--- deliantra/server/include/map.h 2007/08/24 00:26:10 1.84
+++ deliantra/server/include/map.h 2008/05/04 14:12:37 1.92
@@ -1,11 +1,11 @@
/*
- * 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.
@@ -18,7 +18,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*
- * The authors can be reached via e-mail to
+ * The authors can be reached via e-mail to
*/
/*
@@ -49,9 +49,10 @@
#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,
@@ -105,11 +106,6 @@
#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.
@@ -156,6 +152,11 @@
// 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
@@ -272,13 +273,13 @@
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);
@@ -326,7 +327,7 @@
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]; }
@@ -350,10 +351,10 @@
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);
@@ -362,7 +363,7 @@
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
@@ -370,6 +371,7 @@
(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
@@ -377,5 +379,64 @@
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);
+ }
+
+ object *insert (object *op, object *originator = 0, int flags = 0) const
+ {
+ 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