Merge lp:~widelands-dev/widelands/delete_deprecated into lp:widelands

[GunChleoc]

Got rid of base/deprecated.h.

There are 2 NOCOM comments in the code with questions.

[SirVer (sirver)]

Couple of nits. I suggest to prefer dynamic_cast<> wherever possible (i.e. when you know the type of the object you have) instead of upcast() which is made for if(upcast()) { situations. dynamic_cast<> can also cast references which will make for easier to read code.

review: Approve

[GunChleoc (gunchleoc)]

Next round - replaced upcast with dynamic_cast, but only for the statements that I introduced. typeid(building) is also gone.

review: Needs Resubmitting

[SirVer (sirver)]

Looks good. Gonna merge.

review: Approve

=== modified file 'src/ai/defaultai.cc'
--- src/ai/defaultai.cc	2014-11-30 11:14:34 +0000
+++ src/ai/defaultai.cc	2014-11-30 18:54:51 +0000
@@ -329,9 +329,9 @@
 		}
 
 		// Read all interesting data from ware producing buildings
-		if (typeid(bld) == typeid(ProductionSiteDescr)) {
+		if (bld.type() == MapObjectType::PRODUCTIONSITE) {
 			const ProductionSiteDescr& prod =
-			   ref_cast<ProductionSiteDescr const, BuildingDescr const>(bld);
+					dynamic_cast<const ProductionSiteDescr&>(bld);
 			bo.type = bld.get_ismine() ? BuildingObserver::MINE : BuildingObserver::PRODUCTIONSITE;
 			for (const WareAmount& temp_input : prod.inputs()) {
 				bo.inputs_.push_back(temp_input.first);
@@ -368,10 +368,10 @@
 		// now for every military building, we fill critical_built_mat_ vector
 		// with critical construction wares
 		// non critical are excluded (see below)
-		if (typeid(bld) == typeid(MilitarySiteDescr)) {
+		if (bld.type() == MapObjectType::MILITARYSITE) {
 			bo.type = BuildingObserver::MILITARYSITE;
 			const MilitarySiteDescr& milit =
-			   ref_cast<MilitarySiteDescr const, BuildingDescr const>(bld);
+				dynamic_cast<const MilitarySiteDescr&>(bld);
 			for (const std::pair<unsigned char, unsigned char>& temp_buildcosts : milit.buildcost()) {
 				// bellow are non-critical wares
 				if (tribe_->ware_index("log") == temp_buildcosts.first ||
@@ -387,17 +387,17 @@
 			continue;
 		}
 
-		if (typeid(bld) == typeid(WarehouseDescr)) {
+		if (bld.type() == MapObjectType::WAREHOUSE) {
 			bo.type = BuildingObserver::WAREHOUSE;
 			continue;
 		}
 
-		if (typeid(bld) == typeid(TrainingSiteDescr)) {
+		if (bld.type() == MapObjectType::TRAININGSITE) {
 			bo.type = BuildingObserver::TRAININGSITE;
 			continue;
 		}
 
-		if (typeid(bld) == typeid(ConstructionSiteDescr)) {
+		if (bld.type() == MapObjectType::CONSTRUCTIONSITE) {
 			bo.type = BuildingObserver::CONSTRUCTIONSITE;
 			continue;
 		}
@@ -3008,7 +3008,7 @@
 
 	if (bo.type == BuildingObserver::CONSTRUCTIONSITE) {
 		BuildingObserver& target_bo =
-		   get_building_observer(ref_cast<ConstructionSite, Building>(b).building().name().c_str());
+		   get_building_observer(dynamic_cast<ConstructionSite&>(b).building().name().c_str());
 		++target_bo.cnt_under_construction_;
 		++num_constructionsites_;
 		if (target_bo.type == BuildingObserver::PRODUCTIONSITE) {
@@ -3025,7 +3025,7 @@
 
 		if (bo.type == BuildingObserver::PRODUCTIONSITE) {
 			productionsites.push_back(ProductionSiteObserver());
-			productionsites.back().site = &ref_cast<ProductionSite, Building>(b);
+			productionsites.back().site = &dynamic_cast<ProductionSite&>(b);
 			productionsites.back().bo = &bo;
 			productionsites.back().built_time_ = game().get_gametime();
 			productionsites.back().unoccupied_till_ = game().get_gametime();
@@ -3039,7 +3039,7 @@
 				++wares.at(bo.inputs_.at(i)).consumers_;
 		} else if (bo.type == BuildingObserver::MINE) {
 			mines_.push_back(ProductionSiteObserver());
-			mines_.back().site = &ref_cast<ProductionSite, Building>(b);
+			mines_.back().site = &dynamic_cast<ProductionSite&>(b);
 			mines_.back().bo = &bo;
 			mines_.back().built_time_ = game().get_gametime();
 
@@ -3050,7 +3050,7 @@
 				++wares.at(bo.inputs_.at(i)).consumers_;
 		} else if (bo.type == BuildingObserver::MILITARYSITE) {
 			militarysites.push_back(MilitarySiteObserver());
-			militarysites.back().site = &ref_cast<MilitarySite, Building>(b);
+			militarysites.back().site = &dynamic_cast<MilitarySite&>(b);
 			militarysites.back().bo = &bo;
 			militarysites.back().checks = bo.desc->get_size();
 			militarysites.back().enemies_nearby_ = true;
@@ -3067,7 +3067,7 @@
 
 	if (bo.type == BuildingObserver::CONSTRUCTIONSITE) {
 		BuildingObserver& target_bo = get_building_observer(
-		   ref_cast<ConstructionSite const, Building const>(b).building().name().c_str());
+			dynamic_cast<const ConstructionSite&>(b).building().name().c_str());
 		--target_bo.cnt_under_construction_;
 		--num_constructionsites_;
 		if (target_bo.type == BuildingObserver::PRODUCTIONSITE) {

=== modified file 'src/base/CMakeLists.txt'
--- src/base/CMakeLists.txt	2014-11-26 09:36:46 +0000
+++ src/base/CMakeLists.txt	2014-11-30 18:54:51 +0000
@@ -45,13 +45,6 @@
     base_macros
 )
 
-# TODO(sirver): this library should be deleted.
-wl_library(base_deprecated
-  SRCS
-    deprecated.h
-    deprecated.cc
-  DEPENDS
-)
 
 wl_library(base_scoped_timer
   SRCS

=== removed file 'src/base/deprecated.cc'
--- src/base/deprecated.cc	2014-07-05 12:17:03 +0000
+++ src/base/deprecated.cc	1970-01-01 00:00:00 +0000
@@ -1,20 +0,0 @@
-/*
- * Copyright (C) 2006-2014 by the Widelands Development Team
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-
-// Dummy file as cmake cannot handle header only libraries :(.

=== removed file 'src/base/deprecated.h'
--- src/base/deprecated.h	2014-07-25 19:15:23 +0000
+++ src/base/deprecated.h	1970-01-01 00:00:00 +0000
@@ -1,35 +0,0 @@
-/*
- * Copyright (C) 2006-2014 by the Widelands Development Team
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- */
-
-#ifndef WL_BASE_DEPRECATED_H
-#define WL_BASE_DEPRECATED_H
-
-// Code that is still used all over the place, but should not be used anymore.
-
-#include <cassert>
-
-// DEPRECATED: leads to unsafe code. Instead use upcast() or is_a() to check at
-// runtime for the type you are expecting.
-template<typename Derived, typename Base> Derived & ref_cast(Base & base) {
-	assert(dynamic_cast<Derived *>(&base) == static_cast<Derived *>(&base));
-	return static_cast<Derived &>(base);
-}
-
-
-#endif  // end of include guard: WL_BASE_DEPRECATED_H

=== modified file 'src/economy/CMakeLists.txt'
--- src/economy/CMakeLists.txt	2014-07-05 12:17:03 +0000
+++ src/economy/CMakeLists.txt	2014-11-30 18:54:51 +0000
@@ -41,7 +41,6 @@
     wares_queue.cc
     wares_queue.h
   DEPENDS
-    base_deprecated
     base_exceptions
     base_log
     base_macros

=== modified file 'src/economy/economy.cc'
--- src/economy/economy.cc	2014-09-20 09:37:47 +0000
+++ src/economy/economy.cc	2014-11-30 18:54:51 +0000
@@ -1034,11 +1034,12 @@
 */
 void Economy::balance(uint32_t const timerid)
 {
-	if (m_request_timerid != timerid)
+	if (m_request_timerid != timerid) {
 		return;
+	}
 	++m_request_timerid;
 
-	Game & game = ref_cast<Game, EditorGameBase>(owner().egbase());
+	Game & game = dynamic_cast<Game&>(owner().egbase());
 
 	_check_splits();
 

=== modified file 'src/economy/flag.cc'
--- src/economy/flag.cc	2014-09-10 10:18:46 +0000
+++ src/economy/flag.cc	2014-11-30 18:54:51 +0000
@@ -19,7 +19,6 @@
 
 #include "economy/flag.h"
 
-#include "base/deprecated.h"
 #include "base/macros.h"
 #include "base/wexception.h"
 #include "economy/economy.h"
@@ -640,15 +639,16 @@
 	}
 
 	// Deal with the normal (flag) case
-	ref_cast<Flag const, PlayerImmovable const>(*nextstep);
+	const Flag& nextflag = dynamic_cast<const Flag&>(*nextstep);
 
 	for (int32_t dir = 1; dir <= 6; ++dir) {
 		Road * const road = get_road(dir);
 		Flag *       other;
 		Road::FlagId flagid;
 
-		if (!road)
+		if (!road) {
 			continue;
+		}
 
 		if (&road->get_flag(Road::FlagStart) == this) {
 			flagid = Road::FlagStart;
@@ -658,12 +658,14 @@
 			other = &road->get_flag(Road::FlagStart);
 		}
 
-		if (other != nextstep)
+		if (other != &nextflag) {
 			continue;
+		}
 
 		// Yes, this is the road we want; inform it
-		if (road->notify_ware(game, flagid))
+		if (road->notify_ware(game, flagid)) {
 			return;
+		}
 
 		// If the road doesn't react to the ware immediately, we try other roads:
 		// They might lead to the same flag!
@@ -791,7 +793,7 @@
 	 Worker          * const w,
 	 PlayerImmovable &       target)
 {
-	Flag & flag = ref_cast<Flag, PlayerImmovable>(target);
+	Flag & flag = dynamic_cast<Flag&>(target);
 
 	assert(w);
 

=== modified file 'src/economy/fleet.cc'
--- src/economy/fleet.cc	2014-09-20 09:37:47 +0000
+++ src/economy/fleet.cc	2014-11-30 18:54:51 +0000
@@ -21,7 +21,6 @@
 
 #include <memory>
 
-#include "base/deprecated.h"
 #include "base/macros.h"
 #include "economy/economy.h"
 #include "economy/flag.h"

=== modified file 'src/economy/portdock.cc'
--- src/economy/portdock.cc	2014-09-20 09:37:47 +0000
+++ src/economy/portdock.cc	2014-11-30 18:54:51 +0000
@@ -21,8 +21,8 @@
 
 #include <memory>
 
-#include "base/deprecated.h"
 #include "base/log.h"
+#include "base/macros.h"
 #include "economy/fleet.h"
 #include "economy/ware_instance.h"
 #include "economy/wares_queue.h"

=== modified file 'src/economy/road.cc'
--- src/economy/road.cc	2014-09-19 12:54:54 +0000
+++ src/economy/road.cc	2014-11-30 18:54:51 +0000
@@ -382,11 +382,11 @@
 {
 	assert(w);
 
-	Road    & road    = ref_cast<Road,    PlayerImmovable>(target);
+	Road& road = dynamic_cast<Road&>(target);
 
 	for (CarrierSlot& slot : road.m_carrier_slots) {
 		if (slot.carrier_request == &rq) {
-			Carrier & carrier = ref_cast<Carrier, Worker> (*w);
+			Carrier & carrier = dynamic_cast<Carrier&> (*w);
 			slot.carrier_request = nullptr;
 			slot.carrier = &carrier;
 

=== modified file 'src/economy/routeastar.h'
--- src/economy/routeastar.h	2014-09-14 11:31:58 +0000
+++ src/economy/routeastar.h	2014-11-30 18:54:51 +0000
@@ -20,7 +20,6 @@
 #ifndef WL_ECONOMY_ROUTEASTAR_H
 #define WL_ECONOMY_ROUTEASTAR_H
 
-#include "base/deprecated.h"
 #include "economy/itransport_cost_calculator.h"
 #include "economy/routing_node.h"
 

=== modified file 'src/economy/supply_list.cc'
--- src/economy/supply_list.cc	2014-07-25 16:37:06 +0000
+++ src/economy/supply_list.cc	2014-11-30 18:54:51 +0000
@@ -19,7 +19,6 @@
 
 #include "economy/supply_list.h"
 
-#include "base/deprecated.h"
 #include "base/wexception.h"
 #include "economy/request.h"
 #include "economy/supply.h"

=== modified file 'src/economy/test/CMakeLists.txt'
--- src/economy/test/CMakeLists.txt	2014-10-28 21:14:24 +0000
+++ src/economy/test/CMakeLists.txt	2014-11-30 18:54:51 +0000
@@ -4,7 +4,6 @@
     test_road.cc
     test_routing.cc
   DEPENDS
-    base_deprecated
     economy
     io_filesystem
     logic

=== modified file 'src/economy/test/test_routing.cc'
--- src/economy/test/test_routing.cc	2014-10-28 21:14:24 +0000
+++ src/economy/test/test_routing.cc	2014-11-30 18:54:51 +0000
@@ -22,7 +22,6 @@
 #include <boost/bind.hpp>
 #include <boost/test/unit_test.hpp>
 
-#include "base/deprecated.h"
 #include "economy/flag.h"
 #include "economy/iroute.h"
 #include "economy/itransport_cost_calculator.h"

=== modified file 'src/economy/ware_instance.cc'
--- src/economy/ware_instance.cc	2014-09-20 09:37:47 +0000
+++ src/economy/ware_instance.cc	2014-11-30 18:54:51 +0000
@@ -561,7 +561,7 @@
 	m_transfer_nextstep = fr.unsigned_32();
 	if (fr.unsigned_8()) {
 		ware.m_transfer =
-			new Transfer(ref_cast<Game, EditorGameBase>(egbase()), ware);
+			new Transfer(dynamic_cast<Game&>(egbase()), ware);
 		ware.m_transfer->read(fr, m_transfer);
 	}
 }

=== modified file 'src/economy/wares_queue.cc'
--- src/economy/wares_queue.cc	2014-09-20 09:37:47 +0000
+++ src/economy/wares_queue.cc	2014-11-30 18:54:51 +0000
@@ -131,7 +131,7 @@
 	 PlayerImmovable & target)
 {
 	WaresQueue & wq =
-		ref_cast<Building, PlayerImmovable>(target).waresqueue(ware);
+		dynamic_cast<Building&>(target).waresqueue(ware);
 
 	assert(!w); // WaresQueue can't hold workers
 	assert(wq.m_filled < wq.m_max_size);

=== modified file 'src/editor/editorinteractive.cc'
--- src/editor/editorinteractive.cc	2014-11-23 14:34:38 +0000
+++ src/editor/editorinteractive.cc	2014-11-30 18:54:51 +0000
@@ -336,12 +336,14 @@
 }
 
 void EditorInteractive::set_sel_radius_and_update_menu(uint32_t const val) {
-	if (tools.current().has_size_one())
+	if (tools.current().has_size_one()) {
 		return;
-	if (UI::UniqueWindow * const w = m_toolsizemenu.window)
-		ref_cast<EditorToolsizeMenu, UI::UniqueWindow>(*w).update(val);
-	else
+	}
+	if (UI::UniqueWindow * const w = m_toolsizemenu.window) {
+		dynamic_cast<EditorToolsizeMenu&>(*w).update(val);
+	} else {
 		set_sel_radius(val);
+	}
 }
 
 

=== modified file 'src/editor/ui_menus/editor_main_menu.cc'
--- src/editor/ui_menus/editor_main_menu.cc	2014-09-10 14:08:25 +0000
+++ src/editor/ui_menus/editor_main_menu.cc	2014-11-30 18:54:51 +0000
@@ -37,7 +37,7 @@
 #define vspacing 15
 
 inline EditorInteractive & EditorMainMenu::eia() {
-	return ref_cast<EditorInteractive, UI::Panel>(*get_parent());
+	return dynamic_cast<EditorInteractive&>(*get_parent());
 }
 
 /**

=== modified file 'src/editor/ui_menus/editor_main_menu_load_map.cc'
--- src/editor/ui_menus/editor_main_menu_load_map.cc	2014-10-28 14:57:52 +0000
+++ src/editor/ui_menus/editor_main_menu_load_map.cc	2014-11-30 18:54:51 +0000
@@ -146,7 +146,7 @@
 		m_mapfiles.clear();
 		fill_list();
 	} else {
-		ref_cast<EditorInteractive, UI::Panel>(*get_parent()).load(filename);
+		dynamic_cast<EditorInteractive&>(*get_parent()).load(filename);
 		die();
 	}
 }

=== modified file 'src/editor/ui_menus/editor_main_menu_map_options.cc'
--- src/editor/ui_menus/editor_main_menu_map_options.cc	2014-10-28 08:16:53 +0000
+++ src/editor/ui_menus/editor_main_menu_map_options.cc	2014-11-30 18:54:51 +0000
@@ -36,7 +36,7 @@
 
 
 inline EditorInteractive & MainMenuMapOptions::eia() {
-	return ref_cast<EditorInteractive, UI::Panel>(*get_parent());
+	return dynamic_cast<EditorInteractive&>(*get_parent());
 }
 
 

=== modified file 'src/editor/ui_menus/editor_main_menu_new_map.cc'
--- src/editor/ui_menus/editor_main_menu_new_map.cc	2014-11-13 08:25:45 +0000
+++ src/editor/ui_menus/editor_main_menu_new_map.cc	2014-11-30 18:54:51 +0000
@@ -134,7 +134,7 @@
 
 void MainMenuNewMap::clicked_create_map() {
 	EditorInteractive & eia =
-		ref_cast<EditorInteractive, UI::Panel>(*get_parent());
+		dynamic_cast<EditorInteractive&>(*get_parent());
 	Widelands::EditorGameBase & egbase = eia.egbase();
 	Widelands::Map              & map    = egbase.map();
 	UI::ProgressWindow loader;

=== modified file 'src/editor/ui_menus/editor_main_menu_random_map.cc'
--- src/editor/ui_menus/editor_main_menu_random_map.cc	2014-11-13 08:25:45 +0000
+++ src/editor/ui_menus/editor_main_menu_random_map.cc	2014-11-30 18:54:51 +0000
@@ -484,7 +484,7 @@
 
 void MainMenuNewRandomMap::clicked_create_map() {
 	EditorInteractive & eia =
-		ref_cast<EditorInteractive, UI::Panel>(*get_parent());
+		dynamic_cast<EditorInteractive&>(*get_parent());
 	Widelands::EditorGameBase & egbase = eia.egbase();
 	Widelands::Map              & map    = egbase.map();
 	UI::ProgressWindow loader;

=== modified file 'src/editor/ui_menus/editor_main_menu_save_map.cc'
--- src/editor/ui_menus/editor_main_menu_save_map.cc	2014-10-28 14:57:52 +0000
+++ src/editor/ui_menus/editor_main_menu_save_map.cc	2014-11-30 18:54:51 +0000
@@ -46,7 +46,7 @@
 #include "ui_basic/textarea.h"
 
 inline EditorInteractive & MainMenuSaveMap::eia() {
-	return ref_cast<EditorInteractive, UI::Panel>(*get_parent());
+	return dynamic_cast<EditorInteractive&>(*get_parent());
 }
 
 

=== modified file 'src/editor/ui_menus/editor_player_menu.cc'
--- src/editor/ui_menus/editor_player_menu.cc	2014-11-22 10:18:20 +0000
+++ src/editor/ui_menus/editor_player_menu.cc	2014-11-30 18:54:51 +0000
@@ -38,6 +38,10 @@
 
 #define UNDEFINED_TRIBE_NAME "<undefined>"
 
+inline EditorInteractive & EditorPlayerMenu::eia() {
+	return dynamic_cast<EditorInteractive&>(*get_parent());
+}
+
 EditorPlayerMenu::EditorPlayerMenu
 	(EditorInteractive & parent, UI::UniqueWindow::Registry & registry)
 	:
@@ -108,9 +112,7 @@
 	if (is_minimal())
 		return;
 
-	Widelands::Map & map =
-		ref_cast<EditorInteractive const, UI::Panel const>(*get_parent())
-		.egbase().map();
+	Widelands::Map & map = eia().egbase().map();
 	Widelands::PlayerNumber const nr_players = map.get_nrplayers();
 	{
 		assert(nr_players <= 99); //  2 decimal digits
@@ -194,9 +196,7 @@
 }
 
 void EditorPlayerMenu::clicked_add_player() {
-	EditorInteractive & menu =
-		ref_cast<EditorInteractive, UI::Panel>(*get_parent());
-	Widelands::Map & map = menu.egbase().map();
+	Widelands::Map & map = eia().egbase().map();
 	Widelands::PlayerNumber const nr_players = map.get_nrplayers() + 1;
 	assert(nr_players <= MAX_PLAYERS);
 	map.set_nrplayers(nr_players);
@@ -211,7 +211,7 @@
 		map.set_scenario_player_name(nr_players, name);
 	}
 	map.set_scenario_player_tribe(nr_players, m_tribes[0]);
-	menu.set_need_save(true);
+	eia().set_need_save(true);
 	m_add_player        .set_enabled(nr_players < MAX_PLAYERS);
 	m_remove_last_player.set_enabled(true);
 	update();
@@ -219,14 +219,12 @@
 
 
 void EditorPlayerMenu::clicked_remove_last_player() {
-	EditorInteractive & menu =
-		ref_cast<EditorInteractive, UI::Panel>(*get_parent());
-	Widelands::Map & map = menu.egbase().map();
+	Widelands::Map & map = eia().egbase().map();
 	Widelands::PlayerNumber const old_nr_players = map.get_nrplayers();
 	Widelands::PlayerNumber const nr_players     = old_nr_players - 1;
 	assert(1 <= nr_players);
 
-	if (!menu.is_player_tribe_referenced(old_nr_players)) {
+	if (!eia().is_player_tribe_referenced(old_nr_players)) {
 		if (const Widelands::Coords sp = map.get_starting_pos(old_nr_players)) {
 			//  Remove starting position marker.
 			char picsname[] = "pics/editor_player_00_starting_pos.png";
@@ -306,9 +304,8 @@
  * Player Tribe Button clicked
  */
 void EditorPlayerMenu::player_tribe_clicked(uint8_t n) {
-	EditorInteractive & menu =
-		ref_cast<EditorInteractive, UI::Panel>(*get_parent());
-	if (!menu.is_player_tribe_referenced(n + 1)) {
+	EditorInteractive& menu = eia();
+		if (!menu.is_player_tribe_referenced(n + 1)) {
 		std::string t = m_plr_set_tribes_buts[n]->get_title();
 		if (!Widelands::TribeDescr::exists_tribe(t))
 			throw wexception
@@ -338,8 +335,7 @@
  * Set Current Start Position button selected
  */
 void EditorPlayerMenu::set_starting_pos_clicked(uint8_t n) {
-	EditorInteractive & menu =
-		ref_cast<EditorInteractive, UI::Panel>(*get_parent());
+	EditorInteractive& menu = eia();
 	//  jump to the current node
 	Widelands::Map & map = menu.egbase().map();
 	if (Widelands::Coords const sp = map.get_starting_pos(n))
@@ -366,8 +362,7 @@
 void EditorPlayerMenu::name_changed(int32_t m) {
 	//  Player name has been changed.
 	std::string text = m_plr_names[m]->text();
-	EditorInteractive & menu =
-		ref_cast<EditorInteractive, UI::Panel>(*get_parent());
+	EditorInteractive& menu = eia();
 	Widelands::Map & map = menu.egbase().map();
 	if (text == "") {
 		text = map.get_scenario_player_name(m + 1);

=== modified file 'src/editor/ui_menus/editor_player_menu.h'
--- src/editor/ui_menus/editor_player_menu.h	2014-09-10 14:08:25 +0000
+++ src/editor/ui_menus/editor_player_menu.h	2014-11-30 18:54:51 +0000
@@ -44,6 +44,7 @@
 	virtual ~EditorPlayerMenu() {}
 
 private:
+	EditorInteractive & eia();
 	UI::UniqueWindow::Registry m_allow_buildings_menu;
 	UI::Textarea * m_nr_of_players_ta;
 	UI::EditBox * m_plr_names[MAX_PLAYERS];

=== modified file 'src/editor/ui_menus/editor_tool_change_resources_options_menu.cc'
--- src/editor/ui_menus/editor_tool_change_resources_options_menu.cc	2014-09-30 05:41:55 +0000
+++ src/editor/ui_menus/editor_tool_change_resources_options_menu.cc	2014-11-30 18:54:51 +0000
@@ -37,6 +37,11 @@
 const static int BUTTON_WIDTH = 20;
 const static int BUTTON_HEIGHT = 20;
 
+inline EditorInteractive & EditorToolChangeResourcesOptionsMenu::eia() {
+	return dynamic_cast<EditorInteractive&>(*get_parent());
+}
+
+
 EditorToolChangeResourcesOptionsMenu::
 EditorToolChangeResourcesOptionsMenu
 		(EditorInteractive             & parent,
@@ -213,7 +218,7 @@
 	m_increase_tool.set_cur_res(n);
 	m_increase_tool.decrease_tool().set_cur_res(n);
 
-	Widelands::EditorGameBase& egbase = ref_cast<EditorInteractive, UI::Panel>(*get_parent()).egbase();
+	Widelands::EditorGameBase& egbase = eia().egbase();
 	Widelands::Map & map = egbase.map();
 	map.overlay_manager().register_overlay_callback_function(
 	   boost::bind(&editor_change_resource_tool_callback, _1, boost::ref(map), boost::ref(egbase.world()), n));
@@ -234,8 +239,7 @@
 										static_cast<unsigned int>(m_increase_tool.set_tool().get_set_to())));
 
 	m_cur_selection.set_text
-		(ref_cast<EditorInteractive, UI::Panel>(*get_parent()).egbase()
-		 .world().get_resource(m_increase_tool.set_tool().get_cur_res())->descname());
+		(eia().egbase().world().get_resource(m_increase_tool.set_tool().get_cur_res())->descname());
 	m_cur_selection.set_pos
 		(Point
 		 	((get_inner_w() - m_cur_selection.get_w()) / 2, get_inner_h() - 20));

=== modified file 'src/editor/ui_menus/editor_tool_change_resources_options_menu.h'
--- src/editor/ui_menus/editor_tool_change_resources_options_menu.h	2014-09-10 14:08:25 +0000
+++ src/editor/ui_menus/editor_tool_change_resources_options_menu.h	2014-11-30 18:54:51 +0000
@@ -37,6 +37,7 @@
 		 UI::UniqueWindow::Registry     &);
 
 private:
+	EditorInteractive & eia();
 	void selected();
 	enum Button {
 		Change_By_Increase, Change_By_Decrease,

=== modified file 'src/editor/ui_menus/editor_tool_menu.cc'
--- src/editor/ui_menus/editor_tool_menu.cc	2014-09-20 09:37:47 +0000
+++ src/editor/ui_menus/editor_tool_menu.cc	2014-11-30 18:54:51 +0000
@@ -99,7 +99,7 @@
 	const int32_t n = m_radioselect.get_state();
 
 	EditorInteractive & parent =
-		ref_cast<EditorInteractive, UI::Panel>(*get_parent());
+		dynamic_cast<EditorInteractive&>(*get_parent());
 
 	EditorTool                * current_tool_pointer = nullptr;
 	UI::UniqueWindow::Registry * current_registry_pointer = nullptr;

=== modified file 'src/editor/ui_menus/editor_tool_options_menu.cc'
--- src/editor/ui_menus/editor_tool_options_menu.cc	2014-09-10 14:08:25 +0000
+++ src/editor/ui_menus/editor_tool_options_menu.cc	2014-11-30 18:54:51 +0000
@@ -35,6 +35,6 @@
 
 
 void EditorToolOptionsMenu::select_correct_tool() {
-	ref_cast<EditorInteractive, UI::Panel>(*get_parent())
+	dynamic_cast<EditorInteractive&>(*get_parent())
 		.select_tool(*m_current_pointer, EditorTool::First);
 }

=== modified file 'src/editor/ui_menus/editor_toolsize_menu.cc'
--- src/editor/ui_menus/editor_toolsize_menu.cc	2014-09-18 18:52:34 +0000
+++ src/editor/ui_menus/editor_toolsize_menu.cc	2014-11-30 18:54:51 +0000
@@ -29,7 +29,7 @@
 #include "graphic/graphic.h"
 
 inline EditorInteractive & EditorToolsizeMenu::eia() {
-	return ref_cast<EditorInteractive, UI::Panel>(*get_parent());
+	return dynamic_cast<EditorInteractive&>(*get_parent());
 }
 
 

=== modified file 'src/graphic/CMakeLists.txt'
--- src/graphic/CMakeLists.txt	2014-11-24 07:25:21 +0000
+++ src/graphic/CMakeLists.txt	2014-11-30 18:54:51 +0000
@@ -128,7 +128,6 @@
   USES_SDL2_IMAGE
   USES_SDL2_TTF
   DEPENDS
-    base_deprecated
     base_exceptions
     base_geometry
     base_i18n

=== modified file 'src/graphic/animation.cc'
--- src/graphic/animation.cc	2014-11-24 07:10:03 +0000
+++ src/graphic/animation.cc	2014-11-30 18:54:51 +0000
@@ -30,7 +30,6 @@
 #include <boost/format.hpp>
 #include <boost/lexical_cast.hpp>
 
-#include "base/deprecated.h"
 #include "base/i18n.h"
 #include "base/log.h"
 #include "base/macros.h"

=== modified file 'src/graphic/graphic.cc'
--- src/graphic/graphic.cc	2014-11-30 09:17:50 +0000
+++ src/graphic/graphic.cc	2014-11-30 18:54:51 +0000
@@ -25,7 +25,6 @@
 
 #include <SDL_image.h>
 
-#include "base/deprecated.h"
 #include "base/i18n.h"
 #include "base/log.h"
 #include "base/macros.h"

=== modified file 'src/graphic/terrain_texture.cc'
--- src/graphic/terrain_texture.cc	2014-11-24 07:10:03 +0000
+++ src/graphic/terrain_texture.cc	2014-11-30 18:54:51 +0000
@@ -21,7 +21,6 @@
 
 #include <SDL_image.h>
 
-#include "base/deprecated.h"
 #include "base/log.h"
 #include "base/wexception.h"
 #include "graphic/image_io.h"

=== modified file 'src/graphic/text_parser.cc'
--- src/graphic/text_parser.cc	2014-09-10 14:48:40 +0000
+++ src/graphic/text_parser.cc	2014-11-30 18:54:51 +0000
@@ -24,7 +24,6 @@
 #include <string>
 #include <vector>
 
-#include "base/deprecated.h"
 #include "base/log.h"
 #include "helper.h"
 

=== modified file 'src/io/CMakeLists.txt'
--- src/io/CMakeLists.txt	2014-10-13 15:04:50 +0000
+++ src/io/CMakeLists.txt	2014-11-30 18:54:51 +0000
@@ -37,7 +37,6 @@
     filesystem/zip_filesystem.cc
     filesystem/zip_filesystem.h
   DEPENDS
-    base_deprecated
     base_exceptions
     base_log
     base_macros

=== modified file 'src/io/filesystem/layered_filesystem.cc'
--- src/io/filesystem/layered_filesystem.cc	2014-09-29 13:30:46 +0000
+++ src/io/filesystem/layered_filesystem.cc	2014-11-30 18:54:51 +0000
@@ -22,7 +22,6 @@
 #include <cstdio>
 #include <memory>
 
-#include "base/deprecated.h"
 #include "base/log.h"
 #include "base/wexception.h"
 #include "io/fileread.h"

=== modified file 'src/logic/CMakeLists.txt'
--- src/logic/CMakeLists.txt	2014-10-13 15:04:50 +0000
+++ src/logic/CMakeLists.txt	2014-11-30 18:54:51 +0000
@@ -215,7 +215,6 @@
   USES_SDL2
   DEPENDS
     ai
-    base_deprecated
     base_exceptions
     base_geometry
     base_i18n

=== modified file 'src/logic/battle.cc'
--- src/logic/battle.cc	2014-09-20 09:37:47 +0000
+++ src/logic/battle.cc	2014-11-30 18:54:51 +0000
@@ -83,23 +83,27 @@
 
 	m_creationtime = egbase.get_gametime();
 
-	if (Battle* battle = m_first ->get_battle())
-		battle->cancel(ref_cast<Game, EditorGameBase>(egbase), *m_first);
-	m_first->set_battle(ref_cast<Game, EditorGameBase>(egbase), this);
-	if (Battle* battle = m_second->get_battle())
-		battle->cancel(ref_cast<Game, EditorGameBase>(egbase), *m_second);
-	m_second->set_battle(ref_cast<Game, EditorGameBase>(egbase), this);
+	Game& game = dynamic_cast<Game&>(egbase);
+
+	if (Battle* battle = m_first ->get_battle()) {
+		battle->cancel(game, *m_first);
+	}
+	m_first->set_battle(game, this);
+	if (Battle* battle = m_second->get_battle()) {
+		battle->cancel(game, *m_second);
+	}
+	m_second->set_battle(game, this);
 }
 
 
 void Battle::cleanup (EditorGameBase & egbase)
 {
 	if (m_first) {
-		m_first ->set_battle(ref_cast<Game, EditorGameBase>(egbase), nullptr);
+		m_first ->set_battle(dynamic_cast<Game&>(egbase), nullptr);
 		m_first  = nullptr;
 	}
 	if (m_second) {
-		m_second->set_battle(ref_cast<Game, EditorGameBase>(egbase), nullptr);
+		m_second->set_battle(dynamic_cast<Game&>(egbase), nullptr);
 		m_second = nullptr;
 	}
 

=== modified file 'src/logic/bob.cc'
--- src/logic/bob.cc	2014-09-20 09:37:47 +0000
+++ src/logic/bob.cc	2014-11-30 18:54:51 +0000
@@ -149,8 +149,9 @@
  */
 void Bob::cleanup(EditorGameBase & egbase)
 {
-	while (!m_stack.empty()) //  bobs in the editor do not have tasks
-		do_pop_task(ref_cast<Game, EditorGameBase>(egbase));
+	while (!m_stack.empty()) { //  bobs in the editor do not have tasks
+		do_pop_task(dynamic_cast<Game&>(egbase));
+	}
 
 	set_owner(nullptr); // implicitly remove ourselves from owner's map
 

=== modified file 'src/logic/building.cc'
--- src/logic/building.cc	2014-11-24 07:25:21 +0000
+++ src/logic/building.cc	2014-11-30 18:54:51 +0000
@@ -245,7 +245,7 @@
 		m_tribe.get_building_descr
 			(m_tribe.safe_building_index("constructionsite"));
 	ConstructionSite & csite =
-		ref_cast<ConstructionSite, MapObject>(descr->create_object());
+		dynamic_cast<ConstructionSite&>(descr->create_object());
 	csite.set_building(*this);
 
 	return csite;
@@ -725,8 +725,7 @@
 	(const EditorGameBase& game, RenderTarget& dst, const FCoords&, const Point& pos)
 {
 	const InteractiveGameBase & igbase =
-		ref_cast<InteractiveGameBase const, InteractiveBase const>
-			(*game.get_ibase());
+		dynamic_cast<const InteractiveGameBase&>(*game.get_ibase());
 	uint32_t const dpyflags = igbase.get_display_flags();
 
 	if (dpyflags & InteractiveBase::dfShowCensus) {

=== modified file 'src/logic/carrier.cc'
--- src/logic/carrier.cc	2014-09-20 09:37:47 +0000
+++ src/logic/carrier.cc	2014-11-30 18:54:51 +0000
@@ -84,8 +84,6 @@
 		return pop_task(game);
 	}
 
-	Road & road = ref_cast<Road, PlayerImmovable>(*get_location(game));
-
 	// Check for pending wares
 	if (m_promised_pickup_to == NOONE)
 		find_pending_ware(game);
@@ -103,6 +101,8 @@
 		}
 	}
 
+	Road & road = dynamic_cast<Road&>(*get_location(game));
+
 	// Move into idle position if necessary
 	if
 		(start_task_movepath
@@ -127,7 +127,7 @@
 void Carrier::road_pop(Game & game, State & /* state */)
 {
 	if (m_promised_pickup_to != NOONE && get_location(game)) {
-		Road & road      = ref_cast<Road, PlayerImmovable>(*get_location(game));
+		Road & road      = dynamic_cast<Road&>(*get_location(game));
 		Flag & flag      = road.get_flag(static_cast<Road::FlagId>(m_promised_pickup_to));
 		Flag & otherflag = road.get_flag(static_cast<Road::FlagId>(m_promised_pickup_to ^ 1));
 
@@ -176,8 +176,6 @@
 		return pop_task(game);
 	}
 
-	Road & road = ref_cast<Road, PlayerImmovable>(*get_location(game));
-
 	if (state.ivar1 == -1)
 		// If we're "in" the target building, special code applies
 		deliver_to_building(game, state);
@@ -187,6 +185,7 @@
 		pickup_from_flag(game, state);
 
 	else {
+		Road & road = dynamic_cast<Road&>(*get_location(game));
 		// If the ware should go to the building attached to our flag, walk
 		// directly into said building
 		Flag & flag = road.get_flag(static_cast<Road::FlagId>(state.ivar1 ^ 1));
@@ -243,7 +242,7 @@
 				state.ivar1 =
 					&building->base_flag()
 					==
-					&ref_cast<Road, PlayerImmovable>(*get_location(game)).get_flag
+					&dynamic_cast<Road&>(*get_location(game)).get_flag
 						(static_cast<Road::FlagId>(0));
 				break;
 			}
@@ -277,7 +276,7 @@
 
 		m_promised_pickup_to = NOONE;
 
-		Road & road      = ref_cast<Road, PlayerImmovable>(*get_location(game));
+		Road & road      = dynamic_cast<Road&>(*get_location(game));
 		Flag & flag      = road.get_flag(static_cast<Road::FlagId>(ivar1));
 		Flag & otherflag = road.get_flag(static_cast<Road::FlagId>(ivar1 ^ 1));
 
@@ -305,7 +304,7 @@
 void Carrier::drop_ware(Game & game, State & state)
 {
 	WareInstance * other = nullptr;
-	Road & road = ref_cast<Road, PlayerImmovable>(*get_location(game));
+	Road & road = dynamic_cast<Road&>(*get_location(game));
 	Flag & flag = road.get_flag(static_cast<Road::FlagId>(state.ivar1 ^ 1));
 
 	if (m_promised_pickup_to == (state.ivar1 ^ 1)) {
@@ -376,7 +375,7 @@
 bool Carrier::swap_or_wait(Game & game, State & state)
 {
 	// Road that employs us
-	Road & road = ref_cast<Road, PlayerImmovable>(*get_location(game));
+	Road & road = dynamic_cast<Road&>(*get_location(game));
 	// Flag we are delivering to
 	Flag & flag = road.get_flag(static_cast<Road::FlagId>(state.ivar1 ^ 1));
 	// The other flag of our road
@@ -456,24 +455,25 @@
  */
 void Carrier::find_pending_ware(Game & game)
 {
-	Road & road = ref_cast<Road, PlayerImmovable>(*get_location(game));
+	Road & road = dynamic_cast<Road&>(*get_location(game));
 	uint32_t havewarebits = 0;
 
 	assert(m_promised_pickup_to == NOONE);
 
-	if
-		(road.get_flag(Road::FlagStart).has_pending_ware
-		 	(game, road.get_flag(Road::FlagEnd)))
+	if (road.get_flag(Road::FlagStart).has_pending_ware
+			(game, road.get_flag(Road::FlagEnd))) {
 		havewarebits |= 1;
+	}
 
-	if
-		(road.get_flag(Road::FlagEnd).has_pending_ware
-		 	(game, road.get_flag(Road::FlagStart)))
+	if (road.get_flag(Road::FlagEnd).has_pending_ware
+			(game, road.get_flag(Road::FlagStart))) {
 		havewarebits |= 2;
+	}
 
 	//  If both flags have an ware, we pick the one closer to us.
-	if (havewarebits == 3)
+	if (havewarebits == 3) {
 		havewarebits = 1 << find_closest_flag(game);
+	}
 
 	// Ack our decision
 	if (havewarebits == 1) {
@@ -503,7 +503,7 @@
 {
 	Map & map = game.map();
 	CoordPath startpath
-		(map, ref_cast<Road, PlayerImmovable>(*get_location(game)).get_path());
+		(map, dynamic_cast<Road&>(*get_location(game)).get_path());
 
 	CoordPath endpath;
 	int32_t startcost, endcost;
@@ -551,7 +551,7 @@
 	(Game & game, int32_t const flag, bool const offset)
 {
 	const Path & path =
-		ref_cast<Road, PlayerImmovable>(*get_location(game)).get_path();
+		dynamic_cast<Road&>(*get_location(game)).get_path();
 	int32_t idx;
 
 	if (!flag) {

=== modified file 'src/logic/constructionsite.cc'
--- src/logic/constructionsite.cc	2014-09-10 17:52:49 +0000
+++ src/logic/constructionsite.cc	2014-11-30 18:54:51 +0000
@@ -172,7 +172,7 @@
 		Building & b =
 			m_building->create(egbase, owner(), m_position, false, false, m_old_buildings);
 		if (Worker * const builder = m_builder.get(egbase)) {
-			builder->reset_tasks(ref_cast<Game, EditorGameBase>(egbase));
+			builder->reset_tasks(dynamic_cast<Game&>(egbase));
 			builder->set_location(&b);
 		}
 		// Open the new building window if needed
@@ -180,7 +180,7 @@
 			Point window_position = m_optionswindow->get_pos();
 			hide_options();
 			InteractiveGameBase & igbase =
-				ref_cast<InteractiveGameBase, InteractiveBase>(*egbase.get_ibase());
+				dynamic_cast<InteractiveGameBase&>(*egbase.get_ibase());
 			b.show_options(igbase, false, window_position);
 		}
 	}

=== modified file 'src/logic/critter.cc'
--- src/logic/critter.cc	2014-10-27 10:14:10 +0000
+++ src/logic/critter.cc	2014-11-30 18:54:51 +0000
@@ -302,8 +302,7 @@
 
 	for (;;) {
 		const CritterProgram & program =
-			ref_cast<CritterProgram const, BobProgramBase const>
-				(*state.program);
+			dynamic_cast<const CritterProgram&>(*state.program);
 
 		if (state.ivar1 >= program.get_size())
 			return pop_task(game);

=== modified file 'src/logic/findnode.cc'
--- src/logic/findnode.cc	2014-07-24 16:26:55 +0000
+++ src/logic/findnode.cc	2014-11-30 18:54:51 +0000
@@ -19,7 +19,6 @@
 
 #include "logic/findnode.h"
 
-#include "base/deprecated.h"
 #include "base/wexception.h"
 #include "logic/field.h"
 #include "logic/immovable.h"

=== modified file 'src/logic/immovable.cc'
--- src/logic/immovable.cc	2014-11-24 07:25:21 +0000
+++ src/logic/immovable.cc	2014-11-30 18:54:51 +0000
@@ -25,7 +25,6 @@
 #include <boost/algorithm/string.hpp>
 #include <boost/format.hpp>
 
-#include "base/deprecated.h"
 #include "base/macros.h"
 #include "base/wexception.h"
 #include "config.h"
@@ -619,7 +618,7 @@
 {
 	BaseImmovable::Loader::load(fr);
 
-	Immovable & imm = ref_cast<Immovable, MapObject>(*get_object());
+	Immovable & imm = dynamic_cast<Immovable&>(*get_object());
 
 	if (version >= 5) {
 		PlayerNumber pn = fr.unsigned_8();

=== modified file 'src/logic/instances.cc'
--- src/logic/instances.cc	2014-09-20 09:37:47 +0000
+++ src/logic/instances.cc	2014-11-30 18:54:51 +0000
@@ -24,7 +24,6 @@
 #include <cstring>
 #include <string>
 
-#include "base/deprecated.h"
 #include "base/log.h"
 #include "base/wexception.h"
 #include "io/fileread.h"

=== modified file 'src/logic/instances.h'
--- src/logic/instances.h	2014-09-19 12:54:54 +0000
+++ src/logic/instances.h	2014-11-30 18:54:51 +0000
@@ -30,7 +30,6 @@
 #include <boost/unordered_map.hpp>
 #include <boost/signals2.hpp>
 
-#include "base/deprecated.h"
 #include "base/log.h"
 #include "base/macros.h"
 #include "logic/cmd_queue.h"
@@ -181,9 +180,9 @@
 
 /// If you find a better way to do this that doesn't cost a virtual function
 /// or additional member variable, go ahead
-#define MO_DESCR(type) \
-public: const type & descr() const { \
-		return ref_cast<type const, MapObjectDescr const>(*m_descr);          \
+#define MO_DESCR(type)                     \
+public: const type & descr() const {       \
+		return dynamic_cast<const type&>(*m_descr); \
    }                                                                          \
 
 class MapObject {
@@ -311,7 +310,7 @@
 		MapObjectLoader & mol   () {return *m_mol;}
 		MapObject            * get_object() {return m_object;}
 		template<typename T> T & get() {
-			return ref_cast<T, MapObject>(*m_object);
+			return dynamic_cast<T&>(*m_object);
 		}
 
 	protected:

=== modified file 'src/logic/militarysite.cc'
--- src/logic/militarysite.cc	2014-09-30 05:41:55 +0000
+++ src/logic/militarysite.cc	2014-11-30 18:54:51 +0000
@@ -335,7 +335,7 @@
 		// Now I know that the new guy is worthy.
 		if (nullptr != kickoutCandidate)
 		{
-			Game & game = ref_cast<Game, EditorGameBase>(owner().egbase());
+			Game & game = dynamic_cast<Game&>(owner().egbase());
 			kickoutCandidate->reset_tasks(game);
 			kickoutCandidate->start_task_leavebuilding(game, true);
 			return true;
@@ -355,7 +355,7 @@
 	// Call to drop_least routine has side effects: it tries to drop a soldier. Order is important!
 	if (stationed_soldiers().size() < m_capacity || drop_least_suited_soldier(true, &s))
 	{
-		Game & game = ref_cast<Game, EditorGameBase>(egbase);
+		Game & game = dynamic_cast<Game&>(egbase);
 		s.set_location(this);
 		s.reset_tasks(game);
 		s.start_task_buildingwork(game);
@@ -376,8 +376,8 @@
 	 Worker          * const w,
 	 PlayerImmovable &       target)
 {
-	MilitarySite & msite = ref_cast<MilitarySite, PlayerImmovable>(target);
-	Soldier      & s     = ref_cast<Soldier,      Worker>         (*w);
+	MilitarySite& msite = dynamic_cast<MilitarySite&>(target);
+	Soldier& s = dynamic_cast<Soldier&>(*w);
 
 	msite.incorporate_soldier(game, s);
 }
@@ -409,7 +409,7 @@
 	}
 
 	if (m_capacity < present.size()) {
-		Game & game = ref_cast<Game, EditorGameBase>(owner().egbase());
+		Game & game = dynamic_cast<Game&>(owner().egbase());
 		for (uint32_t i = 0; i < present.size() - m_capacity; ++i) {
 			Soldier & soldier = *present[i];
 			soldier.reset_tasks(game);
@@ -716,7 +716,7 @@
 
 void MilitarySite::drop_soldier(Soldier & soldier)
 {
-	Game & game = ref_cast<Game, EditorGameBase>(owner().egbase());
+	Game & game = dynamic_cast<Game&>(owner().egbase());
 
 	if (!is_present(soldier)) {
 		// This can happen when the "drop soldier" player command is delayed
@@ -754,7 +754,7 @@
 
 void MilitarySite::aggressor(Soldier & enemy)
 {
-	Game & game = ref_cast<Game, EditorGameBase>(owner().egbase());
+	Game & game = dynamic_cast<Game&>(owner().egbase());
 	Map  & map  = game.map();
 	if
 		(enemy.get_owner() == &owner() ||
@@ -797,7 +797,7 @@
 
 bool MilitarySite::attack(Soldier & enemy)
 {
-	Game & game = ref_cast<Game, EditorGameBase>(owner().egbase());
+	Game & game = dynamic_cast<Game&>(owner().egbase());
 
 	std::vector<Soldier *> present = present_soldiers();
 	Soldier * defender = nullptr;
@@ -992,7 +992,7 @@
 	m_soldierjobs.push_back(sj);
 
 	soldier.update_task_buildingwork
-		(ref_cast<Game, EditorGameBase>(owner().egbase()));
+		(dynamic_cast<Game&>(owner().egbase()));
 }
 
 

=== modified file 'src/logic/partially_finished_building.cc'
--- src/logic/partially_finished_building.cc	2014-09-10 10:18:46 +0000
+++ src/logic/partially_finished_building.cc	2014-11-30 18:54:51 +0000
@@ -201,7 +201,7 @@
 {
 	assert(w);
 
-	PartiallyFinishedBuilding & b = ref_cast<PartiallyFinishedBuilding, PlayerImmovable>(target);
+	PartiallyFinishedBuilding & b = dynamic_cast<PartiallyFinishedBuilding&>(target);
 
 	b.m_builder = w;
 

=== modified file 'src/logic/pathfield.cc'
--- src/logic/pathfield.cc	2014-09-19 12:54:54 +0000
+++ src/logic/pathfield.cc	2014-11-30 18:54:51 +0000
@@ -19,7 +19,6 @@
 
 #include "logic/pathfield.h"
 
-#include "base/deprecated.h"
 #include "base/wexception.h"
 
 namespace Widelands {

=== modified file 'src/logic/player.cc'
--- src/logic/player.cc	2014-09-20 09:37:47 +0000
+++ src/logic/player.cc	2014-11-30 18:54:51 +0000
@@ -201,7 +201,7 @@
 		const TribeDescr::Initialization & initialization =
 			tribe().initialization(m_initialization_index);
 
-		Game & game = ref_cast<Game, EditorGameBase>(egbase());
+		Game & game = dynamic_cast<Game&>(egbase());
 
 		// Run the corresponding script
 		std::unique_ptr<LuaTable> table(game.lua().run_script(initialization.script));
@@ -485,7 +485,7 @@
 		log("Clearing for road at (%i, %i)\n", c.x, c.y);
 
 		//  Make sure that the player owns the area around.
-		ref_cast<Game, EditorGameBase>(egbase()).conquer_area_no_building
+		dynamic_cast<Game&>(egbase()).conquer_area_no_building
 			(PlayerArea<Area<FCoords> >(player_number(), Area<FCoords>(c, 1)));
 
 		if (BaseImmovable * const immovable = c.field->get_immovable()) {
@@ -774,11 +774,12 @@
 */
 void Player::flagaction(Flag & flag)
 {
-	if (&flag.owner() == this) //  Additional security check.
+	if (&flag.owner() == this) { //  Additional security check.
 		flag.add_flag_job
-			(ref_cast<Game, EditorGameBase>(egbase()),
+			(dynamic_cast<Game&>(egbase()),
 			 tribe().worker_index("geologist"),
 			 "expedition");
+	}
 }
 
 

=== modified file 'src/logic/production_program.h'
--- src/logic/production_program.h	2014-09-14 11:31:58 +0000
+++ src/logic/production_program.h	2014-11-30 18:54:51 +0000
@@ -28,7 +28,6 @@
 
 #include <stdint.h>
 
-#include "base/deprecated.h"
 #include "base/log.h"
 #include "base/macros.h"
 #include "logic/bill_of_materials.h"

=== modified file 'src/logic/productionsite.cc'
--- src/logic/productionsite.cc	2014-10-27 10:14:10 +0000
+++ src/logic/productionsite.cc	2014-11-30 18:54:51 +0000
@@ -517,7 +517,7 @@
 	 Worker          * const w,
 	 PlayerImmovable &       target)
 {
-	ProductionSite & psite = ref_cast<ProductionSite, PlayerImmovable>(target);
+	ProductionSite & psite = dynamic_cast<ProductionSite&>(target);
 
 	assert(w);
 	assert(w->get_location(game) == &psite);
@@ -766,7 +766,7 @@
 				*descr().tribe().get_worker_descr(worker_type_with_count.first);
 			{
 				Worker & recruit =
-					ref_cast<Worker, Bob>(worker_descr.create_object());
+					dynamic_cast<Worker&>(worker_descr.create_object());
 				recruit.set_owner(&worker.owner());
 				recruit.set_position(game, worker.get_position());
 				recruit.init(game);

=== modified file 'src/logic/requirements.cc'
--- src/logic/requirements.cc	2014-09-20 09:37:47 +0000
+++ src/logic/requirements.cc	2014-11-30 18:54:51 +0000
@@ -19,7 +19,6 @@
 
 #include "logic/requirements.h"
 
-#include "base/deprecated.h"
 #include "base/i18n.h"
 #include "io/fileread.h"
 #include "io/filewrite.h"

=== modified file 'src/logic/ship.cc'
--- src/logic/ship.cc	2014-09-20 09:37:47 +0000
+++ src/logic/ship.cc	2014-11-30 18:54:51 +0000
@@ -21,7 +21,7 @@
 
 #include <memory>
 
-#include "base/deprecated.h"
+#include "base/macros.h"
 #include "economy/economy.h"
 #include "economy/flag.h"
 #include "economy/fleet.h"
@@ -1031,7 +1031,7 @@
 	// economy of all workers we're transporting so that they are in the correct
 	// economy. Also, we might are on an expedition which means that we just now
 	// created the economy of this ship and must inform all wares.
-	ship.set_economy(ref_cast<Game>(egbase()), ship.m_economy);
+	ship.set_economy(dynamic_cast<Game&>(egbase()), ship.m_economy);
 }
 
 

=== modified file 'src/logic/soldier.cc'
--- src/logic/soldier.cc	2014-10-27 10:14:10 +0000
+++ src/logic/soldier.cc	2014-11-30 18:54:51 +0000
@@ -700,12 +700,8 @@
 	 uint32_t const time)
 {
 	molog("[soldier] starting animation %s", animname);
-	return
-		start_task_idle
-			(ref_cast<Game, EditorGameBase>(egbase),
-			 descr().get_rand_anim
-			 	(ref_cast<Game, EditorGameBase>(egbase), animname),
-			 time);
+	Game& game = dynamic_cast<Game&>(egbase);
+	return start_task_idle(game, descr().get_rand_anim(game, animname), time);
 }
 
 
@@ -748,14 +744,16 @@
  */
 bool Soldier::can_be_challenged()
 {
-	if (m_hp_current < 1)  //< Soldier is dead!
-		return false;
-	if (!is_on_battlefield())
-		return false;
-	if (!m_battle)
+	if (m_hp_current < 1) {  //< Soldier is dead!
+		return false;
+	}
+	if (!is_on_battlefield()) {
+		return false;
+	}
+	if (!m_battle) {
 		return true;
-	return
-		!m_battle->locked(ref_cast<Game, EditorGameBase>(owner().egbase()));
+	}
+	return !m_battle->locked(dynamic_cast<Game&>(owner().egbase()));
 }
 
 /**
@@ -1806,7 +1804,7 @@
 
 		for (BaseImmovable * temp_attackable : attackables) {
 			if
-				(ref_cast<PlayerImmovable const, BaseImmovable const>(*temp_attackable)
+				(dynamic_cast<const PlayerImmovable&>(*temp_attackable)
 				 .get_owner()->player_number()
 				 ==
 				 land_owner) {

=== modified file 'src/logic/trainingsite.cc'
--- src/logic/trainingsite.cc	2014-10-27 10:14:10 +0000
+++ src/logic/trainingsite.cc	2014-11-30 18:54:51 +0000
@@ -341,8 +341,8 @@
 	 Worker          * const w,
 	 PlayerImmovable &       target)
 {
-	TrainingSite & tsite = ref_cast<TrainingSite, PlayerImmovable>(target);
-	Soldier      & s     = ref_cast<Soldier,      Worker>         (*w);
+	TrainingSite& tsite = dynamic_cast<TrainingSite&>(target);
+	Soldier& s = dynamic_cast<Soldier&>(*w);
 
 	assert(s.get_location(game) == &tsite);
 	assert(tsite.m_soldier_request == &rq);
@@ -416,7 +416,7 @@
  */
 void TrainingSite::drop_soldier(Soldier & soldier)
 {
-	Game & game = ref_cast<Game, EditorGameBase>(owner().egbase());
+	Game & game = dynamic_cast<Game&>(owner().egbase());
 
 	std::vector<Soldier *>::iterator it =
 		std::find(m_soldiers.begin(), m_soldiers.end(), &soldier);

=== modified file 'src/logic/warehouse.cc'
--- src/logic/warehouse.cc	2014-09-30 05:41:55 +0000
+++ src/logic/warehouse.cc	2014-11-30 18:54:51 +0000
@@ -23,7 +23,6 @@
 
 #include <boost/format.hpp>
 
-#include "base/deprecated.h"
 #include "base/log.h"
 #include "base/macros.h"
 #include "base/wexception.h"
@@ -377,11 +376,10 @@
 			(owner().is_worker_type_allowed(worker_index) &&
 			 m_next_worker_without_cost_spawn[i] == static_cast<uint32_t>(never()))
 		{
-			if (next_spawn == static_cast<uint32_t>(never()))
-				next_spawn =
-					schedule_act
-						(ref_cast<Game, EditorGameBase>(egbase),
-						 WORKER_WITHOUT_COST_SPAWN_INTERVAL);
+			upcast(Game, game, &egbase);
+			if (next_spawn == static_cast<uint32_t>(never())) {
+				next_spawn = schedule_act(dynamic_cast<Game&>(egbase), WORKER_WITHOUT_COST_SPAWN_INTERVAL);
+			}
 			m_next_worker_without_cost_spawn[i] = next_spawn;
 			log
 				("WARNING: player %u is allowed to create worker type %s but his "
@@ -444,17 +442,13 @@
 		// m_next_military_act is not touched in the loading code. Is only needed
 		// if there warehous is created in the game?  I assume it's for the
 		// conquer_radius thing
-		m_next_military_act =
-			schedule_act
-				(ref_cast<Game, EditorGameBase>(egbase), 1000);
+		m_next_military_act = schedule_act(*game, 1000);
 
-		m_next_stock_remove_act =
-			schedule_act
-				(ref_cast<Game, EditorGameBase>(egbase), 4000);
+		m_next_stock_remove_act = schedule_act(*game, 4000);
 
 		log("Message: adding (wh) (%s) %i \n", to_string(descr().type()).c_str(), player.player_number());
 		send_message
-			(ref_cast<Game, EditorGameBase>(egbase),
+			(*game,
 			 "warehouse",
 			 descr().descname(),
 			 (boost::format(_("A new %s was added to your economy."))
@@ -911,7 +905,7 @@
 	 Worker          * const w,
 	 PlayerImmovable &       target)
 {
-	Warehouse & wh = ref_cast<Warehouse, PlayerImmovable>(target);
+	Warehouse & wh = dynamic_cast<Warehouse&>(target);
 
 	if (w) {
 		w->schedule_incorporate(game);
@@ -1198,7 +1192,7 @@
 	if (!descr().get_conquers())
 		return;
 
-	Game & game = ref_cast<Game, EditorGameBase>(owner().egbase());
+	Game & game = dynamic_cast<Game&>(owner().egbase());
 	Map  & map  = game.map();
 	if
 		(enemy.get_owner() == &owner() ||
@@ -1221,20 +1215,18 @@
 	if (!count_workers(game, soldier_index, noreq))
 		return;
 
-	Soldier & defender =
-		ref_cast<Soldier, Worker>(launch_worker(game, soldier_index, noreq));
+	Soldier & defender = dynamic_cast<Soldier&>(launch_worker(game, soldier_index, noreq));
 	defender.start_task_defense(game, false);
 }
 
 bool Warehouse::attack(Soldier & enemy)
 {
-	Game & game = ref_cast<Game, EditorGameBase>(owner().egbase());
+	Game & game = dynamic_cast<Game&>(owner().egbase());
 	WareIndex const soldier_index = descr().tribe().worker_index("soldier");
 	Requirements noreq;
 
 	if (count_workers(game, soldier_index, noreq)) {
-		Soldier & defender =
-			ref_cast<Soldier, Worker>(launch_worker(game, soldier_index, noreq));
+		Soldier & defender = dynamic_cast<Soldier&>(launch_worker(game, soldier_index, noreq));
 		defender.start_task_defense(game, true);
 		enemy.send_signal(game, "sleep");
 		return true;

=== modified file 'src/logic/worker.cc'
--- src/logic/worker.cc	2014-10-27 10:14:10 +0000
+++ src/logic/worker.cc	2014-11-30 18:54:51 +0000
@@ -618,7 +618,7 @@
 	int32_t max_steps = -1;
 
 	// First of all, make sure we're outside
-	if (imm == &ref_cast<Building, PlayerImmovable>(*get_location(game))) {
+	if (imm == &dynamic_cast<Building&>(*get_location(game))) {
 		start_task_leavebuilding(game, false);
 		return true;
 	}
@@ -901,9 +901,6 @@
  */
 bool Worker::run_geologist(Game & game, State & state, const Action & action)
 {
-	// assert that location is of the right type.
-	ref_cast<Flag const, PlayerImmovable const>(*get_location(game));
-
 	molog
 		("  Start Geologist (%i attempts, %i radius -> %s)\n",
 		 action.iparam1, action.iparam2, action.sparam1.c_str());
@@ -1902,8 +1899,7 @@
 	}
 
 	for (;;) {
-		const WorkerProgram & program =
-			ref_cast<WorkerProgram const, BobProgramBase const>(*state.program);
+		const WorkerProgram & program = dynamic_cast<const WorkerProgram&>(*state.program);
 
 		if (static_cast<uint32_t>(state.ivar1) >= program.get_size())
 			return pop_task(game);
@@ -2083,7 +2079,7 @@
 	WareInstance * ware = get_carried_ware(game);
 	BaseImmovable * const location = game.map()[get_position()].get_immovable();
 #ifndef NDEBUG
-	Building & ploc = ref_cast<Building, PlayerImmovable>(*get_location(game));
+	Building & ploc = dynamic_cast<Building&>(*get_location(game));
 	assert(&ploc == location || &ploc.base_flag() == location);
 #endif
 
@@ -2205,11 +2201,9 @@
 
 		// The ware has decided that it doesn't want to go to us after all
 		// In order to return to the warehouse, we're switching to State_DropOff
-		if
-			(WareInstance * const ware =
-			 	ref_cast<Flag, PlayerImmovable>(*location).fetch_pending_ware
-			 		(game, employer))
+		if (WareInstance * const ware = dynamic_cast<Flag&>(*location).fetch_pending_ware(game, employer)) {
 			set_carried_ware(game, ware);
+		}
 
 		set_animation(game, descr().get_animation("idle"));
 		return schedule_act(game, 20);
@@ -2367,14 +2361,11 @@
  */
 void Worker::start_task_leavebuilding(Game & game, bool const changelocation)
 {
-	Building & building =
-		ref_cast<Building, PlayerImmovable>(*get_location(game));
-
 	// Set the wait task
 	push_task(game, taskLeavebuilding);
 	State & state = top_state();
 	state.ivar1   = changelocation;
-	state.objvar1 = &building;
+	state.objvar1 = &dynamic_cast<Building&>(*get_location(game));
 }
 
 
@@ -2437,8 +2428,9 @@
 	//  The if-statement is needed because this is (unfortunately) also called
 	//  when the Worker is deallocated when shutting down the simulation. Then
 	//  the building might not exist any more.
-	if (MapObject * const building = state.objvar1.get(game))
-		ref_cast<Building, MapObject>(*building).leave_skip(game, *this);
+	if (MapObject * const building = state.objvar1.get(game)) {
+		dynamic_cast<Building&>(*building).leave_skip(game, *this);
+	}
 }
 
 
@@ -2544,7 +2536,7 @@
 		molog("[fugitive]: found a flag connected to warehouse(s)\n");
 		for (const ImmovableFound& tmp_flag : flags) {
 
-			Flag & flag = ref_cast<Flag, BaseImmovable>(*tmp_flag.object);
+			Flag & flag = dynamic_cast<Flag&>(*tmp_flag.object);
 
 			if (game.logic_rand() % 2 == 0)
 				continue;
@@ -2651,7 +2643,7 @@
 	const World & world = game.world();
 	Area<FCoords> owner_area
 		(map.get_fcoords
-		 	(ref_cast<Flag, PlayerImmovable>(*get_location(game)).get_position()),
+		 	(dynamic_cast<Flag&>(*get_location(game)).get_position()),
 		 state.ivar2);
 
 	// Check if it's not time to go home
@@ -2798,12 +2790,10 @@
 	state.ivar2   = game.get_gametime() + time;
 
 	// first get out
-	Building & building =
-		ref_cast<Building, PlayerImmovable>(*get_location(game));
 	push_task(game, taskLeavebuilding);
 	State & stateLeave = top_state();
 	stateLeave.ivar1 = false;
-	stateLeave.objvar1 = &building;
+	stateLeave.objvar1 = &dynamic_cast<Building&>(*get_location(game));
 }
 
 
@@ -2958,8 +2948,7 @@
 
 	if (version >= 2) {
 		if (fr.unsigned_8()) {
-			worker.m_transfer =
-				new Transfer(ref_cast<Game, EditorGameBase>(egbase()), worker);
+			worker.m_transfer = new Transfer(dynamic_cast<Game&>(egbase()), worker);
 			worker.m_transfer->read(fr, m_transfer);
 		}
 	}

=== modified file 'src/logic/worker_descr.cc'
--- src/logic/worker_descr.cc	2014-09-20 09:37:47 +0000
+++ src/logic/worker_descr.cc	2014-11-30 18:54:51 +0000
@@ -19,7 +19,6 @@
 
 #include "logic/worker_descr.h"
 
-#include "base/deprecated.h"
 #include "base/i18n.h"
 #include "base/wexception.h"
 #include "graphic/graphic.h"
@@ -177,7 +176,7 @@
 	 Coords             const coords)
 const
 {
-	Worker & worker = ref_cast<Worker, MapObject>(create_object());
+	Worker & worker = dynamic_cast<Worker&>(create_object());
 	worker.set_owner(&owner);
 	worker.set_location(location);
 	worker.set_position(egbase, coords);

=== modified file 'src/map_io/CMakeLists.txt'
--- src/map_io/CMakeLists.txt	2014-11-22 15:27:45 +0000
+++ src/map_io/CMakeLists.txt	2014-11-30 18:54:51 +0000
@@ -86,7 +86,6 @@
     map_version_packet.h
   USES_SDL2_IMAGE
   DEPENDS
-    base_deprecated
     base_exceptions
     base_log
     base_macros

=== modified file 'src/map_io/map_buildingdata_packet.cc'
--- src/map_io/map_buildingdata_packet.cc	2014-09-20 09:37:47 +0000
+++ src/map_io/map_buildingdata_packet.cc	2014-11-30 18:54:51 +0000
@@ -194,43 +194,21 @@
 					//  Set economy now, some stuff below will count on this.
 					building.set_economy(building.m_flag->get_economy());
 
+					Game& game = dynamic_cast<Game&>(egbase);
+
 					if (upcast(ConstructionSite, constructionsite, &building)) {
-						read_constructionsite
-							(*constructionsite,
-							 fr,
-							 ref_cast<Game, EditorGameBase>(egbase),
-							 mol);
+						read_constructionsite(*constructionsite, fr, game, mol);
 					} else if (upcast(DismantleSite, dms, &building)) {
-						read_dismantlesite
-							(*dms,
-							 fr,
-							 ref_cast<Game, EditorGameBase>(egbase),
-							 mol);
+						read_dismantlesite(*dms, fr, game, mol);
 					} else if (upcast(Warehouse, warehouse, &building)) {
-						read_warehouse
-							(*warehouse,
-							 fr,
-							 ref_cast<Game, EditorGameBase>(egbase),
-							 mol);
+						read_warehouse(*warehouse, fr, game, mol);
 					} else if (upcast(ProductionSite, productionsite, &building)) {
 						if (upcast(MilitarySite, militarysite, productionsite)) {
-							read_militarysite
-								(*militarysite,
-								 fr,
-								 ref_cast<Game, EditorGameBase>(egbase),
-								 mol);
+							read_militarysite(*militarysite, fr, game, mol);
 						} else if (upcast(TrainingSite, trainingsite, productionsite)) {
-							read_trainingsite
-								(*trainingsite,
-								 fr,
-								 ref_cast<Game, EditorGameBase>(egbase),
-								 mol);
+							read_trainingsite(*trainingsite, fr, game, mol);
 						} else {
-							read_productionsite
-								(*productionsite,
-								 fr,
-								 ref_cast<Game, EditorGameBase>(egbase),
-								 mol);
+							read_productionsite(*productionsite, fr, game, mol);
 						}
 					} else {
 						//  type of building is not one of (or derived from)
@@ -238,8 +216,7 @@
 						assert(false);
 					}
 					if (packet_version < 3) {
-						read_formerbuildings_v2
-							(building, fr, ref_cast<Game, EditorGameBase>(egbase), mol);
+						read_formerbuildings_v2(building, fr, game, mol);
 					}
 
 					mol.mark_object_as_loaded(building);
@@ -1137,7 +1114,7 @@
 	Map & map = egbase.map();
 	const uint32_t mapwidth = map.get_width();
 	MapIndex const max_index = map.max_index();
-	for (MapIndex i = 0; i < max_index; ++i)
+	for (MapIndex i = 0; i < max_index; ++i) {
 		if (upcast(Building const, building, map[i].get_immovable())) {
 			assert(mos.is_object_known(*building));
 
@@ -1190,52 +1167,32 @@
 				fw.unsigned_8(is_stopped);
 			}
 
-			if (upcast(ConstructionSite const, constructionsite, building))
-				write_constructionsite
-					(*constructionsite,
-					 fw,
-					 ref_cast<Game, EditorGameBase>(egbase),
-					 mos);
-			else if (upcast(DismantleSite const, dms, building))
-				write_dismantlesite
-					(*dms,
-					 fw,
-					 ref_cast<Game, EditorGameBase>(egbase),
-					 mos);
-			else if (upcast(Warehouse const, warehouse, building))
-				write_warehouse
-					(*warehouse,
-					 fw,
-					 ref_cast<Game, EditorGameBase>(egbase),
-					 mos);
-			else if (upcast(ProductionSite const, productionsite, building)) {
-				if (upcast(MilitarySite const, militarysite, productionsite))
-					write_militarysite
-						(*militarysite,
-						 fw,
-						 ref_cast<Game, EditorGameBase>(egbase),
-						 mos);
-				else if (upcast(TrainingSite const, trainingsite, productionsite))
-					write_trainingsite
-						(*trainingsite,
-						 fw,
-						 ref_cast<Game, EditorGameBase>(egbase),
-						 mos);
-				else
-					write_productionsite
-						(*productionsite,
-						 fw,
-						 ref_cast<Game, EditorGameBase>(egbase),
-						 mos);
+			Game& game = dynamic_cast<Game&>(egbase);
+
+			if (upcast(ConstructionSite const, constructionsite, building)) {
+				write_constructionsite(*constructionsite, fw, game, mos);
+			} else if (upcast(DismantleSite const, dms, building)) {
+				write_dismantlesite(*dms, fw, game, mos);
+			} else if (upcast(Warehouse const, warehouse, building)) {
+				write_warehouse (*warehouse, fw, game, mos);
+			} else if (upcast(ProductionSite const, productionsite, building)) {
+				if (upcast(MilitarySite const, militarysite, productionsite)) {
+					write_militarysite(*militarysite, fw, game, mos);
+				}
+				else if (upcast(TrainingSite const, trainingsite, productionsite)) {
+					write_trainingsite(*trainingsite, fw, game, mos);
+				}
+				else {
+					write_productionsite(*productionsite, fw, game, mos);
+				}
 			} else {
 				assert(false);
 				//  type of building is not one of (or derived from)
 				//  {ConstructionSite, Warehouse, ProductionSite}
 			}
-
 			mos.mark_object_as_saved(*building);
 		}
-
+	}
 	fw.write(fs, "binary/building_data");
 }
 

=== modified file 'src/map_io/map_elemental_packet.cc'
--- src/map_io/map_elemental_packet.cc	2014-10-29 06:41:10 +0000
+++ src/map_io/map_elemental_packet.cc	2014-11-30 18:54:51 +0000
@@ -22,7 +22,6 @@
 #include <boost/algorithm/string.hpp>
 #include <boost/format.hpp>
 
-#include "base/deprecated.h"
 #include "logic/editor_game_base.h"
 #include "logic/game_data_error.h"
 #include "logic/map.h"

=== modified file 'src/map_io/map_flag_packet.cc'
--- src/map_io/map_flag_packet.cc	2014-09-20 09:37:47 +0000
+++ src/map_io/map_flag_packet.cc	2014-11-30 18:54:51 +0000
@@ -109,7 +109,7 @@
 						mol.register_object<Flag>
 							(serial,
 							 *new Flag
-							 	(ref_cast<Game, EditorGameBase>(egbase),
+							 	(dynamic_cast<Game&>(egbase),
 							 	 egbase.player(owner),
 							 	 fc));
 					} catch (const WException & e) {

=== modified file 'src/map_io/map_flagdata_packet.cc'
--- src/map_io/map_flagdata_packet.cc	2014-09-20 09:37:47 +0000
+++ src/map_io/map_flagdata_packet.cc	2014-11-30 18:54:51 +0000
@@ -202,7 +202,7 @@
 										 Flag::flag_job_request_callback,
 										 wwWORKER);
 								f.request->read
-									(fr, ref_cast<Game, EditorGameBase>(egbase), mol);
+									(fr, dynamic_cast<Game&>(egbase), mol);
 							} else {
 								f.request = nullptr;
 							}
@@ -302,7 +302,7 @@
 				if (temp_job.request) {
 					fw.unsigned_8(1);
 					temp_job.request->write
-						(fw, ref_cast<Game, EditorGameBase>(egbase), mos);
+						(fw, dynamic_cast<Game&>(egbase), mos);
 				} else
 					fw.unsigned_8(0);
 

=== modified file 'src/map_io/map_object_saver.cc'
--- src/map_io/map_object_saver.cc	2014-09-14 11:31:58 +0000
+++ src/map_io/map_object_saver.cc	2014-11-30 18:54:51 +0000
@@ -19,7 +19,6 @@
 
 #include "map_io/map_object_saver.h"
 
-#include "base/deprecated.h"
 #include "base/wexception.h"
 #include "economy/flag.h"
 #include "economy/fleet.h"

=== modified file 'src/map_io/map_port_spaces_packet.cc'
--- src/map_io/map_port_spaces_packet.cc	2014-09-30 05:41:55 +0000
+++ src/map_io/map_port_spaces_packet.cc	2014-11-30 18:54:51 +0000
@@ -23,7 +23,6 @@
 
 #include <boost/algorithm/string.hpp>
 
-#include "base/deprecated.h"
 #include "base/log.h"
 #include "logic/editor_game_base.h"
 #include "logic/game_data_error.h"

=== modified file 'src/map_io/map_roaddata_packet.cc'
--- src/map_io/map_roaddata_packet.cc	2014-09-20 09:37:47 +0000
+++ src/map_io/map_roaddata_packet.cc	2014-11-30 18:54:51 +0000
@@ -69,6 +69,7 @@
 					break;
 				}
 				try {
+					Game& game = dynamic_cast<Game&>(egbase);
 					Road & road = mol.get<Road>(serial);
 					if (mol.is_object_loaded(road))
 						throw GameDataError("already loaded");
@@ -124,7 +125,7 @@
 
 					//  Now that all rudimentary data is set, init this road. Then
 					//  overwrite the initialization values.
-					road._link_into_flags(ref_cast<Game, EditorGameBase>(egbase));
+					road._link_into_flags(game);
 
 					road.m_idle_index      = fr.unsigned_32();
 
@@ -166,8 +167,8 @@
 							 		(road,
 							 		 0,
 							 		 Road::_request_carrier_callback,
-							 		 wwWORKER))
-							->read(fr, ref_cast<Game, EditorGameBase>(egbase), mol);
+									 wwWORKER))
+							->read(fr, game, mol);
 						} else {
 							carrier_request = nullptr;
 							//log("No request in this slot");
@@ -190,13 +191,7 @@
 						} else {
 							delete carrier_request;
 							if (carrier) {
-								//carrier->set_location (0);
-								carrier->reset_tasks
-									(ref_cast<Game,
-									 EditorGameBase>(egbase));
-								//carrier->send_signal
-								//(ref_cast<Game,
-								//EditorGameBase>(egbase), "location");
+								carrier->reset_tasks(dynamic_cast<Game&>(egbase));
 							}
 						}
 					}
@@ -275,8 +270,7 @@
 
 					if (temp_slot.carrier_request) {
 						fw.unsigned_8(1);
-						temp_slot.carrier_request->write
-							(fw, ref_cast<Game, EditorGameBase>(egbase), mos);
+						temp_slot.carrier_request->write(fw, dynamic_cast<Game&>(egbase), mos);
 					} else {
 						fw.unsigned_8(0);
 					}

=== modified file 'src/network/CMakeLists.txt'
--- src/network/CMakeLists.txt	2014-10-13 15:04:50 +0000
+++ src/network/CMakeLists.txt	2014-11-30 18:54:51 +0000
@@ -23,7 +23,6 @@
   USES_SDL2_NET
   DEPENDS
     ai
-    base_deprecated
     base_exceptions
     base_i18n
     base_log

=== modified file 'src/network/network_lan_promotion.cc'
--- src/network/network_lan_promotion.cc	2014-09-20 09:37:47 +0000
+++ src/network/network_lan_promotion.cc	2014-11-30 18:54:51 +0000
@@ -22,7 +22,6 @@
 #include <cstdio>
 #include <cstring>
 
-#include "base/deprecated.h"
 #include "base/log.h"
 #include "base/macros.h"
 #include "build_info.h"

=== modified file 'src/scripting/CMakeLists.txt'
--- src/scripting/CMakeLists.txt	2014-07-25 20:16:31 +0000
+++ src/scripting/CMakeLists.txt	2014-11-30 18:54:51 +0000
@@ -38,7 +38,6 @@
     scripting.h
   USES_BOOST_REGEX
   DEPENDS
-    base_deprecated
     base_exceptions
     base_i18n
     base_log

=== modified file 'src/scripting/lua_map.cc'
--- src/scripting/lua_map.cc	2014-10-27 10:14:10 +0000
+++ src/scripting/lua_map.cc	2014-11-30 18:54:51 +0000
@@ -21,8 +21,8 @@
 
 #include <boost/format.hpp>
 
-#include "base/deprecated.h"
 #include "base/log.h"
+#include "base/macros.h"
 #include "economy/wares_queue.h"
 #include "graphic/graphic.h"
 #include "logic/carrier.h"
@@ -444,7 +444,7 @@
 			lua_rawset(L, -3);
 		}
 	} else {
-		const SoldierDescr& soldier_descr = ref_cast<SoldierDescr const, WorkerDescr const>
+		const SoldierDescr& soldier_descr = dynamic_cast<const SoldierDescr&>
 			(*tribe.get_worker_descr(tribe.worker_index("soldier")));
 
 		// Only return the number of those requested
@@ -470,7 +470,7 @@
 
 	const TribeDescr& tribe = owner->tribe();
 	const SoldierDescr& soldier_descr =  //  soldiers
-		ref_cast<SoldierDescr const, WorkerDescr const>
+		dynamic_cast<const SoldierDescr&>
 			(*tribe.get_worker_descr(tribe.worker_index("soldier")));
 	SoldiersMap setpoints = m_parse_set_soldiers_arguments(L, soldier_descr);
 
@@ -517,7 +517,7 @@
 			}
 		} else if (d > 0) {
 			for (; d; --d) {
-				Soldier& soldier = ref_cast<Soldier, Worker>
+				Soldier& soldier = dynamic_cast<Soldier&>
 					(soldier_descr.create(egbase, *owner, nullptr, building_position));
 				soldier.set_level
 					(sp.first.hp, sp.first.at, sp.first.de, sp.first.ev);
@@ -2586,11 +2586,12 @@
 	for (Path::StepVector::size_type i = 0; i < idle_index; ++i)
 		egbase.map().get_neighbour(idle_position, path[i], &idle_position);
 
-	Carrier & carrier = ref_cast<Carrier, Worker>
-		(wdes->create (egbase, r.owner(), &r, idle_position));
+	Carrier& carrier = dynamic_cast<Carrier&>
+		(wdes->create(egbase, r.owner(), &r, idle_position));
 
-	if (upcast(Game, game, &egbase))
+	if (upcast(Game, game, &egbase)) {
 		carrier.start_task_road(*game);
+	}
 
 	r.assign_carrier(carrier, 0);
 	return 0;

=== modified file 'src/sound/CMakeLists.txt'
--- src/sound/CMakeLists.txt	2014-10-13 15:04:50 +0000
+++ src/sound/CMakeLists.txt	2014-11-30 18:54:51 +0000
@@ -10,7 +10,6 @@
   USES_SDL2
   USES_SDL2_MIXER
   DEPENDS
-    base_deprecated
     base_i18n
     base_log
     graphic

=== modified file 'src/sound/sound_handler.cc'
--- src/sound/sound_handler.cc	2014-10-16 16:06:37 +0000
+++ src/sound/sound_handler.cc	2014-11-30 18:54:51 +0000
@@ -28,7 +28,6 @@
 #include <windows.h>
 #endif
 
-#include "base/deprecated.h"
 #include "base/i18n.h"
 #include "base/log.h"
 #include "graphic/graphic.h"

=== modified file 'src/ui_basic/CMakeLists.txt'
--- src/ui_basic/CMakeLists.txt	2014-11-22 11:00:04 +0000
+++ src/ui_basic/CMakeLists.txt	2014-11-30 18:54:51 +0000
@@ -51,7 +51,6 @@
   USES_BOOST_REGEX
   USES_SDL2
   DEPENDS
-    base_deprecated
     base_exceptions
     base_geometry
     base_i18n

=== modified file 'src/ui_basic/listselect.cc'
--- src/ui_basic/listselect.cc	2014-11-22 10:18:20 +0000
+++ src/ui_basic/listselect.cc	2014-11-30 18:54:51 +0000
@@ -23,7 +23,6 @@
 
 #include <boost/bind.hpp>
 
-#include "base/deprecated.h"
 #include "base/log.h"
 #include "graphic/font.h"
 #include "graphic/font_handler.h"

=== modified file 'src/ui_basic/progresswindow.cc'
--- src/ui_basic/progresswindow.cc	2014-10-14 06:30:20 +0000
+++ src/ui_basic/progresswindow.cc	2014-11-30 18:54:51 +0000
@@ -23,7 +23,6 @@
 #include <sys/time.h>
 #endif
 
-#include "base/deprecated.h"
 #include "base/i18n.h"
 #include "graphic/font.h"
 #include "graphic/font_handler.h"

=== modified file 'src/ui_basic/spinbox.cc'
--- src/ui_basic/spinbox.cc	2014-09-30 05:41:55 +0000
+++ src/ui_basic/spinbox.cc	2014-11-30 18:54:51 +0000
@@ -23,7 +23,6 @@
 
 #include <boost/format.hpp>
 
-#include "base/deprecated.h"
 #include "base/i18n.h"
 #include "base/wexception.h"
 #include "ui_basic/button.h"

=== modified file 'src/ui_basic/table.cc'
--- src/ui_basic/table.cc	2014-11-22 10:18:20 +0000
+++ src/ui_basic/table.cc	2014-11-30 18:54:51 +0000
@@ -21,7 +21,6 @@
 
 #include <boost/bind.hpp>
 
-#include "base/deprecated.h"
 #include "graphic/font.h"
 #include "graphic/font_handler.h"
 #include "graphic/font_handler1.h"

=== modified file 'src/wui/CMakeLists.txt'
--- src/wui/CMakeLists.txt	2014-10-13 15:04:50 +0000
+++ src/wui/CMakeLists.txt	2014-11-30 18:54:51 +0000
@@ -129,7 +129,6 @@
     watchwindow.h
   USES_SDL2
   DEPENDS
-    base_deprecated
     base_exceptions
     base_geometry
     base_i18n

=== modified file 'src/wui/actionconfirm.cc'
--- src/wui/actionconfirm.cc	2014-11-13 08:25:45 +0000
+++ src/wui/actionconfirm.cc	2014-11-30 18:54:51 +0000
@@ -46,7 +46,7 @@
 		 Widelands::Ship & ship);
 
 	InteractivePlayer & iaplayer() const {
-		return ref_cast<InteractivePlayer, UI::Panel>(*get_parent());
+		return dynamic_cast<InteractivePlayer&>(*get_parent());
 	}
 
 	virtual void think() = 0;

=== modified file 'src/wui/building_statistics_menu.cc'
--- src/wui/building_statistics_menu.cc	2014-10-28 14:57:52 +0000
+++ src/wui/building_statistics_menu.cc	2014-11-30 18:54:51 +0000
@@ -65,7 +65,7 @@
 namespace Columns {enum {Name, Size, Prod, Owned, Build};}
 
 inline InteractivePlayer & BuildingStatisticsMenu::iplayer() const {
-	return ref_cast<InteractivePlayer, UI::Panel>(*get_parent());
+	return dynamic_cast<InteractivePlayer&>(*get_parent());
 }
 
 BuildingStatisticsMenu::BuildingStatisticsMenu
@@ -420,7 +420,7 @@
 				++nr_owned;
 				if (productionsite)
 					total_prod +=
-						ref_cast<Widelands::ProductionSite, Widelands::BaseImmovable>
+						dynamic_cast<Widelands::ProductionSite&>
 							(*map[vec[l].pos].get_immovable())
 						.get_statistics_percent();
 			}

=== modified file 'src/wui/buildingwindow.cc'
--- src/wui/buildingwindow.cc	2014-11-24 07:25:21 +0000
+++ src/wui/buildingwindow.cc	2014-11-30 18:54:51 +0000
@@ -378,7 +378,7 @@
 			igbase().game().send_player_bulldoze(m_building);
 	}
 	else {
-		show_bulldoze_confirm(ref_cast<InteractivePlayer, InteractiveGameBase>(igbase()), m_building);
+		show_bulldoze_confirm(dynamic_cast<InteractivePlayer&>(igbase()), m_building);
 	}
 }
 
@@ -394,7 +394,7 @@
 			igbase().game().send_player_dismantle(m_building);
 	}
 	else {
-		show_dismantle_confirm(ref_cast<InteractivePlayer, InteractiveGameBase>(igbase()), m_building);
+		show_dismantle_confirm(dynamic_cast<InteractivePlayer&>(igbase()), m_building);
 	}
 }
 
@@ -438,7 +438,7 @@
 	}
 	else {
 		show_enhance_confirm
-			(ref_cast<InteractivePlayer, InteractiveGameBase>(igbase()),
+			(dynamic_cast<InteractivePlayer&>(igbase()),
 			 m_building,
 			 id);
 	}

=== modified file 'src/wui/buildingwindow.h'
--- src/wui/buildingwindow.h	2014-09-10 14:48:40 +0000
+++ src/wui/buildingwindow.h	2014-11-30 18:54:51 +0000
@@ -47,7 +47,7 @@
 	Widelands::Building & building() {return m_building;}
 
 	InteractiveGameBase & igbase() const {
-		return ref_cast<InteractiveGameBase, UI::Panel>(*get_parent());
+		return dynamic_cast<InteractiveGameBase&>(*get_parent());
 	}
 
 	void draw(RenderTarget &) override;

=== modified file 'src/wui/constructionsitewindow.cc'
--- src/wui/constructionsitewindow.cc	2014-09-10 14:48:40 +0000
+++ src/wui/constructionsitewindow.cc	2014-11-30 18:54:51 +0000
@@ -86,7 +86,7 @@
 	BuildingWindow::think();
 
 	const Widelands::ConstructionSite & cs =
-		ref_cast<Widelands::ConstructionSite, Widelands::Building>(building());
+		dynamic_cast<Widelands::ConstructionSite&>(building());
 
 	m_progress->set_state(cs.get_built_per64k());
 }

=== modified file 'src/wui/dismantlesitewindow.cc'
--- src/wui/dismantlesitewindow.cc	2014-09-10 14:48:40 +0000
+++ src/wui/dismantlesitewindow.cc	2014-11-30 18:54:51 +0000
@@ -80,7 +80,7 @@
 	BuildingWindow::think();
 
 	const Widelands::DismantleSite & ds =
-		ref_cast<Widelands::DismantleSite, Widelands::Building>(building());
+		dynamic_cast<Widelands::DismantleSite&>(building());
 
 	m_progress->set_state(ds.get_built_per64k());
 }

=== modified file 'src/wui/encyclopedia_window.cc'
--- src/wui/encyclopedia_window.cc	2014-10-28 14:57:52 +0000
+++ src/wui/encyclopedia_window.cc	2014-11-30 18:54:51 +0000
@@ -51,7 +51,7 @@
 using namespace Widelands;
 
 inline InteractivePlayer & EncyclopediaWindow::iaplayer() const {
-	return ref_cast<InteractivePlayer, UI::Panel>(*get_parent());
+	return dynamic_cast<InteractivePlayer&>(*get_parent());
 }
 
 
@@ -141,10 +141,8 @@
 	condTable.clear();
 	const TribeDescr & tribe = iaplayer().player().tribe();
 
-	const ProductionSiteDescr::Programs & programs =
-		ref_cast<ProductionSiteDescr const, BuildingDescr const>
-			(*tribe.get_building_descr(prodSites.get_selected()))
-		.programs();
+	upcast(ProductionSiteDescr const, descr, tribe.get_building_descr(prodSites.get_selected()));
+	const ProductionSiteDescr::Programs & programs = descr->programs();
 
 	//  TODO(unknown): This needs reworking. A program can indeed produce iron even if
 	//  the program name is not any of produce_iron, smelt_iron, prog_iron

=== modified file 'src/wui/fieldaction.cc'
--- src/wui/fieldaction.cc	2014-11-13 08:25:45 +0000
+++ src/wui/fieldaction.cc	2014-11-30 18:54:51 +0000
@@ -177,7 +177,7 @@
 	~FieldActionWindow();
 
 	InteractiveBase & ibase() {
-		return ref_cast<InteractiveBase, UI::Panel>(*get_parent());
+		return dynamic_cast<InteractiveBase&>(*get_parent());
 	}
 
 	void think() override;
@@ -656,8 +656,8 @@
 */
 void FieldActionWindow::act_watch()
 {
-	show_watch_window
-		(ref_cast<InteractiveGameBase, InteractiveBase>(ibase()), m_node);
+	upcast(InteractiveGameBase, igbase, &ibase());
+	show_watch_window(*igbase, m_node);
 	okdialog();
 }
 
@@ -710,9 +710,10 @@
 
 	if (ibase().is_building_road())
 		ibase().finish_build_road();
-	else if (game)
-		ref_cast<InteractivePlayer, InteractiveBase>(ibase())
-			.set_flag_to_connect(m_node);
+	else if (game) {
+		upcast(InteractivePlayer, iaplayer, &ibase());
+		iaplayer->set_flag_to_connect(m_node);
+	}
 
 	okdialog();
 }
@@ -734,22 +735,22 @@
 {
 	okdialog();
 	Widelands::EditorGameBase & egbase = ibase().egbase();
+	upcast(Game, game, &egbase);
+	upcast(InteractivePlayer, iaplayer, &ibase());
+
 	if (upcast(Widelands::Flag, flag, m_node.field->get_immovable())) {
 		if (Building * const building = flag->get_building()) {
 			if (building->get_playercaps() & Building::PCap_Bulldoze) {
 				if (get_key_state(SDL_SCANCODE_LCTRL) || get_key_state(SDL_SCANCODE_RCTRL)) {
-					ref_cast<Game, EditorGameBase>(egbase).send_player_bulldoze
+					game->send_player_bulldoze
 						(*flag, get_key_state(SDL_SCANCODE_LCTRL) || get_key_state(SDL_SCANCODE_RCTRL));
 				}
 				else {
-					show_bulldoze_confirm
-						(ref_cast<InteractivePlayer, InteractiveBase>(ibase()),
-						 *building,
-						 flag);
+					show_bulldoze_confirm(*iaplayer, *building, flag);
 				}
 			}
 		} else {
-			ref_cast<Game, EditorGameBase>(egbase).send_player_bulldoze
+			game->send_player_bulldoze
 					(*flag, get_key_state(SDL_SCANCODE_LCTRL) || get_key_state(SDL_SCANCODE_RCTRL));
 		}
 	}
@@ -792,9 +793,11 @@
 void FieldActionWindow::act_removeroad()
 {
 	Widelands::EditorGameBase & egbase = ibase().egbase();
-	if (upcast(Widelands::Road, road, egbase.map().get_immovable(m_node)))
-		ref_cast<Game, EditorGameBase>(egbase).send_player_bulldoze
+	if (upcast(Widelands::Road, road, egbase.map().get_immovable(m_node))) {
+		upcast(Game, game, &ibase().egbase());
+		game->send_player_bulldoze
 			(*road, get_key_state(SDL_SCANCODE_LCTRL) || get_key_state(SDL_SCANCODE_RCTRL));
+	}
 	okdialog();
 }
 
@@ -806,15 +809,12 @@
 */
 void FieldActionWindow::act_build(Widelands::BuildingIndex idx)
 {
-	Widelands::Game & game = ref_cast<Game, EditorGameBase>(ibase().egbase());
-	game.send_player_build
-		(ref_cast<InteractivePlayer, InteractiveBase>(ibase()).player_number(),
-		 m_node,
-		 Widelands::BuildingIndex(idx));
-	ibase().reference_player_tribe
-		(m_plr->player_number(), &m_plr->tribe());
-	ref_cast<InteractivePlayer, InteractiveBase>(ibase()).set_flag_to_connect
-		(game.map().br_n(m_node));
+	upcast(Game, game, &ibase().egbase());
+	upcast(InteractivePlayer, iaplayer, &ibase());
+
+	game->send_player_build(iaplayer->player_number(), m_node, Widelands::BuildingIndex(idx));
+	ibase().reference_player_tribe(m_plr->player_number(), &m_plr->tribe());
+	iaplayer->set_flag_to_connect(game->map().br_n(m_node));
 	okdialog();
 }
 
@@ -848,10 +848,10 @@
 */
 void FieldActionWindow::act_geologist()
 {
-	Game & game = ref_cast<Game, EditorGameBase>(ibase().egbase());
-	if (upcast(Widelands::Flag, flag, game.map().get_immovable(m_node)))
-		game.send_player_flagaction (*flag);
-
+	upcast(Game, game, &ibase().egbase());
+	if (upcast(Widelands::Flag, flag, game->map().get_immovable(m_node))) {
+		game->send_player_flagaction (*flag);
+	}
 	okdialog();
 }
 
@@ -863,15 +863,16 @@
  */
 void FieldActionWindow::act_attack ()
 {
-	Game & game = ref_cast<Game, EditorGameBase>(ibase().egbase());
-
 	assert(m_attack_box);
-	if (upcast(Building, building, game.map().get_immovable(m_node)))
-		if (m_attack_box->soldiers() > 0)
-			game.send_player_enemyflagaction(
+	upcast(Game, game, &ibase().egbase());
+	if (upcast(Building, building, game->map().get_immovable(m_node)))
+		if (m_attack_box->soldiers() > 0) {
+			upcast(InteractivePlayer const, iaplayer, &ibase());
+			game->send_player_enemyflagaction(
 			   building->base_flag(),
-			   ref_cast<const InteractivePlayer, const InteractiveBase>(ibase()).player_number(),
+				iaplayer->player_number(),
 			   m_attack_box->soldiers() /*  number of soldiers */);
+		}
 	okdialog();
 }
 
@@ -933,8 +934,8 @@
 			finish = true;
 		else if (dynamic_cast<const Widelands::Road *>(i))
 			if (player->get_buildcaps(target) & Widelands::BUILDCAPS_FLAG) {
-				ref_cast<Game, EditorGameBase>(player->egbase())
-					.send_player_build_flag(player->player_number(), target);
+				upcast(Game, game, &player->egbase());
+				game->send_player_build_flag(player->player_number(), target);
 				finish = true;
 			}
 		if (finish)

=== modified file 'src/wui/game_debug_ui.cc'
--- src/wui/game_debug_ui.cc	2014-10-27 10:14:10 +0000
+++ src/wui/game_debug_ui.cc	2014-11-30 18:54:51 +0000
@@ -133,7 +133,7 @@
 	MapObjectDebugWindow(InteractiveBase & parent, Widelands::MapObject &);
 
 	InteractiveBase & ibase() {
-		return ref_cast<InteractiveBase, UI::Panel>(*get_parent());
+		return dynamic_cast<InteractiveBase&>(*get_parent());
 	}
 
 	void think() override;
@@ -212,7 +212,7 @@
 	FieldDebugWindow(InteractiveBase & parent, Widelands::Coords);
 
 	InteractiveBase & ibase() {
-		return ref_cast<InteractiveBase, UI::Panel>(*get_parent());
+		return dynamic_cast<InteractiveBase&>(*get_parent());
 	}
 
 	void think() override;
@@ -274,7 +274,7 @@
 
 	// Select information about the field itself
 	const Widelands::EditorGameBase & egbase =
-		ref_cast<InteractiveBase const, UI::Panel const>(*get_parent())
+		dynamic_cast<const InteractiveBase&>(*get_parent())
 		.egbase();
 	{
 		Widelands::PlayerNumber const owner = m_coords.field->get_owned_by();

=== modified file 'src/wui/game_main_menu_save_game.cc'
--- src/wui/game_main_menu_save_game.cc	2014-10-27 10:31:04 +0000
+++ src/wui/game_main_menu_save_game.cc	2014-11-30 18:54:51 +0000
@@ -35,7 +35,7 @@
 #include "wui/interactive_gamebase.h"
 
 InteractiveGameBase & GameMainMenuSaveGame::igbase() {
-	return ref_cast<InteractiveGameBase, UI::Panel>(*get_parent());
+	return dynamic_cast<InteractiveGameBase&>(*get_parent());
 }
 
 #define WINDOW_WIDTH                                                        440
@@ -262,7 +262,7 @@
 	{}
 
 	GameMainMenuSaveGame & menu_save_game() {
-		return ref_cast<GameMainMenuSaveGame, UI::Panel>(*get_parent());
+		return dynamic_cast<GameMainMenuSaveGame&>(*get_parent());
 	}
 
 
@@ -328,7 +328,7 @@
 	void pressed_yes() override
 	{
 		g_fs->fs_unlink(m_filename);
-		ref_cast<GameMainMenuSaveGame, UI::Panel>(*get_parent()).fill_list();
+		dynamic_cast<GameMainMenuSaveGame&>(*get_parent()).fill_list();
 		die();
 	}
 

=== modified file 'src/wui/game_main_menu_save_game.h'
--- src/wui/game_main_menu_save_game.h	2014-09-10 13:03:40 +0000
+++ src/wui/game_main_menu_save_game.h	2014-11-30 18:54:51 +0000
@@ -20,7 +20,6 @@
 #ifndef WL_WUI_GAME_MAIN_MENU_SAVE_GAME_H
 #define WL_WUI_GAME_MAIN_MENU_SAVE_GAME_H
 
-#include "base/deprecated.h"
 #include "base/i18n.h"
 #include "ui_basic/button.h"
 #include "ui_basic/editbox.h"

=== modified file 'src/wui/game_message_menu.cc'
--- src/wui/game_message_menu.cc	2014-11-22 10:18:20 +0000
+++ src/wui/game_message_menu.cc	2014-11-30 18:54:51 +0000
@@ -21,7 +21,6 @@
 
 #include <boost/bind.hpp>
 
-#include "base/deprecated.h"
 #include "base/time_string.h"
 #include "graphic/graphic.h"
 #include "logic/instances.h"
@@ -35,7 +34,7 @@
 using Widelands::MessageQueue;
 
 inline InteractivePlayer & GameMessageMenu::iplayer() const {
-	return ref_cast<InteractivePlayer, UI::Panel>(*get_parent());
+	return dynamic_cast<InteractivePlayer&>(*get_parent());
 }
 
 

=== modified file 'src/wui/game_message_menu.h'
--- src/wui/game_message_menu.h	2014-10-14 06:30:20 +0000
+++ src/wui/game_message_menu.h	2014-11-30 18:54:51 +0000
@@ -20,7 +20,6 @@
 #ifndef WL_WUI_GAME_MESSAGE_MENU_H
 #define WL_WUI_GAME_MESSAGE_MENU_H
 
-#include "base/deprecated.h"
 #include "base/i18n.h"
 #include "logic/message_queue.h"
 #include "ui_basic/button.h"

=== modified file 'src/wui/game_objectives_menu.cc'
--- src/wui/game_objectives_menu.cc	2014-10-27 10:31:04 +0000
+++ src/wui/game_objectives_menu.cc	2014-11-30 18:54:51 +0000
@@ -31,7 +31,7 @@
 
 
 inline InteractivePlayer & GameObjectivesMenu::iplayer() const {
-	return ref_cast<InteractivePlayer, UI::Panel>(*get_parent());
+	return dynamic_cast<InteractivePlayer&>(*get_parent());
 }
 
 

=== modified file 'src/wui/general_statistics_menu.cc'
--- src/wui/general_statistics_menu.cc	2014-11-22 11:32:06 +0000
+++ src/wui/general_statistics_menu.cc	2014-11-30 18:54:51 +0000
@@ -284,7 +284,7 @@
 }
 
 GeneralStatisticsMenu::~GeneralStatisticsMenu() {
-	Game & game = ref_cast<InteractiveGameBase, UI::Panel>(*get_parent()).game();
+	Game & game = dynamic_cast<InteractiveGameBase&>(*get_parent()).game();
 	if (game.is_loaded()) {
 		// Save informations for recreation, if window is reopened
 		m_my_registry->selected_information = m_selected_information;
@@ -321,7 +321,7 @@
  */
 void GeneralStatisticsMenu::radiogroup_changed(int32_t const id) {
 	size_t const statistics_size =
-		ref_cast<InteractiveGameBase, UI::Panel>(*get_parent()).game()
+		dynamic_cast<InteractiveGameBase&>(*get_parent()).game()
 		.get_general_statistics().size();
 	for (uint32_t i = 0; i < statistics_size; ++i)
 		if (m_cbs[i]) {

=== modified file 'src/wui/interactive_gamebase.cc'
--- src/wui/interactive_gamebase.cc	2014-09-20 09:37:47 +0000
+++ src/wui/interactive_gamebase.cc	2014-11-30 18:54:51 +0000
@@ -53,7 +53,7 @@
 
 Widelands::Game & InteractiveGameBase::    game() const
 {
-	return ref_cast<Widelands::Game, Widelands::EditorGameBase>(egbase());
+	return dynamic_cast<Widelands::Game&>(egbase());
 }
 
 void InteractiveGameBase::set_chat_provider(ChatProvider & chat)

=== modified file 'src/wui/interactive_player.cc'
--- src/wui/interactive_player.cc	2014-11-23 14:34:38 +0000
+++ src/wui/interactive_player.cc	2014-11-30 18:54:51 +0000
@@ -304,7 +304,7 @@
 	(Widelands::MessageId const id, const Widelands::Message & message)
 {
 	m_message_menu.create();
-	ref_cast<GameMessageMenu, UI::UniqueWindow>(*m_message_menu.window)
+	dynamic_cast<GameMessageMenu&>(*m_message_menu.window)
 	.show_new_message(id, message);
 }
 
@@ -473,7 +473,7 @@
 	if
 		(UI::UniqueWindow * const building_statistics_window =
 		 	m_mainm_windows.building_stats.window)
-		ref_cast<BuildingStatisticsMenu, UI::UniqueWindow>
+		dynamic_cast<BuildingStatisticsMenu&>
 			(*building_statistics_window)
 			.update();
 }

=== modified file 'src/wui/interactive_spectator.cc'
--- src/wui/interactive_spectator.cc	2014-11-23 14:34:38 +0000
+++ src/wui/interactive_spectator.cc	2014-11-30 18:54:51 +0000
@@ -275,8 +275,7 @@
 			if (!m_chat.window)
 				GameChatMenu::create_chat_console(this, m_chat, *m_chatProvider);
 
-			ref_cast<GameChatMenu, UI::UniqueWindow>(*m_chat.window)
-				.enter_chat_message();
+			dynamic_cast<GameChatMenu*>(m_chat.window)->enter_chat_message();
 			return true;
 
 		default:

=== modified file 'src/wui/militarysitewindow.cc'
--- src/wui/militarysitewindow.cc	2014-09-10 13:03:40 +0000
+++ src/wui/militarysitewindow.cc	2014-11-30 18:54:51 +0000
@@ -38,7 +38,7 @@
 		 UI::Window *       & registry);
 
 	MilitarySite & militarysite() {
-		return ref_cast<MilitarySite, Widelands::Building>(building());
+		return dynamic_cast<MilitarySite&>(building());
 	}
 
 protected:

=== modified file 'src/wui/minimap.cc'
--- src/wui/minimap.cc	2014-11-24 07:10:03 +0000
+++ src/wui/minimap.cc	2014-11-30 18:54:51 +0000
@@ -98,7 +98,7 @@
 
 	m_ibase.egbase().map().normalize_coords(c);
 
-	ref_cast<MiniMap, UI::Panel>(*get_parent()).warpview(c.x * TRIANGLE_WIDTH, c.y * TRIANGLE_HEIGHT);
+	dynamic_cast<MiniMap&>(*get_parent()).warpview(c.x * TRIANGLE_WIDTH, c.y * TRIANGLE_HEIGHT);
 
 	return true;
 }

=== modified file 'src/wui/productionsitewindow.h'
--- src/wui/productionsitewindow.h	2014-09-10 13:03:40 +0000
+++ src/wui/productionsitewindow.h	2014-11-30 18:54:51 +0000
@@ -31,7 +31,7 @@
 		 UI::Window *         & registry);
 
 	Widelands::ProductionSite & productionsite() {
-		return ref_cast<Widelands::ProductionSite, Widelands::Building>(building());
+		return dynamic_cast<Widelands::ProductionSite&>(building());
 	}
 	void update_worker_table();
 protected:

=== modified file 'src/wui/shipwindow.cc'
--- src/wui/shipwindow.cc	2014-11-22 10:18:20 +0000
+++ src/wui/shipwindow.cc	2014-11-30 18:54:51 +0000
@@ -295,7 +295,7 @@
 		m_igbase.game().send_player_sink_ship(m_ship);
 	}
 	else {
-		show_ship_sink_confirm(ref_cast<InteractivePlayer, InteractiveGameBase>(m_igbase), m_ship);
+		show_ship_sink_confirm(dynamic_cast<InteractivePlayer&>(m_igbase), m_ship);
 	}
 }
 
@@ -307,7 +307,7 @@
 	}
 	else {
 		show_ship_cancel_expedition_confirm
-			(ref_cast<InteractivePlayer, InteractiveGameBase>(m_igbase), m_ship);
+			(dynamic_cast<InteractivePlayer&>(m_igbase), m_ship);
 	}
 }
 

=== modified file 'src/wui/soldierlist.cc'
--- src/wui/soldierlist.cc	2014-11-22 10:18:20 +0000
+++ src/wui/soldierlist.cc	2014-11-30 18:54:51 +0000
@@ -22,7 +22,6 @@
 #include <boost/bind.hpp>
 #include <boost/format.hpp>
 
-#include "base/deprecated.h"
 #include "base/macros.h"
 #include "graphic/font.h"
 #include "graphic/graphic.h"

=== modified file 'src/wui/trainingsitewindow.cc'
--- src/wui/trainingsitewindow.cc	2014-09-10 13:03:40 +0000
+++ src/wui/trainingsitewindow.cc	2014-11-30 18:54:51 +0000
@@ -37,7 +37,7 @@
 		(InteractiveGameBase & parent, TrainingSite &, UI::Window * & registry);
 
 	TrainingSite & trainingsite() {
-		return ref_cast<TrainingSite, Widelands::Building>(building());
+		return dynamic_cast<TrainingSite&>(building());
 	}
 
 protected:

=== modified file 'src/wui/transport_ui.cc'
--- src/wui/transport_ui.cc	2014-11-22 11:32:06 +0000
+++ src/wui/transport_ui.cc	2014-11-30 18:54:51 +0000
@@ -159,7 +159,7 @@
 						m_economy.ware_target_quantity(id);
 					if (1 < tq.permanent) {
 						Widelands::Player & player = m_economy.owner();
-						Game & game = ref_cast<Game, EditorGameBase>(player.egbase());
+						Game & game = dynamic_cast<Game&>(player.egbase());
 						game.send_player_command
 							(*new Widelands::CmdSetWareTargetQuantity
 								(game.get_gametime(), player.player_number(),
@@ -181,7 +181,7 @@
 					const Economy::TargetQuantity & tq =
 						m_economy.ware_target_quantity(id);
 					Widelands::Player & player = m_economy.owner();
-					Game & game = ref_cast<Game, EditorGameBase>(player.egbase());
+					Game & game = dynamic_cast<Game&>(player.egbase());
 					game.send_player_command
 						(*new Widelands::CmdSetWareTargetQuantity
 							(game.get_gametime(), player.player_number(),
@@ -200,7 +200,7 @@
 			{
 				if (m_display.ware_selected(id)) {
 					Widelands::Player & player = m_economy.owner();
-					Game & game = ref_cast<Game, EditorGameBase>(player.egbase());
+					Game & game = dynamic_cast<Game&>(player.egbase());
 					game.send_player_command
 						(*new Widelands::CmdResetWareTargetQuantity
 							(game.get_gametime(), player.player_number(),
@@ -256,7 +256,7 @@
 						m_economy.worker_target_quantity(id);
 					if (1 < tq.permanent) {
 						Widelands::Player & player = m_economy.owner();
-						Game & game = ref_cast<Game, EditorGameBase>(player.egbase());
+						Game & game = dynamic_cast<Game&>(player.egbase());
 						game.send_player_command
 							(*new Widelands::CmdSetWorkerTargetQuantity
 								(game.get_gametime(), player.player_number(),
@@ -278,7 +278,7 @@
 					const Economy::TargetQuantity & tq =
 						m_economy.worker_target_quantity(id);
 					Widelands::Player & player = m_economy.owner();
-					Game & game = ref_cast<Game, EditorGameBase>(player.egbase());
+					Game & game = dynamic_cast<Game&>(player.egbase());
 					game.send_player_command
 						(*new Widelands::CmdSetWorkerTargetQuantity
 							(game.get_gametime(), player.player_number(),
@@ -296,7 +296,7 @@
 			{
 				if (m_display.ware_selected(id)) {
 					Widelands::Player & player = m_economy.owner();
-					Game & game = ref_cast<Game, EditorGameBase>(player.egbase());
+					Game & game = dynamic_cast<Game&>(player.egbase());
 					game.send_player_command
 						(*new Widelands::CmdResetWorkerTargetQuantity
 							(game.get_gametime(), player.player_number(),
@@ -313,11 +313,10 @@
 // users can register for change updates. The registry should be
 // moved to InteractivePlayer or some other UI component.
 void Economy::show_options_window() {
-	if (m_optionswindow_registry.window)
+	if (m_optionswindow_registry.window) {
 		m_optionswindow_registry.window->move_to_top();
-	else
-		new EconomyOptionsWindow
-			(ref_cast<InteractiveGameBase, InteractiveBase>
-			 	(*owner().egbase().get_ibase()),
-			 *this);
+	} else {
+		new EconomyOptionsWindow(dynamic_cast<InteractiveGameBase&>
+			 	(*owner().egbase().get_ibase()), *this);
+	}
 }

=== modified file 'src/wui/warehousewindow.cc'
--- src/wui/warehousewindow.cc	2014-09-10 13:03:40 +0000
+++ src/wui/warehousewindow.cc	2014-11-30 18:54:51 +0000
@@ -176,7 +176,7 @@
 		(InteractiveGameBase & parent, Warehouse &, UI::Window * & registry);
 
 	Warehouse & warehouse() {
-		return ref_cast<Warehouse, Widelands::Building>(building());
+		return dynamic_cast<Warehouse&>(building());
 	}
 };
 

=== modified file 'src/wui/watchwindow.cc'
--- src/wui/watchwindow.cc	2014-11-22 11:32:06 +0000
+++ src/wui/watchwindow.cc	2014-11-30 18:54:51 +0000
@@ -56,7 +56,7 @@
 	~WatchWindow();
 
 	Widelands::Game & game() const {
-		return ref_cast<InteractiveGameBase, UI::Panel>(*get_parent()).game();
+		return dynamic_cast<InteractiveGameBase&>(*get_parent()).game();
 	}
 
 	boost::signals2::signal<void (Point)> warp_mainview;