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

Comparing deliantra/server/include/object.h (file contents):
Revision 1.46 by root, Sun Dec 3 01:06:37 2006 UTC vs.
Revision 1.75 by root, Sat Dec 30 21:17:48 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 ();
68	extern const uint64 UUID_SKIP;	75	extern const uint64 UUID_SKIP;
…		…
78	#define WILL_APPLY_DOOR 0x08	85	#define WILL_APPLY_DOOR 0x08
79	#define WILL_APPLY_FOOD 0x10	86	#define WILL_APPLY_FOOD 0x10
80		87
81	/* 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
82	* 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,
83	* e.g. copy_object.	90	* e.g. ->copy_to ()
84	*/	91	*/
85		92
86	typedef refptr<object> object_ptr;	93	INTERFACE_CLASS (object)
87	typedef refptr<archetype> arch_ptr;
88
89	// these are not being copied	94	// these are being copied
90	ACC_CLASS (object)	95	struct object_copy : attachable
91	struct object_keep : refcounted
92	{	96	{
93	tag_t ACC (RW, count); /* Generation count for this object */	97	typedef bitset<NUM_FLAGS> flags_t;
94	UUID ACC (RW, uuid); // Unique Identifier, survives saves etc.
95		98
96	/* These variables are not changed by copy_object() */	99	sint16 ACC (RW, x), ACC (RW, y); /* Position in the map for this object */
97	player ACC (RW, contr); / Pointer to the player which control this object */	100	sint8 ACC (RW, direction); /* Means the object is moving that way. */
98	object ACC (RW, next); / Pointer to the next object in the free/used list */	101	sint8 ACC (RW, facing); /* Object is oriented/facing that way. */
99	object ACC (RW, prev); / Pointer to the previous object in the free/used list */
100	object ACC (RW, active_next);/ Next & previous object in the 'active' */
101	object ACC (RW, active_prev);/ List. This is used in process_events */
102	/* so that the entire object list does not */
103	/* need to be gone through. */
104	object ACC (RW, below); / Pointer to the object stacked below this one */
105	object ACC (RW, above); / Pointer to the object stacked above this one */
106	/* Note: stacked in the same environment */
107	object inv; / Pointer to the first object in the inventory */
108	object ACC (RW, container); / Current container being used. I think this
109	* is only used by the player right now.
110	*/
111	object ACC (RW, env); / Pointer to the object which is the environment.
112	* This is typically the container that the object is in.
113	*/
114	object ACC (RW, more); / Pointer to the rest of a large body of objects */
115	object head; / Points to the main object of a large body */ // NO ACC, perl semantics are different
116	maptile ACC (RW, map); / Pointer to the map in which this object is present */
117	};
118
119	// these are being copied
120	struct object_copy : attachable<object>
121	{
122	shstr ACC (RW, name); /* The name of the object, obviously... */	102	shstr ACC (RW, name); /* The name of the object, obviously... */
123	shstr ACC (RW, name_pl); /* The plural name of the object */	103	shstr ACC (RW, name_pl); /* The plural name of the object */
124	shstr ACC (RW, title); /* Of foo, etc */	104	shstr ACC (RW, title); /* Of foo, etc */
125	shstr ACC (RW, race); /* human, goblin, dragon, etc */	105	shstr ACC (RW, race); /* human, goblin, dragon, etc */
126	shstr ACC (RW, slaying); /* Which race to do double damage to */	106	shstr ACC (RW, slaying); /* Which race to do double damage to */
127	/* If this is an exit, this is the filename */	107	/* If this is an exit, this is the filename */
128	shstr ACC (RW, skill); /* Name of the skill this object uses/grants */	108	shstr ACC (RW, skill); /* Name of the skill this object uses/grants */
129	shstr ACC (RW, msg); /* If this is a book/sign/magic mouth/etc */	109	shstr ACC (RW, msg); /* If this is a book/sign/magic mouth/etc */
130	shstr ACC (RW, lore); /* Obscure information about this object, */	110	shstr ACC (RW, lore); /* Obscure information about this object, */
131	/* To get put into books and the like. */	111	/* To get put into books and the like. */
132	shstr ACC (RW, materialname); /* specific material name */	112	shstr ACC (RW, materialname); /* specific material name */
133	shstr ACC (RW, custom_name); /* Custom name assigned by player */	113	shstr ACC (RW, custom_name); /* Custom name assigned by player */
134	object_ptr ACC (RW, owner); /* Pointer to the object which controls this one */	114	object_ptr ACC (RW, owner); /* Pointer to the object which controls this one */
135	object_ptr ACC (RW, enemy); /* Monster/player to follow even if not closest */	115	object_ptr ACC (RW, enemy); /* Monster/player to follow even if not closest */
136	object_ptr ACC (RW, attacked_by); /* This object start to attack us! only player & monster */	116	object_ptr ACC (RW, attacked_by); /* This object start to attack us! only player & monster */
137	object_ptr ACC (RW, chosen_skill); /* the skill chosen to use */	117	object_ptr ACC (RW, chosen_skill); /* the skill chosen to use */
138	object_ptr ACC (RW, spellitem); /* Spell ability monster is choosing to use */	118	object_ptr ACC (RW, spellitem); /* Spell ability monster is choosing to use */
139	object_ptr ACC (RW, spell); /* Spell that was being cast */	119	object_ptr ACC (RW, spell); /* Spell that was being cast */
140	object_ptr ACC (RW, current_weapon); /* Pointer to the weapon currently used */	120	object_ptr ACC (RW, current_weapon); /* Pointer to the weapon currently used */
141	};	121	arch_ptr ACC (RW, arch); /* Pointer to archetype */
		122	arch_ptr ACC (RW, other_arch);/* Pointer used for various things - mostly used for what */
142		123
143	// these are being copied and also cleared
144	struct object_pod
145	{
146	New_Face ACC (RW, face); / Face with colors */	124	New_Face ACC (RW, face); / Face with colors */
147	sint16 ACC (RW, x), ACC (RW, y); /* Position in the map for this object */
148	float ACC (RW, speed); /* The overall speed of this object */	125	float ACC (RW, speed); /* The overall speed of this object */
149	float ACC (RW, speed_left); /* How much speed is left to spend this round */	126	float ACC (RW, speed_left); /* How much speed is left to spend this round */
150	uint32 ACC (RW, nrof); /* How many of the objects */	127	uint32 ACC (RW, nrof); /* How many of the objects */
151	sint8 ACC (RW, direction); /* Means the object is moving that way. */
152	sint8 ACC (RW, facing); /* Object is oriented/facing that way. */
153		128
154	/* This next big block are basically used for monsters and equipment */	129	/* This next big block are basically used for monsters and equipment */
155	uint8 ACC (RW, type); /* PLAYER, BULLET, etc. See define.h */	130	uint8 ACC (RW, type); /* PLAYER, BULLET, etc. See define.h */
156	uint8 ACC (RW, subtype); /* subtype of object */	131	uint8 ACC (RW, subtype); /* subtype of object */
157	uint16 ACC (RW, client_type); /* Public type information. see doc/Developers/objects */	132	uint16 ACC (RW, client_type); /* Public type information. see doc/Developers/objects */
158	sint16 resist[NROFATTACKS]; /* Resistance adjustments for attacks */	133	sint16 ACC (RW, resist[NROFATTACKS]); /* Resistance adjustments for attacks */
159	uint32 ACC (RW, attacktype); /* Bitmask of attacks this object does */	134	uint32 ACC (RW, attacktype); /* Bitmask of attacks this object does */
160	uint32 ACC (RW, path_attuned);/* Paths the object is attuned to */	135	uint32 ACC (RW, path_attuned);/* Paths the object is attuned to */
161	uint32 ACC (RW, path_repelled); /* Paths the object is repelled from */	136	uint32 ACC (RW, path_repelled); /* Paths the object is repelled from */
162	uint32 ACC (RW, path_denied); /* Paths the object is denied access to */	137	uint32 ACC (RW, path_denied); /* Paths the object is denied access to */
163	uint16 ACC (RW, material); /* What materials this object consist of */	138	uint16 ACC (RW, material); /* What materials this object consist of */
…		…
181	sint32 ACC (RW, weight_limit);/* Weight-limit of object */	156	sint32 ACC (RW, weight_limit);/* Weight-limit of object */
182	sint32 ACC (RW, carrying); /* How much weight this object contains */	157	sint32 ACC (RW, carrying); /* How much weight this object contains */
183	sint64 ACC (RW, perm_exp); /* Permanent exp */	158	sint64 ACC (RW, perm_exp); /* Permanent exp */
184	uint32 ACC (RW, weapontype); /* type of weapon */	159	uint32 ACC (RW, weapontype); /* type of weapon */
185	uint32 ACC (RW, tooltype); /* type of tool or build facility */	160	uint32 ACC (RW, tooltype); /* type of tool or build facility */
186	sint8 body_info[NUM_BODY_LOCATIONS]; /* body info as loaded from the file */	161	sint8 ACC (RW, body_info[NUM_BODY_LOCATIONS]); /* body info as loaded from the file */
187	sint8 body_used[NUM_BODY_LOCATIONS]; /* Calculated value based on items equipped */	162	sint8 ACC (RW, body_used[NUM_BODY_LOCATIONS]); /* Calculated value based on items equipped */
188	living ACC (RO, stats); /* Str, Con, Dex, etc */	163	living ACC (RO, stats); /* Str, Con, Dex, etc */
189	/* See the doc/Developers/objects for more info about body locations */	164	/* See the pod/objects.pod for more info about body locations */
190		165
191	/* Following mostly refers to fields only used for monsters */	166	/* Following mostly refers to fields only used for monsters */
192	uint32 ACC (RW, hide); /* The object is hidden, not invisible */	167	uint32 ACC (RW, hide); /* The object is hidden, not invisible */
193	/* changes made by kholland@sunlab.cit.cornell.edu */	168
194	/* allows different movement patterns for attackers */	169	/* allows different movement patterns for attackers */
195	sint32 ACC (RW, move_status); /* What stage in attack mode */	170	sint32 ACC (RW, move_status); /* What stage in attack mode */
196	uint16 ACC (RW, attack_movement); /* What kind of attack movement */	171	uint16 ACC (RW, attack_movement); /* What kind of attack movement */
197	uint16 ACC (RW, run_away); /* Monster runs away if it's hp goes below this percentage. */	172	uint16 ACC (RW, run_away); /* Monster runs away if it's hp goes below this percentage. */
198	float ACC (RW, expmul); /* needed experience = (calc_expexpmul) - means some /	173	float ACC (RW, expmul); /* needed experience = (calc_expexpmul) - means some /
199	/* races/classes can need less/more exp to gain levels */	174	/* races/classes can need less/more exp to gain levels */
200		175
201	/* Spell related information, may be useful elsewhere	176	/* Spell related information, may be useful elsewhere
202	* Note that other fields are used - these files are basically	177	* Note that other fields are used - these files are basically
203	* only used in spells.	178	* only used in spells.
204	*/	179	*/
…		…
207	uint16 ACC (RW, start_holding);	182	uint16 ACC (RW, start_holding);
208	uint8 ACC (RW, duration_modifier); /* how level modifies duration */	183	uint8 ACC (RW, duration_modifier); /* how level modifies duration */
209	uint8 ACC (RW, dam_modifier); /* How going up in level effects damage */	184	uint8 ACC (RW, dam_modifier); /* How going up in level effects damage */
210	sint8 ACC (RW, range); /* Range of the spell */	185	sint8 ACC (RW, range); /* Range of the spell */
211	uint8 ACC (RW, range_modifier); /* How going up in level effects range */	186	uint8 ACC (RW, range_modifier); /* How going up in level effects range */
212	char *ACC (RW, spellarg);
213
214	/* Following are values used by any object */
215	treasurelist ACC (RW, randomitems); / Items to be generated */
216	arch_ptr ACC (RW, arch); /* Pointer to archetype */
217	arch_ptr ACC (RW, other_arch);/* Pointer used for various things - mostly used for what */
218	key_value key_values; / Fields not explictly known by the loader. */
219	/* this objects turns into or what this object creates */
220	uint32 flags[4]; /* various flags */
221	uint16 ACC (RW, animation_id);/* An index into the animation array */
222	uint8 ACC (RW, anim_speed); /* ticks between animation-frames */
223	uint8 ACC (RW, last_anim); /* last sequence used to draw face */
224	sint32 ACC (RW, elevation); /* elevation of this terrain - not currently used */
225	uint8 ACC (RW, smoothlevel); /* how to smooth this square around */
226	uint8 ACC (RW, will_apply); /* See crossfire.doc */
227		187
228	MoveType ACC (RW, move_type); /* Type of movement this object uses */	188	MoveType ACC (RW, move_type); /* Type of movement this object uses */
229	MoveType ACC (RW, move_block);/* What movement types this blocks */	189	MoveType ACC (RW, move_block);/* What movement types this blocks */
230	MoveType ACC (RW, move_allow);/* What movement types explicitly allowd */	190	MoveType ACC (RW, move_allow);/* What movement types explicitly allowd */
231	MoveType ACC (RW, move_on); /* Move types affected moving on to this space */	191	MoveType ACC (RW, move_on); /* Move types affected moving on to this space */
232	MoveType ACC (RW, move_off); /* Move types affected moving off this space */	192	MoveType ACC (RW, move_off); /* Move types affected moving off this space */
233	MoveType ACC (RW, move_slow); /* Movement types this slows down */	193	MoveType ACC (RW, move_slow); /* Movement types this slows down */
234	float ACC (RW, move_slow_penalty); /* How much this slows down the object */	194	float ACC (RW, move_slow_penalty); /* How much this slows down the object */
		195
		196	char *ACC (RW, spellarg);
		197
		198	/* Following are values used by any object */
		199	/* this objects turns into or what this object creates */
		200	treasurelist ACC (RW, randomitems); / Items to be generated */
		201	key_value key_values; / Fields not explictly known by the loader. */
		202	flags_t flag; /* various flags */
		203	#if FOR_PERL
		204	bool ACC (RW, flag[NUM_FLAGS]);
		205	#endif
		206	uint16 ACC (RW, animation_id);/* An index into the animation array */
		207	uint8 ACC (RW, anim_speed); /* ticks between animation-frames */
		208	uint8 ACC (RW, last_anim); /* last sequence used to draw face */
		209	sint16 ACC (RW, elevation); /* elevation of this terrain - not currently used */
		210	uint8 ACC (RW, smoothlevel); /* how to smooth this square around */
		211	uint8 ACC (RW, will_apply); /* See crossfire.doc */
235	};	212	};
236		213
237	struct object : zero_initialised, object_keep, object_copy, object_pod	214	struct object : zero_initialised, object_copy
238	{	215	{
239	typedef unordered_vector<object *> vector;	216	typedef unordered_vector<object *> vector;
240		217
241	static vector mortals;	218	// These variables are not changed by ->copy_to
		219	maptile_ptr ACC (RW, map); /* Pointer to the map in which this object is present */
		220
		221	tag_t ACC (RW, count); /* Generation count for this object */
		222	UUID ACC (RW, uuid); // Unique Identifier, survives saves etc.
		223
		224	player_ptr ACC (RW, contr); /* Pointer to the player which control this object */
		225	object ACC (RW, next); / Pointer to the next object in the free/used list */
		226	object ACC (RW, prev); / Pointer to the previous object in the free/used list */
		227	object ACC (RW, active_next);/ Next & previous object in the 'active' */
		228	object ACC (RW, active_prev);/ List. This is used in process_events */
		229	/* so that the entire object list does not */
		230	/* need to be gone through. */
		231	object ACC (RW, below); / Pointer to the object stacked below this one */
		232	object ACC (RW, above); / Pointer to the object stacked above this one */
		233	/* Note: stacked in the same environment */
		234	object inv; / Pointer to the first object in the inventory */
		235	object ACC (RW, container); / Current container being used. I think this
		236	* is only used by the player right now.
		237	*/
		238	object ACC (RW, env); / Pointer to the object which is the environment.
		239	* This is typically the container that the object is in.
		240	*/
		241	object ACC (RW, more); / Pointer to the rest of a large body of objects */
		242	object head; / Points to the main object of a large body */ // NO ACC, perl semantics are different
		243	client_container *seen_by; // seen by which player/container currently?
		244
242	static vector active; // active objects, not yet used	245	static vector active; // active objects, not yet used
243	static vector objects; // not used yet, use first->next->...	246	static vector objects; // not used yet, use first->next->...
244	static object *first; // will be replaced by "objects"	247	static object *first; // will be replaced by "objects"
245		248
246	static object *create ();	249	MTH static object *create ();
		250	MTH void copy_to (object *dst);
		251	MTH object *clone (); // create + copy_to
		252	void do_destroy ();
		253	void gather_callbacks (AV *&callbacks, event_type event) const;
247	void destroy (bool destroy_inventory = false);	254	MTH void destroy (bool destroy_inventory = false);
248		255
249	static void free_mortals ();	256	// recursively destroy all objects in inventory, optionally dropping them to the ground instead
		257	MTH void destroy_inv (bool drop_to_ground = false);
		258	MTH void remove ();
		259	MTH object insert (object item); // insert into inventory
		260
250	static bool can_merge (object op1, object op2);	261	static bool can_merge_slow (object op1, object op2);
251		262
252	void clear ();	263	// this is often used in time-critical code, so optimise
253	void clone (object *destination);	264	MTH static bool can_merge (object op1, object op2)
		265	{
		266	return op1->value == op2->value
		267	&& op1->name == op2->name
		268	&& can_merge_slow (op1, op2);
		269	}
254		270
255	bool destroyed () { return QUERY_FLAG (this, FLAG_FREED); }	271	MTH void set_owner (object *owner);
		272	MTH void set_speed (float speed);
256		273
257	void instantiate ()	274	MTH void instantiate ()
258	{	275	{
259	if (!uuid.seq) // HACK	276	if (!uuid.seq) // HACK
260	uuid = gen_uuid ();	277	uuid = gen_uuid ();
261		278
262	attachable<object>::instantiate ();	279	attachable::instantiate ();
263	}	280	}
264		281
265	void set_owner (object *owner);	282	// recalculate all stats
		283	MTH void update_stats ();
		284	MTH void roll_stats ();
		285	MTH void swap_stats (int a, int b);
		286	MTH void add_statbonus ();
		287	MTH void remove_statbonus ();
		288	MTH void drain_stat ();
		289	MTH void drain_specific_stat (int deplete_stats);
		290	MTH void change_luck (int value);
266		291
267	// info must hold 256 * 3 bytes currently	292	// info must hold 256 * 3 bytes currently
268	const char debug_desc (char info) const;	293	const char debug_desc (char info) const;
269	const char *debug_desc () const;	294	MTH const char *debug_desc () const;
		295	const char flag_desc (char desc, int len) const;
		296
		297	MTH bool is_weapon () const { return type == ARROW \|\| type == BOW \|\| type == WEAPON; }
		298	MTH bool is_armor () const { return type == ARMOUR \|\| type == SHIELD \|\| type == HELMET
		299	\|\| type == CLOAK \|\| type == BOOTS \|\| type == GLOVES
		300	\|\| type == BRACERS \|\| type == GIRDLE; }
		301	MTH bool is_alive () const { return (type == PLAYER
		302	\|\| flag [FLAG_MONSTER]
		303	\|\| (flag [FLAG_ALIVE] && !flag [FLAG_GENERATOR] && type != DOOR))
		304	&& !flag [FLAG_IS_A_TEMPLATE]; }
		305	MTH bool is_arrow () const { return type == ARROW
		306	\|\| (type == SPELL_EFFECT
		307	&& (subtype == SP_BULLET \|\| subtype == SP_MAGIC_MISSILE)); }
		308
		309	MTH bool has_active_speed () const { return FABS(speed) >= MIN_ACTIVE_SPEED; }
		310
		311	// temporary: wether the objetc can be saved in a map file
		312	// contr => is a player
		313	// head => only save head of a multitile object
		314	// owner => can not reference owner yet
		315	MTH bool can_map_save () const { return !contr && !head && !owner; }
		316
		317	/* This return true if object has still randomitems which
		318	* could be expanded.
		319	*/
		320	MTH bool has_random_items () const { return randomitems && !flag [FLAG_IS_A_TEMPLATE]; }
		321
		322	// returns the player that has this object in his inventory, or 0
		323	MTH object *in_player () const
		324	{
		325	for (object *op = env; op; op = op->env)
		326	if (op->type == PLAYER)
		327	return op;
		328
		329	return 0;
		330	}
		331
		332	// "temporary" helper function
		333	MTH object *head_ ()
		334	{
		335	return head ? head : this;
		336	}
		337
		338	// insert object at same map position as 'where'
		339	// handles both inventory and map "positions"
		340	MTH object insert_at (object where, object *originator = 0, int flags = 0);
		341
		342	MTH void activate (bool recursive = true);
		343	MTH void deactivate (bool recursive = true);
		344
		345	void enter_exit (object *exit);//PERL
		346	MTH void enter_map (maptile *newmap, int x, int y);
		347
		348	// returns the mapspace this object is in
		349	mapspace &ms () const;
270		350
271	// fully recursive iterator	351	// fully recursive iterator
272	struct iterator_base	352	struct iterator_base
273	{	353	{
274	object *item;	354	object *item;
…		…
310	void unlink ();	390	void unlink ();
311		391
312	object ();	392	object ();
313	~object ();	393	~object ();
314	};	394	};
315
316	#define get_object() object::create ()
317	#define free_object(op) (op)->destroy (0)
318	#define free_object2(op, free_inv) (op)->destroy (free_inv)
319	#define clear_owner(op) (op)->owner = 0
320	#define copy_owner(op,other) (op)->owner = (other)->owner
321	#define get_owner(op) (op)->owner
322	#define clear_object(op) (op)->clear ()
323
324	static inline void
325	set_owner (object op, object owner)
326	{
327	op->set_owner (owner);
328	}
329
330	#define CAN_MERGE(op1,op2) ((op1)->value == (op2)->value && (op1)->name == (op2)->name && object::can_merge ((op1), (op2)))
331		395
332	typedef struct oblnk	396	typedef struct oblnk
333	{ /* Used to link together several objects */	397	{ /* Used to link together several objects */
334	object_ptr ob;	398	object_ptr ob;
335	struct oblnk *next;	399	struct oblnk *next;
…		…
349	* be much left in the archetype - all it really is is a holder for the	413	* be much left in the archetype - all it really is is a holder for the
350	* object and pointers. This structure should get removed, and just replaced	414	* object and pointers. This structure should get removed, and just replaced
351	* by the object structure	415	* by the object structure
352	*/	416	*/
353		417
354	ACC_CLASS (archetype)	418	INTERFACE_CLASS (archetype)
355	struct archetype : zero_initialised, refcounted	419	struct archetype : zero_initialised, attachable
356	{	420	{
357	archetype ();	421	archetype ();
358	~archetype ();	422	~archetype ();
		423	void gather_callbacks (AV *&callbacks, event_type event) const;
359		424
360	static archetype find (const char arch);	425	static archetype find (const char arch);
361		426
362	void hash_add (); // add to hastable	427	void hash_add (); // add to hashtable
363	void hash_del (); // remove from hashtable	428	void hash_del (); // remove from hashtable
364		429
365	shstr ACC (RW, name); /* More definite name, like "generate_kobold" */	430	shstr ACC (RW, name); /* More definite name, like "generate_kobold" */
366	struct archetype ACC (RW, next); / Next archetype in a linked list */	431	struct archetype ACC (RW, next); / Next archetype in a linked list */
367	struct archetype ACC (RW, head); / The main part of a linked object */	432	struct archetype ACC (RW, head); / The main part of a linked object */
368	struct archetype ACC (RW, more); / Next part of a linked object */	433	struct archetype ACC (RW, more); / Next part of a linked object */
369	object ACC (RO, clone); /* An object from which to do copy_object() */	434	object ACC (RO, clone); /* An object from which to do ->copy_to () */
370	uint32 ACC (RW, editable); /* editable flags (mainly for editor) */	435	uint32 ACC (RW, editable); /* editable flags (mainly for editor) */
371	sint8 ACC (RW, tail_x), ACC (RW, tail_y); /* Where the lower right most portion of the object is	436	sint8 ACC (RW, tail_x), ACC (RW, tail_y); /* Where the lower right most portion of the object is
372	* in comparison to the head.	437	* in comparison to the head.
373	*/	438	*/
374	};	439	};
…		…
379	extern int nrofallocobjects;	444	extern int nrofallocobjects;
380		445
381	/* This returns TRUE if the object is something that	446	/* This returns TRUE if the object is something that
382	* should be displayed in the look window	447	* should be displayed in the look window
383	*/	448	*/
384	#define LOOK_OBJ(ob) (!ob->invisible && ob->type!=PLAYER && ob->type!=EVENT_CONNECTOR)	449	#define LOOK_OBJ(ob) (!ob->invisible && ob->type != PLAYER && ob->type != EVENT_CONNECTOR)
385		450
386	/* Used by update_object to know if the object being passed is	451	/* Used by update_object to know if the object being passed is
387	* being added or removed.	452	* being added or removed.
388	*/	453	*/
389	#define UP_OBJ_INSERT 1	454	#define UP_OBJ_INSERT 1

Diff Legend

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

Comparing deliantra/server/include/object.h (file contents): Revision 1.46 by root, Sun Dec 3 01:06:37 2006 UTC vs. Revision 1.75 by root, Sat Dec 30 21:17:48 2006 UTC

Diff Legend

Comparing deliantra/server/include/object.h (file contents):
Revision 1.46 by root, Sun Dec 3 01:06:37 2006 UTC vs.
Revision 1.75 by root, Sat Dec 30 21:17:48 2006 UTC