Mercurial > mm7
diff mm7_4.cpp @ 187:49728858c35e
On player voices
author | Nomad |
---|---|
date | Fri, 15 Feb 2013 22:38:05 +0200 |
parents | c5bd7a825ef2 |
children | 9b77686e2239 |
line wrap: on
line diff
--- a/mm7_4.cpp Fri Feb 15 19:53:40 2013 +0200 +++ b/mm7_4.cpp Fri Feb 15 22:38:05 2013 +0200 @@ -3147,7 +3147,7 @@ if ( qword_A750D8 <= 0 ) { if ( pPlayers[word_A750E2]->CanAct() ) - pPlayers[word_A750E2]->PlaySound(word_A750E0, 0); + pPlayers[word_A750E2]->PlaySound((PlayerSpeech)word_A750E0, 0); qword_A750D8 = 0i64; } } @@ -9565,7 +9565,7 @@ v13[1] |= 1u; break; } - pPlayers[uActiveCharacter]->PlaySound(85, 0); + pPlayers[uActiveCharacter]->PlaySound(SPEECH_85, 0); } if ( (signed int)pMessageQueue_50CBD0->uNumMessages < 40 ) { @@ -9635,9 +9635,9 @@ if ( uActiveCharacter ) { v25 = 0; - v23 = 86; + v23 = SPEECH_86; LABEL_50: - pPlayers[v11]->PlaySound(v23, v25); + pPlayers[v11]->PlaySound((PlayerSpeech)v23, v25); goto _return; } } @@ -9664,7 +9664,7 @@ ptr_F8B1E8 = (char *)*(&pNPCStats->field_13A64 + 5 * v2->uProfession); ptr_F8B1E8 = sub_495461((char *)ptr_F8B1E8, uActiveCharacter - 1, 0, 0, 0, 0); if ( uActiveCharacter ) - pPlayers[uActiveCharacter]->PlaySound(38, 0); + pPlayers[uActiveCharacter]->PlaySound(SPEECH_38, 0); v19 = pGlobalTXT_LocalizationStrings[155]; goto LABEL_77; } @@ -11762,7 +11762,7 @@ if ( uCurrentlyLoadedLevelType == LEVEL_Outdoor ) pOutdoor->SetFog(); } - v0->PlaySound(87, 0); + v0->PlaySound(SPEECH_87, 0); sprintf(pTmpBuf, pGlobalTXT_LocalizationStrings[430], v0->pName, v0->uLevel, v0->uLevel / 10 + 5);// // "%s is now Level %lu and has earned %lu Skill Points!" ShowStatusBarString(pTmpBuf, 2u); @@ -12692,7 +12692,7 @@ byte_F8B1EC = 0; uDialogueType = 13; if ( uActiveCharacter ) - pPlayers[uActiveCharacter]->PlaySound(38, 0); + pPlayers[uActiveCharacter]->PlaySound(SPEECH_38, 0); v7 = pGlobalTXT_LocalizationStrings[155]; goto LABEL_64; } @@ -12724,7 +12724,7 @@ if ( (uDialogue_SpeakingActorNPC_ID & 0x80000000u) == 0 ) pDialogue_SpeakingActor->uAIState = Removed; if ( uActiveCharacter ) - pPlayers[uActiveCharacter]->PlaySound(61, 0); + pPlayers[uActiveCharacter]->PlaySound(SPEECH_61, 0); goto LABEL_87; } if ( v3 == 22 ) @@ -13496,7 +13496,7 @@ } } ++byte_F8B1EF[v29]; - v1->PlaySound(83, 0); + v1->PlaySound(SPEECH_83, 0); ShowStatusBarString(pGlobalTXT_LocalizationStrings[527], 2u); goto LABEL_46; } @@ -13557,7 +13557,7 @@ HIDWORD(v1->pConditions[17]) = (int)v39; LABEL_63: pAudioPlayer->PlaySound((SoundID)(SOUND_GoldReceived|0x2), -1, 0, -1, 0, 0, 0, 0); - v1->PlaySound(82, 0); + v1->PlaySound(SPEECH_82, 0); pOtherOverlayList->_4418B1(20, uActiveCharacter + 99, 0, 65536); LABEL_46: result = pMessageQueue_50CBD0->uNumMessages; @@ -14220,7 +14220,7 @@ v12 = (unsigned __int8)v5[8]; if ( (signed int)ptr_507BC0->ptr_1C >= 63 ) { - v63 = 72; + v63 = SPEECH_72; v13 = 2500; if ( CheckHiredNPCSpeciality(8u) ) v12 -= 2; @@ -14230,7 +14230,7 @@ } else { - v63 = 71; + v63 = SPEECH_71; v13 = 1500; v47[1] = (const char *)35; } @@ -14241,7 +14241,7 @@ if ( v12 < 1 ) v12 = 1; RestAndHeal(1440 * v12); - v61->PlaySound(v63, 0); + v61->PlaySound((PlayerSpeech)v63, 0); v14 = GetTickCount(); v15 = v14 + v13; if ( v15 < v14 ) @@ -14900,7 +14900,7 @@ if ( BYTE1(pAnimatedRooms[p2DEvents[v9 - 1].uAnimationID].field_C) ) HousePlaySomeSound(v9, 1); if ( uCurrentlyLoadedLevelType == LEVEL_Indoor && uActiveCharacter && pParty->uFlags & 0x30 ) - pPlayers[uActiveCharacter]->PlaySound(47, 0); + pPlayers[uActiveCharacter]->PlaySound(SPEECH_47, 0); result = v23; if ( v23 ) uCurrentHouse_Animation = v23; @@ -15106,7 +15106,7 @@ sprintf(pTmpBuf, pGlobalTXT_LocalizationStrings[414], v6, aAMPMNames[v7], v9, aAMPMNames[v8]); ShowStatusBarString(pTmpBuf, 2u); if ( uActiveCharacter ) - pPlayers[uActiveCharacter]->PlaySound(3, 0); + pPlayers[uActiveCharacter]->PlaySound(SPEECH_3, 0); return 0; } }