Mercurial > mm7

comparison Player.cpp @ 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
comparison
equal deleted inserted replaced
1767:3ee4a4d592af 1768:3601186b4c26
5516 || (pParty->PartyTimes.HistoryEventTimes[v22] = pParty->uTimePlayed, 5516 || (pParty->PartyTimes.HistoryEventTimes[v22] = pParty->uTimePlayed,
5517 pStorylineText->StoreLine[v22].pText == 0) )//*(&pStorylineText->field_0 + 3 * v22) == 0, 5517 pStorylineText->StoreLine[v22].pText == 0) )//*(&pStorylineText->field_0 + 3 * v22) == 0,
5518 return; 5518 return;
5519 bFlashHistoryBook = 1; 5519 bFlashHistoryBook = 1;
5520 } 5520 }
5521 LABEL_172:
5522 v25 = 8 * currPlayerId + 400; 5521 v25 = 8 * currPlayerId + 400;
5523 LOBYTE(v25) = PID(OBJECT_Player,currPlayerId - 112); 5522 LOBYTE(v25) = PID(OBJECT_Player,currPlayerId - 112);
5524 pAudioPlayer->PlaySound(SOUND_20001, v25, v5, -1, v5, v5, v5, v5); 5523 pAudioPlayer->PlaySound(SOUND_20001, v25, v5, -1, v5, v5, v5, v5);
5525 return; 5524 return;
5526 } 5525 }
5555 { 5554 {
5556 LABEL_170: 5555 LABEL_170:
5557 if ( v31 != 1 ) 5556 if ( v31 != 1 )
5558 return; 5557 return;
5559 v5 = 0; 5558 v5 = 0;
5560 goto LABEL_172; 5559 v25 = 8 * currPlayerId + 400;
5560 LOBYTE(v25) = PID(OBJECT_Player,currPlayerId - 112);
5561 pAudioPlayer->PlaySound(SOUND_20001, v25, v5, -1, v5, v5, v5, v5);
5562 return;
5561 } 5563 }
5562 LABEL_169: 5564 LABEL_169:
5563 pGame->pStru6Instance->SetPlayerBuffAnim(0x96u, currPlayerId); 5565 pGame->pStru6Instance->SetPlayerBuffAnim(0x96u, currPlayerId);
5564 goto LABEL_170; 5566 goto LABEL_170;
5565 } 5567 }
5924 if ( v30 != 1 ) 5926 if ( v30 != 1 )
5925 { 5927 {
5926 if ( v31 != 1 ) 5928 if ( v31 != 1 )
5927 return; 5929 return;
5928 v5 = 0; 5930 v5 = 0;
5929 goto LABEL_172; 5931 v25 = 8 * currPlayerId + 400;
5932 LOBYTE(v25) = PID(OBJECT_Player,currPlayerId - 112);
5933 pAudioPlayer->PlaySound(SOUND_20001, v25, v5, -1, v5, v5, v5, v5);
5934 return;
5930 } 5935 }
5931 pGame->pStru6Instance->SetPlayerBuffAnim(0x96u, currPlayerId); 5936 pGame->pStru6Instance->SetPlayerBuffAnim(0x96u, currPlayerId);
5932 goto LABEL_170; 5937 goto LABEL_170;
5933 if ( var_type <= VAR_BodyResistanceBonus ) 5938 if ( var_type <= VAR_BodyResistanceBonus )
5934 { 5939 {