Merge branch 'master' into dev

This commit is contained in:
Silent 2018-05-28 13:12:24 +02:00
commit f9a9404fd0
No known key found for this signature in database
GPG Key ID: AE53149BB0C45AF1

View File

@ -126,7 +126,7 @@ namespace SVF {
if ( feature == Feature::NO_FEATURE ) return; if ( feature == Feature::NO_FEATURE ) return;
for ( auto it = specialVehFeatures.begin(); it != specialVehFeatures.end(); ) for ( auto it = specialVehFeatures.begin(); it != specialVehFeatures.end(); )
{ {
if ( std::get<int32_t>(it->second) <= highestStockCookie ) if ( std::get<Feature>(it->second) == feature && std::get<int32_t>(it->second) <= highestStockCookie )
{ {
it = specialVehFeatures.erase( it ); it = specialVehFeatures.erase( it );
} }