--- deliantra/server/include/map.h	2009/11/08 20:55:39	1.120
+++ deliantra/server/include/map.h	2011/05/04 19:39:43	1.141
@@ -1,9 +1,9 @@
 /*
  * 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 Affero GNU General Public License as published by the
@@ -50,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
@@ -138,7 +139,7 @@
   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
+  uint32_t pad1_; // pad to 64 bytes on 64 bit systems
 
 //-GPL
 
@@ -206,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;
@@ -215,6 +216,17 @@
   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<object *>
+{
+  int i; // already processed
+  physics_queue ();
+  object *pop ();
+};
+
+#define PHYSICS_QUEUES 16 // "activity" at least every 16 ticks
+
 //+GPL
 
 struct shopitems : zero_initialised
@@ -265,11 +277,11 @@
   bool ACC (RW, fixed_resettime);  /* if true, reset time is not affected by
                                     * players entering/exiting map
                                     */
-  sint32 ACC (RW, timeout);        /* swapout is set to this */
-  sint32 ACC (RW, swap_time);      /* When it reaches 0, the map will be swapped out */
-  uint32 ACC (RW, in_memory);      /* If not true, the map has been freed and must
+  uint8 ACC (RW, state);           /* If not true, the map has been freed and must
                                     * be loaded before used.  The map,omap and map_ob
                                     * arrays will be allocated when the map is loaded */
+  sint32 ACC (RW, timeout);        /* swapout is set to this */
+  sint32 ACC (RW, swap_time);      /* When it reaches 0, the map will be swapped out */
   sint16 players;        /* How many players are on this map right now */
   uint16 ACC (RW, difficulty);     /* What level the player should be to play here */
 
@@ -283,13 +295,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 */
@@ -297,15 +302,20 @@
   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
 
+  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);
+
   // the maptile:: is neccessary here for the perl interface to work
   MTH sint8 darklevel (sint8 outside = maptile::outdoor_darkness) const
   {
@@ -322,6 +332,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 ();
@@ -329,7 +340,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);
@@ -357,19 +368,22 @@
 
   // 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 ();
   void gather_callbacks (AV *&callbacks, event_type event) const;
 
+  MTH bool linkable () { return state >= MAP_INACTIVE; }
+
   MTH int size () const { return width * height; }
 
   MTH object *insert (object *op, int x, int y, object *originator = 0, int flags = 0);
@@ -395,12 +409,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]; }
@@ -408,11 +422,18 @@
   // 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
@@ -440,9 +461,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
@@ -556,6 +577,8 @@
       }									\
   }
 
+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 offset relative to dx0,dy0
 // the iterator code must be a single statement following this macro call, similar to "if"
@@ -571,16 +594,16 @@
 // 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_at(map,ox,oy,dx0,dy0,dx1,dy1)			\
-  for (maprect *r_e_c_t = (map)->split_to_tiles (			\
+#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, (ox), (oy))
 
-#define unordered_mapwalk(op,dx0,dy0,dx1,dy1)				\
-  unordered_mapwalk_at (op->map, op->x, op->y, dx0, dy0, dx1, dy1)
+#define unordered_mapwalk(buf,op,dx0,dy0,dx1,dy1)			\
+  unordered_mapwalk_at (buf,op->map, op->x, op->y, dx0, dy0, dx1, dy1)
 
 #endif