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

Remove some spurious scenario editor error messages

Browse Source 
These errors are all no longer necessary due to the editor loading the entire scenario into memory at the same time
This commit is contained in:
Celtic Minstrel
2017-02-12 18:19:29 -05:00
parent 59f2a7b94e
commit e38053d39f
3 changed files with 0 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
rsrc/dialogs/save-section-confirm.xml
View File

@@ -1,11 +0,0 @@
<?xml version='1.0' encoding='UTF-8' standalone='no'?>
<?xml-stylesheet href="dialog.xsl" type="text/xsl"?>
<dialog defbtn='save'>
<button name='save' type='regular' top='54' left='240'>Save</button>
<button name='cancel' type='regular' def-key='esc' top='54' left='175'>Cancel</button>
<button name='revert' type='regular' top='54' left='109'>Open</button>
<pict type='dlog' num='16' top='6' left='6'/>
<text top='6' left='49' width='257' height='47'>
Do you save the changes to this town/outdoor section before loading a new one?
</text>
</dialog>

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

@@ -248,10 +248,6 @@ static bool handle_lb_action(location the_point) {
start_item_editing(0);
break;
case LB_NEW_TOWN:
if(change_made) {
showError("You need to save the changes made to your scenario before you can add a new town.");
return true;
}
if(scenario.towns.size() >= 200) {
showError("You have reached the limit of 200 towns you can have in one scenario.");
return true;
@@ -273,10 +269,6 @@ static bool handle_lb_action(location the_point) {
start_shops_editing(false);
break;
case LB_LOAD_OUT:
if(change_made) {
if(!save_check("save-section-confirm"))
break;
}
spot_hit = pick_out(cur_out, scenario);
if(spot_hit != cur_out) {
cur_out = spot_hit;
@@ -289,10 +281,6 @@ static bool handle_lb_action(location the_point) {
mouse_button_held = false;
break;
case LB_LOAD_TOWN:
if(change_made) {
if(!save_check("save-section-confirm"))
break;
}
x = pick_town_num("select-town-edit",cur_town,scenario);
if(x >= 0){
cur_town = x;

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

@@ -288,10 +288,6 @@ void handle_menu_choice(eMenu item_hit) {
isEdit = true;
break;
case eMenu::TOWN_CREATE:
if(change_made) {
showError("You need to save the changes made to your scenario before you can add a new town.");
return;
}
if(scenario.towns.size() >= 200) {
showError("You have reached the limit of 200 towns you can have in one scenario.");
return;
@@ -343,10 +339,6 @@ void handle_menu_choice(eMenu item_hit) {
start_string_editing(STRS_JOURNAL,0);
break;
case eMenu::TOWN_IMPORT:
if(change_made) {
showError("You need to save the changes made to your scenario before you can import a town.");
return;
}
if(cTown* town = pick_import_town()) {
town->reattach(scenario);
delete scenario.towns[cur_town];
@@ -357,10 +349,6 @@ void handle_menu_choice(eMenu item_hit) {
}
break;
case eMenu::OUT_IMPORT:
if(change_made) {
showError("You need to save the changes made to your scenario before you can import a sector.");
return;
}
if(cOutdoors* out = pick_import_out()) {
out->reattach(scenario);
delete scenario.outdoors[cur_out.x][cur_out.y];
@@ -386,10 +374,6 @@ void handle_menu_choice(eMenu item_hit) {
edit_item_placement();
break;
case eMenu::TOWN_DELETE:
if(change_made) {
showError("You need to save the changes made to your scenario before you can delete a town.");
return;
}
if(scenario.towns.size() == 1) {
showError("You can't delete the last town in a scenario. All scenarios must have at least 1 town.");
return;