[wpdev-commits] wolfpack Timing.cpp,1.175,1.176 npc.cpp,1.36,1.37 npc.h,1.21,1.22 persistentbroker.cpp,1.18,1.19

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

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

Modified Files:
	Timing.cpp npc.cpp npc.h persistentbroker.cpp 
Log Message:
unknown ai not deleted anymore

Index: Timing.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/Timing.cpp,v
retrieving revision 1.175
retrieving revision 1.176
diff -C2 -d -r1.175 -r1.176
*** Timing.cpp	28 Aug 2003 20:56:16 -0000	1.175
--- Timing.cpp	30 Aug 2003 21:30:05 -0000	1.176
***************
*** 362,366 ****
  */
  	
! #pragma note("TODO: jail reimplementation with xml")
  /*
  	// Jail stuff
--- 362,366 ----
  */
  	
! #pragma note("TODO: jail reimplementation with python")
  /*
  	// Jail stuff

Index: npc.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/npc.cpp,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** npc.cpp	27 Aug 2003 23:20:56 -0000	1.36
--- npc.cpp	30 Aug 2003 21:30:05 -0000	1.37
***************
*** 67,70 ****
--- 67,71 ----
  	stablemasterSerial_	= INVALID_SERIAL;
  	wanderType_			= stWanderType();
+ 	aiid_				= "Monster_Aggressive_L1";
  	ai_					= new Monster_Aggressive_L1( this );
  	aiCheckInterval_	= (UINT16)floor(SrvParams->checkAITime() * 1000.0f);
***************
*** 169,180 ****
  		addField( "stablemaster", stablemasterSerial_ );
  		addStrField( "lootlist", lootList_);
! 		if( ai_ )
! 		{
! 			addStrField( "ai", ai_->name() );
! 		}
! 		else
! 		{
! 			addStrField( "ai", QString::null );
! 		}
  		addField( "wandertype", (UINT8)wanderType() );
  		addField( "wanderx1", wanderX1() );
--- 170,174 ----
  		addField( "stablemaster", stablemasterSerial_ );
  		addStrField( "lootlist", lootList_);
! 		addStrField( "ai", aiid_ );
  		addField( "wandertype", (UINT8)wanderType() );
  		addField( "wanderx1", wanderX1() );
***************
*** 1154,1158 ****
  	else GET_PROPERTY( "summontimer", (int)summonTime_) 
  	else GET_PROPERTY( "owner", owner_ )
! 	else GET_PROPERTY( "ai", ai_ ? ai_->name() : QString( "" ) )
  	else GET_PROPERTY( "fleeat", criticalHealth_ )
  	else GET_PROPERTY( "criticalhealth", criticalHealth_ )
--- 1148,1152 ----
  	else GET_PROPERTY( "summontimer", (int)summonTime_) 
  	else GET_PROPERTY( "owner", owner_ )
! 	else GET_PROPERTY( "ai", aiid_ )
  	else GET_PROPERTY( "fleeat", criticalHealth_ )
  	else GET_PROPERTY( "criticalhealth", criticalHealth_ )
***************
*** 1436,1441 ****
  {
  	QString tmp = QStringList::split( ",", data )[0];
  	AbstractAI* ai = AIFactory::instance()->createObject( tmp );
! 	if( !ai )
  		return;
  
--- 1430,1442 ----
  {
  	QString tmp = QStringList::split( ",", data )[0];
+ 	aiid_ = tmp;
+ 	
+ 	if( ai_ )
+ 		delete ai_;
+ 
+ 	ai_ = NULL;
+ 
  	AbstractAI* ai = AIFactory::instance()->createObject( tmp );
! 	if( !ai ) 
  		return;
  
***************
*** 1446,1452 ****
  	}
  	ai->init( this );
- 
- 	if( ai_ )
- 		delete ai_;
  
  	setAI( ai );
--- 1447,1450 ----

Index: npc.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/npc.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** npc.h	27 Aug 2003 20:35:10 -0000	1.21
--- npc.h	30 Aug 2003 21:30:05 -0000	1.22
***************
*** 263,268 ****
  	std::deque< Coord_cl > path_;
  
! 	// NPC AI State Machine interface
  	AbstractAI* ai_;
  
  	// NPC AI check timer
--- 263,271 ----
  	std::deque< Coord_cl > path_;
  
! 	// NPC AI interface
  	AbstractAI* ai_;
+ 
+ 	// NPC AI ID
+ 	QString aiid_;
  
  	// NPC AI check timer

Index: persistentbroker.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/persistentbroker.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** persistentbroker.cpp	29 Aug 2003 17:58:58 -0000	1.18
--- persistentbroker.cpp	30 Aug 2003 21:30:05 -0000	1.19
***************
*** 135,153 ****
  bool PersistentBroker::deleteObject( PersistentObject* object )
  {
! //	static const bool hasTransaction = connection->driver()->hasFeature(QSqlDriver::Transactions);
! //	if ( hasTransaction )
! //		connection->transaction();
  	if ( object->del() )
  	{
! //		if ( hasTransaction )
! //			connection->commit();
  		return true;
  	}
  	else
  	{
! //		if ( hasTransaction )
! //			connection->rollback();
  		return false;
  	}
  }
  
--- 135,156 ----
  bool PersistentBroker::deleteObject( PersistentObject* object )
  {
! 	return object->del();
! 
! /*	static const bool hasTransaction = connection->driver()->hasFeature(QSqlDriver::Transactions);
! 	if ( hasTransaction )
! 		connection->transaction();
  	if ( object->del() )
  	{
! 		if ( hasTransaction )
! 			connection->commit();
  		return true;
  	}
  	else
  	{
! 		if ( hasTransaction )
! 			connection->rollback();
  		return false;
  	}
+ 	*/
  }