Update of /cvsroot/wpdev/wolfpack
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26956
Modified Files:
basechar.cpp timing.cpp
Log Message:
various
Index: timing.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/timing.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** timing.cpp 3 Oct 2004 13:51:39 -0000 1.16
--- timing.cpp 7 Oct 2004 23:02:26 -0000 1.17
***************
*** 387,391 ****
// Criminal Flagging
! if ( player->criminalTime() > 0 && player->criminalTime() <= time )
{
socket->sysMessage( tr( "You are no longer criminal." ) );
--- 387,391 ----
// Criminal Flagging
! if ( player->criminalTime() != 0 && player->criminalTime() <= time )
{
socket->sysMessage( tr( "You are no longer criminal." ) );
Index: basechar.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/basechar.cpp,v
retrieving revision 1.157
retrieving revision 1.158
diff -C2 -d -r1.157 -r1.158
*** basechar.cpp 1 Oct 2004 16:32:52 -0000 1.157
--- basechar.cpp 7 Oct 2004 23:02:26 -0000 1.158
***************
*** 331,336 ****
hunger_ = atoi( result[offset++] );
poison_ = ( char ) atoi( result[offset++] );
! murdererTime_ = atoi( result[offset++] ) + Server::instance()->time();
! criminalTime_ = atoi( result[offset++] ) + Server::instance()->time();
gender_ = atoi( result[offset++] );
propertyFlags_ = atoi( result[offset++] );
--- 331,342 ----
hunger_ = atoi( result[offset++] );
poison_ = ( char ) atoi( result[offset++] );
! murdererTime_ = atoi( result[offset++] );
! if (murdererTime_ != 0) {
! murdererTime_ += Server::instance()->time();
! }
! criminalTime_ = atoi( result[offset++] );
! if (criminalTime_ != 0) {
! criminalTime_ += Server::instance()->time();
! }
gender_ = atoi( result[offset++] );
propertyFlags_ = atoi( result[offset++] );
|
