Merge branch 'tracerestrict-sx' into jgrpp

# Conflicts: # src/lang/english.txt # src/settings_gui.cpp # src/settings_type.h # src/table/settings.ini # src/vehicle_gui.cpp
2016-07-05 22:34:50 +01:00
parent f3e0da1e63 ed33a62bcd
commit f0fee802a9
14 changed files with 346 additions and 28 deletions
--- a/src/table/control_codes.h
+++ b/src/table/control_codes.h
@@ -62,6 +62,9 @@ enum StringControlCode {
 	SCC_VELOCITY,
 	SCC_HEIGHT,

+	SCC_POWER_WEIGHT_RATIO,
+	SCC_FORCE_WEIGHT_RATIO,
+
 	SCC_DATE_TINY,
 	SCC_DATE_SHORT,
 	SCC_DATE_LONG,