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.29 by root, Mon Sep 11 12:38:36 2006 UTC vs.
Revision 1.147 by root, Sat May 12 16:06:42 2007 UTC

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

Diff Legend

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