ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/server/common/object.C

Comparing deliantra/server/common/object.C (file contents):
Revision 1.14 by root, Mon Sep 4 11:07:59 2006 UTC vs.
Revision 1.47 by root, Thu Sep 14 22:33:59 2006 UTC

1	/*
2	* static char *rcsid_object_c =
3	* "$Id: object.C,v 1.14 2006/09/04 11:07:59 root Exp $";
4	*/
5
6	/*	1	/*
7	CrossFire, A Multiplayer game for X-windows	2	CrossFire, A Multiplayer game for X-windows
8		3
9	Copyright (C) 2001 Mark Wedel & Crossfire Development Team	4	Copyright (C) 2001 Mark Wedel & Crossfire Development Team
10	Copyright (C) 1992 Frank Tore Johansen	5	Copyright (C) 1992 Frank Tore Johansen
…		…
21		16
22	You should have received a copy of the GNU General Public License	17	You should have received a copy of the GNU General Public License
23	along with this program; if not, write to the Free Software	18	along with this program; if not, write to the Free Software
24	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	19	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
25		20
26	The authors can be reached via e-mail at crossfire-devel@real-time.com	21	The authors can be reached via e-mail at <crossfire@schmorp.de>
27	*/	22	*/
28		23
29	/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.	24	/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
30	sub/add_weight will transcend the environment updating the carrying	25	sub/add_weight will transcend the environment updating the carrying
31	variable. */	26	variable. */
32	#include <global.h>	27	#include <global.h>
33	#ifndef WIN32 /* ---win32 exclude headers */
34	#include <stdio.h>	28	#include <stdio.h>
35	#include <sys/types.h>	29	#include <sys/types.h>
36	#include <sys/uio.h>	30	#include <sys/uio.h>
37	#endif /* win32 */
38	#include <object.h>	31	#include <object.h>
39	#include <funcpoint.h>	32	#include <funcpoint.h>
40	#include <skills.h>
41	#include <loader.h>	33	#include <loader.h>
		34
42	int nrofallocobjects = 0;	35	int nrofallocobjects = 0;
		36	static UUID uuid;
		37	const uint64 UUID_SKIP = 1<<19;
43		38
44	object *objects; /* Pointer to the list of used objects */
45	object *active_objects; /* List of active objects that need to be processed */	39	object *active_objects; /* List of active objects that need to be processed */
46		40
47	short freearr_x[SIZEOFFREE]=	41	short freearr_x[SIZEOFFREE] = { 0, 0, 1, 1, 1, 0, -1, -1, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,
48	{0,0,1,1,1,0,-1,-1,-1,0,1,2,2,2,2,2,1,0,-1,-2,-2,-2,-2,-2,-1,
49	0,1,2,3,3,3,3,3,3,3,2,1,0,-1,-2,-3,-3,-3,-3,-3,-3,-3,-2,-1};	42	0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1
50	short freearr_y[SIZEOFFREE]=	43	};
51	{0,-1,-1,0,1,1,1,0,-1,-2,-2,-2,-1,0,1,2,2,2,2,2,1,0,-1,-2,-2,	44	short freearr_y[SIZEOFFREE] = { 0, -1, -1, 0, 1, 1, 1, 0, -1, -2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2,
52	-3,-3,-3,-3,-2,-1,0,1,2,3,3,3,3,3,3,3,2,1,0,-1,-2,-3,-3,-3};	45	-3, -3, -3, -3, -2, -1, 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3
53	int maxfree[SIZEOFFREE]=	46	};
54	{0,9,10,13,14,17,18,21,22,25,26,27,30,31,32,33,36,37,39,39,42,43,44,45,	47	int maxfree[SIZEOFFREE] = { 0, 9, 10, 13, 14, 17, 18, 21, 22, 25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45,
55	48,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49,49};	48	48, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49
		49	};
56	int freedir[SIZEOFFREE]= {	50	int freedir[SIZEOFFREE] = {
57	0,1,2,3,4,5,6,7,8,1,2,2,2,3,4,4,4,5,6,6,6,7,8,8,8,	51	0, 1, 2, 3, 4, 5, 6, 7, 8, 1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8,
58	1,2,2,2,2,2,3,4,4,4,4,4,5,6,6,6,6,6,7,8,8,8,8,8};	52	1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8
		53	};
59		54
		55	static void
		56	write_uuid (void)
		57	{
		58	char filename1[MAX_BUF], filename2[MAX_BUF];
		59
		60	sprintf (filename1, "%s/uuid", settings.localdir);
		61	sprintf (filename2, "%s/uuid~", settings.localdir);
		62
		63	FILE *fp;
		64
		65	if (!(fp = fopen (filename2, "w")))
		66	{
		67	LOG (llevError, "ERROR: cannot open %s for writing, unable to write UUID!\n", filename2);
		68	return;
		69	}
		70
		71	fprintf (fp, "<1,%llx>\n", (unsigned long long)uuid.seq + UUID_SKIP * 2);
		72	fclose (fp);
		73	rename (filename2, filename1);
		74	}
		75
		76	static void
		77	read_uuid (void)
		78	{
		79	char filename[MAX_BUF];
		80
		81	sprintf (filename, "%s/uuid", settings.localdir);
		82
		83	FILE *fp;
		84
		85	if (!(fp = fopen (filename, "r")))
		86	{
		87	if (errno == ENOENT)
		88	{
		89	LOG (llevInfo, "RESET uid to 1\n");
		90	uuid.seq = 0;
		91	write_uuid ();
		92	return;
		93	}
		94
		95	LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);
		96	_exit (1);
		97	}
		98
		99	int version;
		100	unsigned long long uid;
		101	if (2 != fscanf (fp, "<%d,%llx>\n", &version, &uid) || version != 1)
		102	{
		103	LOG (llevError, "FATAL: error reading uid from %s!\n", filename);
		104	_exit (1);
		105	}
		106
		107	uuid.seq = uid;
		108	write_uuid ();
		109	LOG (llevDebug, "read UID: %lld\n", uid);
		110	fclose (fp);
		111	}
		112
		113	UUID
		114	gen_uuid ()
		115	{
		116	UUID uid;
		117
		118	uid.seq = ++uuid.seq;
		119
		120	if (!(uuid.seq & (UUID_SKIP - 1)))
		121	write_uuid ();
		122
		123	return uid;
		124	}
		125
		126	void
		127	init_uuid ()
		128	{
		129	read_uuid ();
		130	}
60		131
61	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */	132	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */
		133	static int
62	static int compare_ob_value_lists_one(const object * wants, const object * has) {	134	compare_ob_value_lists_one (const object *wants, const object *has)
		135	{
63	key_value * wants_field;	136	key_value *wants_field;
64		137
65	/* n-squared behaviour (see get_ob_key_link()), but I'm hoping both	138	/* n-squared behaviour (see get_ob_key_link()), but I'm hoping both
66	* objects with lists are rare, and lists stay short. If not, use a	139	* objects with lists are rare, and lists stay short. If not, use a
67	* different structure or at least keep the lists sorted...	140	* different structure or at least keep the lists sorted...
68	*/	141	*/
69		142
70	/* For each field in wants, */	143	/* For each field in wants, */
71	for (wants_field = wants->key_values; wants_field != NULL; wants_field = wants_field->next) {	144	for (wants_field = wants->key_values; wants_field != NULL; wants_field = wants_field->next)
		145	{
72	key_value * has_field;	146	key_value *has_field;
73		147
74	/* Look for a field in has with the same key. */	148	/* Look for a field in has with the same key. */
75	has_field = get_ob_key_link(has, wants_field->key);	149	has_field = get_ob_key_link (has, wants_field->key);
		150
		151	if (has_field == NULL)
76		152	{
77	if (has_field == NULL) {
78	/* No field with that name. */	153	/* No field with that name. */
79	return FALSE;	154	return FALSE;
80	}
81		155	}
		156
82	/* Found the matching field. */	157	/* Found the matching field. */
83	if (has_field->value != wants_field->value) {	158	if (has_field->value != wants_field->value)
		159	{
84	/* Values don't match, so this half of the comparison is false. */	160	/* Values don't match, so this half of the comparison is false. */
85	return FALSE;	161	return FALSE;
86	}	162	}
87		163
88	/* If we get here, we found a match. Now for the next field in wants. */	164	/* If we get here, we found a match. Now for the next field in wants. */
89	}
90		165	}
		166
91	/* If we get here, every field in wants has a matching field in has. */	167	/* If we get here, every field in wants has a matching field in has. */
92	return TRUE;	168	return TRUE;
93	}	169	}
94		170
95	/* Returns TRUE if ob1 has the same key_values as ob2. */	171	/* Returns TRUE if ob1 has the same key_values as ob2. */
		172	static int
96	static int compare_ob_value_lists(const object * ob1, const object * ob2) {	173	compare_ob_value_lists (const object *ob1, const object *ob2)
		174	{
97	/* However, there may be fields in has which aren't partnered in wants,	175	/* However, there may be fields in has which aren't partnered in wants,
98	* so we need to run the comparison *twice*. :(	176	* so we need to run the comparison *twice*. :(
99	*/	177	*/
100	return compare_ob_value_lists_one(ob1, ob2) && compare_ob_value_lists_one(ob2, ob1);	178	return compare_ob_value_lists_one (ob1, ob2) && compare_ob_value_lists_one (ob2, ob1);
101	}	179	}
102		180
103	/* Function examines the 2 objects given to it, and returns true if	181	/* Function examines the 2 objects given to it, and returns true if
104	* they can be merged together.	182	* they can be merged together.
105	*	183	*
…		…
111	*	189	*
112	* Improvements made with merge: Better checking on potion, and also	190	* Improvements made with merge: Better checking on potion, and also
113	* check weight	191	* check weight
114	*/	192	*/
115		193
116	int CAN_MERGE(object *ob1, object *ob2) {	194	bool object::can_merge (object *ob1, object *ob2)
117		195	{
118	/* A couple quicksanity checks */	196	/* A couple quicksanity checks */
119	if ((ob1 == ob2) || (ob1->type != ob2->type)) return 0;	197	if ((ob1 == ob2) || (ob1->type != ob2->type))
		198	return 0;
120		199
121	if (ob1->speed != ob2->speed) return 0;	200	if (ob1->speed != ob2->speed)
122	/* Note sure why the following is the case - either the object has to	201	return 0;
123	* be animated or have a very low speed. Is this an attempted monster	202
124	* check?	203	/* Do not merge objects if nrof would overflow. We use 1UL<<31 since that
		204	* value could not be stored in a sint32 (which unfortunately sometimes is
		205	* used to store nrof).
125	*/	206	*/
126	if (!QUERY_FLAG(ob1,FLAG_ANIMATE) && FABS((ob1)->speed) > MIN_ACTIVE_SPEED)	207	if (ob1->nrof + ob2->nrof >= 1UL << 31)
		208	return 0;
		209
		210	/* If the objects have been identified, set the BEEN_APPLIED flag.
		211	* This is to the comparison of the flags below will be OK. We
		212	* just can't ignore the been applied or identified flags, as they
		213	* are not equal - just if it has been identified, the been_applied
		214	* flags lose any meaning.
		215	*/
		216	if (QUERY_FLAG (ob1, FLAG_IDENTIFIED))
		217	SET_FLAG (ob1, FLAG_BEEN_APPLIED);
		218
		219	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))
		220	SET_FLAG (ob2, FLAG_BEEN_APPLIED);
		221
		222
		223	/* the 0x400000 on flags2 is FLAG_INV_LOCK. I don't think something
		224	* being locked in inventory should prevent merging.
		225	* 0x4 in flags3 is CLIENT_SENT
		226	*/
		227	if ((ob1->arch != ob2->arch) ||
		228	(ob1->flags[0] != ob2->flags[0]) ||
		229	(ob1->flags[1] != ob2->flags[1]) ||
		230	((ob1->flags[2] & ~0x400000) != (ob2->flags[2] & ~0x400000)) ||
		231	((ob1->flags[3] & ~0x4) != (ob2->flags[3] & ~0x4)) ||
		232	(ob1->name != ob2->name) ||
		233	(ob1->title != ob2->title) ||
		234	(ob1->msg != ob2->msg) ||
		235	(ob1->weight != ob2->weight) ||
		236	(memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist)) != 0) ||
		237	(memcmp (&ob1->stats, &ob2->stats, sizeof (ob1->stats)) != 0) ||
		238	(ob1->attacktype != ob2->attacktype) ||
		239	(ob1->magic != ob2->magic) ||
		240	(ob1->slaying != ob2->slaying) ||
		241	(ob1->skill != ob2->skill) ||
		242	(ob1->value != ob2->value) ||
		243	(ob1->animation_id != ob2->animation_id) ||
		244	(ob1->client_type != ob2->client_type) ||
		245	(ob1->materialname != ob2->materialname) ||
		246	(ob1->lore != ob2->lore) ||
		247	(ob1->subtype != ob2->subtype) ||
		248	(ob1->move_type != ob2->move_type) ||
		249	(ob1->move_block != ob2->move_block) ||
		250	(ob1->move_allow != ob2->move_allow) ||
		251	(ob1->move_on != ob2->move_on) ||
		252	(ob1->move_off != ob2->move_off) || (ob1->move_slow != ob2->move_slow) || (ob1->move_slow_penalty != ob2->move_slow_penalty))
		253	return 0;
		254
		255	/* This is really a spellbook check - really, we should
		256	* check all objects in the inventory.
		257	*/
		258	if (ob1->inv || ob2->inv)
		259	{
		260	/* if one object has inventory but the other doesn't, not equiv */
		261	if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv))
127	return 0;	262	return 0;
128		263
129	/* Do not merge objects if nrof would overflow. We use 1UL<<31 since that	264	/* Now check to see if the two inventory objects could merge */
130	* value could not be stored in a sint32 (which unfortunately sometimes is	265	if (!CAN_MERGE (ob1->inv, ob2->inv))
131	* used to store nrof).
132	*/
133	if (ob1->nrof+ob2->nrof >= 1UL<<31)
134	return 0;	266	return 0;
135		267
136	/* This is really a spellbook check - really, we should
137	* check all objects in the inventory.
138	*/
139	if (ob1->inv || ob2->inv) {
140	/* if one object has inventory but the other doesn't, not equiv */
141	if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv)) return 0;
142
143	/* Now check to see if the two inventory objects could merge */
144	if (!CAN_MERGE(ob1->inv, ob2->inv)) return 0;
145
146	/* inventory ok - still need to check rest of this object to see	268	/* inventory ok - still need to check rest of this object to see
147	* if it is valid.	269	* if it is valid.
148	*/	270	*/
149	}	271	}
150		272
151	/* If the objects have been identified, set the BEEN_APPLIED flag.
152	* This is to the comparison of the flags below will be OK. We
153	* just can't ignore the been applied or identified flags, as they
154	* are not equal - just if it has been identified, the been_applied
155	* flags lose any meaning.
156	*/
157	if (QUERY_FLAG(ob1, FLAG_IDENTIFIED))
158	SET_FLAG(ob1, FLAG_BEEN_APPLIED);
159
160	if (QUERY_FLAG(ob2, FLAG_IDENTIFIED))
161	SET_FLAG(ob2, FLAG_BEEN_APPLIED);
162
163
164	/* the 0x400000 on flags2 is FLAG_INV_LOCK. I don't think something
165	* being locked in inventory should prevent merging.
166	* 0x4 in flags3 is CLIENT_SENT
167	*/
168	if ((ob1->arch != ob2->arch) ||
169	(ob1->flags[0] != ob2->flags[0]) ||
170	(ob1->flags[1] != ob2->flags[1]) ||
171	((ob1->flags[2] & ~0x400000) != (ob2->flags[2] & ~ 0x400000)) ||
172	((ob1->flags[3] & ~0x4) != (ob2->flags[3] & ~0x4)) ||
173	(ob1->name != ob2->name) ||
174	(ob1->title != ob2->title) ||
175	(ob1->msg != ob2->msg) ||
176	(ob1->weight != ob2->weight) ||
177	(memcmp(&ob1->resist, &ob2->resist, sizeof(ob1->resist))!=0) ||
178	(memcmp(&ob1->stats, &ob2->stats, sizeof(ob1->stats))!=0) ||
179	(ob1->attacktype != ob2->attacktype) ||
180	(ob1->magic != ob2->magic) ||
181	(ob1->slaying != ob2->slaying) ||
182	(ob1->skill != ob2->skill) ||
183	(ob1->value != ob2->value) ||
184	(ob1->animation_id != ob2->animation_id) ||
185	(ob1->client_type != ob2->client_type) ||
186	(ob1->materialname != ob2->materialname) ||
187	(ob1->lore != ob2->lore) ||
188	(ob1->subtype != ob2->subtype) ||
189	(ob1->move_type != ob2->move_type) ||
190	(ob1->move_block != ob2->move_block) ||
191	(ob1->move_allow != ob2->move_allow) ||
192	(ob1->move_on != ob2->move_on) ||
193	(ob1->move_off != ob2->move_off) ||
194	(ob1->move_slow != ob2->move_slow) ||
195	(ob1->move_slow_penalty != ob2->move_slow_penalty)
196	)
197	return 0;
198
199	/* Don't merge objects that are applied. With the new 'body' code,	273	/* Don't merge objects that are applied. With the new 'body' code,
200	* it is possible for most any character to have more than one of	274	* it is possible for most any character to have more than one of
201	* some items equipped, and we don't want those to merge.	275	* some items equipped, and we don't want those to merge.
202	*/	276	*/
203	if (QUERY_FLAG(ob1, FLAG_APPLIED) || QUERY_FLAG(ob2, FLAG_APPLIED))	277	if (QUERY_FLAG (ob1, FLAG_APPLIED) || QUERY_FLAG (ob2, FLAG_APPLIED))
		278	return 0;
		279
		280	/* Note sure why the following is the case - either the object has to
		281	* be animated or have a very low speed. Is this an attempted monster
		282	* check?
		283	*/
		284	if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && FABS ((ob1)->speed) > MIN_ACTIVE_SPEED)
		285	return 0;
		286
		287	switch (ob1->type)
		288	{
		289	case SCROLL:
		290	if (ob1->level != ob2->level)
		291	return 0;
		292	break;
		293	}
		294
		295	if (ob1->key_values != NULL || ob2->key_values != NULL)
		296	{
		297	/* At least one of these has key_values. */
		298	if ((ob1->key_values == NULL) != (ob2->key_values == NULL))
		299	/* One has fields, but the other one doesn't. */
204	return 0;	300	return 0;
205
206	switch (ob1->type) {
207	case SCROLL:
208	if (ob1->level != ob2->level) return 0;
209	break;
210
211	}
212	if (ob1->key_values != NULL || ob2->key_values != NULL) {
213	/* At least one of these has key_values. */
214	if ((ob1->key_values == NULL) != (ob2->key_values == NULL)) {
215	/* One has fields, but the other one doesn't. */
216	return 0;
217	} else if (!compare_ob_value_lists(ob1, ob2)) {	301	else if (!compare_ob_value_lists (ob1, ob2))
218	return 0;	302	return 0;
219	}	303	}
		304
		305	//TODO: generate an event or call into perl for additional checks
		306	if (ob1->self || ob2->self)
220	}	307	{
		308	ob1->optimise ();
		309	ob2->optimise ();
221		310
		311	if (ob1->self || ob2->self)
		312	return 0;
		313	}
		314
222	/* Everything passes, must be OK. */	315	/* Everything passes, must be OK. */
223	return 1;	316	return 1;
224	}	317	}
225		318
226	/*	319	/*
227	* sum_weight() is a recursive function which calculates the weight	320	* sum_weight() is a recursive function which calculates the weight
228	* an object is carrying. It goes through in figures out how much	321	* an object is carrying. It goes through in figures out how much
229	* containers are carrying, and sums it up.	322	* containers are carrying, and sums it up.
230	*/	323	*/
231	signed long sum_weight(object *op) {	324	long
		325	sum_weight (object *op)
		326	{
232	signed long sum;	327	long sum;
233	object *inv;	328	object *inv;
		329
234	for(sum = 0, inv = op->inv; inv != NULL; inv = inv->below) {	330	for (sum = 0, inv = op->inv; inv != NULL; inv = inv->below)
		331	{
235	if (inv->inv)	332	if (inv->inv)
236	sum_weight(inv);	333	sum_weight (inv);
237	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);	334	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);
238	}	335	}
		336
239	if (op->type == CONTAINER && op->stats.Str)	337	if (op->type == CONTAINER && op->stats.Str)
240	sum = (sum * (100 - op->stats.Str))/100;	338	sum = (sum * (100 - op->stats.Str)) / 100;
		339
241	if(op->carrying != sum)	340	if (op->carrying != sum)
242	op->carrying = sum;	341	op->carrying = sum;
		342
