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

Comparing deliantra/server/include/object.h (file contents):
Revision 1.107 by root, Mon Apr 16 13:02:29 2007 UTC vs.
Revision 1.117 by root, Mon May 7 04:21:11 2007 UTC

 #include "cfperl.h"
 #include "shstr.h"
 typedef int tag_t;
-#define NUM_BODY_LOCATIONS      12
+#define NUM_BODY_LOCATIONS      14
 #define BODY_ARMS               1
 /* See common/item.c */
 typedef struct Body_Locations
 /* However, if you're keeping a pointer of some sort, you probably
  * don't just want it copied, so you'll need to add to common/object.C,
  * e.g. ->copy_to ()
  */
+struct body_slot
+{
+  signed char info:4;	/* body info as loaded from the file */
+  signed char used:4;	/* Calculated value based on items equipped */
+};
 INTERFACE_CLASS (object)
 // these are being copied
 struct object_copy : attachable
 {
   typedef bitset<NUM_FLAGS> flags_t;
   sint16 ACC (RW, x), ACC (RW, y);	/* Position in the map for this object */
+  uint8 ACC (RW, type);		/* PLAYER, BULLET, etc.  See define.h */
+  uint8 ACC (RW, subtype);	/* subtype of object */
   sint8 ACC (RW, direction);	/* Means the object is moving that way. */
   sint8 ACC (RW, facing);	/* Object is oriented/facing that way. */
   shstr ACC (RW, name);		/* The name of the object, obviously... */
   shstr ACC (RW, name_pl);	/* The plural name of the object */
   shstr ACC (RW, title);	/* Of foo, etc */
   shstr ACC (RW, race);		/* human, goblin, dragon, etc */
   shstr ACC (RW, slaying);	/* Which race to do double damage to */
   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 */
-  uint8 ACC (RW, type);		/* PLAYER, BULLET, etc.  See define.h */
-  uint8 ACC (RW, subtype);	/* subtype of object */
   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 */
   uint32 ACC (RW, path_repelled);	/* Paths the object is repelled from */
   uint32 ACC (RW, path_denied);	/* Paths the object is denied access to */
   sint32 ACC (RW, weight_limit);/* Weight-limit of object */
   sint32 ACC (RW, carrying);	/* How much weight this object contains */
   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 */
+  body_slot slot [NUM_BODY_LOCATIONS];
-  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 */
    * Note that other fields are used - these files are basically
    * only used in spells.
    */
   sint16 ACC (RW, duration);	/* How long the spell lasts */
   sint16 ACC (RW, casting_time);/* time left before spell goes off */
   uint16 ACC (RW, start_holding);
   uint8 ACC (RW, duration_modifier);	/* how level modifies duration */
   uint8 ACC (RW, dam_modifier);	/* How going up in level effects damage */
   sint8 ACC (RW, range);	/* Range of the spell */
   uint8 ACC (RW, range_modifier);	/* How going up in level effects range  */
   MoveType ACC (RW, move_type);	/* Type of movement this object uses */
   MoveType ACC (RW, move_block);/* What movement types this blocks */
   MoveType ACC (RW, move_allow);/* What movement types explicitly allowd */
   MoveType ACC (RW, move_on);	/* Move types affected moving on to this space */
   MoveType ACC (RW, move_off);	/* Move types affected moving off this space */
   MoveType ACC (RW, move_slow);	/* Movement types this slows down */
   float ACC (RW, move_slow_penalty);	/* How much this slows down the object */
   char *ACC (RW, spellarg);
   /* Following are values used by any object */
         && can_merge_slow (op1, op2);
   }
   MTH void set_owner (object *owner);
   MTH void set_speed (float speed);
+  MTH void set_weapon (object *ob);
   MTH void open_container (object *new_container);
   MTH void close_container ()
   {
     open_container (0);
   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;
                                         || (flag [FLAG_ALIVE] && !flag [FLAG_GENERATOR] && type != DOOR))
                                        && !flag [FLAG_IS_A_TEMPLATE]; }
   MTH bool is_arrow  () const { return type == ARROW
                                        || (type == SPELL_EFFECT
                                            && (subtype == SP_BULLET || subtype == SP_MAGIC_MISSILE)); }
+  MTH bool is_range  () const { return type == BOW || type == ROD || type == WAND || type == HORN; }
   MTH bool has_active_speed () const { return FABS(speed) >= MIN_ACTIVE_SPEED; }
   // temporary: wether the object can be saved in a map file
   // contr => is a player
   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;
 {
   archetype ();
   ~archetype ();
   void gather_callbacks (AV *&callbacks, event_type event) const;
-  static bool load (object_thawer &f);
+  static archetype *read (object_thawer &f);
-  static archetype *get (const char *name); // find or create
+  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
 #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.107 by root, Mon Apr 16 13:02:29 2007 UTC vs. Revision 1.117 by root, Mon May 7 04:21:11 2007 UTC

Diff Legend

Comparing deliantra/server/include/object.h (file contents):
Revision 1.107 by root, Mon Apr 16 13:02:29 2007 UTC vs.
Revision 1.117 by root, Mon May 7 04:21:11 2007 UTC