cpp/openttd-patchpack/source Changeset - r14822:bdb7fc47ed89

Changeset - r14822:bdb7fc47ed89

Parent rev.

Child rev.

[Not reviewed]

master

0 3 0

alberth - 15 years ago 2010-03-14 19:59:45
alberth@openttd.org

(svn r19423) -Codechange: Move error message reporting of industry build in SE to a callback.

3 files changed with 26 insertions and 5 deletions:

src/command_func.h

src/industry_gui.cpp

src/network/network_command.cpp

0 comments (0 inline, 0 general)

src/command_func.h

➞

Show inline comments

@@ @@ -107,6 +107,9 @@ CommandCallback CcCloneVehicle; @@
 /* group_gui.cpp */
 CommandCallback CcCreateGroup;
 /* industry_gui.cpp */
 CommandCallback CcBuildIndustry;
 /* main_gui.cpp */
 CommandCallback CcPlaySound10;
 CommandCallback CcPlaceSign;

src/industry_gui.cpp

➞

Show inline comments

@@ @@ -96,6 +96,26 @@ static inline void GetAllCargoSuffixes(u @@
+	}
+}
 /** Command callback. In case of failure to build an industry, show an error message.
  * @param result Result of the command.
  * @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.
  */
 void CcBuildIndustry(const CommandCost &result, TileIndex tile, uint32 p1, uint32 p2)
+{
 	if (result.Succeeded()) return;
 	uint8 indtype = GB(p1, 0, 8);
 	if (indtype < NUM_INDUSTRYTYPES) {
 		const IndustrySpec *indsp = GetIndustrySpec(indtype);
 		if (indsp->enabled) {
 			SetDParam(0, indsp->name);
 			ShowErrorMessage(STR_ERROR_CAN_T_BUILD_HERE, result.GetErrorMessage(), WL_INFO, TileX(tile) * TILE_SIZE, TileY(tile) * TILE_SIZE);
+		}
+	}
+}
 /** Names of the widgets of the dynamic place industries gui */
 enum DynamicPlaceIndustriesWidgets {
 	DPIW_MATRIX_WIDGET,
@@ @@ -465,11 +485,8 @@ public: @@
 			_current_company = OWNER_NONE;
 			_generating_world = true;
 			_ignore_restrictions = true;
 			success = DoCommandP(tile, (InteractiveRandomRange(indsp->num_table) << 8) | this->selected_type, seed, CMD_BUILD_INDUSTRY | CMD_MSG(STR_ERROR_CAN_T_CONSTRUCT_THIS_INDUSTRY));
 			if (!success) {
 				SetDParam(0, indsp->name);
 				ShowErrorMessage(STR_ERROR_CAN_T_BUILD_HERE, _error_message, WL_INFO, pt.x, pt.y);
+			}
 			DoCommandP(tile, (InteractiveRandomRange(indsp->num_table) << 8) | this->selected_type, seed,
 					CMD_BUILD_INDUSTRY | CMD_MSG(STR_ERROR_CAN_T_CONSTRUCT_THIS_INDUSTRY), &CcBuildIndustry);
 			_ignore_restrictions = false;
 			_generating_world = false;

src/network/network_command.cpp

➞

Show inline comments

@@ @@ -48,6 +48,7 @@ static CommandCallback * const _callback @@
 	/* 0x15 */ CcCreateGroup,
 	/* 0x16 */ CcFoundRandomTown,
 	/* 0x17 */ CcRoadStop,
 	/* 0x18 */ CcBuildIndustry,
 };
 /** Local queue of packets */

0 comments (0 inline, 0 general)