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.73 by root, Wed Dec 20 01:19:11 2006 UTC vs.
Revision 1.183 by root, Mon Aug 20 19:13:10 2007 UTC

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

Diff Legend

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