--- deliantra/server/include/global.h	2006/08/29 08:01:36	1.6
+++ deliantra/server/include/global.h	2006/09/16 22:06:17	1.17
@@ -1,9 +1,4 @@
 /*
- * static char *rcsid_global_h =
- *   "$Id$";
- */
-
-/*
     CrossFire, A Multiplayer game for X-windows
 
     Copyright (C) 2002 Mark Wedel & Crossfire Development Team
@@ -77,7 +72,6 @@
 typedef signed char	sint8;
 #define SINT8_MAX	127
 
-
 typedef unsigned short Fontindex;
 
 #ifdef WIN32
@@ -107,6 +101,17 @@
 
 #endif
 
+#include <vector>
+
+#define ACC_CLASS(name)
+#define ACC(meta,member) member
+
+#include "keyword.h"
+#include "traits.h"
+#include "dynbuf.h"
+#include "util.h"
+#include "shstr.h"
+
 /* This blob, in this order, is needed to actually define maps */
 #include "face.h"
 /* Include the basic defines from spells.h */
@@ -137,11 +142,10 @@
  * (now used by alchemy and other code too. Nov 95 b.t).
  */
 typedef struct linked_char {
-  const char *name;
+  shstr name;
   struct linked_char *next;
 } linked_char;
 
-
 /* Pull in artifacts */
 #include "artifact.h"
 
@@ -178,9 +182,6 @@
 EXTERN godlink *first_god;
 EXTERN racelink *first_race;
 
-#define NROF_COMPRESS_METHODS 4
-extern char *uncomp[NROF_COMPRESS_METHODS][3];
-
 /*
  * The editor uses these (will get them out of here later):
  */
@@ -219,9 +220,8 @@
  * Used in treasure.c
  */
 EXTERN archetype *ring_arch,*amulet_arch,*staff_arch,*crown_arch;
-EXTERN const char *undead_name;	/* Used in hit_player() in main.c */
 
-EXTERN Animations *animations;
+extern std::vector<Animations> animations;
 EXTERN int num_animations,animations_allocated, bmaps_checksum;
 
 /* Rotate right from bsd sum. This is used in various places for checksumming */
@@ -268,14 +268,6 @@
  * makes the code a bit cleaner when doing so.
  */
 #define FREE_AND_CLEAR(xyz) {free(xyz); xyz=NULL; }
-#define FREE_AND_CLEAR_STR(xyz) {free_string(xyz); xyz=NULL; }
-
-/* FREE_AND_COPY is for the shared string - it is handy enough
- * to use all over the place.
- */
-#define FREE_AND_COPY(sv,nv) { if (sv) free_string(sv); sv=add_string(nv); }
-
-#define DELETE_STRING(__str_)  free_string(__str_);__str_=NULL;
 
 #ifdef CALLOC
 #undef CALLOC
@@ -404,12 +396,22 @@
 #define GETTIMEOFDAY(last_time) gettimeofday(last_time);
 #endif
 
-/* GROS: Those are used by plugin events (argument fixthem) */
-#define SCRIPT_FIX_ACTIVATOR 2
-#define SCRIPT_FIX_ALL 1
-#define SCRIPT_FIX_NOTHING 0
-
 #include "plugin.h"
 #include "cfperl.h"
 
+//TODO: various TEMPORARY link guards to avoid doing the wrong thing
+void free (object *);
+void free (archetype *);
+void free (recipe *);
+void free (linked_char *);
+void free (godlink *);
+void free (mapstruct *);
+void free (key_value *);
+void free (treasure *);
+void free (materialtype_t *);
+void free (player *);
+void free (New_Face *);
+void free (racelink *);
+
 #endif /* GLOBAL_H */
+