changeset 1266:71ebff35c428

Merge
author Grumpy7
date Thu, 13 Jun 2013 07:23:54 +0200
parents 2b4c8cdd8db0 (diff) 6bc88137a019 (current diff)
children 33e360a9b4bf
files
diffstat 1 files changed, 5 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/AudioPlayer.cpp	Thu Jun 13 00:56:22 2013 +0400
+++ b/AudioPlayer.cpp	Thu Jun 13 07:23:54 2013 +0200
@@ -55,7 +55,7 @@
 std::array<float, 10> pSoundVolumeLevels = 
 {
   0.0000000f, 0.1099999f, 0.2199999f, 0.3300000f, 0.4399999f,
- 0.5500000f, 0.6600000f, 0.7699999f, 0.8799999f, 0.9900000f
+ 0.5500000f, 0.6600000f, 0.7699999f, 0.8799999f, 0.9700000f     //changed 0.9900000f to 0.9700000f. for some reason it only works for values below this
 };
 
 
@@ -2256,9 +2256,11 @@
             do
             {
               v11 = v14[v10];
-              v10++;
+              v12 = 16 * (v14[v10++] + 47);
               pMixerChannels[v11].uSourceTrackID = 0;
-               pMixerChannels[v11].hSample = NULL;
+              v13 = __OFSUB__(v10, num_same_sound_on_channels);
+              v6 = v10 - num_same_sound_on_channels < 0;
+              *(unsigned int *)((char *)&bEAXSupported + v12) = 0;
             }
             while (v10<num_same_sound_on_channels);
           }