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

(svn r14812) -Codechange: use INVALID_TILE instead of 0 to mark company without HQ

Browse Source
This commit is contained in:
smatz
2009-01-03 17:11:52 +00:00
parent 6512d717e1
commit afef22e3e7
8 changed files with 23 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/unmovable_cmd.cpp
View File

@@ -51,7 +51,7 @@ static CommandCost DestroyCompanyHQ(CompanyID cid, uint32 flags)
DoClearSquare(t + TileDiffXY(0, 1));
DoClearSquare(t + TileDiffXY(1, 0));
DoClearSquare(t + TileDiffXY(1, 1));
c->location_of_HQ = 0; // reset HQ position
c->location_of_HQ = INVALID_TILE; // reset HQ position
InvalidateWindow(WC_COMPANY, cid);
}
@@ -64,7 +64,7 @@ void UpdateCompanyHQ(Company *c, uint score)
byte val;
TileIndex tile = c->location_of_HQ;
if (tile == 0) return;
if (tile == INVALID_TILE) return;
(val = 0, score < 170) ||
(val++, score < 350) ||
@@ -96,7 +96,7 @@ CommandCost CmdBuildCompanyHQ(TileIndex tile, uint32 flags, uint32 p1, uint32 p2
cost = CheckFlatLandBelow(tile, 2, 2, flags, 0, NULL);
if (CmdFailed(cost)) return cost;
if (c->location_of_HQ != 0) { // Moving HQ
if (c->location_of_HQ != INVALID_TILE) { // Moving HQ
cost.AddCost(DestroyCompanyHQ(_current_company, flags));
}