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

Comparing deliantra/server/include/object.h (file contents):
Revision 1.67 by root, Sat Dec 23 15:49:40 2006 UTC vs.
Revision 1.203 by root, Sat Jun 27 08:35:03 2009 UTC

…		…
1	/*	1	/*
2	CrossFire, A Multiplayer game for X-windows	2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.
3		3	*
		4	* Copyright (©) 2005,2006,2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
4	Copyright (C) 2001 Mark Wedel & Crossfire Development Team	5	* Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team
5	Copyright (C) 1992 Frank Tore Johansen	6	* Copyright (©) 1992,2007 Frank Tore Johansen
6		7	*
7	This program is free software; you can redistribute it and/or modify	8	* Deliantra is free software: you can redistribute it and/or modify
8	it under the terms of the GNU General Public License as published by	9	* it under the terms of the GNU General Public License as published by
9	the Free Software Foundation; either version 2 of the License, or	10	* the Free Software Foundation, either version 3 of the License, or
10	(at your option) any later version.	11	* (at your option) any later version.
11		12	*
12	This program is distributed in the hope that it will be useful,	13	* This program is distributed in the hope that it will be useful,
13	but WITHOUT ANY WARRANTY; without even the implied warranty of	14	* but WITHOUT ANY WARRANTY; without even the implied warranty of
14	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15	GNU General Public License for more details.	16	* GNU General Public License for more details.
16		17	*
17	You should have received a copy of the GNU General Public License	18	* You should have received a copy of the GNU General Public License
18	along with this program; if not, write to the Free Software	19	* along with this program. If not, see <http://www.gnu.org/licenses/>.
19	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	20	*
20		21	* The authors can be reached via e-mail to <support@deliantra.net>
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		26
27	#include <bitset>	27	#include <bitset>
28		28
29	#include "cfperl.h"	29	#include "cfperl.h"
30	#include "shstr.h"	30	#include "shstr.h"
31		31
32	typedef uint32 tag_t;	32	typedef int tag_t;
33	#define NUM_BODY_LOCATIONS 12	33
34	#define BODY_ARMS 1	34	enum {
		35	body_skill,
		36	body_combat,
		37	body_range,
		38	body_shield,
		39	body_arm,
		40	body_torso,
		41	body_head,
		42	body_neck,
		43	body_finger,
		44	body_shoulder,
		45	body_foot,
		46	body_hand,
		47	body_wrist,
		48	body_waist,
		49	NUM_BODY_LOCATIONS
		50	};
		51
		52	enum slottype_t
		53	{
		54	slot_none,
		55	slot_combat,
		56	slot_ranged,
		57	};
35		58
36	/* See common/item.c */	59	/* See common/item.c */
37		60
38	typedef struct Body_Locations	61	typedef struct Body_Locations
39	{	62	{
40	const char save_name; / Name used to load/save it to disk */	63	keyword save_name; /* Name used to load/save it to disk */
41	const char use_name; / Name used when describing an item we can use */	64	const char use_name; / Name used when describing an item we can use */
42	const char nonuse_name; / Name to describe objects we can't use */	65	const char nonuse_name; / Name to describe objects we can't use */
43	} Body_Locations;	66	} Body_Locations;
44		67
45	extern Body_Locations body_locations[NUM_BODY_LOCATIONS];	68	extern Body_Locations body_locations[NUM_BODY_LOCATIONS];
		69
		70	#define NUM_COINS 4 /* number of coin types */
		71	extern const char *const coins[NUM_COINS + 1];
46		72
47	/*	73	/*
48	* Each object (this also means archetypes!) could have a few of these	74	* Each object (this also means archetypes!) could have a few of these
49	* "dangling" from it; this could also end up containing 'parse errors'.	75	* "dangling" from it; this could also end up containing 'parse errors'.
50	*	76	*
51	* key and value are shared-strings.	77	* key and value are shared-strings.
52	*	78	*
53	* Please use get_ob_key_value(), set_ob_key_value() from object.c rather than	79	* Please use kv_get/kv_set/kv_del from object rather than
54	* accessing the list directly.	80	* accessing the list directly.
55	* Exception is if you want to walk this list for some reason.	81	* Exception is if you want to walk this list for some reason.
56	*/	82	*/
57	struct key_value	83	struct key_value : slice_allocated
58	{	84	{
59	key_value *next;	85	key_value *next;
60	shstr key, value;	86	shstr key, value;
61	};	87	};
62		88
63	struct UUID	89	struct UUID
64	{	90	{
65	uint64 seq;	91	uint64 seq;
		92
		93	static UUID cur; // last uuid generated
		94	static void init ();
		95	static UUID gen ();
66		96
67	UUID () { }	97	UUID () { }
68	UUID (uint64 seq) : seq(seq) { }	98	UUID (uint64 seq) : seq(seq) { }
69	operator uint64() { return seq; }	99	operator uint64() { return seq; }
70	void operator =(uint64 seq) { this->seq = seq; }	100	void operator =(uint64 seq) { this->seq = seq; }
		101
		102	typedef char BUF [32];
		103
		104	bool parse (const char *s)
		105	{
		106	return sscanf (s, "<1.%" SCNx64 ">", &seq) == 1;
		107	}
		108
		109	const char c_str (char buf, int len) const
		110	{
		111	snprintf (buf, len, "<1.%" PRIx64 ">", seq);
		112
		113	return buf;
		114	}
		115
		116	const char *c_str () const
		117	{
		118	static BUF buf;
		119
		120	return c_str (buf, sizeof (buf));
		121	}
71	};	122	};
72
73	extern void init_uuid ();
74	extern UUID gen_uuid ();
75	extern const uint64 UUID_SKIP;
76		123
77	/* Definition for WILL_APPLY values. Replaces having harcoded values	124	/* Definition for WILL_APPLY values. Replaces having harcoded values
78	* sprinkled in the code. Note that some of these also replace fields	125	* sprinkled in the code. Note that some of these also replace fields
79	* that were in the can_apply area. What is the point of having both	126	* that were in the can_apply area. What is the point of having both
80	* can_apply and will_apply?	127	* can_apply and will_apply?
83	#define WILL_APPLY_TREASURE 0x02	130	#define WILL_APPLY_TREASURE 0x02
84	#define WILL_APPLY_EARTHWALL 0x04	131	#define WILL_APPLY_EARTHWALL 0x04
85	#define WILL_APPLY_DOOR 0x08	132	#define WILL_APPLY_DOOR 0x08
86	#define WILL_APPLY_FOOD 0x10	133	#define WILL_APPLY_FOOD 0x10
87		134
88	/* However, if you're keeping a pointer of some sort, you probably	135	struct body_slot
89	* don't just want it copied, so you'll need to add to common/object.C,	136	{
90	* e.g. ->copy_to ()	137	signed char info:4; /* body info as loaded from the file */
91	*/	138	signed char used:4; /* Calculated value based on items equipped */
		139	};
