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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.113 by root, Tue Jan 9 21:32:41 2007 UTC vs.
Revision 1.183 by root, Mon Aug 20 19:13:10 2007 UTC

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

Diff Legend

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

Comparing deliantra/server/common/object.C (file contents): Revision 1.113 by root, Tue Jan 9 21:32:41 2007 UTC vs. Revision 1.183 by root, Mon Aug 20 19:13:10 2007 UTC

Diff Legend

Comparing deliantra/server/common/object.C (file contents):
Revision 1.113 by root, Tue Jan 9 21:32:41 2007 UTC vs.
Revision 1.183 by root, Mon Aug 20 19:13:10 2007 UTC