[ViewVC] Diff of: cvs/deliantra/server/common/object.C

Comparing deliantra/server/common/object.C (file contents):
Revision 1.94 by root, Wed Dec 27 05:22:35 2006 UTC vs.
Revision 1.135 by root, Sun Mar 11 02:12:44 2007 UTC

…		…
1	/*	1	/*
2	CrossFire, A Multiplayer game for X-windows	2	* CrossFire, A Multiplayer game for X-windows
3		3	*
		4	* Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
4	Copyright (C) 2001 Mark Wedel & Crossfire Development Team	5	* Copyright (C) 2001 Mark Wedel & Crossfire Development Team
5	Copyright (C) 1992 Frank Tore Johansen	6	* Copyright (C) 1992 Frank Tore Johansen
6		7	*
7	This program is free software; you can redistribute it and/or modify	8	* This program is free software; you can redistribute it and/or modify
8	it under the terms of the GNU General Public License as published by	9	* it under the terms of the GNU General Public License as published by
9	the Free Software Foundation; either version 2 of the License, or	10	* the Free Software Foundation; either version 2 of the License, or
10	(at your option) any later version.	11	* (at your option) any later version.
11		12	*
12	This program is distributed in the hope that it will be useful,	13	* This program is distributed in the hope that it will be useful,
13	but WITHOUT ANY WARRANTY; without even the implied warranty of	14	* but WITHOUT ANY WARRANTY; without even the implied warranty of
14	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15	GNU General Public License for more details.	16	* GNU General Public License for more details.
16		17	*
17	You should have received a copy of the GNU General Public License	18	* You should have received a copy of the GNU General Public License
18	along with this program; if not, write to the Free Software	19	* along with this program; if not, write to the Free Software
19	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	20	* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
20		21	*
21	The authors can be reached via e-mail at <crossfire@schmorp.de>	22	* The authors can be reached via e-mail at <crossfire@schmorp.de>
22	*/	23	*/
23		24
24	/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.	25	/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
25	sub/add_weight will transcend the environment updating the carrying	26	sub/add_weight will transcend the environment updating the carrying
26	variable. */	27	variable. */
27	#include <global.h>	28	#include <global.h>
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,
…		…
190	* Check nrof variable before calling can_merge()	192	* Check nrof variable before calling can_merge()
191	*	193	*
192	* Improvements made with merge: Better checking on potion, and also	194	* Improvements made with merge: Better checking on potion, and also
193	* check weight	195	* check weight
194	*/	196	*/
195
196	bool object::can_merge_slow (object ob1, object ob2)	197	bool object::can_merge_slow (object ob1, object ob2)
197	{	198	{
198	/* A couple quicksanity checks */	199	/* A couple quicksanity checks */
199	if (ob1 == ob2	200	if (ob1 == ob2
200	\|\| ob1->type != ob2->type	201	\|\| ob1->type != ob2->type
…		…
277		278
278	/* Note sure why the following is the case - either the object has to	279	/* Note sure why the following is the case - either the object has to
279	* be animated or have a very low speed. Is this an attempted monster	280	* be animated or have a very low speed. Is this an attempted monster
280	* check?	281	* check?
281	*/	282	*/
282	if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && FABS ((ob1)->speed) > MIN_ACTIVE_SPEED)	283	if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && ob1->has_active_speed ())
283	return 0;	284	return 0;
284		285
285	switch (ob1->type)	286	switch (ob1->type)
286	{	287	{
287	case SCROLL:	288	case SCROLL:
…		…
356	/*	357	/*
357	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.	358	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
358	* Some error messages.	359	* Some error messages.
359	* The result of the dump is stored in the static global errmsg array.	360	* The result of the dump is stored in the static global errmsg array.
360	*/	361	*/
361
362	char *	362	char *
363	dump_object (object *op)	363	dump_object (object *op)
364	{	364	{
365	if (!op)	365	if (!op)
366	return strdup ("[NULLOBJ]");	366	return strdup ("[NULLOBJ]");
367		367
368	object_freezer freezer;	368	object_freezer freezer;
369	save_object (freezer, op, 1);	369	op->write (freezer);
370	return freezer.as_string ();	370	return freezer.as_string ();
371	}	371	}
372		372
373	/*	373	/*
374	* get_nearest_part(multi-object, object 2) returns the part of the	374	* get_nearest_part(multi-object, object 2) returns the part of the
…		…
391	}	391	}
392		392
393	/*	393	/*
394	* 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.
395	*/	395	*/
396
397	object *	396	object *
398	find_object (tag_t i)	397	find_object (tag_t i)
399	{	398	{
400	for (object *op = object::first; op; op = op->next)	399	for_all_objects (op)
401	if (op->count == i)	400	if (op->count == i)
402	return op;	401	return op;
403		402
404	return 0;	403	return 0;
405	}	404	}
406		405
407	/*	406	/*
408	* 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.
409	* Used only by the patch command, but not all that useful.	408	* Used only by the patch command, but not all that useful.
410	* Enables features like "patch <name-of-other-player> food 999"	409	* Enables features like "patch <name-of-other-player> food 999"
411	*/	410	*/
412
413	object *	411	object *
414	find_object_name (const char *str)	412	find_object_name (const char *str)
415	{	413	{
416	shstr_cmp str_ (str);	414	shstr_cmp str_ (str);
417	object *op;	415	object *op;
418		416
419	for (op = object::first; op != NULL; op = op->next)	417	for_all_objects (op)
420	if (op->name == str_)	418	if (op->name == str_)
421	break;	419	break;
422		420
423	return op;	421	return op;
424	}	422	}
…		…
490		488
491	if (is_removed)	489	if (is_removed)
492	SET_FLAG (dst, FLAG_REMOVED);	490	SET_FLAG (dst, FLAG_REMOVED);
493		491
494	if (speed < 0)	492	if (speed < 0)
495	dst->speed_left = speed_left - RANDOM () % 200 / 100.0;	493	dst->speed_left = speed_left - rndm ();
496		494
497	/* Copy over key_values, if any. */	495	/* Copy over key_values, if any. */
498	if (key_values)	496	if (key_values)
499	{	497	{
500	key_value *tail = 0;	498	key_value *tail = 0;
…		…
525	}	523	}
526		524
527	dst->set_speed (dst->speed);	525	dst->set_speed (dst->speed);
528	}	526	}
529		527
		528	void
		529	object::instantiate ()
		530	{
		531	if (!uuid.seq) // HACK
		532	uuid = gen_uuid ();
		533
		534	speed_left = -0.1f;
		535	/* copy the body_info to the body_used - this is only really
		536	* need for monsters, but doesn't hurt to do it for everything.
		537	* by doing so, when a monster is created, it has good starting
		538	* values for the body_used info, so when items are created
		539	* for it, they can be properly equipped.
		540	*/
		541	memcpy (body_used, body_info, sizeof (body_used));
		542
		543	attachable::instantiate ();
		544	}
		545
530	object *	546	object *
531	object::clone ()	547	object::clone ()
532	{	548	{
533	object *neu = create ();	549	object *neu = create ();
534	copy_to (neu);	550	copy_to (neu);
…		…
538	/*	554	/*
539	* If an object with the IS_TURNABLE() flag needs to be turned due	555	* If an object with the IS_TURNABLE() flag needs to be turned due
540	* to the closest player being on the other side, this function can	556	* to the closest player being on the other side, this function can
541	* be called to update the face variable, _and_ how it looks on the map.	557	* be called to update the face variable, _and_ how it looks on the map.
542	*/	558	*/
543
544	void	559	void
545	update_turn_face (object *op)	560	update_turn_face (object *op)
546	{	561	{
547	if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) \|\| op->arch == NULL)	562	if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) \|\| !op->arch)
548	return;	563	return;
		564
549	SET_ANIMATION (op, op->direction);	565	SET_ANIMATION (op, op->direction);
550	update_object (op, UP_OBJ_FACE);	566	update_object (op, UP_OBJ_FACE);
551	}	567	}
552		568
553	/*	569	/*
…		…
556	* This function needs to be called whenever the speed of an object changes.	572	* This function needs to be called whenever the speed of an object changes.
557	*/	573	*/
558	void	574	void
559	object::set_speed (float speed)	575	object::set_speed (float speed)
560	{	576	{
561	extern int arch_init;
562
563	/* No reason putting the archetypes objects on the speed list,
564	* since they never really need to be updated.
565	*/
566	if (flag [FLAG_FREED] && speed)	577	if (flag [FLAG_FREED] && speed)
567	{	578	{
568	LOG (llevError, "Object %s is freed but has speed.\n", &name);	579	LOG (llevError, "Object %s is freed but has speed.\n", &name);
569	speed = 0;	580	speed = 0;
570	}	581	}
571		582
572	this->speed = speed;	583	this->speed = speed;
573		584
574	if (arch_init)	585	if (has_active_speed ())
575	return;	586	activate ();
576
577	if (FABS (speed) > MIN_ACTIVE_SPEED)
578	{
579	/* If already on active list, don't do anything */
580	if (active_next \|\| active_prev \|\| this == active_objects)
581	return;
582
583	/* process_events() expects us to insert the object at the beginning
584	* of the list. */
585	active_next = active_objects;
586
587	if (active_next)
588	active_next->active_prev = this;
589
590	active_objects = this;
591	}
592	else	587	else
593	{	588	deactivate ();
594	/* If not on the active list, nothing needs to be done */
595	if (!active_next && !active_prev && this != active_objects)
596	return;
597
598	if (!active_prev)
599	{
600	active_objects = active_next;
601
602	if (active_next)
603	active_next->active_prev = 0;
604	}
605	else
606	{
607	active_prev->active_next = active_next;
608
609	if (active_next)
610	active_next->active_prev = active_prev;
611	}
612
613	active_next = 0;
614	active_prev = 0;
615	}
616	}
617
618	/* This function removes object 'op' from the list of active
619	* objects.
620	* This should only be used for style maps or other such
621	* reference maps where you don't want an object that isn't
622	* in play chewing up cpu time getting processed.
623	* The reverse of this is to call update_ob_speed, which
624	* will do the right thing based on the speed of the object.
625	*/
626	void
627	remove_from_active_list (object *op)
628	{
629	/* If not on the active list, nothing needs to be done */
630	if (!op->active_next && !op->active_prev && op != active_objects)
631	return;
632
633	if (op->active_prev == NULL)
634	{
635	active_objects = op->active_next;
636	if (op->active_next != NULL)
637	op->active_next->active_prev = NULL;
638	}
639	else
640	{
641	op->active_prev->active_next = op->active_next;
642	if (op->active_next)
643	op->active_next->active_prev = op->active_prev;
644	}
645	op->active_next = NULL;
646	op->active_prev = NULL;
647	}	589	}
648		590
649	/*	591	/*
650	* update_object() updates the the map.	592	* update_object() updates the the map.
651	* It takes into account invisible objects (and represent squares covered	593	* It takes into account invisible objects (and represent squares covered
…		…
664	* UP_OBJ_FACE: only the objects face has changed.	606	* UP_OBJ_FACE: only the objects face has changed.
665	*/	607	*/
666	void	608	void
667	update_object (object *op, int action)	609	update_object (object *op, int action)
668	{	610	{
669	MoveType move_on, move_off, move_block, move_slow;
670
671	if (op == NULL)	611	if (op == NULL)
672	{	612	{
673	/* this should never happen */	613	/* this should never happen */
674	LOG (llevDebug, "update_object() called for NULL object.\n");	614	LOG (llevDebug, "update_object() called for NULL object.\n");
675	return;	615	return;
…		…
699	return;	639	return;
700	}	640	}
701		641
702	mapspace &m = op->ms ();	642	mapspace &m = op->ms ();
703		643
704	if (m.flags_ & P_NEED_UPDATE)	644	if (!(m.flags_ & P_UPTODATE))
705	/* nop */;	645	/* nop */;
706	else if (action == UP_OBJ_INSERT)	646	else if (action == UP_OBJ_INSERT)
707	{	647	{
708	// this is likely overkill, TODO: revisit (schmorp)	648	// this is likely overkill, TODO: revisit (schmorp)
709	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))	649	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
…		…
718	/* This isn't perfect, but I don't expect a lot of objects to	658	/* This isn't perfect, but I don't expect a lot of objects to
719	* to have move_allow right now.	659	* to have move_allow right now.
720	*/	660	*/
721	\|\| ((m.move_block \| op->move_block) & ~op->move_allow) != m.move_block	661	\|\| ((m.move_block \| op->move_block) & ~op->move_allow) != m.move_block
722	\|\| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)	662	\|\| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)
723	m.flags_ = P_NEED_UPDATE;	663	m.flags_ = 0;
724	}	664	}
725	/* if the object is being removed, we can't make intelligent	665	/* if the object is being removed, we can't make intelligent
726	* decisions, because remove_ob can't really pass the object	666	* decisions, because remove_ob can't really pass the object
727	* that is being removed.	667	* that is being removed.
728	*/	668	*/
729	else if (action == UP_OBJ_CHANGE \|\| action == UP_OBJ_REMOVE)	669	else if (action == UP_OBJ_CHANGE \|\| action == UP_OBJ_REMOVE)
730	m.flags_ = P_NEED_UPDATE;	670	m.flags_ = 0;
731	else if (action == UP_OBJ_FACE)	671	else if (action == UP_OBJ_FACE)
732	/* Nothing to do for that case */ ;	672	/* Nothing to do for that case */ ;
733	else	673	else
734	LOG (llevError, "update_object called with invalid action: %d\n", action);	674	LOG (llevError, "update_object called with invalid action: %d\n", action);
735		675
736	if (op->more)	676	if (op->more)
737	update_object (op->more, action);	677	update_object (op->more, action);
738	}	678	}
739		679
740	object::vector object::objects; // not yet used
741	object *object::first;
742
743	object::object ()	680	object::object ()
744	{	681	{
745	SET_FLAG (this, FLAG_REMOVED);	682	SET_FLAG (this, FLAG_REMOVED);
746		683
747	expmul = 1.0;	684	expmul = 1.0;
748	face = blank_face;	685	face = blank_face;
749	}	686	}
750		687
751	object::~object ()	688	object::~object ()
752	{	689	{
		690	unlink ();
		691
753	free_key_values (this);	692	free_key_values (this);
754	}	693	}
755		694
		695	static int object_count;
		696
