Mercurial > mm7

diff mm7_4.cpp @ 214:8646cad02950

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Слияние
author Ritor1
date Sun, 17 Feb 2013 00:19:51 +0600
parents 650d96af8855
children e6e348d66a75
line wrap: on
line diff
--- a/mm7_4.cpp	Sun Feb 17 00:19:34 2013 +0600
+++ b/mm7_4.cpp	Sun Feb 17 00:19:51 2013 +0600
@@ -31,7 +31,6 @@
 #include "Time.h"
 #include "IconFrameTable.h"
 #include "GUIProgressBar.h"
-#include "stru157.h"
 #include "Bink_Smacker.h"
 #include "TileFrameTable.h"
 #include "PlayerFrameTable.h"
@@ -14719,9 +14718,11 @@
     v0->uScreenSpaceY = a6;
     LOWORD(v25) = 0;
     LOBYTE(v26) = v41;
-    v0->sZValue = v25 + (8 * i | 3);
-    //v27 = pMonsterList->pMonsters;
-    //v28 = p->pMonsterInfo.uID;
+
+    //v0->sZValue = v25 + (8 * i | OBJECT_Actor);
+    v0->actual_z = HIWORD(x);
+    v0->object_pid = v8 * i | OBJECT_Actor;
+
     v29 = HIDWORD(p->pActorBuffs[5].uExpireTime) == 0;
     v30 = HIDWORD(p->pActorBuffs[5].uExpireTime) < 0;
     v0->field_1E = v41;