[ViewVC] Diff of: cvs/deliantra/server/include/map.h

Comparing deliantra/server/include/map.h (file contents):
Revision 1.146 by root, Sun May 8 11:32:12 2011 UTC vs.
Revision 1.157 by root, Sat Nov 17 23:40:01 2018 UTC

 /*
  * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  *
+ * Copyright (©) 2017,2018 Marc Alexander Lehmann / the Deliantra team
- * Copyright (©) 2005,2006,2007,2008,2009,2010,2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+ * 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
  * <http://www.gnu.org/licenses/>.
  *
  * The authors can be reached via e-mail to <support@deliantra.net>
  */
 /*
  * The maptile is allocated each time a new map is opened.
 // tile map index - toggling the lowest bit reverses direction
 enum
 {
   TILE_NORTH,
   TILE_SOUTH,
-  TILE_EAST ,
   TILE_WEST,
+  TILE_EAST,
   TILE_UP,
   TILE_DOWN,
   TILE_NUM
 };
   void update_ ();
   MTH void update ()
   {
     // 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 (P_UPTODATE) < 0);
-    assert (sint8 (-1 & ~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);
+    ecb_assume (sint8 (flags_) < 0);
-    assume (flags_ & P_UPTODATE);
+    ecb_assume (flags_ & P_UPTODATE);
   }
   MTH uint8 flags ()
   {
     update ();
     update ();
     return items_;
   }
   // return the item volume on this mapspace in cm³
-  MTH uint64 volume ()
+  MTH volume_t volume ()
   {
     update ();
     return volume_ * 1024;
   }
 struct shopitems : zero_initialised
 {
   const char *name;             /* name of the item in question, null if it is the default item */
   const char *name_pl;          /* plural name */
   int typenum;                  /* itemtype number we need to match 0 if it is the default price */
   sint8 strength;               /* the degree of specialisation the shop has in this item,
                                  * as a percentage from -100 to 100 */
   int index;                    /* being the size of the shopitems array. */
 };
 // map I/O, what to load/save
   IO_HEADER  = 0x01, // the "arch map" pseudo object
   IO_OBJECTS = 0x02, // the non-unique objects
   IO_UNIQUES = 0x04, // unique objects
 };
 /* In general, code should always use the macros
  * above (or functions in map.c) to access many of the
  * values in the map structure.  Failure to do this will
  * almost certainly break various features.  You may think
  * it is safe to look at width and height values directly
  * (or even through the macros), but doing so will completely
  * break map tiling.
   region_ptr *regionmap;           /* index to region */
   tstamp ACC (RW, last_access);    /* last time this map was accessed somehow */
   shstr ACC (RW, name);    /* Name of map as given by its creator */
   region_ptr ACC (RW, default_region); /* What jurisdiction in the game world this map is ruled by
                                     * points to the struct containing all the properties of
                                     * the region */
   double ACC (RW, reset_time);
   uint32 ACC (RW, reset_timeout);  /* How many seconds must elapse before this map
                                     * should be reset
                                     */
   shstr ACC (RW, msg);     /* Message map creator may have left */
   shstr ACC (RW, maplore); /* Map lore information */
   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 */
-  uint64 ACC (RW, max_volume);            // maximum volume for all items on a mapspace
+  volume_t 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
   physics_queue pq[PHYSICS_QUEUES];
   MTH void queue_physics (object *ob, int after = 0);
   MTH void queue_physics_at (int x, int y);
-  MTH void post_load_physics ();
   MTH int run_physics (tick_t tick, int max_objects);
+  MTH void activate_physics ();
   // the maptile:: is neccessary here for the perl interface to work
   MTH sint8 darklevel (sint8 outside = maptile::outdoor_darkness) const
   {
     return clamp (outdoor ? darkness + outside : darkness, 0, MAX_DARKNESS);
   }
   static void adjust_daylight ();
   MTH void activate ();
-  MTH void activate_physics ();
   MTH void deactivate ();
   // allocates all (empty) mapspace
   MTH void alloc ();
   // deallocates the mapspaces (and destroys all objects)
     return *this;
   }
   mapxy &move (int dir)
   {
-    return move (freearr_x [dir], freearr_y [dir]);
+    return move (DIRX (dir), DIRY (dir));
   }
   operator void *() const { return (void *)m; }
   mapxy &operator =(const object *op)
   {
       }									\
   }
 extern dynbuf mapwalk_buf; // can be used in simple non-recursive situations
+// special "grave" map used to store all removed objects
+// till they can be destroyed - saves a lot of checks in the rest
+// of the code
+struct freed_map
+: maptile
+{
+  freed_map ()
+  : maptile (3, 3)
+  {
+    path     = "<freed objects map>";
+    name     = "/internal/freed_objects_map";
+    no_drop  = 1;
+    no_reset = 1;
+    state = MAP_ACTIVE;
+  }
+  ~freed_map ()
+  {
+    destroy ();
+  }
+};
+// initialised in common/shstr.C, due to shstr usage we need defined
+// initialisation order!
+extern struct freed_map freed_map; // freed objects are moved here to avoid crashes
 // 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)					\

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing deliantra/server/include/map.h (file contents): Revision 1.146 by root, Sun May 8 11:32:12 2011 UTC vs. Revision 1.157 by root, Sat Nov 17 23:40:01 2018 UTC

Diff Legend

Comparing deliantra/server/include/map.h (file contents):
Revision 1.146 by root, Sun May 8 11:32:12 2011 UTC vs.
Revision 1.157 by root, Sat Nov 17 23:40:01 2018 UTC