Merge pull request diasurgical#2 from Songoo7/multiplayerPauseSupport

Multiplayer pause support
tukkek · Feb 1, 2024 · 3c8164d · 3c8164d
2 parents ef7a313 + e370503
commit 3c8164d
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 5 deletions.
diff --git a/Source/diablo.cpp b/Source/diablo.cpp
@@ -1460,7 +1460,6 @@ void GameLogic()
 		ProcessMissiles();
 	}
 
-	//removethis
 	if (BattlePauseMode != 2) {
 		gGameLogicStep = GameLogicStep::None;
 
@@ -2710,10 +2709,12 @@ void diablo_pause_game()
 
 void diablo_battle_pause_game()
 {
-	if (BattlePauseMode != 0) {
-		BattlePauseMode = 0;
-	} else {
-		BattlePauseMode = 2;
+	if (!gbIsMultiplayer) {
+		if (BattlePauseMode != 0) {
+			BattlePauseMode = 0;
+		} else {
+			BattlePauseMode = 2;
+		}
 	}
 }
 

diff --git a/Source/plrmsg.cpp b/Source/plrmsg.cpp
@@ -81,6 +81,18 @@ void SendPlrMsg(Player &player, std::string_view text)
 	message.text = from + std::string(text);
 	message.prefixLength = from.size();
 	message.lineHeight = GetLineHeight(message.text, GameFont12) + 3;
+
+	// Check for specific messages and update BattlePauseMode accordingly
+	if (text == "I need help! Come here!") {
+		message.text = from + std::string("Pause, do commands");
+		BattlePauseMode = 2;
+	} else if (text == "Follow me.") {
+		message.text = from + std::string("Play");
+		BattlePauseMode = 0;
+	} else {
+		message.text = from + std::string(text);
+	}
+
 	AddMessageToChatLog(text, &player);
 }