1
0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-08-30 18:09:09 +00:00

(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
This commit is contained in:
celestar
2005-07-10 01:25:17 +00:00
parent 5286a014ec
commit b45eee3157
3 changed files with 11 additions and 4 deletions

View File

@@ -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++;
}