Mercurial > mm7

changeset 756:3523c3b581e5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Nomad
date Sat, 23 Mar 2013 00:18:02 +0200
parents e0914a9bc424 (diff) 5ba796adbf5e (current diff)
children 0b3f4b854652 9f7db515a8d7 7f1487b74571 02bfc82f429c
files
diffstat 2 files changed, 27 insertions(+), 27 deletions(-) [+]
line wrap: on
line diff
--- a/Outdoor_stuff.h	Sat Mar 23 00:54:30 2013 +0400
+++ b/Outdoor_stuff.h	Sat Mar 23 00:18:02 2013 +0200
@@ -68,8 +68,8 @@
   int _48653D(int a2, int a3, int a4, int a5, int a6, int a7);
   int _48694B();
 
-  int field_0;
-  int field_4;
+  int field_0_party_dir_x;
+  int field_4_party_dir_y;
   int field_8;
   int field_C;
   int field_10;
--- a/mm7_3.cpp	Sat Mar 23 00:54:30 2013 +0400
+++ b/mm7_3.cpp	Sat Mar 23 00:18:02 2013 +0200
@@ -10647,20 +10647,20 @@
   {
     v14 = v10 + pOutdoorCamera->camera_rotation_y_int_sine * -pIndoorCamera->pos.y;
     v15 = pOutdoorCamera->camera_rotation_y_int_cosine * v8 - pOutdoorCamera->camera_rotation_y_int_sine * v24;
-    this->field_0 = ((unsigned __int64)(v11 * (signed __int64)pOutdoorCamera->camera_rotation_x_int_cosine) >> 16)
+    this->field_0_party_dir_x = ((unsigned __int64)(v11 * (signed __int64)pOutdoorCamera->camera_rotation_x_int_cosine) >> 16)
                   + ((unsigned __int64)(-65536
                                       * pIndoorCamera->pos.z
                                       * (signed __int64)pOutdoorCamera->camera_rotation_x_int_sine) >> 16);
-    this->field_4 = v15;
+    this->field_4_party_dir_y = v15;
     v12 = v25;
     v13 = ((unsigned __int64)((v26 << 16) * (signed __int64)v25) >> 16)
         - ((unsigned __int64)(v14 * (signed __int64)v27) >> 16);
   }
   else
   {
-    this->field_4 = pOutdoorCamera->camera_rotation_y_int_cosine * v8 - pOutdoorCamera->camera_rotation_y_int_sine * v24;
+    this->field_4_party_dir_y = pOutdoorCamera->camera_rotation_y_int_cosine * v8 - pOutdoorCamera->camera_rotation_y_int_sine * v24;
     v12 = v25;
-    this->field_0 = v11;
+    this->field_0_party_dir_x = v11;
     v13 = v26 << 16;
   }
   this->field_8 = v13;
@@ -10704,14 +10704,14 @@
   this->field_20 = v18;
   v20 = this->field_C;
   this->field_20 = -this->field_20;
-  v21 = ((unsigned __int64)(v20 * (signed __int64)this->field_0) >> 16)
-      + ((unsigned __int64)(this->field_10 * (signed __int64)this->field_4) >> 16)
+  v21 = ((unsigned __int64)(v20 * (signed __int64)this->field_0_party_dir_x) >> 16)
+      + ((unsigned __int64)(this->field_10 * (signed __int64)this->field_4_party_dir_y) >> 16)
       + ((unsigned __int64)(this->field_14 * (signed __int64)this->field_8) >> 16);
   v28 = this->field_18;
-  v22 = this->field_0;
+  v22 = this->field_0_party_dir_x;
   this->field_24 = v21;
   v29 = (unsigned __int64)(v28 * (signed __int64)v22) >> 16;
-  result = (unsigned __int64)(this->field_1C * (signed __int64)this->field_4) >> 16;
+  result = (unsigned __int64)(this->field_1C * (signed __int64)this->field_4_party_dir_y) >> 16;
   this->field_28 = v29 + result + ((unsigned __int64)(this->field_20 * (signed __int64)this->field_8) >> 16);
   return result;
 }
@@ -10722,8 +10722,8 @@
   stru149 *v7; // esi@1
   int v8; // edi@1
   int v9; // eax@1
-  int v10; // edx@1
-  int v11; // ecx@1
+  //int v10; // edx@1
+  //int v11; // ecx@1
   int v12; // eax@1
   int v13; // ebx@2
   int v14; // ecx@2
@@ -10738,7 +10738,7 @@
   int v23; // ecx@10
   int v24; // eax@10
   int result; // eax@10
-  int v26; // [sp+14h] [bp-14h]@1
+  //int v26; // [sp+14h] [bp-14h]@1
   int v27; // [sp+18h] [bp-10h]@1
   int v28; // [sp+1Ch] [bp-Ch]@1
   int v29; // [sp+24h] [bp-4h]@1
