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.106 by root, Wed Jan 3 20:08:04 2007 UTC vs.
Revision 1.191 by root, Sun Sep 30 20:22:15 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,
…		…
297	return 0;	299	return 0;
298	else if (!compare_ob_value_lists (ob1, ob2))	300	else if (!compare_ob_value_lists (ob1, ob2))
299	return 0;	301	return 0;
300	}	302	}
301		303
302	//TODO: generate an event or call into perl for additional checks
303	if (ob1->self || ob2->self)	304	if (ob1->self || ob2->self)
304	{	305	{
305	ob1->optimise ();	306	ob1->optimise ();
306	ob2->optimise ();	307	ob2->optimise ();
307		308
308	if (ob1->self || ob2->self)	309	if (ob1->self || ob2->self)
		310	if (!cfperl_can_merge (ob1, ob2))
309	return 0;	311	return 0;
310	}	312	}
311		313
312	/* Everything passes, must be OK. */	314	/* Everything passes, must be OK. */
313	return 1;	315	return 1;
314	}	316	}
…		…
322	sum_weight (object *op)	324	sum_weight (object *op)
323	{	325	{
324	long sum;	326	long sum;
325	object *inv;	327	object *inv;
326		328
327	for (sum = 0, inv = op->inv; inv != NULL; inv = inv->below)	329	for (sum = 0, inv = op->inv; inv; inv = inv->below)
328	{	330	{
329	if (inv->inv)	331	if (inv->inv)
330	sum_weight (inv);	332	sum_weight (inv);
		333
331	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);	334	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);
332	}	335	}
333		336
334	if (op->type == CONTAINER && op->stats.Str)	337	if (op->type == CONTAINER && op->stats.Str)
335	sum = (sum * (100 - op->stats.Str)) / 100;	338	sum = (sum * (100 - op->stats.Str)) / 100;
…		…
355	/*	358	/*
356	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.	359	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
357	* Some error messages.	360	* Some error messages.
358	* 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.
359	*/	362	*/
360
361	char *	363	char *
362	dump_object (object *op)	364	dump_object (object *op)
363	{	365	{
364	if (!op)	366	if (!op)
365	return strdup ("[NULLOBJ]");	367	return strdup ("[NULLOBJ]");
366		368
367	object_freezer freezer;	369	object_freezer freezer;
368	save_object (freezer, op, 1);	370	op->write (freezer);
369	return freezer.as_string ();	371	return freezer.as_string ();
370	}	372	}
371		373
372	/*	374	/*
373	* 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
374	* multi-object 1 which is closest to the second object.	376	* multi-object 1 which is closest to the second object.
375	* If it's not a multi-object, it is returned.	377	* If it's not a multi-object, it is returned.
376	*/	378	*/
377
378	object *	379	object *
379	get_nearest_part (object *op, const object *pl)	380	get_nearest_part (object *op, const object *pl)
380	{	381	{
381	object *tmp, *closest;	382	object *tmp, *closest;
382	int last_dist, i;	383	int last_dist, i;
…		…
390	}	391	}
391		392
392	/*	393	/*
393	* Returns the object which has the count-variable equal to the argument.	394	* Returns the object which has the count-variable equal to the argument.
394	*/	395	*/
395
396	object *	396	object *
397	find_object (tag_t i)	397	find_object (tag_t i)
398	{	398	{
399	for (object *op = object::first; op; op = op->next)	399	for_all_objects (op)
400	if (op->count == i)	400	if (op->count == i)
401	return op;	401	return op;
402		402
403	return 0;	403	return 0;
404	}	404	}
405		405
406	/*	406	/*
407	* Returns the first object which has a name equal to the argument.	407	* Returns the first object which has a name equal to the argument.
408	* Used only by the patch command, but not all that useful.	408	* Used only by the patch command, but not all that useful.
409	* Enables features like "patch <name-of-other-player> food 999"	409	* Enables features like "patch <name-of-other-player> food 999"
410	*/	410	*/
411
412	object *	411	object *
413	find_object_name (const char *str)	412	find_object_name (const char *str)
414	{	413	{
415	shstr_cmp str_ (str);	414	shstr_cmp str_ (str);
416	object *op;	415	object *op;
417		416
418	for (op = object::first; op != NULL; op = op->next)	417	for_all_objects (op)
419	if (op->name == str_)	418	if (op->name == str_)
420	break;	419	break;
421		420
422	return op;	421	return op;
423	}	422	}
…		…
429	}	428	}
430		429
431	/*	430	/*
432	* Sets the owner and sets the skill and exp pointers to owner's current	431	* Sets the owner and sets the skill and exp pointers to owner's current
433	* skill and experience objects.	432	* skill and experience objects.
		433	* ACTUALLY NO! investigate! TODO
434	*/	434	*/
435	void	435	void
436	object::set_owner (object *owner)	436	object::set_owner (object *owner)
437	{	437	{
		438	// allow objects which own objects
438	if (!owner)	439	if (owner)
439	return;
440
441	/* next line added to allow objects which own objects */
442	/* Add a check for ownercounts in here, as I got into an endless loop
443	* with the fireball owning a poison cloud which then owned the
444	* fireball. I believe that was caused by one of the objects getting
445	* freed and then another object replacing it. Since the ownercounts
446	* didn't match, this check is valid and I believe that cause is valid.
447	*/
448	while (owner->owner)	440	while (owner->owner)
449	owner = owner->owner;	441	owner = owner->owner;
450		442
451	this->owner = owner;	443	this->owner = owner;
		444	}
		445
		446	int
		447	object::slottype () const
		448	{
		449	if (type == SKILL)
		450	{
		451	if (IS_COMBAT_SKILL (subtype)) return slot_combat;
		452	if (IS_RANGED_SKILL (subtype)) return slot_ranged;
		453	}
		454	else
		455	{
		456	if (slot [body_combat].info) return slot_combat;
		457	if (slot [body_range ].info) return slot_ranged;
		458	}
		459
		460	return slot_none;
		461	}
		462
		463	bool
		464	object::change_weapon (object *ob)
		465	{
		466	if (current_weapon == ob)
		467	return true;
		468
		469	if (chosen_skill)
		470	chosen_skill->flag [FLAG_APPLIED] = false;
		471
		472	current_weapon = ob;
		473	chosen_skill = !ob || ob->type == SKILL ? ob : find_skill_by_name (this, ob->skill);
		474
		475	if (chosen_skill)
		476	chosen_skill->flag [FLAG_APPLIED] = true;
		477
		478	update_stats ();
		479
		480	if (ob)
		481	{
		482	// now check wether any body locations became invalid, in which case
		483	// we cannot apply the weapon at the moment.
		484	for (int i = 0; i < NUM_BODY_LOCATIONS; ++i)
		485	if (slot[i].used < 0)
		486	{
		487	current_weapon = chosen_skill = 0;
		488	update_stats ();
		489
		490	new_draw_info_format (NDI_UNIQUE, 0, this,
		491	"You try to balance all your items at once, "
		492	"but the %s is just too much for your body. "
		493	"[You need to unapply some items first.]", &ob->name);
		494	return false;
		495	}
		496
		497	//new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);
		498	}
		499	else
		500	;//new_draw_info_format (NDI_UNIQUE, 0, this, "You unwield your weapons.");
		501
		502	if (ob && !ob->flag [FLAG_APPLIED] && ob->type != SPELL)
		503	{
		504	LOG (llevError | logBacktrace, "%s changed to unapplied weapon %s",
		505	&name, ob->debug_desc ());
		506	return false;
		507	}
		508
		509	return true;
452	}	510	}
453		511
454	/* Zero the key_values on op, decrementing the shared-string	512	/* Zero the key_values on op, decrementing the shared-string
455	* refcounts and freeing the links.	513	* refcounts and freeing the links.
456	*/	514	*/
457	static void	515	static void
458	free_key_values (object *op)	516	free_key_values (object *op)
459	{	517	{
460	for (key_value *i = op->key_values; i != 0;)	518	for (key_value *i = op->key_values; i; )
461	{	519	{
462	key_value *next = i->next;	520	key_value *next = i->next;
463	delete i;	521	delete i;
464		522
465	i = next;	523	i = next;
466	}	524	}
467		525
468	op->key_values = 0;	526	op->key_values = 0;
469	}	527	}
470		528
471	/*	529	object &
472	* copy_to first frees everything allocated by the dst object,	530	object::operator =(const object &src)
473	* and then copies the contents of itself into the second
474	* object, allocating what needs to be allocated. Basically, any
475	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
476	* if the first object is freed, the pointers in the new object
477	* will point at garbage.
478	*/
479	void
480	object::copy_to (object *dst)
481	{	531	{
482	bool is_freed = QUERY_FLAG (dst, FLAG_FREED);	532	bool is_freed = flag [FLAG_FREED];
483	bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED);	533	bool is_removed = flag [FLAG_REMOVED];
484		534
485	*(object_copy *)dst = *this;	535	*(object_copy *)this = src;
486		536
487	if (is_freed)	537	flag [FLAG_FREED] = is_freed;
488	SET_FLAG (dst, FLAG_FREED);	538	flag [FLAG_REMOVED] = is_removed;
489
490	if (is_removed)
491	SET_FLAG (dst, FLAG_REMOVED);
492
493	if (speed < 0)
494	dst->speed_left = speed_left - RANDOM () % 200 / 100.0;
495		539
496	/* Copy over key_values, if any. */	540	/* Copy over key_values, if any. */
497	if (key_values)	541	if (src.key_values)
498	{	542	{
499	key_value *tail = 0;	543	key_value *tail = 0;
500	key_value *i;
501
502	dst->key_values = 0;	544	key_values = 0;
503		545
504	for (i = key_values; i; i = i->next)	546	for (key_value *i = src.key_values; i; i = i->next)
505	{	547	{
506	key_value *new_link = new key_value;	548	key_value *new_link = new key_value;
507		549
508	new_link->next = 0;	550	new_link->next = 0;
509	new_link->key = i->key;	551	new_link->key = i->key;
510	new_link->value = i->value;	552	new_link->value = i->value;
511		553
512	/* Try and be clever here, too. */	554	/* Try and be clever here, too. */
513	if (!dst->key_values)	555	if (!key_values)
514	{	556	{
515	dst->key_values = new_link;	557	key_values = new_link;
516	tail = new_link;	558	tail = new_link;
517	}	559	}
518	else	560	else
519	{	561	{
520	tail->next = new_link;	562	tail->next = new_link;
521	tail = new_link;	563	tail = new_link;
522	}	564	}
523	}	565	}
524	}	566	}
		567	}
		568
		569	/*
		570	* copy_to first frees everything allocated by the dst object,
		571	* and then copies the contents of itself into the second
		572	* object, allocating what needs to be allocated. Basically, any
		573	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
		574	* if the first object is freed, the pointers in the new object
		575	* will point at garbage.
		576	*/
		577	void
		578	object::copy_to (object *dst)
		579	{
		580	*dst = *this;
		581
		582	if (speed < 0)
		583	dst->speed_left -= rndm ();
525		584
526	dst->set_speed (dst->speed);	585	dst->set_speed (dst->speed);
		586	}
		587
		588	void
		589	object::instantiate ()
		590	{
		591	if (!uuid.seq) // HACK
		592	uuid = gen_uuid ();
		593
		594	speed_left = -0.1f;
		595	/* copy the body_info to the body_used - this is only really
		596	* need for monsters, but doesn't hurt to do it for everything.
		597	* by doing so, when a monster is created, it has good starting
		598	* values for the body_used info, so when items are created
		599	* for it, they can be properly equipped.
		600	*/
		601	for (int i = NUM_BODY_LOCATIONS; i--; )
		602	slot[i].used = slot[i].info;
		603
		604	attachable::instantiate ();
527	}	605	}
528		606
529	object *	607	object *
530	object::clone ()	608	object::clone ()
531	{	609	{
…		…
589	* UP_OBJ_FACE: only the objects face has changed.	667	* UP_OBJ_FACE: only the objects face has changed.
590	*/	668	*/
591	void	669	void
592	update_object (object *op, int action)	670	update_object (object *op, int action)
593	{	671	{
594	MoveType move_on, move_off, move_block, move_slow;
595
596	if (op == NULL)	672	if (op == NULL)
597	{	673	{
598	/* this should never happen */	674	/* this should never happen */
599	LOG (llevDebug, "update_object() called for NULL object.\n");	675	LOG (llevDebug, "update_object() called for NULL object.\n");
600	return;	676	return;
…		…
660		736
661	if (op->more)	737	if (op->more)
662	update_object (op->more, action);	738	update_object (op->more, action);
663	}	739	}
664		740
665	object *object::first;
666
667	object::object ()	741	object::object ()
668	{	742	{
669	SET_FLAG (this, FLAG_REMOVED);	743	SET_FLAG (this, FLAG_REMOVED);
670		744
671	expmul = 1.0;	745	expmul = 1.0;
672	face = blank_face;	746	face = blank_face;
673	}	747	}
674		748
675	object::~object ()	749	object::~object ()
676	{	750	{
		751	unlink ();
		752
677	free_key_values (this);	753	free_key_values (this);
678	}	754	}
679		755
		756	static int object_count;
		757
680	void object::link ()	758	void object::link ()
681	{	759	{
682	count = ++ob_count;	760	assert (!index);//D
683	uuid = gen_uuid ();	761	uuid = gen_uuid ();
		762	count = ++object_count;
684		763
685	prev = 0;	764	refcnt_inc ();
686	next = object::first;	765	objects.insert (this);
687
688	if (object::first)
689	object::first->prev = this;
690
691	object::first = this;
692	}	766	}
693		767
694	void object::unlink ()	768	void object::unlink ()
695	{	769	{
696	if (this == object::first)	770	if (!index)
697	object::first = next;	771	return;
698		772
699	/* Remove this object from the list of used objects */	773	objects.erase (this);
700	if (prev) prev->next = next;	774	refcnt_dec ();
701	if (next) next->prev = prev;
702
703	prev = 0;
704	next = 0;
705	}
706
707	bool
708	object::active () const
709	{
710	return active_next || active_prev || this == active_objects;
711	}	775	}
712		776
713	void	777	void
714	object::activate ()	778	object::activate ()
715	{	779	{
716	/* If already on active list, don't do anything */	780	/* If already on active list, don't do anything */
717	if (active ())	781	if (active)
718	return;	782	return;
719		783
720	if (has_active_speed ())	784	if (has_active_speed ())
721	{	785	actives.insert (this);
722	/* process_events() expects us to insert the object at the beginning
723	* of the list. */
724	active_next = active_objects;
725
726	if (active_next)
727	active_next->active_prev = this;
728
729	active_objects = this;
730	}
731	}	786	}
732		787
733	void	788	void
734	object::activate_recursive ()	789	object::activate_recursive ()
735	{	790	{
…		…
749	*/	804	*/
750	void	805	void
751	object::deactivate ()	806	object::deactivate ()
752	{	807	{
753	/* If not on the active list, nothing needs to be done */	808	/* If not on the active list, nothing needs to be done */
754	if (!active ())	809	if (!active)
755	return;	810	return;
756		811
757	if (active_prev == 0)	812	actives.erase (this);
758	{
759	active_objects = active_next;
760	if (active_next)
761	active_next->active_prev = 0;
762	}
763	else
764	{
765	active_prev->active_next = active_next;
766	if (active_next)
767	active_next->active_prev = active_prev;
768	}
769
770	active_next = 0;
771	active_prev = 0;
772	}	813	}
773		814
774	void	815	void
775	object::deactivate_recursive ()	816	object::deactivate_recursive ()
776	{	817	{
…		…
810	* drop on that space.	851	* drop on that space.
811	*/	852	*/
812	if (!drop_to_ground	853	if (!drop_to_ground
813	|| !map	854	|| !map
814	|| map->in_memory != MAP_IN_MEMORY	855	|| map->in_memory != MAP_IN_MEMORY
		856	|| map->nodrop
815	|| ms ().move_block == MOVE_ALL)	857	|| ms ().move_block == MOVE_ALL)
816	{	858	{
817	while (inv)	859	while (inv)
818	{	860	{
819	inv->destroy_inv (drop_to_ground);	861	inv->destroy_inv (drop_to_ground);
…		…
828		870
829	if (op->flag [FLAG_STARTEQUIP]	871	if (op->flag [FLAG_STARTEQUIP]
830	|| op->flag [FLAG_NO_DROP]	872	|| op->flag [FLAG_NO_DROP]
831	|| op->type == RUNE	873	|| op->type == RUNE
832	|| op->type == TRAP	874	|| op->type == TRAP
833	|| op->flag [FLAG_IS_A_TEMPLATE])	875	|| op->flag [FLAG_IS_A_TEMPLATE]
		876	|| op->flag [FLAG_DESTROY_ON_DEATH])
834	op->destroy ();	877	op->destroy ();
835	else	878	else
836	map->insert (op, x, y);	879	map->insert (op, x, y);
837	}	880	}
838	}	881	}
…		…
846	}	889	}
847		890
848	void	891	void
849	object::do_destroy ()	892	object::do_destroy ()
850	{	893	{
		894	attachable::do_destroy ();
		895
851	if (flag [FLAG_IS_LINKED])	896	if (flag [FLAG_IS_LINKED])
852	remove_button_link (this);	897	remove_button_link (this);
853		898
854	if (flag [FLAG_FRIENDLY])	899	if (flag [FLAG_FRIENDLY])
855	remove_friendly_object (this);	900	remove_friendly_object (this);
856		901
857	if (!flag [FLAG_REMOVED])	902	if (!flag [FLAG_REMOVED])
858	remove ();	903	remove ();
859		904
860	if (flag [FLAG_FREED])	905	destroy_inv (true);
861	return;
862		906
863	set_speed (0);	907	deactivate ();
		908	unlink ();
864		909
865	flag [FLAG_FREED] = 1;	910	flag [FLAG_FREED] = 1;
866
867	attachable::do_destroy ();
868
869	destroy_inv (true);
870	unlink ();
871		911
872	// hack to ensure that freed objects still have a valid map	912	// hack to ensure that freed objects still have a valid map
873	{	913	{
874	static maptile *freed_map; // freed objects are moved here to avoid crashes	914	static maptile *freed_map; // freed objects are moved here to avoid crashes
875		915
876	if (!freed_map)	916	if (!freed_map)
877	{	917	{
878	freed_map = new maptile;	918	freed_map = new maptile;
879		919
		920	freed_map->path = "<freed objects map>";
880	freed_map->name = "/internal/freed_objects_map";	921	freed_map->name = "/internal/freed_objects_map";
881	freed_map->width = 3;	922	freed_map->width = 3;
882	freed_map->height = 3;	923	freed_map->height = 3;
883		924
884	freed_map->alloc ();	925	freed_map->alloc ();
…		…
888	map = freed_map;	929	map = freed_map;
889	x = 1;	930	x = 1;
890	y = 1;	931	y = 1;
891	}	932	}
892		933
893	head = 0;
894
895	if (more)	934	if (more)
896	{	935	{
897	more->destroy ();	936	more->destroy ();
898	more = 0;	937	more = 0;
899	}	938	}
900		939
		940	head = 0;
		941
901	// clear those pointers that likely might have circular references to us	942	// clear those pointers that likely might cause circular references
902	owner = 0;	943	owner = 0;
903	enemy = 0;	944	enemy = 0;
904	attacked_by = 0;	945	attacked_by = 0;
905		946	current_weapon = 0;
906	// only relevant for players(?), but make sure of it anyways
907	contr = 0;
908	}	947	}
909		948
910	void	949	void
911	object::destroy (bool destroy_inventory)	950	object::destroy (bool destroy_inventory)
912	{	951	{
913	if (destroyed ())	952	if (destroyed ())
914	return;	953	return;
915		954
916	if (destroy_inventory)	955	if (destroy_inventory)
917	destroy_inv (false);	956	destroy_inv (false);
		957
		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
918		963
919	attachable::destroy ();	964	attachable::destroy ();
920	}	965	}
921		966
922	/*	967	/*
…		…
940	* 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
941	* 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
942	* object will have no environment. If the object previously had an	987	* object will have no environment. If the object previously had an
943	* environment, the x and y coordinates will be updated to	988	* environment, the x and y coordinates will be updated to
944	* the previous environment.	989	* the previous environment.
945	* Beware: This function is called from the editor as well!
946	*/	990	*/
947	void	991	void
948	object::remove ()	992	object::do_remove ()
949	{	993	{
950	object *tmp, *last = 0;	994	object *tmp, *last = 0;
951	object *otmp;	995	object *otmp;
952		996
953	if (QUERY_FLAG (this, FLAG_REMOVED))	997	if (QUERY_FLAG (this, FLAG_REMOVED))
…		…
996	}	1040	}
997	else if (map)	1041	else if (map)
998	{	1042	{
999	if (type == PLAYER)	1043	if (type == PLAYER)
1000	{	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
1001	--map->players;	1051	--map->players;
1002	map->touch ();	1052	map->touch ();
1003	}	1053	}
1004		1054
1005	map->dirty = true;	1055	map->dirty = true;
		1056	mapspace &ms = this->ms ();
1006		1057
1007	/* link the object above us */	1058	/* link the object above us */
1008	if (above)	1059	if (above)
1009	above->below = below;	1060	above->below = below;
1010	else	1061	else
1011	map->at (x, y).top = below; /* we were top, set new top */	1062	ms.top = below; /* we were top, set new top */
1012		1063
1013	/* Relink the object below us, if there is one */	1064	/* Relink the object below us, if there is one */
1014	if (below)	1065	if (below)
1015	below->above = above;	1066	below->above = above;
1016	else	1067	else
…		…
1018	/* 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
1019	* use translated coordinates in case some oddness with map tiling is	1070	* use translated coordinates in case some oddness with map tiling is
1020	* evident	1071	* evident
1021	*/	1072	*/
1022	if (GET_MAP_OB (map, x, y) != this)	1073	if (GET_MAP_OB (map, x, y) != this)
1023	{
1024	char *dump = dump_object (this);
1025	LOG (llevError,
1026	"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 ());
1027	free (dump);
1028	dump = dump_object (GET_MAP_OB (map, x, y));
1029	LOG (llevError, "%s\n", dump);
1030	free (dump);
1031	}
1032		1075
1033	map->at (x, y).bot = above; /* goes on above it. */	1076	ms.bot = above; /* goes on above it. */
1034	}	1077	}
1035		1078
1036	above = 0;	1079	above = 0;
1037	below = 0;	1080	below = 0;
1038		1081
1039	if (map->in_memory == MAP_SAVING)	1082	if (map->in_memory == MAP_SAVING)
1040	return;	1083	return;
1041		1084
1042	int check_walk_off = !flag [FLAG_NO_APPLY];	1085	int check_walk_off = !flag [FLAG_NO_APPLY];
1043		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
1044	for (tmp = map->at (x, y).bot; tmp; tmp = tmp->above)	1099	for (tmp = ms.bot; tmp; tmp = tmp->above)
1045	{	1100	{
1046	/* 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
1047	* being removed.	1102	* being removed.
1048	*/	1103	*/
1049
1050	if (tmp->type == PLAYER && tmp != this)
1051	{
1052	/* If a container that the player is currently using somehow gets
1053	* removed (most likely destroyed), update the player view
1054	* appropriately.
1055	*/
1056	if (tmp->container == this)
1057	{
1058	flag [FLAG_APPLIED] = 0;
1059	tmp->container = 0;
1060	}
1061
1062	if (tmp->contr->ns)
1063	tmp->contr->ns->floorbox_update ();
1064	}
1065		1104
1066	/* See if object moving off should effect something */	1105	/* See if object moving off should effect something */
1067	if (check_walk_off	1106	if (check_walk_off
1068	&& ((move_type & tmp->move_off)	1107	&& ((move_type & tmp->move_off)
1069	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))	1108	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
…		…
1072		1111
1073	if (destroyed ())	1112	if (destroyed ())
1074	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 ());
1075	}	1114	}
1076		1115
1077	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1078	//TODO: why is this horrible hacka fix? get rid of this code=bug! (schmorp)
1079	if (tmp->above == tmp)
1080	tmp->above = 0;
1081
1082	last = tmp;	1116	last = tmp;
1083	}	1117	}
1084		1118
1085	/* last == NULL if there are no objects on this space */	1119	/* last == NULL if there are no objects on this space */
1086	//TODO: this makes little sense, why only update the topmost object?	1120	//TODO: this makes little sense, why only update the topmost object?
…		…
1129	}	1163	}
1130		1164
1131	return 0;	1165	return 0;
1132	}	1166	}
1133		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
1134	/*	1191	/*
1135	* 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
1136	* job preparing multi-part monsters	1193	* job preparing multi-part monsters.
1137	*/	1194	*/
1138	object *	1195	object *
1139	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)
1140	{	1197	{
1141	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)	1198	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1142	{	1199	{
1143	tmp->x = x + tmp->arch->clone.x;	1200	tmp->x = x + tmp->arch->x;
1144	tmp->y = y + tmp->arch->clone.y;	1201	tmp->y = y + tmp->arch->y;
1145	}	1202	}
1146		1203
1147	return insert_ob_in_map (op, m, originator, flag);	1204	return insert_ob_in_map (op, m, originator, flag);
1148	}	1205	}
1149		1206
…		…
1168	* just 'op' otherwise	1225	* just 'op' otherwise
1169	*/	1226	*/
1170	object *	1227	object *
1171	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)
1172	{	1229	{
		1230	assert (!op->flag [FLAG_FREED]);
		1231
1173	object *tmp, *top, *floor = NULL;	1232	object *top, *floor = NULL;
1174	sint16 x, y;
1175		1233
1176	if (QUERY_FLAG (op, FLAG_FREED))	1234	op->remove ();
1177	{
1178	LOG (llevError, "Trying to insert freed object!\n");
1179	return NULL;
1180	}
1181
1182	if (!m)
1183	{
1184	char *dump = dump_object (op);
1185	LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
1186	free (dump);
1187	return op;
1188	}
1189
1190	if (out_of_map (m, op->x, op->y))
1191	{
1192	char *dump = dump_object (op);
1193	LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump);
1194	#ifdef MANY_CORES
1195	/* Better to catch this here, as otherwise the next use of this object
1196	* is likely to cause a crash. Better to find out where it is getting
1197	* improperly inserted.
1198	*/
1199	abort ();
1200	#endif
1201	free (dump);
1202	return op;
1203	}
1204
1205	if (!QUERY_FLAG (op, FLAG_REMOVED))
1206	{
1207	char *dump = dump_object (op);
1208	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
1209	free (dump);
1210	return op;
1211	}
1212
1213	if (op->more)
1214	{
1215	/* The part may be on a different map. */
1216
1217	object *more = op->more;
1218
1219	/* We really need the caller to normalise coordinates - if
1220	* we set the map, that doesn't work if the location is within
1221	* a map and this is straddling an edge. So only if coordinate
1222	* is clear wrong do we normalise it.
1223	*/
1224	if (OUT_OF_REAL_MAP (more->map, more->x, more->y))
1225	more->map = get_map_from_coord (m, &more->x, &more->y);
1226	else if (!more->map)
1227	{
1228	/* For backwards compatibility - when not dealing with tiled maps,
1229	* more->map should always point to the parent.
1230	*/
1231	more->map = m;
1232	}
1233
1234	if (insert_ob_in_map (more, more->map, originator, flag) == NULL)
1235	{
1236	if (!op->head)
1237	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1238
1239	return 0;
1240	}
1241	}
1242
1243	CLEAR_FLAG (op, FLAG_REMOVED);
1244		1235
1245	/* Ideally, the caller figures this out. However, it complicates a lot	1236	/* Ideally, the caller figures this out. However, it complicates a lot
1246	* of areas of callers (eg, anything that uses find_free_spot would now	1237	* of areas of callers (eg, anything that uses find_free_spot would now
1247	* need extra work	1238	* need extra work
1248	*/	1239	*/
1249	op->map = get_map_from_coord (m, &op->x, &op->y);	1240	if (!xy_normalise (m, op->x, op->y))
1250	x = op->x;	1241	{
1251	y = op->y;	1242	op->destroy ();
		1243	return 0;
		1244	}
		1245
		1246	if (object *more = op->more)
		1247	if (!insert_ob_in_map (more, m, originator, flag))
		1248	return 0;
		1249
		1250	CLEAR_FLAG (op, FLAG_REMOVED);
		1251
		1252	op->map = m;
		1253	mapspace &ms = op->ms ();
1252		1254
1253	/* this has to be done after we translate the coordinates.	1255	/* this has to be done after we translate the coordinates.
1254	*/	1256	*/
1255	if (op->nrof && !(flag & INS_NO_MERGE))	1257	if (op->nrof && !(flag & INS_NO_MERGE))
1256	for (tmp = GET_MAP_OB (op->map, x, y); tmp; tmp = tmp->above)	1258	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1257	if (object::can_merge (op, tmp))	1259	if (object::can_merge (op, tmp))
1258	{	1260	{
1259	op->nrof += tmp->nrof;	1261	op->nrof += tmp->nrof;
1260	tmp->destroy ();	1262	tmp->destroy ();
1261	}	1263	}
…		…
1278	op->below = originator->below;	1280	op->below = originator->below;
1279		1281
1280	if (op->below)	1282	if (op->below)
1281	op->below->above = op;	1283	op->below->above = op;
1282	else	1284	else
1283	op->ms ().bot = op;	1285	ms.bot = op;
1284		1286
1285	/* since *below* originator, no need to update top */	1287	/* since *below* originator, no need to update top */
1286	originator->below = op;	1288	originator->below = op;
1287	}	1289	}
1288	else	1290	else
1289	{	1291	{
		1292	top = ms.bot;
		1293
1290	/* If there are other objects, then */	1294	/* If there are other objects, then */
1291	if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL))	1295	if (top)
1292	{	1296	{
1293	object *last = 0;	1297	object *last = 0;
1294		1298
1295	/*	1299	/*
1296	* If there are multiple objects on this space, we do some trickier handling.	1300	* If there are multiple objects on this space, we do some trickier handling.
…		…
1302	* once we get to them. This reduces the need to traverse over all of	1306	* once we get to them. This reduces the need to traverse over all of
1303	* them when adding another one - this saves quite a bit of cpu time	1307	* them when adding another one - this saves quite a bit of cpu time
1304	* when lots of spells are cast in one area. Currently, it is presumed	1308	* when lots of spells are cast in one area. Currently, it is presumed
1305	* that flying non pickable objects are spell objects.	1309	* that flying non pickable objects are spell objects.
1306	*/	1310	*/
1307	while (top)	1311	for (top = ms.bot; top; top = top->above)
1308	{	1312	{
1309	if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))	1313	if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))
1310	floor = top;	1314	floor = top;
1311		1315
1312	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))	1316	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))
…		…
1315	top = top->below;	1319	top = top->below;
1316	break;	1320	break;
1317	}	1321	}
1318		1322
1319	last = top;	1323	last = top;
1320	top = top->above;
1321	}	1324	}
1322		1325
1323	/* Don't want top to be NULL, so set it to the last valid object */	1326	/* Don't want top to be NULL, so set it to the last valid object */
1324	top = last;	1327	top = last;
1325		1328
…		…
1327	* looks like instead of lots of conditions here.	1330	* looks like instead of lots of conditions here.
1328	* makes things faster, and effectively the same result.	1331	* makes things faster, and effectively the same result.
1329	*/	1332	*/
1330		1333
1331	/* Have object 'fall below' other objects that block view.	1334	/* Have object 'fall below' other objects that block view.
1332	* Unless those objects are exits, type 66	1335	* Unless those objects are exits.
1333	* If INS_ON_TOP is used, don't do this processing	1336	* If INS_ON_TOP is used, don't do this processing
1334	* Need to find the object that in fact blocks view, otherwise	1337	* Need to find the object that in fact blocks view, otherwise
1335	* stacking is a bit odd.	1338	* stacking is a bit odd.
1336	*/	1339	*/
1337	if (!(flag & INS_ON_TOP) &&	1340	if (!(flag & INS_ON_TOP)
1338	(get_map_flags (op->map, 0, op->x, op->y, 0, 0) & P_BLOCKSVIEW) && (op->face && !op->face->visibility))	1341	&& ms.flags () & P_BLOCKSVIEW
		1342	&& (op->face && !faces [op->face].visibility))
