From 8973618dffc40f8b6a5d73be0237c3e5d76f60ec Mon Sep 17 00:00:00 2001
From: Nat Quayle Nelson <natquaylenelson@gmail.com>
Date: Wed, 26 Feb 2025 12:22:13 -0600
Subject: [PATCH] Wait action: always print to buffer when can't

---
 src/game/boe.actions.cpp | 9 ++++++---
 src/game/boe.main.cpp    | 5 +----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/game/boe.actions.cpp b/src/game/boe.actions.cpp
index 6d8a728e..98e7f979 100644
--- a/src/game/boe.actions.cpp
+++ b/src/game/boe.actions.cpp
@@ -1141,11 +1141,14 @@ void handle_wait(bool& did_something, bool& need_redraw, bool& need_reprint) {
 
 	if(overall_mode == MODE_TOWN) {
 		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);
 		advance_time(did_something, need_redraw, need_reprint);
-	} else if(overall_mode == MODE_OUTDOORS) {
-		add_string_to_buf("Wait: In town only.");
+	} else {
+		add_string_to_buf("Wait: " + FINISH_FIRST);
 		print_buf();
 	}
 }
diff --git a/src/game/boe.main.cpp b/src/game/boe.main.cpp
index 194e7595..cab143ea 100644
--- a/src/game/boe.main.cpp
+++ b/src/game/boe.main.cpp
@@ -1422,7 +1422,6 @@ void menu_give_help(short help1){
 
 void handle_menu_choice(eMenu item_hit) {
 	std::string dialogToShow;
-	sf::Event dummyEvent = {sf::Event::KeyPressed};
 	bool did_something = false, need_redraw = false, need_reprint = false;
 	
 	switch(item_hit) {
@@ -1522,9 +1521,7 @@ void handle_menu_choice(eMenu item_hit) {
 			handle_alchemy(need_redraw, need_reprint);
 			break;
 		case eMenu::ACTIONS_WAIT:
-			// This will be recorded when the fake event is processed
-			dummyEvent.key.code = sf::Keyboard::W;
-			queue_fake_event(dummyEvent);
+			handle_wait(did_something, need_redraw, need_reprint);
 			break;
 		case eMenu::ACTIONS_AUTOMAP:
 			display_map();