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.107 by pippijn, Sat Jan 6 14:42:29 2007 UTC vs.
Revision 1.182 by root, Mon Aug 20 18:11:02 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 (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team	4	* Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
5	Copyright (C) 2001 Mark Wedel & Crossfire Development Team	5	* Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team
6	Copyright (C) 1992 Frank Tore Johansen	6	* Copyright (©) 1992,2007 Frank Tore Johansen
7		7	*
8	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
9	it under the terms of the GNU General Public License as published by	9	* it under the terms of the GNU General Public License as published by
10	the Free Software Foundation; either version 2 of the License, or	10	* the Free Software Foundation, either version 3 of the License, or
11	(at your option) any later version.	11	* (at your option) any later version.
12		12	*
13	This program is distributed in the hope that it will be useful,	13	* This program is distributed in the hope that it will be useful,
14	but WITHOUT ANY WARRANTY; without even the implied warranty of	14	* but WITHOUT ANY WARRANTY; without even the implied warranty of
15	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16	GNU General Public License for more details.	16	* GNU General Public License for more details.
17		17	*
18	You should have received a copy of the GNU General Public License	18	* You should have received a copy of the GNU General Public License
19	along with this program; if not, write to the Free Software	19	* along with this program. If not, see <http://www.gnu.org/licenses/>.
20	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	20	*
21
22	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>
23	*/	22	*/
24		23
25	/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.	24	/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
26	sub/add_weight will transcend the environment updating the carrying	25	sub/add_weight will transcend the environment updating the carrying
27	variable. */	26	variable. */
28	#include <global.h>	27	#include <global.h>
29	#include <stdio.h>	28	#include <stdio.h>
30	#include <sys/types.h>	29	#include <sys/types.h>
31	#include <sys/uio.h>	30	#include <sys/uio.h>
32	#include <object.h>	31	#include <object.h>
33	#include <funcpoint.h>	32	#include <funcpoint.h>
		33	#include <sproto.h>
34	#include <loader.h>	34	#include <loader.h>
35		35
36	#include <bitset>	36	#include <bitset>
37		37
38	int nrofallocobjects = 0;	38	int nrofallocobjects = 0;
39	static UUID uuid;	39	static UUID uuid;
40	const uint64 UUID_SKIP = 1<<19;	40	const uint64 UUID_SKIP = 1<<19;
41		41
42	object *active_objects; /* List of active objects that need to be processed */	42	objectvec objects;
		43	activevec actives;
43		44
44	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,
45	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
46	};	47	};
47	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,
…		…
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;
…		…
356	/*	358	/*
357	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.	359	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
358	* Some error messages.	360	* Some error messages.
359	* 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.
360	*/	362	*/
361
362	char *	363	char *
363	dump_object (object *op)	364	dump_object (object *op)
364	{	365	{
365	if (!op)	366	if (!op)
366	return strdup ("[NULLOBJ]");	367	return strdup ("[NULLOBJ]");
367		368
368	object_freezer freezer;	369	object_freezer freezer;
369	save_object (freezer, op, 1);	370	op->write (freezer);
370	return freezer.as_string ();	371	return freezer.as_string ();
371	}	372	}
372		373
373	/*	374	/*
374	* 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
…		…
391	}	392	}
392		393
393	/*	394	/*
394	* 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.
395	*/	396	*/
396
397	object *	397	object *
398	find_object (tag_t i)	398	find_object (tag_t i)
399	{	399	{
400	for (object *op = object::first; op; op = op->next)	400	for_all_objects (op)
401	if (op->count == i)	401	if (op->count == i)
402	return op;	402	return op;
403		403
404	return 0;	404	return 0;
405	}	405	}
406		406
407	/*	407	/*
408	* 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.
409	* Used only by the patch command, but not all that useful.	409	* Used only by the patch command, but not all that useful.
410	* Enables features like "patch <name-of-other-player> food 999"	410	* Enables features like "patch <name-of-other-player> food 999"
411	*/	411	*/
412
413	object *	412	object *
414	find_object_name (const char *str)	413	find_object_name (const char *str)
415	{	414	{
416	shstr_cmp str_ (str);	415	shstr_cmp str_ (str);
417	object *op;	416	object *op;
418		417
419	for (op = object::first; op != NULL; op = op->next)	418	for_all_objects (op)
420	if (op->name == str_)	419	if (op->name == str_)
421	break;	420	break;
422		421
423	return op;	422	return op;
424	}	423	}
…		…
450	owner = owner->owner;	449	owner = owner->owner;
451		450
452	this->owner = owner;	451	this->owner = owner;
453	}	452	}
454		453
		454	int
		455	object::slottype () const
		456	{
		457	if (type == SKILL)
		458	{
		459	if (IS_COMBAT_SKILL (subtype)) return slot_combat;
		460	if (IS_RANGED_SKILL (subtype)) return slot_ranged;
		461	}
		462	else
		463	{
		464	if (slot [body_combat].info) return slot_combat;
		465	if (slot [body_range ].info) return slot_ranged;
		466	}
		467
		468	return slot_none;
		469	}
		470
		471	bool
		472	object::change_weapon (object *ob)
		473	{
		474	if (current_weapon == ob)
		475	return true;
		476
		477	if (chosen_skill)
		478	chosen_skill->flag [FLAG_APPLIED] = false;
		479
		480	current_weapon = ob;
		481	chosen_skill = !ob || ob->type == SKILL ? ob : find_skill_by_name (this, ob->skill);
		482
		483	if (chosen_skill)
		484	chosen_skill->flag [FLAG_APPLIED] = true;
		485
		486	update_stats ();
		487
		488	if (ob)
		489	{
		490	// now check wether any body locations became invalid, in which case
		491	// we cannot apply the weapon at the moment.
		492	for (int i = 0; i < NUM_BODY_LOCATIONS; ++i)
		493	if (slot[i].used < 0)
		494	{
		495	current_weapon = chosen_skill = 0;
		496	update_stats ();
		497
		498	new_draw_info_format (NDI_UNIQUE, 0, this,
		499	"You try to balance all your items at once, "
		500	"but the %s is just too much for your body. "
		501	"[You need to unapply some items first.]", &ob->name);
		502	return false;
		503	}
		504
		505	//new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);
		506	}
		507	else
		508	;//new_draw_info_format (NDI_UNIQUE, 0, this, "You unwield your weapons.");
		509
		510	if (ob && !ob->flag [FLAG_APPLIED] && ob->type != SPELL)
		511	{
		512	LOG (llevError | logBacktrace, "%s changed to unapplied weapon %s",
		513	&name, ob->debug_desc ());
		514	return false;
		515	}
		516
		517	return true;
		518	}
		519
