[wpdev-commits] wolfpack/ai ai_monsters.cpp,1.18,1.19

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

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

Modified Files:
	ai_monsters.cpp 
Log Message:
Fixes

Index: ai_monsters.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/ai/ai_monsters.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** ai_monsters.cpp	5 Sep 2004 00:22:09 -0000	1.18
--- ai_monsters.cpp	6 Sep 2004 22:31:25 -0000	1.19
***************
*** 222,228 ****
  	P_ITEM weapon = m_npc->getWeapon();
  
! 	if ( weapon && weapon->hasTag( "range" ) )
  	{
! 		range = weapon->getTag( "range" ).toInt();
  	}
  
--- 222,232 ----
  	P_ITEM weapon = m_npc->getWeapon();
  
! 	if ( weapon )
  	{
! 		if ( weapon->hasTag( "range" ) ) {
! 			range = weapon->getTag( "range" ).toInt();
! 		} else if ( weapon->basedef() ) {
! 			range = weapon->basedef()->getIntProperty( "range", 1 );
! 		}
  	}
  
***************
*** 256,262 ****
  	Q_UINT8 range = 1;
  	P_ITEM weapon = m_npc->getWeapon();
! 	if ( weapon && weapon->hasTag( "range" ) )
  	{
! 		range = weapon->getTag( "range" ).toInt();
  	}
  
--- 260,270 ----
  	Q_UINT8 range = 1;
  	P_ITEM weapon = m_npc->getWeapon();
! 	if ( weapon )
  	{
! 		if ( weapon->hasTag( "range" ) ) {
! 			range = weapon->getTag( "range" ).toInt();
! 		} else if ( weapon->basedef() ) {
! 			range = weapon->basedef()->getIntProperty( "range", 1 );
! 		}
  	}
  
***************
*** 313,319 ****
  	Q_UINT8 range = 1;
  	P_ITEM weapon = m_npc->getWeapon();
! 	if ( weapon && weapon->hasTag( "range" ) )
  	{
! 		range = weapon->getTag( "range" ).toInt();
  	}
  
--- 321,331 ----
  	Q_UINT8 range = 1;
  	P_ITEM weapon = m_npc->getWeapon();
! 	if ( weapon )
  	{
! 		if ( weapon->hasTag( "range" ) ) {
! 			range = weapon->getTag( "range" ).toInt();
! 		} else if ( weapon->basedef() ) {
! 			range = weapon->basedef()->getIntProperty( "range", 1 );
! 		}
  	}
  
***************
*** 348,354 ****
  	Q_UINT8 range = 1;
  	P_ITEM weapon = m_npc->getWeapon();
! 	if ( weapon && weapon->hasTag( "range" ) )
  	{
! 		range = weapon->getTag( "range" ).toInt();
  	}
  
--- 360,370 ----
  	Q_UINT8 range = 1;
  	P_ITEM weapon = m_npc->getWeapon();
! 	if ( weapon )
  	{
! 		if ( weapon->hasTag( "range" ) ) {
! 			range = weapon->getTag( "range" ).toInt();
! 		} else if ( weapon->basedef() ) {
! 			range = weapon->basedef()->getIntProperty( "range", 1 );
! 		}
  	}