Mercurial > mm7

diff mm7_4.cpp @ 302:0f2541245f65

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Слияние
author Ritor1
date Tue, 19 Feb 2013 17:16:40 +0600
parents 055cea8660e5 af7e848d6def
children f16ac5e65438
line wrap: on
line diff
--- a/mm7_4.cpp	Tue Feb 19 17:16:26 2013 +0600
+++ b/mm7_4.cpp	Tue Feb 19 17:16:40 2013 +0600
@@ -1117,7 +1117,7 @@
   }
   else
   {
-    v13 = v12 - sub_452A9E(v17 * v17 - v11 * v11);
+    v13 = v12 - integer_sqrt(v17 * v17 - v11 * v11);
     if ( v13 < 0 )
       v13 = 0;
     if ( v13 < stru_721530.field_7C )
@@ -1200,7 +1200,7 @@
                         {
                           if ( v11 <= v18 + v10 )
                           {
-                            v12 = v9 - sub_452A9E(v8 * v8 - v17 * v17);
+                            v12 = v9 - integer_sqrt(v8 * v8 - v17 * v17);
                             if ( v12 < 0 )
                               v12 = 0;
                             if ( v12 < stru_721530.field_7C )
@@ -1309,7 +1309,7 @@
                                     {
                                       if ( v16 <= v22 + v15 )
                                       {
-                                        v17 = v14 - sub_452A9E(v13 * v13 - v21 * v21);
+                                        v17 = v14 - integer_sqrt(v13 * v13 - v21 * v21);
                                         if ( v17 < 0 )
                                           v17 = 0;
                                         if ( v17 < stru_721530.field_7C )
@@ -8716,7 +8716,7 @@
   }
   v64 = v62 * v62 + v60;
   if ( v64 )
-    stru_F8AD28.field_34 = sub_452A9E(v64) << 16;
+    stru_F8AD28.field_34 = integer_sqrt(v64) << 16;
   else
     stru_F8AD28.field_34 = 0;
   v68 = (BLVFaceExtra *)abs(stru_F8AD28.rotated_normal.y);