455	/* Zero the key_values on op, decrementing the shared-string	520	/* Zero the key_values on op, decrementing the shared-string
456	* refcounts and freeing the links.	521	* refcounts and freeing the links.
457	*/	522	*/
458	static void	523	static void
459	free_key_values (object *op)	524	free_key_values (object *op)
460	{	525	{
461	for (key_value *i = op->key_values; i != 0;)	526	for (key_value *i = op->key_values; i; )
462	{	527	{
463	key_value *next = i->next;	528	key_value *next = i->next;
464	delete i;	529	delete i;
465		530
466	i = next;	531	i = next;
467	}	532	}
468		533
469	op->key_values = 0;	534	op->key_values = 0;
470	}	535	}
471		536
472	/*	537	object &
473	* copy_to first frees everything allocated by the dst object,	538	object::operator =(const object &src)
474	* and then copies the contents of itself into the second
475	* object, allocating what needs to be allocated. Basically, any
476	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
477	* if the first object is freed, the pointers in the new object
478	* will point at garbage.
479	*/
480	void
481	object::copy_to (object *dst)
482	{	539	{
483	bool is_freed = QUERY_FLAG (dst, FLAG_FREED);	540	bool is_freed = flag [FLAG_FREED];
484	bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED);	541	bool is_removed = flag [FLAG_REMOVED];
485		542
486	*(object_copy *)dst = *this;	543	*(object_copy *)this = src;
487		544
488	if (is_freed)	545	flag [FLAG_FREED] = is_freed;
489	SET_FLAG (dst, FLAG_FREED);	546	flag [FLAG_REMOVED] = is_removed;
490
491	if (is_removed)
492	SET_FLAG (dst, FLAG_REMOVED);
493
494	if (speed < 0)
495	dst->speed_left = speed_left - RANDOM () % 200 / 100.0;
496		547
497	/* Copy over key_values, if any. */	548	/* Copy over key_values, if any. */
498	if (key_values)	549	if (src.key_values)
499	{	550	{
500	key_value *tail = 0;	551	key_value *tail = 0;
501	key_value *i;
502
503	dst->key_values = 0;	552	key_values = 0;
504		553
505	for (i = key_values; i; i = i->next)	554	for (key_value *i = src.key_values; i; i = i->next)
506	{	555	{
507	key_value *new_link = new key_value;	556	key_value *new_link = new key_value;
508		557
509	new_link->next = 0;	558	new_link->next = 0;
510	new_link->key = i->key;	559	new_link->key = i->key;
511	new_link->value = i->value;	560	new_link->value = i->value;
512		561
513	/* Try and be clever here, too. */	562	/* Try and be clever here, too. */
514	if (!dst->key_values)	563	if (!key_values)
515	{	564	{
516	dst->key_values = new_link;	565	key_values = new_link;
517	tail = new_link;	566	tail = new_link;
518	}	567	}
519	else	568	else
520	{	569	{
521	tail->next = new_link;	570	tail->next = new_link;
522	tail = new_link;	571	tail = new_link;
523	}	572	}
524	}	573	}
525	}	574	}
		575	}
		576
		577	/*
		578	* copy_to first frees everything allocated by the dst object,
		579	* and then copies the contents of itself into the second
		580	* object, allocating what needs to be allocated. Basically, any
		581	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
		582	* if the first object is freed, the pointers in the new object
		583	* will point at garbage.
		584	*/
		585	void
		586	object::copy_to (object *dst)
		587	{
		588	*dst = *this;
		589
		590	if (speed < 0)
		591	dst->speed_left = speed_left - rndm ();
526		592
527	dst->set_speed (dst->speed);	593	dst->set_speed (dst->speed);
		594	}
		595
		596	void
		597	object::instantiate ()
		598	{
		599	if (!uuid.seq) // HACK
		600	uuid = gen_uuid ();
		601
		602	speed_left = -0.1f;
		603	/* copy the body_info to the body_used - this is only really
		604	* need for monsters, but doesn't hurt to do it for everything.
		605	* by doing so, when a monster is created, it has good starting
		606	* values for the body_used info, so when items are created
		607	* for it, they can be properly equipped.
		608	*/
		609	for (int i = NUM_BODY_LOCATIONS; i--; )
		610	slot[i].used = slot[i].info;
		611
		612	attachable::instantiate ();
528	}	613	}
529		614
530	object *	615	object *
531	object::clone ()	616	object::clone ()
532	{	617	{
…		…
590	* UP_OBJ_FACE: only the objects face has changed.	675	* UP_OBJ_FACE: only the objects face has changed.
591	*/	676	*/
592	void	677	void
593	update_object (object *op, int action)	678	update_object (object *op, int action)
594	{	679	{
595	MoveType move_on, move_off, move_block, move_slow;
596
597	if (op == NULL)	680	if (op == NULL)
598	{	681	{
599	/* this should never happen */	682	/* this should never happen */
600	LOG (llevDebug, "update_object() called for NULL object.\n");	683	LOG (llevDebug, "update_object() called for NULL object.\n");
601	return;	684	return;
…		…
661		744
662	if (op->more)	745	if (op->more)
663	update_object (op->more, action);	746	update_object (op->more, action);
664	}	747	}
665		748
666	object *object::first;
667
668	object::object ()	749	object::object ()
669	{	750	{
670	SET_FLAG (this, FLAG_REMOVED);	751	SET_FLAG (this, FLAG_REMOVED);
671		752
672	expmul = 1.0;	753	expmul = 1.0;
673	face = blank_face;	754	face = blank_face;
674	}	755	}
675		756
676	object::~object ()	757	object::~object ()
677	{	758	{
		759	unlink ();
		760
678	free_key_values (this);	761	free_key_values (this);
679	}	762	}
680		763
		764	static int object_count;
		765
681	void object::link ()	766	void object::link ()
682	{	767	{
683	count = ++ob_count;	768	assert (!index);//D
684	uuid = gen_uuid ();	769	uuid = gen_uuid ();
		770	count = ++object_count;
685		771
686	prev = 0;	772	refcnt_inc ();
687	next = object::first;	773	objects.insert (this);
688
689	if (object::first)
690	object::first->prev = this;
691
692	object::first = this;
693	}	774	}
694		775
695	void object::unlink ()	776	void object::unlink ()
696	{	777	{
697	if (this == object::first)	778	if (!index)
698	object::first = next;	779	return;
699		780
700	/* Remove this object from the list of used objects */	781	objects.erase (this);
701	if (prev) prev->next = next;	782	refcnt_dec ();
702	if (next) next->prev = prev;
703
704	prev = 0;
705	next = 0;
706	}
707
708	bool
709	object::active () const
710	{
711	return active_next || active_prev || this == active_objects;
712	}	783	}
713		784
714	void	785	void
715	object::activate ()	786	object::activate ()
716	{	787	{
717	/* If already on active list, don't do anything */	788	/* If already on active list, don't do anything */
718	if (active ())	789	if (active)
719	return;	790	return;
720		791
721	if (has_active_speed ())	792	if (has_active_speed ())
722	{	793	actives.insert (this);
723	/* process_events() expects us to insert the object at the beginning
724	* of the list. */
725	active_next = active_objects;
726
727	if (active_next)
728	active_next->active_prev = this;
729
730	active_objects = this;
731	}
732	}	794	}
733		795
734	void	796	void
735	object::activate_recursive ()	797	object::activate_recursive ()
736	{	798	{
…		…
750	*/	812	*/
751	void	813	void
752	object::deactivate ()	814	object::deactivate ()
753	{	815	{
754	/* If not on the active list, nothing needs to be done */	816	/* If not on the active list, nothing needs to be done */
755	if (!active ())	817	if (!active)
756	return;	818	return;
757		819
758	if (active_prev == 0)	820	actives.erase (this);
759	{
760	active_objects = active_next;
761	if (active_next)
762	active_next->active_prev = 0;
763	}
764	else
765	{
766	active_prev->active_next = active_next;
767	if (active_next)
768	active_next->active_prev = active_prev;
769	}
770
771	active_next = 0;
772	active_prev = 0;
773	}	821	}
774		822
775	void	823	void
776	object::deactivate_recursive ()	824	object::deactivate_recursive ()
777	{	825	{
…		…
811	* drop on that space.	859	* drop on that space.
812	*/	860	*/
813	if (!drop_to_ground	861	if (!drop_to_ground
814	|| !map	862	|| !map
815	|| map->in_memory != MAP_IN_MEMORY	863	|| map->in_memory != MAP_IN_MEMORY
		864	|| map->nodrop
816	|| ms ().move_block == MOVE_ALL)	865	|| ms ().move_block == MOVE_ALL)
817	{	866	{
818	while (inv)	867	while (inv)
819	{	868	{
820	inv->destroy_inv (drop_to_ground);	869	inv->destroy_inv (drop_to_ground);
…		…
829		878
830	if (op->flag [FLAG_STARTEQUIP]	879	if (op->flag [FLAG_STARTEQUIP]
831	|| op->flag [FLAG_NO_DROP]	880	|| op->flag [FLAG_NO_DROP]
832	|| op->type == RUNE	881	|| op->type == RUNE
833	|| op->type == TRAP	882	|| op->type == TRAP
834	|| op->flag [FLAG_IS_A_TEMPLATE])	883	|| op->flag [FLAG_IS_A_TEMPLATE]
		884	|| op->flag [FLAG_DESTROY_ON_DEATH])
835	op->destroy ();	885	op->destroy ();
836	else	886	else
837	map->insert (op, x, y);	887	map->insert (op, x, y);
838	}	888	}
839	}	889	}
…		…
847	}	897	}
848		898
849	void	899	void
850	object::do_destroy ()	900	object::do_destroy ()
851	{	901	{
		902	attachable::do_destroy ();
		903
852	if (flag [FLAG_IS_LINKED])	904	if (flag [FLAG_IS_LINKED])
853	remove_button_link (this);	905	remove_button_link (this);
854		906
855	if (flag [FLAG_FRIENDLY])	907	if (flag [FLAG_FRIENDLY])
856	remove_friendly_object (this);	908	remove_friendly_object (this);
857		909
858	if (!flag [FLAG_REMOVED])	910	if (!flag [FLAG_REMOVED])
859	remove ();	911	remove ();
860		912
861	if (flag [FLAG_FREED])	913	destroy_inv (true);
862	return;
863		914
864	set_speed (0);	915	deactivate ();
		916	unlink ();
865		917
866	flag [FLAG_FREED] = 1;	918	flag [FLAG_FREED] = 1;
867
868	attachable::do_destroy ();
869
870	destroy_inv (true);
871	unlink ();
872		919
873	// hack to ensure that freed objects still have a valid map	920	// hack to ensure that freed objects still have a valid map
874	{	921	{
875	static maptile *freed_map; // freed objects are moved here to avoid crashes	922	static maptile *freed_map; // freed objects are moved here to avoid crashes
876		923
…		…
889	map = freed_map;	936	map = freed_map;
890	x = 1;	937	x = 1;
891	y = 1;	938	y = 1;
892	}	939	}
893		940
894	head = 0;
895
896	if (more)	941	if (more)
897	{	942	{
898	more->destroy ();	943	more->destroy ();
899	more = 0;	944	more = 0;
900	}	945	}
901		946
		947	head = 0;
		948
902	// clear those pointers that likely might have circular references to us	949	// clear those pointers that likely might cause circular references
903	owner = 0;	950	owner = 0;
904	enemy = 0;	951	enemy = 0;
905	attacked_by = 0;	952	attacked_by = 0;
906		953	current_weapon = 0;
907	// only relevant for players(?), but make sure of it anyways
908	contr = 0;
909	}	954	}
910		955
911	void	956	void
912	object::destroy (bool destroy_inventory)	957	object::destroy (bool destroy_inventory)
913	{	958	{
914	if (destroyed ())	959	if (destroyed ())
915	return;	960	return;
916		961
917	if (destroy_inventory)	962	if (destroy_inventory)
918	destroy_inv (false);	963	destroy_inv (false);
		964
		965	if (is_head ())
		966	if (sound_destroy)
		967	play_sound (sound_destroy);
		968	else if (flag [FLAG_MONSTER])
		969	play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism
919		970
920	attachable::destroy ();	971	attachable::destroy ();
921	}	972	}
922		973
923	/*	974	/*
…		…
941	* This function removes the object op from the linked list of objects	992	* This function removes the object op from the linked list of objects
942	* which it is currently tied to. When this function is done, the	993	* which it is currently tied to. When this function is done, the
943	* object will have no environment. If the object previously had an	994	* object will have no environment. If the object previously had an
944	* environment, the x and y coordinates will be updated to	995	* environment, the x and y coordinates will be updated to
945	* the previous environment.	996	* the previous environment.
946	* Beware: This function is called from the editor as well!
947	*/	997	*/
948	void	998	void
949	object::remove ()	999	object::do_remove ()
950	{	1000	{
951	object *tmp, *last = 0;	1001	object *tmp, *last = 0;
952	object *otmp;	1002	object *otmp;
953		1003
954	if (QUERY_FLAG (this, FLAG_REMOVED))	1004	if (QUERY_FLAG (this, FLAG_REMOVED))
…		…
997	}	1047	}
998	else if (map)	1048	else if (map)
999	{	1049	{
1000	if (type == PLAYER)	1050	if (type == PLAYER)
1001	{	1051	{
		1052	// leaving a spot always closes any open container on the ground
		1053	if (container && !container->env)
		1054	// this causes spurious floorbox updates, but it ensures
		1055	// that the CLOSE event is being sent.
		1056	close_container ();
		1057
1002	--map->players;	1058	--map->players;
1003	map->touch ();	1059	map->touch ();
1004	}	1060	}
1005		1061
1006	map->dirty = true;	1062	map->dirty = true;
		1063	mapspace &ms = this->ms ();
1007		1064
1008	/* link the object above us */	1065	/* link the object above us */
1009	if (above)	1066	if (above)
1010	above->below = below;	1067	above->below = below;
1011	else	1068	else
1012	map->at (x, y).top = below; /* we were top, set new top */	1069	ms.top = below; /* we were top, set new top */
1013		1070
1014	/* Relink the object below us, if there is one */	1071	/* Relink the object below us, if there is one */
1015	if (below)	1072	if (below)
1016	below->above = above;	1073	below->above = above;
1017	else	1074	else
…		…
1019	/* Nothing below, which means we need to relink map object for this space	1076	/* Nothing below, which means we need to relink map object for this space
1020	* use translated coordinates in case some oddness with map tiling is	1077	* use translated coordinates in case some oddness with map tiling is
1021	* evident	1078	* evident
1022	*/	1079	*/
1023	if (GET_MAP_OB (map, x, y) != this)	1080	if (GET_MAP_OB (map, x, y) != this)
1024	{
1025	char *dump = dump_object (this);
1026	LOG (llevError,
1027	"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);	1081	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 ());
1028	free (dump);
1029	dump = dump_object (GET_MAP_OB (map, x, y));
1030	LOG (llevError, "%s\n", dump);
1031	free (dump);
1032	}
1033		1082
1034	map->at (x, y).bot = above; /* goes on above it. */	1083	ms.bot = above; /* goes on above it. */
1035	}	1084	}
1036		1085
1037	above = 0;	1086	above = 0;
1038	below = 0;	1087	below = 0;
1039		1088
1040	if (map->in_memory == MAP_SAVING)	1089	if (map->in_memory == MAP_SAVING)
1041	return;	1090	return;
1042		1091
1043	int check_walk_off = !flag [FLAG_NO_APPLY];	1092	int check_walk_off = !flag [FLAG_NO_APPLY];
1044		1093
		1094	if (object *pl = ms.player ())
		1095	{
		1096	if (pl->container == this)
		1097	/* If a container that the player is currently using somehow gets
		1098	* removed (most likely destroyed), update the player view
		1099	* appropriately.
		1100	*/
		1101	pl->close_container ();
		1102
		1103	pl->contr->ns->floorbox_update ();
		1104	}
		1105
1045	for (tmp = map->at (x, y).bot; tmp; tmp = tmp->above)	1106	for (tmp = ms.bot; tmp; tmp = tmp->above)
1046	{	1107	{
1047	/* No point updating the players look faces if he is the object	1108	/* No point updating the players look faces if he is the object
1048	* being removed.	1109	* being removed.
1049	*/	1110	*/
1050
1051	if (tmp->type == PLAYER && tmp != this)
1052	{
1053	/* If a container that the player is currently using somehow gets
1054	* removed (most likely destroyed), update the player view
1055	* appropriately.
1056	*/
1057	if (tmp->container == this)
1058	{
1059	flag [FLAG_APPLIED] = 0;
1060	tmp->container = 0;
1061	}
1062
1063	if (tmp->contr->ns)
1064	tmp->contr->ns->floorbox_update ();
1065	}
1066		1111
1067	/* See if object moving off should effect something */	1112	/* See if object moving off should effect something */
1068	if (check_walk_off	1113	if (check_walk_off
1069	&& ((move_type & tmp->move_off)	1114	&& ((move_type & tmp->move_off)
1070	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))	1115	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
…		…
1073		1118
1074	if (destroyed ())	1119	if (destroyed ())
1075	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());	1120	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1076	}	1121	}
1077		1122
1078	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1079	//TODO: why is this horrible hacka fix? get rid of this code=bug! (schmorp)
1080	if (tmp->above == tmp)
1081	tmp->above = 0;
1082
1083	last = tmp;	1123	last = tmp;
1084	}	1124	}
1085		1125
1086	/* last == NULL if there are no objects on this space */	1126	/* last == NULL if there are no objects on this space */
1087	//TODO: this makes little sense, why only update the topmost object?	1127	//TODO: this makes little sense, why only update the topmost object?
…		…
1130	}	1170	}
1131		1171
1132	return 0;	1172	return 0;
1133	}	1173	}
1134		1174
		1175	void
		1176	object::expand_tail ()
		1177	{
		1178	if (more)
		1179	return;
		1180
		1181	object *prev = this;
		1182
		1183	for (archetype *at = (archetype *)arch->more; at; at = (archetype *)at->more)
		1184	{
		1185	object *op = arch_to_object (at);
		1186
		1187	op->name = name;
		1188	op->name_pl = name_pl;
		1189	op->title = title;
		1190
		1191	op->head = this;
		1192	prev->more = op;
		1193
		1194	prev = op;
		1195	}
		1196	}
		1197
1135	/*	1198	/*
1136	* same as insert_ob_in_map except it handle separate coordinates and do a clean	1199	* same as insert_ob_in_map except it handles separate coordinates and does a clean
1137	* job preparing multi-part monsters	1200	* job preparing multi-part monsters.
1138	*/	1201	*/
1139	object *	1202	object *
1140	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)	1203	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1141	{	1204	{
1142	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)	1205	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1143	{	1206	{
1144	tmp->x = x + tmp->arch->clone.x;	1207	tmp->x = x + tmp->arch->x;
1145	tmp->y = y + tmp->arch->clone.y;	1208	tmp->y = y + tmp->arch->y;
1146	}	1209	}
1147		1210
1148	return insert_ob_in_map (op, m, originator, flag);	1211	return insert_ob_in_map (op, m, originator, flag);
1149	}	1212	}
1150		1213
…		…
1169	* just 'op' otherwise	1232	* just 'op' otherwise
1170	*/	1233	*/
1171	object *	1234	object *
1172	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)	1235	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1173	{	1236	{
		1237	assert (!op->flag [FLAG_FREED]);
		1238
1174	object *tmp, *top, *floor = NULL;	1239	object *top, *floor = NULL;
1175	sint16 x, y;
1176		1240
1177	if (QUERY_FLAG (op, FLAG_FREED))	1241	op->remove ();
1178	{
1179	LOG (llevError, "Trying to insert freed object!\n");
1180	return NULL;
1181	}
1182
1183	if (!m)
1184	{
1185	char *dump = dump_object (op);
1186	LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
1187	free (dump);
1188	return op;
1189	}
1190		1242
1191	if (out_of_map (m, op->x, op->y))	1243	if (out_of_map (m, op->x, op->y))
1192	{	1244	{
1193	char *dump = dump_object (op);
1194	LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump);	1245	LOG (llevError, "Trying to insert object outside the map.\n%s\n", op->debug_desc ());
1195	#ifdef MANY_CORES	1246	#ifdef MANY_CORES
1196	/* Better to catch this here, as otherwise the next use of this object	1247	/* Better to catch this here, as otherwise the next use of this object
1197	* is likely to cause a crash. Better to find out where it is getting	1248	* is likely to cause a crash. Better to find out where it is getting
1198	* improperly inserted.	1249	* improperly inserted.
1199	*/	1250	*/
1200	abort ();	1251	abort ();
1201	#endif	1252	#endif
1202	free (dump);
1203	return op;	1253	return op;
1204	}	1254	}
1205		1255
1206	if (!QUERY_FLAG (op, FLAG_REMOVED))	1256	if (object *more = op->more)
1207	{	1257	if (!insert_ob_in_map (more, m, originator, flag))
1208	char *dump = dump_object (op);
1209	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
1210	free (dump);
1211	return op;	1258	return 0;
1212	}
1213
1214	if (op->more)
1215	{
1216	/* The part may be on a different map. */
1217
1218	object *more = op->more;
1219
1220	/* We really need the caller to normalise coordinates - if
1221	* we set the map, that doesn't work if the location is within
1222	* a map and this is straddling an edge. So only if coordinate
1223	* is clear wrong do we normalise it.
1224	*/
1225	if (OUT_OF_REAL_MAP (more->map, more->x, more->y))
1226	more->map = get_map_from_coord (m, &more->x, &more->y);
1227	else if (!more->map)
1228	{
1229	/* For backwards compatibility - when not dealing with tiled maps,
1230	* more->map should always point to the parent.
1231	*/
1232	more->map = m;
1233	}
1234
1235	if (insert_ob_in_map (more, more->map, originator, flag) == NULL)
1236	{
1237	if (!op->head)
1238	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1239
1240	return 0;
1241	}
1242	}
1243		1259
1244	CLEAR_FLAG (op, FLAG_REMOVED);	1260	CLEAR_FLAG (op, FLAG_REMOVED);
1245		1261
1246	/* Ideally, the caller figures this out. However, it complicates a lot	1262	/* Ideally, the caller figures this out. However, it complicates a lot
1247	* of areas of callers (eg, anything that uses find_free_spot would now	1263	* of areas of callers (eg, anything that uses find_free_spot would now
1248	* need extra work	1264	* need extra work
1249	*/	1265	*/
1250	op->map = get_map_from_coord (m, &op->x, &op->y);	1266	if (!xy_normalise (m, op->x, op->y))
1251	x = op->x;	1267	return 0;
1252	y = op->y;	1268
		1269	op->map = m;
		1270	mapspace &ms = op->ms ();
1253		1271
1254	/* this has to be done after we translate the coordinates.	1272	/* this has to be done after we translate the coordinates.
1255	*/	1273	*/
1256	if (op->nrof && !(flag & INS_NO_MERGE))	1274	if (op->nrof && !(flag & INS_NO_MERGE))
1257	for (tmp = GET_MAP_OB (op->map, x, y); tmp; tmp = tmp->above)	1275	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1258	if (object::can_merge (op, tmp))	1276	if (object::can_merge (op, tmp))
1259	{	1277	{
1260	op->nrof += tmp->nrof;	1278	op->nrof += tmp->nrof;
1261	tmp->destroy ();	1279	tmp->destroy ();
1262	}	1280	}
…		…
1279	op->below = originator->below;	1297	op->below = originator->below;
1280		1298
1281	if (op->below)	1299	if (op->below)
1282	op->below->above = op;	1300	op->below->above = op;
1283	else	1301	else
1284	op->ms ().bot = op;	1302	ms.bot = op;
1285		1303
1286	/* since *below* originator, no need to update top */	1304	/* since *below* originator, no need to update top */
1287	originator->below = op;	1305	originator->below = op;
1288	}	1306	}
1289	else	1307	else
1290	{	1308	{
		1309	top = ms.bot;
		1310
1291	/* If there are other objects, then */	1311	/* If there are other objects, then */
1292	if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL))	1312	if ((!(flag & INS_MAP_LOAD)) && top)
1293	{	1313	{
1294	object *last = 0;	1314	object *last = 0;
1295		1315
1296	/*	1316	/*
1297	* If there are multiple objects on this space, we do some trickier handling.	1317	* If there are multiple objects on this space, we do some trickier handling.
…		…
1303	* once we get to them. This reduces the need to traverse over all of	1323	* once we get to them. This reduces the need to traverse over all of
1304	* them when adding another one - this saves quite a bit of cpu time	1324	* them when adding another one - this saves quite a bit of cpu time
1305	* when lots of spells are cast in one area. Currently, it is presumed	1325	* when lots of spells are cast in one area. Currently, it is presumed
1306	* that flying non pickable objects are spell objects.	1326	* that flying non pickable objects are spell objects.
1307	*/	1327	*/
1308	while (top)	1328	for (top = ms.bot; top; top = top->above)
1309	{	1329	{
1310	if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))	1330	if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))
1311	floor = top;	1331	floor = top;
1312		1332
1313	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))	1333	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))
…		…
1316	top = top->below;	1336	top = top->below;
1317	break;	1337	break;
1318	}	1338	}
1319		1339
1320	last = top;	1340	last = top;
1321	top = top->above;
1322	}	1341	}
1323		1342
1324	/* Don't want top to be NULL, so set it to the last valid object */	1343	/* Don't want top to be NULL, so set it to the last valid object */
1325	top = last;	1344	top = last;
1326		1345
…		…
1328	* looks like instead of lots of conditions here.	1347	* looks like instead of lots of conditions here.
1329	* makes things faster, and effectively the same result.	1348	* makes things faster, and effectively the same result.
1330	*/	1349	*/
1331		1350
1332	/* Have object 'fall below' other objects that block view.	1351	/* Have object 'fall below' other objects that block view.
1333	* Unless those objects are exits, type 66	1352	* Unless those objects are exits.
1334	* If INS_ON_TOP is used, don't do this processing	1353	* If INS_ON_TOP is used, don't do this processing
1335	* Need to find the object that in fact blocks view, otherwise	1354	* Need to find the object that in fact blocks view, otherwise
1336	* stacking is a bit odd.	1355	* stacking is a bit odd.
1337	*/	1356	*/
1338	if (!(flag & INS_ON_TOP) &&	1357	if (!(flag & INS_ON_TOP)
1339	(get_map_flags (op->map, 0, op->x, op->y, 0, 0) & P_BLOCKSVIEW) && (op->face && !op->face->visibility))	1358	&& ms.flags () & P_BLOCKSVIEW
		1359	&& (op->face && !faces [op->face].visibility))
