--- deliantra/server/include/global.h	2006/08/31 17:54:14	1.9
+++ deliantra/server/include/global.h	2006/09/03 00:18:41	1.10
@@ -107,10 +107,13 @@
 
 #endif
 
+#include <vector>
+
 #include "keyword.h"
 #include "traits.h"
 #include "dynbuf.h"
 #include "shstr.h"
+#include "util.h"
 
 /* This blob, in this order, is needed to actually define maps */
 #include "face.h"
@@ -142,7 +145,7 @@
  * (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;
 
@@ -221,9 +224,9 @@
  * 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 shstr 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 */
@@ -270,14 +273,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