From 08898f69bebd4ed5fc866aeb31406cc512ed7fcf Mon Sep 17 00:00:00 2001 From: belugas Date: Mon, 25 Aug 2008 16:10:34 +0000 Subject: (svn r14169) -Codechange: rename location_of_house for location_of_HQ, which is more exact and less subject to interpretation --- src/unmovable_cmd.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/unmovable_cmd.cpp') diff --git a/src/unmovable_cmd.cpp b/src/unmovable_cmd.cpp index 38098399c..9e8a8ad93 100644 --- a/src/unmovable_cmd.cpp +++ b/src/unmovable_cmd.cpp @@ -45,13 +45,13 @@ static CommandCost DestroyCompanyHQ(PlayerID pid, uint32 flags) Player *p = GetPlayer(pid); if (flags & DC_EXEC) { - TileIndex t = p->location_of_house; + TileIndex t = p->location_of_HQ; DoClearSquare(t + TileDiffXY(0, 0)); DoClearSquare(t + TileDiffXY(0, 1)); DoClearSquare(t + TileDiffXY(1, 0)); DoClearSquare(t + TileDiffXY(1, 1)); - p->location_of_house = 0; // reset HQ position + p->location_of_HQ = 0; // reset HQ position InvalidateWindow(WC_COMPANY, pid); } @@ -62,7 +62,7 @@ static CommandCost DestroyCompanyHQ(PlayerID pid, uint32 flags) void UpdateCompanyHQ(Player *p, uint score) { byte val; - TileIndex tile = p->location_of_house; + TileIndex tile = p->location_of_HQ; if (tile == 0) return; @@ -96,14 +96,14 @@ CommandCost CmdBuildCompanyHQ(TileIndex tile, uint32 flags, uint32 p1, uint32 p2 cost = CheckFlatLandBelow(tile, 2, 2, flags, 0, NULL); if (CmdFailed(cost)) return cost; - if (p->location_of_house != 0) { // Moving HQ + if (p->location_of_HQ != 0) { // Moving HQ cost.AddCost(DestroyCompanyHQ(_current_player, flags)); } if (flags & DC_EXEC) { int score = UpdateCompanyRatingAndValue(p, false); - p->location_of_house = tile; + p->location_of_HQ = tile; MakeCompanyHQ(tile, _current_player); -- cgit v1.2.3-54-g00ecf