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

(svn r3820) Be a bit more strict with types: use special types instead of generic byte and don't fill arbitrary data into inappropriate types

Browse Source
This commit is contained in:
tron
2006-03-11 17:06:16 +00:00
parent 929fae7b68
commit e63e3bb84c
2 changed files with 23 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
smallmap_gui.c
View File

@@ -11,6 +11,7 @@
#include "tile.h"
#include "gui.h"
#include "tree_map.h"
#include "tunnel_map.h"
#include "window.h"
#include "gfx.h"
#include "viewport.h"
@@ -345,12 +346,17 @@ static inline TileType GetEffectiveTileType(TileIndex tile)
TileType t = GetTileType(tile);
if (t == MP_TUNNELBRIDGE) {
t = _m[tile].m5;
if ((t & 0x80) == 0) t >>= 1;
switch (t & 0x06) {
case 0x00: t = MP_RAILWAY; break;
case 0x02: t = MP_STREET; break;
default: t = MP_WATER; break;
TransportType tt;
if (_m[tile].m5 & 0x80) {
tt = GB(_m[tile].m5, 1, 2);
} else {
tt = GetTunnelTransportType(tile);
}
switch (tt) {
case TRANSPORT_RAIL: t = MP_RAILWAY; break;
case TRANSPORT_ROAD: t = MP_STREET; break;
default: t = MP_WATER; break;
}
}
return t;