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

Comparing deliantra/server/include/object.h (file contents):
Revision 1.7 by root, Sat Aug 26 23:36:32 2006 UTC vs.
Revision 1.10 by root, Mon Aug 28 16:52:51 2006 UTC

 /*
  * static char *rcsid_object_h =
- *   "$Id: object.h,v 1.7 2006/08/26 23:36:32 root Exp $";
+ *   "$Id: object.h,v 1.10 2006/08/28 16:52:51 root Exp $";
  */
 /*
     CrossFire, A Multiplayer game for X-windows
  * related ones, etc.
  * This structure is best viewed with about a 100 width screen.
  * MSW 2002-07-05
  */
-struct object_simple : extendable<object> {
+struct object_simple : attachable<object> {
-    data_type get_dt () const { return DT_OBJECT; }
+    static data_type get_dt () { return DT_OBJECT; }
     /* These variables are not changed by copy_object() */
     struct pl	*contr;		/* Pointer to the player which control this object */
     struct object	*next;		/* Pointer to the next object in the free/used list */
     struct object	*prev;		/* Pointer to the previous object in the free/used list*/
     const char  *custom_name; /* Custom name assigned by player */
     key_value *key_values; /* Fields not explictly known by the loader. */
 };
 struct object : object_special, object_simple {
-  void instantiate_ ();
-  void instantiate ()
-  {
-    if (attach)
-      {
-        instantiate_ ();
-        free_string (attach);
-        attach = 0;
-      }
-  }
   void clone (object *destination)
   {
     if (attach)
       destination->attach = add_refcount (attach);

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