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.8 by root, Thu Aug 31 09:19:34 2006 UTC vs.
Revision 1.13 by root, Sun Sep 3 23:33:00 2006 UTC

1/* 1/*
2 * static char *rcsid_global_h = 2 * static char *rcsid_global_h =
3 * "$Id: global.h,v 1.8 2006/08/31 09:19:34 root Exp $"; 3 * "$Id: global.h,v 1.13 2006/09/03 23:33:00 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
… …
105#error correct and send mail to crossfire-devel on how to do this 105#error correct and send mail to crossfire-devel on how to do this
106#endif 106#endif
107 107
108#endif 108#endif
109 109
110#include <vector>
111
112#include "keyword.h"
110#include "traits.h" 113#include "traits.h"
114#include "dynbuf.h"
115#include "util.h"
116#include "shstr.h"
111 117
112/* This blob, in this order, is needed to actually define maps */ 118/* This blob, in this order, is needed to actually define maps */
113#include "face.h" 119#include "face.h"
114/* Include the basic defines from spells.h */ 120/* Include the basic defines from spells.h */
115#include "attack.h" /* needs to be before material.h */ 121#include "attack.h" /* needs to be before material.h */
… …
137/* 143/*
138 * So far only used when dealing with artifacts. 144 * So far only used when dealing with artifacts.
139 * (now used by alchemy and other code too. Nov 95 b.t). 145 * (now used by alchemy and other code too. Nov 95 b.t).
140 */ 146 */
141typedef struct linked_char { 147typedef struct linked_char {
142 const char *name; 148 shstr name;
143 struct linked_char *next; 149 struct linked_char *next;
144} linked_char; 150} linked_char;
145 151
146 152
147/* Pull in artifacts */ 153/* Pull in artifacts */
… …
216EXTERN long ob_count; 222EXTERN long ob_count;
217/* 223/*
218 * Used in treasure.c 224 * Used in treasure.c
219 */ 225 */
220EXTERN archetype *ring_arch,*amulet_arch,*staff_arch,*crown_arch; 226EXTERN archetype *ring_arch,*amulet_arch,*staff_arch,*crown_arch;
221EXTERN const char *undead_name; /* Used in hit_player() in main.c */ 227extern shstr undead_name; /* Used in hit_player() in main.c */
222 228
223EXTERN Animations *animations; 229extern std::vector<Animations> animations;
224EXTERN int num_animations,animations_allocated, bmaps_checksum; 230EXTERN int num_animations,animations_allocated, bmaps_checksum;
225 231
226/* 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 */
227#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;
228 234
… …
265/* 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.
266 * This is generally done as a safety, and having this macro 272 * This is generally done as a safety, and having this macro
267 * makes the code a bit cleaner when doing so. 273 * makes the code a bit cleaner when doing so.
268 */ 274 */
269#define FREE_AND_CLEAR(xyz) {free(xyz); xyz=NULL; } 275#define FREE_AND_CLEAR(xyz) {free(xyz); xyz=NULL; }
270#define FREE_AND_CLEAR_STR(xyz) {free_string(xyz); xyz=NULL; }
271
272/* FREE_AND_COPY is for the shared string - it is handy enough
273 * to use all over the place.
274 */
275#define FREE_AND_COPY(sv,nv) { if (sv) free_string(sv); sv=add_string(nv); }
276
277#define DELETE_STRING(__str_) free_string(__str_);__str_=NULL;
278 276
279#ifdef CALLOC 277#ifdef CALLOC
280#undef CALLOC 278#undef CALLOC
281#endif 279#endif
282 280
… …
401#define GETTIMEOFDAY(last_time) gettimeofday(last_time, (struct timezone *) NULL); 399#define GETTIMEOFDAY(last_time) gettimeofday(last_time, (struct timezone *) NULL);
402#else 400#else
403#define GETTIMEOFDAY(last_time) gettimeofday(last_time); 401#define GETTIMEOFDAY(last_time) gettimeofday(last_time);
404#endif 402#endif
405 403
406/* GROS: Those are used by plugin events (argument fixthem) */
407#define SCRIPT_FIX_ACTIVATOR 2
408#define SCRIPT_FIX_ALL 1
409#define SCRIPT_FIX_NOTHING 0
410
411#include "plugin.h" 404#include "plugin.h"
412#include "cfperl.h" 405#include "cfperl.h"
413 406
407//TODO: various TEMPORARY link guards to avoid doing the wrong thing
408void free (archetype *);
409void free (recipe *);
410void free (linked_char *);
411void free (godlink *);
412void free (mapstruct *);
413void free (key_value *);
414void free (treasure *);
415void free (materialtype_t *);
416void free (player *);
417
414#endif /* GLOBAL_H */ 418#endif /* GLOBAL_H */
419

Diff Legend

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