From 05c96bb501e4cd46529668185c7465bc249fd81b Mon Sep 17 00:00:00 2001
From: Alexander van Gessel <ai0867@gmail.com>
Date: Sat, 20 Mar 2010 22:53:36 +0100
Subject: [PATCH] Initialize savegame_config in all subclasses

---
 src/gamestatus.cpp       | 2 ++
 src/mp_game_settings.cpp | 5 ++++-
 src/play_controller.cpp  | 2 ++
 src/soundsource.cpp      | 2 ++
 src/team.cpp             | 1 +
 src/tod_manager.cpp      | 1 +
 6 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/gamestatus.cpp b/src/gamestatus.cpp
index 56ed9f1accc..9606d7d7237 100644
--- a/src/gamestatus.cpp
+++ b/src/gamestatus.cpp
@@ -57,6 +57,7 @@ static lg::log_domain log_engine_tc("engine/team_construction");
 #define DBG_NG_TC LOG_STREAM(debug, log_engine_tc)
 
 game_classification::game_classification():
+	savegame_config(),
 	label(),
 	parent(),
 	version(),
@@ -75,6 +76,7 @@ game_classification::game_classification():
 	{}
 
 game_classification::game_classification(const config& cfg):
+	savegame_config(),
 	label(cfg["label"]),
 	parent(cfg["parent"]),
 	version(cfg["version"]),
diff --git a/src/mp_game_settings.cpp b/src/mp_game_settings.cpp
index 728c7964225..d7fcdbc356f 100644
--- a/src/mp_game_settings.cpp
+++ b/src/mp_game_settings.cpp
@@ -23,6 +23,7 @@
 #include "util.hpp"
 
 mp_game_settings::mp_game_settings() :
+	savegame_config(),
 	name(),
 	password(),
 	hash(),
@@ -48,6 +49,7 @@ mp_game_settings::mp_game_settings() :
 { reset(); }
 
 mp_game_settings::mp_game_settings(const config& cfg) :
+	savegame_config(),
 	name(),
 	password(),
 	hash(),
@@ -74,7 +76,8 @@ mp_game_settings::mp_game_settings(const config& cfg) :
 }
 
 mp_game_settings::mp_game_settings(const mp_game_settings& settings)
-	: name(settings.name)
+	: savegame_config()
+	, name(settings.name)
 	, password(settings.password)
 	, hash(settings.hash)
 	, mp_era(settings.mp_era)
diff --git a/src/play_controller.cpp b/src/play_controller.cpp
index 60670417d2a..9b42dc3bd3d 100644
--- a/src/play_controller.cpp
+++ b/src/play_controller.cpp
@@ -53,6 +53,8 @@ play_controller::play_controller(const config& level, game_state& state_of_game,
 		int ticks, int num_turns, const config& game_config, CVideo& video,
 		bool skip_replay) :
 	controller_base(ticks, game_config, video),
+	observer(),
+	savegame_config(),
 	prefs_disp_manager_(),
 	tooltips_manager_(),
 	events_manager_(),
diff --git a/src/soundsource.cpp b/src/soundsource.cpp
index 5feb724fc07..61b3aaf6285 100644
--- a/src/soundsource.cpp
+++ b/src/soundsource.cpp
@@ -32,6 +32,8 @@ const unsigned DEFAULT_FADE_RANGE       = 14;
 unsigned int positional_source::last_id = 0;
 
 manager::manager(const display &disp) :
+	observer(),
+	savegame_config(),
 	sources_(),
 	disp_(disp)
 {
diff --git a/src/team.cpp b/src/team.cpp
index d1fbcf76258..9c5963511d7 100644
--- a/src/team.cpp
+++ b/src/team.cpp
@@ -229,6 +229,7 @@ void team::merge_shroud_map_data(const std::string& shroud_data)
 }
 
 team::team(const config& cfg, const gamemap& map, int gold) :
+		savegame_config(),
 		gold_(gold),
 		villages_(),
 		shroud_(),
diff --git a/src/tod_manager.cpp b/src/tod_manager.cpp
index 3787d037e54..67a0ab1c66b 100644
--- a/src/tod_manager.cpp
+++ b/src/tod_manager.cpp
@@ -26,6 +26,7 @@ static lg::log_domain log_engine("engine");
 #define LOG_NG LOG_STREAM(info, log_engine)
 
 tod_manager::tod_manager(const config& time_cfg, int num_turns, game_state* state):
+	savegame_config(),
 	currentTime_(0),
 	times_(),
 	areas_(),