Update of /cvsroot/wpdev/wolfpack
In directory sc8-pr-cvs1:/tmp/cvs-serv10812
Modified Files:
Timing.cpp TmpEff.h defines.h globals.cpp gumps.h typedefs.h
walking.h world.h
Log Message:
clean ups.
Index: Timing.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/Timing.cpp,v
retrieving revision 1.183
retrieving revision 1.184
diff -C2 -d -r1.183 -r1.184
*** Timing.cpp 24 Nov 2003 02:36:09 -0000 1.183
--- Timing.cpp 5 Jan 2004 06:25:37 -0000 1.184
***************
*** 67,70 ****
--- 67,74 ----
#define DBGFILE "Timing.cpp"
+ // global junk
+ time_t oldtime;
+ time_t newtime;
+
void restockNPC( UINT32 currenttime, P_NPC pc_i )
{
Index: TmpEff.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/TmpEff.h,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -d -r1.41 -r1.42
*** TmpEff.h 10 Oct 2003 21:13:46 -0000 1.41
--- TmpEff.h 5 Jan 2004 06:25:37 -0000 1.42
***************
*** 54,57 ****
--- 54,59 ----
#include "singleton.h"
+ #include <qstring.h>
+
class cDBResult;
Index: defines.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/defines.h,v
retrieving revision 1.43
retrieving revision 1.44
diff -C2 -d -r1.43 -r1.44
*** defines.h 15 Sep 2003 19:56:23 -0000 1.43
--- defines.h 5 Jan 2004 06:25:37 -0000 1.44
***************
*** 33,79 ****
#define __DEFINES_H__
- #define _ST_( L ) #L
- #define _MST_( M, L ) M(L)
- #define $LINE _MST_(_ST_, __LINE__)
- #define Reminder "("$LINE"):Remind: "
! #define MAXLOOPS 250000
#define MaxZstep 5
#if defined(__unix__)
- #define BYTE unsigned char
- #define SOCKET_ERROR -1
- extern "C" {
- char *strlwr(char *);
- char *strupr(char *);
- };
#include <sys/types.h>
- extern time_t oldtime, newtime;
- //#define Sleep(sec) usleep(sec * 1000)
-
- #else
- extern long int oldtime, newtime;
#endif
- //#ifndef MSG_NOSIGNAL
- //#define MSG_NOSIGNAL 0
- //#endif
#define ILLEGAL_Z 128
- #define MAX_GUILDTYPE 2 // Code to support the Chaos/order system
- #define MAXSERV 5 // Maximum servers in login listing
- //#define MAXSTART 15 // Maximum starting locations
-
- #define MAXPAGES 75 // Maximum number of pages in the GM queue
#define VISRANGE 18 // Visibility for normal items
#define BUILDRANGE 31 // Visibility for castles and keeps
#define XYMAX 256 // Maximum items Wolfpack can handle on one X/Y square
- //#define MAXEFFECTS MAXCHARS/10
#define MAXLAYERS 50 // Maximum number of Layers in paperdolls (still not sure how many)
#define ITEMMENUOFFSET 256
- #define CMAX 40 // Maximum parameters in one line (Only for memory reasons)
#define VERFILE_MAP 0x00
#define VERFILE_STAIDX 0x01
--- 33,66 ----
#define __DEFINES_H__
! //o---------------------------------------------------------------------------o
! // FIXMEs / TODOs / NOTE macros
! //o---------------------------------------------------------------------------o
! #define _QUOTE(x) # x
! #define QUOTE(x) _QUOTE(x)
! #define __FILE__LINE__ __FILE__ "(" QUOTE(__LINE__) ") : "
! #define todo( x ) message( __FILE__LINE__" TODO : " #x "\n" )
! #define fixme( x ) message( __FILE__LINE__" FIXME: " #x "\n" )
! #define note( x ) message( __FILE__LINE__" NOTE : " #x "\n" )
!
! #define Reminder __FILE__LINE__ ":Remind: "
!
! //#define MAXLOOPS 250000
#define MaxZstep 5
#if defined(__unix__)
#include <sys/types.h>
#endif
#define ILLEGAL_Z 128
#define VISRANGE 18 // Visibility for normal items
#define BUILDRANGE 31 // Visibility for castles and keeps
#define XYMAX 256 // Maximum items Wolfpack can handle on one X/Y square
#define MAXLAYERS 50 // Maximum number of Layers in paperdolls (still not sure how many)
#define ITEMMENUOFFSET 256
#define VERFILE_MAP 0x00
#define VERFILE_STAIDX 0x01
***************
*** 207,214 ****
North = 1, NorthEast, East, SouthEast, South, SouthWest, West, NorthWest
};
-
- // for spinning wheel -vagrant
- #define YARN 0
- #define THREAD 1
// Line Of Sight
--- 194,197 ----
Index: globals.cpp
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/globals.cpp,v
retrieving revision 1.104
retrieving revision 1.105
diff -C2 -d -r1.104 -r1.105
*** globals.cpp 23 Sep 2003 12:40:18 -0000 1.104
--- globals.cpp 5 Jan 2004 06:25:37 -0000 1.105
***************
*** 50,55 ****
enServerState serverState;
- time_t oldtime;
- time_t newtime;
QDateTime uoTime;
int autosaved;
--- 50,53 ----
Index: gumps.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/gumps.h,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** gumps.h 23 Nov 2003 03:46:22 -0000 1.33
--- gumps.h 5 Jan 2004 06:25:37 -0000 1.34
***************
*** 37,40 ****
--- 37,42 ----
#include <qstringlist.h>
#include <qobject.h>
+ #include <vector>
+ #include <map>
// Forward Declarations
***************
*** 43,46 ****
--- 45,57 ----
class cPage;
class cSpawnRegion;
+
+
+ struct gumpChoice_st
+ {
+ signed int button;
+ std::vector< unsigned int > switches;
+ std::map< unsigned short, QString > textentries;
+ };
+
/*****************************************************************************
Index: typedefs.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/typedefs.h,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** typedefs.h 20 Sep 2003 01:05:10 -0000 1.24
--- typedefs.h 5 Jan 2004 06:25:37 -0000 1.25
***************
*** 34,42 ****
#define __TYPEDEFS_H__
- // Library includes
- #include "qstring.h"
- #include <vector>
- #include <map>
-
// Forward Base Classes declaration
--- 34,37 ----
***************
*** 69,78 ****
typedef cUObject * P_OBJECT;
- struct gumpChoice_st
- {
- signed int button;
- std::vector< unsigned int > switches;
- std::map< unsigned short, QString > textentries;
- };
enum WPPAGE_TYPE
--- 64,67 ----
Index: walking.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/walking.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** walking.h 7 Sep 2003 19:07:47 -0000 1.20
--- walking.h 5 Jan 2004 06:25:37 -0000 1.21
***************
*** 36,39 ****
--- 36,41 ----
#include "singleton.h"
+ #include <qglobal.h>
+
struct unitile_st
{
Index: world.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/world.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** world.h 26 Aug 2003 15:01:06 -0000 1.4
--- world.h 5 Jan 2004 06:25:37 -0000 1.5
***************
*** 70,76 ****
// is implemented in this private structure for compile reasons.
class cWorldPrivate *p;
! UINT32 _charCount;
! UINT32 _itemCount;
! UINT32 lastTooltip;
SERIAL _lastCharSerial, _lastItemSerial;
--- 70,76 ----
// is implemented in this private structure for compile reasons.
class cWorldPrivate *p;
! unsigned int _charCount;
! unsigned int _itemCount;
! unsigned int lastTooltip;
SERIAL _lastCharSerial, _lastItemSerial;
***************
*** 102,109 ****
SERIAL findItemSerial() const { return _lastItemSerial + 1; }
! UINT32 charCount() const { return _charCount; }
! UINT32 itemCount() const { return _itemCount; }
! UINT32 getUnusedTooltip() { return ++lastTooltip; }
};
--- 102,109 ----
SERIAL findItemSerial() const { return _lastItemSerial + 1; }
! unsigned int charCount() const { return _charCount; }
! unsigned int itemCount() const { return _itemCount; }
! unsigned int getUnusedTooltip() { return ++lastTooltip; }
};
|
