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

Wait action: always print to buffer when can't

Browse Source
This commit is contained in:
Nat Quayle Nelson
2025-02-26 12:22:13 -06:00
committed by Celtic Minstrel
parent 91f28d3c9d
commit 8973618dff
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1141,11 +1141,14 @@ void handle_wait(bool& did_something, bool& need_redraw, bool& need_reprint) {
if(overall_mode == MODE_TOWN) { if(overall_mode == MODE_TOWN) {
handle_town_wait(need_redraw, need_reprint); handle_town_wait(need_redraw, need_reprint);
} else if(overall_mode == MODE_COMBAT) { } else if(!is_town()){
add_string_to_buf("Wait: In town only.");
print_buf();
}else if(overall_mode == MODE_COMBAT) {
handle_stand_ready(need_redraw, need_reprint); handle_stand_ready(need_redraw, need_reprint);
advance_time(did_something, need_redraw, need_reprint); advance_time(did_something, need_redraw, need_reprint);
} else if(overall_mode == MODE_OUTDOORS) { } else {
add_string_to_buf("Wait: In town only."); add_string_to_buf("Wait: " + FINISH_FIRST);
print_buf(); print_buf();
} }
} }

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

@@ -1422,7 +1422,6 @@ void menu_give_help(short help1){
void handle_menu_choice(eMenu item_hit) { void handle_menu_choice(eMenu item_hit) {
std::string dialogToShow; std::string dialogToShow;
sf::Event dummyEvent = {sf::Event::KeyPressed};
bool did_something = false, need_redraw = false, need_reprint = false; bool did_something = false, need_redraw = false, need_reprint = false;
switch(item_hit) { switch(item_hit) {
@@ -1522,9 +1521,7 @@ void handle_menu_choice(eMenu item_hit) {
handle_alchemy(need_redraw, need_reprint); handle_alchemy(need_redraw, need_reprint);
break; break;
case eMenu::ACTIONS_WAIT: case eMenu::ACTIONS_WAIT:
// This will be recorded when the fake event is processed handle_wait(did_something, need_redraw, need_reprint);
dummyEvent.key.code = sf::Keyboard::W;
queue_fake_event(dummyEvent);
break; break;
case eMenu::ACTIONS_AUTOMAP: case eMenu::ACTIONS_AUTOMAP:
display_map(); display_map();