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

Comparing deliantra/server/include/object.h (file contents):
Revision 1.6 by root, Sat Aug 26 08:44:06 2006 UTC vs.
Revision 1.13 by root, Thu Aug 31 09:19:34 2006 UTC

 /*
  * static char *rcsid_object_h =
- *   "$Id: object.h,v 1.6 2006/08/26 08:44:06 root Exp $";
+ *   "$Id: object.h,v 1.13 2006/08/31 09:19:34 root Exp $";
  */
 /*
     CrossFire, A Multiplayer game for X-windows
 #ifndef OBJECT_H
 #define OBJECT_H
 #include "cfperl.h"
+#include "shstr.h"
 typedef uint32 tag_t;
 #define NUM_BODY_LOCATIONS	12
 #define BODY_ARMS		1
  * related ones, etc.
  * This structure is best viewed with about a 100 width screen.
  * MSW 2002-07-05
  */
-struct object_simple {
+struct object_simple : attachable<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*/
     struct object	*active_next;	/* Next & previous object in the 'active' */
     struct object	*active_prev;	/* List.  This is used in process_events */
-				/* so that the entire object list does not */
+                                /* so that the entire object list does not */
-				/* need to be gone through. */
+                                /* need to be gone through. */
     struct object	*below;		/* Pointer to the object stacked below this one */
     struct object	*above;		/* Pointer to the object stacked above this one */
-				/* Note: stacked in the *same* environment*/
+                                /* Note: stacked in the *same* environment*/
     struct object	*inv;		/* Pointer to the first object in the inventory */
     struct object	*container;	/* Current container being used.  I think this
-				 * is only used by the player right now.
+                                 * is only used by the player right now.
-				 */
+                                 */
     struct object	*env;		/* Pointer to the object which is the environment.
-				 * This is typically the container that the object is in.
+                                 * This is typically the container that the object is in.
-				 */
+                                 */
     struct object	*more;		/* Pointer to the rest of a large body of objects */
     struct object	*head;		/* Points to the main object of a large body */
     struct mapstruct *map;		/* Pointer to the map in which this object is present */
     tag_t	count;		/* Unique object number for this object */
     uint16	refcount;	/* How many objects points to this object */
 };
-struct object_special : extendable<object> {
+struct object_special {
-    data_type get_dt () const { return DT_OBJECT; }
     /* These get an extra add_refcount(), after having been copied by memcpy().
      * All fields beow this point are automatically copied by memcpy.  If
      * adding something that needs a refcount updated, make sure you modify
      * copy_object to do so.  Everything below here also gets cleared
      * by clear_object()
     const char	*name;		/* The name of the object, obviously... */
     const char	*name_pl;	/* The plural name of the object */
     const char	*title;		/* Of foo, etc */
     const char	*race;		/* human, goblin, dragon, etc */
     const char	*slaying;	/* Which race to do double damage to */
-				/* If this is an exit, this is the filename */
+                                /* If this is an exit, this is the filename */
     const char	*skill;		/* Name of the skill this object uses/grants */
     const char	*msg;		/* If this is a book/sign/magic mouth/etc */
     const char	*lore;		/* Obscure information about this object, */
-				/* To get put into books and the like. */
+                                /* To get put into books and the like. */
     sint16	x,y;		/* Position in the map for this object */
     sint16	ox,oy;		/* For debugging: Where it was last inserted */
     float	speed;		/* The overall speed of this object */
     float	speed_left;	/* How much speed is left to spend this round */
     sint32	weight_limit;	/* Weight-limit of object */
     sint32	carrying;	/* How much weight this object contains */
     sint8	glow_radius;	/* indicates the glow radius of the object */
     living	stats;		/* Str, Con, Dex, etc */
     sint64	perm_exp;	/* Permanent exp */
-    const char	*current_weapon_script;  /* The script of the currently used weapon. Executed */
-				/* each time the object attacks something */
     struct object	*current_weapon;   /* Pointer to the weapon currently used */
     uint32	weapontype;	/* type of weapon */
     uint32	tooltype;	/* type of tool or build facility */
     sint8	body_info[NUM_BODY_LOCATIONS];	/* body info as loaded from the file */
     sint8	body_used[NUM_BODY_LOCATIONS];	/* Calculated value based on items equipped */
-				/* See the doc/Developers/objects for more info about body locations */
+                                /* See the doc/Developers/objects for more info about body locations */
     /* Following mostly refers to fields only used for monsters */
     struct object	*owner;		/* Pointer to the object which controls this one */
-				/* Owner should not be referred to directly - */
+                                /* Owner should not be referred to directly - */
-				/* get_owner should be used instead. */
+                                /* get_owner should be used instead. */
     tag_t	ownercount;	/* What count the owner had (in case owner */
-				/* has been freed) */
+                                /* has been freed) */
     struct object	*enemy;		/* Monster/player to follow even if not closest */
     struct object	*attacked_by;   /* This object start to attack us! only player & monster */
     tag_t	attacked_by_count;         /* the tag of attacker, so we can be sure */
     struct treasureliststruct *randomitems; /* Items to be generated */
     uint16	run_away;	/* Monster runs away if it's hp goes below this percentage. */
     sint32	move_status;	/* What stage in attack mode */
     uint16	attack_movement;/* What kind of attack movement */
     uint8	will_apply;     /* See crossfire.doc */
     struct object	*spellitem;	/* Spell ability monster is choosing to use */
     double	expmul;		/* needed experience = (calc_exp*expmul) - means some */
-				/* races/classes can need less/more exp to gain levels */
+                                /* races/classes can need less/more exp to gain levels */
     /* Spell related information, may be useful elsewhere
      * Note that other fields are used - these files are basically
      * only used in spells.
      */
     uint8	range_modifier;	/* How going up in level effects range  */
     /* Following are values used by any object */
     struct archt *arch;         /* Pointer to archetype */
     struct archt *other_arch;	/* Pointer used for various things - mostly used for what */
-				/* this objects turns into or what this object creates */
+                                /* this objects turns into or what this object creates */
     uint32	flags[4];	/* various flags */
     uint16	animation_id;	/* An index into the animation array */
     uint8	anim_speed;	/* ticks between animation-frames */
     uint8	last_anim;	/* last sequence used to draw face */
     sint32	elevation;	/* elevation of this terrain - not currently used */
     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 clone (object *destination)
+  {
+    if (attach)
+      destination->attach = add_refcount (attach);
+    if (self || cb)
+      INVOKE_OBJECT (CLONE, this, ARG_OBJECT (destination));
+  }
 };
 typedef struct oblnk { /* Used to link together several objects */
   object *ob;
   struct oblnk *next;
     struct archt *head;	    /* The main part of a linked object */
     struct archt *more;	    /* Next part of a linked object */
     object clone;	    /* An object from which to do copy_object() */
     uint32 editable;	    /* editable flags (mainly for editor) */
     sint8   tail_x, tail_y; /* Where the lower right most portion of the object is
-			     * in comparison to the head.
+                             * in comparison to the head.
-			     */
+                             */
 } archetype;
 extern object *objects;
 extern object *active_objects;
 extern object *free_objects;

Diff Legend

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

Comparing deliantra/server/include/object.h (file contents): Revision 1.6 by root, Sat Aug 26 08:44:06 2006 UTC vs. Revision 1.13 by root, Thu Aug 31 09:19:34 2006 UTC

Diff Legend

Comparing deliantra/server/include/object.h (file contents):
Revision 1.6 by root, Sat Aug 26 08:44:06 2006 UTC vs.
Revision 1.13 by root, Thu Aug 31 09:19:34 2006 UTC