Update of /cvsroot/wpdev/wolfpack/network
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30480/network
Modified Files:
uosocket.cpp
Log Message:
containers and corpses now ignore the object delay
Index: uosocket.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/network/uosocket.cpp,v
retrieving revision 1.421
retrieving revision 1.422
diff -C2 -d -r1.421 -r1.422
*** uosocket.cpp 29 Sep 2004 19:08:17 -0000 1.421
--- uosocket.cpp 1 Oct 2004 10:14:52 -0000 1.422
***************
*** 3065,3075 ****
bool cUOSocket::useItem( P_ITEM item )
{
! if ( !_player->isGM() && _player->objectDelay() >= Server::instance()->time() )
! {
! sysMessage( tr( "You must wait to perform another action." ) );
! return false;
}
- else
- _player->setObjectDelay( Config::instance()->objectDelay() * MY_CLOCKS_PER_SEC + Server::instance()->time() );
// Cant use stuff that isn't in your pack.
--- 3065,3077 ----
bool cUOSocket::useItem( P_ITEM item )
{
! if (item->type() != 1 && !item->corpse()) {
! if ( !_player->isGM() && _player->objectDelay() >= Server::instance()->time() )
! {
! sysMessage( tr( "You must wait to perform another action." ) );
! return false;
! }
! else
! _player->setObjectDelay( Config::instance()->objectDelay() * MY_CLOCKS_PER_SEC + Server::instance()->time() );
}
// Cant use stuff that isn't in your pack.
|
