openboe/oboe
2
0
Fork 0
Code Issues 146 Pull Requests 4 Actions Packages Projects Releases Wiki Activity

Fix scenario editor build

Browse Source
This commit is contained in:
Celtic Minstrel
2015-01-10 20:12:49 -05:00
parent 6b107f8273
commit bd0dc55995
5 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/scenedit/scen.actions.cpp
View File

@@ -3390,7 +3390,7 @@ bool save_check(std::string which_dlog) {
else if(choice == "cancel") else if(choice == "cancel")
return false; return false;
town->set_up_lights(); town->set_up_lights();
save_scenario(); save_scenario(scenario.scen_file);
return true; return true;
} }

3
src/scenedit/scen.core.cpp
View File

@@ -1614,7 +1614,6 @@ bool build_scenario() {
cur_town = which_town; cur_town = which_town;
scenario.addTown<cBigTown>(); scenario.addTown<cBigTown>();
town->town_name = "Large town"; town->town_name = "Large town";
save_scenario();
} }
for(i = 0; i < med; i++) { for(i = 0; i < med; i++) {
which_town = scenario.num_towns; which_town = scenario.num_towns;
@@ -1624,7 +1623,6 @@ bool build_scenario() {
cur_town = which_town; cur_town = which_town;
scenario.addTown<cMedTown>(); scenario.addTown<cMedTown>();
town->town_name = "Medium town"; town->town_name = "Medium town";
save_scenario();
} }
for(i = 0; i < small; i++) { for(i = 0; i < small; i++) {
which_town = scenario.num_towns; which_town = scenario.num_towns;
@@ -1634,7 +1632,6 @@ bool build_scenario() {
cur_town = which_town; cur_town = which_town;
scenario.addTown<cTinyTown>(); scenario.addTown<cTinyTown>();
town->town_name = "Small town"; town->town_name = "Small town";
save_scenario();
} }
cur_town = 0; cur_town = 0;
town = scenario.towns[0]; town = scenario.towns[0];

2
src/scenedit/scen.fileio.cpp
View File

@@ -98,7 +98,7 @@ void save_scenario(fs::path toFile) {
for(size_t i = 0; i < scenario.towns.size(); i++) { for(size_t i = 0; i < scenario.towns.size(); i++) {
std::string file_basename = 't' + std::to_string(i); std::string file_basename = 't' + std::to_string(i);
// First the main data. // 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. // Then the map.
std::ostream& town_map = scen_file.newFile("scenario/towns/" + file_basename + ".map"); std::ostream& town_map = scen_file.newFile("scenario/towns/" + file_basename + ".map");

2
src/scenedit/scen.main.cpp
View File

@@ -233,7 +233,7 @@ void handle_menu_choice(eMenu item_hit) {
break; break;
case eMenu::FILE_SAVE: case eMenu::FILE_SAVE:
town->set_up_lights(); town->set_up_lights();
save_scenario(); save_scenario(scenario.scen_file);
break; break;
case eMenu::FILE_NEW: case eMenu::FILE_NEW:
if(build_scenario()) { if(build_scenario()) {

2
src/scenedit/scen.townout.cpp
View File

@@ -1155,7 +1155,7 @@ void delete_last_town() {
scenario.town_data_size[scenario.num_towns][2] = 0; 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][3] = 0;
scenario.town_data_size[scenario.num_towns][4] = 0; scenario.town_data_size[scenario.num_towns][4] = 0;
save_scenario(); save_scenario(scenario.scen_file);
} }
cTown* pick_import_town(short def) { cTown* pick_import_town(short def) {