Mercurial > mm7

changeset 1769:d45164042a9d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Player::SetVariable removing LABEL_170
author Grumpy7
date Tue, 01 Oct 2013 07:33:52 +0200
parents 3601186b4c26
children eba6a0a8e184
files Player.cpp
diffstat 1 files changed, 23 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/Player.cpp	Tue Oct 01 07:32:15 2013 +0200
+++ b/Player.cpp	Tue Oct 01 07:33:52 2013 +0200
@@ -5552,7 +5552,6 @@
 LABEL_168:
     if ( v30 != 1 )
     {
-LABEL_170:
       if ( v31 != 1 )
         return;
       v5 = 0;
@@ -5563,7 +5562,13 @@
     }
 LABEL_169:
     pGame->pStru6Instance->SetPlayerBuffAnim(0x96u, currPlayerId);
-    goto LABEL_170;
+    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_AutoNotes )
   {
@@ -5933,8 +5938,14 @@
       pAudioPlayer->PlaySound(SOUND_20001, v25, v5, -1, v5, v5, v5, v5);
       return;
 		  }
-	  pGame->pStru6Instance->SetPlayerBuffAnim(0x96u, currPlayerId);
-	  goto LABEL_170;
+    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_BodyResistanceBonus )
   {
     switch ( var_type )
@@ -5988,8 +5999,14 @@
 		  pAudioPlayer->PlaySound(SOUND_20001, v25, 0, -1, 0, 0, 0, 0);
 		  return;
 		  }
-	  pGame->pStru6Instance->SetPlayerBuffAnim(0x96u, currPlayerId);
-	  goto LABEL_170;
+    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;
 }