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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.25 by root, Mon Sep 11 01:16:20 2006 UTC vs.
Revision 1.30 by root, Mon Sep 11 20:28:37 2006 UTC

…		…
1
2	/*
3	* static char *rcsid_object_c =
4	* "$Id: object.C,v 1.25 2006/09/11 01:16:20 root Exp $";
5	*/
6		1
7	/*	2	/*
8	CrossFire, A Multiplayer game for X-windows	3	CrossFire, A Multiplayer game for X-windows
9		4
10	Copyright (C) 2001 Mark Wedel & Crossfire Development Team	5	Copyright (C) 2001 Mark Wedel & Crossfire Development Team
29		24
30	/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.	25	/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
31	sub/add_weight will transcend the environment updating the carrying	26	sub/add_weight will transcend the environment updating the carrying
32	variable. */	27	variable. */
33	#include <global.h>	28	#include <global.h>
34	#ifndef WIN32 /* ---win32 exclude headers */
35	# include <stdio.h>	29	#include <stdio.h>
36	# include <sys/types.h>	30	#include <sys/types.h>
37	# include <sys/uio.h>	31	#include <sys/uio.h>
38	#endif /* win32 */
39	#include <object.h>	32	#include <object.h>
40	#include <funcpoint.h>	33	#include <funcpoint.h>
41	#include <skills.h>	34	#include <skills.h>
42	#include <loader.h>	35	#include <loader.h>
		36
