From 6849e086f5a19094129e2b7b2046421fad571774 Mon Sep 17 00:00:00 2001 From: hackykid Date: Thu, 2 Jun 2005 21:38:50 +0000 Subject: (svn r2400) - Fix: [newgrf] Load power for dual-headed engines correctly --- newgrf.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/newgrf.c b/newgrf.c index df9fbed7c..729594d36 100644 --- a/newgrf.c +++ b/newgrf.c @@ -225,6 +225,9 @@ static bool RailVehicleChangeInfo(uint engine, int numinfo, int prop, byte **buf FOR_EACH_OBJECT { uint16 power = grf_load_word(&buf); + if (rvi[i].flags & RVI_MULTIHEAD) + power /= 2; + rvi[i].power = power; 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); 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 { - rvi[i].flags &= ~1; + if (rvi[i].flags & RVI_MULTIHEAD) // adjust power if needed + rvi[i].power *= 2; + rvi[i].flags &= ~RVI_MULTIHEAD; } } } break; -- cgit v1.2.3-70-g09d2