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

[SirVer]

- Make mutating of field resources only possible through the map, no longer through the field interface. This allows the Map to decide if and which notifications it needs to send.
- Editor's resource overlays are completely handled in the EditorInteractive class which listens for change notifications from the map.

Fixes bug 977980 - display of overlays.

I decided on a slightly more involve fix that added some symmetry between resources and terrains to the code and decoupled UI from logic through the use of notifications.

[bunnybot (widelandsofficial)]

Hi, I am bunnybot (https://github.com/widelands/bunnybot).

I am keeping the source branch lp:~widelands-dev/widelands/fix_resource_overlay mirrored to https://github.com/widelands/widelands/tree/_widelands_dev_widelands_fix_resource_overlay

You can give me commands by starting a line with @bunnybot <command>. I understand:
 merge: Merges the source branch into the target branch, closing the merge proposal. I will use the proposed commit message if it is set.

[bunnybot (widelandsofficial)]

Travis build 267 has changed state to: passed. Details: https://travis-ci.org/widelands/widelands/builds/102491117.

[kaputtnik (franku)]

Works again :-)

Approve for functionality. One has to look at the code though.

The other linked Bug "Set Origin" isn't solved with this branch, so i remove the link.

review: Approve

[kaputtnik (franku)]

Found one thing: The layer isn't destroyed when loading a map or creating a new map. The previous placed resources are still shown. This is very confusing if one creates a random maps, which may not look good and create another random map. So the second map shows also the resources from previous random map.

See also: bug 1521736 (editor does not clean up memory (?) when loading another map)

review: Needs Fixing

[SirVer (sirver)]

Thanks for testing!

I changed the code to close all child windows in the editor and close all windows when the map changes. that also means when the map origin changes (because that changes the whole map).

[kaputtnik (franku)]

Sorry, one crash after another...

Start editor, create a new map -> crash.

Start editor, create a random map, -> crash. On time got a hint in console:

WARNING: Could not find a suitable place for player 1
Speicherzugriffsfehler (Speicherabzug geschrieben)

review: Needs Fixing

[SirVer (sirver)]

> Sorry, one crash after another...

no need to apologize. I apologize for amateur-programming night tonight :/

next try. Could you take it for a spin?

[kaputtnik (franku)]

Works now... until one thing related to bug 1521736 :

Loading another map or create a new map does not reset tool size and former chosen resources or terrain are still used. If you have enabled the info tool and load/create another map the pointer is still the info tool.

I would expect that loading another map would reset all input, just like it is when starting the editor.

Seems to be a never ending story :-D

[SirVer (sirver)]

Next try. Tools were very differently coupled than uI, so that was a little more work. But I agree that it makes sense. Could you have another look?

[kaputtnik (franku)]

Looks very good now :-)

There are some compiler statements/warnings. Because i am not sure to which code they belong, or if they are importand, i write them down here:

1. /src/editor/editorinteractive.cc:134: No space after opening brace allowed!
2. /src/editor/editorinteractive.cc:135: No space after opening brace allowed!
3. /src/editor/editorinteractive.cc:635:9: Warnung: Die Standardfallbehandlung in switch fehlt [-Wswitch-default]
  switch (action) {
4. /src/scripting/lua_map.cc:4483: A space is mandatory after catch/for/if/switch/throw/while.
5. /src/editor/ui_menus/editor_tool_change_resources_options_menu.cc:226: Bad indentation.

Thanks for your work so far :-)

Approving functionality.

review: Approve (correct functionality)

[GunChleoc (gunchleoc)]

Code LGTM, just 1 code style nit.

I noticed that you use variable type "auto" a lot - please double-check if you can be more specific. Strong typing is good ;)

review: Approve

[SirVer (sirver)]

I fixed everything but

3. /src/editor/editorinteractive.cc:635:9: Warnung: Die Standardfallbehandlung in switch fehlt [-Wswitch-default]

that is a stupid warning. I handled all possible cases in this switch() statement for the enum class it handles. The default: should never be taken, so it should actually not be there. I prepare a branch to remove this warning.

> I noticed that you use variable type "auto" a lot - please double-check if you can be more specific. Strong typing is good ;)

auto is not any less strong typing, since the compiler knows the exact type. In fact auto can be stronger typing than explicit types because it never does implicit conversion.

int32_t a = 1;
uint8_t b = 9;
uint8_t c = a - b; // is a bug, underflow.
auto c = a - b; // works, means type of c == int32_t, so all is good.

If you feel it impedes readability in a specific place, I will add types of course.

@bunnybot merge

[GunChleoc (gunchleoc)]

Fine by me, thanks for explaining.

=== modified file 'src/editor/CMakeLists.txt'
--- src/editor/CMakeLists.txt	2016-01-10 11:36:05 +0000
+++ src/editor/CMakeLists.txt	2016-01-16 15:57:59 +0000
@@ -96,6 +96,7 @@
     logic_widelands_geometry
     map_io
     map_io_map_loader
+    notifications
     random
     scripting_lua_interface
     scripting_lua_table
@@ -104,6 +105,6 @@
     widelands_ball_of_mud
     wui
     wui_common
+    wui_field_overlay_manager
     wui_mapview_pixelfunctions
-    wui_field_overlay_manager
 )

=== modified file 'src/editor/editorinteractive.cc'
--- src/editor/editorinteractive.cc	2016-01-10 11:36:05 +0000
+++ src/editor/editorinteractive.cc	2016-01-16 15:57:59 +0000
@@ -62,71 +62,89 @@
 	egbase->tribes();
 }
 
+// Updates the resources overlays after a field has changed.
+void update_resource_overlay(const Widelands::NoteFieldResourceChanged& note,
+                             const Widelands::World& world,
+                             FieldOverlayManager* field_overlay_manager) {
+	//  Ok, we're doing something. First remove the current overlays.
+	if (note.old_resource != Widelands::kNoResource) {
+		const std::string str =
+		   world.get_resource(note.old_resource)->get_editor_pic(note.old_amount);
+		const Image* pic = g_gr->images().get(str);
+		field_overlay_manager->remove_overlay(note.fc, pic);
+	}
+
+	const auto amount = note.fc.field->get_resources_amount();
+	const auto resource_type = note.fc.field->get_resources();
+	if (amount > 0 && resource_type != Widelands::kNoResource) {
+		const std::string str =
+		   world.get_resource(note.fc.field->get_resources())->get_editor_pic(amount);
+		const Image* pic = g_gr->images().get(str);
+		field_overlay_manager->register_overlay(note.fc, pic, 0);
+	}
+}
+
 }  // namespace
 
 EditorInteractive::EditorInteractive(Widelands::EditorGameBase & e) :
 	InteractiveBase(e, g_options.pull_section("global")),
-	m_need_save(false),
-	m_realtime(SDL_GetTicks()),
-	m_left_mouse_button_is_down(false),
-	m_history(m_undo, m_redo),
+	need_save_(false),
+	realtime_(SDL_GetTicks()),
+	left_mouse_button_is_down_(false),
+	tools_(new Tools()),
+	history_(new EditorHistory(undo_, redo_)),
 
 #define INIT_BUTTON(picture, name, tooltip)                         \
 	TOOLBAR_BUTTON_COMMON_PARAMETERS(name),                                      \
 	g_gr->images().get("pics/" picture ".png"),                      \
 	tooltip                                                                      \
 
-	m_toggle_main_menu
+	toggle_main_menu_
 	(INIT_BUTTON
 	 ("menu_toggle_menu", "menu", _("Menu"))),
-	m_toggle_tool_menu
+	toggle_tool_menu_
 	(INIT_BUTTON
 	 ("editor_menu_toggle_tool_menu", "tools", _("Tools"))),
-	m_toggle_toolsize_menu
+	toggle_toolsize_menu_
 	(INIT_BUTTON
 	 ("editor_menu_set_toolsize_menu", "toolsize",
 	  _("Tool Size"))),
-	m_toggle_minimap
+	toggle_minimap_
 	(INIT_BUTTON
 	 ("menu_toggle_minimap", "minimap", _("Minimap"))),
-	m_toggle_buildhelp
+	toggle_buildhelp_
 	(INIT_BUTTON
 	 ("menu_toggle_buildhelp", "buildhelp", _("Show Building Spaces (on/off)"))),
-	m_toggle_player_menu
+	toggle_player_menu_
 	(INIT_BUTTON
 	 ("editor_menu_player_menu", "players", _("Players"))),
-	m_undo
+	undo_
 	(INIT_BUTTON
 	 ("editor_undo", "undo", _("Undo"))),
-	m_redo
+	redo_
 	(INIT_BUTTON
 	 ("editor_redo", "redo", _("Redo")))
 {
-	m_toggle_main_menu.sigclicked.connect(boost::bind(&EditorInteractive::toggle_mainmenu, this));
-	m_toggle_tool_menu.sigclicked.connect(boost::bind(&EditorInteractive::tool_menu_btn, this));
-	m_toggle_toolsize_menu.sigclicked.connect(boost::bind(&EditorInteractive::toolsize_menu_btn, this));
-	m_toggle_minimap.sigclicked.connect(boost::bind(&EditorInteractive::toggle_minimap, this));
-	m_toggle_buildhelp.sigclicked.connect(boost::bind(&EditorInteractive::toggle_buildhelp, this));
-	m_toggle_player_menu.sigclicked.connect(boost::bind(&EditorInteractive::toggle_playermenu, this));
-	m_undo.sigclicked.connect(
-		boost::bind(&EditorHistory::undo_action, &m_history, boost::cref(egbase().world())));
-	m_redo.sigclicked.connect(
-		boost::bind(&EditorHistory::redo_action, &m_history, boost::cref(egbase().world())));
+	toggle_main_menu_.sigclicked.connect(boost::bind(&EditorInteractive::toggle_mainmenu, this));
+	toggle_tool_menu_.sigclicked.connect(boost::bind(&EditorInteractive::tool_menu_btn, this));
+	toggle_toolsize_menu_.sigclicked.connect(boost::bind(&EditorInteractive::toolsize_menu_btn, this));
+	toggle_minimap_.sigclicked.connect(boost::bind(&EditorInteractive::toggle_minimap, this));
+	toggle_buildhelp_.sigclicked.connect(boost::bind(&EditorInteractive::toggle_buildhelp, this));
+	toggle_player_menu_.sigclicked.connect(boost::bind(&EditorInteractive::toggle_playermenu, this));
+	undo_.sigclicked.connect([this] {history_->undo_action(egbase().world());});
+	redo_.sigclicked.connect([this] {history_->redo_action(egbase().world());});
 
-	m_toolbar.set_layout_toplevel(true);
-	m_toolbar.add(&m_toggle_main_menu,       UI::Box::AlignLeft);
-	m_toolbar.add(&m_toggle_tool_menu,       UI::Box::AlignLeft);
-	m_toolbar.add(&m_toggle_toolsize_menu,   UI::Box::AlignLeft);
-	m_toolbar.add(&m_toggle_minimap,         UI::Box::AlignLeft);
-	m_toolbar.add(&m_toggle_buildhelp,       UI::Box::AlignLeft);
-	m_toolbar.add(&m_toggle_player_menu,     UI::Box::AlignLeft);
-	m_toolbar.add(&m_undo,                   UI::Box::AlignLeft);
-	m_toolbar.add(&m_redo,                   UI::Box::AlignLeft);
+	toolbar_.set_layout_toplevel(true);
+	toolbar_.add(&toggle_main_menu_,       UI::Box::AlignLeft);
+	toolbar_.add(&toggle_tool_menu_,       UI::Box::AlignLeft);
+	toolbar_.add(&toggle_toolsize_menu_,   UI::Box::AlignLeft);
+	toolbar_.add(&toggle_minimap_,         UI::Box::AlignLeft);
+	toolbar_.add(&toggle_buildhelp_,       UI::Box::AlignLeft);
+	toolbar_.add(&toggle_player_menu_,     UI::Box::AlignLeft);
+	toolbar_.add(&undo_,                   UI::Box::AlignLeft);
+	toolbar_.add(&redo_,                   UI::Box::AlignLeft);
 	adjust_toolbar_position();
 
-	m_undo.set_enabled(false);
-	m_redo.set_enabled(false);
-
 #ifndef NDEBUG
 	set_display_flag(InteractiveBase::dfDebug, true);
 #else
@@ -134,6 +152,13 @@
 #endif
 
 	fieldclicked.connect(boost::bind(&EditorInteractive::map_clicked, this, false));
+
+	// Subscribe to changes of the resource type on a field..
+	field_resource_changed_subscriber_ =
+	   Notifications::subscribe<Widelands::NoteFieldResourceChanged>(
+	      [this](const Widelands::NoteFieldResourceChanged& note) {
+		      update_resource_overlay(note, egbase().world(), mutable_field_overlay_manager());
+		   });
 }
 
 void EditorInteractive::register_overlays() {
@@ -175,7 +200,6 @@
 	// TODO(unknown): get rid of cleanup_for_load, it tends to be very messy
 	// Instead, delete and re-create the egbase.
 	egbase().cleanup_for_load();
-	m_history.reset();
 
 	std::unique_ptr<Widelands::MapLoader> ml(map.get_correct_loader(filename));
 	if (!ml.get())
@@ -189,8 +213,6 @@
 	std::vector<std::string> tipstext;
 	tipstext.push_back("editor");
 
-	m_history.reset();
-
 	GameTips editortips(loader_ui, tipstext);
 
 	load_all_tribes(&egbase(), &loader_ui);
@@ -202,12 +224,8 @@
 	}
 
 	ml->load_map_complete(egbase(), true);
-
 	egbase().load_graphics(loader_ui);
-
-	register_overlays();
-
-	set_need_save(false);
+	map_changed(MapWas::kReplaced);
 }
 
 
@@ -219,7 +237,7 @@
 	} catch (LuaScriptNotExistingError &) {
 		// do nothing.
 	}
-	show_buildhelp(true);
+	map_changed(MapWas::kReplaced);
 }
 
 
