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

Comparing deliantra/server/include/object.h (file contents):
Revision 1.189 by root, Tue Dec 23 00:39:48 2008 UTC vs.
Revision 1.196 by root, Thu Jan 8 03:03:24 2009 UTC

 {
   signed char info:4;	/* body info as loaded from the file */
   signed char used:4;	/* Calculated value based on items equipped */
 };
+typedef struct oblnk
+{				/* Used to link together several objects */
+  object_ptr ob;
+  struct oblnk *next;
+} objectlink;
+typedef struct oblinkpt
+{				/* Used to link together several object links */
+  struct oblnk *link;
+  struct oblinkpt *next;
+  shstr id;			/* Used as connected value in buttons/gates */
+} oblinkpt;
 INTERFACE_CLASS (object)
 // these are being copied
 struct object_copy : attachable
 {
   sint16 ACC (RW, x), ACC (RW, y);	/* Position in the map for this object */
   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;
+  shstr_tmp kv_get (shstr_tmp key) const;
-  void kv_del (const shstr &key);
+  void kv_del (shstr_tmp key);
-  void kv_set (const shstr &key, const shstr &value);
+  void kv_set (shstr_tmp key, shstr_tmp value);
   // custom extra fields management
   struct key_value_access_proxy
   {
     object &ob;
-    shstr key;
+    shstr_tmp key;
-    key_value_access_proxy (object &ob, const shstr &key)
+    key_value_access_proxy (object &ob, shstr_tmp key)
     : ob (ob), key (key)
     {
     }
-    const key_value_access_proxy &operator =(const shstr &value) const
+    const key_value_access_proxy &operator =(shstr_tmp value) const
     {
       ob.kv_set (key, value);
       return *this;
     }
-    operator const shstr &() const { return ob.kv_get (key); }
+    operator const shstr_tmp () const { return ob.kv_get (key); }
-    operator const char  *() 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)
+  const key_value_access_proxy kv (shstr_tmp 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
     remove ();
     *this = pos;
     insert_at (this, this);
   }
+  // high-level move functions, return true if successful
+  int move (int dir, object *originator);
+  int move (int dir)
+  {
+    return move (dir, this);
+  }
   static bool can_merge_slow (object *op1, object *op2);
   // this is often used in time-critical code, so optimise
   MTH static bool can_merge (object *op1, object *op2)
   {
   MTH void close_container ()
   {
     open_container (0);
   }
-  MTH object *force_find (const shstr name);
+  MTH object *force_find (shstr_tmp name);
-  MTH object *force_add (const shstr name, int duration = 0);
+  MTH object *force_add (shstr_tmp name, int duration = 0);
+  oblinkpt *find_link () const;
+  MTH void add_link (maptile *map, shstr_tmp id);
+  MTH void remove_link ();
   // overwrite the attachable should_invoke function with a version that also checks ev_want_type
   bool should_invoke (event_type event)
   {
     return ev_want_event [event] || ev_want_type [type] || cb;
   const materialtype_t *dominant_material () const;
   // return the volume of this object in cm³
   MTH uint64 volume () const
   {
-    return total_weight ()
+    return (uint64)total_weight ()
            * 1000
            * (type == CONTAINER ? 1000 : 1)
            / dominant_material ()->density;
   }
   MTH bool is_inserted () const
   {
     return !flag [FLAG_REMOVED];
   }
+  MTH bool is_player () const
+  {
+    return !!contr;
+  }
   MTH bool affects_los () const
   {
     return glow_radius || flag [FLAG_BLOCKSVIEW];
+  }
+  MTH bool has_carried_lights () const
+  {
+    return glow_radius;
   }
   // returns the player that cna see this object, if any
   MTH object *visible_to () const;
     }
   return ob;
 }
-typedef struct oblnk
-{				/* Used to link together several objects */
-  object_ptr ob;
-  struct oblnk *next;
-} objectlink;
-typedef struct oblinkpt
-{				/* Used to link together several object links */
-  struct oblnk *link;
-  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_fuzzy (object *who, const char *name);
-object *find_skill_by_name (object *who, const shstr &sh);
+object *find_skill_by_name (object *who, shstr_cmp sh);
 object *find_skill_by_number (object *who, int skillno);
 /*
  * The archetype structure is a set of rules on how to generate and manipulate
  * objects which point to archetypes.
 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
+// quite horrible, that's 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)                    	\
   for (unsigned _i = 0; _i < objects.size (); ++_i)     \

Diff Legend

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

Comparing deliantra/server/include/object.h (file contents): Revision 1.189 by root, Tue Dec 23 00:39:48 2008 UTC vs. Revision 1.196 by root, Thu Jan 8 03:03:24 2009 UTC

Diff Legend

Comparing deliantra/server/include/object.h (file contents):
Revision 1.189 by root, Tue Dec 23 00:39:48 2008 UTC vs.
Revision 1.196 by root, Thu Jan 8 03:03:24 2009 UTC