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

Comparing deliantra/server/include/map.h (file contents):
Revision 1.1 by root, Fri Feb 3 07:12:49 2006 UTC vs.
Revision 1.8 by elmex, Tue Aug 15 17:35:50 2006 UTC

 /*
  * static char *rcsid_define_h =
- *   "$Id: map.h,v 1.1 2006/02/03 07:12:49 root Exp $";
+ *   "$Id: map.h,v 1.8 2006/08/15 17:35:50 elmex Exp $";
  */
 /*
     CrossFire, A Multiplayer game for X-windows
  * arch_blocked and functions that examine the return value.
  */
 #define AB_NO_PASS       0x04
 /*#define P_PASS_THRU     0x08	*//* */
+#define	P_SAFE          0x08	/* If this is set the map is a safe map,
+                                 * that means, nothing harmful there will be done,
+                                 * like: bombs, potion usage, alchemy, spells
+                                 * this was introduced to make shops more safe
+                                 * and propably other maps */
 #define P_IS_ALIVE      0x10	/* something alive is on this space */
 #define P_NO_CLERIC     0x20	/* no clerical spells cast here */
 #define P_NEED_UPDATE	0x40	/* this space is out of date */
 #define P_NO_ERROR      0x80	/* Purely temporary - if set, update_position
                                  * does not complain if the flags are different.
  * have this structure take care of that information.
  * This puts it all in one place, and should also make it easier
  * to extend information about a space.
  */
-typedef struct MapSpace {
+struct MapSpace {
     object	*bottom;	/* lowest object on this space */
     object	*top;		/* Highest object on this space */
     New_Face	*faces[MAP_LAYERS];	/* faces for the 3 layers */
     object	*faces_obj[MAP_LAYERS];	/* face objects for the 3 layers */
     uint8	flags;		/* flags about this space (see the P_ values above) */
     sint8	light;		/* How much light this space provides */
     MoveType	move_block;	/* What movement types this space blocks */
     MoveType	move_slow;	/* What movement types this space slows */
     MoveType	move_on;	/* What movement types are activated */
     MoveType	move_off;	/* What movement types are activated */
-} MapSpace;
+};
 /*
  * this is an overlay structure of the whole world.  It exists as a simple
  * high level map, which doesn't contain the full data of the underlying map.
  * in this map, only things such as weather are recorded.  By doing so, we
  * can keep the entire world parameters in memory, and act as a whole on
  * them at once.  We can then, in a separate loop, update the actual world
  * with the new values we have assigned.
  */
-typedef struct wmapdef {
+struct weathermap_t {
     sint16	temp;		/* base temperature of this tile (F) */
     sint16	pressure;	/* barometric pressure (mb) */
     sint8	humid;		/* humitidy of this tile */
     sint8	windspeed;	/* windspeed of this tile */
     sint8	winddir;	/* direction of wind */
     uint32	rainfall;	/* cumulative rainfall */
     uint8 	darkness;	/* indicates level of darkness of map */
     uint8	water;		/* 0-100 percentage of water tiles */
 	/*Dynamic parts*/
 	sint16  realtemp;  /*  temperature at a given calculation step for this tile*/
-} weathermap_t;
+};
 /*
  * Each map is in a given region of the game world and links to a region definiton, so
  * they have to appear here in the headers, before the mapdef
  */
-typedef struct regiondef {
+struct region {
-    struct	regiondef *next; /* pointer to next region, NULL for the last one */
+    struct region *next;                /* pointer to next region, NULL for the last one */
     const char	*name;		 /* Shortend name of the region as maps refer to it */
     const char	*parent_name;	 /*
     				  * So that parent and child regions can be defined in
     				  * any order, we keep hold of the parent_name during
 				  * initialisation, and the children get assigned to their
 				  * parents later. (before runtime on the server though)
 				  * nothing outside the init code should ever use this value.
 				  */
-    struct     regiondef *parent;/*
+    struct region *parent;              /*
     				  * Pointer to the region that is a parent of the current
     				  * region, if a value isn't defined in the current region
 				  * we traverse this series of pointers until it is.
 				  */
     const char	*longname;	 /* Official title of the region, this might be defined
     				  * to be the same as name*/
     const char	*msg;		 /* the description of the region */
     uint32	counter;	 /* A generic counter for holding temporary data. */
     sint8	fallback;	 /* whether, in the event of a region not existing,
     				  * this should be the one we fall back on as the default */
-} region;
+    char	*jailmap;        /*where a player that is arrested in this region should be imprisoned.*/
+    sint16	jailx, jaily;	 /* The coodinates in jailmap to which the player should be sent. */
+};
-typedef struct shopitem {
+struct shopitems {
     const char *name;     /* name of the item in question, null if it is the default item */
     const char *name_pl;  /* plural name */
     int typenum;    /* itemtype number we need to match 0 if it is the default price*/
     sint8 strength; /* the degree of specialisation the shop has in this item,
 		     * as a percentage from -100 to 100 */
     int index;      /* being the size of the shopitems array.*/
-} shopitems;
+};
 /* In general, code should always use the macros
  * above (or functions in map.c) to access many of the
  * values in the map structure.  Failure to do this will
  * almost certainly break various features.  You may think
  * it is safe to look at width and height values directly
  * (or even through the macros), but doing so will completely
  * break map tiling.
  */
