Merge branch 'improved_breakdowns-sx' into jgrpp

# Conflicts: # src/saveload/extended_ver_sl.cpp # src/settings.cpp
2016-02-02 23:09:29 +00:00
parent 41e0d65d6a 6890e0af35
commit 31a5baf555
17 changed files with 144 additions and 86 deletions
--- a/src/vehicle_base.h
+++ b/src/vehicle_base.h
@@ -210,6 +210,7 @@ public:

 	byte breakdown_severity;            ///< severity of the breakdown. Note that lower means more severe
 	byte breakdown_type;                ///< Type of breakdown
+	byte breakdown_chance_factor;       ///< Improved breakdowns: current multiplier for breakdown_chance * 128, used for head vehicle only
 	SpriteID colourmap;                 ///< NOSAVE: cached colour mapping

 	/* Related to age and service time */