[wpdev-commits] wolfpack basechar.cpp,1.142,1.143 npc.cpp,1.111,1.112 world.cpp,1.121,1.122

[spddmn <xxx...@us...>]

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

Modified Files:
	basechar.cpp npc.cpp world.cpp 
Log Message:
final stuff for stables 1.0

Index: world.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/world.cpp,v
retrieving revision 1.121
retrieving revision 1.122
diff -C2 -d -r1.121 -r1.122
*** world.cpp	31 Aug 2004 22:40:20 -0000	1.121
--- world.cpp	4 Sep 2004 08:36:22 -0000	1.122
***************
*** 708,730 ****
  			P_NPC pNPC = dynamic_cast<P_NPC>( pChar );
  
- 			// Find Owner
- 			if ( pNPC && pNPC->owner() )
- 			{
- 				SERIAL owner = pNPC->owner()->serial();
- 
- 				P_PLAYER pOwner = dynamic_cast<P_PLAYER>( FindCharBySerial( owner ) );
- 				if ( pOwner )
- 				{
- 					pNPC->setOwner( pOwner );
- 					pOwner->addPet( pNPC, true );
- 				}
- 				else
- 				{
- 					Console::instance()->send( QString( "The owner of Serial 0x%1 is invalid: %2" ).arg( pNPC->serial(), 0, 16 ).arg( owner, 0, 16 ) );
- 					pNPC->setOwner( NULL );
- 				}
- 			}
- 
  			// Find Guarding
  			if ( pChar->guarding() )
  			{
--- 708,713 ----
  			P_NPC pNPC = dynamic_cast<P_NPC>( pChar );
  
  			// Find Guarding
+ 			// this needs to move to postprocessing
  			if ( pChar->guarding() )
  			{

Index: basechar.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/basechar.cpp,v
retrieving revision 1.142
retrieving revision 1.143
diff -C2 -d -r1.142 -r1.143
*** basechar.cpp	3 Sep 2004 19:23:14 -0000	1.142
--- basechar.cpp	4 Sep 2004 08:36:20 -0000	1.143
***************
*** 399,405 ****
  void cBaseChar::save()
  {
- 	initSave;
  	if ( changed_ )
  	{
  		setTable( "characters" );
  
--- 399,405 ----
  void cBaseChar::save()
  {
  	if ( changed_ )
  	{
+ 		initSave;
  		setTable( "characters" );
  
***************
*** 465,469 ****
  	}
  	PersistentBroker::instance()->unlockTable( "skills" );
- 
  	cUObject::save();
  }
--- 465,468 ----

Index: npc.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/npc.cpp,v
retrieving revision 1.111
retrieving revision 1.112
diff -C2 -d -r1.111 -r1.112
*** npc.cpp	31 Aug 2004 22:04:39 -0000	1.111
--- npc.cpp	4 Sep 2004 08:36:22 -0000	1.112
***************
*** 170,175 ****
  		summonTime_ += Server::instance()->time();
  	additionalFlags_ = atoi( result[offset++] );
! 	ser = atoi( result[offset++] );
! 	owner_ = dynamic_cast<P_PLAYER>( FindCharBySerial( ser ) );
  	stablemasterSerial_ = atoi( result[offset++] );
  	setAI( result[offset++] );
--- 170,174 ----
  		summonTime_ += Server::instance()->time();
  	additionalFlags_ = atoi( result[offset++] );
! 	owner_ =  reinterpret_cast<P_PLAYER>(atoi(result[offset++]));
  	stablemasterSerial_ = atoi( result[offset++] );
  	setAI( result[offset++] );
***************
*** 186,190 ****
  
  void cNPC::save()
! {
  	if ( changed_ )
  	{
--- 185,189 ----
  
  void cNPC::save()
! {	
  	if ( changed_ )
  	{
***************
*** 208,211 ****
--- 207,211 ----
  		saveFields;
  	}
+ 	
  	cBaseChar::save();
  }
***************
*** 1381,1384 ****
--- 1381,1386 ----
  		MapObjects::instance()->remove( this );
  	}
+ 
+ 
  }