Merge branch 'lifetime_profit-sx' into jgrpp

Conflicts:
	src/saveload/afterload.cpp
	src/saveload/extended_ver_sl.cpp
	src/saveload/extended_ver_sl.h
	src/vehicle_gui.cpp
This commit is contained in:
Jonathan G Rennison
2016-01-01 15:04:54 +00:00
8 changed files with 48 additions and 11 deletions

View File

@@ -3197,6 +3197,12 @@ bool AfterLoadGame()
}
}
/* Set lifetime vehicle profit to 0 if lifetime profit feature is missing */
if (SlXvIsFeatureMissing(XSLFI_VEH_LIFETIME_PROFIT)) {
Vehicle *v;
FOR_ALL_VEHICLES(v) v->profit_lifetime = 0;
}
/* Road stops is 'only' updating some caches */
AfterLoadRoadStops();
AfterLoadLabelMaps();