summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcelestar <celestar@openttd.org>2005-07-10 01:25:17 +0000
committercelestar <celestar@openttd.org>2005-07-10 01:25:17 +0000
commit84faec4c4341a2310d9e97bc75170231ba5b1d43 (patch)
tree4d36e1b0eda6ff1c3c42c8febff1fa7cf3ae7484
parent92a89005185d78932f6427ba27bf7d36c9aff20d (diff)
downloadopenttd-84faec4c4341a2310d9e97bc75170231ba5b1d43.tar.xz
(svn r2541) -Feature: Modified IsCompatibleRail so that an engine can move on more
than one railtype (like Diesel engines on electrified rail). -Codechange: Use IsCompatibleRail where it should be used
-rw-r--r--rail.h8
-rw-r--r--train_cmd.c3
-rw-r--r--train_gui.c4
3 files changed, 11 insertions, 4 deletions
diff --git a/rail.h b/rail.h
index d8611787e..65d25a850 100644
--- a/rail.h
+++ b/rail.h
@@ -505,7 +505,13 @@ static inline TransportType GetCrossingTransportType(TileIndex tile, Track track
*/
static inline bool IsCompatibleRail(RailType enginetype, RailType tiletype)
{
- return enginetype == tiletype;
+ static const bool EquivRailTypes[RAILTYPE_END][RAILTYPE_END] = {
+ { true, false, false },
+ { false, true, false },
+ { false, false, true },
+ };
+
+ return EquivRailTypes[enginetype][tiletype];
}
#endif // RAIL_H
diff --git a/train_cmd.c b/train_cmd.c
index d8ac7a051..b23c6e9e4 100644
--- a/train_cmd.c
+++ b/train_cmd.c
@@ -2542,7 +2542,8 @@ static bool CheckCompatibleRail(const Vehicle *v, TileIndex tile)
return
IsTileOwner(tile, v->owner) &&
- (v->subtype != TS_Front_Engine || (_map3_lo[tile] & 0xF) == v->u.rail.railtype);
+ (v->subtype != TS_Front_Engine ||
+ IsCompatibleRail(v->u.rail.railtype, GetRailType(tile)));
}
typedef struct {
diff --git a/train_gui.c b/train_gui.c
index fe0492646..5d070244d 100644
--- a/train_gui.c
+++ b/train_gui.c
@@ -160,7 +160,7 @@ static void engine_drawing_loop(int *x, int *y, int *pos, int *sel,
const Engine *e = GetEngine(i);
const RailVehicleInfo *rvi = RailVehInfo(i);
- if (e->railtype != railtype || !(rvi->flags & RVI_WAGON) != is_engine ||
+ if (!IsCompatibleRail(railtype, e->railtype) || !(rvi->flags & RVI_WAGON) != is_engine ||
!HASBIT(e->player_avail, _local_player))
continue;
@@ -192,7 +192,7 @@ static void NewRailVehicleWndProc(Window *w, WindowEvent *e)
for (i = 0; i < NUM_TRAIN_ENGINES; i++) {
const Engine *e = GetEngine(i);
- if (e->railtype == railtype
+ if (IsCompatibleRail(railtype, e->railtype)
&& HASBIT(e->player_avail, _local_player))
count++;
}