Extra checks to prevent the player from moving

Co-authored-by: sigonasr2 <sigonasr2@gmail.com>
2 years ago · fcdfc8065b
parent e06a261873
commit fcdfc8065b
2 changed files with 2 additions and 2 deletions
--- a/BIN
+++ b/BIN
--- a/main.cpp
+++ b/main.cpp
@ -1013,7 +1013,7 @@ This is a test message that lets us trigger straight from a cutscene! Cool!)"),
 				if (GetKey(F5).bPressed) {
 					GAME_STATE=GameState::EDITOR;
 				} else
-				if (ACTIONKEYPRESSED) {
+				if (PlayerCanMove()&&ACTIONKEYPRESSED) {
 					GAME_STATE=GameState::OVERWORLD_MENU;
 					OVERWORLD_MENU_SELECTION=0;
 				}
@ -2394,7 +2394,7 @@ This is a test message that lets us trigger straight from a cutscene! Cool!)"),
 	}

 	bool PlayerCanMove(){
-		return BATTLE_ENCOUNTER==nullptr&&!IsTextEntryEnabled()&&!messageBoxVisible&&PARTY_MEMBER_OBJ[0]!=nullptr;
+		return GAME_STATE==GameState::GAME_WORLD&&BATTLE_ENCOUNTER==nullptr&&!IsTextEntryEnabled()&&!messageBoxVisible&&PARTY_MEMBER_OBJ[0]!=nullptr&&CurrentCutscene==nullptr;
 	}

 	void DisplayMessageBox(std::string targetText) {