From 0ab078158e0b02ab094af7b714d0c39da1871b6b Mon Sep 17 00:00:00 2001 From: smatz Date: Sat, 15 Jan 2011 15:51:16 +0000 Subject: (svn r21804) -Remove [FS#4409]: the 'stopall' console command, as its functionality was broken. Group start/stop commands can be used instead --- src/console_cmds.cpp | 12 ------------ src/vehicle.cpp | 13 ------------- src/vehicle_func.h | 1 - 3 files changed, 26 deletions(-) (limited to 'src') diff --git a/src/console_cmds.cpp b/src/console_cmds.cpp index a7d855ab2..e78ca1294 100644 --- a/src/console_cmds.cpp +++ b/src/console_cmds.cpp @@ -161,17 +161,6 @@ DEF_CONSOLE_CMD(ConResetTile) return false; } - -DEF_CONSOLE_CMD(ConStopAllVehicles) -{ - if (argc == 0) { - IConsoleHelp("Stops all vehicles in the game. For debugging only! Use at your own risk... Usage: 'stopall'"); - return true; - } - - StopAllVehicles(); - return true; -} #endif /* _DEBUG */ DEF_CONSOLE_CMD(ConScrollToTile) @@ -1742,7 +1731,6 @@ DEF_CONSOLE_CMD(ConNewGRFReload) static void IConsoleDebugLibRegister() { IConsoleCmdRegister("resettile", ConResetTile); - IConsoleCmdRegister("stopall", ConStopAllVehicles); IConsoleAliasRegister("dbg_echo", "echo %A; echo %B"); IConsoleAliasRegister("dbg_echo2", "echo %!"); } diff --git a/src/vehicle.cpp b/src/vehicle.cpp index f5bffc159..2dd158329 100644 --- a/src/vehicle.cpp +++ b/src/vehicle.cpp @@ -2174,19 +2174,6 @@ Order *Vehicle::GetNextManualOrder(int index) const return order; } -void StopAllVehicles() -{ - Vehicle *v; - FOR_ALL_VEHICLES(v) { - /* Code ripped from CmdStartStopTrain. Can't call it, because of - * ownership problems, so we'll duplicate some code, for now */ - v->vehstatus |= VS_STOPPED; - v->MarkDirty(); - SetWindowWidgetDirty(WC_VEHICLE_VIEW, v->index, VVW_WIDGET_START_STOP_VEH); - SetWindowDirty(WC_VEHICLE_DEPOT, v->tile); - } -} - void VehiclesYearlyLoop() { Vehicle *v; diff --git a/src/vehicle_func.h b/src/vehicle_func.h index 2f43d7d02..930da9b47 100644 --- a/src/vehicle_func.h +++ b/src/vehicle_func.h @@ -170,7 +170,6 @@ static inline uint32 GetCmdSendToDepot(const BaseVehicle *v) CommandCost EnsureNoVehicleOnGround(TileIndex tile); CommandCost EnsureNoTrainOnTrackBits(TileIndex tile, TrackBits track_bits); -void StopAllVehicles(); extern VehicleID _new_vehicle_id; extern uint16 _returned_refit_capacity; -- cgit v1.2.3-54-g00ecf