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

Comparing deliantra/server/include/object.h (file contents):
Revision 1.156 by root, Fri Apr 11 13:59:06 2008 UTC vs.
Revision 1.183 by root, Mon Sep 29 06:32:08 2008 UTC

 /*
  * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  *
- * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+ * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
  * Copyright (©) 2001,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 GNU General Public License as published by
  * Each object (this also means archetypes!) could have a few of these
  * "dangling" from it; this could also end up containing 'parse errors'.
  *
  * key and value are shared-strings.
  *
- * Please use get_ob_key_value(), set_ob_key_value() from object.c rather than
+ * Please use kv_get/kv_set/kv_del from object rather than
  * accessing the list directly.
  * Exception is if you want to walk this list for some reason.
  */
-struct key_value
+struct key_value : slice_allocated
 {
   key_value *next;
   shstr key, value;
 };
   typedef char BUF [32];
   bool parse (const char *s)
   {
-    return sscanf (s, "<1%*[,.]%" SCNx64 ">", &seq) == 1;
+    return sscanf (s, "<1.%" SCNx64 ">", &seq) == 1;
   }
   const char *c_str (char *buf, int len) const
   {
     snprintf (buf, len, "<1.%" PRIx64 ">", seq);
   arch_ptr ACC (RW, arch);	/* Pointer to archetype */
   arch_ptr ACC (RW, other_arch);/* Pointer used for various things - mostly used for what */
   float ACC (RW, speed);	/* The overall speed of this object */
   float ACC (RW, speed_left);	/* How much speed is left to spend this round */
-  uint32 ACC (RW, nrof);	/* How many of the objects */
+  sint32 ACC (RW, nrof);	/* How many of the objects */
-  /* This next big block are basically used for monsters and equipment */
+  /* This next big block is basically used for monsters and equipment */
   uint16 ACC (RW, client_type);	/* Public type information.  see doc/Developers/objects */
   sint16 ACC (RW, resist[NROFATTACKS]);	/* Resistance adjustments for attacks */
   uint32 ACC (RW, attacktype);	/* Bitmask of attacks this object does */
   uint32 ACC (RW, path_attuned);/* Paths the object is attuned to */
   sint8 ACC (RW, item_power);	/* power rating of the object */
   sint8 ACC (RW, gen_sp_armour);/* sp regen penalty this object has (was last_heal) */
   sint8 ACC (RW, glow_radius);	/* indicates the glow radius of the object */
   sint32 ACC (RW, weight);	/* Attributes of the object */
   sint32 ACC (RW, weight_limit);/* Weight-limit of object */
-  sint32 ACC (RW, carrying);	/* How much weight this object contains */
+  sint32 ACC (RW, carrying);	/* How much weight this object contains, must be 0 if nrof == 0 */
   sint64 ACC (RW, perm_exp);	/* Permanent exp */
   uint32 ACC (RW, weapontype);	/* type of weapon */
   uint32 ACC (RW, tooltype);	/* type of tool or build facility */
   body_slot slot [NUM_BODY_LOCATIONS];
   faceidx ACC (RW, face);	/* the graphical face */
   bool ACC (RW, flag[NUM_FLAGS]);
 #endif
   uint16 ACC (RW, animation_id);/* An index into the animation array */
   uint8 ACC (RW, anim_speed);	/* ticks between animation-frames */
   uint8 ACC (RW, last_anim);	/* last sequence used to draw face */
-  sint16 ACC (RW, elevation);	/* elevation of this terrain - not currently used */
   uint8 ACC (RW, smoothlevel);	/* how to smooth this square around */
   uint8 ACC (RW, will_apply);	/* See crossfire.doc */
+  uint16 ACC (RW, cached_sp);   /* cached spell points used for a spell, used by esrv_update_spells */
+  uint16 ACC (RW, cached_grace);/* cached grace points used for a spell, used by esrv_update_spells */
+  uint16 ACC (RW, cached_eat);  /* cached food, used by esrv_update_spells */
 };
 struct object : zero_initialised, object_copy
 {
   // These variables are not changed by ->copy_to
-  maptile_ptr ACC (RW, map);	/* Pointer to the map in which this object is present */
+  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);
   object_vector_index ACC (RO, index);	// index into objects
   object_vector_index ACC (RO, active); // index into actives
   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
   client_container *seen_by;    // seen by which player/container currently?
   key_value *key_values;	/* Fields not explictly known by the loader. */
