Update of /cvsroot/wpdev/wolfpack/ai
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30412/ai
Modified Files:
ai_humans.cpp
Log Message:
stables 1.0
Index: ai_humans.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/ai/ai_humans.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** ai_humans.cpp 13 Aug 2004 08:55:27 -0000 1.17
--- ai_humans.cpp 4 Sep 2004 08:32:38 -0000 1.18
***************
*** 35,38 ****
--- 35,39 ----
#include "../timers.h"
#include "../serverconfig.h"
+ #include "../console.h"
#include "../sectors.h"
***************
*** 110,113 ****
--- 111,115 ----
int gold = pTalker->countBankGold() + pTalker->countGold();
P_ITEM pPack = m_npc->getBankbox();
+
cItem::ContainerContent stableitems;
if ( pPack )
***************
*** 137,140 ****
--- 139,144 ----
{
pPet->free = false;
+ // we need this for db saves
+ pPet->setStablemasterSerial( INVALID_SERIAL );
pPet->moveTo( m_npc->pos() );
pPet->resend();
***************
*** 184,188 ****
// but will still be saved.
P_ITEM pGem = new cItem();
! pGem->Init( false );
pGem->setTag( "player", cVariant( player->serial() ) );
pGem->setTag( "pet", cVariant( pPet->serial() ) );
--- 188,192 ----
// but will still be saved.
P_ITEM pGem = new cItem();
! pGem->Init( true );
pGem->setTag( "player", cVariant( player->serial() ) );
pGem->setTag( "pet", cVariant( pPet->serial() ) );
***************
*** 193,201 ****
pGem->update();
! pPet->free = true;
MapObjects::instance()->remove( pPet );
pPet->removeFromView();
! m_npc->talk( tr( "Say release to get your pet back!" ) );
}
--- 197,208 ----
pGem->update();
!
! //pPet->free = true;
MapObjects::instance()->remove( pPet );
+ pPet->setStablemasterSerial( this->m_npc->serial() );
pPet->removeFromView();
! // we need this for db saves
! m_npc->talk( tr( "Say release to get your pet back!" ) );
}
|
