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

Comparing deliantra/server/include/object.h (file contents):
Revision 1.233 by root, Sun Apr 4 02:51:56 2010 UTC vs.
Revision 1.254 by root, Fri Jul 2 16:24:24 2010 UTC

  */
 #ifndef OBJECT_H
 #define OBJECT_H
-#include <bitset>
 #include "cfperl.h"
 #include "shstr.h"
 //+GPL
 typedef int tag_t;
 // also see common/item.C
-enum {
+enum
+{
   body_skill,
   body_combat,
   body_range,
   body_shield,
   body_arm,
   const char *nonuse_name;	/* Name to describe objects we can't use */
 } Body_Locations;
 extern Body_Locations body_locations[NUM_BODY_LOCATIONS];
+// for each set of directions (1 == up, 2 == right, 4 == down, 8 == left)
+// contaisn the wall suffix (0, 1_3, 1_4 and so on).
+extern const char *wall_suffix[16];
 #define NUM_COINS 4             /* number of coin types */
 extern const char *const coins[NUM_COINS + 1];
+// restart server when object_count reaches this value
+#define RESTART_COUNT 0xe0000000
 /*
  * Each object (this also means archetypes!) could have a few of these
  * "dangling" from it; this could also end up containing 'parse errors'.
  *
 sint16 SP_level_spellpoint_cost (object *caster, object *spell, int flags);
 int SP_level_dam_adjust (object *caster, object *spob);
 int SP_level_duration_adjust (object *caster, object *spob);
 int SP_level_range_adjust (object *caster, object *spob);
+struct freelist_item
+{
+  freelist_item *next;
+  uint32_t count;
+};
-struct object : zero_initialised, object_copy
+struct object : object_copy
 {
   // These variables are not changed by ->copy_to
   maptile *ACC (RW, map);	/* Pointer to the map in which this object is present */
   UUID ACC (RW, uuid);          // Unique Identifier, survives saves etc.
-  int ACC (RO, count);
+  uint32_t ACC (RO, count);
   object_vector_index ACC (RO, index);	// index into objects
   object_vector_index ACC (RO, active); // index into actives
   player_ptr ACC (RW, contr);	/* Pointer to the player which control this object, ALWAYS set *iff* type == PLAYER */
 				 */
   object *ACC (RW, more);	/* Pointer to the rest of a large body of objects */
   object *head;			/* Points to the main object of a large body */ // NO ACC, perl semantics are different
   key_value *key_values;	/* Fields not explictly known by the loader. */
+  MTH void set_flag (int flagnum)
+  {
+    flag [flagnum] = true;
+  }
+  MTH void clr_flag (int flagnum)
+  {
+    flag [flagnum] = false;
+  }
   // privates / perl
   shstr_tmp kv_get (shstr_tmp key) const;
   void kv_del (shstr_tmp key);
   void kv_set (shstr_tmp key, shstr_tmp value);
     destroy ();
   }
   // recursively destroy all objects in inventory, optionally dropping them to the ground instead
   MTH void destroy_inv (bool drop_to_ground = false);
+  MTH void destroy_inv_fast (); // like destroy_inv (false), but only works when *this is destroyed, too
   MTH object *insert (object *item); // insert into inventory
   MTH void play_sound (faceidx sound) const;
   MTH void say_msg (const_utf8_string msg) const;
   void do_remove ();
   }
   MTH void set_owner (object *owner);
   MTH void set_speed (float speed);
   MTH void set_glow_radius (sint8 rad);
-  MTH bool change_skill (object *ob); // deprecated?
   MTH void open_container (object *new_container);
   MTH void close_container ()
   {
     open_container (0);
                                            && (subtype == SP_BULLET || subtype == SP_MAGIC_MISSILE)); }
   MTH bool is_range  () const { return type == BOW || type == ROD || type == WAND || type == HORN; }
   MTH bool is_dragon () const;
+  MTH bool is_immunity () const { return invisible && type == SIGN; }
   MTH bool has_active_speed () const { return speed >= MIN_ACTIVE_SPEED; }
   // temporary: wether the object can be saved in a map file
   // contr => is a player
   // head  => only save head of a multitile object
   static bool msg_has_dialogue (const char *msg) { return *msg == '@'; }
   MTH bool has_dialogue () const { return msg_has_dialogue (&msg); }
