cpp/openttd-patchpack/source Changeset - r23818:7609f20f2104

Changeset - r23818:7609f20f2104

Parent rev.

Child rev.

[Not reviewed]

master

0 23 0

glx22 - 5 years ago 2019-09-07 16:37:01
glx22@users.noreply.github.com

Fix #7188: check the validity of command callback for scripts (#7701)

23 files changed with 97 insertions and 36 deletions:

src/ai/ai_instance.cpp

src/airport_gui.cpp

src/bridge_gui.cpp

src/command.cpp

src/command_type.h

src/depot_gui.cpp

src/dock_gui.cpp

src/game/game_instance.cpp

src/group_gui.cpp

src/industry_gui.cpp

src/main_gui.cpp

src/rail_gui.cpp

src/road_gui.cpp

src/script/api/script_object.cpp

src/script/api/script_object.hpp

src/script/script_instance.cpp

src/script/script_instance.hpp

src/script/script_storage.hpp

src/signs_cmd.cpp

src/terraform_gui.cpp

src/town_gui.cpp

src/train_gui.cpp

src/vehicle_gui.cpp

0 comments (0 inline, 0 general)

src/ai/ai_instance.cpp

➞

Show inline comments

@@ @@ -251,8 +251,9 @@ ScriptInfo *AIInstance::FindLibrary(cons @@
  * @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.
@@ @@ -263,8 +264,9 @@ void CcAI(const CommandCost &result, Til @@
 	const Company *c = Company::GetIfValid(_current_company);
 	if (c == nullptr || c->ai_instance == nullptr) 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()

src/airport_gui.cpp

➞

Show inline comments

@@ @@ -42,7 +42,7 @@ static void ShowBuildAirportPicker(Windo @@
 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;

src/bridge_gui.cpp

➞

Show inline comments

@@ @@ -58,8 +58,9 @@ typedef GUIList<BuildBridgeData> GUIBrid @@
  * - 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);

src/command.cpp

➞

Show inline comments

@@ @@ -598,7 +598,7 @@ bool DoCommandP(TileIndex tile, uint32 p @@
+	}
 	if (!estimate_only && !only_sending && callback != nullptr) {
 		callback(res, tile, p1, p2);
+		callback(res, tile, p1, p2, cmd);
+	}
 	return res.Succeeded();

src/command_type.h

➞

Show inline comments

@@ @@ -469,7 +469,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.

src/depot_gui.cpp

➞

Show inline comments

@@ @@ -117,8 +117,9 @@ extern void DepotSortList(VehicleList *l @@
  * @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;

src/dock_gui.cpp

➞

Show inline comments

@@ @@ -40,7 +40,7 @@ static void ShowBuildDocksDepotPicker(Wi @@
 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 &res @@
 	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);
+}

src/game/game_instance.cpp

➞

Show inline comments

@@ @@ -257,11 +257,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()

src/group_gui.cpp

➞

Show inline comments

@@ @@ -1046,9 +1046,10 @@ static inline VehicleGroupWindow *FindVe @@
  * @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);
@@ @@ -1063,13 +1064,14 @@ void CcCreateGroup(const CommandCost &re @@
  * @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);
+}
 /**

src/industry_gui.cpp

➞

Show inline comments

@@ @@ -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;

src/main_gui.cpp

➞

Show inline comments

@@ @@ -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)
+{
 	if (result.Failed() || !_settings_game.economy.give_money) return;
@@ @@ -115,7 +115,7 @@ bool HandlePlacePushButton(Window *w, in @@
+}
 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);
+}

src/rail_gui.cpp

➞

Show inline comments

@@ @@ -86,7 +86,7 @@ static bool IsStationAvailable(const Sta @@
 	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_ @@
 	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 @@
+	}
+}
 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 t @@
+}
 /** 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);

src/road_gui.cpp

➞

Show inline comments

@@ @@ -68,7 +68,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);
+}
@@ @@ -96,8 +96,9 @@ static void PlaceRoad_Bridge(TileIndex t @@
  * @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);
@@ @@ -130,7 +131,7 @@ void ConnectRoadToStructure(TileIndex ti @@
+	}
+}
 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;
@@ @@ -153,9 +154,10 @@ void CcRoadDepot(const CommandCost &resu @@
  *           bit 3: #Axis of the road for drive-through stops.
  *           bit 5..9: The roadtype.
  *           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;

src/script/api/script_object.cpp

➞

Show inline comments

@@ @@ -83,6 +83,23 @@ ScriptObject::ActiveInstance::~ActiveIns @@
 	return GetStorage()->mode_instance;
+}
 /* static */ void ScriptObject::SetLastCommand(TileIndex tile, uint32 p1, uint32 p2, uint32 cmd)
