(svn r1682) - Fix: [newgrf] Helicopters from grf sets are now correctly recognized

20 years ago · f20758441c
parent ccd4f53a34
commit f20758441c
1 changed files with 4 additions and 4 deletions
--- 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 */