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

More little fixes

Browse Source 
- Fix timers triggering every turn after they expire
- More fixes for uninitialized data
- Fix attack 3 type changing to match attack 2 type when changed
- Fix last node in the node chain duplicating over the entire chain once you clicked OK
- Fix issue where finding an unused node returned the node currently being edited.
This commit is contained in:
Celtic Minstrel
2015-06-02 10:34:52 -04:00
parent 7dddcdb86e
commit 322e3b9e21
6 changed files with 18 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -781,9 +781,9 @@ static bool edit_monst_type_event_filter(cDialog& me,std::string hit,cMonster& m
}
} else if(hit == "picktype2") {
if(!save_monst_info(me,monst)) return false;
i = choose_text_res("monster-abilities",130,139,int(monst.a[1].type),&me,"Choose Attack 2 & 3 Type:");
i = choose_text_res("monster-abilities",130,139,int(monst.a[1].type),&me,"Choose Attack 2 Type:");
if(i >= 0) {
monst.a[1].type = monst.a[2].type = eMonstMelee(i);
monst.a[1].type = eMonstMelee(i);
put_monst_info_in_dlog(me,monst,which);
}
} else if(hit == "picktype3") {

19
src/scenedit/scen.keydlgs.cpp
View File

@@ -538,7 +538,8 @@ static void save_spec_enc(cDialog& me, node_stack_t& edit_stack) {
}
static bool commit_spec_enc(cDialog& me, std::string item_hit, node_stack_t& edit_stack) {
save_spec_enc(me, edit_stack);
if(item_hit != "unwind")
save_spec_enc(me, edit_stack);
int mode = edit_stack.top().mode, node = edit_stack.top().which;
switch(mode) {
case 0: scenario.scen_specials[node] = edit_stack.top().node; break;
@@ -734,7 +735,7 @@ static bool edit_spec_enc_value(cDialog& me, std::string item_hit, node_stack_t&
eStrType strt;
short str_adj = 0;
const char* title;
cSpecial node_to_change_to;
cSpecial* node_to_change_to;
switch(btn) {
case 'm':
choose_string = false;
@@ -759,14 +760,14 @@ static bool edit_spec_enc_value(cDialog& me, std::string item_hit, node_stack_t&
me[field].setTextToNum(store);
save_spec_enc(me, edit_stack);
if(mode == 0)
node_to_change_to = scenario.scen_specials[store];
node_to_change_to = &scenario.scen_specials[store];
else if(mode == 1)
node_to_change_to = current_terrain->specials[store];
node_to_change_to = &current_terrain->specials[store];
else if(mode == 2)
node_to_change_to = town->specials[store];
if(node_to_change_to.pic < 0)
node_to_change_to.pic = 0;
edit_stack.push({store,mode,node_to_change_to});
node_to_change_to = &town->specials[store];
if(node_to_change_to->pic < 0)
node_to_change_to->pic = 0;
edit_stack.push({store,mode,*node_to_change_to});
put_spec_enc_in_dlog(me, edit_stack);
me["back"].show();
return true;
@@ -890,7 +891,7 @@ short get_fresh_spec(short which_mode) {
store_node = current_terrain->specials[i];
if(which_mode == 2)
store_node = town->specials[i];
if(store_node.type == eSpecType::NONE && store_node.jumpto == -1)
if(store_node.type == eSpecType::NONE && store_node.jumpto == -1 && store_node.pic < 0)
return i;
}