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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.208 by root, Mon Apr 21 06:16:01 2008 UTC vs.
Revision 1.241 by root, Wed May 7 19:19:09 2008 UTC

…		…
24	#include <global.h>	24	#include <global.h>
25	#include <stdio.h>	25	#include <stdio.h>
26	#include <sys/types.h>	26	#include <sys/types.h>
27	#include <sys/uio.h>	27	#include <sys/uio.h>
28	#include <object.h>	28	#include <object.h>
29	#include <funcpoint.h>
30	#include <sproto.h>	29	#include <sproto.h>
31	#include <loader.h>	30	#include <loader.h>
32		31
33	#include <bitset>	32	#include <bitset>
34		33
…		…
140		139
141	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */	140	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */
142	static bool	141	static bool
143	compare_ob_value_lists_one (const object wants, const object has)	142	compare_ob_value_lists_one (const object wants, const object has)
144	{	143	{
145	key_value *wants_field;
146
147	/* n-squared behaviour (see get_ob_key_link()), but I'm hoping both	144	/* n-squared behaviour (see kv_get), but I'm hoping both
148	* objects with lists are rare, and lists stay short. If not, use a	145	* objects with lists are rare, and lists stay short. If not, use a
149	* different structure or at least keep the lists sorted...	146	* different structure or at least keep the lists sorted...
150	*/	147	*/
151		148
152	/* For each field in wants, */	149	/* For each field in wants, */
153	for (wants_field = wants->key_values; wants_field; wants_field = wants_field->next)	150	for (key_value *kv = wants->key_values; kv; kv = kv->next)
154	{	151	if (has->kv_get (kv->key) != kv->value)
155	key_value *has_field;	152	return false;
156
157	/* Look for a field in has with the same key. */
158	has_field = get_ob_key_link (has, wants_field->key);
159
160	if (!has_field)
161	return 0; /* No field with that name. */
162
163	/* Found the matching field. */
164	if (has_field->value != wants_field->value)
165	return 0; /* Values don't match, so this half of the comparison is false. */
166
167	/* If we get here, we found a match. Now for the next field in wants. */
168	}
169		153
170	/* If we get here, every field in wants has a matching field in has. */	154	/* If we get here, every field in wants has a matching field in has. */
171	return 1;	155	return true;
172	}	156	}
173		157
174	/* Returns TRUE if ob1 has the same key_values as ob2. */	158	/* Returns TRUE if ob1 has the same key_values as ob2. */
175	static bool	159	static bool
176	compare_ob_value_lists (const object ob1, const object ob2)	160	compare_ob_value_lists (const object ob1, const object ob2)
177	{	161	{
178	/* However, there may be fields in has which aren't partnered in wants,	162	/* However, there may be fields in has which aren't partnered in wants,
179	* so we need to run the comparison twice. :(	163	* so we need to run the comparison twice. :(
180	*/	164	*/
181	return compare_ob_value_lists_one (ob1, ob2) && compare_ob_value_lists_one (ob2, ob1);	165	return compare_ob_value_lists_one (ob1, ob2)
		166	&& compare_ob_value_lists_one (ob2, ob1);
182	}	167	}
183		168
184	/* Function examines the 2 objects given to it, and returns true if	169	/* Function examines the 2 objects given to it, and returns true if
185	* they can be merged together.	170	* they can be merged together.
186	*	171	*
…		…
331		316
332	/* Everything passes, must be OK. */	317	/* Everything passes, must be OK. */
333	return 1;	318	return 1;
334	}	319	}
335		320
		321	// find player who can see this object
		322	object *
		323	object::visible_to () const
		324	{
		325	if (client_visible () && !flag [FLAG_REMOVED])
		326	{
		327	// see if we are in a container of sorts
		328	if (env)
		329	{
		330	// the player inventory itself is always visible
		331	if (env->type == PLAYER)
		332	return env;
		333
		334	// else a player could have our env open
		335	object *envest = env->outer_env ();
		336
		337	// the player itself is always on a map, so we will find him here
		338	// even if our inv is in a player.
		339	if (envest->is_on_map ())
		340	if (object *pl = envest->ms ().player ())
		341	if (pl->container == env)
		342	return pl;
		343	}
		344	else
		345	{
		346	// maybe there is a player standing on the same mapspace
		347	// this will catch the case where "this" is a player
		348	if (object *pl = ms ().player ())
		349	if (!pl->container \|\| this == pl->container)
		350	return pl;
		351	}
		352	}
		353
		354	return 0;
		355	}
		356
336	// adjust weight per container type ("of holding")	357	// adjust weight per container type ("of holding")
337	static sint32	358	static sint32
338	weight_adjust (object *op, sint32 weight)	359	weight_adjust_for (object *op, sint32 weight)
339	{	360	{
340	return op->type == CONTAINER	361	return op->type == CONTAINER
341	? lerp (weight, 0, 100, 0, 100 - op->stats.Str)	362	? lerp (weight, 0, 100, 0, 100 - op->stats.Str)
342	: weight;	363	: weight;
343	}	364	}
…		…
349	static void	370	static void
350	adjust_weight (object *op, sint32 weight)	371	adjust_weight (object *op, sint32 weight)
351	{	372	{
352	while (op)	373	while (op)
353	{	374	{
		375	// adjust by actual difference to account for rounding errors
		376	// i.e. (w2 - w1) / f != w2 / f - w1 / f and the latter is correct
354	weight = weight_adjust (op, weight);	377	weight = weight_adjust_for (op, op->carrying)
		378	- weight_adjust_for (op, op->carrying - weight);
		379
		380	if (!weight)
		381	return;
355		382
356	op->carrying += weight;	383	op->carrying += weight;
		384
		385	if (object *pl = op->visible_to ())
		386	if (pl != op) // player is handled lazily
		387	esrv_update_item (UPD_WEIGHT, pl, op);
		388
357	op = op->env;	389	op = op->env;
358	}	390	}
359	}	391	}
360		392
361	/*	393	/*
…		…
374	op->update_weight ();	406	op->update_weight ();
375		407
376	sum += op->total_weight ();	408	sum += op->total_weight ();
377	}	409	}
378		410
379	carrying = weight_adjust (this, sum);	411	sum = weight_adjust_for (this, sum);
		412
		413	if (sum != carrying)
		414	{
		415	carrying = sum;
		416
		417	if (object *pl = visible_to ())
		418	if (pl != this) // player is handled lazily
		419	esrv_update_item (UPD_WEIGHT, pl, this);
		420	}
380	}	421	}
381		422
382	/*	423	/*
383	* Used by: Server DM commands: dumpbelow, dump. Some error messages.	424	* Used by: Server DM commands: dumpbelow, dump. Some error messages.
384	*/	425	*/
…		…
551	}	592	}
552		593
553	op->key_values = 0;	594	op->key_values = 0;
554	}	595	}
555		596
556	object &	597	/*
557	object::operator =(const object &src)	598	* copy_to first frees everything allocated by the dst object,
		599	* and then copies the contents of itself into the second
		600	* object, allocating what needs to be allocated. Basically, any
		601	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
		602	* if the first object is freed, the pointers in the new object
		603	* will point at garbage.
		604	*/
		605	void
		606	object::copy_to (object *dst)
