mirror of
https://github.com/OpenTTD/OpenTTD.git
synced 2025-08-31 10:29:10 +00:00
(svn r10180) -Fix (r10167): do not reset the 2cc loaded feature setting when a (later) newgrf does not have 2cc.
This commit is contained in:
@@ -539,7 +539,7 @@ static bool RailVehicleChangeInfo(uint engine, int numinfo, int prop, byte **buf
|
||||
case 0x27: // Miscellaneous flags
|
||||
FOR_EACH_OBJECT {
|
||||
ei[i].misc_flags = grf_load_byte(&buf);
|
||||
_loaded_newgrf_features.has_2CC = HASBIT(ei[i].misc_flags, EF_USES_2CC);
|
||||
_loaded_newgrf_features.has_2CC |= HASBIT(ei[i].misc_flags, EF_USES_2CC);
|
||||
}
|
||||
break;
|
||||
|
||||
@@ -661,7 +661,7 @@ static bool RoadVehicleChangeInfo(uint engine, int numinfo, int prop, byte **buf
|
||||
case 0x1C: // Miscellaneous flags
|
||||
FOR_EACH_OBJECT {
|
||||
ei[i].misc_flags = grf_load_byte(&buf);
|
||||
_loaded_newgrf_features.has_2CC = HASBIT(ei[i].misc_flags, EF_USES_2CC);
|
||||
_loaded_newgrf_features.has_2CC |= HASBIT(ei[i].misc_flags, EF_USES_2CC);
|
||||
}
|
||||
break;
|
||||
|
||||
@@ -772,7 +772,7 @@ static bool ShipVehicleChangeInfo(uint engine, int numinfo, int prop, byte **buf
|
||||
case 0x17: // Miscellaneous flags
|
||||
FOR_EACH_OBJECT {
|
||||
ei[i].misc_flags = grf_load_byte(&buf);
|
||||
_loaded_newgrf_features.has_2CC = HASBIT(ei[i].misc_flags, EF_USES_2CC);
|
||||
_loaded_newgrf_features.has_2CC |= HASBIT(ei[i].misc_flags, EF_USES_2CC);
|
||||
}
|
||||
break;
|
||||
|
||||
@@ -888,7 +888,7 @@ static bool AircraftVehicleChangeInfo(uint engine, int numinfo, int prop, byte *
|
||||
case 0x17: // Miscellaneous flags
|
||||
FOR_EACH_OBJECT {
|
||||
ei[i].misc_flags = grf_load_byte(&buf);
|
||||
_loaded_newgrf_features.has_2CC = HASBIT(ei[i].misc_flags, EF_USES_2CC);
|
||||
_loaded_newgrf_features.has_2CC |= HASBIT(ei[i].misc_flags, EF_USES_2CC);
|
||||
}
|
||||
break;
|
||||
|
||||
|
Reference in New Issue
Block a user