[wpdev-commits] wolfpack Timing.cpp,1.177,1.178 Timing.h,1.10,1.11 Trade.cpp,1.87,1.88 Trade.h,1.16,1.17 ai.cpp,1.16,1.17 basedef.cpp,1.2,1.3 basedef.h,1.2,1.3 basics.h,1.14,1.15 boats.cpp,1.112,1.113 chars.h,1.201,1.202 combat.cpp,1.148,1.149 commands.cpp,1.197,1.198 contextmenu.cpp,1.14,1.15 coord.cpp,1.26,1.27 customtags.cpp,1.29,1.30 dbl_single_click.cpp,1.220,1.221 dragdrop.cpp,1.197,1.198 encryption.cpp,1.12,1.13 globals.cpp,1.99,1.100 globals.h,1.73,1.74 gumps.cpp,1.142,1.143 house.cpp,1.113,1.114 house.h,1.30,1.31 itemid.cpp,1.9,1.10 items.cpp,1.346,1.347 makemenus.cpp,1.57,1.58 npc.cpp,1.39,1.40 pagesystem.h,1.10,1.11 platform.h,1.10,1.11 player.cpp,1.35,1.36 prototypes.h,1.109,1.110 pythonscript.cpp,1.7,1.8 scriptmanager.cpp,1.4,1.5 scriptmanager.h,1.3,1.4 serbinfile.cpp,1.25,1.26 serxmlfile.cpp,1.21,1.22 skills.cpp,1.206,1.207 spawnregions.cpp,1.46,1.47 speech.cpp,1.155,1.156 speech.h,1.19,1.20 targetactions.cpp,1.28,1.29 targetrequests.cpp,1.76,1.77 targetrequests.h,1.45,1.46 tmpeff.cpp,1.60,1.61 tracking.cpp,1.17,1.18 typedefs.h,1.21,1.22 uobject.cpp,1.111,1.112 walking.cpp,1.90,1.91 walking.h,1.19,1.20 wolf.dsp,1.217,1.218 wolfpack.cpp,1.455,1.456 wolfpack.pro,1.152,1.153 debug.cpp,1.12,NONE debug.h,1.7,NONE storage.cpp,1.12,NONE storage.h,1.10,NONE

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

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

Modified Files:
	Timing.cpp Timing.h Trade.cpp Trade.h ai.cpp basedef.cpp 
	basedef.h basics.h boats.cpp chars.h combat.cpp commands.cpp 
	contextmenu.cpp coord.cpp customtags.cpp dbl_single_click.cpp 
	dragdrop.cpp encryption.cpp globals.cpp globals.h gumps.cpp 
	house.cpp house.h itemid.cpp items.cpp makemenus.cpp npc.cpp 
	pagesystem.h platform.h player.cpp prototypes.h 
	pythonscript.cpp scriptmanager.cpp scriptmanager.h 
	serbinfile.cpp serxmlfile.cpp skills.cpp spawnregions.cpp 
	speech.cpp speech.h targetactions.cpp targetrequests.cpp 
	targetrequests.h tmpeff.cpp tracking.cpp typedefs.h 
	uobject.cpp walking.cpp walking.h wolf.dsp wolfpack.cpp 
	wolfpack.pro 
Removed Files:
	debug.cpp debug.h storage.cpp storage.h 
Log Message:
Removed wolfpack.h

Index: Timing.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/Timing.cpp,v
retrieving revision 1.177
retrieving revision 1.178
diff -C2 -d -r1.177 -r1.178
*** Timing.cpp	2 Sep 2003 02:06:33 -0000	1.177
--- Timing.cpp	7 Sep 2003 19:07:46 -0000	1.178
***************
*** 53,56 ****
--- 53,59 ----
  #include "chars.h"
  #include "ai.h"
+ #include "inlines.h"
+ #include "world.h"
+ #include "utilsys.h"
  
  // Library Includes
***************
*** 251,256 ****
  			{          
  				decayed_houses++;
- 				sprintf((char*)temp,"%s decayed! not refreshed for > %i seconds!\n",pi->name().ascii(), SrvParams->housedecay_secs());
- 				LogMessage((char*)temp);
  				(dynamic_cast< cHouse* >(pi))->remove();
  			}
--- 254,257 ----
***************
*** 351,355 ****
  */
  	
! #pragma note("TODO: jail reimplementation with python")
  /*
  	// Jail stuff
--- 352,356 ----
  */
  	
