--- deliantra/server/include/global.h 2009/10/15 21:40:42 1.78 +++ deliantra/server/include/global.h 2010/01/16 13:41:37 1.82 @@ -32,10 +32,9 @@ #endif #include "includes.h" - #include "config.h" +#include "compiler.h" #include "define.h" -#include "logger.h" #ifndef TRUE #define TRUE 1 @@ -46,7 +45,7 @@ #endif extern short freearr_x[SIZEOFFREE], freearr_y[SIZEOFFREE]; -extern int maxfree[SIZEOFFREE], freedir[SIZEOFFREE]; +extern int freedir[SIZEOFFREE]; extern int rightof_x[9], rightof_y[9]; extern int leftof_x[9], leftof_y[9]; @@ -56,14 +55,9 @@ #define ACC(meta,member) member #define MTH -#if __GNUC__ >= 3 -# define attribute(attrlist) __attribute__(attrlist) -#else -# define attribute(attrlist) -#endif - #include "keyword.h" #include "traits.h" +#include "logger.h" #include "dynbuf.h" #include "util.h" #include "shstr.h" @@ -148,7 +142,6 @@ EXTERN shstr first_map_path; /* The start-level */ EXTERN shstr first_map_ext_path; /* Path used for per-race start maps */ -EXTERN char errmsg[HUGE_BUF]; EXTERN long ob_count; extern dynbuf_text msg_dynbuf; // a dynbuf for text messages and other temporary data