comparison SpriteObject.cpp @ 1483:223605b325b3

Слияние
author Ritor1
date Thu, 29 Aug 2013 12:04:55 +0600
parents 7ef4b64f6329
children c4ab816fcc5e
comparison
equal deleted inserted replaced
1482:cfd99b6177a3 1483:223605b325b3
995 signed int v13; // edi@20 995 signed int v13; // edi@20
996 int dir_y; // [sp+Ch] [bp-Ch]@1 996 int dir_y; // [sp+Ch] [bp-Ch]@1
997 int dir_z; // [sp+10h] [bp-8h]@1 997 int dir_z; // [sp+10h] [bp-8h]@1
998 DAMAGE_TYPE pDamageType; // [sp+14h] [bp-4h]@14 998 DAMAGE_TYPE pDamageType; // [sp+14h] [bp-4h]@14
999 999
1000 pMapInfo = &pMapStats->pInfos[pMapStats->GetMapInfo(pCurrentMapName.data())]; 1000 pMapInfo = &pMapStats->pInfos[pMapStats->GetMapInfo(pCurrentMapName)];
1001 dir_x = abs(pParty->vPosition.x - this->vPosition.x); 1001 dir_x = abs(pParty->vPosition.x - this->vPosition.x);
1002 dir_y = abs(pParty->vPosition.y - this->vPosition.y); 1002 dir_y = abs(pParty->vPosition.y - this->vPosition.y);
1003 dir_z = abs(pParty->vPosition.z + pParty->sEyelevel - this->vPosition.z); 1003 dir_z = abs(pParty->vPosition.z + pParty->sEyelevel - this->vPosition.z);
1004 if ( dir_x < dir_y ) 1004 if ( dir_x < dir_y )
1005 { 1005 {