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

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

Diff Legend

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

Comparing deliantra/server/include/object.h (file contents): Revision 1.71 by root, Tue Dec 26 20:04:09 2006 UTC vs. Revision 1.212 by root, Mon Oct 12 14:00:58 2009 UTC

Diff Legend

Comparing deliantra/server/include/object.h (file contents):
Revision 1.71 by root, Tue Dec 26 20:04:09 2006 UTC vs.
Revision 1.212 by root, Mon Oct 12 14:00:58 2009 UTC