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

(svn r16327) -Codechange: replace IsValidPoolItemID(index) by PoolItem::IsValidID(index)

Browse Source
This commit is contained in:
smatz
2009-05-17 01:00:56 +00:00
parent cf986c3099
commit 0c10daa243
78 changed files with 242 additions and 303 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/economy.cpp
View File

@@ -1891,7 +1891,7 @@ CommandCost CmdBuyShareInCompany(TileIndex tile, DoCommandFlag flags, uint32 p1,
/* Check if buying shares is allowed (protection against modified clients)
* Cannot buy own shares */
if (!IsValidCompanyID((CompanyID)p1) || !_settings_game.economy.allow_shares || _current_company == (CompanyID)p1) return CMD_ERROR;
if (!Company::IsValidID((CompanyID)p1) || !_settings_game.economy.allow_shares || _current_company == (CompanyID)p1) return CMD_ERROR;
Company *c = Company::Get((CompanyID)p1);
@@ -1934,7 +1934,7 @@ CommandCost CmdSellShareInCompany(TileIndex tile, DoCommandFlag flags, uint32 p1
{
/* Check if selling shares is allowed (protection against modified clients)
* Cannot sell own shares */
if (!IsValidCompanyID((CompanyID)p1) || !_settings_game.economy.allow_shares || _current_company == (CompanyID)p1) return CMD_ERROR;
if (!Company::IsValidID((CompanyID)p1) || !_settings_game.economy.allow_shares || _current_company == (CompanyID)p1) return CMD_ERROR;
Company *c = Company::Get((CompanyID)p1);
@@ -1968,7 +1968,7 @@ CommandCost CmdBuyCompany(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32
CompanyID cid = (CompanyID)p1;
/* Disable takeovers in multiplayer games */
if (!IsValidCompanyID(cid) || _networking) return CMD_ERROR;
if (!Company::IsValidID(cid) || _networking) return CMD_ERROR;
/* Do not allow companies to take over themselves */
if (cid == _current_company) return CMD_ERROR;