[wpdev-commits] wolfpack defines.h,1.44,1.45 exceptions.h,1.7,1.8 platform.h,1.11,1.12 singleton.h,1.5,1.6 structs.h,1.36,1.37 uobject.h,1.77,1.78 verinfo.h,1.28,1.29

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

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

Modified Files:
	defines.h exceptions.h platform.h singleton.h structs.h 
	uobject.h verinfo.h 
Log Message:
clean ups.

Index: defines.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/defines.h,v
retrieving revision 1.44
retrieving revision 1.45
diff -C2 -d -r1.44 -r1.45
*** defines.h	5 Jan 2004 06:25:37 -0000	1.44
--- defines.h	6 Jan 2004 22:30:06 -0000	1.45
***************
*** 46,58 ****
  #define Reminder  __FILE__LINE__ ":Remind: "
  
- //#define MAXLOOPS 250000
  #define MaxZstep 5
  
- #if defined(__unix__)
- 
- #include <sys/types.h>
- 
- #endif
- 
  #define ILLEGAL_Z	128
  
--- 46,51 ----
***************
*** 196,203 ****
  
  // Line Of Sight
- #define ITEM_TYPE_CHOICES 6
  #define TREES_BUSHES 1 // Trees and other large vegetaion in the way
  #define WALLS_CHIMNEYS 2  // Walls, chimineys, ovens, etc... in the way
  #define DOORS 4 // Doors in the way
  #define ROOFING_SLANTED 8  // So can't tele onto slanted roofs, basically
  #define FLOORS_FLAT_ROOFING 16  //  For attacking between floors
--- 189,196 ----
  
  // Line Of Sight
  #define TREES_BUSHES 1 // Trees and other large vegetaion in the way
  #define WALLS_CHIMNEYS 2  // Walls, chimineys, ovens, etc... in the way
  #define DOORS 4 // Doors in the way
+ #define ITEM_TYPE_CHOICES 6
  #define ROOFING_SLANTED 8  // So can't tele onto slanted roofs, basically
  #define FLOORS_FLAT_ROOFING 16  //  For attacking between floors
***************
*** 211,215 ****
  #define MY_CLOCKS_PER_SEC 1000
  #define INVALID_SERIAL -1
- #define INVALID_UOXSOCKET -1
  
  #define CONN_MAIN 1
--- 204,207 ----

Index: exceptions.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/exceptions.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** exceptions.h	22 Mar 2003 13:29:22 -0000	1.7
--- exceptions.h	6 Jan 2004 22:30:06 -0000	1.8
***************
*** 37,41 ****
  // System Includes
  #include <exception>
- #include <string>
  
  // Library Includes
--- 37,40 ----
***************
*** 68,78 ****
  	{
  	private:
! 		std::string m_Error;
  	public:
! 		wpbad_ptr(std::string sError) throw() : m_Error(sError) {};
  
  		virtual const char *what() const throw()
  		{
! 			return m_Error.c_str();
  		}
  		~wpbad_ptr() throw(){} ;
--- 67,77 ----
  	{
  	private:
! 		QString m_Error;
  	public:
! 		wpbad_ptr(const QString& sError) throw() : m_Error(sError) {};
  
  		virtual const char *what() const throw()
  		{
! 			return m_Error.latin1();
  		}
  		~wpbad_ptr() throw(){} ;

Index: platform.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/platform.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** platform.h	7 Sep 2003 19:07:47 -0000	1.11
--- platform.h	6 Jan 2004 22:30:06 -0000	1.12
***************
*** 59,75 ****
  //#pragma optimize("y", off)
  #define OBSOLETETIME
- 
- //DIRECTIVES
- #if defined(_MSC_VER)
- /*
- #if !defined(min)
- #define min(x,y) _MIN(x,y)
- #endif
- #if !defined(max)
- #define max(x,y) _MAX(x,y)
- #endif
- */
- #endif
- 
  #define PACK
  
--- 59,62 ----

Index: singleton.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/singleton.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** singleton.h	5 May 2003 11:59:14 -0000	1.5
--- singleton.h	6 Jan 2004 22:30:06 -0000	1.6
***************
*** 10,13 ****
--- 10,14 ----
  #define __SINGLETONHOLDER_H__
  
+ #include "platform.h" // just to silent the warnings.
  #include <stdlib.h>
  

Index: structs.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/structs.h,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** structs.h	2 Sep 2003 02:06:34 -0000	1.36
--- structs.h	6 Jan 2004 22:30:06 -0000	1.37
***************
*** 37,41 ****
  
  // System Headers
- #include <string>
  #include <map>
  
--- 37,40 ----

Index: uobject.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/uobject.h,v
retrieving revision 1.77
retrieving revision 1.78
diff -C2 -d -r1.77 -r1.78
*** uobject.h	30 Sep 2003 15:06:29 -0000	1.77
--- uobject.h	6 Jan 2004 22:30:06 -0000	1.78
***************
*** 42,46 ****
  
  // System includes
- #include <string>
  #include <vector>
  #include <map>
--- 42,45 ----

Index: verinfo.h
===================================================================
RCS file: /cvsroot/wpdev/wolfpack/verinfo.h,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -d -r1.28 -r1.29
*** verinfo.h	11 Sep 2003 12:22:24 -0000	1.28
--- verinfo.h	6 Jan 2004 22:30:06 -0000	1.29
***************
*** 36,43 ****
  #include "platform.h"
  
- //System Includes
- #include <string>
- 
- 
  // Library Include
  #include <qstring.h>
--- 36,39 ----