92		140
		141	typedef struct oblnk
		142	{ /* Used to link together several objects */
		143	object_ptr ob;
		144	struct oblnk *next;
		145	} objectlink;
		146
		147	typedef struct oblinkpt
		148	{ /* Used to link together several object links */
		149	struct oblnk *link;
		150	struct oblinkpt *next;
		151	shstr id; /* Used as connected value in buttons/gates */
		152	} oblinkpt;
		153
93	ACC_CLASS (object)	154	INTERFACE_CLASS (object)
94	// these are being copied	155	// these are being copied
95	struct object_copy	156	struct object_copy : attachable
96	{	157	{
97	typedef bitset<NUM_FLAGS> flags_t;	158	sint16 ACC (RW, x), ACC (RW, y); /* Position in the map for this object */
		159
		160	uint8 ACC (RW, type); /* PLAYER, BULLET, etc. See define.h */
		161	uint8 ACC (RW, subtype); /* subtype of object */
		162	sint8 ACC (RW, direction); /* Means the object is moving that way. */
		163	sint8 ACC (RW, facing); /* Object is oriented/facing that way. */
98		164
99	shstr ACC (RW, name); /* The name of the object, obviously... */	165	shstr ACC (RW, name); /* The name of the object, obviously... */
100	shstr ACC (RW, name_pl); /* The plural name of the object */	166	shstr ACC (RW, name_pl); /* The plural name of the object */
101	shstr ACC (RW, title); /* Of foo, etc */	167	shstr ACC (RW, title); /* Of foo, etc */
102	shstr ACC (RW, race); /* human, goblin, dragon, etc */	168	shstr ACC (RW, race); /* human, goblin, dragon, etc */
103	shstr ACC (RW, slaying); /* Which race to do double damage to */	169	shstr ACC (RW, slaying); /* Which race to do double damage to */
104	/* If this is an exit, this is the filename */	170	/* If this is an exit, this is the filename */
		171
		172	typedef bitset<NUM_FLAGS> flags_t;
		173	flags_t flag; /* various flags */
		174	#if FOR_PERL
		175	bool ACC (RW, flag[NUM_FLAGS]);
		176	#endif
		177
		178	shstr ACC (RW, materialname); /* specific material name */
105	shstr ACC (RW, skill); /* Name of the skill this object uses/grants */	179	shstr ACC (RW, skill); /* Name of the skill this object uses/grants */
106	shstr ACC (RW, msg); /* If this is a book/sign/magic mouth/etc */	180	// materialtype_t ACC (RW, material); / What material this object consists of */
107	shstr ACC (RW, lore); /* Obscure information about this object, */
108	/* To get put into books and the like. */
109	shstr ACC (RW, materialname); /* specific material name */
110	shstr ACC (RW, custom_name); /* Custom name assigned by player */
111	object_ptr ACC (RW, owner); /* Pointer to the object which controls this one */	181	object_ptr ACC (RW, owner); /* Pointer to the object which controls this one */
112	object_ptr ACC (RW, enemy); /* Monster/player to follow even if not closest */	182	object_ptr ACC (RW, enemy); /* Monster/player to follow even if not closest */
113	object_ptr ACC (RW, attacked_by); /* This object start to attack us! only player & monster */	183	object_ptr ACC (RW, attacked_by); /* This object start to attack us! only player & monster */
114	object_ptr ACC (RW, chosen_skill); /* the skill chosen to use */	184	object_ptr ACC (RW, chosen_skill); /* the skill chosen to use */
115	object_ptr ACC (RW, spellitem); /* Spell ability monster is choosing to use */	185	object_ptr ACC (RW, spellitem); /* Spell ability monster is choosing to use */
116	object_ptr ACC (RW, spell); /* Spell that was being cast */	186	object_ptr ACC (RW, spell); /* Spell that was being cast */
117	object_ptr ACC (RW, current_weapon); /* Pointer to the weapon currently used */	187	object_ptr ACC (RW, current_weapon); /* Pointer to the weapon currently used */
118	arch_ptr ACC (RW, arch); /* Pointer to archetype */	188	arch_ptr ACC (RW, arch); /* Pointer to archetype */
119	arch_ptr ACC (RW, other_arch);/* Pointer used for various things - mostly used for what */	189	arch_ptr ACC (RW, other_arch);/* Pointer used for various things - mostly used for what */
120		190
121	New_Face ACC (RW, face); / Face with colors */
122	sint16 ACC (RW, x), ACC (RW, y); /* Position in the map for this object */
123	float ACC (RW, speed); /* The overall speed of this object */	191	float ACC (RW, speed); /* The overall speed of this object */
124	float ACC (RW, speed_left); /* How much speed is left to spend this round */	192	float ACC (RW, speed_left); /* How much speed is left to spend this round */
		193
125	uint32 ACC (RW, nrof); /* How many of the objects */	194	sint32 ACC (RW, nrof); /* How many of the objects */
126	sint8 ACC (RW, direction); /* Means the object is moving that way. */
127	sint8 ACC (RW, facing); /* Object is oriented/facing that way. */
128
129	/* This next big block are basically used for monsters and equipment */	195	/* This next big block is basically used for monsters and equipment */
130	uint8 ACC (RW, type); /* PLAYER, BULLET, etc. See define.h */
131	uint8 ACC (RW, subtype); /* subtype of object */
132	uint16 ACC (RW, client_type); /* Public type information. see doc/Developers/objects */	196	uint16 ACC (RW, client_type); /* Public type information. see doc/Developers/objects */
133	sint16 ACC (RW, resist[NROFATTACKS]); /* Resistance adjustments for attacks */	197	sint16 ACC (RW, resist[NROFATTACKS]); /* Resistance adjustments for attacks */
		198
134	uint32 ACC (RW, attacktype); /* Bitmask of attacks this object does */	199	uint32 ACC (RW, attacktype); /* Bitmask of attacks this object does */
135	uint32 ACC (RW, path_attuned);/* Paths the object is attuned to */	200	uint32 ACC (RW, path_attuned);/* Paths the object is attuned to */
136	uint32 ACC (RW, path_repelled); /* Paths the object is repelled from */	201	uint32 ACC (RW, path_repelled); /* Paths the object is repelled from */
137	uint32 ACC (RW, path_denied); /* Paths the object is denied access to */	202	uint32 ACC (RW, path_denied); /* Paths the object is denied access to */
138	uint16 ACC (RW, material); /* What materials this object consist of */	203
		204	uint16 ACC (RW, materials); /* What materials this object consists of */
139	sint8 ACC (RW, magic); /* Any magical bonuses to this item */	205	sint8 ACC (RW, magic); /* Any magical bonuses to this item */
140	uint8 ACC (RW, state); /* How the object was last drawn (animation) */	206	uint8 ACC (RW, state); /* How the object was last drawn (animation) */
141	sint32 ACC (RW, value); /* How much money it is worth (or contains) */	207	sint32 ACC (RW, value); /* How much money it is worth (or contains) */
		208
142	/* Note that the last_.. values are sometimes used for non obvious	209	/* Note that the last_.. values are sometimes used for non obvious
143	* meanings by some objects, eg, sp penalty, permanent exp.	210	* meanings by some objects, eg, sp penalty, permanent exp.
144	*/	211	*/
145	sint32 ACC (RW, last_heal); /* Last healed. Depends on constitution */	212	sint16 ACC (RW, last_heal); /* Last healed. Depends on constitution */
146	sint32 ACC (RW, last_sp); /* As last_heal, but for spell points */	213	sint16 ACC (RW, last_sp); /* As last_heal, but for spell points */
147	sint16 ACC (RW, last_grace); /* as last_sp, except for grace */	214	sint16 ACC (RW, last_grace); /* as last_sp, except for grace */
148	sint16 ACC (RW, last_eat); /* How long since we last ate */	215	sint16 ACC (RW, last_eat); /* How long since we last ate */
		216
149	sint16 ACC (RW, invisible); /* How much longer the object will be invis */	217	sint16 ACC (RW, invisible); /* How much longer the object will be invis */
150	sint16 ACC (RW, level); /* Level of creature or object */	218	sint16 ACC (RW, level); /* Level of creature or object */
		219
151	uint8 ACC (RW, pick_up); /* See crossfire.doc */	220	uint8 ACC (RW, pick_up); /* See crossfire.doc */
152	sint8 ACC (RW, item_power); /* power rating of the object */
153	sint8 ACC (RW, gen_sp_armour);/* sp regen penalty this object has (was last_heal) */	221	sint8 ACC (RW, gen_sp_armour);/* sp regen penalty this object has (was last_heal) */
154	sint8 ACC (RW, glow_radius); /* indicates the glow radius of the object */	222	sint8 ACC (RW, glow_radius); /* indicates the glow radius of the object */
		223	uint8 ACC (RW, weapontype); /* type of weapon */
		224
		225	faceidx ACC (RW, face); /* the graphical face */
		226
		227	faceidx ACC (RW, sound); /* the sound face */
		228	faceidx ACC (RW, sound_destroy); /* played on destroy */
		229
		230	body_slot slot [NUM_BODY_LOCATIONS];
		231
155	sint32 ACC (RW, weight); /* Attributes of the object */	232	sint32 ACC (RW, weight); /* Attributes of the object */
156	sint32 ACC (RW, weight_limit);/* Weight-limit of object */	233	sint32 ACC (RW, weight_limit);/* Weight-limit of object */
		234
157	sint32 ACC (RW, carrying); /* How much weight this object contains */	235	sint32 ACC (RW, carrying); /* How much weight this object contains, must be 0 if nrof == 0 */
		236
158	sint64 ACC (RW, perm_exp); /* Permanent exp */	237	sint64 ACC (RW, perm_exp); /* Permanent exp */
159	uint32 ACC (RW, weapontype); /* type of weapon */
160	uint32 ACC (RW, tooltype); /* type of tool or build facility */
161	sint8 ACC (RW, body_info[NUM_BODY_LOCATIONS]); /* body info as loaded from the file */
162	sint8 ACC (RW, body_used[NUM_BODY_LOCATIONS]); /* Calculated value based on items equipped */
163	living ACC (RO, stats); /* Str, Con, Dex, etc */	238	living ACC (RO, stats); /* Str, Con, Dex, etc */
164	/* See the doc/Developers/objects for more info about body locations */	239	/* See the pod/objects.pod for more info about body locations */
165		240
166	/* Following mostly refers to fields only used for monsters */	241	/* Following mostly refers to fields only used for monsters */
167	uint32 ACC (RW, hide); /* The object is hidden, not invisible */
168	/* changes made by kholland@sunlab.cit.cornell.edu */
169	/* allows different movement patterns for attackers */
170	sint32 ACC (RW, move_status); /* What stage in attack mode */
171	uint16 ACC (RW, attack_movement); /* What kind of attack movement */
172	uint16 ACC (RW, run_away); /* Monster runs away if it's hp goes below this percentage. */
173	float ACC (RW, expmul); /* needed experience = (calc_expexpmul) - means some /
174	/* races/classes can need less/more exp to gain levels */
175		242
176	/* Spell related information, may be useful elsewhere	243	/* Spell related information, may be useful elsewhere
177	* Note that other fields are used - these files are basically	244	* Note that other fields are used - these files are basically
178	* only used in spells.	245	* only used in spells.
179	*/	246	*/
180	sint16 ACC (RW, duration); /* How long the spell lasts */	247	sint16 ACC (RW, duration); /* How long the spell lasts */
181	sint16 ACC (RW, casting_time);/* time left before spell goes off */	248	uint8 ACC (RW, casting_time); /* time left before spell goes off */
182	uint16 ACC (RW, start_holding);
183	uint8 ACC (RW, duration_modifier); /* how level modifies duration */	249	uint8 ACC (RW, duration_modifier); /* how level modifies duration */
		250
184	uint8 ACC (RW, dam_modifier); /* How going up in level effects damage */	251	uint8 ACC (RW, dam_modifier); /* How going up in level effects damage */
185	sint8 ACC (RW, range); /* Range of the spell */	252	sint8 ACC (RW, range); /* Range of the spell */
186	uint8 ACC (RW, range_modifier); /* How going up in level effects range */	253	uint8 ACC (RW, range_modifier); /* How going up in level effects range */
187	char *ACC (RW, spellarg);	254	sint8 ACC (RW, item_power); /* power rating of the object */
		255
		256	uint8 ACC (RW, run_away); /* Monster runs away if it's hp goes below this percentage. */
		257	MoveType ACC (RW, move_type); /* Type of movement this object uses */
		258	MoveType ACC (RW, move_block);/* What movement types this blocks */
		259	MoveType ACC (RW, move_allow);/* What movement types explicitly allowd */
		260
		261	MoveType ACC (RW, move_on); /* Move types affected moving on to this space */
		262	MoveType ACC (RW, move_off); /* Move types affected moving off this space */
		263	MoveType ACC (RW, move_slow); /* Movement types this slows down */
		264
		265	// 8 free bits
		266
		267	//float ACC (RW, expmul) = 1.0; /* needed experience = (calc_expexpmul) - means some /
		268	// /* races/classes can need less/more exp to gain levels */
		269	static const float expmul = 1.0;//D
		270	float ACC (RW, move_slow_penalty); /* How much this slows down the object */
188		271
189	/* Following are values used by any object */	272	/* Following are values used by any object */
190	/* this objects turns into or what this object creates */	273	/* this objects turns into or what this object creates */
191	treasurelist ACC (RW, randomitems); / Items to be generated */	274	treasurelist ACC (RW, randomitems); / Items to be generated */
192	key_value key_values; / Fields not explictly known by the loader. */	275
193	flags_t flag; /* various flags */
194	#if FOR_PERL
195	bool ACC (RW, flag[NUM_FLAGS]);
196	#endif
197	uint16 ACC (RW, animation_id);/* An index into the animation array */
198	uint8 ACC (RW, anim_speed); /* ticks between animation-frames */
199	uint8 ACC (RW, last_anim); /* last sequence used to draw face */	276	uint8 ACC (RW, last_anim); /* last sequence used to draw face */
200	sint32 ACC (RW, elevation); /* elevation of this terrain - not currently used */
201	uint8 ACC (RW, smoothlevel); /* how to smooth this square around */	277	uint8 ACC (RW, smoothlevel); /* how to smooth this square around */
202	uint8 ACC (RW, will_apply); /* See crossfire.doc */	278	uint8 ACC (RW, will_apply); /* See crossfire.doc */
		279	uint8 ACC (RW, anim_speed); /* ticks between animation-frames */
		280	uint16 ACC (RW, animation_id);/* An index into the animation array */
		281	uint16 ACC (RW, cached_grace);/* cached grace points used for a spell, used by esrv_update_spells */
203		282
204	MoveType ACC (RW, move_type); /* Type of movement this object uses */	283	uint16 ACC (RW, cached_eat); /* cached food, used by esrv_update_spells */
205	MoveType ACC (RW, move_block);/* What movement types this blocks */	284	uint16 ACC (RW, cached_sp); /* cached spell points used for a spell, used by esrv_update_spells */
206	MoveType ACC (RW, move_allow);/* What movement types explicitly allowd */	285	/* allows different movement patterns for attackers */
207	MoveType ACC (RW, move_on); /* Move types affected moving on to this space */	286	uint8 ACC (RW, move_status); /* What stage in attack mode */
208	MoveType ACC (RW, move_off); /* Move types affected moving off this space */	287	uint8 ACC (RW, attack_movement);/* What kind of attack movement */
209	MoveType ACC (RW, move_slow); /* Movement types this slows down */	288
210	float ACC (RW, move_slow_penalty); /* How much this slows down the object */	289	//16+ free bits
		290
		291	// rarely-accessed members should be at the end
		292	shstr ACC (RW, tag); // a tag used to tracking this object
		293	shstr ACC (RW, msg); /* If this is a book/sign/magic mouth/etc */
		294	shstr ACC (RW, lore); /* Obscure information about this object, */
		295	/* To get put into books and the like. */
		296	shstr ACC (RW, custom_name); /* Custom name assigned by player */
211	};	297	};
212		298
213	struct object : zero_initialised, refcounted, attachable<object>, object_copy	299	const char query_weight (const object op);
214	{	300	const char query_short_name (const object op);
215	typedef unordered_vector<object *> vector;	301	const char query_name (const object op);
		302	const char query_base_name (const object op, int plural);
216		303
		304	struct object : zero_initialised, object_copy
		305	{
217	// These variables are not changed by ->copy_to	306	// These variables are not changed by ->copy_to
		307	maptile ACC (RW, map); / Pointer to the map in which this object is present */
218		308
219	tag_t ACC (RW, count); /* Generation count for this object */
220	UUID ACC (RW, uuid); // Unique Identifier, survives saves etc.	309	UUID ACC (RW, uuid); // Unique Identifier, survives saves etc.
		310	int ACC (RO, count);
		311	object_vector_index ACC (RO, index); // index into objects
		312	object_vector_index ACC (RO, active); // index into actives
221		313
222	player_ptr ACC (RW, contr); /* Pointer to the player which control this object */	314	player_ptr ACC (RW, contr); /* Pointer to the player which control this object, ALWAYS set iff type == PLAYER */
223	object ACC (RW, next); / Pointer to the next object in the free/used list */	315
224	object ACC (RW, prev); / Pointer to the previous object in the free/used list */
225	object ACC (RW, active_next);/ Next & previous object in the 'active' */
226	object ACC (RW, active_prev);/ List. This is used in process_events */
227	/* so that the entire object list does not */
228	/* need to be gone through. */
229	object ACC (RW, below); / Pointer to the object stacked below this one */	316	object ACC (RW, below); / Pointer to the object stacked below this one */
230	object ACC (RW, above); / Pointer to the object stacked above this one */	317	object ACC (RW, above); / Pointer to the object stacked above this one */
231	/* Note: stacked in the same environment */	318	/* Note: stacked in the same environment */
232	object inv; / Pointer to the first object in the inventory */	319	object inv; / Pointer to the first object in the inventory */
		320
		321	//TODO: container must move into client
233	object ACC (RW, container); / Current container being used. I think this	322	object_ptr ACC (RW, container); /* Current container being used. I think this
234	* is only used by the player right now.	323	* is only used by the player right now.
235	*/	324	*/
236	object ACC (RW, env); / Pointer to the object which is the environment.	325	object ACC (RW, env); / Pointer to the object which is the environment.
237	* This is typically the container that the object is in.	326	* This is typically the container that the object is in.
238	*/	327	*/
239	object ACC (RW, more); / Pointer to the rest of a large body of objects */	328	object ACC (RW, more); / Pointer to the rest of a large body of objects */
240	object head; / Points to the main object of a large body */ // NO ACC, perl semantics are different	329	object head; / Points to the main object of a large body */ // NO ACC, perl semantics are different
241	maptile ACC (RW, map); / Pointer to the map in which this object is present */
242	client_container *seen_by; // seen by which player/container currently?	330	client_container *seen_by; // seen by which player/container currently?
		331	key_value key_values; / Fields not explictly known by the loader. */
243		332
244	static vector mortals;	333	// privates / perl
245	static vector active; // active objects, not yet used	334	shstr_tmp kv_get (shstr_tmp key) const;
246	static vector objects; // not used yet, use first->next->...	335	void kv_del (shstr_tmp key);
247	static object *first; // will be replaced by "objects"	336	void kv_set (shstr_tmp key, shstr_tmp value);
248		337
		338	// custom extra fields management
		339	struct key_value_access_proxy
		340	{
		341	object &ob;
		342	shstr_tmp key;
		343
		344	key_value_access_proxy (object &ob, shstr_tmp key)
		345	: ob (ob), key (key)
		346	{
		347	}
		348
		349	const key_value_access_proxy &operator =(shstr_tmp value) const
		350	{
		351	ob.kv_set (key, value);
		352	return *this;
		353	}
		354
		355	operator const shstr_tmp () const { return ob.kv_get (key); }
		356	operator const char *() const { return ob.kv_get (key); }
		357
		358	private:
		359	void operator =(int);
		360	};
		361
		362	// operator [] is too annoying to use
		363	const key_value_access_proxy kv (shstr_tmp key)
		364	{
		365	return key_value_access_proxy (*this, key);
		366	}
		367
		368	bool parse_kv (object_thawer &f); // parse kv pairs, (ab-)used by archetypes, which should not exist at all
		369	MTH void post_load_check (); // do some adjustments after parsing
		370	static object read (object_thawer &f, maptile map = 0); // map argument due to toal design bogosity, must go.
		371	bool write (object_freezer &f);
		372
		373	MTH int slottype () const;
249	static object *create ();	374	MTH static object *create ();
		375	const mapxy &operator =(const mapxy &pos);
250	void copy_to (object *dst);	376	MTH void copy_to (object *dst);
251	object *clone (); // create + copy_to	377	MTH object *clone (); // create + copy_to a single object
252	void destroy (bool destroy_inventory = false);	378	MTH object *deep_clone (); // copy whole more chain and inventory
253	void remove ();	379	void do_destroy ();
		380	void gather_callbacks (AV *&callbacks, event_type event) const;
		381	MTH void destroy ();
		382	MTH void drop_and_destroy ()
		383	{
		384	destroy_inv (true);
		385	destroy ();
		386	}
		387
		388	// recursively destroy all objects in inventory, optionally dropping them to the ground instead
		389	MTH void destroy_inv (bool drop_to_ground = false);
254	object insert (object item); // insert into inventory	390	MTH object insert (object item); // insert into inventory
		391	MTH void play_sound (faceidx sound) const;
		392	MTH void say_msg (const char *msg) const;
255		393
256	static void free_mortals ();	394	void do_remove ();
		395	MTH void remove ()
		396	{
		397	if (!flag [FLAG_REMOVED])
		398	do_remove ();
		399	}
		400
		401	MTH bool blocked (maptile *m, int x, int y) const;
		402
		403	void move_to (const mapxy &pos)
		404	{
		405	remove ();
		406	*this = pos;
		407	insert_at (this, this);
		408	}
		409
		410	// high-level move functions, return true if successful
		411	int move (int dir, object *originator);
		412
		413	int move (int dir)
		414	{
		415	return move (dir, this);
		416	}
		417
257	static bool can_merge_slow (object op1, object op2);	418	static bool can_merge_slow (object op1, object op2);
258		419
259	// this is often used in time-critical code, so optimise	420	// this is often used in time-critical code, so optimise
260	static bool can_merge (object op1, object op2)	421	MTH static bool can_merge (object op1, object op2)
261	{	422	{
262	return op1->value == op2->value	423	return op1->value == op2->value
263	&& op1->name == op2->name	424	&& op1->name == op2->name
264	&& can_merge_slow (op1, op2);	425	&& can_merge_slow (op1, op2);
265	}	426	}
266		427
267	bool destroyed () { return QUERY_FLAG (this, FLAG_FREED); }
268
269	void set_owner (object *owner);	428	MTH void set_owner (object *owner);
		429	MTH void set_speed (float speed);
		430	MTH void set_glow_radius (sint8 rad);
		431	MTH bool change_weapon (object *ob);
		432	MTH bool change_skill (object *ob);
270		433
		434	MTH void open_container (object *new_container);
		435	MTH void close_container ()
		436	{
		437	open_container (0);
		438	}
		439
		440	MTH object *force_find (shstr_tmp name);
		441	MTH object *force_add (shstr_tmp name, int duration = 0);
		442
		443	oblinkpt *find_link () const;
		444	MTH void add_link (maptile *map, shstr_tmp id);
		445	MTH void remove_link ();
		446
		447	// overwrite the attachable should_invoke function with a version that also checks ev_want_type
		448	bool should_invoke (event_type event)
		449	{
		450	return ev_want_event [event] \|\| ev_want_type [type] \|\| cb;
		451	}
		452
271	void instantiate ()	453	MTH void instantiate ();
272	{
273	if (!uuid.seq) // HACK
274	uuid = gen_uuid ();
275
276	attachable<object>::instantiate ();
277	}
278		454
279	// recalculate all stats	455	// recalculate all stats
280	void update_stats ();	456	MTH void update_stats ();
281	void roll_stats ();	457	MTH void roll_stats ();
282	void swap_stats (int a, int b);	458	MTH void swap_stats (int a, int b);
283	void add_statbonus ();	459	MTH void add_statbonus ();
284	void remove_statbonus ();	460	MTH void remove_statbonus ();
285	void drain_stat ();	461	MTH void drain_stat ();
286	void drain_specific_stat (int deplete_stats);	462	MTH void drain_specific_stat (int deplete_stats);
287	void change_luck (int value);	463	MTH void change_luck (int value);
288		464
289	// info must hold 256 * 3 bytes currently	465	// info must hold 256 * 3 bytes currently
290	const char debug_desc (char info) const;	466	const char debug_desc (char info) const;
291	const char *debug_desc () const;	467	MTH const char *debug_desc () const; // uses at least 3 round-robin buffers
		468	const char flag_desc (char desc, int len) const;
292		469
		470	MTH bool decrease (sint32 nr = 1); // returns true if anything is left
		471	MTH object *split (sint32 nr = 1); // return 0 on failure
		472
		473	MTH int number_of () const
		474	{
		475	return nrof ? nrof : 1;
		476	}
		477
		478	MTH sint32 total_weight () const
		479	{
		480	return (weight + carrying) * number_of ();
		481	}
		482
		483	MTH void update_weight ();
		484
		485	// return the dominant material of this item, always return something
		486	const materialtype_t *dominant_material () const;
		487
		488	// return the volume of this object in cm³
		489	MTH uint64 volume () const
		490	{
		491	return (uint64)total_weight ()
		492	* 1000
		493	* (type == CONTAINER ? 1000 : 1)
		494	/ dominant_material ()->density;
		495	}
		496
		497	MTH bool is_wiz () const { return flag [FLAG_WIZ]; }
293	bool is_weapon () const { return type == ARROW \|\| type == BOW \|\| type == WEAPON; }	498	MTH bool is_weapon () const { return type == ARROW \|\| type == BOW \|\| type == WEAPON; }
294	bool is_armor () const { return type == ARMOUR \|\| type == SHIELD \|\| type == HELMET	499	MTH bool is_armor () const { return type == ARMOUR \|\| type == SHIELD \|\| type == HELMET
295	\|\| type == CLOAK \|\| type == BOOTS \|\| type == GLOVES	500	\|\| type == CLOAK \|\| type == BOOTS \|\| type == GLOVES
296	\|\| type == BRACERS \|\| type == GIRDLE; }	501	\|\| type == BRACERS \|\| type == GIRDLE; }
297	bool is_alive () const { return (type == PLAYER	502	MTH bool is_alive () const { return (type == PLAYER
298	\|\| flag [FLAG_MONSTER]	503	\|\| flag [FLAG_MONSTER]
299	\|\| (flag [FLAG_ALIVE] && !flag [FLAG_GENERATOR] && type != DOOR))	504	\|\| (flag [FLAG_ALIVE] && !flag [FLAG_GENERATOR] && type != DOOR))
300	&& !flag [FLAG_IS_A_TEMPLATE]; }	505	&& !flag [FLAG_IS_A_TEMPLATE]; }
301	bool is_arrow () const { return type == ARROW	506	MTH bool is_arrow () const { return type == ARROW
302	\|\| (type == SPELL_EFFECT	507	\|\| (type == SPELL_EFFECT
303	&& (subtype == SP_BULLET \|\| subtype == SP_MAGIC_MISSILE)); }	508	&& (subtype == SP_BULLET \|\| subtype == SP_MAGIC_MISSILE)); }
		509	MTH bool is_range () const { return type == BOW \|\| type == ROD \|\| type == WAND \|\| type == HORN; }
		510
		511	MTH bool has_active_speed () const { return FABS(speed) >= MIN_ACTIVE_SPEED; }
		512
		513	// temporary: wether the object can be saved in a map file
		514	// contr => is a player
		515	// head => only save head of a multitile object
		516	// owner => can not reference owner yet
		517	MTH bool can_map_save () const { return !head && (!owner \|\| owner->contr) && !contr && !flag [FLAG_NO_MAP_SAVE]; }
304		518
305	/* This return true if object has still randomitems which	519	/* This return true if object has still randomitems which
306	* could be expanded.	520	* could be expanded.
307	*/	521	*/
308	bool has_random_items () const { return randomitems && !flag [FLAG_IS_A_TEMPLATE]; }	522	MTH bool has_random_items () const { return randomitems && !flag [FLAG_IS_A_TEMPLATE]; }
		523
		524	MTH bool has_dialogue () const { return *&msg == '@'; }
		525
		526	// returns the outermost owner, never returns 0
		527	MTH object *outer_owner ()
		528	{
		529	object *op;
		530
		531	for (op = this; op->owner; op = op->owner)
		532	;
		533
		534	return op;
		535	}
		536
		537	// returns the outermost environment, never returns 0
		538	MTH object *outer_env () const
		539	{
		540	const object *op;
		541
		542	for (op = this; op->env; op = op->env)
		543	;
		544
		545	return const_cast<object *>(op);
		546	}
309		547
310	// returns the player that has this object in his inventory, or 0	548	// returns the player that has this object in his inventory, or 0
		549	// we assume the player is always the outer env
311	object *in_player () const	550	MTH object *in_player () const
312	{	551	{
313	for (object *op = env; op; op = op->env)	552	object *op = outer_env ();
314	if (op->type == PLAYER)
315	return op;
316		553
		554	return op->type == PLAYER ? op : 0;
		555	}
		556
		557	// "temporary" helper function
		558	MTH object *head_ () const
		559	{
		560	return head ? head : const_cast<object *>(this);
		561	}
		562
		563	MTH bool is_head () const
		564	{
		565	return head_ () == this;
		566	}
		567
		568	MTH bool is_on_map () const
		569	{
		570	return !env && !flag [FLAG_REMOVED];
		571	}
		572
		573	MTH bool is_inserted () const
		574	{
		575	return !flag [FLAG_REMOVED];
		576	}
		577
		578	MTH bool is_player () const
		579	{
317	return 0;	580	return !!contr;
318	}	581	}
		582
		583	MTH bool affects_los () const
		584	{
		585	return glow_radius \|\| flag [FLAG_BLOCKSVIEW];
		586	}
		587
		588	MTH bool has_carried_lights () const
		589	{
		590	return glow_radius;
		591	}
		592
		593	// returns the player that cna see this object, if any
		594	MTH object *visible_to () const;
		595
		596	MTH std::string long_desc (object *who = 0);
		597	MTH std::string describe_monster (object *who = 0);
		598	MTH std::string describe_item (object *who = 0);
		599	MTH std::string describe (object *who = 0);
		600
		601	MTH const char *query_weight () { return ::query_weight (this); }
		602	MTH const char *query_name () { return ::query_name (this); }
		603	MTH const char *query_short_name () { return ::query_short_name (this); }
		604	MTH const char *query_base_name (bool plural) { return ::query_base_name (this, plural); }
		605
		606	// If this object has no extra parts but should have them,
		607	// add them, effectively expanding heads into multipart
		608	// objects. This method only works on objects not inserted
		609	// anywhere.
		610	MTH void expand_tail ();
		611
		612	MTH void create_treasure (treasurelist *tl, int flags = 0);
		613
		614	// insert object at same map position as 'where'
		615	// handles both inventory and map "positions"
		616	MTH object insert_at (object where, object *originator = 0, int flags = 0);
		617	MTH void drop_unpaid_items ();
		618
		619	MTH void activate ();
		620	MTH void deactivate ();
		621	MTH void activate_recursive ();
		622	MTH void deactivate_recursive ();
		623
		624	// set the given flag on all objects in the inventory recursively
		625	MTH void set_flag_inv (int flag, int value = 1);
		626
		627	void enter_exit (object *exit);//Perl
		628	MTH void enter_map (maptile *newmap, int x, int y);
		629	void player_goto (const char *path, int x, int y); // only for players
319		630
320	// returns the mapspace this object is in	631	// returns the mapspace this object is in
321	mapspace &ms () const;	632	mapspace &ms () const;
322		633
323	// fully recursive iterator	634	// fully recursive iterator
…		…
333	operator object *() const { return item; }	644	operator object *() const { return item; }
334		645
335	object *operator ->() const { return item; }	646	object *operator ->() const { return item; }
336	object &operator * () const { return *item; }	647	object &operator * () const { return *item; }
337	};	648	};
		649
		650	MTH unsigned int random_seed () const
		651	{
		652	return (unsigned int)uuid.seq;
		653	}
