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

Comparing deliantra/server/include/map.h (file contents):
Revision 1.60 by root, Sat Jan 27 23:59:29 2007 UTC vs.
Revision 1.82 by root, Sun Aug 12 14:13:54 2007 UTC

 /*
- * CrossFire, A Multiplayer game for X-windows
+ * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
  *
- * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
+ * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
- * Copyright (C) 2002-2005 Mark Wedel & Crossfire Development Team
+ * Copyright (©) 2002-2005,2007 Mark Wedel & Crossfire Development Team
- * Copyright (C) 1992 Frank Tore Johansen
+ * Copyright (©) 1992,2007 Frank Tore Johansen
  *
- * This program is free software; you can redistribute it and/or modify
+ * Crossfire TRT 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 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
  * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * The authors can be reached via e-mail at crossfire@schmorp.de
+ * The authors can be reached via e-mail to <crossfire@schmorp.de>
  */
 /*
  * The maptile is allocated each time a new map is opened.
  * It contains pointers (very indirectly) to all objects on the map.
 #ifndef MAP_H
 #define MAP_H
 #include <tr1/unordered_map>
+#include "region.h"
 #include "cfperl.h"
 /* We set this size - this is to make magic map work properly on
  * tiled maps. There is no requirement that this matches the
  * tiled maps size - it just seemed like a reasonable value.
 // all those macros are herewith declared legacy
 #define GET_MAP_FLAGS(M,X,Y)         (M)->at((X),(Y)).flags ()
 #define GET_MAP_LIGHT(M,X,Y)         (M)->at((X),(Y)).light
 #define GET_MAP_OB(M,X,Y)            (M)->at((X),(Y)).bot
 #define GET_MAP_TOP(M,X,Y)           (M)->at((X),(Y)).top
-#define GET_MAP_FACE(M,X,Y,L)        (M)->at((X),(Y)).faces[L]
 #define GET_MAP_FACE_OBJ(M,X,Y,L)    (M)->at((X),(Y)).faces_obj[L]
 #define GET_MAP_MOVE_BLOCK(M,X,Y)    (M)->at((X),(Y)).move_block
 #define GET_MAP_MOVE_SLOW(M,X,Y)     (M)->at((X),(Y)).move_slow
 #define GET_MAP_MOVE_ON(M,X,Y)       (M)->at((X),(Y)).move_on
 #define GET_MAP_MOVE_OFF(M,X,Y)      (M)->at((X),(Y)).move_off
  * to extend information about a space.
  */
 struct mapspace
 {
   object *bot, *top;            /* lowest/highest object on this space */
-  facetile *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 */
         if (op->type == PLAYER)
           return op;
     return 0;
   }
