--- deliantra/server/include/map.h 2009/11/08 15:11:23 1.117
+++ deliantra/server/include/map.h 2017/09/16 22:17:42 1.155
@@ -1,24 +1,24 @@
/*
* 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,2012,2013,2014,2015,2016 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 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 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
*/
@@ -50,23 +50,28 @@
#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 map index - toggling the lowest bit reverses direction
+enum
+{
+ TILE_NORTH,
+ TILE_SOUTH,
+ TILE_WEST,
+ TILE_EAST,
+ TILE_UP,
+ TILE_DOWN,
+ TILE_NUM
};
-/* Values for in_memory below */
-enum {
- MAP_ACTIVE,
- MAP_INACTIVE, // not used atm.
- MAP_SWAPPED,
- MAP_LOADING,
- MAP_SAVING,
+#define REVERSE_TILE_DIR(dir) ((dir) ^ 1)
+
+/* Values for state below */
+enum
+{
+ 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
@@ -90,7 +95,7 @@
*/
#define OUT_OF_REAL_MAP(M,X,Y) (!(IN_RANGE_EXC ((X), 0, (M)->width) && IN_RANGE_EXC ((Y), 0, (M)->height)))
-/* These are used in the MapLook flags element. They are not used in
+/* These are used in the mapspace flags element. They are not used in
* in the object flags structure.
*/
#define P_BLOCKSVIEW 0x01
@@ -115,6 +120,12 @@
#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 */
+// persistent flags (pflags) in mapspace
+enum
+{
+ PF_VIS_UP = 0x01, // visible upwards, set by upmap, cleared by mapspace
+};
+
/* 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.
@@ -133,12 +144,13 @@
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
+ 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
+ uint8_t pflags; // additional, persistent flags
+ uint8_t pad [3]; // pad to 64 bytes on LP64 systems
//-GPL
@@ -147,12 +159,13 @@
{
// we take advantage of the fact that 0x80 is the sign bit
// to generate more efficient code on many cpus
- assert (P_UPTODATE == 0x80);
+ assert (sint8 (P_UPTODATE) < 0);
+ assert (sint8 (-1 & ~P_UPTODATE) >= 0);
- if (expect_false (sint8 (flags_) < 0))
+ if (expect_false (sint8 (flags_) >= 0))
update_ ();
- // must be true by now
+ // must be true by now (gcc seems content with only the second test)
assume (sint8 (flags_) < 0);
assume (flags_ & P_UPTODATE);
}
@@ -163,11 +176,16 @@
return flags_;
}
+ MTH void update_up ();
+
MTH void invalidate ()
{
flags_ = 0;
+
+ if (pflags)
+ update_up ();
}
-
+
MTH object *player ()
{
object *op;
@@ -181,14 +199,14 @@
return op;
}
- MTH uint32 nrof ()
+ MTH uint32 items()
{
update ();
- return nrof_;
+ return items_;
}
// return the item volume on this mapspace in cm³
- MTH uint64 volume ()
+ MTH volume_t volume ()
{
update ();
return volume_ * 1024;
@@ -205,7 +223,7 @@
}
};
-// a rectangular area of a map
+// a rectangular area of a map, used my split_to_tiles/unordered_mapwalk
struct maprect
{
maptile *m;
@@ -214,6 +232,18 @@
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