558	{	607	{
559	bool is_freed = flag [FLAG_FREED];	608	dst->remove ();
560	bool is_removed = flag [FLAG_REMOVED];
561
562	(object_copy )this = src;	609	(object_copy )dst = *this;
563
564	flag [FLAG_FREED] = is_freed;
565	flag [FLAG_REMOVED] = is_removed;	610	dst->flag [FLAG_REMOVED] = true;
566		611
567	/* Copy over key_values, if any. */	612	/* Copy over key_values, if any. */
568	if (src.key_values)	613	if (key_values)
569	{	614	{
570	key_value *tail = 0;	615	key_value *tail = 0;
571	key_values = 0;	616	dst->key_values = 0;
572		617
573	for (key_value *i = src.key_values; i; i = i->next)	618	for (key_value *i = key_values; i; i = i->next)
574	{	619	{
575	key_value *new_link = new key_value;	620	key_value *new_link = new key_value;
576		621
577	new_link->next = 0;	622	new_link->next = 0;
578	new_link->key = i->key;	623	new_link->key = i->key;
579	new_link->value = i->value;	624	new_link->value = i->value;
580		625
581	/* Try and be clever here, too. */	626	/* Try and be clever here, too. */
582	if (!key_values)	627	if (!dst->key_values)
583	{	628	{
584	key_values = new_link;	629	dst->key_values = new_link;
585	tail = new_link;	630	tail = new_link;
586	}	631	}
587	else	632	else
588	{	633	{
589	tail->next = new_link;	634	tail->next = new_link;
590	tail = new_link;	635	tail = new_link;
591	}	636	}
592	}	637	}
593	}	638	}
594	}
595
596	/*
597	* copy_to first frees everything allocated by the dst object,
598	* and then copies the contents of itself into the second
599	* object, allocating what needs to be allocated. Basically, any
600	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
601	* if the first object is freed, the pointers in the new object
602	* will point at garbage.
603	*/
604	void
605	object::copy_to (object *dst)
606	{
607	dst = this;
608		639
609	if (speed < 0)	640	if (speed < 0)
610	dst->speed_left -= rndm ();	641	dst->speed_left -= rndm ();
611		642
612	dst->set_speed (dst->speed);	643	dst->set_speed (dst->speed);
…		…
634	object *	665	object *
635	object::clone ()	666	object::clone ()
636	{	667	{
637	object *neu = create ();	668	object *neu = create ();
638	copy_to (neu);	669	copy_to (neu);
		670	neu->map = map; // not copied by copy_to
639	return neu;	671	return neu;
640	}	672	}
641		673
642	/*	674	/*
643	* If an object with the IS_TURNABLE() flag needs to be turned due	675	* If an object with the IS_TURNABLE() flag needs to be turned due
…		…
694	* UP_OBJ_FACE: only the objects face has changed.	726	* UP_OBJ_FACE: only the objects face has changed.
695	*/	727	*/
696	void	728	void
697	update_object (object *op, int action)	729	update_object (object *op, int action)
698	{	730	{
699	if (op == NULL)	731	if (!op)
700	{	732	{
701	/* this should never happen */	733	/* this should never happen */
702	LOG (llevDebug, "update_object() called for NULL object.\n");	734	LOG (llevError \| logBacktrace, "update_object() called for NULL object.\n");
703	return;	735	return;
704	}	736	}
705		737
706	if (op->env)	738	if (!op->is_on_map ())
707	{	739	{
708	/* Animation is currently handled by client, so nothing	740	/* Animation is currently handled by client, so nothing
709	* to do in this case.	741	* to do in this case.
710	*/	742	*/
711	return;	743	return;
712	}	744	}
713
714	/* If the map is saving, don't do anything as everything is
715	* going to get freed anyways.
716	*/
717	if (!op->map \|\| op->map->in_memory == MAP_SAVING)
718	return;
719		745
720	/* make sure the object is within map boundaries */	746	/* make sure the object is within map boundaries */
721	if (op->x < 0 \|\| op->x >= op->map->width \|\| op->y < 0 \|\| op->y >= op->map->height)	747	if (op->x < 0 \|\| op->x >= op->map->width \|\| op->y < 0 \|\| op->y >= op->map->height)
722	{	748	{
723	LOG (llevError, "update_object() called for object out of map!\n");	749	LOG (llevError, "update_object() called for object out of map!\n");
…		…
866	object::destroy_inv (bool drop_to_ground)	892	object::destroy_inv (bool drop_to_ground)
867	{	893	{
868	// need to check first, because the checks below might segfault	894	// need to check first, because the checks below might segfault
869	// as we might be on an invalid mapspace and crossfire code	895	// as we might be on an invalid mapspace and crossfire code
870	// is too buggy to ensure that the inventory is empty.	896	// is too buggy to ensure that the inventory is empty.
871	// corollary: if you create arrows etc. with stuff in tis inventory,	897	// corollary: if you create arrows etc. with stuff in its inventory,
872	// cf will crash below with off-map x and y	898	// cf will crash below with off-map x and y
873	if (!inv)	899	if (!inv)
874	return;	900	return;
875		901
876	/* Only if the space blocks everything do we not process -	902	/* Only if the space blocks everything do we not process -
…		…
878	* drop on that space.	904	* drop on that space.
879	*/	905	*/
880	if (!drop_to_ground	906	if (!drop_to_ground
881	\|\| !map	907	\|\| !map
882	\|\| map->in_memory != MAP_ACTIVE	908	\|\| map->in_memory != MAP_ACTIVE
883	\|\| map->nodrop	909	\|\| map->no_drop
884	\|\| ms ().move_block == MOVE_ALL)	910	\|\| ms ().move_block == MOVE_ALL)
885	{	911	{
886	while (inv)	912	while (inv)
887	{	913	{
888	inv->destroy_inv (drop_to_ground);	914	inv->destroy_inv (false);
889	inv->destroy ();	915	inv->destroy ();
890	}	916	}
891	}	917	}
892	else	918	else
893	{ /* Put objects in inventory onto this space */	919	{ /* Put objects in inventory onto this space */
…		…
899	\|\| op->flag [FLAG_NO_DROP]	925	\|\| op->flag [FLAG_NO_DROP]
900	\|\| op->type == RUNE	926	\|\| op->type == RUNE
901	\|\| op->type == TRAP	927	\|\| op->type == TRAP
902	\|\| op->flag [FLAG_IS_A_TEMPLATE]	928	\|\| op->flag [FLAG_IS_A_TEMPLATE]
903	\|\| op->flag [FLAG_DESTROY_ON_DEATH])	929	\|\| op->flag [FLAG_DESTROY_ON_DEATH])
904	op->destroy ();	930	op->destroy (true);
905	else	931	else
906	map->insert (op, x, y);	932	map->insert (op, x, y);
907	}	933	}
908	}	934	}
909	}	935	}
…		…
913	object *op = new object;	939	object *op = new object;
914	op->link ();	940	op->link ();
915	return op;	941	return op;
916	}	942	}
917		943
		944	static struct freed_map : maptile
		945	{
		946	freed_map ()
		947	{
		948	path = "<freed objects map>";
		949	name = "/internal/freed_objects_map";
		950	width = 3;
		951	height = 3;
		952	no_drop = 1;
		953	no_reset = 1;
		954
		955	alloc ();
		956	in_memory = MAP_ACTIVE;
		957	}
		958
		959	~freed_map ()
		960	{
		961	destroy ();
		962	}
		963	} freed_map; // freed objects are moved here to avoid crashes
		964
