petern/OpenTTD
1
0
Fork 0
forked from mirror/OpenTTD
Code Pull Requests Activity

(svn r2407) Use {Get,Is}TileOwner to get/check the owner of a tile and fix some bogus reads of _map_owner

Browse Source
This commit is contained in:
tron
2005-06-04 11:56:32 +00:00
parent 19e2b40a78
commit 0c4ecbe9ec
25 changed files with 118 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
station_cmd.c
View File

@@ -2103,7 +2103,7 @@ static void DrawTile_Station(TileInfo *ti)
uint32 relocation = 0;
{
uint owner = _map_owner[ti->tile];
uint owner = GetTileOwner(ti->tile);
image_or_modificator = 0x315 << 16; /* NOTE: possible bug in ttd here? */
if (owner < MAX_PLAYERS)
image_or_modificator = PLAYER_SPRITE_COLOR(owner);
@@ -2204,7 +2204,7 @@ static void GetTileDesc_Station(uint tile, TileDesc *td)
byte m5;
StringID str;
td->owner = _map_owner[tile];
td->owner = GetTileOwner(tile);
td->build_date = GetStation(_map2[tile])->build_date;
m5 = _map5[tile];
@@ -2880,8 +2880,7 @@ void DeleteOilRig(uint tile)
static void ChangeTileOwner_Station(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) {
Station *st = GetStation(_map2[tile]);