Merge branch 'master' into save_ext

2017-03-28 02:26:13 +01:00
parent c4e06808a2 065a0547e2
commit f58fe00294
79 changed files with 468 additions and 168 deletions
--- a/src/saveload/vehicle_sl.cpp
+++ b/src/saveload/vehicle_sl.cpp
@@ -375,6 +375,8 @@ void AfterLoadVehicles(bool part_of_load)
 	FOR_ALL_VEHICLES(v) {
 		assert(v->first != NULL);

+		v->trip_occupancy = CalcPercentVehicleFilled(v, NULL);
+
 		switch (v->type) {
 			case VEH_TRAIN: {
 				Train *t = Train::From(v);