--- deliantra/server/include/map.h 2008/12/27 08:41:44 1.107
+++ deliantra/server/include/map.h 2009/11/08 16:13:45 1.118
@@ -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
*/
@@ -31,6 +32,8 @@
#include
+//+GPL
+
#include "region.h"
#include "cfperl.h"
@@ -92,16 +95,16 @@
*/
#define P_BLOCKSVIEW 0x01
#define P_NO_MAGIC 0x02 /* Spells (some) can't pass this object */
-#define P_PLAYER 0x04 /* a player (or something seeing these objects) is on this mapspace */
+#define P_NO_CLERIC 0x04 /* no clerical spells cast here */
#define P_SAFE 0x08 /* If this is set the map tile is a safe space,
* that means, nothing harmful can be done,
* such as: bombs, potion usage, alchemy, spells
* this was introduced to make shops safer
* but is useful in other situations */
-#define P_IS_ALIVE 0x10 /* something alive is on this space */
-#define P_NO_CLERIC 0x20 /* no clerical spells cast here */
-#define P_UPTODATE 0x80 /* this space is up to date */
+#define P_PLAYER 0x10 /* a player (or something seeing these objects) is on this mapspace */
+#define P_IS_ALIVE 0x20 /* something alive is on this space */
+#define P_UPTODATE 0x80 // this space is up to date
/* The following two values are not stored in the MapLook flags, but instead
* used in the get_map_flags value - that function is used to return
@@ -122,22 +125,37 @@
struct mapspace
{
object *ACC (RW, bot);
- object *ACC (RW, top); /* lowest/highest object on this space */
+ 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 */
- MoveType ACC (RW, move_slow); /* What movement types this space slows */
- MoveType ACC (RW, move_on); /* What movement types are activated */
- MoveType ACC (RW, move_off); /* What movement types are activated */
+ 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 */
+ MoveType ACC (RW, move_slow); /* What movement types this space slows */
+ MoveType ACC (RW, move_on); /* What movement types are activated */
+ MoveType ACC (RW, move_off); /* What movement types are activated */
+ uint16_t ACC (RW, nrof_); // saturates at 64k
+ uint32_t ACC (RW, volume_); // ~dm³ (not cm³) (factor is actually 1024)
+ uint32_t ACC (RW, smell); // the last count a player was seen here, or 0
+ static uint32_t ACC (RW, smellcount); // global smell counter
+
+ uint32_t pad1_, pad2_; // pad to 64 bytes on 64 bit systems
+
+//-GPL
void update_ ();
MTH void update ()
{
- if (!(flags_ & P_UPTODATE))
+ // we take advantage of the fact that 0x80 is the sign bit
+ // to generate more efficient code on many cpus
+ assert (sint8 (P_UPTODATE) < 0);
+ assert (sint8 (-1 & ~P_UPTODATE) >= 0);
+
+ if (expect_false (sint8 (flags_) >= 0))
update_ ();
+
+ // must be true by now
+ assume (sint8 (flags_) < 0);
+ assume (flags_ & P_UPTODATE);
}
MTH uint8 flags ()
@@ -164,8 +182,18 @@
return op;
}
+ MTH uint32 nrof ()
+ {
+ update ();
+ return nrof_;
+ }
+
// return the item volume on this mapspace in cm³
- MTH uint64 volume () const;
+ MTH uint64 volume ()
+ {
+ update ();
+ return volume_ * 1024;
+ }
bool blocks (MoveType mt) const
{
@@ -187,6 +215,8 @@
int dx, dy; // offset to go from local coordinates to original tile */
};
+//+GPL
+
struct shopitems : zero_initialised
{
const char *name; /* name of the item in question, null if it is the default item */
@@ -272,6 +302,9 @@
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
+ int ACC (RW, max_items); // maximum number of items on a mapspace
+
+//-GPL
// the maptile:: is neccessary here for the perl interface to work
MTH sint8 darklevel (sint8 outside = maptile::outdoor_darkness) const
@@ -296,6 +329,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);
@@ -375,6 +413,8 @@
maprect *split_to_tiles (int x0, int y0, int x1, int y1);
};
+//+GPL
+
/* This is used by get_rangevector to determine where the other
* creature is. get_rangevector takes into account map tiling,
* so you just can not look the the map coordinates and get the
@@ -400,7 +440,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);
@@ -415,6 +455,8 @@
}
// comaptibility cruft end
+//-GPL
+
inline mapspace &
object::ms () const
{
@@ -491,6 +533,7 @@
// see common/los.C for usage example
// 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) \
{ \
@@ -514,8 +557,9 @@
}
// loop over every space in the given maprect,
-// setting m, nx, ny to the map and -coordinate and dx, dy to the offste relative to dx0,dy0
+// 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) \
@@ -523,16 +567,20 @@
statementvar (int, dx, nx + (rect)->dx - (dx0)) \
statementvar (int, dy, ny + (rect)->dy - (dy0))
-// same as above, but the walk will not follow any particular
+// 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
-#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); \
+// "continue" will skip to the next space
+#define unordered_mapwalk_at(map,ox,oy,dx0,dy0,dx1,dy1) \
+ for (maprect *r_e_c_t = (map)->split_to_tiles ( \
+ (ox) + (dx0) , (oy) + (dy0) , \
+ (ox) + (dx1) + 1, (oy) + (dy1) + 1); \
r_e_c_t->m; \
++r_e_c_t) \
- rect_mapwalk (r_e_c_t, (op)->x, (op)->y)
+ rect_mapwalk (r_e_c_t, (ox), (oy))
+
+#define unordered_mapwalk(op,dx0,dy0,dx1,dy1) \
+ unordered_mapwalk_at (op->map, op->x, op->y, dx0, dy0, dx1, dy1)
#endif