summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2009-09-10 14:27:43 +0000
committerrubidium <rubidium@openttd.org>2009-09-10 14:27:43 +0000
commitbb94724a092750794e8c2ad1a6537fac6b902b9e (patch)
tree53e2fad2517d84d432e7f047445e888643e15c67 /src
parent96e2435aa827b9e4af60b7c87fd8da38f9b87cc2 (diff)
downloadopenttd-bb94724a092750794e8c2ad1a6537fac6b902b9e.tar.xz
(svn r17492) -Codechange: don't store the town index for road depots.
Diffstat (limited to 'src')
-rw-r--r--src/road_cmd.cpp2
-rw-r--r--src/road_map.h4
-rw-r--r--src/saveload/afterload.cpp2
-rw-r--r--src/town_map.h11
4 files changed, 9 insertions, 10 deletions
diff --git a/src/road_cmd.cpp b/src/road_cmd.cpp
index d3c865e35..05e1ef571 100644
--- a/src/road_cmd.cpp
+++ b/src/road_cmd.cpp
@@ -882,7 +882,7 @@ CommandCost CmdBuildRoadDepot(TileIndex tile, DoCommandFlag flags, uint32 p1, ui
Depot *dep = new Depot(tile);
dep->town_index = ClosestTownFromTile(tile, UINT_MAX)->index;
- MakeRoadDepot(tile, _current_company, dir, rt, dep->town_index);
+ MakeRoadDepot(tile, _current_company, dir, rt);
MarkTileDirtyByTile(tile);
}
return cost.AddCost(_price.build_road_depot);
diff --git a/src/road_map.h b/src/road_map.h
index 6dba8e420..04e87f1b9 100644
--- a/src/road_map.h
+++ b/src/road_map.h
@@ -407,11 +407,11 @@ static inline void MakeRoadCrossing(TileIndex t, Owner road, Owner tram, Owner r
}
-static inline void MakeRoadDepot(TileIndex t, Owner owner, DiagDirection dir, RoadType rt, TownID town)
+static inline void MakeRoadDepot(TileIndex t, Owner owner, DiagDirection dir, RoadType rt)
{
SetTileType(t, MP_ROAD);
SetTileOwner(t, owner);
- _m[t].m2 = town;
+ _m[t].m2 = 0;
_m[t].m3 = 0;
_m[t].m4 = 0;
_m[t].m5 = ROAD_TILE_DEPOT << 6 | dir;
diff --git a/src/saveload/afterload.cpp b/src/saveload/afterload.cpp
index afdbd4151..4a122d005 100644
--- a/src/saveload/afterload.cpp
+++ b/src/saveload/afterload.cpp
@@ -842,7 +842,7 @@ bool AfterLoadGame()
case ROAD_TILE_DEPOT:
break;
}
- if (!HasTownOwnedRoad(t)) {
+ if (!IsRoadDepot(t) && !HasTownOwnedRoad(t)) {
const Town *town = CalcClosestTownFromTile(t);
if (town != NULL) SetTownIndex(t, town->index);
}
diff --git a/src/town_map.h b/src/town_map.h
index 3ac810cb4..2fd38b210 100644
--- a/src/town_map.h
+++ b/src/town_map.h
@@ -12,32 +12,31 @@
#ifndef TOWN_MAP_H
#define TOWN_MAP_H
-#include "tile_map.h"
+#include "road_map.h"
#include "town_type.h"
#include "house.h"
/**
* Get the index of which town this house/street is attached to.
* @param t the tile
- * @pre IsTileType(t, MP_HOUSE) or IsTileType(t, MP_ROAD)
+ * @pre IsTileType(t, MP_HOUSE) or IsTileType(t, MP_ROAD) but not a road depot
* @return TownID
*/
static inline TownID GetTownIndex(TileIndex t)
{
- assert(IsTileType(t, MP_HOUSE) || IsTileType(t, MP_ROAD)); // XXX incomplete
+ assert(IsTileType(t, MP_HOUSE) || (IsTileType(t, MP_ROAD) && !IsRoadDepot(t)));
return _m[t].m2;
}
/**
* Set the town index for a road or house tile.
* @param t the tile
- * @pre IsTileType(t, MP_HOUSE) or IsTileType(t, MP_ROAD)
* @param index the index of the town
- * @pre IsTileType(t, MP_ROAD) || IsTileType(t, MP_HOUSE)
+ * @pre IsTileType(t, MP_HOUSE) or IsTileType(t, MP_ROAD) but not a road depot
*/
static inline void SetTownIndex(TileIndex t, TownID index)
{
- assert(IsTileType(t, MP_HOUSE) || IsTileType(t, MP_ROAD));
+ assert(IsTileType(t, MP_HOUSE) || (IsTileType(t, MP_ROAD) && !IsRoadDepot(t)));
_m[t].m2 = index;
}