1340	{	1360	{
1341	for (last = top; last != floor; last = last->below)	1361	for (last = top; last != floor; last = last->below)
1342	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1362	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1343	break;	1363	break;
		1364
1344	/* Check to see if we found the object that blocks view,	1365	/* Check to see if we found the object that blocks view,
1345	* and make sure we have a below pointer for it so that	1366	* and make sure we have a below pointer for it so that
1346	* we can get inserted below this one, which requires we	1367	* we can get inserted below this one, which requires we
1347	* set top to the object below us.	1368	* set top to the object below us.
1348	*/	1369	*/
1349	if (last && last->below && last != floor)	1370	if (last && last->below && last != floor)
1350	top = last->below;	1371	top = last->below;
1351	}	1372	}
1352	} /* If objects on this space */	1373	} /* If objects on this space */
1353
1354	if (flag & INS_MAP_LOAD)	1374	if (flag & INS_MAP_LOAD)
1355	top = GET_MAP_TOP (op->map, op->x, op->y);	1375	top = ms.top;
1356		1376
1357	if (flag & INS_ABOVE_FLOOR_ONLY)	1377	if (flag & INS_ABOVE_FLOOR_ONLY)
1358	top = floor;	1378	top = floor;
1359		1379
1360	/* Top is the object that our object (op) is going to get inserted above.	1380	/* Top is the object that our object (op) is going to get inserted above.
1361	*/	1381	*/
1362		1382
1363	/* First object on this space */	1383	/* First object on this space */
1364	if (!top)	1384	if (!top)
1365	{	1385	{
1366	op->above = GET_MAP_OB (op->map, op->x, op->y);	1386	op->above = ms.bot;
1367		1387
1368	if (op->above)	1388	if (op->above)
1369	op->above->below = op;	1389	op->above->below = op;
1370		1390
1371	op->below = 0;	1391	op->below = 0;
1372	op->ms ().bot = op;	1392	ms.bot = op;
1373	}	1393	}
1374	else	1394	else
1375	{ /* get inserted into the stack above top */	1395	{ /* get inserted into the stack above top */
1376	op->above = top->above;	1396	op->above = top->above;
1377		1397
…		…
1381	op->below = top;	1401	op->below = top;
1382	top->above = op;	1402	top->above = op;
1383	}	1403	}
1384		1404
1385	if (!op->above)	1405	if (!op->above)
1386	op->ms ().top = op;	1406	ms.top = op;
1387	} /* else not INS_BELOW_ORIGINATOR */	1407	} /* else not INS_BELOW_ORIGINATOR */
1388		1408
1389	if (op->type == PLAYER)	1409	if (op->type == PLAYER)
1390	{	1410	{
1391	op->contr->do_los = 1;	1411	op->contr->do_los = 1;
…		…
1393	op->map->touch ();	1413	op->map->touch ();
1394	}	1414	}
1395		1415
1396	op->map->dirty = true;	1416	op->map->dirty = true;
1397		1417
1398	/* If we have a floor, we know the player, if any, will be above
1399	* it, so save a few ticks and start from there.
1400	*/
1401	if (!(flag & INS_MAP_LOAD))	1418	if (!(flag & INS_MAP_LOAD))
1402	if (object *pl = op->ms ().player ())	1419	if (object *pl = ms.player ())
1403	if (pl->contr->ns)
1404	pl->contr->ns->floorbox_update ();	1420	pl->contr->ns->floorbox_update ();
1405		1421
1406	/* If this object glows, it may affect lighting conditions that are	1422	/* If this object glows, it may affect lighting conditions that are
1407	* visible to others on this map. But update_all_los is really	1423	* visible to others on this map. But update_all_los is really
1408	* an inefficient way to do this, as it means los for all players	1424	* an inefficient way to do this, as it means los for all players
1409	* on the map will get recalculated. The players could very well	1425	* on the map will get recalculated. The players could very well
…		…
1428	* blocked() and wall() work properly), and these flags are updated by	1444	* blocked() and wall() work properly), and these flags are updated by
1429	* update_object().	1445	* update_object().
1430	*/	1446	*/
1431		1447
1432	/* if this is not the head or flag has been passed, don't check walk on status */	1448	/* if this is not the head or flag has been passed, don't check walk on status */
1433	if (!(flag & INS_NO_WALK_ON) && !op->head)	1449	if (!(flag & INS_NO_WALK_ON) && op->head_ () == op)
1434	{	1450	{
1435	if (check_move_on (op, originator))	1451	if (check_move_on (op, originator))
1436	return 0;	1452	return 0;
1437		1453
1438	/* If we are a multi part object, lets work our way through the check	1454	/* If we are a multi part object, lets work our way through the check
1439	* walk on's.	1455	* walk on's.
1440	*/	1456	*/
1441	for (tmp = op->more; tmp != NULL; tmp = tmp->more)	1457	for (object *tmp = op->more; tmp; tmp = tmp->more)
1442	if (check_move_on (tmp, originator))	1458	if (check_move_on (tmp, originator))
1443	return 0;	1459	return 0;
1444	}	1460	}
1445		1461
1446	return op;	1462	return op;
…		…
1456	object *tmp, *tmp1;	1472	object *tmp, *tmp1;
1457		1473
1458	/* first search for itself and remove any old instances */	1474	/* first search for itself and remove any old instances */
1459		1475
1460	for (tmp = op->ms ().bot; tmp; tmp = tmp->above)	1476	for (tmp = op->ms ().bot; tmp; tmp = tmp->above)
1461	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */	1477	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */
1462	tmp->destroy ();	1478	tmp->destroy ();
1463		1479
1464	tmp1 = arch_to_object (archetype::find (arch_string));	1480	tmp1 = arch_to_object (archetype::find (arch_string));
1465		1481
1466	tmp1->x = op->x;	1482	tmp1->x = op->x;
…		…
1469	}	1485	}
1470		1486
1471	object *	1487	object *
1472	object::insert_at (object *where, object *originator, int flags)	1488	object::insert_at (object *where, object *originator, int flags)
1473	{	1489	{
1474	where->map->insert (this, where->x, where->y, originator, flags);	1490	return where->map->insert (this, where->x, where->y, originator, flags);
1475	}	1491	}
1476		1492
1477	/*	1493	/*
1478	* get_split_ob(ob,nr) splits up ob into two parts. The part which	1494	* get_split_ob(ob,nr) splits up ob into two parts. The part which
1479	* is returned contains nr objects, and the remaining parts contains	1495	* is returned contains nr objects, and the remaining parts contains
…		…
1519	* the amount of an object. If the amount reaches 0, the object	1535	* the amount of an object. If the amount reaches 0, the object
1520	* is subsequently removed and freed.	1536	* is subsequently removed and freed.
1521	*	1537	*
1522	* Return value: 'op' if something is left, NULL if the amount reached 0	1538	* Return value: 'op' if something is left, NULL if the amount reached 0
1523	*/	1539	*/
1524
1525	object *	1540	object *
1526	decrease_ob_nr (object *op, uint32 i)	1541	decrease_ob_nr (object *op, uint32 i)
1527	{	1542	{
1528	object *tmp;	1543	object *tmp;
1529		1544
…		…
1604		1619
1605	/*	1620	/*
1606	* add_weight(object, weight) adds the specified weight to an object,	1621	* add_weight(object, weight) adds the specified weight to an object,
1607	* and also updates how much the environment(s) is/are carrying.	1622	* and also updates how much the environment(s) is/are carrying.
1608	*/	1623	*/
1609
1610	void	1624	void
1611	add_weight (object *op, signed long weight)	1625	add_weight (object *op, signed long weight)
1612	{	1626	{
1613	while (op != NULL)	1627	while (op != NULL)
1614	{	1628	{
…		…
1629	LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);	1643	LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
1630	free (dump);	1644	free (dump);
1631	return op;	1645	return op;
1632	}	1646	}
1633		1647
1634	if (where->head)	1648	if (where->head_ () != where)
1635	{	1649	{
1636	LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n");	1650	LOG (llevError | logBacktrace, "Warning: Tried to insert object into wrong part of multipart object.\n");
1637	where = where->head;	1651	where = where->head;
1638	}	1652	}
1639		1653
1640	return where->insert (op);	1654	return where->insert (op);
1641	}	1655	}
…		…
1646	* inside the object environment.	1660	* inside the object environment.
1647	*	1661	*
1648	* The function returns now pointer to inserted item, and return value can	1662	* The function returns now pointer to inserted item, and return value can
1649	* be != op, if items are merged. -Tero	1663	* be != op, if items are merged. -Tero
1650	*/	1664	*/
1651
1652	object *	1665	object *
1653	object::insert (object *op)	1666	object::insert (object *op)
1654	{	1667	{
1655	object *tmp, *otmp;
1656
1657	if (!QUERY_FLAG (op, FLAG_REMOVED))	1668	if (!QUERY_FLAG (op, FLAG_REMOVED))
1658	op->remove ();	1669	op->remove ();
1659		1670
1660	if (op->more)	1671	if (op->more)
1661	{	1672	{
…		…
1663	return op;	1674	return op;
1664	}	1675	}
1665		1676
1666	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1677	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1667	CLEAR_FLAG (op, FLAG_REMOVED);	1678	CLEAR_FLAG (op, FLAG_REMOVED);
		1679
1668	if (op->nrof)	1680	if (op->nrof)
1669	{	1681	{
1670	for (tmp = inv; tmp != NULL; tmp = tmp->below)	1682	for (object *tmp = inv; tmp; tmp = tmp->below)
1671	if (object::can_merge (tmp, op))	1683	if (object::can_merge (tmp, op))
1672	{	1684	{
1673	/* return the original object and remove inserted object	1685	/* return the original object and remove inserted object
1674	(client needs the original object) */	1686	(client needs the original object) */
1675	tmp->nrof += op->nrof;	1687	tmp->nrof += op->nrof;
…		…
1694	add_weight (this, op->weight * op->nrof);	1706	add_weight (this, op->weight * op->nrof);
1695	}	1707	}
1696	else	1708	else
1697	add_weight (this, (op->weight + op->carrying));	1709	add_weight (this, (op->weight + op->carrying));
1698		1710
1699	otmp = this->in_player ();	1711	if (object *otmp = this->in_player ())
1700	if (otmp && otmp->contr)
1701	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1712	if (otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1702	otmp->update_stats ();	1713	otmp->update_stats ();
1703		1714
		1715	op->owner = 0; // its his/hers now. period.
1704	op->map = 0;	1716	op->map = 0;
1705	op->env = this;	1717	op->env = this;
1706	op->above = 0;	1718	op->above = 0;
1707	op->below = 0;	1719	op->below = 0;
1708	op->x = 0, op->y = 0;	1720	op->x = op->y = 0;
1709		1721
1710	/* reset the light list and los of the players on the map */	1722	/* reset the light list and los of the players on the map */
1711	if ((op->glow_radius != 0) && map)	1723	if (op->glow_radius && map)
1712	{	1724	{
1713	#ifdef DEBUG_LIGHTS	1725	#ifdef DEBUG_LIGHTS
1714	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);	1726	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1715	#endif /* DEBUG_LIGHTS */	1727	#endif /* DEBUG_LIGHTS */
1716	if (map->darkness)	1728	if (map->darkness)
…		…
1816	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||	1828	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
1817	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))	1829	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1818	{	1830	{
1819		1831
1820	float	1832	float
1821	diff = tmp->move_slow_penalty * FABS (op->speed);	1833	diff = tmp->move_slow_penalty * fabs (op->speed);
1822		1834
1823	if (op->type == PLAYER)	1835	if (op->type == PLAYER)
1824	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||	1836	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||
1825	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))	1837	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))
1826	diff /= 4.0;	1838	diff /= 4.0;
…		…
1970	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)	1982	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
1971	{	1983	{
1972	CLEAR_FLAG (tmp, flag);	1984	CLEAR_FLAG (tmp, flag);
1973	unflag_inv (tmp, flag);	1985	unflag_inv (tmp, flag);
1974	}	1986	}
1975	}
1976
1977	/*
1978	* set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in
1979	* all it's inventory (recursively).
1980	* If checksums are used, a player will get set_cheat called for
1981	* him/her-self and all object carried by a call to this function.
1982	*/
1983	void
1984	set_cheat (object *op)
1985	{
1986	SET_FLAG (op, FLAG_WAS_WIZ);
1987	flag_inv (op, FLAG_WAS_WIZ);
1988	}	1987	}
1989		1988
1990	/*	1989	/*
1991	* find_free_spot(object, map, x, y, start, stop) will search for	1990	* find_free_spot(object, map, x, y, start, stop) will search for
1992	* a spot at the given map and coordinates which will be able to contain	1991	* a spot at the given map and coordinates which will be able to contain
…		…
2033	}	2032	}
2034		2033
2035	if (!index)	2034	if (!index)
2036	return -1;	2035	return -1;
2037		2036
2038	return altern[RANDOM () % index];	2037	return altern [rndm (index)];
2039	}	2038	}
2040		2039
2041	/*	2040	/*
2042	* find_first_free_spot(archetype, maptile, x, y) works like	2041	* find_first_free_spot(archetype, maptile, x, y) works like
2043	* find_free_spot(), but it will search max number of squares.	2042	* find_free_spot(), but it will search max number of squares.
…		…
2064	{	2063	{
2065	arr += begin;	2064	arr += begin;
2066	end -= begin;	2065	end -= begin;
2067		2066
2068	while (--end)	2067	while (--end)
2069	swap (arr [end], arr [RANDOM () % (end + 1)]);	2068	swap (arr [end], arr [rndm (end + 1)]);
2070	}	2069	}
2071		2070
2072	/* new function to make monster searching more efficient, and effective!	2071	/* new function to make monster searching more efficient, and effective!
2073	* This basically returns a randomized array (in the passed pointer) of	2072	* This basically returns a randomized array (in the passed pointer) of
2074	* the spaces to find monsters. In this way, it won't always look for	2073	* the spaces to find monsters. In this way, it won't always look for
…		…
2110	object *tmp;	2109	object *tmp;
2111	maptile *mp;	2110	maptile *mp;
2112		2111
2113	MoveType blocked, move_type;	2112	MoveType blocked, move_type;
2114		2113
2115	if (exclude && exclude->head)	2114	if (exclude && exclude->head_ () != exclude)
2116	{	2115	{
2117	exclude = exclude->head;	2116	exclude = exclude->head;
2118	move_type = exclude->move_type;	2117	move_type = exclude->move_type;
2119	}	2118	}
2120	else	2119	else
…		…
2143	max = maxfree[i];	2142	max = maxfree[i];
2144	else if (mflags & P_IS_ALIVE)	2143	else if (mflags & P_IS_ALIVE)
2145	{	2144	{
2146	for (tmp = ms.bot; tmp; tmp = tmp->above)	2145	for (tmp = ms.bot; tmp; tmp = tmp->above)
2147	if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)	2146	if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)
2148	&& (tmp != exclude || (tmp->head && tmp->head != exclude)))	2147	&& (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2149	break;	2148	break;
2150		2149
2151	if (tmp)	2150	if (tmp)
2152	return freedir[i];	2151	return freedir[i];
2153	}	2152	}
…		…
2208		2207
2209	return 3;	2208	return 3;
2210	}	2209	}
2211		2210
2212	/*	2211	/*
2213	* absdir(int): Returns a number between 1 and 8, which represent
2214	* the "absolute" direction of a number (it actually takes care of
2215	* "overflow" in previous calculations of a direction).
2216	*/
2217
2218	int
2219	absdir (int d)
2220	{
2221	while (d < 1)
2222	d += 8;
2223
2224	while (d > 8)
2225	d -= 8;
2226
2227	return d;
2228	}
2229
2230	/*
2231	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is	2212	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is
2232	* between two directions (which are expected to be absolute (see absdir())	2213	* between two directions (which are expected to be absolute (see absdir())
2233	*/	2214	*/
2234
2235	int	2215	int
2236	dirdiff (int dir1, int dir2)	2216	dirdiff (int dir1, int dir2)
2237	{	2217	{
2238	int d;	2218	int d;
2239		2219
…		…
2352	* Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause	2332	* Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause
2353	* core dumps if they do.	2333	* core dumps if they do.
2354	*	2334	*
2355	* Add a check so we can't pick up invisible objects (0.93.8)	2335	* Add a check so we can't pick up invisible objects (0.93.8)
2356	*/	2336	*/
2357
2358	int	2337	int
2359	can_pick (const object *who, const object *item)	2338	can_pick (const object *who, const object *item)
2360	{	2339	{
2361	return /*QUERY_FLAG(who,FLAG_WIZ)|| */	2340	return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2362	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&	2341	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
…		…
2367	* create clone from object to another	2346	* create clone from object to another
2368	*/	2347	*/
2369	object *	2348	object *
2370	object_create_clone (object *asrc)	2349	object_create_clone (object *asrc)
2371	{	2350	{
2372	object *dst = 0, *tmp, *src, *part, *prev, *item;	2351	object *dst = 0, *tmp, *src, *prev, *item;
2373		2352
2374	if (!asrc)	2353	if (!asrc)
2375	return 0;	2354	return 0;
2376		2355
2377	src = asrc;
2378	if (src->head)
2379	src = src->head;	2356	src = asrc->head_ ();
2380		2357
2381	prev = 0;	2358	prev = 0;
2382	for (part = src; part; part = part->more)	2359	for (object *part = src; part; part = part->more)
2383	{	2360	{
2384	tmp = part->clone ();	2361	tmp = part->clone ();
2385	tmp->x -= src->x;	2362	tmp->x -= src->x;
2386	tmp->y -= src->y;	2363	tmp->y -= src->y;
2387		2364
…		…
2405	insert_ob_in_ob (object_create_clone (item), dst);	2382	insert_ob_in_ob (object_create_clone (item), dst);
2406		2383
2407	return dst;	2384	return dst;
2408	}	2385	}
2409		2386
2410	/* GROS - Creates an object using a string representing its content. */
2411	/* Basically, we save the content of the string to a temp file, then call */
2412	/* load_object on it. I admit it is a highly inefficient way to make things, */
2413	/* but it was simple to make and allows reusing the load_object function. */
2414	/* Remember not to use load_object_str in a time-critical situation. */
2415	/* Also remember that multiparts objects are not supported for now. */
2416	object *
2417	load_object_str (const char *obstr)
2418	{
2419	object *op;
2420	char filename[MAX_BUF];
2421
2422	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2423
2424	FILE *tempfile = fopen (filename, "w");
2425
2426	if (tempfile == NULL)
2427	{
2428	LOG (llevError, "Error - Unable to access load object temp file\n");
2429	return NULL;
2430	}
2431
2432	fprintf (tempfile, obstr);
2433	fclose (tempfile);
2434
2435	op = object::create ();
2436
2437	object_thawer thawer (filename);
2438
2439	if (thawer)
2440	load_object (thawer, op, 0);
2441
2442	LOG (llevDebug, " load str completed, object=%s\n", &op->name);
2443	CLEAR_FLAG (op, FLAG_REMOVED);
2444
2445	return op;
2446	}
2447
2448	/* This returns the first object in who's inventory that	2387	/* This returns the first object in who's inventory that
2449	* has the same type and subtype match.	2388	* has the same type and subtype match.
2450	* returns NULL if no match.	2389	* returns NULL if no match.
2451	*/	2390	*/
2452	object *	2391	object *
…		…
2505	if (link->key == canonical_key)	2444	if (link->key == canonical_key)
2506	return link->value;	2445	return link->value;
2507		2446
2508	return 0;	2447	return 0;
2509	}	2448	}
2510
2511		2449
2512	/*	2450	/*
2513	* Updates the canonical_key in op to value.	2451	* Updates the canonical_key in op to value.
2514	*	2452	*
2515	* canonical_key is a shared string (value doesn't have to be).	2453	* canonical_key is a shared string (value doesn't have to be).
…		…
2539	/* Basically, if the archetype has this key set,	2477	/* Basically, if the archetype has this key set,
2540	* we need to store the null value so when we save	2478	* we need to store the null value so when we save
2541	* it, we save the empty value so that when we load,	2479	* it, we save the empty value so that when we load,
2542	* we get this value back again.	2480	* we get this value back again.
2543	*/	2481	*/
2544	if (get_ob_key_link (&op->arch->clone, canonical_key))	2482	if (get_ob_key_link (op->arch, canonical_key))
2545	field->value = 0;	2483	field->value = 0;
2546	else	2484	else
2547	{	2485	{
2548	if (last)	2486	if (last)
2549	last->next = field->next;	2487	last->next = field->next;
…		…
2618	}	2556	}
2619	else	2557	else
2620	item = item->env;	2558	item = item->env;
2621	}	2559	}
2622		2560
2623
2624	const char *	2561	const char *
2625	object::flag_desc (char *desc, int len) const	2562	object::flag_desc (char *desc, int len) const
2626	{	2563	{
2627	char *p = desc;	2564	char *p = desc;
2628	bool first = true;	2565	bool first = true;
…		…
2655	{	2592	{
2656	char flagdesc[512];	2593	char flagdesc[512];
2657	char info2[256 * 4];	2594	char info2[256 * 4];
2658	char *p = info;	2595	char *p = info;
2659		2596
2660	p += snprintf (p, 512, "{cnt:%d,uuid:<1,%" PRIx64 ">,name:\"%s%s%s\",flags:[%s],type:%d}",	2597	p += snprintf (p, 512, "{cnt:%d,uuid:<1.%" PRIx64 ">,name:\"%s\"%s%s,flags:[%s],type:%d}",
2661	count, uuid.seq,	2598	count, uuid.seq,
2662	&name,	2599	&name,
2663	title ? "\",title:" : "",	2600	title ? "\",title:\"" : "",
2664	title ? (const char *)title : "",	2601	title ? (const char *)title : "",
2665	flag_desc (flagdesc, 512), type);	2602	flag_desc (flagdesc, 512), type);
2666		2603
2667	if (env)	2604	if (!this->flag[FLAG_REMOVED] && env)
2668	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2605	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2669		2606
2670	if (map)	2607	if (map)
2671	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);	2608	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2672		2609
…		…
2674	}	2611	}
2675		2612
2676	const char *	2613	const char *
2677	object::debug_desc () const	2614	object::debug_desc () const
2678	{	2615	{
2679	static char info[256 * 4];	2616	static char info[3][256 * 4];
		2617	static int info_idx;
		2618
2680	return debug_desc (info);	2619	return debug_desc (info [++info_idx % 3]);
2681	}	2620	}
2682		2621
		2622	struct region *
		2623	object::region () const
		2624	{
		2625	return map ? map->region (x, y)
		2626	: region::default_region ();
		2627	}
		2628
		2629	const materialtype_t *
		2630	object::dominant_material () const
		2631	{
		2632	if (materialtype_t *mt = name_to_material (materialname))
		2633	return mt;
		2634
		2635	return name_to_material (shstr_unknown);
		2636	}
		2637
		2638	void
		2639	object::open_container (object *new_container)
		2640	{
		2641	if (container == new_container)
		2642	return;
		2643
		2644	if (object *old_container = container)
		2645	{
		2646	if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
		2647	return;
		2648
		2649	#if 0
		2650	// remove the "Close old_container" object.
		2651	if (object *closer = old_container->inv)
		2652	if (closer->type == CLOSE_CON)
		2653	closer->destroy ();
		2654	#endif
		2655
		2656	old_container->flag [FLAG_APPLIED] = 0;
		2657	container = 0;
		2658
		2659	esrv_update_item (UPD_FLAGS, this, old_container);
		2660	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
		2661	play_sound (sound_find ("chest_close"));
		2662	}
		2663
		2664	if (new_container)
		2665	{
		2666	if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))
		2667	return;
		2668
		2669	// TODO: this does not seem to serve any purpose anymore?
		2670	#if 0
		2671	// insert the "Close Container" object.
		2672	if (archetype *closer = new_container->other_arch)
		2673	{
		2674	object *closer = arch_to_object (new_container->other_arch);
		2675	closer->flag [FLAG_NO_MAP_SAVE] = 1;
		2676	new_container->insert (closer);
		2677	}
		2678	#endif
		2679
		2680	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));
		2681
		2682	new_container->flag [FLAG_APPLIED] = 1;
		2683	container = new_container;
		2684
		2685	esrv_update_item (UPD_FLAGS, this, new_container);
		2686	esrv_send_inventory (this, new_container);
		2687	play_sound (sound_find ("chest_open"));
		2688	}
		2689	}
		2690
		2691	object *
		2692	object::force_find (const shstr name)
		2693	{
		2694	/* cycle through his inventory to look for the MARK we want to
		2695	* place
		2696	*/
		2697	for (object *tmp = inv; tmp; tmp = tmp->below)
		2698	if (tmp->type == FORCE && tmp->slaying == name)
		2699	return splay (tmp);
		2700
		2701	return 0;
		2702	}
		2703
		2704	void
		2705	object::force_add (const shstr name, int duration)
		2706	{
		2707	if (object *force = force_find (name))
		2708	force->destroy ();
		2709
		2710	object *force = get_archetype (FORCE_NAME);
		2711
		2712	force->slaying = name;
		2713	force->stats.food = 1;
		2714	force->speed_left = -1.f;
		2715
		2716	force->set_speed (duration ? 1.f / duration : 0.f);
		2717	force->flag [FLAG_IS_USED_UP] = true;
		2718	force->flag [FLAG_APPLIED] = true;
		2719
		2720	insert (force);
		2721	}
		2722
		2723	void
		2724	object::play_sound (faceidx sound) const
		2725	{
		2726	if (!sound)
		2727	return;
		2728
		2729	if (flag [FLAG_REMOVED])
		2730	return;
		2731
		2732	if (env)
		2733	{
		2734	if (object *pl = in_player ())
		2735	pl->contr->play_sound (sound);
		2736	}
		2737	else
		2738	map->play_sound (sound, x, y);
		2739	}
		2740

Diff Legend

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