gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-01-31 03:12:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r3967) - Fix: Properly set back the owner of a crossing/road-under bridge after removing it. For crossings we can always use .m2 because it is already 0 when not owned by a town. Backport of r3876, r3893 from trunk

Browse Source
This commit is contained in:
Darkvater 2006-03-18 16:00:02 +00:00
parent 6b664a3ba0
commit 5de94db9df
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
rail_cmd.c
View File

@ -451,7 +451,6 @@ int32 CmdRemoveSingleRail(int x, int y, uint32 flags, uint32 p1, uint32 p2)
_m[tile].m5 = m5;
SetTileOwner(tile, _m[tile].m3);
_m[tile].m2 = 0;
break;
case MP_RAILWAY:

4
tunnelbridge_cmd.c
View File

@ -803,6 +803,8 @@ static int32 DoClearBridge(TileIndex tile, uint32 flags)
m5 = _m[c].m5;
if (m5 & 0x40) {
uint town = IsTileOwner(c, OWNER_TOWN) ? ClosestTownFromTile(c, (uint)-1)->index : 0;
if (m5 & 0x20) {
static const uint16 _new_data_table[] = {0x1002, 0x1001, 0x2005, 0x200A, 0, 0, 0, 0};
new_data = _new_data_table[((m5 & 0x18) >> 2) | (m5 & 1)];
@ -813,7 +815,7 @@ static int32 DoClearBridge(TileIndex tile, uint32 flags)
SetTileType(c, new_data >> 12);
_m[c].m5 = (byte)new_data;
_m[c].m2 = 0;
_m[c].m2 = town;
_m[c].m4 &= 0x0F;
MarkTileDirtyByTile(c);