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

Comparing deliantra/server/include/map.h (file contents):
Revision 1.86 by root, Fri Aug 31 00:20:41 2007 UTC vs.
Revision 1.90 by root, Thu Nov 8 19:43:24 2007 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 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 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;
+  }
 };
 struct shopitems : zero_initialised
 {
   const char *name;             /* name of the item in question, null if it is the default item */
   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);
   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);
 }
-// not used anywhere *yet*
 struct mapxy {
   maptile *m;
   sint16 x, y;
   mapxy (maptile *m, sint16 x, sint16 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)
   {
-    x += freearr_x [dir];
+    return move (freearr_x [dir], freearr_y [dir]);
-    y += freearr_y [dir];
-    return *this;
   }
   operator void *() const { return (void *)m; }
   mapxy &operator =(const object *op)
   {
     return *this;
   }
   mapspace *operator ->() const { return &m->at (x, y); }
-  mapspace *operator * () const { return &m->at (x, y); }
+  mapspace &operator * () const { return  m->at (x, y); }
   bool normalise ()
   {
     return xy_normalise (m, x, y);
   }

Diff Legend

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

Comparing deliantra/server/include/map.h (file contents): Revision 1.86 by root, Fri Aug 31 00:20:41 2007 UTC vs. Revision 1.90 by root, Thu Nov 8 19:43:24 2007 UTC

Diff Legend

Comparing deliantra/server/include/map.h (file contents):
Revision 1.86 by root, Fri Aug 31 00:20:41 2007 UTC vs.
Revision 1.90 by root, Thu Nov 8 19:43:24 2007 UTC