+  /* need_identify returns true if the item should be identified.  This
+   * function really should not exist - by default, any item not identified
+   * should need it.
+   */
+  MTH bool need_identify () const;
   // returns the outermost owner, never returns 0
   MTH object *outer_owner ()
   {
     object *op;
   MTH bool has_carried_lights () const
   {
     return glow_radius;
   }
-  // returns the player that cna see this object, if any
+  // returns the player that can see this object, if any
   MTH object *visible_to () const;
   MTH std::string long_desc        (object *who = 0); // query_name . " " . describe
   MTH std::string describe_monster (object *who = 0);
   MTH std::string describe_item    (object *who = 0);
   // objects. This method only works on objects not inserted
   // anywhere.
   MTH void expand_tail ();
   MTH void create_treasure (treasurelist *tl, int flags = 0);
+  // makes sure the player has the named skill,
+  // and also makes it innate if can_use is true.
+  // returns the new skill or 0 if no such skill exists.
+  MTH object *give_skill (shstr_cmp name, bool can_use = false);
+  MTH void become_follower (object *new_god);
   // insert object at same map position as 'where'
   // handles both inventory and map "positions"
   MTH object *insert_at (object *where, object *originator = 0, int flags = 0);
   // check whether we can put this into the map, respect max_nrof, max_volume, max_items
   MTH void deactivate_recursive ();
   // set the given flag on all objects in the inventory recursively
   MTH void set_flag_inv (int flag, int value = 1);
-  void enter_exit (object *exit);//Perl
+  void enter_exit (object *exit); // perl
-  MTH void enter_map (maptile *newmap, int x, int y);
+  MTH bool enter_map (maptile *newmap, int x, int y);
   void player_goto (const_utf8_string path, int x, int y); // only for players
   MTH bool apply (object *ob, int aflags = AP_APPLY); // ob may be 0
+  MTH object *mark () const;
   // returns the mapspace this object is in
   mapspace &ms () const;
   // fully recursive iterator
     return weight + carrying;
   }
   MTH struct region *region () const;
-  void statusmsg (const_utf8_string msg, int color = NDI_BLACK);
+  MTH void statusmsg (const_utf8_string msg, int color = NDI_BLACK);
-  void failmsg (const_utf8_string msg, int color = NDI_RED);
+  MTH void failmsg (const_utf8_string msg, int color = NDI_RED);
+  void failmsgf (const_utf8_string format, ...); // always NDI_RED...
-  const_utf8_string query_inventory (object *who = 0, const_utf8_string indent = "");
+  MTH const_utf8_string query_inventory (object *who = 0, const_utf8_string indent = "");
   MTH const_octet_string ref () const; // creates and returns a consistent persistent object reference
-  static object *deref (const_octet_string ref); // returns the object from the generated refreence, if possible
+  static object *deref (const_octet_string ref); // returns the object from the generated reference, if possible
   // make some noise with given item into direction dir,
   // currently only used for players to make them temporarily visible
   // when they are invisible.
   MTH void make_noise ();
   MTH int anim_frames  () const { return anim ().num_animations; }
   MTH int anim_facings () const { return anim ().facings; }
   MTH utf8_string as_string ();
+  // low-level management, statistics, ...
+  static uint32_t ACC (RW, object_count);
+  static uint32_t ACC (RW, free_count);
+  static uint32_t ACC (RW, create_count);
+  static uint32_t ACC (RW, destroy_count);
+  static freelist_item *freelist;
+  MTH static void freelist_free (int count);
 protected:
   void link   ();
   void unlink ();
+  void do_delete ();
   object ();
   ~object ();
 private:
  */
 //-GPL
 INTERFACE_CLASS (archetype)
-struct archetype : object
+struct archetype : object, zero_initialised
 {
   static arch_ptr empty; // the empty_archetype
   MTH static void gc ();
   archetype (const_utf8_string name);
   // support for archetype loading
   static archetype *read (object_thawer &f);
   MTH static void commit_load (); // commit any objects loaded, resolves cyclic dependencies and more
   static void postpone_arch_ref (arch_ptr &ref, const_utf8_string other_arch); /* postpone  other_arch reference */
+protected:
+  void do_delete ();
 };
 // returns whether the object is a dragon player, which are often specialcased
 inline bool
 object::is_dragon () const
 #define INS_NO_MERGE            0x0001
 #define INS_ABOVE_FLOOR_ONLY    0x0002
 #define INS_NO_WALK_ON          0x0004
 #define INS_ON_TOP              0x0008
 #define INS_BELOW_ORIGINATOR    0x0010
+#define INS_NO_AUTO_EXIT	0x0020 // temporary, fix exits instead
 //-GPL
 #endif

Diff Legend

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

Comparing deliantra/server/include/object.h (file contents): Revision 1.233 by root, Sun Apr 4 02:51:56 2010 UTC vs. Revision 1.254 by root, Fri Jul 2 16:24:24 2010 UTC

Diff Legend

Comparing deliantra/server/include/object.h (file contents):
Revision 1.233 by root, Sun Apr 4 02:51:56 2010 UTC vs.
Revision 1.254 by root, Fri Jul 2 16:24:24 2010 UTC