Merge branch 'master' into jgrpp

# Conflicts:
#	cmake/CompileFlags.cmake
#	src/aircraft_cmd.cpp
#	src/blitter/32bpp_anim.cpp
#	src/cargopacket.cpp
#	src/cheat_gui.cpp
#	src/company_cmd.cpp
#	src/company_gui.cpp
#	src/core/pool_func.hpp
#	src/date.cpp
#	src/economy.cpp
#	src/error_gui.cpp
#	src/ground_vehicle.cpp
#	src/ground_vehicle.hpp
#	src/group_gui.cpp
#	src/industry_cmd.cpp
#	src/lang/dutch.txt
#	src/lang/french.txt
#	src/lang/german.txt
#	src/linkgraph/linkgraph_gui.cpp
#	src/linkgraph/mcf.cpp
#	src/network/network_content.cpp
#	src/network/network_server.cpp
#	src/network/network_udp.cpp
#	src/newgrf_engine.cpp
#	src/newgrf_station.cpp
#	src/order_cmd.cpp
#	src/order_gui.cpp
#	src/pathfinder/follow_track.hpp
#	src/pathfinder/yapf/yapf_common.hpp
#	src/saveload/saveload.cpp
#	src/settings_gui.cpp
#	src/station_cmd.cpp
#	src/station_kdtree.h
#	src/string_func.h
#	src/table/settings.ini
#	src/tgp.cpp
#	src/timetable_cmd.cpp
#	src/timetable_gui.cpp
#	src/toolbar_gui.cpp
#	src/town_cmd.cpp
#	src/train_cmd.cpp
#	src/train_gui.cpp
#	src/tree_gui.cpp
#	src/tunnelbridge_cmd.cpp
#	src/vehicle.cpp
#	src/vehicle_gui.cpp
#	src/video/sdl2_v.cpp
#	src/video/sdl_v.cpp
#	src/video/win32_v.cpp
#	src/viewport.cpp
#	src/viewport_sprite_sorter_sse4.cpp
#	src/window.cpp

src/table/newgrf_debug_data.h

@@ -67,7 +67,8 @@ static const NIVariable _niv_vehicles[] = {
 	NIV(0x4D, "position in articulated vehicle"),
 	NIV(0x60, "count vehicle id occurrences"),
 	// 0x61 not useful, since it requires register 0x10F
-	NIV(0x62, "Curvature/position difference to other vehicle"),
+	NIV(0x62, "curvature/position difference to other vehicle"),
+	NIV(0x63, "tile compatibility wrt. track-type"),
 	NIV_END()
 };
 
@@ -579,6 +580,15 @@ static const NIVariable _niv_industries[] = {
 	NIV(0x66, "get square of Euclidean distance of closes town"),
 	NIV(0x67, "count of industry and distance of closest instance"),
 	NIV(0x68, "count of industry and distance of closest instance with layout filter"),
+	NIV(0x69, "produced cargo waiting"),
+	NIV(0x6A, "cargo produced this month"),
+	NIV(0x6B, "cargo transported this month"),
+	NIV(0x6C, "cargo produced last month"),
+	NIV(0x6D, "cargo transported last month"),
+	NIV(0x6E, "date since cargo was delivered"),
+	NIV(0x6F, "waiting input cargo"),
+	NIV(0x70, "production rate"),
+	NIV(0x71, "percentage of cargo transported last month"),
 	NIV_END()
 };
 

src/table/settings.ini

@@ -68,8 +68,6 @@ static bool CheckSharingRoad(int32 p1);
 static bool CheckSharingWater(int32 p1);
 static bool CheckSharingAir(int32 p1);
 
-extern int32 _old_ending_year_slv_105;
-
 /* End - Callback Functions for the various settings */
 
 /* Begin - GUI order callbacks */
@@ -2212,15 +2210,9 @@ str      = STR_CONFIG_SETTING_STARTING_YEAR
 strval   = STR_JUST_INT
 cat      = SC_BASIC
 
-[SDTG_VAR]
-name     = ""old_ending_year_slv_105""
-var      = _old_ending_year_slv_105
-flags    = SLF_NOT_IN_CONFIG
-type     = SLE_INT32
+[SDT_NULL]
+length   = 4
 to       = SLV_105
-def      = DEF_END_YEAR
-min      = MIN_YEAR
-max      = MAX_YEAR
 
 [SDT_VAR]
 base     = GameSettings
@@ -2230,7 +2222,7 @@ from     = SLV_ENDING_YEAR
 guiflags = SGF_0ISDISABLED
 def      = DEF_END_YEAR
 min      = MIN_YEAR
-max      = MAX_YEAR
+max      = MAX_YEAR - 1
 interval = 1
 str      = STR_CONFIG_SETTING_ENDING_YEAR
 strhelp  = STR_CONFIG_SETTING_ENDING_YEAR_HELPTEXT
@@ -4717,15 +4709,6 @@ def      = false
 str      = STR_CONFIG_SETTING_WARN_RESTRICTION_WAIT_VEHICLE
 strhelp  = STR_CONFIG_SETTING_WARN_RESTRICTION_WAIT_VEHICLE_HELPTEXT
 
-[SDTC_BOOL]
-var      = gui.disable_unsuitable_building
-flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
-def      = true
-str      = STR_CONFIG_SETTING_DISABLE_UNSUITABLE_BUILDING
-strhelp  = STR_CONFIG_SETTING_DISABLE_UNSUITABLE_BUILDING_HELPTEXT
-proc     = RedrawScreen
-cat      = SC_EXPERT
-
 [SDTC_BOOL]
 var      = gui.new_nonstop
 flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC