diff mm7_1.cpp @ 500:63b171359be2

Слияние
author Ritor1
date Thu, 28 Feb 2013 10:36:37 +0600
parents 511e3a6f587a 0e27362ac1d9
children 6fa3ff8ef729
line wrap: on
line diff
--- a/mm7_1.cpp	Thu Feb 28 10:34:14 2013 +0600
+++ b/mm7_1.cpp	Thu Feb 28 10:36:37 2013 +0600
@@ -694,7 +694,7 @@
     {
       v5 = pStru179.field_0[v21];
       v20 = 8 * pStru179.field_0[v21];
-      v6 = (char *)pAwards[v20/8-1].pText;//(char *)dword_723E80_award_related[v20 / 4];
+      v6 = (char *)pAwards[(v20-1)/8].pText;//(char *)dword_723E80_award_related[v20 / 4];
       if ( v5 != 1 )
         break;
       v17 = pParty->uFine;
@@ -5913,10 +5913,7 @@
           LODWORD(v14) = v13 << 16;
           HIDWORD(v14) = v13 >> 16;
           v15 = &_50B744_view_transformed_ys[i - 1];
-          dword_50B828[v79] = ((unsigned __int64)((_50B834_view_transformed_zs[i] - _50B834_view_transformed_zs[i - 1])
-                                                * v14
-                                                / v12) >> 16)
-                            + _50B834_view_transformed_zs[i - 1];
+          dword_50B828[v79] = ((unsigned __int64)((_50B834_view_transformed_zs[i] - _50B834_view_transformed_zs[i - 1]) * v14 / v12) >> 16) + _50B834_view_transformed_zs[i - 1];
           thisb = (unsigned __int64)((_50B744_view_transformed_ys[i] - _50B744_view_transformed_ys[i - 1]) * v14 / v12) >> 16;
         }
         else
@@ -6001,8 +5998,7 @@
       }
     }
     dword_50BA08[v22] = v32;
-    dword_50BAF4_xs[v22 + 1] = (unsigned __int64)(SHIWORD(pBLVRenderParams->field_40)
-                                                * (signed __int64)dword_50BAF4_xs[v22 + 1]) >> 16;
+    dword_50BAF4_xs[v22 + 1] = (unsigned __int64)(SHIWORD(pBLVRenderParams->field_40) * (signed __int64)dword_50BAF4_xs[v22 + 1]) >> 16;
     v35 = (unsigned __int64)(SHIWORD(pBLVRenderParams->field_40) * (signed __int64)dword_50BA08[v22]) >> 16;
     dword_50BAF4_xs[v22 + 1] = pBLVRenderParams->uViewportCenterX - dword_50BAF4_xs[v22 + 1];
     ++ia;
@@ -6026,16 +6022,12 @@
     {
       if ( v41 >= (signed int)v37 )
       {
-        v67 = (signed int)(v37 - dword_50BAF4_xs[v40])
-            * (signed __int64)(dword_50BA08[v40] - dword_50B9F8[v40 + 3])
-            / (v41 - dword_50BAF4_xs[v40]);
+        v67 = (signed int)(v37 - dword_50BAF4_xs[v40]) * (signed __int64)(dword_50BA08[v40] - dword_50B9F8[v40 + 3]) / (v41 - dword_50BAF4_xs[v40]);
         v42 = dword_50B9F8[v40 + 3];
       }
       else
       {
-        v67 = (signed int)(v37 - v41)
-            * (signed __int64)(dword_50B9F8[v40 + 3] - dword_50BA08[v40])
-            / (dword_50BAF4_xs[v40] - v41);
+        v67 = (signed int)(v37 - v41) * (signed __int64)(dword_50B9F8[v40 + 3] - dword_50BA08[v40]) / (dword_50BAF4_xs[v40] - v41);
         v42 = dword_50BA08[v40];
       }
       ++v36;
@@ -6053,16 +6045,16 @@
   }
   while ( ib <= v79 );
 
-  if ( !v36
-    || (v43 = 0,
-        dword_50BAE8_xs[v36 + 1] = dword_50BAE8_xs[1],
-        dword_50B9F8[v36 + 1] = dword_50B9F8[1],
-        v44 = pBLVRenderParams->uViewportZ,
-        thisd = dword_50BAE8_xs[1] <= (signed int)pBLVRenderParams->uViewportZ,
-        ic = 1,
-        v36 < 1) )
+  if (v36 < 1)
     return 0;
 