! #pragma message("TODO: jail reimplementation with python")
  /*
  	// Jail stuff

Index: Timing.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/Timing.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** Timing.h	12 Jan 2003 18:11:31 -0000	1.10
--- Timing.h	7 Sep 2003 19:07:46 -0000	1.11
***************
*** 33,53 ****
  #define __TIMING_H__
  
- //Platform specifics
- #include "platform.h"
- 
- //system includes
- 
- #include <iostream>
- 
- //Forward Class Decl
- 
- 
- //Wolfpack Includes
- 
- #include "wolfpack.h"
- #include "basics.h"
- #include "utilsys.h"
- #include "debug.h"
- 
  void checkauto();	// Check automatic/timer controlled stuff (Like fighting and regeneration)
  void checktimers();	// Check shutdown timers
--- 33,36 ----

Index: Trade.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/Trade.cpp,v
retrieving revision 1.87
retrieving revision 1.88
diff -C2 -d -r1.87 -r1.88
*** Trade.cpp	3 Sep 2003 20:58:16 -0000	1.87
--- Trade.cpp	7 Sep 2003 19:07:46 -0000	1.88
***************
*** 43,47 ****
--- 43,50 ----
  #include "basechar.h"
  #include "player.h"
+ #include "world.h"
+ #include "wpconsole.h"
  #include "network.h"
+ #include "items.h"
  #include "network/uorxpackets.h"
  #include "network/uotxpackets.h"

Index: Trade.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/Trade.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** Trade.h	3 Sep 2003 20:58:17 -0000	1.16
--- Trade.h	7 Sep 2003 19:07:46 -0000	1.17
***************
*** 35,38 ****
--- 35,39 ----
  //Platform specifics
  #include "platform.h"
+ #include "inlines.h"
  
  //system includes 
***************
*** 40,46 ****
  
  // Wolfpack includes
- #include "wolfpack.h"
  #include "itemid.h"
- #include "debug.h"
  
  class cUORxBuy;
--- 41,45 ----

Index: ai.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/ai.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** ai.cpp	3 Sep 2003 14:44:21 -0000	1.16
--- ai.cpp	7 Sep 2003 19:07:46 -0000	1.17
***************
*** 40,43 ****
--- 40,45 ----
  #include "walking.h"
  #include "itemid.h"
+ #include "items.h"
+ #include "wpconsole.h"
  #include "world.h"
  

Index: basedef.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/basedef.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** basedef.cpp	2 Sep 2003 02:32:19 -0000	1.2
--- basedef.cpp	7 Sep 2003 19:07:46 -0000	1.3
***************
*** 1,2 ****
--- 1,32 ----
+ //==================================================================================
+ //
+ //      Wolfpack Emu (WP)
+ //	UO Server Emulation Program
+ //
+ //	Copyright 1997, 98 by Marcus Rating (Cironian)
+ //  Copyright 2001-2003 by holders identified in authors.txt
+ //	This program is free software; you can redistribute it and/or modify
+ //	it under the terms of the GNU General Public License as published by
+ //	the Free Software Foundation; either version 2 of the License, or
+ //	(at your option) any later version.
+ //
+ //	This program is distributed in the hope that it will be useful,
+ //	but WITHOUT ANY WARRANTY; without even the implied warranty of
+ //	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ //	GNU General Public License for more details.
+ //
+ //	You should have received a copy of the GNU General Public License
+ //	along with this program; if not, write to the Free Software
+ //	Foundation, Inc., 59 Temple Palace - Suite 330, Boston, MA 02111-1307, USA.
+ //
+ //	* In addition to that license, if you are running this program or modified
+ //	* versions of it on a public system you HAVE TO make the complete source of
+ //	* the version used by you available or provide people with a location to
+ //	* download it.
+ //
+ //
+ //
+ //	Wolfpack Homepage: http://wpdev.sf.net/
+ //==================================================================================
  
  #include "basedef.h"
***************
*** 4,7 ****
--- 34,38 ----
  #include "wpdefmanager.h"
  #include "prototypes.h"
+ #include "basics.h"
  
  #include <string.h>

Index: basedef.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/basedef.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** basedef.h	2 Sep 2003 02:32:19 -0000	1.2
--- basedef.h	7 Sep 2003 19:07:46 -0000	1.3
***************
*** 1,2 ****
--- 1,32 ----
+ //==================================================================================
+ //
+ //      Wolfpack Emu (WP)
+ //	UO Server Emulation Program
+ //
+ //	Copyright 1997, 98 by Marcus Rating (Cironian)
+ //  Copyright 2001-2003 by holders identified in authors.txt
+ //	This program is free software; you can redistribute it and/or modify
+ //	it under the terms of the GNU General Public License as published by
+ //	the Free Software Foundation; either version 2 of the License, or
+ //	(at your option) any later version.
+ //
+ //	This program is distributed in the hope that it will be useful,
+ //	but WITHOUT ANY WARRANTY; without even the implied warranty of
+ //	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ //	GNU General Public License for more details.
+ //
+ //	You should have received a copy of the GNU General Public License
+ //	along with this program; if not, write to the Free Software
+ //	Foundation, Inc., 59 Temple Palace - Suite 330, Boston, MA 02111-1307, USA.
+ //
+ //	* In addition to that license, if you are running this program or modified
+ //	* versions of it on a public system you HAVE TO make the complete source of
+ //	* the version used by you available or provide people with a location to
+ //	* download it.
+ //
+ //
+ //
+ //	Wolfpack Homepage: http://wpdev.sf.net/
+ //==================================================================================
  
  #if !defined( __BASEDEF_H__ )

Index: basics.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/basics.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** basics.h	12 Jan 2003 18:11:31 -0000	1.14
--- basics.h	7 Sep 2003 19:07:46 -0000	1.15
***************
*** 79,82 ****
--- 79,84 ----
  int RandomNum(int nLowNum, int nHighNum);
  
+ QString hex2dec( const QString& value );
+ 
  float RandomFloatNum(float nLowNum, float nHighNum);
  

Index: boats.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/boats.cpp,v
retrieving revision 1.112
retrieving revision 1.113
diff -C2 -d -r1.112 -r1.113
*** boats.cpp	5 Sep 2003 00:03:45 -0000	1.112
--- boats.cpp	7 Sep 2003 19:07:46 -0000	1.113
***************
*** 50,53 ****
--- 50,54 ----
  #include "player.h"
  #include "inlines.h"
+ #include "basics.h"
  
  #undef DBGFILE

Index: chars.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/chars.h,v
retrieving revision 1.201
retrieving revision 1.202
diff -C2 -d -r1.201 -r1.202
*** chars.h	11 Jun 2003 10:54:06 -0000	1.201
--- chars.h	7 Sep 2003 19:07:46 -0000	1.202
***************
*** 36,42 ****
  #include "platform.h"
  
- // just temporary
- #include "debug.h"
- 
  #include "typedefs.h"
  #include "structs.h"
--- 36,39 ----

Index: combat.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/combat.cpp,v
retrieving revision 1.148
retrieving revision 1.149
diff -C2 -d -r1.148 -r1.149
*** combat.cpp	5 Sep 2003 00:03:45 -0000	1.148
--- combat.cpp	7 Sep 2003 19:07:46 -0000	1.149
***************
*** 35,39 ****
  // Wolfpack Includes
  
- #include "wolfpack.h"
  #include "itemid.h"
  #include "utilsys.h"
--- 35,38 ----
***************
*** 54,66 ****
  #include "chars.h"
  #include "basedef.h"
! 
! #include "debug.h"
  
  // System Includes
  #include <math.h>
  
- #undef  DBGFILE
- #define DBGFILE "combat.cpp"
- 
  #define SWINGAT (unsigned int)1.75 * MY_CLOCKS_PER_SEC // changed from signed to unsigned, LB
  
--- 53,64 ----
  #include "chars.h"
  #include "basedef.h"
! #include "items.h"
! #include "inlines.h"
! #include "world.h"
! #include "basics.h"
  
  // System Includes
  #include <math.h>
  
  #define SWINGAT (unsigned int)1.75 * MY_CLOCKS_PER_SEC // changed from signed to unsigned, LB
  
***************
*** 883,887 ****
  		{
  			// Guards beam to their target if they are out of range
! #pragma note("reimplement with new npc ai!")
  /*			if( pAttacker->npcaitype() == 4 && pDefender->inGuardedArea() )
  			{
--- 881,885 ----
  		{
  			// Guards beam to their target if they are out of range
! #pragma message("reimplement with new npc ai!")
  /*			if( pAttacker->npcaitype() == 4 && pDefender->inGuardedArea() )
  			{
***************
*** 1013,1017 ****
  		if( pDefender->isDead() ) // Highlight // Repsys
  		{
! #pragma note("reimplement with new npc ai sys")
  /*			if( ( pAttacker->npcaitype() == 4 || pAttacker->npcaitype() == 9 ) && pDefender->isNpc() )
  			{
--- 1011,1015 ----
  		if( pDefender->isDead() ) // Highlight // Repsys
  		{
! #pragma message("reimplement with new npc ai sys")
  /*			if( ( pAttacker->npcaitype() == 4 || pAttacker->npcaitype() == 9 ) && pDefender->isNpc() )
  			{

Index: commands.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/commands.cpp,v
retrieving revision 1.197
retrieving revision 1.198
diff -C2 -d -r1.197 -r1.198
*** commands.cpp	1 Sep 2003 05:03:03 -0000	1.197
--- commands.cpp	7 Sep 2003 19:07:46 -0000	1.198
***************
*** 53,56 ****
--- 53,57 ----
  #include "contextmenu.h"
  #include "pythonscript.h"
+ #include "network.h"
  
  // System Includes

Index: contextmenu.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/contextmenu.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** contextmenu.cpp	20 Jul 2003 00:04:51 -0000	1.14
--- contextmenu.cpp	7 Sep 2003 19:07:46 -0000	1.15
***************
*** 38,45 ****
  #include "player.h"
  
- #include "debug.h"
- #undef  DBGFILE
- #define DBGFILE "contextmenu.cpp"
- 
  cConMenu::cConMenu( const cElement *Tag )
  {
--- 38,41 ----

Index: coord.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/coord.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** coord.cpp	3 Sep 2003 14:44:21 -0000	1.26
--- coord.cpp	7 Sep 2003 19:07:46 -0000	1.27
***************
*** 34,38 ****
  
  #include "coord.h"
- #include "debug.h"
  #include "player.h"
  #include "network.h"
--- 34,37 ----

Index: customtags.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/customtags.cpp,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** customtags.cpp	30 Aug 2003 17:00:08 -0000	1.29
--- customtags.cpp	7 Sep 2003 19:07:46 -0000	1.30
***************
*** 31,35 ****
  
  #include "customtags.h"
- #include "wolfpack.h"
  #include "items.h"
  #include "basechar.h"
--- 31,34 ----
***************
*** 38,41 ****
--- 37,41 ----
  #include "basics.h"
  #include "globals.h"
+ #include "world.h"
  
  #include <math.h>

Index: dbl_single_click.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/dbl_single_click.cpp,v
retrieving revision 1.220
retrieving revision 1.221
diff -C2 -d -r1.220 -r1.221
*** dbl_single_click.cpp	3 Sep 2003 20:58:17 -0000	1.220
--- dbl_single_click.cpp	7 Sep 2003 19:07:46 -0000	1.221
***************
*** 50,53 ****
--- 50,54 ----
  #include "npc.h"
  #include "itemid.h"
+ #include "basics.h"
  
  #undef  DBGFILE

Index: dragdrop.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/dragdrop.cpp,v
retrieving revision 1.197
retrieving revision 1.198
diff -C2 -d -r1.197 -r1.198
*** dragdrop.cpp	3 Sep 2003 20:58:17 -0000	1.197
--- dragdrop.cpp	7 Sep 2003 19:07:46 -0000	1.198
***************
*** 30,36 ****
  //==================================================================================
  
- #include "debug.h"
  #include "basics.h"
- #include "wolfpack.h"
  #include "tilecache.h"
  #include "speech.h"
--- 30,34 ----
***************
*** 48,52 ****
  #include "player.h"
  #include "npc.h"
! 
  
  #undef  DBGFILE
--- 46,51 ----
  #include "player.h"
  #include "npc.h"
! #include "world.h"
! #include "inlines.h"
  
  #undef  DBGFILE

Index: encryption.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/encryption.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** encryption.cpp	5 Sep 2003 00:03:45 -0000	1.12
--- encryption.cpp	7 Sep 2003 19:07:46 -0000	1.13
***************
*** 43,46 ****
--- 43,47 ----
  #include "prototypes.h"
  #include "log.h"
+ #include "basics.h"
  
  /*!

Index: globals.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/globals.cpp,v
retrieving revision 1.99
retrieving revision 1.100
diff -C2 -d -r1.99 -r1.100
*** globals.cpp	2 Sep 2003 02:06:34 -0000	1.99
--- globals.cpp	7 Sep 2003 19:07:46 -0000	1.100
***************
*** 32,36 ****
  // Global Variables
  
- #include "wolfpack.h"
  #include "verinfo.h"
  #include "walking.h"
--- 32,35 ----
***************
*** 39,42 ****
--- 38,46 ----
  #include "wptargetrequests.h"
  #include "typedefs.h"
+ #include "wpconsole.h"
+ #include "srvparams.h"
+ #include "skills.h"
+ #include "maps.h"
+ #include "speech.h"
  
  unsigned int uiCurrentTime;
***************
*** 125,130 ****
  // - the below structure is for looking up items based on serial #
  // - item's serial, owner's serial, char's serial, and container's serial
- 
- Container_cl stablesp;
  
  list<SERIAL> guilds;
--- 129,132 ----

Index: globals.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/globals.h,v
retrieving revision 1.73
retrieving revision 1.74
diff -C2 -d -r1.73 -r1.74
*** globals.h	2 Sep 2003 02:06:34 -0000	1.73
--- globals.h	7 Sep 2003 19:07:46 -0000	1.74
***************
*** 56,62 ****
  
  #include "structs.h"
- #include "storage.h"
- 
- enum enServerState { STARTUP = 0, RUNNING, SCRIPTRELOAD, SHUTDOWN };
  
  // Global Variables
--- 56,59 ----
***************
*** 112,116 ****
  // - item's serial, owner's serial, char's serial, and container's serial
  
- extern Container_cl stablesp;
  extern std::list<SERIAL> guilds;
  
--- 109,112 ----

Index: gumps.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/gumps.cpp,v
retrieving revision 1.142
retrieving revision 1.143
diff -C2 -d -r1.142 -r1.143
*** gumps.cpp	3 Sep 2003 20:58:17 -0000	1.142
--- gumps.cpp	7 Sep 2003 19:07:46 -0000	1.143
***************
*** 30,34 ****
  
  
- #include "wolfpack.h"
  #include "accounts.h"
  #include "prototypes.h"
--- 30,33 ----
***************
*** 45,56 ****
  #include "basechar.h"
  #include "player.h"
! #include "debug.h"
  
  // System Includes
  #include <math.h>
  
- #undef  DBGFILE
- #define DBGFILE "gumps.cpp"
- 
  cGump::cGump() : noMove_( false ), noClose_( false ), 
  noDispose_( false ), x_( 50 ), y_( 50 ), serial_( INVALID_SERIAL ), 
--- 44,52 ----
  #include "basechar.h"
  #include "player.h"
! #include "world.h"
  
  // System Includes
  #include <math.h>
  
  cGump::cGump() : noMove_( false ), noClose_( false ), 
  noDispose_( false ), x_( 50 ), y_( 50 ), serial_( INVALID_SERIAL ), 
***************
*** 126,130 ****
  	Q_UNUSED(socket);
  	Q_UNUSED(choice);
! #pragma note("This is a good candidate for pure virtual")
  }
  
--- 122,126 ----
  	Q_UNUSED(socket);
  	Q_UNUSED(choice);
! #pragma message("This is a good candidate for pure virtual")
  }
  

Index: house.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/house.cpp,v
retrieving revision 1.113
retrieving revision 1.114
diff -C2 -d -r1.113 -r1.114
*** house.cpp	27 Aug 2003 23:20:56 -0000	1.113
--- house.cpp	7 Sep 2003 19:07:47 -0000	1.114
***************
*** 37,41 ****
  #include "srvparams.h"
  #include "maps.h"
- #include "debug.h"
  #include "tilecache.h"
  #include "utilsys.h"
--- 37,40 ----
***************
*** 49,52 ****
--- 48,55 ----
  #include "customtags.h"
  #include "territories.h"
+ #include "world.h"
+ #include "srvparams.h"
+ #include "inlines.h"
+ #include "globals.h"
  
  // System Include Files
***************
*** 55,61 ****
  // Namespaces for this module
  using namespace std;
- 
- #undef  DBGFILE
- #define DBGFILE "house.cpp"
  
  void cHouse::processHouseItemNode( const cElement *Tag )
--- 58,61 ----

Index: house.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/house.h,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** house.h	27 Aug 2003 20:35:10 -0000	1.30
--- house.h	7 Sep 2003 19:07:47 -0000	1.31
***************
*** 33,37 ****
  #define __HOUSE_H__
  
- #include "wolfpack.h"
  #include "items.h"
  #include "multis.h"
--- 33,36 ----

Index: itemid.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/itemid.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** itemid.cpp	12 Jan 2003 18:11:31 -0000	1.9
--- itemid.cpp	7 Sep 2003 19:07:47 -0000	1.10
***************
*** 40,44 ****
  #include "platform.h"
  
- #include "debug.h"
  #undef  DBGFILE
  #define DBGFILE "itemid.cpp"
--- 40,43 ----

Index: items.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/items.cpp,v
retrieving revision 1.346
retrieving revision 1.347
diff -C2 -d -r1.346 -r1.347
*** items.cpp	5 Sep 2003 00:03:45 -0000	1.346
--- items.cpp	7 Sep 2003 19:07:47 -0000	1.347
***************
*** 34,38 ****
  
  // Wolfpack Includes
- #include "wolfpack.h"
  #include "accounts.h"
  #include "network/uosocket.h"
--- 34,37 ----
***************
*** 40,44 ****
  #include "utilsys.h"
  #include "iserialization.h"
- #include "debug.h"
  #include "items.h"
  #include "tilecache.h"
--- 39,42 ----
***************
*** 58,61 ****
--- 56,64 ----
  #include "basechar.h"
  #include "player.h"
+ #include "basics.h"
+ #include "srvparams.h"
+ #include "globals.h"
+ #include "inlines.h"
+ #include "wpconsole.h"
  
  // System Includes
***************
*** 334,343 ****
  void cItem::SetRandPosInCont(cItem* pCont)
  {
! 	int k=pCont->GetContGumpType();	
! 	if (k==-1)
! 	{
! 		LogWarningVar("trying to put something INTO a non container, id=0x%X",pCont->id());
! 		k=1;
! 	}
  	Coord_cl position = pos();
  	position.x = RandomNum(18, 118);
--- 337,341 ----
  void cItem::SetRandPosInCont(cItem* pCont)
  {
! 	int k = pCont->GetContGumpType();
  	Coord_cl position = pos();
  	position.x = RandomNum(18, 118);

Index: makemenus.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/makemenus.cpp,v
retrieving revision 1.57
retrieving revision 1.58
diff -C2 -d -r1.57 -r1.58
*** makemenus.cpp	2 Sep 2003 02:06:34 -0000	1.57
--- makemenus.cpp	7 Sep 2003 19:07:47 -0000	1.58
***************
*** 30,34 ****
  
  #include "makemenus.h"
- #include "wolfpack.h"
  #include "network/uosocket.h"
  #include "skills.h"
--- 30,33 ----
***************
*** 40,45 ****
  #include "python/utilities.h"
  #include "basedef.h"
! 
! #include "debug.h"
  
  // System Includes
--- 39,45 ----
  #include "python/utilities.h"
  #include "basedef.h"
! #include "basics.h"
! #include "network.h"
! #include "wpconsole.h"
  
  // System Includes

Index: npc.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/npc.cpp,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** npc.cpp	5 Sep 2003 00:03:45 -0000	1.39
--- npc.cpp	7 Sep 2003 19:07:47 -0000	1.40
***************
*** 53,56 ****
--- 53,58 ----
  #include "skills.h"
  #include "ai.h"
+ #include "inlines.h"
+ #include "basics.h"
  
  cNPC::cNPC()
***************
*** 200,209 ****
  static void npcRegisterAfterLoading( P_NPC pc )
  {
! 	if( pc->stablemasterSerial() == INVALID_SERIAL )
! 	{ 
! 		MapObjects::instance()->add(pc); 
! 	} 
! 	else
! 		stablesp.insert(pc->stablemasterSerial(), pc->serial());
  }
  
--- 202,206 ----
  static void npcRegisterAfterLoading( P_NPC pc )
  {
! 	MapObjects::instance()->add(pc); 
  }
  
***************
*** 353,357 ****
  UINT8 cNPC::notority( P_CHAR pChar ) // Gets the notority toward another char
  {
! 	// 0x01 Blue, 0x02 Green, 0x03 Grey, 0x05 Orange, 0x06 Red
  	UINT8 result;
  
--- 350,364 ----
  UINT8 cNPC::notority( P_CHAR pChar ) // Gets the notority toward another char
  {
! 	/*
! 		Hard to tell because the ai-types are now string based
! 		0 = invalid/across server line
! 		1 = innocent (blue)
! 		2 = guilded/ally (green)
! 		3 = attackable but not criminal (gray)
! 		4 = criminal (gray)
! 		5 = enemy (orange)
! 		6 = murderer (red)
! 		7 = unknown use (translucent (like 0x4000 hue))
! 	*/
  	UINT8 result;
  
