diff options
| author | frosch <frosch@openttd.org> | 2008-08-15 13:57:43 +0000 |
|---|---|---|
| committer | frosch <frosch@openttd.org> | 2008-08-15 13:57:43 +0000 |
| commit | c8e699cc35694f884e5d93fcdce81b3cda60ea09 (patch) | |
| tree | e439387d0f5c3387188afcb3d06876defc09085e /src/ai | |
| parent | 80376a11a0aef7f471250eca151de2e4d6d30327 (diff) | |
| download | openttd-c8e699cc35694f884e5d93fcdce81b3cda60ea09.tar.xz | |
(svn r14076) -Codechange: Merge the four start/stop commands into a single CMD_START_STOP_VEHICLE.
Diffstat (limited to 'src/ai')
| -rw-r--r-- | src/ai/default/default.cpp | 12 | ||||
| -rw-r--r-- | src/ai/trolly/trolly.cpp | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/ai/default/default.cpp b/src/ai/default/default.cpp index 772ef87c3..650250ca5 100644 --- a/src/ai/default/default.cpp +++ b/src/ai/default/default.cpp @@ -348,7 +348,7 @@ static void AiHandleReplaceTrain(Player *p) CmdSucceeded(DoCommand(tile, veh, 0, DC_EXEC, CMD_BUILD_RAIL_VEHICLE))) { VehicleID veh = _new_vehicle_id; AiRestoreVehicleOrders(GetVehicle(veh), &orderbak); - DoCommand(0, veh, 0, DC_EXEC, CMD_START_STOP_TRAIN); + DoCommand(0, veh, 0, DC_EXEC, CMD_START_STOP_VEHICLE); DoCommand(0, veh, _ai_service_interval, DC_EXEC, CMD_CHANGE_SERVICE_INT); } @@ -378,7 +378,7 @@ static void AiHandleReplaceRoadVeh(Player *p) VehicleID veh = _new_vehicle_id; AiRestoreVehicleOrders(GetVehicle(veh), &orderbak); - DoCommand(0, veh, 0, DC_EXEC, CMD_START_STOP_ROADVEH); + DoCommand(0, veh, 0, DC_EXEC, CMD_START_STOP_VEHICLE); DoCommand(0, veh, _ai_service_interval, DC_EXEC, CMD_CHANGE_SERVICE_INT); } } @@ -406,7 +406,7 @@ static void AiHandleReplaceAircraft(Player *p) CmdSucceeded(DoCommand(tile, veh, 0, DC_EXEC, CMD_BUILD_AIRCRAFT))) { VehicleID veh = _new_vehicle_id; AiRestoreVehicleOrders(GetVehicle(veh), &orderbak); - DoCommand(0, veh, 0, DC_EXEC, CMD_START_STOP_AIRCRAFT); + DoCommand(0, veh, 0, DC_EXEC, CMD_START_STOP_VEHICLE); DoCommand(0, veh, _ai_service_interval, DC_EXEC, CMD_CHANGE_SERVICE_INT); } @@ -2563,7 +2563,7 @@ handle_nocash: DoCommand(0, loco_id + (i << 16), order.Pack(), DC_EXEC, CMD_INSERT_ORDER); } - DoCommand(0, loco_id, 0, DC_EXEC, CMD_START_STOP_TRAIN); + DoCommand(0, loco_id, 0, DC_EXEC, CMD_START_STOP_VEHICLE); DoCommand(0, loco_id, _ai_service_interval, DC_EXEC, CMD_CHANGE_SERVICE_INT); @@ -3298,7 +3298,7 @@ static void AiStateBuildRoadVehicles(Player *p) DoCommand(0, loco_id + (i << 16), order.Pack(), DC_EXEC, CMD_INSERT_ORDER); } - DoCommand(0, loco_id, 0, DC_EXEC, CMD_START_STOP_ROADVEH); + DoCommand(0, loco_id, 0, DC_EXEC, CMD_START_STOP_VEHICLE); DoCommand(0, loco_id, _ai_service_interval, DC_EXEC, CMD_CHANGE_SERVICE_INT); if (_players_ai[p->index].num_want_fullload != 0) _players_ai[p->index].num_want_fullload--; @@ -3596,7 +3596,7 @@ static void AiStateBuildAircraftVehicles(Player *p) DoCommand(0, loco_id + (i << 16), order.Pack(), DC_EXEC, CMD_INSERT_ORDER); } - DoCommand(0, loco_id, 0, DC_EXEC, CMD_START_STOP_AIRCRAFT); + DoCommand(0, loco_id, 0, DC_EXEC, CMD_START_STOP_VEHICLE); DoCommand(0, loco_id, _ai_service_interval, DC_EXEC, CMD_CHANGE_SERVICE_INT); diff --git a/src/ai/trolly/trolly.cpp b/src/ai/trolly/trolly.cpp index a195a4020..de392dcca 100644 --- a/src/ai/trolly/trolly.cpp +++ b/src/ai/trolly/trolly.cpp @@ -1220,7 +1220,7 @@ static void AiNew_State_StartVehicle(Player *p) AI_DoCommand(0, _players_ainew[p->index].veh_id, 1, DC_EXEC, CMD_SKIP_TO_ORDER); // 3, 2, 1... go! (give START_STOP command ;)) - AI_DoCommand(0, _players_ainew[p->index].veh_id, 0, DC_EXEC, CMD_START_STOP_ROADVEH); + AI_DoCommand(0, _players_ainew[p->index].veh_id, 0, DC_EXEC, CMD_START_STOP_VEHICLE); // Try to build an other vehicle (that function will stop building when needed) _players_ainew[p->index].idle = 10; _players_ainew[p->index].state = AI_STATE_BUILD_VEHICLE; |