Mercurial > mm7

comparison mm7_4.cpp @ 203:0c64754c7fd4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Voices work (at least in party creation screen)
author Nomad
date Sun, 17 Feb 2013 05:27:56 +0200
parents e6e348d66a75
children 46ae2602aceb
comparison
equal deleted inserted replaced
201:30aa44013f7a 203:0c64754c7fd4
2887 2887
2888 pTexture_PlayerFaceEradicated = pIcons_LOD->LoadTexturePtr("ERADCATE", TEXTURE_16BIT_PALETTE); 2888 pTexture_PlayerFaceEradicated = pIcons_LOD->LoadTexturePtr("ERADCATE", TEXTURE_16BIT_PALETTE);
2889 pTexture_PlayerFaceDead = pIcons_LOD->LoadTexturePtr("DEAD", TEXTURE_16BIT_PALETTE); 2889 pTexture_PlayerFaceDead = pIcons_LOD->LoadTexturePtr("DEAD", TEXTURE_16BIT_PALETTE);
2890 pTexture_PlayerFaceMask = pIcons_LOD->LoadTexturePtr("FACEMASK", TEXTURE_16BIT_PALETTE); 2890 pTexture_PlayerFaceMask = pIcons_LOD->LoadTexturePtr("FACEMASK", TEXTURE_16BIT_PALETTE);
2891 2891
2892 if (byte_4ED498) 2892 if (SoundSetAction[24][0])
2893 for (uint i = 0; i < 4; ++i) 2893 for (uint i = 0; i < 4; ++i)
2894 { 2894 {
2895 pSoundList->LoadSound(2 * (byte_4ED498 + 50 * pParty->pPlayers[i].uVoiceID) + 4998, 0); 2895 pSoundList->LoadSound(2 * (SoundSetAction[24][0] + 50 * pParty->pPlayers[i].uVoiceID) + 4998, 0);
2896 pSoundList->LoadSound(2 * (byte_4ED498 + 50 * pParty->pPlayers[i].uVoiceID) + 4999, 0); 2896 pSoundList->LoadSound(2 * (SoundSetAction[24][0] + 50 * pParty->pPlayers[i].uVoiceID) + 4999, 0);
2897 } 2897 }
2898 } 2898 }
2899 2899
2900 //----- (00491DE7) -------------------------------------------------------- 2900 //----- (00491DE7) --------------------------------------------------------
2901 int __fastcall ReloadPlayerPortraits(int a1, int a2) 2901 int __fastcall ReloadPlayerPortraits(int a1, int a2)
2939 int v12; // eax@26 2939 int v12; // eax@26
2940 2940
2941 v0 = pParty->pPlayers; 2941 v0 = pParty->pPlayers;
2942 do 2942 do
2943 { 2943 {
2944 if ( byte_4ED498 ) 2944 if (SoundSetAction[24][0])
2945 { 2945 {
2946 v1 = 0; 2946 v1 = 0;
2947 if ( (signed int)pSoundList->uNumSounds <= 0 ) 2947 if ( (signed int)pSoundList->uNumSounds <= 0 )
2948 { 2948 {
2949 LABEL_7: 2949 LABEL_7:
2950 v3 = 0; 2950 v3 = 0;
2951 } 2951 }
2952 else 2952 else
2953 { 2953 {
2954 v2 = (char *)&pSoundList->pSounds->uSoundID; 2954 v2 = (char *)&pSoundList->pSounds->uSoundID;
2955 while ( *(int *)v2 != 2 * ((unsigned __int8)byte_4ED498 + 50 * v0->uVoiceID) + 4998 ) 2955 while ( *(int *)v2 != 2 * (SoundSetAction[24][0] + 50 * v0->uVoiceID) + 4998 )
2956 { 2956 {
2957 ++v1; 2957 ++v1;
2958 v2 += 120; 2958 v2 += 120;
2959 if ( v1 >= (signed int)pSoundList->uNumSounds ) 2959 if ( v1 >= (signed int)pSoundList->uNumSounds )
2960 goto LABEL_7; 2960 goto LABEL_7;
2969 v4 = 0; 2969 v4 = 0;
2970 } 2970 }
2971 else 2971 else
2972 { 2972 {
2973 v5 = (char *)&pSoundList->pSounds->uSoundID; 2973 v5 = (char *)&pSoundList->pSounds->uSoundID;
2974 while ( *(int *)v5 != 2 * ((unsigned __int8)byte_4ED498 + 50 * v0->uVoiceID) + 4999 ) 2974 while ( *(int *)v5 != 2 * (SoundSetAction[24][0] + 50 * v0->uVoiceID) + 4999 )
2975 { 2975 {
2976 ++v4; 2976 ++v4;
2977 v5 += 120; 2977 v5 += 120;
2978 if ( (signed int)v4 >= (signed int)pSoundList->uNumSounds ) 2978 if ( (signed int)v4 >= (signed int)pSoundList->uNumSounds )
2979 goto LABEL_12; 2979 goto LABEL_12;