Update of /cvsroot/wpdev/wolfpack
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14360a
Modified Files:
npc.cpp
Log Message:
Fix for items not being removed from their spawnregion if grabbed.
Index: npc.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/npc.cpp,v
retrieving revision 1.98
retrieving revision 1.99
diff -C2 -d -r1.98 -r1.99
*** npc.cpp 5 Jul 2004 19:59:38 -0000 1.98
--- npc.cpp 18 Jul 2004 19:58:20 -0000 1.99
***************
*** 186,197 ****
}
! void cNPC::setOwner( P_PLAYER data, bool nochecks )
! {
! // We CANT be our own owner
! if ( data && ( data->serial() == this->serial() ) )
! return;
!
! if ( !nochecks && owner_ )
! {
owner_->removePet( this, true );
}
--- 186,191 ----
}
! void cNPC::setOwner(P_PLAYER data, bool nochecks) {
! if (!nochecks && owner_) {
owner_->removePet( this, true );
}
***************
*** 201,207 ****
changed_ = true;
! if ( !nochecks && owner_ )
! {
! owner_->addPet( this, true );
}
}
--- 195,201 ----
changed_ = true;
! if (!nochecks && owner_) {
! owner_->addPet(this, true);
! setSpawnregion(0);
}
}
|
