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

allow cancelling 'talk'

Browse Source
This commit is contained in:
Nat Quayle Nelson
2024-11-30 15:07:06 -06:00
committed by Celtic Minstrel
parent e4bd05b22a
commit faf3347272
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -376,8 +376,13 @@ void handle_begin_talk(bool& need_reprint) {
if(recording){
record_action("handle_begin_talk", "");
}
overall_mode = MODE_TALK_TOWN;
add_string_to_buf("Talk: Select someone.");
if(overall_mode == MODE_TALK_TOWN){
overall_mode = MODE_TOWN;
add_string_to_buf(" Cancelled.");
}else if(overall_mode == MODE_TOWN){
overall_mode = MODE_TALK_TOWN;
add_string_to_buf("Talk: Select someone.");
}
need_reprint = true;
}
@@ -1395,7 +1400,7 @@ bool handle_action(const sf::Event& event, cFramerateLimiter& fps_limiter) {
break;
case TOOLBAR_TALK:
if(overall_mode == MODE_TOWN)
if(overall_mode == MODE_TOWN || overall_mode == MODE_TALK_TOWN)
handle_begin_talk(need_reprint);
break;
@@ -2541,7 +2546,7 @@ bool handle_keystroke(const sf::Event& event, cFramerateLimiter& fps_limiter){
break;
case 't': // Talk
if(overall_mode == MODE_TOWN) {
if(overall_mode == MODE_TOWN || overall_mode == MODE_TALK_TOWN) {
handle_begin_talk(need_reprint);
advance_time(did_something, need_redraw, need_reprint);
}