summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordominik <dominik@openttd.org>2005-01-26 17:36:59 +0000
committerdominik <dominik@openttd.org>2005-01-26 17:36:59 +0000
commit478e001d0e842eb0a3822b821dd34d7adbe4aeee (patch)
tree3a7b62ffa4793f997a49ebe817e6b12cef60d308
parentefcd72a2efdc04c87e4ea579355a446b65c0f9fb (diff)
downloadopenttd-478e001d0e842eb0a3822b821dd34d7adbe4aeee.tar.xz
(svn r1682) - Fix: [newgrf] Helicopters from grf sets are now correctly recognized
-rw-r--r--newgrf.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/newgrf.c b/newgrf.c
index 4d9113087..70bfdb5ab 100644
--- a/newgrf.c
+++ b/newgrf.c
@@ -589,15 +589,15 @@ static bool AircraftVehicleChangeInfo(uint engine, int numinfo, int prop, byte *
case 0x09: { /* Helicopter */
FOR_EACH_OBJECT {
uint8 heli = grf_load_byte(&buf);
-
- avi[i].subtype = (heli == 0) ? 0 : 1;
+ avi[i].subtype &= ~0x01; // remove old property
+ avi[i].subtype &= (heli == 0) ? 0 : 1;
}
} break;
case 0x0A: { /* Large */
FOR_EACH_OBJECT {
uint8 large = grf_load_byte(&buf);
-
- avi[i].subtype = (large == 1) ? 3 : 1;
+ avi[i].subtype &= ~0x02; // remove old property
+ avi[i].subtype &= (large == 1) ? 2 : 0;
}
} break;
case 0x0B: { /* Cost factor */