1339	{	1343	{
1340	for (last = top; last != floor; last = last->below)	1344	for (last = top; last != floor; last = last->below)
1341	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1345	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1342	break;	1346	break;
		1347
1343	/* Check to see if we found the object that blocks view,	1348	/* Check to see if we found the object that blocks view,
1344	* and make sure we have a below pointer for it so that	1349	* and make sure we have a below pointer for it so that
1345	* we can get inserted below this one, which requires we	1350	* we can get inserted below this one, which requires we
1346	* set top to the object below us.	1351	* set top to the object below us.
1347	*/	1352	*/
1348	if (last && last->below && last != floor)	1353	if (last && last->below && last != floor)
1349	top = last->below;	1354	top = last->below;
1350	}	1355	}
1351	} /* If objects on this space */	1356	} /* If objects on this space */
1352		1357
1353	if (flag & INS_MAP_LOAD)
1354	top = GET_MAP_TOP (op->map, op->x, op->y);
1355
1356	if (flag & INS_ABOVE_FLOOR_ONLY)	1358	if (flag & INS_ABOVE_FLOOR_ONLY)
1357	top = floor;	1359	top = floor;
1358		1360
1359	/* Top is the object that our object (op) is going to get inserted above.	1361	/* Top is the object that our object (op) is going to get inserted above.
1360	*/	1362	*/
1361		1363
1362	/* First object on this space */	1364	/* First object on this space */
1363	if (!top)	1365	if (!top)
1364	{	1366	{
1365	op->above = GET_MAP_OB (op->map, op->x, op->y);	1367	op->above = ms.bot;
1366		1368
1367	if (op->above)	1369	if (op->above)
1368	op->above->below = op;	1370	op->above->below = op;
1369		1371
1370	op->below = 0;	1372	op->below = 0;
1371	op->ms ().bot = op;	1373	ms.bot = op;
1372	}	1374	}
1373	else	1375	else
1374	{ /* get inserted into the stack above top */	1376	{ /* get inserted into the stack above top */
1375	op->above = top->above;	1377	op->above = top->above;
1376		1378
…		…
1380	op->below = top;	1382	op->below = top;
1381	top->above = op;	1383	top->above = op;
1382	}	1384	}
1383		1385
1384	if (!op->above)	1386	if (!op->above)
1385	op->ms ().top = op;	1387	ms.top = op;
1386	} /* else not INS_BELOW_ORIGINATOR */	1388	} /* else not INS_BELOW_ORIGINATOR */
1387		1389
1388	if (op->type == PLAYER)	1390	if (op->type == PLAYER)
1389	{	1391	{
1390	op->contr->do_los = 1;	1392	op->contr->do_los = 1;
…		…
1392	op->map->touch ();	1394	op->map->touch ();
1393	}	1395	}
1394		1396
1395	op->map->dirty = true;	1397	op->map->dirty = true;
1396		1398
1397	/* If we have a floor, we know the player, if any, will be above
1398	* it, so save a few ticks and start from there.
1399	*/
1400	if (!(flag & INS_MAP_LOAD))
1401	if (object *pl = op->ms ().player ())	1399	if (object *pl = ms.player ())
1402	if (pl->contr->ns)
1403	pl->contr->ns->floorbox_update ();	1400	pl->contr->ns->floorbox_update ();
1404		1401
1405	/* If this object glows, it may affect lighting conditions that are	1402	/* If this object glows, it may affect lighting conditions that are
1406	* visible to others on this map. But update_all_los is really	1403	* visible to others on this map. But update_all_los is really
1407	* an inefficient way to do this, as it means los for all players	1404	* an inefficient way to do this, as it means los for all players
1408	* on the map will get recalculated. The players could very well	1405	* on the map will get recalculated. The players could very well
…		…
1427	* blocked() and wall() work properly), and these flags are updated by	1424	* blocked() and wall() work properly), and these flags are updated by
1428	* update_object().	1425	* update_object().
1429	*/	1426	*/
1430		1427
1431	/* if this is not the head or flag has been passed, don't check walk on status */	1428	/* if this is not the head or flag has been passed, don't check walk on status */
1432	if (!(flag & INS_NO_WALK_ON) && !op->head)	1429	if (!(flag & INS_NO_WALK_ON) && op->head_ () == op)
1433	{	1430	{
1434	if (check_move_on (op, originator))	1431	if (check_move_on (op, originator))
1435	return 0;	1432	return 0;
1436		1433
1437	/* If we are a multi part object, lets work our way through the check	1434	/* If we are a multi part object, lets work our way through the check
1438	* walk on's.	1435	* walk on's.
1439	*/	1436	*/
1440	for (tmp = op->more; tmp != NULL; tmp = tmp->more)	1437	for (object *tmp = op->more; tmp; tmp = tmp->more)
1441	if (check_move_on (tmp, originator))	1438	if (check_move_on (tmp, originator))
1442	return 0;	1439	return 0;
1443	}	1440	}
1444		1441
1445	return op;	1442	return op;
…		…
1455	object *tmp, *tmp1;	1452	object *tmp, *tmp1;
1456		1453
1457	/* first search for itself and remove any old instances */	1454	/* first search for itself and remove any old instances */
1458		1455
1459	for (tmp = op->ms ().bot; tmp; tmp = tmp->above)	1456	for (tmp = op->ms ().bot; tmp; tmp = tmp->above)
1460	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */	1457	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */
1461	tmp->destroy ();	1458	tmp->destroy ();
1462		1459
1463	tmp1 = arch_to_object (archetype::find (arch_string));	1460	tmp1 = arch_to_object (archetype::find (arch_string));
1464		1461
1465	tmp1->x = op->x;	1462	tmp1->x = op->x;
…		…
1468	}	1465	}
1469		1466
1470	object *	1467	object *
1471	object::insert_at (object *where, object *originator, int flags)	1468	object::insert_at (object *where, object *originator, int flags)
1472	{	1469	{
1473	where->map->insert (this, where->x, where->y, originator, flags);	1470	return where->map->insert (this, where->x, where->y, originator, flags);
1474	}	1471	}
1475		1472
1476	/*	1473	/*
1477	* get_split_ob(ob,nr) splits up ob into two parts. The part which	1474	* get_split_ob(ob,nr) splits up ob into two parts. The part which
1478	* is returned contains nr objects, and the remaining parts contains	1475	* is returned contains nr objects, and the remaining parts contains
…		…
1518	* the amount of an object. If the amount reaches 0, the object	1515	* the amount of an object. If the amount reaches 0, the object
1519	* is subsequently removed and freed.	1516	* is subsequently removed and freed.
1520	*	1517	*
1521	* Return value: 'op' if something is left, NULL if the amount reached 0	1518	* Return value: 'op' if something is left, NULL if the amount reached 0
1522	*/	1519	*/
1523
1524	object *	1520	object *
1525	decrease_ob_nr (object *op, uint32 i)	1521	decrease_ob_nr (object *op, uint32 i)
1526	{	1522	{
1527	object *tmp;	1523	object *tmp;
1528		1524
…		…
1603		1599
1604	/*	1600	/*
1605	* add_weight(object, weight) adds the specified weight to an object,	1601	* add_weight(object, weight) adds the specified weight to an object,
1606	* and also updates how much the environment(s) is/are carrying.	1602	* and also updates how much the environment(s) is/are carrying.
1607	*/	1603	*/
1608
1609	void	1604	void
1610	add_weight (object *op, signed long weight)	1605	add_weight (object *op, signed long weight)
1611	{	1606	{
1612	while (op != NULL)	1607	while (op != NULL)
1613	{	1608	{
…		…
1628	LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);	1623	LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
1629	free (dump);	1624	free (dump);
1630	return op;	1625	return op;
1631	}	1626	}
1632		1627
1633	if (where->head)	1628	if (where->head_ () != where)
1634	{	1629	{
1635	LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n");	1630	LOG (llevError | logBacktrace, "Warning: Tried to insert object into wrong part of multipart object.\n");
1636	where = where->head;	1631	where = where->head;
1637	}	1632	}
1638		1633
1639	return where->insert (op);	1634	return where->insert (op);
1640	}	1635	}
…		…
1645	* inside the object environment.	1640	* inside the object environment.
1646	*	1641	*
1647	* The function returns now pointer to inserted item, and return value can	1642	* The function returns now pointer to inserted item, and return value can
1648	* be != op, if items are merged. -Tero	1643	* be != op, if items are merged. -Tero
1649	*/	1644	*/
1650
1651	object *	1645	object *
1652	object::insert (object *op)	1646	object::insert (object *op)
1653	{	1647	{
1654	object *tmp, *otmp;
1655
1656	if (!QUERY_FLAG (op, FLAG_REMOVED))	1648	if (!QUERY_FLAG (op, FLAG_REMOVED))
1657	op->remove ();	1649	op->remove ();
1658		1650
1659	if (op->more)	1651	if (op->more)
1660	{	1652	{
…		…
1662	return op;	1654	return op;
1663	}	1655	}
1664		1656
1665	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1657	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1666	CLEAR_FLAG (op, FLAG_REMOVED);	1658	CLEAR_FLAG (op, FLAG_REMOVED);
		1659
1667	if (op->nrof)	1660	if (op->nrof)
1668	{	1661	{
1669	for (tmp = inv; tmp != NULL; tmp = tmp->below)	1662	for (object *tmp = inv; tmp; tmp = tmp->below)
1670	if (object::can_merge (tmp, op))	1663	if (object::can_merge (tmp, op))
1671	{	1664	{
1672	/* return the original object and remove inserted object	1665	/* return the original object and remove inserted object
1673	(client needs the original object) */	1666	(client needs the original object) */
1674	tmp->nrof += op->nrof;	1667	tmp->nrof += op->nrof;
…		…
1693	add_weight (this, op->weight * op->nrof);	1686	add_weight (this, op->weight * op->nrof);
1694	}	1687	}
1695	else	1688	else
1696	add_weight (this, (op->weight + op->carrying));	1689	add_weight (this, (op->weight + op->carrying));
1697		1690
1698	otmp = this->in_player ();	1691	if (object *otmp = this->in_player ())
1699	if (otmp && otmp->contr)
1700	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1692	if (otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1701	otmp->update_stats ();	1693	otmp->update_stats ();
1702		1694
		1695	op->owner = 0; // its his/hers now. period.
1703	op->map = 0;	1696	op->map = 0;
1704	op->env = this;	1697	op->env = this;
1705	op->above = 0;	1698	op->above = 0;
1706	op->below = 0;	1699	op->below = 0;
1707	op->x = 0, op->y = 0;	1700	op->x = op->y = 0;
1708		1701
1709	/* reset the light list and los of the players on the map */	1702	/* reset the light list and los of the players on the map */
1710	if ((op->glow_radius != 0) && map)	1703	if (op->glow_radius && map)
1711	{	1704	{
1712	#ifdef DEBUG_LIGHTS	1705	#ifdef DEBUG_LIGHTS
1713	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);	1706	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1714	#endif /* DEBUG_LIGHTS */	1707	#endif /* DEBUG_LIGHTS */
1715	if (map->darkness)	1708	if (map->darkness)
…		…
1815	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||	1808	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
1816	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))	1809	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1817	{	1810	{
1818		1811
1819	float	1812	float
1820	diff = tmp->move_slow_penalty * FABS (op->speed);	1813	diff = tmp->move_slow_penalty * fabs (op->speed);
1821		1814
1822	if (op->type == PLAYER)	1815	if (op->type == PLAYER)
1823	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||	1816	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||
1824	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))	1817	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))
1825	diff /= 4.0;	1818	diff /= 4.0;
…		…
1969	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)	1962	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
1970	{	1963	{
1971	CLEAR_FLAG (tmp, flag);	1964	CLEAR_FLAG (tmp, flag);
1972	unflag_inv (tmp, flag);	1965	unflag_inv (tmp, flag);
1973	}	1966	}
1974	}
1975
1976	/*
1977	* set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in
1978	* all it's inventory (recursively).
1979	* If checksums are used, a player will get set_cheat called for
1980	* him/her-self and all object carried by a call to this function.
1981	*/
1982	void
1983	set_cheat (object *op)
1984	{
1985	SET_FLAG (op, FLAG_WAS_WIZ);
1986	flag_inv (op, FLAG_WAS_WIZ);
1987	}	1967	}
1988		1968
1989	/*	1969	/*
1990	* find_free_spot(object, map, x, y, start, stop) will search for	1970	* find_free_spot(object, map, x, y, start, stop) will search for
1991	* a spot at the given map and coordinates which will be able to contain	1971	* a spot at the given map and coordinates which will be able to contain
…		…
2008	* customized, changed states, etc.	1988	* customized, changed states, etc.
2009	*/	1989	*/
2010	int	1990	int
2011	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)	1991	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2012	{	1992	{
		1993	int altern[SIZEOFFREE];
2013	int index = 0, flag;	1994	int index = 0, flag;
2014	int altern[SIZEOFFREE];
2015		1995
2016	for (int i = start; i < stop; i++)	1996	for (int i = start; i < stop; i++)
2017	{	1997	{
2018	flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]);	1998	mapxy pos (m, x, y); pos.move (i);
2019	if (!flag)	1999
		2000	if (!pos.normalise ())
		2001	continue;
		2002
		2003	mapspace &ms = *pos;
		2004
		2005	if (ms.flags () & P_IS_ALIVE)
		2006	continue;
		2007
		2008	/* However, often
		2009	* ob doesn't have any move type (when used to place exits)
		2010	* so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.
		2011	*/
		2012	if (ob->move_type == 0 && ms.move_block != MOVE_ALL)
		2013	{
2020	altern [index++] = i;	2014	altern [index++] = i;
		2015	continue;
		2016	}
2021		2017
2022	/* Basically, if we find a wall on a space, we cut down the search size.	2018	/* Basically, if we find a wall on a space, we cut down the search size.
2023	* In this way, we won't return spaces that are on another side of a wall.	2019	* In this way, we won't return spaces that are on another side of a wall.
2024	* This mostly work, but it cuts down the search size in all directions -	2020	* This mostly work, but it cuts down the search size in all directions -
2025	* if the space being examined only has a wall to the north and empty	2021	* if the space being examined only has a wall to the north and empty
2026	* spaces in all the other directions, this will reduce the search space	2022	* spaces in all the other directions, this will reduce the search space
2027	* to only the spaces immediately surrounding the target area, and	2023	* to only the spaces immediately surrounding the target area, and
2028	* won't look 2 spaces south of the target space.	2024	* won't look 2 spaces south of the target space.
2029	*/	2025	*/
2030	else if ((flag & P_NO_PASS) && maxfree[i] < stop)	2026	if (ms.move_block == MOVE_ALL && maxfree[i] < stop)
		2027	{
2031	stop = maxfree[i];	2028	stop = maxfree[i];
		2029	continue;
		2030	}
		2031
		2032	/* Note it is intentional that we check ob - the movement type of the
		2033	* head of the object should correspond for the entire object.
		2034	*/
		2035	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
		2036	continue;
		2037
		2038	altern [index++] = i;
2032	}	2039	}
2033		2040
2034	if (!index)	2041	if (!index)
2035	return -1;	2042	return -1;
2036		2043
2037	return altern[RANDOM () % index];	2044	return altern [rndm (index)];
2038	}	2045	}
2039		2046
2040	/*	2047	/*
2041	* find_first_free_spot(archetype, maptile, x, y) works like	2048	* find_first_free_spot(archetype, maptile, x, y) works like
2042	* find_free_spot(), but it will search max number of squares.	2049	* find_free_spot(), but it will search max number of squares.
…		…
2045	*/	2052	*/
2046	int	2053	int
2047	find_first_free_spot (const object *ob, maptile *m, int x, int y)	2054	find_first_free_spot (const object *ob, maptile *m, int x, int y)
2048	{	2055	{
2049	for (int i = 0; i < SIZEOFFREE; i++)	2056	for (int i = 0; i < SIZEOFFREE; i++)
2050	if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]))	2057	if (!ob->blocked (m, x + freearr_x[i], y + freearr_y[i]))
2051	return i;	2058	return i;
2052		2059
2053	return -1;	2060	return -1;
2054	}	2061	}
2055		2062
…		…
2063	{	2070	{
2064	arr += begin;	2071	arr += begin;
2065	end -= begin;	2072	end -= begin;
2066		2073
2067	while (--end)	2074	while (--end)
2068	swap (arr [end], arr [RANDOM () % (end + 1)]);	2075	swap (arr [end], arr [rndm (end + 1)]);
2069	}	2076	}
2070		2077
2071	/* new function to make monster searching more efficient, and effective!	2078	/* new function to make monster searching more efficient, and effective!
2072	* This basically returns a randomized array (in the passed pointer) of	2079	* This basically returns a randomized array (in the passed pointer) of
2073	* the spaces to find monsters. In this way, it won't always look for	2080	* the spaces to find monsters. In this way, it won't always look for
…		…
2109	object *tmp;	2116	object *tmp;
2110	maptile *mp;	2117	maptile *mp;
2111		2118
2112	MoveType blocked, move_type;	2119	MoveType blocked, move_type;
2113		2120
2114	if (exclude && exclude->head)	2121	if (exclude && exclude->head_ () != exclude)
2115	{	2122	{
2116	exclude = exclude->head;	2123	exclude = exclude->head;
2117	move_type = exclude->move_type;	2124	move_type = exclude->move_type;
2118	}	2125	}
2119	else	2126	else
…		…
2142	max = maxfree[i];	2149	max = maxfree[i];
2143	else if (mflags & P_IS_ALIVE)	2150	else if (mflags & P_IS_ALIVE)
2144	{	2151	{
2145	for (tmp = ms.bot; tmp; tmp = tmp->above)	2152	for (tmp = ms.bot; tmp; tmp = tmp->above)
2146	if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)	2153	if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)
2147	&& (tmp != exclude || (tmp->head && tmp->head != exclude)))	2154	&& (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2148	break;	2155	break;
2149		2156
2150	if (tmp)	2157	if (tmp)
2151	return freedir[i];	2158	return freedir[i];
2152	}	2159	}
…		…
2207		2214
2208	return 3;	2215	return 3;
2209	}	2216	}
2210		2217
2211	/*	2218	/*
2212	* absdir(int): Returns a number between 1 and 8, which represent
2213	* the "absolute" direction of a number (it actually takes care of
2214	* "overflow" in previous calculations of a direction).
2215	*/
2216
2217	int
2218	absdir (int d)
2219	{
2220	while (d < 1)
2221	d += 8;
2222
2223	while (d > 8)
2224	d -= 8;
2225
2226	return d;
2227	}
2228
2229	/*
2230	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is	2219	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is
2231	* between two directions (which are expected to be absolute (see absdir())	2220	* between two directions (which are expected to be absolute (see absdir())
2232	*/	2221	*/
2233
2234	int	2222	int
2235	dirdiff (int dir1, int dir2)	2223	dirdiff (int dir1, int dir2)
2236	{	2224	{
2237	int d;	2225	int d;
2238		2226
…		…
2351	* Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause	2339	* Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause
2352	* core dumps if they do.	2340	* core dumps if they do.
2353	*	2341	*
2354	* Add a check so we can't pick up invisible objects (0.93.8)	2342	* Add a check so we can't pick up invisible objects (0.93.8)
2355	*/	2343	*/
2356
2357	int	2344	int
2358	can_pick (const object *who, const object *item)	2345	can_pick (const object *who, const object *item)
2359	{	2346	{
2360	return /*QUERY_FLAG(who,FLAG_WIZ)|| */	2347	return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2361	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&	2348	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
…		…
2366	* create clone from object to another	2353	* create clone from object to another
2367	*/	2354	*/
2368	object *	2355	object *
2369	object_create_clone (object *asrc)	2356	object_create_clone (object *asrc)
2370	{	2357	{
2371	object *dst = 0, *tmp, *src, *part, *prev, *item;	2358	object *dst = 0, *tmp, *src, *prev, *item;
2372		2359
2373	if (!asrc)	2360	if (!asrc)
2374	return 0;	2361	return 0;
2375		2362
2376	src = asrc;
2377	if (src->head)
2378	src = src->head;	2363	src = asrc->head_ ();
2379		2364
2380	prev = 0;	2365	prev = 0;
2381	for (part = src; part; part = part->more)	2366	for (object *part = src; part; part = part->more)
2382	{	2367	{
2383	tmp = part->clone ();	2368	tmp = part->clone ();
2384	tmp->x -= src->x;	2369	tmp->x -= src->x;
2385	tmp->y -= src->y;	2370	tmp->y -= src->y;
2386		2371
…		…
2402		2387
2403	for (item = src->inv; item; item = item->below)	2388	for (item = src->inv; item; item = item->below)
2404	insert_ob_in_ob (object_create_clone (item), dst);	2389	insert_ob_in_ob (object_create_clone (item), dst);
2405		2390
2406	return dst;	2391	return dst;
2407	}
2408
2409	/* GROS - Creates an object using a string representing its content. */
2410	/* Basically, we save the content of the string to a temp file, then call */
2411	/* load_object on it. I admit it is a highly inefficient way to make things, */
2412	/* but it was simple to make and allows reusing the load_object function. */
2413	/* Remember not to use load_object_str in a time-critical situation. */
2414	/* Also remember that multiparts objects are not supported for now. */
2415	object *
2416	load_object_str (const char *obstr)
2417	{
2418	object *op;
2419	char filename[MAX_BUF];
2420
2421	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2422
2423	FILE *tempfile = fopen (filename, "w");
2424
2425	if (tempfile == NULL)
2426	{
2427	LOG (llevError, "Error - Unable to access load object temp file\n");
2428	return NULL;
2429	}
2430
2431	fprintf (tempfile, obstr);
2432	fclose (tempfile);
2433
2434	op = object::create ();
2435
2436	object_thawer thawer (filename);
2437
2438	if (thawer)
2439	load_object (thawer, op, 0);
2440
2441	LOG (llevDebug, " load str completed, object=%s\n", &op->name);
2442	CLEAR_FLAG (op, FLAG_REMOVED);
2443
2444	return op;
2445	}	2392	}
2446		2393
2447	/* This returns the first object in who's inventory that	2394	/* This returns the first object in who's inventory that
2448	* has the same type and subtype match.	2395	* has the same type and subtype match.
2449	* returns NULL if no match.	2396	* returns NULL if no match.
…		…
2504	if (link->key == canonical_key)	2451	if (link->key == canonical_key)
2505	return link->value;	2452	return link->value;
2506		2453
2507	return 0;	2454	return 0;
2508	}	2455	}
2509
2510		2456
2511	/*	2457	/*
2512	* Updates the canonical_key in op to value.	2458	* Updates the canonical_key in op to value.
2513	*	2459	*
2514	* canonical_key is a shared string (value doesn't have to be).	2460	* canonical_key is a shared string (value doesn't have to be).
…		…
2538	/* Basically, if the archetype has this key set,	2484	/* Basically, if the archetype has this key set,
2539	* we need to store the null value so when we save	2485	* we need to store the null value so when we save
2540	* it, we save the empty value so that when we load,	2486	* it, we save the empty value so that when we load,
2541	* we get this value back again.	2487	* we get this value back again.
2542	*/	2488	*/
2543	if (get_ob_key_link (&op->arch->clone, canonical_key))	2489	if (get_ob_key_link (op->arch, canonical_key))
2544	field->value = 0;	2490	field->value = 0;
2545	else	2491	else
2546	{	2492	{
2547	if (last)	2493	if (last)
2548	last->next = field->next;	2494	last->next = field->next;
…		…
2617	}	2563	}
2618	else	2564	else
2619	item = item->env;	2565	item = item->env;
2620	}	2566	}
2621		2567
2622
2623	const char *	2568	const char *
2624	object::flag_desc (char *desc, int len) const	2569	object::flag_desc (char *desc, int len) const
2625	{	2570	{
2626	char *p = desc;	2571	char *p = desc;
2627	bool first = true;	2572	bool first = true;
…		…
2654	{	2599	{
2655	char flagdesc[512];	2600	char flagdesc[512];
2656	char info2[256 * 4];	2601	char info2[256 * 4];
2657	char *p = info;	2602	char *p = info;
2658		2603
2659	p += snprintf (p, 512, "{cnt:%d,uuid:<1,%" PRIx64 ">,name:\"%s%s%s\",flags:[%s],type:%d}",	2604	p += snprintf (p, 512, "{cnt:%d,uuid:<1.%" PRIx64 ">,name:\"%s\"%s%s,flags:[%s],type:%d}",
2660	count, uuid.seq,	2605	count, uuid.seq,
2661	&name,	2606	&name,
2662	title ? "\",title:" : "",	2607	title ? "\",title:\"" : "",
2663	title ? (const char *)title : "",	2608	title ? (const char *)title : "",
2664	flag_desc (flagdesc, 512), type);	2609	flag_desc (flagdesc, 512), type);
2665		2610
2666	if (env)	2611	if (!this->flag[FLAG_REMOVED] && env)
2667	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2612	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2668		2613
2669	if (map)	2614	if (map)
2670	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);	2615	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2671		2616
…		…
2673	}	2618	}
2674		2619
2675	const char *	2620	const char *
2676	object::debug_desc () const	2621	object::debug_desc () const
2677	{	2622	{
2678	static char info[256 * 4];	2623	static char info[3][256 * 4];
		2624	static int info_idx;
		2625
2679	return debug_desc (info);	2626	return debug_desc (info [++info_idx % 3]);
2680	}	2627	}
2681		2628
		2629	struct region *
		2630	object::region () const
		2631	{
		2632	return map ? map->region (x, y)
		2633	: region::default_region ();
		2634	}
		2635
		2636	const materialtype_t *
		2637	object::dominant_material () const
		2638	{
		2639	if (materialtype_t *mt = name_to_material (materialname))
		2640	return mt;
		2641
		2642	return name_to_material (shstr_unknown);
		2643	}
		2644
		2645	void
		2646	object::open_container (object *new_container)
		2647	{
		2648	if (container == new_container)
		2649	return;
		2650
		2651	if (object *old_container = container)
		2652	{
		2653	if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
		2654	return;
		2655
		2656	#if 0
		2657	// remove the "Close old_container" object.
		2658	if (object *closer = old_container->inv)
		2659	if (closer->type == CLOSE_CON)
		2660	closer->destroy ();
		2661	#endif
		2662
		2663	old_container->flag [FLAG_APPLIED] = 0;
		2664	container = 0;
		2665
		2666	esrv_update_item (UPD_FLAGS, this, old_container);
		2667	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
		2668	play_sound (sound_find ("chest_close"));
		2669	}
		2670
		2671	if (new_container)
		2672	{
		2673	if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))
		2674	return;
		2675
		2676	// TODO: this does not seem to serve any purpose anymore?
		2677	#if 0
		2678	// insert the "Close Container" object.
		2679	if (archetype *closer = new_container->other_arch)
		2680	{
		2681	object *closer = arch_to_object (new_container->other_arch);
		2682	closer->flag [FLAG_NO_MAP_SAVE] = 1;
		2683	new_container->insert (closer);
		2684	}
		2685	#endif
		2686
		2687	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));
		2688
		2689	new_container->flag [FLAG_APPLIED] = 1;
		2690	container = new_container;
		2691
		2692	esrv_update_item (UPD_FLAGS, this, new_container);
		2693	esrv_send_inventory (this, new_container);
		2694	play_sound (sound_find ("chest_open"));
		2695	}
		2696	}
		2697
		2698	object *
		2699	object::force_find (const shstr name)
		2700	{
		2701	/* cycle through his inventory to look for the MARK we want to
		2702	* place
		2703	*/
		2704	for (object *tmp = inv; tmp; tmp = tmp->below)
		2705	if (tmp->type == FORCE && tmp->slaying == name)
		2706	return splay (tmp);
		2707
		2708	return 0;
		2709	}
		2710
		2711	void
		2712	object::force_add (const shstr name, int duration)
		2713	{
		2714	if (object *force = force_find (name))
		2715	force->destroy ();
		2716
		2717	object *force = get_archetype (FORCE_NAME);
		2718
		2719	force->slaying = name;
		2720	force->stats.food = 1;
		2721	force->speed_left = -1.f;
		2722
		2723	force->set_speed (duration ? 1.f / duration : 0.f);
		2724	force->flag [FLAG_IS_USED_UP] = true;
		2725	force->flag [FLAG_APPLIED] = true;
		2726
		2727	insert (force);
		2728	}
		2729
		2730	void
		2731	object::play_sound (faceidx sound) const
		2732	{
		2733	if (!sound)
		2734	return;
		2735
		2736	if (flag [FLAG_REMOVED])
		2737	return;
		2738
		2739	if (env)
		2740	{
		2741	if (object *pl = in_player ())
		2742	pl->contr->play_sound (sound);
		2743	}
		2744	else
		2745	map->play_sound (sound, x, y);
		2746	}
		2747

Diff Legend

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