comparison mm7_4.cpp @ 768:67b77b052ef3

Merge
author Nomad
date Sat, 23 Mar 2013 21:16:04 +0200
parents 45615cacad31 777c42590ffc
children 7994986603d5 a821bbace194
comparison
equal deleted inserted replaced
767:45615cacad31 768:67b77b052ef3
1862 do 1862 do
1863 { 1863 {
1864 if (SoundSetAction[24][0]) 1864 if (SoundSetAction[24][0])
1865 { 1865 {
1866 v1 = 0; 1866 v1 = 0;
1867 if ( (signed int)pSoundList->uNumSounds <= 0 ) 1867 if ( (signed int)pSoundList->sNumSounds <= 0 )
1868 { 1868 {
1869 LABEL_7: 1869 LABEL_7:
1870 v3 = 0; 1870 v3 = 0;
1871 } 1871 }
1872 else 1872 else
1874 v2 = (char *)&pSoundList->pSounds->uSoundID; 1874 v2 = (char *)&pSoundList->pSounds->uSoundID;
1875 while ( *(int *)v2 != 2 * (SoundSetAction[24][0] + 50 * v0->uVoiceID) + 4998 ) 1875 while ( *(int *)v2 != 2 * (SoundSetAction[24][0] + 50 * v0->uVoiceID) + 4998 )
1876 { 1876 {
1877 ++v1; 1877 ++v1;
1878 v2 += 120; 1878 v2 += 120;
1879 if ( v1 >= (signed int)pSoundList->uNumSounds ) 1879 if ( v1 >= (signed int)pSoundList->sNumSounds )
1880 goto LABEL_7; 1880 goto LABEL_7;
1881 } 1881 }
1882 v3 = v1; 1882 v3 = v1;
1883 } 1883 }
1884 pSoundList->_4A9DCD(v3, 1); 1884 pSoundList->UnloadSound(v3, 1);
1885 v4 = 0; 1885 v4 = 0;
1886 if ( (signed int)pSoundList->uNumSounds <= 0 ) 1886 if ( (signed int)pSoundList->sNumSounds <= 0 )
1887 { 1887 {
1888 LABEL_12: 1888 LABEL_12:
1889 v4 = 0; 1889 v4 = 0;
1890 } 1890 }
1891 else 1891 else
1893 v5 = (char *)&pSoundList->pSounds->uSoundID; 1893 v5 = (char *)&pSoundList->pSounds->uSoundID;
1894 while ( *(int *)v5 != 2 * (SoundSetAction[24][0] + 50 * v0->uVoiceID) + 4999 ) 1894 while ( *(int *)v5 != 2 * (SoundSetAction[24][0] + 50 * v0->uVoiceID) + 4999 )
1895 { 1895 {
1896 ++v4; 1896 ++v4;
1897 v5 += 120; 1897 v5 += 120;
1898 if ( (signed int)v4 >= (signed int)pSoundList->uNumSounds ) 1898 if ( (signed int)v4 >= (signed int)pSoundList->sNumSounds )
1899 goto LABEL_12; 1899 goto LABEL_12;
1900 } 1900 }
1901 } 1901 }
1902 pSoundList->_4A9DCD(v4, 1); 1902 pSoundList->UnloadSound(v4, 1);
1903 } 1903 }
1904 ++v0; 1904 ++v0;
1905 } 1905 }
1906 while ( (signed int)v0 < (signed int)pParty->pHirelings ); 1906 while ( (signed int)v0 < (signed int)pParty->pHirelings );
1907 v6 = pIcons_LOD->uNumLoadedFiles - 1; 1907 v6 = pIcons_LOD->uNumLoadedFiles - 1;