243	return sum;	343	return sum;
244	}	344	}
245		345
246	/**	346	/**
247	* Return the outermost environment object for a given object.	347	* Return the outermost environment object for a given object.
248	*/	348	*/
249		349
		350	object *
250	object *object_get_env_recursive (object *op) {	351	object_get_env_recursive (object *op)
		352	{
251	while (op->env != NULL)	353	while (op->env != NULL)
252	op = op->env;	354	op = op->env;
253	return op;	355	return op;
254	}	356	}
255		357
256	/*	358	/*
257	* Eneq(@csd.uu.se): Since we can have items buried in a character we need	359	* Eneq(@csd.uu.se): Since we can have items buried in a character we need
258	* a better check. We basically keeping traversing up until we can't	360	* a better check. We basically keeping traversing up until we can't
259	* or find a player.	361	* or find a player.
260	*/	362	*/
261		363
		364	object *
262	object *is_player_inv (object *op) {	365	is_player_inv (object *op)
		366	{
263	for (;op!=NULL&&op->type!=PLAYER; op=op->env)	367	for (; op != NULL && op->type != PLAYER; op = op->env)
264	if (op->env==op)	368	if (op->env == op)
265	op->env = NULL;	369	op->env = NULL;
266	return op;	370	return op;
267	}	371	}
268		372
269	/*	373	/*
270	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.	374	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
271	* Some error messages.	375	* Some error messages.
272	* The result of the dump is stored in the static global errmsg array.	376	* The result of the dump is stored in the static global errmsg array.
273	*/	377	*/
274		378
		379	void
275	void dump_object2(object *op) {	380	dump_object2 (object *op)
		381	{
276	errmsg[0] = 0;	382	errmsg[0] = 0;
277	return;	383	return;
278	//TODO//D#d#	384	//TODO//D#d#
279	#if 0	385	#if 0
280	char *cp;	386	char *cp;
		387
281	/* object *tmp;*/	388	/* object *tmp;*/
282		389
283	if(op->arch!=NULL) {	390	if (op->arch != NULL)
		391	{
284	strcat(errmsg,"arch ");	392	strcat (errmsg, "arch ");
285	strcat(errmsg,op->arch->name?op->arch->name:"(null)");	393	strcat (errmsg, op->arch->name ? op->arch->name : "(null)");
286	strcat(errmsg,"\n");	394	strcat (errmsg, "\n");
287	if((cp=get_ob_diff(op,&empty_archetype->clone))!=NULL)	395	if ((cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
288	strcat(errmsg,cp);	396	strcat (errmsg, cp);
289	#if 0	397	# if 0
290	/* Don't dump player diffs - they are too long, mostly meaningless, and	398	/* Don't dump player diffs - they are too long, mostly meaningless, and
291	* will overflow the buffer.	399	* will overflow the buffer.
292	* Changed so that we don't dump inventory either. This may	400	* Changed so that we don't dump inventory either. This may
293	* also overflow the buffer.	401	* also overflow the buffer.
294	*/	402	*/
295	if(op->type!=PLAYER && (cp=get_ob_diff(op,&empty_archetype->clone))!=NULL)	403	if (op->type != PLAYER && (cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
296	strcat(errmsg,cp);	404	strcat (errmsg, cp);
297	for (tmp=op->inv; tmp; tmp=tmp->below)	405	for (tmp = op->inv; tmp; tmp = tmp->below)
298	dump_object2(tmp);	406	dump_object2 (tmp);
		407	# endif
		408	strcat (errmsg, "end\n");
		409	}
		410	else
		411	{
		412	strcat (errmsg, "Object ");
		413	if (op->name == NULL)
		414	strcat (errmsg, "(null)");
		415	else
		416	strcat (errmsg, op->name);
		417	strcat (errmsg, "\n");
		418	# if 0
		419	if ((cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
		420	strcat (errmsg, cp);
		421	for (tmp = op->inv; tmp; tmp = tmp->below)
		422	dump_object2 (tmp);
		423	# endif
		424	strcat (errmsg, "end\n");
		425	}
299	#endif	426	#endif
300	strcat(errmsg,"end\n");
301	} else {
302	strcat(errmsg,"Object ");
303	if (op->name==NULL) strcat(errmsg, "(null)");
304	else strcat(errmsg,op->name);
305	strcat(errmsg,"\n");
306	#if 0
307	if((cp=get_ob_diff(op,&empty_archetype->clone))!=NULL)
308	strcat(errmsg,cp);
309	for (tmp=op->inv; tmp; tmp=tmp->below)
310	dump_object2(tmp);
311	#endif
312	strcat(errmsg,"end\n");
313	}
314	#endif
315	}	427	}
316		428
317	/*	429	/*
318	* Dumps an object. Returns output in the static global errmsg array.	430	* Dumps an object. Returns output in the static global errmsg array.
319	*/	431	*/
320		432
		433	void
321	void dump_object(object *op) {	434	dump_object (object *op)
		435	{
322	if(op==NULL) {	436	if (op == NULL)
		437	{
323	strcpy(errmsg,"[NULL pointer]");	438	strcpy (errmsg, "[NULL pointer]");
324	return;	439	return;
325	}	440	}
326	errmsg[0]='\0';	441	errmsg[0] = '\0';
327	dump_object2(op);	442	dump_object2 (op);
328	}	443	}
329		444
		445	void
330	void dump_all_objects(void) {	446	dump_all_objects (void)
		447	{
331	object *op;	448	object *op;
		449
332	for(op=objects;op!=NULL;op=op->next) {	450	for (op = object::first; op != NULL; op = op->next)
		451	{
333	dump_object(op);	452	dump_object (op);
334	fprintf(logfile, "Object %d\n:%s\n", op->count, errmsg);	453	fprintf (logfile, "Object %d\n:%s\n", op->count, errmsg);
335	}	454	}
336	}	455	}
337		456
338	/*	457	/*
339	* get_nearest_part(multi-object, object 2) returns the part of the	458	* get_nearest_part(multi-object, object 2) returns the part of the
340	* multi-object 1 which is closest to the second object.	459	* multi-object 1 which is closest to the second object.
341	* If it's not a multi-object, it is returned.	460	* If it's not a multi-object, it is returned.
342	*/	461	*/
343		462
		463	object *
344	object *get_nearest_part(object *op, const object *pl) {	464	get_nearest_part (object *op, const object *pl)
		465	{
345	object *tmp,*closest;	466	object *tmp, *closest;
346	int last_dist,i;	467	int last_dist, i;
		468
347	if(op->more==NULL)	469	if (op->more == NULL)
348	return op;	470	return op;
349	for(last_dist=distance(op,pl),closest=op,tmp=op->more;tmp!=NULL;tmp=tmp->more)	471	for (last_dist = distance (op, pl), closest = op, tmp = op->more; tmp != NULL; tmp = tmp->more)
350	if((i=distance(tmp,pl))<last_dist)	472	if ((i = distance (tmp, pl)) < last_dist)
351	closest=tmp,last_dist=i;	473	closest = tmp, last_dist = i;
352	return closest;	474	return closest;
353	}	475	}
354		476
355	/*	477	/*
356	* Returns the object which has the count-variable equal to the argument.	478	* Returns the object which has the count-variable equal to the argument.
357	*/	479	*/
358		480
		481	object *
359	object *find_object(tag_t i) {	482	find_object (tag_t i)
		483	{
360	object *op;	484	object *op;
		485
361	for(op=objects;op!=NULL;op=op->next)	486	for (op = object::first; op != NULL; op = op->next)
362	if(op->count==i)	487	if (op->count == i)
363	break;	488	break;
364	return op;	489	return op;
365	}	490	}
366		491
367	/*	492	/*
368	* Returns the first object which has a name equal to the argument.	493	* Returns the first object which has a name equal to the argument.
369	* Used only by the patch command, but not all that useful.	494	* Used only by the patch command, but not all that useful.
370	* Enables features like "patch <name-of-other-player> food 999"	495	* Enables features like "patch <name-of-other-player> food 999"
371	*/	496	*/
372		497
		498	object *
373	object *find_object_name(const char *str) {	499	find_object_name (const char *str)
374	const char *name = shstr::find (str);	500	{
		501	shstr_cmp str_ (str);
375	object *op;	502	object *op;
		503
376	for(op=objects;op!=NULL;op=op->next)	504	for (op = object::first; op != NULL; op = op->next)
377	if(&op->name == name)	505	if (op->name == str_)
378	break;	506	break;
379		507
380	return op;	508	return op;
381	}	509	}
382		510
		511	void
383	void free_all_object_data ()	512	free_all_object_data ()
384	{	513	{
385	LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);	514	LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);
386	}
387
388	/*
389	* Returns the object which this object marks as being the owner.
390	* A id-scheme is used to avoid pointing to objects which have been
391	* freed and are now reused. If this is detected, the owner is
392	* set to NULL, and NULL is returned.
393	* Changed 2004-02-12 - if the player is setting at the play again
394	* prompt, he is removed, and we don't want to treat him as an owner of
395	* anything, so check removed flag. I don't expect that this should break
396	* anything - once an object is removed, it is basically dead anyways.
397	*/
398
399	object *get_owner(object *op) {
400	if(op->owner==NULL)
401	return NULL;
402
403	if (!QUERY_FLAG(op->owner,FLAG_FREED) && !QUERY_FLAG(op->owner, FLAG_REMOVED) &&
404	op->owner->count==op->ownercount)
405	return op->owner;
406
407	op->owner=NULL;
408	op->ownercount=0;
409	return NULL;
410	}
411
412	void clear_owner(object *op)
413	{
414	if (!op) return;
415
416	if (op->owner && op->ownercount == op->owner->count)
417	op->owner->refcount--;
418
419	op->owner = NULL;
420	op->ownercount = 0;
421	}	515	}
422		516
423	/*	517	/*
424	* Sets the owner and sets the skill and exp pointers to owner's current	518	* Sets the owner and sets the skill and exp pointers to owner's current
425	* skill and experience objects.	519	* skill and experience objects.
426	*/	520	*/
427	void set_owner (object *op, object *owner)	521	void
		522	object::set_owner (object *owner)
428	{	523	{
429	if(owner==NULL||op==NULL)	524	if (!owner)
430	return;	525	return;
431		526
432	/* next line added to allow objects which own objects */	527	/* next line added to allow objects which own objects */
433	/* Add a check for ownercounts in here, as I got into an endless loop	528	/* Add a check for ownercounts in here, as I got into an endless loop
434	* with the fireball owning a poison cloud which then owned the	529	* with the fireball owning a poison cloud which then owned the
435	* fireball. I believe that was caused by one of the objects getting	530	* fireball. I believe that was caused by one of the objects getting
436	* freed and then another object replacing it. Since the ownercounts	531	* freed and then another object replacing it. Since the ownercounts
437	* didn't match, this check is valid and I believe that cause is valid.	532	* didn't match, this check is valid and I believe that cause is valid.
438	*/	533	*/
439	while (owner->owner && owner!=owner->owner &&	534	while (owner->owner)
440	owner->ownercount==owner->owner->count) owner=owner->owner;	535	owner = owner->owner;
441		536
442	/* IF the owner still has an owner, we did not resolve to a final owner.
443	* so lets not add to that.
444	*/
445	if (owner->owner) return;
446
447	op->owner=owner;	537	this->owner = owner;
448
449	op->ownercount=owner->count;
450	owner->refcount++;
451
452	}
453
454	/* Set the owner to clone's current owner and set the skill and experience
455	* objects to clone's objects (typically those objects that where the owner's
456	* current skill and experience objects at the time when clone's owner was
457	* set - not the owner's current skill and experience objects).
458	*
459	* Use this function if player created an object (e.g. fire bullet, swarm
460	* spell), and this object creates further objects whose kills should be
461	* accounted for the player's original skill, even if player has changed
462	* skills meanwhile.
463	*/
464	void copy_owner (object *op, object *clone)
465	{
466	object *owner = get_owner (clone);
467	if (owner == NULL) {
468	/* players don't have owners - they own themselves. Update
469	* as appropriate.
470	*/
471	if (clone->type == PLAYER) owner=clone;
472	else return;
473	}
474	set_owner(op, owner);
475
476	}	538	}
477		539
478	/* Zero the key_values on op, decrementing the shared-string	540	/* Zero the key_values on op, decrementing the shared-string
479	* refcounts and freeing the links.	541	* refcounts and freeing the links.
480	*/	542	*/
		543	static void
481	static void free_key_values(object * op)	544	free_key_values (object *op)
482	{	545	{
483	for (key_value *i = op->key_values; i != 0; )	546	for (key_value *i = op->key_values; i != 0;)
484	{	547	{
485	key_value *next = i->next;	548	key_value *next = i->next;
486	delete i;	549	delete i;
		550
487	i = next;	551	i = next;
488	}	552	}
489		553
490	op->key_values = 0;	554	op->key_values = 0;
491	}	555	}
492		556
493	void object::clear ()	557	void object::clear ()
494	{	558	{
495	attachable_base::clear ();	559	attachable_base::clear ();
496		560
497	free_key_values (this);	561	free_key_values (this);
498		562
499	name = 0;	563	owner = 0;
		564	name = 0;
500	name_pl = 0;	565	name_pl = 0;
501	title = 0;	566	title = 0;
502	race = 0;	567	race = 0;
503	slaying = 0;	568	slaying = 0;
504	skill = 0;	569	skill = 0;
505	msg = 0;	570	msg = 0;
506	lore = 0;	571	lore = 0;
507	custom_name = 0;	572	custom_name = 0;
508	materialname = 0;	573	materialname = 0;
		574	contr = 0;
		575	below = 0;
		576	above = 0;
		577	inv = 0;
		578	container = 0;
		579	env = 0;
		580	more = 0;
		581	head = 0;
		582	map = 0;
		583	active_next = 0;
		584	active_prev = 0;
509		585
510	memset (static_cast<object_pod *>(this), 0, sizeof (object_pod));	586	memset (static_cast<object_pod *>(this), 0, sizeof (object_pod));
511		587
512	SET_FLAG (this, FLAG_REMOVED);	588	SET_FLAG (this, FLAG_REMOVED);
		589
		590	/* What is not cleared is next, prev, and count */
		591
		592	expmul = 1.0;
		593	face = blank_face;
		594
		595	if (settings.casting_time)
		596	casting_time = -1;
513	}	597	}
514		598
515	void object::clone (object *destination)	599	void object::clone (object *destination)
516	{	600	{
517	*(object_copy *)destination = *(object_copy *)this;	601	*(object_copy *)destination = *this;
518	*(object_pod *)destination = *(object_pod *)this;	602	*(object_pod *)destination = *this;
519		603
520	if (self || cb)	604	if (self || cb)
521	INVOKE_OBJECT (CLONE, this, ARG_OBJECT (destination));	605	INVOKE_OBJECT (CLONE, this, ARG_OBJECT (destination));
522	}
523
524	/*
525	* clear_object() frees everything allocated by an object, and also
526	* clears all variables and flags to default settings.
527	*/
528
529	void clear_object (object *op)
530	{
531	op->clear ();
532
533	op->contr = NULL;
534	op->below = NULL;
535	op->above = NULL;
536	op->inv = NULL;
537	op->container=NULL;
538	op->env=NULL;
539	op->more=NULL;
540	op->head=NULL;
541	op->map=NULL;
542	op->refcount=0;
543	op->active_next = NULL;
544	op->active_prev = NULL;
545	/* What is not cleared is next, prev, and count */
546
547	op->expmul = 1.0;
548	op->face = blank_face;
549	op->attacked_by_count = -1;
550
551	if (settings.casting_time)
552	op->casting_time = -1;
553	}	606	}
554		607
555	/*	608	/*
556	* copy object first frees everything allocated by the second object,	609	* copy object first frees everything allocated by the second object,
557	* and then copies the contends of the first object into the second	610	* and then copies the contends of the first object into the second
558	* object, allocating what needs to be allocated. Basically, any	611	* object, allocating what needs to be allocated. Basically, any
559	* data that is malloc'd needs to be re-malloc/copied. Otherwise,	612	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
560	* if the first object is freed, the pointers in the new object	613	* if the first object is freed, the pointers in the new object
561	* will point at garbage.	614	* will point at garbage.
562	*/	615	*/
563		616	void
564	void copy_object (object *op2, object *op)	617	copy_object (object *op2, object *op)
565	{	618	{
566	bool is_freed = QUERY_FLAG (op, FLAG_FREED);	619	bool is_freed = QUERY_FLAG (op, FLAG_FREED);
567	bool is_removed = QUERY_FLAG (op, FLAG_REMOVED);	620	bool is_removed = QUERY_FLAG (op, FLAG_REMOVED);
568		621
569	op2->clone (op);	622	op2->clone (op);
570		623
		624	if (is_freed)
571	if (is_freed) SET_FLAG (op, FLAG_FREED);	625	SET_FLAG (op, FLAG_FREED);
		626	if (is_removed)
572	if (is_removed) SET_FLAG (op, FLAG_REMOVED);	627	SET_FLAG (op, FLAG_REMOVED);
573		628
574	if (op2->speed < 0)	629	if (op2->speed < 0)
575	op->speed_left = op2->speed_left - RANDOM() % 200 / 100.0;	630	op->speed_left = op2->speed_left - RANDOM () % 200 / 100.0;
576		631
577	/* Copy over key_values, if any. */	632	/* Copy over key_values, if any. */
578	if (op2->key_values != NULL)	633	if (op2->key_values)
579	{	634	{
580	key_value *tail = NULL;	635	key_value *tail = 0;
581	key_value *i;	636	key_value *i;
582		637
583	op->key_values = NULL;	638	op->key_values = 0;
584		639
585	for (i = op2->key_values; i != NULL; i = i->next)	640	for (i = op2->key_values; i; i = i->next)
586	{	641	{
587	key_value *new_link = new key_value;	642	key_value *new_link = new key_value;
588		643
589	new_link->next = NULL;	644	new_link->next = 0;
590	new_link->key = i->key;	645	new_link->key = i->key;
591	new_link->value = i->value;	646	new_link->value = i->value;
592		647
593	/* Try and be clever here, too. */	648	/* Try and be clever here, too. */
594	if (op->key_values == NULL)	649	if (!op->key_values)
595	{	650	{
596	op->key_values = new_link;	651	op->key_values = new_link;
597	tail = new_link;	652	tail = new_link;
598	}	653	}
599	else	654	else
…		…
606		661
607	update_ob_speed (op);	662	update_ob_speed (op);
608	}	663	}
609		664
610	/*	665	/*
611	* get_object() grabs an object from the list of unused objects, makes
612	* sure it is initialised, and returns it.
613	* If there are no free objects, expand_objects() is called to get more.
614	*/
615
616	object *get_object ()
617	{
618	object *op = new object;
619
620	op->count = ++ob_count;
621
622	op->active_next = 0;
623	op->active_prev = 0;
624
625	op->next = objects;
626	op->prev = 0;
627
628	if (objects)
629	objects->prev = op;
630
631	objects = op;
632
633	SET_FLAG (op, FLAG_REMOVED);
634
635	return op;
636	}
637
638	/*
639	* If an object with the IS_TURNABLE() flag needs to be turned due	666	* If an object with the IS_TURNABLE() flag needs to be turned due
640	* to the closest player being on the other side, this function can	667	* to the closest player being on the other side, this function can
641	* be called to update the face variable, _and_ how it looks on the map.	668	* be called to update the face variable, _and_ how it looks on the map.
642	*/	669	*/
643		670
		671	void
644	void update_turn_face(object *op) {	672	update_turn_face (object *op)
		673	{
645	if(!QUERY_FLAG(op,FLAG_IS_TURNABLE)||op->arch==NULL)	674	if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || op->arch == NULL)
646	return;	675	return;
647	SET_ANIMATION(op, op->direction);	676	SET_ANIMATION (op, op->direction);
648	update_object(op,UP_OBJ_FACE);	677	update_object (op, UP_OBJ_FACE);
649	}	678	}
650		679
651	/*	680	/*
652	* Updates the speed of an object. If the speed changes from 0 to another	681	* Updates the speed of an object. If the speed changes from 0 to another
653	* value, or vice versa, then add/remove the object from the active list.	682	* value, or vice versa, then add/remove the object from the active list.
654	* This function needs to be called whenever the speed of an object changes.	683	* This function needs to be called whenever the speed of an object changes.
655	*/	684	*/
656		685	void
657	void update_ob_speed(object *op) {	686	update_ob_speed (object *op)
		687	{
658	extern int arch_init;	688	extern int arch_init;
659		689
660	/* No reason putting the archetypes objects on the speed list,	690	/* No reason putting the archetypes objects on the speed list,
661	* since they never really need to be updated.	691	* since they never really need to be updated.
662	*/	692	*/
663		693
664	if (QUERY_FLAG(op, FLAG_FREED) && op->speed) {	694	if (QUERY_FLAG (op, FLAG_FREED) && op->speed)
		695	{
665	LOG(llevError,"Object %s is freed but has speed.\n", &op->name);	696	LOG (llevError, "Object %s is freed but has speed.\n", &op->name);
666	#ifdef MANY_CORES	697	#ifdef MANY_CORES
667	abort();	698	abort ();
668	#else	699	#else
669	op->speed = 0;	700	op->speed = 0;
670	#endif	701	#endif
671	}	702	}
		703
672	if (arch_init) {	704	if (arch_init)
		705	return;
		706
		707	if (FABS (op->speed) > MIN_ACTIVE_SPEED)
		708	{
		709	/* If already on active list, don't do anything */
		710	if (op->active_next || op->active_prev || op == active_objects)
673	return;	711	return;
674	}
675	if (FABS(op->speed)>MIN_ACTIVE_SPEED) {
676	/* If already on active list, don't do anything */
677	if (op->active_next || op->active_prev || op==active_objects)
678	return;
679		712
680	/* process_events() expects us to insert the object at the beginning	713	/* process_events() expects us to insert the object at the beginning
681	* of the list. */	714	* of the list. */
682	op->active_next = active_objects;	715	op->active_next = active_objects;
		716
683	if (op->active_next!=NULL)	717	if (op->active_next != NULL)
684	op->active_next->active_prev = op;	718	op->active_next->active_prev = op;
		719
685	active_objects = op;	720	active_objects = op;
		721	}
		722	else
686	}	723	{
687	else {
688	/* If not on the active list, nothing needs to be done */	724	/* If not on the active list, nothing needs to be done */
689	if (!op->active_next && !op->active_prev && op!=active_objects)	725	if (!op->active_next && !op->active_prev && op != active_objects)
690	return;	726	return;
691		727
692	if (op->active_prev==NULL) {	728	if (op->active_prev == NULL)
		729	{
693	active_objects = op->active_next;	730	active_objects = op->active_next;
		731
694	if (op->active_next!=NULL)	732	if (op->active_next != NULL)
695	op->active_next->active_prev = NULL;	733	op->active_next->active_prev = NULL;
		734	}
		735	else
696	}	736	{
697	else {
698	op->active_prev->active_next = op->active_next;	737	op->active_prev->active_next = op->active_next;
		738
699	if (op->active_next)	739	if (op->active_next)
700	op->active_next->active_prev = op->active_prev;	740	op->active_next->active_prev = op->active_prev;
701	}	741	}
		742
702	op->active_next = NULL;	743	op->active_next = NULL;
703	op->active_prev = NULL;	744	op->active_prev = NULL;
704	}	745	}
705	}	746	}
706		747
707	/* This function removes object 'op' from the list of active	748	/* This function removes object 'op' from the list of active
708	* objects.	749	* objects.
…		…
710	* reference maps where you don't want an object that isn't	751	* reference maps where you don't want an object that isn't
711	* in play chewing up cpu time getting processed.	752	* in play chewing up cpu time getting processed.
712	* The reverse of this is to call update_ob_speed, which	753	* The reverse of this is to call update_ob_speed, which
713	* will do the right thing based on the speed of the object.	754	* will do the right thing based on the speed of the object.
714	*/	755	*/
		756	void
715	void remove_from_active_list(object *op)	757	remove_from_active_list (object *op)
716	{	758	{
717	/* If not on the active list, nothing needs to be done */	759	/* If not on the active list, nothing needs to be done */
718	if (!op->active_next && !op->active_prev && op!=active_objects)	760	if (!op->active_next && !op->active_prev && op != active_objects)
719	return;	761	return;
720		762
721	if (op->active_prev==NULL) {	763	if (op->active_prev == NULL)
		764	{
722	active_objects = op->active_next;	765	active_objects = op->active_next;
723	if (op->active_next!=NULL)	766	if (op->active_next != NULL)
724	op->active_next->active_prev = NULL;	767	op->active_next->active_prev = NULL;
		768	}
		769	else
725	}	770	{
726	else {
727	op->active_prev->active_next = op->active_next;	771	op->active_prev->active_next = op->active_next;
728	if (op->active_next)	772	if (op->active_next)
729	op->active_next->active_prev = op->active_prev;	773	op->active_next->active_prev = op->active_prev;
730	}	774	}
731	op->active_next = NULL;	775	op->active_next = NULL;
732	op->active_prev = NULL;	776	op->active_prev = NULL;
733	}	777	}
734		778
735	/*	779	/*
736	* update_object() updates the array which represents the map.	780	* update_object() updates the array which represents the map.
737	* It takes into account invisible objects (and represent squares covered	781	* It takes into account invisible objects (and represent squares covered
…		…
752	* UP_OBJ_CHANGE: object has somehow changed. In this case, we always update	796	* UP_OBJ_CHANGE: object has somehow changed. In this case, we always update
753	* as that is easier than trying to look at what may have changed.	797	* as that is easier than trying to look at what may have changed.
754	* UP_OBJ_FACE: only the objects face has changed.	798	* UP_OBJ_FACE: only the objects face has changed.
755	*/	799	*/
756		800
		801	void
757	void update_object(object *op, int action) {	802	update_object (object *op, int action)
		803	{
758	int update_now=0, flags;	804	int update_now = 0, flags;
759	MoveType move_on, move_off, move_block, move_slow;	805	MoveType move_on, move_off, move_block, move_slow;
760		806
761	if (op == NULL) {	807	if (op == NULL)
		808	{
762	/* this should never happen */	809	/* this should never happen */
763	LOG(llevDebug,"update_object() called for NULL object.\n");	810	LOG (llevDebug, "update_object() called for NULL object.\n");
764	return;	811	return;
765	}
766		812	}
		813
767	if(op->env!=NULL) {	814	if (op->env != NULL)
		815	{
768	/* Animation is currently handled by client, so nothing	816	/* Animation is currently handled by client, so nothing
769	* to do in this case.	817	* to do in this case.
770	*/	818	*/
771	return;	819	return;
772	}	820	}
773		821
774	/* If the map is saving, don't do anything as everything is	822	/* If the map is saving, don't do anything as everything is
775	* going to get freed anyways.	823	* going to get freed anyways.
776	*/	824	*/
777	if (!op->map || op->map->in_memory == MAP_SAVING) return;	825	if (!op->map || op->map->in_memory == MAP_SAVING)
778		826	return;
		827
779	/* make sure the object is within map boundaries */	828	/* make sure the object is within map boundaries */
780	if (op->x < 0 || op->x >= MAP_WIDTH(op->map) ||	829	if (op->x < 0 || op->x >= MAP_WIDTH (op->map) || op->y < 0 || op->y >= MAP_HEIGHT (op->map))
781	op->y < 0 || op->y >= MAP_HEIGHT(op->map)) {	830	{
782	LOG(llevError,"update_object() called for object out of map!\n");	831	LOG (llevError, "update_object() called for object out of map!\n");
783	#ifdef MANY_CORES	832	#ifdef MANY_CORES
784	abort();	833	abort ();
785	#endif	834	#endif
786	return;	835	return;
787	}
788		836	}
		837
789	flags = GET_MAP_FLAGS(op->map, op->x, op->y);	838	flags = GET_MAP_FLAGS (op->map, op->x, op->y);
790	SET_MAP_FLAGS(op->map, op->x, op->y, flags | P_NEED_UPDATE);	839	SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NEED_UPDATE);
791	move_slow = GET_MAP_MOVE_SLOW(op->map, op->x, op->y);	840	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);
792	move_on = GET_MAP_MOVE_ON(op->map, op->x, op->y);	841	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);
793	move_block = GET_MAP_MOVE_BLOCK(op->map, op->x, op->y);	842	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);
794	move_off = GET_MAP_MOVE_OFF(op->map, op->x, op->y);	843	move_off = GET_MAP_MOVE_OFF (op->map, op->x, op->y);
795		844
796	if (action == UP_OBJ_INSERT) {	845	if (action == UP_OBJ_INSERT)
		846	{
797	if (QUERY_FLAG(op, FLAG_BLOCKSVIEW) && !(flags & P_BLOCKSVIEW))	847	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(flags & P_BLOCKSVIEW))
798	update_now=1;	848	update_now = 1;
799		849
800	if (QUERY_FLAG(op, FLAG_NO_MAGIC) && !(flags & P_NO_MAGIC))	850	if (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(flags & P_NO_MAGIC))
801	update_now=1;	851	update_now = 1;
802		852
803	if (QUERY_FLAG(op, FLAG_DAMNED) && !(flags & P_NO_CLERIC))	853	if (QUERY_FLAG (op, FLAG_DAMNED) && !(flags & P_NO_CLERIC))
804	update_now=1;	854	update_now = 1;
805		855
806	if (QUERY_FLAG(op, FLAG_ALIVE) && !(flags & P_IS_ALIVE))	856	if (QUERY_FLAG (op, FLAG_ALIVE) && !(flags & P_IS_ALIVE))
807	update_now=1;	857	update_now = 1;
808		858
		859	if (op->type == SAFE_GROUND && !(flags & P_SAFE))
		860	update_now = 1;
		861
809	if ((move_on | op->move_on) != move_on) update_now=1;	862	if ((move_on | op->move_on) != move_on)
		863	update_now = 1;
		864
810	if ((move_off | op->move_off) != move_off) update_now=1;	865	if ((move_off | op->move_off) != move_off)
		866	update_now = 1;
		867
811	/* This isn't perfect, but I don't expect a lot of objects to	868	/* This isn't perfect, but I don't expect a lot of objects to
812	* to have move_allow right now.	869	* to have move_allow right now.
813	*/	870	*/
814	if (((move_block | op->move_block) & ~op->move_allow) != move_block)	871	if (((move_block | op->move_block) & ~op->move_allow) != move_block)
815	update_now=1;	872	update_now = 1;
		873
816	if ((move_slow | op->move_slow) != move_slow) update_now=1;	874	if ((move_slow | op->move_slow) != move_slow)
		875	update_now = 1;
817	}	876	}
818	/* if the object is being removed, we can't make intelligent	877	/* if the object is being removed, we can't make intelligent
819	* decisions, because remove_ob can't really pass the object	878	* decisions, because remove_ob can't really pass the object
820	* that is being removed.	879	* that is being removed.
821	*/	880	*/
822	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE) {	881	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
823	update_now=1;	882	update_now = 1;
824	} else if (action == UP_OBJ_FACE) {	883	else if (action == UP_OBJ_FACE)
825	/* Nothing to do for that case */	884	/* Nothing to do for that case */ ;
826	}
827	else {	885	else
828	LOG(llevError,"update_object called with invalid action: %d\n", action);	886	LOG (llevError, "update_object called with invalid action: %d\n", action);
829	}
830		887
831	if (update_now) {	888	if (update_now)
		889	{
832	SET_MAP_FLAGS(op->map, op->x, op->y, flags | P_NO_ERROR | P_NEED_UPDATE);	890	SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NO_ERROR | P_NEED_UPDATE);
833	update_position(op->map, op->x, op->y);	891	update_position (op->map, op->x, op->y);
834	}	892	}
835		893
836	if(op->more!=NULL)	894	if (op->more != NULL)
837	update_object(op->more, action);	895	update_object (op->more, action);
838	}	896	}
839		897
		898	object::vector object::mortals;
		899	object::vector object::objects; // not yet used
		900	object *object::first;
		901
		902	void object::free_mortals ()
		903	{
		904	for (AUTODECL (i, mortals.begin ()); i != mortals.end ();)
		905	if ((*i)->refcnt)
		906	++i; // further delay freeing
		907	else
		908	{
		909	delete *i;
		910	mortals.erase (i);
		911	}
		912
		913	static int lastmortals = 0;//D
		914
		915	if (mortals.size() != lastmortals)//D
		916	{
		917	lastmortals = mortals.size ();//D
		918	LOG (llevDebug, "%d objects in mortal queue\n", lastmortals);//D
		919	}
		920	}
		921
		922	object::object ()
		923	{
		924	SET_FLAG (this, FLAG_REMOVED);
		925
		926	expmul = 1.0;
		927	face = blank_face;
		928	}
		929
		930	object::~object ()
		931	{
		932	free_key_values (this);
		933	}
		934
		935	void object::link ()
		936	{
		937	count = ++ob_count;
		938	uuid = gen_uuid ();
		939
		940	prev = 0;
		941	next = object::first;
		942
		943	if (object::first)
		944	object::first->prev = this;
		945
		946	object::first = this;
		947	}
		948
		949	void object::unlink ()
		950	{
		951	//count = 0;//D
		952	if (!prev && !next) return;//D
		953
		954	if (this == object::first)
		955	object::first = next;
		956
		957	/* Remove this object from the list of used objects */
		958	if (prev) prev->next = next;
		959	if (next) next->prev = prev;
		960
		961	prev = 0;
		962	next = 0;
		963	}
		964
		965	object *object::create ()
		966	{
		967	object *op = new object;
		968	op->link ();
		969	return op;
		970	}
