Merge branch 'master' into jgrpp

# Conflicts:
#	cmake/CompileFlags.cmake
#	src/3rdparty/squirrel/squirrel/sqclosure.h
#	src/3rdparty/squirrel/squirrel/sqobject.h
#	src/3rdparty/squirrel/squirrel/sqvm.h
#	src/aircraft.h
#	src/airport_gui.cpp
#	src/blitter/32bpp_sse_func.hpp
#	src/blitter/null.hpp
#	src/bridge_gui.cpp
#	src/build_vehicle_gui.cpp
#	src/cargotype.h
#	src/cheat_gui.cpp
#	src/command.cpp
#	src/command_func.h
#	src/company_gui.cpp
#	src/console_gui.cpp
#	src/date_gui.cpp
#	src/depot_gui.cpp
#	src/dock_gui.cpp
#	src/economy.cpp
#	src/error_gui.cpp
#	src/fileio.cpp
#	src/fios.cpp
#	src/fios_gui.cpp
#	src/fontcache/spritefontcache.h
#	src/framerate_gui.cpp
#	src/game/game_text.cpp
#	src/gamelog.cpp
#	src/genworld_gui.cpp
#	src/gfx_layout_fallback.cpp
#	src/group_gui.cpp
#	src/highscore_gui.cpp
#	src/hotkeys.cpp
#	src/industry_cmd.cpp
#	src/industry_gui.cpp
#	src/landscape.cpp
#	src/main_gui.cpp
#	src/misc_cmd.cpp
#	src/misc_gui.cpp
#	src/network/core/tcp_game.cpp
#	src/network/core/udp.cpp
#	src/network/network_chat_gui.cpp
#	src/network/network_content_gui.cpp
#	src/network/network_gui.cpp
#	src/network/network_server.cpp
#	src/network/network_server.h
#	src/newgrf_airport.cpp
#	src/newgrf_airport.h
#	src/newgrf_airporttiles.cpp
#	src/newgrf_airporttiles.h
#	src/newgrf_animation_base.h
#	src/newgrf_canal.cpp
#	src/newgrf_commons.h
#	src/newgrf_config.cpp
#	src/newgrf_debug_gui.cpp
#	src/newgrf_engine.cpp
#	src/newgrf_engine.h
#	src/newgrf_generic.cpp
#	src/newgrf_gui.cpp
#	src/newgrf_house.cpp
#	src/newgrf_house.h
#	src/newgrf_industries.cpp
#	src/newgrf_industries.h
#	src/newgrf_industrytiles.cpp
#	src/newgrf_industrytiles.h
#	src/newgrf_object.cpp
#	src/newgrf_object.h
#	src/newgrf_railtype.cpp
#	src/newgrf_railtype.h
#	src/newgrf_roadstop.cpp
#	src/newgrf_roadstop.h
#	src/newgrf_roadtype.cpp
#	src/newgrf_roadtype.h
#	src/newgrf_spritegroup.cpp
#	src/newgrf_spritegroup.h
#	src/newgrf_station.cpp
#	src/newgrf_station.h
#	src/newgrf_town.cpp
#	src/newgrf_town.h
#	src/news_gui.cpp
#	src/object_gui.cpp
#	src/order_gui.cpp
#	src/os/macosx/crashlog_osx.cpp
#	src/os/unix/crashlog_unix.cpp
#	src/os/windows/crashlog_win.cpp
#	src/os/windows/win32.cpp
#	src/os/windows/win32_main.cpp
#	src/pathfinder/npf/npf.cpp
#	src/pathfinder/npf/queue.cpp
#	src/rail_cmd.cpp
#	src/rail_gui.cpp
#	src/road_gui.cpp
#	src/roadveh.h
#	src/saveload/saveload.cpp
#	src/screenshot.cpp
#	src/script/api/script_text.hpp
#	src/settings.cpp
#	src/settings_gui.cpp
#	src/settings_internal.h
#	src/settings_table.cpp
#	src/signs_cmd.cpp
#	src/signs_gui.cpp
#	src/smallmap_gui.cpp
#	src/smallmap_gui.h
#	src/spriteloader/grf.hpp
#	src/station_cmd.cpp
#	src/station_gui.cpp
#	src/station_map.h
#	src/statusbar_gui.cpp
#	src/stdafx.h
#	src/strgen/strgen.cpp
#	src/table/newgrf_debug_data.h
#	src/terraform_gui.cpp
#	src/timer/timer_game_calendar.cpp
#	src/timer/timer_window.cpp
#	src/town.h
#	src/town_cmd.cpp
#	src/town_gui.cpp
#	src/train_gui.cpp
#	src/transparency_gui.cpp
#	src/vehicle_gui.cpp
#	src/water_cmd.cpp
#	src/waypoint_cmd.cpp
#	src/widget.cpp
#	src/widget_type.h
#	src/widgets/dropdown.cpp
#	src/widgets/rail_widget.h
#	src/widgets/terraform_widget.h
#	src/window.cpp
#	src/window_gui.h

