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

Comparing deliantra/server/include/object.h (file contents):
Revision 1.21 by root, Fri Sep 8 16:53:57 2006 UTC vs.
Revision 1.23 by root, Sat Sep 9 21:48:28 2006 UTC

   MoveType ACC (RW, move_slow);		/* Movement types this slows down */
   float ACC (RW, move_slow_penalty);	/* How much this slows down the object */
   key_value *key_values;	/* Fields not explictly known by the loader. */
 };
+#define get_object() object::create ()
+#define free_object(op) (op)->free (0)
+#define free_object2(op, free_inv) (op)->free (free_inv)
 struct object : zero_initialised, object_keep, object_copy, object_pod
 {
+  static object *create ();
+  void free (bool free_inventory = false);
+  void mortalise ();
+  static void free_mortals ();
-  static bool can_merge (object * op1, object * op2);
+  static bool can_merge (object *op1, object *op2);
   void clear ();
-  void clone (object * destination);
+  void clone (object *destination);
+protected:
+  friend struct archetype;
+  object ();
+  ~object ();
 };
 #define CAN_MERGE(op1,op2) ((op1)->value == (op2)->value && (op1)->name == (op2)->name && object::can_merge ((op1), (op2)))
 typedef struct oblnk
  */
 ACC_CLASS(archetype)
 struct archetype : zero_initialised
 {
+  archetype ();
+  ~archetype ();
   shstr ACC (RW, name);			/* More definite name, like "generate_kobold" */
   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_object() */

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