+{
 	GetStorage()->last_tile = tile;
 	GetStorage()->last_p1 = p1;
 	GetStorage()->last_p2 = p2;
 	GetStorage()->last_cmd = cmd;
+}
 /* static */ bool ScriptObject::CheckLastCommand(TileIndex tile, uint32 p1, uint32 p2, uint32 cmd)
+{
 	if (GetStorage()->last_tile != tile) return false;
 	if (GetStorage()->last_p1 != p1) return false;
 	if (GetStorage()->last_p2 != p2) return false;
 	if (GetStorage()->last_cmd != cmd) return false;
 	return true;
+}
 /* static */ void ScriptObject::SetDoCommandCosts(Money value)
+{
 	GetStorage()->costs = CommandCost(value);
@@ @@ -304,6 +321,9 @@ ScriptObject::ActiveInstance::~ActiveIns @@
 	/* Only set p2 when the command does not come from the network. */
 	if (GetCommandFlags(cmd) & CMD_CLIENT_ID && p2 == 0) p2 = UINT32_MAX;
 	/* 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() : nullptr, text, false, estimate_only);

src/script/api/script_object.hpp

➞

Show inline comments

@@ @@ -74,6 +74,16 @@ protected: @@
 	static bool DoCommand(TileIndex tile, uint32 p1, uint32 p2, uint cmd, const char *text = nullptr, Script_SuspendCallbackProc *callback = nullptr);
 	/**
 	 * 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.
 	 */
 	static void SetDoCommandCosts(Money value);

src/script/script_instance.cpp

➞

Show inline comments

@@ @@ -680,10 +680,12 @@ SQInteger ScriptInstance::GetOpsTillSusp @@
 	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)) return false;
 	ScriptObject::SetLastCommandRes(result.Succeeded());
 	if (result.Failed()) {
@@ @@ -692,6 +694,10 @@ void ScriptInstance::DoCommandCallback(c @@
 		ScriptObject::IncreaseDoCommandCosts(result.GetCost());
 		ScriptObject::SetLastCost(result.GetCost());
+	}
 	ScriptObject::SetLastCommand(INVALID_TILE, 0, 0, CMD_END);
 	return true;
+}
 void ScriptInstance::InsertEvent(class ScriptEvent *event)

src/script/script_instance.hpp

➞

Show inline comments

@@ @@ -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.

src/script/script_storage.hpp

➞

Show inline comments

@@ @@ -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),

src/signs_cmd.cpp

➞

Show inline comments

@@ @@ -117,8 +117,9 @@ CommandCost CmdRenameSign(TileIndex tile @@
  * @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;

src/terraform_gui.cpp

➞

Show inline comments

@@ @@ -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);

src/town_gui.cpp

➞

Show inline comments

@@ @@ -1050,7 +1050,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;
@@ @@ -1058,7 +1058,7 @@ void CcFoundTown(const CommandCost &resu @@
 	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);
+}

src/train_gui.cpp

➞

Show inline comments

@@ @@ -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;

src/vehicle_gui.cpp

➞

Show inline comments

@@ @@ -2377,7 +2377,7 @@ static const uint32 _vehicle_command_tra @@
  * @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;
@@ @@ -2822,8 +2822,9 @@ void StopGlobalFollowVehicle(const Vehic @@
  * @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;

0 comments (0 inline, 0 general)