diff --git a/src/ai/ai_instance.cpp b/src/ai/ai_instance.cpp
index c03e745992..76e8efd27c 100644
--- a/src/ai/ai_instance.cpp
+++ b/src/ai/ai_instance.cpp
@@ -248,8 +248,9 @@ ScriptInfo *AIInstance::FindLibrary(const char *library, int version)
* @param tile The tile on which the command was executed.
* @param p1 p1 as given to DoCommandPInternal.
* @param p2 p2 as given to DoCommandPInternal.
+ * @param cmd cmd as given to DoCommandPInternal.
*/
-void CcAI(const CommandCost &result, TileIndex tile, uint32 p1, uint32 p2)
+void CcAI(const CommandCost &result, TileIndex tile, uint32 p1, uint32 p2, uint32 cmd)
{
/*
* The company might not exist anymore. Check for this.
@@ -260,8 +261,9 @@ void CcAI(const CommandCost &result, TileIndex tile, uint32 p1, uint32 p2)
const Company *c = Company::GetIfValid(_current_company);
if (c == NULL || c->ai_instance == NULL) return;
- c->ai_instance->DoCommandCallback(result, tile, p1, p2);
- c->ai_instance->Continue();
+ if (c->ai_instance->DoCommandCallback(result, tile, p1, p2, cmd)) {
+ c->ai_instance->Continue();
+ }
}
CommandCallback *AIInstance::GetDoCommandCallback()
diff --git a/src/airport_gui.cpp b/src/airport_gui.cpp
index 243f91b247..71b3b50133 100644
--- a/src/airport_gui.cpp
+++ b/src/airport_gui.cpp
@@ -42,7 +42,7 @@ static void ShowBuildAirportPicker(Window *parent);
SpriteID GetCustomAirportSprite(const AirportSpec *as, byte layout);
-void CcBuildAirport(const CommandCost &result, TileIndex tile, uint32 p1, uint32 p2)
+void CcBuildAirport(const CommandCost &result, TileIndex tile, uint32 p1, uint32 p2, uint32 cmd)
{
if (result.Failed()) return;
diff --git a/src/bridge_gui.cpp b/src/bridge_gui.cpp
index 768691f080..fd6d46752c 100644
--- a/src/bridge_gui.cpp
+++ b/src/bridge_gui.cpp
@@ -57,8 +57,9 @@ typedef GUIList<BuildBridgeData> GUIBridgeList; ///< List of bridges, used in #B
* - p2 = (bit 0- 7) - bridge type (hi bh)
* - p2 = (bit 8-13) - rail type or road types.
* - p2 = (bit 15-16) - transport type.
+ * @param cmd unused
*/
-void CcBuildBridge(const CommandCost &result, TileIndex end_tile, uint32 p1, uint32 p2)
+void CcBuildBridge(const CommandCost &result, TileIndex end_tile, uint32 p1, uint32 p2, uint32 cmd)
{
if (result.Failed()) return;
if (_settings_client.sound.confirm) SndPlayTileFx(SND_27_BLACKSMITH_ANVIL, end_tile);
diff --git a/src/command.cpp b/src/command.cpp
index 70258aaa1d..6828633723 100644
--- a/src/command.cpp
+++ b/src/command.cpp
@@ -597,7 +597,7 @@ bool DoCommandP(TileIndex tile, uint32 p1, uint32 p2, uint32 cmd, CommandCallbac
}
if (!estimate_only && !only_sending && callback != NULL) {
- callback(res, tile, p1, p2);
+ callback(res, tile, p1, p2, cmd);
}
return res.Succeeded();
diff --git a/src/command_type.h b/src/command_type.h
index e7512f11d2..f644d654cc 100644
--- a/src/command_type.h
+++ b/src/command_type.h
@@ -467,7 +467,7 @@ struct Command {
* @param p1 Additional data of the command
* @see CommandProc
*/
-typedef void CommandCallback(const CommandCost &result, TileIndex tile, uint32 p1, uint32 p2);
+typedef void CommandCallback(const CommandCost &result, TileIndex tile, uint32 p1, uint32 p2, uint32 cmd);
/**
* Structure for buffering the build command when selecting a station to join.
diff --git a/src/depot_gui.cpp b/src/depot_gui.cpp
index 39accd65f1..2173dea81a 100644
--- a/src/depot_gui.cpp
+++ b/src/depot_gui.cpp
@@ -117,8 +117,9 @@ extern void DepotSortList(VehicleList *list);
* @param tile unused
* @param p1 unused
* @param p2 unused
+ * @param cmd unused
*/
-void CcCloneVehicle(const CommandCost &result, TileIndex tile, uint32 p1, uint32 p2)
+void CcCloneVehicle(const CommandCost &result, TileIndex tile, uint32 p1, uint32 p2, uint32 cmd)
{
if (result.Failed()) return;
diff --git a/src/dock_gui.cpp b/src/dock_gui.cpp
index e2224dfa28..78cdd5cf8b 100644
--- a/src/dock_gui.cpp
+++ b/src/dock_gui.cpp
@@ -40,7 +40,7 @@ static void ShowBuildDocksDepotPicker(Window *parent);
static Axis _ship_depot_direction;
-void CcBuildDocks(const CommandCost &result, TileIndex tile, uint32 p1, uint32 p2)
+void CcBuildDocks(const CommandCost &result, TileIndex tile, uint32 p1, uint32 p2, uint32 cmd)
{
if (result.Failed()) return;
@@ -48,7 +48,7 @@ void CcBuildDocks(const CommandCost &result, TileIndex tile, uint32 p1, uint32 p
if (!_settings_client.gui.persistent_buildingtools) ResetObjectToPlace();
}
-void CcPlaySound_SPLAT_WATER(const CommandCost &result, TileIndex tile, uint32 p1, uint32 p2)
+void CcPlaySound_SPLAT_WATER(const CommandCost &result, TileIndex tile, uint32 p1, uint32 p2, uint32 cmd)
{
if (result.Succeeded() && _settings_client.sound.confirm) SndPlayTileFx(SND_02_SPLAT_WATER, tile);
}
diff --git a/src/game/game_instance.cpp b/src/game/game_instance.cpp
index e2b3775110..e9853f569e 100644
--- a/src/game/game_instance.cpp
+++ b/src/game/game_instance.cpp
@@ -255,11 +255,13 @@ void GameInstance::Died()
* @param tile The tile on which the command was executed.
* @param p1 p1 as given to DoCommandPInternal.
* @param p2 p2 as given to DoCommandPInternal.
+ * @param cmd cmd as given to DoCommandPInternal.
*/
-void CcGame(const CommandCost &result, TileIndex tile, uint32 p1, uint32 p2)
+void CcGame(const CommandCost &result, TileIndex tile, uint32 p1, uint32 p2, uint32 cmd)
{
- Game::GetGameInstance()->DoCommandCallback(result, tile, p1, p2);
- Game::GetGameInstance()->Continue();
+ if (Game::GetGameInstance()->DoCommandCallback(result, tile, p1, p2, cmd)) {
+ Game::GetGameInstance()->Continue();
+ }
}
CommandCallback *GameInstance::GetDoCommandCallback()
diff --git a/src/group_gui.cpp b/src/group_gui.cpp
index b5f33ff52a..1c90326257 100644
--- a/src/group_gui.cpp
+++ b/src/group_gui.cpp
@@ -989,9 +989,10 @@ static inline VehicleGroupWindow *FindVehicleGroupWindow(VehicleType vt, Owner o
* @param tile Unused.
* @param p1 Vehicle type.
* @param p2 Unused.
+ * @param cmd Unused.
* @see CmdCreateGroup
*/
-void CcCreateGroup(const CommandCost &result, TileIndex tile, uint32 p1, uint32 p2)
+void CcCreateGroup(const CommandCost &result, TileIndex tile, uint32 p1, uint32 p2, uint32 cmd)
{
if (result.Failed()) return;
assert(p1 <= VEH_AIRCRAFT);
@@ -1006,13 +1007,14 @@ void CcCreateGroup(const CommandCost &result, TileIndex tile, uint32 p1, uint32
* @param tile Unused.
* @param p1 Unused.
* @param p2 Bit 0-19: Vehicle ID.
+ * @param cmd Unused.
*/
-void CcAddVehicleNewGroup(const CommandCost &result, TileIndex tile, uint32 p1, uint32 p2)
+void CcAddVehicleNewGroup(const CommandCost &result, TileIndex tile, uint32 p1, uint32 p2, uint32 cmd)
{
if (result.Failed()) return;
assert(Vehicle::IsValidID(GB(p2, 0, 20)));
- CcCreateGroup(result, 0, Vehicle::Get(GB(p2, 0, 20))->type, 0);
+ CcCreateGroup(result, 0, Vehicle::Get(GB(p2, 0, 20))->type, 0, cmd);
}
/**
diff --git a/src/industry_gui.cpp b/src/industry_gui.cpp
index 78bf3f4a01..52fc0505e6 100644
--- a/src/industry_gui.cpp
+++ b/src/industry_gui.cpp
@@ -222,8 +222,9 @@ void SortIndustryTypes()
* @param tile Tile where the industry is placed.
* @param p1 Additional data of the #CMD_BUILD_INDUSTRY command.
* @param p2 Additional data of the #CMD_BUILD_INDUSTRY command.
+ * @param cmd Unused.
*/
-void CcBuildIndustry(const CommandCost &result, TileIndex tile, uint32 p1, uint32 p2)
+void CcBuildIndustry(const CommandCost &result, TileIndex tile, uint32 p1, uint32 p2, uint32 cmd)
{
if (result.Succeeded()) return;
diff --git a/src/main_gui.cpp b/src/main_gui.cpp
index 42a2a7eff4..ce96357589 100644
--- a/src/main_gui.cpp
+++ b/src/main_gui.cpp
@@ -51,7 +51,7 @@
static int _rename_id = 1;
static int _rename_what = -1;
-void CcGiveMoney(const CommandCost &result, TileIndex tile, uint32 p1, uint32 p2)
+void CcGiveMoney(const CommandCost &result, TileIndex tile, uint32 p1, uint32 p2, uint32 cmd)
{
#ifdef ENABLE_NETWORK
if (result.Failed() || !_settings_game.economy.give_money) return;
@@ -119,7 +119,7 @@ bool HandlePlacePushButton(Window *w, int widget, CursorID cursor, HighLightStyl
}
-void CcPlaySound_EXPLOSION(const CommandCost &result, TileIndex tile, uint32 p1, uint32 p2)
+void CcPlaySound_EXPLOSION(const CommandCost &result, TileIndex tile, uint32 p1, uint32 p2, uint32 cmd)
{
if (result.Succeeded() && _settings_client.sound.confirm) SndPlayTileFx(SND_12_EXPLOSION, tile);
}
diff --git a/src/rail_gui.cpp b/src/rail_gui.cpp
index 234edbf22f..d732389a35 100644
--- a/src/rail_gui.cpp
+++ b/src/rail_gui.cpp
@@ -86,7 +86,7 @@ static bool IsStationAvailable(const StationSpec *statspec)
return Convert8bitBooleanCallback(statspec->grf_prop.grffile, CBID_STATION_AVAILABILITY, cb_res);
}
-void CcPlaySound_SPLAT_RAIL(const CommandCost &result, TileIndex tile, uint32 p1, uint32 p2)
+void CcPlaySound_SPLAT_RAIL(const CommandCost &result, TileIndex tile, uint32 p1, uint32 p2, uint32 cmd)
{
if (result.Succeeded() && _settings_client.sound.confirm) SndPlayTileFx(SND_20_SPLAT_RAIL, tile);
}
@@ -129,7 +129,7 @@ static const DiagDirection _place_depot_extra_dir[12] = {
DIAGDIR_NW, DIAGDIR_NE, DIAGDIR_NW, DIAGDIR_NE,
};
-void CcRailDepot(const CommandCost &result, TileIndex tile, uint32 p1, uint32 p2)
+void CcRailDepot(const CommandCost &result, TileIndex tile, uint32 p1, uint32 p2, uint32 cmd)
{
if (result.Failed()) return;
@@ -170,7 +170,7 @@ static void PlaceRail_Waypoint(TileIndex tile)
}
}
-void CcStation(const CommandCost &result, TileIndex tile, uint32 p1, uint32 p2)
+void CcStation(const CommandCost &result, TileIndex tile, uint32 p1, uint32 p2, uint32 cmd)
{
if (result.Failed()) return;
@@ -272,7 +272,7 @@ static void PlaceRail_Bridge(TileIndex tile, Window *w)
}
/** Command callback for building a tunnel */
-void CcBuildRailTunnel(const CommandCost &result, TileIndex tile, uint32 p1, uint32 p2)
+void CcBuildRailTunnel(const CommandCost &result, TileIndex tile, uint32 p1, uint32 p2, uint32 cmd)
{
if (result.Succeeded()) {
if (_settings_client.sound.confirm) SndPlayTileFx(SND_20_SPLAT_RAIL, tile);
diff --git a/src/road_gui.cpp b/src/road_gui.cpp
index e3091ec8af..5480663e0e 100644
--- a/src/road_gui.cpp
+++ b/src/road_gui.cpp
@@ -64,7 +64,7 @@ static RoadType _cur_roadtype;
static DiagDirection _road_depot_orientation;
static DiagDirection _road_station_picker_orientation;
-void CcPlaySound_SPLAT_OTHER(const CommandCost &result, TileIndex tile, uint32 p1, uint32 p2)
+void CcPlaySound_SPLAT_OTHER(const CommandCost &result, TileIndex tile, uint32 p1, uint32 p2, uint32 cmd)
{
if (result.Succeeded() && _settings_client.sound.confirm) SndPlayTileFx(SND_1F_SPLAT_OTHER, tile);
}
@@ -92,8 +92,9 @@ static void PlaceRoad_Bridge(TileIndex tile, Window *w)
* @param p1 bit 0-3 railtype or roadtypes
* bit 8-9 transport type
* @param p2 unused
+ * @param cmd unused
*/
-void CcBuildRoadTunnel(const CommandCost &result, TileIndex start_tile, uint32 p1, uint32 p2)
+void CcBuildRoadTunnel(const CommandCost &result, TileIndex start_tile, uint32 p1, uint32 p2, uint32 cmd)
{
if (result.Succeeded()) {
if (_settings_client.sound.confirm) SndPlayTileFx(SND_1F_SPLAT_OTHER, start_tile);
@@ -172,7 +173,7 @@ void ConnectRoadToStructure(TileIndex tile, DiagDirection direction)
}
}
-void CcRoadDepot(const CommandCost &result, TileIndex tile, uint32 p1, uint32 p2)
+void CcRoadDepot(const CommandCost &result, TileIndex tile, uint32 p1, uint32 p2, uint32 cmd)
{
if (result.Failed()) return;
@@ -194,9 +195,10 @@ void CcRoadDepot(const CommandCost &result, TileIndex tile, uint32 p1, uint32 p2
* bit 5: Allow stations directly adjacent to other stations.
* bit 6..7: Entrance direction (#DiagDirection).
* bit 16..31: Station ID to join (NEW_STATION if build new one).
+ * @param cmd Unused.
* @see CmdBuildRoadStop
*/
-void CcRoadStop(const CommandCost &result, TileIndex tile, uint32 p1, uint32 p2)
+void CcRoadStop(const CommandCost &result, TileIndex tile, uint32 p1, uint32 p2, uint32 cmd)
{
if (result.Failed()) return;
diff --git a/src/script/api/script_object.cpp b/src/script/api/script_object.cpp
index 49dba6bb73..e3501d5de5 100644
--- a/src/script/api/script_object.cpp
+++ b/src/script/api/script_object.cpp
@@ -23,6 +23,7 @@
#include "../script_instance.hpp"
#include "../script_fatalerror.hpp"
#include "script_error.hpp"
+#include "../../debug.h"
#include "../../safeguards.h"
@@ -83,6 +84,27 @@ ScriptObject::ActiveInstance::~ActiveInstance()
return GetStorage()->mode_instance;
}
+/* static */ void ScriptObject::SetLastCommand(TileIndex tile, uint32 p1, uint32 p2, uint32 cmd)
+{
+ ScriptStorage *s = GetStorage();
+ DEBUG(script, 6, "SetLastCommand company=%02d tile=%06x p1=%08x p2=%08x cmd=%d", s->root_company, tile, p1, p2, cmd);
+ s->last_tile = tile;
+ s->last_p1 = p1;
+ s->last_p2 = p2;
+ s->last_cmd = cmd & CMD_ID_MASK;
+}
+
+/* static */ bool ScriptObject::CheckLastCommand(TileIndex tile, uint32 p1, uint32 p2, uint32 cmd)
+{
+ ScriptStorage *s = GetStorage();
+ DEBUG(script, 6, "CheckLastCommand company=%02d tile=%06x p1=%08x p2=%08x cmd=%d", s->root_company, tile, p1, p2, cmd);
+ if (s->last_tile != tile) return false;
+ if (s->last_p1 != p1) return false;
+ if (s->last_p2 != p2) return false;
+ if (s->last_cmd != (cmd & CMD_ID_MASK)) return false;
+ return true;
+}
+
/* static */ void ScriptObject::SetDoCommandCosts(Money value)
{
GetStorage()->costs = CommandCost(value);
@@ -306,6 +328,9 @@ ScriptObject::ActiveInstance::~ActiveInstance()
if (GetCommandFlags(cmd) & CMD_CLIENT_ID && p2 == 0) p2 = UINT32_MAX;
#endif
+ /* Store the command for command callback validation. */
+ if (!estimate_only && _networking && !_generating_world) SetLastCommand(tile, p1, p2, cmd);
+
/* Try to perform the command. */
CommandCost res = ::DoCommandPInternal(tile, p1, p2, cmd, (_networking && !_generating_world) ? ScriptObject::GetActiveInstance()->GetDoCommandCallback() : NULL, text, false, estimate_only);
diff --git a/src/script/api/script_object.hpp b/src/script/api/script_object.hpp
index 482e76f663..289c01c824 100644
--- a/src/script/api/script_object.hpp
+++ b/src/script/api/script_object.hpp
@@ -71,6 +71,16 @@ protected:
*/
static bool DoCommand(TileIndex tile, uint32 p1, uint32 p2, uint cmd, const char *text = NULL, Script_SuspendCallbackProc *callback = NULL);
+ /**
+ * Store the latest command executed by the script.
+ */
+ static void SetLastCommand(TileIndex tile, uint32 p1, uint32 p2, uint cmd);
+
+ /**
+ * Check if it's the latest command executed by the script.
+ */
+ static bool CheckLastCommand(TileIndex tile, uint32 p1, uint32 p2, uint cmd);
+
/**
* Sets the DoCommand costs counter to a value.
*/
diff --git a/src/script/script_instance.cpp b/src/script/script_instance.cpp
index 5df06ad890..f3830780a4 100644
--- a/src/script/script_instance.cpp
+++ b/src/script/script_instance.cpp
@@ -678,10 +678,15 @@ SQInteger ScriptInstance::GetOpsTillSuspend()
return this->engine->GetOpsTillSuspend();
}
-void ScriptInstance::DoCommandCallback(const CommandCost &result, TileIndex tile, uint32 p1, uint32 p2)
+bool ScriptInstance::DoCommandCallback(const CommandCost &result, TileIndex tile, uint32 p1, uint32 p2, uint32 cmd)
{
ScriptObject::ActiveInstance active(this);
+ if (!ScriptObject::CheckLastCommand(tile, p1, p2, cmd)) {
+ DEBUG(script, 1, "DoCommandCallback terminating a script, last command does not match expected command");
+ return false;
+ }
+
ScriptObject::SetLastCommandRes(result.Succeeded());
if (result.Failed()) {
@@ -690,6 +695,10 @@ void ScriptInstance::DoCommandCallback(const CommandCost &result, TileIndex tile
ScriptObject::IncreaseDoCommandCosts(result.GetCost());
ScriptObject::SetLastCost(result.GetCost());
}
+
+ ScriptObject::SetLastCommand(INVALID_TILE, 0, 0, CMD_END);
+
+ return true;
}
void ScriptInstance::InsertEvent(class ScriptEvent *event)
diff --git a/src/script/script_instance.hpp b/src/script/script_instance.hpp
index e6f3c64b22..4fbf677a86 100644
--- a/src/script/script_instance.hpp
+++ b/src/script/script_instance.hpp
@@ -182,8 +182,10 @@ public:
* @param tile The tile on which the command was executed.
* @param p1 p1 as given to DoCommandPInternal.
* @param p2 p2 as given to DoCommandPInternal.
+ * @param cmd cmd as given to DoCommandPInternal.
+ * @return true if we handled result.
*/
- void DoCommandCallback(const CommandCost &result, TileIndex tile, uint32 p1, uint32 p2);
+ bool DoCommandCallback(const CommandCost &result, TileIndex tile, uint32 p1, uint32 p2, uint32 cmd);
/**
* Insert an event for this script.
diff --git a/src/script/script_storage.hpp b/src/script/script_storage.hpp
index 8fe1e17323..3fd8a95f73 100644
--- a/src/script/script_storage.hpp
+++ b/src/script/script_storage.hpp
@@ -46,6 +46,11 @@ private:
uint last_error; ///< The last error of the command.
bool last_command_res; ///< The last result of the command.
+ TileIndex last_tile; ///< The last tile passed to a command.
+ uint32 last_p1; ///< The last p1 passed to a command.
+ uint32 last_p2; ///< The last p2 passed to a command.
+ uint32 last_cmd; ///< The last cmd passed to a command.
+
VehicleID new_vehicle_id; ///< The ID of the new Vehicle.
SignID new_sign_id; ///< The ID of the new Sign.
GroupID new_group_id; ///< The ID of the new Group.
@@ -73,6 +78,10 @@ public:
last_cost (0),
last_error (STR_NULL),
last_command_res (true),
+ last_tile (INVALID_TILE),
+ last_p1 (0),
+ last_p2 (0),
+ last_cmd (CMD_END),
new_vehicle_id (0),
new_sign_id (0),
new_group_id (0),
diff --git a/src/signs_cmd.cpp b/src/signs_cmd.cpp
index 4badd36050..f359ad4e64 100644
--- a/src/signs_cmd.cpp
+++ b/src/signs_cmd.cpp
@@ -114,8 +114,9 @@ CommandCost CmdRenameSign(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32
* @param tile unused
* @param p1 unused
* @param p2 unused
+ * @param cmd unused
*/
-void CcPlaceSign(const CommandCost &result, TileIndex tile, uint32 p1, uint32 p2)
+void CcPlaceSign(const CommandCost &result, TileIndex tile, uint32 p1, uint32 p2, uint32 cmd)
{
if (result.Failed()) return;
diff --git a/src/terraform_gui.cpp b/src/terraform_gui.cpp
index 97749a8dcc..c844f853c2 100644
--- a/src/terraform_gui.cpp
+++ b/src/terraform_gui.cpp
@@ -40,7 +40,7 @@
#include "safeguards.h"
-void CcTerraform(const CommandCost &result, TileIndex tile, uint32 p1, uint32 p2)
+void CcTerraform(const CommandCost &result, TileIndex tile, uint32 p1, uint32 p2, uint32 cmd)
{
if (result.Succeeded()) {
if (_settings_client.sound.confirm) SndPlayTileFx(SND_1F_SPLAT_OTHER, tile);
diff --git a/src/town_gui.cpp b/src/town_gui.cpp
index 17449854d6..660d1ba58a 100644
--- a/src/town_gui.cpp
+++ b/src/town_gui.cpp
@@ -969,7 +969,7 @@ void ShowTownDirectory()
new TownDirectoryWindow(&_town_directory_desc);
}
-void CcFoundTown(const CommandCost &result, TileIndex tile, uint32 p1, uint32 p2)
+void CcFoundTown(const CommandCost &result, TileIndex tile, uint32 p1, uint32 p2, uint32 cmd)
{
if (result.Failed()) return;
@@ -977,7 +977,7 @@ void CcFoundTown(const CommandCost &result, TileIndex tile, uint32 p1, uint32 p2
if (!_settings_client.gui.persistent_buildingtools) ResetObjectToPlace();
}
-void CcFoundRandomTown(const CommandCost &result, TileIndex tile, uint32 p1, uint32 p2)
+void CcFoundRandomTown(const CommandCost &result, TileIndex tile, uint32 p1, uint32 p2, uint32 cmd)
{
if (result.Succeeded()) ScrollMainWindowToTile(Town::Get(_new_town_id)->xy);
}
diff --git a/src/train_gui.cpp b/src/train_gui.cpp
index 51e772b520..e6a676b102 100644
--- a/src/train_gui.cpp
+++ b/src/train_gui.cpp
@@ -27,8 +27,9 @@
* @param tile The tile the command was executed on.
* @param p1 Additional data for the command (for the #CommandProc)
* @param p2 Additional data for the command (for the #CommandProc)
+ * @param cmd Unused.
*/
-void CcBuildWagon(const CommandCost &result, TileIndex tile, uint32 p1, uint32 p2)
+void CcBuildWagon(const CommandCost &result, TileIndex tile, uint32 p1, uint32 p2, uint32 cmd)
{
if (result.Failed()) return;
diff --git a/src/vehicle_gui.cpp b/src/vehicle_gui.cpp
index 777716c646..3f5df201c2 100644
--- a/src/vehicle_gui.cpp
+++ b/src/vehicle_gui.cpp
@@ -2380,7 +2380,7 @@ static const uint32 _vehicle_command_translation_table[][4] = {
* @param p1 vehicle ID
* @param p2 unused
*/
-void CcStartStopVehicle(const CommandCost &result, TileIndex tile, uint32 p1, uint32 p2)
+void CcStartStopVehicle(const CommandCost &result, TileIndex tile, uint32 p1, uint32 p2, uint32 cmd)
{
if (result.Failed()) return;
@@ -2825,8 +2825,9 @@ void StopGlobalFollowVehicle(const Vehicle *v)
* @param tile unused
* @param p1 unused
* @param p2 unused
+ * @param cmd unused
*/
-void CcBuildPrimaryVehicle(const CommandCost &result, TileIndex tile, uint32 p1, uint32 p2)
+void CcBuildPrimaryVehicle(const CommandCost &result, TileIndex tile, uint32 p1, uint32 p2, uint32 cmd)
{
if (result.Failed()) return;