src/script/api/script_asyncmode.hpp

@@ -57,7 +57,7 @@ public:
 	/**
 	 * @api -all
 	 */
-	virtual void FinalRelease();
+	void FinalRelease() override;
 };
 
 #endif /* SCRIPT_ASYNCMODE_HPP */

src/script/api/script_base.cpp

@@ -18,7 +18,7 @@
 	return ScriptObject::GetRandomizer().Next();
 }
 
-/* static */ SQInteger ScriptBase::RandItem(SQInteger unused_param)
+/* static */ SQInteger ScriptBase::RandItem(SQInteger)
 {
 	return ScriptBase::Rand();
 }
@@ -29,7 +29,7 @@
 	return ScriptObject::GetRandomizer().Next(max);
 }
 
-/* static */ SQInteger ScriptBase::RandRangeItem(SQInteger unused_param, SQInteger max)
+/* static */ SQInteger ScriptBase::RandRangeItem(SQInteger, SQInteger max)
 {
 	return ScriptBase::RandRange(max);
 }
@@ -42,7 +42,7 @@
 	return ScriptBase::RandRange(max) < out;
 }
 
-/* static */ bool ScriptBase::ChanceItem(SQInteger unused_param, SQInteger out, SQInteger max)
+/* static */ bool ScriptBase::ChanceItem(SQInteger, SQInteger out, SQInteger max)
 {
 	return ScriptBase::Chance(out, max);
 }

src/script/api/script_execmode.hpp

@@ -48,7 +48,7 @@ public:
 	/**
 	 * @api -all
 	 */
-	virtual void FinalRelease();
+	void FinalRelease() override;
 };
 
 #endif /* SCRIPT_EXECMODE_HPP */

src/script/api/script_list.cpp

@@ -113,7 +113,7 @@ public:
 		this->End();
 	}
 
-	SQInteger Begin()
+	SQInteger Begin() override
 	{
 		if (this->list->values.empty()) return 0;
 		this->has_no_more_items = false;
@@ -126,7 +126,7 @@ public:
 		return item_current;
 	}
 
-	void End()
+	void End() override
 	{
 		this->has_no_more_items = true;
 		this->item_next = 0;
@@ -145,7 +145,7 @@ public:
 		if (this->value_iter != this->list->values.end()) item_next = (*this->value_iter).second;
 	}
 
-	SQInteger Next()
+	SQInteger Next() override
 	{
 		if (this->IsEnd()) return 0;
 
@@ -154,7 +154,7 @@ public:
 		return item_current;
 	}
 
-	void Remove(SQInteger item)
+	void Remove(SQInteger item) override
 	{
 		if (this->IsEnd()) return;
 
@@ -165,7 +165,7 @@ public:
 		}
 	}
 
-	void PostErase(SQInteger item, ScriptList::ScriptListMap::iterator post_erase, ScriptList::ScriptListValueSet::iterator value_post_erase)
+	void PostErase(SQInteger item, ScriptList::ScriptListMap::iterator post_erase, ScriptList::ScriptListValueSet::iterator value_post_erase) override
 	{
 		if (this->IsEnd()) return;
 
@@ -178,12 +178,12 @@ public:
 		}
 	}
 
-	void ValueChange(SQInteger item)
+	void ValueChange(SQInteger item) override
 	{
 		this->ScriptListSorterValueAscending::Remove(item);
 	}
 
-	void RetargetIterators()
+	void RetargetIterators() override
 	{
 		RetargetIterator(this->list->values, this->value_iter);
 	}
@@ -210,7 +210,7 @@ public:
 		this->End();
 	}
 
-	SQInteger Begin()
+	SQInteger Begin() override
 	{
 		if (this->list->values.empty()) return 0;
 		this->has_no_more_items = false;
@@ -224,7 +224,7 @@ public:
 		return item_current;
 	}
 
-	void End()
+	void End() override
 	{
 		this->has_no_more_items = true;
 		this->item_next = 0;
@@ -248,7 +248,7 @@ public:
 		if (this->value_iter != this->list->values.end()) item_next = this->value_iter->second;
 	}
 
-	SQInteger Next()
+	SQInteger Next() override
 	{
 		if (this->IsEnd()) return 0;
 
@@ -257,7 +257,7 @@ public:
 		return item_current;
 	}
 
-	void Remove(SQInteger item)
+	void Remove(SQInteger item) override
 	{
 		if (this->IsEnd()) return;
 
@@ -268,17 +268,17 @@ public:
 		}
 	}
 
