# HG changeset patch # User Grumpy7 # Date 1380605715 -7200 # Node ID eba6a0a8e184a1ca1d3ac3928f786205b0b554ba # Parent d45164042a9db4e76f5a6e06b944e6dae316915f Player::SetVariable removing LABEL_169 diff -r d45164042a9d -r eba6a0a8e184 Player.cpp --- 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);