840		971
841	/*	972	/*
842	* free_object() frees everything allocated by an object, removes	973	* free_object() frees everything allocated by an object, removes
843	* it from the list of used objects, and puts it on the list of	974	* it from the list of used objects, and puts it on the list of
844	* free objects. The IS_FREED() flag is set in the object.	975	* free objects. The IS_FREED() flag is set in the object.
…		…
846	* this function to succeed.	977	* this function to succeed.
847	*	978	*
848	* If free_inventory is set, free inventory as well. Else drop items in	979	* If free_inventory is set, free inventory as well. Else drop items in
849	* inventory to the ground.	980	* inventory to the ground.
850	*/	981	*/
851		982	void object::free (bool free_inventory)
852	void
853	free_object (object * ob)
854	{	983	{
855	free_object2 (ob, 0);
856	}
857
858	void
859	free_object2 (object * ob, int free_inventory)
860	{
861	object *tmp, *op;
862
863	if (!QUERY_FLAG (ob, FLAG_REMOVED))	984	if (QUERY_FLAG (this, FLAG_FREED))
864	{	985	return;
865	LOG (llevDebug, "Free object called with non removed object\n");
866	dump_object (ob);
867	#ifdef MANY_CORES
868	abort ();
869	#endif
870	}
871		986
872	if (QUERY_FLAG (ob, FLAG_FRIENDLY))	987	if (QUERY_FLAG (this, FLAG_FRIENDLY))
873	{
874	LOG (llevMonster, "Warning: tried to free friendly object.\n");
875	remove_friendly_object (ob);	988	remove_friendly_object (this);
876	}
877		989
878	if (QUERY_FLAG (ob, FLAG_FREED))	990	if (!QUERY_FLAG (this, FLAG_REMOVED))
879	{	991	remove_ob (this);
880	dump_object (ob);	992
881	LOG (llevError, "Trying to free freed object.\n%s\n", errmsg);	993	SET_FLAG (this, FLAG_FREED);
882	return;	994
		995	if (more)
883	}	996	{
884		997	more->free (free_inventory);
885	if (ob->more != NULL)	998	more = 0;
886	{	999	}
887	free_object2 (ob->more, free_inventory);
888	ob->more = NULL;
889	}
890		1000
891	if (ob->inv)	1001	if (inv)
892	{	1002	{
893	/* Only if the space blocks everything do we not process -	1003	/* Only if the space blocks everything do we not process -
894	* if some form of movemnt is allowed, let objects	1004	* if some form of movement is allowed, let objects
895	* drop on that space.	1005	* drop on that space.
896	*/	1006	*/
897	if (free_inventory || ob->map == NULL	1007	if (free_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
898	|| ob->map->in_memory != MAP_IN_MEMORY	1008	{
899	|| (GET_MAP_MOVE_BLOCK (ob->map, ob->x, ob->y) == MOVE_ALL))	1009	object *op = inv;
900	{
901	op = ob->inv;
902		1010
903	while (op != NULL)	1011	while (op)
904	{	1012	{
905	tmp = op->below;	1013	object *tmp = op->below;
906	remove_ob (op);	1014	op->free (free_inventory);
907	free_object2 (op, free_inventory);
908	op = tmp;	1015	op = tmp;
909	}	1016	}
910	}	1017	}
911	else	1018	else
912	{ /* Put objects in inventory onto this space */	1019	{ /* Put objects in inventory onto this space */
913	op = ob->inv;	1020	object *op = inv;
914		1021
915	while (op != NULL)	1022	while (op)
916	{	1023	{
917	tmp = op->below;	1024	object *tmp = op->below;
		1025
918	remove_ob (op);	1026	remove_ob (op);
919		1027
920	if (QUERY_FLAG (op, FLAG_STARTEQUIP)	1028	if (QUERY_FLAG (op, FLAG_STARTEQUIP)
921	|| QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE	1029	|| QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
922	|| op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))	1030	free_object (op);
923	free_object (op);	1031	else
924	else	1032	{
925	{	1033	op->x = x;
926	op->x = ob->x;	1034	op->y = y;
927	op->y = ob->y;
928	insert_ob_in_map (op, ob->map, NULL, 0); /* Insert in same map as the envir */	1035	insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */
929	}	1036	}
930		1037
931	op = tmp;	1038	op = tmp;
		1039	}
		1040	}
932	}	1041	}
933	}	1042
934	}	1043	// clear those pointers that likely might have circular references to us
		1044	owner = 0;
		1045	enemy = 0;
		1046	attacked_by = 0;
935		1047
936	/* Remove object from the active list */	1048	/* Remove object from the active list */
937	ob->speed = 0;	1049	speed = 0;
938	update_ob_speed (ob);	1050	update_ob_speed (this);
939		1051
940	SET_FLAG (ob, FLAG_FREED);	1052	unlink ();
941	ob->count = 0;
942		1053
943	/* Remove this object from the list of used objects */	1054	mortals.push_back (this);
944	if (ob->prev == NULL)
945	{
946	objects = ob->next;
947
948	if (objects != NULL)
949	objects->prev = NULL;
950	}
951	else
952	{
953	ob->prev->next = ob->next;
954
955	if (ob->next != NULL)
956	ob->next->prev = ob->prev;
957	}
958
959	free_key_values (ob);
960
961	/* Now link it with the free_objects list: */
962	ob->prev = 0;
963	ob->next = 0;
964
965	delete ob;
966	}	1055	}
967		1056
968	/*	1057	/*
969	* sub_weight() recursively (outwards) subtracts a number from the	1058	* sub_weight() recursively (outwards) subtracts a number from the
970	* weight of an object (and what is carried by it's environment(s)).	1059	* weight of an object (and what is carried by it's environment(s)).
971	*/	1060	*/
972		1061
		1062	void
973	void sub_weight (object *op, signed long weight) {	1063	sub_weight (object *op, signed long weight)
		1064	{
974	while (op != NULL) {	1065	while (op != NULL)
		1066	{
975	if (op->type == CONTAINER) {	1067	if (op->type == CONTAINER)
976	weight=(signed long)(weight*(100-op->stats.Str)/100);	1068	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
977	}	1069
978	op->carrying-=weight;	1070	op->carrying -= weight;
979	op = op->env;	1071	op = op->env;
980	}	1072	}
981	}	1073	}
982		1074
983	/* remove_ob(op):	1075	/* remove_ob(op):
984	* This function removes the object op from the linked list of objects	1076	* This function removes the object op from the linked list of objects
985	* which it is currently tied to. When this function is done, the	1077	* which it is currently tied to. When this function is done, the
…		…
987	* environment, the x and y coordinates will be updated to	1079	* environment, the x and y coordinates will be updated to
988	* the previous environment.	1080	* the previous environment.
989	* Beware: This function is called from the editor as well!	1081	* Beware: This function is called from the editor as well!
990	*/	1082	*/
991		1083
		1084	void
992	void remove_ob(object *op) {	1085	remove_ob (object *op)
		1086	{
993	object *tmp,*last=NULL;	1087	object *tmp, *last = 0;
994	object *otmp;	1088	object *otmp;
		1089
995	tag_t tag;	1090	tag_t tag;
996	int check_walk_off;	1091	int check_walk_off;
997	mapstruct *m;	1092	mapstruct *m;
		1093
998	sint16 x,y;	1094	sint16 x, y;
999
1000		1095
1001	if(QUERY_FLAG(op,FLAG_REMOVED)) {	1096	if (QUERY_FLAG (op, FLAG_REMOVED))
1002	dump_object(op);	1097	return;
1003	LOG(llevError,"Trying to remove removed object.\n%s\n",errmsg);
1004		1098
1005	/* Changed it to always dump core in this case. As has been learned
1006	* in the past, trying to recover from errors almost always
1007	* make things worse, and this is a real error here - something
1008	* that should not happen.
1009	* Yes, if this was a mission critical app, trying to do something
1010	* to recover may make sense, but that is because failure of the app
1011	* may have other disastrous problems. Cf runs out of a script
1012	* so is easily enough restarted without any real problems.
1013	* MSW 2001-07-01
1014	*/
1015	abort();
1016	}
1017	if(op->more!=NULL)
1018	remove_ob(op->more);
1019
1020	SET_FLAG(op, FLAG_REMOVED);	1099	SET_FLAG (op, FLAG_REMOVED);
1021		1100
		1101	if (op->more != NULL)
		1102	remove_ob (op->more);
		1103
1022	/*	1104	/*
1023	* In this case, the object to be removed is in someones	1105	* In this case, the object to be removed is in someones
1024	* inventory.	1106	* inventory.
1025	*/	1107	*/
1026	if(op->env!=NULL) {	1108	if (op->env != NULL)
		1109	{
1027	if(op->nrof)	1110	if (op->nrof)
1028	sub_weight(op->env, op->weight*op->nrof);	1111	sub_weight (op->env, op->weight * op->nrof);
1029	else	1112	else
1030	sub_weight(op->env, op->weight+op->carrying);	1113	sub_weight (op->env, op->weight + op->carrying);
1031		1114
1032	/* NO_FIX_PLAYER is set when a great many changes are being	1115	/* NO_FIX_PLAYER is set when a great many changes are being
1033	* made to players inventory. If set, avoiding the call	1116	* made to players inventory. If set, avoiding the call
1034	* to save cpu time.	1117	* to save cpu time.
1035	*/	1118	*/
1036	if ((otmp=is_player_inv(op->env))!=NULL && otmp->contr &&	1119	if ((otmp = is_player_inv (op->env)) != NULL && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1037	!QUERY_FLAG(otmp,FLAG_NO_FIX_PLAYER))
1038	fix_player(otmp);	1120	fix_player (otmp);
1039		1121
1040	if(op->above!=NULL)	1122	if (op->above != NULL)
1041	op->above->below=op->below;	1123	op->above->below = op->below;
1042	else	1124	else
1043	op->env->inv=op->below;	1125	op->env->inv = op->below;
1044		1126
1045	if(op->below!=NULL)	1127	if (op->below != NULL)
1046	op->below->above=op->above;	1128	op->below->above = op->above;
1047		1129
1048	/* we set up values so that it could be inserted into	1130	/* we set up values so that it could be inserted into
1049	* the map, but we don't actually do that - it is up	1131	* the map, but we don't actually do that - it is up
1050	* to the caller to decide what we want to do.	1132	* to the caller to decide what we want to do.
1051	*/	1133	*/
1052	op->x=op->env->x,op->y=op->env->y;	1134	op->x = op->env->x, op->y = op->env->y;
1053	op->map=op->env->map;	1135	op->map = op->env->map;
1054	op->above=NULL,op->below=NULL;	1136	op->above = NULL, op->below = NULL;
1055	op->env=NULL;	1137	op->env = NULL;
		1138	}
		1139	else if (op->map)
		1140	{
		1141	x = op->x;
		1142	y = op->y;
		1143	m = get_map_from_coord (op->map, &x, &y);
		1144
		1145	if (!m)
		1146	{
		1147	LOG (llevError, "remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n",
		1148	op->map->path, op->x, op->y);
		1149	/* in old days, we used to set x and y to 0 and continue.
		1150	* it seems if we get into this case, something is probablye
		1151	* screwed up and should be fixed.
		1152	*/
		1153	abort ();
		1154	}
		1155
		1156	if (op->map != m)
		1157	LOG (llevDebug, "remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n",
		1158	op->map->path, m->path, op->x, op->y, x, y);
		1159
		1160	/* Re did the following section of code - it looks like it had
		1161	* lots of logic for things we no longer care about
		1162	*/
		1163
		1164	/* link the object above us */
		1165	if (op->above)
		1166	op->above->below = op->below;
		1167	else
		1168	SET_MAP_TOP (m, x, y, op->below); /* we were top, set new top */
		1169
		1170	/* Relink the object below us, if there is one */
		1171	if (op->below)
		1172	op->below->above = op->above;
		1173	else
		1174	{
		1175	/* Nothing below, which means we need to relink map object for this space
		1176	* use translated coordinates in case some oddness with map tiling is
		1177	* evident
		1178	*/
		1179	if (GET_MAP_OB (m, x, y) != op)
		1180	{
		1181	dump_object (op);
		1182	LOG (llevError,
		1183	"remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom?\n%s\n", errmsg);
		1184	dump_object (GET_MAP_OB (m, x, y));
		1185	LOG (llevError, "%s\n", errmsg);
		1186	}
		1187
		1188	SET_MAP_OB (m, x, y, op->above); /* goes on above it. */
		1189	}
		1190
		1191	op->above = 0;
		1192	op->below = 0;
		1193
		1194	if (op->map->in_memory == MAP_SAVING)
1056	return;	1195	return;
1057	}
1058		1196
1059	/* If we get here, we are removing it from a map */
1060	if (op->map == NULL) return;
1061
1062	x = op->x;
1063	y = op->y;
1064	m = get_map_from_coord(op->map, &x, &y);
1065
1066	if (!m) {
1067	LOG(llevError,"remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n",
1068	op->map->path, op->x, op->y);
1069	/* in old days, we used to set x and y to 0 and continue.
1070	* it seems if we get into this case, something is probablye
1071	* screwed up and should be fixed.
1072	*/
1073	abort();
1074	}
1075	if (op->map != m) {
1076	LOG(llevDebug,"remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n",
1077	op->map->path, m->path, op->x, op->y, x, y);
1078	}
1079
1080	/* Re did the following section of code - it looks like it had
1081	* lots of logic for things we no longer care about
1082	*/
1083
1084	/* link the object above us */
1085	if (op->above)
1086	op->above->below=op->below;
1087	else
1088	SET_MAP_TOP(m,x,y,op->below); /* we were top, set new top */
1089
1090	/* Relink the object below us, if there is one */
1091	if(op->below) {
1092	op->below->above=op->above;
1093	} else {
1094	/* Nothing below, which means we need to relink map object for this space
1095	* use translated coordinates in case some oddness with map tiling is
1096	* evident
1097	*/
1098	if(GET_MAP_OB(m,x,y)!=op) {
1099	dump_object(op);
1100	LOG(llevError,"remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom?\n%s\n", errmsg);
1101	dump_object(GET_MAP_OB(m,x,y));
1102	LOG(llevError,"%s\n",errmsg);
1103	}
1104	SET_MAP_OB(m,x,y,op->above); /* goes on above it. */
1105	}
1106	op->above=NULL;
1107	op->below=NULL;
1108
1109	if (op->map->in_memory == MAP_SAVING)
1110	return;
1111
1112	tag = op->count;	1197	tag = op->count;
1113	check_walk_off = ! QUERY_FLAG (op, FLAG_NO_APPLY);	1198	check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY);
		1199
1114	for(tmp=GET_MAP_OB(m,x,y);tmp!=NULL;tmp=tmp->above) {	1200	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)
		1201	{
1115	/* No point updating the players look faces if he is the object	1202	/* No point updating the players look faces if he is the object
1116	* being removed.	1203	* being removed.
1117	*/	1204	*/
1118		1205
1119	if(tmp->type==PLAYER && tmp!=op) {	1206	if (tmp->type == PLAYER && tmp != op)
		1207	{
1120	/* If a container that the player is currently using somehow gets	1208	/* If a container that the player is currently using somehow gets
1121	* removed (most likely destroyed), update the player view	1209	* removed (most likely destroyed), update the player view
1122	* appropriately.	1210	* appropriately.
1123	*/	1211	*/
1124	if (tmp->container==op) {	1212	if (tmp->container == op)
		1213	{
1125	CLEAR_FLAG(op, FLAG_APPLIED);	1214	CLEAR_FLAG (op, FLAG_APPLIED);
1126	tmp->container=NULL;	1215	tmp->container = NULL;
		1216	}
		1217
		1218	tmp->contr->socket.update_look = 1;
1127	}	1219	}
1128	tmp->contr->socket.update_look=1;	1220
1129	}
1130	/* See if player moving off should effect something */	1221	/* See if player moving off should effect something */
1131	if (check_walk_off && ((op->move_type & tmp->move_off) &&	1222	if (check_walk_off && ((op->move_type & tmp->move_off) && (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1132	(op->move_type & ~tmp->move_off & ~tmp->move_block)==0)) {	1223	{
1133
1134	move_apply(tmp, op, NULL);	1224	move_apply (tmp, op, NULL);
		1225
1135	if (was_destroyed (op, tag)) {	1226	if (was_destroyed (op, tag))
		1227	{
1136	LOG (llevError, "BUG: remove_ob(): name %s, archname %s destroyed "	1228	LOG (llevError, "BUG: remove_ob(): name %s, archname %s destroyed " "leaving object\n", &tmp->name, &tmp->arch->name);
1137	"leaving object\n", &tmp->name, &tmp->arch->name);	1229	}
1138	}	1230	}
1139	}
1140		1231
1141	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */	1232	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1142		1233
1143	if(tmp->above == tmp)	1234	if (tmp->above == tmp)
1144	tmp->above = NULL;	1235	tmp->above = NULL;
		1236
1145	last=tmp;	1237	last = tmp;
1146	}	1238	}
		1239
1147	/* last == NULL of there are no objects on this space */	1240	/* last == NULL of there are no objects on this space */
1148	if (last==NULL) {	1241	if (last == NULL)
		1242	{
1149	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,	1243	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1150	* we could preserve the flags (GET_MAP_FLAGS), but update_position figures	1244	* we could preserve the flags (GET_MAP_FLAGS), but update_position figures
1151	* those out anyways, and if there are any flags set right now, they won't	1245	* those out anyways, and if there are any flags set right now, they won't
1152	* be correct anyways.	1246	* be correct anyways.
1153	*/	1247	*/
1154	SET_MAP_FLAGS(op->map, op->x, op->y, P_NEED_UPDATE);	1248	SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE);
1155	update_position(op->map, op->x, op->y);	1249	update_position (op->map, op->x, op->y);
1156	}	1250	}
1157	else	1251	else
1158	update_object(last, UP_OBJ_REMOVE);	1252	update_object (last, UP_OBJ_REMOVE);
1159		1253
1160	if(QUERY_FLAG(op,FLAG_BLOCKSVIEW)|| (op->glow_radius != 0))	1254	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0))
1161	update_all_los(op->map, op->x, op->y);	1255	update_all_los (op->map, op->x, op->y);
1162		1256	}
1163	}	1257	}
1164		1258
1165	/*	1259	/*
1166	* merge_ob(op,top):	1260	* merge_ob(op,top):
1167	*	1261	*
1168	* This function goes through all objects below and including top, and	1262	* This function goes through all objects below and including top, and
1169	* merges op to the first matching object.	1263	* merges op to the first matching object.
1170	* If top is NULL, it is calculated.	1264	* If top is NULL, it is calculated.
1171	* Returns pointer to object if it succeded in the merge, otherwise NULL	1265	* Returns pointer to object if it succeded in the merge, otherwise NULL
1172	*/	1266	*/
1173		1267	object *
1174	object *merge_ob(object *op, object *top) {	1268	merge_ob (object *op, object *top)
		1269	{
1175	if(!op->nrof)	1270	if (!op->nrof)
1176	return 0;	1271	return 0;
		1272
1177	if(top==NULL)	1273	if (top == NULL)
1178	for(top=op;top!=NULL&&top->above!=NULL;top=top->above);	1274	for (top = op; top != NULL && top->above != NULL; top = top->above);
		1275
1179	for(;top!=NULL;top=top->below) {	1276	for (; top != NULL; top = top->below)
		1277	{
1180	if(top==op)	1278	if (top == op)
1181	continue;	1279	continue;
1182	if (CAN_MERGE(op,top))	1280	if (CAN_MERGE (op, top))
1183	{	1281	{
1184	top->nrof+=op->nrof;	1282	top->nrof += op->nrof;
		1283
1185	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/	1284	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/
1186	op->weight = 0; /* Don't want any adjustements now */	1285	op->weight = 0; /* Don't want any adjustements now */
1187	remove_ob(op);	1286	remove_ob (op);
1188	free_object(op);	1287	free_object (op);
1189	return top;	1288	return top;
1190	}	1289	}
1191	}	1290	}
		1291
1192	return NULL;	1292	return 0;
1193	}	1293	}
1194		1294
1195	/*	1295	/*
1196	* same as insert_ob_in_map except it handle separate coordinates and do a clean	1296	* same as insert_ob_in_map except it handle separate coordinates and do a clean
1197	* job preparing multi-part monsters	1297	* job preparing multi-part monsters
1198	*/	1298	*/
		1299	object *
