[ViewVC] Diff of: cvs/deliantra/server/include/global.h

Comparing deliantra/server/include/global.h (file contents):
Revision 1.9 by root, Thu Aug 31 17:54:14 2006 UTC vs.
Revision 1.21 by root, Mon Dec 11 21:32:17 2006 UTC

…		…
1	/*
2	* static char *rcsid_global_h =
3	* "$Id: global.h,v 1.9 2006/08/31 17:54:14 root Exp $";
4	*/
5
6	/*	1	/*
7	CrossFire, A Multiplayer game for X-windows	2	CrossFire, A Multiplayer game for X-windows
8		3
9	Copyright (C) 2002 Mark Wedel & Crossfire Development Team	4	Copyright (C) 2002 Mark Wedel & Crossfire Development Team
10	Copyright (C) 1992 Frank Tore Johansen	5	Copyright (C) 1992 Frank Tore Johansen
33	#define EXTERN extern	28	#define EXTERN extern
34	#endif	29	#endif
35		30
36	#include "includes.h"	31	#include "includes.h"
37		32
38		33	typedef int8_t sint8;
39	/* Type defines for specific signed/unsigned variables of a certain number	34	typedef uint8_t uint8;
40	* of bits. Not really used anyplace, but if a certain number of bits	35	typedef int16_t sint16;
41	* is required, these type defines should then be used. This will make	36	typedef uint16_t uint16;
42	* porting to systems that have different sized data types easier.	37	typedef int32_t sint32;
43	*
44	* Note: The type defines should just mean that the data type has at
45	* least that many bits. if a uint16 is actually 32 bits, no big deal,
46	* it is just a waste of space.
47	*
48	* Note2: When using something that is normally stored in a character
49	* (ie strings), don't use the uint8/sint8 typdefs, use 'char' instead.
50	* The signedness for char is probably not universal, and using char
51	* will probably be more portable than sint8/unit8
52	*/
53
54
55	typedef unsigned int uint32;	38	typedef uint32_t uint32;
56		39	typedef int64_t sint64;
57	#ifndef UINT32_MAX	40	typedef uint64_t uint64;
58	#define UINT32_MAX 4294967295U
59	#endif
60
61	typedef signed int sint32;
62	#define SINT32_MAX 2147483647
63
64	typedef unsigned short uint16;
65	#ifndef UINT16_MAX
66	#define UINT16_MAX 65535
67	#endif
68
69	typedef signed short sint16;
70	#define SINT16_MAX 32767
71
72	typedef unsigned char uint8;
73	#ifndef UINT8_MAX
74	#define UINT8_MAX 255
75	#endif
76
77	typedef signed char sint8;
78	#define SINT8_MAX 127
79
80		41
81	typedef unsigned short Fontindex;	42	typedef unsigned short Fontindex;
82		43
83	#ifdef WIN32	44	#include <vector>
84	/* Python plugin stuff defines SIZEOF_LONG_LONG as 8, and besides __int64 is a 64b type on MSVC...
85	* So let's force the typedef */
86	typedef unsigned __int64 uint64;
87	typedef signed __int64 sint64;
88	/* Needed for experience */
89	#define atoll _atoi64
90		45
91	/* To reduce number of warnings */	46	#define ACC_CLASS(name)
92	#pragma warning( disable: 4244 ) /* conversion from 'xxx' to 'yyy', possible loss of data */	47	#define ACC(meta,member) member
93	#pragma warning( disable: 4305 ) /* initializing float f = 0.05; instead of f = 0.05f; */
94
95	#else /* WIN32 */
96
97	#if SIZEOF_LONG == 8
98	typedef unsigned long uint64;
99	typedef signed long sint64;
100	#elif SIZEOF_LONG_LONG == 8
101	typedef unsigned long long uint64;
102	typedef signed long long sint64;
103	#else
104	#error do not know how to get a 64 bit value on this system.
105	#error correct and send mail to crossfire-devel on how to do this
106	#endif
107
108	#endif
109		48
110	#include "keyword.h"	49	#include "keyword.h"
111	#include "traits.h"	50	#include "traits.h"
112	#include "dynbuf.h"	51	#include "dynbuf.h"
		52	#include "util.h"
