# HG changeset patch # User Grumpy7 # Date 1380605632 -7200 # Node ID d45164042a9db4e76f5a6e06b944e6dae316915f # Parent 3601186b4c26fd9133f92d48de4133d289bfdf71 Player::SetVariable removing LABEL_170 diff -r 3601186b4c26 -r d45164042a9d Player.cpp --- 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; }