diff options
Diffstat (limited to 'src/script')
| -rw-r--r-- | src/script/api/script_object.cpp | 12 | ||||
| -rw-r--r-- | src/script/api/script_object.hpp | 11 | ||||
| -rw-r--r-- | src/script/api/script_vehicle.cpp | 8 | ||||
| -rw-r--r-- | src/script/script_instance.cpp | 2 | ||||
| -rw-r--r-- | src/script/script_storage.hpp | 3 |
5 files changed, 5 insertions, 31 deletions
diff --git a/src/script/api/script_object.cpp b/src/script/api/script_object.cpp index f95433bd9..3cddb12f8 100644 --- a/src/script/api/script_object.cpp +++ b/src/script/api/script_object.cpp @@ -159,8 +159,6 @@ ScriptObject::ActiveInstance::~ActiveInstance() /* static */ void ScriptObject::SetLastCommandRes(bool res) { GetStorage()->last_command_res = res; - /* Also store the results of various global variables */ - SetNewVehicleID(_new_vehicle_id); } /* static */ bool ScriptObject::GetLastCommandRes() @@ -178,16 +176,6 @@ ScriptObject::ActiveInstance::~ActiveInstance() return GetStorage()->last_cmd_ret; } -/* static */ void ScriptObject::SetNewVehicleID(VehicleID vehicle_id) -{ - GetStorage()->new_vehicle_id = vehicle_id; -} - -/* static */ VehicleID ScriptObject::GetNewVehicleID() -{ - return GetStorage()->new_vehicle_id; -} - /* static */ void ScriptObject::SetAllowDoCommand(bool allow) { GetStorage()->allow_do_command = allow; diff --git a/src/script/api/script_object.hpp b/src/script/api/script_object.hpp index d90fec351..5fffe783b 100644 --- a/src/script/api/script_object.hpp +++ b/src/script/api/script_object.hpp @@ -193,11 +193,6 @@ protected: static const CommandDataBuffer &GetLastCommandResData(); /** - * Get the latest stored new_vehicle_id. - */ - static VehicleID GetNewVehicleID(); - - /** * Store a allow_do_command per company. * @param allow The new allow. */ @@ -274,12 +269,6 @@ protected: static char *GetString(StringID string); private: - /** - * Store a new_vehicle_id per company. - * @param vehicle_id The new VehicleID. - */ - static void SetNewVehicleID(VehicleID vehicle_id); - /* Helper functions for DoCommand. */ static std::tuple<bool, bool, bool> DoCommandPrep(); static bool DoCommandProcessResult(const CommandCost &res, Script_SuspendCallbackProc *callback, bool estimate_only); diff --git a/src/script/api/script_vehicle.cpp b/src/script/api/script_vehicle.cpp index c92502661..b7b5fd950 100644 --- a/src/script/api/script_vehicle.cpp +++ b/src/script/api/script_vehicle.cpp @@ -94,8 +94,8 @@ if (!ScriptEngine::IsBuildable(engine_id)) return -1; if (!ScriptCargo::IsValidCargo(cargo)) return -1; - CommandCost res = ::Command<CMD_BUILD_VEHICLE>::Do(DC_QUERY_COST, depot, engine_id, true, cargo, INVALID_CLIENT_ID); - return res.Succeeded() ? _returned_refit_capacity : -1; + auto [res, veh_id, refit_capacity, refit_mail] = ::Command<CMD_BUILD_VEHICLE>::Do(DC_QUERY_COST, depot, engine_id, true, cargo, INVALID_CLIENT_ID); + return res.Succeeded() ? refit_capacity : -1; } /* static */ VehicleID ScriptVehicle::CloneVehicle(TileIndex depot, VehicleID vehicle_id, bool share_orders) @@ -143,8 +143,8 @@ if (!IsValidVehicle(vehicle_id)) return -1; if (!ScriptCargo::IsValidCargo(cargo)) return -1; - CommandCost res = ::Command<CMD_REFIT_VEHICLE>::Do(DC_QUERY_COST, vehicle_id, cargo, 0, false, false, 0); - return res.Succeeded() ? _returned_refit_capacity : -1; + auto [res, refit_capacity, refit_mail] = ::Command<CMD_REFIT_VEHICLE>::Do(DC_QUERY_COST, vehicle_id, cargo, 0, false, false, 0); + return res.Succeeded() ? refit_capacity : -1; } /* static */ bool ScriptVehicle::RefitVehicle(VehicleID vehicle_id, CargoID cargo) diff --git a/src/script/script_instance.cpp b/src/script/script_instance.cpp index 9d978f833..bcd8b2d4b 100644 --- a/src/script/script_instance.cpp +++ b/src/script/script_instance.cpp @@ -270,7 +270,7 @@ void ScriptInstance::CollectGarbage() /* static */ void ScriptInstance::DoCommandReturnVehicleID(ScriptInstance *instance) { - instance->engine->InsertResult(ScriptObject::GetNewVehicleID()); + instance->engine->InsertResult(EndianBufferReader::ToValue<VehicleID>(ScriptObject::GetLastCommandResData())); } /* static */ void ScriptInstance::DoCommandReturnSignID(ScriptInstance *instance) diff --git a/src/script/script_storage.hpp b/src/script/script_storage.hpp index f95eb7e71..2afb03827 100644 --- a/src/script/script_storage.hpp +++ b/src/script/script_storage.hpp @@ -49,8 +49,6 @@ private: Commands last_cmd; ///< The last cmd passed to a command. CommandDataBuffer last_cmd_ret; ///< The extra data returned by the last command. - VehicleID new_vehicle_id; ///< The ID of the new Vehicle. - std::vector<int> callback_value; ///< The values which need to survive a callback. RoadType road_type; ///< The current roadtype we build. @@ -73,7 +71,6 @@ public: last_command_res (true), last_tile (INVALID_TILE), last_cmd (CMD_END), - new_vehicle_id (0), /* calback_value (can't be set) */ road_type (INVALID_ROADTYPE), rail_type (INVALID_RAILTYPE), |