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.63 by root, Tue Dec 12 20:53:02 2006 UTC vs.
Revision 1.141 by root, Sun Apr 29 21:44:34 2007 UTC

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

Diff Legend

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