***************
*** 379,383 ****
  		if( isHuman() )
  		{
! 			if( karma_ >= 0 )
  				result = 0x01;
  			else
--- 386,390 ----
  		if( isHuman() )
  		{
! 			if( karma_ > 0 )
  				result = 0x01;
  			else
***************
*** 387,391 ****
  		// Everything else
  		else
! 			result = 0x03;
  	}
  	
--- 394,403 ----
  		// Everything else
  		else
! 		{
! 			if( karma_ >= 0 )
! 				return 0x03;
! 			else 
! 				return 0x01;
! 		}
  	}
  	
***************
*** 480,484 ****
  	P_ITEM pi_backpack = getBackpack();
  	
! #pragma note("Implement here tradewindow closing and disposal of it's cItem*")
  	// Close here the trade window... we still not sure how this will work, so I took out
  	//the old code
--- 492,496 ----
  	P_ITEM pi_backpack = getBackpack();
  	
! #pragma message("Implement here tradewindow closing and disposal of it's cItem*")
  	// Close here the trade window... we still not sure how this will work, so I took out
  	//the old code

Index: pagesystem.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/pagesystem.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** pagesystem.h	26 Aug 2003 15:36:44 -0000	1.10
--- pagesystem.h	7 Sep 2003 19:07:47 -0000	1.11
***************
*** 39,42 ****
--- 39,43 ----
  #include "persistentbroker.h"
  #include "dbdriver.h"