338		654
339	// depth-first recursive iterator	655	// depth-first recursive iterator
340	struct depth_iterator : iterator_base	656	struct depth_iterator : iterator_base
341	{	657	{
342	depth_iterator (object *container);	658	depth_iterator (object *container);
…		…
353	object *end ()	669	object *end ()
354	{	670	{
355	return this;	671	return this;
356	}	672	}
357		673
		674	/* This returns TRUE if the object is something that
		675	* a client might want to know about.
		676	*/
		677	MTH bool client_visible () const
		678	{
		679	return !invisible && type != PLAYER;
		680	}
		681
		682	// the client does nrof * this weight
		683	MTH sint32 client_weight () const
		684	{
		685	return weight + carrying;
		686	}
		687
		688	MTH struct region *region () const;
		689
		690	void statusmsg (const char *msg, int color = NDI_BLACK);
		691	void failmsg (const char *msg, int color = NDI_RED);
		692
		693	const char query_inventory (object who = 0, const char *indent = "");
		694
		695	MTH const_octet_string ref () const; // creates and returns a consistent persistent object reference
		696	static object *deref (const_octet_string ref); // returns the object from the generated refreence, if possible
		697
		698	// make some noise with given item into direction dir,
		699	// currently only used for players to make them temporarily visible
		700	// when they are invisible.
		701	MTH void make_noise ();
		702
		703	/* animation */
		704	bool has_anim () { return animation_id; }
		705	const animation &anim () const { return animations [animation_id]; }
		706	faceidx get_anim_frame (int frame) const { return anim ().faces [frame]; }
		707	void set_anim_frame (int frame) { face = get_anim_frame (frame); }
		708	/* anim_frames () returns the number of animations allocated. The last
		709	* usuable animation will be anim_frames () - 1 (for example, if an object
		710	* has 8 animations, anim_frames () will return 8, but the values will
		711	* range from 0 through 7.
		712	*/
		713	int anim_frames () const { return anim ().num_animations; }
		714	int anim_facings () const { return anim ().facings; }
		715
358	protected:	716	protected:
359	friend struct archetype;
360
361	void link ();	717	void link ();
362	void unlink ();	718	void unlink ();
363		719
364	object ();	720	object ();
365	~object ();	721	~object ();
		722
		723	private:
		724	object &operator =(const object &);
		725	object (const object &);
366	};	726	};
367		727
368	typedef struct oblnk	728	// move this object to the top of its env's inventory to speed up
369	{ /* Used to link together several objects */	729	// searches for it.
370	object_ptr ob;	730	static object *
371	struct oblnk *next;	731	splay (object *ob)
372	} objectlink;	732	{
		733	if (ob->env && ob->env->inv != ob)
		734	{
		735	if (ob->above) ob->above->below = ob->below;
		736	if (ob->below) ob->below->above = ob->above;
373		737
374	typedef struct oblinkpt	738	ob->above = 0;
375	{ /* Used to link together several object links */	739	ob->below = ob->env->inv;
376	struct oblnk *link;	740	ob->below->above = ob;
377	long value; /* Used as connected value in buttons/gates */	741	ob->env->inv = ob;
378	struct oblinkpt *next;	742	}
379	} oblinkpt;	743
		744	return ob;
		745	}
		746
		747	object find_skill_by_name_fuzzy (object who, const char *name);
		748	object find_skill_by_name (object who, shstr_cmp sh);
		749	object find_skill_by_number (object who, int skillno);
