--- deliantra/server/include/map.h 2008/12/27 02:31:19 1.105
+++ deliantra/server/include/map.h 2011/05/07 10:50:35 1.143
@@ -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,2011 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,23 +50,24 @@
#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 */
+/* Values for state below */
enum {
- MAP_ACTIVE,
- MAP_INACTIVE, // not used atm.
- MAP_SWAPPED,
- MAP_LOADING,
- MAP_SAVING,
+ MAP_SWAPPED, // header loaded, nothing else
+ MAP_INACTIVE, // in memory, linkable, but not active
+ MAP_ACTIVE, // running!
};
/* GET_MAP_FLAGS really shouldn't be used very often - get_map_flags should
@@ -92,16 +96,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,21 +126,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 */
- tick_t smell; // the last ptick a player was seen here, or 0
- 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_; // 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 (gcc seems content with only the second test)
+ assume (sint8 (flags_) < 0);
+ assume (flags_ & P_UPTODATE);
}
MTH uint8 flags ()
@@ -163,8 +183,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
{
@@ -177,7 +207,7 @@
}
};
-// a rectangular area of a map
+// a rectangular area of a map, used my split_to_tiles/unordered_mapwalk
struct maprect
{
maptile *m;
@@ -186,6 +216,20 @@
int dx, dy; // offset to go from local coordinates to original tile */
};
+// (refcounted) list of objects on this map that need physics processing
+struct physics_queue
+: unordered_vector