mirrors/0ad
1
0
Fork 2
mirror of https://gitea.wildfiregames.com/0ad/0ad.git synced 2026-07-27 14:33:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Fixed a compile error on VS2003.

Browse Source 
- Fixed some crashes that could occur when you end a game with units
mouseover'ed or with the building placer active (it tries to render them
after the game world is gone).

This was SVN commit r4543.
This commit is contained in:
Matei
2006-10-11 13:37:13 +00:00
parent 0daed1ed30
commit d36bc3a949
4 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/simulation/EntityStateProcessing.cpp
+3 -3
View File
@@ -367,7 +367,7 @@ bool CEntity::processContactAction( CEntityOrder* current, size_t UNUSED(timeste
if( !target || !target->m_extant )
{
popOrder();
if( m_orderQueue.empty() && target )
if( m_orderQueue.empty() && target.isValid() )
{
CEventTargetExhausted evt( target, action->m_Id );
DispatchEvent( &evt );
@@ -447,7 +447,7 @@ bool CEntity::processContactActionNoPathing( CEntityOrder* current, size_t times
m_actor->SetEntitySelection( "idle" );
m_actor->SetRandomAnimation( "idle" );
popOrder();
if( m_orderQueue.empty() && target )
if( m_orderQueue.empty() && target.isValid() )
{
CEventTargetExhausted evt( target, action->m_Id );
DispatchEvent( &evt );
@@ -473,7 +473,7 @@ bool CEntity::processContactActionNoPathing( CEntityOrder* current, size_t times
|| g_Game->GetWorld()->GetLOSManager()->GetUnitStatus( target, m_player ) == UNIT_HIDDEN )
{
popOrder();
if( m_orderQueue.empty() && target )
if( m_orderQueue.empty() && target.isValid() )
{
CEventTargetExhausted evt( target, action->m_Id );
DispatchEvent( &evt );