@@ -10750,8 +10750,8 @@
   v29 = stru_5C6E00->Sin(pBLVRenderParams->sPartyRotY);
   v28 = stru_5C6E00->Cos(pBLVRenderParams->sPartyRotX);
   v9 = stru_5C6E00->Sin(pBLVRenderParams->sPartyRotX);
-  v11 = -pBLVRenderParams->vPartyPos.y;
-  v26 = -pBLVRenderParams->vPartyPos.x;
+  //v11 = -pBLVRenderParams->vPartyPos.y;
+  //v26 = -pBLVRenderParams->vPartyPos.x;
   v27 = v9;
   v12 = -pBLVRenderParams->vPartyPos.z;
   if ( pBLVRenderParams->sPartyRotX )
@@ -10759,17 +10759,17 @@
     v16 = v8 * -pBLVRenderParams->vPartyPos.x + v29 * -pBLVRenderParams->vPartyPos.y;
     v13 = v28;
     v17 = -65536 * pBLVRenderParams->vPartyPos.z;
-    v7->field_0 = ((unsigned __int64)(v16 * (signed __int64)v28) >> 16)
+    v7->field_0_party_dir_x = ((unsigned __int64)(v16 * (signed __int64)v28) >> 16)
                 + ((unsigned __int64)(-65536 * pBLVRenderParams->vPartyPos.z * (signed __int64)v27) >> 16);
-    v7->field_4 = v8 * v11 - v29 * v26;
+    v7->field_4_party_dir_y = v8 * -pBLVRenderParams->vPartyPos.y - v29 * -pBLVRenderParams->vPartyPos.x;
     v14 = v27;
     v15 = ((unsigned __int64)(v17 * (signed __int64)v28) >> 16) - ((unsigned __int64)(v16 * (signed __int64)v27) >> 16);
   }
   else
   {
-    v7->field_0 = v10 + v29 * -pBLVRenderParams->vPartyPos.y;
+    v7->field_0_party_dir_x = v8 * -pBLVRenderParams->vPartyPos.x + v29 * -pBLVRenderParams->vPartyPos.y;
     v13 = v28;
-    v7->field_4 = v8 * v11 - v29 * v26;
+    v7->field_4_party_dir_y = v8 * -pBLVRenderParams->vPartyPos.y - v29 * -pBLVRenderParams->vPartyPos.x;
     v14 = v27;
     v15 = v12 << 16;
   }
@@ -10814,14 +10814,14 @@
   v7->field_20 = v20;
   v22 = v7->field_C;
   v7->field_20 = -v7->field_20;
-  v23 = ((unsigned __int64)(v22 * (signed __int64)v7->field_0) >> 16)
-      + ((unsigned __int64)(v7->field_10 * (signed __int64)v7->field_4) >> 16)
+  v23 = ((unsigned __int64)(v22 * (signed __int64)v7->field_0_party_dir_x) >> 16)
+      + ((unsigned __int64)(v7->field_10 * (signed __int64)v7->field_4_party_dir_y) >> 16)
       + ((unsigned __int64)(v7->field_14 * (signed __int64)v7->field_8) >> 16);
   v30 = v7->field_18;
-  v24 = v7->field_0;
+  v24 = v7->field_0_party_dir_x;
   v7->field_24 = v23;
   v31 = (unsigned __int64)(v30 * (signed __int64)v24) >> 16;
-  result = (unsigned __int64)(v7->field_1C * (signed __int64)v7->field_4) >> 16;
+  result = (unsigned __int64)(v7->field_1C * (signed __int64)v7->field_4_party_dir_y) >> 16;
   v7->field_28 = v31 + result + ((unsigned __int64)(v7->field_20 * (signed __int64)v7->field_8) >> 16);
   return result;
 }
@@ -10840,14 +10840,14 @@
   this->field_18 = -this->field_18;
   this->field_1C = -this->field_1C;
   this->field_20 = -this->field_20;
-  v2 = (unsigned __int64)(v1 * (signed __int64)this->field_0) >> 16;
+  v2 = (unsigned __int64)(v1 * (signed __int64)this->field_0_party_dir_x) >> 16;
   v3 = this->field_18;
-  v4 = this->field_0;
+  v4 = this->field_0_party_dir_x;
   this->field_24 = v2
-                 + ((unsigned __int64)(this->field_10 * (signed __int64)this->field_4) >> 16)
+                 + ((unsigned __int64)(this->field_10 * (signed __int64)this->field_4_party_dir_y) >> 16)
                  + ((unsigned __int64)(this->field_14 * (signed __int64)this->field_8) >> 16);
   v5 = (unsigned __int64)(v3 * (signed __int64)v4) >> 16;
-  result = (unsigned __int64)(this->field_1C * (signed __int64)this->field_4) >> 16;
+  result = (unsigned __int64)(this->field_1C * (signed __int64)this->field_4_party_dir_y) >> 16;
   this->field_28 = v5 + result + ((unsigned __int64)(this->field_20 * (signed __int64)this->field_8) >> 16);
   return result;
 }