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

Comparing deliantra/server/include/object.h (file contents):
Revision 1.22 by root, Fri Sep 8 17:14:07 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);
+  void clear ();
+  void clone (object *destination);
+protected:
+  friend struct archetype;
   object ();
   ~object ();
-  static bool can_merge (object * op1, object * op2);
-  void clear ();
-  void clone (object * destination);
 };
-#define get_object() (new object) // compatibility, but please keep for a while
 #define CAN_MERGE(op1,op2) ((op1)->value == (op2)->value && (op1)->name == (op2)->name && object::can_merge ((op1), (op2)))
 typedef struct oblnk
 {				/* Used to link together several objects */

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