--- deliantra/server/include/map.h 2009/05/05 04:51:56 1.112
+++ deliantra/server/include/map.h 2011/04/22 06:10:33 1.135
@@ -1,22 +1,23 @@
/*
* This file is part of Deliantra, the Roguelike Realtime MMORPG.
*
- * 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
+ * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+ * Copyright (©) 2002-2005 Mark Wedel & Crossfire Development Team
+ * Copyright (©) 1992 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"
@@ -47,14 +50,17 @@
#define MAGIC_MAP_SIZE 50
#define MAGIC_MAP_HALF MAGIC_MAP_SIZE/2
-#define MAP_LAYERS 3
+#define MAP_LAYERS 3
// tile map index
enum {
- TILE_UP = 0,
- TILE_RIGHT = 1,
- TILE_DOWN = 2,
- TILE_LEFT = 3,
+ TILE_NORTH,
+ TILE_EAST,
+ TILE_SOUTH,
+ TILE_WEST,
+ TILE_UP,
+ TILE_DOWN,
+ TILE_NUM,
};
/* Values for in_memory below */
@@ -92,16 +98,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 +128,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, items_); // 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 (expect_false (!(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 (gcc seems content with only the second test)
+ assume (sint8 (flags_) < 0);
+ assume (flags_ & P_UPTODATE);
}
MTH uint8 flags ()
@@ -164,8 +185,18 @@
return op;
}
+ MTH uint32 items()
+ {
+ update ();
+ return items_;
+ }
+
// 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
{
@@ -178,7 +209,7 @@
}
};
-// a rectangular area of a map
+// a rectangular area of a map, used my split_to_tiles/unordered_mapwalk
struct maprect
{
maptile *m;
@@ -187,6 +218,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 */
@@ -253,13 +286,6 @@
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 */
- sint16 ACC (RW, temp); /* base temperature of this tile (F) */
- sint16 ACC (RW, pressure); /* barometric pressure (mb) */
- sint8 ACC (RW, humid); /* humitidy of this tile */
- sint8 ACC (RW, windspeed); /* windspeed of this tile */
- sint8 ACC (RW, winddir); /* direction of wind */
- sint8 ACC (RW, sky); /* sky conditions */
- int ACC (RW, worldpartx), ACC (RW, worldparty); /*Highly fasten conversion between worldmap and weathermap */
struct shopitems *shopitems; /* a semi-colon seperated list of item-types the map's shop will trade in */
shstr ACC (RW, shoprace); /* the preffered race of the local shopkeeper */
double ACC (RW, shopgreed); /* how much our shopkeeper overcharges */
@@ -267,11 +293,13 @@
sint64 ACC (RW, shopmax); /* maximum price a shop will offer */
shstr ACC (RW, msg); /* Message map creator may have left */
shstr ACC (RW, maplore); /* Map lore information */
- shstr ACC (RW, tile_path[4]); /* path to adjoining maps */
- maptile *ACC (RW, tile_map[4]); /* Next map, linked list */
+ shstr ACC (RW, tile_path[TILE_NUM]); /* path to adjoining maps */
+ maptile *ACC (RW, tile_map[TILE_NUM]); /* Next map, linked list */
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
@@ -289,6 +317,7 @@
// deallocates the mapspaces (and destroys all objects)
MTH void clear ();
+ MTH void post_load (); // update cached values in mapspaces etc.
MTH void fix_auto_apply ();
MTH void do_decay_objects ();
MTH void update_buttons ();
@@ -296,7 +325,7 @@
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;
+ MTH void say_msg (const_utf8_string msg, int x, int y) const;
// connected links
oblinkpt *find_link (shstr_tmp id);
@@ -324,14 +353,15 @@
// 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 bool _save_objects (const_octet_string path, int flags);
// save the header pseudo object _only_
bool _save_header (object_freezer &freezer);
- MTH bool _save_header (const char *path);
+ MTH bool _save_header (const_octet_string path);
maptile ();
maptile (int w, int h);
+ void init ();
~maptile ();
void do_destroy ();
@@ -362,12 +392,12 @@
do_load_sync ();
}
- void make_map_floor (char **layout, char *floorstyle, random_map_params *RP);
+ void make_map_floor (char **layout, const char *floorstyle, random_map_params *RP);
bool generate_random_map (random_map_params *RP);
- 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
+ static maptile *find_async (const_utf8_string path, maptile *original = 0, bool load = true);//PERL
+ static maptile *find_sync (const_utf8_string path, maptile *original = 0);//PERL
+ static maptile *find_style_sync (const_utf8_string dir, const_utf8_string file = 0);//PERL
object *pick_random_object (rand_gen &gen = rndm) const;
mapspace &at (uint32 x, uint32 y) const { return spaces [x * height + y]; }
@@ -375,11 +405,20 @@
// 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);
+ maprect *split_to_tiles (dynbuf &buf, int x0, int y0, int x1, int y1);
+
+ MTH bool is_in_shop (int x, int y) const;
};
+inline bool
+object::is_in_shop () const
+{
+ return is_on_map ()
+ && map->is_in_shop (x, y);
+}
+
+//+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
@@ -405,9 +444,9 @@
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 = 0 /*unused*/);
+void get_rangevector_from_mapcoord (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);
+int adjacent_map (maptile *map1, maptile *map2, int *dx, int *dy);
// adjust map, x and y for tiled maps and return true if the position is valid at all
static inline bool
@@ -420,6 +459,8 @@
}
// comaptibility cruft end
+//-GPL
+
inline mapspace &
object::ms () const
{
@@ -519,8 +560,10 @@
} \
}
+extern dynbuf mapwalk_buf; // can be used in simple non-recursive situations
+
// 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) \
@@ -530,17 +573,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
// "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); \
+#define unordered_mapwalk_at(buf,map,ox,oy,dx0,dy0,dx1,dy1) \
+ for (maprect *r_e_c_t = (map)->split_to_tiles (buf, \
+ (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(buf,op,dx0,dy0,dx1,dy1) \
+ unordered_mapwalk_at (buf,op->map, op->x, op->y, dx0, dy0, dx1, dy1)
#endif