diff AudioPlayer.cpp @ 1174:05247ad19710

Слияние
author Ritor1
date Fri, 31 May 2013 09:54:44 +0600
parents 5d5c78088274
children 29a8defbad9e
line wrap: on
line diff
--- a/AudioPlayer.cpp	Fri May 31 09:54:33 2013 +0600
+++ b/AudioPlayer.cpp	Fri May 31 09:54:44 2013 +0600
@@ -267,7 +267,7 @@
         return 0;
     }
     v12 = 0;
-    while ( _strcmpi(pAudioPlayer->pSoundHeaders[v12].pSoundName, v11->pSoundName) )
+    while ( _stricmp(pAudioPlayer->pSoundHeaders[v12].pSoundName, v11->pSoundName) )
     {
       ++v7;
       ++v12;
@@ -488,11 +488,11 @@
       v9 = atoi(v19.pProperties[1]);
       v10 = v19.pProperties[2];
       v2->pSounds[v2->sNumSounds].uSoundID = v9;
-      if ( _strcmpi(v10, "system") )
+      if ( _stricmp(v10, "system") )
       {
-        if ( _strcmpi(v19.pProperties[2], "swap") )
+        if ( _stricmp(v19.pProperties[2], "swap") )
         {
-          v11 = _strcmpi(v19.pProperties[2], "lock");
+          v11 = _stricmp(v19.pProperties[2], "lock");
           v12 = v2->pSounds;
           v13 = v11 == 0;
           v14 = v2->sNumSounds;
@@ -510,7 +510,7 @@
       {
         v2->pSounds[v2->sNumSounds].eType = SOUND_DESC_SYSTEM;
       }
-      if ( v19.uPropCount >= 4 && !_strcmpi(v19.pProperties[3], "3D") )
+      if ( v19.uPropCount >= 4 && !_stricmp(v19.pProperties[3], "3D") )
       {
         v15 = (int)&v2->pSounds[v2->sNumSounds].uFlags;
         *(int *)v15 |= SOUND_DESC_SWAP;
@@ -2576,7 +2576,7 @@
     result = &pAudioPlayer->pSoundHeaders[v6 / 2 + v4];
     if ( !result )
       return result;
-    result = (SoundHeader *)_strcmpi(pName, result->pSoundName);
+    result = (SoundHeader *)_stricmp(pName, result->pSoundName);
     if ( !result )
       uFindSound_BinSearch_ResultID = v6 / 2 + v4;
     if ( v4 == v10 )
@@ -2591,7 +2591,7 @@
         v9 = v4;
         do
         {
-          result = (SoundHeader *)_strcmpi(pName, pAudioPlayer->pSoundHeaders[v9].pSoundName);
+          result = (SoundHeader *)_stricmp(pName, pAudioPlayer->pSoundHeaders[v9].pSoundName);
           if ( !result )
             goto LABEL_24;
           ++v7;
@@ -2618,7 +2618,7 @@
   v8 = v4;
   while ( 1 )
   {
-    result = (SoundHeader *)_strcmpi(pName, pAudioPlayer->pSoundHeaders[v8].pSoundName);
+    result = (SoundHeader *)_stricmp(pName, pAudioPlayer->pSoundHeaders[v8].pSoundName);
     if ( !result )
       break;
     ++v7;