380		750
381	/*	751	/*
382	* The archetype structure is a set of rules on how to generate and manipulate	752	* The archetype structure is a set of rules on how to generate and manipulate
383	* objects which point to archetypes.	753	* objects which point to archetypes.
384	* This probably belongs in arch.h, but there really doesn't appear to	754	* This probably belongs in arch.h, but there really doesn't appear to
385	* be much left in the archetype - all it really is is a holder for the	755	* be much left in the archetype - all it really is is a holder for the
386	* object and pointers. This structure should get removed, and just replaced	756	* object and pointers. This structure should get removed, and just replaced
387	* by the object structure	757	* by the object structure
388	*/	758	*/
389		759
390	ACC_CLASS (archetype)	760	INTERFACE_CLASS (archetype)
391	struct archetype : zero_initialised, refcounted	761	struct archetype : object
392	{	762	{
393	archetype ();	763	static arch_ptr empty; // the empty_archetype
		764	MTH static void gc ();
		765
		766	archetype (const char *name);
394	~archetype ();	767	~archetype ();
		768	void gather_callbacks (AV *&callbacks, event_type event) const;
395		769
396	static archetype find (const char arch);	770	MTH static archetype *find (const_utf8_string name);
397		771
398	void hash_add (); // add to hastable	772	MTH void link ();
399	void hash_del (); // remove from hashtable	773	MTH void unlink ();
400		774
		775	MTH static object get (const char name); // (find() \|\| singularity)->instance()
		776	MTH object *instance ();
		777
		778	object_vector_index ACC (RW, archid); // index in archvector
401	shstr ACC (RW, name); /* More definite name, like "generate_kobold" */	779	shstr ACC (RW, archname); /* More definite name, like "generate_kobold" */
402	struct archetype ACC (RW, next); / Next archetype in a linked list */	780
403	struct archetype ACC (RW, head); / The main part of a linked object */	781	sint8 ACC (RW, min_x), ACC (RW, min_y); /* extents, compared to the head (min_x, min_y should be zero, but aren't...) */
404	struct archetype ACC (RW, more); / Next part of a linked object */	782	sint8 ACC (RW, max_x), ACC (RW, max_y);
405	object ACC (RO, clone); /* An object from which to do ->copy_to () */	783
406	uint32 ACC (RW, editable); /* editable flags (mainly for editor) */	784	// support for archetype loading
407	sint8 ACC (RW, tail_x), ACC (RW, tail_y); /* Where the lower right most portion of the object is	785	static archetype *read (object_thawer &f);
408	* in comparison to the head.	786	MTH static void commit_load (); // commit any objects loaded, resolves cyclic dependencies and more
409	*/	787	static void postpone_arch_ref (arch_ptr &ref, const_utf8_string other_arch); /* postpone other_arch reference */
410	};	788	};
411		789
		790	// compatbiility, remove once replaced by ->instance
		791	inline object *
		792	arch_to_object (archetype *at)
		793	{
		794	return at->instance ();
		795	}
		796
		797	inline void
		798	object_freezer::put (keyword k, archetype *v)
		799	{
		800	put (k, v ? &v->archname : (const char *)0);
		801	}
		802
		803	typedef object_vector<object, &object::index > objectvec;
		804	typedef object_vector<object, &object::active> activevec;
		805	typedef object_vector<archetype, &archetype::archid> archvec;
		806
