dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r10180) -Fix (r10167): do not reset the 2cc loaded feature setting when a (later) newgrf does not have 2cc.

Browse Source
This commit is contained in:
rubidium
2007-06-17 13:26:19 +00:00
parent 1f0513ae51
commit 6c67bdcc71
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/newgrf.cpp
View File

@@ -539,7 +539,7 @@ static bool RailVehicleChangeInfo(uint engine, int numinfo, int prop, byte **buf
case 0x27: // Miscellaneous flags case 0x27: // Miscellaneous flags
FOR_EACH_OBJECT { FOR_EACH_OBJECT {
ei[i].misc_flags = grf_load_byte(&buf); 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; break;
@@ -661,7 +661,7 @@ static bool RoadVehicleChangeInfo(uint engine, int numinfo, int prop, byte **buf
case 0x1C: // Miscellaneous flags case 0x1C: // Miscellaneous flags
FOR_EACH_OBJECT { FOR_EACH_OBJECT {
ei[i].misc_flags = grf_load_byte(&buf); 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; break;
@@ -772,7 +772,7 @@ static bool ShipVehicleChangeInfo(uint engine, int numinfo, int prop, byte **buf
case 0x17: // Miscellaneous flags case 0x17: // Miscellaneous flags
FOR_EACH_OBJECT { FOR_EACH_OBJECT {
ei[i].misc_flags = grf_load_byte(&buf); 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; break;
@@ -888,7 +888,7 @@ static bool AircraftVehicleChangeInfo(uint engine, int numinfo, int prop, byte *
case 0x17: // Miscellaneous flags case 0x17: // Miscellaneous flags
FOR_EACH_OBJECT { FOR_EACH_OBJECT {
ei[i].misc_flags = grf_load_byte(&buf); 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; break;