113	#include "shstr.h"	53	#include "shstr.h"
114		54
115	/* This blob, in this order, is needed to actually define maps */	55	/* This blob, in this order, is needed to actually define maps */
116	#include "face.h"	56	#include "face.h"
117	/* Include the basic defines from spells.h */	57	/* Include the basic defines from spells.h */
…		…
139	#include "book.h"	79	#include "book.h"
140	/*	80	/*
141	* So far only used when dealing with artifacts.	81	* So far only used when dealing with artifacts.
142	* (now used by alchemy and other code too. Nov 95 b.t).	82	* (now used by alchemy and other code too. Nov 95 b.t).
143	*/	83	*/
144	typedef struct linked_char {	84	struct linked_char
145	const char *name;	85	{
		86	shstr name;
146	struct linked_char *next;	87	struct linked_char *next;
147	} linked_char;	88	};
148
149		89
150	/* Pull in artifacts */	90	/* Pull in artifacts */
151	#include "artifact.h"	91	#include "artifact.h"
152		92
153	/* Now for gods */	93	/* Now for gods */
…		…
172		112
173	/*	113	/*
174	* These are the beginnings of linked lists:	114	* These are the beginnings of linked lists:
175	*/	115	*/
176	EXTERN player *first_player;	116	EXTERN player *first_player;
177	EXTERN mapstruct *first_map;	117	EXTERN maptile *first_map;
178	EXTERN region *first_region;	118	EXTERN region *first_region;
179	EXTERN treasurelist *first_treasurelist;	119	EXTERN treasurelist *first_treasurelist;
180	EXTERN artifactlist *first_artifactlist;	120	EXTERN artifactlist *first_artifactlist;
181	EXTERN archetype *first_archetype;	121	EXTERN archetype *first_archetype;
182	EXTERN objectlink first_friendly_object; / Objects monsters will go after */	122	EXTERN objectlink first_friendly_object; / Objects monsters will go after */
…		…
219	EXTERN long ob_count;	159	EXTERN long ob_count;
220	/*	160	/*
221	* Used in treasure.c	161	* Used in treasure.c
222	*/	162	*/
223	EXTERN archetype ring_arch,amulet_arch,staff_arch,crown_arch;	163	EXTERN archetype ring_arch,amulet_arch,staff_arch,crown_arch;
224	EXTERN const char undead_name; / Used in hit_player() in main.c */
225		164
226	EXTERN Animations *animations;	165	extern std::vector<Animations> animations;
227	EXTERN int num_animations,animations_allocated, bmaps_checksum;	166	EXTERN int num_animations,animations_allocated, bmaps_checksum;
228		167
229	/* Rotate right from bsd sum. This is used in various places for checksumming */	168	/* Rotate right from bsd sum. This is used in various places for checksumming */
230	#define ROTATE_RIGHT(c) if ((c) & 01) (c) = ((c) >>1) + 0x80000000; else (c) >>= 1;	169	#define ROTATE_RIGHT(c) if ((c) & 01) (c) = ((c) >>1) + 0x80000000; else (c) >>= 1;
231		170
…		…
268	/* FREE_AND_CLEAR frees the pointer and then sets it to NULL.	207	/* FREE_AND_CLEAR frees the pointer and then sets it to NULL.
269	* This is generally done as a safety, and having this macro	208	* This is generally done as a safety, and having this macro
270	* makes the code a bit cleaner when doing so.	209	* makes the code a bit cleaner when doing so.
271	*/	210	*/
272	#define FREE_AND_CLEAR(xyz) {free(xyz); xyz=NULL; }	211	#define FREE_AND_CLEAR(xyz) {free(xyz); xyz=NULL; }
273	#define FREE_AND_CLEAR_STR(xyz) {free_string(xyz); xyz=NULL; }
274
275	/* FREE_AND_COPY is for the shared string - it is handy enough
276	* to use all over the place.
277	*/
278	#define FREE_AND_COPY(sv,nv) { if (sv) free_string(sv); sv=add_string(nv); }
279
280	#define DELETE_STRING(__str_) free_string(__str_);__str_=NULL;
281		212
282	#ifdef CALLOC	213	#ifdef CALLOC
283	#undef CALLOC	214	#undef CALLOC
284	#endif	215	#endif
285		216
…		…
289	#else	220	#else
290	# define CALLOC(x,y) malloc(x*y)	221	# define CALLOC(x,y) malloc(x*y)
291	# define CFREE(x) free(x)	222	# define CFREE(x) free(x)
292	#endif	223	#endif
293		224
294	#ifndef WIN32 /* ---win32 we define this stuff in win32.h */
295	#if HAVE_DIRENT_H	225	#if HAVE_DIRENT_H
296	# include <dirent.h>	226	# include <dirent.h>
297	# define NAMLEN(dirent) strlen((dirent)->d_name)	227	# define NAMLEN(dirent) strlen((dirent)->d_name)
298	#else	228	#else
299	# define dirent direct	229	# define dirent direct
…		…
305	# include <sys/dir.h>	235	# include <sys/dir.h>
306	# endif	236	# endif
307	# if HAVE_NDIR_H	237	# if HAVE_NDIR_H
308	# include <ndir.h>	238	# include <ndir.h>
309	# endif	239	# endif
310	#endif
311	#endif	240	#endif
312		241
313	typedef struct Settings {	242	typedef struct Settings {
314	char logfilename; / logfile to use */	243	char logfilename; / logfile to use */
315	uint16 csport; /* port for new client/server */	244	uint16 csport; /* port for new client/server */
…		…
404	#define GETTIMEOFDAY(last_time) gettimeofday(last_time, (struct timezone *) NULL);	333	#define GETTIMEOFDAY(last_time) gettimeofday(last_time, (struct timezone *) NULL);
405	#else	334	#else
406	#define GETTIMEOFDAY(last_time) gettimeofday(last_time);	335	#define GETTIMEOFDAY(last_time) gettimeofday(last_time);
407	#endif	336	#endif
408		337
409	/* GROS: Those are used by plugin events (argument fixthem) */
410	#define SCRIPT_FIX_ACTIVATOR 2
411	#define SCRIPT_FIX_ALL 1
412	#define SCRIPT_FIX_NOTHING 0
413
414	#include "plugin.h"	338	#include "plugin.h"
415	#include "cfperl.h"	339	#include "cfperl.h"
416		340
		341	//TODO: various TEMPORARY link guards to avoid doing the wrong thing
		342	void free (object *);
		343	void free (archetype *);
		344	void free (recipe *);
		345	void free (linked_char *);
		346	void free (godlink *);
		347	void free (objectlink *);
		348	void free (oblinkpt *);
		349	void free (maptile *);
		350	void free (key_value *);
		351	void free (treasure *);
		352	void free (materialtype_t *);
		353	void free (player *);
		354	void free (New_Face *);
		355	void free (racelink *);
		356
417	#endif /* GLOBAL_H */	357	#endif /* GLOBAL_H */
		358

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing deliantra/server/include/global.h (file contents): Revision 1.9 by root, Thu Aug 31 17:54:14 2006 UTC vs. Revision 1.21 by root, Mon Dec 11 21:32:17 2006 UTC

Diff Legend

Comparing deliantra/server/include/global.h (file contents):
Revision 1.9 by root, Thu Aug 31 17:54:14 2006 UTC vs.
Revision 1.21 by root, Mon Dec 11 21:32:17 2006 UTC