-	void PostErase(SQInteger item, ScriptList::ScriptListMap::iterator post_erase, ScriptList::ScriptListValueSet::iterator value_post_erase)
+	void PostErase(SQInteger item, ScriptList::ScriptListMap::iterator post_erase, ScriptList::ScriptListValueSet::iterator value_post_erase) override
 	{
 		/* not implemented */
 	}
 
-	void ValueChange(SQInteger item)
+	void ValueChange(SQInteger item) override
 	{
 		this->ScriptListSorterValueDescending::Remove(item);
 	}
 
-	void RetargetIterators()
+	void RetargetIterators() override
 	{
 		RetargetIterator(this->list->values, this->value_iter);
 	}
@@ -302,7 +302,7 @@ public:
 		this->End();
 	}
 
-	SQInteger Begin()
+	SQInteger Begin() override
 	{
 		if (this->list->items.empty()) return 0;
 		this->has_no_more_items = false;
@@ -315,7 +315,7 @@ public:
 		return item_current;
 	}
 
-	void End()
+	void End() override
 	{
 		this->has_no_more_items = true;
 	}
@@ -333,7 +333,7 @@ public:
 		if (this->item_iter != this->list->items.end()) item_next = (*this->item_iter).first;
 	}
 
-	SQInteger Next()
+	SQInteger Next() override
 	{
 		if (this->IsEnd()) return 0;
 
@@ -342,7 +342,7 @@ public:
 		return item_current;
 	}
 
-	void Remove(SQInteger item)
+	void Remove(SQInteger item) override
 	{
 		if (this->IsEnd()) return;
 
@@ -353,7 +353,7 @@ public:
 		}
 	}
 
-	void PostErase(SQInteger item, ScriptList::ScriptListMap::iterator post_erase, ScriptList::ScriptListValueSet::iterator value_post_erase)
+	void PostErase(SQInteger item, ScriptList::ScriptListMap::iterator post_erase, ScriptList::ScriptListValueSet::iterator value_post_erase) override
 	{
 		if (this->IsEnd()) return;
 
@@ -366,12 +366,12 @@ public:
 		}
 	}
 
-	void ValueChange(SQInteger item)
+	void ValueChange(SQInteger item) override
 	{
 		/* do nothing */
 	}
 
-	void RetargetIterators()
+	void RetargetIterators() override
 	{
 		RetargetIterator(this->list->items, this->item_iter);
 	}
@@ -398,7 +398,7 @@ public:
 		this->End();
 	}
 
-	SQInteger Begin()
+	SQInteger Begin() override
 	{
 		if (this->list->items.empty()) return 0;
 		this->has_no_more_items = false;
@@ -412,7 +412,7 @@ public:
 		return item_current;
 	}
 
-	void End()
+	void End() override
 	{
 		this->has_no_more_items = true;
 	}
@@ -435,7 +435,7 @@ public:
 		if (this->item_iter != this->list->items.end()) item_next = (*this->item_iter).first;
 	}
 
-	SQInteger Next()
+	SQInteger Next() override
 	{
 		if (this->IsEnd()) return 0;
 
@@ -444,7 +444,7 @@ public:
 		return item_current;
 	}
 
-	void Remove(SQInteger item)
+	void Remove(SQInteger item) override
 	{
 		if (this->IsEnd()) return;
 
@@ -455,17 +455,17 @@ public:
 		}
 	}
 
-	void PostErase(SQInteger item, ScriptList::ScriptListMap::iterator post_erase, ScriptList::ScriptListValueSet::iterator value_post_erase)
+	void PostErase(SQInteger item, ScriptList::ScriptListMap::iterator post_erase, ScriptList::ScriptListValueSet::iterator value_post_erase) override
 	{
 		/* not implemented */
 	}
 
-	void ValueChange(SQInteger item)
+	void ValueChange(SQInteger item) override
 	{
 		/* do nothing */
 	}
 
-	void RetargetIterators()
+	void RetargetIterators() override
 	{
 		RetargetIterator(this->list->items, this->item_iter);
 	}

src/script/api/script_testmode.hpp

@@ -50,7 +50,7 @@ public:
 	/**
 	 * @api -all
 	 */
-	virtual void FinalRelease();
+	void FinalRelease() override;
 };
 
 #endif /* SCRIPT_TESTMODE_HPP */

src/script/api/script_text.hpp

@@ -125,7 +125,7 @@ public:
 	/**
 	 * @api -all
 	 */
-	virtual const std::string GetEncodedText();
+	const std::string GetEncodedText() override;
 
 private:
 	using ScriptTextRef = ScriptObjectRef<ScriptText>;