summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortron <tron@openttd.org>2006-04-15 18:57:58 +0000
committertron <tron@openttd.org>2006-04-15 18:57:58 +0000
commitbe4293098ab2184c904f1aa2db44ae180efa9937 (patch)
treedb1e3ccb1d2948a31bc26c5fdadafc2b75f2df69
parent3e8423f5d825380a49e6e8ed7ede40b6832b00e8 (diff)
downloadopenttd-be4293098ab2184c904f1aa2db44ae180efa9937.tar.xz
(svn r4432) Make use of map access functions
-rw-r--r--oldloader.c3
-rw-r--r--openttd.c17
2 files changed, 11 insertions, 9 deletions
diff --git a/oldloader.c b/oldloader.c
index 7d01fc18b..31f2ab293 100644
--- a/oldloader.c
+++ b/oldloader.c
@@ -2,6 +2,7 @@
#include "stdafx.h"
#include "openttd.h"
+#include "station_map.h"
#include "table/strings.h"
#include "functions.h"
#include "map.h"
@@ -359,7 +360,7 @@ static void FixOldStations(void)
FOR_ALL_STATIONS(st) {
/* Check if we need to swap width and height for the station */
- if (st->train_tile != 0 && _m[st->train_tile].m5 & 1) {
+ if (st->train_tile != 0 && GetRailStationAxis(st->train_tile) != AXIS_X) {
swap_byte(&st->trainst_w, &st->trainst_h);
}
diff --git a/openttd.c b/openttd.c
index 8a97a46fa..0818b03d4 100644
--- a/openttd.c
+++ b/openttd.c
@@ -22,6 +22,7 @@
#include "gui.h"
#include "station.h"
#include "station_map.h"
+#include "town_map.h"
#include "tunnel_map.h"
#include "vehicle.h"
#include "viewport.h"
@@ -1010,9 +1011,9 @@ static void ConvertTownOwner(void)
SetCrossingRoadOwner(tile, OWNER_TOWN);
}
- if (_m[tile].m1 & 0x80) SetTileOwner(tile, OWNER_TOWN);
+ if (GetTileOwner(tile) & 0x80) SetTileOwner(tile, OWNER_TOWN);
} else if (IsTileType(tile, MP_TUNNELBRIDGE)) {
- if (_m[tile].m1 & 0x80) SetTileOwner(tile, OWNER_TOWN);
+ if (GetTileOwner(tile) & 0x80) SetTileOwner(tile, OWNER_TOWN);
}
}
}
@@ -1209,7 +1210,7 @@ bool AfterLoadGame(void)
_m[tile].m2 = ClosestTownFromTile(tile,(uint)-1)->index;
SetTileType(tile, MP_STREET);
} else {
- _m[tile].m2 = 0;
+ SetTownIndex(tile, 0);
}
}
} END_TILE_LOOP(tile, MapSizeX(), MapSizeY(), 0);
@@ -1277,26 +1278,26 @@ bool AfterLoadGame(void)
break;
case MP_STATION:
- if (IsRailwayStation(t) && (GB(_m[t].m3, 0, 4) > RAILTYPE_RAIL || make_elrail)) AB(_m[t].m3, 0, 4, 1);
+ if (IsRailwayStation(t) && (GetRailType(t) > RAILTYPE_RAIL || make_elrail)) AB(_m[t].m3, 0, 4, 1);
break;
case MP_TUNNELBRIDGE:
if (IsTunnel(t)) {
if (GetTunnelTransportType(t) == TRANSPORT_RAIL) {
- if (GB(_m[t].m3, 0, 4) > RAILTYPE_RAIL || make_elrail) AB(_m[t].m3, 0, 4, 1);
+ if (GetRailType(t) > RAILTYPE_RAIL || make_elrail) AB(_m[t].m3, 0, 4, 1);
}
} else {
if (GetBridgeTransportType(t) == TRANSPORT_RAIL) {
if (IsBridgeRamp(t)) {
- if (GB(_m[t].m3, 0, 4) > RAILTYPE_RAIL || make_elrail) AB(_m[t].m3, 0, 4, 1);
+ if (GetRailType(t) > RAILTYPE_RAIL || make_elrail) AB(_m[t].m3, 0, 4, 1);
} else {
- if (GB(_m[t].m3, 4, 4) > RAILTYPE_RAIL || make_elrail) AB(_m[t].m3, 4, 4, 1);
+ if (GetRailTypeOnBridge(t) > RAILTYPE_RAIL || make_elrail) AB(_m[t].m3, 4, 4, 1);
}
}
if (IsBridgeMiddle(t) &&
IsTransportUnderBridge(t) &&
GetTransportTypeUnderBridge(t) == TRANSPORT_RAIL) {
- if (GB(_m[t].m3, 0, 4) > RAILTYPE_RAIL || make_elrail) AB(_m[t].m3, 0, 4, 1);
+ if (GetRailType(t) > RAILTYPE_RAIL || make_elrail) AB(_m[t].m3, 0, 4, 1);
}
}
break;