Mercurial > mm7

comparison SpriteObject.cpp @ 2168:7cd99cb12911

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Слияние
author Ritor1
date Fri, 17 Jan 2014 22:44:57 +0600
parents 00bd098f6435
children ff8920a40c21
comparison
equal deleted inserted replaced
2167:1497ca65a525 2168:7cd99cb12911
715 { 715 {
716 pSpriteObject->vVelocity.z += v39; 716 pSpriteObject->vVelocity.z += v39;
717 v22 = fixpoint_mul(32000, v39); 717 v22 = fixpoint_mul(32000, v39);
718 } 718 }
719 pSpriteObject->vVelocity.z += v22; 719 pSpriteObject->vVelocity.z += v22;
720 if ( BYTE3(pIndoor->pFaces[v15].uAttributes) & 0x10 ) 720 if ( pIndoor->pFaces[v15].uAttributes & FACE_UNKNOW2 )
721 EventProcessor(pIndoor->pFaceExtras[pIndoor->pFaces[v15].uFaceExtraID].uEventID, 0, 1); 721 EventProcessor(pIndoor->pFaceExtras[pIndoor->pFaces[v15].uFaceExtraID].uEventID, 0, 1);
722 pSpriteObject->vVelocity.x = fixpoint_mul(58500, pSpriteObject->vVelocity.x); 722 pSpriteObject->vVelocity.x = fixpoint_mul(58500, pSpriteObject->vVelocity.x);
723 pSpriteObject->vVelocity.y = fixpoint_mul(58500, pSpriteObject->vVelocity.y); 723 pSpriteObject->vVelocity.y = fixpoint_mul(58500, pSpriteObject->vVelocity.y);
724 pSpriteObject->vVelocity.z = fixpoint_mul(58500, pSpriteObject->vVelocity.z); 724 pSpriteObject->vVelocity.z = fixpoint_mul(58500, pSpriteObject->vVelocity.z);
725 continue; 725 continue;
728 { 728 {
729 v17 = -pSpriteObject->vVelocity.z / 2; 729 v17 = -pSpriteObject->vVelocity.z / 2;
730 pSpriteObject->vVelocity.z = v17; 730 pSpriteObject->vVelocity.z = v17;
731 if ( (signed __int16)v17 < 10 ) 731 if ( (signed __int16)v17 < 10 )
732 pSpriteObject->vVelocity.z = 0; 732 pSpriteObject->vVelocity.z = 0;
733 if ( BYTE3(pIndoor->pFaces[v15].uAttributes) & 0x10 ) 733 if ( pIndoor->pFaces[v15].uAttributes & FACE_UNKNOW2 )
734 EventProcessor(pIndoor->pFaceExtras[pIndoor->pFaces[v15].uFaceExtraID].uEventID, 0, 1); 734 EventProcessor(pIndoor->pFaceExtras[pIndoor->pFaces[v15].uFaceExtraID].uEventID, 0, 1);
735 pSpriteObject->vVelocity.x = fixpoint_mul(58500, pSpriteObject->vVelocity.x); 735 pSpriteObject->vVelocity.x = fixpoint_mul(58500, pSpriteObject->vVelocity.x);
736 pSpriteObject->vVelocity.y = fixpoint_mul(58500, pSpriteObject->vVelocity.y); 736 pSpriteObject->vVelocity.y = fixpoint_mul(58500, pSpriteObject->vVelocity.y);
737 pSpriteObject->vVelocity.z = fixpoint_mul(58500, pSpriteObject->vVelocity.z); 737 pSpriteObject->vVelocity.z = fixpoint_mul(58500, pSpriteObject->vVelocity.z);
738 continue; 738 continue;
739 } 739 }
740 pSpriteObject->vVelocity.z = 0; 740 pSpriteObject->vVelocity.z = 0;
741 if ( pSpriteObject->vVelocity.x * pSpriteObject->vVelocity.x + pSpriteObject->vVelocity.y * pSpriteObject->vVelocity.y >= 400 ) 741 if ( pSpriteObject->vVelocity.x * pSpriteObject->vVelocity.x + pSpriteObject->vVelocity.y * pSpriteObject->vVelocity.y >= 400 )
742 { 742 {
743 if ( BYTE3(pIndoor->pFaces[v15].uAttributes) & 0x10 ) 743 if ( pIndoor->pFaces[v15].uAttributes & FACE_UNKNOW2 )
744 EventProcessor(pIndoor->pFaceExtras[pIndoor->pFaces[v15].uFaceExtraID].uEventID, 0, 1); 744 EventProcessor(pIndoor->pFaceExtras[pIndoor->pFaces[v15].uFaceExtraID].uEventID, 0, 1);
745 pSpriteObject->vVelocity.x = fixpoint_mul(58500, pSpriteObject->vVelocity.x); 745 pSpriteObject->vVelocity.x = fixpoint_mul(58500, pSpriteObject->vVelocity.x);
746 pSpriteObject->vVelocity.y = fixpoint_mul(58500, pSpriteObject->vVelocity.y); 746 pSpriteObject->vVelocity.y = fixpoint_mul(58500, pSpriteObject->vVelocity.y);
747 pSpriteObject->vVelocity.z = fixpoint_mul(58500, pSpriteObject->vVelocity.z); 747 pSpriteObject->vVelocity.z = fixpoint_mul(58500, pSpriteObject->vVelocity.z);
748 continue; 748 continue;