--- deliantra/server/include/global.h 2007/07/31 17:33:14 1.64
+++ deliantra/server/include/global.h 2008/04/21 06:35:26 1.71
@@ -1,11 +1,11 @@
/*
- * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
+ * This file is part of Deliantra, the Roguelike Realtime MMORPG.
*
- * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
+ * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
* Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
* Copyright (©) 1992,2007 Frank Tore Johansen
*
- * Crossfire TRT is free software: you can redistribute it and/or modify
+ * Deliantra is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
@@ -18,7 +18,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*
- * The authors can be reached via e-mail to
+ * The authors can be reached via e-mail to
*/
#ifndef GLOBAL_H
@@ -44,6 +44,11 @@
#define FALSE 0
#endif
+extern short freearr_x[SIZEOFFREE], freearr_y[SIZEOFFREE];
+extern int maxfree[SIZEOFFREE], freedir[SIZEOFFREE];
+extern int rightof_x[9], rightof_y[9];
+extern int leftof_x[9], leftof_y[9];
+
// used only for tagging structure members so scripting languages
// can easily parse the include files.
#define INTERFACE_CLASS(name)
@@ -141,19 +146,11 @@
/*
* Misc global variables:
*/
-EXTERN FILE *logfile; /* Used by server/daemon.c */
-
-EXTERN archetype *empty_archetype; /* Nice to have fast access to it */
-EXTERN archetype *map_archeytpe;
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;
-/*
- * Used in treasure.c
- */
-EXTERN archetype *ring_arch, *amulet_arch, *staff_arch, *crown_arch;
#define SET_ANIMATION(ob,newanim) ob->face = animations [ob->animation_id].faces [newanim]
#define GET_ANIMATION(ob,anim) animations [ob->animation_id].faces [anim]
@@ -166,19 +163,14 @@
#define NUM_ANIMATIONS(ob) (animations[ob->animation_id].num_animations)
#define NUM_FACINGS(ob) (animations[ob->animation_id].facings)
-extern short freearr_x[SIZEOFFREE], freearr_y[SIZEOFFREE];
-extern int maxfree[SIZEOFFREE], freedir[SIZEOFFREE];
-extern int rightof_x[9], rightof_y[9];
-extern int leftof_x[9], leftof_y[9];
+// used only by treasure.C, does not handle null arch ptrs
+#define IS_ARCH(arch,name) ((arch)->archname == shstr_ ## name)
extern void emergency_save ();
-extern void cleanup (const char *cause, bool make_core = false);
#include "libproto.h"
#include "sockproto.h"
-#define decrease_ob(xyz) decrease_ob_nr(xyz,1)
-
INTERFACE_CLASS (Settings)
struct Settings {
const char *ACC (RO, logfilename); /* logfile to use */
@@ -246,7 +238,5 @@
void reset_signals ();
-#include "plugin.h"
-
#endif /* GLOBAL_H */