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

Comparing deliantra/server/include/object.h (file contents):
Revision 1.42 by root, Wed Sep 27 00:36:09 2006 UTC vs.
Revision 1.62 by root, Fri Dec 22 16:34:00 2006 UTC

…		…
16		16
17	You should have received a copy of the GNU General Public License	17	You should have received a copy of the GNU General Public License
18	along with this program; if not, write to the Free Software	18	along with this program; if not, write to the Free Software
19	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	19	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
20		20
21	The authors can be reached via e-mail at crossfire-devel@real-time.com	21	The authors can be reached via e-mail at crossfire@schmorp.de
22	*/	22	*/
23		23
24	#ifndef OBJECT_H	24	#ifndef OBJECT_H
25	#define OBJECT_H	25	#define OBJECT_H
		26
		27	#include <bitset>
26		28
27	#include "cfperl.h"	29	#include "cfperl.h"
28	#include "shstr.h"	30	#include "shstr.h"
29		31
30	typedef uint32 tag_t;	32	typedef uint32 tag_t;
…		…
59	};	61	};
60		62
61	struct UUID	63	struct UUID
62	{	64	{
63	uint64 seq;	65	uint64 seq;
		66
		67	UUID () { }
		68	UUID (uint64 seq) : seq(seq) { }
		69	operator uint64() { return seq; }
		70	void operator =(uint64 seq) { this->seq = seq; }
64	};	71	};
65		72
66	extern void init_uuid ();	73	extern void init_uuid ();
67	extern UUID gen_uuid ();	74	extern UUID gen_uuid ();
		75	extern const uint64 UUID_SKIP;
68		76
69	/* Definition for WILL_APPLY values. Replaces having harcoded values	77	/* Definition for WILL_APPLY values. Replaces having harcoded values
70	* sprinkled in the code. Note that some of these also replace fields	78	* sprinkled in the code. Note that some of these also replace fields
71	* that were in the can_apply area. What is the point of having both	79	* that were in the can_apply area. What is the point of having both
72	* can_apply and will_apply?	80	* can_apply and will_apply?
…		…
77	#define WILL_APPLY_DOOR 0x08	85	#define WILL_APPLY_DOOR 0x08
78	#define WILL_APPLY_FOOD 0x10	86	#define WILL_APPLY_FOOD 0x10
79		87
80	/* However, if you're keeping a pointer of some sort, you probably	88	/* However, if you're keeping a pointer of some sort, you probably
81	* don't just want it copied, so you'll need to add to common/object.C,	89	* don't just want it copied, so you'll need to add to common/object.C,
82	* e.g. copy_object.	90	* e.g. ->copy_to ()
83	*/	91	*/
84		92
85	typedef refptr<object> object_ptr;	93	typedef refptr<object> object_ptr;
		94	typedef refptr<archetype> arch_ptr;