+  // privates / perl
+  const shstr &kv_get (const shstr &key) const;
+  void kv_del (const shstr &key);
+  void kv_set (const shstr &key, const shstr &value);
+  // custom extra fields management
+  struct key_value_access_proxy
+  {
+    object &ob;
+    shstr key;
+    key_value_access_proxy (object &ob, const shstr &key)
+    : ob (ob), key (key)
+    {
+    }
+    const key_value_access_proxy &operator =(const shstr &value) const
+    {
+      ob.kv_set (key, value);
+      return *this;
+    }
+    operator const shstr &() const { return ob.kv_get (key); }
+    operator const char  *() const { return ob.kv_get (key); }
+  private:
+    void operator =(int);
+  };
+  // operator [] is too annoying to use
+  const key_value_access_proxy kv (const shstr &key)
+  {
+    return key_value_access_proxy (*this, key);
+  }
   bool parse_kv (object_thawer &f); // parse kv pairs, (ab-)used by archetypes, which should not exist at all
   MTH void post_load_check ();          // do some adjustments after parsing
   static object *read (object_thawer &f, maptile *map = 0); // map argument due to toal design bogosity, must go.
   bool write (object_freezer &f);
   MTH int slottype () const;
   MTH static object *create ();
   const mapxy &operator =(const mapxy &pos);
-  object &operator =(const object &src);
   MTH void copy_to (object *dst);
-  MTH object *clone (); // create + copy_to
+  MTH object *clone (); // create + copy_to a single object
+  MTH object *deep_clone (); // copy whole more chain and inventory
   void do_destroy ();
   void gather_callbacks (AV *&callbacks, event_type event) const;
   MTH void destroy (bool destroy_inventory = false);
   // recursively destroy all objects in inventory, optionally dropping them to the ground instead
   MTH void destroy_inv (bool drop_to_ground = false);
   MTH object *insert (object *item); // insert into inventory
