Update of /cvsroot/wpdev/wolfpack/network
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22993
Modified Files:
uosocket.cpp
Log Message:
Fixed bug 0000192
did some refactoring on cUOSocket::sendStatWindow. Reduced the
number of branches ( duplicates. )
Index: uosocket.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/network/uosocket.cpp,v
retrieving revision 1.385
retrieving revision 1.386
diff -C2 -d -r1.385 -r1.386
*** uosocket.cpp 4 Aug 2004 23:17:38 -0000 1.385
--- uosocket.cpp 5 Aug 2004 01:29:04 -0000 1.386
***************
*** 611,615 ****
QValueVector<P_PLAYER> characters = _account->caracterList();
! if ( packet->slot() >= characters.size() )
{
cUOTxDenyLogin denyLogin;
--- 611,615 ----
QValueVector<P_PLAYER> characters = _account->caracterList();
! if ( packet->slot() > characters.size() )
{
cUOTxDenyLogin denyLogin;
***************
*** 2364,2367 ****
--- 2364,2370 ----
sendStats.setAllowRename( ( ( pChar->objectType() == enNPC && dynamic_cast<P_NPC>( pChar )->owner() == _player && !pChar->isHuman() ) || _player->isGM() ) && ( _player != pChar ) );
+ sendStats.setName( pChar->name() );
+ sendStats.setSerial( pChar->serial() );
+
if ( pChar != _player )
{
***************
*** 2376,2387 ****
sendStats.setMaxHp( pChar->maxHitpoints() );
sendStats.setHp( pChar->hitpoints() );
- }
-
- sendStats.setName( pChar->name() );
- sendStats.setSerial( pChar->serial() );
-
- // Set the rest - and reset if nec.
- if ( pChar == _player )
- {
sendStats.setStamina( _player->stamina() );
sendStats.setMaxStamina( _player->maxStamina() );
--- 2379,2382 ----
***************
*** 2418,2433 ****
stats.setLocks( _player->strengthLock(), _player->dexterityLock(), _player->intelligenceLock() );
send( &stats );
- }
! // Send the packet to our party members too
! if ( pChar == _player && _player->party() )
! {
! QPtrList<cPlayer> members = _player->party()->members();
!
! for ( P_PLAYER member = members.first(); member; member = members.next() )
{
! if ( member->socket() && member != _player )
{
! member->socket()->send( &sendStats );
}
}
--- 2413,2428 ----
stats.setLocks( _player->strengthLock(), _player->dexterityLock(), _player->intelligenceLock() );
send( &stats );
! // Send the packet to our party members too
! if ( _player->party() )
{
! QPtrList<cPlayer> members = _player->party()->members();
!
! for ( P_PLAYER member = members.first(); member; member = members.next() )
{
! if ( member->socket() && member != _player )
! {
! member->socket()->send( &sendStats );
! }
}
}
|
