dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r22656) -Codechange: Deduplicate the custom error message of the industry shape and location callbacks.

Browse Source
This commit is contained in:
michi_cc
2011-07-11 16:32:19 +00:00
parent b7d1196093
commit b31cf48c3a
4 changed files with 32 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/newgrf_industrytiles.cpp
View File

@@ -303,20 +303,8 @@ CommandCost PerformIndustryTileSlopeCheck(TileIndex ind_base_tile, TileIndex ind
if (callback_res != 0) return CommandCost();
return_cmd_error(STR_ERROR_SITE_UNSUITABLE);
}
if (callback_res == 0x400) return CommandCost();
CommandCost res;
switch (callback_res) {
case 0x401: res = CommandCost(STR_ERROR_SITE_UNSUITABLE); break;
case 0x402: res = CommandCost(STR_ERROR_CAN_ONLY_BE_BUILT_IN_RAINFOREST); break;
case 0x403: res = CommandCost(STR_ERROR_CAN_ONLY_BE_BUILT_IN_DESERT); break;
default: res = CommandCost(GetGRFStringID(its->grf_prop.grffile->grfid, 0xD000 + callback_res)); break;
}
/* Copy some parameters from the registers to the error message text ref. stack */
res.UseTextRefStack(4);
return res;
return GetErrorMessageFromLocationCallbackResult(callback_res, its->grf_prop.grffile->grfid, STR_ERROR_SITE_UNSUITABLE);
}
/* Simple wrapper for GetHouseCallback to keep the animation unified. */