Mercurial > mm7

diff 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
line wrap: on
line diff
--- a/Engine/Graphics/Render.cpp	Wed May 20 15:12:33 2015 +0200
+++ b/Engine/Graphics/Render.cpp	Wed May 20 21:05:07 2015 +0200
@@ -604,7 +604,7 @@
           //v2 = *((short *)v0 - 14)
     //v2 = object->uType;
     if ( (object->uType < 1000 || object->uType >= 10000) && (object->uType < 500 || object->uType >= 600)
-       || pEngine->pStru6Instance->_4A81CA(object) )
+       || pEngine->pStru6Instance->RenderAsSprite(object) )
     {
             //a5 = *(short *)v0;
       x = object->vPosition.x;
@@ -9897,7 +9897,7 @@
 
 	result = uLayingItemID;
 	if (pObjectList->pObjects[pSpriteObjects[uLayingItemID].uObjectDescID].uFlags & 0x10)
-		result = _46BFFA_check_object_intercept(uLayingItemID, a2);
+		result = _46BFFA_update_spell_fx(uLayingItemID, a2);
 	return result;
 }
 
@@ -9976,7 +9976,7 @@
 					SpriteObject::OnInteraction(i);
 					continue;
 				}
-				_46BFFA_check_object_intercept(i, PID(OBJECT_Item, i));
+				_46BFFA_update_spell_fx(i, PID(OBJECT_Item, i));
 			}
 		}
 	}