Have a separate ClearPlayerDialogs function

LVPlayground · Oct 10, 2016 · 8692f5b · 8692f5b
1 parent ed569f7
commit 8692f5b
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/pawn/Interface/JavaScriptBridge.pwn b/pawn/Interface/JavaScriptBridge.pwn
@@ -27,6 +27,7 @@ public OnSerializePlayerState(playerid, serialize, restoreOnSpawn) {
             RemovePlayerFromBombShop(playerid);
 
         ClearPlayerMenus(playerid);
+        ClearPlayerDialogs(playerid);
 
         TogglePlayerSpectating(playerid, 0);
 

diff --git a/pawn/Interface/functions.pwn b/pawn/Interface/functions.pwn
@@ -773,15 +773,17 @@ GameTextForAllEx(const message[], time, style, playerWorldId = -1) {
     return 1;
 }
 
+ClearPlayerDialogs(playerId) {
+    ShowPlayerDialog(playerId, -1, DIALOG_STYLE_MSGBOX, "Las Venturas Playground", "You shouldn't see this.", "Close", "");
+}
+
 ClearPlayerMenus(playerId) {
     if (!Player(playerId)->isConnected())
         return 0;
 
     if (IsPlayerInBombShop[playerId])
         RemovePlayerFromBombShop(playerId);
 
-    ShowPlayerDialog(playerId, -1, DIALOG_STYLE_MSGBOX, "Las Venturas Playground", "You shouldn't see this.", "Close", "");
-
     for (new i; i < MAX_MENUS; i++) {
         if (!IsValidMenu(Menu: i))
             continue;

diff --git a/pawn/Resources/Minigames/Core/DeathmatchHandler.pwn b/pawn/Resources/Minigames/Core/DeathmatchHandler.pwn
@@ -54,9 +54,7 @@ public DeathmatchStartFunc() {
 
                 // Enough sign-ups, do some magic for every contestant.
                 else if (MinigameTypeInfo[Players] > 1) {
-                    if (LegacyIsPlayerInBombShop(contestant))
-                        RemovePlayerFromBombShop(contestant);
-
+                    ClearPlayerDialogs(contestant);
                     ClearPlayerMenus(contestant);
                     RemovePlayerFromVehicle(contestant);