Loading

Paste #plzzu7ujn

Wrap Raw Revise
  1. Index: src/lang/english.txt
  2. ===================================================================
  3. --- src/lang/english.txt    (revision 27683)
  4. +++ src/lang/english.txt    (working copy)
  5. @@ -2589,6 +2589,7 @@
  6.  STR_LAND_AREA_INFORMATION_NEWGRF_NAME                           :{BLACK}NewGRF: {LTBLUE}{RAW_STRING}
  7.  STR_LAND_AREA_INFORMATION_CARGO_ACCEPTED                        :{BLACK}Cargo accepted: {LTBLUE}
  8.  STR_LAND_AREA_INFORMATION_CARGO_EIGHTS                          :({COMMA}/8 {STRING})
  9. +STR_LANG_AREA_INFORMATION_RAIL_TYPE                             :{BLACK}Rail type: {LTBLUE}{STRING}
  10.  STR_LANG_AREA_INFORMATION_RAIL_SPEED_LIMIT                      :{BLACK}Rail speed limit: {LTBLUE}{VELOCITY}
  11.  STR_LANG_AREA_INFORMATION_ROAD_SPEED_LIMIT                      :{BLACK}Road speed limit: {LTBLUE}{VELOCITY}
  12.  
  13. @@ -2601,29 +2602,29 @@
  14.  STR_LAI_CLEAR_DESCRIPTION_SNOW_COVERED_LAND                     :Snow-covered land
  15.  STR_LAI_CLEAR_DESCRIPTION_DESERT                                :Desert
  16.  
  17. -STR_LAI_RAIL_DESCRIPTION_TRACK                                  :{STRING} track
  18. -STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_SIGNALS              :{STRING} track with block signals
  19. -STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRESIGNALS                  :{STRING} track with pre-signals
  20. -STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXITSIGNALS                 :{STRING} track with exit-signals
  21. -STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_COMBOSIGNALS                :{STRING} track with combo-signals
  22. -STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PBSSIGNALS                  :{STRING} track with path signals
  23. -STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NOENTRYSIGNALS              :{STRING} track with one-way path signals
  24. -STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_PRESIGNALS           :{STRING} track with block and pre-signals
  25. -STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_EXITSIGNALS          :{STRING} track with block and exit-signals
  26. -STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_COMBOSIGNALS         :{STRING} track with block and combo-signals
  27. -STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_PBSSIGNALS           :{STRING} track with block and path signals
  28. -STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_NOENTRYSIGNALS       :{STRING} track with block and one-way path signals
  29. -STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_EXITSIGNALS             :{STRING} track with pre- and exit-signals
  30. -STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_COMBOSIGNALS            :{STRING} track with pre- and combo-signals
  31. -STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_PBSSIGNALS              :{STRING} track with pre- and path signals
  32. -STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_NOENTRYSIGNALS          :{STRING} track with pre- and one-way path signals
  33. -STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXIT_COMBOSIGNALS           :{STRING} track with exit- and combo-signals
  34. -STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXIT_PBSSIGNALS             :{STRING} track with exit- and path signals
  35. -STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXIT_NOENTRYSIGNALS         :{STRING} track with exit- and one-way path signals
  36. -STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_COMBO_PBSSIGNALS            :{STRING} track with combo- and path signals
  37. -STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_COMBO_NOENTRYSIGNALS        :{STRING} track with combo- and one-way path signals
  38. -STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PBS_NOENTRYSIGNALS          :{STRING} track with path and one-way path signals
  39. -STR_LAI_RAIL_DESCRIPTION_TRAIN_DEPOT                            :{STRING} train depot
  40. +STR_LAI_RAIL_DESCRIPTION_TRACK                                  :Railway track
  41. +STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_SIGNALS              :Railway track with block signals
  42. +STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRESIGNALS                  :Railway track with pre-signals
  43. +STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXITSIGNALS                 :Railway track with exit-signals
  44. +STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_COMBOSIGNALS                :Railway track with combo-signals
  45. +STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PBSSIGNALS                  :Railway track with path signals
  46. +STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NOENTRYSIGNALS              :Railway track with one-way path signals
  47. +STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_PRESIGNALS           :Railway track with block and pre-signals
  48. +STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_EXITSIGNALS          :Railway track with block and exit-signals
  49. +STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_COMBOSIGNALS         :Railway track with block and combo-signals
  50. +STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_PBSSIGNALS           :Railway track with block and path signals
  51. +STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_NORMAL_NOENTRYSIGNALS       :Railway track with block and one-way path signals
  52. +STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_EXITSIGNALS             :Railway track with pre- and exit-signals
  53. +STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_COMBOSIGNALS            :Railway track with pre- and combo-signals
  54. +STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_PBSSIGNALS              :Railway track with pre- and path signals
  55. +STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PRE_NOENTRYSIGNALS          :Railway track with pre- and one-way path signals
  56. +STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXIT_COMBOSIGNALS           :Railway track with exit- and combo-signals
  57. +STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXIT_PBSSIGNALS             :Railway track with exit- and path signals
  58. +STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_EXIT_NOENTRYSIGNALS         :Railway track with exit- and one-way path signals
  59. +STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_COMBO_PBSSIGNALS            :Railway track with combo- and path signals
  60. +STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_COMBO_NOENTRYSIGNALS        :Railway track with combo- and one-way path signals
  61. +STR_LAI_RAIL_DESCRIPTION_TRACK_WITH_PBS_NOENTRYSIGNALS          :Railway track with path and one-way path signals
  62. +STR_LAI_RAIL_DESCRIPTION_TRAIN_DEPOT                            :Railway train depot
  63.  
  64.  STR_LAI_ROAD_DESCRIPTION_ROAD                                   :Road
  65.  STR_LAI_ROAD_DESCRIPTION_ROAD_WITH_STREETLIGHTS                 :Road with street lights
  66. Index: src/misc_gui.cpp
  67. ===================================================================
  68. --- src/misc_gui.cpp    (revision 27683)
  69. +++ src/misc_gui.cpp    (working copy)
  70. @@ -162,6 +162,7 @@
  71.         td.airport_class = STR_NULL;
  72.         td.airport_name = STR_NULL;
  73.         td.airport_tile_name = STR_NULL;
  74. +       td.railtype = STR_NULL;
  75.         td.rail_speed = 0;
  76.         td.road_speed = 0;
  77.  
  78. @@ -272,6 +273,13 @@
  79.             line_nr++;
  80.         }
  81.  
  82. +       /* Rail type name */
  83. +       if (td.railtype != STR_NULL) {
  84. +           SetDParam(0, td.railtype);
  85. +           GetString(this->landinfo_data[line_nr], STR_LANG_AREA_INFORMATION_RAIL_TYPE, lastof(this->landinfo_data[line_nr]));
  86. +           line_nr++;
  87. +       }
  88. +
  89.         /* Rail speed limit */
  90.         if (td.rail_speed != 0) {
  91.             SetDParam(0, td.rail_speed);
  92. Index: src/rail_cmd.cpp
  93. ===================================================================
  94. --- src/rail_cmd.cpp    (revision 27683)
  95. +++ src/rail_cmd.cpp    (working copy)
  96. @@ -2720,8 +2720,8 @@
  97.  {
  98.     const RailtypeInfo *rti = GetRailTypeInfo(GetRailType(tile));
  99.     td->rail_speed = rti->max_speed;
  100. +   td->railtype = rti->strings.name;
  101.     td->owner[0] = GetTileOwner(tile);
  102. -   SetDParamX(td->dparam, 0, rti->strings.name);
  103.     switch (GetRailTileType(tile)) {
  104.         case RAIL_TILE_NORMAL:
  105.             td->str = STR_LAI_RAIL_DESCRIPTION_TRACK;
  106. Index: src/road_cmd.cpp
  107. ===================================================================
  108. --- src/road_cmd.cpp    (revision 27683)
  109. +++ src/road_cmd.cpp    (working copy)
  110. @@ -1684,6 +1684,7 @@
  111.             if (HasBit(rts, ROADTYPE_TRAM)) tram_owner = GetRoadOwner(tile, ROADTYPE_TRAM);
  112.  
  113.             const RailtypeInfo *rti = GetRailTypeInfo(GetRailType(tile));
  114. +           td->railtype = rti->strings.name;
  115.             td->rail_speed = rti->max_speed;
  116.  
  117.             break;
  118. Index: src/station_cmd.cpp
  119. ===================================================================
  120. --- src/station_cmd.cpp (revision 27683)
  121. +++ src/station_cmd.cpp (working copy)
  122. @@ -2995,6 +2995,7 @@
  123.  
  124.         const RailtypeInfo *rti = GetRailTypeInfo(GetRailType(tile));
  125.         td->rail_speed = rti->max_speed;
  126. +       td->railtype = rti->strings.name;
  127.     }
  128.  
  129.     if (IsAirport(tile)) {
  130. Index: src/tile_cmd.h
  131. ===================================================================
  132. --- src/tile_cmd.h  (revision 27683)
  133. +++ src/tile_cmd.h  (working copy)
  134. @@ -62,6 +62,7 @@
  135.     StringID airport_tile_name; ///< Name of the airport tile
  136.     const char *grf;            ///< newGRF used for the tile contents
  137.     uint64 dparam[2];           ///< Parameters of the \a str string
  138. +   StringID railtype;          ///< Type of rail on the tile.
  139.     uint16 rail_speed;          ///< Speed limit of rail (bridges and track)
  140.     uint16 road_speed;          ///< Speed limit of road (bridges)
  141.  };
  142. Index: src/tunnelbridge_cmd.cpp
  143. ===================================================================
  144. --- src/tunnelbridge_cmd.cpp    (revision 27683)
  145. +++ src/tunnelbridge_cmd.cpp    (working copy)
  146. @@ -1612,6 +1612,7 @@
  147.     if (tt == TRANSPORT_RAIL) {
  148.         const RailtypeInfo *rti = GetRailTypeInfo(GetRailType(tile));
  149.         td->rail_speed = rti->max_speed;
  150. +       td->railtype = rti->strings.name;
  151.  
  152.         if (!IsTunnel(tile)) {
  153.             uint16 spd = GetBridgeSpec(GetBridgeType(tile))->speed;
  154.  
Posted by Anonymous at 09 Dec 2016, 20:03:53 UTC
Language: diff • Views: 541

Comments