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

Fix many of the buttons doing nothing in the special node dialog

Browse Source
This commit is contained in:
Celtic Minstrel
2014-12-23 00:04:03 -05:00
parent f4c9d98808
commit d7e3e3bd71
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
osx/scenedit/scen.keydlgs.cpp
View File

@@ -604,7 +604,7 @@ static bool edit_spec_enc_event_filter(cDialog& me, std::string item_hit, short&
store_spec_node.ex2a = i; store_spec_node.ex2a = i;
me["x2a"].setTextToNum(store_spec_node.ex2a); me["x2a"].setTextToNum(store_spec_node.ex2a);
} else if(item_hit == "msg2-edit") { // TODO: What about msg1-edit? } else if(item_hit == "msg2-edit") { // TODO: What about msg1-edit?
if(save_spec_enc(me, which_mode, which_node)) if(!save_spec_enc(me, which_mode, which_node))
return true; return true;
if(((*store_spec_node.type).msg_label == 2) || if(((*store_spec_node.type).msg_label == 2) ||
((*store_spec_node.type).msg_label == 4) || ((*store_spec_node.type).msg_label == 4) ||
@@ -619,7 +619,7 @@ static bool edit_spec_enc_event_filter(cDialog& me, std::string item_hit, short&
put_spec_enc_in_dlog(me, which_node); put_spec_enc_in_dlog(me, which_node);
} }
} else if(item_hit == "pict-edit") { } else if(item_hit == "pict-edit") {
if(save_spec_enc(me, which_mode, which_node)) if(!save_spec_enc(me, which_mode, which_node))
return true; return true;
i = -1; i = -1;
switch((*store_spec_node.type).pic_label) { switch((*store_spec_node.type).pic_label) {
@@ -638,7 +638,7 @@ static bool edit_spec_enc_event_filter(cDialog& me, std::string item_hit, short&
put_spec_enc_in_dlog(me, which_node); put_spec_enc_in_dlog(me, which_node);
} }
} else if(item_hit == "general") { } else if(item_hit == "general") {
if(save_spec_enc(me, which_mode, which_node)) if(!save_spec_enc(me, which_mode, which_node))
return true; return true;
// TODO: I wonder if this can all be achieved without casts... if not, at least check getNodeCategory to ensure validity. // TODO: I wonder if this can all be achieved without casts... if not, at least check getNodeCategory to ensure validity.
i = choose_text_res("special-node-names",1,28,int(store_spec_node.type) + 1,&me,"Choose General Use Special:"); i = choose_text_res("special-node-names",1,28,int(store_spec_node.type) + 1,&me,"Choose General Use Special:");
@@ -647,7 +647,7 @@ static bool edit_spec_enc_event_filter(cDialog& me, std::string item_hit, short&
} }
put_spec_enc_in_dlog(me, which_node); put_spec_enc_in_dlog(me, which_node);
} else if(item_hit == "oneshot") { } else if(item_hit == "oneshot") {
if(save_spec_enc(me, which_mode, which_node)) if(!save_spec_enc(me, which_mode, which_node))
return true; return true;
i = choose_text_res("special-node-names",51,64,int(store_spec_node.type) + 1,&me,"Choose One-Shot Special:"); i = choose_text_res("special-node-names",51,64,int(store_spec_node.type) + 1,&me,"Choose One-Shot Special:");
if(i >= 0) { if(i >= 0) {
@@ -659,13 +659,13 @@ static bool edit_spec_enc_event_filter(cDialog& me, std::string item_hit, short&
} }
put_spec_enc_in_dlog(me, which_node); put_spec_enc_in_dlog(me, which_node);
} else if(item_hit == "affectpc") { } else if(item_hit == "affectpc") {
if(save_spec_enc(me, which_mode, which_node)) if(!save_spec_enc(me, which_mode, which_node))
return true; return true;
i = choose_text_res("special-node-names",81,107,int(store_spec_node.type) + 1,&me,"Choose Affect Party Special:"); i = choose_text_res("special-node-names",81,107,int(store_spec_node.type) + 1,&me,"Choose Affect Party Special:");
if(i >= 0) store_spec_node.type = eSpecType(i - 1); if(i >= 0) store_spec_node.type = eSpecType(i - 1);
put_spec_enc_in_dlog(me, which_node); put_spec_enc_in_dlog(me, which_node);
} else if(item_hit == "ifthen") { } else if(item_hit == "ifthen") {
if(save_spec_enc(me, which_mode, which_node)) if(!save_spec_enc(me, which_mode, which_node))
return true; return true;
i = choose_text_res("special-node-names",131,156,int(store_spec_node.type) + 1,&me,"Choose If-Then Special:"); i = choose_text_res("special-node-names",131,156,int(store_spec_node.type) + 1,&me,"Choose If-Then Special:");
if(i >= 0) { if(i >= 0) {
@@ -673,13 +673,13 @@ static bool edit_spec_enc_event_filter(cDialog& me, std::string item_hit, short&
} }
put_spec_enc_in_dlog(me, which_node); put_spec_enc_in_dlog(me, which_node);
} else if(item_hit == "town") { } else if(item_hit == "town") {
if(save_spec_enc(me, which_mode, which_node)) if(!save_spec_enc(me, which_mode, which_node))
return true; return true;
i = choose_text_res("special-node-names",171,219,int(store_spec_node.type) + 1,&me,"Choose Town Special:"); i = choose_text_res("special-node-names",171,219,int(store_spec_node.type) + 1,&me,"Choose Town Special:");
if(i >= 0) store_spec_node.type = eSpecType(i - 1); if(i >= 0) store_spec_node.type = eSpecType(i - 1);
put_spec_enc_in_dlog(me, which_node); put_spec_enc_in_dlog(me, which_node);
} else if(item_hit == "out") { } else if(item_hit == "out") {
if(save_spec_enc(me, which_mode, which_node)) if(!save_spec_enc(me, which_mode, which_node))
return true; return true;
i = choose_text_res("special-node-names",226,230,int(store_spec_node.type) + 1,&me,"Choose Outdoor Special:"); i = choose_text_res("special-node-names",226,230,int(store_spec_node.type) + 1,&me,"Choose Outdoor Special:");
if(i >= 0) store_spec_node.type = eSpecType(i - 1); if(i >= 0) store_spec_node.type = eSpecType(i - 1);