From 459e13fc5aee24b96dacc39f6586bb22920e3072 Mon Sep 17 00:00:00 2001 From: Jonathan G Rennison Date: Tue, 26 Mar 2024 17:26:49 +0000 Subject: [PATCH] Remove unused command: CMD_SET_VEHICLE_UNIT_NUMBER --- src/command.cpp | 4 ---- src/command_type.h | 2 -- src/vehicle_cmd.cpp | 24 ------------------------ 3 files changed, 30 deletions(-) diff --git a/src/command.cpp b/src/command.cpp index 34b99d7cd0..109a587491 100644 --- a/src/command.cpp +++ b/src/command.cpp @@ -134,8 +134,6 @@ CommandProcEx CmdSetCompanyMaxLoan; CommandProc CmdWantEnginePreview; CommandProc CmdEngineCtrl; -CommandProc CmdSetVehicleUnitNumber; - CommandProc CmdRenameVehicle; CommandProc CmdRenameEngine; @@ -405,8 +403,6 @@ static const Command _command_proc_table[] = { DEF_CMD(CmdWantEnginePreview, 0, CMDT_VEHICLE_MANAGEMENT ), // CMD_WANT_ENGINE_PREVIEW DEF_CMD(CmdEngineCtrl, CMD_DEITY, CMDT_VEHICLE_MANAGEMENT ), // CMD_ENGINE_CTRL - DEF_CMD(CmdSetVehicleUnitNumber, 0, CMDT_OTHER_MANAGEMENT ), // CMD_SET_VEHICLE_UNIT_NUMBER - DEF_CMD(CmdRenameVehicle, 0, CMDT_OTHER_MANAGEMENT ), // CMD_RENAME_VEHICLE DEF_CMD(CmdRenameEngine, CMD_SERVER, CMDT_OTHER_MANAGEMENT ), // CMD_RENAME_ENGINE diff --git a/src/command_type.h b/src/command_type.h index d2f55fa081..4b9b8f7824 100644 --- a/src/command_type.h +++ b/src/command_type.h @@ -353,8 +353,6 @@ enum Commands { CMD_WANT_ENGINE_PREVIEW, ///< confirm the preview of an engine CMD_ENGINE_CTRL, ///< control availability of the engine for companies - CMD_SET_VEHICLE_UNIT_NUMBER, ///< sets the unit number of a vehicle - CMD_RENAME_VEHICLE, ///< rename a whole vehicle CMD_RENAME_ENGINE, ///< rename a engine (in the engine list) CMD_RENAME_COMPANY, ///< change the company name diff --git a/src/vehicle_cmd.cpp b/src/vehicle_cmd.cpp index c22cb38082..c952373c2f 100644 --- a/src/vehicle_cmd.cpp +++ b/src/vehicle_cmd.cpp @@ -1785,30 +1785,6 @@ CommandCost CmdSendVehicleToDepot(TileIndex tile, DoCommandFlag flags, uint32_t return v->SendToDepot(flags, (DepotCommand)(p1 & DEPOT_COMMAND_MASK), p2); } -/** - * Sets the vehicle unit number - * @param tile unused - * @param flags type of operation - * @param p1 vehicle ID to set number on - * @param p2 vehicle unit number - * @param text unused - * @return the cost of this operation or an error - */ -CommandCost CmdSetVehicleUnitNumber(TileIndex tile, DoCommandFlag flags, uint32_t p1, uint32_t p2, const char *text) -{ - Vehicle *v = Vehicle::GetIfValid(p1); - if (v == nullptr || !v->IsPrimaryVehicle()) return CMD_ERROR; - - CommandCost ret = CheckOwnership(v->owner); - if (ret.Failed()) return ret; - - if (flags & DC_EXEC) { - v->unitnumber = (UnitID)p2; - } - - return CommandCost(); -} - /** * Give a custom name to your vehicle * @param tile unused