1199	object *insert_ob_in_map_at(object *op, mapstruct *m, object *originator, int flag, int x, int y){	1300	insert_ob_in_map_at (object *op, mapstruct *m, object *originator, int flag, int x, int y)
		1301	{
1200	object* tmp;	1302	object *tmp;
		1303
1201	if (op->head)	1304	if (op->head)
1202	op=op->head;	1305	op = op->head;
		1306
1203	for (tmp=op;tmp;tmp=tmp->more){	1307	for (tmp = op; tmp; tmp = tmp->more)
		1308	{
1204	tmp->x=x+tmp->arch->clone.x;	1309	tmp->x = x + tmp->arch->clone.x;
1205	tmp->y=y+tmp->arch->clone.y;	1310	tmp->y = y + tmp->arch->clone.y;
1206	}	1311	}
		1312
1207	return insert_ob_in_map (op, m, originator, flag);	1313	return insert_ob_in_map (op, m, originator, flag);
1208	}	1314	}
1209		1315
1210	/*	1316	/*
1211	* insert_ob_in_map (op, map, originator, flag):	1317	* insert_ob_in_map (op, map, originator, flag):
1212	* This function inserts the object in the two-way linked list	1318	* This function inserts the object in the two-way linked list
…		…
1226	* new object if 'op' was merged with other object	1332	* new object if 'op' was merged with other object
1227	* NULL if 'op' was destroyed	1333	* NULL if 'op' was destroyed
1228	* just 'op' otherwise	1334	* just 'op' otherwise
1229	*/	1335	*/
1230		1336
		1337	object *
