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

Comparing deliantra/server/include/object.h (file contents):
Revision 1.58 by elmex, Mon Dec 18 17:39:17 2006 UTC vs.
Revision 1.63 by elmex, Fri Dec 22 16:54:56 2006 UTC

 				 * 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
   maptile *ACC (RW, map);	/* Pointer to the map in which this object is present */
+  client_container *seen_by;    // seen by which player/container currently?
 };
 // these are being copied
 struct object_copy : attachable<object>
 {
   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 */
 };
 // these are being copied and also cleared
 struct object_pod
 {
+  typedef bitset<NUM_FLAGS> flags_t;
   New_Face *ACC (RW, face);	/* Face with colors */
   sint16 ACC (RW, x), ACC (RW, y);	/* Position in the map for this object */
   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 */
   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 */
-  arch_ptr ACC (RW, arch);	/* Pointer to archetype */
-  arch_ptr ACC (RW, other_arch);/* Pointer used for various things - mostly used for what */
   key_value *key_values;	/* Fields not explictly known by the loader. */
-  std::bitset<NUM_FLAGS> flags; /* various flags */
+  object_pod::flags_t flags;        /* various flags */
   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 */
   sint32 ACC (RW, elevation);	/* elevation of this terrain - not currently used */
   uint8 ACC (RW, smoothlevel);	/* how to smooth this square around */
   float ACC (RW, move_slow_penalty);	/* How much this slows down the object */
 };
 struct object : zero_initialised, object_keep, object_copy, object_pod
 {
+  typedef object_pod::flags_t flags_t;
   typedef unordered_vector<object *> vector;
   static vector mortals;
   static vector active;  // active objects, not yet used
   static vector objects; // not used yet, use first->next->...
     return op1->value == op2->value
         && op1->name  == op2->name
         && can_merge_slow (op1, op2);
   }
-  void clear ();
   bool destroyed () { return QUERY_FLAG (this, FLAG_FREED); }
   void set_owner (object *owner);
   void instantiate ()
     if (!uuid.seq) // HACK
       uuid = gen_uuid ();
     attachable<object>::instantiate ();
   }
+  // recalculate all stats
+  void update_stats ();
+  void roll_stats ();
+  void swap_stats (int a, int b);
+  void add_statbonus ();
+  void remove_statbonus ();
+  void drain_stat ();
+  void drain_specific_stat (int deplete_stats);
+  void change_luck (int value);
   // info must hold 256 * 3 bytes currently
   const char *debug_desc (char *info) const;
   const char *debug_desc () const;
   /* This return true if object has still randomitems which
    * could be expanded.
    */
   bool has_random_items () const { return randomitems && !flags [FLAG_IS_A_TEMPLATE]; }
+  // returns the player that has this object in his inventory, or 0
+  object *in_player () const
+  {
+    for (object *op = env; op; op = op->env)
+      if (op->type == PLAYER)
+        return op;
+    return 0;
+  }
+  // returns the mapspace this object is in
+  mapspace &ms () const;
   // fully recursive iterator
   struct iterator_base
   {
     object *item;
 extern int nrofallocobjects;
 /* This returns TRUE if the object is something that
  * should be displayed in the look window
  */
-#define LOOK_OBJ(ob) (!ob->invisible && ob->type!=PLAYER && ob->type!=EVENT_CONNECTOR)
+#define LOOK_OBJ(ob) (!ob->invisible && ob->type != PLAYER && ob->type != EVENT_CONNECTOR)
 /* Used by update_object to know if the object being passed is
  * being added or removed.
  */
 #define UP_OBJ_INSERT   1

Diff Legend

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

Comparing deliantra/server/include/object.h (file contents): Revision 1.58 by elmex, Mon Dec 18 17:39:17 2006 UTC vs. Revision 1.63 by elmex, Fri Dec 22 16:54:56 2006 UTC

Diff Legend

Comparing deliantra/server/include/object.h (file contents):
Revision 1.58 by elmex, Mon Dec 18 17:39:17 2006 UTC vs.
Revision 1.63 by elmex, Fri Dec 22 16:54:56 2006 UTC