43	int nrofallocobjects = 0;	37	int nrofallocobjects = 0;
44		38
45	object objects; / Pointer to the list of used objects */	39	object objects; / Pointer to the list of used objects */
46	object active_objects; / List of active objects that need to be processed */	40	object active_objects; / List of active objects that need to be processed */
47		41
…		…
214	if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && FABS ((ob1)->speed) > MIN_ACTIVE_SPEED)	208	if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && FABS ((ob1)->speed) > MIN_ACTIVE_SPEED)
215	return 0;	209	return 0;
216		210
217	switch (ob1->type)	211	switch (ob1->type)
218	{	212	{
219	case SCROLL:	213	case SCROLL:
220	if (ob1->level != ob2->level)	214	if (ob1->level != ob2->level)
221	return 0;	215	return 0;
222	break;	216	break;
223	}	217	}
224		218
225	if (ob1->key_values != NULL \|\| ob2->key_values != NULL)	219	if (ob1->key_values != NULL \|\| ob2->key_values != NULL)
226	{	220	{
227	/* At least one of these has key_values. */	221	/* At least one of these has key_values. */
…		…
249	/*	243	/*
250	* sum_weight() is a recursive function which calculates the weight	244	* sum_weight() is a recursive function which calculates the weight
251	* an object is carrying. It goes through in figures out how much	245	* an object is carrying. It goes through in figures out how much
252	* containers are carrying, and sums it up.	246	* containers are carrying, and sums it up.
253	*/	247	*/
254	signed long	248	long
255	sum_weight (object *op)	249	sum_weight (object *op)
256	{	250	{
257	signed long sum;	251	long sum;
258	object *inv;	252	object *inv;
259		253
260	for (sum = 0, inv = op->inv; inv != NULL; inv = inv->below)	254	for (sum = 0, inv = op->inv; inv != NULL; inv = inv->below)
261	{	255	{
262	if (inv->inv)	256	if (inv->inv)
…		…
449	* Changed 2004-02-12 - if the player is setting at the play again	443	* Changed 2004-02-12 - if the player is setting at the play again
450	* prompt, he is removed, and we don't want to treat him as an owner of	444	* prompt, he is removed, and we don't want to treat him as an owner of
451	* anything, so check removed flag. I don't expect that this should break	445	* anything, so check removed flag. I don't expect that this should break
452	* anything - once an object is removed, it is basically dead anyways.	446	* anything - once an object is removed, it is basically dead anyways.
453	*/	447	*/
454
455	object *	448	object *
456	get_owner (object *op)	449	object::get_owner ()
457	{	450	{
458	if (op->owner == NULL)	451	if (!owner
459	return NULL;	452	\|\| QUERY_FLAG (owner, FLAG_FREED)
		453	\|\| QUERY_FLAG (owner, FLAG_REMOVED))
		454	owner = 0;
460		455
461	if (!QUERY_FLAG (op->owner, FLAG_FREED) && !QUERY_FLAG (op->owner, FLAG_REMOVED) && op->owner->count == op->ownercount)
462	return op->owner;	456	return owner;
463
464	op->owner = NULL;
465	op->ownercount = 0;
466	return NULL;
467	}
468
469	void
470	clear_owner (object *op)
471	{
472	if (!op)
473	return;
474
475	if (op->owner && op->ownercount == op->owner->count)
476	op->owner->refcount--;
477
478	op->owner = NULL;
479	op->ownercount = 0;
480	}	457	}
481		458
482	/*	459	/*
483	* Sets the owner and sets the skill and exp pointers to owner's current	460	* Sets the owner and sets the skill and exp pointers to owner's current
484	* skill and experience objects.	461	* skill and experience objects.
485	*/	462	*/
486	void	463	void
487	set_owner (object op, object owner)	464	object::set_owner (object *owner)
488	{	465	{
489	if (owner == NULL \|\| op == NULL)	466	if (!owner)
490	return;	467	return;
491		468
492	/* next line added to allow objects which own objects */	469	/* next line added to allow objects which own objects */
493	/* Add a check for ownercounts in here, as I got into an endless loop	470	/* Add a check for ownercounts in here, as I got into an endless loop
494	* with the fireball owning a poison cloud which then owned the	471	* with the fireball owning a poison cloud which then owned the
495	* fireball. I believe that was caused by one of the objects getting	472	* fireball. I believe that was caused by one of the objects getting
496	* freed and then another object replacing it. Since the ownercounts	473	* freed and then another object replacing it. Since the ownercounts
497	* didn't match, this check is valid and I believe that cause is valid.	474	* didn't match, this check is valid and I believe that cause is valid.
498	*/	475	*/
499	while (owner->owner && owner != owner->owner && owner->ownercount == owner->owner->count)	476	while (owner->owner)
500	owner = owner->owner;	477	owner = owner->owner;
501		478
502	/* IF the owner still has an owner, we did not resolve to a final owner.
503	* so lets not add to that.
504	*/
505	if (owner->owner)
506	return;
507
508	op->owner = owner;	479	this->owner = owner;
509
510	op->ownercount = owner->count;
511	owner->refcount++;
512	}
513
514	/* Set the owner to clone's current owner and set the skill and experience
515	* objects to clone's objects (typically those objects that where the owner's
516	* current skill and experience objects at the time when clone's owner was
517	* set - not the owner's current skill and experience objects).
518	*
519	* Use this function if player created an object (e.g. fire bullet, swarm
520	* spell), and this object creates further objects whose kills should be
521	* accounted for the player's original skill, even if player has changed
522	* skills meanwhile.
523	*/
524	void
525	copy_owner (object op, object clone)
526	{
527	object *owner = get_owner (clone);
528
529	if (owner == NULL)
530	{
531	/* players don't have owners - they own themselves. Update
532	* as appropriate.
533	*/
534	if (clone->type == PLAYER)
535	owner = clone;
536	else
537	return;
538	}
539
540	set_owner (op, owner);
541	}	480	}
542		481
543	/* Zero the key_values on op, decrementing the shared-string	482	/* Zero the key_values on op, decrementing the shared-string
544	* refcounts and freeing the links.	483	* refcounts and freeing the links.
545	*/	484	*/
…		…
561	{	500	{
562	attachable_base::clear ();	501	attachable_base::clear ();
563		502
564	free_key_values (this);	503	free_key_values (this);
565		504
566	clear_owner (this);	505	owner = 0;
567
568	name = 0;	506	name = 0;
569	name_pl = 0;	507	name_pl = 0;
570	title = 0;	508	title = 0;
571	race = 0;	509	race = 0;
572	slaying = 0;	510	slaying = 0;
573	skill = 0;	511	skill = 0;
574	msg = 0;	512	msg = 0;
575	lore = 0;	513	lore = 0;
576	custom_name = 0;	514	custom_name = 0;
577	materialname = 0;	515	materialname = 0;
		516	contr = 0;
		517	below = 0;
		518	above = 0;
		519	inv = 0;
		520	container = 0;
		521	env = 0;
		522	more = 0;
		523	head = 0;
		524	map = 0;
		525	active_next = 0;
		526	active_prev = 0;
578		527
579	memset (static_cast < object_pod * >(this), 0, sizeof (object_pod));	528	memset (static_cast<object_pod *>(this), 0, sizeof (object_pod));
580		529
581	SET_FLAG (this, FLAG_REMOVED);	530	SET_FLAG (this, FLAG_REMOVED);
		531
		532	/* What is not cleared is next, prev, and count */
		533
		534	expmul = 1.0;
		535	face = blank_face;
		536	attacked_by_count = -1;
		537
		538	if (settings.casting_time)
		539	casting_time = -1;
582	}	540	}
583		541
584	void object::clone (object *destination)	542	void object::clone (object *destination)
585	{	543	{
586	(object_copy ) destination = *this;	544	(object_copy )destination = *this;
587	(object_pod ) destination = *this;	545	(object_pod )destination = *this;
588		546
589	if (self \|\| cb)	547	if (self \|\| cb)
590	INVOKE_OBJECT (CLONE, this, ARG_OBJECT (destination));	548	INVOKE_OBJECT (CLONE, this, ARG_OBJECT (destination));
591	}
592
593	/*
594	* clear_object() frees everything allocated by an object, and also
595	* clears all variables and flags to default settings.
596	*/
597
598	void
599	clear_object (object *op)
600	{
601	op->clear ();
602
603	op->contr = NULL;
604	op->below = NULL;
605	op->above = NULL;
606	op->inv = NULL;
607	op->container = NULL;
608	op->env = NULL;
609	op->more = NULL;
610	op->head = NULL;
611	op->map = NULL;
612	op->refcount = 0;
613	op->active_next = NULL;
614	op->active_prev = NULL;
615	/* What is not cleared is next, prev, and count */
616
617	op->expmul = 1.0;
618	op->face = blank_face;
619	op->attacked_by_count = -1;
620
621	if (settings.casting_time)
622	op->casting_time = -1;
623	}	549	}
624		550
625	/*	551	/*
626	* copy object first frees everything allocated by the second object,	552	* copy object first frees everything allocated by the second object,
627	* and then copies the contends of the first object into the second	553	* and then copies the contends of the first object into the second
628	* object, allocating what needs to be allocated. Basically, any	554	* object, allocating what needs to be allocated. Basically, any
629	* data that is malloc'd needs to be re-malloc/copied. Otherwise,	555	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
630	* if the first object is freed, the pointers in the new object	556	* if the first object is freed, the pointers in the new object
631	* will point at garbage.	557	* will point at garbage.
632	*/	558	*/
633
634	void	559	void
635	copy_object (object op2, object op)	560	copy_object (object op2, object op)
636	{	561	{
637	bool is_freed = QUERY_FLAG (op, FLAG_FREED);	562	bool is_freed = QUERY_FLAG (op, FLAG_FREED);
638	bool is_removed = QUERY_FLAG (op, FLAG_REMOVED);	563	bool is_removed = QUERY_FLAG (op, FLAG_REMOVED);
…		…
891	/* if the object is being removed, we can't make intelligent	816	/* if the object is being removed, we can't make intelligent
892	* decisions, because remove_ob can't really pass the object	817	* decisions, because remove_ob can't really pass the object
893	* that is being removed.	818	* that is being removed.
894	*/	819	*/
895	else if (action == UP_OBJ_CHANGE \|\| action == UP_OBJ_REMOVE)	820	else if (action == UP_OBJ_CHANGE \|\| action == UP_OBJ_REMOVE)
896	{
897	update_now = 1;	821	update_now = 1;
898	}
899	else if (action == UP_OBJ_FACE)	822	else if (action == UP_OBJ_FACE)
900	{
901	/* Nothing to do for that case */	823	/* Nothing to do for that case */ ;
902	}
903	else	824	else
904	{
905	LOG (llevError, "update_object called with invalid action: %d\n", action);	825	LOG (llevError, "update_object called with invalid action: %d\n", action);
906	}
907		826
908	if (update_now)	827	if (update_now)
909	{	828	{
910	SET_MAP_FLAGS (op->map, op->x, op->y, flags \| P_NO_ERROR \| P_NEED_UPDATE);	829	SET_MAP_FLAGS (op->map, op->x, op->y, flags \| P_NO_ERROR \| P_NEED_UPDATE);
911	update_position (op->map, op->x, op->y);	830	update_position (op->map, op->x, op->y);
…		…
918	static unordered_vector<object *> mortals;	837	static unordered_vector<object *> mortals;
919	static std::vector<object *> freed;	838	static std::vector<object *> freed;
920		839
921	void object::free_mortals ()	840	void object::free_mortals ()
922	{	841	{
923	for (unordered_vector<object *>::iterator i = mortals.begin (); i != mortals.end (); )	842	for (unordered_vector<object *>::iterator i = mortals.begin (); i != mortals.end ();)
924	if (!(*i)->refcount)	843	if ((*i)->refcnt)
		844	++i; // further delay freeing
		845	else
925	{	846	{
926	freed.push_back (*i);	847	freed.push_back (*i);//D
		848	//delete *i;
927	mortals.erase (i);	849	mortals.erase (i);
928	}	850	}
929	else	851
930	++i;	852	if (mortals.size())//D
		853	LOG (llevDebug, "%d objects in mortal queue\n", mortals.size());//D
931	}	854	}
932		855
933	object::object ()	856	object::object ()
934	{	857	{
935	SET_FLAG (this, FLAG_REMOVED);	858	SET_FLAG (this, FLAG_REMOVED);
…		…
978	objects = next;	901	objects = next;
979	}	902	}
980		903
981	object *object::create ()	904	object *object::create ()
982	{	905	{
983	object *op;	906	object *
		907	op;
984		908
985	if (freed.empty ())	909	if (freed.empty ())
986	op = new object;	910	op = new object;
987	else	911	else
988	{	912	{
989	// highly annoying, but the only way to get it stable right now	913	// highly annoying, but the only way to get it stable right now
990	op = freed.back (); freed.pop_back ();	914	op = freed.back ();
		915	freed.pop_back ();
991	op->~object ();	916	op->~object ();
992	new ((void *)op) object;	917	new ((void *) op) object;
993	}	918	}
994		919
995	op->link ();	920	op->link ();
996	return op;	921	return op;
997	}	922	}
…		…
1006	* If free_inventory is set, free inventory as well. Else drop items in	931	* If free_inventory is set, free inventory as well. Else drop items in
1007	* inventory to the ground.	932	* inventory to the ground.
1008	*/	933	*/
1009	void object::free (bool free_inventory)	934	void object::free (bool free_inventory)
1010	{	935	{
		936	if (QUERY_FLAG (this, FLAG_FREED))
		937	return;
		938
1011	if (!QUERY_FLAG (this, FLAG_REMOVED))	939	if (!QUERY_FLAG (this, FLAG_REMOVED))
1012	{	940	remove_ob (this);
1013	LOG (llevDebug, "Free object called with non removed object\n");
1014	dump_object (this);
1015	#ifdef MANY_CORES
1016	abort ();
1017	#endif
1018	}
1019		941
1020	if (QUERY_FLAG (this, FLAG_FRIENDLY))	942	if (QUERY_FLAG (this, FLAG_FRIENDLY))
1021	{
1022	LOG (llevMonster, "Warning: tried to free friendly object.\n");
1023	remove_friendly_object (this);	943	remove_friendly_object (this);
1024	}
1025		944
1026	if (QUERY_FLAG (this, FLAG_FREED))	945	SET_FLAG (this, FLAG_FREED);
1027	{
1028	dump_object (this);
1029	LOG (llevError, "Trying to free freed object.\n%s\n", errmsg);
1030	return;
1031	}
1032		946
1033	if (more)	947	if (more)
1034	{	948	{
1035	more->free (free_inventory);	949	more->free (free_inventory);
1036	more = 0;	950	more = 0;
…		…
1042	* if some form of movement is allowed, let objects	956	* if some form of movement is allowed, let objects
1043	* drop on that space.	957	* drop on that space.
1044	*/	958	*/
1045	if (free_inventory \|\| !map \|\| map->in_memory != MAP_IN_MEMORY \|\| (GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL))	959	if (free_inventory \|\| !map \|\| map->in_memory != MAP_IN_MEMORY \|\| (GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL))
1046	{	960	{
1047	object *	961	object *op = inv;
1048	op = inv;
1049		962
1050	while (op)	963	while (op)
1051	{	964	{
1052	object *
1053	tmp = op->below;	965	object *tmp = op->below;
1054
1055	remove_ob (op);
1056	op->free (free_inventory);	966	op->free (free_inventory);
1057	op = tmp;	967	op = tmp;
1058	}	968	}
1059	}	969	}
1060	else	970	else
1061	{ /* Put objects in inventory onto this space */	971	{ /* Put objects in inventory onto this space */
1062	object *	972	object *op = inv;
1063	op = inv;
1064		973
1065	while (op)	974	while (op)
1066	{	975	{
1067	object *
1068	tmp = op->below;	976	object *tmp = op->below;
1069		977
1070	remove_ob (op);	978	remove_ob (op);
1071		979
1072	if (QUERY_FLAG (op, FLAG_STARTEQUIP)	980	if (QUERY_FLAG (op, FLAG_STARTEQUIP)
1073	\|\| QUERY_FLAG (op, FLAG_NO_DROP) \|\| op->type == RUNE \|\| op->type == TRAP \|\| QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))	981	\|\| QUERY_FLAG (op, FLAG_NO_DROP) \|\| op->type == RUNE \|\| op->type == TRAP \|\| QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
…		…
1082	op = tmp;	990	op = tmp;
1083	}	991	}
1084	}	992	}
1085	}	993	}
1086		994
1087	clear_owner (this);	995	owner = 0;
1088		996
1089	/* Remove object from the active list */	997	/* Remove object from the active list */
1090	speed = 0;	998	speed = 0;
1091	update_ob_speed (this);	999	update_ob_speed (this);
1092		1000
1093	unlink ();	1001	unlink ();
1094
1095	SET_FLAG (this, FLAG_FREED);
1096		1002
1097	mortals.push_back (this);	1003	mortals.push_back (this);
1098	}	1004	}
1099		1005
1100	/*	1006	/*
…		…
1131	object *	1037	object *
1132	tmp, *	1038	tmp, *
1133	last = NULL;	1039	last = NULL;
1134	object *	1040	object *
1135	otmp;	1041	otmp;
		1042
1136	tag_t	1043	tag_t
1137	tag;	1044	tag;
1138	int	1045	int
1139	check_walk_off;	1046	check_walk_off;
1140	mapstruct *	1047	mapstruct *
1141	m;	1048	m;
		1049
1142	sint16	1050	sint16
1143	x,	1051	x,
1144	y;	1052	y;
1145		1053
1146
1147	if (QUERY_FLAG (op, FLAG_REMOVED))	1054	if (QUERY_FLAG (op, FLAG_REMOVED))
1148	{	1055	return;
1149	dump_object (op);
1150	LOG (llevError, "Trying to remove removed object.\n%s\n", errmsg);
1151		1056
1152	/* Changed it to always dump core in this case. As has been learned	1057	SET_FLAG (op, FLAG_REMOVED);
1153	* in the past, trying to recover from errors almost always	1058
1154	* make things worse, and this is a real error here - something
1155	* that should not happen.
1156	* Yes, if this was a mission critical app, trying to do something
1157	* to recover may make sense, but that is because failure of the app
1158	* may have other disastrous problems. Cf runs out of a script
1159	* so is easily enough restarted without any real problems.
1160	* MSW 2001-07-01
1161	*/
1162	abort ();
1163	}
1164	if (op->more != NULL)	1059	if (op->more != NULL)
1165	remove_ob (op->more);	1060	remove_ob (op->more);
1166
1167	SET_FLAG (op, FLAG_REMOVED);
1168		1061
1169	/*	1062	/*
1170	* In this case, the object to be removed is in someones	1063	* In this case, the object to be removed is in someones
1171	* inventory.	1064	* inventory.
1172	*/	1065	*/
…		…
1198	*/	1091	*/
1199	op->x = op->env->x, op->y = op->env->y;	1092	op->x = op->env->x, op->y = op->env->y;
1200	op->map = op->env->map;	1093	op->map = op->env->map;
1201	op->above = NULL, op->below = NULL;	1094	op->above = NULL, op->below = NULL;
1202	op->env = NULL;	1095	op->env = NULL;
1203	return;	1096	}
		1097	else if (op->map)
1204	}	1098	{
1205
1206	/* If we get here, we are removing it from a map */
1207	if (op->map == NULL)
1208	return;
1209
1210	x = op->x;	1099	x = op->x;
1211	y = op->y;	1100	y = op->y;
1212	m = get_map_from_coord (op->map, &x, &y);	1101	m = get_map_from_coord (op->map, &x, &y);
1213		1102
1214	if (!m)	1103	if (!m)
1215	{	1104	{
1216	LOG (llevError, "remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n",	1105	LOG (llevError, "remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n",
1217	op->map->path, op->x, op->y);	1106	op->map->path, op->x, op->y);
1218	/* in old days, we used to set x and y to 0 and continue.	1107	/* in old days, we used to set x and y to 0 and continue.
1219	* it seems if we get into this case, something is probablye	1108	* it seems if we get into this case, something is probablye
1220	* screwed up and should be fixed.	1109	* screwed up and should be fixed.
		1110	*/
		1111	abort ();
		1112	}
		1113
		1114	if (op->map != m)
		1115	LOG (llevDebug, "remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n",
		1116	op->map->path, m->path, op->x, op->y, x, y);
		1117
		1118	/* Re did the following section of code - it looks like it had
		1119	* lots of logic for things we no longer care about
1221	*/	1120	*/
1222	abort ();
1223	}
1224	if (op->map != m)
1225	{
1226	LOG (llevDebug, "remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n",
1227	op->map->path, m->path, op->x, op->y, x, y);
1228	}
1229		1121
1230	/* Re did the following section of code - it looks like it had
1231	* lots of logic for things we no longer care about
1232	*/
1233
1234	/* link the object above us */	1122	/* link the object above us */
1235	if (op->above)	1123	if (op->above)
1236	op->above->below = op->below;	1124	op->above->below = op->below;
1237	else	1125	else
1238	SET_MAP_TOP (m, x, y, op->below); /* we were top, set new top */	1126	SET_MAP_TOP (m, x, y, op->below); /* we were top, set new top */
1239		1127
1240	/* Relink the object below us, if there is one */	1128	/* Relink the object below us, if there is one */
1241	if (op->below)	1129	if (op->below)
1242	{
1243	op->below->above = op->above;	1130	op->below->above = op->above;
1244	}
1245	else	1131	else
1246	{	1132	{
1247	/* Nothing below, which means we need to relink map object for this space	1133	/* Nothing below, which means we need to relink map object for this space
1248	* use translated coordinates in case some oddness with map tiling is	1134	* use translated coordinates in case some oddness with map tiling is
1249	* evident	1135	* evident
1250	*/
1251	if (GET_MAP_OB (m, x, y) != op)
1252	{
1253	dump_object (op);
1254	LOG (llevError, "remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom?\n%s\n",
1255	errmsg);
1256	dump_object (GET_MAP_OB (m, x, y));
1257	LOG (llevError, "%s\n", errmsg);
1258	}
1259	SET_MAP_OB (m, x, y, op->above); /* goes on above it. */
1260	}
1261	op->above = NULL;
1262	op->below = NULL;
1263
1264	if (op->map->in_memory == MAP_SAVING)
1265	return;
1266
1267	tag = op->count;
1268	check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY);
1269	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)
1270	{
1271	/* No point updating the players look faces if he is the object
1272	* being removed.
1273	*/
1274
1275	if (tmp->type == PLAYER && tmp != op)
1276	{
1277	/* If a container that the player is currently using somehow gets
1278	* removed (most likely destroyed), update the player view
1279	* appropriately.
1280	*/	1136	*/
1281	if (tmp->container == op)	1137	if (GET_MAP_OB (m, x, y) != op)
1282	{	1138	{
1283	CLEAR_FLAG (op, FLAG_APPLIED);	1139	dump_object (op);
1284	tmp->container = NULL;	1140	LOG (llevError,
		1141	"remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom?\n%s\n", errmsg);
		1142	dump_object (GET_MAP_OB (m, x, y));
		1143	LOG (llevError, "%s\n", errmsg);
1285	}	1144	}
1286	tmp->contr->socket.update_look = 1;	1145
1287	}	1146	SET_MAP_OB (m, x, y, op->above); /* goes on above it. */
1288	/* See if player moving off should effect something */
1289	if (check_walk_off && ((op->move_type & tmp->move_off) && (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1290	{	1147	}
1291		1148
1292	move_apply (tmp, op, NULL);	1149	op->above = 0;
1293	if (was_destroyed (op, tag))	1150	op->below = 0;
		1151
		1152	if (op->map->in_memory == MAP_SAVING)
		1153	return;
		1154
		1155	tag = op->count;
		1156	check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY);
		1157
		1158	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)
		1159	{
		1160	/* No point updating the players look faces if he is the object
		1161	* being removed.
		1162	*/
		1163
		1164	if (tmp->type == PLAYER && tmp != op)
1294	{	1165	{
1295	LOG (llevError, "BUG: remove_ob(): name %s, archname %s destroyed " "leaving object\n", &tmp->name, &tmp->arch->name);	1166	/* If a container that the player is currently using somehow gets
		1167	* removed (most likely destroyed), update the player view
		1168	* appropriately.
		1169	*/
		1170	if (tmp->container == op)
		1171	{
		1172	CLEAR_FLAG (op, FLAG_APPLIED);
		1173	tmp->container = NULL;
		1174	}
		1175
		1176	tmp->contr->socket.update_look = 1;
1296	}	1177	}
		1178
		1179	/* See if player moving off should effect something */
		1180	if (check_walk_off && ((op->move_type & tmp->move_off) && (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0))
		1181	{
		1182	move_apply (tmp, op, NULL);
		1183
		1184	if (was_destroyed (op, tag))
		1185	{
		1186	LOG (llevError, "BUG: remove_ob(): name %s, archname %s destroyed " "leaving object\n", &tmp->name, &tmp->arch->name);
		1187	}
1297	}	1188	}
1298		1189
1299	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */	1190	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1300		1191
1301	if (tmp->above == tmp)	1192	if (tmp->above == tmp)
1302	tmp->above = NULL;	1193	tmp->above = NULL;
		1194
1303	last = tmp;	1195	last = tmp;
1304	}	1196	}
		1197
1305	/* last == NULL of there are no objects on this space */	1198	/* last == NULL of there are no objects on this space */
1306	if (last == NULL)	1199	if (last == NULL)
1307	{	1200	{
1308	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,	1201	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1309	* we could preserve the flags (GET_MAP_FLAGS), but update_position figures	1202	* we could preserve the flags (GET_MAP_FLAGS), but update_position figures
1310	* those out anyways, and if there are any flags set right now, they won't	1203	* those out anyways, and if there are any flags set right now, they won't
1311	* be correct anyways.	1204	* be correct anyways.
1312	*/	1205	*/
1313	SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE);	1206	SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE);
1314	update_position (op->map, op->x, op->y);	1207	update_position (op->map, op->x, op->y);
1315	}	1208	}
1316	else	1209	else
1317	update_object (last, UP_OBJ_REMOVE);	1210	update_object (last, UP_OBJ_REMOVE);
1318		1211
1319	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) \|\| (op->glow_radius != 0))	1212	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) \|\| (op->glow_radius != 0))
1320	update_all_los (op->map, op->x, op->y);	1213	update_all_los (op->map, op->x, op->y);
1321		1214	}
1322	}	1215	}
1323		1216
1324	/*	1217	/*
1325	* merge_ob(op,top):	1218	* merge_ob(op,top):
1326	*	1219	*
…		…
1333	object *	1226	object *
1334	merge_ob (object op, object top)	1227	merge_ob (object op, object top)
1335	{	1228	{
1336	if (!op->nrof)	1229	if (!op->nrof)
1337	return 0;	1230	return 0;
		1231
1338	if (top == NULL)	1232	if (top == NULL)
1339	for (top = op; top != NULL && top->above != NULL; top = top->above);	1233	for (top = op; top != NULL && top->above != NULL; top = top->above);
		1234
1340	for (; top != NULL; top = top->below)	1235	for (; top != NULL; top = top->below)
1341	{	1236	{
1342	if (top == op)	1237	if (top == op)
1343	continue;	1238	continue;
1344	if (CAN_MERGE (op, top))	1239	if (CAN_MERGE (op, top))
…		…
1350	remove_ob (op);	1245	remove_ob (op);
1351	free_object (op);	1246	free_object (op);
1352	return top;	1247	return top;
1353	}	1248	}
1354	}	1249	}
		1250
1355	return NULL;	1251	return NULL;
1356	}	1252	}
1357		1253
1358	/*	1254	/*
1359	* same as insert_ob_in_map except it handle separate coordinates and do a clean	1255	* same as insert_ob_in_map except it handle separate coordinates and do a clean
1360	* job preparing multi-part monsters	1256	* job preparing multi-part monsters
1361	*/	1257	*/
1362	object *	1258	object *
1363	insert_ob_in_map_at (object op, mapstruct m, object *originator, int flag, int x, int y)	1259	insert_ob_in_map_at (object op, mapstruct m, object *originator, int flag, int x, int y)
1364	{	1260	{
1365	object *	1261	object *tmp;
1366	tmp;
1367		1262
1368	if (op->head)	1263	if (op->head)
1369	op = op->head;	1264	op = op->head;
		1265
1370	for (tmp = op; tmp; tmp = tmp->more)	1266	for (tmp = op; tmp; tmp = tmp->more)
1371	{	1267	{
1372	tmp->x = x + tmp->arch->clone.x;	1268	tmp->x = x + tmp->arch->clone.x;
1373	tmp->y = y + tmp->arch->clone.y;	1269	tmp->y = y + tmp->arch->clone.y;
1374	}	1270	}
		1271
1375	return insert_ob_in_map (op, m, originator, flag);	1272	return insert_ob_in_map (op, m, originator, flag);
1376	}	1273	}
1377		1274
1378	/*	1275	/*
1379	* insert_ob_in_map (op, map, originator, flag):	1276	* insert_ob_in_map (op, map, originator, flag):
…		…
1438		1335
1439	if (op->more != NULL)	1336	if (op->more != NULL)
1440	{	1337	{
1441	/* The part may be on a different map. */	1338	/* The part may be on a different map. */
1442		1339
1443	object *
1444	more = op->more;	1340	object *more = op->more;
1445		1341
1446	/* We really need the caller to normalize coordinates - if	1342	/* We really need the caller to normalize coordinates - if
1447	* we set the map, that doesn't work if the location is within	1343	* we set the map, that doesn't work if the location is within
1448	* a map and this is straddling an edge. So only if coordinate	1344	* a map and this is straddling an edge. So only if coordinate
1449	* is clear wrong do we normalize it.	1345	* is clear wrong do we normalize it.
1450	*/	1346	*/
1451	if (OUT_OF_REAL_MAP (more->map, more->x, more->y))	1347	if (OUT_OF_REAL_MAP (more->map, more->x, more->y))
1452	{
1453	more->map = get_map_from_coord (m, &more->x, &more->y);	1348	more->map = get_map_from_coord (m, &more->x, &more->y);
1454	}
1455	else if (!more->map)	1349	else if (!more->map)
1456	{	1350	{
1457	/* For backwards compatibility - when not dealing with tiled maps,	1351	/* For backwards compatibility - when not dealing with tiled maps,
1458	* more->map should always point to the parent.	1352	* more->map should always point to the parent.
1459	*/	1353	*/
…		…
1462		1356
1463	if (insert_ob_in_map (more, more->map, originator, flag) == NULL)	1357	if (insert_ob_in_map (more, more->map, originator, flag) == NULL)
1464	{	1358	{
1465	if (!op->head)	1359	if (!op->head)
1466	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");	1360	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
		1361
1467	return NULL;	1362	return NULL;
1468	}	1363	}
1469	}	1364	}
1470		1365
1471	CLEAR_FLAG (op, FLAG_REMOVED);	1366	CLEAR_FLAG (op, FLAG_REMOVED);
…		…
1536		1431
1537	while (top != NULL)	1432	while (top != NULL)
1538	{	1433	{
1539	if (QUERY_FLAG (top, FLAG_IS_FLOOR) \|\| QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))	1434	if (QUERY_FLAG (top, FLAG_IS_FLOOR) \|\| QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))
1540	floor = top;	1435	floor = top;
		1436