1231	object *insert_ob_in_map (object *op, mapstruct *m, object *originator, int flag)	1338	insert_ob_in_map (object *op, mapstruct *m, object *originator, int flag)
1232	{	1339	{
1233	object *tmp, *top, *floor=NULL;	1340	object *tmp, *top, *floor = NULL;
1234	sint16 x,y;	1341	sint16 x, y;
1235		1342
1236	if (QUERY_FLAG (op, FLAG_FREED)) {	1343	if (QUERY_FLAG (op, FLAG_FREED))
		1344	{
1237	LOG (llevError, "Trying to insert freed object!\n");	1345	LOG (llevError, "Trying to insert freed object!\n");
		1346	return NULL;
		1347	}
		1348
		1349	if (m == NULL)
		1350	{
		1351	dump_object (op);
		1352	LOG (llevError, "Trying to insert in null-map!\n%s\n", errmsg);
		1353	return op;
		1354	}
		1355
		1356	if (out_of_map (m, op->x, op->y))
		1357	{
		1358	dump_object (op);
		1359	LOG (llevError, "Trying to insert object outside the map.\n%s\n", errmsg);
		1360	#ifdef MANY_CORES
		1361	/* Better to catch this here, as otherwise the next use of this object
		1362	* is likely to cause a crash. Better to find out where it is getting
		1363	* improperly inserted.
		1364	*/
		1365	abort ();
		1366	#endif
		1367	return op;
		1368	}
		1369
		1370	if (!QUERY_FLAG (op, FLAG_REMOVED))
		1371	{
		1372	dump_object (op);
		1373	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", errmsg);
		1374	return op;
		1375	}
		1376
		1377	if (op->more != NULL)
		1378	{
		1379	/* The part may be on a different map. */
		1380
		1381	object *more = op->more;
		1382
		1383	/* We really need the caller to normalize coordinates - if
		1384	* we set the map, that doesn't work if the location is within
		1385	* a map and this is straddling an edge. So only if coordinate
		1386	* is clear wrong do we normalize it.
		1387	*/
		1388	if (OUT_OF_REAL_MAP (more->map, more->x, more->y))
		1389	more->map = get_map_from_coord (m, &more->x, &more->y);
		1390	else if (!more->map)
		1391	{
		1392	/* For backwards compatibility - when not dealing with tiled maps,
		1393	* more->map should always point to the parent.
		1394	*/
		1395	more->map = m;
		1396	}
		1397
		1398	if (insert_ob_in_map (more, more->map, originator, flag) == NULL)
		1399	{
		1400	if (!op->head)
		1401	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
		1402
		1403	return NULL;
		1404	}
		1405	}
		1406
		1407	CLEAR_FLAG (op, FLAG_REMOVED);
		1408
		1409	/* Ideally, the caller figures this out. However, it complicates a lot
		1410	* of areas of callers (eg, anything that uses find_free_spot would now
		1411	* need extra work
		1412	*/
		1413	op->map = get_map_from_coord (m, &op->x, &op->y);
		1414	x = op->x;
		1415	y = op->y;
		1416
		1417	/* this has to be done after we translate the coordinates.
		1418	*/
		1419	if (op->nrof && !(flag & INS_NO_MERGE))
		1420	for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)
		1421	if (CAN_MERGE (op, tmp))
		1422	{
		1423	op->nrof += tmp->nrof;
		1424	remove_ob (tmp);
		1425	free_object (tmp);
		1426	}
		1427
		1428	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
		1429	CLEAR_FLAG (op, FLAG_INV_LOCKED);
		1430
		1431	if (!QUERY_FLAG (op, FLAG_ALIVE))
		1432	CLEAR_FLAG (op, FLAG_NO_STEAL);
		1433
		1434	if (flag & INS_BELOW_ORIGINATOR)
		1435	{
		1436	if (originator->map != op->map || originator->x != op->x || originator->y != op->y)
		1437	{
		1438	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");
		1439	abort ();
		1440	}
		1441
		1442	op->above = originator;
		1443	op->below = originator->below;
		1444
		1445	if (op->below)
		1446	op->below->above = op;
		1447	else
		1448	SET_MAP_OB (op->map, op->x, op->y, op);
		1449
		1450	/* since *below* originator, no need to update top */
		1451	originator->below = op;
		1452	}
		1453	else
		1454	{
		1455	/* If there are other objects, then */
		1456	if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL))
		1457	{
		1458	object *last = NULL;
		1459
		1460	/*
		1461	* If there are multiple objects on this space, we do some trickier handling.
		1462	* We've already dealt with merging if appropriate.
		1463	* Generally, we want to put the new object on top. But if
		1464	* flag contains INS_ABOVE_FLOOR_ONLY, once we find the last
		1465	* floor, we want to insert above that and no further.
		1466	* Also, if there are spell objects on this space, we stop processing
		1467	* once we get to them. This reduces the need to traverse over all of
		1468	* them when adding another one - this saves quite a bit of cpu time
		1469	* when lots of spells are cast in one area. Currently, it is presumed
		1470	* that flying non pickable objects are spell objects.
		1471	*/
		1472
		1473	while (top != NULL)
		1474	{
		1475	if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))
		1476	floor = top;
		1477
		1478	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))
		1479	{
		1480	/* We insert above top, so we want this object below this */
		1481	top = top->below;
		1482	break;
		1483	}
		1484
		1485	last = top;
		1486	top = top->above;
		1487	}
		1488
		1489	/* Don't want top to be NULL, so set it to the last valid object */
		1490	top = last;
		1491
		1492	/* We let update_position deal with figuring out what the space
		1493	* looks like instead of lots of conditions here.
		1494	* makes things faster, and effectively the same result.
		1495	*/
		1496
		1497	/* Have object 'fall below' other objects that block view.
		1498	* Unless those objects are exits, type 66
		1499	* If INS_ON_TOP is used, don't do this processing
		1500	* Need to find the object that in fact blocks view, otherwise
		1501	* stacking is a bit odd.
		1502	*/
		1503	if (!(flag & INS_ON_TOP) &&
		1504	(get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_BLOCKSVIEW) && (op->face && !op->face->visibility))
		1505	{
		1506	for (last = top; last != floor; last = last->below)
		1507	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
		1508	break;
		1509	/* Check to see if we found the object that blocks view,
		1510	* and make sure we have a below pointer for it so that
		1511	* we can get inserted below this one, which requires we
		1512	* set top to the object below us.
		1513	*/
		1514	if (last && last->below && last != floor)
		1515	top = last->below;
		1516	}
		1517	} /* If objects on this space */
		1518
		1519	if (flag & INS_MAP_LOAD)
		1520	top = GET_MAP_TOP (op->map, op->x, op->y);
		1521
		1522	if (flag & INS_ABOVE_FLOOR_ONLY)
		1523	top = floor;
		1524
		1525	/* Top is the object that our object (op) is going to get inserted above.
		1526	*/
		1527
		1528	/* First object on this space */
		1529	if (!top)
		1530	{
		1531	op->above = GET_MAP_OB (op->map, op->x, op->y);
		1532
		1533	if (op->above)
		1534	op->above->below = op;
		1535
		1536	op->below = NULL;
		1537	SET_MAP_OB (op->map, op->x, op->y, op);
		1538	}
		1539	else
		1540	{ /* get inserted into the stack above top */
		1541	op->above = top->above;
		1542
		1543	if (op->above)
		1544	op->above->below = op;
		1545
		1546	op->below = top;
		1547	top->above = op;
		1548	}
		1549
		1550	if (op->above == NULL)
		1551	SET_MAP_TOP (op->map, op->x, op->y, op);
		1552	} /* else not INS_BELOW_ORIGINATOR */
		1553
		1554	if (op->type == PLAYER)
		1555	op->contr->do_los = 1;
		1556
		1557	/* If we have a floor, we know the player, if any, will be above
		1558	* it, so save a few ticks and start from there.
		1559	*/
		1560	if (!(flag & INS_MAP_LOAD))
		1561	for (tmp = floor ? floor : GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
		1562	if (tmp->type == PLAYER)
		1563	tmp->contr->socket.update_look = 1;
		1564
		1565	/* If this object glows, it may affect lighting conditions that are
		1566	* visible to others on this map. But update_all_los is really
		1567	* an inefficient way to do this, as it means los for all players
		1568	* on the map will get recalculated. The players could very well
		1569	* be far away from this change and not affected in any way -
		1570	* this should get redone to only look for players within range,
		1571	* or just updating the P_NEED_UPDATE for spaces within this area
		1572	* of effect may be sufficient.
		1573	*/
		1574	if (MAP_DARKNESS (op->map) && (op->glow_radius != 0))
		1575	update_all_los (op->map, op->x, op->y);
		1576
		1577	/* updates flags (blocked, alive, no magic, etc) for this map space */
		1578	update_object (op, UP_OBJ_INSERT);
		1579
		1580	/* Don't know if moving this to the end will break anything. However,
		1581	* we want to have update_look set above before calling this.
		1582	*
		1583	* check_move_on() must be after this because code called from
		1584	* check_move_on() depends on correct map flags (so functions like
		1585	* blocked() and wall() work properly), and these flags are updated by
		1586	* update_object().
		1587	*/
		1588
		1589	/* if this is not the head or flag has been passed, don't check walk on status */
		1590	if (!(flag & INS_NO_WALK_ON) && !op->head)
		1591	{
		1592	if (check_move_on (op, originator))
1238	return NULL;	1593	return NULL;
1239	}
1240	if(m==NULL) {
1241	dump_object(op);
1242	LOG(llevError,"Trying to insert in null-map!\n%s\n",errmsg);
1243	return op;
1244	}
1245	if(out_of_map(m,op->x,op->y)) {
1246	dump_object(op);
1247	LOG(llevError,"Trying to insert object outside the map.\n%s\n", errmsg);
1248	#ifdef MANY_CORES
1249	/* Better to catch this here, as otherwise the next use of this object
1250	* is likely to cause a crash. Better to find out where it is getting
1251	* improperly inserted.
1252	*/
1253	abort();
1254	#endif
1255	return op;
1256	}
1257	if(!QUERY_FLAG(op,FLAG_REMOVED)) {
1258	dump_object(op);
1259	LOG(llevError,"Trying to insert (map) inserted object.\n%s\n", errmsg);
1260	return op;
1261	}
1262	if(op->more!=NULL) {
1263	/* The part may be on a different map. */
1264		1594
1265	object *more = op->more;
1266
1267	/* We really need the caller to normalize coordinates - if
1268	* we set the map, that doesn't work if the location is within
1269	* a map and this is straddling an edge. So only if coordinate
1270	* is clear wrong do we normalize it.
1271	*/
1272	if (OUT_OF_REAL_MAP(more->map, more->x, more->y)) {
1273	more->map = get_map_from_coord(m, &more->x, &more->y);
1274	} else if (!more->map) {
1275	/* For backwards compatibility - when not dealing with tiled maps,
1276	* more->map should always point to the parent.
1277	*/
1278	more->map = m;
1279	}
1280
1281	if (insert_ob_in_map(more, more->map, originator, flag) == NULL) {
1282	if ( ! op->head)
1283	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1284	return NULL;
1285	}
1286	}
1287	CLEAR_FLAG(op,FLAG_REMOVED);
1288
1289	/* Ideally, the caller figures this out. However, it complicates a lot
1290	* of areas of callers (eg, anything that uses find_free_spot would now
1291	* need extra work
1292	*/
1293	op->map=get_map_from_coord(m, &op->x, &op->y);
1294	x = op->x;
1295	y = op->y;
1296
1297	/* this has to be done after we translate the coordinates.
1298	*/
1299	if(op->nrof && !(flag & INS_NO_MERGE)) {
1300	for(tmp=GET_MAP_OB(op->map,x,y);tmp!=NULL;tmp=tmp->above)
1301	if (CAN_MERGE(op,tmp)) {
1302	op->nrof+=tmp->nrof;
1303	remove_ob(tmp);
1304	free_object(tmp);
1305	}
1306	}
1307
1308	CLEAR_FLAG(op,FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1309	CLEAR_FLAG(op, FLAG_INV_LOCKED);
1310	if (!QUERY_FLAG(op, FLAG_ALIVE))
1311	CLEAR_FLAG(op, FLAG_NO_STEAL);
1312
1313	if (flag & INS_BELOW_ORIGINATOR) {
1314	if (originator->map != op->map || originator->x != op->x ||
1315	originator->y != op->y) {
1316	LOG(llevError,"insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");
1317	abort();
1318	}
1319	op->above = originator;
1320	op->below = originator->below;
1321	if (op->below) op->below->above = op;
1322	else SET_MAP_OB(op->map, op->x, op->y, op);
1323	/* since *below* originator, no need to update top */
1324	originator->below = op;
1325	} else {
1326	/* If there are other objects, then */
1327	if((! (flag & INS_MAP_LOAD)) && ((top=GET_MAP_OB(op->map,op->x,op->y))!=NULL)) {
1328	object *last=NULL;
1329	/*
1330	* If there are multiple objects on this space, we do some trickier handling.
1331	* We've already dealt with merging if appropriate.
1332	* Generally, we want to put the new object on top. But if
1333	* flag contains INS_ABOVE_FLOOR_ONLY, once we find the last
1334	* floor, we want to insert above that and no further.
1335	* Also, if there are spell objects on this space, we stop processing
1336	* once we get to them. This reduces the need to traverse over all of
1337	* them when adding another one - this saves quite a bit of cpu time
1338	* when lots of spells are cast in one area. Currently, it is presumed
1339	* that flying non pickable objects are spell objects.
1340	*/
1341
1342	while (top != NULL) {
1343	if (QUERY_FLAG(top, FLAG_IS_FLOOR) ||
1344	QUERY_FLAG(top, FLAG_OVERLAY_FLOOR)) floor = top;
1345	if (QUERY_FLAG(top, FLAG_NO_PICK)
1346	&& (top->move_type & (MOVE_FLY_LOW |MOVE_FLY_HIGH))
1347	&& !QUERY_FLAG(top, FLAG_IS_FLOOR))
1348	{
1349	/* We insert above top, so we want this object below this */
1350	top=top->below;
1351	break;
1352	}
1353	last = top;
1354	top = top->above;
1355	}
1356	/* Don't want top to be NULL, so set it to the last valid object */
1357	top = last;
1358
1359	/* We let update_position deal with figuring out what the space
1360	* looks like instead of lots of conditions here.
1361	* makes things faster, and effectively the same result.
1362	*/
1363
1364	/* Have object 'fall below' other objects that block view.
1365	* Unless those objects are exits, type 66
1366	* If INS_ON_TOP is used, don't do this processing
1367	* Need to find the object that in fact blocks view, otherwise
1368	* stacking is a bit odd.
1369	*/
1370	if (!(flag & INS_ON_TOP) &&
1371	(get_map_flags(op->map, NULL, op->x, op->y, NULL, NULL) & P_BLOCKSVIEW) &&
1372	(op->face && !op->face->visibility)) {
1373	for (last=top; last != floor; last=last->below)
1374	if (QUERY_FLAG(last, FLAG_BLOCKSVIEW)&&(last->type != EXIT)) break;
1375	/* Check to see if we found the object that blocks view,
1376	* and make sure we have a below pointer for it so that
1377	* we can get inserted below this one, which requires we
1378	* set top to the object below us.
1379	*/
1380	if (last && last->below && last != floor) top=last->below;
1381	}
1382	} /* If objects on this space */
1383	if (flag & INS_MAP_LOAD)
1384	top = GET_MAP_TOP(op->map,op->x,op->y);
1385	if (flag & INS_ABOVE_FLOOR_ONLY) top = floor;
1386
1387	/* Top is the object that our object (op) is going to get inserted above.
1388	*/
1389
1390	/* First object on this space */
1391	if (!top) {
1392	op->above = GET_MAP_OB(op->map, op->x, op->y);
1393	if (op->above) op->above->below = op;
1394	op->below = NULL;
1395	SET_MAP_OB(op->map, op->x, op->y, op);
1396	} else { /* get inserted into the stack above top */
1397	op->above = top->above;
1398	if (op->above) op->above->below = op;
1399	op->below = top;
1400	top->above = op;
1401	}
1402	if (op->above==NULL)
1403	SET_MAP_TOP(op->map,op->x, op->y, op);
1404	} /* else not INS_BELOW_ORIGINATOR */
1405
1406	if(op->type==PLAYER)
1407	op->contr->do_los=1;
1408
1409	/* If we have a floor, we know the player, if any, will be above
1410	* it, so save a few ticks and start from there.
1411	*/
1412	if (!(flag & INS_MAP_LOAD))
1413	for(tmp=floor?floor:GET_MAP_OB(op->map,op->x,op->y);tmp!=NULL;tmp=tmp->above) {
1414	if (tmp->type == PLAYER)
1415	tmp->contr->socket.update_look=1;
1416	}
1417
1418	/* If this object glows, it may affect lighting conditions that are
1419	* visible to others on this map. But update_all_los is really
1420	* an inefficient way to do this, as it means los for all players
1421	* on the map will get recalculated. The players could very well
1422	* be far away from this change and not affected in any way -
1423	* this should get redone to only look for players within range,
1424	* or just updating the P_NEED_UPDATE for spaces within this area
1425	* of effect may be sufficient.
1426	*/
1427	if(MAP_DARKNESS(op->map) && (op->glow_radius != 0))
1428	update_all_los(op->map, op->x, op->y);
1429
1430
1431	/* updates flags (blocked, alive, no magic, etc) for this map space */
1432	update_object(op,UP_OBJ_INSERT);
1433
1434
1435	/* Don't know if moving this to the end will break anything. However,
1436	* we want to have update_look set above before calling this.
1437	*
1438	* check_move_on() must be after this because code called from
1439	* check_move_on() depends on correct map flags (so functions like
1440	* blocked() and wall() work properly), and these flags are updated by
1441	* update_object().
1442	*/
1443
1444	/* if this is not the head or flag has been passed, don't check walk on status */
1445
1446	if (!(flag & INS_NO_WALK_ON) && !op->head) {
1447	if (check_move_on(op, originator))
1448	return NULL;
1449
1450	/* If we are a multi part object, lets work our way through the check	1595	/* If we are a multi part object, lets work our way through the check
1451	* walk on's.	1596	* walk on's.
1452	*/	1597	*/
1453	for (tmp=op->more; tmp!=NULL; tmp=tmp->more)	1598	for (tmp = op->more; tmp != NULL; tmp = tmp->more)
1454	if (check_move_on (tmp, originator))	1599	if (check_move_on (tmp, originator))
1455	return NULL;	1600	return NULL;
1456	}	1601	}
		1602
1457	return op;	1603	return op;
1458	}	1604	}
1459		1605
1460	/* this function inserts an object in the map, but if it	1606	/* this function inserts an object in the map, but if it
1461	* finds an object of its own type, it'll remove that one first.	1607	* finds an object of its own type, it'll remove that one first.
1462	* op is the object to insert it under: supplies x and the map.	1608	* op is the object to insert it under: supplies x and the map.
1463	*/	1609	*/
		1610	void
1464	void replace_insert_ob_in_map(const char *arch_string, object *op) {	1611	replace_insert_ob_in_map (const char *arch_string, object *op)
		1612	{
1465	object *tmp;	1613	object *
1466	object *tmp1;	1614	tmp;
		1615	object *
		1616	tmp1;
1467		1617
1468	/* first search for itself and remove any old instances */	1618	/* first search for itself and remove any old instances */
1469		1619
1470	for(tmp=GET_MAP_OB(op->map,op->x,op->y); tmp!=NULL; tmp=tmp->above) {	1620	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
		1621	{
1471	if(!strcmp(tmp->arch->name,arch_string)) /* same archetype */ {	1622	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */
		1623	{
1472	remove_ob(tmp);	1624	remove_ob (tmp);
1473	free_object(tmp);	1625	free_object (tmp);
1474	}	1626	}
1475	}	1627	}
1476		1628
1477	tmp1=arch_to_object(find_archetype(arch_string));	1629	tmp1 = arch_to_object (archetype::find (arch_string));
1478		1630
1479		1631	tmp1->x = op->x;
1480	tmp1->x = op->x; tmp1->y = op->y;	1632	tmp1->y = op->y;
1481	insert_ob_in_map(tmp1,op->map,op,0);	1633	insert_ob_in_map (tmp1, op->map, op, 0);
1482	}	1634	}
1483		1635
1484	/*	1636	/*
1485	* get_split_ob(ob,nr) splits up ob into two parts. The part which	1637	* get_split_ob(ob,nr) splits up ob into two parts. The part which
1486	* is returned contains nr objects, and the remaining parts contains	1638	* is returned contains nr objects, and the remaining parts contains
1487	* the rest (or is removed and freed if that number is 0).	1639	* the rest (or is removed and freed if that number is 0).
1488	* On failure, NULL is returned, and the reason put into the	1640	* On failure, NULL is returned, and the reason put into the
1489	* global static errmsg array.	1641	* global static errmsg array.
1490	*/	1642	*/
1491		1643
		1644	object *
1492	object *get_split_ob(object *orig_ob, uint32 nr) {	1645	get_split_ob (object *orig_ob, uint32 nr)
1493	object *newob;	1646	{
		1647	object *
		1648	newob;
		1649	int
1494	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);	1650	is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1495		1651
1496	if(orig_ob->nrof<nr) {	1652	if (orig_ob->nrof < nr)
1497	sprintf(errmsg,"There are only %d %ss.",	1653	{
1498	orig_ob->nrof?orig_ob->nrof:1, &orig_ob->name);	1654	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1499	return NULL;	1655	return NULL;
1500	}	1656	}
		1657
1501	newob = object_create_clone(orig_ob);	1658	newob = object_create_clone (orig_ob);
		1659
1502	if((orig_ob->nrof-=nr)<1) {	1660	if ((orig_ob->nrof -= nr) < 1)
		1661	{
1503	if ( ! is_removed)	1662	if (!is_removed)
1504	remove_ob(orig_ob);	1663	remove_ob (orig_ob);
1505	free_object2(orig_ob, 1);	1664	free_object2 (orig_ob, 1);
1506	}	1665	}
1507	else if ( ! is_removed) {	1666	else if (!is_removed)
		1667	{
1508	if(orig_ob->env!=NULL)	1668	if (orig_ob->env != NULL)
1509	sub_weight (orig_ob->env,orig_ob->weight*nr);	1669	sub_weight (orig_ob->env, orig_ob->weight * nr);
1510	if (orig_ob->env == NULL && orig_ob->map->in_memory!=MAP_IN_MEMORY) {	1670	if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)
		1671	{
1511	strcpy(errmsg, "Tried to split object whose map is not in memory.");	1672	strcpy (errmsg, "Tried to split object whose map is not in memory.");
1512	LOG(llevDebug,
1513	"Error, Tried to split object whose map is not in memory.\n");	1673	LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n");
1514	return NULL;	1674	return NULL;
1515	}	1675	}
1516	}	1676	}
		1677
1517	newob->nrof=nr;	1678	newob->nrof = nr;
1518		1679
1519	return newob;	1680	return newob;
1520	}	1681	}
1521		1682
1522	/*	1683	/*
1523	* decrease_ob_nr(object, number) decreases a specified number from	1684	* decrease_ob_nr(object, number) decreases a specified number from
1524	* the amount of an object. If the amount reaches 0, the object	1685	* the amount of an object. If the amount reaches 0, the object
1525	* is subsequently removed and freed.	1686	* is subsequently removed and freed.
1526	*	1687	*
1527	* Return value: 'op' if something is left, NULL if the amount reached 0	1688	* Return value: 'op' if something is left, NULL if the amount reached 0
1528	*/	1689	*/
1529		1690
		1691	object *
1530	object *decrease_ob_nr (object *op, uint32 i)	1692	decrease_ob_nr (object *op, uint32 i)
1531	{	1693	{
1532	object *tmp;	1694	object *tmp;
1533	player *pl;	1695	player *pl;
1534		1696
1535	if (i == 0) /* objects with op->nrof require this check */	1697	if (i == 0) /* objects with op->nrof require this check */
1536	return op;	1698	return op;
1537		1699
1538	if (i > op->nrof)	1700	if (i > op->nrof)
1539	i = op->nrof;	1701	i = op->nrof;
1540		1702
1541	if (QUERY_FLAG (op, FLAG_REMOVED))	1703	if (QUERY_FLAG (op, FLAG_REMOVED))
		1704	op->nrof -= i;
		1705	else if (op->env != NULL)
		1706	{
		1707	/* is this object in the players inventory, or sub container
		1708	* therein?
		1709	*/
		1710	tmp = is_player_inv (op->env);
		1711	/* nope. Is this a container the player has opened?
		1712	* If so, set tmp to that player.
		1713	* IMO, searching through all the players will mostly
		1714	* likely be quicker than following op->env to the map,
		1715	* and then searching the map for a player.
		1716	*/
		1717	if (!tmp)
		1718	{
		1719	for (pl = first_player; pl; pl = pl->next)
		1720	if (pl->ob->container == op->env)
		1721	break;
		1722	if (pl)
		1723	tmp = pl->ob;
		1724	else
		1725	tmp = NULL;
		1726	}
		1727
		1728	if (i < op->nrof)
		1729	{
		1730	sub_weight (op->env, op->weight * i);
		1731	op->nrof -= i;
		1732	if (tmp)
		1733	{
		1734	esrv_send_item (tmp, op);
		1735	}
		1736	}
		1737	else
		1738	{
		1739	remove_ob (op);
		1740	op->nrof = 0;
		1741	if (tmp)
		1742	{
		1743	esrv_del_item (tmp->contr, op->count);
		1744	}
		1745	}
1542	{	1746	}
		1747	else
		1748	{
		1749	object *above = op->above;
		1750
		1751	if (i < op->nrof)
1543	op->nrof -= i;	1752	op->nrof -= i;
1544	}	1753	else
1545	else if (op->env != NULL)
1546	{
1547	/* is this object in the players inventory, or sub container
1548	* therein?
1549	*/
1550	tmp = is_player_inv (op->env);
1551	/* nope. Is this a container the player has opened?
1552	* If so, set tmp to that player.
1553	* IMO, searching through all the players will mostly
1554	* likely be quicker than following op->env to the map,
1555	* and then searching the map for a player.
1556	*/
1557	if (!tmp) {
1558	for (pl=first_player; pl; pl=pl->next)
1559	if (pl->ob->container == op->env) break;
1560	if (pl) tmp=pl->ob;
1561	else tmp=NULL;
1562	}	1754	{
1563
1564	if (i < op->nrof) {
1565	sub_weight (op->env, op->weight * i);
1566	op->nrof -= i;
1567	if (tmp) {
1568	esrv_send_item(tmp, op);
1569	}
1570	} else {
1571	remove_ob (op);	1755	remove_ob (op);
1572	op->nrof = 0;	1756	op->nrof = 0;
1573	if (tmp) {
1574	esrv_del_item(tmp->contr, op->count);
1575	}	1757	}
1576	}
1577	}
1578	else
1579	{
1580	object *above = op->above;
1581		1758
1582	if (i < op->nrof) {
1583	op->nrof -= i;
1584	} else {
1585	remove_ob (op);
1586	op->nrof = 0;
1587	}
1588	/* Since we just removed op, op->above is null */	1759	/* Since we just removed op, op->above is null */
1589	for (tmp = above; tmp != NULL; tmp = tmp->above)	1760	for (tmp = above; tmp != NULL; tmp = tmp->above)
1590	if (tmp->type == PLAYER) {	1761	if (tmp->type == PLAYER)
		1762	{
1591	if (op->nrof)	1763	if (op->nrof)
1592	esrv_send_item(tmp, op);	1764	esrv_send_item (tmp, op);
1593	else	1765	else
1594	esrv_del_item(tmp->contr, op->count);	1766	esrv_del_item (tmp->contr, op->count);
1595	}	1767	}
1596	}	1768	}
1597		1769
1598	if (op->nrof) {	1770	if (op->nrof)
1599	return op;	1771	return op;
1600	} else {	1772	else
		1773	{
1601	free_object (op);	1774	free_object (op);
1602	return NULL;	1775	return NULL;
1603	}	1776	}
1604	}	1777	}
1605		1778
1606	/*	1779	/*
1607	* add_weight(object, weight) adds the specified weight to an object,	1780	* add_weight(object, weight) adds the specified weight to an object,
1608	* and also updates how much the environment(s) is/are carrying.	1781	* and also updates how much the environment(s) is/are carrying.
1609	*/	1782	*/
1610		1783
		1784	void
