dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'improved_breakdowns-sx' into jgrpp

Browse Source 
Conflicts:
	src/saveload/extended_ver_sl.cpp
	src/saveload/extended_ver_sl.h
	src/settings_type.h
This commit is contained in:
Jonathan G Rennison
2015-08-02 23:43:19 +01:00
parent b6a1866ded a8a726464c
commit a8c2c394a5
24 changed files with 790 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/vehicle_base.h
View File

@@ -194,6 +194,8 @@ public:
Vehicle **hash_tile_prev; ///< NOSAVE: Previous vehicle in the tile location hash.
Vehicle **hash_tile_current; ///< NOSAVE: Cache of the current hash chain.
byte breakdown_severity; ///< severity of the breakdown. Note that lower means more severe
byte breakdown_type; ///< Type of breakdown
SpriteID colourmap; ///< NOSAVE: cached colour mapping
/* Related to age and service time */