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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.108 by root, Sun Jan 7 02:39:13 2007 UTC vs.
Revision 1.185 by root, Fri Aug 24 01:23:29 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;
299	return 0;	299	return 0;
300	else if (!compare_ob_value_lists (ob1, ob2))	300	else if (!compare_ob_value_lists (ob1, ob2))
301	return 0;	301	return 0;
302	}	302	}
303		303
304	//TODO: generate an event or call into perl for additional checks
305	if (ob1->self \|\| ob2->self)	304	if (ob1->self \|\| ob2->self)
306	{	305	{
307	ob1->optimise ();	306	ob1->optimise ();
308	ob2->optimise ();	307	ob2->optimise ();
309		308
310	if (ob1->self \|\| ob2->self)	309	if (ob1->self \|\| ob2->self)
		310	if (!cfperl_can_merge (ob1, ob2))
311	return 0;	311	return 0;
312	}	312	}
313		313
314	/* Everything passes, must be OK. */	314	/* Everything passes, must be OK. */
315	return 1;	315	return 1;
316	}	316	}
…		…
324	sum_weight (object *op)	324	sum_weight (object *op)
325	{	325	{
326	long sum;	326	long sum;
327	object *inv;	327	object *inv;
328		328
329	for (sum = 0, inv = op->inv; inv != NULL; inv = inv->below)	329	for (sum = 0, inv = op->inv; inv; inv = inv->below)
330	{	330	{
331	if (inv->inv)	331	if (inv->inv)
332	sum_weight (inv);	332	sum_weight (inv);
		333
333	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);	334	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);
334	}	335	}
335		336
336	if (op->type == CONTAINER && op->stats.Str)	337	if (op->type == CONTAINER && op->stats.Str)
337	sum = (sum * (100 - op->stats.Str)) / 100;	338	sum = (sum * (100 - op->stats.Str)) / 100;
…		…
357	/*	358	/*
358	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.	359	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
359	* Some error messages.	360	* Some error messages.
360	* 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.
361	*/	362	*/
362
363	char *	363	char *
364	dump_object (object *op)	364	dump_object (object *op)
365	{	365	{
366	if (!op)	366	if (!op)
367	return strdup ("[NULLOBJ]");	367	return strdup ("[NULLOBJ]");
368		368
369	object_freezer freezer;	369	object_freezer freezer;
370	save_object (freezer, op, 1);	370	op->write (freezer);
371	return freezer.as_string ();	371	return freezer.as_string ();
372	}	372	}
373		373
374	/*	374	/*
375	* 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
376	* multi-object 1 which is closest to the second object.	376	* multi-object 1 which is closest to the second object.
377	* If it's not a multi-object, it is returned.	377	* If it's not a multi-object, it is returned.
378	*/	378	*/
379
380	object *	379	object *
381	get_nearest_part (object op, const object pl)	380	get_nearest_part (object op, const object pl)
382	{	381	{
383	object tmp, closest;	382	object tmp, closest;
384	int last_dist, i;	383	int last_dist, i;
…		…
395	* 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.
396	*/	395	*/
397	object *	396	object *
398	find_object (tag_t i)	397	find_object (tag_t i)
399	{	398	{
400	return ((unsigned int)i) < objects.size ()	399	for_all_objects (op)
401	? objects [i]	400	if (op->count == i)
402	: 0;	401	return op;
		402
		403	return 0;
403	}	404	}
404		405
405	/*	406	/*
406	* 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.
407	* Used only by the patch command, but not all that useful.	408	* Used only by the patch command, but not all that useful.
…		…
427	}	428	}
428		429
429	/*	430	/*
430	* Sets the owner and sets the skill and exp pointers to owner's current	431	* Sets the owner and sets the skill and exp pointers to owner's current
431	* skill and experience objects.	432	* skill and experience objects.
		433	* ACTUALLY NO! investigate! TODO
432	*/	434	*/
433	void	435	void
434	object::set_owner (object *owner)	436	object::set_owner (object *owner)
435	{	437	{
		438	// allow objects which own objects
436	if (!owner)	439	if (owner)
437	return;
438
439	/* next line added to allow objects which own objects */
440	/* Add a check for ownercounts in here, as I got into an endless loop
441	* with the fireball owning a poison cloud which then owned the
442	* fireball. I believe that was caused by one of the objects getting
443	* freed and then another object replacing it. Since the ownercounts
444	* didn't match, this check is valid and I believe that cause is valid.
445	*/
446	while (owner->owner)	440	while (owner->owner)
447	owner = owner->owner;	441	owner = owner->owner;
448		442
449	this->owner = owner;	443	this->owner = owner;
		444	}
		445
		446	int
		447	object::slottype () const
		448	{
		449	if (type == SKILL)
		450	{
		451	if (IS_COMBAT_SKILL (subtype)) return slot_combat;
		452	if (IS_RANGED_SKILL (subtype)) return slot_ranged;
		453	}
		454	else
		455	{
		456	if (slot [body_combat].info) return slot_combat;
		457	if (slot [body_range ].info) return slot_ranged;
		458	}
		459
		460	return slot_none;
		461	}
		462
		463	bool
		464	object::change_weapon (object *ob)
		465	{
		466	if (current_weapon == ob)
		467	return true;
		468
		469	if (chosen_skill)
		470	chosen_skill->flag [FLAG_APPLIED] = false;
		471
		472	current_weapon = ob;
		473	chosen_skill = !ob \|\| ob->type == SKILL ? ob : find_skill_by_name (this, ob->skill);
		474
		475	if (chosen_skill)
		476	chosen_skill->flag [FLAG_APPLIED] = true;
		477
		478	update_stats ();
		479
		480	if (ob)
		481	{
		482	// now check wether any body locations became invalid, in which case
		483	// we cannot apply the weapon at the moment.
		484	for (int i = 0; i < NUM_BODY_LOCATIONS; ++i)
		485	if (slot[i].used < 0)
		486	{
		487	current_weapon = chosen_skill = 0;
		488	update_stats ();
		489
		490	new_draw_info_format (NDI_UNIQUE, 0, this,
		491	"You try to balance all your items at once, "
		492	"but the %s is just too much for your body. "
		493	"[You need to unapply some items first.]", &ob->name);
		494	return false;
		495	}
		496
		497	//new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);
		498	}
		499	else
		500	;//new_draw_info_format (NDI_UNIQUE, 0, this, "You unwield your weapons.");
		501
		502	if (ob && !ob->flag [FLAG_APPLIED] && ob->type != SPELL)
		503	{
		504	LOG (llevError \| logBacktrace, "%s changed to unapplied weapon %s",
		505	&name, ob->debug_desc ());
		506	return false;
		507	}
		508
		509	return true;
450	}	510	}
451		511
452	/* Zero the key_values on op, decrementing the shared-string	512	/* Zero the key_values on op, decrementing the shared-string
453	* refcounts and freeing the links.	513	* refcounts and freeing the links.
454	*/	514	*/
455	static void	515	static void
456	free_key_values (object *op)	516	free_key_values (object *op)
457	{	517	{
458	for (key_value *i = op->key_values; i != 0;)	518	for (key_value *i = op->key_values; i; )
459	{	519	{
460	key_value *next = i->next;	520	key_value *next = i->next;
461	delete i;	521	delete i;
462		522
463	i = next;	523	i = next;
464	}	524	}
465		525
466	op->key_values = 0;	526	op->key_values = 0;
467	}	527	}
468		528
469	/*	529	object &
470	* copy_to first frees everything allocated by the dst object,	530	object::operator =(const object &src)
471	* and then copies the contents of itself into the second
472	* object, allocating what needs to be allocated. Basically, any
473	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
474	* if the first object is freed, the pointers in the new object
475	* will point at garbage.
476	*/
477	void
478	object::copy_to (object *dst)
479	{	531	{
480	bool is_freed = QUERY_FLAG (dst, FLAG_FREED);	532	bool is_freed = flag [FLAG_FREED];
481	bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED);	533	bool is_removed = flag [FLAG_REMOVED];
482		534
483	(object_copy )dst = *this;	535	(object_copy )this = src;
484		536
485	if (is_freed)	537	flag [FLAG_FREED] = is_freed;
486	SET_FLAG (dst, FLAG_FREED);	538	flag [FLAG_REMOVED] = is_removed;
487
488	if (is_removed)
489	SET_FLAG (dst, FLAG_REMOVED);
490
491	if (speed < 0)
492	dst->speed_left = speed_left - RANDOM () % 200 / 100.0;
493		539
494	/* Copy over key_values, if any. */	540	/* Copy over key_values, if any. */
495	if (key_values)	541	if (src.key_values)
496	{	542	{
497	key_value *tail = 0;	543	key_value *tail = 0;
498	key_value *i;
499
500	dst->key_values = 0;	544	key_values = 0;
501		545
502	for (i = key_values; i; i = i->next)	546	for (key_value *i = src.key_values; i; i = i->next)
503	{	547	{
504	key_value *new_link = new key_value;	548	key_value *new_link = new key_value;
505		549
506	new_link->next = 0;	550	new_link->next = 0;
507	new_link->key = i->key;	551	new_link->key = i->key;
508	new_link->value = i->value;	552	new_link->value = i->value;
509		553
510	/* Try and be clever here, too. */	554	/* Try and be clever here, too. */
511	if (!dst->key_values)	555	if (!key_values)
512	{	556	{
513	dst->key_values = new_link;	557	key_values = new_link;
514	tail = new_link;	558	tail = new_link;
515	}	559	}
516	else	560	else
517	{	561	{
518	tail->next = new_link;	562	tail->next = new_link;
519	tail = new_link;	563	tail = new_link;
520	}	564	}
521	}	565	}
522	}	566	}
		567	}
		568
		569	/*
		570	* copy_to first frees everything allocated by the dst object,
		571	* and then copies the contents of itself into the second
		572	* object, allocating what needs to be allocated. Basically, any
		573	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
		574	* if the first object is freed, the pointers in the new object
		575	* will point at garbage.
		576	*/
		577	void
		578	object::copy_to (object *dst)
		579	{
		580	dst = this;
		581
		582	if (speed < 0)
		583	dst->speed_left -= rndm ();
523		584
524	dst->set_speed (dst->speed);	585	dst->set_speed (dst->speed);
		586	}
		587
		588	void
		589	object::instantiate ()
		590	{
		591	if (!uuid.seq) // HACK
		592	uuid = gen_uuid ();
		593
		594	speed_left = -0.1f;
		595	/* copy the body_info to the body_used - this is only really
		596	* need for monsters, but doesn't hurt to do it for everything.
		597	* by doing so, when a monster is created, it has good starting
		598	* values for the body_used info, so when items are created
		599	* for it, they can be properly equipped.
		600	*/
		601	for (int i = NUM_BODY_LOCATIONS; i--; )
		602	slot[i].used = slot[i].info;
		603
		604	attachable::instantiate ();
525	}	605	}
526		606
527	object *	607	object *
528	object::clone ()	608	object::clone ()
529	{	609	{
…		…
587	* UP_OBJ_FACE: only the objects face has changed.	667	* UP_OBJ_FACE: only the objects face has changed.
588	*/	668	*/
589	void	669	void
590	update_object (object *op, int action)	670	update_object (object *op, int action)
591	{	671	{
592	MoveType move_on, move_off, move_block, move_slow;
593
594	if (op == NULL)	672	if (op == NULL)
595	{	673	{
596	/* this should never happen */	674	/* this should never happen */
597	LOG (llevDebug, "update_object() called for NULL object.\n");	675	LOG (llevDebug, "update_object() called for NULL object.\n");
598	return;	676	return;
…		…
658		736
659	if (op->more)	737	if (op->more)
660	update_object (op->more, action);	738	update_object (op->more, action);
661	}	739	}
662		740
663	object *object::first;
664
665	object::object ()	741	object::object ()
666	{	742	{
667	SET_FLAG (this, FLAG_REMOVED);	743	SET_FLAG (this, FLAG_REMOVED);
668		744
669	expmul = 1.0;	745	expmul = 1.0;
670	face = blank_face;	746	face = blank_face;
671	}	747	}
672		748
673	object::~object ()	749	object::~object ()
674	{	750	{
		751	unlink ();
		752
675	free_key_values (this);	753	free_key_values (this);
676	}	754	}
677		755
		756	static int object_count;
		757
678	void object::link ()	758	void object::link ()
679	{	759	{
		760	assert (!index);//D
680	uuid = gen_uuid ();	761	uuid = gen_uuid ();
		762	count = ++object_count;
681		763
		764	refcnt_inc ();
682	objects.insert (this);	765	objects.insert (this);
683	}	766	}
684		767
685	void object::unlink ()	768	void object::unlink ()
686	{	769	{
		770	if (!index)
		771	return;
		772
687	objects.erase (this);	773	objects.erase (this);
		774	refcnt_dec ();
688	}	775	}
689		776
690	void	777	void
691	object::activate ()	778	object::activate ()
692	{	779	{
…		…
764	* drop on that space.	851	* drop on that space.
765	*/	852	*/
766	if (!drop_to_ground	853	if (!drop_to_ground
767	\|\| !map	854	\|\| !map
768	\|\| map->in_memory != MAP_IN_MEMORY	855	\|\| map->in_memory != MAP_IN_MEMORY
		856	\|\| map->nodrop
769	\|\| ms ().move_block == MOVE_ALL)	857	\|\| ms ().move_block == MOVE_ALL)
770	{	858	{
771	while (inv)	859	while (inv)
772	{	860	{
773	inv->destroy_inv (drop_to_ground);	861	inv->destroy_inv (drop_to_ground);
…		…
782		870
783	if (op->flag [FLAG_STARTEQUIP]	871	if (op->flag [FLAG_STARTEQUIP]
784	\|\| op->flag [FLAG_NO_DROP]	872	\|\| op->flag [FLAG_NO_DROP]
785	\|\| op->type == RUNE	873	\|\| op->type == RUNE
786	\|\| op->type == TRAP	874	\|\| op->type == TRAP
787	\|\| op->flag [FLAG_IS_A_TEMPLATE])	875	\|\| op->flag [FLAG_IS_A_TEMPLATE]
		876	\|\| op->flag [FLAG_DESTROY_ON_DEATH])
788	op->destroy ();	877	op->destroy ();
789	else	878	else
790	map->insert (op, x, y);	879	map->insert (op, x, y);
791	}	880	}
792	}	881	}
…		…
800	}	889	}
801		890
802	void	891	void
803	object::do_destroy ()	892	object::do_destroy ()
804	{	893	{
		894	attachable::do_destroy ();
		895
805	if (flag [FLAG_IS_LINKED])	896	if (flag [FLAG_IS_LINKED])
806	remove_button_link (this);	897	remove_button_link (this);
807		898
808	if (flag [FLAG_FRIENDLY])	899	if (flag [FLAG_FRIENDLY])
809	remove_friendly_object (this);	900	remove_friendly_object (this);
810		901
811	if (!flag [FLAG_REMOVED])	902	if (!flag [FLAG_REMOVED])
812	remove ();	903	remove ();
813		904
814	if (flag [FLAG_FREED])	905	destroy_inv (true);
815	return;
816		906
817	set_speed (0);	907	deactivate ();
		908	unlink ();
818		909
819	flag [FLAG_FREED] = 1;	910	flag [FLAG_FREED] = 1;
820
821	attachable::do_destroy ();
822
823	destroy_inv (true);
824	unlink ();
825		911
826	// hack to ensure that freed objects still have a valid map	912	// hack to ensure that freed objects still have a valid map
827	{	913	{
828	static maptile *freed_map; // freed objects are moved here to avoid crashes	914	static maptile *freed_map; // freed objects are moved here to avoid crashes
829		915
…		…
842	map = freed_map;	928	map = freed_map;
843	x = 1;	929	x = 1;
844	y = 1;	930	y = 1;
845	}	931	}
846		932
847	head = 0;
848
849	if (more)	933	if (more)
850	{	934	{
851	more->destroy ();	935	more->destroy ();
852	more = 0;	936	more = 0;
853	}	937	}
854		938
		939	head = 0;
		940
855	// clear those pointers that likely might have circular references to us	941	// clear those pointers that likely might cause circular references
856	owner = 0;	942	owner = 0;
857	enemy = 0;	943	enemy = 0;
858	attacked_by = 0;	944	attacked_by = 0;
		945	current_weapon = 0;
859	}	946	}
860		947
861	void	948	void
862	object::destroy (bool destroy_inventory)	949	object::destroy (bool destroy_inventory)
863	{	950	{
864	if (destroyed ())	951	if (destroyed ())
865	return;	952	return;
866		953
867	if (destroy_inventory)	954	if (destroy_inventory)
868	destroy_inv (false);	955	destroy_inv (false);
		956
		957	if (is_head ())
		958	if (sound_destroy)
		959	play_sound (sound_destroy);
		960	else if (flag [FLAG_MONSTER])
		961	play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism
869		962
870	attachable::destroy ();	963	attachable::destroy ();
871	}	964	}
872		965
873	/*	966	/*
…		…
891	* This function removes the object op from the linked list of objects	984	* This function removes the object op from the linked list of objects
892	* which it is currently tied to. When this function is done, the	985	* which it is currently tied to. When this function is done, the
893	* object will have no environment. If the object previously had an	986	* object will have no environment. If the object previously had an
894	* environment, the x and y coordinates will be updated to	987	* environment, the x and y coordinates will be updated to
895	* the previous environment.	988	* the previous environment.
896	* Beware: This function is called from the editor as well!
897	*/	989	*/
898	void	990	void
899	object::remove ()	991	object::do_remove ()
900	{	992	{
901	object tmp, last = 0;	993	object tmp, last = 0;
902	object *otmp;	994	object *otmp;
903		995
904	if (QUERY_FLAG (this, FLAG_REMOVED))	996	if (QUERY_FLAG (this, FLAG_REMOVED))
…		…
947	}	1039	}
948	else if (map)	1040	else if (map)
949	{	1041	{
950	if (type == PLAYER)	1042	if (type == PLAYER)
951	{	1043	{
		1044	// leaving a spot always closes any open container on the ground
		1045	if (container && !container->env)
		1046	// this causes spurious floorbox updates, but it ensures
		1047	// that the CLOSE event is being sent.
		1048	close_container ();
		1049
952	--map->players;	1050	--map->players;
953	map->touch ();	1051	map->touch ();
954	}	1052	}
955		1053
956	map->dirty = true;	1054	map->dirty = true;
		1055	mapspace &ms = this->ms ();
957		1056
958	/* link the object above us */	1057	/* link the object above us */
959	if (above)	1058	if (above)
960	above->below = below;	1059	above->below = below;
961	else	1060	else
962	map->at (x, y).top = below; /* we were top, set new top */	1061	ms.top = below; /* we were top, set new top */
963		1062
964	/* Relink the object below us, if there is one */	1063	/* Relink the object below us, if there is one */
965	if (below)	1064	if (below)
966	below->above = above;	1065	below->above = above;
967	else	1066	else
…		…
969	/* Nothing below, which means we need to relink map object for this space	1068	/* Nothing below, which means we need to relink map object for this space
970	* use translated coordinates in case some oddness with map tiling is	1069	* use translated coordinates in case some oddness with map tiling is
971	* evident	1070	* evident
972	*/	1071	*/
973	if (GET_MAP_OB (map, x, y) != this)	1072	if (GET_MAP_OB (map, x, y) != this)
974	{
975	char *dump = dump_object (this);
976	LOG (llevError,
977	"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);	1073	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 ());
978	free (dump);
979	dump = dump_object (GET_MAP_OB (map, x, y));
980	LOG (llevError, "%s\n", dump);
981	free (dump);
982	}
983		1074
984	map->at (x, y).bot = above; /* goes on above it. */	1075	ms.bot = above; /* goes on above it. */
985	}	1076	}
986		1077
987	above = 0;	1078	above = 0;
988	below = 0;	1079	below = 0;
989		1080
990	if (map->in_memory == MAP_SAVING)	1081	if (map->in_memory == MAP_SAVING)
991	return;	1082	return;
992		1083
993	int check_walk_off = !flag [FLAG_NO_APPLY];	1084	int check_walk_off = !flag [FLAG_NO_APPLY];
994		1085
		1086	if (object *pl = ms.player ())
		1087	{
		1088	if (pl->container == this)
		1089	/* If a container that the player is currently using somehow gets
		1090	* removed (most likely destroyed), update the player view
		1091	* appropriately.
		1092	*/
		1093	pl->close_container ();
		1094
		1095	pl->contr->ns->floorbox_update ();
		1096	}
		1097
995	for (tmp = map->at (x, y).bot; tmp; tmp = tmp->above)	1098	for (tmp = ms.bot; tmp; tmp = tmp->above)
996	{	1099	{
997	/* No point updating the players look faces if he is the object	1100	/* No point updating the players look faces if he is the object
998	* being removed.	1101	* being removed.
999	*/	1102	*/
1000
1001	if (tmp->type == PLAYER && tmp != this)
1002	{
1003	/* If a container that the player is currently using somehow gets
1004	* removed (most likely destroyed), update the player view
1005	* appropriately.
1006	*/
1007	if (tmp->container == this)
1008	{
1009	flag [FLAG_APPLIED] = 0;
1010	tmp->container = 0;
1011	}
1012
1013	if (tmp->contr->ns)
1014	tmp->contr->ns->floorbox_update ();
1015	}
1016		1103
1017	/* See if object moving off should effect something */	1104	/* See if object moving off should effect something */
1018	if (check_walk_off	1105	if (check_walk_off
1019	&& ((move_type & tmp->move_off)	1106	&& ((move_type & tmp->move_off)
1020	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))	1107	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
…		…
1023		1110
1024	if (destroyed ())	1111	if (destroyed ())
1025	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());	1112	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1026	}	1113	}
1027		1114
1028	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1029	//TODO: why is this horrible hacka fix? get rid of this code=bug! (schmorp)
1030	if (tmp->above == tmp)
1031	tmp->above = 0;
1032
1033	last = tmp;	1115	last = tmp;
1034	}	1116	}
1035		1117
1036	/* last == NULL if there are no objects on this space */	1118	/* last == NULL if there are no objects on this space */
1037	//TODO: this makes little sense, why only update the topmost object?	1119	//TODO: this makes little sense, why only update the topmost object?
…		…
1080	}	1162	}
1081		1163
1082	return 0;	1164	return 0;
1083	}	1165	}
1084		1166
		1167	void
		1168	object::expand_tail ()
		1169	{
		1170	if (more)
		1171	return;
		1172
		1173	object *prev = this;
		1174
		1175	for (archetype at = (archetype )arch->more; at; at = (archetype *)at->more)
		1176	{
		1177	object *op = arch_to_object (at);
		1178
		1179	op->name = name;
		1180	op->name_pl = name_pl;
		1181	op->title = title;
		1182
		1183	op->head = this;
		1184	prev->more = op;
		1185
		1186	prev = op;
		1187	}
		1188	}
		1189
1085	/*	1190	/*
1086	* same as insert_ob_in_map except it handle separate coordinates and do a clean	1191	* same as insert_ob_in_map except it handles separate coordinates and does a clean
1087	* job preparing multi-part monsters	1192	* job preparing multi-part monsters.
1088	*/	1193	*/
1089	object *	1194	object *
1090	insert_ob_in_map_at (object op, maptile m, object *originator, int flag, int x, int y)	1195	insert_ob_in_map_at (object op, maptile m, object *originator, int flag, int x, int y)
1091	{	1196	{
1092	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)	1197	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1093	{	1198	{
1094	tmp->x = x + tmp->arch->clone.x;	1199	tmp->x = x + tmp->arch->x;
1095	tmp->y = y + tmp->arch->clone.y;	1200	tmp->y = y + tmp->arch->y;
1096	}	1201	}
1097		1202
1098	return insert_ob_in_map (op, m, originator, flag);	1203	return insert_ob_in_map (op, m, originator, flag);
1099	}	1204	}
1100		1205
…		…
1119	* just 'op' otherwise	1224	* just 'op' otherwise
1120	*/	1225	*/
1121	object *	1226	object *
1122	insert_ob_in_map (object op, maptile m, object *originator, int flag)	1227	insert_ob_in_map (object op, maptile m, object *originator, int flag)
1123	{	1228	{
		1229	assert (!op->flag [FLAG_FREED]);
		1230
1124	object tmp, top, *floor = NULL;	1231	object top, floor = NULL;
1125	sint16 x, y;
1126		1232
1127	if (QUERY_FLAG (op, FLAG_FREED))	1233	op->remove ();
1128	{
1129	LOG (llevError, "Trying to insert freed object!\n");
1130	return NULL;
1131	}
1132
1133	if (!m)
1134	{
1135	char *dump = dump_object (op);
1136	LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
1137	free (dump);
1138	return op;
1139	}
1140		1234
1141	if (out_of_map (m, op->x, op->y))	1235	if (out_of_map (m, op->x, op->y))
1142	{	1236	{
1143	char *dump = dump_object (op);
1144	LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump);	1237	LOG (llevError, "Trying to insert object outside the map.\n%s\n", op->debug_desc ());
1145	#ifdef MANY_CORES	1238	#ifdef MANY_CORES
1146	/* Better to catch this here, as otherwise the next use of this object	1239	/* Better to catch this here, as otherwise the next use of this object
1147	* is likely to cause a crash. Better to find out where it is getting	1240	* is likely to cause a crash. Better to find out where it is getting
1148	* improperly inserted.	1241	* improperly inserted.
1149	*/	1242	*/
1150	abort ();	1243	abort ();
1151	#endif	1244	#endif
1152	free (dump);
1153	return op;	1245	return op;
1154	}	1246	}
1155		1247
1156	if (!QUERY_FLAG (op, FLAG_REMOVED))	1248	if (object *more = op->more)
1157	{	1249	if (!insert_ob_in_map (more, m, originator, flag))
1158	char *dump = dump_object (op);
1159	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
1160	free (dump);
1161	return op;	1250	return 0;
1162	}
1163
1164	if (op->more)
1165	{
1166	/* The part may be on a different map. */
1167
1168	object *more = op->more;
1169
1170	/* We really need the caller to normalise coordinates - if
1171	* we set the map, that doesn't work if the location is within
1172	* a map and this is straddling an edge. So only if coordinate
1173	* is clear wrong do we normalise it.
1174	*/
1175	if (OUT_OF_REAL_MAP (more->map, more->x, more->y))
1176	more->map = get_map_from_coord (m, &more->x, &more->y);
1177	else if (!more->map)
1178	{
1179	/* For backwards compatibility - when not dealing with tiled maps,
1180	* more->map should always point to the parent.
1181	*/
1182	more->map = m;
1183	}
1184
1185	if (insert_ob_in_map (more, more->map, originator, flag) == NULL)
1186	{
1187	if (!op->head)
1188	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1189
1190	return 0;
1191	}
1192	}
1193		1251
1194	CLEAR_FLAG (op, FLAG_REMOVED);	1252	CLEAR_FLAG (op, FLAG_REMOVED);
1195		1253
1196	/* Ideally, the caller figures this out. However, it complicates a lot	1254	/* Ideally, the caller figures this out. However, it complicates a lot
1197	* of areas of callers (eg, anything that uses find_free_spot would now	1255	* of areas of callers (eg, anything that uses find_free_spot would now
1198	* need extra work	1256	* need extra work
1199	*/	1257	*/
1200	op->map = get_map_from_coord (m, &op->x, &op->y);	1258	if (!xy_normalise (m, op->x, op->y))
1201	x = op->x;	1259	return 0;
1202	y = op->y;	1260
		1261	op->map = m;
		1262	mapspace &ms = op->ms ();
1203		1263
1204	/* this has to be done after we translate the coordinates.	1264	/* this has to be done after we translate the coordinates.
1205	*/	1265	*/
1206	if (op->nrof && !(flag & INS_NO_MERGE))	1266	if (op->nrof && !(flag & INS_NO_MERGE))
1207	for (tmp = GET_MAP_OB (op->map, x, y); tmp; tmp = tmp->above)	1267	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1208	if (object::can_merge (op, tmp))	1268	if (object::can_merge (op, tmp))
1209	{	1269	{
1210	op->nrof += tmp->nrof;	1270	op->nrof += tmp->nrof;
1211	tmp->destroy ();	1271	tmp->destroy ();
1212	}	1272	}
…		…
1229	op->below = originator->below;	1289	op->below = originator->below;
1230		1290
1231	if (op->below)	1291	if (op->below)
1232	op->below->above = op;	1292	op->below->above = op;
1233	else	1293	else
1234	op->ms ().bot = op;	1294	ms.bot = op;
1235		1295
1236	/* since below originator, no need to update top */	1296	/* since below originator, no need to update top */
1237	originator->below = op;	1297	originator->below = op;
1238	}	1298	}
1239	else	1299	else
1240	{	1300	{
		1301	top = ms.bot;
		1302
1241	/* If there are other objects, then */	1303	/* If there are other objects, then */
1242	if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL))	1304	if ((!(flag & INS_MAP_LOAD)) && top)
1243	{	1305	{
1244	object *last = 0;	1306	object *last = 0;
1245		1307
1246	/*	1308	/*
1247	* If there are multiple objects on this space, we do some trickier handling.	1309	* If there are multiple objects on this space, we do some trickier handling.
…		…
1253	* once we get to them. This reduces the need to traverse over all of	1315	* once we get to them. This reduces the need to traverse over all of
1254	* them when adding another one - this saves quite a bit of cpu time	1316	* them when adding another one - this saves quite a bit of cpu time
1255	* when lots of spells are cast in one area. Currently, it is presumed	1317	* when lots of spells are cast in one area. Currently, it is presumed
1256	* that flying non pickable objects are spell objects.	1318	* that flying non pickable objects are spell objects.
1257	*/	1319	*/
1258	while (top)	1320	for (top = ms.bot; top; top = top->above)
1259	{	1321	{
1260	if (QUERY_FLAG (top, FLAG_IS_FLOOR) \|\| QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))	1322	if (QUERY_FLAG (top, FLAG_IS_FLOOR) \|\| QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))
1261	floor = top;	1323	floor = top;
1262		1324
1263	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW \| MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))	1325	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW \| MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))
…		…
1266	top = top->below;	1328	top = top->below;
1267	break;	1329	break;
1268	}	1330	}
1269		1331
1270	last = top;	1332	last = top;
1271	top = top->above;
1272	}	1333	}
1273		1334
1274	/* Don't want top to be NULL, so set it to the last valid object */	1335	/* Don't want top to be NULL, so set it to the last valid object */
1275	top = last;	1336	top = last;
1276		1337
…		…
1278	* looks like instead of lots of conditions here.	1339	* looks like instead of lots of conditions here.
1279	* makes things faster, and effectively the same result.	1340	* makes things faster, and effectively the same result.
1280	*/	1341	*/
1281		1342
1282	/* Have object 'fall below' other objects that block view.	1343	/* Have object 'fall below' other objects that block view.
1283	* Unless those objects are exits, type 66	1344	* Unless those objects are exits.
1284	* If INS_ON_TOP is used, don't do this processing	1345	* If INS_ON_TOP is used, don't do this processing
1285	* Need to find the object that in fact blocks view, otherwise	1346	* Need to find the object that in fact blocks view, otherwise
1286	* stacking is a bit odd.	1347	* stacking is a bit odd.
1287	*/	1348	*/
1288	if (!(flag & INS_ON_TOP) &&	1349	if (!(flag & INS_ON_TOP)
1289	(get_map_flags (op->map, 0, op->x, op->y, 0, 0) & P_BLOCKSVIEW) && (op->face && !op->face->visibility))	1350	&& ms.flags () & P_BLOCKSVIEW
		1351	&& (op->face && !faces [op->face].visibility))
