diff options
| -rw-r--r-- | command.c | 12 | ||||
| -rw-r--r-- | command.h | 6 | ||||
| -rw-r--r-- | functions.h | 4 | ||||
| -rw-r--r-- | lang/american.txt | 32 | ||||
| -rw-r--r-- | lang/catalan.txt | 32 | ||||
| -rw-r--r-- | lang/czech.txt | 36 | ||||
| -rw-r--r-- | lang/danish.txt | 12 | ||||
| -rw-r--r-- | lang/dutch.txt | 16 | ||||
| -rw-r--r-- | lang/english.txt | 36 | ||||
| -rw-r--r-- | lang/finnish.txt | 32 | ||||
| -rw-r--r-- | lang/french.txt | 32 | ||||
| -rw-r--r-- | lang/galician.txt | 32 | ||||
| -rw-r--r-- | lang/german.txt | 32 | ||||
| -rw-r--r-- | lang/hungarian.txt | 32 | ||||
| -rw-r--r-- | lang/icelandic.txt | 32 | ||||
| -rw-r--r-- | lang/italian.txt | 18 | ||||
| -rw-r--r-- | lang/norwegian.txt | 32 | ||||
| -rw-r--r-- | lang/polish.txt | 32 | ||||
| -rw-r--r-- | lang/portuguese.txt | 32 | ||||
| -rw-r--r-- | lang/romanian.txt | 28 | ||||
| -rw-r--r-- | lang/slovak.txt | 32 | ||||
| -rw-r--r-- | lang/spanish.txt | 32 | ||||
| -rw-r--r-- | lang/swedish.txt | 32 | ||||
| -rw-r--r-- | main_gui.c | 12 | ||||
| -rw-r--r-- | misc.c | 4 | ||||
| -rw-r--r-- | order_gui.c | 12 | ||||
| -rw-r--r-- | rail_cmd.c | 126 | ||||
| -rw-r--r-- | rail_gui.c | 70 | ||||
| -rw-r--r-- | settings.c | 2 | ||||
| -rw-r--r-- | strgen/strgen.c | 2 | ||||
| -rw-r--r-- | strings.c | 8 | ||||
| -rw-r--r-- | table/track_land.h | 8 | ||||
| -rw-r--r-- | train_cmd.c | 8 | ||||
| -rw-r--r-- | train_gui.c | 4 | ||||
| -rw-r--r-- | ttd.h | 4 | ||||
| -rw-r--r-- | vehicle.c | 48 | ||||
| -rw-r--r-- | vehicle.h | 20 | ||||
| -rw-r--r-- | viewport.c | 40 |
38 files changed, 492 insertions, 492 deletions
@@ -30,9 +30,9 @@ DEF_COMMAND(CmdSellLandArea); DEF_COMMAND(CmdBuildTunnel); DEF_COMMAND(CmdBuildTrainDepot); -DEF_COMMAND(CmdBuildTrainCheckpoint); -DEF_COMMAND(CmdRenameCheckpoint); -DEF_COMMAND(CmdRemoveTrainCheckpoint); +DEF_COMMAND(CmdBuildTrainWaypoint); +DEF_COMMAND(CmdRenameWaypoint); +DEF_COMMAND(CmdRemoveTrainWaypoint); DEF_COMMAND(CmdBuildTruckStation); @@ -180,9 +180,9 @@ static CommandProc * const _command_proc_table[] = { CmdBuildTunnel, /* 13 */ CmdRemoveFromRailroadStation, /* 14 */ CmdConvertRail, /* 15 */ - CmdBuildTrainCheckpoint, /* 16 */ - CmdRenameCheckpoint, /* 17 */ - CmdRemoveTrainCheckpoint, /* 18 */ + CmdBuildTrainWaypoint, /* 16 */ + CmdRenameWaypoint, /* 17 */ + CmdRemoveTrainWaypoint, /* 18 */ CmdBuildTruckStation, /* 19 */ NULL, /* 20 */ CmdBuildBusStation, /* 21 */ @@ -20,9 +20,9 @@ enum { CMD_REMOVE_FROM_RAILROAD_STATION = 14, CMD_CONVERT_RAIL = 15, - CMD_BUILD_TRAIN_CHECKPOINT = 16, - CMD_RENAME_CHECKPOINT = 17, - CMD_REMOVE_TRAIN_CHECKPOINT = 18, + CMD_BUILD_TRAIN_WAYPOINT = 16, + CMD_RENAME_WAYPOINT = 17, + CMD_REMOVE_TRAIN_WAYPOINT = 18, CMD_BUILD_TRUCK_STATION = 19, CMD_BUILD_BUS_STATION = 21, diff --git a/functions.h b/functions.h index 7d5f2094e..acc8e1b5f 100644 --- a/functions.h +++ b/functions.h @@ -66,7 +66,7 @@ void StationPickerDrawSprite(int x, int y, int railtype, int image); /* track_land.c */ void DrawTrainDepotSprite(int x, int y, int image, int railtype); -void DrawCheckpointSprite(int x, int y, int image); +void DrawWaypointSprite(int x, int y, int image); /* road_land.c */ void DrawRoadDepotSprite(int x, int y, int image); @@ -215,7 +215,7 @@ uint GetRoadBitsByTile(TileIndex tile); int GetTownRadiusGroup(Town *t, uint tile); int32 GetTransportedGoodsIncome(uint num_pieces, uint dist, byte transit_days, byte cargo_type); void ShowRenameSignWindow(SignStruct *ss); -void ShowRenameCheckpointWindow(Checkpoint *cp); +void ShowRenameWaypointWindow(Waypoint *cp); int FindFirstBit(uint32 x); void ShowHighscoreTable(int tbl); TileIndex AdjustTileCoordRandomly(TileIndex a, byte rng); diff --git a/lang/american.txt b/lang/american.txt index 18ebb2eb7..8b64bba7e 100644 --- a/lang/american.txt +++ b/lang/american.txt @@ -741,8 +741,8 @@ STR_02CB_STATION_NAMES_DISPLAYED :{CHECKMARK}{SETX 12}Station names displayed STR_02CC_STATION_NAMES_DISPLAYED :{SETX 12}Station names displayed STR_02CD_SIGNS_DISPLAYED :{CHECKMARK}{SETX 12}Signs displayed STR_02CE_SIGNS_DISPLAYED :{SETX 12}Signs displayed -STR_CHECKPOINTS_DISPLAYED :{CHECKMARK}{SETX 12}Checkpoints displayed -STR_CHECKPOINTS_DISPLAYED2 :{SETX 12}Checkpoints displayed +STR_WAYPOINTS_DISPLAYED :{CHECKMARK}{SETX 12}Waypoints displayed +STR_WAYPOINTS_DISPLAYED2 :{SETX 12}Waypoints displayed STR_02CF_FULL_ANIMATION :{CHECKMARK}{SETX 12}Full animation STR_02D0_FULL_ANIMATION :{SETX 12}Full animation STR_02D1_FULL_DETAIL :{CHECKMARK}{SETX 12}Full detail @@ -1072,24 +1072,24 @@ STR_CHEAT_NO_JETCRASH :{LTBLUE}Jetplanes will not crash (frequently) on sma STR_CHEAT_SWITCH_CLIMATE :{LTBLUE}Switch climate: {ORANGE} {STRING} STR_CHEAT_CHANGE_DATE :{LTBLUE}Change date: {ORANGE} {DATE_SHORT} -STR_HEADING_FOR_CHECKPOINT :{LTBLUE}Heading for {CHECKPOINT} -STR_HEADING_FOR_CHECKPOINT_VEL :{LTBLUE}Heading for {CHECKPOINT}, {VELOCITY} +STR_HEADING_FOR_WAYPOINT :{LTBLUE}Heading for {WAYPOINT} +STR_HEADING_FOR_WAYPOINT_VEL :{LTBLUE}Heading for {WAYPOINT}, {VELOCITY} -STR_GO_TO_CHECKPOINT :Go via {CHECKPOINT} +STR_GO_TO_WAYPOINT :Go via {WAYPOINT} -STR_CHECKPOINTNAME_CITY :Checkpoint {TOWN} -STR_CHECKPOINTNAME_CITY_SERIAL :Checkpoint {TOWN} #{COMMA16} -STR_LANDINFO_CHECKPOINT :Checkpoint +STR_WAYPOINTNAME_CITY :Waypoint {TOWN} +STR_WAYPOINTNAME_CITY_SERIAL :Waypoint {TOWN} #{COMMA16} +STR_LANDINFO_WAYPOINT :Waypoint -STR_CHECKPOINT_VIEWPORT :{WHITE}{CHECKPOINT} -STR_CHECKPOINT_VIEWPORT_TINY :{TINYFONT}{WHITE}{CHECKPOINT} -STR_CHECKPOINT_RAW :{CHECKPOINT} -STR_EDIT_CHECKPOINT_NAME :{WHITE}Edit checkpoint name +STR_WAYPOINT_VIEWPORT :{WHITE}{WAYPOINT} +STR_WAYPOINT_VIEWPORT_TINY :{TINYFONT}{WHITE}{WAYPOINT} +STR_WAYPOINT_RAW :{WAYPOINT} +STR_EDIT_WAYPOINT_NAME :{WHITE}Edit waypoint name -STR_CANT_CHANGE_CHECKPOINT_NAME :{WHITE}Can't change checkpoint name... -STR_CONVERT_RAIL_TO_CHECKPOINT_TIP :{BLACK}Convert rail to checkpoint -STR_CANT_BUILD_TRAIN_CHECKPOINT :{WHITE}Can't build train checkpoint here... -STR_CANT_REMOVE_TRAIN_CHECKPOINT :{WHITE}Can't remove train checkpoint here... +STR_CANT_CHANGE_WAYPOINT_NAME :{WHITE}Can't change waypoint name... +STR_CONVERT_RAIL_TO_WAYPOINT_TIP :{BLACK}Convert rail to waypoint +STR_CANT_BUILD_TRAIN_WAYPOINT :{WHITE}Can't build train waypoint here... +STR_CANT_REMOVE_TRAIN_WAYPOINT :{WHITE}Can't remove train waypoint here... STR_BUILD_AUTORAIL_TIP :{BLACK}Build railroad track using the Autorail mode diff --git a/lang/catalan.txt b/lang/catalan.txt index 2ba733395..17d39e701 100644 --- a/lang/catalan.txt +++ b/lang/catalan.txt @@ -741,8 +741,8 @@ STR_02CB_STATION_NAMES_DISPLAYED :{CHECKMARK}{SETX 12}Mostrats noms d'estacio STR_02CC_STATION_NAMES_DISPLAYED :{SETX 12}Mostrats noms d'estacions STR_02CD_SIGNS_DISPLAYED :{CHECKMARK}{SETX 12}Mostrades senyals STR_02CE_SIGNS_DISPLAYED :{SETX 12}Mostrades senyals -STR_CHECKPOINTS_DISPLAYED :{CHECKMARK}{SETX 12}Mostrats punts de control -STR_CHECKPOINTS_DISPLAYED2 :{SETX 12}Mostrats punts de control +STR_WAYPOINTS_DISPLAYED :{CHECKMARK}{SETX 12}Mostrats punts de control +STR_WAYPOINTS_DISPLAYED2 :{SETX 12}Mostrats punts de control STR_02CF_FULL_ANIMATION :{CHECKMARK}{SETX 12}Animació completa STR_02D0_FULL_ANIMATION :{SETX 12}Animació completa STR_02D1_FULL_DETAIL :{CHECKMARK}{SETX 12}Detall complet @@ -1072,24 +1072,24 @@ STR_CHEAT_NO_JETCRASH :{LTBLUE}Els avions a reacció no tenen (frecuents) ac STR_CHEAT_SWITCH_CLIMATE :{LTBLUE}Canviar clima: {ORANGE} {STRING} STR_CHEAT_CHANGE_DATE :{LTBLUE}Canviar data: {ORANGE} {DATE_SHORT} -STR_HEADING_FOR_CHECKPOINT :{LTBLUE}Cap a {CHECKPOINT} -STR_HEADING_FOR_CHECKPOINT_VEL :{LTBLUE}Cap a {CHECKPOINT}, a {VELOCITY} +STR_HEADING_FOR_WAYPOINT :{LTBLUE}Cap a {WAYPOINT} +STR_HEADING_FOR_WAYPOINT_VEL :{LTBLUE}Cap a {WAYPOINT}, a {VELOCITY} -STR_GO_TO_CHECKPOINT :Anar vía {CHECKPOINT} +STR_GO_TO_WAYPOINT :Anar vía {WAYPOINT} -STR_CHECKPOINTNAME_CITY :Punt de Control {TOWN} -STR_CHECKPOINTNAME_CITY_SERIAL :Punt de Control {TOWN} #{COMMA16} -STR_LANDINFO_CHECKPOINT :Punt de Control +STR_WAYPOINTNAME_CITY :Punt de Control {TOWN} +STR_WAYPOINTNAME_CITY_SERIAL :Punt de Control {TOWN} #{COMMA16} +STR_LANDINFO_WAYPOINT :Punt de Control -STR_CHECKPOINT_VIEWPORT :{WHITE}{CHECKPOINT} -STR_CHECKPOINT_VIEWPORT_TINY :{TINYFONT}{WHITE}{CHECKPOINT} -STR_CHECKPOINT_RAW :{CHECKPOINT} -STR_EDIT_CHECKPOINT_NAME :{WHITE}Editar nom de punt de control +STR_WAYPOINT_VIEWPORT :{WHITE}{WAYPOINT} +STR_WAYPOINT_VIEWPORT_TINY :{TINYFONT}{WHITE}{WAYPOINT} +STR_WAYPOINT_RAW :{WAYPOINT} +STR_EDIT_WAYPOINT_NAME :{WHITE}Editar nom de punt de control -STR_CANT_CHANGE_CHECKPOINT_NAME :{WHITE}No es pot canviar el nom del punt de control... -STR_CONVERT_RAIL_TO_CHECKPOINT_TIP :{BLACK}Convertir vía a punt de control -STR_CANT_BUILD_TRAIN_CHECKPOINT :{WHITE}No es pot construir punt de control de tren aqui... -STR_CANT_REMOVE_TRAIN_CHECKPOINT :{WHITE}No es pot treure punt de control de tren aqui... +STR_CANT_CHANGE_WAYPOINT_NAME :{WHITE}No es pot canviar el nom del punt de control... +STR_CONVERT_RAIL_TO_WAYPOINT_TIP :{BLACK}Convertir vía a punt de control +STR_CANT_BUILD_TRAIN_WAYPOINT :{WHITE}No es pot construir punt de control de tren aqui... +STR_CANT_REMOVE_TRAIN_WAYPOINT :{WHITE}No es pot treure punt de control de tren aqui... STR_BUILD_AUTORAIL_TIP :{BLACK}Construir via de tren usant el mode Autorail diff --git a/lang/czech.txt b/lang/czech.txt index df4cf8c65..60b601afd 100644 --- a/lang/czech.txt +++ b/lang/czech.txt @@ -741,8 +741,8 @@ STR_02CB_STATION_NAMES_DISPLAYED :{CHECKMARK}{SETX 12}Zobrazení jmen stanic STR_02CC_STATION_NAMES_DISPLAYED :{SETX 12}Zobrazení jmen stanic STR_02CD_SIGNS_DISPLAYED :{CHECKMARK}{SETX 12}Zobrazení napisu STR_02CE_SIGNS_DISPLAYED :{SETX 12}Zobrazení napisu -STR_CHECKPOINTS_DISPLAYED :{CHECKMARK}{SETX 12}Zobrazení kontrolních bodu -STR_CHECKPOINTS_DISPLAYED2 :{SETX 12}Zobrazení kontrolních bodu +STR_WAYPOINTS_DISPLAYED :{CHECKMARK}{SETX 12}Zobrazení kontrolních bodu +STR_WAYPOINTS_DISPLAYED2 :{SETX 12}Zobrazení kontrolních bodu STR_02CF_FULL_ANIMATION :{CHECKMARK}{SETX 12}Plné animace STR_02D0_FULL_ANIMATION :{SETX 12}Plné animace STR_02D1_FULL_DETAIL :{CHECKMARK}{SETX 12}Plné detaily @@ -1074,27 +1074,27 @@ STR_CHEAT_NO_JETCRASH :{LTBLUE}Letadla nebudou na malých letistich (tak cas STR_CHEAT_SWITCH_CLIMATE :{LTBLUE}Zmenit podnebí: {ORANGE} {STRING} STR_CHEAT_CHANGE_DATE :{LTBLUE}Zmenit datum: {ORANGE} {DATE_SHORT} -STR_HEADING_FOR_CHECKPOINT :{LTBLUE}Mirim do {CHECKPOINT} -STR_HEADING_FOR_CHECKPOINT_VEL :{LTBLUE}Mirim do {CHECKPOINT}, {VELOCITY} +STR_HEADING_FOR_WAYPOINT :{LTBLUE}Mirim do {WAYPOINT} +STR_HEADING_FOR_WAYPOINT_VEL :{LTBLUE}Mirim do {WAYPOINT}, {VELOCITY} -STR_GO_TO_CHECKPOINT :Jet pres {CHECKPOINT} +STR_GO_TO_WAYPOINT :Jet pres {WAYPOINT} -STR_CHECKPOINTNAME_CITY :Kontrolni bod {TOWN} -STR_CHECKPOINTNAME_CITY_SERIAL :Kontrolni bod {TOWN} #{COMMA16} -STR_LANDINFO_CHECKPOINT :Kontrolni bod +STR_WAYPOINTNAME_CITY :Kontrolni bod {TOWN} +STR_WAYPOINTNAME_CITY_SERIAL :Kontrolni bod {TOWN} #{COMMA16} +STR_LANDINFO_WAYPOINT :Kontrolni bod -STR_CHECKPOINT :{WHITE}Kontrolní bod -STR_CHECKPOINT_GRAPHICS_TIP :{BLACK}Vyber typ kontrolního bodu +STR_WAYPOINT :{WHITE}Kontrolní bod +STR_WAYPOINT_GRAPHICS_TIP :{BLACK}Vyber typ kontrolního bodu -STR_CHECKPOINT_VIEWPORT :{WHITE}{CHECKPOINT} -STR_CHECKPOINT_VIEWPORT_TINY :{TINYFONT}{WHITE}{CHECKPOINT} -STR_CHECKPOINT_RAW :{CHECKPOINT} -STR_EDIT_CHECKPOINT_NAME :{WHITE}Zmenit jméno kontrolniho bodu +STR_WAYPOINT_VIEWPORT :{WHITE}{WAYPOINT} +STR_WAYPOINT_VIEWPORT_TINY :{TINYFONT}{WHITE}{WAYPOINT} +STR_WAYPOINT_RAW :{WAYPOINT} +STR_EDIT_WAYPOINT_NAME :{WHITE}Zmenit jméno kontrolniho bodu -STR_CANT_CHANGE_CHECKPOINT_NAME :{WHITE}Nemohu zmenit jméno kontrolniho bodu... -STR_CONVERT_RAIL_TO_CHECKPOINT_TIP :{BLACK}Zmenit koleje v kontrolni bod -STR_CANT_BUILD_TRAIN_CHECKPOINT :{WHITE}Nemohu zde vybudovat zeleznicni kontrolni bod... -STR_CANT_REMOVE_TRAIN_CHECKPOINT :{WHITE}Nemohu zde zrusit zeleznicni kontrolni bod... +STR_CANT_CHANGE_WAYPOINT_NAME :{WHITE}Nemohu zmenit jméno kontrolniho bodu... +STR_CONVERT_RAIL_TO_WAYPOINT_TIP :{BLACK}Zmenit koleje v kontrolni bod +STR_CANT_BUILD_TRAIN_WAYPOINT :{WHITE}Nemohu zde vybudovat zeleznicni kontrolni bod... +STR_CANT_REMOVE_TRAIN_WAYPOINT :{WHITE}Nemohu zde zrusit zeleznicni kontrolni bod... STR_BUILD_AUTORAIL_TIP :{BLACK}Budovat koleje pouzitim rezimu Autokoleje diff --git a/lang/danish.txt b/lang/danish.txt index 83d3714ec..7032b9428 100644 --- a/lang/danish.txt +++ b/lang/danish.txt @@ -1072,18 +1072,18 @@ STR_CHEAT_NO_JETCRASH :{LTBLUE}Jetplanes will not crash (frequently) on sma STR_CHEAT_SWITCH_CLIMATE :{LTBLUE}Switch climate: {ORANGE} {STRING} STR_CHEAT_CHANGE_DATE :{LTBLUE}Change date: {ORANGE} {DATE_SHORT} -STR_HEADING_FOR_CHECKPOINT :{LTBLUE}Retning mod {CHECKPOINT} -STR_HEADING_FOR_CHECKPOINT_VEL :{LTBLUE}Retning mod {CHECKPOINT}, {VELOCITY} +STR_HEADING_FOR_WAYPOINT :{LTBLUE}Retning mod {WAYPOINT} +STR_HEADING_FOR_WAYPOINT_VEL :{LTBLUE}Retning mod {WAYPOINT}, {VELOCITY} -STR_GO_TO_CHECKPOINT :Via {CHECKPOINT} +STR_GO_TO_WAYPOINT :Via {WAYPOINT} STR_CHECKPOINTNAME_CITY :Checkpoint {TOWN} STR_CHECKPOINTNAME_CITY_SERIAL :Checkpoint {TOWN} #{COMMA16} STR_LANDINFO_CHECKPOINT :Checkpoint -STR_CHECKPOINT_VIEWPORT :{WHITE}{CHECKPOINT} -STR_CHECKPOINT_VIEWPORT_TINY :{TINYFONT}{WHITE}{CHECKPOINT} -STR_CHECKPOINT_RAW :{CHECKPOINT} +STR_WAYPOINT_VIEWPORT :{WHITE}{WAYPOINT} +STR_WAYPOINT_VIEWPORT_TINY :{TINYFONT}{WHITE}{WAYPOINT} +STR_WAYPOINT_RAW :{WAYPOINT} STR_EDIT_CHECKPOINT_NAME :{WHITE}Ćndrer checkpointets navn STR_CANT_CHANGE_CHECKPOINT_NAME :{WHITE}Kan ikke ćndre checkpointets navn... diff --git a/lang/dutch.txt b/lang/dutch.txt index 25646caff..871ef3582 100644 --- a/lang/dutch.txt +++ b/lang/dutch.txt @@ -1074,18 +1074,18 @@ STR_CHEAT_NO_JETCRASH :{LTBLUE}Jetvliegtuigen storten niet (vaak) neer op k STR_CHEAT_SWITCH_CLIMATE :{LTBLUE}Verander klimaat: {ORANGE} {STRING} STR_CHEAT_CHANGE_DATE :{LTBLUE}Verander datum: {ORANGE} {DATE_SHORT} -STR_HEADING_FOR_CHECKPOINT :{LTBLUE}Op weg naar {CHECKPOINT} -STR_HEADING_FOR_CHECKPOINT_VEL :{LTBLUE}Op weg naar {CHECKPOINT}, {VELOCITY} +STR_HEADING_FOR_WAYPOINT :{LTBLUE}Op weg naar {WAYPOINT} +STR_HEADING_FOR_WAYPOINT_VEL :{LTBLUE}Op weg naar {WAYPOINT}, {VELOCITY} -STR_GO_TO_CHECKPOINT :Ga via {CHECKPOINT} +STR_GO_TO_WAYPOINT :Ga via {WAYPOINT} -STR_CHECKPOINTNAME_CITY :Tussenstop {TOWN} -STR_CHECKPOINTNAME_CITY_SERIAL :Tussenstop {TOWN} #{COMMA16} +STR_WAYPOINTNAME_CITY :Tussenstop {TOWN} +STR_WAYPOINTNAME_CITY_SERIAL :Tussenstop {TOWN} #{COMMA16} STR_LANDINFO_CHECKPOINT :Checkpoint -STR_CHECKPOINT_VIEWPORT :{WHITE}{CHECKPOINT} -STR_CHECKPOINT_VIEWPORT_TINY :{TINYFONT}{WHITE}{CHECKPOINT} -STR_CHECKPOINT_RAW :{CHECKPOINT} +STR_WAYPOINT_VIEWPORT :{WHITE}{WAYPOINT} +STR_WAYPOINT_VIEWPORT_TINY :{TINYFONT}{WHITE}{WAYPOINT} +STR_WAYPOINT_RAW :{WAYPOINT} STR_EDIT_CHECKPOINT_NAME :{WHITE}Verander checkpointnaam STR_CANT_CHANGE_CHECKPOINT_NAME :{WHITE}Kan checkpointnaam niet veranderen... diff --git a/lang/english.txt b/lang/english.txt index e6434ee29..99bf0d2e5 100644 --- a/lang/english.txt +++ b/lang/english.txt @@ -741,8 +741,8 @@ STR_02CB_STATION_NAMES_DISPLAYED :{CHECKMARK}{SETX 12}Station names displayed STR_02CC_STATION_NAMES_DISPLAYED :{SETX 12}Station names displayed STR_02CD_SIGNS_DISPLAYED :{CHECKMARK}{SETX 12}Signs displayed STR_02CE_SIGNS_DISPLAYED :{SETX 12}Signs displayed -STR_CHECKPOINTS_DISPLAYED :{CHECKMARK}{SETX 12}Checkpoints displayed -STR_CHECKPOINTS_DISPLAYED2 :{SETX 12}Checkpoints displayed +STR_WAYPOINTS_DISPLAYED :{CHECKMARK}{SETX 12}Waypoints displayed +STR_WAYPOINTS_DISPLAYED2 :{SETX 12}Waypoints displayed STR_02CF_FULL_ANIMATION :{CHECKMARK}{SETX 12}Full animation STR_02D0_FULL_ANIMATION :{SETX 12}Full animation STR_02D1_FULL_DETAIL :{CHECKMARK}{SETX 12}Full detail @@ -1074,27 +1074,27 @@ STR_CHEAT_NO_JETCRASH :{LTBLUE}Jetplanes will not crash (frequently) on smal STR_CHEAT_SWITCH_CLIMATE :{LTBLUE}Switch climate: {ORANGE} {STRING} STR_CHEAT_CHANGE_DATE :{LTBLUE}Change date: {ORANGE} {DATE_SHORT} -STR_HEADING_FOR_CHECKPOINT :{LTBLUE}Heading for {CHECKPOINT} -STR_HEADING_FOR_CHECKPOINT_VEL :{LTBLUE}Heading for {CHECKPOINT}, {VELOCITY} +STR_HEADING_FOR_WAYPOINT :{LTBLUE}Heading for {WAYPOINT} +STR_HEADING_FOR_WAYPOINT_VEL :{LTBLUE}Heading for {WAYPOINT}, {VELOCITY} -STR_GO_TO_CHECKPOINT :Go via {CHECKPOINT} +STR_GO_TO_WAYPOINT :Go via {WAYPOINT} -STR_CHECKPOINTNAME_CITY :Checkpoint {TOWN} -STR_CHECKPOINTNAME_CITY_SERIAL :Checkpoint {TOWN} #{COMMA16} -STR_LANDINFO_CHECKPOINT :Checkpoint +STR_WAYPOINTNAME_CITY :Waypoint {TOWN} +STR_WAYPOINTNAME_CITY_SERIAL :Waypoint {TOWN} #{COMMA16} +STR_LANDINFO_WAYPOINT :Waypoint -STR_CHECKPOINT :{WHITE}Checkpoint -STR_CHECKPOINT_GRAPHICS_TIP :{BLACK}Select checkpoint type +STR_WAYPOINT :{WHITE}Waypoint +STR_WAYPOINT_GRAPHICS_TIP :{BLACK}Select waypoint type -STR_CHECKPOINT_VIEWPORT :{WHITE}{CHECKPOINT} -STR_CHECKPOINT_VIEWPORT_TINY :{TINYFONT}{WHITE}{CHECKPOINT} -STR_CHECKPOINT_RAW :{CHECKPOINT} -STR_EDIT_CHECKPOINT_NAME :{WHITE}Edit checkpoint name +STR_WAYPOINT_VIEWPORT :{WHITE}{WAYPOINT} +STR_WAYPOINT_VIEWPORT_TINY :{TINYFONT}{WHITE}{WAYPOINT} +STR_WAYPOINT_RAW :{WAYPOINT} +STR_EDIT_WAYPOINT_NAME :{WHITE}Edit waypoint name -STR_CANT_CHANGE_CHECKPOINT_NAME :{WHITE}Can't change checkpoint name... -STR_CONVERT_RAIL_TO_CHECKPOINT_TIP :{BLACK}Convert rail to checkpoint -STR_CANT_BUILD_TRAIN_CHECKPOINT :{WHITE}Can't build train checkpoint here... -STR_CANT_REMOVE_TRAIN_CHECKPOINT :{WHITE}Can't remove train checkpoint here... +STR_CANT_CHANGE_WAYPOINT_NAME :{WHITE}Can't change waypoint name... +STR_CONVERT_RAIL_TO_WAYPOINT_TIP :{BLACK}Convert rail to waypoint +STR_CANT_BUILD_TRAIN_WAYPOINT :{WHITE}Can't build train waypoint here... +STR_CANT_REMOVE_TRAIN_WAYPOINT :{WHITE}Can't remove train waypoint here... STR_BUILD_AUTORAIL_TIP :{BLACK}Build railway track using the Autorail mode diff --git a/lang/finnish.txt b/lang/finnish.txt index dde6b00ac..31065fa09 100644 --- a/lang/finnish.txt +++ b/lang/finnish.txt @@ -741,8 +741,8 @@ STR_02CB_STATION_NAMES_DISPLAYED :{CHECKMARK}{SETX 12}Asemien nimet näkyvissä STR_02CC_STATION_NAMES_DISPLAYED :{SETX 12}Asemien nimet näkyvissä STR_02CD_SIGNS_DISPLAYED :{CHECKMARK}{SETX 12}Kyltit näkyvissä STR_02CE_SIGNS_DISPLAYED :{SETX 12}Kyltit näkyvissä -STR_CHECKPOINTS_DISPLAYED :{CHECKMARK}{SETX 12}Rastit näkyvissä -STR_CHECKPOINTS_DISPLAYED2 :{SETX 12}Rastit näkyvissä +STR_WAYPOINTS_DISPLAYED :{CHECKMARK}{SETX 12}Rastit näkyvissä +STR_WAYPOINTS_DISPLAYED2 :{SETX 12}Rastit näkyvissä STR_02CF_FULL_ANIMATION :{CHECKMARK}{SETX 12}Täysi animointi STR_02D0_FULL_ANIMATION :{SETX 12}Täysi animointi STR_02D1_FULL_DETAIL :{CHECKMARK}{SETX 12}Kaikki yksityiskohdat @@ -1072,24 +1072,24 @@ STR_CHEAT_NO_JETCRASH :{LTBLUE}Suihkukoneet eivät syöksy (usein) pienille l STR_CHEAT_SWITCH_CLIMATE :{LTBLUE}Vaihda ilmastoa: {ORANGE} {STRING} STR_CHEAT_CHANGE_DATE :{LTBLUE}Muuta päiväystä: {ORANGE} {DATE_SHORT} -STR_HEADING_FOR_CHECKPOINT :{LTBLUE}Kohteena {CHECKPOINT} -STR_HEADING_FOR_CHECKPOINT_VEL :{LTBLUE}Kohteena {CHECKPOINT}, {VELOCITY} +STR_HEADING_FOR_WAYPOINT :{LTBLUE}Kohteena {WAYPOINT} +STR_HEADING_FOR_WAYPOINT_VEL :{LTBLUE}Kohteena {WAYPOINT}, {VELOCITY} -STR_GO_TO_CHECKPOINT :Kierrä rastin {CHECKPOINT} kautta +STR_GO_TO_WAYPOINT :Kierrä rastin {WAYPOINT} kautta -STR_CHECKPOINTNAME_CITY :Rasti: {TOWN} -STR_CHECKPOINTNAME_CITY_SERIAL :Rasti: {TOWN} #{COMMA16} -STR_LANDINFO_CHECKPOINT :Rasti +STR_WAYPOINTNAME_CITY :Rasti: {TOWN} +STR_WAYPOINTNAME_CITY_SERIAL :Rasti: {TOWN} #{COMMA16} +STR_LANDINFO_WAYPOINT :Rasti -STR_CHECKPOINT_VIEWPORT :{WHITE}{CHECKPOINT} -STR_CHECKPOINT_VIEWPORT_TINY :{TINYFONT}{WHITE}{CHECKPOINT} -STR_CHECKPOINT_RAW :{CHECKPOINT} -STR_EDIT_CHECKPOINT_NAME :{WHITE}Muokkaa rastin nimeä +STR_WAYPOINT_VIEWPORT :{WHITE}{WAYPOINT} +STR_WAYPOINT_VIEWPORT_TINY :{TINYFONT}{WHITE}{WAYPOINT} +STR_WAYPOINT_RAW :{WAYPOINT} +STR_EDIT_WAYPOINT_NAME :{WHITE}Muokkaa rastin nimeä -STR_CANT_CHANGE_CHECKPOINT_NAME :{WHITE}Rastin nimeä ei voi muuttaa... -STR_CONVERT_RAIL_TO_CHECKPOINT_TIP :{BLACK}Muunna raide rastiksi -STR_CANT_BUILD_TRAIN_CHECKPOINT :{WHITE}Junarastia ei voi rakentaa tähän... -STR_CANT_REMOVE_TRAIN_CHECKPOINT :{WHITE}Junarastia ei voi poistaa... +STR_CANT_CHANGE_WAYPOINT_NAME :{WHITE}Rastin nimeä ei voi muuttaa... +STR_CONVERT_RAIL_TO_WAYPOINT_TIP :{BLACK}Muunna raide rastiksi +STR_CANT_BUILD_TRAIN_WAYPOINT :{WHITE}Junarastia ei voi rakentaa tähän... +STR_CANT_REMOVE_TRAIN_WAYPOINT :{WHITE}Junarastia ei voi poistaa... STR_BUILD_AUTORAIL_TIP :{BLACK}Rakenna rautatiet käyttäen Autorail-tilaa diff --git a/lang/french.txt b/lang/french.txt index e47b4d551..4e40423e4 100644 --- a/lang/french.txt +++ b/lang/french.txt @@ -741,8 +741,8 @@ STR_02CB_STATION_NAMES_DISPLAYED :{CHECKMARK}{SETX 12}Afficher le nom des sta STR_02CC_STATION_NAMES_DISPLAYED :{SETX 12}Afficher le nom des stations STR_02CD_SIGNS_DISPLAYED :{CHECKMARK}{SETX 12}Afficher les panneaux STR_02CE_SIGNS_DISPLAYED :{SETX 12}Afficher les panneaux -STR_CHECKPOINTS_DISPLAYED :{CHECKMARK}{SETX 12}Afficher les points de contrôle -STR_CHECKPOINTS_DISPLAYED2 :{SETX 12}Afficher les points de contrôle +STR_WAYPOINTS_DISPLAYED :{CHECKMARK}{SETX 12}Afficher les points de contrôle +STR_WAYPOINTS_DISPLAYED2 :{SETX 12}Afficher les points de contrôle STR_02CF_FULL_ANIMATION :{CHECKMARK}{SETX 12}Animation complčte STR_02D0_FULL_ANIMATION :{SETX 12}Animation complčte STR_02D1_FULL_DETAIL :{CHECKMARK}{SETX 12}Détail Maximal @@ -1074,24 +1074,24 @@ STR_CHEAT_NO_JETCRASH :{LTBLUE}Les jets ne se crashent plus (fréquemment) s STR_CHEAT_SWITCH_CLIMATE :{LTBLUE}Changer de climat : {ORANGE} {STRING} STR_CHEAT_CHANGE_DATE :{LTBLUE}Changer la date: {ORANGE} {DATE_SHORT} -STR_HEADING_FOR_CHECKPOINT :{LTBLUE}En route pour {CHECKPOINT} -STR_HEADING_FOR_CHECKPOINT_VEL :{LTBLUE}En route pour {CHECKPOINT}, {VELOCITY} +STR_HEADING_FOR_WAYPOINT :{LTBLUE}En route pour {WAYPOINT} +STR_HEADING_FOR_WAYPOINT_VEL :{LTBLUE}En route pour {WAYPOINT}, {VELOCITY} -STR_GO_TO_CHECKPOINT :Passant par {CHECKPOINT} +STR_GO_TO_WAYPOINT :Passant par {WAYPOINT} -STR_CHECKPOINTNAME_CITY :Point de contrôle {TOWN} -STR_CHECKPOINTNAME_CITY_SERIAL :Point de contrôle {TOWN} #{COMMA16} -STR_LANDINFO_CHECKPOINT :Point de contrôle +STR_WAYPOINTNAME_CITY :Point de contrôle {TOWN} +STR_WAYPOINTNAME_CITY_SERIAL :Point de contrôle {TOWN} #{COMMA16} +STR_LANDINFO_WAYPOINT :Point de contrôle -STR_CHECKPOINT_VIEWPORT :{WHITE}{CHECKPOINT} -STR_CHECKPOINT_VIEWPORT_TINY :{TINYFONT}{WHITE}{CHECKPOINT} -STR_CHECKPOINT_RAW :{CHECKPOINT} -STR_EDIT_CHECKPOINT_NAME :{WHITE}Modifier nom du point de contrôle +STR_WAYPOINT_VIEWPORT :{WHITE}{WAYPOINT} +STR_WAYPOINT_VIEWPORT_TINY :{TINYFONT}{WHITE}{WAYPOINT} +STR_WAYPOINT_RAW :{WAYPOINT} +STR_EDIT_WAYPOINT_NAME :{WHITE}Modifier nom du point de contrôle -STR_CANT_CHANGE_CHECKPOINT_NAME :{WHITE}Impossible de modifier le nom du point de contrôle... -STR_CONVERT_RAIL_TO_CHECKPOINT_TIP :{BLACK}Convertir rail en point de contrôle -STR_CANT_BUILD_TRAIN_CHECKPOINT :{WHITE}Impossible de construire point de contrôle ici... -STR_CANT_REMOVE_TRAIN_CHECKPOINT :{WHITE}Impossible de retirer point de contrôle ici... +STR_CANT_CHANGE_WAYPOINT_NAME :{WHITE}Impossible de modifier le nom du point de contrôle... +STR_CONVERT_RAIL_TO_WAYPOINT_TIP :{BLACK}Convertir rail en point de contrôle +STR_CANT_BUILD_TRAIN_WAYPOINT :{WHITE}Impossible de construire point de contrôle ici... +STR_CANT_REMOVE_TRAIN_WAYPOINT :{WHITE}Impossible de retirer point de contrôle ici... STR_BUILD_AUTORAIL_TIP :{BLACK}Construire les rails avec le mode AutoRail diff --git a/lang/galician.txt b/lang/galician.txt index a6db5196c..2129d617f 100644 --- a/lang/galician.txt +++ b/lang/galician.txt @@ -739,8 +739,8 @@ STR_02CB_STATION_NAMES_DISPLAYED :{CHECKMARK}{SETX 12}Amosar nomes de estació STR_02CC_STATION_NAMES_DISPLAYED :{SETX 12}Amosae nomes de estacións STR_02CD_SIGNS_DISPLAYED :{CHECKMARK}{SETX 12}Amosa-los sinais STR_02CE_SIGNS_DISPLAYED :{SETX 12}Amosa-los sinais -STR_CHECKPOINTS_DISPLAYED :{CHECKMARK}{SETX 12}Amosar puntos de control -STR_CHECKPOINTS_DISPLAYED2 :{SETX 12}Amosar puntos de control +STR_WAYPOINTS_DISPLAYED :{CHECKMARK}{SETX 12}Amosar puntos de control +STR_WAYPOINTS_DISPLAYED2 :{SETX 12}Amosar puntos de control STR_02CF_FULL_ANIMATION :{CHECKMARK}{SETX 12}Animacións completas STR_02D0_FULL_ANIMATION :{SETX 12}Animación completa STR_02D1_FULL_DETAIL :{CHECKMARK}{SETX 12}Detalle completo @@ -1053,24 +1053,24 @@ STR_CHEAT_EXTRA_DYNAMITE :{LTBLUE}Escavadora máxica(Elimina industrias, non STR_CHEAT_CROSSINGTUNNELS :{LTBLUE}Os tuneis poden cruzarse entre eles: {ORANGE}{STRING} STR_CHEAT_BUILD_IN_PAUSE :{LTBLUE}Permiti-la construcción en modo pausa: {ORANGE}{STRING} -STR_HEADING_FOR_CHECKPOINT :{LTBLUE}Diríxese a {CHECKPOINT} -STR_HEADING_FOR_CHECKPOINT_VEL :{LTBLUE}Diríxese a {CHECKPOINT}, {VELOCITY} +STR_HEADING_FOR_WAYPOINT :{LTBLUE}Diríxese a {WAYPOINT} +STR_HEADING_FOR_WAYPOINT_VEL :{LTBLUE}Diríxese a {WAYPOINT}, {VELOCITY} -STR_GO_TO_CHECKPOINT :Ir vía {CHECKPOINT} +STR_GO_TO_WAYPOINT :Ir vía {WAYPOINT} -STR_CHECKPOINTNAME_CITY :Punto de Control {TOWN} -STR_CHECKPOINTNAME_CITY_SERIAL :Punto de control {TOWN} #{COMMA16} -STR_LANDINFO_CHECKPOINT :Punto de control +STR_WAYPOINTNAME_CITY :Punto de Control {TOWN} +STR_WAYPOINTNAME_CITY_SERIAL :Punto de control {TOWN} #{COMMA16} +STR_LANDINFO_WAYPOINT :Punto de control -STR_CHECKPOINT_VIEWPORT :{WHITE}{CHECKPOINT} -STR_CHECKPOINT_VIEWPORT_TINY :{TINYFONT}{WHITE}{CHECKPOINT} -STR_CHECKPOINT_RAW :{CHECKPOINT} -STR_EDIT_CHECKPOINT_NAME :{WHITE}Edita-lo nome do punto de control +STR_WAYPOINT_VIEWPORT :{WHITE}{WAYPOINT} +STR_WAYPOINT_VIEWPORT_TINY :{TINYFONT}{WHITE}{WAYPOINT} +STR_WAYPOINT_RAW :{WAYPOINT} +STR_EDIT_WAYPOINT_NAME :{WHITE}Edita-lo nome do punto de control -STR_CANT_CHANGE_CHECKPOINT_NAME :{WHITE}Non se pode cambia-lo nome do punto de control... -STR_CONVERT_RAIL_TO_CHECKPOINT_TIP :{BLACK}Convertir raíl a punto de control -STR_CANT_BUILD_TRAIN_CHECKPOINT :{WHITE}Non se pode construír un punto de control de tren aí... -STR_CANT_REMOVE_TRAIN_CHECKPOINT :{WHITE}Non se pode eliminar-lo punto de control... +STR_CANT_CHANGE_WAYPOINT_NAME :{WHITE}Non se pode cambia-lo nome do punto de control... +STR_CONVERT_RAIL_TO_WAYPOINT_TIP :{BLACK}Convertir raíl a punto de control +STR_CANT_BUILD_TRAIN_WAYPOINT :{WHITE}Non se pode construír un punto de control de tren aí... +STR_CANT_REMOVE_TRAIN_WAYPOINT :{WHITE}Non se pode eliminar-lo punto de control... STR_BUILD_AUTORAIL_TIP :{BLACK}Construí-la vía de ferrocarril usando o modo Autoraíl diff --git a/lang/german.txt b/lang/german.txt index 3162c7b8d..da1cb9c02 100644 --- a/lang/german.txt +++ b/lang/german.txt @@ -741,8 +741,8 @@ STR_02CB_STATION_NAMES_DISPLAYED :{CHECKMARK}{SETX 12}Stationsnamen anzeigen STR_02CC_STATION_NAMES_DISPLAYED :{SETX 12}Stationsnamen anzeigen STR_02CD_SIGNS_DISPLAYED :{CHECKMARK}{SETX 12}Schilder anzeigen STR_02CE_SIGNS_DISPLAYED :{SETX 12}Schilder anzeigen -STR_CHECKPOINTS_DISPLAYED :{CHECKMARK}{SETX 12}Wegpunkte anzeigen -STR_CHECKPOINTS_DISPLAYED2 :{SETX 12}Wegpunkte anzeigen +STR_WAYPOINTS_DISPLAYED :{CHECKMARK}{SETX 12}Wegpunkte anzeigen +STR_WAYPOINTS_DISPLAYED2 :{SETX 12}Wegpunkte anzeigen STR_02CF_FULL_ANIMATION :{CHECKMARK}{SETX 12}Vollständige Animation STR_02D0_FULL_ANIMATION :{SETX 12}Vollständige Animation STR_02D1_FULL_DETAIL :{CHECKMARK}{SETX 12}Vollständige Detailansicht @@ -1074,24 +1074,24 @@ STR_CHEAT_NO_JETCRASH :{LTBLUE}Flugzeuge stürzen auf kleinen Flughäfen nich STR_CHEAT_SWITCH_CLIMATE :{LTBLUE}Wechsle Klima: {ORANGE} {STRING} STR_CHEAT_CHANGE_DATE :{LTBLUE}Ändere Datum: {ORANGE} {DATE_SHORT} -STR_HEADING_FOR_CHECKPOINT :{LTBLUE}Fahre zu {CHECKPOINT} -STR_HEADING_FOR_CHECKPOINT_VEL :{LTBLUE}Fahre zu {CHECKPOINT}, {VELOCITY} +STR_HEADING_FOR_WAYPOINT :{LTBLUE}Fahre zu {WAYPOINT} +STR_HEADING_FOR_WAYPOINT_VEL :{LTBLUE}Fahre zu {WAYPOINT}, {VELOCITY} -STR_GO_TO_CHECKPOINT :Fahre über {CHECKPOINT} +STR_GO_TO_WAYPOINT :Fahre über {WAYPOINT} -STR_CHECKPOINTNAME_CITY :Wegpunkt {TOWN} -STR_CHECKPOINTNAME_CITY_SERIAL :Wegpunkt {TOWN} #{COMMA16} -STR_LANDINFO_CHECKPOINT :Wegpunkt +STR_WAYPOINTNAME_CITY :Wegpunkt {TOWN} +STR_WAYPOINTNAME_CITY_SERIAL :Wegpunkt {TOWN} #{COMMA16} +STR_LANDINFO_WAYPOINT :Wegpunkt -STR_CHECKPOINT_VIEWPORT :{WHITE}{CHECKPOINT} -STR_CHECKPOINT_VIEWPORT_TINY :{TINYFONT}{WHITE}{CHECKPOINT} -STR_CHECKPOINT_RAW :{CHECKPOINT} -STR_EDIT_CHECKPOINT_NAME :{WHITE}Wegpunktename ändern +STR_WAYPOINT_VIEWPORT :{WHITE}{WAYPOINT} +STR_WAYPOINT_VIEWPORT_TINY :{TINYFONT}{WHITE}{WAYPOINT} +STR_WAYPOINT_RAW :{WAYPOINT} +STR_EDIT_WAYPOINT_NAME :{WHITE}Wegpunktename ändern -STR_CANT_CHANGE_CHECKPOINT_NAME :{WHITE}Kann Wegpunktname nicht ändern... -STR_CONVERT_RAIL_TO_CHECKPOINT_TIP :{BLACK}Ändere Schiene in einen Wegpunkt -STR_CANT_BUILD_TRAIN_CHECKPOINT :{WHITE}Kann Wegpunkt hier nicht bauen... -STR_CANT_REMOVE_TRAIN_CHECKPOINT :{WHITE}Kann Wegpunkt hier nicht entfernen... +STR_CANT_CHANGE_WAYPOINT_NAME :{WHITE}Kann Wegpunktname nicht ändern... +STR_CONVERT_RAIL_TO_WAYPOINT_TIP :{BLACK}Ändere Schiene in einen Wegpunkt +STR_CANT_BUILD_TRAIN_WAYPOINT :{WHITE}Kann Wegpunkt hier nicht bauen... +STR_CANT_REMOVE_TRAIN_WAYPOINT :{WHITE}Kann Wegpunkt hier nicht entfernen... STR_BUILD_AUTORAIL_TIP :{BLACK}Bauen von Schienen unter Verwendung des Autoschienenmodus diff --git a/lang/hungarian.txt b/lang/hungarian.txt index 4bd7fd36a..76d2bc1c6 100644 --- a/lang/hungarian.txt +++ b/lang/hungarian.txt @@ -741,8 +741,8 @@ STR_02CB_STATION_NAMES_DISPLAYED :{CHECKMARK}{SETX 12}Állomásnevek mutatása STR_02CC_STATION_NAMES_DISPLAYED :{SETX 12}Állomásnevek mutatása STR_02CD_SIGNS_DISPLAYED :{CHECKMARK}{SETX 12}Feliratok mutatása STR_02CE_SIGNS_DISPLAYED :{SETX 12}Feliratok mutatása -STR_CHECKPOINTS_DISPLAYED :{CHECKMARK}{SETX 12}Ellenőrző pontok mutatása -STR_CHECKPOINTS_DISPLAYED2 :{SETX 12}Ellenőrző pontok mutatása +STR_WAYPOINTS_DISPLAYED :{CHECKMARK}{SETX 12}Ellenőrző pontok mutatása +STR_WAYPOINTS_DISPLAYED2 :{SETX 12}Ellenőrző pontok mutatása STR_02CF_FULL_ANIMATION :{CHECKMARK}{SETX 12}Teljes animáció STR_02D0_FULL_ANIMATION :{SETX 12}Teljes animáció STR_02D1_FULL_DETAIL :{CHECKMARK}{SETX 12}Minden részlet @@ -1074,24 +1074,24 @@ STR_CHEAT_NO_JETCRASH :{LTBLUE}Jet-repülőgépek nem fognak (gyakran) lezuhan STR_CHEAT_SWITCH_CLIMATE :{LTBLUE}Klíma változtatás: {ORANGE} {STRING} STR_CHEAT_CHANGE_DATE :{LTBLUE}Dátum módosítás: {ORANGE} {DATE_SHORT} -STR_HEADING_FOR_CHECKPOINT :{LTBLUE}Úton {CHECKPOINT} felé -STR_HEADING_FOR_CHECKPOINT_VEL :{LTBLUE}Úton {CHECKPOINT} felé, {VELOCITY} +STR_HEADING_FOR_WAYPOINT :{LTBLUE}Úton {WAYPOINT} felé +STR_HEADING_FOR_WAYPOINT_VEL :{LTBLUE}Úton {WAYPOINT} felé, {VELOCITY} -STR_GO_TO_CHECKPOINT :{CHECKPOINT}on át +STR_GO_TO_WAYPOINT :{WAYPOINT}on át -STR_CHECKPOINTNAME_CITY :{TOWN}i ellenőrző pont -STR_CHECKPOINTNAME_CITY_SERIAL :{TOWN}i {COMMA16}. ellenőrző pont -STR_LANDINFO_CHECKPOINT :Ellenőrző pont +STR_WAYPOINTNAME_CITY :{TOWN}i ellenőrző pont +STR_WAYPOINTNAME_CITY_SERIAL :{TOWN}i {COMMA16}. ellenőrző pont +STR_LANDINFO_WAYPOINT :Ellenőrző pont -STR_CHECKPOINT_VIEWPORT :{WHITE}{CHECKPOINT} -STR_CHECKPOINT_VIEWPORT_TINY :{TINYFONT}{WHITE}{CHECKPOINT} -STR_CHECKPOINT_RAW :{CHECKPOINT} -STR_EDIT_CHECKPOINT_NAME :{WHITE}Módosítd az ellenőrző pont nevét +STR_WAYPOINT_VIEWPORT :{WHITE}{WAYPOINT} +STR_WAYPOINT_VIEWPORT_TINY :{TINYFONT}{WHITE}{WAYPOINT} +STR_WAYPOINT_RAW :{WAYPOINT} +STR_EDIT_WAYPOINT_NAME :{WHITE}Módosítd az ellenőrző pont nevét -STR_CANT_CHANGE_CHECKPOINT_NAME :{WHITE}Nem lehet megváltoztatni az ellenőrző pont nevét... -STR_CONVERT_RAIL_TO_CHECKPOINT_TIP :{BLACK}Sín átalakítása ellenőrző ponttá -STR_CANT_BUILD_TRAIN_CHECKPOINT :{WHITE}Nem lehet vonat ellenőrző pontot építeni ide... -STR_CANT_REMOVE_TRAIN_CHECKPOINT :{WHITE}Nem lehet eltávolítani az ellenőrző pontot... +STR_CANT_CHANGE_WAYPOINT_NAME :{WHITE}Nem lehet megváltoztatni az ellenőrző pont nevét... +STR_CONVERT_RAIL_TO_WAYPOINT_TIP :{BLACK}Sín átalakítása ellenőrző ponttá +STR_CANT_BUILD_TRAIN_WAYPOINT :{WHITE}Nem lehet vonat ellenőrző pontot építeni ide... +STR_CANT_REMOVE_TRAIN_WAYPOINT :{WHITE}Nem lehet eltávolítani az ellenőrző pontot... STR_BUILD_AUTORAIL_TIP :{BLACK}Sín építése egyszerűsített módón diff --git a/lang/icelandic.txt b/lang/icelandic.txt index 8a96b2e55..bc1529bff 100644 --- a/lang/icelandic.txt +++ b/lang/icelandic.txt @@ -738,8 +738,8 @@ STR_02CB_STATION_NAMES_DISPLAYED :{CHECKMARK}{SETX 12}Stöđvarnöfn sýnd STR_02CC_STATION_NAMES_DISPLAYED :{SETX 12}Stöđvarnöfn sýnd STR_02CD_SIGNS_DISPLAYED :{CHECKMARK}{SETX 12}Skilti sýnd STR_02CE_SIGNS_DISPLAYED :{SETX 12}Skilti sýnd -STR_CHECKPOINTS_DISPLAYED :{CHECKMARK}{SETX 12}Millistöđvar sýndar -STR_CHECKPOINTS_DISPLAYED2 :{SETX 12}Millistöđvar sýndar +STR_WAYPOINTS_DISPLAYED :{CHECKMARK}{SETX 12}Millistöđvar sýndar +STR_WAYPOINTS_DISPLAYED2 :{SETX 12}Millistöđvar sýndar STR_02CF_FULL_ANIMATION :{CHECKMARK}{SETX 12}Fullar myndhreyfingar STR_02D0_FULL_ANIMATION :{SETX 12}Fullar myndhreyfingar STR_02D1_FULL_DETAIL :{CHECKMARK}{SETX 12}Full nákvćmni @@ -1031,24 +1031,24 @@ STR_CHEAT_BUILD_IN_PAUSE :{LTBLUE}Byggja í biđ: {ORANGE}{STRING} STR_CHEAT_NO_JETCRASH :{LTBLUE}Ţotur brotlenda ekki (oft) á litlum flugvöllum: {ORANGE} {STRING} STR_CHEAT_CHANGE_DATE :{LTBLUE}Breyta dagsetningu: {ORANGE} {DATE_SHORT} -STR_HEADING_FOR_CHECKPOINT :{LTBLUE}Á leiđinni til {CHECKPOINT} -STR_HEADING_FOR_CHECKPOINT_VEL :{LTBLUE}Á leiđinni til {CHECKPOINT}, {VELOCITY} +STR_HEADING_FOR_WAYPOINT :{LTBLUE}Á leiđinni til {WAYPOINT} +STR_HEADING_FOR_WAYPOINT_VEL :{LTBLUE}Á leiđinni til {WAYPOINT}, {VELOCITY} -STR_GO_TO_CHECKPOINT :Fara međ {CHECKPOINT} +STR_GO_TO_WAYPOINT :Fara međ {WAYPOINT} -STR_CHECKPOINTNAME_CITY :Millistöđ {CITY} -STR_CHECKPOINTNAME_CITY_SERIAL :Millistöđ {CITY} #{COMMA16} -STR_LANDINFO_CHECKPOINT :Millistöđ +STR_WAYPOINTNAME_CITY :Millistöđ {CITY} +STR_WAYPOINTNAME_CITY_SERIAL :Millistöđ {CITY} #{COMMA16} +STR_LANDINFO_WAYPOINT :Millistöđ -STR_CHECKPOINT_VIEWPORT :{WHITE}{CHECKPOINT} -STR_CHECKPOINT_VIEWPORT_TINY :{TINYFONT}{WHITE}{CHECKPOINT} -STR_CHECKPOINT_RAW :{CHECKPOINT} -STR_EDIT_CHECKPOINT_NAME :{WHITE}Breyta nafni millistöđvar +STR_WAYPOINT_VIEWPORT :{WHITE}{WAYPOINT} +STR_WAYPOINT_VIEWPORT_TINY :{TINYFONT}{WHITE}{WAYPOINT} +STR_WAYPOINT_RAW :{WAYPOINT} +STR_EDIT_WAYPOINT_NAME :{WHITE}Breyta nafni millistöđvar -STR_CANT_CHANGE_CHECKPOINT_NAME :{WHITE}Get ekki breytt nafni millistöđvar... -STR_CONVERT_RAIL_TO_CHECKPOINT_TIP :{BLACK}Breyta teini í millistöđ -STR_CANT_BUILD_TRAIN_CHECKPOINT :{WHITE}Get ekki byggt lestarmillistöđ hér... -STR_CANT_REMOVE_TRAIN_CHECKPOINT :{WHITE}Get ekki fjarlćgt lestarmillistöđ héđan... +STR_CANT_CHANGE_WAYPOINT_NAME :{WHITE}Get ekki breytt nafni millistöđvar... +STR_CONVERT_RAIL_TO_WAYPOINT_TIP :{BLACK}Breyta teini í millistöđ +STR_CANT_BUILD_TRAIN_WAYPOINT :{WHITE}Get ekki byggt lestarmillistöđ hér... +STR_CANT_REMOVE_TRAIN_WAYPOINT :{WHITE}Get ekki fjarlćgt lestarmillistöđ héđan... STR_BUILD_AUTORAIL_TIP :{BLACK}Byggja lestartein í Sjálfvirkum ham diff --git a/lang/italian.txt b/lang/italian.txt index a460fb56f..f0c1bd86e 100644 --- a/lang/italian.txt +++ b/lang/italian.txt @@ -1072,18 +1072,18 @@ STR_CHEAT_NO_JETCRASH :{LTBLUE}I jet non si schiantano troppo di frequente STR_CHEAT_SWITCH_CLIMATE :{LTBLUE}Cambia paesaggio: {ORANGE} {STRING} STR_CHEAT_CHANGE_DATE :{LTBLUE}Cambia data: {ORANGE} {DATE_SHORT} -STR_HEADING_FOR_CHECKPOINT :{LTBLUE}Direzione {CHECKPOINT} -STR_HEADING_FOR_CHECKPOINT_VEL :{LTBLUE}Direzione {CHECKPOINT}, {VELOCITY} +STR_HEADING_FOR_WAYPOINT :{LTBLUE}Direzione {WAYPOINT} +STR_HEADING_FOR_WAYPOINT_VEL :{LTBLUE}Direzione {WAYPOINT}, {VELOCITY} -STR_GO_TO_CHECKPOINT :Vai al {CHECKPOINT} +STR_GO_TO_WAYPOINT :Vai al {WAYPOINT} -STR_CHECKPOINTNAME_CITY :Checkpoint {TOWN} -STR_CHECKPOINTNAME_CITY_SERIAL :Checkpoint {TOWN} #{COMMA16} -STR_LANDINFO_CHECKPOINT :Checkpoint +STR_WAYPOINTNAME_CITY :Waypoint {TOWN} +STR_WAYPOINTNAME_CITY_SERIAL :Waypoint {TOWN} #{COMMA16} +STR_LANDINFO_WAYPOINT :Waypoint -STR_CHECKPOINT_VIEWPORT :{WHITE}{CHECKPOINT} -STR_CHECKPOINT_VIEWPORT_TINY :{TINYFONT}{WHITE}{CHECKPOINT} -STR_CHECKPOINT_RAW :{CHECKPOINT} +STR_WAYPOINT_VIEWPORT :{WHITE}{WAYPOINT} +STR_WAYPOINT_VIEWPORT_TINY :{TINYFONT}{WHITE}{WAYPOINT} +STR_WAYPOINT_RAW :{WAYPOINT} STR_EDIT_CHECKPOINT_NAME :{WHITE}Modifica nome checkpoint STR_CANT_CHANGE_CHECKPOINT_NAME :{WHITE}Non puoi cambiare il nome del checkpoint... diff --git a/lang/norwegian.txt b/lang/norwegian.txt index 8ca52758c..3c9c4911e 100644 --- a/lang/norwegian.txt +++ b/lang/norwegian.txt @@ -741,8 +741,8 @@ STR_02CB_STATION_NAMES_DISPLAYED :{CHECKMARK}{SETX 12}Vis stasjonsnavn STR_02CC_STATION_NAMES_DISPLAYED :{SETX 12}Vis stasjonsnavn STR_02CD_SIGNS_DISPLAYED :{CHECKMARK}{SETX 12}Vis skilt STR_02CE_SIGNS_DISPLAYED :{SETX 12}Vis skilt -STR_CHECKPOINTS_DISPLAYED :{CHECKMARK}{SETX 12}Vis kontrollpunkt -STR_CHECKPOINTS_DISPLAYED2 :{SETX 12}Vis kontrollpunkt +STR_WAYPOINTS_DISPLAYED :{CHECKMARK}{SETX 12}Vis kontrollpunkt +STR_WAYPOINTS_DISPLAYED2 :{SETX 12}Vis kontrollpunkt STR_02CF_FULL_ANIMATION :{CHECKMARK}{SETX 12}Fullstending animasjon STR_02D0_FULL_ANIMATION :{SETX 12}Fullstending animasjon STR_02D1_FULL_DETAIL :{CHECKMARK}{SETX 12}Maksimalt med detaljer @@ -1072,24 +1072,24 @@ STR_CHEAT_NO_JETCRASH :{LTBLUE}Jetfly vil ikke krasje (hele tiden) pĺ smĺ f STR_CHEAT_SWITCH_CLIMATE :{LTBLUE}Bytt klima: {ORANGE} {STRING} STR_CHEAT_CHANGE_DATE :{LTBLUE}Bytt dato: {ORANGE} {DATE_SHORT} -STR_HEADING_FOR_CHECKPOINT :{LTBLUE}Har kurs for {CHECKPOINT} -STR_HEADING_FOR_CHECKPOINT_VEL :{LTBLUE}Har kurs for {CHECKPOINT}, {VELOCITY} +STR_HEADING_FOR_WAYPOINT :{LTBLUE}Har kurs for {WAYPOINT} +STR_HEADING_FOR_WAYPOINT_VEL :{LTBLUE}Har kurs for {WAYPOINT}, {VELOCITY} -STR_GO_TO_CHECKPOINT :Kjřr via {CHECKPOINT} +STR_GO_TO_WAYPOINT :Kjřr via {WAYPOINT} -STR_CHECKPOINTNAME_CITY :Kontrollpunkt {TOWN} -STR_CHECKPOINTNAME_CITY_SERIAL :Kontrollpunkt {TOWN} #{COMMA16} -STR_LANDINFO_CHECKPOINT :Kontrollpunkt +STR_WAYPOINTNAME_CITY :Kontrollpunkt {TOWN} +STR_WAYPOINTNAME_CITY_SERIAL :Kontrollpunkt {TOWN} #{COMMA16} +STR_LANDINFO_WAYPOINT :Kontrollpunkt -STR_CHECKPOINT_VIEWPORT :{WHITE}{CHECKPOINT} -STR_CHECKPOINT_VIEWPORT_TINY :{TINYFONT}{WHITE}{CHECKPOINT} -STR_CHECKPOINT_RAW :{CHECKPOINT} -STR_EDIT_CHECKPOINT_NAME :{WHITE}Endre navnet til kontrollpunkt... +STR_WAYPOINT_VIEWPORT :{WHITE}{WAYPOINT} +STR_WAYPOINT_VIEWPORT_TINY :{TINYFONT}{WHITE}{WAYPOINT} +STR_WAYPOINT_RAW :{WAYPOINT} +STR_EDIT_WAYPOINT_NAME :{WHITE}Endre navnet til kontrollpunkt... -STR_CANT_CHANGE_CHECKPOINT_NAME :{WHITE}Kan ikke endre navnet til kontrollpunktet... -STR_CONVERT_RAIL_TO_CHECKPOINT_TIP :{BLACK}Konverter jernbane til kontrollpunkt -STR_CANT_BUILD_TRAIN_CHECKPOINT :{WHITE}Kan ikke bygge kontrollpunkt for tog her... -STR_CANT_REMOVE_TRAIN_CHECKPOINT :{WHITE}Kan ikke fjerne kontrollpunktet... +STR_CANT_CHANGE_WAYPOINT_NAME :{WHITE}Kan ikke endre navnet til kontrollpunktet... +STR_CONVERT_RAIL_TO_WAYPOINT_TIP :{BLACK}Konverter jernbane til kontrollpunkt +STR_CANT_BUILD_TRAIN_WAYPOINT :{WHITE}Kan ikke bygge kontrollpunkt for tog her... +STR_CANT_REMOVE_TRAIN_WAYPOINT :{WHITE}Kan ikke fjerne kontrollpunktet... STR_BUILD_AUTORAIL_TIP :{BLACK}Bygg jernbane ved hjelp av Autobane modusen diff --git a/lang/polish.txt b/lang/polish.txt index 71f9bf551..523dfdb93 100644 --- a/lang/polish.txt +++ b/lang/polish.txt @@ -741,8 +741,8 @@ STR_02CB_STATION_NAMES_DISPLAYED :{CHECKMARK}{SETX 12}Wyswietlanie nazw stacj STR_02CC_STATION_NAMES_DISPLAYED :{SETX 12}Wyswietlanie nazw stacji STR_02CD_SIGNS_DISPLAYED :{CHECKMARK}{SETX 12}Wyswietlanie znakow STR_02CE_SIGNS_DISPLAYED :{SETX 12}Wyswietlanie znakow -STR_CHECKPOINTS_DISPLAYED :{CHECKMARK}{SETX 12}Wyswietlanie punktow kontrolnych -STR_CHECKPOINTS_DISPLAYED2 :{SETX 12}Wyswietlanie punktow kontrolnych +STR_WAYPOINTS_DISPLAYED :{CHECKMARK}{SETX 12}Wyswietlanie punktow kontrolnych +STR_WAYPOINTS_DISPLAYED2 :{SETX 12}Wyswietlanie punktow kontrolnych STR_02CF_FULL_ANIMATION :{CHECKMARK}{SETX 12}Pelna animacja STR_02D0_FULL_ANIMATION :{SETX 12}Pelna animacja STR_02D1_FULL_DETAIL :{CHECKMARK}{SETX 12}Wszystkie detale @@ -1072,24 +1072,24 @@ STR_CHEAT_NO_JETCRASH :{LTBLUE}Odrzutowce nie beda sie rozbijac (czesto) na STR_CHEAT_SWITCH_CLIMATE :{LTBLUE}Zmien klimat: {ORANGE} {STRING} STR_CHEAT_CHANGE_DATE :{LTBLUE}Zmien date: {ORANGE} {DATE_SHORT} -STR_HEADING_FOR_CHECKPOINT :{LTBLUE}Zmierza do {CHECKPOINT} -STR_HEADING_FOR_CHECKPOINT_VEL :{LTBLUE}Zmierza do {CHECKPOINT}, {VELOCITY} +STR_HEADING_FOR_WAYPOINT :{LTBLUE}Zmierza do {WAYPOINT} +STR_HEADING_FOR_WAYPOINT_VEL :{LTBLUE}Zmierza do {WAYPOINT}, {VELOCITY} -STR_GO_TO_CHECKPOINT :Idz przez {CHECKPOINT} +STR_GO_TO_WAYPOINT :Idz przez {WAYPOINT} -STR_CHECKPOINTNAME_CITY :Pkt. kontrolny {TOWN} -STR_CHECKPOINTNAME_CITY_SERIAL :Pkt. kontrolny {TOWN} #{COMMA16} -STR_LANDINFO_CHECKPOINT :Pkt. kontrolny +STR_WAYPOINTNAME_CITY :Pkt. kontrolny {TOWN} +STR_WAYPOINTNAME_CITY_SERIAL :Pkt. kontrolny {TOWN} #{COMMA16} +STR_LANDINFO_WAYPOINT :Pkt. kontrolny -STR_CHECKPOINT_VIEWPORT :{WHITE}{CHECKPOINT} -STR_CHECKPOINT_VIEWPORT_TINY :{TINYFONT}{WHITE}{CHECKPOINT} -STR_CHECKPOINT_RAW :{CHECKPOINT} -STR_EDIT_CHECKPOINT_NAME :{WHITE}Edytuj nazwe pkt. kontrolnego +STR_WAYPOINT_VIEWPORT :{WHITE}{WAYPOINT} +STR_WAYPOINT_VIEWPORT_TINY :{TINYFONT}{WHITE}{WAYPOINT} +STR_WAYPOINT_RAW :{WAYPOINT} +STR_EDIT_WAYPOINT_NAME :{WHITE}Edytuj nazwe pkt. kontrolnego -STR_CANT_CHANGE_CHECKPOINT_NAME :{WHITE}Nie mozna zmienic nazwy pkt. kontrolnego... -STR_CONVERT_RAIL_TO_CHECKPOINT_TIP :{BLACK}Zmiana torow na pkt. kontrolny -STR_CANT_BUILD_TRAIN_CHECKPOINT :{WHITE}Nie mozna zbudowac pkt. kontolnego tutaj... -STR_CANT_REMOVE_TRAIN_CHECKPOINT :{WHITE}Nie mozna usunac pkt. kontolnego z tego miejsca... +STR_CANT_CHANGE_WAYPOINT_NAME :{WHITE}Nie mozna zmienic nazwy pkt. kontrolnego... +STR_CONVERT_RAIL_TO_WAYPOINT_TIP :{BLACK}Zmiana torow na pkt. kontrolny +STR_CANT_BUILD_TRAIN_WAYPOINT :{WHITE}Nie mozna zbudowac pkt. kontolnego tutaj... +STR_CANT_REMOVE_TRAIN_WAYPOINT :{WHITE}Nie mozna usunac pkt. kontolnego z tego miejsca... STR_BUILD_AUTORAIL_TIP :{BLACK}Budowanie torow uzywajac trybu Autorail diff --git a/lang/portuguese.txt b/lang/portuguese.txt index 198980a11..bc7263941 100644 --- a/lang/portuguese.txt +++ b/lang/portuguese.txt @@ -741,8 +741,8 @@ STR_02CB_STATION_NAMES_DISPLAYED :{CHECKMARK}{SETX 12}Mostrar nomes de estaçő STR_02CC_STATION_NAMES_DISPLAYED :{SETX 12}Mostrar nomes de estaçőes STR_02CD_SIGNS_DISPLAYED :{CHECKMARK}{SETX 12}Mostrar indicaçőes STR_02CE_SIGNS_DISPLAYED :{SETX 12}Mostrar indicaçőes -STR_CHECKPOINTS_DISPLAYED :{CHECKMARK}{SETX 12}Mostrar pontos de passagem -STR_CHECKPOINTS_DISPLAYED2 :{SETX 12}Mostrar pontos de passagem +STR_WAYPOINTS_DISPLAYED :{CHECKMARK}{SETX 12}Mostrar pontos de passagem +STR_WAYPOINTS_DISPLAYED2 :{SETX 12}Mostrar pontos de passagem STR_02CF_FULL_ANIMATION :{CHECKMARK}{SETX 12}Animaçăo completa STR_02D0_FULL_ANIMATION :{SETX 12}Animaçăo completa STR_02D1_FULL_DETAIL :{CHECKMARK}{SETX 12}Máximo de detalhes @@ -1072,24 +1072,24 @@ STR_CHEAT_NO_JETCRASH :{LTBLUE}Aviőes a jacto năo irăo ter acidentes em aer STR_CHEAT_SWITCH_CLIMATE :{LTBLUE}Mudar de clima: {ORANGE} {STRING} STR_CHEAT_CHANGE_DATE :{LTBLUE}Alterar data: {ORANGE} {DATE_SHORT} -STR_HEADING_FOR_CHECKPOINT :{LTBLUE}Dirige-se a {CHECKPOINT} -STR_HEADING_FOR_CHECKPOINT_VEL :{LTBLUE}Dirige-se a {CHECKPOINT}, {VELOCITY} +STR_HEADING_FOR_WAYPOINT :{LTBLUE}Dirige-se a {WAYPOINT} +STR_HEADING_FOR_WAYPOINT_VEL :{LTBLUE}Dirige-se a {WAYPOINT}, {VELOCITY} -STR_GO_TO_CHECKPOINT :Ir via {CHECKPOINT} +STR_GO_TO_WAYPOINT :Ir via {WAYPOINT} -STR_CHECKPOINTNAME_CITY :Ponto de passagem {TOWN} -STR_CHECKPOINTNAME_CITY_SERIAL :Ponto de passagem {TOWN} #{COMMA16} -STR_LANDINFO_CHECKPOINT :Ponto de passagem +STR_WAYPOINTNAME_CITY :Ponto de passagem {TOWN} +STR_WAYPOINTNAME_CITY_SERIAL :Ponto de passagem {TOWN} #{COMMA16} +STR_LANDINFO_WAYPOINT :Ponto de passagem -STR_CHECKPOINT_VIEWPORT :{WHITE}{CHECKPOINT} -STR_CHECKPOINT_VIEWPORT_TINY :{TINYFONT}{WHITE}{CHECKPOINT} -STR_CHECKPOINT_RAW :{CHECKPOINT} -STR_EDIT_CHECKPOINT_NAME :{WHITE}Editar nome do ponto de passagem +STR_WAYPOINT_VIEWPORT :{WHITE}{WAYPOINT} +STR_WAYPOINT_VIEWPORT_TINY :{TINYFONT}{WHITE}{WAYPOINT} +STR_WAYPOINT_RAW :{WAYPOINT} +STR_EDIT_WAYPOINT_NAME :{WHITE}Editar nome do ponto de passagem -STR_CANT_CHANGE_CHECKPOINT_NAME :{WHITE}Năo é possível alterar o nome do ponto de passagem... -STR_CONVERT_RAIL_TO_CHECKPOINT_TIP :{BLACK}Converter linha em ponto de passagem -STR_CANT_BUILD_TRAIN_CHECKPOINT :{WHITE}Năo é possível construir ponto de passagem de comboio aqui... -STR_CANT_REMOVE_TRAIN_CHECKPOINT :{WHITE}Năo é possível remover ponto de passagem de comboio aqui... +STR_CANT_CHANGE_WAYPOINT_NAME :{WHITE}Năo é possível alterar o nome do ponto de passagem... +STR_CONVERT_RAIL_TO_WAYPOINT_TIP :{BLACK}Converter linha em ponto de passagem +STR_CANT_BUILD_TRAIN_WAYPOINT :{WHITE}Năo é possível construir ponto de passagem de comboio aqui... +STR_CANT_REMOVE_TRAIN_WAYPOINT :{WHITE}Năo é possível remover ponto de passagem de comboio aqui... STR_BUILD_AUTORAIL_TIP :{BLACK}Construir caminhos-de-ferro usando o modo automático diff --git a/lang/romanian.txt b/lang/romanian.txt index 2d4ce81e1..fff0095e8 100644 --- a/lang/romanian.txt +++ b/lang/romanian.txt @@ -1072,24 +1072,24 @@ STR_CHEAT_NO_JETCRASH :{LTBLUE}Avioanele cu reactie nu se vor prăbusi (frec STR_CHEAT_SWITCH_CLIMATE :{LTBLUE}Schimbă peisajul: {ORANGE} {STRING} STR_CHEAT_CHANGE_DATE :{LTBLUE}Schimbă data: {ORANGE} {DATE_SHORT} -STR_HEADING_FOR_CHECKPOINT :{LTBLUE}Merge spre {CHECKPOINT} -STR_HEADING_FOR_CHECKPOINT_VEL :{LTBLUE}Merge spre {CHECKPOINT}, {VELOCITY} +STR_HEADING_FOR_WAYPOINT :{LTBLUE}Merge spre {WAYPOINT} +STR_HEADING_FOR_WAYPOINT_VEL :{LTBLUE}Merge spre {WAYPOINT}, {VELOCITY} -STR_GO_TO_CHECKPOINT :Mergi via {CHECKPOINT} +STR_GO_TO_WAYPOINT :Mergi via {WAYPOINT} -STR_CHECKPOINTNAME_CITY :Halta {TOWN} -STR_CHECKPOINTNAME_CITY_SERIAL :Halta {TOWN} #{COMMA16} -STR_LANDINFO_CHECKPOINT :Haltă de miscare +STR_WAYPOINTNAME_CITY :Halta {TOWN} +STR_WAYPOINTNAME_CITY_SERIAL :Halta {TOWN} #{COMMA16} +STR_LANDINFO_WAYPOINT :Haltă de miscare -STR_CHECKPOINT_VIEWPORT :{WHITE}{CHECKPOINT} -STR_CHECKPOINT_VIEWPORT_TINY :{TINYFONT}{WHITE}{CHECKPOINT} -STR_CHECKPOINT_RAW :{CHECKPOINT} -STR_EDIT_CHECKPOINT_NAME :{WHITE}Editează numele haltei +STR_WAYPOINT_VIEWPORT :{WHITE}{WAYPOINT} +STR_WAYPOINT_VIEWPORT_TINY :{TINYFONT}{WHITE}{WAYPOINT} +STR_WAYPOINT_RAW :{WAYPOINT} +STR_EDIT_WAYPOINT_NAME :{WHITE}Editează numele haltei -STR_CANT_CHANGE_CHECKPOINT_NAME :{WHITE}Nu pot schimba numele haltei... -STR_CONVERT_RAIL_TO_CHECKPOINT_TIP :{BLACK}Converteste linia în haltă de miscare (checkpoint) -STR_CANT_BUILD_TRAIN_CHECKPOINT :{WHITE}Nu pot plasa o haltă aici... -STR_CANT_REMOVE_TRAIN_CHECKPOINT :{WHITE}Nu pot sterge halta de aici... +STR_CANT_CHANGE_WAYPOINT_NAME :{WHITE}Nu pot schimba numele haltei... +STR_CONVERT_RAIL_TO_WAYPOINT_TIP :{BLACK}Converteste linia în haltă de miscare (waypoint) +STR_CANT_BUILD_TRAIN_WAYPOINT :{WHITE}Nu pot plasa o haltă aici... +STR_CANT_REMOVE_TRAIN_WAYPOINT :{WHITE}Nu pot sterge halta de aici... STR_BUILD_AUTORAIL_TIP :{BLACK}Construieste cale ferată în modul automat diff --git a/lang/slovak.txt b/lang/slovak.txt index 4c1e2c14d..a37c2f6bf 100644 --- a/lang/slovak.txt +++ b/lang/slovak.txt @@ -741,8 +741,8 @@ STR_02CB_STATION_NAMES_DISPLAYED :{CHECKMARK}{SETX 12}Zobrazit nazvy stanic STR_02CC_STATION_NAMES_DISPLAYED :{SETX 12}Zobrazit nazvy stanic STR_02CD_SIGNS_DISPLAYED :{CHECKMARK}{SETX 12}Zobrazit popisy STR_02CE_SIGNS_DISPLAYED :{SETX 12}Zobrazit popisy -STR_CHECKPOINTS_DISPLAYED :{CHECKMARK}{SETX 12}Zobrazit navigacne body -STR_CHECKPOINTS_DISPLAYED2 :{SETX 12}Zobrazit navigacne body +STR_WAYPOINTS_DISPLAYED :{CHECKMARK}{SETX 12}Zobrazit navigacne body +STR_WAYPOINTS_DISPLAYED2 :{SETX 12}Zobrazit navigacne body STR_02CF_FULL_ANIMATION :{CHECKMARK}{SETX 12}Plna animacia STR_02D0_FULL_ANIMATION :{SETX 12}Plna animacia STR_02D1_FULL_DETAIL :{CHECKMARK}{SETX 12}Plne detaily @@ -1072,24 +1072,24 @@ STR_CHEAT_NO_JETCRASH :{LTBLUE}Triskove lietadla nebudu havarovat (casto) n STR_CHEAT_SWITCH_CLIMATE :{LTBLUE}Zmenit klimu: {ORANGE} {STRING} STR_CHEAT_CHANGE_DATE :{LTBLUE}Zmenit datum: {ORANGE} {DATE_SHORT} -STR_HEADING_FOR_CHECKPOINT :{LTBLUE}Smeruje do {CHECKPOINT} -STR_HEADING_FOR_CHECKPOINT_VEL :{LTBLUE}Smeruje do {CHECKPOINT}, {VELOCITY} +STR_HEADING_FOR_WAYPOINT :{LTBLUE}Smeruje do {WAYPOINT} +STR_HEADING_FOR_WAYPOINT_VEL :{LTBLUE}Smeruje do {WAYPOINT}, {VELOCITY} -STR_GO_TO_CHECKPOINT :Chod cez {CHECKPOINT} +STR_GO_TO_WAYPOINT :Chod cez {WAYPOINT} -STR_CHECKPOINTNAME_CITY :Smerovy bod {TOWN} -STR_CHECKPOINTNAME_CITY_SERIAL :Smerovy bod {TOWN} #{COMMA16} -STR_LANDINFO_CHECKPOINT :Smerovy bod +STR_WAYPOINTNAME_CITY :Smerovy bod {TOWN} +STR_WAYPOINTNAME_CITY_SERIAL :Smerovy bod {TOWN} #{COMMA16} +STR_LANDINFO_WAYPOINT :Smerovy bod -STR_CHECKPOINT_VIEWPORT :{WHITE}{CHECKPOINT} -STR_CHECKPOINT_VIEWPORT_TINY :{TINYFONT}{WHITE}{CHECKPOINT} -STR_CHECKPOINT_RAW :{CHECKPOINT} -STR_EDIT_CHECKPOINT_NAME :{WHITE}Upravit nazvy smerovych bodov +STR_WAYPOINT_VIEWPORT :{WHITE}{WAYPOINT} +STR_WAYPOINT_VIEWPORT_TINY :{TINYFONT}{WHITE}{WAYPOINT} +STR_WAYPOINT_RAW :{WAYPOINT} +STR_EDIT_WAYPOINT_NAME :{WHITE}Upravit nazvy smerovych bodov -STR_CANT_CHANGE_CHECKPOINT_NAME :{WHITE}Meno smeroveho bodu sa neda zmenit... -STR_CONVERT_RAIL_TO_CHECKPOINT_TIP :{BLACK}Konvertovat zeleznicu na smerove body -STR_CANT_BUILD_TRAIN_CHECKPOINT :{WHITE}Tu nie je mozne postavit zeleznicny smerovy bod... -STR_CANT_REMOVE_TRAIN_CHECKPOINT :{WHITE}Tu nie je mozne odstranit zeleznicny smerovy bod... +STR_CANT_CHANGE_WAYPOINT_NAME :{WHITE}Meno smeroveho bodu sa neda zmenit... +STR_CONVERT_RAIL_TO_WAYPOINT_TIP :{BLACK}Konvertovat zeleznicu na smerove body +STR_CANT_BUILD_TRAIN_WAYPOINT :{WHITE}Tu nie je mozne postavit zeleznicny smerovy bod... +STR_CANT_REMOVE_TRAIN_WAYPOINT :{WHITE}Tu nie je mozne odstranit zeleznicny smerovy bod... STR_BUILD_AUTORAIL_TIP :{BLACK}Automaticka stavba zeleznicnych kolaji diff --git a/lang/spanish.txt b/lang/spanish.txt index 01fc0c368..f2bc0bbd6 100644 --- a/lang/spanish.txt +++ b/lang/spanish.txt @@ -741,8 +741,8 @@ STR_02CB_STATION_NAMES_DISPLAYED :{CHECKMARK}{SETX 12}Ver nombres de estacion STR_02CC_STATION_NAMES_DISPLAYED :{SETX 12}Ver nombres de estaciones STR_02CD_SIGNS_DISPLAYED :{CHECKMARK}{SETX 12}Ver seńales STR_02CE_SIGNS_DISPLAYED :{SETX 12}Ver seńales -STR_CHECKPOINTS_DISPLAYED :{CHECKMARK}{SETX 12}Ver puntos de comprobación -STR_CHECKPOINTS_DISPLAYED2 :{SETX 12}Ver puntos de comprobación +STR_WAYPOINTS_DISPLAYED :{CHECKMARK}{SETX 12}Ver puntos de comprobación +STR_WAYPOINTS_DISPLAYED2 :{SETX 12}Ver puntos de comprobación STR_02CF_FULL_ANIMATION :{CHECKMARK}{SETX 12}Animación completa STR_02D0_FULL_ANIMATION :{SETX 12}Animación completa STR_02D1_FULL_DETAIL :{CHECKMARK}{SETX 12}Detalle completo @@ -1072,24 +1072,24 @@ STR_CHEAT_NO_JETCRASH :{LTBLUE}Los Jets no se estrellarán (frecuentemente) STR_CHEAT_SWITCH_CLIMATE :{LTBLUE}Cambiar clima: {ORANGE} {STRING} STR_CHEAT_CHANGE_DATE :{LTBLUE}Cambiar fecha: {ORANGE} {DATE_SHORT} -STR_HEADING_FOR_CHECKPOINT :{LTBLUE}Hacia {CHECKPOINT} -STR_HEADING_FOR_CHECKPOINT_VEL :{LTBLUE}Hacia {CHECKPOINT}, {VELOCITY} +STR_HEADING_FOR_WAYPOINT :{LTBLUE}Hacia {WAYPOINT} +STR_HEADING_FOR_WAYPOINT_VEL :{LTBLUE}Hacia {WAYPOINT}, {VELOCITY} -STR_GO_TO_CHECKPOINT :Ir vía {CHECKPOINT} +STR_GO_TO_WAYPOINT :Ir vía {WAYPOINT} -STR_CHECKPOINTNAME_CITY :Punto de paso {TOWN} -STR_CHECKPOINTNAME_CITY_SERIAL :Punto de paso {TOWN} #{COMMA16} -STR_LANDINFO_CHECKPOINT :Punto de paso +STR_WAYPOINTNAME_CITY :Punto de paso {TOWN} +STR_WAYPOINTNAME_CITY_SERIAL :Punto de paso {TOWN} #{COMMA16} +STR_LANDINFO_WAYPOINT :Punto de paso -STR_CHECKPOINT_VIEWPORT :{WHITE}{CHECKPOINT} -STR_CHECKPOINT_VIEWPORT_TINY :{TINYFONT}{WHITE}{CHECKPOINT} -STR_CHECKPOINT_RAW :{CHECKPOINT} -STR_EDIT_CHECKPOINT_NAME :{WHITE}Editar nombre del punto de paso +STR_WAYPOINT_VIEWPORT :{WHITE}{WAYPOINT} +STR_WAYPOINT_VIEWPORT_TINY :{TINYFONT}{WHITE}{WAYPOINT} +STR_WAYPOINT_RAW :{WAYPOINT} +STR_EDIT_WAYPOINT_NAME :{WHITE}Editar nombre del punto de paso -STR_CANT_CHANGE_CHECKPOINT_NAME :{WHITE}No se puede cambiar el nombre del punto de paso... -STR_CONVERT_RAIL_TO_CHECKPOINT_TIP :{BLACK}Convertir raíl a punto de paso -STR_CANT_BUILD_TRAIN_CHECKPOINT :{WHITE}No se puede construir punto de paso para trenes aquí... -STR_CANT_REMOVE_TRAIN_CHECKPOINT :{WHITE}No se puede retirar punto de paso aquí... +STR_CANT_CHANGE_WAYPOINT_NAME :{WHITE}No se puede cambiar el nombre del punto de paso... +STR_CONVERT_RAIL_TO_WAYPOINT_TIP :{BLACK}Convertir raíl a punto de paso +STR_CANT_BUILD_TRAIN_WAYPOINT :{WHITE}No se puede construir punto de paso para trenes aquí... +STR_CANT_REMOVE_TRAIN_WAYPOINT :{WHITE}No se puede retirar punto de paso aquí... STR_BUILD_AUTORAIL_TIP :{BLACK}Construir tramos de ferrocarril usando modo Autorraíl diff --git a/lang/swedish.txt b/lang/swedish.txt index f1086479a..33a95fe23 100644 --- a/lang/swedish.txt +++ b/lang/swedish.txt @@ -741,8 +741,8 @@ STR_02CB_STATION_NAMES_DISPLAYED :{CHECKMARK}{SETX 12}Stationsnamn visas STR_02CC_STATION_NAMES_DISPLAYED :{SETX 12}Stationsnamn visas STR_02CD_SIGNS_DISPLAYED :{CHECKMARK}{SETX 12}Skyltar visas STR_02CE_SIGNS_DISPLAYED :{SETX 12}Skyltar visas -STR_CHECKPOINTS_DISPLAYED :{CHECKMARK}{SETX 12}Kontrollstationer visas -STR_CHECKPOINTS_DISPLAYED2 :{SETX 12}Kontrollstationer visas +STR_WAYPOINTS_DISPLAYED :{CHECKMARK}{SETX 12}Kontrollstationer visas +STR_WAYPOINTS_DISPLAYED2 :{SETX 12}Kontrollstationer visas STR_02CF_FULL_ANIMATION :{CHECKMARK}{SETX 12}Full animation STR_02D0_FULL_ANIMATION :{SETX 12}Full animation STR_02D1_FULL_DETAIL :{CHECKMARK}{SETX 12}Full detaljnivĺ @@ -1072,24 +1072,24 @@ STR_CHEAT_NO_JETCRASH :{LTBLUE}Jetplan kommer inte att störta (frekvent) pĺ STR_CHEAT_SWITCH_CLIMATE :{LTBLUE}Byt klimat: {ORANGE} {STRING} STR_CHEAT_CHANGE_DATE :{LTBLUE}Byt datum: {ORANGE} {DATE_SHORT} -STR_HEADING_FOR_CHECKPOINT :{LTBLUE}Pĺ väg mot {CHECKPOINT} -STR_HEADING_FOR_CHECKPOINT_VEL :{LTBLUE}Pĺ väg mot {CHECKPOINT}, {VELOCITY} +STR_HEADING_FOR_WAYPOINT :{LTBLUE}Pĺ väg mot {WAYPOINT} +STR_HEADING_FOR_WAYPOINT_VEL :{LTBLUE}Pĺ väg mot {WAYPOINT}, {VELOCITY} -STR_GO_TO_CHECKPOINT :Gĺ via {CHECKPOINT} +STR_GO_TO_WAYPOINT :Gĺ via {WAYPOINT} -STR_CHECKPOINTNAME_CITY :Kontrollstation {TOWN} -STR_CHECKPOINTNAME_CITY_SERIAL :Kontrollstation {TOWN} #{COMMA16} -STR_LANDINFO_CHECKPOINT :Kontrollpunkt +STR_WAYPOINTNAME_CITY :Kontrollstation {TOWN} +STR_WAYPOINTNAME_CITY_SERIAL :Kontrollstation {TOWN} #{COMMA16} +STR_LANDINFO_WAYPOINT :Kontrollpunkt -STR_CHECKPOINT_VIEWPORT :{WHITE}{CHECKPOINT} -STR_CHECKPOINT_VIEWPORT_TINY :{TINYFONT}{WHITE}{CHECKPOINT} -STR_CHECKPOINT_RAW :{CHECKPOINT} -STR_EDIT_CHECKPOINT_NAME :{WHITE}Ändra namn pĺ kontrollstation +STR_WAYPOINT_VIEWPORT :{WHITE}{WAYPOINT} +STR_WAYPOINT_VIEWPORT_TINY :{TINYFONT}{WHITE}{WAYPOINT} +STR_WAYPOINT_RAW :{WAYPOINT} +STR_EDIT_WAYPOINT_NAME :{WHITE}Ändra namn pĺ kontrollstation -STR_CANT_CHANGE_CHECKPOINT_NAME :{WHITE}Kan inte ändra kontrollstationens namn... -STR_CONVERT_RAIL_TO_CHECKPOINT_TIP :{BLACK}Ändra räls till kontrollstation -STR_CANT_BUILD_TRAIN_CHECKPOINT :{WHITE}Kan inte bygga tĺgkontrollstation här... -STR_CANT_REMOVE_TRAIN_CHECKPOINT :{WHITE}Kan inte ta bort tĺgkontrollstation här... +STR_CANT_CHANGE_WAYPOINT_NAME :{WHITE}Kan inte ändra kontrollstationens namn... +STR_CONVERT_RAIL_TO_WAYPOINT_TIP :{BLACK}Ändra räls till kontrollstation +STR_CANT_BUILD_TRAIN_WAYPOINT :{WHITE}Kan inte bygga tĺgkontrollstation här... +STR_CANT_REMOVE_TRAIN_WAYPOINT :{WHITE}Kan inte ta bort tĺgkontrollstation här... STR_BUILD_AUTORAIL_TIP :{BLACK}Bygg järnvägspĺr genom att använda Autorail-funktionen diff --git a/main_gui.c b/main_gui.c index b53947dfd..c62f7cfcf 100644 --- a/main_gui.c +++ b/main_gui.c @@ -50,7 +50,7 @@ static void HandleOnEditText(WindowEvent *e) { case 1: if(*b == 0) return; - DoCommandP(0, id, 0, NULL, CMD_RENAME_CHECKPOINT | CMD_MSG(STR_CANT_CHANGE_CHECKPOINT_NAME)); + DoCommandP(0, id, 0, NULL, CMD_RENAME_WAYPOINT | CMD_MSG(STR_CANT_CHANGE_WAYPOINT_NAME)); break; } } @@ -113,7 +113,7 @@ void MenuClickSettings(int index) case 4: _display_opt ^= DO_SHOW_TOWN_NAMES; MarkWholeScreenDirty(); return; case 5: _display_opt ^= DO_SHOW_STATION_NAMES; MarkWholeScreenDirty(); return; case 6: _display_opt ^= DO_SHOW_SIGNS; MarkWholeScreenDirty(); return; - case 7: _display_opt ^= DO_CHECKPOINTS; MarkWholeScreenDirty(); return; + case 7: _display_opt ^= DO_WAYPOINTS; MarkWholeScreenDirty(); return; case 8: _display_opt ^= DO_FULL_ANIMATION; MarkWholeScreenDirty(); return; case 9: _display_opt ^= DO_FULL_DETAIL; MarkWholeScreenDirty(); return; case 10: _display_opt ^= DO_TRANS_BUILDINGS; MarkWholeScreenDirty(); return; @@ -275,13 +275,13 @@ void ShowRenameSignWindow(SignStruct *ss) ShowQueryString(ss->str, STR_280B_EDIT_SIGN_TEXT, 30, 180, 1, 0); } -void ShowRenameCheckpointWindow(Checkpoint *cp) +void ShowRenameWaypointWindow(Waypoint *cp) { - int id = cp - _checkpoints; + int id = cp - _waypoints; _rename_id = id; _rename_what = 1; SET_DPARAM16(0, id); - ShowQueryString(STR_CHECKPOINT_RAW, STR_EDIT_CHECKPOINT_NAME, 30, 180, 1, 0); + ShowQueryString(STR_WAYPOINT_RAW, STR_EDIT_WAYPOINT_NAME, 30, 180, 1, 0); } static void CcPlaceSign(bool success, uint tile, uint32 p1, uint32 p2) @@ -844,7 +844,7 @@ static void ToolbarOptionsClick(Window *w) if (_display_opt & DO_SHOW_TOWN_NAMES) x &= ~(1<<4); if (_display_opt & DO_SHOW_STATION_NAMES) x &= ~(1<<5); if (_display_opt & DO_SHOW_SIGNS) x &= ~(1<<6); - if (_display_opt & DO_CHECKPOINTS) x &= ~(1<<7); + if (_display_opt & DO_WAYPOINTS) x &= ~(1<<7); if (_display_opt & DO_FULL_ANIMATION) x &= ~(1<<8); if (_display_opt & DO_FULL_DETAIL) x &= ~(1<<9); if (!(_display_opt & DO_TRANS_BUILDINGS)) x &= ~(1<<10); @@ -525,7 +525,7 @@ void RoadVehiclesYearlyLoop(); void AircraftYearlyLoop(); void ShipsYearlyLoop(); -void CheckpointsDailyLoop(); +void WaypointsDailyLoop(); static const uint16 _autosave_months[] = { @@ -579,7 +579,7 @@ void IncreaseDate() _vehicle_id_ctr_day = 0; DisasterDailyLoop(); - CheckpointsDailyLoop(); + WaypointsDailyLoop(); if (_game_mode != GM_MENU) { InvalidateWindowWidget(WC_STATUS_BAR, 0, 0); diff --git a/order_gui.c b/order_gui.c index 4df0fdd1f..68b19e7bd 100644 --- a/order_gui.c +++ b/order_gui.c @@ -111,9 +111,9 @@ static void DrawOrdersWindow(Window *w) if (v->type == VEH_Train) s += (ord>>6)&2; SET_DPARAM16(1, s + ((ord>>6)&1) ); - } else if ((ord & OT_MASK) == OT_GOTO_CHECKPOINT) { + } else if ((ord & OT_MASK) == OT_GOTO_WAYPOINT) { SET_DPARAM16(2, ord >> 8); - SET_DPARAM16(1, STR_GO_TO_CHECKPOINT); + SET_DPARAM16(1, STR_GO_TO_WAYPOINT); } } { @@ -195,12 +195,12 @@ static uint GetOrderCmdFromTile(Vehicle *v, uint tile) } } - // check checkpoint + // check waypoint if (IS_TILETYPE(tile, MP_RAILWAY) && v->type == VEH_Train && _map_owner[tile] == _local_player && (_map5[tile]&0xFE)==0xC4) - return (GetCheckpointByTile(tile)<<8) | OT_GOTO_CHECKPOINT; + return (GetWaypointByTile(tile)<<8) | OT_GOTO_WAYPOINT; if (IS_TILETYPE(tile, MP_STATION)) { st = DEREF_STATION(st_index = _map2[tile]); @@ -296,8 +296,8 @@ static void OrdersWndProc(Window *w, WindowEvent *e) case OT_GOTO_DEPOT: /* goto depot order */ xy = _depots[ord >> 8].xy; break; - case OT_GOTO_CHECKPOINT: /* goto checkpoint order */ - xy = _checkpoints[ord >> 8].xy; + case OT_GOTO_WAYPOINT: /* goto waypoint order */ + xy = _waypoints[ord >> 8].xy; } if (xy) diff --git a/rail_cmd.c b/rail_cmd.c index 67b7812d3..df765bc05 100644 --- a/rail_cmd.c +++ b/rail_cmd.c @@ -29,13 +29,13 @@ enum { /* These values are bitmasks for the map5 byte */ RAIL_DEPOT_DIR = 3, RAIL_DEPOT_UNUSED_BITS = 0x3C, - RAIL_TYPE_CHECKPOINT = 0xC4, - RAIL_CHECKPOINT_TRACK_MASK = 1, - RAIL_CHECKPOINT_UNUSED_BITS = 0x3E, + RAIL_TYPE_WAYPOINT = 0xC4, + RAIL_WAYPOINT_TRACK_MASK = 1, + RAIL_WAYPOINT_UNUSED_BITS = 0x3E, }; #define IS_RAIL_DEPOT(x) (((x) & (RAIL_TYPE_DEPOT|RAIL_DEPOT_UNUSED_BITS)) == RAIL_TYPE_DEPOT) -#define IS_RAIL_CHECKPOINT(x) (((x) & (RAIL_TYPE_CHECKPOINT|RAIL_CHECKPOINT_UNUSED_BITS)) == RAIL_TYPE_CHECKPOINT) +#define IS_RAIL_WAYPOINT(x) (((x) & (RAIL_TYPE_WAYPOINT|RAIL_WAYPOINT_UNUSED_BITS)) == RAIL_TYPE_WAYPOINT) /* Format of rail map5 byte. * 00 abcdef => Normal rail @@ -663,32 +663,32 @@ int32 CmdBuildTrainDepot(int x, int y, uint32 flags, uint32 p1, uint32 p2) return cost + _price.build_train_depot; } -static void MakeDefaultCheckpointName(Checkpoint *cp) +static void MakeDefaultWaypointName(Waypoint *cp) { int townidx = ClosestTownFromTile(cp->xy, (uint)-1)->index; - Checkpoint *cc; - bool used_checkpoint[64]; + Waypoint *cc; + bool used_waypoint[64]; int i; - memset(used_checkpoint, 0, sizeof(used_checkpoint)); + memset(used_waypoint, 0, sizeof(used_waypoint)); - // find an unused checkpoint number belonging to this town - for(cc = _checkpoints; cc != endof(_checkpoints); cc++) { + // find an unused waypoint number belonging to this town + for(cc = _waypoints; cc != endof(_waypoints); cc++) { if (cc->xy && cc->town_or_string & 0xC000 && (cc->town_or_string & 0xFF) == townidx) - used_checkpoint[(cc->town_or_string >> 8) & 0x3F] = true; + used_waypoint[(cc->town_or_string >> 8) & 0x3F] = true; } - for(i=0; used_checkpoint[i] && i!=lengthof(used_checkpoint)-1; i++) {} + for(i=0; used_waypoint[i] && i!=lengthof(used_waypoint)-1; i++) {} cp->town_or_string = 0xC000 + (i << 8) + townidx; } -// find a deleted checkpoint close to a tile. -static Checkpoint *FindDeletedCheckpointCloseTo(uint tile) +// find a deleted waypoint close to a tile. +static Waypoint *FindDeletedWaypointCloseTo(uint tile) { - Checkpoint *cp,*best = NULL; + Waypoint *cp,*best = NULL; uint thres = 8, cur_dist; - for(cp = _checkpoints; cp != endof(_checkpoints); cp++) { + for(cp = _waypoints; cp != endof(_waypoints); cp++) { if (cp->deleted && cp->xy) { cur_dist = GetTileDist(tile, cp->xy); if (cur_dist < thres) { @@ -700,12 +700,12 @@ static Checkpoint *FindDeletedCheckpointCloseTo(uint tile) return best; } -/* Convert existing rail to checkpoint */ +/* Convert existing rail to waypoint */ -int32 CmdBuildTrainCheckpoint(int x, int y, uint32 flags, uint32 p1, uint32 p2) +int32 CmdBuildTrainWaypoint(int x, int y, uint32 flags, uint32 p1, uint32 p2) { uint tile = TILE_FROM_XY(x,y); - Checkpoint *cp; + Waypoint *cp; uint tileh; uint dir; @@ -725,16 +725,16 @@ int32 CmdBuildTrainCheckpoint(int x, int y, uint32 flags, uint32 p1, uint32 p2) return_cmd_error(STR_0007_FLAT_LAND_REQUIRED); } - // check if there is an already existing, deleted, checkpoint close to us that we can reuse. - cp = FindDeletedCheckpointCloseTo(tile); + // check if there is an already existing, deleted, waypoint close to us that we can reuse. + cp = FindDeletedWaypointCloseTo(tile); if (cp == NULL) { - cp = AllocateCheckpoint(); + cp = AllocateWaypoint(); if (cp == NULL) return CMD_ERROR; cp->town_or_string = 0; } if (flags & DC_EXEC) { - ModifyTile(tile, MP_MAP5, RAIL_TYPE_CHECKPOINT | dir); + ModifyTile(tile, MP_MAP5, RAIL_TYPE_WAYPOINT | dir); if (p1 & 0x100) { // custom graphics _map3_lo[tile] |= 16; @@ -744,40 +744,40 @@ int32 CmdBuildTrainCheckpoint(int x, int y, uint32 flags, uint32 p1, uint32 p2) cp->deleted = 0; cp->xy = tile; - if (cp->town_or_string == 0) MakeDefaultCheckpointName(cp); else RedrawCheckpointSign(cp); - UpdateCheckpointSign(cp); - RedrawCheckpointSign(cp); + if (cp->town_or_string == 0) MakeDefaultWaypointName(cp); else RedrawWaypointSign(cp); + UpdateWaypointSign(cp); + RedrawWaypointSign(cp); SetSignalsOnBothDir(tile, dir ? 2 : 1); } return _price.build_train_depot; } -static void DoDeleteCheckpoint(Checkpoint *cp) +static void DoDeleteWaypoint(Waypoint *cp) { cp->xy = 0; - DeleteCommandFromVehicleSchedule(((cp-_checkpoints) << 8) + OT_GOTO_CHECKPOINT); + DeleteCommandFromVehicleSchedule(((cp-_waypoints) << 8) + OT_GOTO_WAYPOINT); if (~cp->town_or_string & 0xC000) DeleteName(cp->town_or_string); - RedrawCheckpointSign(cp); + RedrawWaypointSign(cp); } -// delete checkpoints after a while -void CheckpointsDailyLoop() +// delete waypoints after a while +void WaypointsDailyLoop() { - Checkpoint *cp; - for(cp = _checkpoints; cp != endof(_checkpoints); cp++) { + Waypoint *cp; + for(cp = _waypoints; cp != endof(_waypoints); cp++) { if (cp->deleted && !--cp->deleted) { - DoDeleteCheckpoint(cp); + DoDeleteWaypoint(cp); } } } -static int32 RemoveTrainCheckpoint(uint tile, uint32 flags, bool justremove) +static int32 RemoveTrainWaypoint(uint tile, uint32 flags, bool justremove) { - Checkpoint *cp; + Waypoint *cp; - // make sure it's a checkpoint - if (!IS_TILETYPE(tile, MP_RAILWAY) || !IS_RAIL_CHECKPOINT(_map5[tile])) + // make sure it's a waypoint + if (!IS_TILETYPE(tile, MP_RAILWAY) || !IS_RAIL_WAYPOINT(_map5[tile])) return CMD_ERROR; if (!CheckTileOwnership(tile) && !(_current_player==17)) @@ -787,12 +787,12 @@ static int32 RemoveTrainCheckpoint(uint tile, uint32 flags, bool justremove) return CMD_ERROR; if (flags & DC_EXEC) { - int direction = _map5[tile] & RAIL_CHECKPOINT_TRACK_MASK; + int direction = _map5[tile] & RAIL_WAYPOINT_TRACK_MASK; - // mark the checkpoint deleted - for(cp=_checkpoints; cp->xy != (TileIndex)tile; cp++) {} + // mark the waypoint deleted + for(cp=_waypoints; cp->xy != (TileIndex)tile; cp++) {} cp->deleted = 30; // let it live for this many days before we do the actual deletion. - RedrawCheckpointSign(cp); + RedrawWaypointSign(cp); if (justremove) { ModifyTile(tile, MP_MAP5, 1<<direction); @@ -807,17 +807,17 @@ static int32 RemoveTrainCheckpoint(uint tile, uint32 flags, bool justremove) return _price.remove_train_depot; } -int32 CmdRemoveTrainCheckpoint(int x, int y, uint32 flags, uint32 p1, uint32 p2) +int32 CmdRemoveTrainWaypoint(int x, int y, uint32 flags, uint32 p1, uint32 p2) { uint tile = TILE_FROM_XY(x,y); - return RemoveTrainCheckpoint(tile, flags, true); + return RemoveTrainWaypoint(tile, flags, true); } -// p1 = id of checkpoint -int32 CmdRenameCheckpoint(int x, int y, uint32 flags, uint32 p1, uint32 p2) +// p1 = id of waypoint +int32 CmdRenameWaypoint(int x, int y, uint32 flags, uint32 p1, uint32 p2) { - Checkpoint *cp; + Waypoint *cp; StringID str; if (_decode_parameters[0] != 0) { @@ -825,20 +825,20 @@ int32 CmdRenameCheckpoint(int x, int y, uint32 flags, uint32 p1, uint32 p2) if (str == 0) return CMD_ERROR; if (flags & DC_EXEC) { - cp = &_checkpoints[p1]; + cp = &_waypoints[p1]; if (~cp->town_or_string & 0xC000) DeleteName(cp->town_or_string); cp->town_or_string = str; - UpdateCheckpointSign(cp); + UpdateWaypointSign(cp); MarkWholeScreenDirty(); } else { DeleteName(str); } } else { if (flags & DC_EXEC) { - cp = &_checkpoints[p1]; + cp = &_waypoints[p1]; if (~cp->town_or_string & 0xC000) DeleteName(cp->town_or_string); - MakeDefaultCheckpointName(cp); - UpdateCheckpointSign(cp); + MakeDefaultWaypointName(cp); + UpdateWaypointSign(cp); MarkWholeScreenDirty(); } } @@ -1218,8 +1218,8 @@ regular_track:; return cost + _price.remove_rail; } else if ( (m5 & (RAIL_TYPE_MASK|RAIL_DEPOT_UNUSED_BITS)) == RAIL_TYPE_DEPOT) { return RemoveTrainDepot(tile, flags); - } else if ( (m5 & (RAIL_TYPE_MASK|RAIL_CHECKPOINT_UNUSED_BITS)) == RAIL_TYPE_CHECKPOINT) { - return RemoveTrainCheckpoint(tile, flags, false); + } else if ( (m5 & (RAIL_TYPE_MASK|RAIL_WAYPOINT_UNUSED_BITS)) == RAIL_TYPE_WAYPOINT) { + return RemoveTrainWaypoint(tile, flags, false); } else return CMD_ERROR; } @@ -1532,17 +1532,17 @@ static void DrawTile_Track(TileInfo *ti) } } } else { - /* draw depots / checkpoints */ + /* draw depots / waypoints */ const byte *s; const DrawTrackSeqStruct *drss; - byte type = m5 & 0x3F; // 0-3: depots, 4-5: checkpoints + byte type = m5 & 0x3F; // 0-3: depots, 4-5: waypoints if (!(m5 & (RAIL_TYPE_MASK&~RAIL_TYPE_SPECIAL))) return; if (ti->tileh != 0) { DrawFoundation(ti, ti->tileh); } - if (!IS_RAIL_DEPOT(m5) && IS_RAIL_CHECKPOINT(m5) && _map3_lo[ti->tile]&16) { + if (!IS_RAIL_DEPOT(m5) && IS_RAIL_WAYPOINT(m5) && _map3_lo[ti->tile]&16) { // look for customization DrawTileSprites *cust = GetCustomStation('WAYP', _map3_hi[ti->tile]); @@ -1620,7 +1620,7 @@ void DrawTrainDepotSprite(int x, int y, int image, int railtype) } } -void DrawCheckpointSprite(int x, int y, int stat_id) +void DrawWaypointSprite(int x, int y, int stat_id) { // TODO: We should use supersets with cargo-id FF, if available. --pasky DrawTileSprites *cust = GetCustomStation('WAYP', stat_id); @@ -1878,7 +1878,7 @@ uint GetSlopeZ_Track(TileInfo *ti) th = _inclined_tileh[f - 15]; } } else if ((ti->map5 & 0xC0) == 0xC0) { - // depot or checkpoint + // depot or waypoint return z + 8; } return GetPartialZ(ti->x&0xF, ti->y&0xF, th) + z; @@ -1901,7 +1901,7 @@ uint GetSlopeTileh_Track(TileInfo *ti) return _inclined_tileh[f - 15]; } } else if ((ti->map5 & 0xC0) == 0xC0) { - // depot or checkpoint + // depot or waypoint return 0; } } @@ -2053,8 +2053,8 @@ static void ClickTile_Track(uint tile) { if (IS_RAIL_DEPOT(_map5[tile])) ShowTrainDepotWindow(tile); - else if (IS_RAIL_CHECKPOINT(_map5[tile])) - ShowRenameCheckpointWindow(&_checkpoints[GetCheckpointByTile(tile)]); + else if (IS_RAIL_WAYPOINT(_map5[tile])) + ShowRenameWaypointWindow(&_waypoints[GetWaypointByTile(tile)]); } @@ -2079,7 +2079,7 @@ static void GetTileDesc_Track(uint tile, TileDesc *td) } } } else { - td->str = m5 < 0xC4 ? STR_1023_RAILROAD_TRAIN_DEPOT : STR_LANDINFO_CHECKPOINT; + td->str = m5 < 0xC4 ? STR_1023_RAILROAD_TRAIN_DEPOT : STR_LANDINFO_WAYPOINT; } td->owner = _map_owner[tile]; } diff --git a/rail_gui.c b/rail_gui.c index 7a16a1322..2b84883e7 100644 --- a/rail_gui.c +++ b/rail_gui.c @@ -13,8 +13,8 @@ static uint _cur_railtype; static bool _remove_button_clicked; static byte _build_depot_direction; -static byte _checkpoint_count; -static byte _cur_checkpoint_type; +static byte _waypoint_count; +static byte _cur_waypoint_type; struct { byte orientation; @@ -26,7 +26,7 @@ struct { static void HandleStationPlacement(uint start, uint end); static void ShowBuildTrainDepotPicker(); -static void ShowBuildCheckpointPicker(); +static void ShowBuildWaypointPicker(); static void ShowStationBuilder(); typedef void OnButtonClick(Window *w); @@ -115,12 +115,12 @@ static void PlaceRail_Depot(uint tile) CMD_BUILD_TRAIN_DEPOT | CMD_AUTO | CMD_NO_WATER | CMD_MSG(STR_100E_CAN_T_BUILD_TRAIN_DEPOT)); } -static void PlaceRail_Checkpoint(uint tile) +static void PlaceRail_Waypoint(uint tile) { if (!_remove_button_clicked) { - DoCommandP(tile, _checkpoint_count > 0 ? (0x100 + _cur_checkpoint_type) : 0, 0, CcPlaySound1E, CMD_BUILD_TRAIN_CHECKPOINT | CMD_MSG(STR_CANT_BUILD_TRAIN_CHECKPOINT)); + DoCommandP(tile, _waypoint_count > 0 ? (0x100 + _cur_waypoint_type) : 0, 0, CcPlaySound1E, CMD_BUILD_TRAIN_WAYPOINT | CMD_MSG(STR_CANT_BUILD_TRAIN_WAYPOINT)); } else { - DoCommandP(tile, 0, 0, CcPlaySound1E, CMD_REMOVE_TRAIN_CHECKPOINT | CMD_MSG(STR_CANT_REMOVE_TRAIN_CHECKPOINT)); + DoCommandP(tile, 0, 0, CcPlaySound1E, CMD_REMOVE_TRAIN_WAYPOINT | CMD_MSG(STR_CANT_REMOVE_TRAIN_WAYPOINT)); } } @@ -305,12 +305,12 @@ static void BuildRailClick_Sign(Window *w) HandlePlacePushButton(w, 17, 0x12B8, 1, PlaceProc_BuyLand); } -static void BuildRailClick_Checkpoint(Window *w) +static void BuildRailClick_Waypoint(Window *w) { - _checkpoint_count = GetCustomStationsCount('WAYP'); - if (HandlePlacePushButton(w, 18, SPR_OPENTTD_BASE + 7, 1, PlaceRail_Checkpoint) - && _checkpoint_count > 1) - ShowBuildCheckpointPicker(); + _waypoint_count = GetCustomStationsCount('WAYP'); + if (HandlePlacePushButton(w, 18, SPR_OPENTTD_BASE + 7, 1, PlaceRail_Waypoint) + && _waypoint_count > 1) + ShowBuildWaypointPicker(); } static void BuildRailClick_Convert(Window *w) @@ -575,7 +575,7 @@ static OnButtonClick * const _build_railroad_button_proc[] = { BuildRailClick_Tunnel, BuildRailClick_Remove, BuildRailClick_Sign, - BuildRailClick_Checkpoint, + BuildRailClick_Waypoint, BuildRailClick_Convert, }; @@ -595,7 +595,7 @@ static const uint16 _rail_keycodes[] = { 'T',// tunnel 'R',// remove 0, // sign - 'C',// checkpoint + 'C',// waypoint }; @@ -712,7 +712,7 @@ static const Widget _build_railroad_widgets[] = { { WWT_PANEL, 7, 352, 373, 14, 35, 0x2CA, STR_101E_TOGGLE_BUILD_REMOVE_FOR}, { WWT_PANEL, 7, 374, 395, 14, 35, 0x12B7, STR_0329_PURCHASE_LAND_FOR_FUTURE}, -{ WWT_PANEL, 7, 202, 223, 14, 35, SPR_OPENTTD_BASE + 3, STR_CONVERT_RAIL_TO_CHECKPOINT_TIP}, +{ WWT_PANEL, 7, 202, 223, 14, 35, SPR_OPENTTD_BASE + 3, STR_CONVERT_RAIL_TO_WAYPOINT_TIP}, { WWT_PANEL, 7, 396, 417, 14, 35, SPR_OPENTTD_BASE + 25, STR_CONVERT_RAIL_TIP}, { WIDGETS_END}, @@ -750,7 +750,7 @@ static const Widget _build_monorail_widgets[] = { { WWT_PANEL, 7, 352, 373, 14, 35, 0x2CA, STR_101E_TOGGLE_BUILD_REMOVE_FOR}, { WWT_PANEL, 7, 374, 395, 14, 35, 0x12B7, STR_0329_PURCHASE_LAND_FOR_FUTURE}, -{ WWT_PANEL, 7, 202, 223, 14, 35, SPR_OPENTTD_BASE + 3, STR_CONVERT_RAIL_TO_CHECKPOINT_TIP}, +{ WWT_PANEL, 7, 202, 223, 14, 35, SPR_OPENTTD_BASE + 3, STR_CONVERT_RAIL_TO_WAYPOINT_TIP}, { WWT_PANEL, 7, 396, 417, 14, 35, SPR_OPENTTD_BASE + 27, STR_CONVERT_RAIL_TIP}, { WIDGETS_END}, }; @@ -787,7 +787,7 @@ static const Widget _build_maglev_widgets[] = { { WWT_PANEL, 7, 352, 373, 14, 35, 0x2CA, STR_101E_TOGGLE_BUILD_REMOVE_FOR}, { WWT_PANEL, 7, 374, 395, 14, 35, 0x12B7, STR_0329_PURCHASE_LAND_FOR_FUTURE}, -{ WWT_PANEL, 7, 202, 223, 14, 35, SPR_OPENTTD_BASE + 3, STR_CONVERT_RAIL_TO_CHECKPOINT_TIP}, +{ WWT_PANEL, 7, 202, 223, 14, 35, SPR_OPENTTD_BASE + 3, STR_CONVERT_RAIL_TO_WAYPOINT_TIP}, { WWT_PANEL, 7, 396, 417, 14, 35, SPR_OPENTTD_BASE + 29, STR_CONVERT_RAIL_TIP}, { WIDGETS_END}, }; @@ -1055,20 +1055,20 @@ static void ShowBuildTrainDepotPicker() } -static void BuildCheckpointWndProc(Window *w, WindowEvent *e) +static void BuildWaypointWndProc(Window *w, WindowEvent *e) { switch(e->event) { case WE_PAINT: { int r; - w->click_state = (1 << 3) << _cur_checkpoint_type; + w->click_state = (1 << 3) << _cur_waypoint_type; DrawWindowWidgets(w); r = 4*w->hscroll.pos; - if(r+0<=_checkpoint_count) DrawCheckpointSprite(2, 25, r + 0); - if(r+1<=_checkpoint_count) DrawCheckpointSprite(70, 25, r + 1); - if(r+2<=_checkpoint_count) DrawCheckpointSprite(138, 25, r + 2); - if(r+3<=_checkpoint_count) DrawCheckpointSprite(206, 25, r + 3); + if(r+0<=_waypoint_count) DrawWaypointSprite(2, 25, r + 0); + if(r+1<=_waypoint_count) DrawWaypointSprite(70, 25, r + 1); + if(r+2<=_waypoint_count) DrawWaypointSprite(138, 25, r + 2); + if(r+3<=_waypoint_count) DrawWaypointSprite(206, 25, r + 3); break; } case WE_CLICK: { @@ -1080,7 +1080,7 @@ static void BuildCheckpointWndProc(Window *w, WindowEvent *e) case 4: case 5: case 6: - _cur_checkpoint_type = e->click.widget - 3; + _cur_waypoint_type = e->click.widget - 3; SndPlayFx(0x13); SetWindowDirty(w); break; @@ -1095,33 +1095,33 @@ static void BuildCheckpointWndProc(Window *w, WindowEvent *e) } } -static const Widget _build_checkpoint_widgets[] = { +static const Widget _build_waypoint_widgets[] = { { WWT_CLOSEBOX, 7, 0, 10, 0, 13, STR_00C5, STR_018B_CLOSE_WINDOW}, -{ WWT_CAPTION, 7, 11, 275, 0, 13, STR_CHECKPOINT,STR_018C_WINDOW_TITLE_DRAG_THIS}, +{ WWT_CAPTION, 7, 11, 275, 0, 13, STR_WAYPOINT,STR_018C_WINDOW_TITLE_DRAG_THIS}, { WWT_PANEL, 7, 0, 275, 14, 91, 0x0, 0}, -{ WWT_PANEL, 7, 3, 68, 17, 76, 0x0, STR_CHECKPOINT_GRAPHICS_TIP}, -{ WWT_PANEL, 7, 71, 136, 17, 76, 0x0, STR_CHECKPOINT_GRAPHICS_TIP}, -{ WWT_PANEL, 7, 139, 204, 17, 76, 0x0, STR_CHECKPOINT_GRAPHICS_TIP}, -{ WWT_PANEL, 7, 207, 272, 17, 76, 0x0, STR_CHECKPOINT_GRAPHICS_TIP}, +{ WWT_PANEL, 7, 3, 68, 17, 76, 0x0, STR_WAYPOINT_GRAPHICS_TIP}, +{ WWT_PANEL, 7, 71, 136, 17, 76, 0x0, STR_WAYPOINT_GRAPHICS_TIP}, +{ WWT_PANEL, 7, 139, 204, 17, 76, 0x0, STR_WAYPOINT_GRAPHICS_TIP}, +{ WWT_PANEL, 7, 207, 272, 17, 76, 0x0, STR_WAYPOINT_GRAPHICS_TIP}, { WWT_HSCROLLBAR, 7, 1, 275, 80, 91, 0x0, STR_0190_SCROLL_BAR_SCROLLS_LIST}, { WWT_LAST}, }; -static const WindowDesc _build_checkpoint_desc = { +static const WindowDesc _build_waypoint_desc = { -1,-1, 276, 92, WC_BUILD_DEPOT,WC_BUILD_TOOLBAR, WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET, - _build_checkpoint_widgets, - BuildCheckpointWndProc + _build_waypoint_widgets, + BuildWaypointWndProc }; -static void ShowBuildCheckpointPicker() +static void ShowBuildWaypointPicker() { - Window *w = AllocateWindowDesc(&_build_checkpoint_desc); + Window *w = AllocateWindowDesc(&_build_waypoint_desc); w->hscroll.cap = 1; - w->hscroll.count = (uint) (_checkpoint_count+3) / 4; + w->hscroll.count = (uint) (_waypoint_count+3) / 4; } diff --git a/settings.c b/settings.c index b85cb69f6..8eb7579b8 100644 --- a/settings.c +++ b/settings.c @@ -745,7 +745,7 @@ static const SettingDesc win32_settings[] = { }; static const SettingDesc misc_settings[] = { - {"display_opt", SDT_MANYOFMANY | SDT_UINT8, (void*)(DO_SHOW_TOWN_NAMES|DO_SHOW_STATION_NAMES|DO_SHOW_SIGNS|DO_FULL_ANIMATION|DO_FULL_DETAIL|DO_TRANS_BUILDINGS|DO_CHECKPOINTS), &_display_opt, "SHOW_TOWN_NAMES|SHOW_STATION_NAMES|SHOW_SIGNS|FULL_ANIMATION|TRANS_BUILDINGS|FULL_DETAIL|CHECKPOINTS"}, + {"display_opt", SDT_MANYOFMANY | SDT_UINT8, (void*)(DO_SHOW_TOWN_NAMES|DO_SHOW_STATION_NAMES|DO_SHOW_SIGNS|DO_FULL_ANIMATION|DO_FULL_DETAIL|DO_TRANS_BUILDINGS|DO_WAYPOINTS), &_display_opt, "SHOW_TOWN_NAMES|SHOW_STATION_NAMES|SHOW_SIGNS|FULL_ANIMATION|TRANS_BUILDINGS|FULL_DETAIL|WAYPOINTS"}, {"news_display_opt", SDT_UINT16, (void*)-1, &_news_display_opt, NULL}, {"fullscreen", SDT_BOOL, (void*)false, &_fullscreen, NULL}, {"videodriver", SDT_STRINGBUF | (lengthof(_ini_videodriver)<<16) | SDT_NOSAVE,NULL, _ini_videodriver, NULL}, diff --git a/strgen/strgen.c b/strgen/strgen.c index 635e77a61..28781554d 100644 --- a/strgen/strgen.c +++ b/strgen/strgen.c @@ -269,7 +269,7 @@ static const CmdStruct _cmd_structs[] = { {"STATION", EmitSingleByte, 0x9A}, {"TOWN", EmitSingleByte, 0x9B}, {"CURRENCY64", EmitSingleByte, 0x9C}, - {"CHECKPOINT", EmitSingleByte, 0x9D}, // checkpoint name + {"WAYPOINT", EmitSingleByte, 0x9D}, // waypoint name // 0x9E=158 is the LAST special character we may use. {"UPARROW", EmitSingleByte, 0xA0}, @@ -523,8 +523,8 @@ static byte *DecodeString(byte *buff, const byte *str) break; } - case 0x9D: { // {CHECKPOINT} - Checkpoint *cp = &_checkpoints[GET_DPARAM16(0)]; + case 0x9D: { // {WAYPOINT} + Waypoint *cp = &_waypoints[GET_DPARAM16(0)]; StringID str; int idx; if (~cp->town_or_string & 0xC000) { @@ -533,11 +533,11 @@ static byte *DecodeString(byte *buff, const byte *str) } else { idx = (cp->town_or_string >> 8) & 0x3F; if (idx == 0) { - str = STR_CHECKPOINTNAME_CITY; + str = STR_WAYPOINTNAME_CITY; } else { InjectDparam(1); SET_DPARAM16(1, idx + 1); - str = STR_CHECKPOINTNAME_CITY_SERIAL; + str = STR_WAYPOINTNAME_CITY_SERIAL; } SET_DPARAM16(0, cp->town_or_string & 0xFF); } diff --git a/table/track_land.h b/table/track_land.h index bd9c3cc09..440048058 100644 --- a/table/track_land.h +++ b/table/track_land.h @@ -28,14 +28,14 @@ static const byte _track_depot_layout_table_3[] = { TILE_SEQ_END() }; -static const byte _track_checkpoint_table_0[] = { +static const byte _track_waypoint_table_0[] = { TILE_SEQ_BEGIN(0x83F4) TILE_SEQ_LINE(0x8000 + SPR_OPENTTD_BASE+18, 0, 0, 16, 5) TILE_SEQ_LINE(0x8000 + SPR_OPENTTD_BASE+19, 0, 11, 16, 5) TILE_SEQ_END() }; -static const byte _track_checkpoint_table_1[] = { +static const byte _track_waypoint_table_1[] = { TILE_SEQ_BEGIN(0x83F3) TILE_SEQ_LINE(0x8000 + SPR_OPENTTD_BASE+20, 0, 0, 5, 16) TILE_SEQ_LINE(0x8000 + SPR_OPENTTD_BASE+21, 11, 0, 5, 16) @@ -49,8 +49,8 @@ static const byte * const _track_depot_layout_table[6] = { _track_depot_layout_table_2, _track_depot_layout_table_3, - _track_checkpoint_table_0, - _track_checkpoint_table_1, + _track_waypoint_table_0, + _track_waypoint_table_1, }; const byte _track_sloped_sprites[14] = { diff --git a/train_cmd.c b/train_cmd.c index 2d28ab63c..0181f6534 100644 --- a/train_cmd.c +++ b/train_cmd.c @@ -1582,8 +1582,8 @@ static bool ProcessTrainOrder(Vehicle *v) v->cur_order_index++; } - // check if we've reached the checkpoint? - if ((v->next_order & OT_MASK) == OT_GOTO_CHECKPOINT && v->tile == v->dest_tile) { + // check if we've reached the waypoint? + if ((v->next_order & OT_MASK) == OT_GOTO_WAYPOINT && v->tile == v->dest_tile) { v->cur_order_index++; } @@ -1623,8 +1623,8 @@ static bool ProcessTrainOrder(Vehicle *v) } else if ((order & OT_MASK) == OT_GOTO_DEPOT) { v->dest_tile = _depots[order >> 8].xy; result = CheckReverseTrain(v); - } else if ((order & OT_MASK) == OT_GOTO_CHECKPOINT) { - v->dest_tile = _checkpoints[order >> 8].xy; + } else if ((order & OT_MASK) == OT_GOTO_WAYPOINT) { + v->dest_tile = _waypoints[order >> 8].xy; result = CheckReverseTrain(v); } diff --git a/train_gui.c b/train_gui.c index 5dafcfbc0..6f0e26d48 100644 --- a/train_gui.c +++ b/train_gui.c @@ -788,9 +788,9 @@ static void TrainViewWndProc(Window *w, WindowEvent *e) str = STR_882F_LOADING_UNLOADING; break; - case OT_GOTO_CHECKPOINT: { + case OT_GOTO_WAYPOINT: { SET_DPARAM16(0, v->next_order_param); - str = STR_HEADING_FOR_CHECKPOINT + _patches.vehicle_speed; + str = STR_HEADING_FOR_WAYPOINT + _patches.vehicle_speed; SET_DPARAM16(1, v->u.rail.last_speed * 10 >> 4); break; } @@ -47,7 +47,7 @@ typedef struct YearMonthDay { // Forward declarations of structs. typedef struct Vehicle Vehicle; typedef struct Depot Depot; -typedef struct Checkpoint Checkpoint; +typedef struct Waypoint Waypoint; typedef struct Window Window; typedef struct Station Station; typedef struct ViewPort ViewPort; @@ -132,7 +132,7 @@ enum { DO_FULL_ANIMATION = 8, DO_TRANS_BUILDINGS = 0x10, DO_FULL_DETAIL = 0x20, - DO_CHECKPOINTS = 0x40, + DO_WAYPOINTS = 0x40, }; /* Landscape types */ @@ -108,14 +108,14 @@ void VehiclePositionChanged(Vehicle *v) v->bottom_coord = pt.y + sd->ysize + 2; } -void UpdateCheckpointSign(Checkpoint *cp) +void UpdateWaypointSign(Waypoint *cp) { Point pt = RemapCoords2(GET_TILE_X(cp->xy)*16, GET_TILE_Y(cp->xy)*16); - SET_DPARAM16(0, cp - _checkpoints); - UpdateViewportSignPos(&cp->sign, pt.x, pt.y - 0x20, STR_CHECKPOINT_VIEWPORT); + SET_DPARAM16(0, cp - _waypoints); + UpdateViewportSignPos(&cp->sign, pt.x, pt.y - 0x20, STR_WAYPOINT_VIEWPORT); } -void RedrawCheckpointSign(Checkpoint *cp) +void RedrawWaypointSign(Waypoint *cp) { MarkAllViewportsDirty( cp->sign.left - 6, @@ -128,7 +128,7 @@ void RedrawCheckpointSign(Checkpoint *cp) void AfterLoadVehicles() { Vehicle *v; - Checkpoint *cp; + Waypoint *cp; FOR_ALL_VEHICLES(v) { if (v->type != 0) { @@ -147,8 +147,8 @@ void AfterLoadVehicles() } } - // update checkpoint signs - for(cp=_checkpoints; cp != endof(_checkpoints); cp++) if (cp->xy) UpdateCheckpointSign(cp); + // update waypoint signs + for(cp=_waypoints; cp != endof(_waypoints); cp++) if (cp->xy) UpdateWaypointSign(cp); } @@ -294,7 +294,7 @@ void InitializeVehicles() // clear it... memset(&_vehicles, 0, sizeof(_vehicles)); - memset(&_checkpoints, 0, sizeof(_checkpoints)); + memset(&_waypoints, 0, sizeof(_waypoints)); memset(&_depots, 0, sizeof(_depots)); // setup indexes.. @@ -368,11 +368,11 @@ Depot *AllocateDepot() return free_dep; } -Checkpoint *AllocateCheckpoint() +Waypoint *AllocateWaypoint() { - Checkpoint *cp; + Waypoint *cp; - for(cp = _checkpoints; cp != endof(_checkpoints); cp++) { + for(cp = _waypoints; cp != endof(_waypoints); cp++) { if (cp->xy == 0) return cp; } @@ -380,11 +380,11 @@ Checkpoint *AllocateCheckpoint() return NULL; } -uint GetCheckpointByTile(uint tile) +uint GetWaypointByTile(uint tile) { - Checkpoint *cp; + Waypoint *cp; int i=0; - for(cp=_checkpoints; cp->xy != (TileIndex)tile; cp++) { i++; } + for(cp=_waypoints; cp->xy != (TileIndex)tile; cp++) { i++; } return i; } @@ -1801,25 +1801,25 @@ static void Load_DEPT() } } -static const byte _checkpoint_desc[] = { - SLE_VAR(Checkpoint,xy, SLE_UINT16), - SLE_VAR(Checkpoint,town_or_string, SLE_UINT16), - SLE_VAR(Checkpoint,deleted, SLE_UINT8), +static const byte _waypoint_desc[] = { + SLE_VAR(Waypoint,xy, SLE_UINT16), + SLE_VAR(Waypoint,town_or_string, SLE_UINT16), + SLE_VAR(Waypoint,deleted, SLE_UINT8), - SLE_CONDVAR(Checkpoint, build_date, SLE_UINT16, 3, 255), - SLE_CONDVAR(Checkpoint, stat_id, SLE_UINT8, 3, 255), + SLE_CONDVAR(Waypoint, build_date, SLE_UINT16, 3, 255), + SLE_CONDVAR(Waypoint, stat_id, SLE_UINT8, 3, 255), SLE_END() }; static void Save_CHKP() { - Checkpoint *cp; + Waypoint *cp; int i; - for(i=0,cp=_checkpoints; i!=lengthof(_checkpoints); i++,cp++) { + for(i=0,cp=_waypoints; i!=lengthof(_waypoints); i++,cp++) { if (cp->xy != 0) { SlSetArrayIndex(i); - SlObject(cp, _checkpoint_desc); + SlObject(cp, _waypoint_desc); } } } @@ -1828,7 +1828,7 @@ static void Load_CHKP() { int index; while ((index = SlIterateArray()) != -1) { - SlObject(&_checkpoints[index], _checkpoint_desc); + SlObject(&_waypoints[index], _waypoint_desc); } } @@ -186,14 +186,14 @@ struct Depot { uint16 town_index; }; -// train checkpoint -struct Checkpoint { +// train waypoint +struct Waypoint { TileIndex xy; uint16 town_or_string; // if this is 0xC000, it's a string id, otherwise a town. ViewportSign sign; uint16 build_date; byte stat_id; - byte deleted; // this is a delete counter. when it reaches 0, the checkpoint struct is deleted. + byte deleted; // this is a delete counter. when it reaches 0, the waypoint struct is deleted. }; enum { @@ -213,7 +213,7 @@ enum { OT_LOADING = 3, OT_LEAVESTATION = 4, OT_DUMMY = 5, - OT_GOTO_CHECKPOINT = 6, + OT_GOTO_WAYPOINT = 6, OT_MASK = 0x1F, }; @@ -290,9 +290,9 @@ void DeleteVehicleSchedule(Vehicle *v); Vehicle *IsScheduleShared(Vehicle *v); Depot *AllocateDepot(); -Checkpoint *AllocateCheckpoint(); -void UpdateCheckpointSign(Checkpoint *cp); -void RedrawCheckpointSign(Checkpoint *cp); +Waypoint *AllocateWaypoint(); +void UpdateWaypointSign(Waypoint *cp); +void RedrawWaypointSign(Waypoint *cp); void InitializeTrains(); bool IsTrainDepotTile(TileIndex tile); @@ -346,7 +346,7 @@ uint GetFreeUnitNumber(byte type); int LoadUnloadVehicle(Vehicle *v); int GetDepotByTile(uint tile); -uint GetCheckpointByTile(uint tile); +uint GetWaypointByTile(uint tile); void DoDeleteDepot(uint tile); @@ -388,8 +388,8 @@ VARDEF uint16 *_ptr_to_next_order; VARDEF Depot _depots[255]; -// 128 checkpoints -VARDEF Checkpoint _checkpoints[128]; +// 128 waypoints +VARDEF Waypoint _waypoints[128]; // NOSAVE: Can be regenerated by inspecting the vehicles. VARDEF VehicleID _vehicle_position_hash[0x1000]; diff --git a/viewport.c b/viewport.c index 2968a737d..d3b276928 100644 --- a/viewport.c +++ b/viewport.c @@ -923,14 +923,14 @@ void ViewportAddSigns(DrawPixelInfo *dpi) } } -void ViewportAddCheckpoints(DrawPixelInfo *dpi) +void ViewportAddWaypoints(DrawPixelInfo *dpi) { - Checkpoint *cp; + Waypoint *cp; int left, top, right, bottom; StringSpriteToDraw *sstd; - if (!(_display_opt & DO_CHECKPOINTS)) + if (!(_display_opt & DO_WAYPOINTS)) return; left = dpi->left; @@ -939,14 +939,14 @@ void ViewportAddCheckpoints(DrawPixelInfo *dpi) bottom = top + dpi->height; if (dpi->zoom < 1) { - for(cp=_checkpoints; cp != endof(_checkpoints); cp++) { + for(cp=_waypoints; cp != endof(_waypoints); cp++) { if (cp->xy && bottom > cp->sign.top && top < cp->sign.top + 12 && right > cp->sign.left && left < cp->sign.left + cp->sign.width_1) { - sstd=AddStringToDraw(cp->sign.left + 1, cp->sign.top + 1, STR_CHECKPOINT_VIEWPORT, cp - _checkpoints, 0); + sstd=AddStringToDraw(cp->sign.left + 1, cp->sign.top + 1, STR_WAYPOINT_VIEWPORT, cp - _waypoints, 0); if (sstd != NULL) { sstd->width = cp->sign.width_1; sstd->color = (cp->deleted ? 0xE : 11); @@ -956,14 +956,14 @@ void ViewportAddCheckpoints(DrawPixelInfo *dpi) } else if (dpi->zoom == 1) { right += 2; bottom += 2; - for(cp=_checkpoints; cp != endof(_checkpoints); cp++) { + for(cp=_waypoints; cp != endof(_waypoints); cp++) { if (cp->xy && bottom > cp->sign.top && top < cp->sign.top + 24 && right > cp->sign.left && left < cp->sign.left + cp->sign.width_1*2) { - sstd=AddStringToDraw(cp->sign.left + 1, cp->sign.top + 1, STR_CHECKPOINT_VIEWPORT, cp - _checkpoints, 0); + sstd=AddStringToDraw(cp->sign.left + 1, cp->sign.top + 1, STR_WAYPOINT_VIEWPORT, cp - _waypoints, 0); if (sstd != NULL) { sstd->width = cp->sign.width_1; sstd->color = (cp->deleted ? 0xE : 11); @@ -974,14 +974,14 @@ void ViewportAddCheckpoints(DrawPixelInfo *dpi) right += 4; bottom += 5; - for(cp=_checkpoints; cp != endof(_checkpoints); cp++) { + for(cp=_waypoints; cp != endof(_waypoints); cp++) { if (cp->xy && bottom > cp->sign.top && top < cp->sign.top + 24 && right > cp->sign.left && left < cp->sign.left + cp->sign.width_2*4) { - sstd=AddStringToDraw(cp->sign.left + 1, cp->sign.top + 1, STR_CHECKPOINT_VIEWPORT_TINY, cp - _checkpoints, 0); + sstd=AddStringToDraw(cp->sign.left + 1, cp->sign.top + 1, STR_WAYPOINT_VIEWPORT_TINY, cp - _waypoints, 0); if (sstd != NULL) { sstd->width = cp->sign.width_2 | 0x8000; sstd->color = (cp->deleted ? 0xE : 11); @@ -1181,7 +1181,7 @@ void ViewportDoDraw(ViewPort *vp, int left, int top, int right, int bottom) ViewportAddTownNames(&vd.dpi); ViewportAddStationNames(&vd.dpi); ViewportAddSigns(&vd.dpi); - ViewportAddCheckpoints(&vd.dpi); + ViewportAddWaypoints(&vd.dpi); #endif // This assert should never happen (because the length of the parent_list @@ -1564,50 +1564,50 @@ static bool CheckClickOnSign(ViewPort *vp, int x, int y) return false; } -static bool CheckClickOnCheckpoint(ViewPort *vp, int x, int y) +static bool CheckClickOnWaypoint(ViewPort *vp, int x, int y) { - Checkpoint *cp; + Waypoint *cp; - if (!(_display_opt & DO_CHECKPOINTS)) + if (!(_display_opt & DO_WAYPOINTS)) return false; if (vp->zoom < 1) { x = x - vp->left + vp->virtual_left; y = y - vp->top + vp->virtual_top; - for(cp = _checkpoints; cp != endof(_checkpoints); cp++) { + for(cp = _waypoints; cp != endof(_waypoints); cp++) { if (cp->xy && y >= cp->sign.top && y < cp->sign.top + 12 && x >= cp->sign.left && x < cp->sign.left + cp->sign.width_1) { - ShowRenameCheckpointWindow(cp); + ShowRenameWaypointWindow(cp); return true; } } } else if (vp->zoom == 1) { x = (x - vp->left + 1) * 2 + vp->virtual_left; y = (y - vp->top + 1) * 2 + vp->virtual_top; - for(cp = _checkpoints; cp != endof(_checkpoints); cp++) { + for(cp = _waypoints; cp != endof(_waypoints); cp++) { if (cp->xy && y >= cp->sign.top && y < cp->sign.top + 24 && x >= cp->sign.left && x < cp->sign.left + cp->sign.width_1 * 2) { - ShowRenameCheckpointWindow(cp); + ShowRenameWaypointWindow(cp); return true; } } } else { x = (x - vp->left + 3) * 4 + vp->virtual_left; y = (y - vp->top + 3) * 4 + vp->virtual_top; - for(cp = _checkpoints; cp != endof(_checkpoints); cp++) { + for(cp = _waypoints; cp != endof(_waypoints); cp++) { if (cp->xy && y >= cp->sign.top && y < cp->sign.top + 24 && x >= cp->sign.left && x < cp->sign.left + cp->sign.width_2 * 4) { - ShowRenameCheckpointWindow(cp); + ShowRenameWaypointWindow(cp); return true; } } @@ -1653,7 +1653,7 @@ void HandleViewportClicked(ViewPort *vp, int x, int y) if (CheckClickOnSign(vp, x, y)) return; - if (CheckClickOnCheckpoint(vp, x, y)) + if (CheckClickOnWaypoint(vp, x, y)) return; CheckClickOnLandscape(vp, x, y); |