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.10 by root, Sun Sep 3 00:18:41 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.10 2006/09/03 00:18:41 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
110#include "keyword.h" 112#include "keyword.h"
111#include "traits.h" 113#include "traits.h"
112#include "dynbuf.h" 114#include "dynbuf.h"
113#include "shstr.h" 115#include "shstr.h"
116#include "util.h"
114 117
115/* This blob, in this order, is needed to actually define maps */ 118/* This blob, in this order, is needed to actually define maps */
116#include "face.h" 119#include "face.h"
117/* Include the basic defines from spells.h */ 120/* Include the basic defines from spells.h */
118#include "attack.h" /* needs to be before material.h */ 121#include "attack.h" /* needs to be before material.h */
… …
140/* 143/*
141 * So far only used when dealing with artifacts. 144 * So far only used when dealing with artifacts.
142 * (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).
143 */ 146 */
144typedef struct linked_char { 147typedef struct linked_char {
145 const char *name; 148 shstr name;
146 struct linked_char *next; 149 struct linked_char *next;
147} linked_char; 150} linked_char;
148 151
149 152
150/* Pull in artifacts */ 153/* Pull in artifacts */
… …
219EXTERN long ob_count; 222EXTERN long ob_count;
220/* 223/*
221 * Used in treasure.c 224 * Used in treasure.c
222 */ 225 */
223EXTERN archetype *ring_arch,*amulet_arch,*staff_arch,*crown_arch; 226EXTERN archetype *ring_arch,*amulet_arch,*staff_arch,*crown_arch;
224EXTERN const char *undead_name; /* Used in hit_player() in main.c */ 227extern shstr 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

Diff Legend

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