diff AudioPlayer.cpp @ 325:875ba5966ceb

Слияние
author Ritor1
date Wed, 20 Feb 2013 09:24:02 +0600
parents ce39b96acf5c
children 8e23edf57e27
line wrap: on
line diff
--- a/AudioPlayer.cpp	Wed Feb 20 09:23:48 2013 +0600
+++ b/AudioPlayer.cpp	Wed Feb 20 09:24:02 2013 +0600
@@ -1197,7 +1197,7 @@
     v27 = abs((signed __int64)v26);
     v28 = abs((signed __int64)v93);
     v29 = abs((signed __int64)*(float *)&varC);
-    v90 = sub_4621DA(v29, v28, v27);
+    v90 = int_get_vector_length(v29, v28, v27);
     sPlaybackRate = v12;
     if ( v12 > v25 )
       goto LABEL_192;
@@ -1208,7 +1208,7 @@
       v31 = abs((signed __int64)*(float *)&uVolume);
       v32 = abs((signed __int64)v93);
       v33 = abs((signed __int64)*(float *)&varC);
-      v34 = sub_4621DA(v33, v32, v31);
+      v34 = int_get_vector_length(v33, v32, v31);
       v35 = v103 == v34;
       if ( v103 < v34 )
       {
@@ -1287,7 +1287,7 @@
           v50 = abs((signed __int64)v49);
           v51 = abs(0);
           v52 = abs((signed __int64)v99);
-          if ( sub_4621DA(v52, v51, v50) <= 100 )
+          if ( int_get_vector_length(v52, v51, v50) <= 100 )
           {
             AIL_set_3D_position((void *)*(int *)v42, LODWORD(v99), 0.0, LODWORD(uNumRepeatsa));
             v53 = -uNumRepeatsa;
@@ -1559,7 +1559,7 @@
           v23 = abs((signed __int64)v22);
           v24 = abs(0);
           v25 = abs((signed __int64)v58);
-          if ( sub_4621DA(v25, v24, v23) <= 100 )
+          if ( int_get_vector_length(v25, v24, v23) <= 100 )
           {
             AIL_set_3D_position(v6->hSample, LODWORD(v58), 0.0, uNumRepeats);
             v26 = -*(float *)&uNumRepeats;
@@ -1690,7 +1690,7 @@
         v45 = abs(v44->vPosition.z - pParty->vPosition.z);
         v46 = abs(v44->vPosition.y - pParty->vPosition.y);
         v47 = abs(v44->vPosition.x - pParty->vPosition.x);
-        if ( sub_4621DA(v47, v46, v45) <= 8192 )
+        if ( int_get_vector_length(v47, v46, v45) <= 8192 )
           break;
 LABEL_89:
         ++v59;
@@ -1772,7 +1772,6 @@
   int v5; // ST08_4@1
   int v6; // esi@1
   int v7; // eax@1
-  int result; // eax@2
   int v9; // [sp+10h] [bp+8h]@1
 
   v3 = a2;
@@ -1780,12 +1779,11 @@
   v5 = abs(a3 - pParty->vPosition.z);
   v6 = abs(v3 - pParty->vPosition.y);
   v7 = abs(v4 - pParty->vPosition.x);
-  v9 = sub_4621DA(v7, v6, v5);
+  v9 = int_get_vector_length(v7, v6, v5);
   if ( v9 <= 8192 )
-    result = 114 - (unsigned __int64)(signed __int64)((double)v9 * 0.0001220703125 * 100.0);
+    return 114 - (unsigned __int64)(signed __int64)((double)v9 * 0.0001220703125 * 100.0);
   else
-    result = 0;
-  return result;
+    return 0;
 }