756	void object::link ()	697	void object::link ()
757	{	698	{
758	count = ++ob_count;	699	assert (!index);//D
759	uuid = gen_uuid ();	700	uuid = gen_uuid ();
		701	count = ++object_count;
760		702
761	prev = 0;	703	refcnt_inc ();
762	next = object::first;	704	objects.insert (this);
763
764	if (object::first)
765	object::first->prev = this;
766
767	object::first = this;
768	}	705	}
769		706
770	void object::unlink ()	707	void object::unlink ()
771	{	708	{
772	if (this == object::first)	709	if (!index)
773	object::first = next;	710	return;
774		711
775	/* Remove this object from the list of used objects */	712	objects.erase (this);
776	if (prev) prev->next = next;	713	refcnt_dec ();
777	if (next) next->prev = prev;	714	}
778		715
779	prev = 0;	716	void
780	next = 0;	717	object::activate ()
		718	{
		719	/* If already on active list, don't do anything */
		720	if (active)
		721	return;
		722
		723	if (has_active_speed ())
		724	actives.insert (this);
		725	}
		726
		727	void
		728	object::activate_recursive ()
		729	{
		730	activate ();
		731
		732	for (object *op = inv; op; op = op->below)
		733	op->activate_recursive ();
		734	}
		735
		736	/* This function removes object 'op' from the list of active
		737	* objects.
		738	* This should only be used for style maps or other such
		739	* reference maps where you don't want an object that isn't
		740	* in play chewing up cpu time getting processed.
		741	* The reverse of this is to call update_ob_speed, which
		742	* will do the right thing based on the speed of the object.
		743	*/
		744	void
		745	object::deactivate ()
		746	{
		747	/* If not on the active list, nothing needs to be done */
		748	if (!active)
		749	return;
		750
		751	actives.erase (this);
		752	}
		753
		754	void
		755	object::deactivate_recursive ()
		756	{
		757	for (object *op = inv; op; op = op->below)
		758	op->deactivate_recursive ();
		759
		760	deactivate ();
		761	}
		762
		763	void
		764	object::set_flag_inv (int flag, int value)
		765	{
		766	for (object *op = inv; op; op = op->below)
		767	{
		768	op->flag [flag] = value;
		769	op->set_flag_inv (flag, value);
		770	}
781	}	771	}
782		772
783	/*	773	/*
784	* Remove and free all objects in the inventory of the given object.	774	* Remove and free all objects in the inventory of the given object.
785	* object.c ?	775	* object.c ?
…		…
800	* drop on that space.	790	* drop on that space.
801	*/	791	*/
802	if (!drop_to_ground	792	if (!drop_to_ground
803	\|\| !map	793	\|\| !map
804	\|\| map->in_memory != MAP_IN_MEMORY	794	\|\| map->in_memory != MAP_IN_MEMORY
		795	\|\| map->nodrop
805	\|\| map->at (x, y).move_block == MOVE_ALL)	796	\|\| ms ().move_block == MOVE_ALL)
806	{	797	{
807	while (inv)	798	while (inv)
808	{	799	{
809	inv->destroy_inv (drop_to_ground);	800	inv->destroy_inv (drop_to_ground);
810	inv->destroy ();	801	inv->destroy ();
…		…
818		809
819	if (op->flag [FLAG_STARTEQUIP]	810	if (op->flag [FLAG_STARTEQUIP]
820	\|\| op->flag [FLAG_NO_DROP]	811	\|\| op->flag [FLAG_NO_DROP]
821	\|\| op->type == RUNE	812	\|\| op->type == RUNE
822	\|\| op->type == TRAP	813	\|\| op->type == TRAP
823	\|\| op->flag [FLAG_IS_A_TEMPLATE])	814	\|\| op->flag [FLAG_IS_A_TEMPLATE]
		815	\|\| op->flag [FLAG_DESTROY_ON_DEATH])
824	op->destroy ();	816	op->destroy ();
825	else	817	else
826	map->insert (op, x, y);	818	map->insert (op, x, y);
827	}	819	}
828	}	820	}
…		…
836	}	828	}
837		829
838	void	830	void
839	object::do_destroy ()	831	object::do_destroy ()
840	{	832	{
		833	attachable::do_destroy ();
		834
841	if (flag [FLAG_IS_LINKED])	835	if (flag [FLAG_IS_LINKED])
842	remove_button_link (this);	836	remove_button_link (this);
843		837
844	if (flag [FLAG_FRIENDLY])	838	if (flag [FLAG_FRIENDLY])
		839	{
845	remove_friendly_object (this);	840	remove_friendly_object (this);
		841
		842	if (type == GOLEM
		843	&& owner
		844	&& owner->type == PLAYER
		845	&& owner->contr->ranges[range_golem] == this)
		846	owner->contr->ranges[range_golem] = 0;
		847	}
846		848
847	if (!flag [FLAG_REMOVED])	849	if (!flag [FLAG_REMOVED])
848	remove ();	850	remove ();
849		851
850	if (flag [FLAG_FREED])	852	destroy_inv (true);
851	return;
852		853
853	set_speed (0);	854	deactivate ();
		855	unlink ();
854		856
855	flag [FLAG_FREED] = 1;	857	flag [FLAG_FREED] = 1;
856
857	attachable::do_destroy ();
858
859	destroy_inv (true);
860	unlink ();
861		858
862	// hack to ensure that freed objects still have a valid map	859	// hack to ensure that freed objects still have a valid map
863	{	860	{
864	static maptile *freed_map; // freed objects are moved here to avoid crashes	861	static maptile *freed_map; // freed objects are moved here to avoid crashes
865		862
…		…
869		866
870	freed_map->name = "/internal/freed_objects_map";	867	freed_map->name = "/internal/freed_objects_map";
871	freed_map->width = 3;	868	freed_map->width = 3;
872	freed_map->height = 3;	869	freed_map->height = 3;
873		870
874	freed_map->allocate ();	871	freed_map->alloc ();
		872	freed_map->in_memory = MAP_IN_MEMORY;
875	}	873	}
876		874
877	map = freed_map;	875	map = freed_map;
878	x = 1;	876	x = 1;
879	y = 1;	877	y = 1;
…		…
889		887
890	// clear those pointers that likely might have circular references to us	888	// clear those pointers that likely might have circular references to us
891	owner = 0;	889	owner = 0;
892	enemy = 0;	890	enemy = 0;
893	attacked_by = 0;	891	attacked_by = 0;
894
895	// only relevant for players(?), but make sure of it anyways
896	contr = 0;
897	}	892	}
898		893
899	void	894	void
900	object::destroy (bool destroy_inventory)	895	object::destroy (bool destroy_inventory)
901	{	896	{
…		…
929	* This function removes the object op from the linked list of objects	924	* This function removes the object op from the linked list of objects
930	* which it is currently tied to. When this function is done, the	925	* which it is currently tied to. When this function is done, the
931	* object will have no environment. If the object previously had an	926	* object will have no environment. If the object previously had an
932	* environment, the x and y coordinates will be updated to	927	* environment, the x and y coordinates will be updated to
933	* the previous environment.	928	* the previous environment.
934	* Beware: This function is called from the editor as well!
935	*/	929	*/
936	void	930	void
937	object::remove ()	931	object::do_remove ()
938	{	932	{
939	object tmp, last = 0;	933	object tmp, last = 0;
940	object *otmp;	934	object *otmp;
941		935
942	if (QUERY_FLAG (this, FLAG_REMOVED))	936	if (QUERY_FLAG (this, FLAG_REMOVED))
…		…
964	* to save cpu time.	958	* to save cpu time.
965	*/	959	*/
966	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	960	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
967	otmp->update_stats ();	961	otmp->update_stats ();
968		962
969	if (above != NULL)	963	if (above)
970	above->below = below;	964	above->below = below;
971	else	965	else
972	env->inv = below;	966	env->inv = below;
973		967
974	if (below != NULL)	968	if (below)
975	below->above = above;	969	below->above = above;
976		970
977	/* we set up values so that it could be inserted into	971	/* we set up values so that it could be inserted into
978	* the map, but we don't actually do that - it is up	972	* the map, but we don't actually do that - it is up
979	* to the caller to decide what we want to do.	973	* to the caller to decide what we want to do.
…		…
983	above = 0, below = 0;	977	above = 0, below = 0;
984	env = 0;	978	env = 0;
985	}	979	}
986	else if (map)	980	else if (map)
987	{	981	{
988	/* Re did the following section of code - it looks like it had	982	if (type == PLAYER)
989	* lots of logic for things we no longer care about
990	*/	983	{
		984	// leaving a spot always closes any open container on the ground
		985	if (container && !container->env)
		986	// this causes spurious floorbox updates, but it ensures
		987	// that the CLOSE event is being sent.
		988	close_container ();
		989
		990	--map->players;
		991	map->touch ();
		992	}
		993
		994	map->dirty = true;
		995	mapspace &ms = this->ms ();
991		996
992	/* link the object above us */	997	/* link the object above us */
993	if (above)	998	if (above)
994	above->below = below;	999	above->below = below;
995	else	1000	else
996	map->at (x, y).top = below; /* we were top, set new top */	1001	ms.top = below; /* we were top, set new top */
997		1002
998	/* Relink the object below us, if there is one */	1003	/* Relink the object below us, if there is one */
999	if (below)	1004	if (below)
1000	below->above = above;	1005	below->above = above;
1001	else	1006	else
…		…
1003	/* Nothing below, which means we need to relink map object for this space	1008	/* Nothing below, which means we need to relink map object for this space
1004	* use translated coordinates in case some oddness with map tiling is	1009	* use translated coordinates in case some oddness with map tiling is
1005	* evident	1010	* evident
1006	*/	1011	*/
1007	if (GET_MAP_OB (map, x, y) != this)	1012	if (GET_MAP_OB (map, x, y) != this)
1008	{
1009	char *dump = dump_object (this);
1010	LOG (llevError,
1011	"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);	1013	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 ());
1012	free (dump);
1013	dump = dump_object (GET_MAP_OB (map, x, y));
1014	LOG (llevError, "%s\n", dump);
1015	free (dump);
1016	}
1017		1014
1018	map->at (x, y).bot = above; /* goes on above it. */	1015	ms.bot = above; /* goes on above it. */
1019	}	1016	}
1020		1017
1021	above = 0;	1018	above = 0;
1022	below = 0;	1019	below = 0;
1023		1020
1024	if (map->in_memory == MAP_SAVING)	1021	if (map->in_memory == MAP_SAVING)
1025	return;	1022	return;
1026		1023
1027	int check_walk_off = !flag [FLAG_NO_APPLY];	1024	int check_walk_off = !flag [FLAG_NO_APPLY];
1028		1025
1029	for (tmp = map->at (x, y).bot; tmp; tmp = tmp->above)	1026	for (tmp = ms.bot; tmp; tmp = tmp->above)
1030	{	1027	{
1031	/* No point updating the players look faces if he is the object	1028	/* No point updating the players look faces if he is the object
1032	* being removed.	1029	* being removed.
1033	*/	1030	*/
1034		1031
…		…
1046		1043
1047	if (tmp->contr->ns)	1044	if (tmp->contr->ns)
1048	tmp->contr->ns->floorbox_update ();	1045	tmp->contr->ns->floorbox_update ();
1049	}	1046	}
1050		1047
1051	/* See if player moving off should effect something */	1048	/* See if object moving off should effect something */
1052	if (check_walk_off	1049	if (check_walk_off
1053	&& ((move_type & tmp->move_off)	1050	&& ((move_type & tmp->move_off)
1054	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))	1051	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1055	{	1052	{
1056	move_apply (tmp, this, 0);	1053	move_apply (tmp, this, 0);
…		…
1058	if (destroyed ())	1055	if (destroyed ())
1059	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());	1056	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1060	}	1057	}
1061		1058
1062	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */	1059	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1063		1060	//TODO: why is this horrible hacka fix? get rid of this code=bug! (schmorp)
1064	if (tmp->above == tmp)	1061	if (tmp->above == tmp)
1065	tmp->above = 0;	1062	tmp->above = 0;
1066		1063
1067	last = tmp;	1064	last = tmp;
1068	}	1065	}
1069		1066
1070	/* last == NULL of there are no objects on this space */	1067	/* last == NULL if there are no objects on this space */
		1068	//TODO: this makes little sense, why only update the topmost object?
1071	if (!last)	1069	if (!last)
1072	map->at (x, y).flags_ = P_NEED_UPDATE;	1070	map->at (x, y).flags_ = 0;
1073	else	1071	else
1074	update_object (last, UP_OBJ_REMOVE);	1072	update_object (last, UP_OBJ_REMOVE);
1075		1073
1076	if (flag [FLAG_BLOCKSVIEW] \|\| glow_radius)	1074	if (flag [FLAG_BLOCKSVIEW] \|\| glow_radius)
1077	update_all_los (map, x, y);	1075	update_all_los (map, x, y);
…		…
1114		1112
1115	return 0;	1113	return 0;
1116	}	1114	}
1117		1115
1118	/*	1116	/*
1119	* same as insert_ob_in_map except it handle separate coordinates and do a clean	1117	* same as insert_ob_in_map except it handles separate coordinates and does a clean
1120	* job preparing multi-part monsters	1118	* job preparing multi-part monsters.
1121	*/	1119	*/
1122	object *	1120	object *
1123	insert_ob_in_map_at (object op, maptile m, object *originator, int flag, int x, int y)	1121	insert_ob_in_map_at (object op, maptile m, object *originator, int flag, int x, int y)
1124	{	1122	{
1125	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)	1123	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
…		…
1153	*/	1151	*/
1154	object *	1152	object *
1155	insert_ob_in_map (object op, maptile m, object *originator, int flag)	1153	insert_ob_in_map (object op, maptile m, object *originator, int flag)
1156	{	1154	{
1157	object tmp, top, *floor = NULL;	1155	object tmp, top, *floor = NULL;
1158	sint16 x, y;
1159		1156
1160	if (QUERY_FLAG (op, FLAG_FREED))	1157	if (QUERY_FLAG (op, FLAG_FREED))
1161	{	1158	{
1162	LOG (llevError, "Trying to insert freed object!\n");	1159	LOG (llevError, "Trying to insert freed object!\n");
1163	return NULL;	1160	return NULL;
1164	}	1161	}
1165		1162
1166	if (m == NULL)	1163	if (!QUERY_FLAG (op, FLAG_REMOVED))
		1164	LOG (llevError, "Trying to insert already inserted object %s\n", op->debug_desc ());
		1165
		1166	op->remove ();
		1167
		1168	if (!m)
1167	{	1169	{
1168	char *dump = dump_object (op);	1170	char *dump = dump_object (op);
1169	LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);	1171	LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
1170	free (dump);	1172	free (dump);
1171	return op;	1173	return op;
…		…
1184	#endif	1186	#endif
1185	free (dump);	1187	free (dump);
1186	return op;	1188	return op;
1187	}	1189	}
1188		1190
1189	if (!QUERY_FLAG (op, FLAG_REMOVED))
1190	{
1191	char *dump = dump_object (op);
1192	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
1193	free (dump);
1194	return op;
1195	}
1196
1197	if (op->more)
1198	{
1199	/* The part may be on a different map. */
1200
1201	object *more = op->more;	1191	if (object *more = op->more)
1202		1192	{
1203	/* We really need the caller to normalize coordinates - if
1204	* we set the map, that doesn't work if the location is within
1205	* a map and this is straddling an edge. So only if coordinate
1206	* is clear wrong do we normalize it.
1207	*/
1208	if (OUT_OF_REAL_MAP (more->map, more->x, more->y))
1209	more->map = get_map_from_coord (m, &more->x, &more->y);
1210	else if (!more->map)
1211	{
1212	/* For backwards compatibility - when not dealing with tiled maps,
1213	* more->map should always point to the parent.
1214	*/
1215	more->map = m;
1216	}
1217
1218	if (insert_ob_in_map (more, more->map, originator, flag) == NULL)	1193	if (!insert_ob_in_map (more, m, originator, flag))
1219	{	1194	{
1220	if (!op->head)	1195	if (!op->head)
1221	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");	1196	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1222		1197
1223	return 0;	1198	return 0;
…		…
1228		1203
1229	/* Ideally, the caller figures this out. However, it complicates a lot	1204	/* Ideally, the caller figures this out. However, it complicates a lot
1230	* of areas of callers (eg, anything that uses find_free_spot would now	1205	* of areas of callers (eg, anything that uses find_free_spot would now
1231	* need extra work	1206	* need extra work
1232	*/	1207	*/
1233	op->map = get_map_from_coord (m, &op->x, &op->y);	1208	if (!xy_normalise (m, op->x, op->y))
1234	x = op->x;	1209	return 0;
1235	y = op->y;	1210
		1211	op->map = m;
		1212	mapspace &ms = op->ms ();
1236		1213
1237	/* this has to be done after we translate the coordinates.	1214	/* this has to be done after we translate the coordinates.
1238	*/	1215	*/
1239	if (op->nrof && !(flag & INS_NO_MERGE))	1216	if (op->nrof && !(flag & INS_NO_MERGE))
1240	for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)	1217	for (tmp = ms.bot; tmp; tmp = tmp->above)
1241	if (object::can_merge (op, tmp))	1218	if (object::can_merge (op, tmp))
1242	{	1219	{
1243	op->nrof += tmp->nrof;	1220	op->nrof += tmp->nrof;
1244	tmp->destroy ();	1221	tmp->destroy ();
1245	}	1222	}
…		…
1262	op->below = originator->below;	1239	op->below = originator->below;
1263		1240
1264	if (op->below)	1241	if (op->below)
1265	op->below->above = op;	1242	op->below->above = op;
1266	else	1243	else
1267	op->ms ().bot = op;	1244	ms.bot = op;
1268		1245
1269	/* since below originator, no need to update top */	1246	/* since below originator, no need to update top */
1270	originator->below = op;	1247	originator->below = op;
1271	}	1248	}
1272	else	1249	else
1273	{	1250	{
		1251	top = ms.bot;
		1252
1274	/* If there are other objects, then */	1253	/* If there are other objects, then */
1275	if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL))	1254	if ((!(flag & INS_MAP_LOAD)) && top)
1276	{	1255	{
1277	object *last = NULL;	1256	object *last = 0;
1278		1257
1279	/*	1258	/*
1280	* If there are multiple objects on this space, we do some trickier handling.	1259	* If there are multiple objects on this space, we do some trickier handling.
1281	* We've already dealt with merging if appropriate.	1260	* We've already dealt with merging if appropriate.
1282	* Generally, we want to put the new object on top. But if	1261	* Generally, we want to put the new object on top. But if
…		…
1286	* once we get to them. This reduces the need to traverse over all of	1265	* once we get to them. This reduces the need to traverse over all of
1287	* them when adding another one - this saves quite a bit of cpu time	1266	* them when adding another one - this saves quite a bit of cpu time
1288	* when lots of spells are cast in one area. Currently, it is presumed	1267	* when lots of spells are cast in one area. Currently, it is presumed
1289	* that flying non pickable objects are spell objects.	1268	* that flying non pickable objects are spell objects.
1290	*/	1269	*/
1291		1270	for (top = ms.bot; top; top = top->above)
1292	while (top != NULL)
1293	{	1271	{
1294	if (QUERY_FLAG (top, FLAG_IS_FLOOR) \|\| QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))	1272	if (QUERY_FLAG (top, FLAG_IS_FLOOR) \|\| QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))
1295	floor = top;	1273	floor = top;
1296		1274
1297	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW \| MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))	1275	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW \| MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))
…		…
1300	top = top->below;	1278	top = top->below;
1301	break;	1279	break;
1302	}	1280	}
1303		1281
1304	last = top;	1282	last = top;
1305	top = top->above;
1306	}	1283	}
1307		1284
1308	/* Don't want top to be NULL, so set it to the last valid object */	1285	/* Don't want top to be NULL, so set it to the last valid object */
1309	top = last;	1286	top = last;
1310		1287
…		…
1312	* looks like instead of lots of conditions here.	1289	* looks like instead of lots of conditions here.
1313	* makes things faster, and effectively the same result.	1290	* makes things faster, and effectively the same result.
1314	*/	1291	*/
1315		1292
1316	/* Have object 'fall below' other objects that block view.	1293	/* Have object 'fall below' other objects that block view.
1317	* Unless those objects are exits, type 66	1294	* Unless those objects are exits.
1318	* If INS_ON_TOP is used, don't do this processing	1295	* If INS_ON_TOP is used, don't do this processing
1319	* Need to find the object that in fact blocks view, otherwise	1296	* Need to find the object that in fact blocks view, otherwise
1320	* stacking is a bit odd.	1297	* stacking is a bit odd.
1321	*/	1298	*/
1322	if (!(flag & INS_ON_TOP) &&	1299	if (!(flag & INS_ON_TOP)
1323	(get_map_flags (op->map, 0, op->x, op->y, 0, 0) & P_BLOCKSVIEW) && (op->face && !op->face->visibility))	1300	&& ms.flags () & P_BLOCKSVIEW
		1301	&& (op->face && !faces [op->face].visibility))