1611	void add_weight (object *op, signed long weight) {	1785	add_weight (object *op, signed long weight)
		1786	{
1612	while (op!=NULL) {	1787	while (op != NULL)
		1788	{
1613	if (op->type == CONTAINER) {	1789	if (op->type == CONTAINER)
1614	weight=(signed long)(weight*(100-op->stats.Str)/100);	1790	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1615	}	1791
1616	op->carrying+=weight;	1792	op->carrying += weight;
1617	op=op->env;	1793	op = op->env;
1618	}	1794	}
1619	}	1795	}
1620		1796
1621	/*	1797	/*
1622	* insert_ob_in_ob(op,environment):	1798	* insert_ob_in_ob(op,environment):
1623	* This function inserts the object op in the linked list	1799	* This function inserts the object op in the linked list
…		…
1630	*	1806	*
1631	* The function returns now pointer to inserted item, and return value can	1807	* The function returns now pointer to inserted item, and return value can
1632	* be != op, if items are merged. -Tero	1808	* be != op, if items are merged. -Tero
1633	*/	1809	*/
1634		1810
		1811	object *
1635	object *insert_ob_in_ob(object *op,object *where) {	1812	insert_ob_in_ob (object *op, object *where)
1636	object *tmp, *otmp;	1813	{
		1814	object *
		1815	tmp, *
		1816	otmp;
1637		1817
1638	if(!QUERY_FLAG(op,FLAG_REMOVED)) {	1818	if (!QUERY_FLAG (op, FLAG_REMOVED))
		1819	{
1639	dump_object(op);	1820	dump_object (op);
1640	LOG(llevError,"Trying to insert (ob) inserted object.\n%s\n", errmsg);	1821	LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", errmsg);
1641	return op;	1822	return op;
1642	}	1823	}
		1824
1643	if(where==NULL) {	1825	if (where == NULL)
		1826	{
1644	dump_object(op);	1827	dump_object (op);
1645	LOG(llevError,"Trying to put object in NULL.\n%s\n", errmsg);	1828	LOG (llevError, "Trying to put object in NULL.\n%s\n", errmsg);
1646	return op;	1829	return op;
1647	}	1830	}
		1831
1648	if (where->head) {	1832	if (where->head)
1649	LOG(llevDebug,	1833	{
1650	"Warning: Tried to insert object wrong part of multipart object.\n");	1834	LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n");
1651	where = where->head;	1835	where = where->head;
1652	}	1836	}
		1837
1653	if (op->more) {	1838	if (op->more)
		1839	{
1654	LOG(llevError, "Tried to insert multipart object %s (%d)\n",	1840	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1655	&op->name, op->count);
1656	return op;	1841	return op;
1657	}	1842	}
		1843
1658	CLEAR_FLAG(op, FLAG_OBJ_ORIGINAL);	1844	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1659	CLEAR_FLAG(op, FLAG_REMOVED);	1845	CLEAR_FLAG (op, FLAG_REMOVED);
1660	if(op->nrof) {	1846	if (op->nrof)
		1847	{
1661	for(tmp=where->inv;tmp!=NULL;tmp=tmp->below)	1848	for (tmp = where->inv; tmp != NULL; tmp = tmp->below)
1662	if ( CAN_MERGE(tmp,op) ) {	1849	if (CAN_MERGE (tmp, op))
		1850	{
1663	/* return the original object and remove inserted object	1851	/* return the original object and remove inserted object
1664	(client needs the original object) */	1852	(client needs the original object) */
1665	tmp->nrof += op->nrof;	1853	tmp->nrof += op->nrof;
1666	/* Weight handling gets pretty funky. Since we are adding to	1854	/* Weight handling gets pretty funky. Since we are adding to
1667	* tmp->nrof, we need to increase the weight.	1855	* tmp->nrof, we need to increase the weight.
1668	*/	1856	*/
1669	add_weight (where, op->weight*op->nrof);	1857	add_weight (where, op->weight * op->nrof);
1670	SET_FLAG(op, FLAG_REMOVED);	1858	SET_FLAG (op, FLAG_REMOVED);
1671	free_object(op); /* free the inserted object */	1859	free_object (op); /* free the inserted object */
1672	op = tmp;	1860	op = tmp;
1673	remove_ob (op); /* and fix old object's links */	1861	remove_ob (op); /* and fix old object's links */
1674	CLEAR_FLAG(op, FLAG_REMOVED);	1862	CLEAR_FLAG (op, FLAG_REMOVED);
1675	break;	1863	break;
1676	}	1864	}
1677		1865
1678	/* I assume combined objects have no inventory	1866	/* I assume combined objects have no inventory
1679	* We add the weight - this object could have just been removed	1867	* We add the weight - this object could have just been removed
1680	* (if it was possible to merge). calling remove_ob will subtract	1868	* (if it was possible to merge). calling remove_ob will subtract
1681	* the weight, so we need to add it in again, since we actually do	1869	* the weight, so we need to add it in again, since we actually do
1682	* the linking below	1870	* the linking below
1683	*/	1871	*/
1684	add_weight (where, op->weight*op->nrof);	1872	add_weight (where, op->weight * op->nrof);
		1873	}
1685	} else	1874	else
1686	add_weight (where, (op->weight+op->carrying));	1875	add_weight (where, (op->weight + op->carrying));
1687		1876
1688	otmp=is_player_inv(where);	1877	otmp = is_player_inv (where);
1689	if (otmp&&otmp->contr!=NULL) {	1878	if (otmp && otmp->contr != NULL)
		1879	{
1690	if (!QUERY_FLAG(otmp,FLAG_NO_FIX_PLAYER))	1880	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1691	fix_player(otmp);	1881	fix_player (otmp);
1692	}	1882	}
1693		1883
1694	op->map=NULL;	1884	op->map = NULL;
1695	op->env=where;	1885	op->env = where;
1696	op->above=NULL;	1886	op->above = NULL;
1697	op->below=NULL;	1887	op->below = NULL;
1698	op->x=0,op->y=0;	1888	op->x = 0, op->y = 0;
1699		1889
1700	/* reset the light list and los of the players on the map */	1890	/* reset the light list and los of the players on the map */
1701	if((op->glow_radius!=0)&&where->map)	1891	if ((op->glow_radius != 0) && where->map)
1702	{	1892	{
1703	#ifdef DEBUG_LIGHTS	1893	#ifdef DEBUG_LIGHTS
1704	LOG(llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n",	1894	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1705	op->name);
1706	#endif /* DEBUG_LIGHTS */	1895	#endif /* DEBUG_LIGHTS */
		1896	if (MAP_DARKNESS (where->map))
1707	if (MAP_DARKNESS(where->map)) update_all_los(where->map, where->x, where->y);	1897	update_all_los (where->map, where->x, where->y);
1708	}	1898	}
1709		1899
1710	/* Client has no idea of ordering so lets not bother ordering it here.	1900	/* Client has no idea of ordering so lets not bother ordering it here.
1711	* It sure simplifies this function...	1901	* It sure simplifies this function...
1712	*/	1902	*/
1713	if (where->inv==NULL)	1903	if (where->inv == NULL)
1714	where->inv=op;	1904	where->inv = op;
1715	else {	1905	else
		1906	{
1716	op->below = where->inv;	1907	op->below = where->inv;
1717	op->below->above = op;	1908	op->below->above = op;
1718	where->inv = op;	1909	where->inv = op;
1719	}	1910	}
1720	return op;	1911	return op;
1721	}	1912	}
1722		1913
1723	/*	1914	/*
1724	* Checks if any objects has a move_type that matches objects	1915	* Checks if any objects has a move_type that matches objects
…		…
1739	* MSW 2001-07-08: Check all objects on space, not just those below	1930	* MSW 2001-07-08: Check all objects on space, not just those below
1740	* object being inserted. insert_ob_in_map may not put new objects	1931	* object being inserted. insert_ob_in_map may not put new objects
1741	* on top.	1932	* on top.
1742	*/	1933	*/
1743		1934
		1935	int
1744	int check_move_on (object *op, object *originator)	1936	check_move_on (object *op, object *originator)
1745	{	1937	{
1746	object *tmp;	1938	object *
1747	tag_t tag;	1939	tmp;
1748	mapstruct *m=op->map;	1940	tag_t
		1941	tag;
		1942	mapstruct *
		1943	m = op->map;
		1944	int
1749	int x=op->x, y=op->y;	1945	x = op->x, y = op->y;
1750	MoveType move_on, move_slow, move_block;
1751		1946
		1947	MoveType
		1948	move_on,
		1949	move_slow,
		1950	move_block;
		1951
1752	if(QUERY_FLAG(op,FLAG_NO_APPLY))	1952	if (QUERY_FLAG (op, FLAG_NO_APPLY))
1753	return 0;	1953	return 0;
1754		1954
1755	tag = op->count;	1955	tag = op->count;
1756		1956
1757	move_on = GET_MAP_MOVE_ON(op->map, op->x, op->y);	1957	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);
1758	move_slow = GET_MAP_MOVE_SLOW(op->map, op->x, op->y);	1958	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);
1759	move_block = GET_MAP_MOVE_BLOCK(op->map, op->x, op->y);	1959	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);
1760		1960
1761	/* if nothing on this space will slow op down or be applied,	1961	/* if nothing on this space will slow op down or be applied,
1762	* no need to do checking below. have to make sure move_type	1962	* no need to do checking below. have to make sure move_type
1763	* is set, as lots of objects don't have it set - we treat that	1963	* is set, as lots of objects don't have it set - we treat that
1764	* as walking.	1964	* as walking.
1765	*/	1965	*/
1766	if (op->move_type && !(op->move_type & move_on) && !(op->move_type & move_slow))	1966	if (op->move_type && !(op->move_type & move_on) && !(op->move_type & move_slow))
1767	return 0;	1967	return 0;
1768		1968
1769	/* This is basically inverse logic of that below - basically,	1969	/* This is basically inverse logic of that below - basically,
1770	* if the object can avoid the move on or slow move, they do so,	1970	* if the object can avoid the move on or slow move, they do so,
1771	* but can't do it if the alternate movement they are using is	1971	* but can't do it if the alternate movement they are using is
1772	* blocked. Logic on this seems confusing, but does seem correct.	1972	* blocked. Logic on this seems confusing, but does seem correct.
1773	*/	1973	*/
1774	if ((op->move_type & ~move_on & ~move_block) != 0 &&	1974	if ((op->move_type & ~move_on & ~move_block) != 0 && (op->move_type & ~move_slow & ~move_block) != 0)
1775	(op->move_type & ~move_slow & ~move_block) != 0) return 0;	1975	return 0;
1776		1976
1777	/* The objects have to be checked from top to bottom.	1977	/* The objects have to be checked from top to bottom.
1778	* Hence, we first go to the top:	1978	* Hence, we first go to the top:
1779	*/	1979	*/
1780		1980
1781	for (tmp=GET_MAP_OB(op->map, op->x, op->y); tmp!=NULL &&	1981	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL && tmp->above != NULL; tmp = tmp->above)
1782	tmp->above!=NULL; tmp=tmp->above) {	1982	{
1783	/* Trim the search when we find the first other spell effect	1983	/* Trim the search when we find the first other spell effect
1784	* this helps performance so that if a space has 50 spell objects,	1984	* this helps performance so that if a space has 50 spell objects,
1785	* we don't need to check all of them.	1985	* we don't need to check all of them.
1786	*/	1986	*/
1787	if ((tmp->move_type & MOVE_FLY_LOW) && QUERY_FLAG(tmp, FLAG_NO_PICK)) break;	1987	if ((tmp->move_type & MOVE_FLY_LOW) && QUERY_FLAG (tmp, FLAG_NO_PICK))
		1988	break;
		1989	}
		1990
		1991	for (; tmp; tmp = tmp->below)
1788	}	1992	{
1789	for(;tmp!=NULL; tmp=tmp->below) {	1993	if (tmp == op)
1790	if (tmp == op) continue; /* Can't apply yourself */	1994	continue; /* Can't apply yourself */
1791		1995
1792	/* Check to see if one of the movement types should be slowed down.	1996	/* Check to see if one of the movement types should be slowed down.
1793	* Second check makes sure that the movement types not being slowed	1997	* Second check makes sure that the movement types not being slowed
1794	* (~slow_move) is not blocked on this space - just because the	1998	* (~slow_move) is not blocked on this space - just because the
1795	* space doesn't slow down swimming (for example), if you can't actually	1999	* space doesn't slow down swimming (for example), if you can't actually
1796	* swim on that space, can't use it to avoid the penalty.	2000	* swim on that space, can't use it to avoid the penalty.
1797	*/	2001	*/
1798	if (!QUERY_FLAG(op, FLAG_WIZPASS)) {	2002	if (!QUERY_FLAG (op, FLAG_WIZPASS))
		2003	{
1799	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||	2004	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
1800	((op->move_type & tmp->move_slow) &&
1801	(op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0)) {	2005	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
		2006	{
1802		2007
1803	float diff;	2008	float
1804
1805	diff = tmp->move_slow_penalty*FABS(op->speed);	2009	diff = tmp->move_slow_penalty * FABS (op->speed);
		2010
1806	if (op->type == PLAYER) {	2011	if (op->type == PLAYER)
1807	if ((QUERY_FLAG(tmp, FLAG_IS_HILLY) && find_skill_by_number(op, SK_CLIMBING)) ||	2012	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||
1808	(QUERY_FLAG(tmp, FLAG_IS_WOODED) && find_skill_by_number(op, SK_WOODSMAN))) {	2013	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))
1809	diff /= 4.0;	2014	diff /= 4.0;
1810	}	2015
1811	}
1812	op->speed_left -= diff;	2016	op->speed_left -= diff;
1813	}	2017	}
1814	}	2018	}
1815		2019
1816	/* Basically same logic as above, except now for actual apply. */	2020	/* Basically same logic as above, except now for actual apply. */
1817	if ((!op->move_type && tmp->move_on & MOVE_WALK) ||	2021	if ((!op->move_type && tmp->move_on & MOVE_WALK) ||
1818	((op->move_type & tmp->move_on) &&
1819	(op->move_type & ~tmp->move_on & ~tmp->move_block)==0)) {	2022	((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))
1820		2023	{
1821	move_apply(tmp, op, originator);	2024	move_apply (tmp, op, originator);
		2025
1822	if (was_destroyed (op, tag))	2026	if (was_destroyed (op, tag))
1823	return 1;	2027	return 1;
1824		2028
1825	/* what the person/creature stepped onto has moved the object	2029	/* what the person/creature stepped onto has moved the object
1826	* someplace new. Don't process any further - if we did,	2030	* someplace new. Don't process any further - if we did,
1827	* have a feeling strange problems would result.	2031	* have a feeling strange problems would result.
1828	*/	2032	*/
1829	if (op->map != m || op->x != x || op->y != y) return 0;	2033	if (op->map != m || op->x != x || op->y != y)
		2034	return 0;
1830	}	2035	}
1831	}	2036	}
		2037
1832	return 0;	2038	return 0;
1833	}	2039	}
1834		2040
1835	/*	2041	/*
1836	* present_arch(arch, map, x, y) searches for any objects with	2042	* present_arch(arch, map, x, y) searches for any objects with
1837	* a matching archetype at the given map and coordinates.	2043	* a matching archetype at the given map and coordinates.
1838	* The first matching object is returned, or NULL if none.	2044	* The first matching object is returned, or NULL if none.
1839	*/	2045	*/
1840		2046
		2047	object *
1841	object *present_arch(const archetype *at, mapstruct *m, int x, int y) {	2048	present_arch (const archetype *at, mapstruct *m, int x, int y)
		2049	{
1842	object *tmp;	2050	object *
		2051	tmp;
		2052
1843	if(m==NULL || out_of_map(m,x,y)) {	2053	if (m == NULL || out_of_map (m, x, y))
		2054	{
1844	LOG(llevError,"Present_arch called outside map.\n");	2055	LOG (llevError, "Present_arch called outside map.\n");
1845	return NULL;	2056	return NULL;
1846	}	2057	}
1847	for(tmp=GET_MAP_OB(m,x,y); tmp != NULL; tmp = tmp->above)	2058	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)
1848	if(tmp->arch == at)	2059	if (tmp->arch == at)
1849	return tmp;	2060	return tmp;
1850	return NULL;	2061	return NULL;
1851	}	2062	}
1852		2063
1853	/*	2064	/*
1854	* present(type, map, x, y) searches for any objects with	2065	* present(type, map, x, y) searches for any objects with
1855	* a matching type variable at the given map and coordinates.	2066	* a matching type variable at the given map and coordinates.
1856	* The first matching object is returned, or NULL if none.	2067	* The first matching object is returned, or NULL if none.
1857	*/	2068	*/
1858		2069
		2070	object *
1859	object *present(unsigned char type,mapstruct *m, int x,int y) {	2071	present (unsigned char type, mapstruct *m, int x, int y)
		2072	{
1860	object *tmp;	2073	object *
		2074	tmp;
		2075
1861	if(out_of_map(m,x,y)) {	2076	if (out_of_map (m, x, y))
		2077	{
1862	LOG(llevError,"Present called outside map.\n");	2078	LOG (llevError, "Present called outside map.\n");
1863	return NULL;	2079	return NULL;
1864	}	2080	}
1865	for(tmp=GET_MAP_OB(m,x,y);tmp!=NULL;tmp=tmp->above)	2081	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)
1866	if(tmp->type==type)	2082	if (tmp->type == type)
1867	return tmp;	2083	return tmp;
1868	return NULL;	2084	return NULL;
1869	}	2085	}
1870		2086
1871	/*	2087	/*
1872	* present_in_ob(type, object) searches for any objects with	2088	* present_in_ob(type, object) searches for any objects with
1873	* a matching type variable in the inventory of the given object.	2089	* a matching type variable in the inventory of the given object.
1874	* The first matching object is returned, or NULL if none.	2090	* The first matching object is returned, or NULL if none.
1875	*/	2091	*/
1876		2092
		2093	object *
1877	object *present_in_ob(unsigned char type, const object *op) {	2094	present_in_ob (unsigned char type, const object *op)
		2095	{
1878	object *tmp;	2096	object *
		2097	tmp;
		2098
1879	for(tmp=op->inv;tmp!=NULL;tmp=tmp->below)	2099	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)
1880	if(tmp->type==type)	2100	if (tmp->type == type)
1881	return tmp;	2101	return tmp;
1882	return NULL;	2102	return NULL;
1883	}	2103	}
1884		2104
1885	/*	2105	/*
…		…
1895	* the object name, not the archetype name. this is so that the	2115	* the object name, not the archetype name. this is so that the
1896	* spell code can use one object type (force), but change it's name	2116	* spell code can use one object type (force), but change it's name
1897	* to be unique.	2117	* to be unique.
1898	*/	2118	*/
1899		2119
		2120	object *
1900	object *present_in_ob_by_name(int type, const char *str, const object *op) {	2121	present_in_ob_by_name (int type, const char *str, const object *op)
		2122	{
1901	object *tmp;	2123	object *
		2124	tmp;
1902		2125
1903	for(tmp=op->inv; tmp!=NULL; tmp=tmp->below) {	2126	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)
		2127	{
1904	if ((type==-1 || tmp->type==type) && (!strcmp(str, tmp->name)))	2128	if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name)))
1905	return tmp;	2129	return tmp;
1906	}	2130	}
1907	return NULL;	2131	return NULL;
1908	}	2132	}
1909		2133
1910	/*	2134	/*
1911	* present_arch_in_ob(archetype, object) searches for any objects with	2135	* present_arch_in_ob(archetype, object) searches for any objects with
1912	* a matching archetype in the inventory of the given object.	2136	* a matching archetype in the inventory of the given object.
1913	* The first matching object is returned, or NULL if none.	2137	* The first matching object is returned, or NULL if none.
1914	*/	2138	*/
1915		2139
		2140	object *