+ #include "basics.h"
  
  // Library includes

Index: platform.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/platform.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** platform.h	20 Jun 2003 22:44:30 -0000	1.10
--- platform.h	7 Sep 2003 19:07:47 -0000	1.11
***************
*** 121,124 ****
--- 121,125 ----
  //========================================================================
  //========================================================================
+ 
  #endif
  

Index: player.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/player.cpp,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** player.cpp	5 Sep 2003 00:03:45 -0000	1.35
--- player.cpp	7 Sep 2003 19:07:47 -0000	1.36
***************
*** 491,495 ****
  	unmount();
  
! #pragma note("Implement here tradewindow closing and disposal of it's cItem*")
  	// Close here the trade window... we still not sure how this will work, so I took out
  	//the old code
--- 491,495 ----
  	unmount();
  
! #pragma message("Implement here tradewindow closing and disposal of it's cItem*")
  	// Close here the trade window... we still not sure how this will work, so I took out
  	//the old code
***************
*** 653,657 ****
  	corpse->update();
  
! #pragma note( "Deathshroud has to be defined as 204e in the scripts" )
  	P_ITEM pItem = cItem::createFromScript( "204e" );
  	if( pItem )
--- 653,657 ----
  	corpse->update();
  
! #pragma message( "Deathshroud has to be defined as 204e in the scripts" )
  	P_ITEM pItem = cItem::createFromScript( "204e" );
  	if( pItem )
