[wpdev-commits] wolfpack/network listener.cpp,1.14,1.15 uosocket.cpp,1.293,1.294

[<dar...@us...>]

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

Modified Files:
	listener.cpp uosocket.cpp 
Log Message:
Had to rename destroy to destroy_object because of a naming clash with std::destroy in some cases (STLPort)

Index: listener.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/network/listener.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** listener.cpp	19 Sep 2003 20:41:08 -0000	1.14
--- listener.cpp	19 Sep 2003 22:02:41 -0000	1.15
***************
*** 66,70 ****
  cListener::~cListener() throw()
  {
! 	std::for_each( readyConnections.begin(), readyConnections.end(), destroy<QSocketDevice*>() );
  }
  
--- 66,70 ----
  cListener::~cListener() throw()
  {
! 	std::for_each( readyConnections.begin(), readyConnections.end(), destroy_obj<QSocketDevice*>() );
  }
  

Index: uosocket.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/network/uosocket.cpp,v
retrieving revision 1.293
retrieving revision 1.294
diff -C2 -d -r1.293 -r1.294
*** uosocket.cpp	19 Sep 2003 20:41:08 -0000	1.293
--- uosocket.cpp	19 Sep 2003 22:02:41 -0000	1.294
***************
*** 1868,1879 ****
  	}
  
- /*	// Playervendors are invulnerable
- 	if( pc_i->npcaitype() == 17 ) 
- 	{
- 		sysMessage( tr( "%1 cannot be harmed." ).arg( pc_i->name() ) );
- 		send( &attack );
- 		return;
- 	}*/
- 
  	_player->setCombatTarget( pc_i->serial() );
  	_player->unhide();
--- 1868,1871 ----