Mercurial > mm7

changeset 1768:3601186b4c26

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Player::SetVariable removing LABEL_172
author Grumpy7
date Tue, 01 Oct 2013 07:32:15 +0200
parents 3ee4a4d592af
children d45164042a9d
files Player.cpp
diffstat 1 files changed, 8 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/Player.cpp	Tue Oct 01 07:30:46 2013 +0200
+++ b/Player.cpp	Tue Oct 01 07:32:15 2013 +0200
@@ -5518,7 +5518,6 @@
           return;
         bFlashHistoryBook = 1;
       }
-LABEL_172:
       v25 = 8 * currPlayerId + 400;
       LOBYTE(v25) = PID(OBJECT_Player,currPlayerId - 112);
       pAudioPlayer->PlaySound(SOUND_20001, v25, v5, -1, v5, v5, v5, v5);
@@ -5557,7 +5556,10 @@
       if ( v31 != 1 )
         return;
       v5 = 0;
-      goto LABEL_172;
+      v25 = 8 * currPlayerId + 400;
+      LOBYTE(v25) = PID(OBJECT_Player,currPlayerId - 112);
+      pAudioPlayer->PlaySound(SOUND_20001, v25, v5, -1, v5, v5, v5, v5);
+      return;
     }
 LABEL_169:
     pGame->pStru6Instance->SetPlayerBuffAnim(0x96u, currPlayerId);
@@ -5926,7 +5928,10 @@
 		  if ( v31 != 1 )
 			  return;
 		  v5 = 0;
-		  goto LABEL_172;
+      v25 = 8 * currPlayerId + 400;
+      LOBYTE(v25) = PID(OBJECT_Player,currPlayerId - 112);
+      pAudioPlayer->PlaySound(SOUND_20001, v25, v5, -1, v5, v5, v5, v5);
+      return;
 		  }
 	  pGame->pStru6Instance->SetPlayerBuffAnim(0x96u, currPlayerId);
 	  goto LABEL_170;