Mercurial > mm7
diff SpriteObject.cpp @ 2168:7cd99cb12911
Слияние
| author | Ritor1 |
|---|---|
| date | Fri, 17 Jan 2014 22:44:57 +0600 |
| parents | 00bd098f6435 |
| children | ff8920a40c21 |
line wrap: on
line diff
--- a/SpriteObject.cpp Thu Jan 16 23:49:04 2014 +0600 +++ b/SpriteObject.cpp Fri Jan 17 22:44:57 2014 +0600 @@ -717,7 +717,7 @@ v22 = fixpoint_mul(32000, v39); } pSpriteObject->vVelocity.z += v22; - if ( BYTE3(pIndoor->pFaces[v15].uAttributes) & 0x10 ) + if ( pIndoor->pFaces[v15].uAttributes & FACE_UNKNOW2 ) EventProcessor(pIndoor->pFaceExtras[pIndoor->pFaces[v15].uFaceExtraID].uEventID, 0, 1); pSpriteObject->vVelocity.x = fixpoint_mul(58500, pSpriteObject->vVelocity.x); pSpriteObject->vVelocity.y = fixpoint_mul(58500, pSpriteObject->vVelocity.y); @@ -730,7 +730,7 @@ pSpriteObject->vVelocity.z = v17; if ( (signed __int16)v17 < 10 ) pSpriteObject->vVelocity.z = 0; - if ( BYTE3(pIndoor->pFaces[v15].uAttributes) & 0x10 ) + if ( pIndoor->pFaces[v15].uAttributes & FACE_UNKNOW2 ) EventProcessor(pIndoor->pFaceExtras[pIndoor->pFaces[v15].uFaceExtraID].uEventID, 0, 1); pSpriteObject->vVelocity.x = fixpoint_mul(58500, pSpriteObject->vVelocity.x); pSpriteObject->vVelocity.y = fixpoint_mul(58500, pSpriteObject->vVelocity.y); @@ -740,7 +740,7 @@ pSpriteObject->vVelocity.z = 0; if ( pSpriteObject->vVelocity.x * pSpriteObject->vVelocity.x + pSpriteObject->vVelocity.y * pSpriteObject->vVelocity.y >= 400 ) { - if ( BYTE3(pIndoor->pFaces[v15].uAttributes) & 0x10 ) + if ( pIndoor->pFaces[v15].uAttributes & FACE_UNKNOW2 ) EventProcessor(pIndoor->pFaceExtras[pIndoor->pFaces[v15].uFaceExtraID].uEventID, 0, 1); pSpriteObject->vVelocity.x = fixpoint_mul(58500, pSpriteObject->vVelocity.x); pSpriteObject->vVelocity.y = fixpoint_mul(58500, pSpriteObject->vVelocity.y);