1541	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW \| MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))	1437	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW \| MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))
1542	{	1438	{
1543	/* We insert above top, so we want this object below this */	1439	/* We insert above top, so we want this object below this */
1544	top = top->below;	1440	top = top->below;
1545	break;	1441	break;
1546	}	1442	}
		1443
1547	last = top;	1444	last = top;
1548	top = top->above;	1445	top = top->above;
1549	}	1446	}
		1447
1550	/* Don't want top to be NULL, so set it to the last valid object */	1448	/* Don't want top to be NULL, so set it to the last valid object */
1551	top = last;	1449	top = last;
1552		1450
1553	/* We let update_position deal with figuring out what the space	1451	/* We let update_position deal with figuring out what the space
1554	* looks like instead of lots of conditions here.	1452	* looks like instead of lots of conditions here.
…		…
1633	* of effect may be sufficient.	1531	* of effect may be sufficient.
1634	*/	1532	*/
1635	if (MAP_DARKNESS (op->map) && (op->glow_radius != 0))	1533	if (MAP_DARKNESS (op->map) && (op->glow_radius != 0))
1636	update_all_los (op->map, op->x, op->y);	1534	update_all_los (op->map, op->x, op->y);
1637		1535
1638
1639	/* updates flags (blocked, alive, no magic, etc) for this map space */	1536	/* updates flags (blocked, alive, no magic, etc) for this map space */
1640	update_object (op, UP_OBJ_INSERT);	1537	update_object (op, UP_OBJ_INSERT);
1641
1642		1538
1643	/* Don't know if moving this to the end will break anything. However,	1539	/* Don't know if moving this to the end will break anything. However,
1644	* we want to have update_look set above before calling this.	1540	* we want to have update_look set above before calling this.
1645	*	1541	*
1646	* check_move_on() must be after this because code called from	1542	* check_move_on() must be after this because code called from
…		…
1671	* op is the object to insert it under: supplies x and the map.	1567	* op is the object to insert it under: supplies x and the map.
1672	*/	1568	*/
1673	void	1569	void
1674	replace_insert_ob_in_map (const char arch_string, object op)	1570	replace_insert_ob_in_map (const char arch_string, object op)
1675	{	1571	{
1676	object *tmp;	1572	object *
		1573	tmp;
1677	object *tmp1;	1574	object *
		1575	tmp1;
1678		1576
1679	/* first search for itself and remove any old instances */	1577	/* first search for itself and remove any old instances */
1680		1578
1681	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1579	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
1682	{	1580	{
…		…
1713	if (orig_ob->nrof < nr)	1611	if (orig_ob->nrof < nr)
1714	{	1612	{
1715	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);	1613	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1716	return NULL;	1614	return NULL;
1717	}	1615	}
		1616
1718	newob = object_create_clone (orig_ob);	1617	newob = object_create_clone (orig_ob);
		1618
1719	if ((orig_ob->nrof -= nr) < 1)	1619	if ((orig_ob->nrof -= nr) < 1)
1720	{	1620	{
1721	if (!is_removed)	1621	if (!is_removed)
1722	remove_ob (orig_ob);	1622	remove_ob (orig_ob);
1723	free_object2 (orig_ob, 1);	1623	free_object2 (orig_ob, 1);
…		…
1731	strcpy (errmsg, "Tried to split object whose map is not in memory.");	1631	strcpy (errmsg, "Tried to split object whose map is not in memory.");
1732	LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n");	1632	LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n");
1733	return NULL;	1633	return NULL;
1734	}	1634	}
1735	}	1635	}
		1636
