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

Comparing deliantra/server/include/map.h (file contents):
Revision 1.98 by root, Sun Aug 17 22:46:26 2008 UTC vs.
Revision 1.103 by root, Tue Dec 23 22:03:06 2008 UTC

  * where it is known the map is not tiled or the values are known
  * consistent (eg, op->map, op->x, op->y)
  */
 // all those macros are herewith declared legacy
 #define GET_MAP_FLAGS(M,X,Y)         (M)->at((X),(Y)).flags ()
-#define GET_MAP_LIGHT(M,X,Y)         (M)->at((X),(Y)).light
 #define GET_MAP_OB(M,X,Y)            (M)->at((X),(Y)).bot
 #define GET_MAP_TOP(M,X,Y)           (M)->at((X),(Y)).top
 #define GET_MAP_FACE_OBJ(M,X,Y,L)    (M)->at((X),(Y)).faces_obj[L]
 #define GET_MAP_MOVE_BLOCK(M,X,Y)    (M)->at((X),(Y)).move_block
 #define GET_MAP_MOVE_SLOW(M,X,Y)     (M)->at((X),(Y)).move_slow
   MTH uint8 flags ()
   {
     update ();
     return flags_;
+  }
+  MTH void invalidate ()
+  {
+    flags_ = 0;
   }
   MTH object *player ()
   {
     object *op;
   bool ACC (RW, per_player);
   bool ACC (RW, per_party);
   bool ACC (RW, outdoor);  /* True if an outdoor map */
   bool ACC (RW, no_drop);   /* avoid auto-dropping (on death) anything on this map */
-  uint8 ACC (RW, darkness);        /* indicates level of darkness of map */
+  sint8 ACC (RW, darkness);        /* indicates level of darkness of map */
+  static sint8 outdoor_darkness; /* the global darkness level outside */
   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) */
   maptile *ACC (RW, tile_map[4]);   /* 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
+  // 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 deactivate ();
   // allocates all (empty) mapspace
   MTH void alloc ();
   MTH void fix_auto_apply ();
   MTH void do_decay_objects ();
   MTH void update_buttons ();
   MTH int change_map_light (int change);
-  static void change_all_map_light (int change); //PERL
-  MTH void set_darkness_map ();
   MTH int estimate_difficulty () const;
   MTH void play_sound (faceidx sound, int x, int y) const;
   // set the given flag on all objects in the map
   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
   object *pick_random_object (rand_gen &gen = rndm) const;
-  mapspace const &at (uint32 x, uint32 y) const { return spaces [x * height + y]; }
+  mapspace &at (uint32 x, uint32 y) const { return spaces [x * height + y]; }
-  mapspace       &at (uint32 x, uint32 y)       { return spaces [x * height + y]; }
 };
 /* 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
   y   = pos.y;
   return pos;
 }
+// iterate over a rectangular area relative to op
+// can be used as a single statement, but both iterate macros
+// invocations must not be followed by a ";"
+// see common/los.C for usage example
+#define rectangular_mapspace_iterate_begin(op,dx0,dx1,dy0,dy1)			\
+    for (int dx = (dx0); dx <= (dx1); dx++)					\
+      {										\
+        sint16 nx, ny;								\
+        maptile *m = 0;								\
+										\
+        for (int dy = (dy0); dy <= (dy1); dy++)					\
+          {									\
+            /* check to see if we can simply go one down quickly, */		\
+            /* if not, due it the slow way                        */		\
+            if (!m || ++ny >= m->height)					\
+              {									\
+                nx = (op)->x + dx; ny = (op)->y + dy; m = (op)->map; 		\
+										\
+                if (xy_normalise (m, nx, ny))					\
+                  m->touch ();							\
+                else								\
+                  m = 0;							\
+              }
+#define rectangular_mapspace_iterate_end					\
+          }									\
+      }
 #endif

Diff Legend

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

Comparing deliantra/server/include/map.h (file contents): Revision 1.98 by root, Sun Aug 17 22:46:26 2008 UTC vs. Revision 1.103 by root, Tue Dec 23 22:03:06 2008 UTC

Diff Legend

Comparing deliantra/server/include/map.h (file contents):
Revision 1.98 by root, Sun Aug 17 22:46:26 2008 UTC vs.
Revision 1.103 by root, Tue Dec 23 22:03:06 2008 UTC