1324	{	1302	{
1325	for (last = top; last != floor; last = last->below)	1303	for (last = top; last != floor; last = last->below)
1326	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1304	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1327	break;	1305	break;
		1306
1328	/* Check to see if we found the object that blocks view,	1307	/* Check to see if we found the object that blocks view,
1329	* and make sure we have a below pointer for it so that	1308	* and make sure we have a below pointer for it so that
1330	* we can get inserted below this one, which requires we	1309	* we can get inserted below this one, which requires we
1331	* set top to the object below us.	1310	* set top to the object below us.
1332	*/	1311	*/
…		…
1334	top = last->below;	1313	top = last->below;
1335	}	1314	}
1336	} /* If objects on this space */	1315	} /* If objects on this space */
1337		1316
1338	if (flag & INS_MAP_LOAD)	1317	if (flag & INS_MAP_LOAD)
1339	top = GET_MAP_TOP (op->map, op->x, op->y);	1318	top = ms.top;
1340		1319
1341	if (flag & INS_ABOVE_FLOOR_ONLY)	1320	if (flag & INS_ABOVE_FLOOR_ONLY)
1342	top = floor;	1321	top = floor;
1343		1322
1344	/* Top is the object that our object (op) is going to get inserted above.	1323	/* Top is the object that our object (op) is going to get inserted above.
1345	*/	1324	*/
1346		1325
1347	/* First object on this space */	1326	/* First object on this space */
1348	if (!top)	1327	if (!top)
1349	{	1328	{
1350	op->above = GET_MAP_OB (op->map, op->x, op->y);	1329	op->above = ms.bot;
1351		1330
1352	if (op->above)	1331	if (op->above)
1353	op->above->below = op;	1332	op->above->below = op;
1354		1333
1355	op->below = NULL;	1334	op->below = 0;
1356	op->ms ().bot = op;	1335	ms.bot = op;
1357	}	1336	}
1358	else	1337	else
1359	{ /* get inserted into the stack above top */	1338	{ /* get inserted into the stack above top */
1360	op->above = top->above;	1339	op->above = top->above;
1361		1340
…		…
1364		1343
1365	op->below = top;	1344	op->below = top;
1366	top->above = op;	1345	top->above = op;
1367	}	1346	}
1368		1347
1369	if (op->above == NULL)	1348	if (!op->above)
1370	op->ms ().top = op;	1349	ms.top = op;
1371	} /* else not INS_BELOW_ORIGINATOR */	1350	} /* else not INS_BELOW_ORIGINATOR */
1372		1351
1373	if (op->type == PLAYER)	1352	if (op->type == PLAYER)
		1353	{
1374	op->contr->do_los = 1;	1354	op->contr->do_los = 1;
		1355	++op->map->players;
		1356	op->map->touch ();
		1357	}
		1358
		1359	op->map->dirty = true;