***************
*** 1004,1008 ****
  	if( !pi )
  	{
! 		LogCritical( "cChar::canPickUp() - bad parm" );
  		return false;
  	}
--- 1004,1008 ----
  	if( !pi )
  	{
! 		clConsole.log( LOG_ERROR, "cChar::canPickUp() - bad parm" );
  		return false;
  	}

Index: prototypes.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/prototypes.h,v
retrieving revision 1.109
retrieving revision 1.110
diff -C2 -d -r1.109 -r1.110
*** prototypes.h	5 Sep 2003 00:03:45 -0000	1.109
--- prototypes.h	7 Sep 2003 19:07:47 -0000	1.110
***************
*** 36,40 ****
  class cUOSocket;
  
- QString hex2dec( const QString& value );
  void showPaperdoll( cUOSocket *socket, P_CHAR pTarget, bool hotkey );
  
--- 36,39 ----

Index: pythonscript.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/pythonscript.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** pythonscript.cpp	30 Aug 2003 17:00:09 -0000	1.7
--- pythonscript.cpp	7 Sep 2003 19:07:47 -0000	1.8
***************
*** 41,44 ****
--- 41,45 ----
  #include "maps.h"
  #include "network.h"
+ #include "wpconsole.h"
  
  // Library Includes

Index: scriptmanager.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/scriptmanager.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** scriptmanager.cpp	20 Jul 2003 00:04:51 -0000	1.4
--- scriptmanager.cpp	7 Sep 2003 19:07:47 -0000	1.5
***************
*** 29,36 ****
  //==================================================================================
  
! #include "wolfpack.h"
  #include "scriptmanager.h"
  #include "wpdefmanager.h"
  #include "basechar.h"
  #include "pythonscript.h"
  #include "python/engine.h"
--- 29,40 ----
  //==================================================================================
  
! #include "qapplication.h"
  #include "scriptmanager.h"
  #include "wpdefmanager.h"
  #include "basechar.h"
+ #include "globals.h"
+ #include "wpconsole.h"
+ #include "world.h"
+ #include "items.h"
  #include "pythonscript.h"
  #include "python/engine.h"
***************
*** 44,52 ****
  cScriptManager::~cScriptManager()
  {
! 	map< QString, cPythonScript* >::iterator ScriptIterator;
  
  	for( ScriptIterator = Scripts.begin(); ScriptIterator != Scripts.end(); ++ScriptIterator )
  	{
! 		delete( ScriptIterator->second );
  	}
  }
--- 48,56 ----
  cScriptManager::~cScriptManager()
  {
! 	QMap< QString, cPythonScript* >::iterator ScriptIterator;
  
  	for( ScriptIterator = Scripts.begin(); ScriptIterator != Scripts.end(); ++ScriptIterator )
  	{
! 		delete( ScriptIterator.data() );
  	}
  }
***************
*** 55,61 ****
  cPythonScript* cScriptManager::find( const QString& Name ) const
  {
! 	map< QString, cPythonScript* >::const_iterator it = Scripts.find( Name );
  	if ( it != Scripts.end() )
! 		return (*it).second;
  	else
  		return 0;
--- 59,65 ----
  cPythonScript* cScriptManager::find( const QString& Name ) const
  {
! 	QMap< QString, cPythonScript* >::const_iterator it = Scripts.find( Name );
  	if ( it != Scripts.end() )
! 		return it.data();
  	else
  		return 0;
***************
*** 68,72 ****
  	Script->setName( Name );
  
! 	Scripts.insert( make_pair(Name, Script) );
  }
  
--- 72,76 ----
  	Script->setName( Name );
  
! 	Scripts.insert( Name, Script );
  }
  
***************
*** 76,80 ****
  	if( it != Scripts.end() )
  	{
! 		delete (*it).second;
  		Scripts.erase( it );
  	}
--- 80,84 ----
  	if( it != Scripts.end() )
  	{
! 		delete it.data();
  		Scripts.erase( it );
  	}
***************
*** 119,124 ****
  	for( myIter = Scripts.begin(); myIter != Scripts.end(); ++myIter )
  	{
! 		myIter->second->unload();
! 		delete myIter->second;
  	}
  
--- 123,128 ----
  	for( myIter = Scripts.begin(); myIter != Scripts.end(); ++myIter )
  	{
! 		myIter.data()->unload();
! 		delete myIter.data();
  	}
  
***************
*** 190,198 ****
  void cScriptManager::onServerStart()
  {
! 	map< QString, cPythonScript* >::iterator ScriptIterator;
  
  	for( ScriptIterator = Scripts.begin(); ScriptIterator != Scripts.end(); ++ScriptIterator )
  	{
! 		ScriptIterator->second->onServerstart();
  	}	
  }
--- 194,202 ----
  void cScriptManager::onServerStart()
  {
! 	QMap< QString, cPythonScript* >::iterator ScriptIterator;
  
  	for( ScriptIterator = Scripts.begin(); ScriptIterator != Scripts.end(); ++ScriptIterator )
  	{
! 		ScriptIterator.data()->onServerstart();
  	}	
  }

Index: scriptmanager.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/scriptmanager.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** scriptmanager.h	27 Aug 2003 01:39:59 -0000	1.3
--- scriptmanager.h	7 Sep 2003 19:07:47 -0000	1.4
***************
*** 34,39 ****
  
  // System Includes
- #include <map>
  #include <qmap.h>
  
  // Forward definitions
--- 34,39 ----
  
  // System Includes
  #include <qmap.h>
+ #include <qvaluevector.h>
  
  // Forward definitions