+  v43 = 0;
+  dword_50BAE8_xs[v36 + 1] = dword_50BAE8_xs[1];
+  dword_50B9F8[v36 + 1] = dword_50B9F8[1];
+  v44 = pBLVRenderParams->uViewportZ;
+  thisd = dword_50BAE8_xs[1] <= (signed int)pBLVRenderParams->uViewportZ;
+  ic = 1;
+
   do
   {
     v45 = ic;
@@ -6072,16 +6064,12 @@
     {
       if ( v46 <= (signed int)v44 )
       {
-        v68 = (signed int)(v44 - dword_50BAE8_xs[v45])
-            * (signed __int64)(dword_50B9F8[v45 + 1] - dword_50B9F8[v45])
-            / (v46 - dword_50BAE8_xs[v45]);
+        v68 = (signed int)(v44 - dword_50BAE8_xs[v45]) * (signed __int64)(dword_50B9F8[v45 + 1] - dword_50B9F8[v45]) / (v46 - dword_50BAE8_xs[v45]);
         v47 = dword_50B9F8[v45];
       }
       else
       {
-        v68 = (signed int)(v44 - v46)
-            * (signed __int64)(dword_50B9F8[v45] - dword_50B9F8[v45 + 1])
-            / (dword_50BAE8_xs[v45] - v46);
+        v68 = (signed int)(v44 - v46) * (signed __int64)(dword_50B9F8[v45] - dword_50B9F8[v45 + 1]) / (dword_50BAE8_xs[v45] - v46);
         v47 = dword_50B9F8[v45 + 1];
       }
       ++v43;
@@ -6098,17 +6086,18 @@
     thisd = v83;
   }
   while ( ic <= v36 );
-  if ( !v43
-    || (v48 = 0,
-        dword_50BAE0[v43] = dword_50BAE0[0],
-        dword_50B9F0[v43] = dword_50B9F0[0],
-        v49 = pBLVRenderParams->uViewportY,
-        v50 = dword_50B9F0[0] < (signed int)pBLVRenderParams->uViewportY,
-        LOBYTE(v50) = dword_50B9F0[0] >= (signed int)pBLVRenderParams->uViewportY,
-        v51 = 1,
-        id = 1,
-        v43 < 1) )
+
+  if (v43 < 1)
     return 0;
+
+  v48 = 0;
+  dword_50BAE0[v43] = dword_50BAE0[0];
+  dword_50B9F0[v43] = dword_50B9F0[0];
+  v49 = pBLVRenderParams->uViewportY;
+  v50 = dword_50B9F0[0] < (signed int)pBLVRenderParams->uViewportY;
+  LOBYTE(v50) = dword_50B9F0[0] >= (signed int)pBLVRenderParams->uViewportY;
+  v51 = 1;
+  id = 1;
   do
   {
     v52 = v51;
@@ -6118,16 +6107,12 @@
     {
       if ( v53 >= (signed int)v49 )
       {
-        v69 = (signed int)(v49 - dword_50B9EC[v52])
-            * (signed __int64)(dword_50BAE0[v52] - dword_50BADC_xs[v52])
-            / (v53 - dword_50B9EC[v52]);
+        v69 = (signed int)(v49 - dword_50B9EC[v52]) * (signed __int64)(dword_50BAE0[v52] - dword_50BADC_xs[v52]) / (v53 - dword_50B9EC[v52]);
         v54 = dword_50BADC_xs[v52];
       }
       else
       {
-        v69 = (signed int)(v49 - v53)
-            * (signed __int64)(dword_50BADC_xs[v52] - dword_50BAE0[v52])
-            / (dword_50B9EC[v52] - v53);
+        v69 = (signed int)(v49 - v53) * (signed __int64)(dword_50BADC_xs[v52] - dword_50BAE0[v52]) / (dword_50B9EC[v52] - v53);
         v54 = dword_50BAE0[v52];
       }
       ++v48;
@@ -6144,15 +6129,16 @@
     v51 = id++ + 1;
   }
   while ( id <= v43 );
-  if ( !v48
-    || (v55 = 0,
-        dword_50BAD4[v48] = dword_50BAD4[0],
-        dword_50B9E0_ys[v48 + 1] = dword_50B9E0_ys[1],
-        v56 = pBLVRenderParams->uViewportW,
-        thise = dword_50B9E0_ys[1] <= (signed int)pBLVRenderParams->uViewportW,
-        ie = 1,
-        v48 < 1) )
+
+  if (v48 < 1)
     return 0;
+
+  v55 = 0;
+  dword_50BAD4[v48] = dword_50BAD4[0];
+  dword_50B9E0_ys[v48 + 1] = dword_50B9E0_ys[1];
+  v56 = pBLVRenderParams->uViewportW;
+  thise = dword_50B9E0_ys[1] <= (signed int)pBLVRenderParams->uViewportW;
+  ie = 1;
   do
   {
     v57 = ie;
@@ -6162,16 +6148,12 @@
     {
       if ( v58 <= (signed int)v56 )
       {
-        v70 = (signed int)(v56 - dword_50B9E0_ys[v57])
-            * (signed __int64)(dword_50BAD4[v57] - dword_50BAD0[v57])
-            / (v58 - dword_50B9E0_ys[v57]);
+        v70 = (signed int)(v56 - dword_50B9E0_ys[v57]) * (signed __int64)(dword_50BAD4[v57] - dword_50BAD0[v57]) / (v58 - dword_50B9E0_ys[v57]);
         v59 = dword_50BAD0[v57];
       }
       else
       {
-        v70 = (signed int)(v56 - v58)
-            * (signed __int64)(dword_50BAD0[v57] - dword_50BAD4[v57])
-            / (dword_50B9E0_ys[v57] - v58);
+        v70 = (signed int)(v56 - v58) * (signed __int64)(dword_50BAD0[v57] - dword_50BAD4[v57]) / (dword_50B9E0_ys[v57] - v58);
         v59 = dword_50BAD4[v57];
       }
       ++v55;
@@ -6188,6 +6170,7 @@
     thise = v85;
   }
   while ( ie <= v48 );
+
   if ( !v55 )
     return 0;
   v61 = pRenderer->pRenderD3D == 0;