Fix message box disappearing during interaction messages

Co-authored-by: sigonasr2 <sigonasr2@gmail.com>
2 years ago · dbde149aba
parent 145db14bb3
commit dbde149aba
2 changed files with 3 additions and 3 deletions
--- a/BIN
+++ b/BIN
--- a/main.cpp
+++ b/main.cpp
@ -311,10 +311,10 @@ This is a test message that lets us trigger straight from a cutscene! Cool!)"),
 					messageBoxLoad=true;
 				} else {
 					messageBoxVisible=false;
-					if (CLOSE_OVERWORLD_WINDOW) {
+					if (CLOSE_OVERWORLD_WINDOW&&INTERACTION_MESSAGES.size()==0) {
 						GAME_STATE=GameState::GAME_WORLD;
-					}
 						CLOSE_OVERWORLD_WINDOW=false;
+					}
 					if (HEALING_OVERWORLD_MEMBERS) {
 						if (HEALING_OVERWORLD_MEMBER==0||HEALING_OVERWORLD_MEMBER==2) {
 							DisplayMessageBox("");
@ -379,7 +379,7 @@ This is a test message that lets us trigger straight from a cutscene! Cool!)"),
 			}
 		}

-		if (PlayerCanMove()&&INTERACTION_MESSAGES.size()>0) {
+		if (!messageBoxVisible&&INTERACTION_MESSAGES.size()>0) {
 			DisplayMessageBox(INTERACTION_MESSAGES.front());
 			INTERACTION_MESSAGES.erase(INTERACTION_MESSAGES.begin());
 		}