ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/include/global.h
(Generate patch)

Comparing deliantra/server/include/global.h (file contents):
Revision 1.9 by root, Thu Aug 31 17:54:14 2006 UTC vs.
Revision 1.15 by root, Fri Sep 8 16:51:44 2006 UTC

1/* 1/*
2 * static char *rcsid_global_h = 2 * static char *rcsid_global_h =
3 * "$Id: global.h,v 1.9 2006/08/31 17:54:14 root Exp $"; 3 * "$Id: global.h,v 1.15 2006/09/08 16:51:44 root Exp $";
4 */ 4 */
5 5
6/* 6/*
7 CrossFire, A Multiplayer game for X-windows 7 CrossFire, A Multiplayer game for X-windows
8 8
… …
75#endif 75#endif
76 76
77typedef signed char sint8; 77typedef signed char sint8;
78#define SINT8_MAX 127 78#define SINT8_MAX 127
79 79
80
81typedef unsigned short Fontindex; 80typedef unsigned short Fontindex;
82 81
83#ifdef WIN32 82#ifdef WIN32
84/* Python plugin stuff defines SIZEOF_LONG_LONG as 8, and besides __int64 is a 64b type on MSVC... 83/* 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 */ 84 * So let's force the typedef */
… …
105#error correct and send mail to crossfire-devel on how to do this 104#error correct and send mail to crossfire-devel on how to do this
106#endif 105#endif
107 106
108#endif 107#endif
109 108
109#include <vector>
110
111#define ACC_CLASS(name)
112#define ACC(meta,member) member
113
110#include "keyword.h" 114#include "keyword.h"
111#include "traits.h" 115#include "traits.h"
112#include "dynbuf.h" 116#include "dynbuf.h"
117#include "util.h"
113#include "shstr.h" 118#include "shstr.h"
114 119
115/* This blob, in this order, is needed to actually define maps */ 120/* This blob, in this order, is needed to actually define maps */
116#include "face.h" 121#include "face.h"
117/* Include the basic defines from spells.h */ 122/* Include the basic defines from spells.h */
… …
140/* 145/*
141 * So far only used when dealing with artifacts. 146 * So far only used when dealing with artifacts.
142 * (now used by alchemy and other code too. Nov 95 b.t). 147 * (now used by alchemy and other code too. Nov 95 b.t).
143 */ 148 */
144typedef struct linked_char { 149typedef struct linked_char {
145 const char *name; 150 shstr name;
146 struct linked_char *next; 151 struct linked_char *next;
147} linked_char; 152} linked_char;
148
149 153
150/* Pull in artifacts */ 154/* Pull in artifacts */
151#include "artifact.h" 155#include "artifact.h"
152 156
153/* Now for gods */ 157/* Now for gods */
… …
219EXTERN long ob_count; 223EXTERN long ob_count;
220/* 224/*
221 * Used in treasure.c 225 * Used in treasure.c
222 */ 226 */
223EXTERN archetype *ring_arch,*amulet_arch,*staff_arch,*crown_arch; 227EXTERN archetype *ring_arch,*amulet_arch,*staff_arch,*crown_arch;
224EXTERN const char *undead_name; /* Used in hit_player() in main.c */
225 228
226EXTERN Animations *animations; 229extern std::vector<Animations> animations;
227EXTERN int num_animations,animations_allocated, bmaps_checksum; 230EXTERN int num_animations,animations_allocated, bmaps_checksum;
228 231
229/* Rotate right from bsd sum. This is used in various places for checksumming */ 232/* 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; 233#define ROTATE_RIGHT(c) if ((c) & 01) (c) = ((c) >>1) + 0x80000000; else (c) >>= 1;
231 234
… …
268/* FREE_AND_CLEAR frees the pointer and then sets it to NULL. 271/* FREE_AND_CLEAR frees the pointer and then sets it to NULL.
269 * This is generally done as a safety, and having this macro 272 * This is generally done as a safety, and having this macro
270 * makes the code a bit cleaner when doing so. 273 * makes the code a bit cleaner when doing so.
271 */ 274 */
272#define FREE_AND_CLEAR(xyz) {free(xyz); xyz=NULL; } 275#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 276
282#ifdef CALLOC 277#ifdef CALLOC
283#undef CALLOC 278#undef CALLOC
284#endif 279#endif
285 280
… …
404#define GETTIMEOFDAY(last_time) gettimeofday(last_time, (struct timezone *) NULL); 399#define GETTIMEOFDAY(last_time) gettimeofday(last_time, (struct timezone *) NULL);
405#else 400#else
406#define GETTIMEOFDAY(last_time) gettimeofday(last_time); 401#define GETTIMEOFDAY(last_time) gettimeofday(last_time);
407#endif 402#endif
408 403
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" 404#include "plugin.h"
415#include "cfperl.h" 405#include "cfperl.h"
416 406
407//TODO: various TEMPORARY link guards to avoid doing the wrong thing
408void free (object *);
409void free (archetype *);
410void free (recipe *);
411void free (linked_char *);
412void free (godlink *);
413void free (mapstruct *);
414void free (key_value *);
415void free (treasure *);
416void free (materialtype_t *);
417void free (player *);
418void free (New_Face *);
419
417#endif /* GLOBAL_H */ 420#endif /* GLOBAL_H */
421

Diff Legend

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