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

Comparing deliantra/server/include/map.h (file contents):
Revision 1.83 by root, Wed Aug 15 04:57:48 2007 UTC vs.
Revision 1.95 by root, Sat May 17 14:11:13 2008 UTC

 /*
- * 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,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
  * Copyright (©) 2002-2005,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.
  *
  * This program is distributed in the hope that it will be useful,
  * 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, see <http://www.gnu.org/licenses/>.
  *
- * The authors can be reached via e-mail to <crossfire@schmorp.de>
+ * The authors can be reached via e-mail to <support@deliantra.net>
  */
 /*
  * The maptile is allocated each time a new map is opened.
  * It contains pointers (very indirectly) to all objects on the map.
 #define MAGIC_MAP_SIZE  50
 #define MAGIC_MAP_HALF  MAGIC_MAP_SIZE/2
 #define MAP_LAYERS		3
-/* Values for in_memory below.  Should probably be an enumerations */
+/* Values for in_memory below */
 enum {
-  MAP_IN_MEMORY,
+  MAP_ACTIVE,
+  MAP_INACTIVE, // not used atm.
   MAP_SWAPPED,
   MAP_LOADING,
   MAP_SAVING,
 };
  */
 #define P_OUT_OF_MAP	0x10000   /* This space is outside the map */
 #define	P_NEW_MAP	0x20000
                                 /* Coordinates passed result in a new tiled map  */
-/* P_NO_PASS is used for ob_blocked() return value.  It needs
- * to be here to make sure the bits don't match with anything.
- */
-#define P_NO_PASS       0x80000
 /* Instead of having numerous arrays that have information on a
  * particular space (was map, floor, floor2, map_ob),
  * 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.
     return 0;
   }
   // return the item volume on this mapspace in cm³
   uint64 volume () const;
+  bool blocks (MoveType mt) const
+  {
+    return move_block && (mt & move_block) == mt;
+  }
+  bool blocks (object *op) const
+  {
+    return blocks (op->move_type);
+  }
 };
 struct shopitems : zero_initialised
 {
   const char *name;             /* name of the item in question, null if it is the default item */
   uint16 ACC (RW, difficulty);     /* What level the player should be to play here */
   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 */
+  bool ACC (RW, no_drop);   /* avoid auto-dropping (on death) anything on this map */
   uint8 ACC (RW, darkness);        /* indicates level of darkness of map */
   uint16 ACC (RW, enter_x);        /* enter_x and enter_y are default entrance location */
   uint16 ACC (RW, enter_y);        /* on the map if none are set in the exit */
   oblinkpt *buttons;       /* Linked list of linked lists of buttons */
   MTH void clear_header ();
   MTH void clear_links_to (maptile *m);
   MTH struct region *region (int x, int y) const;
-  // loas the header pseudo-object
+  // load the header pseudo-object
   bool _load_header (object_thawer &thawer);
-  MTH bool _load_header (const char *path);
+  MTH bool _load_header (object_thawer *thawer) { return _load_header (*thawer); }
   // load objects into the map
   bool _load_objects (object_thawer &thawer);
-  MTH bool _load_objects (const char *path, bool skip_header = true);
+  MTH bool _load_objects (object_thawer *thawer) { return _load_objects (*thawer); }
   // save objects into the given file (uses IO_ flags)
   bool _save_objects (object_freezer &freezer, int flags);
   MTH bool _save_objects (const char *path, int flags);
   MTH int size () const { return width * height; }
   MTH object *insert (object *op, int x, int y, object *originator = 0, int flags = 0);
   MTH void touch () { last_access = runtime; }
+  MTH bool tile_available (int dir, bool load = true);
   // find the map that is at coordinate x|y relative to this map
   // TODO: need a better way than passing by reference
   // TODO: make perl interface
   maptile *xy_find (sint16 &x, sint16 &y);
   }
   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_async (const char *path, maptile *original = 0, bool load = true);//PERL
   static maptile *find_sync (const char *path, maptile *original = 0);//PERL
   static maptile *find_style_sync (const char *dir, const char *file = 0);//PERL
-  MTH object *pick_random_object () const;
+  object *pick_random_object (rand_gen &gen = rndm) 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]; }
 };
   int distance_y;
   int direction;
   object *part;
 };
+// comaptibility cruft start
 //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 ob_blocked (const object *ob, maptile *m, sint16 x, sint16 y);
 int out_of_map (maptile *m, int x, int 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_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 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
+static inline bool
 xy_normalise (maptile *&map, sint16 &x, sint16 &y)
 {
   // when in range, do a quick return, otherwise go the slow route
   return
     (IN_RANGE_EXC (x, 0, map->width) && IN_RANGE_EXC (y, 0, map->height))
     || !(get_map_flags (map, &map, x, y, &x, &y) & P_OUT_OF_MAP);
 }
+// comaptibility cruft end
 inline mapspace &
 object::ms () const
 {
   return map->at (x, y);
 }
+struct mapxy {
+  maptile *m;
+  sint16 x, y;
+  mapxy (maptile *m, sint16 x, sint16 y)
+  : m(m), x(x), y(y)
+  { }
+  mapxy (object *op)
+  : m(op->map), x(op->x), y(op->y)
+  { }
+  mapxy &move (int dx, int dy)
+  {
+    x += dx;
+    y += dy;
+    return *this;
+  }
+  mapxy &move (int dir)
+  {
+    return move (freearr_x [dir], freearr_y [dir]);
+  }
+  operator void *() const { return (void *)m; }
+  mapxy &operator =(const object *op)
+  {
+    m = op->map;
+    x = op->x;
+    y = op->y;
+    return *this;
+  }
+  mapspace *operator ->() const { return &m->at (x, y); }
+  mapspace &operator * () const { return  m->at (x, y); }
+  bool normalise ()
+  {
+    return xy_normalise (m, x, y);
+  }
+  mapspace &ms () const
+  {
+    return m->at (x, y);
+  }
+  object *insert (object *op, object *originator = 0, int flags = 0) const
+  {
+    return m->insert (op, x, y, originator, flags);
+  }
+};
+inline const mapxy &
+object::operator =(const mapxy &pos)
+{
+  map = pos.m;
+  x   = pos.x;
+  y   = pos.y;
+  return pos;
+}
 #endif

Diff Legend

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

Comparing deliantra/server/include/map.h (file contents): Revision 1.83 by root, Wed Aug 15 04:57:48 2007 UTC vs. Revision 1.95 by root, Sat May 17 14:11:13 2008 UTC

Diff Legend

Comparing deliantra/server/include/map.h (file contents):
Revision 1.83 by root, Wed Aug 15 04:57:48 2007 UTC vs.
Revision 1.95 by root, Sat May 17 14:11:13 2008 UTC