-  MTH void play_sound (faceidx sound) const;
+  MTH void play_sound (faceidx sound);
   void do_remove ();
   MTH void remove ()
   {
     if (!flag [FLAG_REMOVED])
   // info must hold 256 * 3 bytes currently
   const char *debug_desc (char *info) const;
   MTH const char *debug_desc () const; // uses at least 3 round-robin buffers
   const char *flag_desc (char *desc, int len) const;
+  MTH bool decrease (sint32 nr = 1); // returns true if anything is left
+  MTH object *split (sint32 nr = 1); // return 0 on failure
-  int number_of () const
+  MTH int number_of () const
   {
     return nrof ? nrof : 1;
   }
-  uint64 total_weight () const
+  MTH sint32 total_weight () const
   {
-    return weight * number_of ();
+    return (weight + carrying) * number_of ();
   }
+  MTH void update_weight ();
   // return the dominant material of this item, always return something
   const materialtype_t *dominant_material () const;
   // return the volume of this object in cm³
-  uint64 volume () const
+  MTH uint64 volume () const
   {
     return total_weight ()
            * 1000
            * (type == CONTAINER ? 1000 : 1)
            / dominant_material ()->density;
   }
+  MTH bool is_wiz    () const { return flag [FLAG_WIZ]; }
   MTH bool is_weapon () const { return type == ARROW || type == BOW || type == WEAPON; }
   MTH bool is_armor  () const { return type == ARMOUR  || type == SHIELD || type == HELMET
                                     || type == CLOAK   || type == BOOTS  || type == GLOVES
                                     || type == BRACERS || type == GIRDLE; }
   MTH bool is_alive  () const { return (type == PLAYER
   /* This return true if object has still randomitems which
    * could be expanded.
    */
   MTH bool has_random_items () const { return randomitems && !flag [FLAG_IS_A_TEMPLATE]; }
+  MTH bool has_dialogue () const { return *&msg == '@'; }
+  // returns the outermost owner, never returns 0
+  MTH object *outer_owner ()
+  {
+    object *op;
+    for (op = this; op->owner; op = op->owner)
+      ;
+    return op;
+  }
+  // returns the outermost environment, never returns 0
+  MTH object *outer_env ()
+  {
+    object *op;
+    for (op = this; op->env; op = op->env)
+      ;
+    return op;
+  }
   // returns the player that has this object in his inventory, or 0
+  // we assume the player is always the outer env
-  MTH object *in_player () const
+  MTH object *in_player ()
   {
-    for (object *op = env; op; op = op->env)
+    object *op = outer_env ();
-      if (op->type == PLAYER)
-        return op;
-    return 0;
+    return op->type == PLAYER ? op : 0;
   }
   // "temporary" helper function
   MTH object *head_ ()
   {
   MTH bool is_head ()
   {
     return head_ () == this;
   }
+  MTH bool is_on_map () const
+  {
+    return !env && !flag [FLAG_REMOVED];
+  }
+  // returns the player that cna see this object, if any
+  MTH object *visible_to () const;
   MTH std::string long_desc        (object *who = 0);
   MTH std::string describe_monster (object *who = 0);
   MTH std::string describe_item    (object *who = 0);
   MTH std::string describe         (object *who = 0);
   MTH void activate   ();
   MTH void deactivate ();
   MTH void activate_recursive   ();
   MTH void deactivate_recursive ();
-  // set the givne flag on all objects in the inventory recursively
+  // 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
   MTH void enter_map (maptile *newmap, int x, int y);
+  void player_goto (const char *path, int x, int y); // only for players
   // returns the mapspace this object is in
   mapspace &ms () const;
   // fully recursive iterator
   {
     return this;
   }
   /* This returns TRUE if the object is something that
-   * should be displayed in the floorbox/inventory window
+   * a client might want to know about.
    */
   MTH bool client_visible () const
   {
     return !invisible && type != PLAYER;
+  }
+  // the client does nrof * this weight
+  MTH sint32 client_weight () const
+  {
+    return weight + carrying;
   }
   MTH struct region *region () const;
   void statusmsg (const char *msg, int color = NDI_BLACK);
   void link   ();
   void unlink ();
   object ();
   ~object ();
+private:
+  object &operator =(const object &);
+  object (const object &);
 };
 // move this object to the top of its env's inventory to speed up
 // searches for it.
 static object *
 } objectlink;
 typedef struct oblinkpt
 {				/* Used to link together several object links */
   struct oblnk *link;
-  long value;			/* Used as connected value in buttons/gates */
+  sint32 value;			/* Used as connected value in buttons/gates */
   struct oblinkpt *next;
 } oblinkpt;
 object *find_skill_by_name (object *who, const char *name);
 object *find_skill_by_name (object *who, const shstr &sh);
  */
 INTERFACE_CLASS (archetype)
 struct archetype : object
 {
+  static arch_ptr empty; // the empty_archetype
+  MTH static void gc ();
   archetype (const char *name);
   ~archetype ();
   void gather_callbacks (AV *&callbacks, event_type event) const;
-  static archetype *read (object_thawer &f);
-  MTH static archetype *get  (const_utf8_string name); // find or create
   MTH static archetype *find (const_utf8_string name);
   MTH void link   ();
   MTH void unlink ();
+  MTH static object *get (const char *name); // (find() || singularity)->instance()
   MTH object *instance ();
   object_vector_index ACC (RW, archid);         // index in archvector
   shstr ACC (RW, archname);		   	/* More definite name, like "generate_kobold" */
-  bool ACC (RW, stub);                          // if true, this is an invalid archetype
   sint8 ACC (RW, min_x), ACC (RW, min_y);       /* extents, compared to the head (min_x, min_y should be zero, but aren't...) */
   sint8 ACC (RW, max_x), ACC (RW, max_y);
+  // 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 */
 };
+// compatbiility, remove once replaced by ->instance
+inline object *
+arch_to_object (archetype *at)
+{
+  return at->instance ();
+}
 inline void
 object_freezer::put (keyword k, archetype *v)
 {
   put (k, v ? &v->archname : (const char *)0);
 extern objectvec objects;
 extern activevec actives;
 extern archvec   archetypes;
+// "safely" iterate over inv in a way such that the current item is removable
+// quite horrible, thats why its hidden in some macro
+#define for_inv_removable(op,var)			\
+  for (object *var, *next_ = (op)->inv; (var = next_), var && (next_ = var->below), var; )
-#define for_all_objects(var)                    \
+#define for_all_objects(var)                    	\
   for (unsigned _i = 0; _i < objects.size (); ++_i)     \
     statementvar (object *, var, objects [_i])
-#define for_all_actives(var)                    \
+#define for_all_actives(var)                    	\
   for (unsigned _i = 0; _i < actives.size (); ++_i)     \
     statementvar (object *, var, actives [_i])
-#define for_all_archetypes(var)                 \
+#define for_all_archetypes(var)                 	\
   for (unsigned _i = 0; _i < archetypes.size (); ++_i)  \
     statementvar (archetype *, var, archetypes [_i])
 /* Used by update_object to know if the object being passed is
  * being added or removed.

Diff Legend

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

Comparing deliantra/server/include/object.h (file contents): Revision 1.156 by root, Fri Apr 11 13:59:06 2008 UTC vs. Revision 1.183 by root, Mon Sep 29 06:32:08 2008 UTC

Diff Legend

Comparing deliantra/server/include/object.h (file contents):
Revision 1.156 by root, Fri Apr 11 13:59:06 2008 UTC vs.
Revision 1.183 by root, Mon Sep 29 06:32:08 2008 UTC