dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r2400) - Fix: [newgrf] Load power for dual-headed engines correctly

Browse Source
This commit is contained in:
hackykid
2005-06-02 21:38:50 +00:00
parent e8c6b8feca
commit 3f3cbea5c4
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
newgrf.c
View File

@@ -225,6 +225,9 @@ static bool RailVehicleChangeInfo(uint engine, int numinfo, int prop, byte **buf
FOR_EACH_OBJECT { FOR_EACH_OBJECT {
uint16 power = grf_load_word(&buf); uint16 power = grf_load_word(&buf);
if (rvi[i].flags & RVI_MULTIHEAD)
power /= 2;
rvi[i].power = power; rvi[i].power = power;
dewagonize(power, engine + i); dewagonize(power, engine + i);
} }
@@ -269,9 +272,13 @@ static bool RailVehicleChangeInfo(uint engine, int numinfo, int prop, byte **buf
uint8 dual = grf_load_byte(&buf); uint8 dual = grf_load_byte(&buf);
if (dual != 0) { if (dual != 0) {
rvi[i].flags |= 1; if (!(rvi[i].flags & RVI_MULTIHEAD)) // adjust power if needed
rvi[i].power /= 2;
rvi[i].flags |= RVI_MULTIHEAD;
} else { } else {
rvi[i].flags &= ~1; if (rvi[i].flags & RVI_MULTIHEAD) // adjust power if needed
rvi[i].power *= 2;
rvi[i].flags &= ~RVI_MULTIHEAD;
} }
} }
} break; } break;