918	void	965	void
919	object::do_destroy ()	966	object::do_destroy ()
920	{	967	{
921	attachable::do_destroy ();
922
923	if (flag [FLAG_IS_LINKED])	968	if (flag [FLAG_IS_LINKED])
924	remove_button_link (this);	969	remove_button_link (this);
925		970
926	if (flag [FLAG_FRIENDLY])	971	if (flag [FLAG_FRIENDLY])
927	remove_friendly_object (this);	972	remove_friendly_object (this);
928		973
929	if (!flag [FLAG_REMOVED])
930	remove ();	974	remove ();
931		975
932	destroy_inv (true);	976	attachable::do_destroy ();
933		977
934	deactivate ();	978	deactivate ();
935	unlink ();	979	unlink ();
936		980
937	flag [FLAG_FREED] = 1;	981	flag [FLAG_FREED] = 1;
938		982
939	// hack to ensure that freed objects still have a valid map	983	// hack to ensure that freed objects still have a valid map
940	{
941	static maptile *freed_map; // freed objects are moved here to avoid crashes
942
943	if (!freed_map)
944	{
945	freed_map = new maptile;
946
947	freed_map->path = "<freed objects map>";
948	freed_map->name = "/internal/freed_objects_map";
949	freed_map->width = 3;
950	freed_map->height = 3;
951	freed_map->nodrop = 1;
952
953	freed_map->alloc ();
954	freed_map->in_memory = MAP_ACTIVE;
955	}
956
957	map = freed_map;	984	map = &freed_map;
958	x = 1;	985	x = 1;
959	y = 1;	986	y = 1;
960	}
961		987
962	if (more)	988	if (more)
963	{	989	{
964	more->destroy ();	990	more->destroy ();
965	more = 0;	991	more = 0;
…		…
978	object::destroy (bool destroy_inventory)	1004	object::destroy (bool destroy_inventory)
979	{	1005	{
980	if (destroyed ())	1006	if (destroyed ())
981	return;	1007	return;
982		1008
		1009	if (!is_head () && !head->destroyed ())
		1010	{
		1011	LOG (llevError \| logBacktrace, "tried to destroy the tail of an object");
		1012	head->destroy (destroy_inventory);
		1013	return;
		1014	}
		1015
983	if (destroy_inventory)	1016	destroy_inv (!destroy_inventory);
984	destroy_inv (false);
985		1017
986	if (is_head ())	1018	if (is_head ())
987	if (sound_destroy)	1019	if (sound_destroy)
988	play_sound (sound_destroy);	1020	play_sound (sound_destroy);
989	else if (flag [FLAG_MONSTER])	1021	else if (flag [FLAG_MONSTER])
…		…
1003	object::do_remove ()	1035	object::do_remove ()
1004	{	1036	{
1005	object tmp, last = 0;	1037	object tmp, last = 0;
1006	object *otmp;	1038	object *otmp;
1007		1039
1008	if (QUERY_FLAG (this, FLAG_REMOVED))	1040	if (flag [FLAG_REMOVED])
1009	return;	1041	return;
1010		1042
1011	SET_FLAG (this, FLAG_REMOVED);
1012	INVOKE_OBJECT (REMOVE, this);	1043	INVOKE_OBJECT (REMOVE, this);
		1044
		1045	flag [FLAG_REMOVED] = true;
1013		1046
1014	if (more)	1047	if (more)
1015	more->remove ();	1048	more->remove ();
1016		1049
1017	/*	1050	/*
1018	* In this case, the object to be removed is in someones	1051	* In this case, the object to be removed is in someones
1019	* inventory.	1052	* inventory.
1020	*/	1053	*/
1021	if (env)	1054	if (env)
1022	{	1055	{
		1056	flag [FLAG_REMOVED] = false; // hack around the issue of visible_to checking flag_removed
		1057	if (object *pl = visible_to ())
		1058	esrv_del_item (pl->contr, count);
		1059	flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed
		1060
1023	adjust_weight (env, -total_weight ());	1061	adjust_weight (env, -total_weight ());
1024
1025	*(above ? &above->below : &env->inv) = below;
1026
1027	if (below)
1028	below->above = above;
1029		1062
1030	/* we set up values so that it could be inserted into	1063	/* we set up values so that it could be inserted into
1031	* the map, but we don't actually do that - it is up	1064	* the map, but we don't actually do that - it is up
1032	* to the caller to decide what we want to do.	1065	* to the caller to decide what we want to do.
1033	*/	1066	*/
1034	map = env->map;	1067	map = env->map;
1035	x = env->x;	1068	x = env->x;
1036	y = env->y;	1069	y = env->y;
		1070
		1071	// make sure cmov optimisation is applicable
		1072	*(above ? &above->below : &env->inv) = below;
		1073	*(below ? &below->above : &above ) = above; // &above is just a dummy
		1074
1037	above = 0;	1075	above = 0;
1038	below = 0;	1076	below = 0;
1039	env = 0;	1077	env = 0;
1040		1078
1041	/* NO_FIX_PLAYER is set when a great many changes are being	1079	/* NO_FIX_PLAYER is set when a great many changes are being
…		…
1045	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1083	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1046	otmp->update_stats ();	1084	otmp->update_stats ();
1047	}	1085	}
1048	else if (map)	1086	else if (map)
1049	{	1087	{
1050	if (type == PLAYER)
1051	{
1052	// leaving a spot always closes any open container on the ground
1053	if (container && !container->env)
1054	// this causes spurious floorbox updates, but it ensures
1055	// that the CLOSE event is being sent.
1056	close_container ();
1057
1058	--map->players;
1059	map->touch ();
1060	}
1061
1062	map->dirty = true;	1088	map->dirty = true;
1063	mapspace &ms = this->ms ();	1089	mapspace &ms = this->ms ();
1064		1090
		1091	if (object *pl = ms.player ())
		1092	{
		1093	if (type == PLAYER) // this == pl(!)
		1094	{
		1095	// leaving a spot always closes any open container on the ground
		1096	if (container && !container->env)
		1097	// this causes spurious floorbox updates, but it ensures
		1098	// that the CLOSE event is being sent.
		1099	close_container ();
		1100
		1101	--map->players;
		1102	map->touch ();
		1103	}
		1104	else if (pl->container == this)
		1105	{
		1106	// removing a container should close it
		1107	close_container ();
		1108	}
		1109
		1110	esrv_del_item (pl->contr, count);
		1111	}
		1112
1065	/* link the object above us */	1113	/* link the object above us */
1066	if (above)	1114	// re-link, make sure compiler can easily use cmove
1067	above->below = below;	1115	*(above ? &above->below : &ms.top) = below;
1068	else	1116	*(below ? &below->above : &ms.bot) = above;
1069	ms.top = below; /* we were top, set new top */
1070
1071	/* Relink the object below us, if there is one */
1072	if (below)
1073	below->above = above;
1074	else
1075	{
1076	/* Nothing below, which means we need to relink map object for this space
1077	* use translated coordinates in case some oddness with map tiling is
1078	* evident
1079	*/
1080	if (GET_MAP_OB (map, x, y) != this)
1081	LOG (llevError, "remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom? %s\n", debug_desc ());
1082
1083	ms.bot = above; /* goes on above it. */
1084	}
1085		1117
1086	above = 0;	1118	above = 0;
1087	below = 0;	1119	below = 0;
1088		1120
1089	if (map->in_memory == MAP_SAVING)	1121	if (map->in_memory == MAP_SAVING)
…		…
1098	* removed (most likely destroyed), update the player view	1130	* removed (most likely destroyed), update the player view
1099	* appropriately.	1131	* appropriately.
1100	*/	1132	*/
1101	pl->close_container ();	1133	pl->close_container ();
1102		1134
		1135	//TODO: the floorbox prev/next might need updating
		1136	//esrv_del_item (pl->contr, count);
		1137	//TODO: update floorbox to preserve ordering
		1138	if (pl->contr->ns)
1103	pl->contr->ns->floorbox_update ();	1139	pl->contr->ns->floorbox_update ();
1104	}	1140	}
1105		1141
1106	for (tmp = ms.bot; tmp; tmp = tmp->above)	1142	for (tmp = ms.bot; tmp; tmp = tmp->above)
1107	{	1143	{
1108	/* No point updating the players look faces if he is the object	1144	/* No point updating the players look faces if he is the object
…		…
1152	if (!top)	1188	if (!top)
1153	for (top = op; top && top->above; top = top->above)	1189	for (top = op; top && top->above; top = top->above)
1154	;	1190	;
1155		1191
1156	for (; top; top = top->below)	1192	for (; top; top = top->below)
1157	{
1158	if (top == op)
1159	continue;
1160
1161	if (object::can_merge (op, top))	1193	if (object::can_merge (op, top))
1162	{	1194	{
1163	top->nrof += op->nrof;	1195	top->nrof += op->nrof;
1164		1196
1165	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/	1197	if (object *pl = top->visible_to ())
1166	op->weight = 0; /* Don't want any adjustements now */	1198	esrv_update_item (UPD_NROF, pl, top);
		1199
		1200	op->weight = 0; // cancel the addition above
		1201	op->carrying = 0; // must be 0 already
		1202
1167	op->destroy ();	1203	op->destroy (1);
		1204
1168	return top;	1205	return top;
1169	}	1206	}
1170	}
1171		1207
1172	return 0;	1208	return 0;
1173	}	1209	}
1174		1210
1175	void	1211	void
…		…
1232	* just 'op' otherwise	1268	* just 'op' otherwise
1233	*/	1269	*/
1234	object *	1270	object *
1235	insert_ob_in_map (object op, maptile m, object *originator, int flag)	1271	insert_ob_in_map (object op, maptile m, object *originator, int flag)
1236	{	1272	{
1237	assert (!op->flag [FLAG_FREED]);
1238
1239	object top, floor = NULL;
1240
1241	op->remove ();	1273	op->remove ();
1242		1274
1243	/* Ideally, the caller figures this out. However, it complicates a lot	1275	/* Ideally, the caller figures this out. However, it complicates a lot
1244	* of areas of callers (eg, anything that uses find_free_spot would now	1276	* of areas of callers (eg, anything that uses find_free_spot would now
1245	* need extra work	1277	* need extra work
1246	*/	1278	*/
1247	if (!xy_normalise (m, op->x, op->y))	1279	if (!xy_normalise (m, op->x, op->y))
1248	{	1280	{
1249	op->destroy ();	1281	op->head_ ()->destroy (1);// remove head_ once all tail object destroyers found
1250	return 0;	1282	return 0;
1251	}	1283	}
1252		1284
1253	if (object *more = op->more)	1285	if (object *more = op->more)
1254	if (!insert_ob_in_map (more, m, originator, flag))	1286	if (!insert_ob_in_map (more, m, originator, flag))
…		…
1263	*/	1295	*/
1264	if (op->nrof && !(flag & INS_NO_MERGE))	1296	if (op->nrof && !(flag & INS_NO_MERGE))
1265	for (object *tmp = ms.bot; tmp; tmp = tmp->above)	1297	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1266	if (object::can_merge (op, tmp))	1298	if (object::can_merge (op, tmp))
1267	{	1299	{
		1300	// TODO: we actually want to update tmp, not op,
		1301	// but some caller surely breaks when we return tmp
		1302	// from here :/
1268	op->nrof += tmp->nrof;	1303	op->nrof += tmp->nrof;
1269	tmp->destroy (1);	1304	tmp->destroy (1);
1270	}	1305	}
1271		1306
1272	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1307	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
…		…
1281	{	1316	{
1282	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");	1317	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");
1283	abort ();	1318	abort ();
1284	}	1319	}
1285		1320
		1321	if (!originator->is_on_map ())
		1322	LOG (llevDebug \| logBacktrace, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map",
		1323	op->debug_desc (), originator->debug_desc ());
		1324
1286	op->above = originator;	1325	op->above = originator;
1287	op->below = originator->below;	1326	op->below = originator->below;
1288
1289	if (op->below)
1290	op->below->above = op;
1291	else
1292	ms.bot = op;
1293
1294	/* since below originator, no need to update top */
1295	originator->below = op;	1327	originator->below = op;
		1328
		1329	*(op->below ? &op->below->above : &ms.bot) = op;
1296	}	1330	}
1297	else	1331	else
1298	{	1332	{
1299	top = ms.bot;	1333	object *floor = 0;
		1334	object *top = ms.top;
1300		1335
1301	/* If there are other objects, then */	1336	/* If there are other objects, then */
1302	if (top)	1337	if (top)
1303	{	1338	{
1304	object *last = 0;
1305
1306	/*	1339	/*
1307	* If there are multiple objects on this space, we do some trickier handling.	1340	* If there are multiple objects on this space, we do some trickier handling.
1308	* We've already dealt with merging if appropriate.	1341	* We've already dealt with merging if appropriate.
1309	* Generally, we want to put the new object on top. But if	1342	* Generally, we want to put the new object on top. But if
1310	* flag contains INS_ABOVE_FLOOR_ONLY, once we find the last	1343	* flag contains INS_ABOVE_FLOOR_ONLY, once we find the last
…		…
1313	* once we get to them. This reduces the need to traverse over all of	1346	* once we get to them. This reduces the need to traverse over all of
1314	* them when adding another one - this saves quite a bit of cpu time	1347	* them when adding another one - this saves quite a bit of cpu time
1315	* when lots of spells are cast in one area. Currently, it is presumed	1348	* when lots of spells are cast in one area. Currently, it is presumed
1316	* that flying non pickable objects are spell objects.	1349	* that flying non pickable objects are spell objects.
1317	*/	1350	*/
1318	for (top = ms.bot; top; top = top->above)	1351	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1319	{	1352	{
1320	if (QUERY_FLAG (top, FLAG_IS_FLOOR) \|\| QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))	1353	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) \|\| QUERY_FLAG (tmp, FLAG_OVERLAY_FLOOR))
1321	floor = top;	1354	floor = tmp;
1322		1355
1323	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW \| MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))	1356	if (QUERY_FLAG (tmp, FLAG_NO_PICK) && (tmp->move_type & (MOVE_FLY_LOW \| MOVE_FLY_HIGH)) && !QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1324	{	1357	{
1325	/* We insert above top, so we want this object below this */	1358	/* We insert above top, so we want this object below this */
1326	top = top->below;	1359	top = tmp->below;
1327	break;	1360	break;
1328	}	1361	}
1329		1362
1330	last = top;	1363	top = tmp;
1331	}	1364	}
1332
1333	/* Don't want top to be NULL, so set it to the last valid object */
1334	top = last;
1335		1365
1336	/* We let update_position deal with figuring out what the space	1366	/* We let update_position deal with figuring out what the space
1337	* looks like instead of lots of conditions here.	1367	* looks like instead of lots of conditions here.
1338	* makes things faster, and effectively the same result.	1368	* makes things faster, and effectively the same result.
1339	*/	1369	*/
…		…
1346	*/	1376	*/
1347	if (!(flag & INS_ON_TOP)	1377	if (!(flag & INS_ON_TOP)
1348	&& ms.flags () & P_BLOCKSVIEW	1378	&& ms.flags () & P_BLOCKSVIEW
1349	&& (op->face && !faces [op->face].visibility))	1379	&& (op->face && !faces [op->face].visibility))
1350	{	1380	{
		1381	object *last;
		1382
1351	for (last = top; last != floor; last = last->below)	1383	for (last = top; last != floor; last = last->below)
1352	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1384	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1353	break;	1385	break;
1354		1386
1355	/* Check to see if we found the object that blocks view,	1387	/* Check to see if we found the object that blocks view,
…		…
1363	} /* If objects on this space */	1395	} /* If objects on this space */
1364		1396
1365	if (flag & INS_ABOVE_FLOOR_ONLY)	1397	if (flag & INS_ABOVE_FLOOR_ONLY)
1366	top = floor;	1398	top = floor;
1367		1399
1368	/* Top is the object that our object (op) is going to get inserted above.	1400	// insert object above top, or bottom-most if top = 0
1369	*/
1370
1371	/* First object on this space */
1372	if (!top)	1401	if (!top)
1373	{	1402	{
		1403	op->below = 0;
1374	op->above = ms.bot;	1404	op->above = ms.bot;
1375
1376	if (op->above)
1377	op->above->below = op;
1378
1379	op->below = 0;
1380	ms.bot = op;	1405	ms.bot = op;
		1406
		1407	*(op->above ? &op->above->below : &ms.top) = op;
1381	}	1408	}
1382	else	1409	else
1383	{ /* get inserted into the stack above top */	1410	{
1384	op->above = top->above;	1411	op->above = top->above;
1385
1386	if (op->above)
1387	op->above->below = op;	1412	top->above = op;
1388		1413
1389	op->below = top;	1414	op->below = top;
1390	top->above = op;	1415	*(op->above ? &op->above->below : &ms.top) = op;
1391	}	1416	}
1392		1417	}
1393	if (!op->above)
1394	ms.top = op;
1395	} /* else not INS_BELOW_ORIGINATOR */
1396		1418
1397	if (op->type == PLAYER)	1419	if (op->type == PLAYER)
1398	{	1420	{
1399	op->contr->do_los = 1;	1421	op->contr->do_los = 1;
1400	++op->map->players;	1422	++op->map->players;
…		…
1402	}	1424	}
1403		1425
1404	op->map->dirty = true;	1426	op->map->dirty = true;
1405		1427
1406	if (object *pl = ms.player ())	1428	if (object *pl = ms.player ())
		1429	//TODO: the floorbox prev/next might need updating
		1430	//esrv_send_item (pl, op);
		1431	//TODO: update floorbox to preserve ordering
		1432	if (pl->contr->ns)
1407	pl->contr->ns->floorbox_update ();	1433	pl->contr->ns->floorbox_update ();
1408		1434
1409	/* If this object glows, it may affect lighting conditions that are	1435	/* If this object glows, it may affect lighting conditions that are
1410	* visible to others on this map. But update_all_los is really	1436	* visible to others on this map. But update_all_los is really
1411	* an inefficient way to do this, as it means los for all players	1437	* an inefficient way to do this, as it means los for all players
1412	* on the map will get recalculated. The players could very well	1438	* on the map will get recalculated. The players could very well
…		…
1478	else	1504	else
1479	return where->map->insert (this, where->x, where->y, originator, flags);	1505	return where->map->insert (this, where->x, where->y, originator, flags);
1480	}	1506	}
1481		1507
1482	/*	1508	/*
1483	* get_split_ob(ob,nr) splits up ob into two parts. The part which
1484	* is returned contains nr objects, and the remaining parts contains
1485	* the rest (or is removed and freed if that number is 0).
1486	* On failure, NULL is returned, and the reason put into the
1487	* global static errmsg array.
1488	*/
1489	object *
1490	object::split_nr (sint32 nr)
1491	{
1492	if (nrof < nr)
1493	return 0;
1494	else if (nrof == nr)
1495	{
1496	remove ();
1497	return this;
1498	}
1499	else
1500	{
1501	decrease_nr (nr);
1502
1503	object *op = object_create_clone (this);
1504	op->nrof = nr;
1505	return op;
1506	}
1507	}
1508
1509	//TODO: remove, but semantics differs from split_nr
1510	object *
1511	get_split_ob (object *orig_ob, uint32 nr)
1512	{
1513	if (orig_ob->nrof < nr)
1514	{
1515	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1516	return 0;
1517	}
1518
1519	return orig_ob->split_nr (nr);
1520	}
1521
1522	// find player who can see this object
1523	static object *
1524	visible_to (object *op)
1525	{
1526	if (!op->flag [FLAG_REMOVED])
1527	{
1528	// see if we are in a container of sorts
1529	if (object *env = op->env)
1530	{
1531	// the player inventory itself is always visible
1532	if (env->type == PLAYER)
1533	return env;
1534
1535	// else a player could have our env open
1536	env = env->outer_env ();
1537
1538	// the player itself is always on a map, so we will find him here
1539	// even if our inv is in a player.
1540	if (env->is_on_map ())
1541	if (object *pl = env->ms ().player ())
1542	if (pl->container == op->env)
1543	return pl;
1544	}
1545	else
1546	{
1547	// maybe there is a player standing on the same mapspace
1548	if (object *pl = env->ms ().player ())
1549	return pl;
1550	}
1551	}
1552
1553	return 0;
1554	}
1555
1556	/*
1557	* decrease_ob_nr(object, number) decreases a specified number from	1509	* decrease(object, number) decreases a specified number from
1558	* the amount of an object. If the amount reaches 0, the object	1510	* the amount of an object. If the amount reaches 0, the object
1559	* is subsequently removed and freed.	1511	* is subsequently removed and freed.
1560	*	1512	*
1561	* Return value: 'op' if something is left, NULL if the amount reached 0	1513	* Return value: 'op' if something is left, NULL if the amount reached 0
1562	*/	1514	*/
1563	bool	1515	bool
1564	object::decrease_nr (sint32 nr)	1516	object::decrease (sint32 nr)
1565	{	1517	{
		1518	if (!nr)
		1519	return true;
		1520
1566	nr = min (nr, nrof);	1521	nr = min (nr, nrof);
1567		1522
1568	if (!nr)
1569	return 1;
1570
1571	nrof -= nr;	1523	nrof -= nr;
1572		1524
1573	object *visible = visible_to (this);
1574
1575	if (nrof)	1525	if (nrof)
1576	{	1526	{
1577	adjust_weight (env, -weight * nr); // carrying == 0	1527	adjust_weight (env, -weight * nr); // carrying == 0
1578		1528
1579	if (visible)	1529	if (object *pl = visible_to ())
1580	esrv_send_item (visible, this);	1530	esrv_update_item (UPD_NROF, pl, this);
1581		1531
1582	return 1;	1532	return true;
1583	}	1533	}
1584	else	1534	else
1585	{	1535	{
1586	if (visible)
1587	esrv_del_item (visible->contr, count);
1588
1589	this->destroy (1);	1536	destroy (1);
1590	return 0;	1537	return false;
1591	}	1538	}
1592	}	1539	}
1593		1540
1594	//TODO: remove	1541	/*
		1542	* split(ob,nr) splits up ob into two parts. The part which
		1543	* is returned contains nr objects, and the remaining parts contains
		1544	* the rest (or is removed and returned if that number is 0).
		1545	* On failure, NULL is returned.
		1546	*/
1595	object *	1547	object *
1596	decrease_ob_nr (object *op, uint32 i)	1548	object::split (sint32 nr)
1597	{	1549	{
1598	return op->decrease_nr (i) ? op : 0;	1550	int have = number_of ();
		1551
		1552	if (have < nr)
		1553	return 0;
		1554	else if (have == nr)
		1555	{
		1556	remove ();
		1557	return this;
		1558	}
		1559	else
		1560	{
		1561	decrease (nr);
		1562
		1563	object *op = deep_clone ();
		1564	op->nrof = nr;
		1565	return op;
		1566	}
1599	}	1567	}
1600		1568
1601	object *	1569	object *
1602	insert_ob_in_ob (object op, object where)	1570	insert_ob_in_ob (object op, object where)
1603	{	1571	{
…		…
1644	if (object::can_merge (tmp, op))	1612	if (object::can_merge (tmp, op))
1645	{	1613	{
1646	/* return the original object and remove inserted object	1614	/* return the original object and remove inserted object
1647	(client needs the original object) */	1615	(client needs the original object) */
1648	tmp->nrof += op->nrof;	1616	tmp->nrof += op->nrof;
		1617
		1618	if (object *pl = tmp->visible_to ())
		1619	esrv_update_item (UPD_NROF, pl, tmp);
		1620
		1621	adjust_weight (this, op->total_weight ());
		1622
1649	op->destroy (1);	1623	op->destroy (1);
1650	op = tmp;	1624	op = tmp;
1651	goto inserted;	1625	goto inserted;
1652	}	1626	}
1653		1627
…		…
1665		1639
1666	inv = op;	1640	inv = op;
1667		1641
1668	op->flag [FLAG_REMOVED] = 0;	1642	op->flag [FLAG_REMOVED] = 0;
1669		1643
		1644	if (object *pl = op->visible_to ())
		1645	esrv_send_item (pl, op);
		1646
1670	adjust_weight (this, op->total_weight ());	1647	adjust_weight (this, op->total_weight ());
1671		1648
1672	inserted:	1649	inserted:
1673	/* reset the light list and los of the players on the map */	1650	/* reset the light list and los of the players on the map */
1674	if (op->glow_radius && map && map->darkness)	1651	if (op->glow_radius && map && map->darkness)
1675	update_all_los (map, x, y);	1652	update_all_los (map, x, y);
1676		1653
1677	if (object *otmp = in_player ())	1654	// if this is a player's inventory, update stats
1678	if (otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1655	if (type == PLAYER && !flag [FLAG_NO_FIX_PLAYER])
1679	otmp->update_stats ();	1656	update_stats ();
1680		1657
1681	INVOKE_OBJECT (INSERT, this);	1658	INVOKE_OBJECT (INSERT, this);
1682		1659
1683	return op;	1660	return op;
1684	}	1661	}
…		…
1812	LOG (llevError, "Present_arch called outside map.\n");	1789	LOG (llevError, "Present_arch called outside map.\n");
1813	return NULL;	1790	return NULL;
1814	}	1791	}
1815		1792
1816	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)	1793	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1817	if (tmp->arch == at)	1794	if (tmp->arch->archname == at->archname)
1818	return tmp;	1795	return tmp;
1819		1796
1820	return NULL;	1797	return NULL;
1821	}	1798	}
1822		1799
…		…
1886	* The first matching object is returned, or NULL if none.	1863	* The first matching object is returned, or NULL if none.
1887	*/	1864	*/
1888	object *	1865	object *
1889	present_arch_in_ob (const archetype at, const object op)	1866	present_arch_in_ob (const archetype at, const object op)
1890	{	1867	{
1891	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)	1868	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1892	if (tmp->arch == at)	1869	if (tmp->arch->archname == at->archname)
1893	return tmp;	1870	return tmp;
1894		1871
1895	return NULL;	1872	return NULL;
1896	}	1873	}
1897		1874
…		…
2306		2283
2307	/*	2284	/*
2308	* create clone from object to another	2285	* create clone from object to another
2309	*/	2286	*/
2310	object *	2287	object *
2311	object_create_clone (object *asrc)	2288	object::deep_clone ()
2312	{	2289	{
2313	object dst = 0, tmp, src, prev, *item;	2290	assert (("deep_clone called on non-head object", is_head ()));
2314		2291
2315	if (!asrc)	2292	object *dst = clone ();
2316	return 0;
2317		2293
2318	src = asrc->head_ ();	2294	object *prev = dst;
2319
2320	prev = 0;
2321	for (object *part = src; part; part = part->more)	2295	for (object *part = this->more; part; part = part->more)
2322	{	2296	{
2323	tmp = part->clone ();	2297	object *tmp = part->clone ();
2324	tmp->x -= src->x;
2325	tmp->y -= src->y;
2326
2327	if (!part->head)
2328	{
2329	dst = tmp;
2330	tmp->head = 0;
2331	}
2332	else
2333	tmp->head = dst;	2298	tmp->head = dst;
2334
2335	tmp->more = 0;
2336
2337	if (prev)
2338	prev->more = tmp;	2299	prev->more = tmp;
2339
2340	prev = tmp;	2300	prev = tmp;
2341	}	2301	}
2342		2302
2343	for (item = src->inv; item; item = item->below)	2303	for (object *item = inv; item; item = item->below)
2344	insert_ob_in_ob (object_create_clone (item), dst);	2304	insert_ob_in_ob (item->deep_clone (), dst);
2345		2305
2346	return dst;	2306	return dst;
2347	}	2307	}
2348		2308
2349	/* This returns the first object in who's inventory that	2309	/* This returns the first object in who's inventory that
…		…
2358	return tmp;	2318	return tmp;
2359		2319
2360	return 0;	2320	return 0;
2361	}	2321	}
2362		2322
2363	/* If ob has a field named key, return the link from the list,	2323	const shstr &
2364	* otherwise return NULL.	2324	object::kv_get (const shstr &key) const
2365	*
2366	* key must be a passed in shared string - otherwise, this won't
2367	* do the desired thing.
2368	*/
2369	key_value *
2370	get_ob_key_link (const object ob, const char key)
2371	{	2325	{
2372	for (key_value *link = ob->key_values; link; link = link->next)	2326	for (key_value *kv = key_values; kv; kv = kv->next)
2373	if (link->key == key)	2327	if (kv->key == key)
2374	return link;
2375
2376	return 0;
2377	}
2378
2379	/*
2380	* Returns the value of op has an extra_field for key, or NULL.
2381	*
2382	* The argument doesn't need to be a shared string.
2383	*
2384	* The returned string is shared.
2385	*/
2386	const char *
2387	get_ob_key_value (const object op, const char const key)
2388	{
2389	key_value *link;
2390	shstr_cmp canonical_key (key);
2391
2392	if (!canonical_key)
2393	{
2394	/* 1. There being a field named key on any object
2395	* implies there'd be a shared string to find.
2396	* 2. Since there isn't, no object has this field.
2397	* 3. Therefore, this object doesn't have this field.
2398	*/
2399	return 0;
2400	}
2401
2402	/* This is copied from get_ob_key_link() above -
2403	* only 4 lines, and saves the function call overhead.
2404	*/
2405	for (link = op->key_values; link; link = link->next)
2406	if (link->key == canonical_key)
2407	return link->value;	2328	return kv->value;
2408		2329
2409	return 0;	2330	return shstr_null;
2410	}	2331	}
2411		2332
2412	/*	2333	void
2413	* Updates the canonical_key in op to value.	2334	object::kv_set (const shstr &key, const shstr &value)
2414	*
2415	* canonical_key is a shared string (value doesn't have to be).
2416	*
2417	* Unless add_key is TRUE, it won't add fields, only change the value of existing
2418	* keys.
2419	*
2420	* Returns TRUE on success.
2421	*/
2422	int
2423	set_ob_key_value_s (object op, const shstr & canonical_key, const char value, int add_key)
2424	{	2335	{
2425	key_value field = NULL, last = NULL;	2336	for (key_value *kv = key_values; kv; kv = kv->next)
2426		2337	if (kv->key == key)
2427	for (field = op->key_values; field != NULL; field = field->next)
2428	{
2429	if (field->key != canonical_key)
2430	{	2338	{
2431	last = field;	2339	kv->value = value;
2432	continue;	2340	return;
2433	}	2341	}
2434		2342
2435	if (value)	2343	key_value *kv = new key_value;
2436	field->value = value;	2344
2437	else	2345	kv->next = key_values;
		2346	kv->key = key;
		2347	kv->value = value;
		2348
		2349	key_values = kv;
		2350	}
		2351
		2352	void
		2353	object::kv_del (const shstr &key)
		2354	{
		2355	for (key_value *kvp = &key_values; kvp; kvp = &(*kvp)->next)
		2356	if ((*kvp)->key == key)
2438	{	2357	{
2439	/* Basically, if the archetype has this key set,	2358	key_value kv = kvp;
2440	* we need to store the null value so when we save	2359	kvp = (kvp)->next;
2441	* it, we save the empty value so that when we load,	2360	delete kv;
2442	* we get this value back again.	2361	return;
2443	*/
2444	if (get_ob_key_link (op->arch, canonical_key))
2445	field->value = 0;
2446	else
2447	{
2448	if (last)
2449	last->next = field->next;
2450	else
2451	op->key_values = field->next;
2452
2453	delete field;
2454	}
2455	}	2362	}
2456	return TRUE;
2457	}
2458	/* IF we get here, key doesn't exist */
2459
2460	/* No field, we'll have to add it. */
2461
2462	if (!add_key)
2463	return FALSE;
2464
2465	/* There isn't any good reason to store a null
2466	* value in the key/value list. If the archetype has
2467	* this key, then we should also have it, so shouldn't
2468	* be here. If user wants to store empty strings,
2469	* should pass in ""
2470	*/
2471	if (value == NULL)
2472	return TRUE;
2473
2474	field = new key_value;
2475
2476	field->key = canonical_key;
2477	field->value = value;
2478	/* Usual prepend-addition. */
2479	field->next = op->key_values;
2480	op->key_values = field;
2481
2482	return TRUE;
2483	}
2484
2485	/*
2486	* Updates the key in op to value.
2487	*
2488	* If add_key is FALSE, this will only update existing keys,
2489	* and not add new ones.
2490	* In general, should be little reason FALSE is ever passed in for add_key
2491	*
2492	* Returns TRUE on success.
2493	*/
2494	int
2495	set_ob_key_value (object op, const char key, const char *value, int add_key)
2496	{
2497	shstr key_ (key);
2498
2499	return set_ob_key_value_s (op, key_, value, add_key);
2500	}	2363	}
2501		2364
2502	object::depth_iterator::depth_iterator (object *container)	2365	object::depth_iterator::depth_iterator (object *container)
2503	: iterator_base (container)	2366	: iterator_base (container)
2504	{	2367	{
…		…
2562	&name,	2425	&name,
2563	title ? "\",title:\"" : "",	2426	title ? "\",title:\"" : "",
2564	title ? (const char *)title : "",	2427	title ? (const char *)title : "",
2565	flag_desc (flagdesc, 512), type);	2428	flag_desc (flagdesc, 512), type);
2566		2429
2567	if (!this->flag[FLAG_REMOVED] && env)	2430	if (!flag[FLAG_REMOVED] && env)
2568	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2431	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2569		2432
2570	if (map)	2433	if (map)
2571	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);	2434	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2572		2435
…		…
2602	object::open_container (object *new_container)	2465	object::open_container (object *new_container)
2603	{	2466	{
2604	if (container == new_container)	2467	if (container == new_container)
2605	return;	2468	return;
2606		2469
2607	if (object *old_container = container)	2470	object *old_container = container;
		2471
		2472	if (old_container)
2608	{	2473	{
2609	if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))	2474	if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
2610	return;	2475	return;
2611		2476
2612	#if 0	2477	#if 0
…		…
2614	if (object *closer = old_container->inv)	2479	if (object *closer = old_container->inv)
2615	if (closer->type == CLOSE_CON)	2480	if (closer->type == CLOSE_CON)
2616	closer->destroy ();	2481	closer->destroy ();
2617	#endif	2482	#endif
2618		2483
		2484	// make sure the container is available
		2485	esrv_send_item (this, old_container);
		2486
2619	old_container->flag [FLAG_APPLIED] = 0;	2487	old_container->flag [FLAG_APPLIED] = false;
2620	container = 0;	2488	container = 0;
2621		2489
		2490	// client needs item update to make it work, client bug requires this to be separate
2622	esrv_update_item (UPD_FLAGS, this, old_container);	2491	esrv_update_item (UPD_FLAGS, this, old_container);
		2492
2623	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));	2493	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
2624	play_sound (sound_find ("chest_close"));	2494	play_sound (sound_find ("chest_close"));
2625	}	2495	}
2626		2496
2627	if (new_container)	2497	if (new_container)
…		…
2640	}	2510	}
2641	#endif	2511	#endif
2642		2512
2643	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));	2513	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));
2644		2514
		2515	// make sure the container is available, client bug requires this to be separate
		2516	esrv_send_item (this, new_container);
		2517