@@ -231,17 +249,17 @@
 void EditorInteractive::think() {
 	InteractiveBase::think();
 
-	uint32_t lasttime = m_realtime;
-
-	m_realtime = SDL_GetTicks();
-
-	egbase().get_gametime_pointer() += m_realtime - lasttime;
+	uint32_t lasttime = realtime_;
+
+	realtime_ = SDL_GetTicks();
+
+	egbase().get_gametime_pointer() += realtime_ - lasttime;
 }
 
 
 
 void EditorInteractive::exit() {
-	if (m_need_save) {
+	if (need_save_) {
 		if (get_key_state(SDL_SCANCODE_LCTRL) || get_key_state(SDL_SCANCODE_RCTRL)) {
 			end_modal<UI::Panel::Returncodes>(UI::Panel::Returncodes::kBack);
 		} else {
@@ -258,30 +276,28 @@
 }
 
 void EditorInteractive::toggle_mainmenu() {
-	if (m_mainmenu.window)
-		delete m_mainmenu.window;
+	if (mainmenu_.window)
+		delete mainmenu_.window;
 	else
-		new EditorMainMenu(*this, m_mainmenu);
+		new EditorMainMenu(*this, mainmenu_);
 }
 
 void EditorInteractive::map_clicked(bool should_draw) {
-	m_history.do_action
-		(tools.current(),
-		 tools.use_tool, egbase().map(), egbase().world(),
-	     get_sel_pos(), *this, should_draw);
+	history_->do_action(tools_->current(), tools_->use_tool, egbase().map(), egbase().world(),
+	                     get_sel_pos(), *this, should_draw);
 	set_need_save(true);
 }
 
 bool EditorInteractive::handle_mouserelease(uint8_t btn, int32_t x, int32_t y) {
 	if (btn == SDL_BUTTON_LEFT) {
-		m_left_mouse_button_is_down = false;
+		left_mouse_button_is_down_ = false;
 	}
 	return InteractiveBase::handle_mouserelease(btn, x, y);
 }
 
 bool EditorInteractive::handle_mousepress(uint8_t btn, int32_t x, int32_t y) {
 	if (btn == SDL_BUTTON_LEFT) {
-		m_left_mouse_button_is_down = true;
+		left_mouse_button_is_down_ = true;
 	}
 	return InteractiveBase::handle_mousepress(btn, x, y);
 }
@@ -289,44 +305,44 @@
 /// Needed to get freehand painting tools (hold down mouse and move to edit).
 void EditorInteractive::set_sel_pos(Widelands::NodeAndTriangle<> const sel) {
 	bool const target_changed =
-	    tools.current().operates_on_triangles() ?
+	    tools_->current().operates_on_triangles() ?
 	    sel.triangle != get_sel_pos().triangle : sel.node != get_sel_pos().node;
 	InteractiveBase::set_sel_pos(sel);
-	if (target_changed && m_left_mouse_button_is_down)
+	if (target_changed && left_mouse_button_is_down_)
 		map_clicked(true);
 }
 
 void EditorInteractive::tool_menu_btn() {
-	if (m_toolmenu.window)
-		delete m_toolmenu.window;
+	if (toolmenu_.window)
+		delete toolmenu_.window;
 	else
-		new EditorToolMenu(*this, m_toolmenu);
+		new EditorToolMenu(*this, toolmenu_);
 }
 
 
 void EditorInteractive::toggle_playermenu() {
-	if (m_playermenu.window)
-		delete m_playermenu.window;
+	if (playermenu_.window)
+		delete playermenu_.window;
 	else {
-		select_tool(tools.set_starting_pos, EditorTool::First);
-		new EditorPlayerMenu(*this, m_playermenu);
+		select_tool(tools_->set_starting_pos, EditorTool::First);
+		new EditorPlayerMenu(*this, playermenu_);
 	}
 
 }
 
 void EditorInteractive::toolsize_menu_btn() {
-	if (m_toolsizemenu.window)
-		delete m_toolsizemenu.window;
+	if (toolsizemenu_.window)
+		delete toolsizemenu_.window;
 	else
-		new EditorToolsizeMenu(*this, m_toolsizemenu);
+		new EditorToolsizeMenu(*this, toolsizemenu_);
 }
 
 void EditorInteractive::set_sel_radius_and_update_menu(uint32_t const val) {
-	if (tools.current().has_size_one()) {
+	if (tools_->current().has_size_one()) {
 		set_sel_radius(0);
 		return;
 	}
-	if (UI::UniqueWindow * const w = m_toolsizemenu.window) {
+	if (UI::UniqueWindow * const w = toolsizemenu_.window) {
 		dynamic_cast<EditorToolsizeMenu&>(*w).update(val);
 	} else {
 		set_sel_radius(val);
@@ -385,16 +401,16 @@
 
 		case SDLK_LSHIFT:
 		case SDLK_RSHIFT:
-			if (tools.use_tool == EditorTool::First)
-				select_tool(tools.current(), EditorTool::Second);
+			if (tools_->use_tool == EditorTool::First)
+				select_tool(tools_->current(), EditorTool::Second);
 			handled = true;
 			break;
 
 		case SDLK_LALT:
 		case SDLK_RALT:
 		case SDLK_MODE:
-			if (tools.use_tool == EditorTool::First)
-				select_tool(tools.current(), EditorTool::Third);
+			if (tools_->use_tool == EditorTool::First)
+				select_tool(tools_->current(), EditorTool::Third);
 			handled = true;
 			break;
 
@@ -416,7 +432,7 @@
 			break;
 
 		case SDLK_i:
-			select_tool(tools.info, EditorTool::First);
+			select_tool(tools_->info, EditorTool::First);
 			handled = true;
 			break;
 
@@ -449,15 +465,15 @@
 
 		case SDLK_z:
 			if ((code.mod & (KMOD_LCTRL | KMOD_RCTRL)) && (code.mod & (KMOD_LSHIFT | KMOD_RSHIFT)))
-				m_history.redo_action(egbase().world());
+				history_->redo_action(egbase().world());
 			else if (code.mod & (KMOD_LCTRL | KMOD_RCTRL))
-				m_history.undo_action(egbase().world());
+				history_->undo_action(egbase().world());
 			handled = true;
 			break;
 
 		case SDLK_y:
 			if (code.mod & (KMOD_LCTRL | KMOD_RCTRL))
-				m_history.redo_action(egbase().world());
+				history_->redo_action(egbase().world());
 			handled = true;
 			break;
 		default:
@@ -471,8 +487,8 @@
 		case SDLK_LALT:
 		case SDLK_RALT:
 		case SDLK_MODE:
-			if (tools.use_tool != EditorTool::First)
-				select_tool(tools.current(), EditorTool::First);
+			if (tools_->use_tool != EditorTool::First)
+				select_tool(tools_->current(), EditorTool::First);
 			handled = true;
 			break;
 		default:
@@ -485,15 +501,15 @@
 
 void EditorInteractive::select_tool
 (EditorTool & primary, EditorTool::ToolIndex const which) {
-	if (which == EditorTool::First && & primary != tools.current_pointer) {
+	if (which == EditorTool::First && & primary != tools_->current_pointer) {
 		if (primary.has_size_one()) {
 			set_sel_radius(0);
-			if (UI::UniqueWindow * const w = m_toolsizemenu.window) {
+			if (UI::UniqueWindow * const w = toolsizemenu_.window) {
 				EditorToolsizeMenu& toolsize_menu = dynamic_cast<EditorToolsizeMenu&>(*w);
 				toolsize_menu.set_buttons_enabled(false);
 			}
 		} else {
-			if (UI::UniqueWindow * const w = m_toolsizemenu.window) {
+			if (UI::UniqueWindow * const w = toolsizemenu_.window) {
 				EditorToolsizeMenu& toolsize_menu = dynamic_cast<EditorToolsizeMenu&>(*w);
 				toolsize_menu.update(toolsize_menu.value());
 			}
@@ -504,8 +520,8 @@
 		mutable_field_overlay_manager()->register_overlay_callback_function(nullptr);
 		map.recalc_whole_map(egbase().world());
 	}
-	tools.current_pointer = &primary;
-	tools.use_tool        = which;
+	tools_->current_pointer = &primary;
+	tools_->use_tool        = which;
 
 	if (char const * const sel_pic = primary.get_sel(which))
 		set_sel_picture(sel_pic);
@@ -528,7 +544,7 @@
 	r.player = player;
 	r.object = data;
 
-	m_player_tribe_references.push_back(r);
+	player_tribe_references_.push_back(r);
 }
 
 /// Unreference !once!, if referenced many times, this will leak a reference.
@@ -537,7 +553,7 @@
 	assert(player <= egbase().map().get_nrplayers());
 	assert(data);
 
-	std::vector<PlayerReferences> & references = m_player_tribe_references;
+	std::vector<PlayerReferences> & references = player_tribe_references_;
 	std::vector<PlayerReferences>::iterator it = references.begin();
 	std::vector<PlayerReferences>::const_iterator references_end =
 	    references.end();
@@ -561,17 +577,17 @@
 	assert(0 < player);
 	assert(player <= egbase().map().get_nrplayers());
 
-	for (uint32_t i = 0; i < m_player_tribe_references.size(); ++i)
-		if (m_player_tribe_references[i].player == player)
+	for (uint32_t i = 0; i < player_tribe_references_.size(); ++i)
+		if (player_tribe_references_[i].player == player)
 			return true;
 
 	return false;
 }
 
 void EditorInteractive::run_editor(const std::string& filename, const std::string& script_to_run) {
-	Widelands::EditorGameBase editor(nullptr);
-	EditorInteractive eia(editor);
-	editor.set_ibase(&eia); // TODO(unknown): get rid of this
+	Widelands::EditorGameBase egbase(nullptr);
+	EditorInteractive eia(egbase);
+	egbase.set_ibase(&eia); // TODO(unknown): get rid of this
 	{
 		UI::ProgressWindow loader_ui("pics/editor.jpg");
 		std::vector<std::string> tipstext;
@@ -580,11 +596,11 @@
 
 		{
 			Widelands::Map & map = *new Widelands::Map;
-			editor.set_map(&map);
+			egbase.set_map(&map);
 			if (filename.empty()) {
 				loader_ui.step("Creating empty map...");
 				map.create_empty_map(
-				   editor.world(),
+				   egbase.world(),
 				   64,
 				   64,
 					0,
@@ -592,9 +608,9 @@
 				   _("No Name"),
 					g_options.pull_section("global").get_string("realname", pgettext("map_name", "Unknown")));
 
-				load_all_tribes(&editor, &loader_ui);
+				load_all_tribes(&egbase, &loader_ui);
 
-				editor.load_graphics(loader_ui);
+				egbase.load_graphics(loader_ui);
 				loader_ui.step(std::string());
 			} else {
 				loader_ui.stepf("Loading map \"%s\"...", filename.c_str());
@@ -602,8 +618,7 @@
 			}
 		}
 
-		eia.select_tool(eia.tools.increase_height, EditorTool::First);
-		editor.postload();
+		egbase.postload();
 
 		eia.start();
 
@@ -613,5 +628,39 @@
 	}
 	eia.run<UI::Panel::Returncodes>();
 
-	editor.cleanup_objects();
+	egbase.cleanup_objects();
+}
+
+void EditorInteractive::map_changed(const MapWas& action) {
+	switch (action) {
+		case MapWas::kReplaced:
+			history_.reset(new EditorHistory(undo_, redo_));
+			undo_.set_enabled(false);
+			redo_.set_enabled(false);
+
+			tools_.reset(new Tools());
+			select_tool(tools_->increase_height, EditorTool::First);
+			set_sel_radius(0);
+
+			set_need_save(false);
+			show_buildhelp(true);
+
+			// Close all windows.
+			for (Panel* child = get_first_child(); child; child = child->get_next_sibling()) {
+				if (is_a(UI::Window, child)) {
+					child->die();
+				}
+			}
+			break;
+
+		case MapWas::kGloballyMutated:
+			break;
+	}
+
+	mutable_field_overlay_manager()->remove_all_overlays();
+	register_overlays();
+}
+
+EditorInteractive::Tools* EditorInteractive::tools() {
+	return tools_.get();
 }

=== modified file 'src/editor/editorinteractive.h'
--- src/editor/editorinteractive.h	2016-01-07 12:47:17 +0000
+++ src/editor/editorinteractive.h	2016-01-16 15:57:59 +0000
@@ -20,6 +20,8 @@
 #ifndef WL_EDITOR_EDITORINTERACTIVE_H
 #define WL_EDITOR_EDITORINTERACTIVE_H
 
+#include <memory>
+
 #include "editor/tools/editor_history.h"
 #include "editor/tools/editor_increase_height_tool.h"
 #include "editor/tools/editor_increase_resources_tool.h"
@@ -32,6 +34,8 @@
 #include "editor/tools/editor_set_port_space_tool.h"
 #include "editor/tools/editor_set_starting_pos_tool.h"
 #include "editor/tools/editor_set_terrain_tool.h"
+#include "logic/map.h"
+#include "notifications/notifications.h"
 #include "ui_basic/button.h"
 #include "ui_basic/unique_window.h"
 #include "wui/interactive_base.h"
@@ -43,33 +47,8 @@
  * This is the EditorInteractive. It is like the InteractivePlayer class,
  * but for the Editor instead of the game
  */
-struct EditorInteractive : public InteractiveBase {
-	friend struct EditorToolMenu;
-
-	// Runs the Editor via the commandline --editor flag. Will load 'filename' as a
-	// map and run 'script_to_run' directly after all initialization is done.
-	static void run_editor(const std::string & filename, const std::string& script_to_run);
-
-private:
-	EditorInteractive(Widelands::EditorGameBase &);
-
+class EditorInteractive : public InteractiveBase {
 public:
-	void register_overlays();
-	void load(const std::string & filename);
-
-	// leaf functions from base class
-	void start() override;
-	void think() override;
-
-	void map_clicked(bool draw = false);
-	void set_sel_pos(Widelands::NodeAndTriangle<>) override;
-	void set_sel_radius_and_update_menu(uint32_t);
-
-	//  Handle UI elements.
-	bool handle_key(bool down, SDL_Keysym) override;
-	bool handle_mousepress(uint8_t btn, int32_t x, int32_t y) override;
-	bool handle_mouserelease(uint8_t btn, int32_t x, int32_t y) override;
-
 	struct Tools {
 		Tools()
 			:
@@ -106,7 +85,28 @@
 		EditorUnsetPortSpaceTool    unset_port_space;
 		EditorSetOriginTool          set_origin;
 		EditorMakeInfrastructureTool make_infrastructure;
-	} tools;
+	};
+	EditorInteractive(Widelands::EditorGameBase &);
+
+	// Runs the Editor via the commandline --editor flag. Will load 'filename' as a
+	// map and run 'script_to_run' directly after all initialization is done.
+	static void run_editor(const std::string & filename, const std::string& script_to_run);
+
+	void load(const std::string & filename);
+
+	// leaf functions from base class
+	void start() override;
+	void think() override;
+
+	void map_clicked(bool draw = false);
+	void set_sel_pos(Widelands::NodeAndTriangle<>) override;
+	void set_sel_radius_and_update_menu(uint32_t);
+
+	//  Handle UI elements.
+	bool handle_key(bool down, SDL_Keysym) override;
+	bool handle_mousepress(uint8_t btn, int32_t x, int32_t y) override;
+	bool handle_mouserelease(uint8_t btn, int32_t x, int32_t y) override;
+
 
 	void select_tool(EditorTool &, EditorTool::ToolIndex);
 
@@ -119,47 +119,69 @@
 	void   reference_player_tribe(Widelands::PlayerNumber, void const * const) override;
 	void unreference_player_tribe(Widelands::PlayerNumber, void const * const);
 	bool is_player_tribe_referenced(Widelands::PlayerNumber);
-	void set_need_save(bool const t) {m_need_save = t;}
+	void set_need_save(bool const t) {need_save_ = t;}
+
+	// Signalizes that the egbase().map has changed. This can happen when a new
+	// map is created or loaded, in which case all windows should be closed and
+	// all tools should be reset. Otherwise, something else happened that
+	// requires the UI to be completely recalculated, for example the origin of
+	// the map has changed.
+	enum class MapWas {
+		kGloballyMutated,
+		kReplaced,
+	};
+	void map_changed(const MapWas& action);
+
+	// Access to the tools.
+	Tools* tools();
 
 private:
+	friend struct EditorToolMenu;
+
+	struct PlayerReferences {
+		int32_t      player;
+		void const * object;
+	};
+
+	// Registers the overlays for player starting positions.
+	void register_overlays();
+
 	void tool_menu_btn();
 	void toolsize_menu_btn();
 	void toggle_mainmenu();
 	void toggle_playermenu();
 
 	//  state variables
-	bool m_need_save;
-	struct PlayerReferences {
-		int32_t      player;
-		void const * object;
-	};
-	std::vector<PlayerReferences> m_player_tribe_references;
-
-	uint32_t m_realtime;
-	bool m_left_mouse_button_is_down;
-
-	EditorHistory m_history;
-
-	UI::UniqueWindow::Registry m_toolmenu;
-
-	UI::UniqueWindow::Registry m_toolsizemenu;
-	UI::UniqueWindow::Registry m_playermenu;
-	UI::UniqueWindow::Registry m_mainmenu;
-	UI::UniqueWindow::Registry m_heightmenu;
-	UI::UniqueWindow::Registry m_noise_heightmenu;
-	UI::UniqueWindow::Registry m_terrainmenu;
-	UI::UniqueWindow::Registry m_immovablemenu;
-	UI::UniqueWindow::Registry m_bobmenu;
-	UI::UniqueWindow::Registry m_resourcesmenu;
-
-	UI::Button m_toggle_main_menu;
-	UI::Button m_toggle_tool_menu;
-	UI::Button m_toggle_toolsize_menu;
-	UI::Button m_toggle_minimap;
-	UI::Button m_toggle_buildhelp;
-	UI::Button m_toggle_player_menu;
-	UI::Button m_undo;
-	UI::Button m_redo;
+	bool need_save_;
+	std::vector<PlayerReferences> player_tribe_references_;
+	uint32_t realtime_;
+	bool left_mouse_button_is_down_;
+
+	std::unique_ptr<Tools> tools_;
+	std::unique_ptr<EditorHistory> history_;
+
+	std::unique_ptr<Notifications::Subscriber<Widelands::NoteFieldResourceChanged>>
+	   field_resource_changed_subscriber_;
+	UI::UniqueWindow::Registry toolmenu_;
+
+	UI::UniqueWindow::Registry toolsizemenu_;
+	UI::UniqueWindow::Registry playermenu_;
+	UI::UniqueWindow::Registry mainmenu_;
+	UI::UniqueWindow::Registry heightmenu_;
+	UI::UniqueWindow::Registry noise_heightmenu_;
+	UI::UniqueWindow::Registry terrainmenu_;
+	UI::UniqueWindow::Registry immovablemenu_;
+	UI::UniqueWindow::Registry bobmenu_;
+	UI::UniqueWindow::Registry resourcesmenu_;
+
+	UI::Button toggle_main_menu_;
+	UI::Button toggle_tool_menu_;
+	UI::Button toggle_toolsize_menu_;
+	UI::Button toggle_minimap_;
+	UI::Button toggle_buildhelp_;
+	UI::Button toggle_player_menu_;
+	UI::Button undo_;
+	UI::Button redo_;
 };
 
 #endif  // end of include guard: WL_EDITOR_EDITORINTERACTIVE_H

=== modified file 'src/editor/map_generator.cc'
--- src/editor/map_generator.cc	2016-01-06 19:11:20 +0000
+++ src/editor/map_generator.cc	2016-01-16 15:57:59 +0000
@@ -134,8 +134,7 @@
 		res_val *= static_cast<uint8_t>(map_info_.resource_amount) + 1;
 		res_val /= 3;
 		if (map_.is_resource_valid(world, fc, res_idx)) {
-			fc.field->set_resources(res_idx, res_val);
-			fc.field->set_initial_res_amount(res_val);
+			map_.initialize_resources(fc, res_idx, res_val);
 		}
 	};
 

=== modified file 'src/editor/tools/editor_action_args.h'
--- src/editor/tools/editor_action_args.h	2015-11-11 09:54:53 +0000
+++ src/editor/tools/editor_action_args.h	2016-01-16 15:57:59 +0000
@@ -30,7 +30,7 @@
 class BobDescr;
 }  // namespace Widelands
 
-struct EditorInteractive;
+class EditorInteractive;
 struct EditorToolAction;
 
 /// Class to save important and changeable properties of classes needed for actions

=== modified file 'src/editor/tools/editor_decrease_resources_tool.cc'
--- src/editor/tools/editor_decrease_resources_tool.cc	2016-01-10 11:36:05 +0000
+++ src/editor/tools/editor_decrease_resources_tool.cc	2016-01-16 15:57:59 +0000
@@ -36,7 +36,7 @@
 */
 int32_t EditorDecreaseResourcesTool::handle_click_impl(const Widelands::World& world,
                                                        Widelands::NodeAndTriangle<> const center,
-                                                       EditorInteractive& parent,
+                                                       EditorInteractive& /* parent */,
                                                        EditorActionArgs* args,
                                                        Widelands::Map* map) {
 	Widelands::MapRegion<Widelands::Area<Widelands::FCoords> > mr
@@ -54,8 +54,7 @@
 			map->is_resource_valid(world, mr.location(), args->cur_res)) {
 			args->orgResT.push_back(mr.location().field->get_resources());
 			args->orgRes.push_back(mr.location().field->get_resources_amount());
-			EditorSetResourcesTool::set_res_and_overlay(world, amount, args->cur_res, mr.location(),
-			                                            parent.mutable_field_overlay_manager(), map);
+			map->initialize_resources(mr.location(), args->cur_res, amount);
 		}
 
 	} while (mr.advance(*map));
@@ -67,7 +66,7 @@
 													  EditorInteractive& parent,
 													  EditorActionArgs* args,
 													  Widelands::Map* map) {
-	return parent.tools.set_resources.handle_undo_impl(world, center, parent, args, map);
+	return parent.tools()->set_resources.handle_undo_impl(world, center, parent, args, map);
 }
 
 EditorActionArgs EditorDecreaseResourcesTool::format_args_impl(EditorInteractive & parent)

=== modified file 'src/editor/tools/editor_delete_bob_tool.cc'
--- src/editor/tools/editor_delete_bob_tool.cc	2016-01-06 19:11:20 +0000
+++ src/editor/tools/editor_delete_bob_tool.cc	2016-01-16 15:57:59 +0000
@@ -57,7 +57,7 @@
                                       EditorActionArgs* args,
 									  Widelands::Map* map) {
 
-	uint32_t ret = parent.tools.place_bob.handle_undo_impl(world, center, parent, args, map);
+	uint32_t ret = parent.tools()->place_bob.handle_undo_impl(world, center, parent, args, map);
 	args->obob_type.clear();
 	return ret;
 }

=== modified file 'src/editor/tools/editor_delete_immovable_tool.cc'
--- src/editor/tools/editor_delete_immovable_tool.cc	2016-01-06 19:11:20 +0000
+++ src/editor/tools/editor_delete_immovable_tool.cc	2016-01-16 15:57:59 +0000
@@ -58,7 +58,7 @@
 													EditorInteractive& parent,
 													EditorActionArgs* args,
 													Widelands::Map* map) {
-	return parent.tools.place_immovable.handle_undo_impl(world, center, parent, args, map);
+	return parent.tools()->place_immovable.handle_undo_impl(world, center, parent, args, map);
 }
 
 EditorActionArgs EditorDeleteImmovableTool::format_args_impl(EditorInteractive & parent)

=== modified file 'src/editor/tools/editor_history.cc'
--- src/editor/tools/editor_history.cc	2016-01-04 20:50:19 +0000
+++ src/editor/tools/editor_history.cc	2016-01-16 15:57:59 +0000
@@ -133,12 +133,3 @@
 	}
 	return tool.handle_click(ind, world, center, parent, ac.args, &map);
 }
-
-
-void EditorHistory::reset()
-{
-	undo_stack.clear();
-	redo_stack.clear();
-	m_undo_button.set_enabled(false);
-	m_redo_button.set_enabled(false);
-}

=== modified file 'src/editor/tools/editor_history.h'
--- src/editor/tools/editor_history.h	2014-09-10 14:08:25 +0000
+++ src/editor/tools/editor_history.h	2016-01-16 15:57:59 +0000
@@ -25,8 +25,7 @@
 #include "editor/tools/editor_draw_tool.h"
 #include "editor/tools/editor_tool.h"
 
-//struct EditorActionArgs;
-struct EditorInteractive;
+class EditorInteractive;
 namespace UI {struct Button;}
 
 /**
@@ -35,7 +34,6 @@
  * Do all tool action you want to make "undoable" using this class.
  */
 struct EditorHistory {
-
 	EditorHistory(UI::Button & undo, UI::Button & redo):
 		m_undo_button(undo), m_redo_button(redo) {}
 
@@ -49,11 +47,7 @@
 	uint32_t undo_action(const Widelands::World& world);
 	uint32_t redo_action(const Widelands::World& world);
 
-	/// Must be called after every change of map, world, or ... to avoid undo errors
-	void reset();
-
 private:
-
 	UI::Button & m_undo_button;
 	UI::Button & m_redo_button;
 
@@ -61,7 +55,6 @@
 
 	std::deque<EditorToolAction> undo_stack;
 	std::deque<EditorToolAction> redo_stack;
-
 };
 
 

=== modified file 'src/editor/tools/editor_increase_resources_tool.cc'
--- src/editor/tools/editor_increase_resources_tool.cc	2016-01-10 11:36:05 +0000
+++ src/editor/tools/editor_increase_resources_tool.cc	2016-01-16 15:57:59 +0000
@@ -31,7 +31,7 @@
 
 int32_t EditorIncreaseResourcesTool::handle_click_impl(const Widelands::World& world,
                                                        Widelands::NodeAndTriangle<> const center,
-                                                       EditorInteractive& parent,
+                                                       EditorInteractive& /* parent */,
                                                        EditorActionArgs* args,
                                                        Widelands::Map* map) {
 	Widelands::MapRegion<Widelands::Area<Widelands::FCoords> > mr
@@ -52,8 +52,7 @@
 				map->is_resource_valid(world, mr.location(), args->cur_res)) {
 			args->orgResT.push_back(mr.location().field->get_resources());
 			args->orgRes.push_back(mr.location().field->get_resources_amount());
-			EditorSetResourcesTool::set_res_and_overlay(world, amount, args->cur_res, mr.location(),
-			                                            parent.mutable_field_overlay_manager(), map);
+			map->initialize_resources(mr.location(), args->cur_res, amount);
 		}
 	} while (mr.advance(*map));
 	return mr.radius();

=== modified file 'src/editor/tools/editor_set_origin_tool.cc'
--- src/editor/tools/editor_set_origin_tool.cc	2016-01-07 12:47:17 +0000
+++ src/editor/tools/editor_set_origin_tool.cc	2016-01-16 15:57:59 +0000
@@ -29,7 +29,7 @@
                                                EditorActionArgs* /* args */,
 											   Widelands::Map* map) {
 	map->set_origin(center.node);
-	eia.register_overlays();
+	eia.map_changed(EditorInteractive::MapWas::kGloballyMutated);
 	eia.set_rel_viewpoint
 	(Point
 	 (-(center.node.x * 2 + (center.node.y & 1)) * (TRIANGLE_WIDTH / 2),
@@ -41,15 +41,15 @@
 int32_t
 EditorSetOriginTool::handle_undo_impl(const Widelands::World&,
                                       Widelands::NodeAndTriangle<Widelands::Coords> center,
-                                      EditorInteractive& parent,
+                                      EditorInteractive& eia,
                                       EditorActionArgs* /* args */,
 									  Widelands::Map* map) {
 	Widelands::Coords nc
 		(map->get_width()  - center.node.x,
 		 map->get_height() - center.node.y);
 	map->set_origin(nc);
-	parent.register_overlays();
-	parent.set_rel_viewpoint
+	eia.map_changed(EditorInteractive::MapWas::kGloballyMutated);
+	eia.set_rel_viewpoint
 	(Point
 	 (- (nc.x * 2 + (nc.y & 1)) *(TRIANGLE_WIDTH / 2),
 	  - nc.y * TRIANGLE_HEIGHT),
@@ -57,7 +57,7 @@
 	return 0;
 }
 
-EditorActionArgs EditorSetOriginTool::format_args_impl(EditorInteractive & parent)
+EditorActionArgs EditorSetOriginTool::format_args_impl(EditorInteractive & eia)
 {
-	return EditorTool::format_args_impl(parent);
+	return EditorTool::format_args_impl(eia);
 }

=== modified file 'src/editor/tools/editor_set_port_space_tool.cc'
--- src/editor/tools/editor_set_port_space_tool.cc	2016-01-10 11:36:05 +0000
+++ src/editor/tools/editor_set_port_space_tool.cc	2016-01-16 15:57:59 +0000
@@ -86,7 +86,7 @@
                                                  EditorInteractive& parent,
                                                  EditorActionArgs* args,
 												 Map* map) {
-	return parent.tools.unset_port_space.handle_click_impl(world, center, parent, args, map);
+	return parent.tools()->unset_port_space.handle_click_impl(world, center, parent, args, map);
 }
 
 int32_t EditorUnsetPortSpaceTool::handle_click_impl(const Widelands::World& world,
@@ -121,5 +121,5 @@
                                                    EditorInteractive& parent,
                                                    EditorActionArgs* args,
 												   Map* map) {
-	return parent.tools.set_port_space.handle_click_impl(world, center, parent, args, map);
+	return parent.tools()->set_port_space.handle_click_impl(world, center, parent, args, map);
 }

=== modified file 'src/editor/tools/editor_set_resources_tool.cc'
--- src/editor/tools/editor_set_resources_tool.cc	2016-01-10 11:36:05 +0000
+++ src/editor/tools/editor_set_resources_tool.cc	2016-01-16 15:57:59 +0000
@@ -27,11 +27,10 @@
 #include "logic/map_objects/world/resource_description.h"
 #include "logic/map_objects/world/world.h"
 #include "logic/mapregion.h"
-#include "wui/field_overlay_manager.h"
 
 int32_t EditorSetResourcesTool::handle_click_impl(const Widelands::World& world,
                                                   Widelands::NodeAndTriangle<> const center,
-                                                  EditorInteractive& parent,
+                                                  EditorInteractive& /* parent */,
                                                   EditorActionArgs* args,
                                                   Widelands::Map* map) {
 	Widelands::MapRegion<Widelands::Area<Widelands::FCoords> > mr
@@ -50,8 +49,7 @@
 		if (map->is_resource_valid(world, mr.location(), args->cur_res)) {
 			args->orgResT.push_back(mr.location().field->get_resources());
 			args->orgRes.push_back(mr.location().field->get_resources_amount());
-			set_res_and_overlay(world, amount, args->cur_res, mr.location(),
-			                    parent.mutable_field_overlay_manager(), map);
+			map->initialize_resources(mr.location(), args->cur_res, amount);
 		}
 	} while (mr.advance(*map));
 	return mr.radius();
@@ -60,7 +58,7 @@
 int32_t
 EditorSetResourcesTool::handle_undo_impl(const Widelands::World& world,
                                          Widelands::NodeAndTriangle<Widelands::Coords> center,
-                                         EditorInteractive& parent,
+                                         EditorInteractive& /* parent */,
                                          EditorActionArgs* args,
                                          Widelands::Map* map) {
 	Widelands::MapRegion<Widelands::Area<Widelands::FCoords> > mr
@@ -77,9 +75,7 @@
 		if (amount > max_amount)
 			amount = max_amount;
 
-		set_res_and_overlay(
-		   world, amount, *ir, mr.location(), parent.mutable_field_overlay_manager(), map);
-
+		map->initialize_resources(mr.location(), *it, amount);
 		++ir;
 		++it;
 	} while (mr.advance(*map));
@@ -95,33 +91,3 @@
 	a.set_to = m_set_to;
 	return a;
 }
-
-void EditorSetResourcesTool::set_res_and_overlay(const Widelands::World& world,
-											int32_t amount, uint8_t new_res,
-											const Widelands::FCoords& fcoords,
-											FieldOverlayManager* field_overlay_manager,
-											Widelands::Map* map) {
-	int32_t old_res = fcoords.field->get_resources();
-
-
-	//  Ok, we're doing something. First remove the current overlays.
-	if (old_res != Widelands::kNoResource) {
-		std::string str = world.get_resource(old_res)->get_editor_pic(
-				fcoords.field->get_resources_amount());
-		const Image* pic = g_gr->images().get(str);
-		field_overlay_manager->remove_overlay(fcoords, pic);
-	}
-
-	if (!amount) {
-		fcoords.field->set_resources(Widelands::kNoResource, 0);
-		fcoords.field->set_initial_res_amount(0);
-	} else {
-		fcoords.field->set_resources(new_res, amount);
-		fcoords.field->set_initial_res_amount(amount);
-		//  set new overlay
-		std::string str = world.get_resource(new_res)->get_editor_pic(amount);
-		const Image* pic = g_gr->images().get(str);
-		field_overlay_manager->register_overlay(fcoords, pic, 0);
-		map->recalc_for_field_area(world, Widelands::Area<Widelands::FCoords>(fcoords, 0));
-	}
-}

=== modified file 'src/editor/tools/editor_set_resources_tool.h'
--- src/editor/tools/editor_set_resources_tool.h	2016-01-10 11:36:05 +0000
+++ src/editor/tools/editor_set_resources_tool.h	2016-01-16 15:57:59 +0000
@@ -23,7 +23,6 @@
 #include "editor/tools/editor_tool.h"
 #include "logic/mapregion.h"
 #include "logic/widelands.h"
-#include "wui/field_overlay_manager.h"
 
 ///  Decreases the resources of a node by a value.
 struct EditorSetResourcesTool : public EditorTool {
@@ -48,16 +47,6 @@
 
 	EditorActionArgs format_args_impl(EditorInteractive & parent) override;
 
-	/**
-	 * Sets the resource amount and updates the overlay.
-	 */
-	static void set_res_and_overlay(const Widelands::World& world,
-	                                int32_t amount,
-	                                uint8_t resIx,
-	                                const Widelands::FCoords& fcoords,
-	                                FieldOverlayManager* field_overlay_manager,
-	                                Widelands::Map* map);
-
 	char const * get_sel_impl() const override {
 		return "pics/fsel_editor_set_resources.png";
 	}

=== modified file 'src/editor/tools/editor_tool.h'
--- src/editor/tools/editor_tool.h	2016-01-04 20:50:19 +0000
+++ src/editor/tools/editor_tool.h	2016-01-16 15:57:59 +0000
@@ -26,7 +26,7 @@
 #include "editor/tools/editor_action_args.h"
 #include "logic/widelands_geometry.h"
 
-struct EditorInteractive;
+class EditorInteractive;
 namespace Widelands {
 class Map;
 class World;

=== modified file 'src/editor/tools/editor_tool_action.h'
--- src/editor/tools/editor_tool_action.h	2014-09-10 14:08:25 +0000
+++ src/editor/tools/editor_tool_action.h	2016-01-16 15:57:59 +0000
@@ -25,7 +25,7 @@
 
 class EditorTool;
 namespace Widelands {class map;}
-struct EditorInteractive;
+class EditorInteractive;
 
 
 /// Class to save an action done by an editor tool

=== modified file 'src/editor/ui_menus/editor_main_menu.h'
--- src/editor/ui_menus/editor_main_menu.h	2015-09-25 13:08:22 +0000
+++ src/editor/ui_menus/editor_main_menu.h	2016-01-16 15:57:59 +0000
@@ -24,7 +24,7 @@
 #include "ui_basic/button.h"
 #include "ui_basic/unique_window.h"
 
-struct EditorInteractive;
+class EditorInteractive;
 
 /**
  * This represents the main menu

=== modified file 'src/editor/ui_menus/editor_main_menu_load_map.cc'
--- src/editor/ui_menus/editor_main_menu_load_map.cc	2016-01-07 12:47:17 +0000
+++ src/editor/ui_menus/editor_main_menu_load_map.cc	2016-01-16 15:57:59 +0000
@@ -50,9 +50,7 @@
 	} else {
 		EditorInteractive& eia = dynamic_cast<EditorInteractive&>(*get_parent());
 		eia.load(mapdata.filename);
-		eia.toggle_minimap();
-		eia.toggle_minimap();
-		die();
+		// load() will delete us.
 	}
 }
 

=== modified file 'src/editor/ui_menus/editor_main_menu_map_options.h'
--- src/editor/ui_menus/editor_main_menu_map_options.h	2015-03-30 10:17:48 +0000
+++ src/editor/ui_menus/editor_main_menu_map_options.h	2016-01-16 15:57:59 +0000
@@ -30,7 +30,7 @@
 #include "ui_basic/textarea.h"
 #include "ui_basic/window.h"
 
-struct EditorInteractive;
+class EditorInteractive;
 
 /**
  * This is the Main Options Menu. Here, information

=== modified file 'src/editor/ui_menus/editor_main_menu_new_map.cc'
--- src/editor/ui_menus/editor_main_menu_new_map.cc	2016-01-06 19:11:20 +0000
+++ src/editor/ui_menus/editor_main_menu_new_map.cc	2016-01-16 15:57:59 +0000
@@ -125,11 +125,7 @@
 	egbase.load_graphics(loader);
 
 	map.recalc_whole_map(egbase.world());
-
-	parent.set_need_save(true);
-	parent.toggle_minimap();
-	parent.toggle_minimap();
-
+	parent.map_changed(EditorInteractive::MapWas::kReplaced);
 	die();
 }
 

=== modified file 'src/editor/ui_menus/editor_main_menu_new_map.h'
--- src/editor/ui_menus/editor_main_menu_new_map.h	2015-12-04 17:58:39 +0000
+++ src/editor/ui_menus/editor_main_menu_new_map.h	2016-01-16 15:57:59 +0000
@@ -27,7 +27,7 @@
 #include "ui_basic/spinbox.h"
 #include "ui_basic/window.h"
 
-struct EditorInteractive;
+class EditorInteractive;
 
 /**
  * This is the new map selection menu. It offers

=== modified file 'src/editor/ui_menus/editor_main_menu_random_map.cc'
--- src/editor/ui_menus/editor_main_menu_random_map.cc	2016-01-06 19:11:20 +0000
+++ src/editor/ui_menus/editor_main_menu_random_map.cc	2016-01-16 15:57:59 +0000
@@ -449,12 +449,7 @@
 	egbase.load_graphics(loader);
 
 	map.recalc_whole_map(egbase.world());
-
-	eia.set_need_save(true);
-	eia.register_overlays();
-	eia.toggle_minimap();
-	eia.toggle_minimap();
-
+	eia.map_changed(EditorInteractive::MapWas::kReplaced);
 	die();
 }
 

=== modified file 'src/editor/ui_menus/editor_main_menu_random_map.h'
--- src/editor/ui_menus/editor_main_menu_random_map.h	2015-12-03 18:55:59 +0000
+++ src/editor/ui_menus/editor_main_menu_random_map.h	2016-01-16 15:57:59 +0000
@@ -34,7 +34,7 @@
 	struct UniqueRandomMapInfo;
 }
 
-struct EditorInteractive;
+class EditorInteractive;
 namespace UI {
 template <typename T, typename ID> struct IDButton;
 }

=== modified file 'src/editor/ui_menus/editor_player_menu.cc'
--- src/editor/ui_menus/editor_player_menu.cc	2016-01-10 11:36:05 +0000
+++ src/editor/ui_menus/editor_player_menu.cc	2016-01-16 15:57:59 +0000
@@ -233,7 +233,7 @@
 			menu.mutable_field_overlay_manager()->remove_overlay(sp, g_gr->images().get(picsname));
 		}
 		// if removed player was selected switch to the next highest player
-		if (old_nr_players == menu.tools.set_starting_pos.get_current_player())
+		if (old_nr_players == menu.tools()->set_starting_pos.get_current_player())
 			set_starting_pos_clicked(nr_players);
 	}
 	map.set_nrplayers(nr_players);
@@ -290,11 +290,11 @@
 		menu.move_view_to(sp);
 
 	//  select tool set mplayer
-	menu.select_tool(menu.tools.set_starting_pos, EditorTool::First);
-	menu.tools.set_starting_pos.set_current_player(n);
+	menu.select_tool(menu.tools()->set_starting_pos, EditorTool::First);
+	menu.tools()->set_starting_pos.set_current_player(n);
 
 	//  reselect tool, so everything is in a defined state
-	menu.select_tool(menu.tools.current(), EditorTool::First);
+	menu.select_tool(menu.tools()->current(), EditorTool::First);
 
 	//  Register callback function to make sure that only valid locations are
 	//  selected.
@@ -379,8 +379,8 @@
 			(start_pos, g_gr->images().get(picsname));
 	}
 
-	parent.select_tool(parent.tools.make_infrastructure, EditorTool::First);
-	parent.tools.make_infrastructure.set_player(n);
+	parent.select_tool(parent.tools()->make_infrastructure, EditorTool::First);
+	parent.tools()->make_infrastructure.set_player(n);
 	overlay_manager->register_overlay_callback_function(
 	   boost::bind(&editor_make_infrastructure_tool_callback, _1, boost::ref(egbase), n));
 	map.recalc_whole_map(egbase.world());

=== modified file 'src/editor/ui_menus/editor_player_menu.h'
--- src/editor/ui_menus/editor_player_menu.h	2015-09-12 07:53:38 +0000
+++ src/editor/ui_menus/editor_player_menu.h	2016-01-16 15:57:59 +0000
@@ -31,7 +31,7 @@
 #include "ui_basic/unique_window.h"
 
 
-struct EditorInteractive;
+class EditorInteractive;
 namespace UI {
 struct Textarea;
 struct EditBox;

=== modified file 'src/editor/ui_menus/editor_tool_change_height_options_menu.h'
--- src/editor/ui_menus/editor_tool_change_height_options_menu.h	2014-09-10 14:08:25 +0000
+++ src/editor/ui_menus/editor_tool_change_height_options_menu.h	2016-01-16 15:57:59 +0000
@@ -24,7 +24,7 @@
 #include "ui_basic/button.h"
 #include "ui_basic/textarea.h"
 
-struct EditorInteractive;
+class EditorInteractive;
 struct EditorIncreaseHeightTool;
 
 struct EditorToolChangeHeightOptionsMenu :

=== modified file 'src/editor/ui_menus/editor_tool_change_resources_options_menu.cc'
--- src/editor/ui_menus/editor_tool_change_resources_options_menu.cc	2016-01-10 11:36:05 +0000
+++ src/editor/ui_menus/editor_tool_change_resources_options_menu.cc	2016-01-16 15:57:59 +0000
@@ -222,8 +222,8 @@
 	Widelands::EditorGameBase& egbase = eia().egbase();
 	Widelands::Map & map = egbase.map();
 	eia().mutable_field_overlay_manager()->register_overlay_callback_function(
-	   [resIx, &map, &egbase](const Widelands::TCoords<Widelands::FCoords>& coords) -> uint32_t {
-		   if (map.is_resource_valid(egbase.world(), coords, resIx)) {
+		[resIx, &map, &egbase](const Widelands::TCoords<Widelands::FCoords>& coords) -> uint32_t {
+			if (map.is_resource_valid(egbase.world(), coords, resIx)) {
 				return coords.field->nodecaps();
 			}
 			return 0;

=== 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-11-28 12:53:24 +0000
+++ src/editor/ui_menus/editor_tool_change_resources_options_menu.h	2016-01-16 15:57:59 +0000
@@ -25,7 +25,7 @@
 #include "ui_basic/radiobutton.h"
 #include "ui_basic/textarea.h"
 
-struct EditorInteractive;
+class EditorInteractive;
 struct EditorIncreaseResourcesTool;
 
 struct EditorToolChangeResourcesOptionsMenu :

=== modified file 'src/editor/ui_menus/editor_tool_menu.cc'
--- src/editor/ui_menus/editor_tool_menu.cc	2016-01-07 12:47:17 +0000
+++ src/editor/ui_menus/editor_tool_menu.cc	2016-01-16 15:57:59 +0000
@@ -55,7 +55,7 @@
 
 	int32_t const num_tools = 8;
 #define ADD_BUTTON(pic, tooltip)                                              \
-   m_radioselect.add_button                                                   \
+   radioselect_.add_button                                                   \
       (this,                                                                  \
        pos,                                                                   \
        g_gr->images().get("pics/editor_menu_tool_" pic ".png"),       \
@@ -76,20 +76,20 @@
 		(offs.x + (width + spacing) * num_tools, offs.y + (height + spacing));
 
 	{
-		const EditorTool & current = parent.tools.current();
-		m_radioselect.set_state
-			(&current == &parent.tools.noise_height       ? 1 :
-			 &current == &parent.tools.set_terrain        ? 2 :
-			 &current == &parent.tools.place_immovable    ? 3 :
-			 &current == &parent.tools.place_bob          ? 4 :
-			 &current == &parent.tools.increase_resources ? 5 :
-			 &current == &parent.tools.set_port_space     ? 6 :
-			 &current == &parent.tools.set_origin         ? 7 :
+		const EditorTool & current = parent.tools()->current();
+		radioselect_.set_state
+			(&current == &parent.tools()->noise_height       ? 1 :
+			 &current == &parent.tools()->set_terrain        ? 2 :
+			 &current == &parent.tools()->place_immovable    ? 3 :
+			 &current == &parent.tools()->place_bob          ? 4 :
+			 &current == &parent.tools()->increase_resources ? 5 :
+			 &current == &parent.tools()->set_port_space     ? 6 :
+			 &current == &parent.tools()->set_origin         ? 7 :
 			 0);
 	}
 
-	m_radioselect.changed.connect(boost::bind(&EditorToolMenu::changed_to, this));
-	m_radioselect.clicked.connect(boost::bind(&EditorToolMenu::changed_to, this));
+	radioselect_.changed.connect(boost::bind(&EditorToolMenu::changed_to, this));
+	radioselect_.clicked.connect(boost::bind(&EditorToolMenu::changed_to, this));
 
 	if (get_usedefaultpos())
 		center_to_parent();
@@ -99,7 +99,7 @@
  * Called when the radiogroup changes or is reclicked
 */
 void EditorToolMenu::changed_to() {
-	const int32_t n = m_radioselect.get_state();
+	const int32_t n = radioselect_.get_state();
 
 	EditorInteractive & parent =
 		dynamic_cast<EditorInteractive&>(*get_parent());
@@ -108,35 +108,35 @@
 	UI::UniqueWindow::Registry * current_registry_pointer = nullptr;
 	switch (n) {
 	case 0:
-		current_tool_pointer     = &parent.tools.increase_height;
-		current_registry_pointer = &parent.m_heightmenu;
+		current_tool_pointer     = &parent.tools()->increase_height;
+		current_registry_pointer = &parent.heightmenu_;
 		break;
 	case 1:
-		current_tool_pointer     = &parent.tools.noise_height;
-		current_registry_pointer = &parent.m_noise_heightmenu;
+		current_tool_pointer     = &parent.tools()->noise_height;
+		current_registry_pointer = &parent.noise_heightmenu_;
 		break;
 	case 2:
-		current_tool_pointer     = &parent.tools.set_terrain;
-		current_registry_pointer = &parent.m_terrainmenu;
+		current_tool_pointer     = &parent.tools()->set_terrain;
+		current_registry_pointer = &parent.terrainmenu_;
 		break;
 	case 3:
-		current_tool_pointer     = &parent.tools.place_immovable;
-		current_registry_pointer = &parent.m_immovablemenu;
+		current_tool_pointer     = &parent.tools()->place_immovable;
+		current_registry_pointer = &parent.immovablemenu_;
 		break;
 	case 4:
-		current_tool_pointer     = &parent.tools.place_bob;
-		current_registry_pointer = &parent.m_bobmenu;
+		current_tool_pointer     = &parent.tools()->place_bob;
+		current_registry_pointer = &parent.bobmenu_;
 		break;
 	case 5:
-		current_tool_pointer     = &parent.tools.increase_resources;
-		current_registry_pointer = &parent.m_resourcesmenu;
+		current_tool_pointer     = &parent.tools()->increase_resources;
+		current_registry_pointer = &parent.resourcesmenu_;
 		break;
 	case 6:
-		current_tool_pointer     = &parent.tools.set_port_space;
+		current_tool_pointer     = &parent.tools()->set_port_space;
 		current_registry_pointer = nullptr; // no need for a window
 		break;
 	case 7:
-		current_tool_pointer     = &parent.tools.set_origin;
+		current_tool_pointer     = &parent.tools()->set_origin;
 		current_registry_pointer = nullptr; // no need for a window
 		break;
 	default:
@@ -145,7 +145,7 @@
 	}
 
 	parent.select_tool(*current_tool_pointer, EditorTool::First);
-	if (current_tool_pointer == &parent.tools.set_port_space) {
+	if (current_tool_pointer == &parent.tools()->set_port_space) {
 		// Set correct overlay
 		Widelands::Map & map = parent.egbase().map();
 		parent.mutable_field_overlay_manager()->register_overlay_callback_function(
@@ -166,37 +166,37 @@
 			case 0:
 				new EditorToolChangeHeightOptionsMenu
 					(parent,
-					parent.tools.increase_height,
+					parent.tools()->increase_height,
 					*current_registry_pointer);
 				break;
 			case 1:
 				new EditorToolNoiseHeightOptionsMenu
 					(parent,
-					parent.tools.noise_height,
+					parent.tools()->noise_height,
 					*current_registry_pointer);
 				break;
 			case 2:
 				new EditorToolSetTerrainOptionsMenu
 					(parent,
-					parent.tools.set_terrain,
+					parent.tools()->set_terrain,
 					*current_registry_pointer);
 				break;
 			case 3:
 				new EditorToolPlaceImmovableOptionsMenu
 					(parent,
-					parent.tools.place_immovable,
+					parent.tools()->place_immovable,
 					*current_registry_pointer);
 				break;
 			case 4:
 				new EditorToolPlaceBobOptionsMenu
 					(parent,
-					parent.tools.place_bob,
+					parent.tools()->place_bob,
 					*current_registry_pointer);
 				break;
 			case 5:
 				new EditorToolChangeResourcesOptionsMenu
 					(parent,
-					parent.tools.increase_resources,
+					parent.tools()->increase_resources,
 					*current_registry_pointer);
 				break;
 			default:

=== modified file 'src/editor/ui_menus/editor_tool_menu.h'
--- src/editor/ui_menus/editor_tool_menu.h	2014-09-10 14:08:25 +0000
+++ src/editor/ui_menus/editor_tool_menu.h	2016-01-16 15:57:59 +0000
@@ -29,7 +29,7 @@
 	EditorToolMenu(EditorInteractive &, UI::UniqueWindow::Registry &);
 
 private:
-	UI::Radiogroup m_radioselect;
+	UI::Radiogroup radioselect_;
 
 	void changed_to();
 };

=== modified file 'src/editor/ui_menus/editor_tool_noise_height_options_menu.h'
--- src/editor/ui_menus/editor_tool_noise_height_options_menu.h	2014-09-10 14:08:25 +0000
+++ src/editor/ui_menus/editor_tool_noise_height_options_menu.h	2016-01-16 15:57:59 +0000
@@ -24,7 +24,7 @@
 #include "ui_basic/button.h"
 #include "ui_basic/textarea.h"
 
-struct EditorInteractive;
+class EditorInteractive;
 struct EditorNoiseHeightTool;
 
 struct EditorToolNoiseHeightOptionsMenu : public EditorToolOptionsMenu {

=== modified file 'src/editor/ui_menus/editor_tool_options_menu.cc'
--- src/editor/ui_menus/editor_tool_options_menu.cc	2014-11-30 18:49:38 +0000
+++ src/editor/ui_menus/editor_tool_options_menu.cc	2016-01-16 15:57:59 +0000
@@ -27,7 +27,7 @@
 	:
 	UI::UniqueWindow
 		(&parent, "tool_options_menu", &registry, width, height, title),
-	m_current_pointer(parent.tools.current_pointer)
+	m_current_pointer(parent.tools()->current_pointer)
 {
 	if (get_usedefaultpos())
 		center_to_parent();

=== modified file 'src/editor/ui_menus/editor_tool_place_immovable_options_menu.h'
--- src/editor/ui_menus/editor_tool_place_immovable_options_menu.h	2014-09-10 14:08:25 +0000
+++ src/editor/ui_menus/editor_tool_place_immovable_options_menu.h	2016-01-16 15:57:59 +0000
@@ -27,7 +27,7 @@
 #include "editor/ui_menus/editor_tool_options_menu.h"
 #include "editor/tools/editor_place_immovable_tool.h"
 
-struct EditorInteractive;
+class EditorInteractive;
 
 struct EditorToolPlaceImmovableOptionsMenu : public EditorToolOptionsMenu {
 	EditorToolPlaceImmovableOptionsMenu(EditorInteractive&,

=== modified file 'src/editor/ui_menus/editor_tool_set_terrain_options_menu.h'
--- src/editor/ui_menus/editor_tool_set_terrain_options_menu.h	2015-11-28 22:29:26 +0000
+++ src/editor/ui_menus/editor_tool_set_terrain_options_menu.h	2016-01-16 15:57:59 +0000
@@ -29,7 +29,7 @@
 #include "logic/map_objects/world/terrain_description.h"
 #include "ui_basic/textarea.h"
 
-struct EditorInteractive;
+class EditorInteractive;
 struct EditorSetTerrainTool;
 
 struct EditorToolSetTerrainOptionsMenu : public EditorToolOptionsMenu {

=== modified file 'src/editor/ui_menus/editor_toolsize_menu.cc'
--- src/editor/ui_menus/editor_toolsize_menu.cc	2015-07-26 10:20:28 +0000
+++ src/editor/ui_menus/editor_toolsize_menu.cc	2016-01-16 15:57:59 +0000
@@ -65,7 +65,7 @@
 	m_decrease.set_repeating(true);
 	update(parent.get_sel_radius());
 
-	if (eia().tools.current().has_size_one()) {
+	if (eia().tools()->current().has_size_one()) {
 		set_buttons_enabled(false);
 	}
 

=== modified file 'src/editor/ui_menus/editor_toolsize_menu.h'
--- src/editor/ui_menus/editor_toolsize_menu.h	2015-07-26 09:25:51 +0000
+++ src/editor/ui_menus/editor_toolsize_menu.h	2016-01-16 15:57:59 +0000
@@ -25,7 +25,7 @@
 #include "ui_basic/unique_window.h"
 
 
-struct EditorInteractive;
+class EditorInteractive;
 
 
 /// The tool size window/menu.

=== modified file 'src/logic/field.h'
--- src/logic/field.h	2016-01-07 12:47:17 +0000
+++ src/logic/field.h	2016-01-16 15:57:59 +0000
@@ -199,18 +199,10 @@
 		roads |= type << dir;
 	}
 
+	// Resources can be set through Map::set_resources()
 	// TODO(unknown): This should return DescriptionIndex
 	uint8_t get_resources() const {return m_resources;}
 	uint8_t get_resources_amount() const {return m_res_amount;}
-	void set_resources(uint8_t const res, uint8_t const amount) {
-		m_resources  = res;
-		m_res_amount = amount;
-	}
-
-	// TODO(unknown): This should take uint8_t
-	void set_initial_res_amount(int32_t const amount) {
-		m_initial_res_amount = amount;
-	}
 	// TODO(unknown): This should return uint8_t
 	int32_t get_initial_res_amount() const {return m_initial_res_amount;}
 

=== modified file 'src/logic/map.cc'
--- src/logic/map.cc	2016-01-10 11:36:05 +0000
+++ src/logic/map.cc	2016-01-16 15:57:59 +0000
@@ -250,11 +250,9 @@
 			amount /= 6;
 
 			if (res == -1 || !amount) {
-				f.field->set_resources(Widelands::kNoResource, 0);
-				f.field->set_initial_res_amount(0);
+				clear_resources(f);
 			} else {
-				f.field->set_resources(res, amount);
-				f.field->set_initial_res_amount(amount);
+				initialize_resources(f, res, amount);
 			}
 
 		}
@@ -322,12 +320,13 @@
 		Field::Terrains default_terrains;
 		default_terrains.d = default_terrain;
 		default_terrains.r = default_terrain;
-		Field * field = m_fields.get();
-		const Field * const fields_end = field + max_index();
-		for (; field < fields_end; ++field) {
-			field->set_height(10);
-			field->set_terrains(default_terrains);
-			field->set_resources(Widelands::kNoResource, 0);
+		for (int16_t y = 0; y < m_height; ++y) {
+			for (int16_t x = 0; x < m_width; ++x) {
+				auto f = get_fcoords(Coords(x, y));
+				f.field->set_height(10);
+				f.field->set_terrains(default_terrains);
+				clear_resources(f);
+			}
 		}
 	}
 	recalc_whole_map(world);
@@ -1837,24 +1836,25 @@
 	// remove invalid resources if necessary
 	// check vertex to which the triangle belongs
 	if (!is_resource_valid(world, c, c.field->get_resources())){
-		c.field->set_resources(Widelands::kNoResource, 0);
+		clear_resources(c);
 	}
 
 	// always check south-east vertex
 	Widelands::FCoords f_se(c, c.field);
 	get_neighbour(f_se, Widelands::WALK_SE, &f_se);
 	if (!is_resource_valid(world, f_se, f_se.field->get_resources())){
-		f_se.field->set_resources(Widelands::kNoResource, 0);
+		clear_resources(f_se);
 	}
 
 	// check south-west vertex if d-Triangle is changed, check east vertex if r-Triangle is changed
 	Widelands::FCoords f_sw_e(c, c.field);
 	get_neighbour(f_sw_e, c.t == TCoords<FCoords>::D ? Widelands::WALK_SW : Widelands::WALK_E, &f_sw_e);
 	if (!is_resource_valid(world, f_sw_e, f_sw_e.field->get_resources())){
-		f_sw_e.field->set_resources(Widelands::kNoResource, 0);
+		clear_resources(f_sw_e);
 	}
 
-	Notifications::publish(NoteFieldTransformed(c, c.field - &m_fields[0]));
+	Notifications::publish(
+	   NoteFieldTerrainChanged{c, static_cast<MapIndex>(c.field - &m_fields[0])});
 
 	recalc_for_field_area(world, Area<FCoords>(c, 2));
 
@@ -1895,11 +1895,47 @@
 
 void Map::ensure_resource_consistency(const World& world)
 {
-	for (MapIndex i = 0; i < max_index(); ++i)
-		if (!is_resource_valid(world, get_fcoords(m_fields[i]), m_fields[i].get_resources()))
-			m_fields[i].set_resources(Widelands::kNoResource, 0);
-}
-
+	for (MapIndex i = 0; i < max_index(); ++i) {
+		auto fcords = get_fcoords(m_fields[i]);
+		if (!is_resource_valid(world, fcords, fcords.field->get_resources())) {
+			clear_resources(fcords);
+		}
+	}
+}
+
+void Map::initialize_resources(const FCoords& c,
+                               const DescriptionIndex resource_type,
+                               uint8_t amount) {
+	// You cannot have an amount of nothing.
+	if (resource_type == Widelands::kNoResource) {
+		amount = 0;
+	}
+	const auto note = NoteFieldResourceChanged{
+	   c, c.field->m_resources, c.field->m_initial_res_amount, c.field->m_res_amount,
+	};
+
+	c.field->m_resources = resource_type;
+	c.field->m_initial_res_amount = amount;
+	c.field->m_res_amount = amount;
+	Notifications::publish(note);
+}
+
+void Map::set_resources(const FCoords& c, uint8_t amount) {
+	// You cannot change the amount of resources on a field without resources.
+	if (c.field->m_resources == Widelands::kNoResource) {
+		return;
+	}
+	assert(amount <= c.field->m_initial_res_amount);
+	const auto note = NoteFieldResourceChanged{
+	   c, c.field->m_resources, c.field->m_initial_res_amount, c.field->m_res_amount,
+	};
+	c.field->m_res_amount = amount;
+	Notifications::publish(note);
+}
+
+void Map::clear_resources(const FCoords& c) {
+	initialize_resources(c, Widelands::kNoResource, 0);
+}
 
 uint32_t Map::set_height(const World& world, const FCoords fc, uint8_t const new_value) {
 	assert(new_value <= MAX_FIELD_HEIGHT);

=== modified file 'src/logic/map.h'
--- src/logic/map.h	2016-01-10 11:36:05 +0000
+++ src/logic/map.h	2016-01-16 15:57:59 +0000
@@ -68,15 +68,21 @@
 struct Path;
 class Immovable;
 
-struct NoteFieldTransformed {
-	CAN_BE_SENT_AS_NOTE(NoteId::FieldTransformed)
+struct NoteFieldTerrainChanged {
+	CAN_BE_SENT_AS_NOTE(NoteId::FieldTerrainChanged)
 
 	FCoords fc;
 	MapIndex map_index;
-
-	NoteFieldTransformed(const FCoords& init_fc, const MapIndex init_map_index)
-	   : fc(init_fc), map_index(init_map_index) {
-	}
+};
+
+/// Send when the resource of a field is changed.
+struct NoteFieldResourceChanged {
+	CAN_BE_SENT_AS_NOTE(NoteId::FieldResourceTypeChanged)
+
+	FCoords fc;
+	DescriptionIndex old_resource;
+	uint8_t old_initial_amount;
+	uint8_t old_amount;
 };
 
 struct ImmovableFound {
@@ -362,6 +368,18 @@
 	/// Changes the height of the nodes in an Area by a difference.
 	uint32_t change_height(const World& world, Area<FCoords>, int16_t difference);
 
+	/// Initializes the 'initial_resources' on 'coords' to the 'resource_type'
+	/// with the given 'amount'.
+	void initialize_resources(const FCoords& coords, DescriptionIndex resource_type, uint8_t amount);
+
+	/// Sets the number of resources of the field to 'amount'. The type of the
+	/// resource on this field is not changed.
+	void set_resources(const FCoords& coords, uint8_t amount);
+
+	/// Clears the resources, i.e. the amount will be set to 0 and the type of
+	/// resources will be kNoResource.
+	void clear_resources(const FCoords& coords);
+
 	/**
 	 * Ensures that the height of each node within radius from fc is in
 	 * height_interval. If the height is < height_interval.min, it is changed to

=== modified file 'src/logic/map_objects/tribes/production_program.cc'
--- src/logic/map_objects/tribes/production_program.cc	2016-01-12 21:25:20 +0000
+++ src/logic/map_objects/tribes/production_program.cc	2016-01-16 15:57:59 +0000
@@ -1309,8 +1309,7 @@
 					assert(amount > 0);
 
 					--amount;
-
-					mr.location().field->set_resources(m_resource, amount);
+					map.set_resources(mr.location(), amount);
 					break;
 				}
 			} while (mr.advance(map));

=== modified file 'src/logic/map_objects/tribes/worker.cc'
--- src/logic/map_objects/tribes/worker.cc	2016-01-06 19:11:20 +0000
+++ src/logic/map_objects/tribes/worker.cc	2016-01-16 15:57:59 +0000
@@ -176,7 +176,7 @@
 			assert(amount > 0);
 
 			--amount;
-			mr.location().field->set_resources(res, amount);
+			map.set_resources(mr.location(), amount);
 			break;
 		}
 	} while (mr.advance(map));
@@ -286,9 +286,7 @@
 			assert(amount > 0);
 
 			--amount;
-
-			mr.location().field->set_resources
-				(res, mr.location().field->get_initial_res_amount() - amount);
+			map.set_resources(mr.location(), mr.location().field->get_initial_res_amount() - amount);
 			break;
 		}
 	} while (mr.advance(map));

=== modified file 'src/logic/player.cc'
--- src/logic/player.cc	2016-01-06 19:11:20 +0000
+++ src/logic/player.cc	2016-01-16 15:57:59 +0000
@@ -194,9 +194,9 @@
 			}
 		});
 
-	// Subscribe to NoteFieldTransformed.
-	field_transformed_subscriber_ =
-		Notifications::subscribe<NoteFieldTransformed>([this](const NoteFieldTransformed& note) {
+	// Subscribe to NoteFieldTerrainChanged.
+	field_terrain_changed_subscriber_ =
+		Notifications::subscribe<NoteFieldTerrainChanged>([this](const NoteFieldTerrainChanged& note) {
 			if (vision(note.map_index) > 1) {
 				rediscover_node(egbase().map(), egbase().map()[0], note.fc);
 			}

=== modified file 'src/logic/player.h'
--- src/logic/player.h	2016-01-06 19:11:20 +0000
+++ src/logic/player.h	2016-01-16 15:57:59 +0000
@@ -538,7 +538,8 @@
 	void rediscover_node(const Map&, const Widelands::Field&, FCoords);
 
 	std::unique_ptr<Notifications::Subscriber<NoteImmovable>> immovable_subscriber_;
-	std::unique_ptr<Notifications::Subscriber<NoteFieldTransformed>> field_transformed_subscriber_;
+	std::unique_ptr<Notifications::Subscriber<NoteFieldTerrainChanged>>
+	   field_terrain_changed_subscriber_;
 
 	MessageQueue           m_messages;
 

=== modified file 'src/map_io/map_resources_packet.cc'
--- src/map_io/map_resources_packet.cc	2015-11-28 22:29:26 +0000
+++ src/map_io/map_resources_packet.cc	2016-01-16 15:57:59 +0000
@@ -85,8 +85,9 @@
 
 					if (0xa < set_id)
 						throw "Unknown resource in map file. It is not in world!\n";
-					map[Coords(x, y)].set_resources(set_id, set_amount);
-					map[Coords(x, y)].set_initial_res_amount(set_start_amount);
+					const auto fcoords = map.get_fcoords(Coords(x, y));
+					map.initialize_resources(fcoords, set_id, set_start_amount);
+					map.set_resources(fcoords, set_amount);
 				}
 			}
 		} else {

=== modified file 'src/map_io/s2map.cc'
--- src/map_io/s2map.cc	2015-11-29 09:43:15 +0000
+++ src/map_io/s2map.cc	2016-01-16 15:57:59 +0000
@@ -617,19 +617,19 @@
 	if (!section)
 		throw wexception("Section 12 (Resources) not found");
 
-	f = m_map.m_fields.get();
 	pc = section.get();
 	char const * res;
 	int32_t amount = 0;
-	for (uint16_t y = 0; y < mapheight; ++y)
-		for (uint16_t x = 0; x < mapwidth; ++x, ++f, ++pc) {
-			uint8_t c = *pc;
+	for (uint16_t y = 0; y < mapheight; ++y) {
+		for (uint16_t x = 0; x < mapwidth; ++x, ++pc) {
+			auto c = m_map.get_fcoords(Widelands::Coords(x, y));
+			uint8_t value = *pc;
 
-			switch (c & 0xF8) {
-			case 0x40: res = "coal";    amount = c & 7; break;
-			case 0x48: res = "iron";    amount = c & 7; break;
-			case 0x50: res = "gold";    amount = c & 7; break;
-			case 0x59: res = "granite"; amount = c & 7; break;
+			switch (value & 0xF8) {
+			case 0x40: res = "coal";    amount = value & 7; break;
+			case 0x48: res = "iron";    amount = value & 7; break;
+			case 0x50: res = "gold";    amount = value & 7; break;
+			case 0x59: res = "granite"; amount = value & 7; break;
 			default:   res = "";        amount = 0; break;
 			};
 
@@ -644,9 +644,9 @@
 			}
 			const int32_t real_amount = static_cast<int32_t>
 				(2.86 * static_cast<float>(amount));
-			f->set_resources(nres, real_amount);
-			f->set_initial_res_amount(real_amount);
+			m_map.initialize_resources(c, nres, real_amount);
 		}
+	}
 
 
 

=== modified file 'src/notifications/note_ids.h'
--- src/notifications/note_ids.h	2015-05-20 19:17:56 +0000
+++ src/notifications/note_ids.h	2016-01-16 15:57:59 +0000
@@ -30,7 +30,8 @@
 	LogMessage,
 	Immovable,
 	FieldPossession,
-	FieldTransformed,
+	FieldTerrainChanged,
+	FieldResourceTypeChanged,
 	ProductionSiteOutOfResources,
 	TrainingSiteSoldierTrained,
 	ShipMessage,

=== modified file 'src/scripting/lua_map.cc'
--- src/scripting/lua_map.cc	2016-01-06 19:11:20 +0000
+++ src/scripting/lua_map.cc	2016-01-16 15:57:59 +0000
@@ -4442,15 +4442,18 @@
 	return 1;
 }
 int LuaField::set_resource(lua_State * L) {
-	Field * field = fcoords(L).field;
+	auto& egbase = get_egbase(L);
 	int32_t res = get_egbase(L).world().get_resource
 		(luaL_checkstring(L, -1));
 
 	if (res == Widelands::INVALID_INDEX)
 		report_error(L, "Illegal resource: '%s'", luaL_checkstring(L, -1));
 
-	field->set_resources(res, field->get_resources_amount());
-
+	auto c = fcoords(L);
+	const auto current_amount = c.field->get_resources_amount();
+	auto& map = egbase.map();
+	map.initialize_resources(c, res, c.field->get_initial_res_amount());
+	map.set_resources(c, current_amount);
 	return 0;
 }
 
@@ -4466,8 +4469,8 @@
 	return 1;
 }
 int LuaField::set_resource_amount(lua_State * L) {
-	Field * field = fcoords(L).field;
-	int32_t res = field->get_resources();
+	auto c  = fcoords(L);
+	int32_t res = c.field->get_resources();
 	int32_t amount = luaL_checkint32(L, -1);
 	const ResourceDescription * resDesc = get_egbase(L).world().get_resource(res);
 	int32_t max_amount = resDesc ? resDesc->max_amount() : 0;
@@ -4475,14 +4478,14 @@
 	if (amount < 0 || amount > max_amount)
 		report_error(L, "Illegal amount: %i, must be >= 0 and <= %i", amount, max_amount);
 
-	field->set_resources(res, amount);
-	//in editor, reset also initial amount
 	EditorGameBase & egbase = get_egbase(L);
-	upcast(Game, game, &egbase);
-	if (!game) {
-		field->set_initial_res_amount(amount);
+	auto& map = egbase.map();
+	if (is_a(Game, &egbase)) {
+		map.set_resources(c, amount);
+	} else {
+		// in editor, reset also initial amount
+		map.initialize_resources(c, res, amount);
 	}
-
 	return 0;
 }
 /* RST

=== modified file 'src/ui_basic/panel.h'
--- src/ui_basic/panel.h	2015-08-06 17:14:34 +0000
+++ src/ui_basic/panel.h	2016-01-16 15:57:59 +0000
@@ -247,6 +247,8 @@
 	///\return the current set UI font
 	std::string ui_fn();
 
+	virtual void die();
+
 protected:
 	// This panel will never receive keypresses (do_key), instead
 	// textinput will be passed on (do_textinput).
@@ -258,7 +260,6 @@
 	void set_thinks(bool yes);
 
 
-	virtual void die();
 	bool keyboard_free() {return !(_focus);}
 
 	virtual void update_desired_size();

=== modified file 'src/wui/field_overlay_manager.cc'
--- src/wui/field_overlay_manager.cc	2016-01-10 11:36:05 +0000
+++ src/wui/field_overlay_manager.cc	2016-01-16 15:57:59 +0000
@@ -207,6 +207,12 @@
 		}
 }
 
+void FieldOverlayManager::remove_all_overlays() {
+	m_overlays[0].clear();
+	m_overlays[1].clear();
+	m_overlays[2].clear();
+}
+
 void FieldOverlayManager::register_overlay_callback_function(CallbackFn function) {
 	m_callback = function;
 }

=== modified file 'src/wui/field_overlay_manager.h'
--- src/wui/field_overlay_manager.h	2016-01-10 11:56:27 +0000
+++ src/wui/field_overlay_manager.h	2016-01-16 15:57:59 +0000
@@ -97,6 +97,10 @@
 	/// remove all overlays with this overlay_id
 	void remove_overlay(OverlayId overlay_id);
 
+	/// Removes all overlays.
+	// TODO(sirver): It would be preferable to just delete and recreate the object.
+	void remove_all_overlays();
+
 	/// Returns the currently registered overlays and the buildhelp for a node.
 	void get_overlays(Widelands::FCoords c, std::vector<OverlayInfo>* result) const;
 

=== modified file 'src/wui/fieldaction.cc'
--- src/wui/fieldaction.cc	2016-01-10 11:36:05 +0000
+++ src/wui/fieldaction.cc	2016-01-16 15:57:59 +0000
@@ -819,10 +819,9 @@
 void FieldActionWindow::building_icon_mouse_in
 	(const Widelands::DescriptionIndex idx)
 {
-	if (ibase().m_show_workarea_preview && !m_workarea_preview_overlay_id) {
-		const WorkareaInfo & workarea_info =
-			m_plr->tribe().get_building_descr(Widelands::DescriptionIndex(idx))
-			->m_workarea_info;
+	if (ibase().show_workarea_preview_ && !m_workarea_preview_overlay_id) {
+		const WorkareaInfo& workarea_info =
+		   m_plr->tribe().get_building_descr(Widelands::DescriptionIndex(idx))->m_workarea_info;
 		m_workarea_preview_overlay_id = ibase().show_work_area(workarea_info, m_node);
 	}
 }

=== modified file 'src/wui/interactive_base.cc'
--- src/wui/interactive_base.cc	2016-01-10 11:36:05 +0000
+++ src/wui/interactive_base.cc	2016-01-16 15:57:59 +0000
@@ -82,28 +82,28 @@
 InteractiveBase::InteractiveBase(EditorGameBase& the_egbase, Section& global_s)
    : MapView(nullptr, 0, 0, g_gr->get_xres(), g_gr->get_yres(), *this),
      // Initialize chatoveraly before the toolbar so it is below
-     m_show_workarea_preview(global_s.get_bool("workareapreview", true)),
-     m_chatOverlay(new ChatOverlay(this, 10, 25, get_w() / 2, get_h() - 25)),
-     m_toolbar(this, 0, 0, UI::Box::Horizontal),
+     show_workarea_preview_(global_s.get_bool("workareapreview", true)),
+     chat_overlay_(new ChatOverlay(this, 10, 25, get_w() / 2, get_h() - 25)),
+     toolbar_(this, 0, 0, UI::Box::Horizontal),
      m(new InteractiveBaseInternals(new QuickNavigation(the_egbase, get_w(), get_h()))),
-	  m_field_overlay_manager(new FieldOverlayManager()),
-	  m_edge_overlay_manager(new EdgeOverlayManager()),
-     m_egbase(the_egbase),
+	  field_overlay_manager_(new FieldOverlayManager()),
+	  edge_overlay_manager_(new EdgeOverlayManager()),
+     egbase_(the_egbase),
 #ifndef NDEBUG //  not in releases
-     m_display_flags(dfDebug),
+     display_flags_(dfDebug),
 #else
-     m_display_flags(0),
+     display_flags_(0),
 #endif
-     m_lastframe(SDL_GetTicks()),
-     m_frametime(0),
-     m_avg_usframetime(0),
-     m_jobid(0),
-     m_road_buildhelp_overlay_jobid(0),
-     m_buildroad(nullptr),
-     m_road_build_player(0),
+     lastframe_(SDL_GetTicks()),
+     frametime_(0),
+     avg_usframetime_(0),
+     jobid_(0),
+     road_buildhelp_overlay_jobid_(0),
+     buildroad_(nullptr),
+     road_build_player_(0),
      unique_window_handler_(new UniqueWindowHandler()),
      // Start at idx 0 for 2 enhancements, idx 3 for 1, idx 5 if none
-     m_workarea_pics{g_gr->images().get("pics/workarea123.png"),
+     workarea_pics_{g_gr->images().get("pics/workarea123.png"),
                      g_gr->images().get("pics/workarea23.png"),
                      g_gr->images().get("pics/workarea3.png"),
                      g_gr->images().get("pics/workarea12.png"),
@@ -114,12 +114,12 @@
 	   [this](const GraphicResolutionChanged& message) {
 		   set_size(message.width, message.height);
 
-		   m_chatOverlay->set_size(get_w() / 2, get_h() - 25);
-		   m_chatOverlay->recompute();
+		   chat_overlay_->set_size(get_w() / 2, get_h() - 25);
+		   chat_overlay_->recompute();
 		   adjust_toolbar_position();
 		});
 
-	m_toolbar.set_layout_toplevel(true);
+	toolbar_.set_layout_toplevel(true);
 	m->quicknavigation->set_setview
 		(boost::bind(&MapView::set_viewpoint, this, _1, true));
 	set_changeview
@@ -137,7 +137,7 @@
 
 	//  Having this in the initializer list (before Sys_InitGraphics) will give
 	//  funny results.
-	m_sel.pic = g_gr->images().get("pics/fsel.png");
+	sel_.pic = g_gr->images().get("pics/fsel.png");
 
 	setDefaultCommand (boost::bind(&InteractiveBase::cmd_lua, this, _1));
 	addCommand
@@ -147,7 +147,7 @@
 
 InteractiveBase::~InteractiveBase()
 {
-	if (m_buildroad)
+	if (buildroad_)
 		abort_build_road();
 }
 
@@ -161,29 +161,29 @@
 	Map & map = egbase().map();
 
 	// Remove old sel pointer
-	if (m_sel.jobid)
-		m_field_overlay_manager->remove_overlay(m_sel.jobid);
+	if (sel_.jobid)
+		field_overlay_manager_->remove_overlay(sel_.jobid);
 	const FieldOverlayManager::OverlayId jobid =
-		m_sel.jobid = m_field_overlay_manager->next_overlay_id();
+		sel_.jobid = field_overlay_manager_->next_overlay_id();
 
-	m_sel.pos = center;
+	sel_.pos = center;
 
 	//  register sel overlay position
-	if (m_sel.triangles) {
+	if (sel_.triangles) {
 		assert
 			(center.triangle.t == TCoords<>::D ||
 			 center.triangle.t == TCoords<>::R);
 		Widelands::MapTriangleRegion<> mr
-			(map, Area<TCoords<> >(center.triangle, m_sel.radius));
+			(map, Area<TCoords<> >(center.triangle, sel_.radius));
 		do
-			m_field_overlay_manager->register_overlay
-				(mr.location(), m_sel.pic, 7, Point::invalid(), jobid);
+			field_overlay_manager_->register_overlay
+				(mr.location(), sel_.pic, 7, Point::invalid(), jobid);
 		while (mr.advance(map));
 	} else {
-		Widelands::MapRegion<> mr(map, Area<>(center.node, m_sel.radius));
+		Widelands::MapRegion<> mr(map, Area<>(center.node, sel_.radius));
 		do
-			m_field_overlay_manager->register_overlay
-				(mr.location(), m_sel.pic, 7, Point::invalid(), jobid);
+			field_overlay_manager_->register_overlay
+				(mr.location(), sel_.pic, 7, Point::invalid(), jobid);
 		while (mr.advance(map));
 		if (upcast(InteractiveGameBase const, igbase, this))
 			if
@@ -217,8 +217,8 @@
  * Set the current sel selection radius.
  */
 void InteractiveBase::set_sel_radius(const uint32_t n) {
-	if (n != m_sel.radius) {
-		m_sel.radius = n;
+	if (n != sel_.radius) {
+		sel_.radius = n;
 		set_sel_pos(get_sel_pos()); //  redraw
 	}
 }
@@ -227,7 +227,7 @@
  * Set/Unset sel picture
  */
 void InteractiveBase::set_sel_picture(const char * const file) {
-	m_sel.pic = g_gr->images().get(file);
+	sel_.pic = g_gr->images().get(file);
 	set_sel_pos(get_sel_pos()); //  redraw
 }
 void InteractiveBase::unset_sel_picture() {
@@ -235,16 +235,16 @@
 }
 
 bool InteractiveBase::buildhelp() const {
-	return m_field_overlay_manager->buildhelp();
+	return field_overlay_manager_->buildhelp();
 }
 
 void InteractiveBase::show_buildhelp(bool t) {
-	m_field_overlay_manager->show_buildhelp(t);
+	field_overlay_manager_->show_buildhelp(t);
 	on_buildhelp_changed(t);
 }
 
 void InteractiveBase::toggle_buildhelp() {
-	m_field_overlay_manager->show_buildhelp(!m_field_overlay_manager->buildhelp());
+	field_overlay_manager_->show_buildhelp(!field_overlay_manager_->buildhelp());
 }
 
 void InteractiveBase::on_buildhelp_changed(bool /* value */) {
@@ -263,8 +263,8 @@
 		default:
 			throw wexception("Encountered unexpected WorkareaInfo size %i", workareas_nrs);
 	}
-	Widelands::Map & map = m_egbase.map();
-	FieldOverlayManager::OverlayId overlay_id = m_field_overlay_manager->next_overlay_id();
+	Widelands::Map & map = egbase_.map();
+	FieldOverlayManager::OverlayId overlay_id = field_overlay_manager_->next_overlay_id();
 
 	Widelands::HollowArea<> hollow_area(Widelands::Area<>(coords, 0), 0);
 
@@ -274,9 +274,9 @@
 		hollow_area.radius = it->first;
 		Widelands::MapHollowRegion<> mr(map, hollow_area);
 		do
-			m_field_overlay_manager->register_overlay
+			field_overlay_manager_->register_overlay
 				(mr.location(),
-					m_workarea_pics[wa_index],
+					workarea_pics_[wa_index],
 					0,
 					Point::invalid(),
 					overlay_id);
@@ -288,7 +288,7 @@
 }
 
 void InteractiveBase::hide_work_area(FieldOverlayManager::OverlayId overlay_id) {
-	m_field_overlay_manager->remove_overlay(overlay_id);
+	field_overlay_manager_->remove_overlay(overlay_id);
 }
 
 
@@ -310,9 +310,9 @@
 	// Timing
 	uint32_t curframe = SDL_GetTicks();
 
-	m_frametime = curframe - m_lastframe;
-	m_avg_usframetime = ((m_avg_usframetime * 15) + (m_frametime * 1000)) / 16;
-	m_lastframe = curframe;
+	frametime_ = curframe - lastframe_;
+	avg_usframetime_ = ((avg_usframetime_  * 15) + (frametime_  * 1000)) / 16;
+	lastframe_ = curframe;
 
 	// If one of the arrow keys is pressed, scroll here
 	const uint32_t scrollval = 10;
@@ -366,12 +366,12 @@
 
 			static boost::format node_format("(%i, %i)");
 			node_text = as_uifont
-				((node_format % m_sel.pos.node.x % m_sel.pos.node.y).str(), UI_FONT_SIZE_SMALL);
+				((node_format % sel_.pos.node.x % sel_.pos.node.y).str(), UI_FONT_SIZE_SMALL);
 		} else { //this is an editor
 			static boost::format node_format("(%i, %i, %i)");
-			const int32_t height = map[m_sel.pos.node].get_height();
+			const int32_t height = map[sel_.pos.node].get_height();
 			node_text = as_uifont
-				((node_format % m_sel.pos.node.x % m_sel.pos.node.y % height).str(), UI_FONT_SIZE_SMALL);
+				((node_format % sel_.pos.node.x % sel_.pos.node.y % height).str(), UI_FONT_SIZE_SMALL);
 		}
 
 		dst.blit(
@@ -384,10 +384,9 @@
 	// Blit FPS when in debug mode.
 	if (get_display_flag(dfDebug)) {
 		static boost::format fps_format("%5.1f fps (avg: %5.1f fps)");
-		const std::string fps_text = as_uifont
-			((fps_format %
-			  (1000.0 / m_frametime) % (1000.0 / (m_avg_usframetime / 1000)))
-			 .str(), UI_FONT_SIZE_SMALL);
+		const std::string fps_text = as_uifont(
+		   (fps_format % (1000.0 / frametime_) % (1000.0 / (avg_usframetime_ / 1000))).str(),
+		   UI_FONT_SIZE_SMALL);
 		dst.blit(Point(5, (is_game) ? 25 : 5),
 		         UI::g_fh1->render(fps_text),
 		         BlendMode::UseAlpha,
@@ -474,13 +473,7 @@
 }
 
 
-/*
-===========
-InteractiveBase::toggle_minimap()
-
-Open the minimap or close it if it's open
-===========
-*/
+// Open the minimap or close it if it's open
 void InteractiveBase::toggle_minimap() {
 	if (m->minimap.window) {
 		delete m->minimap.window;
@@ -522,7 +515,7 @@
 */
 uint32_t InteractiveBase::get_display_flags() const
 {
-	return m_display_flags;
+	return display_flags_;
 }
 
 
@@ -533,10 +526,9 @@
 */
 void InteractiveBase::set_display_flags(uint32_t flags)
 {
-	m_display_flags = flags;
+	display_flags_ = flags;
 }
 
-
 /*
 ===============
 Get and set one individual flag of the display flags.
@@ -544,15 +536,15 @@
 */
 bool InteractiveBase::get_display_flag(uint32_t const flag)
 {
-	return m_display_flags & flag;
+	return display_flags_& flag;
 }
 
 void InteractiveBase::set_display_flag(uint32_t const flag, bool const on)
 {
-	m_display_flags &= ~flag;
+	display_flags_ &= ~flag;
 
 	if (on)
-		m_display_flags |= flag;
+		display_flags_ |= flag;
 }
 
 /*
@@ -561,13 +553,13 @@
 ===============
 */
 void InteractiveBase::start_build_road
-	(Coords _start, Widelands::PlayerNumber const player)
+	(Coords start, Widelands::PlayerNumber const player)
 {
 	// create an empty path
-	assert(!m_buildroad);
-	m_buildroad = new CoordPath(_start);
+	assert(!buildroad_);
+	buildroad_ = new CoordPath(start);
 
-	m_road_build_player = player;
+	road_build_player_ = player;
 
 	roadb_add_overlay();
 }
@@ -580,14 +572,14 @@
 */
 void InteractiveBase::abort_build_road()
 {
-	assert(m_buildroad);
+	assert(buildroad_);
 
 	roadb_remove_overlay();
 
-	m_road_build_player = 0;
+	road_build_player_ = 0;
 
-	delete m_buildroad;
-	m_buildroad = nullptr;
+	delete buildroad_;
+	buildroad_ = nullptr;
 }
 
 
@@ -598,20 +590,20 @@
 */
 void InteractiveBase::finish_build_road()
 {
-	assert(m_buildroad);
+	assert(buildroad_);
 
 	roadb_remove_overlay();
 
-	if (m_buildroad->get_nsteps()) {
+	if (buildroad_->get_nsteps()) {
 		upcast(Game, game, &egbase());
 
 		// Build the path as requested
 		if (game)
 			game->send_player_build_road
-				(m_road_build_player, *new Widelands::Path(*m_buildroad));
+				(road_build_player_, *new Widelands::Path(*buildroad_));
 		else
-			egbase().get_player(m_road_build_player)->build_road
-				(*new Widelands::Path(*m_buildroad));
+			egbase().get_player(road_build_player_)->build_road
+				(*new Widelands::Path(*buildroad_));
 
 		if
 			(allow_user_input() &&
@@ -620,7 +612,7 @@
 			//  place flags
 			const Map & map = egbase().map();
 			const std::vector<Coords>         &       c_vector =
-				m_buildroad->get_coords();
+				buildroad_->get_coords();
 			std::vector<Coords>::const_iterator const first    =
 				c_vector.begin() + 2;
 			std::vector<Coords>::const_iterator const last     =
@@ -633,9 +625,9 @@
 					 ++it)
 						if (game)
 							game->send_player_build_flag
-								(m_road_build_player, map.get_fcoords(*it));
+								(road_build_player_, map.get_fcoords(*it));
 						else
-							egbase().get_player(m_road_build_player)->build_flag
+							egbase().get_player(road_build_player_)->build_flag
 								(map.get_fcoords(*it));
 
 			} else {
@@ -645,16 +637,16 @@
 					 --it)
 						if (game)
 							game->send_player_build_flag
-								(m_road_build_player, map.get_fcoords(*it));
+								(road_build_player_, map.get_fcoords(*it));
 						else
-							egbase().get_player(m_road_build_player)->build_flag
+							egbase().get_player(road_build_player_)->build_flag
 								(map.get_fcoords(*it));
 			}
 		}
 	}
 
-	delete m_buildroad;
-	m_buildroad = nullptr;
+	delete buildroad_;
+	buildroad_ = nullptr;
 }
 
 
@@ -665,21 +657,21 @@
 ===============
 */
 bool InteractiveBase::append_build_road(Coords const field) {
-	assert(m_buildroad);
+	assert(buildroad_);
 
 	Map & map = egbase().map();
-	const Widelands::Player & player = egbase().player(m_road_build_player);
+	const Widelands::Player & player = egbase().player(road_build_player_);
 
 	{ //  find a path to the clicked-on node
 		Widelands::Path path;
 		Widelands::CheckStepRoad cstep(player, Widelands::MOVECAPS_WALK);
 		if
 			(map.findpath
-			 	(m_buildroad->get_end(), field, 0, path, cstep, Map::fpBidiCost)
+			 	(buildroad_->get_end(), field, 0, path, cstep, Map::fpBidiCost)
 			 <
 			 0)
 			return false; //  could not find a path
-		m_buildroad->append(map, path);
+		buildroad_->append(map, path);
 	}
 
 	{
@@ -690,15 +682,15 @@
 		{
 			Widelands::CheckStepLimited cstep;
 			{
-				for (const Coords& coord : m_buildroad->get_coords()) {
+				for (const Coords& coord : buildroad_->get_coords()) {
 					cstep.add_allowed_location(coord);
 				}
 			}
 			map.findpath
-				(m_buildroad->get_start(), field, 0, path, cstep, Map::fpBidiCost);
+				(buildroad_->get_start(), field, 0, path, cstep, Map::fpBidiCost);
 		}
-		m_buildroad->truncate(0);
-		m_buildroad->append(map, path);
+		buildroad_->truncate(0);
+		buildroad_->append(map, path);
 	}
 
 	roadb_remove_overlay();
@@ -713,9 +705,9 @@
 ===============
 */
 Coords InteractiveBase::get_build_road_start() const {
-	assert(m_buildroad);
+	assert(buildroad_);
 
-	return m_buildroad->get_start();
+	return buildroad_->get_start();
 }
 
 /*
@@ -724,9 +716,9 @@
 ===============
 */
 Coords InteractiveBase::get_build_road_end() const {
-	assert(m_buildroad);
+	assert(buildroad_);
 
-	return m_buildroad->get_end();
+	return buildroad_->get_end();
 }
 
 void InteractiveBase::log_message(const std::string& message) const
@@ -747,19 +739,19 @@
 */
 void InteractiveBase::roadb_add_overlay()
 {
-	assert(m_buildroad);
+	assert(buildroad_);
 
 	//log("Add overlay\n");
 
 	Map & map = egbase().map();
 
 	// preview of the road
-	assert(!m_jobid);
-	m_jobid = m_field_overlay_manager->next_overlay_id();
-	const CoordPath::StepVector::size_type nr_steps = m_buildroad->get_nsteps();
+	assert(!jobid_);
+	jobid_ = field_overlay_manager_->next_overlay_id();
+	const CoordPath::StepVector::size_type nr_steps = buildroad_->get_nsteps();
 	for (CoordPath::StepVector::size_type idx = 0; idx < nr_steps; ++idx) {
-		Widelands::Direction dir = (*m_buildroad)[idx];
-		Coords c = m_buildroad->get_coords()[idx];
+		Widelands::Direction dir = (*buildroad_)[idx];
+		Coords c = buildroad_->get_coords()[idx];
 
 		if (dir < Widelands::WALK_E || dir > Widelands::WALK_SW) {
 			map.get_neighbour(c, dir, &c);
@@ -768,22 +760,22 @@
 
 		int32_t const shift = 2 * (dir - Widelands::WALK_E);
 
-		uint8_t set_to = m_edge_overlay_manager->get_overlay(c);
+		uint8_t set_to = edge_overlay_manager_->get_overlay(c);
 		set_to |=  Widelands::RoadType::kNormal << shift;
-		m_edge_overlay_manager->register_overlay(c, set_to, m_jobid);
+		edge_overlay_manager_->register_overlay(c, set_to, jobid_);
 	}
 
 	// build hints
-	Widelands::FCoords endpos = map.get_fcoords(m_buildroad->get_end());
+	Widelands::FCoords endpos = map.get_fcoords(buildroad_->get_end());
 
-	assert(!m_road_buildhelp_overlay_jobid);
-	m_road_buildhelp_overlay_jobid = m_field_overlay_manager->next_overlay_id();
+	assert(!road_buildhelp_overlay_jobid_);
+	road_buildhelp_overlay_jobid_ = field_overlay_manager_->next_overlay_id();
 	for (int32_t dir = 1; dir <= 6; ++dir) {
 		Widelands::FCoords neighb;
 		int32_t caps;
 
 		map.get_neighbour(endpos, dir, &neighb);
-		caps = egbase().player(m_road_build_player).get_buildcaps(neighb);
+		caps = egbase().player(road_build_player_).get_buildcaps(neighb);
 
 		if (!(caps & Widelands::MOVECAPS_WALK))
 			continue; // need to be able to walk there
@@ -804,7 +796,7 @@
 				continue;
 		}
 
-		if (m_buildroad->get_index(neighb) >= 0)
+		if (buildroad_->get_index(neighb) >= 0)
 			continue; // the road can't cross itself
 
 		int32_t slope;
@@ -830,12 +822,12 @@
 		else
 			name = "pics/roadb_red.png";
 
-		m_field_overlay_manager->register_overlay
+		field_overlay_manager_->register_overlay
 			(neighb,
 			 g_gr->images().get(name),
 			 7,
 			 Point::invalid(),
-			 m_road_buildhelp_overlay_jobid);
+			 road_buildhelp_overlay_jobid_);
 	}
 }
 
@@ -846,21 +838,21 @@
 */
 void InteractiveBase::roadb_remove_overlay()
 {
-	assert(m_buildroad);
+	assert(buildroad_);
 
 	//log("Remove overlay\n");
 
 	//  preview of the road
-	if (m_jobid) {
-		m_edge_overlay_manager->remove_overlay(m_jobid);
+	if (jobid_) {
+		edge_overlay_manager_->remove_overlay(jobid_);
 	}
-	m_jobid = 0;
+	jobid_ = 0;
 
 	// build hints
-	if (m_road_buildhelp_overlay_jobid) {
-		m_field_overlay_manager->remove_overlay(m_road_buildhelp_overlay_jobid);
+	if (road_buildhelp_overlay_jobid_) {
+		field_overlay_manager_->remove_overlay(road_buildhelp_overlay_jobid_);
 	}
-	m_road_buildhelp_overlay_jobid = 0;
+	road_buildhelp_overlay_jobid_ = 0;
 }
 
 
@@ -876,7 +868,7 @@
 				break;
 		/* no break */
 		case SDLK_PAGEUP:
-			if (upcast(Game, game, &m_egbase)) {
+			if (upcast(Game, game, &egbase_)) {
 				if (GameController* const ctrl = game->game_controller()) {
 					ctrl->set_desired_speed(ctrl->desired_speed() + 1000);
 				}
@@ -884,7 +876,7 @@
 			return true;
 
 		case SDLK_PAUSE:
-			if (upcast(Game, game, &m_egbase)) {
+			if (upcast(Game, game, &egbase_)) {
 				if (GameController* const ctrl = game->game_controller()) {
 					ctrl->toggle_paused();
 				}
@@ -896,7 +888,7 @@
 				break;
 		/* no break */
 		case SDLK_PAGEDOWN:
-			if (upcast(Widelands::Game, game, &m_egbase)) {
+			if (upcast(Widelands::Game, game, &egbase_)) {
 				if (GameController* const ctrl = game->game_controller()) {
 					uint32_t const speed = ctrl->desired_speed();
 					ctrl->set_desired_speed(1000 < speed ? speed - 1000 : 0);
@@ -906,7 +898,7 @@
 #ifndef NDEBUG  //  only in debug builds
 		case SDLK_F6:
 			GameChatMenu::create_script_console(
-				this, m_debugconsole, *DebugConsole::get_chat_provider());
+				this, debugconsole_, *DebugConsole::get_chat_provider());
 			return true;
 #endif
 		default:

=== modified file 'src/wui/interactive_base.h'
--- src/wui/interactive_base.h	2016-01-10 11:36:05 +0000
+++ src/wui/interactive_base.h	2016-01-16 15:57:59 +0000
@@ -64,10 +64,10 @@
 	InteractiveBase(Widelands::EditorGameBase &, Section & global_s);
 	virtual ~InteractiveBase();
 
-	Widelands::EditorGameBase & egbase() const {return m_egbase;}
+	Widelands::EditorGameBase & egbase() const {return egbase_;}
 	virtual void reference_player_tribe(Widelands::PlayerNumber, const void * const) {}
 
-	bool m_show_workarea_preview;
+	bool show_workarea_preview_;
 	FieldOverlayManager::OverlayId show_work_area(const WorkareaInfo& workarea_info,
 	                                              Widelands::Coords coords);
 	void hide_work_area(FieldOverlayManager::OverlayId overlay_id);
@@ -79,9 +79,9 @@
 	virtual void postload();
 
 	const Widelands::NodeAndTriangle<> & get_sel_pos() const {
-		return m_sel.pos;
+		return sel_.pos;
 	}
-	bool get_sel_freeze() const {return m_sel.freeze;}
+	bool get_sel_freeze() const {return sel_.freeze;}
 
 	// Returns true if the buildhelp is currently displayed.
 	bool buildhelp() const;
@@ -93,12 +93,12 @@
 	 * sel_triangles determines whether the mouse pointer selects triangles.
 	 * (False meas that it selects nodes.)
 	 */
-	bool get_sel_triangles() const {return m_sel.triangles;}
-	void set_sel_triangles(const bool yes) {m_sel.triangles = yes;}
+	bool get_sel_triangles() const {return sel_.triangles;}
+	void set_sel_triangles(const bool yes) {sel_.triangles = yes;}
 
-	uint32_t get_sel_radius() const {return m_sel.radius;}
+	uint32_t get_sel_radius() const {return sel_.radius;}
 	virtual void set_sel_pos(Widelands::NodeAndTriangle<>);
-	void set_sel_freeze(const bool yes) {m_sel.freeze = yes;}
+	void set_sel_freeze(const bool yes) {sel_.freeze = yes;}
 	void set_sel_radius(uint32_t);
 
 	void move_view_to(Widelands::Coords);
@@ -111,8 +111,8 @@
 	void set_display_flag(uint32_t flag, bool on);
 
 	//  road building
-	bool is_building_road() const {return m_buildroad;}
-	Widelands::CoordPath * get_build_road() {return m_buildroad;}
+	bool is_building_road() const {return buildroad_;}
+	Widelands::CoordPath * get_build_road() {return buildroad_;}
 	void start_build_road
 		(Widelands::Coords start, Widelands::PlayerNumber player);
 		void abort_build_road();
@@ -132,14 +132,14 @@
 	}
 
 	const FieldOverlayManager& field_overlay_manager() const {
-		return *m_field_overlay_manager;
+		return *field_overlay_manager_;
 	}
 	FieldOverlayManager* mutable_field_overlay_manager() {
-		return m_field_overlay_manager.get();
+		return field_overlay_manager_.get();
 	}
 
 	const EdgeOverlayManager& edge_overlay_manager() const {
-		return *m_edge_overlay_manager;
+		return *edge_overlay_manager_;
 	}
 
 	void toggle_minimap();
@@ -162,13 +162,13 @@
 	void unset_sel_picture();
 	void set_sel_picture(const char * const);
 	void adjust_toolbar_position() {
-		m_toolbar.set_pos
-			(Point((get_inner_w() - m_toolbar.get_w()) >> 1, get_inner_h() - 34));
+		toolbar_.set_pos
+			(Point((get_inner_w() - toolbar_.get_w()) >> 1, get_inner_h() - 34));
 	}
 
 	// TODO(sirver): why are these protected?
-	ChatOverlay     * m_chatOverlay;
-	UI::Box           m_toolbar;
+	ChatOverlay     * chat_overlay_;
+	UI::Box           toolbar_;
 
 private:
 	void roadb_add_overlay   ();
@@ -191,39 +191,39 @@
 			freeze(Freeze), triangles(Triangles), pos(Pos), radius(Radius),
 			pic(Pic), jobid(Jobid)
 		{}
-		bool              freeze; // don't change m_sel even if mouse moves
+		bool              freeze; // don't change sel _even if mouse moves
 		bool              triangles; //  otherwise nodes
 		Widelands::NodeAndTriangle<>     pos;
 		uint32_t              radius;
 		const Image* pic;
 		FieldOverlayManager::OverlayId jobid;
-	} m_sel;
+	} sel_;
 
 	std::unique_ptr<InteractiveBaseInternals> m;
 
-	std::unique_ptr<FieldOverlayManager> m_field_overlay_manager;
-	std::unique_ptr<EdgeOverlayManager> m_edge_overlay_manager;
+	std::unique_ptr<FieldOverlayManager> field_overlay_manager_;
+	std::unique_ptr<EdgeOverlayManager> edge_overlay_manager_;
 
 	std::unique_ptr<Notifications::Subscriber<GraphicResolutionChanged>>
 	   graphic_resolution_changed_subscriber_;
-	Widelands::EditorGameBase & m_egbase;
-	uint32_t m_display_flags;
-	uint32_t          m_lastframe;         //  system time (milliseconds)
-	uint32_t          m_frametime;         //  in millseconds
-	uint32_t          m_avg_usframetime;   //  in microseconds!
-
-	EdgeOverlayManager::OverlayId m_jobid;
-	FieldOverlayManager::OverlayId m_road_buildhelp_overlay_jobid;
-	Widelands::CoordPath  * m_buildroad;         //  path for the new road
-	Widelands::PlayerNumber m_road_build_player;
-
-	UI::UniqueWindow::Registry m_debugconsole;
+	Widelands::EditorGameBase & egbase_;
+	uint32_t display_flags_;
+	uint32_t          lastframe_;         //  system time (milliseconds)
+	uint32_t          frametime_;         //  in millseconds
+	uint32_t          avg_usframetime_;   //  in microseconds!
+
+	EdgeOverlayManager::OverlayId jobid_;
+	FieldOverlayManager::OverlayId road_buildhelp_overlay_jobid_;
+	Widelands::CoordPath  * buildroad_;         //  path for the new road
+	Widelands::PlayerNumber road_build_player_;
+
+	UI::UniqueWindow::Registry debugconsole_;
 	std::unique_ptr<UniqueWindowHandler> unique_window_handler_;
-	std::vector<const Image*> m_workarea_pics;
+	std::vector<const Image*> workarea_pics_;
 };
 
 #define PIC2 g_gr->images().get("pics/but2.png")
 #define TOOLBAR_BUTTON_COMMON_PARAMETERS(name) \
-    &m_toolbar, name, 0, 0, 34U, 34U, PIC2
+    &toolbar_, name, 0, 0, 34U, 34U, PIC2
 
 #endif  // end of include guard: WL_WUI_INTERACTIVE_BASE_H

=== modified file 'src/wui/interactive_gamebase.cc'
--- src/wui/interactive_gamebase.cc	2016-01-10 11:36:05 +0000
+++ src/wui/interactive_gamebase.cc	2016-01-16 15:57:59 +0000
@@ -51,7 +51,7 @@
 	 PlayerType pt, bool const chatenabled, bool const multiplayer)
 	:
 	InteractiveBase(_game, global_s),
-	m_chatProvider(nullptr),
+	chat_provider_(nullptr),
 	m_building_census_format
 		(global_s.get_string("building_census_format",       "%N")),
 	m_building_statistics_format
@@ -87,15 +87,15 @@
 
 void InteractiveGameBase::set_chat_provider(ChatProvider & chat)
 {
-	m_chatProvider = &chat;
-	m_chatOverlay->set_chat_provider(chat);
+	chat_provider_ = &chat;
+	chat_overlay_->set_chat_provider(chat);
 
 	m_chatenabled = true;
 }
 
 ChatProvider * InteractiveGameBase::get_chat_provider()
 {
-	return m_chatProvider;
+	return chat_provider_;
 }
 
 void InteractiveGameBase::draw_overlay(RenderTarget& dst) {

=== modified file 'src/wui/interactive_gamebase.h'
--- src/wui/interactive_gamebase.h	2016-01-07 12:47:17 +0000
+++ src/wui/interactive_gamebase.h	2016-01-16 15:57:59 +0000
@@ -91,7 +91,7 @@
 	virtual int32_t calculate_buildcaps(const Widelands::TCoords<Widelands::FCoords> c) = 0;
 
 	GameMainMenuWindows m_mainm_windows;
-	ChatProvider           * m_chatProvider;
+	ChatProvider           * chat_provider_;
 	std::string              m_building_census_format;
 	std::string              m_building_statistics_format;
 	std::string              m_building_tooltip_format;

=== modified file 'src/wui/interactive_player.cc'
--- src/wui/interactive_player.cc	2016-01-10 11:36:05 +0000
+++ src/wui/interactive_player.cc	2016-01-16 15:57:59 +0000
@@ -69,7 +69,7 @@
 	m_auto_roadbuild_mode(global_s.get_bool("auto_roadbuild_mode", true)),
 	m_flag_to_connect(Widelands::Coords::null()),
 
-// Chat is different, as m_chatProvider needs to be checked when toggling
+// Chat is different, as chat_provider_ needs to be checked when toggling
 // Minimap is different as it warps and stuff
 
 #define INIT_BTN_this(picture, name, tooltip)                       \
@@ -124,19 +124,19 @@
 
 	// TODO(unknown): instead of making unneeded buttons invisible after generation,
 	// they should not at all be generated. -> implement more dynamic toolbar UI
-	m_toolbar.add(&m_toggle_options_menu,    UI::Box::AlignLeft);
-	m_toolbar.add(&m_toggle_statistics_menu, UI::Box::AlignLeft);
-	m_toolbar.add(&m_toggle_minimap,         UI::Box::AlignLeft);
-	m_toolbar.add(&m_toggle_buildhelp,       UI::Box::AlignLeft);
+	toolbar_.add(&m_toggle_options_menu,    UI::Box::AlignLeft);
+	toolbar_.add(&m_toggle_statistics_menu, UI::Box::AlignLeft);
+	toolbar_.add(&m_toggle_minimap,         UI::Box::AlignLeft);
+	toolbar_.add(&m_toggle_buildhelp,       UI::Box::AlignLeft);
 	if (multiplayer) {
-		m_toolbar.add(&m_toggle_chat,            UI::Box::AlignLeft);
+		toolbar_.add(&m_toggle_chat,            UI::Box::AlignLeft);
 		m_toggle_chat.set_visible(false);
 		m_toggle_chat.set_enabled(false);
 	}
 
-	m_toolbar.add(&m_toggle_help,            UI::Box::AlignLeft);
-	m_toolbar.add(&m_toggle_objectives,      UI::Box::AlignLeft);
-	m_toolbar.add(&m_toggle_message_menu,    UI::Box::AlignLeft);
+	toolbar_.add(&m_toggle_help,            UI::Box::AlignLeft);
+	toolbar_.add(&m_toggle_objectives,      UI::Box::AlignLeft);
+	toolbar_.add(&m_toggle_message_menu,    UI::Box::AlignLeft);
 
 	set_player_number(plyn);
 	fieldclicked.connect(boost::bind(&InteractivePlayer::node_action, this));
@@ -249,8 +249,8 @@
 void InteractivePlayer::toggle_chat() {
 	if (m_chat.window)
 		delete m_chat.window;
-	else if (m_chatProvider)
-		GameChatMenu::create_chat_console(this, m_chat, *m_chatProvider);
+	else if (chat_provider_)
+		GameChatMenu::create_chat_console(this, m_chat, *chat_provider_);
 }
 
 bool InteractivePlayer::can_see(Widelands::PlayerNumber const p) const
@@ -360,11 +360,11 @@
 
 		case SDLK_KP_ENTER:
 		case SDLK_RETURN:
-			if (!m_chatProvider | !m_chatenabled || !is_multiplayer())
+			if (!chat_provider_ | !m_chatenabled || !is_multiplayer())
 				break;
 
 			if (!m_chat.window)
-				GameChatMenu::create_chat_console(this, m_chat, *m_chatProvider);
+				GameChatMenu::create_chat_console(this, m_chat, *chat_provider_);
 
 			return true;
 		default:

=== modified file 'src/wui/interactive_spectator.cc'
--- src/wui/interactive_spectator.cc	2015-11-01 10:11:56 +0000
+++ src/wui/interactive_spectator.cc	2016-01-16 15:57:59 +0000
@@ -69,16 +69,16 @@
 	m_toggle_statistics.sigclicked.connect(boost::bind(&InteractiveSpectator::toggle_statistics, this));
 	m_toggle_minimap.sigclicked.connect(boost::bind(&InteractiveSpectator::toggle_minimap, this));
 
-	m_toolbar.set_layout_toplevel(true);
+	toolbar_.set_layout_toplevel(true);
 	if (!is_multiplayer()) {
-		m_toolbar.add(&m_exit,                UI::Box::AlignLeft);
-		m_toolbar.add(&m_save,                UI::Box::AlignLeft);
+		toolbar_.add(&m_exit,                UI::Box::AlignLeft);
+		toolbar_.add(&m_save,                UI::Box::AlignLeft);
 	} else
-		m_toolbar.add(&m_toggle_options_menu, UI::Box::AlignLeft);
-	m_toolbar.add(&m_toggle_statistics,      UI::Box::AlignLeft);
-	m_toolbar.add(&m_toggle_minimap,         UI::Box::AlignLeft);
-	m_toolbar.add(&m_toggle_buildhelp,       UI::Box::AlignLeft);
-	m_toolbar.add(&m_toggle_chat,            UI::Box::AlignLeft);
+		toolbar_.add(&m_toggle_options_menu, UI::Box::AlignLeft);
+	toolbar_.add(&m_toggle_statistics,      UI::Box::AlignLeft);
+	toolbar_.add(&m_toggle_minimap,         UI::Box::AlignLeft);
+	toolbar_.add(&m_toggle_buildhelp,       UI::Box::AlignLeft);
+	toolbar_.add(&m_toggle_chat,            UI::Box::AlignLeft);
 
 	// TODO(unknown): instead of making unneeded buttons invisible after generation,
 	// they should not at all be generated. -> implement more dynamic toolbar UI
@@ -162,8 +162,8 @@
 {
 	if (m_chat.window)
 		delete m_chat.window;
-	else if (m_chatProvider)
-		GameChatMenu::create_chat_console(this, m_chat, *m_chatProvider);
+	else if (chat_provider_)
+		GameChatMenu::create_chat_console(this, m_chat, *chat_provider_);
 }
 
 
@@ -270,11 +270,11 @@
 
 		case SDLK_RETURN:
 		case SDLK_KP_ENTER:
-			if (!m_chatProvider | !m_chatenabled)
+			if (!chat_provider_ | !m_chatenabled)
 				break;
 
 			if (!m_chat.window)
-				GameChatMenu::create_chat_console(this, m_chat, *m_chatProvider);
+				GameChatMenu::create_chat_console(this, m_chat, *chat_provider_);
 
 			dynamic_cast<GameChatMenu*>(m_chat.window)->enter_chat_message();
 			return true;

=== modified file 'test/maps/lua_testsuite.wmf/scripting/efield.lua'
--- test/maps/lua_testsuite.wmf/scripting/efield.lua	2016-01-01 17:35:01 +0000
+++ test/maps/lua_testsuite.wmf/scripting/efield.lua	2016-01-16 15:57:59 +0000
@@ -13,7 +13,7 @@
 function field_resources_tests:test_initial_resource_in_editor()
    -- making sure that (set_) resource_amount sets also initial resource in the editor
    -- the resource has to be set to something different than 'none', as none has no amount
-   self.f.resource = "coal"
+   self.f.resource = "water"
    self.f.resource_amount=10
    assert_equal(self.f.initial_resource_amount, self.f.resource_amount)
    assert_equal(10, self.f.initial_resource_amount)

=== modified file 'test/maps/lua_testsuite.wmf/scripting/gfield.lua'
--- test/maps/lua_testsuite.wmf/scripting/gfield.lua	2015-10-31 12:11:44 +0000
+++ test/maps/lua_testsuite.wmf/scripting/gfield.lua	2016-01-16 15:57:59 +0000
@@ -9,13 +9,14 @@
    assert_equal(5, self.f.resource_amount)
 end
 
-
-
 function field_resources_tests:test_initial_resources_in_game()
    -- Changing a resource in game should not change the
    -- initial_resources.
-   assert_equal("water", self.f.resource)
-   assert_equal(5, self.f.initial_resource_amount)
-   self.f.resource_amount = 1
-   assert_equal(5, self.f.initial_resource_amount)
+   local f = map:get_field(61,40)
+   assert_equal("water", f.resource)
+   assert_equal(5, f.initial_resource_amount)
+   assert_equal(5, f.resource_amount)
+   f.resource_amount = 1
+   assert_equal(5, f.initial_resource_amount)
+   assert_equal(1, f.resource_amount)
 end