Mercurial > mm7
diff mm7_4.cpp @ 203:0c64754c7fd4
Voices work (at least in party creation screen)
author | Nomad |
---|---|
date | Sun, 17 Feb 2013 05:27:56 +0200 |
parents | e6e348d66a75 |
children | 46ae2602aceb |
line wrap: on
line diff
--- a/mm7_4.cpp Sun Feb 17 00:16:48 2013 +0200 +++ b/mm7_4.cpp Sun Feb 17 05:27:56 2013 +0200 @@ -2889,11 +2889,11 @@ pTexture_PlayerFaceDead = pIcons_LOD->LoadTexturePtr("DEAD", TEXTURE_16BIT_PALETTE); pTexture_PlayerFaceMask = pIcons_LOD->LoadTexturePtr("FACEMASK", TEXTURE_16BIT_PALETTE); - if (byte_4ED498) + if (SoundSetAction[24][0]) for (uint i = 0; i < 4; ++i) { - pSoundList->LoadSound(2 * (byte_4ED498 + 50 * pParty->pPlayers[i].uVoiceID) + 4998, 0); - pSoundList->LoadSound(2 * (byte_4ED498 + 50 * pParty->pPlayers[i].uVoiceID) + 4999, 0); + pSoundList->LoadSound(2 * (SoundSetAction[24][0] + 50 * pParty->pPlayers[i].uVoiceID) + 4998, 0); + pSoundList->LoadSound(2 * (SoundSetAction[24][0] + 50 * pParty->pPlayers[i].uVoiceID) + 4999, 0); } } @@ -2941,7 +2941,7 @@ v0 = pParty->pPlayers; do { - if ( byte_4ED498 ) + if (SoundSetAction[24][0]) { v1 = 0; if ( (signed int)pSoundList->uNumSounds <= 0 ) @@ -2952,7 +2952,7 @@ else { v2 = (char *)&pSoundList->pSounds->uSoundID; - while ( *(int *)v2 != 2 * ((unsigned __int8)byte_4ED498 + 50 * v0->uVoiceID) + 4998 ) + while ( *(int *)v2 != 2 * (SoundSetAction[24][0] + 50 * v0->uVoiceID) + 4998 ) { ++v1; v2 += 120; @@ -2971,7 +2971,7 @@ else { v5 = (char *)&pSoundList->pSounds->uSoundID; - while ( *(int *)v5 != 2 * ((unsigned __int8)byte_4ED498 + 50 * v0->uVoiceID) + 4999 ) + while ( *(int *)v5 != 2 * (SoundSetAction[24][0] + 50 * v0->uVoiceID) + 4999 ) { ++v4; v5 += 120;