1736	newob->nrof = nr;	1637	newob->nrof = nr;
1737		1638
1738	return newob;	1639	return newob;
1739	}	1640	}
1740		1641
…		…
1747	*/	1648	*/
1748		1649
1749	object *	1650	object *
1750	decrease_ob_nr (object *op, uint32 i)	1651	decrease_ob_nr (object *op, uint32 i)
1751	{	1652	{
1752	object *	1653	object *tmp;
1753	tmp;
1754	player *	1654	player *pl;
1755	pl;
1756		1655
1757	if (i == 0) /* objects with op->nrof require this check */	1656	if (i == 0) /* objects with op->nrof require this check */
1758	return op;	1657	return op;
1759		1658
1760	if (i > op->nrof)	1659	if (i > op->nrof)
1761	i = op->nrof;	1660	i = op->nrof;
1762		1661
1763	if (QUERY_FLAG (op, FLAG_REMOVED))	1662	if (QUERY_FLAG (op, FLAG_REMOVED))
1764	{
1765	op->nrof -= i;	1663	op->nrof -= i;
1766	}
1767	else if (op->env != NULL)	1664	else if (op->env != NULL)
1768	{	1665	{
1769	/* is this object in the players inventory, or sub container	1666	/* is this object in the players inventory, or sub container
1770	* therein?	1667	* therein?
1771	*/	1668	*/
…		…
1806	}	1703	}
1807	}	1704	}
1808	}	1705	}
1809	else	1706	else
1810	{	1707	{
1811	object *
1812	above = op->above;	1708	object *above = op->above;
1813		1709
1814	if (i < op->nrof)	1710	if (i < op->nrof)
1815	{
1816	op->nrof -= i;	1711	op->nrof -= i;
1817	}
1818	else	1712	else
1819	{	1713	{
1820	remove_ob (op);	1714	remove_ob (op);
1821	op->nrof = 0;	1715	op->nrof = 0;
1822	}	1716	}
		1717
1823	/* Since we just removed op, op->above is null */	1718	/* Since we just removed op, op->above is null */
1824	for (tmp = above; tmp != NULL; tmp = tmp->above)	1719	for (tmp = above; tmp != NULL; tmp = tmp->above)
1825	if (tmp->type == PLAYER)	1720	if (tmp->type == PLAYER)
1826	{	1721	{
1827	if (op->nrof)	1722	if (op->nrof)
…		…
1830	esrv_del_item (tmp->contr, op->count);	1725	esrv_del_item (tmp->contr, op->count);
1831	}	1726	}
1832	}	1727	}
1833		1728
1834	if (op->nrof)	1729	if (op->nrof)
1835	{
1836	return op;	1730	return op;
1837	}
1838	else	1731	else
1839	{	1732	{
1840	free_object (op);	1733	free_object (op);
1841	return NULL;	1734	return NULL;
1842	}	1735	}
…		…
1851	add_weight (object *op, signed long weight)	1744	add_weight (object *op, signed long weight)
1852	{	1745	{
1853	while (op != NULL)	1746	while (op != NULL)
1854	{	1747	{
1855	if (op->type == CONTAINER)	1748	if (op->type == CONTAINER)
1856	{
1857	weight = (signed long) (weight * (100 - op->stats.Str) / 100);	1749	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1858	}	1750
1859	op->carrying += weight;	1751	op->carrying += weight;
1860	op = op->env;	1752	op = op->env;
1861	}	1753	}
1862	}	1754	}
1863		1755
…		…
1886	{	1778	{
1887	dump_object (op);	1779	dump_object (op);
1888	LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", errmsg);	1780	LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", errmsg);
1889	return op;	1781	return op;
1890	}	1782	}
		1783
