From 6c67bdcc71401934195e7c6fe6920a21c3b3ac71 Mon Sep 17 00:00:00 2001 From: rubidium Date: Sun, 17 Jun 2007 13:26:19 +0000 Subject: [PATCH] (svn r10180) -Fix (r10167): do not reset the 2cc loaded feature setting when a (later) newgrf does not have 2cc. --- src/newgrf.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/newgrf.cpp b/src/newgrf.cpp index 83031e5fa5..bcb09d0c9c 100644 --- a/src/newgrf.cpp +++ b/src/newgrf.cpp @@ -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;