Mercurial > mm7

changeset 35:aac67e0d2c10

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
uMovementSpeed = v9->uBaseSpe
author Ritor1
date Sun, 20 Jan 2013 20:03:36 +0600
parents bf67f3164041
children 415e1f2d5936
files Render.cpp mm7_3.cpp mm7_4.cpp
diffstat 3 files changed, 10 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/Render.cpp	Sun Jan 20 18:58:44 2013 +0600
+++ b/Render.cpp	Sun Jan 20 20:03:36 2013 +0600
@@ -11096,7 +11096,7 @@
     if (p->uOpacity != RenderBillboardD3D::InvalidOpacity)
       SetBillboardBlendOptions(p->uOpacity);
     
-    //ErrD3D(pRenderer->pRenderD3D->pDevice->SetTexture(0, p->pTexture));
+    ErrD3D(pRenderer->pRenderD3D->pDevice->SetTexture(0, p->pTexture));
     ErrD3D(pRenderer->pRenderD3D->pDevice->DrawPrimitive(D3DPT_TRIANGLEFAN, D3DFVF_XYZRHW | D3DFVF_DIFFUSE | D3DFVF_SPECULAR | D3DFVF_TEX1,
         p->pQuards, p->uNumVertices, D3DDP_DONOTLIGHT | D3DDP_DONOTUPDATEEXTENTS));
   }
--- a/mm7_3.cpp	Sun Jan 20 18:58:44 2013 +0600
+++ b/mm7_3.cpp	Sun Jan 20 20:03:36 2013 +0600
@@ -18669,7 +18669,7 @@
   unsigned int v10; // eax@1
   size_t v11; // ebx@2
   signed int v12; // esi@2
-  char *v13;//Actor_uYawAngle_cr *v13; // ebx@3
+  Actor *pActor;//Actor_uYawAngle_cr *v13; // ebx@3
   AIDirection a3; // [sp+Ch] [bp-50h]@2
   AIDirection v15; // [sp+28h] [bp-34h]@2
   //SpawnPointMM7 v16; // [sp+44h] [bp-18h]@1
@@ -18696,16 +18696,14 @@
     v12 = v11;
     if ( (signed int)v11 < (signed int)uNumActors )
     {
-      v13 = (char *)&pActors[v11].uYawAngle;
-      do
-      {
-        ((Actor *)((char *)v13 - 154))->PrepareSprites(0);
+      
+      for ( pActor = &pActors[v11]; v12 < (signed int)uNumActors; ++pActor )
+      {
+        pActor->PrepareSprites(0);
         ++v12;
-        *(short *)v13/*->uYawAngle*/ = LOWORD(v15.uYawAngle);
-        *(int *)(v13+666)/*->dword_000334_unique_name*/ = uUniqueName;
-        ++v13;
-      }
-      while ( v12 < (signed int)uNumActors );
+        pActor->uYawAngle = v15.uYawAngle;
+        pActor->dword_000334_unique_name = uUniqueName;
+      }
     }
   }
 }
--- a/mm7_4.cpp	Sun Jan 20 18:58:44 2013 +0600
+++ b/mm7_4.cpp	Sun Jan 20 20:03:36 2013 +0600
@@ -9675,7 +9675,7 @@
   sub_44A56A();
   if ( pParty->pHirelings[0].pName )
   {
-    memcpy(&pParty->pHirelings[1], v2, sizeof(pParty->pHirelings[1]));//Ritor1: unknow
+    memcpy(&pParty->pHirelings[1], v2, sizeof(pParty->pHirelings[1]));
     v24 = v2->pName;
     v22 = pParty->pHireling2Name;
   }