1891	if (where == NULL)	1784	if (where == NULL)
1892	{	1785	{
1893	dump_object (op);	1786	dump_object (op);
1894	LOG (llevError, "Trying to put object in NULL.\n%s\n", errmsg);	1787	LOG (llevError, "Trying to put object in NULL.\n%s\n", errmsg);
1895	return op;	1788	return op;
1896	}	1789	}
		1790
1897	if (where->head)	1791	if (where->head)
1898	{	1792	{
1899	LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n");	1793	LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n");
1900	where = where->head;	1794	where = where->head;
1901	}	1795	}
		1796
1902	if (op->more)	1797	if (op->more)
1903	{	1798	{
1904	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);	1799	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1905	return op;	1800	return op;
1906	}	1801	}
		1802
1907	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1803	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1908	CLEAR_FLAG (op, FLAG_REMOVED);	1804	CLEAR_FLAG (op, FLAG_REMOVED);
1909	if (op->nrof)	1805	if (op->nrof)
1910	{	1806	{
1911	for (tmp = where->inv; tmp != NULL; tmp = tmp->below)	1807	for (tmp = where->inv; tmp != NULL; tmp = tmp->below)
…		…
2004	tag;	1900	tag;
2005	mapstruct *	1901	mapstruct *
2006	m = op->map;	1902	m = op->map;
2007	int	1903	int
2008	x = op->x, y = op->y;	1904	x = op->x, y = op->y;
		1905
2009	MoveType	1906	MoveType
2010	move_on,	1907	move_on,
2011	move_slow,	1908	move_slow,
2012	move_block;	1909	move_block;
2013		1910
…		…
2047	* we don't need to check all of them.	1944	* we don't need to check all of them.
2048	*/	1945	*/
2049	if ((tmp->move_type & MOVE_FLY_LOW) && QUERY_FLAG (tmp, FLAG_NO_PICK))	1946	if ((tmp->move_type & MOVE_FLY_LOW) && QUERY_FLAG (tmp, FLAG_NO_PICK))
2050	break;	1947	break;
2051	}	1948	}
		1949
