[ViewVC] Diff of: cvs/deliantra/server/include/global.h

Comparing deliantra/server/include/global.h (file contents):
Revision 1.1 by root, Fri Feb 3 07:12:49 2006 UTC vs.
Revision 1.15 by root, Fri Sep 8 16:51:44 2006 UTC

 /*
  * static char *rcsid_global_h =
- *   "$Id: global.h,v 1.1 2006/02/03 07:12:49 root Exp $";
+ *   "$Id: global.h,v 1.15 2006/09/08 16:51:44 root Exp $";
  */
 /*
     CrossFire, A Multiplayer game for X-windows
 #endif
 typedef signed char	sint8;
 #define SINT8_MAX	127
 typedef unsigned short Fontindex;
 #ifdef WIN32
 /* Python plugin stuff defines SIZEOF_LONG_LONG as 8, and besides __int64 is a 64b type on MSVC...
  * So let's force the typedef */
 #error correct and send mail to crossfire-devel on how to do this
 #endif
 #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 */
 #include "attack.h" /* needs to be before material.h */
 #include "material.h"
 /*
  * So far only used when dealing with artifacts.
  * (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"
 /* Now for gods */
 EXTERN archetype *first_archetype;
 EXTERN objectlink *first_friendly_object;	/* Objects monsters will go after */
 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):
  */
 EXTERN long editor;     /* if true, edit maps instead of playing (almost obsolete) */
 /*
  * Variables set by different flags (see init.c):
  */
 EXTERN long warn_archetypes;	/* If true, write warnings when failing */
-				/* to find archetypes when loading from file */
+                                /* to find archetypes when loading from file */
 EXTERN long init_done;			/* Ignores signals until init_done is true */
 EXTERN long trying_emergency_save;	/* True when emergency_save() is reached */
 EXTERN long nroferrors;		/* If it exceeds MAX_ERRORS, call fatal() */
 extern long pticks;		/* used by various function to determine */
-				/* how often to save the character */
+                                /* how often to save the character */
 /*
  * Misc global variables:
  */
 EXTERN FILE *logfile;			/* Used by server/daemon.c */
 EXTERN int exiting;			/* True if the game is about to exit */
 EXTERN long nrofallowedstr;		/* Only used in malloc_info() */
 EXTERN archetype *empty_archetype;	/* Nice to have fast access to it */
 EXTERN archetype *map_archeytpe;
 EXTERN char first_map_path[MAX_BUF];	/* The start-level */
+EXTERN char first_map_ext_path[MAX_BUF]; /* 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;
-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 */
 #define ROTATE_RIGHT(c) if ((c) & 01) (c) = ((c) >>1) + 0x80000000; else (c) >>= 1;
 /* FREE_AND_CLEAR frees the pointer and then sets it to NULL.
  * This is generally done as a safety, and having this macro
  * 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
 #endif
     char    *uniquedir;	    /* directory for the unique items */
     char    *templatedir;   /* directory for the template map */
     char    *tmpdir;	    /* Directory to use for temporary files */
     uint8   stat_loss_on_death;	/* If true, chars lose a random stat when they die */
     sint16  pk_luck_penalty;    /* Amount by which player luck is reduced if they PK */
-    uint8   use_permanent_experience; /* If true, players can gain perm exp */
+    uint8   permanent_exp_ratio; /* how much exp should be 'permenant' and unable to be lost*/
+    uint8   death_penalty_ratio; /* how much exp should be lost at death */
+    uint8   death_penalty_level; /* how many levels worth of exp may be lost on one death */
     uint8   balanced_stat_loss; /* If true, Death stat depletion based on level etc */
     uint8   not_permadeth;  /* if true, death is non-permament */
     uint8   simple_exp;	    /* If true, use the simple experience system */
     int	    reset_loc_time; /* Number of seconds to put player back at home */
     uint8   set_title;	    /* players can set thier title */
     uint8   resurrection;   /* ressurection possible w/ permadeth on */
     uint8   search_items;   /* search_items command */
     uint8   spell_encumbrance; /* encumbrance effects spells */
     uint8   spell_failure_effects; /* nasty backlash to spell failures */
-	uint16	set_friendly_fire;	/* Percent of damage done by peaceful player vs player damage */
+    uint16  set_friendly_fire;	/* Percent of damage done by peaceful player vs player damage */
     uint8   casting_time;   /* it takes awhile to cast a spell */
     uint8   real_wiz;       /* use mud-like wizards */
     uint8   recycle_tmp_maps; /* re-use tmp maps. */
     uint8   explore_mode;     /* explore mode allowed? */
     uint8   spellpoint_level_depend; /* spell costs go up with level */
     int     armor_weight_reduction; /* Weight reduction per enchantment */
     uint8   armor_weight_linear;  /* If 1, weight reduction is linear, else exponantiel */
     int     armor_speed_improvement;    /* Speed improvement */
     uint8   armor_speed_linear;         /* If 1, speed improvement is linear, else exponantiel */
     uint8   no_player_stealing;     /* If 1, can not steal from other players */
+    uint8   create_home_portals;   /* If 1, can create portals in personal maps */
 } Settings;
 extern Settings settings;
 /* 0.94.1 - change to GETTIMEOFDAY macro - SNI systems only one one option.
 #define GETTIMEOFDAY(last_time) gettimeofday(last_time, (struct timezone *) NULL);
 #else
 #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 *);
 #endif /* GLOBAL_H */

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing deliantra/server/include/global.h (file contents): Revision 1.1 by root, Fri Feb 3 07:12:49 2006 UTC vs. Revision 1.15 by root, Fri Sep 8 16:51:44 2006 UTC

Diff Legend

Comparing deliantra/server/include/global.h (file contents):
Revision 1.1 by root, Fri Feb 3 07:12:49 2006 UTC vs.
Revision 1.15 by root, Fri Sep 8 16:51:44 2006 UTC