[wpdev-commits] wolfpack/network asyncnetio.cpp,1.46,1.47 uopacket.cpp,1.43,1.44 uosocket.cpp,1.383,1.384 uosocket.h,1.120,1.121 uotxpackets.cpp,1.98,1.99 uotxpackets.h,1.110,1.111

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

Update of /cvsroot/wpdev/wolfpack/network
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23998/network

Modified Files:
	asyncnetio.cpp uopacket.cpp uosocket.cpp uosocket.h 
	uotxpackets.cpp uotxpackets.h 
Log Message:
clean ups

Index: uotxpackets.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/network/uotxpackets.h,v
retrieving revision 1.110
retrieving revision 1.111
diff -C2 -d -r1.110 -r1.111
*** uotxpackets.h	2 Jul 2004 06:01:31 -0000	1.110
--- uotxpackets.h	27 Jul 2004 06:35:23 -0000	1.111
***************
*** 1123,1127 ****
  		( *this )[1] = data;
  	}
! 	void setCoord( Coord_cl coord );
  	void setDirection( unsigned char data )
  	{
--- 1123,1127 ----
  		( *this )[1] = data;
  	}
! 	void setCoord( const Coord_cl& coord );
  	void setDirection( unsigned char data )
  	{
***************
*** 2328,2332 ****
  	}
  	void addTile( unsigned short id, short x, short y, short z );
! 	void addTile( unsigned short id, Coord_cl coords )
  	{
  		addTile( id, coords.x, coords.y, coords.z );
--- 2328,2332 ----
  	}
  	void addTile( unsigned short id, short x, short y, short z );
! 	void addTile( unsigned short id, const Coord_cl& coords )
  	{
  		addTile( id, coords.x, coords.y, coords.z );

Index: uopacket.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/network/uopacket.cpp,v
retrieving revision 1.43
retrieving revision 1.44
diff -C2 -d -r1.43 -r1.44
*** uopacket.cpp	2 Jun 2004 15:04:09 -0000	1.43
--- uopacket.cpp	27 Jul 2004 06:35:22 -0000	1.44
***************
*** 498,502 ****
  cUOPacket& cUOPacket::operator=( cUOPacket& p )
  {
! 	assign( p );
  	return *this;
  }
--- 498,503 ----
  cUOPacket& cUOPacket::operator=( cUOPacket& p )
  {
! 	if ( &p != this )
! 		assign( p );
  	return *this;
  }

Index: asyncnetio.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/network/asyncnetio.cpp,v
retrieving revision 1.46
retrieving revision 1.47
diff -C2 -d -r1.46 -r1.47
*** asyncnetio.cpp	22 Jul 2004 13:38:32 -0000	1.46
--- asyncnetio.cpp	27 Jul 2004 06:35:22 -0000	1.47
***************
*** 402,406 ****
  	{
  		mapsMutex.lock(); // do not disturb me here.
! 		for ( const_iterator it = buffers.begin(); it != buffers.end(); ++it )
  		{
  			// Read all avaliable data.
--- 402,406 ----
  	{
  		mapsMutex.lock(); // do not disturb me here.
! 		for ( const_iterator it(buffers.begin()); it != buffers.end(); ++it )
  		{
  			// Read all avaliable data.

Index: uosocket.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/network/uosocket.h,v
retrieving revision 1.120
retrieving revision 1.121
diff -C2 -d -r1.120 -r1.121
*** uosocket.h	22 Jul 2004 13:38:33 -0000	1.120
--- uosocket.h	27 Jul 2004 06:35:22 -0000	1.121
***************
*** 268,272 ****
  	void attachTarget( cTargetRequest* request );
  	void attachTarget( cTargetRequest* request, UINT16 multiid );
! 	void attachTarget( cTargetRequest* request, std::vector<stTargetItem> items, INT16 xOffset = 0, INT16 yOffset = 0, INT16 zOffset = 0 );
  	void cancelTarget();
  	void resendWorld( bool clean = true );
--- 268,272 ----
  	void attachTarget( cTargetRequest* request );
  	void attachTarget( cTargetRequest* request, UINT16 multiid );
! 	void attachTarget( cTargetRequest* request, std::vector<stTargetItem>& items, INT16 xOffset = 0, INT16 yOffset = 0, INT16 zOffset = 0 );
  	void cancelTarget();
  	void resendWorld( bool clean = true );

Index: uosocket.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/network/uosocket.cpp,v
retrieving revision 1.383
retrieving revision 1.384
diff -C2 -d -r1.383 -r1.384
*** uosocket.cpp	22 Jul 2004 13:38:33 -0000	1.383
--- uosocket.cpp	27 Jul 2004 06:35:22 -0000	1.384
***************
*** 2058,2062 ****
  }
  
! void cUOSocket::attachTarget( cTargetRequest* request, std::vector<stTargetItem> items, INT16 xOffset, INT16 yOffset, INT16 zOffset )
  {
  	// Let the old one time out
--- 2058,2062 ----
  }
  
! void cUOSocket::attachTarget( cTargetRequest* request, std::vector<stTargetItem>& items, INT16 xOffset, INT16 yOffset, INT16 zOffset )
  {
  	// Let the old one time out
***************
*** 2510,2517 ****
  struct buyitem_st
  {
! 	buyitem_st() : buyprice( 0 ), name( "" )
  	{
  	}
! 	buyitem_st( int bi, QString n ) : buyprice( bi ), name( n )
  	{
  	}
--- 2510,2517 ----
  struct buyitem_st
  {
! 	buyitem_st() : buyprice( 0 )
  	{
  	}
! 	buyitem_st( int bi, const QString& n ) : buyprice( bi ), name( n )
  	{
  	}

Index: uotxpackets.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/network/uotxpackets.cpp,v
retrieving revision 1.98
retrieving revision 1.99
diff -C2 -d -r1.98 -r1.99
*** uotxpackets.cpp	21 Jul 2004 12:42:55 -0000	1.98
--- uotxpackets.cpp	27 Jul 2004 06:35:22 -0000	1.99
***************
*** 237,241 ****
  }
  
! void cUOTxDenyMove::setCoord( Coord_cl coord )
  {
  	setShort( 2, coord.x );
--- 237,241 ----
  }
  
! void cUOTxDenyMove::setCoord( const Coord_cl& coord )
  {
  	setShort( 2, coord.x );