diff options
| author | tron <tron@openttd.org> | 2005-06-04 11:56:32 +0000 |
|---|---|---|
| committer | tron <tron@openttd.org> | 2005-06-04 11:56:32 +0000 |
| commit | 0c4ecbe9ece42d071a4f4e4b6d506be32030cb4c (patch) | |
| tree | 172ef15bca6626b797fbf586a043a978ee884141 /water_cmd.c | |
| parent | 19e2b40a788cc175f35e4ca0cec0f439bd46ab76 (diff) | |
| download | openttd-0c4ecbe9ece42d071a4f4e4b6d506be32030cb4c.tar.xz | |
(svn r2407) Use {Get,Is}TileOwner to get/check the owner of a tile and fix some bogus reads of _map_owner
Diffstat (limited to 'water_cmd.c')
| -rw-r--r-- | water_cmd.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/water_cmd.c b/water_cmd.c index b7555ec9c..5c476f8c6 100644 --- a/water_cmd.c +++ b/water_cmd.c @@ -421,7 +421,7 @@ static void DrawTile_Water(TileInfo *ti) return; } - DrawWaterStuff(ti, _shipdepot_display_seq[ti->map5 & 0x7F], PLAYER_SPRITE_COLOR(_map_owner[ti->tile]), 0); + DrawWaterStuff(ti, _shipdepot_display_seq[ti->map5 & 0x7F], PLAYER_SPRITE_COLOR(GetTileOwner(ti->tile)), 0); } void DrawShipDepotSprite(int x, int y, int image) @@ -465,7 +465,7 @@ static void GetTileDesc_Water(uint tile, TileDesc *td) else td->str = STR_3806_SHIP_DEPOT; - td->owner = _map_owner[tile]; + td->owner = GetTileOwner(tile); } static void AnimateTile_Water(uint tile) @@ -686,8 +686,7 @@ static void ClickTile_Water(uint tile) static void ChangeTileOwner_Water(uint tile, byte old_player, byte new_player) { - if (_map_owner[tile] != old_player) - return; + if (!IsTileOwner(tile, old_player)) return; if (new_player != 255) { _map_owner[tile] = new_player; |