-typedef struct mapdef {
+struct mapstruct {
-    struct mapdef *next;	/* Next map, linked list */
+    struct mapstruct *next;	/* Next map, linked list */
-    char path[HUGE_BUF];	/* Filename of the map */
     char *tmpname;	/* Name of temporary file */
     char *name;		/* Name of map as given by its creator */
-    region *region;	/* What jurisdiction in the game world this map is ruled by
+    struct region *region;	/* What jurisdiction in the game world this map is ruled by
     			 * points to the struct containing all the properties of
 			 * the region */
     uint32 reset_time;	/* when this map should reset */
     uint32 reset_timeout;  /* How many seconds must elapse before this map
 			    * should be reset
 			    */
     uint32 fixed_resettime:1;	/* if true, reset time is not affected by
 				 * players entering/exiting map
 				 */
     uint32 unique:1;	/* if set, this is a per player unique map */
+    uint32 safe_map:1;	/* if set, this map doesn't allow using magic or harmful stuff in any way */
-    uint32 template:1;	/* if set, this is a template map */
+    uint32 templatemap:1;	/* if set, this is a template map */
     uint32 nosmooth:1;  /* if set the content of this map has smoothlevel=0 forced*/
     sint32 timeout;	/* swapout is set to this */
     sint32 swap_time;	/* When it reaches 0, the map will be swapped out */
     sint16 players;	/* How many plares are on this level right now */
     uint32 in_memory;	/* If not true, the map has been freed and must
     uint16 width,height;	/* Width and height of map. */
     uint16 enter_x;	/* enter_x and enter_y are default entrance location */
     uint16 enter_y;	/* on the map if none are set in the exit */
     uint32  outdoor:1;	/* True if an outdoor map */
     oblinkpt *buttons;	/* Linked list of linked lists of buttons */
-    MapSpace	*spaces;    /* Array of spaces on this map */
+    struct MapSpace   *spaces;    /* Array of spaces on this map */
     sint16	temp;	/* base temperature of this tile (F) */
     sint16    pressure;  /* barometric pressure (mb) */
     sint8	humid;	/* humitidy of this tile */
     sint8     windspeed; /* windspeed of this tile */
     sint8     winddir;   /* direction of wind */
     sint8     sky;	/* sky conditions */
     int     wpartx,wparty; /*Highly fasten conversion between worldmap and weathermap*/
-    shopitems   *shopitems; /* a semi-colon seperated list of item-types the map's shop will trade in */
+    struct shopitems   *shopitems; /* a semi-colon seperated list of item-types the map's shop will trade in */
     char    *shoprace;  /* the preffered race of the local shopkeeper */
     double  shopgreed;  /* how much our shopkeeper overcharges */
     uint64  shopmin;    /* minimum price a shop will trade for */
     uint64  shopmax;    /* maximum price a shop will offer */
     char    *msg;	/* Message map creator may have left */
+    char    *maplore;	/* Map lore information */
     char    *tile_path[4];  /* path to adjoining maps */
-    struct mapdef *tile_map[4];	/* Next map, linked list */
+    struct mapstruct *tile_map[4];	/* Next map, linked list */
-} mapstruct;
+    char path[HUGE_BUF];	/* Filename of the map */
+};
 /* This is used by get_rangevector to determine where the other
  * creature is.  get_rangevector takes into account map tiling,
  * so you just can not look the the map coordinates and get the
  * righte value.  distance_x/y are distance away, which
  * can be negativbe.  direction is the crossfire direction scheme
  * that the creature should head.  part is the part of the
  * monster that is closest.
  * Note: distance should be always >=0. I changed it to UINT. MT
  */
-typedef struct rv_vector {
+struct rv_vector {
     unsigned int	    distance;
     int	    distance_x;
     int	    distance_y;
     int	    direction;
     object  *part;
-} rv_vector;
+};
+extern void (*load_original_map_callback)(mapstruct *map);
+extern void (*load_temporary_map_callback)(mapstruct *map);
+extern void (*clean_temporary_map_callback)(mapstruct *map);
 #endif

Diff Legend

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

Comparing deliantra/server/include/map.h (file contents): Revision 1.1 by root, Fri Feb 3 07:12:49 2006 UTC vs. Revision 1.8 by elmex, Tue Aug 15 17:35:50 2006 UTC

Diff Legend

Comparing deliantra/server/include/map.h (file contents):
Revision 1.1 by root, Fri Feb 3 07:12:49 2006 UTC vs.
Revision 1.8 by elmex, Tue Aug 15 17:35:50 2006 UTC