[wpdev-commits] wolfpack ai.cpp,1.20,1.21 ai_humans.cpp,1.2,1.3 ai_monsters.cpp,1.11,1.12 npc.cpp,1.47,1.48

[<xs...@us...>]

Update of /cvsroot/wpdev/wolfpack
In directory sc8-pr-cvs1:/tmp/cvs-serv5514

Modified Files:
	ai.cpp ai_humans.cpp ai_monsters.cpp npc.cpp 
Log Message:
slight fixes

Index: ai.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/ai.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** ai.cpp	20 Sep 2003 01:05:09 -0000	1.20
--- ai.cpp	23 Sep 2003 15:36:30 -0000	1.21
***************
*** 443,446 ****
--- 443,449 ----
  void Action_Wander::execute()
  {
+ 	if( m_npc->isAtWar() )
+ 		m_npc->toggleCombat();
+ 
  	switch( m_npc->wanderType() )
  	{

Index: ai_humans.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/ai_humans.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ai_humans.cpp	23 Sep 2003 11:53:30 -0000	1.2
--- ai_humans.cpp	23 Sep 2003 15:36:30 -0000	1.3
***************
*** 412,415 ****
--- 412,418 ----
  	}
  
+ 	if( !m_npc->isAtWar() )
+ 		m_npc->toggleCombat();
+ 
  	// Fighting is handled within combat..
  }
***************
*** 436,439 ****
--- 439,445 ----
  void Human_Guard_MoveToTarget::execute()
  {
+ 	if( !m_npc->isAtWar() )
+ 		m_npc->toggleCombat();
+ 
  	Human_Guard* pAI = dynamic_cast< Human_Guard* >(m_ai);
  	P_CHAR pTarget = ( pAI ? pAI->currentVictim() : NULL );

Index: ai_monsters.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/ai_monsters.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** ai_monsters.cpp	20 Aug 2003 17:10:48 -0000	1.11
--- ai_monsters.cpp	23 Sep 2003 15:36:30 -0000	1.12
***************
*** 245,248 ****
--- 245,251 ----
  void Monster_Aggr_MoveToTarget::execute()
  {
+ 	if( !m_npc->isAtWar() )
+ 		m_npc->toggleCombat();
+ 
  	Monster_Aggressive* pAI = dynamic_cast< Monster_Aggressive* >( m_ai );
  	if( !pAI || !pAI->currentVictim() )
***************
*** 310,313 ****
--- 313,319 ----
  void Monster_Aggr_Fight::execute()
  {
+ 	if( !m_npc->isAtWar() )
+ 		m_npc->toggleCombat();
+ 
  	// the execution of combat is handled somewhere else ;)
  	// nothing to do

Index: npc.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/npc.cpp,v
retrieving revision 1.47
retrieving revision 1.48
diff -C2 -d -r1.47 -r1.48
*** npc.cpp	23 Sep 2003 12:40:18 -0000	1.47
--- npc.cpp	23 Sep 2003 15:36:30 -0000	1.48
***************
*** 921,925 ****
  {
  	setAtWar( !isAtWar() );
! 	Movement::instance()->CombatWalk( this );
  }
  
--- 921,925 ----
  {
  	setAtWar( !isAtWar() );
! 	update();
  }