86		95
87	// these are not being copied	96	// these are not being copied
88	ACC_CLASS (object)	97	ACC_CLASS (object)
89	struct object_keep : refcounted	98	struct object_keep : refcounted
90	{	99	{
		100	/* These variables are not changed by ->copy_to */
		101
91	tag_t ACC (RW, count); /* Generation count for this object */	102	tag_t ACC (RW, count); /* Generation count for this object */
92	UUID uuid; // Unique Identifier, survives saves etc.	103	UUID ACC (RW, uuid); // Unique Identifier, survives saves etc.
93		104
94	/* These variables are not changed by copy_object() */
95	player ACC (RW, contr); / Pointer to the player which control this object */	105	player ACC (RW, contr); / Pointer to the player which control this object */
96	object ACC (RW, next); / Pointer to the next object in the free/used list */	106	object ACC (RW, next); / Pointer to the next object in the free/used list */
97	object ACC (RW, prev); / Pointer to the previous object in the free/used list */	107	object ACC (RW, prev); / Pointer to the previous object in the free/used list */
98	object ACC (RW, active_next); / Next & previous object in the 'active' */	108	object ACC (RW, active_next);/ Next & previous object in the 'active' */
99	object ACC (RW, active_prev); / List. This is used in process_events */	109	object ACC (RW, active_prev);/ List. This is used in process_events */
100	/* so that the entire object list does not */	110	/* so that the entire object list does not */
101	/* need to be gone through. */	111	/* need to be gone through. */
102	object ACC (RW, below); / Pointer to the object stacked below this one */	112	object ACC (RW, below); / Pointer to the object stacked below this one */
103	object ACC (RW, above); / Pointer to the object stacked above this one */	113	object ACC (RW, above); / Pointer to the object stacked above this one */
104	/* Note: stacked in the same environment */	114	/* Note: stacked in the same environment */
105	object inv; / Pointer to the first object in the inventory */	115	object inv; / Pointer to the first object in the inventory */
106	object ACC (RW, container); / Current container being used. I think this	116	object ACC (RW, container); / Current container being used. I think this
107	* is only used by the player right now.	117	* is only used by the player right now.
108	*/	118	*/
109	object ACC (RW, env); / Pointer to the object which is the environment.	119	object ACC (RW, env); / Pointer to the object which is the environment.
110	* This is typically the container that the object is in.	120	* This is typically the container that the object is in.
111	*/	121	*/
112	object ACC (RW, more); / Pointer to the rest of a large body of objects */	122	object ACC (RW, more); / Pointer to the rest of a large body of objects */
113	object head; / Points to the main object of a large body */ // NO ACC, perl semantics are different	123	object head; / Points to the main object of a large body */ // NO ACC, perl semantics are different
114	maptile ACC (RW, map); / Pointer to the map in which this object is present */	124	maptile ACC (RW, map); / Pointer to the map in which this object is present */
		125	client_container *seen_by; // seen by which player/container currently?
115	};	126	};
116		127
117	// these are being copied	128	// these are being copied
118	struct object_copy : attachable<object>	129	struct object_copy : attachable<object>
119	{	130	{
120	shstr ACC (RW, name); /* The name of the object, obviously... */	131	shstr ACC (RW, name); /* The name of the object, obviously... */
121	shstr ACC (RW, name_pl); /* The plural name of the object */	132	shstr ACC (RW, name_pl); /* The plural name of the object */
122	shstr ACC (RW, title); /* Of foo, etc */	133	shstr ACC (RW, title); /* Of foo, etc */
123	shstr ACC (RW, race); /* human, goblin, dragon, etc */	134	shstr ACC (RW, race); /* human, goblin, dragon, etc */
124	shstr ACC (RW, slaying); /* Which race to do double damage to */	135	shstr ACC (RW, slaying); /* Which race to do double damage to */
125	/* If this is an exit, this is the filename */	136	/* If this is an exit, this is the filename */
126	shstr ACC (RW, skill); /* Name of the skill this object uses/grants */	137	shstr ACC (RW, skill); /* Name of the skill this object uses/grants */
127	shstr ACC (RW, msg); /* If this is a book/sign/magic mouth/etc */	138	shstr ACC (RW, msg); /* If this is a book/sign/magic mouth/etc */
128	shstr ACC (RW, lore); /* Obscure information about this object, */	139	shstr ACC (RW, lore); /* Obscure information about this object, */
129	/* To get put into books and the like. */	140	/* To get put into books and the like. */
130	shstr ACC (RW, materialname); /* specific material name */	141	shstr ACC (RW, materialname); /* specific material name */
131	shstr ACC (RW, custom_name); /* Custom name assigned by player */	142	shstr ACC (RW, custom_name); /* Custom name assigned by player */
…		…
134	object_ptr ACC (RW, attacked_by); /* This object start to attack us! only player & monster */	145	object_ptr ACC (RW, attacked_by); /* This object start to attack us! only player & monster */
135	object_ptr ACC (RW, chosen_skill); /* the skill chosen to use */	146	object_ptr ACC (RW, chosen_skill); /* the skill chosen to use */
136	object_ptr ACC (RW, spellitem); /* Spell ability monster is choosing to use */	147	object_ptr ACC (RW, spellitem); /* Spell ability monster is choosing to use */
137	object_ptr ACC (RW, spell); /* Spell that was being cast */	148	object_ptr ACC (RW, spell); /* Spell that was being cast */
138	object_ptr ACC (RW, current_weapon); /* Pointer to the weapon currently used */	149	object_ptr ACC (RW, current_weapon); /* Pointer to the weapon currently used */
		150	arch_ptr ACC (RW, arch); /* Pointer to archetype */
		151	arch_ptr ACC (RW, other_arch);/* Pointer used for various things - mostly used for what */
139	};	152	};
140		153
141	// these are being copied and also cleared	154	// these are being copied and also cleared
142	struct object_pod	155	struct object_pod
143	{	156	{
144	New_Face ACC (RW, face); / Face with colors */	157	New_Face ACC (RW, face); / Face with colors */
145	sint16 ACC (RW, x), ACC (RW, y); /* Position in the map for this object */	158	sint16 ACC (RW, x), ACC (RW, y); /* Position in the map for this object */
146	float ACC (RW, speed); /* The overall speed of this object */	159	float ACC (RW, speed); /* The overall speed of this object */
147	float ACC (RW, speed_left); /* How much speed is left to spend this round */	160	float ACC (RW, speed_left); /* How much speed is left to spend this round */
148	uint32 ACC (RW, nrof); /* How many of the objects */	161	uint32 ACC (RW, nrof); /* How many of the objects */
149	sint8 ACC (RW, direction); /* Means the object is moving that way. */	162	sint8 ACC (RW, direction); /* Means the object is moving that way. */
150	sint8 ACC (RW, facing); /* Object is oriented/facing that way. */	163	sint8 ACC (RW, facing); /* Object is oriented/facing that way. */
151		164
152	/* This next big block are basically used for monsters and equipment */	165	/* This next big block are basically used for monsters and equipment */
153	uint8 ACC (RW, type); /* PLAYER, BULLET, etc. See define.h */	166	uint8 ACC (RW, type); /* PLAYER, BULLET, etc. See define.h */
154	uint8 ACC (RW, subtype); /* subtype of object */	167	uint8 ACC (RW, subtype); /* subtype of object */
155	uint16 ACC (RW, client_type); /* Public type information. see doc/Developers/objects */	168	uint16 ACC (RW, client_type); /* Public type information. see doc/Developers/objects */
156	sint16 resist[NROFATTACKS]; /* Resistance adjustments for attacks */	169	sint16 resist[NROFATTACKS]; /* Resistance adjustments for attacks */
157	uint32 ACC (RW, attacktype); /* Bitmask of attacks this object does */	170	uint32 ACC (RW, attacktype); /* Bitmask of attacks this object does */
158	uint32 ACC (RW, path_attuned); /* Paths the object is attuned to */	171	uint32 ACC (RW, path_attuned);/* Paths the object is attuned to */
159	uint32 ACC (RW, path_repelled); /* Paths the object is repelled from */	172	uint32 ACC (RW, path_repelled); /* Paths the object is repelled from */
160	uint32 ACC (RW, path_denied); /* Paths the object is denied access to */	173	uint32 ACC (RW, path_denied); /* Paths the object is denied access to */
161	uint16 ACC (RW, material); /* What materials this object consist of */	174	uint16 ACC (RW, material); /* What materials this object consist of */
162	sint8 ACC (RW, magic); /* Any magical bonuses to this item */	175	sint8 ACC (RW, magic); /* Any magical bonuses to this item */
163	uint8 ACC (RW, state); /* How the object was last drawn (animation) */	176	uint8 ACC (RW, state); /* How the object was last drawn (animation) */
164	sint32 ACC (RW, value); /* How much money it is worth (or contains) */	177	sint32 ACC (RW, value); /* How much money it is worth (or contains) */
165	/* Note that the last_.. values are sometimes used for non obvious	178	/* Note that the last_.. values are sometimes used for non obvious
166	* meanings by some objects, eg, sp penalty, permanent exp.	179	* meanings by some objects, eg, sp penalty, permanent exp.
167	*/	180	*/
168	sint32 ACC (RW, last_heal); /* Last healed. Depends on constitution */	181	sint32 ACC (RW, last_heal); /* Last healed. Depends on constitution */
…		…
171	sint16 ACC (RW, last_eat); /* How long since we last ate */	184	sint16 ACC (RW, last_eat); /* How long since we last ate */
172	sint16 ACC (RW, invisible); /* How much longer the object will be invis */	185	sint16 ACC (RW, invisible); /* How much longer the object will be invis */
173	sint16 ACC (RW, level); /* Level of creature or object */	186	sint16 ACC (RW, level); /* Level of creature or object */
174	uint8 ACC (RW, pick_up); /* See crossfire.doc */	187	uint8 ACC (RW, pick_up); /* See crossfire.doc */
175	sint8 ACC (RW, item_power); /* power rating of the object */	188	sint8 ACC (RW, item_power); /* power rating of the object */
176	sint8 ACC (RW, gen_sp_armour); /* sp regen penalty this object has (was last_heal) */	189	sint8 ACC (RW, gen_sp_armour);/* sp regen penalty this object has (was last_heal) */
177	sint8 ACC (RW, glow_radius); /* indicates the glow radius of the object */	190	sint8 ACC (RW, glow_radius); /* indicates the glow radius of the object */
178	sint32 ACC (RW, weight); /* Attributes of the object */	191	sint32 ACC (RW, weight); /* Attributes of the object */
179	sint32 ACC (RW, weight_limit); /* Weight-limit of object */	192	sint32 ACC (RW, weight_limit);/* Weight-limit of object */
180	sint32 ACC (RW, carrying); /* How much weight this object contains */	193	sint32 ACC (RW, carrying); /* How much weight this object contains */
181	sint64 ACC (RW, perm_exp); /* Permanent exp */	194	sint64 ACC (RW, perm_exp); /* Permanent exp */
182	uint32 ACC (RW, weapontype); /* type of weapon */	195	uint32 ACC (RW, weapontype); /* type of weapon */
183	uint32 ACC (RW, tooltype); /* type of tool or build facility */	196	uint32 ACC (RW, tooltype); /* type of tool or build facility */
184	sint8 body_info[NUM_BODY_LOCATIONS]; /* body info as loaded from the file */	197	sint8 body_info[NUM_BODY_LOCATIONS]; /* body info as loaded from the file */
185	sint8 body_used[NUM_BODY_LOCATIONS]; /* Calculated value based on items equipped */	198	sint8 body_used[NUM_BODY_LOCATIONS]; /* Calculated value based on items equipped */
186	living ACC (RO, stats); /* Str, Con, Dex, etc */	199	living ACC (RO, stats); /* Str, Con, Dex, etc */
187	/* See the doc/Developers/objects for more info about body locations */	200	/* See the doc/Developers/objects for more info about body locations */
188		201
189	/* Following mostly refers to fields only used for monsters */	202	/* Following mostly refers to fields only used for monsters */
190	uint32 ACC (RW, hide); /* The object is hidden, not invisible */	203	uint32 ACC (RW, hide); /* The object is hidden, not invisible */
191	/* changes made by kholland@sunlab.cit.cornell.edu */	204	/* changes made by kholland@sunlab.cit.cornell.edu */
192	/* allows different movement patterns for attackers */	205	/* allows different movement patterns for attackers */
193	sint32 ACC (RW, move_status); /* What stage in attack mode */	206	sint32 ACC (RW, move_status); /* What stage in attack mode */
194	uint16 ACC (RW, attack_movement); /* What kind of attack movement */	207	uint16 ACC (RW, attack_movement); /* What kind of attack movement */
195	uint16 ACC (RW, run_away); /* Monster runs away if it's hp goes below this percentage. */	208	uint16 ACC (RW, run_away); /* Monster runs away if it's hp goes below this percentage. */
…		…
199	/* Spell related information, may be useful elsewhere	212	/* Spell related information, may be useful elsewhere
200	* Note that other fields are used - these files are basically	213	* Note that other fields are used - these files are basically
201	* only used in spells.	214	* only used in spells.
202	*/	215	*/
203	sint16 ACC (RW, duration); /* How long the spell lasts */	216	sint16 ACC (RW, duration); /* How long the spell lasts */
204	sint16 ACC (RW, casting_time); /* time left before spell goes off */	217	sint16 ACC (RW, casting_time);/* time left before spell goes off */
205	uint16 ACC (RW, start_holding);	218	uint16 ACC (RW, start_holding);
206	uint8 ACC (RW, duration_modifier); /* how level modifies duration */	219	uint8 ACC (RW, duration_modifier); /* how level modifies duration */
207	uint8 ACC (RW, dam_modifier); /* How going up in level effects damage */	220	uint8 ACC (RW, dam_modifier); /* How going up in level effects damage */
208	sint8 ACC (RW, range); /* Range of the spell */	221	sint8 ACC (RW, range); /* Range of the spell */
209	uint8 ACC (RW, range_modifier); /* How going up in level effects range */	222	uint8 ACC (RW, range_modifier); /* How going up in level effects range */
210	char *ACC (RW, spellarg);	223	char *ACC (RW, spellarg);
211		224
212	/* Following are values used by any object */	225	/* Following are values used by any object */
		226	/* this objects turns into or what this object creates */
213	treasurelist ACC (RW, randomitems); / Items to be generated */	227	treasurelist ACC (RW, randomitems); / Items to be generated */
214	archetype ACC (RW, arch); / Pointer to archetype */
215	archetype ACC (RW, other_arch); / Pointer used for various things - mostly used for what */
216	key_value key_values; / Fields not explictly known by the loader. */	228	key_value key_values; / Fields not explictly known by the loader. */
217	/* this objects turns into or what this object creates */	229	std::bitset<NUM_FLAGS> flags; /* various flags */
218	uint32 flags[4]; /* various flags */
219	uint16 ACC (RW, animation_id); /* An index into the animation array */	230	uint16 ACC (RW, animation_id);/* An index into the animation array */
220	uint8 ACC (RW, anim_speed); /* ticks between animation-frames */	231	uint8 ACC (RW, anim_speed); /* ticks between animation-frames */
221	uint8 ACC (RW, last_anim); /* last sequence used to draw face */	232	uint8 ACC (RW, last_anim); /* last sequence used to draw face */
222	sint32 ACC (RW, elevation); /* elevation of this terrain - not currently used */	233	sint32 ACC (RW, elevation); /* elevation of this terrain - not currently used */
223	uint8 ACC (RW, smoothlevel); /* how to smooth this square around */	234	uint8 ACC (RW, smoothlevel); /* how to smooth this square around */
224	uint8 ACC (RW, will_apply); /* See crossfire.doc */	235	uint8 ACC (RW, will_apply); /* See crossfire.doc */
225		236
226	MoveType ACC (RW, move_type); /* Type of movement this object uses */	237	MoveType ACC (RW, move_type); /* Type of movement this object uses */
227	MoveType ACC (RW, move_block); /* What movement types this blocks */	238	MoveType ACC (RW, move_block);/* What movement types this blocks */
228	MoveType ACC (RW, move_allow); /* What movement types explicitly allowd */	239	MoveType ACC (RW, move_allow);/* What movement types explicitly allowd */
229	MoveType ACC (RW, move_on); /* Move types affected moving on to this space */	240	MoveType ACC (RW, move_on); /* Move types affected moving on to this space */
230	MoveType ACC (RW, move_off); /* Move types affected moving off this space */	241	MoveType ACC (RW, move_off); /* Move types affected moving off this space */
231	MoveType ACC (RW, move_slow); /* Movement types this slows down */	242	MoveType ACC (RW, move_slow); /* Movement types this slows down */
232	float ACC (RW, move_slow_penalty); /* How much this slows down the object */	243	float ACC (RW, move_slow_penalty); /* How much this slows down the object */
233	};	244	};
234		245
235	struct object : zero_initialised, object_keep, object_copy, object_pod	246	struct object : zero_initialised, object_keep, object_copy, object_pod
236	{	247	{
…		…
240	static vector active; // active objects, not yet used	251	static vector active; // active objects, not yet used
241	static vector objects; // not used yet, use first->next->...	252	static vector objects; // not used yet, use first->next->...
242	static object *first; // will be replaced by "objects"	253	static object *first; // will be replaced by "objects"
243		254
244	static object *create ();	255	static object *create ();
		256	void copy_to (object *dst);
		257	object *clone (); // create + copy_to
245	void destroy (bool destroy_inventory = false);	258	void destroy (bool destroy_inventory = false);
		259	void remove ();
		260	object insert (object item); // insert into inventory
246		261
247	static void free_mortals ();	262	static void free_mortals ();
		263	static bool can_merge_slow (object op1, object op2);
		264
		265	// this is often used in time-critical code, so optimise
248	static bool can_merge (object op1, object op2);	266	static bool can_merge (object op1, object op2)
249		267	{
250	void clear ();	268	return op1->value == op2->value
251	void clone (object *destination);	269	&& op1->name == op2->name
		270	&& can_merge_slow (op1, op2);
		271	}
252		272
253	bool destroyed () { return QUERY_FLAG (this, FLAG_FREED); }	273	bool destroyed () { return QUERY_FLAG (this, FLAG_FREED); }
		274
		275	void set_owner (object *owner);
254		276
255	void instantiate ()	277	void instantiate ()
256	{	278	{
257	if (!uuid.seq) // HACK	279	if (!uuid.seq) // HACK
258	uuid = gen_uuid ();	280	uuid = gen_uuid ();
259		281
260	attachable<object>::instantiate ();	282	attachable<object>::instantiate ();
261	}	283	}
262		284
263	void set_owner (object *owner);	285	// recalculate all stats
		286	void update_stats ();
		287	void roll_stats ();
		288	void swap_stats (int a, int b);
		289	void add_statbonus ();
		290	void remove_statbonus ();
		291	void drain_stat ();
		292	void drain_specific_stat (int deplete_stats);
		293	void change_luck (int value);
264		294
265	// info must hold 256 * 3 bytes currently	295	// info must hold 256 * 3 bytes currently
266	const char debug_desc (char info) const;	296	const char debug_desc (char info) const;
267	const char *debug_desc () const;	297	const char *debug_desc () const;
		298
		299	bool is_weapon () const { return type == ARROW \|\| type == BOW \|\| type == WEAPON; }
		300	bool is_armor () const { return type == ARMOUR \|\| type == SHIELD \|\| type == HELMET
		301	\|\| type == CLOAK \|\| type == BOOTS \|\| type == GLOVES
		302	\|\| type == BRACERS \|\| type == GIRDLE; }
		303	bool is_alive () const { return (type == PLAYER
		304	\|\| flags [FLAG_MONSTER]
		305	\|\| (flags [FLAG_ALIVE] && !flags [FLAG_GENERATOR] && type != DOOR))
		306	&& !flags [FLAG_IS_A_TEMPLATE]; }
		307	bool is_arrow () const { return type == ARROW
		308	\|\| (type == SPELL_EFFECT
		309	&& (subtype == SP_BULLET \|\| subtype == SP_MAGIC_MISSILE)); }
		310
		311	/* This return true if object has still randomitems which
		312	* could be expanded.
		313	*/
		314	bool has_random_items () const { return randomitems && !flags [FLAG_IS_A_TEMPLATE]; }
		315
		316	// returns the player that has this object in his inventory, or 0
		317	object *in_player () const
		318	{
		319	for (object *op = env; op; op = op->env)
		320	if (op->type == PLAYER)
		321	return op;
		322
		323	return 0;
		324	}
		325
		326	// returns the mapspace this object is in
		327	mapspace &ms () const;
268		328
269	// fully recursive iterator	329	// fully recursive iterator
270	struct iterator_base	330	struct iterator_base
271	{	331	{
272	object *item;	332	object *item;
…		…
309		369
310	object ();	370	object ();
311	~object ();	371	~object ();
312	};	372	};
313		373
314	#define get_object() object::create ()
315	#define free_object(op) (op)->destroy (0)
316	#define free_object2(op, free_inv) (op)->destroy (free_inv)
317	#define clear_owner(op) (op)->owner = 0
318	#define copy_owner(op,other) (op)->owner = (other)->owner
319	#define get_owner(op) (op)->owner
320	#define clear_object(op) (op)->clear ()
321
322	static inline void
323	set_owner (object op, object owner)
324	{
325	op->set_owner (owner);
326	}
327
328	#define CAN_MERGE(op1,op2) ((op1)->value == (op2)->value && (op1)->name == (op2)->name && object::can_merge ((op1), (op2)))
329
330	typedef struct oblnk	374	typedef struct oblnk
331	{ /* Used to link together several objects */	375	{ /* Used to link together several objects */
332	object *ob;	376	object_ptr ob;
333	struct oblnk *next;	377	struct oblnk *next;
334	tag_t id;
335	} objectlink;	378	} objectlink;
336		379
337	typedef struct oblinkpt	380	typedef struct oblinkpt
338	{ /* Used to link together several object links */	381	{ /* Used to link together several object links */
339	struct oblnk *link;	382	struct oblnk *link;
…		…
348	* be much left in the archetype - all it really is is a holder for the	391	* be much left in the archetype - all it really is is a holder for the
349	* object and pointers. This structure should get removed, and just replaced	392	* object and pointers. This structure should get removed, and just replaced
350	* by the object structure	393	* by the object structure
351	*/	394	*/
352		395
353	ACC_CLASS(archetype)	396	ACC_CLASS (archetype)
354	struct archetype : zero_initialised	397	struct archetype : zero_initialised, refcounted
355	{	398	{
356	archetype ();	399	archetype ();
357	~archetype ();	400	~archetype ();
358		401
359	static archetype find (const char arch);	402	static archetype find (const char arch);
		403
		404	void hash_add (); // add to hastable
		405	void hash_del (); // remove from hashtable
360		406
361	shstr ACC (RW, name); /* More definite name, like "generate_kobold" */	407	shstr ACC (RW, name); /* More definite name, like "generate_kobold" */
362	struct archetype ACC (RW, next); / Next archetype in a linked list */	408	struct archetype ACC (RW, next); / Next archetype in a linked list */
363	struct archetype ACC (RW, head); / The main part of a linked object */	409	struct archetype ACC (RW, head); / The main part of a linked object */
364	struct archetype ACC (RW, more); / Next part of a linked object */	410	struct archetype ACC (RW, more); / Next part of a linked object */
365	object ACC (RO, clone); /* An object from which to do copy_object() */	411	object ACC (RO, clone); /* An object from which to do ->copy_to () */
366	uint32 ACC (RW, editable); /* editable flags (mainly for editor) */	412	uint32 ACC (RW, editable); /* editable flags (mainly for editor) */
367	sint8 ACC (RW, tail_x), ACC (RW, tail_y); /* Where the lower right most portion of the object is	413	sint8 ACC (RW, tail_x), ACC (RW, tail_y); /* Where the lower right most portion of the object is
368	* in comparison to the head.	414	* in comparison to the head.
369	*/	415	*/
370	};	416	};
…		…
375	extern int nrofallocobjects;	421	extern int nrofallocobjects;
376		422
377	/* This returns TRUE if the object is something that	423	/* This returns TRUE if the object is something that
378	* should be displayed in the look window	424	* should be displayed in the look window
379	*/	425	*/
380	#define LOOK_OBJ(ob) (!ob->invisible && ob->type!=PLAYER && ob->type!=EVENT_CONNECTOR)	426	#define LOOK_OBJ(ob) (!ob->invisible && ob->type != PLAYER && ob->type != EVENT_CONNECTOR)
381		427
382	/* Used by update_object to know if the object being passed is	428	/* Used by update_object to know if the object being passed is
383	* being added or removed.	429	* being added or removed.
384	*/	430	*/
385	#define UP_OBJ_INSERT 1	431	#define UP_OBJ_INSERT 1
…		…
426	#define ARCH_DETECT_MAGIC "detect_magic"	472	#define ARCH_DETECT_MAGIC "detect_magic"
427	#define ARCH_DEPLETION "depletion"	473	#define ARCH_DEPLETION "depletion"
428	#define ARCH_SYMPTOM "symptom"	474	#define ARCH_SYMPTOM "symptom"
429		475
430	#endif	476	#endif
		477

Diff Legend

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

Comparing deliantra/server/include/object.h (file contents): Revision 1.42 by root, Wed Sep 27 00:36:09 2006 UTC vs. Revision 1.62 by root, Fri Dec 22 16:34:00 2006 UTC

Diff Legend

Comparing deliantra/server/include/object.h (file contents):
Revision 1.42 by root, Wed Sep 27 00:36:09 2006 UTC vs.
Revision 1.62 by root, Fri Dec 22 16:34:00 2006 UTC