Mercurial > mm7
changeset 1771:6c1823e19c2e
Player::SetVariable removing LABEL_168
| author | Grumpy7 |
|---|---|
| date | Tue, 01 Oct 2013 07:36:27 +0200 |
| parents | eba6a0a8e184 |
| children | c0b32e8a82c8 |
| files | Player.cpp |
| diffstat | 1 files changed, 37 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/Player.cpp Tue Oct 01 07:35:15 2013 +0200 +++ b/Player.cpp Tue Oct 01 07:36:27 2013 +0200 @@ -5549,7 +5549,6 @@ return; } pParty->uNumDeaths = var_value; -LABEL_168: if ( v30 != 1 ) { if ( v31 != 1 ) @@ -5584,7 +5583,24 @@ } _449B7E_toggle_bit(pParty->_autonote_bits, var_value, 1u); v31 = 1; - goto LABEL_168; + if ( v30 != 1 ) + { + 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; + } + 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_ActualMight ) { @@ -5650,8 +5666,25 @@ v31 = 1; pPlayers[currPlayerId + 1]->PlaySound(SPEECH_96, 0); } - _449B7E_toggle_bit((unsigned char *)v4->_achieved_awards_bits, var_value, 1u); - goto LABEL_168; + _449B7E_toggle_bit((unsigned char *)v4->_achieved_awards_bits, var_value, 1u); + if ( v30 != 1 ) + { + 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; + } + 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; case VAR_Experience: this->uExperience = var_value; goto LABEL_124;