From bd0dc55995f0f3478669cc5d3b27d49ab9efd09f Mon Sep 17 00:00:00 2001
From: Celtic Minstrel <celtic.minstrel.ca@gmail.com>
Date: Sat, 10 Jan 2015 20:12:49 -0500
Subject: [PATCH] Fix scenario editor build

---
 src/scenedit/scen.actions.cpp | 2 +-
 src/scenedit/scen.core.cpp    | 3 ---
 src/scenedit/scen.fileio.cpp  | 2 +-
 src/scenedit/scen.main.cpp    | 2 +-
 src/scenedit/scen.townout.cpp | 2 +-
 5 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/scenedit/scen.actions.cpp b/src/scenedit/scen.actions.cpp
index 67893fb0..25fb0671 100644
--- a/src/scenedit/scen.actions.cpp
+++ b/src/scenedit/scen.actions.cpp
@@ -3390,7 +3390,7 @@ bool save_check(std::string which_dlog) {
 	else if(choice == "cancel")
 		return false;
 	town->set_up_lights();
-	save_scenario();
+	save_scenario(scenario.scen_file);
 	return true;
 }
 
diff --git a/src/scenedit/scen.core.cpp b/src/scenedit/scen.core.cpp
index 4fc1d31c..a30ee0fd 100644
--- a/src/scenedit/scen.core.cpp
+++ b/src/scenedit/scen.core.cpp
@@ -1614,7 +1614,6 @@ bool build_scenario() {
 		cur_town = which_town;
 		scenario.addTown<cBigTown>();
 		town->town_name = "Large town";
-		save_scenario();
 	}
 	for(i = 0; i < med; i++) {
 		which_town = scenario.num_towns;
@@ -1624,7 +1623,6 @@ bool build_scenario() {
 		cur_town = which_town;
 		scenario.addTown<cMedTown>();
 		town->town_name = "Medium town";
-		save_scenario();
 	}
 	for(i = 0; i < small; i++) {
 		which_town = scenario.num_towns;
@@ -1634,7 +1632,6 @@ bool build_scenario() {
 		cur_town = which_town;
 		scenario.addTown<cTinyTown>();
 		town->town_name = "Small town";
-		save_scenario();
 	}
 	cur_town = 0;
 	town = scenario.towns[0];
diff --git a/src/scenedit/scen.fileio.cpp b/src/scenedit/scen.fileio.cpp
index 59fa80f8..1590b306 100644
--- a/src/scenedit/scen.fileio.cpp
+++ b/src/scenedit/scen.fileio.cpp
@@ -98,7 +98,7 @@ void save_scenario(fs::path toFile) {
 	for(size_t i = 0; i < scenario.towns.size(); i++) {
 		std::string file_basename = 't' + std::to_string(i);
 		// First the main data.
-		std::ostream town = scen_file.newFile("scenario/towns/" + file_basename + ".xml");
+		std::ostream& town = scen_file.newFile("scenario/towns/" + file_basename + ".xml");
 		
 		// Then the map.
 		std::ostream& town_map = scen_file.newFile("scenario/towns/" + file_basename + ".map");
diff --git a/src/scenedit/scen.main.cpp b/src/scenedit/scen.main.cpp
index a3b91e98..152447aa 100644
--- a/src/scenedit/scen.main.cpp
+++ b/src/scenedit/scen.main.cpp
@@ -233,7 +233,7 @@ void handle_menu_choice(eMenu item_hit) {
 			break;
 		case eMenu::FILE_SAVE:
 			town->set_up_lights();
-			save_scenario();
+			save_scenario(scenario.scen_file);
 			break;
 		case eMenu::FILE_NEW:
 			if(build_scenario()) {
diff --git a/src/scenedit/scen.townout.cpp b/src/scenedit/scen.townout.cpp
index b2ebde40..a5079cca 100644
--- a/src/scenedit/scen.townout.cpp
+++ b/src/scenedit/scen.townout.cpp
@@ -1155,7 +1155,7 @@ void delete_last_town() {
 	scenario.town_data_size[scenario.num_towns][2] = 0;
 	scenario.town_data_size[scenario.num_towns][3] = 0;
 	scenario.town_data_size[scenario.num_towns][4] = 0;
-	save_scenario();
+	save_scenario(scenario.scen_file);
 }
 
 cTown* pick_import_town(short def) {