diff Vis.cpp @ 34:bf67f3164041

Слияние
author Ritor1
date Sun, 20 Jan 2013 18:58:44 +0600
parents b46b1404725b 8a6ba554d341
children 415e1f2d5936
line wrap: on
line diff
--- a/Vis.cpp	Sun Jan 20 18:57:23 2013 +0600
+++ b/Vis.cpp	Sun Jan 20 18:58:44 2013 +0600
@@ -301,10 +301,7 @@
 
   result = a1;
   if ( a1->uParentBillboardID == -1 )
-  {
-    result = 0;
-    return (bool)result;
-  }
+    goto LABEL_14;
   v5 = a1->pQuards[0].pos.x;
   a1a = a1->pQuards[3].pos.x;
   v6 = result->pQuards[0].pos.y;
@@ -326,16 +323,17 @@
   }
   v9 = x + 1.0;
   //UNDEF(v8);
-  v10 = v9 < v5;
-  v11 = 0;
-  v12 = v9 == v5;
+  //v10 = v9 < v5;
+  //v11 = 0;
+  //v12 = v9 == v5;
   //BYTE1(result) = HIBYTE(v8);//crash
   if ( v9 >= v5
-    && (v14 = x - 1.0, /*UNDEF(v13),*/ v15 = v14 < a1a, v16 = 0, v17 = v14 == a1a, /*BYTE1(result) = HIBYTE(v13),*/ v15 | v17)
-    && (v19 = y + 1.0, /*UNDEF(v18),*/ v20 = v19 < v29, v21 = 0, v22 = v19 == v29, /*BYTE1(result) = HIBYTE(v18),*/ v19 >= v29)
-    && (v24 = y - 1.0, /*UNDEF(v23),*/ v25 = v24 < v28, v26 = 0, v27 = v24 == v28, /*BYTE1(result) = HIBYTE(v23),*/ v25 | v27) )
+    && (v14 = x - 1.0, v14<=a1a)///*UNDEF(v13),*/ v15 = v14 < a1a, v16 = 0, v17 = v14 == a1a, BYTE1(result) = HIBYTE(v13), v15 | v17)
+    && (v19 = y + 1.0, v19>=v29)///*UNDEF(v18),*/ v20 = v19 < v29, v21 = 0, v22 = v19 == v29, BYTE1(result) = HIBYTE(v18), v19 >= v29)
+    && (v24 = y - 1.0, v24<=v28))///*UNDEF(v23),*/ v25 = v24 < v28, v26 = 0, v27 = v24 == v28, BYTE1(result) = HIBYTE(v23), v25 | v27) )
     LOBYTE(result) = 1;
   else
+LABEL_14:
     LOBYTE(result) = 0;
   return (bool)result;
 }
@@ -1822,7 +1820,7 @@
         v9 = v8 < fDepth,
         v10 = 0,
         v11 = v8 == fDepth,
-        /*BYTE1(result) = HIBYTE(v7),*/
+        BYTE1(result) = HIBYTE(v7),
         v9 | v11) )
   {
     LOWORD(v5) = 0;