2645	new_container->flag [FLAG_APPLIED] = 1;	2518	new_container->flag [FLAG_APPLIED] = true;
2646	container = new_container;	2519	container = new_container;
2647		2520
		2521	// client needs flag change
2648	esrv_update_item (UPD_FLAGS, this, new_container);	2522	esrv_update_item (UPD_FLAGS, this, new_container);
2649	esrv_send_inventory (this, new_container);	2523	esrv_send_inventory (this, new_container);
2650	play_sound (sound_find ("chest_open"));	2524	play_sound (sound_find ("chest_open"));
2651	}	2525	}
		2526	// else if (!old_container->env && contr && contr->ns)
		2527	// contr->ns->floorbox_reset ();
2652	}	2528	}
2653		2529
2654	object *	2530	object *
2655	object::force_find (const shstr name)	2531	object::force_find (const shstr name)
2656	{	2532	{

Diff Legend

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

Comparing deliantra/server/common/object.C (file contents): Revision 1.208 by root, Mon Apr 21 06:16:01 2008 UTC vs. Revision 1.241 by root, Wed May 7 19:19:09 2008 UTC

Diff Legend

Comparing deliantra/server/common/object.C (file contents):
Revision 1.208 by root, Mon Apr 21 06:16:01 2008 UTC vs.
Revision 1.241 by root, Wed May 7 19:19:09 2008 UTC