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

Allow cancelling anything with Escape. Close #322

Browse Source
This commit is contained in:
Nat Quayle Nelson
2024-11-30 15:14:05 -06:00
committed by Celtic Minstrel
parent faf3347272
commit ea95adef2e
2 changed files with 53 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
src/game/boe.actions.cpp
View File

@@ -253,6 +253,8 @@ bool prime_time() {
return overall_mode == MODE_OUTDOORS || overall_mode == MODE_TOWN || overall_mode == MODE_COMBAT;
}
eSkill last_spellcast_type = eSkill::MAGE_SPELLS;
void handle_spellcast(eSkill which_type, bool& did_something, bool& need_redraw, bool& need_reprint, bool record) {
if(record && recording){
std::map<std::string,std::string> info;
@@ -260,6 +262,7 @@ void handle_spellcast(eSkill which_type, bool& did_something, bool& need_redraw,
info["spell_forced"] = bool_to_str(spell_forced);
record_action("handle_spellcast", info);
}
last_spellcast_type = which_type;
short store_sp[6];
extern short spec_target_fail;
extern eSpecCtxType spec_target_type;
@@ -2234,10 +2237,56 @@ bool handle_keystroke(const sf::Event& event, cFramerateLimiter& fps_limiter){
Key talk_chars[9] = {Key::L,Key::N,Key::J,Key::B,Key::S,Key::R,Key::D,Key::G,Key::A};
Key shop_chars[8] = {Key::A,Key::B,Key::C,Key::D,Key::E,Key::F,Key::G,Key::H};
if(map_visible && event.key.code == Key::Escape
&& (overall_mode != MODE_TALKING) && (overall_mode != MODE_SHOPPING)) {
close_map();
return false;
bool did_something = false, need_redraw = false, need_reprint = false;
if(event.key.code == Key::Escape){
bool handled = true;
switch(overall_mode){
// These two cases are handled later:
case MODE_TALKING: break;
case MODE_SHOPPING: break;
// Cancel use action
case MODE_USE_TOWN:
handle_use_space_select(need_reprint);
break;
// Cancel bash
case MODE_BASH_TOWN:
handle_bash_pick_select(need_reprint, true);
break;
// Cancel lockpick
case MODE_PICK_TOWN:
handle_bash_pick_select(need_reprint, false);
break;
// Cancel mage or priest spell
case MODE_SPELL_TARGET: BOOST_FALLTHROUGH;
case MODE_FANCY_TARGET: BOOST_FALLTHROUGH;
case MODE_TOWN_TARGET:
handle_spellcast(last_spellcast_type, did_something, need_redraw, need_reprint);
break;
// Cancel look
case MODE_LOOK_TOWN:
handle_begin_look(false, need_redraw, need_reprint);
break;
// Cancel talk
case MODE_TALK_TOWN:
handle_begin_talk(need_reprint);
break;
// Cancel missile
case MODE_FIRING: BOOST_FALLTHROUGH;
case MODE_THROWING:
handle_missile(need_redraw, need_reprint);
break;
// Defer to closing the map:
default:
handled = false;
break;
}
if(!handled && map_visible){
close_map();
return false;
}
}
if(overall_mode == MODE_STARTUP)
@@ -2310,8 +2359,6 @@ bool handle_keystroke(const sf::Event& event, cFramerateLimiter& fps_limiter){
}
}
bool did_something = false, need_redraw = false, need_reprint = false;
char chr = keyToChar(chr2, event.key.shift);
// F1 should bring up help.
// TODO: So should the help key, if it exists (but SFML doesn't support the help key)

2
src/game/boe.main.cpp
View File

@@ -938,8 +938,6 @@ void queue_fake_event(const sf::Event& event) {
fake_event_queue.push_back(event);
}
void handle_one_minimap_event(const sf::Event& event) {
if(event.type == sf::Event::Closed) {
close_map(true);