diff mm7_4.cpp @ 152:796b79187c27

Слияние
author Ritor1
date Tue, 12 Feb 2013 15:28:36 +0600
parents 9abdd40a107b 8ab4484c22e0
children 572d821561f3
line wrap: on
line diff
--- a/mm7_4.cpp	Tue Feb 12 15:28:08 2013 +0600
+++ b/mm7_4.cpp	Tue Feb 12 15:28:36 2013 +0600
@@ -14691,7 +14691,7 @@
       LODWORD(v20) = pBLVRenderParams->field_40 << 16;
       HIDWORD(v20) = pBLVRenderParams->field_40 >> 16;
       v21 = v20 / x;
-      v0->field_0 = (unsigned __int64)(v10->scale * v20 / x) >> 16;
+      v0->_screenspace_x_scaler_packedfloat = (unsigned __int64)(v10->scale * v20 / x) >> 16;
       a5a = (unsigned __int64)(v10->scale * (signed __int64)v21) >> 16;
     }
     else
@@ -14705,15 +14705,15 @@
       LODWORD(v18) = 0;
       HIDWORD(v18) = floorf(v16 + 0.5f);
       v19 = v18 / x;
-      v0->field_0 = (unsigned __int64)(v10->scale * v18 / x) >> 16;
+      v0->_screenspace_x_scaler_packedfloat = (unsigned __int64)(v10->scale * v18 / x) >> 16;
       a5a = (unsigned __int64)(v10->scale * (signed __int64)v19) >> 16;
     }
-    v0->field_4 = a5a;
+    v0->_screenspace_y_scaler_packedfloat = a5a;
     if ( (signed __int64)p->pActorBuffs[3].uExpireTime <= 0 )
     {
       if ( (signed __int64)p->pActorBuffs[10].uExpireTime > 0 )
       {
-        a5b = (unsigned __int64)(pGame->pStru6Instance->_4A806F(p) * (signed __int64)v0->field_4) >> 16;
+        a5b = (unsigned __int64)(pGame->pStru6Instance->_4A806F(p) * (signed __int64)v0->_screenspace_y_scaler_packedfloat) >> 16;
         goto LABEL_43;
       }
     }
@@ -14722,12 +14722,12 @@
       v22 = p->pActorBuffs[3].uPower;
       if ( v22 )
       {
-        v23 = (unsigned __int64)(65536 / (unsigned __int16)v22 * (signed __int64)v0->field_0) >> 16;
+        v23 = (unsigned __int64)(65536 / (unsigned __int16)v22 * (signed __int64)v0->_screenspace_x_scaler_packedfloat) >> 16;
         v24 = p->pActorBuffs[3].uPower;
-        v0->field_0 = v23;
-        a5b = (unsigned __int64)(65536 / v24 * (signed __int64)v0->field_4) >> 16;
+        v0->_screenspace_x_scaler_packedfloat = v23;
+        a5b = (unsigned __int64)(65536 / v24 * (signed __int64)v0->_screenspace_y_scaler_packedfloat) >> 16;
 LABEL_43:
-        v0->field_4 = a5b;
+        v0->_screenspace_y_scaler_packedfloat = a5b;
         goto LABEL_44;
       }
     }