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.26 by root, Mon Sep 11 11:46:52 2006 UTC vs.
Revision 1.128 by root, Mon Feb 5 01:24:45 2007 UTC

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

Diff Legend

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