--- deliantra/server/include/global.h	2007/03/06 19:02:35	1.46
+++ deliantra/server/include/global.h	2007/04/16 06:23:41	1.52
@@ -25,6 +25,8 @@
 #ifndef GLOBAL_H
 #define GLOBAL_H
 
+//#define _GLIBCXX_CONCEPT_CHECKS
+
 #ifndef EXTERN
 #define EXTERN extern
 #endif
@@ -111,12 +113,9 @@
  * GLOBAL VARIABLES:							     *
  *****************************************************************************/
 
-extern facetile *new_faces;
-
 /*
  * These are the beginnings of linked lists:
  */
-EXTERN treasurelist *first_treasurelist;
 EXTERN artifactlist *first_artifactlist;
 EXTERN archetype *first_archetype;
 EXTERN objectlink *first_friendly_object;	/* Objects monsters will go after */
@@ -155,11 +154,7 @@
  */
 EXTERN archetype *ring_arch, *amulet_arch, *staff_arch, *crown_arch;
 
-EXTERN std::vector<animation> animations;
-EXTERN int num_animations, animations_allocated;
-EXTERN uint32_t bmaps_checksum;
-
-#define SET_ANIMATION(ob,newanim) ob->face = new_faces + animations [ob->animation_id].faces [newanim]
+#define SET_ANIMATION(ob,newanim) ob->face = animations [ob->animation_id].faces [newanim]
 #define GET_ANIMATION(ob,anim) animations [ob->animation_id].faces [anim]
 #define GET_ANIM_ID(ob) (ob->animation_id)
 /* NUM_ANIMATIONS returns the number of animations allocated.  The last
@@ -175,11 +170,6 @@
 extern int rightof_x[9], rightof_y[9];
 extern int leftof_x[9], leftof_y[9];
 
-extern facetile *blank_face, *empty_face;
-extern facetile *dark_faces[];
-
-extern client *init_sockets;
-
 extern void emergency_save ();
 extern void cleanup (const char *cause, bool make_core = false);
 
@@ -190,25 +180,25 @@
 
 INTERFACE_CLASS (Settings)
 struct Settings {
-  char    *ACC (RO, logfilename);   /* logfile to use */
+  const char *ACC (RO, logfilename);   /* logfile to use */
   int     ACC (RW, csport);	    /* port for new client/server */
   int     ACC (RW, debug);	    /* Default debugging level */
   uint8   dumpvalues;	    /* Set to dump various values/tables */
-  char    *dumparg;       /* additional argument for some dump functions */
+  const char *dumparg;       /* additional argument for some dump functions */
   uint8   daemonmode;     /* If true, detach and become daemon */
   int	    argc;	    /* parameters that were passed to the program */
   char    **argv;	    /* Only used by xio.c, so will go away at some time */
-  char    *ACC (RO, confdir);	    /* configuration files */
-  char    *ACC (RO, datadir);	    /* read only data files */
-  char    *ACC (RO, localdir);	    /* read/write data files */
-  char    *ACC (RO, playerdir);	    /* Where the player files are */
-  char    *ACC (RO, mapdir);	    /* Where the map files are */
-  char    *ACC (RO, archetypes);    /* name of the archetypes file - libdir is prepended */
-  char    *ACC (RO, regions);       /* name of the regions file - libdir is prepended */
-  char    *ACC (RO, treasures);	    /* location of the treasures file. */
-  char    *ACC (RO, uniquedir);	    /* directory for the unique items */
-  char    *ACC (RO, templatedir);   /* directory for the template map */
-  char    *ACC (RO, tmpdir);	    /* Directory to use for temporary files */
+  const char *ACC (RO, confdir);	    /* configuration files */
+  const char *ACC (RO, datadir);	    /* read only data files */
+  const char *ACC (RO, localdir);	    /* read/write data files */
+  const char *ACC (RO, playerdir);	    /* Where the player files are */
+  const char *ACC (RO, mapdir);	    /* Where the map files are */
+  const char *ACC (RO, archetypes);    /* name of the archetypes file - libdir is prepended */
+  const char *ACC (RO, regions);       /* name of the regions file - libdir is prepended */
+  const char *ACC (RO, treasures);	    /* location of the treasures file. */
+  const char *ACC (RO, uniquedir);	    /* directory for the unique items */
+  const char *ACC (RO, templatedir);   /* directory for the template map */
+  const char *ACC (RO, tmpdir);	    /* Directory to use for temporary files */
   sint16  ACC (RW, pk_luck_penalty);    /* Amount by which player luck is reduced if they PK */
   uint8   ACC (RW, stat_loss_on_death);	/* If true, chars lose a random stat when they die */
   uint8   ACC (RW, permanent_exp_ratio); /* how much exp should be 'permenant' and unable to be lost*/
@@ -227,10 +217,10 @@
   uint8   ACC (RW, real_wiz);       /* use mud-like wizards */
   uint8   dummy_000;
   uint8   ACC (RW, spellpoint_level_depend); /* spell costs go up with level */
-  char    ACC (RW, motd)[MAX_BUF];    /* name of the motd file */
-  char    *ACC (RO, rules);           /* name of rules file*/
-  char    *ACC (RO, news);            /* name of news file*/
-  char    ACC (RW, dm_mail)[MAX_BUF]; /* DM's Email address */
+  char ACC (RW, motd)[MAX_BUF];    /* name of the motd file */
+  const char *ACC (RO, rules);           /* name of rules file*/
+  const char *ACC (RO, news);            /* name of news file*/
+  char ACC (RW, dm_mail)[MAX_BUF]; /* DM's Email address */
 
   uint32  ACC (RW, worldmapstartx);	    /* starting x tile for the worldmap */
   uint32  ACC (RW, worldmapstarty);	    /* starting y tile for the worldmap */