Mercurial > mm7

comparison 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
comparison
equal deleted inserted replaced
213:809d3f71b73d 214:8646cad02950
13434 v15->some_y = a2; 13434 v15->some_y = a2;
13435 v15->some_z = a3; 13435 v15->some_z = a3;
13436 v15->uScreenSpaceX = a5; 13436 v15->uScreenSpaceX = a5;
13437 v15->uScreenSpaceY = a6; 13437 v15->uScreenSpaceY = a6;
13438 v23 = 8 * v26; 13438 v23 = 8 * v26;
13439 LOBYTE(v23) = 8 * v26 | 5; 13439 LOBYTE(v23) = 8 * v26 | OBJECT_Decoration;
13440 LOWORD(v22) = 0; 13440 LOWORD(v22) = 0;
13441
13442 //v15->sZValue = v22 + v23;
13443 v15->actual_z = HIWORD(x);
13444 v15->object_pid = 8 * v26 | OBJECT_Decoration;
13445
13441 v15->uTintColor = 0; 13446 v15->uTintColor = 0;
13442 v15->sZValue = v22 + v23;
13443 v15->pSpriteFrame = v12; 13447 v15->pSpriteFrame = v12;
13444 } 13448 }
13445 } 13449 }
13446 } 13450 }
13447 } 13451 }
13608 v22 = v35; 13612 v22 = v35;
13609 v3->uTintColor = 0; 13613 v3->uTintColor = 0;
13610 v3->uScreenSpaceY = v22; 13614 v3->uScreenSpaceY = v22;
13611 LOWORD(v21) = 0; 13615 LOWORD(v21) = 0;
13612 v23 = 8 * i; 13616 v23 = 8 * i;
13613 LOBYTE(v23) = 8 * i | 2; 13617 LOBYTE(v23) = 8 * i | OBJECT_Item;
13614 v3->pSpriteFrame = v24; 13618 v3->pSpriteFrame = v24;
13615 v12 = (p->uAttributes & 0x20) == 0; 13619 v12 = (p->uAttributes & 0x20) == 0;
13616 v3->sZValue = v21 + v23; 13620 v3->sZValue = v21 + v23;
13617 if ( !v12 ) 13621 if ( !v12 )
13618 { 13622 {