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

Comparing deliantra/server/include/map.h (file contents):
Revision 1.116 by root, Thu Nov 5 15:57:15 2009 UTC vs.
Revision 1.127 by root, Sat Jan 16 17:57:32 2010 UTC

 /*
  * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  *
- * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+ * Copyright (©) 2005,2006,2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
  * Copyright (©) 2002-2005,2007 Mark Wedel & Crossfire Development Team
  * Copyright (©) 1992,2007 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
 /* These are used in the MapLook flags element.  They are not used in
  * in the object flags structure.
  */
 #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_PLAYER        0x10   /* a player (or something seeing these objects) is on this mapspace */
-#define P_IS_ALIVE      0x10   /* something alive is on this space */
+#define P_IS_ALIVE      0x20   /* 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_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
  * the flag value, as well as other conditions - using a more general
  * function that does more of the work can hopefully be used to replace
  */
 INTERFACE_CLASS (mapspace)
 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 */
-  uint32_t smell;			// the last count a player was seen here, or 0
-  static uint32_t smellcount;           // global smell counter
-  uint8 flags_;                 /* flags about this space (see the P_ values above) */
+  uint8 flags_;                         /* flags about this space (see the P_ values above) */
-  sint8 ACC (RW, light);                  /* How much light this space provides */
+  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_block);        /* What movement types this space blocks */
-  MoveType ACC (RW, move_slow);           /* What movement types this space slows */
+  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_on);           /* What movement types are activated */
-  MoveType ACC (RW, move_off);            /* 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_, pad2_; // pad to 64 bytes on 64 bit systems
 //-GPL
   void update_ ();
   MTH void update ()
   {
-    if (expect_false (!(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 ()
   {
     update ();
       op = 0;
     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
   {
     return move_block && (mt & move_block) == mt;
   }
   {
     return blocks (op->move_type);
   }
 };
-// a rectangular area of a map
+// a rectangular area of a map, used my split_to_tiles/unordered_mapwalk
 struct maprect
 {
   maptile *m;
   int x0, y0;
   int x1, y1;
   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) */
-  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 */
   sint64 ACC (RW, shopmin);        /* minimum price a shop will trade for */
   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, 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
   // the maptile:: is neccessary here for the perl interface to work
   MTH sint8 darklevel (sint8 outside = maptile::outdoor_darkness) const
   // allocates all (empty) mapspace
   MTH void alloc ();
   // 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 ();
   MTH int change_map_light (int change);
   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);
   MTH void trigger (shstr_tmp id, int state = 1, object *activator = 0, object *originator = 0);
   bool _load_objects (object_thawer &thawer);
   MTH bool _load_objects (object_thawer *thawer) { return _load_objects (*thawer); }
   // 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);
   ~maptile ();
   }
   void make_map_floor (char **layout, 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_async (const_utf8_string path, maptile *original = 0, bool load = true);//PERL
-  static maptile *find_sync (const char *path, maptile *original = 0);//PERL
+  static maptile *find_sync (const_utf8_string path, maptile *original = 0);//PERL
-  static maptile *find_style_sync (const char *dir, const char *file = 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]; }
   // return an array of maprects corresponding

Diff Legend

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

Comparing deliantra/server/include/map.h (file contents): Revision 1.116 by root, Thu Nov 5 15:57:15 2009 UTC vs. Revision 1.127 by root, Sat Jan 16 17:57:32 2010 UTC

Diff Legend

Comparing deliantra/server/include/map.h (file contents):
Revision 1.116 by root, Thu Nov 5 15:57:15 2009 UTC vs.
Revision 1.127 by root, Sat Jan 16 17:57:32 2010 UTC