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

Comparing deliantra/server/include/object.h (file contents):
Revision 1.99 by root, Sat Feb 10 01:52:27 2007 UTC vs.
Revision 1.113 by root, Tue May 1 05:48:20 2007 UTC

 #include "cfperl.h"
 #include "shstr.h"
 typedef int tag_t;
 #define NUM_BODY_LOCATIONS      12
 #define BODY_ARMS               1
 /* See common/item.c */
   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 */
-  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 */
   sint64 ACC (RW, perm_exp);	/* Permanent exp */
   uint32 ACC (RW, weapontype);	/* type of weapon */
   uint32 ACC (RW, tooltype);	/* type of tool or build facility */
   sint8 ACC (RW, body_info[NUM_BODY_LOCATIONS]);	/* body info as loaded from the file */
   sint8 ACC (RW, body_used[NUM_BODY_LOCATIONS]);	/* Calculated value based on items equipped */
+  faceidx ACC (RW, face);	/* Face with colors */
   living ACC (RO, stats);	/* Str, Con, Dex, etc */
   /* See the pod/objects.pod for more info about body locations */
   /* Following mostly refers to fields only used for monsters */
   uint32 ACC (RW, hide);	/* The object is hidden, not invisible */
   char *ACC (RW, spellarg);
   /* Following are values used by any object */
   /* this objects turns into or what this object creates */
   treasurelist *ACC (RW, randomitems);	/* Items to be generated */
-  key_value *key_values;	/* Fields not explictly known by the loader. */
   flags_t flag;                 /* various flags */
 #if FOR_PERL
   bool ACC (RW, flag[NUM_FLAGS]);
 #endif
   uint16 ACC (RW, animation_id);/* An index into the animation array */
 				 * 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?
+  key_value *key_values;	/* Fields not explictly known by the loader. */
+  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 ();
+  object &operator =(const object &src);
   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);
   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);
   MTH void drain_specific_stat (int deplete_stats);
   MTH void change_luck (int value);
   // info must hold 256 * 3 bytes currently
   const char *debug_desc (char *info) const;
-  MTH const char *debug_desc () const;
+  MTH const char *debug_desc () const; // uses at least 3 round-robin buffers
-  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;
   MTH object *head_ ()
   {
     return head ? head : this;
   }
+  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);
+  // If this object has no extra parts but should have them,
+  // add them, effectively expanding heads into multipart
+  // objects. This method only works on objects not inserted
+  // anywhere.
+  MTH void expand_tail ();
+  MTH void create_treasure (treasurelist *tl, int flags = 0);
   // 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);
   MTH void activate   ();
   MTH void deactivate_recursive ();
   // set the givne 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);
   // returns the mapspace this object is in
   mapspace &ms () const;
 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 *get  (const char *name); // find or create
   static archetype *find (const char *name);
   void hash_add (); // add to hashtable
   void hash_del (); // remove from hashtable
   struct archetype *ACC (RW, next);    		/* Next archetype in a linked list */
   struct archetype *ACC (RW, head);    		/* The main part of a linked object */
   struct archetype *ACC (RW, more);    		/* Next part of a linked object */
   object ACC (RO, clone);	       		/* An object from which to do ->copy_to () */
   uint32 ACC (RW, editable);	       		/* editable flags (mainly for editor) */
+  bool ACC (RW, linked);                        // linked into list of heads
   sint8 ACC (RW, tail_x), ACC (RW, tail_y);	/* Where the lower right most portion of the object is
 						 * in comparison to the head.
 						 */
 };
 #define INS_ON_TOP              0x0008
 #define INS_BELOW_ORIGINATOR    0x0010
 #define INS_MAP_LOAD            0x0020
 #define ARCH_SINGULARITY        "singularity"
-#define ARCH_SINGULARITY_LEN    11
 #define ARCH_DETECT_MAGIC       "detect_magic"
 #define ARCH_DEPLETION          "depletion"
 #define ARCH_SYMPTOM            "symptom"
 #endif

Diff Legend

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

Comparing deliantra/server/include/object.h (file contents): Revision 1.99 by root, Sat Feb 10 01:52:27 2007 UTC vs. Revision 1.113 by root, Tue May 1 05:48:20 2007 UTC

Diff Legend

Comparing deliantra/server/include/object.h (file contents):
Revision 1.99 by root, Sat Feb 10 01:52:27 2007 UTC vs.
Revision 1.113 by root, Tue May 1 05:48:20 2007 UTC