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

Comparing deliantra/server/include/object.h (file contents):
Revision 1.87 by root, Sun Jan 14 22:06:05 2007 UTC vs.
Revision 1.102 by pippijn, Thu Mar 1 12:28:16 2007 UTC

   shstr ACC (RW, msg);		/* If this is a book/sign/magic mouth/etc */
   shstr ACC (RW, lore);		/* Obscure information about this object, */
 				/* To get put into books and the like. */
   shstr ACC (RW, materialname);	/* specific material name */
   shstr ACC (RW, custom_name);	/* Custom name assigned by player */
+//  materialtype_t *ACC (RW, material);	/* What material this object consists of */
   object_ptr ACC (RW, owner);	/* Pointer to the object which controls this one */
   object_ptr ACC (RW, enemy);	/* Monster/player to follow even if not closest */
   object_ptr ACC (RW, attacked_by);	/* This object start to attack us! only player & monster */
   object_ptr ACC (RW, chosen_skill);	/* the skill chosen to use */
   object_ptr ACC (RW, spellitem);	/* Spell ability monster is choosing to use */
   object_ptr ACC (RW, spell);	/* Spell that was being cast */
   object_ptr ACC (RW, current_weapon);	/* Pointer to the weapon currently used */
   arch_ptr ACC (RW, arch);	/* Pointer to archetype */
   arch_ptr ACC (RW, other_arch);/* Pointer used for various things - mostly used for what */
-  New_Face *ACC (RW, face);	/* Face with colors */
+  facetile *ACC (RW, face);	/* Face with colors */
   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 */
   /* This next big block are basically used for monsters and equipment */
   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 */
   uint32 ACC (RW, path_repelled);	/* Paths the object is repelled from */
   uint32 ACC (RW, path_denied);	/* Paths the object is denied access to */
-  uint16 ACC (RW, material);	/* What materials this object consist of */
+  uint16 ACC (RW, materials);	/* What materials this object consists of */
   sint8 ACC (RW, magic);	/* Any magical bonuses to this item */
   uint8 ACC (RW, state);	/* How the object was last drawn (animation) */
   sint32 ACC (RW, value);	/* How much money it is worth (or contains) */
   /* Note that the last_.. values are sometimes used for non obvious
    * meanings by some objects, eg, sp penalty, permanent exp.
   object *ACC (RW, above);	/* Pointer to the object stacked above this one */
                                 /* Note: stacked in the *same* environment */
   object *inv;			/* Pointer to the first object in the inventory */
   //TODO: container must move into client
-  object *ACC (RW, container);	/* Current container being used.  I think this
+  object_ptr ACC (RW, container);	/* Current container being used.  I think this
 				 * is only used by the player right now.
 				 */
   object *ACC (RW, env);	/* Pointer to the object which is the environment.
 				 * This is typically the container that the object is in.
 				 */
   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?
+  bool parse_kv (object_thawer &f); // parse kv pairs, (ab-)used by archetypes, which should not exist at all
+  static object *read (object_thawer &f, maptile *map = 0); // map argument due to toal design bogosity, must go.
+  bool write (object_freezer &f);
   MTH static object *create ();
   MTH void copy_to (object *dst);
   MTH object *clone (); // create + copy_to
   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 void remove ();
   MTH object *insert (object *item); // insert into inventory
+  void do_remove ();
+  MTH void remove ()
+  {
+    if (!flag [FLAG_REMOVED])
+      do_remove ();
+  }
   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 set_owner (object *owner);
   MTH void set_speed (float speed);
+  MTH void open_container (object *new_container);
+  MTH void close_container ()
+  {
+    open_container (0);
+  }
-  MTH void instantiate ()
+  MTH void instantiate ();
-  {
-    if (!uuid.seq) // HACK
-      uuid = gen_uuid ();
-    attachable::instantiate ();
-  }
   // recalculate all stats
   MTH void update_stats ();
   MTH void roll_stats ();
   MTH void swap_stats (int a, int b);
   // info must hold 256 * 3 bytes currently
   const char *debug_desc (char *info) const;
   MTH const char *debug_desc () const;
   const char *debug_desc2 () const; // another debug_desc, pure convinience function
   const char *flag_desc (char *desc, int len) const;
+  int number_of () const
+  {
+    return nrof ? nrof : 1;
+  }
+  uint64 total_weight () const
+  {
+    return weight * number_of ();
+  }
+  // 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
+  {
+    return total_weight ()
+           * 1000
+           * (type == CONTAINER ? 1000 : 1)
+           / dominant_material ()->density;
+  }
   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; }
   // temporary: wether the object can be saved in a map file
   // contr => is a player
   // head  => only save head of a multitile object
   // owner => can not reference owner yet
-  MTH bool can_map_save () const { return !contr && !head && !owner && !flag [FLAG_NO_SAVE]; }
+  MTH bool can_map_save () const { return !contr && !head && !owner && !flag [FLAG_NO_MAP_SAVE]; }
   /* 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 client_visible () const
   {
     return !invisible && type != PLAYER;
   }
+  MTH struct region *region () const;
 protected:
   friend struct archetype;
   void link ();
   void unlink ();
 extern objectvec objects;
 extern activevec actives;
 #define for_all_objects(var)			\
-  for (int _i = 0; _i < objects.size (); ++_i)	\
+  for (unsigned _i = 0; _i < objects.size (); ++_i)	\
     declvar (object *, var, objects [_i])
 #define for_all_actives(var)			\
-  for (int _i = 0; _i < actives.size (); ++_i)	\
+  for (unsigned _i = 0; _i < actives.size (); ++_i)	\
     declvar (object *, var, actives [_i])
 typedef struct oblnk
 {				/* Used to link together several objects */
   object_ptr ob;
 {
   archetype ();
   ~archetype ();
   void gather_callbacks (AV *&callbacks, event_type event) const;
+  static archetype *read (object_thawer &f);
-  static archetype *find (const char *arch);
+  static archetype *find (const char *name);
   void hash_add (); // add to hashtable
   void hash_del (); // remove from hashtable
   shstr ACC (RW, name);		       		/* More definite name, like "generate_kobold" */

Diff Legend

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

Comparing deliantra/server/include/object.h (file contents): Revision 1.87 by root, Sun Jan 14 22:06:05 2007 UTC vs. Revision 1.102 by pippijn, Thu Mar 1 12:28:16 2007 UTC

Diff Legend

Comparing deliantra/server/include/object.h (file contents):
Revision 1.87 by root, Sun Jan 14 22:06:05 2007 UTC vs.
Revision 1.102 by pippijn, Thu Mar 1 12:28:16 2007 UTC