Mercurial > mm7

comparison Indoor.cpp @ 2014:7a2fc95f3b99

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Слияние
author Ritor1
date Thu, 07 Nov 2013 09:19:10 +0600
parents 30c2b575d25c
children 3fa489e0a3f2
comparison
equal deleted inserted replaced
2013:bb1e7b0780d8 2014:7a2fc95f3b99
4629 4629
4630 v29 = HIDWORD(p->pActorBuffs[ACTOR_BUFF_STONED].uExpireTime) == 0; 4630 v29 = HIDWORD(p->pActorBuffs[ACTOR_BUFF_STONED].uExpireTime) == 0;
4631 v30 = HIDWORD(p->pActorBuffs[ACTOR_BUFF_STONED].uExpireTime) < 0; 4631 v30 = HIDWORD(p->pActorBuffs[ACTOR_BUFF_STONED].uExpireTime) < 0;
4632 v0->field_1E = v41; 4632 v0->field_1E = v41;
4633 v0->pSpriteFrame = v10; 4633 v0->pSpriteFrame = v10;
4634 v0->uTintColor = pMonsterList->pMonsters[p->pMonsterInfo.uID - 1].uTintColor; 4634 v0->sTintColor = pMonsterList->pMonsters[p->pMonsterInfo.uID - 1].sTintColor;
4635 if ( !v30 && (!(v30 | v29) || LODWORD(p->pActorBuffs[ACTOR_BUFF_STONED].uExpireTime)) ) 4635 if ( !v30 && (!(v30 | v29) || LODWORD(p->pActorBuffs[ACTOR_BUFF_STONED].uExpireTime)) )
4636 { 4636 {
4637 HIBYTE(v26) = HIBYTE(v41) | 1; 4637 HIBYTE(v26) = HIBYTE(v41) | 1;
4638 v0->field_1E = v26; 4638 v0->field_1E = v26;
4639 } 4639 }
4783 v3->world_x = a1; 4783 v3->world_x = a1;
4784 v3->world_y = a2; 4784 v3->world_y = a2;
4785 v3->world_z = a3; 4785 v3->world_z = a3;
4786 v3->uScreenSpaceX = v36; 4786 v3->uScreenSpaceX = v36;
4787 v22 = v35; 4787 v22 = v35;
4788 v3->uTintColor = 0; 4788 v3->sTintColor = 0;
4789 v3->uScreenSpaceY = v22; 4789 v3->uScreenSpaceY = v22;
4790 //v23 = 8 * i; 4790 //v23 = 8 * i;
4791 //LOBYTE(v23) = PID(OBJECT_Item,i); 4791 //LOBYTE(v23) = PID(OBJECT_Item,i);
4792 v3->pSpriteFrame = v24; 4792 v3->pSpriteFrame = v24;
4793 //v12 = (p->uAttributes & 0x20) == 0; 4793 //v12 = (p->uAttributes & 0x20) == 0;
5045 5045
5046 //v15->sZValue = v22 + v23; 5046 //v15->sZValue = v22 + v23;
5047 v15->actual_z = HIWORD(x); 5047 v15->actual_z = HIWORD(x);
5048 v15->object_pid = PID(OBJECT_Decoration,uDecorationID); 5048 v15->object_pid = PID(OBJECT_Decoration,uDecorationID);
5049 5049
5050 v15->uTintColor = 0; 5050 v15->sTintColor = 0;
5051 v15->pSpriteFrame = v12; 5051 v15->pSpriteFrame = v12;
5052 } 5052 }
5053 } 5053 }
5054 } 5054 }
5055 //----- (0043F953) -------------------------------------------------------- 5055 //----- (0043F953) --------------------------------------------------------