412	extern object *objects;	807	extern objectvec objects;
413	extern object *active_objects;	808	extern activevec actives;
		809	extern archvec archetypes;
414		810
415	extern int nrofallocobjects;	811	// "safely" iterate over inv in a way such that the current item is removable
		812	// quite horrible, that's why its hidden in some macro
		813	#define for_inv_removable(op,var) \
		814	for (object var, next_ = (op)->inv; (var = next_), var && (next_ = var->below), var; )
416		815
417	/* This returns TRUE if the object is something that	816	#define for_all_objects(var) \
418	* should be displayed in the look window	817	for (unsigned _i = 0; _i < objects.size (); ++_i) \
419	*/	818	statementvar (object *, var, objects [_i])
420	#define LOOK_OBJ(ob) (!ob->invisible && ob->type != PLAYER && ob->type != EVENT_CONNECTOR)	819
		820	#define for_all_actives(var) \
		821	for (unsigned _i = 0; _i < actives.size (); ++_i) \
		822	statementvar (object *, var, actives [_i])
		823
		824	#define for_all_archetypes(var) \
		825	for (unsigned _i = 0; _i < archetypes.size (); ++_i) \
		826	statementvar (archetype *, var, archetypes [_i])
421		827
422	/* Used by update_object to know if the object being passed is	828	/* Used by update_object to know if the object being passed is
423	* being added or removed.	829	* being added or removed.
424	*/	830	*/
425	#define UP_OBJ_INSERT 1	831	#define UP_OBJ_INSERT 1
…		…
442	* INS_BELOW_ORIGINATOR: Insert new object immediately below originator -	848	* INS_BELOW_ORIGINATOR: Insert new object immediately below originator -
443	* Use for treasure chests so the new object is the highest thing	849	* Use for treasure chests so the new object is the highest thing
444	* beneath the player, but not actually above it. Note - the	850	* beneath the player, but not actually above it. Note - the
445	* map and x,y coordinates for the object to be inserted must	851	* map and x,y coordinates for the object to be inserted must
446	* match the originator.	852	* match the originator.
447	* INS_MAP_LOAD: disable lots of checkings done at insertion to
448	* speed up map loading process, as we assume the ordering in
449	* loaded map is correct.
450	*	853	*
451	* Note that INS_BELOW_ORIGINATOR, INS_ON_TOP, INS_ABOVE_FLOOR_ONLY	854	* Note that INS_BELOW_ORIGINATOR, INS_ON_TOP, INS_ABOVE_FLOOR_ONLY
452	* are mutually exclusive. The behaviour for passing more than one	855	* are mutually exclusive. The behaviour for passing more than one
453	* should be considered undefined - while you may notice what happens	856	* should be considered undefined - while you may notice what happens
454	* right now if you pass more than one, that could very well change	857	* right now if you pass more than one, that could very well change
…		…
457	#define INS_NO_MERGE 0x0001	860	#define INS_NO_MERGE 0x0001
458	#define INS_ABOVE_FLOOR_ONLY 0x0002	861	#define INS_ABOVE_FLOOR_ONLY 0x0002
459	#define INS_NO_WALK_ON 0x0004	862	#define INS_NO_WALK_ON 0x0004
460	#define INS_ON_TOP 0x0008	863	#define INS_ON_TOP 0x0008
461	#define INS_BELOW_ORIGINATOR 0x0010	864	#define INS_BELOW_ORIGINATOR 0x0010
462	#define INS_MAP_LOAD 0x0020
463		865
464	#define ARCH_SINGULARITY "singularity"
465	#define ARCH_SINGULARITY_LEN 11
466	#define ARCH_DETECT_MAGIC "detect_magic"
467	#define ARCH_DEPLETION "depletion"	866	#define ARCH_DEPLETION "depletion"
468	#define ARCH_SYMPTOM "symptom"
469		867
470	#endif	868	#endif
471		869

Diff Legend

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

Comparing deliantra/server/include/object.h (file contents): Revision 1.67 by root, Sat Dec 23 15:49:40 2006 UTC vs. Revision 1.203 by root, Sat Jun 27 08:35:03 2009 UTC

Diff Legend

Comparing deliantra/server/include/object.h (file contents):
Revision 1.67 by root, Sat Dec 23 15:49:40 2006 UTC vs.
Revision 1.203 by root, Sat Jun 27 08:35:03 2009 UTC