From 79ecda1ecff898a7eb4aba6d78bdeeecec73c1cf Mon Sep 17 00:00:00 2001 From: pyrolink Date: Thu, 29 Dec 2005 04:56:15 +0000 Subject: [PATCH] Commented out notifications and death flag set during kill(). This was SVN commit r3302. --- source/simulation/Entity.cpp | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/source/simulation/Entity.cpp b/source/simulation/Entity.cpp index f618d70a40..78b8b22c41 100755 --- a/source/simulation/Entity.cpp +++ b/source/simulation/Entity.cpp @@ -605,6 +605,7 @@ void UpdateAuras_Normal( SAura& aura, CEntity* e ) void CEntity::Damage( CDamageType& damage, CEntity* inflictor ) { + CEventDamage evt( inflictor, &damage ); DispatchEvent( &evt ); } @@ -614,6 +615,27 @@ void UpdateAuras_Normal( SAura& aura, CEntity* e ) m_orderQueue.clear(); } +/*void CEntity::RequestNotification( CEntity* target, unsigned long orderType ) +{ + CEntityListener notify; + notify.m_sender = this; + notify.m_type = orderType; + target->m_listeners.push_back( notify ); +} +void CEntity::SendNotification( CEntity* target, unsigned long orderType ) +{ + CEntityListener notify; + notify.m_sender = this; + notify.m_type = orderType; + target->m_notifications.push_back( notify ); +} + +void CEntity::DispatchNotification( CEntityListener notify ) +{ + CEventNotification evt( notify ); + DispatchEvent( &evt ); +} +*/ void CEntity::pushOrder( CEntityOrder& order ) { if( acceptsOrder( order.m_type, order.m_data[0].entity ) ) @@ -1229,6 +1251,8 @@ void UpdateAuras_Normal( SAura& aura, CEntity* e ) clearOrders(); + g_EntityManager.SetDeath(true); + if( m_actor ) m_actor->SetRandomAnimation( "death", true );