2052	for (; tmp != NULL; tmp = tmp->below)	1950	for (; tmp; tmp = tmp->below)
2053	{	1951	{
2054	if (tmp == op)	1952	if (tmp == op)
2055	continue; /* Can't apply yourself */	1953	continue; /* Can't apply yourself */
2056		1954
2057	/* Check to see if one of the movement types should be slowed down.	1955	/* Check to see if one of the movement types should be slowed down.
…		…
2065	if ((!op->move_type && tmp->move_slow & MOVE_WALK) \|\|	1963	if ((!op->move_type && tmp->move_slow & MOVE_WALK) \|\|
2066	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))	1964	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
2067	{	1965	{
2068		1966
2069	float	1967	float
2070	diff;
2071
2072	diff = tmp->move_slow_penalty * FABS (op->speed);	1968	diff = tmp->move_slow_penalty * FABS (op->speed);
		1969
2073	if (op->type == PLAYER)	1970	if (op->type == PLAYER)
2074	{
2075	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) \|\|	1971	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) \|\|
2076	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))	1972	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))
2077	{
2078	diff /= 4.0;	1973	diff /= 4.0;
2079	}	1974
2080	}
2081	op->speed_left -= diff;	1975	op->speed_left -= diff;
2082	}	1976	}
2083	}	1977	}
2084		1978
2085	/* Basically same logic as above, except now for actual apply. */	1979	/* Basically same logic as above, except now for actual apply. */
2086	if ((!op->move_type && tmp->move_on & MOVE_WALK) \|\|	1980	if ((!op->move_type && tmp->move_on & MOVE_WALK) \|\|
2087	((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))	1981	((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))
2088	{	1982	{
2089
2090	move_apply (tmp, op, originator);	1983	move_apply (tmp, op, originator);
		1984
2091	if (was_destroyed (op, tag))	1985	if (was_destroyed (op, tag))
2092	return 1;	1986	return 1;
2093		1987
2094	/* what the person/creature stepped onto has moved the object	1988	/* what the person/creature stepped onto has moved the object
2095	* someplace new. Don't process any further - if we did,	1989	* someplace new. Don't process any further - if we did,
…		…
2097	*/	1991	*/
2098	if (op->map != m \|\| op->x != x \|\| op->y != y)	1992	if (op->map != m \|\| op->x != x \|\| op->y != y)
2099	return 0;	1993	return 0;
2100	}	1994	}
2101	}	1995	}
		1996
2102	return 0;	1997	return 0;
2103	}	1998	}
2104		1999
2105	/*	2000	/*
2106	* present_arch(arch, map, x, y) searches for any objects with	2001	* present_arch(arch, map, x, y) searches for any objects with
…		…
2397	find_dir (mapstruct m, int x, int y, object exclude)	2292	find_dir (mapstruct m, int x, int y, object exclude)
2398	{	2293	{
2399	int	2294	int
2400	i,	2295	i,
2401	max = SIZEOFFREE, mflags;	2296	max = SIZEOFFREE, mflags;
2402	sint16	2297
2403	nx,	2298	sint16 nx, ny;
2404	ny;
2405	object *	2299	object *
2406	tmp;	2300	tmp;
2407	mapstruct *	2301	mapstruct *
2408	mp;	2302	mp;
2409	MoveType	2303
2410	blocked,	2304	MoveType blocked, move_type;
2411	move_type;
2412		2305
2413	if (exclude && exclude->head)	2306	if (exclude && exclude->head)
2414	{	2307	{
2415	exclude = exclude->head;	2308	exclude = exclude->head;
2416	move_type = exclude->move_type;	2309	move_type = exclude->move_type;
…		…
2623		2516
2624		2517
2625	int	2518	int
2626	can_see_monsterP (mapstruct *m, int x, int y, int dir)	2519	can_see_monsterP (mapstruct *m, int x, int y, int dir)
2627	{	2520	{
2628	sint16	2521	sint16 dx, dy;
2629	dx,
2630	dy;
2631	int	2522	int
2632	mflags;	2523	mflags;
2633		2524
2634	if (dir < 0)	2525	if (dir < 0)
2635	return 0; /* exit condition: invalid direction */	2526	return 0; /* exit condition: invalid direction */
…		…
2766	fprintf (tempfile, obstr);	2657	fprintf (tempfile, obstr);
2767	fclose (tempfile);	2658	fclose (tempfile);
2768		2659
2769	op = get_object ();	2660	op = get_object ();
2770		2661
2771	object_thawer	2662	object_thawer thawer (filename);
2772	thawer (filename);
2773		2663
2774	if (thawer)	2664	if (thawer)
2775	load_object (thawer, op, 0);	2665	load_object (thawer, op, 0);
2776		2666
2777	LOG (llevDebug, " load str completed, object=%s\n", &op->name);	2667	LOG (llevDebug, " load str completed, object=%s\n", &op->name);
…		…
2901	if (last)	2791	if (last)
2902	last->next = field->next;	2792	last->next = field->next;
2903	else	2793	else
2904	op->key_values = field->next;	2794	op->key_values = field->next;
2905		2795
2906	delete
2907	field;	2796	delete field;
2908	}	2797	}
2909	}	2798	}
2910	return TRUE;	2799	return TRUE;
2911	}	2800	}
2912	/* IF we get here, key doesn't exist */	2801	/* IF we get here, key doesn't exist */
…		…
2947	* Returns TRUE on success.	2836	* Returns TRUE on success.
2948	*/	2837	*/
2949	int	2838	int
2950	set_ob_key_value (object op, const char key, const char *value, int add_key)	2839	set_ob_key_value (object op, const char key, const char *value, int add_key)
2951	{	2840	{
2952	shstr
2953	key_ (key);	2841	shstr key_ (key);
2954		2842
2955	return set_ob_key_value_s (op, key_, value, add_key);	2843	return set_ob_key_value_s (op, key_, value, add_key);
2956	}	2844	}

Diff Legend

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

Comparing deliantra/server/common/object.C (file contents): Revision 1.25 by root, Mon Sep 11 01:16:20 2006 UTC vs. Revision 1.30 by root, Mon Sep 11 20:28:37 2006 UTC

Diff Legend

Comparing deliantra/server/common/object.C (file contents):
Revision 1.25 by root, Mon Sep 11 01:16:20 2006 UTC vs.
Revision 1.30 by root, Mon Sep 11 20:28:37 2006 UTC