diff options
| -rw-r--r-- | src/object.h | 4 | ||||
| -rw-r--r-- | src/object_cmd.cpp | 15 | ||||
| -rw-r--r-- | src/town_cmd.cpp | 2 |
3 files changed, 10 insertions, 11 deletions
diff --git a/src/object.h b/src/object.h index bb2afd60c..f07ab3039 100644 --- a/src/object.h +++ b/src/object.h @@ -28,11 +28,11 @@ void UpdateCompanyHQ(TileIndex tile, uint score); * @param type The type of object to build. * @param tile The tile to build the northern tile of the object on. * @param owner The owner of the object. - * @param index A (generic) index to be stored on the tile, e.g. TownID for statues. + * @param town Town the tile is related with. * @pre All preconditions for building the object at that location * are met, e.g. slope and clearness of tiles are checked. */ -void BuildObject(ObjectType type, TileIndex tile, CompanyID owner = OWNER_NONE, uint index = 0); +void BuildObject(ObjectType type, TileIndex tile, CompanyID owner = OWNER_NONE, struct Town *town = NULL); /** Various object behaviours. */ diff --git a/src/object_cmd.cpp b/src/object_cmd.cpp index 4457b8459..3b15a95e0 100644 --- a/src/object_cmd.cpp +++ b/src/object_cmd.cpp @@ -46,14 +46,14 @@ return ObjectSpec::Get(GetObjectType(tile)); } -void BuildObject(ObjectType type, TileIndex tile, CompanyID owner, uint index) +void BuildObject(ObjectType type, TileIndex tile, CompanyID owner, Town *town) { const ObjectSpec *spec = ObjectSpec::Get(type); TileArea ta(tile, GB(spec->size, 0, 4), GB(spec->size, 4, 4)); TILE_AREA_LOOP(t, ta) { TileIndex offset = t - tile; - MakeObject(t, type, owner, TileY(offset) << 4 | TileX(offset), index, WATER_CLASS_INVALID); + MakeObject(t, type, owner, TileY(offset) << 4 | TileX(offset), town == NULL ? 0 : town->index, WATER_CLASS_INVALID); MarkTileDirtyByTile(t); } } @@ -299,9 +299,9 @@ static CommandCost ClearTile_Object(TileIndex tile, DoCommandFlag flags) case OBJECT_STATUE: if (flags & DC_EXEC) { - TownID town = GetStatueTownID(tile); - ClrBit(Town::Get(town)->statues, GetTileOwner(tile)); - SetWindowDirty(WC_TOWN_AUTHORITY, town); + Town *t = Town::Get(GetStatueTownID(tile)); + ClrBit(t->statues, GetTileOwner(tile)); + SetWindowDirty(WC_TOWN_AUTHORITY, t->index); } break; @@ -492,8 +492,7 @@ static void ChangeTileOwner_Object(TileIndex tile, Owner old_owner, Owner new_ow if (IsOwnedLand(tile) && new_owner != INVALID_OWNER) { SetTileOwner(tile, new_owner); } else if (IsStatueTile(tile)) { - TownID town = GetStatueTownID(tile); - Town *t = Town::Get(town); + Town *t = Town::Get(GetStatueTownID(tile)); ClrBit(t->statues, old_owner); if (new_owner != INVALID_OWNER && !HasBit(t->statues, new_owner)) { /* Transfer ownership to the new company */ @@ -503,7 +502,7 @@ static void ChangeTileOwner_Object(TileIndex tile, Owner old_owner, Owner new_ow DoClearSquare(tile); } - SetWindowDirty(WC_TOWN_AUTHORITY, town); + SetWindowDirty(WC_TOWN_AUTHORITY, t->index); } else { DoClearSquare(tile); } diff --git a/src/town_cmd.cpp b/src/town_cmd.cpp index 538037142..d3b1dcfae 100644 --- a/src/town_cmd.cpp +++ b/src/town_cmd.cpp @@ -2507,7 +2507,7 @@ static CommandCost TownActionBuildStatue(Town *t, DoCommandFlag flags) Backup<CompanyByte> cur_company(_current_company, OWNER_NONE, FILE_LINE); DoCommand(tile, 0, 0, DC_EXEC, CMD_LANDSCAPE_CLEAR); cur_company.Restore(); - BuildObject(OBJECT_STATUE, tile, _current_company, t->index); + BuildObject(OBJECT_STATUE, tile, _current_company, t); SetBit(t->statues, _current_company); // Once found and built, "inform" the Town. MarkTileDirtyByTile(tile); } |