Mercurial > mm7

diff mm7_3.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 809d3f71b73d 650d96af8855
children 125354fe1b9f
line wrap: on
line diff
--- a/mm7_3.cpp	Sun Feb 17 00:19:34 2013 +0600
+++ b/mm7_3.cpp	Sun Feb 17 00:19:51 2013 +0600
@@ -13436,10 +13436,14 @@
               v15->uScreenSpaceX = a5;
               v15->uScreenSpaceY = a6;
               v23 = 8 * v26;
-              LOBYTE(v23) = 8 * v26 | 5;
+              LOBYTE(v23) = 8 * v26 | OBJECT_Decoration;
               LOWORD(v22) = 0;
+
+              //v15->sZValue = v22 + v23;
+              v15->actual_z = HIWORD(x);
+              v15->object_pid = 8 * v26 | OBJECT_Decoration;
+
               v15->uTintColor = 0;
-              v15->sZValue = v22 + v23;
               v15->pSpriteFrame = v12;
             }
           }
@@ -13610,7 +13614,7 @@
               v3->uScreenSpaceY = v22;
               LOWORD(v21) = 0;
               v23 = 8 * i;
-              LOBYTE(v23) = 8 * i | 2;
+              LOBYTE(v23) = 8 * i | OBJECT_Item;
               v3->pSpriteFrame = v24;
               v12 = (p->uAttributes & 0x20) == 0;
               v3->sZValue = v21 + v23;