***************
*** 82,86 ****
  {
  private:
! 	std::map< QString, cPythonScript* > Scripts;
  
  	// map< OBJECT, map< EVENT, vector< cPythonScript
--- 82,86 ----
  {
  private:
! 	QMap< QString, cPythonScript* > Scripts;
  
  	// map< OBJECT, map< EVENT, vector< cPythonScript
***************
*** 91,95 ****
  
  public:
! 	typedef std::map< QString, cPythonScript* >::iterator iterator;
  
  	virtual ~cScriptManager();
--- 91,95 ----
  
  public:
! 	typedef QMap< QString, cPythonScript* >::iterator iterator;
  
  	virtual ~cScriptManager();

Index: serbinfile.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/serbinfile.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** serbinfile.cpp	13 Jan 2003 18:09:15 -0000	1.25
--- serbinfile.cpp	7 Sep 2003 19:07:47 -0000	1.26
***************
*** 33,37 ****
  
  // Wolfpack Includes
! #include "wolfpack.h"
  #include "srvparams.h"
  #include "serbinfile.h"
--- 33,37 ----
  
  // Wolfpack Includes
! #include "globals.h"
  #include "srvparams.h"
  #include "serbinfile.h"

Index: serxmlfile.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/serxmlfile.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** serxmlfile.cpp	12 Jan 2003 18:11:32 -0000	1.21
--- serxmlfile.cpp	7 Sep 2003 19:07:47 -0000	1.22
***************
*** 36,40 ****
  
  // Save Path
! #include "wolfpack.h"
  #include "srvparams.h"
  
--- 36,40 ----
  
  // Save Path
! #include "globals.h"
  #include "srvparams.h"
  

Index: skills.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/skills.cpp,v
retrieving revision 1.206
retrieving revision 1.207
diff -C2 -d -r1.206 -r1.207
*** skills.cpp	5 Sep 2003 00:03:45 -0000	1.206
--- skills.cpp	7 Sep 2003 19:07:47 -0000	1.207
***************
*** 33,37 ****
  */
  
- #include "wolfpack.h"
  #include "wpdefmanager.h"
  #include "basics.h"
--- 33,36 ----
***************
*** 53,63 ****
  #include "makemenus.h"
  #include "npc.h"
  
  // System Includes
  #include <math.h>
- 
- #undef DBGFILE
- #define DBGFILE "skills.cpp"
- #include "debug.h"
  
  void cSkills::Hide( cUOSocket *socket ) 
--- 52,59 ----
  #include "makemenus.h"
  #include "npc.h"
+ #include "wpconsole.h"
  
  // System Includes
  #include <math.h>
  
  void cSkills::Hide( cUOSocket *socket ) 

Index: spawnregions.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/spawnregions.cpp,v
retrieving revision 1.46
retrieving revision 1.47
diff -C2 -d -r1.46 -r1.47
*** spawnregions.cpp	5 Sep 2003 00:03:45 -0000	1.46
--- spawnregions.cpp	7 Sep 2003 19:07:47 -0000	1.47
***************
*** 48,51 ****
--- 48,54 ----
  #include "chars.h"
  #include "npc.h"
+ #include "world.h"
+ #include "basics.h"
+ #include "wpconsole.h"
  //#include "wolfpack.h" // needed for objects Npcs and Items
  

Index: speech.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/speech.cpp,v
retrieving revision 1.155
retrieving revision 1.156
diff -C2 -d -r1.155 -r1.156
*** speech.cpp	3 Sep 2003 20:58:17 -0000	1.155
--- speech.cpp	7 Sep 2003 19:07:47 -0000	1.156
***************
*** 52,55 ****
--- 52,58 ----
  #include "chars.h"
  #include "ai.h"
+ #include "world.h"
+ #include "inlines.h"
+ #include "wpconsole.h"
  
  // Library Includes

Index: speech.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/speech.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** speech.h	15 Jun 2003 18:46:24 -0000	1.19
--- speech.h	7 Sep 2003 19:07:47 -0000	1.20
***************
*** 40,56 ****
  #include "platform.h"
  
- 
  // System includes
  #include <vector>
  #include <iostream>
  
! // Class Declaration
! class cSpeech;
  
  //Wolfpack Includes
- #include "wolfpack.h"
- #include "debug.h"
  #include "speech.h"
  #include "utilsys.h"
  
  bool VendorChkName( P_CHAR pVendor, const QString& comm );
--- 40,54 ----
  #include "platform.h"
  
  // System includes
  #include <vector>
  #include <iostream>
  
! // QT
! #include <qvaluevector.h>
  
  //Wolfpack Includes
  #include "speech.h"
  #include "utilsys.h"
+ #include "typedefs.h"
  
  bool VendorChkName( P_CHAR pVendor, const QString& comm );

Index: targetactions.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/targetactions.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** targetactions.cpp	28 Aug 2003 20:56:16 -0000	1.28
--- targetactions.cpp	7 Sep 2003 19:07:47 -0000	1.29
***************
*** 42,46 ****
  #include "basechar.h"
  #include "player.h"
- #include "debug.h"
  
  bool cSkHealing::responsed( cUOSocket *socket, cUORxTarget *target )
--- 42,45 ----

Index: targetrequests.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/targetrequests.cpp,v
retrieving revision 1.76
retrieving revision 1.77
diff -C2 -d -r1.76 -r1.77
*** targetrequests.cpp	3 Sep 2003 20:58:17 -0000	1.76
--- targetrequests.cpp	7 Sep 2003 19:07:47 -0000	1.77
***************
*** 50,54 ****
  #include "npc.h"
  #include "chars.h"
! 
  
  // System Includes
--- 50,55 ----
  #include "npc.h"
  #include "chars.h"
! #include "basics.h"
! #include "network.h"
  
  // System Includes

Index: targetrequests.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/targetrequests.h,v
retrieving revision 1.45
retrieving revision 1.46
diff -C2 -d -r1.45 -r1.46
*** targetrequests.h	1 Sep 2003 05:03:03 -0000	1.45
--- targetrequests.h	7 Sep 2003 19:07:47 -0000	1.46
***************
*** 33,37 ****
  #define __TARGETREQUEST_H__
  
! #include "wolfpack.h"
  #include "wptargetrequests.h"
  #include "items.h"
--- 33,39 ----
  #define __TARGETREQUEST_H__
  
! #include "inlines.h"
! #include "network/uosocket.h"
! #include "network/uorxpackets.h"
  #include "wptargetrequests.h"
  #include "items.h"

Index: tmpeff.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/tmpeff.cpp,v
retrieving revision 1.60
retrieving revision 1.61
diff -C2 -d -r1.60 -r1.61
*** tmpeff.cpp	20 Aug 2003 17:10:48 -0000	1.60
--- tmpeff.cpp	7 Sep 2003 19:07:47 -0000	1.61
***************
*** 40,46 ****
  #include "items.h"
  #include "globals.h"
- #include "debug.h"
  #include "srvparams.h"
- #include "wolfpack.h"
  #include "iserialization.h"
  #include "network.h"
--- 40,44 ----
***************
*** 53,56 ****
--- 51,55 ----
  #include "npc.h"
  #include "ai.h"
+ #include "world.h"
  
  #include <algorithm>

Index: tracking.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/tracking.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** tracking.cpp	2 Sep 2003 02:06:34 -0000	1.17
--- tracking.cpp	7 Sep 2003 19:07:47 -0000	1.18
***************
*** 36,40 ****
  #include "skills.h"
  #include "globals.h"
- #include "wolfpack.h"
  #include "TmpEff.h"
  #include "sectors.h"
--- 36,39 ----
***************
*** 43,46 ****
--- 42,47 ----
  #include "player.h"
  #include "basedef.h"
+ #include "world.h"
+ #include "inlines.h"
  
  class cRefreshTracking: public cTempEffect

Index: typedefs.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/typedefs.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** typedefs.h	3 Sep 2003 20:58:17 -0000	1.21
--- typedefs.h	7 Sep 2003 19:07:47 -0000	1.22
***************
*** 46,49 ****
--- 46,51 ----
  class cPlayer;
  class cUObject;
+ class cUOSocket;
+ class Coord_cl;
  
  // Typedefs
***************
*** 141,144 ****
--- 143,148 ----
  	enNumberOfWanderTypes
  };
+ 
+ enum enServerState { STARTUP = 0, RUNNING, SCRIPTRELOAD, SHUTDOWN };
  
  #endif

Index: uobject.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/uobject.cpp,v
retrieving revision 1.111
retrieving revision 1.112
diff -C2 -d -r1.111 -r1.112
*** uobject.cpp	27 Aug 2003 23:20:56 -0000	1.111
--- uobject.cpp	7 Sep 2003 19:07:47 -0000	1.112
***************
*** 39,43 ****
  #include "globals.h"
  #include "network.h"
- #include "wolfpack.h"
  #include "defines.h"
  #include "pythonscript.h"
--- 39,42 ----
***************
*** 51,60 ****
  #include "sectors.h"
  #include "player.h"
  
  // Library Includes
- 
- // Debug includes and defines
- #undef  DBGFILE
- #define DBGFILE "uobject.cpp"
  
  cUObject::cUObject() :
--- 50,59 ----
  #include "sectors.h"
  #include "player.h"
+ #include "basics.h"
+ #include "items.h"
+ #include "basics.h"
+ #include "world.h"
  
  // Library Includes
  
  cUObject::cUObject() :

Index: walking.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/walking.cpp,v
retrieving revision 1.90
retrieving revision 1.91
diff -C2 -d -r1.90 -r1.91
*** walking.cpp	4 Sep 2003 01:22:54 -0000	1.90
--- walking.cpp	7 Sep 2003 19:07:47 -0000	1.91
***************
*** 35,40 ****
  // Wolfpack Includes
  #include "walking.h"
- #include "wolfpack.h"
- #include "debug.h"
  #include "sectors.h"
  #include "srvparams.h"
--- 35,38 ----
***************
*** 50,53 ****
--- 48,54 ----
  #include "npc.h"
  #include "player.h"
+ #include "globals.h"
+ #include "inlines.h"
+ #include "world.h"
  
  // Library Includes
***************
*** 1312,1316 ****
  	// Try to find your way to a specified position
  /*	case enGoToPosition:
! #pragma note("Implement pathfinding for this!")
  		if( pc_i->pos().map != pc_i->wanderDestination().map )
  		{
--- 1313,1317 ----
  	// Try to find your way to a specified position
  /*	case enGoToPosition:
! #pragma message("Implement pathfinding for this!")
  		if( pc_i->pos().map != pc_i->wanderDestination().map )
  		{

Index: walking.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/walking.h,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** walking.h	3 Sep 2003 20:58:17 -0000	1.19
--- walking.h	7 Sep 2003 19:07:47 -0000	1.20
***************
*** 33,39 ****
  #define __WALKING2_H__
  
! #include "wolfpack.h"
! 
! class cUOSocket;
  
  struct unitile_st
--- 33,38 ----
  #define __WALKING2_H__
  
! #include "typedefs.h"
! #include "singleton.h"
  
  struct unitile_st

Index: wolf.dsp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/wolf.dsp,v
retrieving revision 1.217
retrieving revision 1.218
diff -C2 -d -r1.217 -r1.218
*** wolf.dsp	5 Sep 2003 00:03:45 -0000	1.217
--- wolf.dsp	7 Sep 2003 19:07:47 -0000	1.218
***************
*** 1,23 ****
  # Microsoft Developer Studio Project File - Name="wolf" - Package Owner=<4>
  # Microsoft Developer Studio Generated Build File, Format Version 6.00
! # ** DO NOT EDIT **
  
  # TARGTYPE "Win32 (x86) Console Application" 0x0103
  
  CFG=wolf - Win32 Debug
! !MESSAGE This is not a valid makefile. To build this project using NMAKE,
! !MESSAGE use the Export Makefile command and run
  !MESSAGE 
  !MESSAGE NMAKE /f "wolf.mak".
  !MESSAGE 
! !MESSAGE You can specify a configuration when running NMAKE
! !MESSAGE by defining the macro CFG on the command line. For example:
  !MESSAGE 
  !MESSAGE NMAKE /f "wolf.mak" CFG="wolf - Win32 Debug"
  !MESSAGE 
! !MESSAGE Possible choices for configuration are:
  !MESSAGE 
! !MESSAGE "wolf - Win32 Release" (based on "Win32 (x86) Console Application")
! !MESSAGE "wolf - Win32 Debug" (based on "Win32 (x86) Console Application")
  !MESSAGE 
  
--- 1,23 ----
  # Microsoft Developer Studio Project File - Name="wolf" - Package Owner=<4>
  # Microsoft Developer Studio Generated Build File, Format Version 6.00
! # ** NICHT BEARBEITEN **
  
  # TARGTYPE "Win32 (x86) Console Application" 0x0103
  
  CFG=wolf - Win32 Debug
! !MESSAGE Dies ist kein gültiges Makefile. Zum Erstellen dieses Projekts mit NMAKE
! !MESSAGE verwenden Sie den Befehl "Makefile exportieren" und führen Sie den Befehl
  !MESSAGE 
  !MESSAGE NMAKE /f "wolf.mak".
  !MESSAGE 
! !MESSAGE Sie können beim Ausführen von NMAKE eine Konfiguration angeben
! !MESSAGE durch Definieren des Makros CFG in der Befehlszeile. Zum Beispiel:
  !MESSAGE 
  !MESSAGE NMAKE /f "wolf.mak" CFG="wolf - Win32 Debug"
  !MESSAGE 
! !MESSAGE Für die Konfiguration stehen zur Auswahl:
  !MESSAGE 
! !MESSAGE "wolf - Win32 Release" (basierend auf  "Win32 (x86) Console Application")
! !MESSAGE "wolf - Win32 Debug" (basierend auf  "Win32 (x86) Console Application")
  !MESSAGE 
  
***************
*** 163,170 ****
  # Begin Source File
  
- SOURCE=.\debug.cpp
- # End Source File
- # Begin Source File
- 
  SOURCE=.\definable.cpp
  # End Source File
--- 163,166 ----
***************
*** 482,489 ****
  
  SOURCE=.\dbl_single_click.h
- # End Source File
- # Begin Source File
- 
- SOURCE=.\debug.h
  # End Source File
  # Begin Source File
--- 478,481 ----

Index: wolfpack.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/wolfpack.cpp,v
retrieving revision 1.455
retrieving revision 1.456
diff -C2 -d -r1.455 -r1.456
*** wolfpack.cpp	5 Sep 2003 00:03:46 -0000	1.455
--- wolfpack.cpp	7 Sep 2003 19:07:47 -0000	1.456
***************
*** 30,34 ****
  //==================================================================================
  
- #include "wolfpack.h"
  #include "world.h"
  #include "verinfo.h"
--- 30,33 ----
***************
*** 71,74 ****
--- 70,74 ----
  #include "sectors.h"
  #include "basedef.h"
+ #include "wpconsole.h"
  
  // Library Includes
***************
*** 150,154 ****
  void reloadScripts()
  {
! 	clConsole.send( "Reloading definitions, scripts and wolfpack.xml\n" );
  
  	SrvParams->reload(); // Reload wolfpack.xml
--- 150,154 ----
  void reloadScripts()
  {
! 	clConsole.send( "Reloading scripts...\n" );
  
  	SrvParams->reload(); // Reload wolfpack.xml
***************
*** 205,209 ****
  		try
  		{
- 			
  			while( keeprun )
  			{
--- 205,208 ----
***************
*** 236,344 ****
  	int i;
  	char c = command.latin1()[0];
  
! 	if (c != 0)
  	{
! 		c = toupper(c);
! 		if (c == 'S')
! 		{
! 			if (secure)
! 			{
! 				clConsole.send("WOLFPACK: Secure mode disabled. Press ? for a commands list.\n");
! 				secure=0;
! 				return;
! 			}
! 			else
! 			{
! 				clConsole.send("WOLFPACK: Secure mode re-enabled.\n");
! 				secure=1;
! 				return;
! 			}
! 		} else {
! 			if (secure && c != '?')  //Allows help in secure mode.
! 			{
! 				clConsole.send("WOLFPACK: Secure mode prevents keyboard commands! Press 'S' to disable.\n");
! 				return;
! 			}
  
! 			switch(c)
! 			{
! 			case '\x1B':
! 				keeprun=0;
! 				break;
! 			case 'Q':
! 			case 'q':
! 				clConsole.send("WOLFPACK: Immediate Shutdown initialized!\n");
! 				keeprun=0;
! 				break;
  
! 			case '#':
! 				World::instance()->save();
! 				
! 				SrvParams->flush();
! 				break;
! 			case 'D':	// Disconnect account 0 (useful when client crashes)
! 			case 'd':	
! 					break;
! 			case 'P':
! 			case 'p':				// Display profiling information
! //				clConsole.send("Performace Dump:\n");
! //				clConsole.send("Network code: %fmsec [%i samples]\n" _ (float)((float)networkTime/(float)networkTimeCount) _ networkTimeCount);
! //				clConsole.send("Timer code: %fmsec [%i samples]\n" _ (float)((float)timerTime/(float)timerTimeCount) _ timerTimeCount);
! //				clConsole.send("Auto code: %fmsec [%i samples]\n" _ (float)((float)autoTime/(float)autoTimeCount) _ autoTimeCount);
! //				clConsole.send("Loop Time: %fmsec [%i samples]\n" _ (float)((float)loopTime/(float)loopTimeCount) _ loopTimeCount);
! //				clConsole.send("Characters: %i/%i (Dynamic)		Items: %i/%i (Dynamic)\n" _ charcount _ cmem _ itemcount _ imem);
! //				clConsole.send("Simulation Cycles: %f per sec\n" _ (1000.0*(1.0/(float)((float)loopTime/(float)loopTimeCount))));
! 				break;
! 			case 'W':
! 			case 'w':				// Display logged in chars
! 				clConsole.send( "Current Users in the World:\n" );
  
! 				mSock = cNetwork::instance()->first();
! 				i = 0;
! 				
! 				for( mSock = cNetwork::instance()->first(); mSock; mSock = cNetwork::instance()->next() )
! 				{
! 					if( mSock->player() )
! 					{
! 						clConsole.send( QString("%1) %2 [%3]\n").arg(++i).arg(mSock->player()->name()).arg(QString::number( mSock->player()->serial(), 16) ) );
! 					}
! 				}
  
! 				clConsole.send( tr("Total Users Online: %1\n").arg(cNetwork::instance()->count()) );
! 				break;
! 			case 'A': //reload the accounts file
! 			case 'a':
! 				Accounts::instance()->reload();
! 				break;
! 			case 'r':
! 			case 'R':
! 				reloadScripts();
  
! 				break;
! 			case '?':
! 				clConsole.send("Console commands:\n");
! 				clConsole.send("	<Esc> or Q: Shutdown the server.\n");
! 				clConsole.send("	T - System Message: The server is shutting down in 10 minutes.\n");
! 				clConsole.send("	# - Save world\n");
! 				clConsole.send("	D - Disconnect Account 0\n");
! 				clConsole.send("	1 - Sysmessage: Attention Players Server being brought down!\n");
! 				clConsole.send("	2 - Broadcast Message 2\n");
! 				clConsole.send("	P - Preformance Dump\n");
! 				clConsole.send("	W - Display logged in characters\n");
! 				clConsole.send("	A - Reload accounts\n");
! 				clConsole.send("	R - Reload scripts\n");
! 				clConsole.send("	S - Toggle Secure mode ");
! 				if (secure)
! 					clConsole.send("[enabled]\n");
! 				else
! 					clConsole.send("[disabled]\n");
! 				clConsole.send("	? - Commands list (this)\n");
! 				clConsole.send("End of commands list.\n");
! 				break;
! 			default:
! 				clConsole.send(tr("WOLFPACK: Key %1 [%2] does not preform a function.\n").arg( c > 32 ? c : '¿' ).arg(QString::number(c)));
! 				break;
! 			}
  		}
  	}
  }
--- 235,308 ----
  	int i;
  	char c = command.latin1()[0];
+ 	c = toupper(c);
  
! 	if( c == 'S' )
  	{
! 		secure = !secure;
  
! 		if( !secure )
! 			clConsole.send("WOLFPACK: Secure mode disabled. Press ? for a commands list.\n");
! 		else
! 			clConsole.send("WOLFPACK: Secure mode re-enabled.\n");
  
! 		return;
! 	}
  
! 	// Allow Help in Secure Mode
! 	if( secure && c != '?' )
! 	{
! 		clConsole.send( "WOLFPACK: Secure mode prevents keyboard commands! Press 'S' to disable.\n" );
! 		return;
! 	}
  
! 	switch( c )
! 	{
! 	case 'Q':
! 		clConsole.send("WOLFPACK: Immediate Shutdown initialized!\n");
! 		keeprun=0;
! 		break;
  
! 	case '#':
! 		World::instance()->save();				
! 		SrvParams->flush();
! 		break;
! 
! 	case 'W':
! 		clConsole.send( "Current Users in the World:\n" );
! 
! 		mSock = cNetwork::instance()->first();
! 		i = 0;
! 		
! 		for( mSock = cNetwork::instance()->first(); mSock; mSock = cNetwork::instance()->next() )
! 		{
! 			if( mSock->player() )
! 				clConsole.send( QString("%1) %2 [%3]\n").arg(++i).arg(mSock->player()->name()).arg(QString::number( mSock->player()->serial(), 16) ) );
  		}
+ 
+ 		clConsole.send( tr("Total Users Online: %1\n").arg(cNetwork::instance()->count()) );
+ 		break;
+ 	case 'A': //reload the accounts file
+ 		Accounts::instance()->reload();
+ 		break;
+ 	case 'R':
+ 		reloadScripts();
+ 		break;
+ 	case '?':
+ 		clConsole.send("Console commands:\n");
+ 		clConsole.send("	Q: Shutdown the server.\n");
+ 		clConsole.send("	# - Save world\n" );
+ 		clConsole.send("	W - Display logged in characters\n" );
+ 		clConsole.send("	A - Reload accounts\n" );
+ 		clConsole.send("	R - Reload scripts\n" );
+ 		clConsole.send("	S - Toggle Secure mode " );
+ 		if( secure )
+ 			clConsole.send( "[enabled]\n" );
+ 		else
+ 			clConsole.send( "[disabled]\n" );
+ 		clConsole.send( "	? - Commands list (this)\n" );
+ 		clConsole.send( "End of commands list.\n" );
+ 		break;
+ 	default:
+ 		break;
  	}
  }

Index: wolfpack.pro
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/wolfpack.pro,v
retrieving revision 1.152
retrieving revision 1.153
diff -C2 -d -r1.152 -r1.153
*** wolfpack.pro	5 Sep 2003 00:03:46 -0000	1.152
--- wolfpack.pro	7 Sep 2003 19:07:48 -0000	1.153
***************
*** 69,73 ****
  		  dbl_single_click.h \
  		  dbdriver.h \
- 		  debug.h \
  		  definable.h \
  		  defines.h \
--- 69,72 ----
***************
*** 142,146 ****
  		dbl_single_click.cpp \
  		dbdriver.cpp \
- 		debug.cpp \
  		definable.cpp \
  		dragdrop.cpp \
--- 141,144 ----

--- debug.cpp DELETED ---

--- debug.h DELETED ---

--- storage.cpp DELETED ---

--- storage.h DELETED ---