gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-02-03 04:43:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r15449) -Codechange: Rename DC_NO_TOWN_RATING to DC_NO_TEST_TOWN_RATING as that is what it does.

Browse Source
This commit is contained in:
frosch 2009-02-11 18:33:27 +00:00
parent 3728df8323
commit 3e3a158610
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/command_type.h
View File

@ -294,16 +294,16 @@ enum {
* This enums defines some flags which can be used for the commands. * This enums defines some flags which can be used for the commands.
*/ */
enum DoCommandFlag { enum DoCommandFlag {
DC_NONE = 0x000, ///< no flag is set DC_NONE = 0x000, ///< no flag is set
DC_EXEC = 0x001, ///< execute the given command DC_EXEC = 0x001, ///< execute the given command
DC_AUTO = 0x002, ///< don't allow building on structures DC_AUTO = 0x002, ///< don't allow building on structures
DC_QUERY_COST = 0x004, ///< query cost only, don't build. DC_QUERY_COST = 0x004, ///< query cost only, don't build.
DC_NO_WATER = 0x008, ///< don't allow building on water DC_NO_WATER = 0x008, ///< don't allow building on water
DC_NO_RAIL_OVERLAP = 0x010, ///< don't allow overlap of rails (used in buildrail) DC_NO_RAIL_OVERLAP = 0x010, ///< don't allow overlap of rails (used in buildrail)
DC_NO_TOWN_RATING = 0x020, ///< town rating does not disallow you from building DC_NO_TEST_TOWN_RATING = 0x020, ///< town rating does not disallow you from building
DC_BANKRUPT = 0x040, ///< company bankrupts, skip money check, skip vehicle on tile check in some cases DC_BANKRUPT = 0x040, ///< company bankrupts, skip money check, skip vehicle on tile check in some cases
DC_AUTOREPLACE = 0x080, ///< autoreplace/autorenew is in progress, this shall disable vehicle limits when building, and ignore certain restrictions when undoing things (like vehicle attach callback) DC_AUTOREPLACE = 0x080, ///< autoreplace/autorenew is in progress, this shall disable vehicle limits when building, and ignore certain restrictions when undoing things (like vehicle attach callback)
DC_ALL_TILES = 0x100, ///< allow this command also on MP_VOID tiles DC_ALL_TILES = 0x100, ///< allow this command also on MP_VOID tiles
}; };
DECLARE_ENUM_AS_BIT_SET(DoCommandFlag); DECLARE_ENUM_AS_BIT_SET(DoCommandFlag);

8
src/town_cmd.cpp
View File

@ -531,7 +531,7 @@ static CommandCost ClearTile_Town(TileIndex tile, DoCommandFlag flags)
Town *t = _cleared_town = GetTownByTile(tile); Town *t = _cleared_town = GetTownByTile(tile);
if (IsValidCompanyID(_current_company)) { if (IsValidCompanyID(_current_company)) {
if (rating > t->ratings[_current_company] && !(flags & DC_NO_TOWN_RATING) && !_cheats.magic_bulldozer.value) { if (rating > t->ratings[_current_company] && !(flags & DC_NO_TEST_TOWN_RATING) && !_cheats.magic_bulldozer.value) {
SetDParam(0, t->index); SetDParam(0, t->index);
return_cmd_error(STR_2009_LOCAL_AUTHORITY_REFUSES); return_cmd_error(STR_2009_LOCAL_AUTHORITY_REFUSES);
} }
@ -2495,11 +2495,11 @@ static void UpdateTownUnwanted(Town *t)
/** /**
* Checks whether the local authority allows construction of a new station (rail, road, airport, dock) on the given tile * Checks whether the local authority allows construction of a new station (rail, road, airport, dock) on the given tile
* @param tile The tile where the station shall be constructed. * @param tile The tile where the station shall be constructed.
* @param flags Command flags. DC_NO_TOWN_RATING is tested. * @param flags Command flags. DC_NO_TEST_TOWN_RATING is tested.
*/ */
bool CheckIfAuthorityAllowsNewStation(TileIndex tile, DoCommandFlag flags) bool CheckIfAuthorityAllowsNewStation(TileIndex tile, DoCommandFlag flags)
{ {
if (!IsValidCompanyID(_current_company) || (flags & DC_NO_TOWN_RATING)) return true; if (!IsValidCompanyID(_current_company) || (flags & DC_NO_TEST_TOWN_RATING)) return true;
Town *t = ClosestTownFromTile(tile, _settings_game.economy.dist_local_authority); Town *t = ClosestTownFromTile(tile, _settings_game.economy.dist_local_authority);
if (t == NULL) return true; if (t == NULL) return true;
@ -2642,7 +2642,7 @@ bool CheckforTownRating(DoCommandFlag flags, Town *t, byte type)
*/ */
int modemod = _default_rating_settings[_settings_game.difficulty.town_council_tolerance][type]; int modemod = _default_rating_settings[_settings_game.difficulty.town_council_tolerance][type];
if (GetRating(t) < 16 + modemod && !(flags & DC_NO_TOWN_RATING)) { if (GetRating(t) < 16 + modemod && !(flags & DC_NO_TEST_TOWN_RATING)) {
SetDParam(0, t->index); SetDParam(0, t->index);
_error_message = STR_2009_LOCAL_AUTHORITY_REFUSES; _error_message = STR_2009_LOCAL_AUTHORITY_REFUSES;
return false; return false;