Merge branch 'way_constraint_translation' of https://github.com/Physt…

…am/simutrans-extended.git
jamespetts · Feb 24, 2018 · d9ee24b · d9ee24b
2 parents 10ec2d6 + bcd7e12
commit d9ee24b
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/boden/wege/weg.cc b/boden/wege/weg.cc
@@ -932,7 +932,7 @@ void weg_t::info(cbuffer_t & buf, bool is_bridge) const
 				}
 				any_permissive = true;
 				char tmpbuf[30];
-				sprintf(tmpbuf, "Permissive %i", i);
+				sprintf(tmpbuf, " Permissive %i-%i", desc->get_waytype(), i);
 				buf.append(translator::translate(tmpbuf));
 				buf.append("\n");
 			}
@@ -962,7 +962,7 @@ void weg_t::info(cbuffer_t & buf, bool is_bridge) const
 				}
 				any_prohibitive = true;
 				char tmpbuf[30];
-				sprintf(tmpbuf, "Prohibitive %i", i);
+				sprintf(tmpbuf, "Prohibitive %i-%i", desc->get_waytype(), i);
 				buf.append(translator::translate(tmpbuf));
 				buf.append("\n");
 			}
@@ -1592,4 +1592,4 @@ signal_t *weg_t::get_signal(ribi_t::ribi direction_of_travel) const
 		return sig;
 	}
 	else return NULL;
-}
+}
diff --git a/gui/components/gui_convoy_assembler.cc b/gui/components/gui_convoy_assembler.cc
@@ -2291,7 +2291,7 @@ void gui_convoy_assembler_t::draw_vehicle_info_text(const scr_coord& pos)
 			{
 				n += sprintf(buf + n, "%s", translator::translate("\nMUST USE: "));
 				char tmpbuf[30];
-				sprintf(tmpbuf, "Permissive %i", i);
+				sprintf(tmpbuf, "Permissive %i-%i", veh_type->get_waytype(), i);
 				n += sprintf(buf + n, "%s", translator::translate(tmpbuf));
 			}
 		}
@@ -2311,7 +2311,7 @@ void gui_convoy_assembler_t::draw_vehicle_info_text(const scr_coord& pos)
 			{
 				n += sprintf(buf + n, "%s", translator::translate("\nMAY USE: "));
 				char tmpbuf[30];
-				sprintf(tmpbuf, "Prohibitive %i", i);
+				sprintf(tmpbuf, "Prohibitive %i-%i", veh_type->get_waytype(), i);
 				n += sprintf(buf + n, "%s", translator::translate(tmpbuf));
 			}
 		}

diff --git a/gui/convoi_detail_t.cc b/gui/convoi_detail_t.cc
@@ -698,7 +698,7 @@ void gui_vehicleinfo_t::draw(scr_coord offset)
 					char tmpbuf1[13];
 					sprintf(tmpbuf1, "\nMUST USE: ");
 					char tmpbuf[14];
-					sprintf(tmpbuf, "Permissive %i", i);
+					sprintf(tmpbuf, "Permissive %i-%i", v->get_desc()->get_waytype(), i);
 					buf.printf("%s %s", translator::translate(tmpbuf1), translator::translate(tmpbuf));
 					display_proportional_clip(pos.x + w + offset.x, pos.y + offset.y + total_height + extra_y, buf, ALIGN_LEFT, SYSCOL_TEXT, true);
 					extra_y += LINESPACE;
@@ -727,7 +727,7 @@ void gui_vehicleinfo_t::draw(scr_coord offset)
 					char tmpbuf1[13];
 					sprintf(tmpbuf1, "\nMAY USE: ");
 					char tmpbuf[14];
-					sprintf(tmpbuf, "Prohibitive %i", i);
+					sprintf(tmpbuf, "Prohibitive %i-%i", v->get_desc()->get_waytype(), i);
 					buf.printf("%s %s", translator::translate(tmpbuf1), translator::translate(tmpbuf));
 					display_proportional_clip(pos.x + w + offset.x, pos.y + offset.y + total_height + extra_y, buf, ALIGN_LEFT, SYSCOL_TEXT, true);
 					extra_y += LINESPACE;

diff --git a/simtool.cc b/simtool.cc
@@ -3640,7 +3640,7 @@ const char* tool_build_wayobj_t::get_tooltip(const player_t *) const
 					}
 					any_prohibitive = true;
 					char tmpbuf[30];
-					sprintf(tmpbuf, "Prohibitive %i", i);
+					sprintf(tmpbuf, "Prohibitive %i-%i", desc->get_waytype(), i);
 					n += sprintf(toolstr + n, " ");
 					n += sprintf(toolstr + n, translator::translate(tmpbuf));
 				}