From 84faec4c4341a2310d9e97bc75170231ba5b1d43 Mon Sep 17 00:00:00 2001 From: celestar Date: Sun, 10 Jul 2005 01:25:17 +0000 Subject: (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 --- train_gui.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'train_gui.c') 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++; } -- cgit v1.2.3-54-g00ecf