diff mm7_4.cpp @ 768:67b77b052ef3

Merge
author Nomad
date Sat, 23 Mar 2013 21:16:04 +0200
parents 45615cacad31 777c42590ffc
children 7994986603d5 a821bbace194
line wrap: on
line diff
--- a/mm7_4.cpp	Sat Mar 23 21:11:15 2013 +0200
+++ b/mm7_4.cpp	Sat Mar 23 21:16:04 2013 +0200
@@ -1864,7 +1864,7 @@
     if (SoundSetAction[24][0])
     {
       v1 = 0;
-      if ( (signed int)pSoundList->uNumSounds <= 0 )
+      if ( (signed int)pSoundList->sNumSounds <= 0 )
       {
 LABEL_7:
         v3 = 0;
@@ -1876,14 +1876,14 @@
         {
           ++v1;
           v2 += 120;
-          if ( v1 >= (signed int)pSoundList->uNumSounds )
+          if ( v1 >= (signed int)pSoundList->sNumSounds )
             goto LABEL_7;
         }
         v3 = v1;
       }
-      pSoundList->_4A9DCD(v3, 1);
+      pSoundList->UnloadSound(v3, 1);
       v4 = 0;
-      if ( (signed int)pSoundList->uNumSounds <= 0 )
+      if ( (signed int)pSoundList->sNumSounds <= 0 )
       {
 LABEL_12:
         v4 = 0;
@@ -1895,11 +1895,11 @@
         {
           ++v4;
           v5 += 120;
-          if ( (signed int)v4 >= (signed int)pSoundList->uNumSounds )
+          if ( (signed int)v4 >= (signed int)pSoundList->sNumSounds )
             goto LABEL_12;
         }
       }
-      pSoundList->_4A9DCD(v4, 1);
+      pSoundList->UnloadSound(v4, 1);
     }
     ++v0;
   }