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

@@ -3124,6 +3124,7 @@ void VehiclesYearlyLoop()
}
v->profit_last_year = v->profit_this_year;
v->profit_lifetime += v->profit_this_year;
v->profit_this_year = 0;
SetWindowDirty(WC_VEHICLE_DETAILS, v->index);
}