1375		1360
1376	/* If we have a floor, we know the player, if any, will be above	1361	/* If we have a floor, we know the player, if any, will be above
1377	* it, so save a few ticks and start from there.	1362	* it, so save a few ticks and start from there.
1378	*/	1363	*/
1379	if (!(flag & INS_MAP_LOAD))	1364	if (!(flag & INS_MAP_LOAD))
1380	if (object *pl = op->ms ().player ())	1365	if (object *pl = ms.player ())
1381	if (pl->contr->ns)	1366	if (pl->contr->ns)
1382	pl->contr->ns->floorbox_update ();	1367	pl->contr->ns->floorbox_update ();
1383		1368
1384	/* If this object glows, it may affect lighting conditions that are	1369	/* If this object glows, it may affect lighting conditions that are
1385	* visible to others on this map. But update_all_los is really	1370	* visible to others on this map. But update_all_los is really
1386	* an inefficient way to do this, as it means los for all players	1371	* an inefficient way to do this, as it means los for all players
1387	* on the map will get recalculated. The players could very well	1372	* on the map will get recalculated. The players could very well
1388	* be far away from this change and not affected in any way -	1373	* be far away from this change and not affected in any way -
1389	* this should get redone to only look for players within range,	1374	* this should get redone to only look for players within range,
1390	* or just updating the P_NEED_UPDATE for spaces within this area	1375	* or just updating the P_UPTODATE for spaces within this area
1391	* of effect may be sufficient.	1376	* of effect may be sufficient.
1392	*/	1377	*/
1393	if (op->map->darkness && (op->glow_radius != 0))	1378	if (op->map->darkness && (op->glow_radius != 0))
1394	update_all_los (op->map, op->x, op->y);	1379	update_all_los (op->map, op->x, op->y);
1395		1380
…		…
1433	{	1418	{
1434	object tmp, tmp1;	1419	object tmp, tmp1;
1435		1420
1436	/* first search for itself and remove any old instances */	1421	/* first search for itself and remove any old instances */
1437		1422
1438	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1423	for (tmp = op->ms ().bot; tmp; tmp = tmp->above)
1439	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */	1424	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */
1440	tmp->destroy ();	1425	tmp->destroy ();
1441		1426
1442	tmp1 = arch_to_object (archetype::find (arch_string));	1427	tmp1 = arch_to_object (archetype::find (arch_string));
1443		1428
1444	tmp1->x = op->x;	1429	tmp1->x = op->x;
1445	tmp1->y = op->y;	1430	tmp1->y = op->y;
1446	insert_ob_in_map (tmp1, op->map, op, 0);	1431	insert_ob_in_map (tmp1, op->map, op, 0);
1447	}	1432	}
1448		1433
		1434	// XXX: function not returning object*
