--- deliantra/server/include/map.h 2008/12/23 22:03:06 1.103
+++ deliantra/server/include/map.h 2009/10/12 14:00:58 1.114
@@ -5,18 +5,19 @@
* Copyright (©) 2002-2005,2007 Mark Wedel & Crossfire Development Team
* Copyright (©) 1992,2007 Frank Tore Johansen
*
- * 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.
+ * Deliantra is free software: you can redistribute it and/or modify it under
+ * the terms of the Affero 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,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* 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, see .
+ * You should have received a copy of the Affero GNU General Public License
+ * and the GNU General Public License along with this program. If not, see
+ * .
*
* The authors can be reached via e-mail to
*/
@@ -49,6 +50,14 @@
#define MAP_LAYERS 3
+// tile map index
+enum {
+ TILE_UP = 0,
+ TILE_RIGHT = 1,
+ TILE_DOWN = 2,
+ TILE_LEFT = 3,
+};
+
/* Values for in_memory below */
enum {
MAP_ACTIVE,
@@ -101,9 +110,8 @@
* function that does more of the work can hopefully be used to replace
* lots of duplicate checks currently in the code.
*/
-#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 */
+#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 */
/* Instead of having numerous arrays that have information on a
* particular space (was map, floor, floor2, map_ob),
@@ -117,6 +125,8 @@
object *ACC (RW, bot);
object *ACC (RW, top); /* lowest/highest object on this space */
object *ACC (RW, faces_obj[MAP_LAYERS]);/* face objects for the 3 layers */
+ uint32_t smell; // the last count a player was seen here, or 0
+ static uint32_t smellcount; // global smell counter
uint8 flags_; /* flags about this space (see the P_ values above) */
sint8 ACC (RW, light); /* How much light this space provides */
MoveType ACC (RW, move_block); /* What movement types this space blocks */
@@ -127,7 +137,7 @@
void update_ ();
MTH void update ()
{
- if (!(flags_ & P_UPTODATE))
+ if (expect_false (!(flags_ & P_UPTODATE)))
update_ ();
}
@@ -169,6 +179,15 @@
}
};
+// a rectangular area of a map
+struct maprect
+{
+ maptile *m;
+ int x0, y0;
+ int x1, y1;
+ int dx, dy; // offset to go from local coordinates to original tile */
+};
+
struct shopitems : zero_initialised
{
const char *name; /* name of the item in question, null if it is the default item */
@@ -278,6 +297,11 @@
MTH int estimate_difficulty () const;
MTH void play_sound (faceidx sound, int x, int y) const;
+ MTH void say_msg (const char *msg, int x, int y) const;
+
+ // connected links
+ oblinkpt *find_link (shstr_tmp id);
+ MTH void trigger (shstr_tmp id, int state = 1, object *activator = 0, object *originator = 0);
// set the given flag on all objects in the map
MTH void set_object_flag (int flag, int value = 1);
@@ -320,7 +344,7 @@
MTH void touch () { last_access = runtime; }
- MTH bool tile_available (int dir, bool load = true);
+ MTH maptile *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
@@ -348,6 +372,13 @@
object *pick_random_object (rand_gen &gen = rndm) const;
mapspace &at (uint32 x, uint32 y) const { return spaces [x * height + y]; }
+
+ // return an array of maprects corresponding
+ // to the given rectangular area. the last rect will have
+ // a 0 map pointer.
+ // the array will be stored in a static memory area,
+ // so recursion is not atm. supported
+ maprect *split_to_tiles (int x0, int y0, int x1, int y1);
};
/* This is used by get_rangevector to determine where the other
@@ -375,7 +406,7 @@
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);
+void get_rangevector_from_mapcoord (const maptile *m, int x, int y, const object *op2, rv_vector *retval, int flags = 0 /*unused*/);
int on_same_map (const object *op1, const object *op2);
int adjacent_map (const maptile *map1, const maptile *map2, int *dx, int *dy);
@@ -464,29 +495,53 @@
// can be used as a single statement, but both iterate macros
// invocations must not be followed by a ";"
// see common/los.C for usage example
-#define rectangular_mapspace_iterate_begin(op,dx0,dx1,dy0,dy1) \
- for (int dx = (dx0); dx <= (dx1); dx++) \
- { \
- sint16 nx, ny; \
- maptile *m = 0; \
- \
- for (int dy = (dy0); dy <= (dy1); dy++) \
- { \
- /* check to see if we can simply go one down quickly, */ \
- /* if not, due it the slow way */ \
- if (!m || ++ny >= m->height) \
- { \
- nx = (op)->x + dx; ny = (op)->y + dy; m = (op)->map; \
- \
- if (xy_normalise (m, nx, ny)) \
- m->touch (); \
- else \
- m = 0; \
- }
-
-#define rectangular_mapspace_iterate_end \
- } \
- }
+// the walk will be ordered, outer loop x, inner loop y
+// m will be set to the map (or 0), nx, ny to the map coord, dx, dy to the offset relative to op
+// "continue" will skip to the next space
+#define ordered_mapwalk_begin(op,dx0,dy0,dx1,dy1) \
+ for (int dx = (dx0); dx <= (dx1); ++dx) \
+ { \
+ sint16 nx, ny; \
+ maptile *m = 0; \
+ \
+ for (int dy = (dy0); dy <= (dy1); ++dy) \
+ { \
+ /* check to see if we can simply go one down quickly, */ \
+ /* if not, do it the slow way */ \
+ if (!m || ++ny >= m->height) \
+ { \
+ nx = (op)->x + dx; ny = (op)->y + dy; m = (op)->map; \
+ \
+ if (!xy_normalise (m, nx, ny)) \
+ m = 0; \
+ }
+
+#define ordered_mapwalk_end \
+ } \
+ }
+
+// loop over every space in the given maprect,
+// setting m, nx, ny to the map and -coordinate and dx, dy to the offset relative to dx0,dy0
+// the iterator code must be a single statement following this macro call, similar to "if"
+// "continue" will skip to the next space
+#define rect_mapwalk(rect,dx0,dy0) \
+ statementvar (maptile *, m, (rect)->m) \
+ for (int nx = (rect)->x0; nx < (rect)->x1; ++nx) \
+ for (int ny = (rect)->y0; ny < (rect)->y1; ++ny) \
+ statementvar (int, dx, nx + (rect)->dx - (dx0)) \
+ statementvar (int, dy, ny + (rect)->dy - (dy0))
+
+// same as ordered_mapwalk, but the walk will not follow any particular
+// order (unorded), but is likely faster.
+// m will be set to the map (never 0!), nx, ny to the map coord, dx, dy to the offset relative to op
+// "continue" will skip to the next space
+#define unordered_mapwalk(op,dx0,dy0,dx1,dy1) \
+ for (maprect *r_e_c_t = (op)->map->split_to_tiles ( \
+ (op)->x + (dx0) , (op)->y + (dy0) , \
+ (op)->x + (dx1) + 1, (op)->y + (dy1) + 1); \
+ r_e_c_t->m; \
+ ++r_e_c_t) \
+ rect_mapwalk (r_e_c_t, (op)->x, (op)->y)
#endif