From 478e001d0e842eb0a3822b821dd34d7adbe4aeee Mon Sep 17 00:00:00 2001
From: dominik <dominik@openttd.org>
Date: Wed, 26 Jan 2005 17:36:59 +0000
Subject: (svn r1682) - Fix: [newgrf] Helicopters from grf sets are now
 correctly recognized

---
 newgrf.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'newgrf.c')

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 */
-- 
cgit v1.2.3-54-g00ecf