1449	object *	1435	object *
1450	object::insert_at (object where, object originator, int flags)	1436	object::insert_at (object where, object originator, int flags)
1451	{	1437	{
1452	where->map->insert (this, where->x, where->y, originator, flags);	1438	where->map->insert (this, where->x, where->y, originator, flags);
1453	}	1439	}
…		…
1766		1752
1767	/* The objects have to be checked from top to bottom.	1753	/* The objects have to be checked from top to bottom.
1768	* Hence, we first go to the top:	1754	* Hence, we first go to the top:
1769	*/	1755	*/
1770		1756
1771	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp && tmp->above; tmp = tmp->above)	1757	for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above)
1772	{	1758	{
1773	/* Trim the search when we find the first other spell effect	1759	/* Trim the search when we find the first other spell effect
1774	* this helps performance so that if a space has 50 spell objects,	1760	* this helps performance so that if a space has 50 spell objects,
1775	* we don't need to check all of them.	1761	* we don't need to check all of them.
1776	*/	1762	*/
…		…
1794	if ((!op->move_type && tmp->move_slow & MOVE_WALK) \|\|	1780	if ((!op->move_type && tmp->move_slow & MOVE_WALK) \|\|
1795	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))	1781	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1796	{	1782	{
1797		1783
1798	float	1784	float
1799	diff = tmp->move_slow_penalty * FABS (op->speed);	1785	diff = tmp->move_slow_penalty * fabs (op->speed);
1800		1786
1801	if (op->type == PLAYER)	1787	if (op->type == PLAYER)
1802	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) \|\|	1788	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) \|\|
1803	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))	1789	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))
1804	diff /= 4.0;	1790	diff /= 4.0;
…		…
1834	* The first matching object is returned, or NULL if none.	1820	* The first matching object is returned, or NULL if none.
1835	*/	1821	*/
1836	object *	1822	object *
1837	present_arch (const archetype at, maptile m, int x, int y)	1823	present_arch (const archetype at, maptile m, int x, int y)
1838	{	1824	{
1839	if (m == NULL \|\| out_of_map (m, x, y))	1825	if (!m \|\| out_of_map (m, x, y))
1840	{	1826	{
1841	LOG (llevError, "Present_arch called outside map.\n");	1827	LOG (llevError, "Present_arch called outside map.\n");
1842	return NULL;	1828	return NULL;
1843	}	1829	}
1844		1830
1845	for (object *tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1831	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1846	if (tmp->arch == at)	1832	if (tmp->arch == at)
1847	return tmp;	1833	return tmp;
1848		1834
1849	return NULL;	1835	return NULL;
1850	}	1836	}
…		…
1861	{	1847	{
1862	LOG (llevError, "Present called outside map.\n");	1848	LOG (llevError, "Present called outside map.\n");
1863	return NULL;	1849	return NULL;
1864	}	1850	}
1865		1851
1866	for (object *tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1852	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1867	if (tmp->type == type)	1853	if (tmp->type == type)
1868	return tmp;	1854	return tmp;
1869		1855
1870	return NULL;	1856	return NULL;
1871	}	1857	}
…		…
2011	}	1997	}
2012		1998
2013	if (!index)	1999	if (!index)
2014	return -1;	2000	return -1;
2015		2001
2016	return altern[RANDOM () % index];	2002	return altern [rndm (index)];
2017	}	2003	}
2018		2004
2019	/*	2005	/*
2020	* find_first_free_spot(archetype, maptile, x, y) works like	2006	* find_first_free_spot(archetype, maptile, x, y) works like
2021	* find_free_spot(), but it will search max number of squares.	2007	* find_free_spot(), but it will search max number of squares.
…		…
2042	{	2028	{
2043	arr += begin;	2029	arr += begin;
2044	end -= begin;	2030	end -= begin;
2045		2031
2046	while (--end)	2032	while (--end)
2047	swap (arr [end], arr [RANDOM () % (end + 1)]);	2033	swap (arr [end], arr [rndm (end + 1)]);
2048	}	2034	}
2049		2035
2050	/* new function to make monster searching more efficient, and effective!	2036	/* new function to make monster searching more efficient, and effective!
2051	* This basically returns a randomized array (in the passed pointer) of	2037	* This basically returns a randomized array (in the passed pointer) of
2052	* the spaces to find monsters. In this way, it won't always look for	2038	* the spaces to find monsters. In this way, it won't always look for
…		…
2186		2172
2187	return 3;	2173	return 3;
2188	}	2174	}
2189		2175
2190	/*	2176	/*
2191	* absdir(int): Returns a number between 1 and 8, which represent
2192	* the "absolute" direction of a number (it actually takes care of
2193	* "overflow" in previous calculations of a direction).
2194	*/
2195
2196	int
2197	absdir (int d)
2198	{
2199	while (d < 1)
2200	d += 8;
2201
2202	while (d > 8)
2203	d -= 8;
2204
2205	return d;
2206	}
2207
2208	/*
2209	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is	2177	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is
2210	* between two directions (which are expected to be absolute (see absdir())	2178	* between two directions (which are expected to be absolute (see absdir())
2211	*/	2179	*/
2212
2213	int	2180	int
2214	dirdiff (int dir1, int dir2)	2181	dirdiff (int dir1, int dir2)
2215	{	2182	{
2216	int d;	2183	int d;
2217		2184
…		…
2383	insert_ob_in_ob (object_create_clone (item), dst);	2350	insert_ob_in_ob (object_create_clone (item), dst);
2384		2351
2385	return dst;	2352	return dst;
2386	}	2353	}
2387		2354
2388	/* GROS - Creates an object using a string representing its content. */
2389	/* Basically, we save the content of the string to a temp file, then call */
2390	/* load_object on it. I admit it is a highly inefficient way to make things, */
2391	/* but it was simple to make and allows reusing the load_object function. */
2392	/* Remember not to use load_object_str in a time-critical situation. */
2393	/* Also remember that multiparts objects are not supported for now. */
2394	object *
2395	load_object_str (const char *obstr)
2396	{
2397	object *op;
2398	char filename[MAX_BUF];
2399
2400	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2401
2402	FILE *tempfile = fopen (filename, "w");
2403
2404	if (tempfile == NULL)
2405	{
2406	LOG (llevError, "Error - Unable to access load object temp file\n");
2407	return NULL;
2408	}
2409
2410	fprintf (tempfile, obstr);
2411	fclose (tempfile);
2412
2413	op = object::create ();
2414
2415	object_thawer thawer (filename);
2416
2417	if (thawer)
2418	load_object (thawer, op, 0);
2419
2420	LOG (llevDebug, " load str completed, object=%s\n", &op->name);
2421	CLEAR_FLAG (op, FLAG_REMOVED);
2422
2423	return op;
2424	}
2425
2426	/* This returns the first object in who's inventory that	2355	/* This returns the first object in who's inventory that
2427	* has the same type and subtype match.	2356	* has the same type and subtype match.
2428	* returns NULL if no match.	2357	* returns NULL if no match.
2429	*/	2358	*/
2430	object *	2359	object *
…		…
2596	}	2525	}
2597	else	2526	else
2598	item = item->env;	2527	item = item->env;
2599	}	2528	}
2600		2529
		2530
		2531	const char *
		2532	object::flag_desc (char *desc, int len) const
		2533	{
		2534	char *p = desc;
		2535	bool first = true;
		2536
		2537	*p = 0;
		2538
		2539	for (int i = 0; i < NUM_FLAGS; i++)
		2540	{
		2541	if (len <= 10) // magic constant!
		2542	{
		2543	snprintf (p, len, ",...");
		2544	break;
		2545	}
		2546
		2547	if (flag [i])
		2548	{
		2549	int cnt = snprintf (p, len, "%s%d", first ? "" : ",", i);
		2550	len -= cnt;
		2551	p += cnt;
		2552	first = false;
		2553	}
		2554	}
		2555
		2556	return desc;
		2557	}
		2558
