[wpdev-commits] wolfpack/ai ai_monsters.cpp,1.23,1.24

[Sebastian H. <dar...@us...>]

Update of /cvsroot/wpdev/wolfpack/ai
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6575/ai

Modified Files:
	ai_monsters.cpp 
Log Message:
ai fixes.

Index: ai_monsters.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/ai/ai_monsters.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** ai_monsters.cpp	18 Sep 2004 21:10:40 -0000	1.23
--- ai_monsters.cpp	20 Sep 2004 02:37:58 -0000	1.24
***************
*** 130,139 ****
  	P_CHAR m_currentVictim = World::instance()->findChar(m_currentVictimSer);
  	if (!m_currentVictim) {
! 		m_currentVictim = INVALID_SERIAL;
  	}
  
  	if (m_currentVictim && invalidTarget(m_npc, m_currentVictim)) {
  		m_currentVictim = 0;
! 		m_currentVictim = INVALID_SERIAL;
  		m_npc->fight(0);
  	}
--- 130,139 ----
  	P_CHAR m_currentVictim = World::instance()->findChar(m_currentVictimSer);
  	if (!m_currentVictim) {
! 		m_currentVictimSer = INVALID_SERIAL;
  	}
  
  	if (m_currentVictim && invalidTarget(m_npc, m_currentVictim)) {
  		m_currentVictim = 0;
! 		m_currentVictimSer = INVALID_SERIAL;
  		m_npc->fight(0);
  	}
***************
*** 227,231 ****
  
  	Monster_Aggressive* pAI = dynamic_cast<Monster_Aggressive*>( m_ai );
! 	if ( !pAI || !pAI->currentVictim() )
  		return 0.0f;
  
--- 227,238 ----
  
  	Monster_Aggressive* pAI = dynamic_cast<Monster_Aggressive*>( m_ai );
! 
! 	if (!pAI) {
! 		return 0.0f;
! 	}
! 
! 	P_CHAR currentVictim = pAI->currentVictim();
! 
! 	if ( !currentVictim || !validTarget(m_npc, currentVictim) )
  		return 0.0f;
  
***************
*** 242,246 ****
  	}
  
! 	if ( m_npc->inRange( pAI->currentVictim(), range ) )
  		return 0.0f;
  
--- 249,253 ----
  	}
  
! 	if ( m_npc->inRange( currentVictim, range ) )
  		return 0.0f;
  
***************
*** 266,270 ****
  
  	Monster_Aggressive* pAI = dynamic_cast<Monster_Aggressive*>( m_ai );
! 	if ( !pAI || !pAI->currentVictim() )
  		return 1.0f;
  
--- 273,284 ----
  
  	Monster_Aggressive* pAI = dynamic_cast<Monster_Aggressive*>( m_ai );
! 
! 	if (!pAI) {
! 		return 1.0f;
! 	}
! 
! 	P_CHAR currentVictim = pAI->currentVictim();
! 
! 	if ( !currentVictim || !validTarget(m_npc, currentVictim) )
  		return 1.0f;
  
***************
*** 280,284 ****
  	}
  
! 	if ( m_npc->inRange( pAI->currentVictim(), range ) )
  		return 1.0f;
  
--- 294,298 ----
  	}
  
! 	if ( m_npc->inRange( currentVictim, range ) )
  		return 1.0f;