[wpdev-commits] wolfpack/network asyncnetio.cpp,1.33,1.34 uorxpackets.h,1.50,1.51 uosocket.cpp,1.280,1.281

[<thi...@us...>]

Update of /cvsroot/wpdev/wolfpack/network
In directory sc8-pr-cvs1:/tmp/cvs-serv32708/network

Modified Files:
	asyncnetio.cpp uorxpackets.h uosocket.cpp 
Log Message:
- removed guildstone.cpp/h
- removed the UOXSOCKET typedef
- fixed small compile warning


Index: asyncnetio.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/network/asyncnetio.cpp,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** asyncnetio.cpp	30 Aug 2003 17:00:11 -0000	1.33
--- asyncnetio.cpp	3 Sep 2003 20:58:17 -0000	1.34
***************
*** 135,146 ****
  
  cAsyncNetIOPrivate::cAsyncNetIOPrivate() 
! 	: socket(0), rsize(0), wsize(0), rindex(0), windex(0), skippedUOHeader(false)
  {
      rba.setAutoDelete( TRUE );
      wba.setAutoDelete( TRUE );
  	packets = new std::deque<cUOPacket*>;
- 	
- 	// Encryption
- 	encryption = 0;
  }
  
--- 135,143 ----
  
  cAsyncNetIOPrivate::cAsyncNetIOPrivate() 
! 	: socket(0), rsize(0), wsize(0), rindex(0), windex(0), skippedUOHeader(false), encryption(0)
  {
      rba.setAutoDelete( TRUE );
      wba.setAutoDelete( TRUE );
  	packets = new std::deque<cUOPacket*>;
  }
  
***************
*** 149,160 ****
  	for ( uint i = 0; i < packets->size(); ++i )
  	{
! 		QMutexLocker lock( &packetsMutex );
  		delete packets->front();
  		packets->pop_front();
  	}
  	delete packets;
! 
! 	if( encryption )
! 		delete encryption;
  }
  
--- 146,155 ----
  	for ( uint i = 0; i < packets->size(); ++i )
  	{
! 		/// QMutexLocker lock( &packetsMutex ); I think it's safe not to lock here.
  		delete packets->front();
  		packets->pop_front();
  	}
  	delete packets;
! 	delete encryption;
  }
  

Index: uorxpackets.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/network/uorxpackets.h,v
retrieving revision 1.50
retrieving revision 1.51
diff -C2 -d -r1.50 -r1.51
*** uorxpackets.h	30 Aug 2003 17:00:12 -0000	1.50
--- uorxpackets.h	3 Sep 2003 20:58:17 -0000	1.51
***************
*** 614,618 ****
  public:
  	cUORxSell( const QByteArray &data ): cUOPacket( data ) {}
! 	uint serial() const				{ return getInt( 3 ); }
  	ushort itemCount() const			{ return getShort( 7 ); }
  	uint iSerial( ushort item ) const	{ return getInt( 9 + ( item * 6 ) ); }
--- 614,618 ----
  public:
  	cUORxSell( const QByteArray &data ): cUOPacket( data ) {}
! 	uint serial() const					{ return getInt( 3 ); }
  	ushort itemCount() const			{ return getShort( 7 ); }
  	uint iSerial( ushort item ) const	{ return getInt( 9 + ( item * 6 ) ); }

Index: uosocket.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/network/uosocket.cpp,v
retrieving revision 1.280
retrieving revision 1.281
diff -C2 -d -r1.280 -r1.281
*** uosocket.cpp	30 Aug 2003 17:00:12 -0000	1.280
--- uosocket.cpp	3 Sep 2003 20:58:17 -0000	1.281
***************
*** 50,54 ****
  #include "../scriptmanager.h"
  #include "../walking.h"
- #include "../guildstones.h"
  #include "../combat.h"
  #include "../gumps.h"
--- 50,53 ----
***************
*** 1844,1848 ****
  	if( pc_i->inGuardedArea() && SrvParams->guardsActive() )
  	{
! 		if( pc_i->objectType() == enPlayer && pc_i->isInnocent() && GuildCompare( _player, pc_i ) == 0 ) //REPSYS
  		{
  			_player->makeCriminal();
--- 1843,1847 ----
  	if( pc_i->inGuardedArea() && SrvParams->guardsActive() )
  	{
! 		if( pc_i->objectType() == enPlayer && pc_i->isInnocent() /*&& GuildCompare( _player, pc_i ) == 0*/ ) //REPSYS
  		{
  			_player->makeCriminal();
***************
*** 1880,1884 ****
  		if( pc_i->isInnocent() )
  		{
! 			if( pc_i->objectType() == enPlayer && GuildCompare( _player, pc_i ) == 0 )
  			{
  				_player->makeCriminal();
--- 1879,1883 ----
  		if( pc_i->isInnocent() )
  		{
! 			if( pc_i->objectType() == enPlayer /*&& GuildCompare( _player, pc_i ) == 0*/ )
  			{
  				_player->makeCriminal();