1916	object *present_arch_in_ob(const archetype *at, const object *op) {	2141	present_arch_in_ob (const archetype *at, const object *op)
		2142	{
1917	object *tmp;	2143	object *
		2144	tmp;
		2145
1918	for(tmp=op->inv;tmp!=NULL;tmp=tmp->below)	2146	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)
1919	if( tmp->arch == at)	2147	if (tmp->arch == at)
1920	return tmp;	2148	return tmp;
1921	return NULL;	2149	return NULL;
1922	}	2150	}
1923		2151
1924	/*	2152	/*
1925	* activate recursively a flag on an object inventory	2153	* activate recursively a flag on an object inventory
1926	*/	2154	*/
		2155	void
1927	void flag_inv(object*op, int flag){	2156	flag_inv (object *op, int flag)
		2157	{
1928	object *tmp;	2158	object *
		2159	tmp;
		2160
1929	if(op->inv)	2161	if (op->inv)
1930	for(tmp = op->inv; tmp != NULL; tmp = tmp->below){	2162	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)
		2163	{
1931	SET_FLAG(tmp, flag);	2164	SET_FLAG (tmp, flag);
1932	flag_inv(tmp,flag);	2165	flag_inv (tmp, flag);
1933	}	2166	}
1934	}/*	2167	} /*
1935	* desactivate recursively a flag on an object inventory	2168	* desactivate recursively a flag on an object inventory
1936	*/	2169	*/
		2170	void
1937	void unflag_inv(object*op, int flag){	2171	unflag_inv (object *op, int flag)
		2172	{
1938	object *tmp;	2173	object *
		2174	tmp;
		2175
1939	if(op->inv)	2176	if (op->inv)
1940	for(tmp = op->inv; tmp != NULL; tmp = tmp->below){	2177	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)
		2178	{
1941	CLEAR_FLAG(tmp, flag);	2179	CLEAR_FLAG (tmp, flag);
1942	unflag_inv(tmp,flag);	2180	unflag_inv (tmp, flag);
1943	}	2181	}
1944	}	2182	}
1945		2183
1946	/*	2184	/*
1947	* set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in	2185	* set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in
1948	* all it's inventory (recursively).	2186	* all it's inventory (recursively).
1949	* If checksums are used, a player will get set_cheat called for	2187	* If checksums are used, a player will get set_cheat called for
1950	* him/her-self and all object carried by a call to this function.	2188	* him/her-self and all object carried by a call to this function.
1951	*/	2189	*/
1952		2190
		2191	void
1953	void set_cheat(object *op) {	2192	set_cheat (object *op)
		2193	{
1954	SET_FLAG(op, FLAG_WAS_WIZ);	2194	SET_FLAG (op, FLAG_WAS_WIZ);
1955	flag_inv(op, FLAG_WAS_WIZ);	2195	flag_inv (op, FLAG_WAS_WIZ);
1956	}	2196	}
1957		2197
1958	/*	2198	/*
1959	* find_free_spot(object, map, x, y, start, stop) will search for	2199	* find_free_spot(object, map, x, y, start, stop) will search for
1960	* a spot at the given map and coordinates which will be able to contain	2200	* a spot at the given map and coordinates which will be able to contain
…		…
1975	* to know if the space in question will block the object. We can't use	2215	* to know if the space in question will block the object. We can't use
1976	* the archetype because that isn't correct if the monster has been	2216	* the archetype because that isn't correct if the monster has been
1977	* customized, changed states, etc.	2217	* customized, changed states, etc.
1978	*/	2218	*/
1979		2219
		2220	int
1980	int find_free_spot(const object *ob, mapstruct *m,int x,int y,int start,int stop) {	2221	find_free_spot (const object *ob, mapstruct *m, int x, int y, int start, int stop)
		2222	{
		2223	int
		2224	i,
1981	int i,index=0, flag;	2225	index = 0, flag;
		2226	static int
1982	static int altern[SIZEOFFREE];	2227	altern[SIZEOFFREE];
1983		2228
1984	for(i=start;i<stop;i++) {	2229	for (i = start; i < stop; i++)
		2230	{
1985	flag = ob_blocked(ob,m,x+freearr_x[i],y+freearr_y[i]);	2231	flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]);
1986	if(!flag)	2232	if (!flag)
1987	altern[index++]=i;	2233	altern[index++] = i;
1988		2234
1989	/* Basically, if we find a wall on a space, we cut down the search size.	2235	/* Basically, if we find a wall on a space, we cut down the search size.
1990	* In this way, we won't return spaces that are on another side of a wall.	2236	* In this way, we won't return spaces that are on another side of a wall.
1991	* This mostly work, but it cuts down the search size in all directions -	2237	* This mostly work, but it cuts down the search size in all directions -
1992	* if the space being examined only has a wall to the north and empty	2238	* if the space being examined only has a wall to the north and empty
1993	* spaces in all the other directions, this will reduce the search space	2239	* spaces in all the other directions, this will reduce the search space
1994	* to only the spaces immediately surrounding the target area, and	2240	* to only the spaces immediately surrounding the target area, and
1995	* won't look 2 spaces south of the target space.	2241	* won't look 2 spaces south of the target space.
1996	*/	2242	*/
1997	else if ((flag & AB_NO_PASS) && maxfree[i]<stop)	2243	else if ((flag & AB_NO_PASS) && maxfree[i] < stop)
1998	stop=maxfree[i];	2244	stop = maxfree[i];
1999	}	2245	}
2000	if(!index) return -1;	2246	if (!index)
		2247	return -1;
2001	return altern[RANDOM()%index];	2248	return altern[RANDOM () % index];
2002	}	2249	}
2003		2250
2004	/*	2251	/*
2005	* find_first_free_spot(archetype, mapstruct, x, y) works like	2252	* find_first_free_spot(archetype, mapstruct, x, y) works like
2006	* find_free_spot(), but it will search max number of squares.	2253	* find_free_spot(), but it will search max number of squares.
2007	* But it will return the first available spot, not a random choice.	2254	* But it will return the first available spot, not a random choice.
2008	* Changed 0.93.2: Have it return -1 if there is no free spot available.	2255	* Changed 0.93.2: Have it return -1 if there is no free spot available.
2009	*/	2256	*/
2010		2257
		2258	int
2011	int find_first_free_spot(const object *ob, mapstruct *m,int x,int y) {	2259	find_first_free_spot (const object *ob, mapstruct *m, int x, int y)
		2260	{
		2261	int
2012	int i;	2262	i;
		2263
2013	for(i=0;i<SIZEOFFREE;i++) {	2264	for (i = 0; i < SIZEOFFREE; i++)
		2265	{
2014	if(!ob_blocked(ob,m,x+freearr_x[i],y+freearr_y[i]))	2266	if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]))
2015	return i;	2267	return i;
2016	}	2268	}
2017	return -1;	2269	return -1;
2018	}	2270	}
2019		2271
2020	/*	2272	/*
2021	* The function permute(arr, begin, end) randomly reorders the array	2273	* The function permute(arr, begin, end) randomly reorders the array
2022	* arr[begin..end-1].	2274	* arr[begin..end-1].
2023	*/	2275	*/
		2276	static void
2024	static void permute(int *arr, int begin, int end)	2277	permute (int *arr, int begin, int end)
2025	{	2278	{
2026	int i, j, tmp, len;	2279	int
		2280	i,
		2281	j,
		2282	tmp,
		2283	len;
2027		2284
2028	len = end-begin;	2285	len = end - begin;
2029	for(i = begin; i < end; i++)	2286	for (i = begin; i < end; i++)
2030	{	2287	{
2031	j = begin+RANDOM()%len;	2288	j = begin + RANDOM () % len;
2032		2289
2033	tmp = arr[i];	2290	tmp = arr[i];
2034	arr[i] = arr[j];	2291	arr[i] = arr[j];
2035	arr[j] = tmp;	2292	arr[j] = tmp;
2036	}	2293	}
2037	}	2294	}
2038		2295
2039	/* new function to make monster searching more efficient, and effective!	2296	/* new function to make monster searching more efficient, and effective!
2040	* This basically returns a randomized array (in the passed pointer) of	2297	* This basically returns a randomized array (in the passed pointer) of
2041	* the spaces to find monsters. In this way, it won't always look for	2298	* the spaces to find monsters. In this way, it won't always look for
2042	* monsters to the north first. However, the size of the array passed	2299	* monsters to the north first. However, the size of the array passed
2043	* covers all the spaces, so within that size, all the spaces within	2300	* covers all the spaces, so within that size, all the spaces within
2044	* the 3x3 area will be searched, just not in a predictable order.	2301	* the 3x3 area will be searched, just not in a predictable order.
2045	*/	2302	*/
		2303	void
2046	void get_search_arr(int *search_arr)	2304	get_search_arr (int *search_arr)
2047	{	2305	{
		2306	int
2048	int i;	2307	i;
2049		2308
2050	for(i = 0; i < SIZEOFFREE; i++)	2309	for (i = 0; i < SIZEOFFREE; i++)
2051	{	2310	{
2052	search_arr[i] = i;	2311	search_arr[i] = i;
2053	}	2312	}
2054		2313
2055	permute(search_arr, 1, SIZEOFFREE1+1);	2314	permute (search_arr, 1, SIZEOFFREE1 + 1);
2056	permute(search_arr, SIZEOFFREE1+1, SIZEOFFREE2+1);	2315	permute (search_arr, SIZEOFFREE1 + 1, SIZEOFFREE2 + 1);
2057	permute(search_arr, SIZEOFFREE2+1, SIZEOFFREE);	2316	permute (search_arr, SIZEOFFREE2 + 1, SIZEOFFREE);
2058	}	2317	}
2059		2318
2060	/*	2319	/*
2061	* find_dir(map, x, y, exclude) will search some close squares in the	2320	* find_dir(map, x, y, exclude) will search some close squares in the
2062	* given map at the given coordinates for live objects.	2321	* given map at the given coordinates for live objects.
…		…
2068	* is actually want is going to try and move there. We need this info	2327	* is actually want is going to try and move there. We need this info
2069	* because we have to know what movement the thing looking to move	2328	* because we have to know what movement the thing looking to move
2070	* there is capable of.	2329	* there is capable of.
2071	*/	2330	*/
2072		2331
		2332	int
2073	int find_dir(mapstruct *m, int x, int y, object *exclude) {	2333	find_dir (mapstruct *m, int x, int y, object *exclude)
		2334	{
		2335	int
		2336	i,
2074	int i,max=SIZEOFFREE, mflags;	2337	max = SIZEOFFREE, mflags;
		2338
2075	sint16 nx, ny;	2339	sint16 nx, ny;
2076	object *tmp;	2340	object *
		2341	tmp;
2077	mapstruct *mp;	2342	mapstruct *
		2343	mp;
		2344
2078	MoveType blocked, move_type;	2345	MoveType blocked, move_type;
2079		2346
2080	if (exclude && exclude->head) {	2347	if (exclude && exclude->head)
		2348	{
2081	exclude = exclude->head;	2349	exclude = exclude->head;
2082	move_type = exclude->move_type;	2350	move_type = exclude->move_type;
2083	} else {	2351	}
		2352	else
		2353	{
2084	/* If we don't have anything, presume it can use all movement types. */	2354	/* If we don't have anything, presume it can use all movement types. */
2085	move_type=MOVE_ALL;	2355	move_type = MOVE_ALL;
		2356	}
		2357
		2358	for (i = 1; i < max; i++)
2086	}	2359	{
2087
2088	for(i=1;i<max;i++) {
2089	mp = m;	2360	mp = m;
2090	nx = x + freearr_x[i];	2361	nx = x + freearr_x[i];
2091	ny = y + freearr_y[i];	2362	ny = y + freearr_y[i];
2092		2363
2093	mflags = get_map_flags(m, &mp, nx, ny, &nx, &ny);	2364	mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);
2094	if (mflags & P_OUT_OF_MAP) {	2365	if (mflags & P_OUT_OF_MAP)
		2366	{
2095	max = maxfree[i];	2367	max = maxfree[i];
		2368	}
2096	} else {	2369	else
		2370	{
2097	blocked = GET_MAP_MOVE_BLOCK(mp, nx, ny);	2371	blocked = GET_MAP_MOVE_BLOCK (mp, nx, ny);
2098		2372
2099	if ((move_type & blocked) == move_type) {	2373	if ((move_type & blocked) == move_type)
		2374	{
2100	max=maxfree[i];	2375	max = maxfree[i];
		2376	}
2101	} else if (mflags & P_IS_ALIVE) {	2377	else if (mflags & P_IS_ALIVE)
		2378	{
2102	for (tmp=GET_MAP_OB(mp,nx,ny); tmp!= NULL; tmp=tmp->above) {	2379	for (tmp = GET_MAP_OB (mp, nx, ny); tmp != NULL; tmp = tmp->above)
2103	if ((QUERY_FLAG(tmp,FLAG_MONSTER) || tmp->type==PLAYER) &&	2380	{
2104	(tmp != exclude ||(tmp->head && tmp->head != exclude))) {	2381	if ((QUERY_FLAG (tmp, FLAG_MONSTER) || tmp->type == PLAYER) && (tmp != exclude || (tmp->head && tmp->head != exclude)))
		2382	{
2105	break;	2383	break;
2106	}	2384	}
2107	}	2385	}
2108	if(tmp) {	2386	if (tmp)
		2387	{
2109	return freedir[i];	2388	return freedir[i];
2110	}	2389	}
2111	}	2390	}
2112	}	2391	}
2113	}	2392	}
2114	return 0;	2393	return 0;
2115	}	2394	}
2116		2395
2117	/*	2396	/*
2118	* distance(object 1, object 2) will return the square of the	2397	* distance(object 1, object 2) will return the square of the
2119	* distance between the two given objects.	2398	* distance between the two given objects.
2120	*/	2399	*/
2121		2400
		2401	int
2122	int distance(const object *ob1, const object *ob2) {	2402	distance (const object *ob1, const object *ob2)
		2403	{
2123	int i;	2404	int
2124	i= (ob1->x - ob2->x)*(ob1->x - ob2->x)+	2405	i;
2125	(ob1->y - ob2->y)*(ob1->y - ob2->y);	2406
		2407	i = (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);
2126	return i;	2408	return i;
2127	}	2409	}
2128		2410
2129	/*	2411	/*
2130	* find_dir_2(delta-x,delta-y) will return a direction in which	2412	* find_dir_2(delta-x,delta-y) will return a direction in which
2131	* an object which has subtracted the x and y coordinates of another	2413	* an object which has subtracted the x and y coordinates of another
2132	* object, needs to travel toward it.	2414	* object, needs to travel toward it.
2133	*/	2415	*/
2134		2416
		2417	int
2135	int find_dir_2(int x, int y) {	2418	find_dir_2 (int x, int y)
		2419	{
2136	int q;	2420	int
		2421	q;
2137		2422
2138	if(y)	2423	if (y)
2139	q=x*100/y;	2424	q = x * 100 / y;
2140	else if (x)	2425	else if (x)
2141	q= -300*x;	2426	q = -300 * x;
2142	else	2427	else
2143	return 0;	2428	return 0;
2144		2429
2145	if(y>0) {	2430	if (y > 0)
		2431	{
2146	if(q < -242)	2432	if (q < -242)
2147	return 3 ;	2433	return 3;
2148	if (q < -41)	2434	if (q < -41)
2149	return 2 ;	2435	return 2;
2150	if (q < 41)	2436	if (q < 41)
2151	return 1 ;	2437	return 1;
2152	if (q < 242)	2438	if (q < 242)
2153	return 8 ;	2439	return 8;
2154	return 7 ;	2440	return 7;
2155	}	2441	}
2156		2442
2157	if (q < -242)	2443	if (q < -242)
2158	return 7 ;	2444	return 7;
2159	if (q < -41)	2445	if (q < -41)
2160	return 6 ;	2446	return 6;
2161	if (q < 41)	2447	if (q < 41)
2162	return 5 ;	2448	return 5;
2163	if (q < 242)	2449	if (q < 242)
2164	return 4 ;	2450	return 4;
2165		2451
2166	return 3 ;	2452	return 3;
2167	}	2453	}
2168		2454
2169	/*	2455	/*
2170	* absdir(int): Returns a number between 1 and 8, which represent	2456	* absdir(int): Returns a number between 1 and 8, which represent
2171	* the "absolute" direction of a number (it actually takes care of	2457	* the "absolute" direction of a number (it actually takes care of
2172	* "overflow" in previous calculations of a direction).	2458	* "overflow" in previous calculations of a direction).
2173	*/	2459	*/
2174		2460
		2461	int
2175	int absdir(int d) {	2462	absdir (int d)
2176	while(d<1) d+=8;	2463	{
2177	while(d>8) d-=8;	2464	while (d < 1)
		2465	d += 8;
		2466	while (d > 8)
		2467	d -= 8;
2178	return d;	2468	return d;
2179	}	2469	}
2180		2470
2181	/*	2471	/*
2182	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is	2472	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is
2183	* between two directions (which are expected to be absolute (see absdir())	2473	* between two directions (which are expected to be absolute (see absdir())
2184	*/	2474	*/
2185		2475
		2476	int
2186	int dirdiff(int dir1, int dir2) {	2477	dirdiff (int dir1, int dir2)
		2478	{
2187	int d;	2479	int
		2480	d;
		2481
2188	d = abs(dir1 - dir2);	2482	d = abs (dir1 - dir2);
2189	if(d>4)	2483	if (d > 4)
2190	d = 8 - d;	2484	d = 8 - d;
2191	return d;	2485	return d;
2192	}	2486	}
2193		2487
2194	/* peterm:	2488	/* peterm:
…		…
2199	* direction 4, 14, or 16 to get back to where we are.	2493	* direction 4, 14, or 16 to get back to where we are.
2200	* Moved from spell_util.c to object.c with the other related direction	2494	* Moved from spell_util.c to object.c with the other related direction
2201	* functions.	2495	* functions.
2202	*/	2496	*/
2203		2497
		2498	int
2204	int reduction_dir[SIZEOFFREE][3] = {	2499	reduction_dir[SIZEOFFREE][3] = {
2205	{0,0,0}, /* 0 */	2500	{0, 0, 0}, /* 0 */
2206	{0,0,0}, /* 1 */	2501	{0, 0, 0}, /* 1 */
2207	{0,0,0}, /* 2 */	2502	{0, 0, 0}, /* 2 */
2208	{0,0,0}, /* 3 */	2503	{0, 0, 0}, /* 3 */
2209	{0,0,0}, /* 4 */	2504	{0, 0, 0}, /* 4 */
2210	{0,0,0}, /* 5 */	2505	{0, 0, 0}, /* 5 */
2211	{0,0,0}, /* 6 */	2506	{0, 0, 0}, /* 6 */
2212	{0,0,0}, /* 7 */	2507	{0, 0, 0}, /* 7 */
2213	{0,0,0}, /* 8 */	2508	{0, 0, 0}, /* 8 */
2214	{8,1,2}, /* 9 */	2509	{8, 1, 2}, /* 9 */
2215	{1,2,-1}, /* 10 */	2510	{1, 2, -1}, /* 10 */
2216	{2,10,12}, /* 11 */	2511	{2, 10, 12}, /* 11 */
2217	{2,3,-1}, /* 12 */	2512	{2, 3, -1}, /* 12 */
2218	{2,3,4}, /* 13 */	2513	{2, 3, 4}, /* 13 */
2219	{3,4,-1}, /* 14 */	2514	{3, 4, -1}, /* 14 */
2220	{4,14,16}, /* 15 */	2515	{4, 14, 16}, /* 15 */
2221	{5,4,-1}, /* 16 */	2516	{5, 4, -1}, /* 16 */
2222	{4,5,6}, /* 17 */	2517	{4, 5, 6}, /* 17 */
2223	{6,5,-1}, /* 18 */	2518	{6, 5, -1}, /* 18 */
2224	{6,20,18}, /* 19 */	2519	{6, 20, 18}, /* 19 */
2225	{7,6,-1}, /* 20 */	2520	{7, 6, -1}, /* 20 */
2226	{6,7,8}, /* 21 */	2521	{6, 7, 8}, /* 21 */
2227	{7,8,-1}, /* 22 */	2522	{7, 8, -1}, /* 22 */
2228	{8,22,24}, /* 23 */	2523	{8, 22, 24}, /* 23 */
2229	{8,1,-1}, /* 24 */	2524	{8, 1, -1}, /* 24 */
2230	{24,9,10}, /* 25 */	2525	{24, 9, 10}, /* 25 */
2231	{9,10,-1}, /* 26 */	2526	{9, 10, -1}, /* 26 */
2232	{10,11,-1}, /* 27 */	2527	{10, 11, -1}, /* 27 */
2233	{27,11,29}, /* 28 */	2528	{27, 11, 29}, /* 28 */
2234	{11,12,-1}, /* 29 */	2529	{11, 12, -1}, /* 29 */
2235	{12,13,-1}, /* 30 */	2530	{12, 13, -1}, /* 30 */
2236	{12,13,14}, /* 31 */	2531	{12, 13, 14}, /* 31 */
2237	{13,14,-1}, /* 32 */	2532	{13, 14, -1}, /* 32 */
2238	{14,15,-1}, /* 33 */	2533	{14, 15, -1}, /* 33 */
2239	{33,15,35}, /* 34 */	2534	{33, 15, 35}, /* 34 */
2240	{16,15,-1}, /* 35 */	2535	{16, 15, -1}, /* 35 */
2241	{17,16,-1}, /* 36 */	2536	{17, 16, -1}, /* 36 */
2242	{18,17,16}, /* 37 */	2537	{18, 17, 16}, /* 37 */
2243	{18,17,-1}, /* 38 */	2538	{18, 17, -1}, /* 38 */
2244	{18,19,-1}, /* 39 */	2539	{18, 19, -1}, /* 39 */
2245	{41,19,39}, /* 40 */	2540	{41, 19, 39}, /* 40 */
2246	{19,20,-1}, /* 41 */	2541	{19, 20, -1}, /* 41 */
2247	{20,21,-1}, /* 42 */	2542	{20, 21, -1}, /* 42 */
2248	{20,21,22}, /* 43 */	2543	{20, 21, 22}, /* 43 */
2249	{21,22,-1}, /* 44 */	2544	{21, 22, -1}, /* 44 */
2250	{23,22,-1}, /* 45 */	2545	{23, 22, -1}, /* 45 */
2251	{45,47,23}, /* 46 */	2546	{45, 47, 23}, /* 46 */
2252	{23,24,-1}, /* 47 */	2547	{23, 24, -1}, /* 47 */
2253	{24,9,-1}}; /* 48 */	2548	{24, 9, -1}
		2549	}; /* 48 */