1290	{	1352	{
1291	for (last = top; last != floor; last = last->below)	1353	for (last = top; last != floor; last = last->below)
1292	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1354	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1293	break;	1355	break;
		1356
1294	/* Check to see if we found the object that blocks view,	1357	/* Check to see if we found the object that blocks view,
1295	* and make sure we have a below pointer for it so that	1358	* and make sure we have a below pointer for it so that
1296	* we can get inserted below this one, which requires we	1359	* we can get inserted below this one, which requires we
1297	* set top to the object below us.	1360	* set top to the object below us.
1298	*/	1361	*/
1299	if (last && last->below && last != floor)	1362	if (last && last->below && last != floor)
1300	top = last->below;	1363	top = last->below;
1301	}	1364	}
1302	} /* If objects on this space */	1365	} /* If objects on this space */
1303
1304	if (flag & INS_MAP_LOAD)	1366	if (flag & INS_MAP_LOAD)
1305	top = GET_MAP_TOP (op->map, op->x, op->y);	1367	top = ms.top;
1306		1368
1307	if (flag & INS_ABOVE_FLOOR_ONLY)	1369	if (flag & INS_ABOVE_FLOOR_ONLY)
1308	top = floor;	1370	top = floor;
1309		1371
1310	/* Top is the object that our object (op) is going to get inserted above.	1372	/* Top is the object that our object (op) is going to get inserted above.
1311	*/	1373	*/
1312		1374
1313	/* First object on this space */	1375	/* First object on this space */
1314	if (!top)	1376	if (!top)
1315	{	1377	{
1316	op->above = GET_MAP_OB (op->map, op->x, op->y);	1378	op->above = ms.bot;
1317		1379
1318	if (op->above)	1380	if (op->above)
1319	op->above->below = op;	1381	op->above->below = op;
1320		1382
1321	op->below = 0;	1383	op->below = 0;
1322	op->ms ().bot = op;	1384	ms.bot = op;
1323	}	1385	}
1324	else	1386	else
1325	{ /* get inserted into the stack above top */	1387	{ /* get inserted into the stack above top */
1326	op->above = top->above;	1388	op->above = top->above;
1327		1389
…		…
1331	op->below = top;	1393	op->below = top;
1332	top->above = op;	1394	top->above = op;
1333	}	1395	}
1334		1396
1335	if (!op->above)	1397	if (!op->above)
1336	op->ms ().top = op;	1398	ms.top = op;
1337	} /* else not INS_BELOW_ORIGINATOR */	1399	} /* else not INS_BELOW_ORIGINATOR */
1338		1400
1339	if (op->type == PLAYER)	1401	if (op->type == PLAYER)
1340	{	1402	{
1341	op->contr->do_los = 1;	1403	op->contr->do_los = 1;
…		…
1343	op->map->touch ();	1405	op->map->touch ();
1344	}	1406	}
1345		1407
1346	op->map->dirty = true;	1408	op->map->dirty = true;
1347		1409
1348	/* If we have a floor, we know the player, if any, will be above
1349	* it, so save a few ticks and start from there.
1350	*/
1351	if (!(flag & INS_MAP_LOAD))	1410	if (!(flag & INS_MAP_LOAD))
1352	if (object *pl = op->ms ().player ())	1411	if (object *pl = ms.player ())
1353	if (pl->contr->ns)
1354	pl->contr->ns->floorbox_update ();	1412	pl->contr->ns->floorbox_update ();
1355		1413
1356	/* If this object glows, it may affect lighting conditions that are	1414	/* If this object glows, it may affect lighting conditions that are
1357	* visible to others on this map. But update_all_los is really	1415	* visible to others on this map. But update_all_los is really
1358	* an inefficient way to do this, as it means los for all players	1416	* an inefficient way to do this, as it means los for all players
1359	* on the map will get recalculated. The players could very well	1417	* on the map will get recalculated. The players could very well
…		…
1378	* blocked() and wall() work properly), and these flags are updated by	1436	* blocked() and wall() work properly), and these flags are updated by
1379	* update_object().	1437	* update_object().
1380	*/	1438	*/
1381		1439
1382	/* if this is not the head or flag has been passed, don't check walk on status */	1440	/* if this is not the head or flag has been passed, don't check walk on status */
1383	if (!(flag & INS_NO_WALK_ON) && !op->head)	1441	if (!(flag & INS_NO_WALK_ON) && op->head_ () == op)
1384	{	1442	{
1385	if (check_move_on (op, originator))	1443	if (check_move_on (op, originator))
1386	return 0;	1444	return 0;
1387		1445
1388	/* If we are a multi part object, lets work our way through the check	1446	/* If we are a multi part object, lets work our way through the check
1389	* walk on's.	1447	* walk on's.
1390	*/	1448	*/
1391	for (tmp = op->more; tmp != NULL; tmp = tmp->more)	1449	for (object *tmp = op->more; tmp; tmp = tmp->more)
1392	if (check_move_on (tmp, originator))	1450	if (check_move_on (tmp, originator))
1393	return 0;	1451	return 0;
1394	}	1452	}
1395		1453
1396	return op;	1454	return op;
…		…
1406	object tmp, tmp1;	1464	object tmp, tmp1;
1407		1465
1408	/* first search for itself and remove any old instances */	1466	/* first search for itself and remove any old instances */
1409		1467
1410	for (tmp = op->ms ().bot; tmp; tmp = tmp->above)	1468	for (tmp = op->ms ().bot; tmp; tmp = tmp->above)
1411	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */	1469	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */
1412	tmp->destroy ();	1470	tmp->destroy ();
1413		1471
1414	tmp1 = arch_to_object (archetype::find (arch_string));	1472	tmp1 = arch_to_object (archetype::find (arch_string));
1415		1473
1416	tmp1->x = op->x;	1474	tmp1->x = op->x;
…		…
1419	}	1477	}
1420		1478
1421	object *	1479	object *
1422	object::insert_at (object where, object originator, int flags)	1480	object::insert_at (object where, object originator, int flags)
1423	{	1481	{
1424	where->map->insert (this, where->x, where->y, originator, flags);	1482	return where->map->insert (this, where->x, where->y, originator, flags);
1425	}	1483	}
1426		1484
1427	/*	1485	/*
1428	* get_split_ob(ob,nr) splits up ob into two parts. The part which	1486	* get_split_ob(ob,nr) splits up ob into two parts. The part which
1429	* is returned contains nr objects, and the remaining parts contains	1487	* is returned contains nr objects, and the remaining parts contains
…		…
1469	* the amount of an object. If the amount reaches 0, the object	1527	* the amount of an object. If the amount reaches 0, the object
1470	* is subsequently removed and freed.	1528	* is subsequently removed and freed.
1471	*	1529	*
1472	* Return value: 'op' if something is left, NULL if the amount reached 0	1530	* Return value: 'op' if something is left, NULL if the amount reached 0
1473	*/	1531	*/
1474
1475	object *	1532	object *
1476	decrease_ob_nr (object *op, uint32 i)	1533	decrease_ob_nr (object *op, uint32 i)
1477	{	1534	{
1478	object *tmp;	1535	object *tmp;
1479		1536
…		…
1554		1611
1555	/*	1612	/*
1556	* add_weight(object, weight) adds the specified weight to an object,	1613	* add_weight(object, weight) adds the specified weight to an object,
1557	* and also updates how much the environment(s) is/are carrying.	1614	* and also updates how much the environment(s) is/are carrying.
1558	*/	1615	*/
1559
1560	void	1616	void
1561	add_weight (object *op, signed long weight)	1617	add_weight (object *op, signed long weight)
1562	{	1618	{
1563	while (op != NULL)	1619	while (op != NULL)
1564	{	1620	{
…		…
1579	LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);	1635	LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
1580	free (dump);	1636	free (dump);
1581	return op;	1637	return op;
1582	}	1638	}
1583		1639
1584	if (where->head)	1640	if (where->head_ () != where)
1585	{	1641	{
1586	LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n");	1642	LOG (llevError \| logBacktrace, "Warning: Tried to insert object into wrong part of multipart object.\n");
1587	where = where->head;	1643	where = where->head;
1588	}	1644	}
1589		1645
1590	return where->insert (op);	1646	return where->insert (op);
1591	}	1647	}
…		…
1596	* inside the object environment.	1652	* inside the object environment.
1597	*	1653	*
1598	* The function returns now pointer to inserted item, and return value can	1654	* The function returns now pointer to inserted item, and return value can
1599	* be != op, if items are merged. -Tero	1655	* be != op, if items are merged. -Tero
1600	*/	1656	*/
1601
1602	object *	1657	object *
1603	object::insert (object *op)	1658	object::insert (object *op)
1604	{	1659	{
1605	object tmp, otmp;
1606
1607	if (!QUERY_FLAG (op, FLAG_REMOVED))	1660	if (!QUERY_FLAG (op, FLAG_REMOVED))
1608	op->remove ();	1661	op->remove ();
1609		1662
1610	if (op->more)	1663	if (op->more)
1611	{	1664	{
…		…
1613	return op;	1666	return op;
1614	}	1667	}
1615		1668
1616	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1669	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1617	CLEAR_FLAG (op, FLAG_REMOVED);	1670	CLEAR_FLAG (op, FLAG_REMOVED);
		1671
1618	if (op->nrof)	1672	if (op->nrof)
1619	{	1673	{
1620	for (tmp = inv; tmp != NULL; tmp = tmp->below)	1674	for (object *tmp = inv; tmp; tmp = tmp->below)
1621	if (object::can_merge (tmp, op))	1675	if (object::can_merge (tmp, op))
1622	{	1676	{
1623	/* return the original object and remove inserted object	1677	/* return the original object and remove inserted object
1624	(client needs the original object) */	1678	(client needs the original object) */
1625	tmp->nrof += op->nrof;	1679	tmp->nrof += op->nrof;
…		…
1644	add_weight (this, op->weight * op->nrof);	1698	add_weight (this, op->weight * op->nrof);
1645	}	1699	}
1646	else	1700	else
1647	add_weight (this, (op->weight + op->carrying));	1701	add_weight (this, (op->weight + op->carrying));
1648		1702
1649	otmp = this->in_player ();	1703	if (object *otmp = this->in_player ())
1650	if (otmp && otmp->contr)
1651	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1704	if (otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1652	otmp->update_stats ();	1705	otmp->update_stats ();
1653		1706
		1707	op->owner = 0; // its his/hers now. period.
1654	op->map = 0;	1708	op->map = 0;
1655	op->env = this;	1709	op->env = this;
1656	op->above = 0;	1710	op->above = 0;
1657	op->below = 0;	1711	op->below = 0;
1658	op->x = 0, op->y = 0;	1712	op->x = op->y = 0;
1659		1713
1660	/* reset the light list and los of the players on the map */	1714	/* reset the light list and los of the players on the map */
1661	if ((op->glow_radius != 0) && map)	1715	if (op->glow_radius && map)
1662	{	1716	{
1663	#ifdef DEBUG_LIGHTS	1717	#ifdef DEBUG_LIGHTS
1664	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);	1718	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1665	#endif /* DEBUG_LIGHTS */	1719	#endif /* DEBUG_LIGHTS */
1666	if (map->darkness)	1720	if (map->darkness)
…		…
1766	if ((!op->move_type && tmp->move_slow & MOVE_WALK) \|\|	1820	if ((!op->move_type && tmp->move_slow & MOVE_WALK) \|\|
1767	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))	1821	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1768	{	1822	{
1769		1823
1770	float	1824	float
1771	diff = tmp->move_slow_penalty * FABS (op->speed);	1825	diff = tmp->move_slow_penalty * fabs (op->speed);
1772		1826
1773	if (op->type == PLAYER)	1827	if (op->type == PLAYER)
1774	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) \|\|	1828	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) \|\|
1775	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))	1829	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))
1776	diff /= 4.0;	1830	diff /= 4.0;
…		…
1920	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)	1974	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
1921	{	1975	{
1922	CLEAR_FLAG (tmp, flag);	1976	CLEAR_FLAG (tmp, flag);
1923	unflag_inv (tmp, flag);	1977	unflag_inv (tmp, flag);
1924	}	1978	}
1925	}
1926
1927	/*
1928	* set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in
1929	* all it's inventory (recursively).
1930	* If checksums are used, a player will get set_cheat called for
1931	* him/her-self and all object carried by a call to this function.
1932	*/
1933	void
1934	set_cheat (object *op)
1935	{
1936	SET_FLAG (op, FLAG_WAS_WIZ);
1937	flag_inv (op, FLAG_WAS_WIZ);
1938	}	1979	}
1939		1980
1940	/*	1981	/*
1941	* find_free_spot(object, map, x, y, start, stop) will search for	1982	* find_free_spot(object, map, x, y, start, stop) will search for
1942	* a spot at the given map and coordinates which will be able to contain	1983	* a spot at the given map and coordinates which will be able to contain
…		…
1983	}	2024	}
1984		2025
1985	if (!index)	2026	if (!index)
1986	return -1;	2027	return -1;
1987		2028
1988	return altern[RANDOM () % index];	2029	return altern [rndm (index)];
1989	}	2030	}
1990		2031
1991	/*	2032	/*
1992	* find_first_free_spot(archetype, maptile, x, y) works like	2033	* find_first_free_spot(archetype, maptile, x, y) works like
1993	* find_free_spot(), but it will search max number of squares.	2034	* find_free_spot(), but it will search max number of squares.
…		…
2014	{	2055	{
2015	arr += begin;	2056	arr += begin;
2016	end -= begin;	2057	end -= begin;
2017		2058
2018	while (--end)	2059	while (--end)
2019	swap (arr [end], arr [RANDOM () % (end + 1)]);	2060	swap (arr [end], arr [rndm (end + 1)]);
2020	}	2061	}
2021		2062
2022	/* new function to make monster searching more efficient, and effective!	2063	/* new function to make monster searching more efficient, and effective!
2023	* This basically returns a randomized array (in the passed pointer) of	2064	* This basically returns a randomized array (in the passed pointer) of
2024	* the spaces to find monsters. In this way, it won't always look for	2065	* the spaces to find monsters. In this way, it won't always look for
…		…
2060	object *tmp;	2101	object *tmp;
2061	maptile *mp;	2102	maptile *mp;
2062		2103
2063	MoveType blocked, move_type;	2104	MoveType blocked, move_type;
2064		2105
2065	if (exclude && exclude->head)	2106	if (exclude && exclude->head_ () != exclude)
2066	{	2107	{
2067	exclude = exclude->head;	2108	exclude = exclude->head;
2068	move_type = exclude->move_type;	2109	move_type = exclude->move_type;
2069	}	2110	}
2070	else	2111	else
…		…
2093	max = maxfree[i];	2134	max = maxfree[i];
2094	else if (mflags & P_IS_ALIVE)	2135	else if (mflags & P_IS_ALIVE)
2095	{	2136	{
2096	for (tmp = ms.bot; tmp; tmp = tmp->above)	2137	for (tmp = ms.bot; tmp; tmp = tmp->above)
2097	if ((tmp->flag [FLAG_MONSTER] \|\| tmp->type == PLAYER)	2138	if ((tmp->flag [FLAG_MONSTER] \|\| tmp->type == PLAYER)
2098	&& (tmp != exclude \|\| (tmp->head && tmp->head != exclude)))	2139	&& (tmp != exclude \|\| (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2099	break;	2140	break;
2100		2141
2101	if (tmp)	2142	if (tmp)
2102	return freedir[i];	2143	return freedir[i];
2103	}	2144	}
…		…
2158		2199
2159	return 3;	2200	return 3;
2160	}	2201	}
2161		2202
2162	/*	2203	/*
2163	* absdir(int): Returns a number between 1 and 8, which represent
2164	* the "absolute" direction of a number (it actually takes care of
2165	* "overflow" in previous calculations of a direction).
2166	*/
2167
2168	int
2169	absdir (int d)
2170	{
2171	while (d < 1)
2172	d += 8;
2173
2174	while (d > 8)
2175	d -= 8;
2176
2177	return d;
2178	}
2179
2180	/*
2181	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is	2204	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is
2182	* between two directions (which are expected to be absolute (see absdir())	2205	* between two directions (which are expected to be absolute (see absdir())
2183	*/	2206	*/
2184
2185	int	2207	int
2186	dirdiff (int dir1, int dir2)	2208	dirdiff (int dir1, int dir2)
2187	{	2209	{
2188	int d;	2210	int d;
2189		2211
…		…
2302	* Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause	2324	* Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause
2303	* core dumps if they do.	2325	* core dumps if they do.
2304	*	2326	*
2305	* Add a check so we can't pick up invisible objects (0.93.8)	2327	* Add a check so we can't pick up invisible objects (0.93.8)
2306	*/	2328	*/
2307
2308	int	2329	int
2309	can_pick (const object who, const object item)	2330	can_pick (const object who, const object item)
2310	{	2331	{
2311	return /QUERY_FLAG(who,FLAG_WIZ)\|\| /	2332	return /QUERY_FLAG(who,FLAG_WIZ)\|\| /
2312	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&	2333	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
…		…
2317	* create clone from object to another	2338	* create clone from object to another
2318	*/	2339	*/
2319	object *	2340	object *
2320	object_create_clone (object *asrc)	2341	object_create_clone (object *asrc)
2321	{	2342	{
2322	object dst = 0, tmp, src, part, prev, item;	2343	object dst = 0, tmp, src, prev, *item;
2323		2344
2324	if (!asrc)	2345	if (!asrc)
2325	return 0;	2346	return 0;
2326		2347
2327	src = asrc;
2328	if (src->head)
2329	src = src->head;	2348	src = asrc->head_ ();
2330		2349
2331	prev = 0;	2350	prev = 0;
2332	for (part = src; part; part = part->more)	2351	for (object *part = src; part; part = part->more)
2333	{	2352	{
2334	tmp = part->clone ();	2353	tmp = part->clone ();
2335	tmp->x -= src->x;	2354	tmp->x -= src->x;
2336	tmp->y -= src->y;	2355	tmp->y -= src->y;
2337		2356
…		…
2355	insert_ob_in_ob (object_create_clone (item), dst);	2374	insert_ob_in_ob (object_create_clone (item), dst);
2356		2375
2357	return dst;	2376	return dst;
2358	}	2377	}
2359		2378
2360	/* GROS - Creates an object using a string representing its content. */
2361	/* Basically, we save the content of the string to a temp file, then call */
2362	/* load_object on it. I admit it is a highly inefficient way to make things, */
2363	/* but it was simple to make and allows reusing the load_object function. */
2364	/* Remember not to use load_object_str in a time-critical situation. */
2365	/* Also remember that multiparts objects are not supported for now. */
2366	object *
2367	load_object_str (const char *obstr)
2368	{
2369	object *op;
2370	char filename[MAX_BUF];
2371
2372	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2373
2374	FILE *tempfile = fopen (filename, "w");
2375
2376	if (tempfile == NULL)
2377	{
2378	LOG (llevError, "Error - Unable to access load object temp file\n");
2379	return NULL;
2380	}
2381
2382	fprintf (tempfile, obstr);
2383	fclose (tempfile);
2384
2385	op = object::create ();
2386
2387	object_thawer thawer (filename);
2388
2389	if (thawer)
2390	load_object (thawer, op, 0);
2391
2392	LOG (llevDebug, " load str completed, object=%s\n", &op->name);
2393	CLEAR_FLAG (op, FLAG_REMOVED);
2394
2395	return op;
2396	}
2397
2398	/* This returns the first object in who's inventory that	2379	/* This returns the first object in who's inventory that
2399	* has the same type and subtype match.	2380	* has the same type and subtype match.
2400	* returns NULL if no match.	2381	* returns NULL if no match.
2401	*/	2382	*/
2402	object *	2383	object *
…		…
2455	if (link->key == canonical_key)	2436	if (link->key == canonical_key)
2456	return link->value;	2437	return link->value;
2457		2438
2458	return 0;	2439	return 0;
2459	}	2440	}
2460
2461		2441
2462	/*	2442	/*
2463	* Updates the canonical_key in op to value.	2443	* Updates the canonical_key in op to value.
2464	*	2444	*
2465	* canonical_key is a shared string (value doesn't have to be).	2445	* canonical_key is a shared string (value doesn't have to be).
…		…
2489	/* Basically, if the archetype has this key set,	2469	/* Basically, if the archetype has this key set,
2490	* we need to store the null value so when we save	2470	* we need to store the null value so when we save
2491	* it, we save the empty value so that when we load,	2471	* it, we save the empty value so that when we load,
2492	* we get this value back again.	2472	* we get this value back again.
2493	*/	2473	*/
2494	if (get_ob_key_link (&op->arch->clone, canonical_key))	2474	if (get_ob_key_link (op->arch, canonical_key))
2495	field->value = 0;	2475	field->value = 0;
2496	else	2476	else
2497	{	2477	{
2498	if (last)	2478	if (last)
2499	last->next = field->next;	2479	last->next = field->next;
…		…
2568	}	2548	}
2569	else	2549	else
2570	item = item->env;	2550	item = item->env;
2571	}	2551	}
2572		2552
2573
2574	const char *	2553	const char *
2575	object::flag_desc (char *desc, int len) const	2554	object::flag_desc (char *desc, int len) const
2576	{	2555	{
2577	char *p = desc;	2556	char *p = desc;
2578	bool first = true;	2557	bool first = true;
…		…
2605	{	2584	{
2606	char flagdesc[512];	2585	char flagdesc[512];
2607	char info2[256 * 4];	2586	char info2[256 * 4];
2608	char *p = info;	2587	char *p = info;
2609		2588
2610	p += snprintf (p, 512, "{cnt:%d,uuid:<1,%" PRIx64 ">,name:\"%s%s%s\",flags:[%s],type:%d}",	2589	p += snprintf (p, 512, "{cnt:%d,uuid:<1.%" PRIx64 ">,name:\"%s\"%s%s,flags:[%s],type:%d}",
2611	count, uuid.seq,	2590	count, uuid.seq,
2612	&name,	2591	&name,
2613	title ? "\",title:" : "",	2592	title ? "\",title:\"" : "",
2614	title ? (const char *)title : "",	2593	title ? (const char *)title : "",
2615	flag_desc (flagdesc, 512), type);	2594	flag_desc (flagdesc, 512), type);
2616		2595
2617	if (env)	2596	if (!this->flag[FLAG_REMOVED] && env)
2618	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2597	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2619		2598
2620	if (map)	2599	if (map)
2621	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);	2600	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2622		2601
…		…
2624	}	2603	}
2625		2604
2626	const char *	2605	const char *
2627	object::debug_desc () const	2606	object::debug_desc () const
2628	{	2607	{
2629	static char info[256 * 4];	2608	static char info[3][256 * 4];
		2609	static int info_idx;
		2610
2630	return debug_desc (info);	2611	return debug_desc (info [++info_idx % 3]);
2631	}	2612	}
2632		2613
		2614	struct region *
		2615	object::region () const
		2616	{
		2617	return map ? map->region (x, y)
		2618	: region::default_region ();
		2619	}
		2620
		2621	const materialtype_t *
		2622	object::dominant_material () const
		2623	{
		2624	if (materialtype_t *mt = name_to_material (materialname))
		2625	return mt;
		2626
		2627	return name_to_material (shstr_unknown);
		2628	}
		2629
		2630	void
		2631	object::open_container (object *new_container)
		2632	{
		2633	if (container == new_container)
		2634	return;
		2635
		2636	if (object *old_container = container)
		2637	{
		2638	if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
		2639	return;
		2640
		2641	#if 0
		2642	// remove the "Close old_container" object.
		2643	if (object *closer = old_container->inv)
		2644	if (closer->type == CLOSE_CON)
		2645	closer->destroy ();
		2646	#endif
		2647
		2648	old_container->flag [FLAG_APPLIED] = 0;
		2649	container = 0;
		2650
		2651	esrv_update_item (UPD_FLAGS, this, old_container);
		2652	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
		2653	play_sound (sound_find ("chest_close"));
		2654	}
		2655
		2656	if (new_container)
		2657	{
		2658	if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))
		2659	return;
		2660
		2661	// TODO: this does not seem to serve any purpose anymore?
		2662	#if 0
		2663	// insert the "Close Container" object.
		2664	if (archetype *closer = new_container->other_arch)
		2665	{
		2666	object *closer = arch_to_object (new_container->other_arch);
		2667	closer->flag [FLAG_NO_MAP_SAVE] = 1;
		2668	new_container->insert (closer);
		2669	}
		2670	#endif
		2671
		2672	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));
		2673
		2674	new_container->flag [FLAG_APPLIED] = 1;
		2675	container = new_container;
		2676
		2677	esrv_update_item (UPD_FLAGS, this, new_container);
		2678	esrv_send_inventory (this, new_container);
		2679	play_sound (sound_find ("chest_open"));
		2680	}
		2681	}
		2682
		2683	object *
		2684	object::force_find (const shstr name)
		2685	{
		2686	/* cycle through his inventory to look for the MARK we want to
		2687	* place
		2688	*/
		2689	for (object *tmp = inv; tmp; tmp = tmp->below)
		2690	if (tmp->type == FORCE && tmp->slaying == name)
		2691	return splay (tmp);
		2692
		2693	return 0;
		2694	}
		2695
		2696	void
		2697	object::force_add (const shstr name, int duration)
		2698	{
		2699	if (object *force = force_find (name))
		2700	force->destroy ();
		2701
		2702	object *force = get_archetype (FORCE_NAME);
		2703
		2704	force->slaying = name;
		2705	force->stats.food = 1;
		2706	force->speed_left = -1.f;
		2707
		2708	force->set_speed (duration ? 1.f / duration : 0.f);
		2709	force->flag [FLAG_IS_USED_UP] = true;
		2710	force->flag [FLAG_APPLIED] = true;
		2711
		2712	insert (force);
		2713	}
		2714
		2715	void
		2716	object::play_sound (faceidx sound) const
		2717	{
		2718	if (!sound)
		2719	return;
		2720
		2721	if (flag [FLAG_REMOVED])
		2722	return;
		2723
		2724	if (env)
		2725	{
		2726	if (object *pl = in_player ())
		2727	pl->contr->play_sound (sound);
		2728	}
		2729	else
		2730	map->play_sound (sound, x, y);
		2731	}
		2732

Diff Legend

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

Comparing deliantra/server/common/object.C (file contents): Revision 1.108 by root, Sun Jan 7 02:39:13 2007 UTC vs. Revision 1.185 by root, Fri Aug 24 01:23:29 2007 UTC

Diff Legend

Comparing deliantra/server/common/object.C (file contents):
Revision 1.108 by root, Sun Jan 7 02:39:13 2007 UTC vs.
Revision 1.185 by root, Fri Aug 24 01:23:29 2007 UTC