Mercurial > mm7

comparison Engine/Graphics/Render.cpp @ 2566:30eb6dcac768

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
big spell fx overhaul
author a.parshin
date Wed, 20 May 2015 21:05:07 +0200
parents b8a56afc6ba1
children d569340b05ff
comparison
equal deleted inserted replaced
2565:117c219bf913 2566:30eb6dcac768
602 //if ( !(v1->uFlags & 1) ) 602 //if ( !(v1->uFlags & 1) )
603 //{ 603 //{
604 //v2 = *((short *)v0 - 14) 604 //v2 = *((short *)v0 - 14)
605 //v2 = object->uType; 605 //v2 = object->uType;
606 if ( (object->uType < 1000 || object->uType >= 10000) && (object->uType < 500 || object->uType >= 600) 606 if ( (object->uType < 1000 || object->uType >= 10000) && (object->uType < 500 || object->uType >= 600)
607 || pEngine->pStru6Instance->_4A81CA(object) ) 607 || pEngine->pStru6Instance->RenderAsSprite(object) )
608 { 608 {
609 //a5 = *(short *)v0; 609 //a5 = *(short *)v0;
610 x = object->vPosition.x; 610 x = object->vPosition.x;
611 y = object->vPosition.y; 611 y = object->vPosition.y;
612 z = object->vPosition.z; 612 z = object->vPosition.z;
9895 { 9895 {
9896 unsigned int result; // eax@1 9896 unsigned int result; // eax@1
9897 9897
9898 result = uLayingItemID; 9898 result = uLayingItemID;
9899 if (pObjectList->pObjects[pSpriteObjects[uLayingItemID].uObjectDescID].uFlags & 0x10) 9899 if (pObjectList->pObjects[pSpriteObjects[uLayingItemID].uObjectDescID].uFlags & 0x10)
9900 result = _46BFFA_check_object_intercept(uLayingItemID, a2); 9900 result = _46BFFA_update_spell_fx(uLayingItemID, a2);
9901 return result; 9901 return result;
9902 } 9902 }
9903 9903
9904 //----- (0047253E) -------------------------------------------------------- 9904 //----- (0047253E) --------------------------------------------------------
9905 void UpdateObjects() 9905 void UpdateObjects()
9974 if (!(object->uFlags & OBJECT_DESC_INTERACTABLE)) 9974 if (!(object->uFlags & OBJECT_DESC_INTERACTABLE))
9975 { 9975 {
9976 SpriteObject::OnInteraction(i); 9976 SpriteObject::OnInteraction(i);
9977 continue; 9977 continue;
9978 } 9978 }
9979 _46BFFA_check_object_intercept(i, PID(OBJECT_Item, i)); 9979 _46BFFA_update_spell_fx(i, PID(OBJECT_Item, i));
9980 } 9980 }
9981 } 9981 }
9982 } 9982 }
9983 } 9983 }
9984 9984