[wpdev-commits] wolfpack/ai ai.cpp,1.31,1.32 ai.h,1.15,1.16 ai_humans.cpp,1.19,1.20

[Correa <thi...@us...>]

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

Modified Files:
	ai.cpp ai.h ai_humans.cpp 
Log Message:
- Human_Stablemaster inherits from Human_vendors now
- Added wolfpack.tr to public Python API
- Some additional user visible strings from the core are tr()'ed

Index: ai_humans.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/ai/ai_humans.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** ai_humans.cpp	10 Sep 2004 04:06:27 -0000	1.19
--- ai_humans.cpp	25 Sep 2004 22:57:09 -0000	1.20
***************
*** 73,77 ****
  }
  
! Human_Stablemaster::Human_Stablemaster( P_NPC npc ) : AbstractAI( npc )
  {
  	notorietyOverride_ = 1;
--- 73,77 ----
  }
  
! Human_Stablemaster::Human_Stablemaster( P_NPC npc ) : Human_Vendor( npc )
  {
  	notorietyOverride_ = 1;
***************
*** 97,103 ****
  void Human_Stablemaster::onSpeechInput( P_PLAYER pTalker, const QString& message )
  {
  	if ( !pTalker->socket() )
  		return;
- 
  	if ( m_npc->inRange( pTalker, 4 ) && ( VendorChkName( m_npc, message ) || message.contains( tr( "STABLEMASTER" ) ) ) )
  	{
--- 97,103 ----
  void Human_Stablemaster::onSpeechInput( P_PLAYER pTalker, const QString& message )
  {
+ 	Human_Vendor::onSpeechInput( pTalker, message );
  	if ( !pTalker->socket() )
  		return;
  	if ( m_npc->inRange( pTalker, 4 ) && ( VendorChkName( m_npc, message ) || message.contains( tr( "STABLEMASTER" ) ) ) )
  	{

Index: ai.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/ai/ai.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** ai.h	18 Sep 2004 21:10:40 -0000	1.15
--- ai.h	25 Sep 2004 22:57:09 -0000	1.16
***************
*** 443,446 ****
--- 443,447 ----
  class Human_Vendor : public AbstractAI
  {
+ 	OBJECTDEF(Human_Vendor)
  protected:
  	Human_Vendor() : AbstractAI()
***************
*** 468,475 ****
  class cUORxTarget;
  
! class Human_Stablemaster : public AbstractAI
  {
  protected:
! 	Human_Stablemaster() : AbstractAI()
  	{
  		notorietyOverride_ = 1;
--- 469,477 ----
  class cUORxTarget;
  
! class Human_Stablemaster : public Human_Vendor
  {
+ 	OBJECTDEF(Human_Stablemaster)
  protected:
! 	Human_Stablemaster()
  	{
  		notorietyOverride_ = 1;
***************
*** 647,650 ****
--- 649,653 ----
  class Human_Guard_Called_Fight : public AbstractAction
  {
+ 	OBJECTDEF(Human_Guard_Called_Fight)
  protected:
  	Human_Guard_Called_Fight() : AbstractAction()
***************
*** 769,772 ****
--- 772,776 ----
  class Human_Guard_Fight : public AbstractAction
  {
+ 	OBJECTDEF(Human_Guard_Fight)
  protected:
  	Human_Guard_Fight() : AbstractAction()

Index: ai.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/ai/ai.cpp,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** ai.cpp	19 Sep 2004 22:13:35 -0000	1.31
--- ai.cpp	25 Sep 2004 22:57:09 -0000	1.32
***************
*** 217,221 ****
  		}
  		else
! 			Console::instance()->send( "Action tag in ai definition must contain attributes for pre-,postcondition and execute at least\n" );
  	}
  	else if ( TagName == "onspeech" )
--- 217,221 ----
  		}
  		else
! 			Console::instance()->send( tr("Action tag in ai definition must contain attributes for pre-,postcondition and execute at least\n") );
  	}
  	else if ( TagName == "onspeech" )
***************
*** 943,950 ****
  	else if ( ( comm.contains( " FETCH" ) ) || ( comm.contains( " GET" ) ) )
  	{
! 		//pPlayer->setGuarded(false);
! 		// >> LEGACY
! 		//addx[s]=pPet->serial();
! 		//target(s, 0, 1, 0, 124, "Click on the object to fetch.");
  	}
  	else if ( comm.contains( " COME" ) )
--- 943,948 ----
  	else if ( ( comm.contains( " FETCH" ) ) || ( comm.contains( " GET" ) ) )
  	{
! #pragma note( Implement me )
! 		pTalker->message( tr( "Sorry, not implemented yet :(" ) );
  	}
  	else if ( comm.contains( " COME" ) )