[wpdev-commits] wolfpack ai.h,1.16,1.17 npc.cpp,1.41,1.42

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

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

Modified Files:
	ai.h npc.cpp 
Log Message:
Added a notority override.

Index: ai.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/ai.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** ai.h	9 Jul 2003 20:23:16 -0000	1.16
--- ai.h	9 Sep 2003 17:22:55 -0000	1.17
***************
*** 91,98 ****
  {
  protected:
! 	AbstractAI() : m_npc( NULL ), m_currentAction( NULL ) { m_actions.setAutoDelete( true ); }
  
  public:
! 	AbstractAI( P_NPC npc ) : m_npc( npc ), m_currentAction( NULL ) { m_actions.setAutoDelete( true ); }
  	virtual ~AbstractAI() {} // virtual destructor.
  
--- 91,98 ----
  {
  protected:
! 	AbstractAI() : m_npc( NULL ), m_currentAction( NULL ), notorityOverride_( 0 ) { m_actions.setAutoDelete( true ); }
  
  public:
! 	AbstractAI( P_NPC npc ) : m_npc( npc ), m_currentAction( NULL ), notorityOverride_( 0 ) { m_actions.setAutoDelete( true ); }
  	virtual ~AbstractAI() {} // virtual destructor.
  
***************
*** 108,111 ****
--- 108,114 ----
  	void			setNPC( P_NPC npc ) { m_npc = npc; }
  
+ 	unsigned char	notorityOverride() const { return notorityOverride_; }
+ 	void			setNotorityOverride( unsigned char value ) { notorityOverride_ = value; }
+ 
  	// This is for creating AI interfaces through the AIFactory
  	virtual void	init( P_NPC npc )
***************
*** 123,126 ****
--- 126,130 ----
  	AbstractAction*	m_currentAction;
  	QPtrList< AbstractAction >	m_actions;
+ 	unsigned char	notorityOverride_;
  };
  
***************
*** 219,226 ****
  {
  protected:
! 	Monster_Aggressive() : AbstractAI(), m_currentVictim( NULL ) {}
  
  public:
! 	Monster_Aggressive( P_NPC npc ) : AbstractAI( npc ), m_currentVictim( NULL ) {} 
  
  	virtual void check();
--- 223,236 ----
  {
  protected:
! 	Monster_Aggressive() : AbstractAI(), m_currentVictim( NULL )
! 	{
! 		 notorityOverride_ = 6;
! 	}
  
  public:
! 	Monster_Aggressive( P_NPC npc ) : AbstractAI( npc ), m_currentVictim( NULL )
! 	{
! 		notorityOverride_ = 6;
! 	}
  
  	virtual void check();
***************
*** 256,260 ****
  {
  protected:
! 	Monster_Aggressive_L1() : Monster_Aggressive() {}
  
  public:
--- 266,270 ----
  {
  protected:
! 	Monster_Aggressive_L1() : Monster_Aggressive(){}
  
  public:
***************
*** 277,285 ****
  {
  protected:
! 	Human_Vendor() : AbstractAI() {}
  
  public:
! 	Human_Vendor( P_NPC npc ) : AbstractAI( npc ) 
  	{
  		m_actions.append( new Action_Wander( npc, this ) );
  		m_actions.append( new Action_FleeAttacker( npc, this ) );
--- 287,299 ----
  {
  protected:
! 	Human_Vendor() : AbstractAI()
! 	{
! 		 notorityOverride_ = 1;
! 	}
  
  public:
! 	Human_Vendor( P_NPC npc ) : AbstractAI( npc )
  	{
+ 		notorityOverride_ = 1;
  		m_actions.append( new Action_Wander( npc, this ) );
  		m_actions.append( new Action_FleeAttacker( npc, this ) );
***************
*** 297,301 ****
  {
  protected:
! 	Human_Stablemaster() : AbstractAI() {}
  
  public:
--- 311,318 ----
  {
  protected:
! 	Human_Stablemaster() : AbstractAI()
! 	{
! 		 notorityOverride_ = 1;
! 	}
  
  public:

Index: npc.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/npc.cpp,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -d -r1.41 -r1.42
*** npc.cpp	8 Sep 2003 10:58:47 -0000	1.41
--- npc.cpp	9 Sep 2003 17:22:55 -0000	1.42
***************
*** 369,372 ****
--- 369,375 ----
  //		return 0x06; // 6 = Red -> Monster
  
+ 	if( ai_ && ai_->notorityOverride() )
+ 		return ai_->notorityOverride();
+ 
  	if( pChar->kills() > SrvParams->maxkills() )
  		result = 0x06; // 6 = Red -> Murderer