2601	// return a suitable string describing an objetc in enough detail to find it	2559	// return a suitable string describing an object in enough detail to find it
2602	const char *	2560	const char *
2603	object::debug_desc (char *info) const	2561	object::debug_desc (char *info) const
2604	{	2562	{
		2563	char flagdesc[512];
2605	char info2[256 * 3];	2564	char info2[256 * 4];
2606	char *p = info;	2565	char *p = info;
2607		2566
2608	p += snprintf (p, 256, "%d=\"%s%s%s\"",	2567	p += snprintf (p, 512, "{cnt:%d,uuid:<1.%" PRIx64 ">,name:\"%s\"%s%s,flags:[%s],type:%d}",
2609	count,	2568	count, uuid.seq,
2610	&name,	2569	&name,
2611	title ? " " : "",	2570	title ? "\",title:\"" : "",
2612	title ? (const char *)title : "");	2571	title ? (const char *)title : "",
		2572	flag_desc (flagdesc, 512), type);
2613		2573
2614	if (env)	2574	if (env)
2615	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2575	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2616		2576
2617	if (map)	2577	if (map)
2618	p += snprintf (p, 256, "(on %s@%d+%d)", map->path, x, y);	2578	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2619		2579
2620	return info;	2580	return info;
2621	}	2581	}
2622		2582
2623	const char *	2583	const char *
2624	object::debug_desc () const	2584	object::debug_desc () const
2625	{	2585	{
2626	static char info[256 * 3];	2586	static char info[256 * 4];
2627	return debug_desc (info);	2587	return debug_desc (info);
2628	}	2588	}
2629		2589
		2590	const char *
		2591	object::debug_desc2 () const
		2592	{
		2593	static char info[256 * 4];
		2594	return debug_desc (info);
		2595	}
		2596
		2597	struct region *
		2598	object::region () const
		2599	{
		2600	return map ? map->region (x, y)
		2601	: region::default_region ();
		2602	}
		2603
		2604	const materialtype_t *
		2605	object::dominant_material () const
		2606	{
		2607	if (materialtype_t *mat = name_to_material (materialname))
		2608	return mat;
		2609
		2610	// omfg this is slow, this has to be temporary :)
		2611	shstr unknown ("unknown");
		2612
		2613	return name_to_material (unknown);
		2614	}
		2615
		2616	void
		2617	object::open_container (object *new_container)
		2618	{
		2619	if (container == new_container)
		2620	return;
		2621
		2622	if (object *old_container = container)
		2623	{
		2624	if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
		2625	return;
		2626
		2627	#if 0
		2628	// remove the "Close old_container" object.
		2629	if (object *closer = old_container->inv)
		2630	if (closer->type == CLOSE_CON)
		2631	closer->destroy ();
		2632	#endif
		2633
		2634	old_container->flag [FLAG_APPLIED] = 0;
		2635	container = 0;
		2636
		2637	esrv_update_item (UPD_FLAGS, this, old_container);
		2638	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
		2639	}
		2640
		2641	if (new_container)
		2642	{
		2643	if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))
		2644	return;
		2645
		2646	// TODO: this does not seem to serve any purpose anymore?
		2647	#if 0
		2648	// insert the "Close Container" object.
		2649	if (archetype *closer = new_container->other_arch)
		2650	{
		2651	object *closer = arch_to_object (new_container->other_arch);
		2652	closer->flag [FLAG_NO_MAP_SAVE] = 1;
		2653	new_container->insert (closer);
		2654	}
		2655	#endif
		2656
		2657	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));
		2658
		2659	new_container->flag [FLAG_APPLIED] = 1;
		2660	container = new_container;
		2661
		2662	esrv_update_item (UPD_FLAGS, this, new_container);
		2663	esrv_send_inventory (this, new_container);
		2664	}
		2665	}
		2666
		2667

Diff Legend

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

Comparing deliantra/server/common/object.C (file contents): Revision 1.94 by root, Wed Dec 27 05:22:35 2006 UTC vs. Revision 1.135 by root, Sun Mar 11 02:12:44 2007 UTC

Diff Legend

Comparing deliantra/server/common/object.C (file contents):
Revision 1.94 by root, Wed Dec 27 05:22:35 2006 UTC vs.
Revision 1.135 by root, Sun Mar 11 02:12:44 2007 UTC