2254		2550
2255	/* Recursive routine to step back and see if we can	2551	/* Recursive routine to step back and see if we can
2256	* find a path to that monster that we found. If not,	2552	* find a path to that monster that we found. If not,
2257	* we don't bother going toward it. Returns 1 if we	2553	* we don't bother going toward it. Returns 1 if we
2258	* can see a direct way to get it	2554	* can see a direct way to get it
2259	* Modified to be map tile aware -.MSW	2555	* Modified to be map tile aware -.MSW
2260	*/	2556	*/
2261
2262		2557
		2558
		2559	int
2263	int can_see_monsterP(mapstruct *m, int x, int y,int dir) {	2560	can_see_monsterP (mapstruct *m, int x, int y, int dir)
		2561	{
2264	sint16 dx, dy;	2562	sint16 dx, dy;
		2563	int
2265	int mflags;	2564	mflags;
2266		2565
		2566	if (dir < 0)
2267	if(dir<0) return 0; /* exit condition: invalid direction */	2567	return 0; /* exit condition: invalid direction */
2268		2568
2269	dx = x + freearr_x[dir];	2569	dx = x + freearr_x[dir];
2270	dy = y + freearr_y[dir];	2570	dy = y + freearr_y[dir];
2271		2571
2272	mflags = get_map_flags(m, &m, dx, dy, &dx, &dy);	2572	mflags = get_map_flags (m, &m, dx, dy, &dx, &dy);
2273		2573
2274	/* This functional arguably was incorrect before - it was	2574	/* This functional arguably was incorrect before - it was
2275	* checking for P_WALL - that was basically seeing if	2575	* checking for P_WALL - that was basically seeing if
2276	* we could move to the monster - this is being more	2576	* we could move to the monster - this is being more
2277	* literal on if we can see it. To know if we can actually	2577	* literal on if we can see it. To know if we can actually
2278	* move to the monster, we'd need the monster passed in or	2578	* move to the monster, we'd need the monster passed in or
2279	* at least its move type.	2579	* at least its move type.
2280	*/	2580	*/
2281	if (mflags & (P_OUT_OF_MAP | P_BLOCKSVIEW)) return 0;	2581	if (mflags & (P_OUT_OF_MAP | P_BLOCKSVIEW))
		2582	return 0;
2282		2583
2283	/* yes, can see. */	2584	/* yes, can see. */
2284	if(dir < 9) return 1;	2585	if (dir < 9)
		2586	return 1;
2285	return can_see_monsterP(m, x, y, reduction_dir[dir][0]) |	2587	return can_see_monsterP (m, x, y, reduction_dir[dir][0]) |
2286	can_see_monsterP(m,x,y, reduction_dir[dir][1]) |	2588	can_see_monsterP (m, x, y, reduction_dir[dir][1]) | can_see_monsterP (m, x, y, reduction_dir[dir][2]);
2287	can_see_monsterP(m,x,y, reduction_dir[dir][2]);
2288	}	2589	}
2289		2590
2290		2591
2291		2592
2292	/*	2593	/*
2293	* can_pick(picker, item): finds out if an object is possible to be	2594	* can_pick(picker, item): finds out if an object is possible to be
2294	* picked up by the picker. Returnes 1 if it can be	2595	* picked up by the picker. Returnes 1 if it can be
2295	* picked up, otherwise 0.	2596	* picked up, otherwise 0.
2296	*	2597	*
…		…
2298	* core dumps if they do.	2599	* core dumps if they do.
2299	*	2600	*
2300	* Add a check so we can't pick up invisible objects (0.93.8)	2601	* Add a check so we can't pick up invisible objects (0.93.8)
2301	*/	2602	*/
2302		2603
		2604	int
2303	int can_pick(const object *who, const object *item) {	2605	can_pick (const object *who, const object *item)
		2606	{
2304	return /*QUERY_FLAG(who,FLAG_WIZ)||*/	2607	return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2305	(item->weight>0&&!QUERY_FLAG(item,FLAG_NO_PICK)&&	2608	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
2306	!QUERY_FLAG(item,FLAG_ALIVE)&&!item->invisible &&	2609	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3));
2307	(who->type==PLAYER||item->weight<who->weight/3));
2308	}	2610	}
2309		2611
2310		2612
2311	/*	2613	/*
2312	* create clone from object to another	2614	* create clone from object to another
2313	*/	2615	*/
		2616	object *
2314	object *object_create_clone (object *asrc) {	2617	object_create_clone (object *asrc)
		2618	{
		2619	object *
2315	object *dst = NULL,*tmp,*src,*part,*prev, *item;	2620	dst = NULL, *tmp, *src, *part, *prev, *item;
2316		2621
		2622	if (!asrc)
2317	if(!asrc) return NULL;	2623	return NULL;
2318	src = asrc;	2624	src = asrc;
2319	if(src->head)	2625	if (src->head)
2320	src = src->head;	2626	src = src->head;
2321		2627
2322	prev = NULL;	2628	prev = NULL;
2323	for(part = src; part; part = part->more) {	2629	for (part = src; part; part = part->more)
		2630	{
2324	tmp = get_object();	2631	tmp = get_object ();
2325	copy_object(part,tmp);	2632	copy_object (part, tmp);
2326	tmp->x -= src->x;	2633	tmp->x -= src->x;
2327	tmp->y -= src->y;	2634	tmp->y -= src->y;
2328	if(!part->head) {	2635	if (!part->head)
		2636	{
2329	dst = tmp;	2637	dst = tmp;
2330	tmp->head = NULL;	2638	tmp->head = NULL;
		2639	}
2331	} else {	2640	else
		2641	{
2332	tmp->head = dst;	2642	tmp->head = dst;
2333	}	2643	}
2334	tmp->more = NULL;	2644	tmp->more = NULL;
2335	if(prev)	2645	if (prev)
2336	prev->more = tmp;	2646	prev->more = tmp;
2337	prev = tmp;	2647	prev = tmp;
2338	}	2648	}
		2649
2339	/*** copy inventory ***/	2650	/*** copy inventory ***/
2340	for(item = src->inv; item; item = item->below) {	2651	for (item = src->inv; item; item = item->below)
		2652	{
2341	(void) insert_ob_in_ob(object_create_clone(item),dst);	2653	(void) insert_ob_in_ob (object_create_clone (item), dst);
2342	}	2654	}
2343		2655
2344	return dst;	2656	return dst;
2345	}	2657	}
2346		2658
2347	/* return true if the object was destroyed, 0 otherwise */	2659	/* return true if the object was destroyed, 0 otherwise */
		2660	int
2348	int was_destroyed (const object *op, tag_t old_tag)	2661	was_destroyed (const object *op, tag_t old_tag)
2349	{	2662	{
2350	/* checking for FLAG_FREED isn't necessary, but makes this function more	2663	/* checking for FLAG_FREED isn't necessary, but makes this function more
2351	* robust */	2664	* robust */
2352	return op->count != old_tag || QUERY_FLAG (op, FLAG_FREED);	2665	return op->count != old_tag || QUERY_FLAG (op, FLAG_FREED);
2353	}	2666	}
2354		2667
2355	/* GROS - Creates an object using a string representing its content. */	2668	/* GROS - Creates an object using a string representing its content. */
		2669
2356	/* Basically, we save the content of the string to a temp file, then call */	2670	/* Basically, we save the content of the string to a temp file, then call */
		2671
2357	/* load_object on it. I admit it is a highly inefficient way to make things, */	2672	/* load_object on it. I admit it is a highly inefficient way to make things, */
		2673
2358	/* but it was simple to make and allows reusing the load_object function. */	2674	/* but it was simple to make and allows reusing the load_object function. */
		2675
2359	/* Remember not to use load_object_str in a time-critical situation. */	2676	/* Remember not to use load_object_str in a time-critical situation. */
		2677
2360	/* Also remember that multiparts objects are not supported for now. */	2678	/* Also remember that multiparts objects are not supported for now. */
2361		2679
		2680	object *
2362	object* load_object_str(const char *obstr)	2681	load_object_str (const char *obstr)
2363	{	2682	{
2364	object *op;	2683	object *
		2684	op;
		2685	char
2365	char filename[MAX_BUF];	2686	filename[MAX_BUF];
		2687
2366	sprintf(filename,"%s/cfloadobstr2044",settings.tmpdir);	2688	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2367		2689
		2690	FILE *
2368	FILE *tempfile=fopen(filename,"w");	2691	tempfile = fopen (filename, "w");
		2692
2369	if (tempfile == NULL)	2693	if (tempfile == NULL)
2370	{	2694	{
2371	LOG(llevError,"Error - Unable to access load object temp file\n");	2695	LOG (llevError, "Error - Unable to access load object temp file\n");
2372	return NULL;	2696	return NULL;
2373	};	2697	}
		2698
2374	fprintf(tempfile,obstr);	2699	fprintf (tempfile, obstr);
2375	fclose(tempfile);	2700	fclose (tempfile);
2376		2701
2377	op=get_object();	2702	op = get_object ();
2378		2703
2379	object_thawer thawer (filename);	2704	object_thawer thawer (filename);
2380		2705
2381	if (thawer)	2706	if (thawer)
2382	load_object(thawer,op,0);	2707	load_object (thawer, op, 0);
2383		2708
2384	LOG(llevDebug," load str completed, object=%s\n", &op->name);	2709	LOG (llevDebug, " load str completed, object=%s\n", &op->name);
2385	CLEAR_FLAG(op,FLAG_REMOVED);	2710	CLEAR_FLAG (op, FLAG_REMOVED);
2386		2711
2387	return op;	2712	return op;
2388	}	2713	}
2389		2714
2390	/* This returns the first object in who's inventory that	2715	/* This returns the first object in who's inventory that
2391	* has the same type and subtype match.	2716	* has the same type and subtype match.
2392	* returns NULL if no match.	2717	* returns NULL if no match.
2393	*/	2718	*/
		2719	object *
2394	object *find_obj_by_type_subtype(const object *who, int type, int subtype)	2720	find_obj_by_type_subtype (const object *who, int type, int subtype)
2395	{	2721	{
2396	object *tmp;	2722	object *
		2723	tmp;
2397		2724
2398	for (tmp=who->inv; tmp; tmp=tmp->below)	2725	for (tmp = who->inv; tmp; tmp = tmp->below)
2399	if (tmp->type == type && tmp->subtype == subtype) return tmp;	2726	if (tmp->type == type && tmp->subtype == subtype)
		2727	return tmp;
2400		2728
2401	return NULL;	2729	return NULL;
2402	}	2730	}
2403		2731
2404	/* If ob has a field named key, return the link from the list,	2732	/* If ob has a field named key, return the link from the list,
2405	* otherwise return NULL.	2733	* otherwise return NULL.
2406	*	2734	*
2407	* key must be a passed in shared string - otherwise, this won't	2735	* key must be a passed in shared string - otherwise, this won't
2408	* do the desired thing.	2736	* do the desired thing.
2409	*/	2737	*/
		2738	key_value *
2410	key_value * get_ob_key_link(const object * ob, const char * key) {	2739	get_ob_key_link (const object *ob, const char *key)
		2740	{
2411	key_value * link;	2741	key_value *
2412		2742	link;
		2743
2413	for (link = ob->key_values; link != NULL; link = link->next) {	2744	for (link = ob->key_values; link != NULL; link = link->next)
		2745	{
2414	if (link->key == key) {	2746	if (link->key == key)
		2747	{
2415	return link;	2748	return link;
2416	}	2749	}
2417	}
2418		2750	}
		2751
2419	return NULL;	2752	return NULL;
2420	}	2753	}
2421		2754
2422	/*	2755	/*
2423	* Returns the value of op has an extra_field for key, or NULL.	2756	* Returns the value of op has an extra_field for key, or NULL.
2424	*	2757	*
2425	* The argument doesn't need to be a shared string.	2758	* The argument doesn't need to be a shared string.
2426	*	2759	*
2427	* The returned string is shared.	2760	* The returned string is shared.
2428	*/	2761	*/
		2762	const char *
2429	const char * get_ob_key_value(const object * op, const char * const key) {	2763	get_ob_key_value (const object *op, const char *const key)
		2764	{
2430	key_value * link;	2765	key_value *link;
2431	const char * canonical_key;	2766	shstr_cmp canonical_key (key);
		2767
		2768	if (!canonical_key)
2432		2769	{
2433	canonical_key = shstr::find (key);
2434
2435	if (canonical_key == NULL) {
2436	/* 1. There being a field named key on any object	2770	/* 1. There being a field named key on any object
2437	* implies there'd be a shared string to find.	2771	* implies there'd be a shared string to find.
2438	* 2. Since there isn't, no object has this field.	2772	* 2. Since there isn't, no object has this field.
2439	* 3. Therefore, *this* object doesn't have this field.	2773	* 3. Therefore, *this* object doesn't have this field.
2440	*/	2774	*/
2441	return NULL;	2775	return 0;
2442	}	2776	}
2443		2777
2444	/* This is copied from get_ob_key_link() above -	2778	/* This is copied from get_ob_key_link() above -
2445	* only 4 lines, and saves the function call overhead.	2779	* only 4 lines, and saves the function call overhead.
2446	*/	2780	*/
2447	for (link = op->key_values; link != NULL; link = link->next) {	2781	for (link = op->key_values; link; link = link->next)
2448	if (link->key == canonical_key) {	2782	if (link->key == canonical_key)
2449	return link->value;	2783	return link->value;
2450	}	2784
2451	}	2785	return 0;
2452	return NULL;
2453	}	2786	}
2454		2787
2455		2788
2456	/*	2789	/*
2457	* Updates the canonical_key in op to value.	2790	* Updates the canonical_key in op to value.
…		…
2461	* Unless add_key is TRUE, it won't add fields, only change the value of existing	2794	* Unless add_key is TRUE, it won't add fields, only change the value of existing
2462	* keys.	2795	* keys.
2463	*	2796	*
2464	* Returns TRUE on success.	2797	* Returns TRUE on success.
2465	*/	2798	*/
		2799	int
2466	int set_ob_key_value_s(object * op, const shstr &canonical_key, const char * value, int add_key) {	2800	set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key)
		2801	{
		2802	key_value *
2467	key_value * field = NULL, *last=NULL;	2803	field = NULL, *last = NULL;
2468		2804
2469	for (field=op->key_values; field != NULL; field=field->next) {	2805	for (field = op->key_values; field != NULL; field = field->next)
		2806	{
2470	if (field->key != canonical_key) {	2807	if (field->key != canonical_key)
		2808	{
2471	last = field;	2809	last = field;
2472	continue;	2810	continue;
2473	}	2811	}
2474		2812
2475	if (value)	2813	if (value)
2476	field->value = value;	2814	field->value = value;
2477	else {	2815	else
		2816	{
2478	/* Basically, if the archetype has this key set,	2817	/* Basically, if the archetype has this key set,
2479	* we need to store the null value so when we save	2818	* we need to store the null value so when we save
2480	* it, we save the empty value so that when we load,	2819	* it, we save the empty value so that when we load,
2481	* we get this value back again.	2820	* we get this value back again.
2482	*/	2821	*/
2483	if (get_ob_key_link (&op->arch->clone, canonical_key))	2822	if (get_ob_key_link (&op->arch->clone, canonical_key))
2484	field->value = 0;	2823	field->value = 0;
		2824	else
		2825	{
		2826	if (last)
		2827	last->next = field->next;
2485	else	2828	else
2486	{
2487	if (last) last->next = field->next;
2488	else op->key_values = field->next;	2829	op->key_values = field->next;
2489		2830
2490	delete field;	2831	delete field;
2491	}	2832	}
2492	}	2833	}
2493	return TRUE;	2834	return TRUE;
2494	}	2835	}
2495	/* IF we get here, key doesn't exist */	2836	/* IF we get here, key doesn't exist */
2496		2837
2497	/* No field, we'll have to add it. */	2838	/* No field, we'll have to add it. */
		2839
		2840	if (!add_key)
2498		2841	{
2499	if (!add_key) {
2500	return FALSE;	2842	return FALSE;
2501	}	2843	}
2502	/* There isn't any good reason to store a null	2844	/* There isn't any good reason to store a null
2503	* value in the key/value list. If the archetype has	2845	* value in the key/value list. If the archetype has
2504	* this key, then we should also have it, so shouldn't	2846	* this key, then we should also have it, so shouldn't
2505	* be here. If user wants to store empty strings,	2847	* be here. If user wants to store empty strings,
2506	* should pass in ""	2848	* should pass in ""
2507	*/	2849	*/
2508	if (value == NULL) return TRUE;	2850	if (value == NULL)
2509
2510	field = new key_value;
2511
2512	field->key = canonical_key;
2513	field->value = value;
2514	/* Usual prepend-addition. */
2515	field->next = op->key_values;
2516	op->key_values = field;
2517
2518	return TRUE;	2851	return TRUE;
		2852
		2853	field = new key_value;
		2854
		2855	field->key = canonical_key;
		2856	field->value = value;
		2857	/* Usual prepend-addition. */
		2858	field->next = op->key_values;
		2859	op->key_values = field;
		2860
		2861	return TRUE;
2519	}	2862	}
2520		2863
2521	/*	2864	/*
2522	* Updates the key in op to value.	2865	* Updates the key in op to value.
2523	*	2866	*
…		…
2525	* and not add new ones.	2868	* and not add new ones.
2526	* In general, should be little reason FALSE is ever passed in for add_key	2869	* In general, should be little reason FALSE is ever passed in for add_key
2527	*	2870	*
2528	* Returns TRUE on success.	2871	* Returns TRUE on success.
2529	*/	2872	*/
		2873	int
2530	int set_ob_key_value(object * op, const char *key, const char * value, int add_key)	2874	set_ob_key_value (object *op, const char *key, const char *value, int add_key)
2531	{	2875	{
2532	shstr key_ (key);	2876	shstr key_ (key);
		2877
2533	return set_ob_key_value_s (op, key_, value, add_key);	2878	return set_ob_key_value_s (op, key_, value, add_key);
2534	}	2879	}
		2880
		2881	object::depth_iterator::depth_iterator (object *container)
		2882	: iterator_base (container)
		2883	{
		2884	while (item->inv)
		2885	item = item->inv;
		2886	}
		2887
		2888	void
		2889	object::depth_iterator::next ()
		2890	{
		2891	if (item->below)
		2892	{
		2893	item = item->below;
		2894
		2895	while (item->inv)
		2896	item = item->inv;
		2897	}
		2898	else
		2899	item = item->env;
		2900	}
		2901
		2902	// return a suitable string describing an objetc in enough detail to find it
		2903	const char *
		2904	object::debug_desc (char *info) const
		2905	{
		2906	char info2[256 * 3];
		2907	char *p = info;
		2908
		2909	p += snprintf (p, 256, "%d=\"%s%s%s\"",
		2910	count,
		2911	&name,
		2912	title ? " " : "",
		2913	title ? (const char *)title : "");
		2914
		2915	if (env)
		2916	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
		2917
		2918	if (map)
		2919	p += snprintf (p, 256, "(on %s@%d+%d)", map->path, x, y);
		2920
		2921	return info;
		2922	}
		2923
		2924	const char *
		2925	object::debug_desc () const
		2926	{
		2927	static char info[256 * 3];
		2928	return debug_desc (info);
		2929	}
		2930

Diff Legend

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