Merge branch 'jgrpp' into save_ext_spp

src/table/newgrf_debug_data.h

@@ -13,7 +13,7 @@
 #include "../newgrf_engine.h"
 
 /* Helper for filling property tables */
-#define NIP(prop, base, variable, type, name) { name, cpp_offsetof(base, variable), cpp_sizeof(base, variable), prop, type }
+#define NIP(prop, base, variable, type, name) { name, (ptrdiff_t)cpp_offsetof(base, variable), cpp_sizeof(base, variable), prop, type }
 #define NIP_END() { NULL, 0, 0, 0, 0 }
 
 /* Helper for filling callback tables */

src/table/settings.ini

@@ -373,6 +373,21 @@ cat      = SC_EXPERT
 extver   = SlXvFeatureTest(XSLFTO_AND, XSLFI_AUTO_TIMETABLE)
 patxname = ""auto_timetables.order.timetable_separation""
 
+[SDT_VAR]
+base     = GameSettings
+var      = order.timetable_separation_rate
+type     = SLE_UINT8
+def      = 100
+min      = 0
+max      = 100
+interval = 10
+str      = STR_CONFIG_SETTING_TIMETABLE_SEPARATION_RATE
+strhelp  = STR_CONFIG_SETTING_TIMETABLE_SEPARATION_RATE_HELPTEXT
+strval   = STR_CONFIG_SETTING_PERCENTAGE
+cat      = SC_EXPERT
+extver   = SlXvFeatureTest(XSLFTO_AND, XSLFI_AUTO_TIMETABLE)
+patxname = ""auto_timetables.order.timetable_separation_rate""
+
 ; There are only 21 predefined town_name values (0-20), but you can have more with newgrf action F so allow
 ; these bigger values (21-255). Invalid values will fallback to english on use and (undefined string) in GUI.
 [SDT_OMANY]
@@ -2485,6 +2500,21 @@ min      = 0
 max      = 1000000
 cat      = SC_EXPERT
 
+[SDT_VAR]
+base     = GameSettings
+var      = order.occupancy_smoothness
+type     = SLE_UINT8
+def      = 75
+min      = 0
+max      = 100
+interval = 10
+str      = STR_CONFIG_OCCUPANCY_SMOOTHNESS
+strhelp  = STR_CONFIG_OCCUPANCY_SMOOTHNESS_HELPTEXT
+strval   = STR_CONFIG_SETTING_PERCENTAGE
+cat      = SC_EXPERT
+extver   = SlXvFeatureTest(XSLFTO_AND, XSLFI_ORDER_OCCUPANCY)
+patxname = ""order_occupancy.order.occupancy_smoothness""
+
 ##
 [SDT_VAR]
 base     = GameSettings

src/table/string_colours.h

@@ -9,23 +9,23 @@
 
 /** @file string_colours.h The colour translation of GRF's strings. */
 
-/** Colour mapping for the TextColours. */
+/** Colour mapping for #TextColour. */
 static const byte _string_colourmap[17] = {
-		150, // TC_BLUE
-		 12, // TC_SILVER
-		189, // TC_GOLD
-		184, // TC_RED
-		174, // TC_PURPLE
-		 30, // TC_LIGHT_BROWN
-		195, // TC_ORANGE
-		209, // TC_GREEN
-		 68, // TC_YELLOW
-		 95, // TC_DARK_GREEN
-		 79, // TC_CREAM
-		116, // TC_BROWN
-		 15, // TC_WHITE
-		152, // TC_LIGHT_BLUE
-		  6, // TC_GREY
-		133, // TC_DARK_BLUE
-		  1, // TC_BLACK
+	150, // TC_BLUE
+	 12, // TC_SILVER
+	189, // TC_GOLD
+	184, // TC_RED
+	174, // TC_PURPLE
+	 30, // TC_LIGHT_BROWN
+	195, // TC_ORANGE
+	209, // TC_GREEN
+	 68, // TC_YELLOW
+	 95, // TC_DARK_GREEN
+	 79, // TC_CREAM
+	116, // TC_BROWN
+	 15, // TC_WHITE
+	152, // TC_LIGHT_BLUE
+	  6, // TC_GREY
+	133, // TC_DARK_BLUE
+	  1, // TC_BLACK
 };