Mercurial > mm7

changeset 1770:eba6a0a8e184

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Player::SetVariable removing LABEL_169
author Grumpy7
date Tue, 01 Oct 2013 07:35:15 +0200
parents d45164042a9d
children 6c1823e19c2e
files Player.cpp
diffstat 1 files changed, 16 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/Player.cpp	Tue Oct 01 07:33:52 2013 +0200
+++ b/Player.cpp	Tue Oct 01 07:35:15 2013 +0200
@@ -5560,7 +5560,6 @@
       pAudioPlayer->PlaySound(SOUND_20001, v25, v5, -1, v5, v5, v5, v5);
       return;
     }
-LABEL_169:
     pGame->pStru6Instance->SetPlayerBuffAnim(0x96u, currPlayerId);
     if ( v31 != 1 )
       return;
@@ -5793,7 +5792,14 @@
     v19 = pPlayers[currPlayerId + 1];
     v31 = 1;
     v19->PlaySound((PlayerSpeech)v26, v28);
-    goto LABEL_169;
+    pGame->pStru6Instance->SetPlayerBuffAnim(0x96u, currPlayerId);
+    if ( v31 != 1 )
+      return;
+    v5 = 0;
+    v25 = 8 * currPlayerId + 400;
+    LOBYTE(v25) = PID(OBJECT_Player,currPlayerId - 112);
+    pAudioPlayer->PlaySound(SOUND_20001, v25, v5, -1, v5, v5, v5, v5);
+    return;
   }
   if ( var_type <= VAR_FireResistanceBonus )
   {
@@ -5910,7 +5916,14 @@
       }
 LABEL_124:
       v31 = 1;
-      goto LABEL_169;
+      pGame->pStru6Instance->SetPlayerBuffAnim(0x96u, currPlayerId);
+      if ( v31 != 1 )
+        return;
+      v5 = 0;
+      v25 = 8 * currPlayerId + 400;
+      LOBYTE(v25) = PID(OBJECT_Player,currPlayerId - 112);
+      pAudioPlayer->PlaySound(SOUND_20001, v25, v5, -1, v5, v5, v5, v5);
+      return;
     }
 LABEL_106:
     v16 = (int)((char *)&v4->pConditions[16] + 2 * var_type);