diff Actor.cpp @ 58:41cbaabde2cb

BLV render
author Nomad
date Thu, 25 Oct 2012 02:05:16 +0200
parents bcc051713d20
children 5159d2e6f559
line wrap: on
line diff
--- a/Actor.cpp	Wed Oct 24 17:33:46 2012 +0200
+++ b/Actor.cpp	Thu Oct 25 02:05:16 2012 +0200
@@ -729,10 +729,10 @@
           }
           if ( uCurrentlyLoadedLevelType == LEVEL_Indoor )
             return;
-          v118 = pParty->vPosition.y;
+          v118 = pParty->vPosition.z;
           v111 = pParty->vPosition.x;
-          v114 = pParty->vPosition.y + 2500;
-          v113 = pParty->vPosition.z;
+          v114 = pParty->vPosition.z + 2500;
+          v113 = pParty->vPosition.y;
           v23 = 8;
           if ( uSkillLevel & 0x0100 )
           {
@@ -1786,8 +1786,8 @@
     if ( !v4 )
     {
       outx = pParty->vPosition.x;
-      outy = pParty->vPosition.z;
-      v14 = pParty->vPosition.y + (signed int)pParty->uPartyHeight / 3;
+      outy = pParty->vPosition.y;
+      v14 = pParty->vPosition.z + (signed int)pParty->uPartyHeight / 3;
 LABEL_27:
       outz = v14;
       goto LABEL_28;
@@ -1807,21 +1807,21 @@
           v39 = &outy;
           v38 = &outx;
           v18 = pParty->sRotationY - stru_5C6E00->uIntegerHalfPi;
-          v37.z = pParty->vPosition.y + (signed int)pParty->uPartyHeight / 3;
+          v37.z = pParty->vPosition.z + (signed int)pParty->uPartyHeight / 3;
           goto LABEL_20;
         }
         v40 = &outz;
         v39 = &outy;
         v38 = &outx;
         v18 = pParty->sRotationY - stru_5C6E00->uIntegerHalfPi;
-        v37.z = pParty->vPosition.y + (signed int)pParty->uPartyHeight / 3;
+        v37.z = pParty->vPosition.z + (signed int)pParty->uPartyHeight / 3;
       }
       else
       {
         v40 = &outz;
         v39 = &outy;
         v38 = &outx;
-        v37.z = pParty->vPosition.y + (signed int)pParty->uPartyHeight / 3;
+        v37.z = pParty->vPosition.z + (signed int)pParty->uPartyHeight / 3;
         v18 = stru_5C6E00->uIntegerHalfPi + pParty->sRotationY;
       }
       *(_QWORD *)&v37.x = *(_QWORD *)&pParty->vPosition.x;
@@ -1834,7 +1834,7 @@
     v40 = &outz;
     v39 = &outy;
     v38 = &outx;
-    v37.z = pParty->vPosition.y + (signed int)pParty->uPartyHeight / 3;
+    v37.z = pParty->vPosition.z + (signed int)pParty->uPartyHeight / 3;
     v18 = stru_5C6E00->uIntegerHalfPi + pParty->sRotationY;
 LABEL_20:
     *(_QWORD *)&v37 = *(_QWORD *)&pParty->vPosition.x;
@@ -1891,11 +1891,11 @@
   if ( v21 == 4 )
   {
     LODWORD(v45) = pParty->vPosition.x;
-    LODWORD(v44) = pParty->vPosition.z;
+    LODWORD(v44) = pParty->vPosition.y;
     v29 = a4;
     if ( !a4 )
       v29 = pParty->sEyelevel;
-    v28 = pParty->vPosition.y + v29;
+    v28 = pParty->vPosition.z + v29;
     goto LABEL_44;
   }
   if ( v21 == 5 )
@@ -2155,8 +2155,8 @@
       if ( (edx0 & 7) == 4 )
       {
         v6 = (AIDirection *)pParty->vPosition.x;
-        v7 = (AIDirection *)pParty->vPosition.z;
-        v23 = pParty->vPosition.y + pParty->sEyelevel;
+        v7 = (AIDirection *)pParty->vPosition.y;
+        v23 = pParty->vPosition.z + pParty->sEyelevel;
       }
       else
       {
@@ -2554,8 +2554,8 @@
     if ( (edx0 & 7) == 4 )
     {
       v4 = (AIDirection *)pParty->vPosition.x;
-      v5 = (AIDirection *)pParty->vPosition.z;
-      v21 = pParty->vPosition.y + pParty->sEyelevel;
+      v5 = (AIDirection *)pParty->vPosition.y;
+      v21 = pParty->vPosition.z + pParty->sEyelevel;
     }
     else
     {
@@ -2666,8 +2666,8 @@
     if ( (edx0 & 7) == 4 )
     {
       v4 = (AIDirection *)pParty->vPosition.x;
-      v5 = (AIDirection *)pParty->vPosition.z;
-      v21 = pParty->vPosition.y + pParty->sEyelevel;
+      v5 = (AIDirection *)pParty->vPosition.y;
+      v21 = pParty->vPosition.z + pParty->sEyelevel;
     }
     else
     {
@@ -2777,8 +2777,8 @@
     if ( (edx0 & 7) == 4 )
     {
       v4 = (AIDirection *)pParty->vPosition.x;
-      v5 = (AIDirection *)pParty->vPosition.z;
-      v20 = pParty->vPosition.y + pParty->sEyelevel;
+      v5 = (AIDirection *)pParty->vPosition.y;
+      v20 = pParty->vPosition.z + pParty->sEyelevel;
     }
     else
     {
@@ -2873,8 +2873,8 @@
     if ( (edx0 & 7) == 4 )
     {
       v4 = pParty->vPosition.x;
-      v5 = pParty->vPosition.z;
-      v22 = pParty->vPosition.y + pParty->sEyelevel;
+      v5 = pParty->vPosition.y;
+      v22 = pParty->vPosition.z + pParty->sEyelevel;
     }
     else
     {
@@ -3436,7 +3436,7 @@
   v19 = stru_5C6E00->SinCos(v18 + v13 - stru_5C6E00->uIntegerHalfPi);
   v7->uYawAngle = stru_5C6E00->Atan2(
                     v17 - v7->vPosition.x,
-                    pParty->vPosition.z
+                    pParty->vPosition.y
                   + ((unsigned __int64)(v19 * (signed __int64)v10->uDistanceXZ) >> 16)
                   - v7->vPosition.y);
   if ( uActionLength )
@@ -3800,8 +3800,8 @@
       if ( !v3->pMonsterInfo.uHostilityType )
         v15 = dword_4DF380[v14];
       v16 = abs(v3->vPosition.x - pParty->vPosition.x);
-      v28 = abs(v3->vPosition.y - pParty->vPosition.z);
-      v17 = abs(v3->vPosition.z - pParty->vPosition.y);
+      v28 = abs(v3->vPosition.y - pParty->vPosition.y);
+      v17 = abs(v3->vPosition.z - pParty->vPosition.z);
       if ( v16 <= v15 && v28 <= v15 && v17 <= v15 )
       {
         if ( v16 * v16 + v28 * v28 + v17 * v17 < (unsigned int)v25 )