Mercurial > mm7

comparison mm7_6.cpp @ 187:49728858c35e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
On player voices
author Nomad
date Fri, 15 Feb 2013 22:38:05 +0200
parents d1dde383af89
children 9b77686e2239
comparison
equal deleted inserted replaced
186:d65528fc3bda 187:49728858c35e
4069 pPlayer->SetRecoveryTime( 4069 pPlayer->SetRecoveryTime(
4070 (signed __int64)(flt_6BE3A4_debug_recmod1 * (double)sRecoveryTime * 2.133333333333333)); 4070 (signed __int64)(flt_6BE3A4_debug_recmod1 * (double)sRecoveryTime * 2.133333333333333));
4071 } 4071 }
4072 if ( v727 != 0.0 ) 4072 if ( v727 != 0.0 )
4073 { 4073 {
4074 pPlayer->PlaySound(49, 0); 4074 pPlayer->PlaySound(SPEECH_49, 0);
4075 goto LABEL_1162; 4075 goto LABEL_1162;
4076 } 4076 }
4077 } 4077 }
4078 v3->spellnum = 0; 4078 v3->spellnum = 0;
4079 v1 = 0; 4079 v1 = 0;
5310 v317 = pGlobalTXT_LocalizationStrings[585]; 5310 v317 = pGlobalTXT_LocalizationStrings[585];
5311 ShowStatusBarString(v317, 2u); 5311 ShowStatusBarString(v317, 2u);
5312 pAudioPlayer->PlaySound(SOUND_PlayerCantCastSpell, v1, v1, -1, v1, v1, v1, v1); 5312 pAudioPlayer->PlaySound(SOUND_PlayerCantCastSpell, v1, v1, -1, v1, v1, v1, v1);
5313 v318 = v726; 5313 v318 = v726;
5314 v3->spellnum = v1; 5314 v3->spellnum = v1;
5315 v318->PlaySound(43, v1); 5315 v318->PlaySound(SPEECH_43, v1);
5316 } 5316 }
5317 goto LABEL_83; 5317 goto LABEL_83;
5318 } 5318 }
5319 if ( v731 != 2 ) 5319 if ( v731 != 2 )
5320 { 5320 {
6087 v396 = v3->uPlayerID_2; 6087 v396 = v3->uPlayerID_2;
6088 if ( HIDWORD(pParty->pPlayers[v396].pConditions[16]) | LODWORD(pParty->pPlayers[v396].pConditions[16]) 6088 if ( HIDWORD(pParty->pPlayers[v396].pConditions[16]) | LODWORD(pParty->pPlayers[v396].pConditions[16])
6089 || HIDWORD(pParty->pPlayers[v396].pConditions[14]) | LODWORD(pParty->pPlayers[v396].pConditions[14]) ) 6089 || HIDWORD(pParty->pPlayers[v396].pConditions[14]) | LODWORD(pParty->pPlayers[v396].pConditions[14]) )
6090 { 6090 {
6091 if ( !(HIDWORD(pParty->pPlayers[v396].pConditions[1]) | LODWORD(pParty->pPlayers[v396].pConditions[1])) ) 6091 if ( !(HIDWORD(pParty->pPlayers[v396].pConditions[1]) | LODWORD(pParty->pPlayers[v396].pConditions[1])) )
6092 pParty->pPlayers[v396].PlaySound(25, v1); 6092 pParty->pPlayers[v396].PlaySound(SPEECH_25, v1);
6093 if ( v731 == 4 ) 6093 if ( v731 == 4 )
6094 { 6094 {
6095 v397 = v3->uPlayerID_2; 6095 v397 = v3->uPlayerID_2;
6096 LODWORD(pParty->pPlayers[v397].pConditions[16]) = v1; 6096 LODWORD(pParty->pPlayers[v397].pConditions[16]) = v1;
6097 HIDWORD(pParty->pPlayers[v397].pConditions[16]) = v1; 6097 HIDWORD(pParty->pPlayers[v397].pConditions[16]) = v1;
6422 pGame->GetStru6()->SetPlayerBuffAnim(v438, v437); 6422 pGame->GetStru6()->SetPlayerBuffAnim(v438, v437);
6423 v440 = v3->uPlayerID_2; 6423 v440 = v3->uPlayerID_2;
6424 if ( HIDWORD(pParty->pPlayers[v440].pConditions[5]) | LODWORD(pParty->pPlayers[v440].pConditions[5]) ) 6424 if ( HIDWORD(pParty->pPlayers[v440].pConditions[5]) | LODWORD(pParty->pPlayers[v440].pConditions[5]) )
6425 { 6425 {
6426 if ( !(HIDWORD(pParty->pPlayers[v440].pConditions[1]) | LODWORD(pParty->pPlayers[v440].pConditions[1])) ) 6426 if ( !(HIDWORD(pParty->pPlayers[v440].pConditions[1]) | LODWORD(pParty->pPlayers[v440].pConditions[1])) )
6427 pParty->pPlayers[v440].PlaySound(25, v1); 6427 pParty->pPlayers[v440].PlaySound(SPEECH_25, v1);
6428 if ( v731 == 4 ) 6428 if ( v731 == 4 )
6429 { 6429 {
6430 v441 = v3->uPlayerID_2; 6430 v441 = v3->uPlayerID_2;
6431 LODWORD(pParty->pPlayers[v441].pConditions[5]) = v1; 6431 LODWORD(pParty->pPlayers[v441].pConditions[5]) = v1;
6432 HIDWORD(pParty->pPlayers[v441].pConditions[5]) = v1; 6432 HIDWORD(pParty->pPlayers[v441].pConditions[5]) = v1;
7738 2u, 7738 2u,
7739 pParty->uTimePlayed - (signed int)(signed __int64)((double)(amount << 7) * 0.033333335)); 7739 pParty->uTimePlayed - (signed int)(signed __int64)((double)(amount << 7) * 0.033333335));
7740 v222 = (char *)HIDWORD(v733); 7740 v222 = (char *)HIDWORD(v733);
7741 if ( v223 ) 7741 if ( v223 )
7742 LABEL_439: 7742 LABEL_439:
7743 ((Player *)v222)->PlaySound(103, v1); 7743 ((Player *)v222)->PlaySound(SPEECH_103, v1);
7744 } 7744 }
7745 v222 += 6972; 7745 v222 += 6972;
7746 HIDWORD(v733) = (int)v222; 7746 HIDWORD(v733) = (int)v222;
7747 if ( (signed int)v222 >= (signed int)pParty->pHirelings ) 7747 if ( (signed int)v222 >= (signed int)pParty->pHirelings )
7748 goto LABEL_1056; 7748 goto LABEL_1056;
8047 } 8047 }
8048 } 8048 }
8049 else 8049 else
8050 { 8050 {
8051 v34 = 5; 8051 v34 = 5;
8052 v1->PlaySound(50, v3); 8052 v1->PlaySound(SPEECH_50, v3);
8053 } 8053 }
8054 switch ( v34 ) 8054 switch ( v34 )
8055 { 8055 {
8056 case 0: 8056 case 0:
8057 v24 = (SoundID)81; 8057 v24 = (SoundID)81;
9108 //goto _add_action_and_continue_; 9108 //goto _add_action_and_continue_;
9109 v5 = pActionQueue; 9109 v5 = pActionQueue;
9110 v5->Add(partyAction); 9110 v5->Add(partyAction);
9111 break; 9111 break;
9112 case INPUT_Yell: 9112 case INPUT_Yell:
9113 //__debugbreak(); 9113 if (!pCurrentScreen && uActiveCharacter)
9114 if ( !pCurrentScreen
9115 && uActiveCharacter )
9116 { 9114 {
9117 pParty->Yell(); 9115 pParty->Yell();
9118 pPlayers[uActiveCharacter]->PlaySound(65, 0); 9116 pPlayers[uActiveCharacter]->PlaySound(SPEECH_Yell, 0);
9119 } 9117 }
9120 break; 9118 break;
9121 case INPUT_Pass: 9119 case INPUT_Pass:
9122 //__debugbreak(); 9120 //__debugbreak();
9123 if ( pCurrentScreen ) 9121 if ( pCurrentScreen )
9124 break; 9122 break;
9125 if (pParty->bTurnBasedModeOn && pTurnEngine->field_4 == 3) 9123 if (pParty->bTurnBasedModeOn && pTurnEngine->field_4 == 3)