From fd09bd15b239c90b1b3e3ac951a0cfbb75f9f79f Mon Sep 17 00:00:00 2001 From: Darkvater Date: Thu, 31 Aug 2006 15:57:38 +0000 Subject: [PATCH] (svn r6280) -Codechange: Use the same naming for trains as for other vehicles: CMD_SEND_TRAIN_TO_DEPOT instead of CMD_TRAIN_GOTO_DEPOT --- ai/default/default.c | 4 ++-- command.h | 2 +- train_gui.c | 2 +- vehicle.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ai/default/default.c b/ai/default/default.c index cb20e2c18a..ef794a9ca4 100644 --- a/ai/default/default.c +++ b/ai/default/default.c @@ -305,7 +305,7 @@ static void AiHandleReplaceTrain(Player *p) // wait until the vehicle reaches the depot. if (!IsTileDepotType(v->tile, TRANSPORT_RAIL) || v->u.rail.track != 0x80 || !(v->vehstatus&VS_STOPPED)) { - AiHandleGotoDepot(p, CMD_TRAIN_GOTO_DEPOT); + AiHandleGotoDepot(p, CMD_SEND_TRAIN_TO_DEPOT); return; } @@ -3509,7 +3509,7 @@ static void AiStateSellVeh(Player *p) if (!IsTileDepotType(v->tile, TRANSPORT_RAIL) || v->u.rail.track != 0x80 || !(v->vehstatus&VS_STOPPED)) { if (v->current_order.type != OT_GOTO_DEPOT) - DoCommand(0, v->index, 0, DC_EXEC, CMD_TRAIN_GOTO_DEPOT); + DoCommand(0, v->index, 0, DC_EXEC, CMD_SEND_TRAIN_TO_DEPOT); goto going_to_depot; } diff --git a/command.h b/command.h index ceef63ec91..c56cbdbddc 100644 --- a/command.h +++ b/command.h @@ -49,7 +49,7 @@ enum { CMD_SELL_RAIL_WAGON = 38, - CMD_TRAIN_GOTO_DEPOT = 39, + CMD_SEND_TRAIN_TO_DEPOT = 39, CMD_FORCE_TRAIN_PROCEED = 40, CMD_REVERSE_TRAIN_DIRECTION = 41, diff --git a/train_gui.c b/train_gui.c index f724c028a3..e7868575f9 100644 --- a/train_gui.c +++ b/train_gui.c @@ -1025,7 +1025,7 @@ static void TrainViewWndProc(Window *w, WindowEvent *e) break; case 7: /* goto depot */ /* TrainGotoDepot has a nice randomizer in the pathfinder, which causes desyncs... */ - DoCommandP(v->tile, v->index, _ctrl_pressed ? 1 : 0, NULL, CMD_TRAIN_GOTO_DEPOT | CMD_NO_TEST_IF_IN_NETWORK | CMD_MSG(STR_8830_CAN_T_SEND_TRAIN_TO_DEPOT)); + DoCommandP(v->tile, v->index, _ctrl_pressed ? 1 : 0, NULL, CMD_SEND_TRAIN_TO_DEPOT | CMD_NO_TEST_IF_IN_NETWORK | CMD_MSG(STR_8830_CAN_T_SEND_TRAIN_TO_DEPOT)); break; case 8: /* force proceed */ DoCommandP(v->tile, v->index, 0, NULL, CMD_FORCE_TRAIN_PROCEED | CMD_MSG(STR_8862_CAN_T_MAKE_TRAIN_PASS_SIGNAL)); diff --git a/vehicle.c b/vehicle.c index 38fae976e3..3efc9ebb33 100644 --- a/vehicle.c +++ b/vehicle.c @@ -68,7 +68,7 @@ static const uint32 _veh_refit_proc_table[] = { }; const uint32 _send_to_depot_proc_table[] = { - CMD_TRAIN_GOTO_DEPOT, + CMD_SEND_TRAIN_TO_DEPOT, CMD_SEND_ROADVEH_TO_DEPOT, CMD_SEND_SHIP_TO_DEPOT, CMD_SEND_AIRCRAFT_TO_HANGAR,