[wpdev-commits] wolfpack/network asyncnetio.cpp,1.47,1.48 network.cpp,1.2,1.3 uosocket.cpp,1.384,1.385

[Richard M. <dr...@us...>]

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

Modified Files:
	asyncnetio.cpp network.cpp uosocket.cpp 
Log Message:
config.h and config.cpp moved to serverconfig.h and serverconfig.cpp
This is to prevent a conflict with Automake.


Index: network.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/network/network.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** network.cpp	2 Jun 2004 15:04:09 -0000	1.2
--- network.cpp	4 Aug 2004 23:17:38 -0000	1.3
***************
*** 31,35 ****
  //Wolfpack Includes
  #include "network.h"
! #include "../config.h"
  
  #include "../console.h"
--- 31,35 ----
  //Wolfpack Includes
  #include "network.h"
! #include "../serverconfig.h"
  
  #include "../console.h"

Index: uosocket.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/network/uosocket.cpp,v
retrieving revision 1.384
retrieving revision 1.385
diff -C2 -d -r1.384 -r1.385
*** uosocket.cpp	27 Jul 2004 06:35:22 -0000	1.384
--- uosocket.cpp	4 Aug 2004 23:17:38 -0000	1.385
***************
*** 45,49 ****
  #include "../speech.h"
  #include "../commands.h"
! #include "../config.h"
  #include "../definitions.h"
  #include "../scriptmanager.h"
--- 45,49 ----
  #include "../speech.h"
  #include "../commands.h"
! #include "../serverconfig.h"
  #include "../definitions.h"
  #include "../scriptmanager.h"
***************
*** 106,110 ****
  PyObject* cUOSocket::handlers[255] =
  {
! 	0, 
  };
  
--- 106,110 ----
  PyObject* cUOSocket::handlers[255] =
  {
! 	0,
  };
  
***************
*** 263,267 ****
  	// This is always checked before anything else
  	if (packetId == 0x02 && Config::instance()->antiSpeedHack()) {
! 		if (_player && !_player->isGM()) {			
  			// There are two different delays for mounted and unmounted players
  			unsigned int delay;
--- 263,267 ----
  	// This is always checked before anything else
  	if (packetId == 0x02 && Config::instance()->antiSpeedHack()) {
! 		if (_player && !_player->isGM()) {
  			// There are two different delays for mounted and unmounted players
  			unsigned int delay;
***************
*** 272,276 ****
  			}
  
! 			// If the last movement of our player was not X ms in the past, 
  			// requeue the walk request until we can fullfil it.
  			//unsigned int time = getNormalizedTime();
--- 272,276 ----
  			}
  
! 			// If the last movement of our player was not X ms in the past,
  			// requeue the walk request until we can fullfil it.
  			//unsigned int time = getNormalizedTime();

Index: asyncnetio.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/network/asyncnetio.cpp,v
retrieving revision 1.47
retrieving revision 1.48
diff -C2 -d -r1.47 -r1.48
*** asyncnetio.cpp	27 Jul 2004 06:35:22 -0000	1.47
--- asyncnetio.cpp	4 Aug 2004 23:17:38 -0000	1.48
***************
*** 29,33 ****
  #include "uorxpackets.h"
  #include "uopacket.h"
! #include "../config.h"
  
  #include "../basics.h"
--- 29,33 ----
  #include "uorxpackets.h"
  #include "uopacket.h"
! #include "../serverconfig.h"
  
  #include "../basics.h"