-};
-/*
+  // return the item volume on this mapspace in cm³
- * Each map is in a given region of the game world and links to a region definiton, so
+  uint64 volume () const;
- * they have to appear here in the headers, before the mapdef
- */
-INTERFACE_CLASS (region)
-struct region : zero_initialised
-{
-  region *ACC (RW, next);          /* pointer to next region, NULL for the last one */
-  char *ACC (RW, name);                   /* Shortend name of the region as maps refer to it */
-  char *ACC (RW, 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.
-                                           */
-  region *ACC (RW, 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.
-                                           */
-  char *ACC (RW, longname);               /* Official title of the region, this might be defined
-                                           * to be the same as name*/
-  char *ACC (RW, msg);                    /* the description of the region */
-  uint32 ACC (RW, counter);               /* A generic counter for holding temporary data. */
-  sint8 ACC (RW, fallback);               /* whether, in the event of a region not existing,
-                                           * this should be the one we fall back on as the default */
-  char *ACC (RW, jailmap);                /*where a player that is arrested in this region should be imprisoned. */
-  sint16 ACC (RW, jailx), ACC (RW, jaily);          /* The coodinates in jailmap to which the player should be sent. */
-  static region *default_region ();
-  static region *find (const char *name);
 };
 struct shopitems : zero_initialised
 {
   const char *name;             /* name of the item in question, null if it is the default item */
 struct maptile : zero_initialised, attachable
 {
   sint32 ACC (RW, width), ACC (RW, height);        /* Width and height of map. */
   struct mapspace *spaces;         /* Array of spaces on this map */
   uint8 *regions;                  /* region index per mapspace, if != 0 */
-  struct region **regionmap;       /* index to region */
+  region_ptr *regionmap;           /* index to region */
   tstamp ACC (RW, last_access);    /* last time this map was accessed somehow */
   shstr ACC (RW, name);    /* Name of map as given by its creator */
-  struct region *ACC (RW, default_region); /* What jurisdiction in the game world this map is ruled by
+  region_ptr ACC (RW, default_region); /* What jurisdiction in the game world this map is ruled by
                                     * points to the struct containing all the properties of
                                     * the region */
   double ACC (RW, reset_time);
   uint32 ACC (RW, reset_timeout);  /* How many seconds must elapse before this map
                                     * should be reset
                                     */
   bool ACC (RW, dirty);            /* if true, something was inserted or removed */
+  bool ACC (RW, no_reset);         // must not reset this map
   bool ACC (RW, fixed_resettime);  /* if true, reset time is not affected by
                                     * players entering/exiting map
                                     */
   sint32 ACC (RW, timeout);        /* swapout is set to this */
   sint32 ACC (RW, swap_time);      /* When it reaches 0, the map will be swapped out */
                                     * be loaded before used.  The map,omap and map_ob
                                     * arrays will be allocated when the map is loaded */
   sint16 players;        /* How many players are on this map right now */
   uint16 ACC (RW, difficulty);     /* What level the player should be to play here */
+  bool ACC (RW, active);           // wether this map is active or not
   bool ACC (RW, per_player);
   bool ACC (RW, per_party);
   bool ACC (RW, outdoor);  /* True if an outdoor map */
   bool ACC (RW, nodrop);   /* avoid dropping anything on this map */
   uint8 ACC (RW, darkness);        /* indicates level of darkness of map */
   shstr ACC (RW, msg);     /* Message map creator may have left */
   shstr ACC (RW, maplore); /* Map lore information */
   shstr ACC (RW, tile_path[4]);      /* path to adjoining maps */
   maptile *ACC (RW, tile_map[4]);   /* Next map, linked list */
   shstr ACC (RW, path);   /* Filename of the map */
+  int ACC (RW, max_nrof);                 // maximum nrof of any single item on a mapspace
+  uint64 ACC (RW, max_volume);            // maximum volume for all items on a mapspace
   MTH void activate ();
   MTH void deactivate ();
   // allocates all (empty) mapspace
   MTH void alloc ();
   // deallocates the mapspaces (and destroys all objects)
   MTH void clear ();
   MTH void fix_auto_apply ();
-  MTH void decay_objects ();
+  MTH void do_decay_objects ();
   MTH void update_buttons ();
   MTH int change_map_light (int change);
   static void change_all_map_light (int change); //PERL
   MTH void set_darkness_map ();
   MTH int estimate_difficulty () const;
+  MTH void play_sound (faceidx sound, int x, int y) const;
   // set the given flag on all objects in the map
   MTH void set_object_flag (int flag, int value = 1);
   MTH void link_multipart_objects ();
   }
   void make_map_floor (char **layout, char *floorstyle, random_map_params *RP);
   bool generate_random_map (random_map_params *RP);
+  static maptile *find_async (const char *path, maptile *original = 0);//PERL
   static maptile *find_sync (const char *path, maptile *original = 0);//PERL
-  // async prefetch
+  static maptile *find_style_sync (const char *dir, const char *file = 0);//PERL
-  static maptile *find_async (const char *path, maptile *original = 0);//PERL
+  MTH object *pick_random_object () const;
   mapspace const &at (uint32 x, uint32 y) const { return spaces [x * height + y]; }
   mapspace       &at (uint32 x, uint32 y)       { return spaces [x * height + y]; }
 };
   object *part;
 };
 //TODO: these should be refactored into things like xy_normalise
 // and so on.
-int get_map_flags(maptile *oldmap, maptile **newmap, sint16 x, sint16 y, sint16 *nx, sint16 *ny);
+int get_map_flags (maptile *oldmap, maptile **newmap, sint16 x, sint16 y, sint16 *nx, sint16 *ny);
-int ob_blocked(const object *ob, maptile *m, sint16 x, sint16 y);
+int ob_blocked (const object *ob, maptile *m, sint16 x, sint16 y);
-int out_of_map(maptile *m, int x, int y);
+int out_of_map (maptile *m, int x, int y);
-maptile *get_map_from_coord(maptile *m, sint16 *x, sint16 *y);
+maptile *get_map_from_coord (maptile *m, sint16 *x, sint16 *y);
-void get_rangevector(object *op1, object *op2, rv_vector *retval, int flags);
+void get_rangevector (object *op1, object *op2, rv_vector *retval, int flags);
-void get_rangevector_from_mapcoord(const maptile *m, int x, int y, const object *op2, rv_vector *retval, int flags);
+void get_rangevector_from_mapcoord (const maptile *m, int x, int y, const object *op2, rv_vector *retval, int flags);
-int on_same_map(const object *op1, const object *op2);
+int on_same_map (const object *op1, const object *op2);
+int adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy);
 // adjust map, x and y for tiled maps and return true if the position is valid at all
 inline bool
 xy_normalise (maptile *&map, sint16 &x, sint16 &y)
 {

Diff Legend

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

Comparing deliantra/server/include/map.h (file contents): Revision 1.60 by root, Sat Jan 27 23:59:29 2007 UTC vs. Revision 1.82 by root, Sun Aug 12 14:13:54 2007 UTC

Diff Legend

Comparing deliantra/server/include/map.h (file contents):
Revision 1.60 by root, Sat Jan 27 23:59:29 2007 UTC vs.
Revision 1.82 by root, Sun Aug 12 14:13:54 2007 UTC