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.13 by root, Sun Sep 3 23:33:00 2006 UTC vs.
Revision 1.16 by root, Mon Sep 11 01:49:03 2006 UTC

1/* 1/*
2 * static char *rcsid_global_h = 2 * static char *rcsid_global_h =
3 * "$Id: global.h,v 1.13 2006/09/03 23:33:00 root Exp $"; 3 * "$Id: global.h,v 1.16 2006/09/11 01:49:03 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 */
… …
107 106
108#endif 107#endif
109 108
110#include <vector> 109#include <vector>
111 110
111#define ACC_CLASS(name)
112#define ACC(meta,member) member
113
112#include "keyword.h" 114#include "keyword.h"
113#include "traits.h" 115#include "traits.h"
114#include "dynbuf.h" 116#include "dynbuf.h"
115#include "util.h" 117#include "util.h"
116#include "shstr.h" 118#include "shstr.h"
… …
147typedef struct linked_char { 149typedef struct linked_char {
148 shstr name; 150 shstr name;
149 struct linked_char *next; 151 struct linked_char *next;
150} linked_char; 152} linked_char;
151 153
152
153/* Pull in artifacts */ 154/* Pull in artifacts */
154#include "artifact.h" 155#include "artifact.h"
155 156
156/* Now for gods */ 157/* Now for gods */
157#include "god.h" 158#include "god.h"
… …
222EXTERN long ob_count; 223EXTERN long ob_count;
223/* 224/*
224 * Used in treasure.c 225 * Used in treasure.c
225 */ 226 */
226EXTERN archetype *ring_arch,*amulet_arch,*staff_arch,*crown_arch; 227EXTERN archetype *ring_arch,*amulet_arch,*staff_arch,*crown_arch;
227extern shstr undead_name; /* Used in hit_player() in main.c */
228 228
229extern std::vector<Animations> animations; 229extern std::vector<Animations> animations;
230EXTERN int num_animations,animations_allocated, bmaps_checksum; 230EXTERN int num_animations,animations_allocated, bmaps_checksum;
231 231
232/* 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 */
… …
403 403
404#include "plugin.h" 404#include "plugin.h"
405#include "cfperl.h" 405#include "cfperl.h"
406 406
407//TODO: various TEMPORARY link guards to avoid doing the wrong thing 407//TODO: various TEMPORARY link guards to avoid doing the wrong thing
408void free (object *);
408void free (archetype *); 409void free (archetype *);
409void free (recipe *); 410void free (recipe *);
410void free (linked_char *); 411void free (linked_char *);
411void free (godlink *); 412void free (godlink *);
412void free (mapstruct *); 413void free (mapstruct *);
413void free (key_value *); 414void free (key_value *);
414void free (treasure *); 415void free (treasure *);
415void free (materialtype_t *); 416void free (materialtype_t *);
416void free (player *); 417void free (player *);
418void free (New_Face *);
419void free (racelink *);
417 420
418#endif /* GLOBAL_H */ 421#endif /* GLOBAL_H */
419 422

Diff Legend

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