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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.214 by root, Tue Apr 22 07:01:46 2008 UTC vs.
Revision 1.252 by root, Mon Aug 11 23:23:41 2008 UTC

…		…
139		139
140	/* 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. */
141	static bool	141	static bool
142	compare_ob_value_lists_one (const object wants, const object has)	142	compare_ob_value_lists_one (const object wants, const object has)
143	{	143	{
144	key_value *wants_field;
145
146	/* 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
147	* 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
148	* different structure or at least keep the lists sorted...	146	* different structure or at least keep the lists sorted...
149	*/	147	*/
150		148
151	/* For each field in wants, */	149	/* For each field in wants, */
152	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)
153	{	151	if (has->kv_get (kv->key) != kv->value)
154	key_value *has_field;	152	return false;
155
156	/* Look for a field in has with the same key. */
157	has_field = get_ob_key_link (has, wants_field->key);
158
159	if (!has_field)
160	return 0; /* No field with that name. */
161
162	/* Found the matching field. */
163	if (has_field->value != wants_field->value)
164	return 0; /* Values don't match, so this half of the comparison is false. */
165
166	/* If we get here, we found a match. Now for the next field in wants. */
167	}
168		153
169	/* 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. */
170	return 1;	155	return true;
171	}	156	}
172		157
173	/* Returns TRUE if ob1 has the same key_values as ob2. */	158	/* Returns TRUE if ob1 has the same key_values as ob2. */
174	static bool	159	static bool
175	compare_ob_value_lists (const object ob1, const object ob2)	160	compare_ob_value_lists (const object ob1, const object ob2)
176	{	161	{
177	/* 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,
178	* so we need to run the comparison twice. :(	163	* so we need to run the comparison twice. :(
179	*/	164	*/
180	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);
181	}	167	}
182		168
183	/* 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
184	* they can be merged together.	170	* they can be merged together.
185	*	171	*
…		…
220	SET_FLAG (ob1, FLAG_BEEN_APPLIED);	206	SET_FLAG (ob1, FLAG_BEEN_APPLIED);
221		207
222	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))	208	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))
223	SET_FLAG (ob2, FLAG_BEEN_APPLIED);	209	SET_FLAG (ob2, FLAG_BEEN_APPLIED);
224		210
225	if (ob1->arch->name != ob2->arch->name	211	if (ob1->arch->archname != ob2->arch->archname
226	\|\| ob1->name != ob2->name	212	\|\| ob1->name != ob2->name
227	\|\| ob1->title != ob2->title	213	\|\| ob1->title != ob2->title
228	\|\| ob1->msg != ob2->msg	214	\|\| ob1->msg != ob2->msg
229	\|\| ob1->weight != ob2->weight	215	\|\| ob1->weight != ob2->weight
230	\|\| ob1->attacktype != ob2->attacktype	216	\|\| ob1->attacktype != ob2->attacktype
231	\|\| ob1->magic != ob2->magic	217	\|\| ob1->magic != ob2->magic
232	\|\| ob1->slaying != ob2->slaying	218	\|\| ob1->slaying != ob2->slaying
233	\|\| ob1->skill != ob2->skill	219	\|\| ob1->skill != ob2->skill
234	\|\| ob1->value != ob2->value	220	\|\| ob1->value != ob2->value
235	\|\| ob1->animation_id != ob2->animation_id	221	\|\| ob1->animation_id != ob2->animation_id
		222	\|\| (ob1->face != ob2->face && !ob1->animation_id) // face and animation are dependent on each other
236	\|\| ob1->client_type != ob2->client_type	223	\|\| ob1->client_type != ob2->client_type
237	\|\| ob1->materialname != ob2->materialname	224	\|\| ob1->materialname != ob2->materialname
238	\|\| ob1->lore != ob2->lore	225	\|\| ob1->lore != ob2->lore
239	\|\| ob1->subtype != ob2->subtype	226	\|\| ob1->subtype != ob2->subtype
240	\|\| ob1->move_type != ob2->move_type	227	\|\| ob1->move_type != ob2->move_type
…		…
334		321
335	// find player who can see this object	322	// find player who can see this object
336	object *	323	object *
337	object::visible_to () const	324	object::visible_to () const
338	{	325	{
339	if (!flag [FLAG_REMOVED])	326	if (client_visible () && !flag [FLAG_REMOVED])
340	{	327	{
341	// see if we are in a container of sorts	328	// see if we are in a container of sorts
342	if (env)	329	if (env)
343	{	330	{
344	// the player inventory itself is always visible	331	// the player inventory itself is always visible
…		…
358	else	345	else
359	{	346	{
360	// maybe there is a player standing on the same mapspace	347	// maybe there is a player standing on the same mapspace
361	// this will catch the case where "this" is a player	348	// this will catch the case where "this" is a player
362	if (object *pl = ms ().player ())	349	if (object *pl = ms ().player ())
		350	if ((!pl->container && pl->contr->ns && !pl->contr->ns->update_look)
		351	\|\| this == pl->container)
363	return pl;	352	return pl;
364	}	353	}
365	}	354	}
366		355
367	return 0;	356	return 0;
368	}	357	}
369		358
370	// adjust weight per container type ("of holding")	359	// adjust weight per container type ("of holding")
371	static sint32	360	static sint32
372	weight_adjust (object *op, sint32 weight)	361	weight_adjust_for (object *op, sint32 weight)
373	{	362	{
374	return op->type == CONTAINER	363	return op->type == CONTAINER
375	? lerp (weight, 0, 100, 0, 100 - op->stats.Str)	364	? lerp (weight, 0, 100, 0, 100 - op->stats.Str)
376	: weight;	365	: weight;
377	}	366	}
…		…
383	static void	372	static void
384	adjust_weight (object *op, sint32 weight)	373	adjust_weight (object *op, sint32 weight)
385	{	374	{
386	while (op)	375	while (op)
387	{	376	{
		377	// adjust by actual difference to account for rounding errors
		378	// i.e. (w2 - w1) / f != w2 / f - w1 / f and the latter is correct
388	weight = weight_adjust (op, weight);	379	weight = weight_adjust_for (op, op->carrying)
		380	- weight_adjust_for (op, op->carrying - weight);
389		381
390	if (!weight)	382	if (!weight)
391	return;	383	return;
392		384
393	op->carrying += weight;	385	op->carrying += weight;
394		386
395	if (object *pl = op->visible_to ())	387	if (object *pl = op->visible_to ())
		388	if (pl != op) // player is handled lazily
396	esrv_update_item (UPD_WEIGHT, pl, op);	389	esrv_update_item (UPD_WEIGHT, pl, op);
397		390
398	op = op->env;	391	op = op->env;
399	}	392	}
400	}	393	}
401		394
…		…
415	op->update_weight ();	408	op->update_weight ();
416		409
417	sum += op->total_weight ();	410	sum += op->total_weight ();
418	}	411	}
419		412
420	sum = weight_adjust (this, sum);	413	sum = weight_adjust_for (this, sum);
421		414
422	if (sum != carrying)	415	if (sum != carrying)
423	{	416	{
424	carrying = sum;	417	carrying = sum;
425		418
426	if (object *pl = visible_to ())	419	if (object *pl = visible_to ())
		420	if (pl != this) // player is handled lazily
427	esrv_update_item (UPD_WEIGHT, pl, this);	421	esrv_update_item (UPD_WEIGHT, pl, this);
428	}	422	}
429	}	423	}
430		424
431	/*	425	/*
432	* Used by: Server DM commands: dumpbelow, dump. Some error messages.	426	* Used by: Server DM commands: dumpbelow, dump. Some error messages.
…		…
486	*/	480	*/
487	object *	481	object *
488	find_object_name (const char *str)	482	find_object_name (const char *str)
489	{	483	{
490	shstr_cmp str_ (str);	484	shstr_cmp str_ (str);
491	object *op;
492		485
		486	if (str_)
493	for_all_objects (op)	487	for_all_objects (op)
494	if (op->name == str_)	488	if (op->name == str_)
495	break;	489	return op;
496		490
497	return op;	491	return 0;
498	}	492	}
499		493
500	/*	494	/*
501	* Sets the owner and sets the skill and exp pointers to owner's current	495	* Sets the owner and sets the skill and exp pointers to owner's current
502	* skill and experience objects.	496	* skill and experience objects.
…		…
600	}	594	}
601		595
602	op->key_values = 0;	596	op->key_values = 0;
603	}	597	}
604		598
605	object &	599	/*
606	object::operator =(const object &src)	600	* copy_to first frees everything allocated by the dst object,
		601	* and then copies the contents of itself into the second
		602	* object, allocating what needs to be allocated. Basically, any
		603	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
		604	* if the first object is freed, the pointers in the new object
		605	* will point at garbage.
		606	*/
		607	void
		608	object::copy_to (object *dst)
607	{	609	{
608	bool is_freed = flag [FLAG_FREED];	610	dst->remove ();
609	bool is_removed = flag [FLAG_REMOVED];
610
611	(object_copy )this = src;	611	(object_copy )dst = *this;
612
613	flag [FLAG_FREED] = is_freed;
614	flag [FLAG_REMOVED] = is_removed;	612	dst->flag [FLAG_REMOVED] = true;
615		613
616	/* Copy over key_values, if any. */	614	/* Copy over key_values, if any. */
617	if (src.key_values)	615	if (key_values)
618	{	616	{
619	key_value *tail = 0;	617	key_value *tail = 0;
620	key_values = 0;	618	dst->key_values = 0;
621		619
622	for (key_value *i = src.key_values; i; i = i->next)	620	for (key_value *i = key_values; i; i = i->next)
623	{	621	{
624	key_value *new_link = new key_value;	622	key_value *new_link = new key_value;
625		623
626	new_link->next = 0;	624	new_link->next = 0;
627	new_link->key = i->key;	625	new_link->key = i->key;
628	new_link->value = i->value;	626	new_link->value = i->value;
629		627
630	/* Try and be clever here, too. */	628	/* Try and be clever here, too. */
631	if (!key_values)	629	if (!dst->key_values)
632	{	630	{
633	key_values = new_link;	631	dst->key_values = new_link;
634	tail = new_link;	632	tail = new_link;
635	}	633	}
636	else	634	else
637	{	635	{
638	tail->next = new_link;	636	tail->next = new_link;
639	tail = new_link;	637	tail = new_link;
640	}	638	}
641	}	639	}
642	}	640	}
643	}
644
645	/*
646	* copy_to first frees everything allocated by the dst object,
647	* and then copies the contents of itself into the second
648	* object, allocating what needs to be allocated. Basically, any
649	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
650	* if the first object is freed, the pointers in the new object
651	* will point at garbage.
652	*/
653	void
654	object::copy_to (object *dst)
655	{
656	dst = this;
657		641
658	if (speed < 0)	642	if (speed < 0)
659	dst->speed_left -= rndm ();	643	dst->speed_left -= rndm ();
660		644
661	dst->set_speed (dst->speed);	645	dst->set_speed (dst->speed);
…		…
683	object *	667	object *
684	object::clone ()	668	object::clone ()
685	{	669	{
686	object *neu = create ();	670	object *neu = create ();
687	copy_to (neu);	671	copy_to (neu);
		672	neu->map = map; // not copied by copy_to
688	return neu;	673	return neu;
689	}	674	}
690		675
691	/*	676	/*
692	* If an object with the IS_TURNABLE() flag needs to be turned due	677	* If an object with the IS_TURNABLE() flag needs to be turned due
…		…
743	* UP_OBJ_FACE: only the objects face has changed.	728	* UP_OBJ_FACE: only the objects face has changed.
744	*/	729	*/
745	void	730	void
746	update_object (object *op, int action)	731	update_object (object *op, int action)
747	{	732	{
748	if (op == NULL)	733	if (!op)
749	{	734	{
750	/* this should never happen */	735	/* this should never happen */
751	LOG (llevDebug, "update_object() called for NULL object.\n");	736	LOG (llevError \| logBacktrace, "update_object() called for NULL object.\n");
752	return;	737	return;
753	}	738	}
754		739
755	if (op->env)	740	if (!op->is_on_map ())
756	{	741	{
757	/* Animation is currently handled by client, so nothing	742	/* Animation is currently handled by client, so nothing
758	* to do in this case.	743	* to do in this case.
759	*/	744	*/
760	return;	745	return;
761	}	746	}
762
763	/* If the map is saving, don't do anything as everything is
764	* going to get freed anyways.
765	*/
766	if (!op->map \|\| op->map->in_memory == MAP_SAVING)
767	return;
768		747
769	/* make sure the object is within map boundaries */	748	/* make sure the object is within map boundaries */
770	if (op->x < 0 \|\| op->x >= op->map->width \|\| op->y < 0 \|\| op->y >= op->map->height)	749	if (op->x < 0 \|\| op->x >= op->map->width \|\| op->y < 0 \|\| op->y >= op->map->height)
771	{	750	{
772	LOG (llevError, "update_object() called for object out of map!\n");	751	LOG (llevError, "update_object() called for object out of map!\n");
…		…
783	else if (action == UP_OBJ_INSERT)	762	else if (action == UP_OBJ_INSERT)
784	{	763	{
785	// this is likely overkill, TODO: revisit (schmorp)	764	// this is likely overkill, TODO: revisit (schmorp)
786	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))	765	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
787	\|\| (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))	766	\|\| (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))
788	\|\| (op->type == PLAYER && !(m.flags_ & P_PLAYER))
789	\|\| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))	767	\|\| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
790	\|\| (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))	768	\|\| (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))
791	\|\| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))	769	\|\| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))
792	\|\| (m.move_on \| op->move_on ) != m.move_on	770	\|\| (m.move_on \| op->move_on ) != m.move_on
793	\|\| (m.move_off \| op->move_off ) != m.move_off	771	\|\| (m.move_off \| op->move_off ) != m.move_off
794	\|\| (m.move_slow \| op->move_slow) != m.move_slow	772	\|\| (m.move_slow \| op->move_slow) != m.move_slow
795	/* This isn't perfect, but I don't expect a lot of objects to	773	/* This isn't perfect, but I don't expect a lot of objects to
796	* to have move_allow right now.	774	* have move_allow right now.
797	*/	775	*/
798	\|\| ((m.move_block \| op->move_block) & ~op->move_allow) != m.move_block	776	\|\| ((m.move_block \| op->move_block) & ~op->move_allow) != m.move_block
799	\|\| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)	777	\|\| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)
800	m.flags_ = 0;	778	m.flags_ = 0;
801	}	779	}
…		…
915	object::destroy_inv (bool drop_to_ground)	893	object::destroy_inv (bool drop_to_ground)
916	{	894	{
917	// need to check first, because the checks below might segfault	895	// need to check first, because the checks below might segfault
918	// as we might be on an invalid mapspace and crossfire code	896	// as we might be on an invalid mapspace and crossfire code
919	// is too buggy to ensure that the inventory is empty.	897	// is too buggy to ensure that the inventory is empty.
920	// corollary: if you create arrows etc. with stuff in tis inventory,	898	// corollary: if you create arrows etc. with stuff in its inventory,
921	// cf will crash below with off-map x and y	899	// cf will crash below with off-map x and y
922	if (!inv)	900	if (!inv)
923	return;	901	return;
924		902
925	/* Only if the space blocks everything do we not process -	903	/* Only if the space blocks everything do we not process -
…		…
927	* drop on that space.	905	* drop on that space.
928	*/	906	*/
929	if (!drop_to_ground	907	if (!drop_to_ground
930	\|\| !map	908	\|\| !map
931	\|\| map->in_memory != MAP_ACTIVE	909	\|\| map->in_memory != MAP_ACTIVE
932	\|\| map->nodrop	910	\|\| map->no_drop
933	\|\| ms ().move_block == MOVE_ALL)	911	\|\| ms ().move_block == MOVE_ALL)
934	{	912	{
935	while (inv)	913	while (inv)
936	{
937	inv->destroy_inv (drop_to_ground);
938	inv->destroy ();	914	inv->destroy (true);
939	}
940	}	915	}
941	else	916	else
942	{ /* Put objects in inventory onto this space */	917	{ /* Put objects in inventory onto this space */
943	while (inv)	918	while (inv)
944	{	919	{
…		…
948	\|\| op->flag [FLAG_NO_DROP]	923	\|\| op->flag [FLAG_NO_DROP]
949	\|\| op->type == RUNE	924	\|\| op->type == RUNE
950	\|\| op->type == TRAP	925	\|\| op->type == TRAP
951	\|\| op->flag [FLAG_IS_A_TEMPLATE]	926	\|\| op->flag [FLAG_IS_A_TEMPLATE]
952	\|\| op->flag [FLAG_DESTROY_ON_DEATH])	927	\|\| op->flag [FLAG_DESTROY_ON_DEATH])
953	op->destroy ();	928	op->destroy (true);
954	else	929	else
955	map->insert (op, x, y);	930	map->insert (op, x, y);
956	}	931	}
957	}	932	}
958	}	933	}
…		…
962	object *op = new object;	937	object *op = new object;
963	op->link ();	938	op->link ();
964	return op;	939	return op;
965	}	940	}
966		941
		942	static struct freed_map : maptile
		943	{
		944	freed_map ()
		945	{
		946	path = "<freed objects map>";
		947	name = "/internal/freed_objects_map";
		948	width = 3;
		949	height = 3;
		950	no_drop = 1;
		951	no_reset = 1;
		952
		953	alloc ();
		954	in_memory = MAP_ACTIVE;
		955	}
		956
		957	~freed_map ()
		958	{
		959	destroy ();
		960	}
		961	} freed_map; // freed objects are moved here to avoid crashes
		962
967	void	963	void
968	object::do_destroy ()	964	object::do_destroy ()
969	{	965	{
970	if (flag [FLAG_IS_LINKED])	966	if (flag [FLAG_IS_LINKED])
971	remove_button_link (this);	967	remove_button_link (this);
…		…
975		971
976	remove ();	972	remove ();
977		973
978	attachable::do_destroy ();	974	attachable::do_destroy ();
979		975
980	destroy_inv (true);
981
982	deactivate ();	976	deactivate ();
983	unlink ();	977	unlink ();
984		978
985	flag [FLAG_FREED] = 1;	979	flag [FLAG_FREED] = 1;
986		980
987	// hack to ensure that freed objects still have a valid map	981	// hack to ensure that freed objects still have a valid map
988	{
989	static maptile *freed_map; // freed objects are moved here to avoid crashes
990
991	if (!freed_map)
992	{
993	freed_map = new maptile;
994
995	freed_map->path = "<freed objects map>";
996	freed_map->name = "/internal/freed_objects_map";
997	freed_map->width = 3;
998	freed_map->height = 3;
999	freed_map->nodrop = 1;
1000
1001	freed_map->alloc ();
1002	freed_map->in_memory = MAP_ACTIVE;
1003	}
1004
1005	map = freed_map;	982	map = &freed_map;
1006	x = 1;	983	x = 1;
1007	y = 1;	984	y = 1;
1008	}
1009		985
1010	if (more)	986	if (more)
1011	{	987	{
1012	more->destroy ();	988	more->destroy ();
1013	more = 0;	989	more = 0;
…		…
1026	object::destroy (bool destroy_inventory)	1002	object::destroy (bool destroy_inventory)
1027	{	1003	{
1028	if (destroyed ())	1004	if (destroyed ())
1029	return;	1005	return;
1030		1006
		1007	if (!is_head () && !head->destroyed ())
		1008	{
		1009	LOG (llevError \| logBacktrace, "tried to destroy the tail of an object");
		1010	head->destroy (destroy_inventory);
		1011	return;
		1012	}
		1013
1031	if (destroy_inventory)	1014	destroy_inv (!destroy_inventory);
1032	destroy_inv (false);
1033		1015
1034	if (is_head ())	1016	if (is_head ())
1035	if (sound_destroy)	1017	if (sound_destroy)
1036	play_sound (sound_destroy);	1018	play_sound (sound_destroy);
1037	else if (flag [FLAG_MONSTER])	1019	else if (flag [FLAG_MONSTER])
…		…
1056	if (flag [FLAG_REMOVED])	1038	if (flag [FLAG_REMOVED])
1057	return;	1039	return;
1058		1040
1059	INVOKE_OBJECT (REMOVE, this);	1041	INVOKE_OBJECT (REMOVE, this);
1060		1042
1061	if (object *pl = visible_to ())
1062	esrv_del_item (pl->contr, count);
1063
1064	flag [FLAG_REMOVED] = true;	1043	flag [FLAG_REMOVED] = true;
1065		1044
1066	if (more)	1045	if (more)
1067	more->remove ();	1046	more->remove ();
1068		1047
…		…
1070	* In this case, the object to be removed is in someones	1049	* In this case, the object to be removed is in someones
1071	* inventory.	1050	* inventory.
1072	*/	1051	*/
1073	if (env)	1052	if (env)
1074	{	1053	{
		1054	flag [FLAG_REMOVED] = false; // hack around the issue of visible_to checking flag_removed
		1055	if (object *pl = visible_to ())
		1056	esrv_del_item (pl->contr, count);
		1057	flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed
		1058
1075	adjust_weight (env, -total_weight ());	1059	adjust_weight (env, -total_weight ());
1076
1077	*(above ? &above->below : &env->inv) = below;
1078
1079	if (below)
1080	below->above = above;
1081		1060
1082	/* we set up values so that it could be inserted into	1061	/* we set up values so that it could be inserted into
1083	* the map, but we don't actually do that - it is up	1062	* the map, but we don't actually do that - it is up
1084	* to the caller to decide what we want to do.	1063	* to the caller to decide what we want to do.
1085	*/	1064	*/
1086	map = env->map;	1065	map = env->map;
1087	x = env->x;	1066	x = env->x;
1088	y = env->y;	1067	y = env->y;
		1068
		1069	// make sure cmov optimisation is applicable
		1070	*(above ? &above->below : &env->inv) = below;
		1071	*(below ? &below->above : &above ) = above; // &above is just a dummy
		1072
1089	above = 0;	1073	above = 0;
1090	below = 0;	1074	below = 0;
1091	env = 0;	1075	env = 0;
1092		1076
1093	/* NO_FIX_PLAYER is set when a great many changes are being	1077	/* NO_FIX_PLAYER is set when a great many changes are being
…		…
1097	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1081	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1098	otmp->update_stats ();	1082	otmp->update_stats ();
1099	}	1083	}
1100	else if (map)	1084	else if (map)
1101	{	1085	{
1102	if (type == PLAYER)
1103	{
1104	// leaving a spot always closes any open container on the ground
1105	if (container && !container->env)
1106	// this causes spurious floorbox updates, but it ensures
1107	// that the CLOSE event is being sent.
1108	close_container ();
1109
1110	--map->players;
1111	map->touch ();
1112	}
1113
1114	map->dirty = true;	1086	map->dirty = true;
1115	mapspace &ms = this->ms ();	1087	mapspace &ms = this->ms ();
1116		1088
		1089	if (object *pl = ms.player ())
		1090	{
		1091	if (type == PLAYER) // this == pl(!)
		1092	{
		1093	// leaving a spot always closes any open container on the ground
		1094	if (container && !container->env)
		1095	// this causes spurious floorbox updates, but it ensures
		1096	// that the CLOSE event is being sent.
		1097	close_container ();
		1098
		1099	--map->players;
		1100	map->touch ();
		1101	}
		1102	else if (pl->container == this)
		1103	{
		1104	// removing a container should close it
		1105	close_container ();
		1106	}
		1107
		1108	esrv_del_item (pl->contr, count);
		1109	}
		1110
1117	/* link the object above us */	1111	/* link the object above us */
1118	if (above)	1112	// re-link, make sure compiler can easily use cmove
1119	above->below = below;	1113	*(above ? &above->below : &ms.top) = below;
1120	else	1114	*(below ? &below->above : &ms.bot) = above;
1121	ms.top = below; /* we were top, set new top */
1122
1123	/* Relink the object below us, if there is one */
1124	if (below)
1125	below->above = above;
1126	else
1127	{
1128	/* Nothing below, which means we need to relink map object for this space
1129	* use translated coordinates in case some oddness with map tiling is
1130	* evident
1131	*/
1132	if (GET_MAP_OB (map, x, y) != this)
1133	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 ());
1134
1135	ms.bot = above; /* goes on above it. */
1136	}
1137		1115
1138	above = 0;	1116	above = 0;
1139	below = 0;	1117	below = 0;
1140		1118
1141	if (map->in_memory == MAP_SAVING)	1119	if (map->in_memory == MAP_SAVING)
…		…
1150	* removed (most likely destroyed), update the player view	1128	* removed (most likely destroyed), update the player view
1151	* appropriately.	1129	* appropriately.
1152	*/	1130	*/
1153	pl->close_container ();	1131	pl->close_container ();
1154		1132
		1133	//TODO: the floorbox prev/next might need updating
		1134	//esrv_del_item (pl->contr, count);
		1135	//TODO: update floorbox to preserve ordering
		1136	if (pl->contr->ns)
1155	pl->contr->ns->floorbox_update ();	1137	pl->contr->ns->floorbox_update ();
1156	}	1138	}
1157		1139
1158	for (tmp = ms.bot; tmp; tmp = tmp->above)	1140	for (tmp = ms.bot; tmp; tmp = tmp->above)
1159	{	1141	{
1160	/* No point updating the players look faces if he is the object	1142	/* No point updating the players look faces if he is the object
…		…
1252	* job preparing multi-part monsters.	1234	* job preparing multi-part monsters.
1253	*/	1235	*/
1254	object *	1236	object *
1255	insert_ob_in_map_at (object op, maptile m, object *originator, int flag, int x, int y)	1237	insert_ob_in_map_at (object op, maptile m, object *originator, int flag, int x, int y)
1256	{	1238	{
		1239	op->remove ();
		1240
1257	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)	1241	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1258	{	1242	{
1259	tmp->x = x + tmp->arch->x;	1243	tmp->x = x + tmp->arch->x;
1260	tmp->y = y + tmp->arch->y;	1244	tmp->y = y + tmp->arch->y;
1261	}	1245	}
…		…
1284	* just 'op' otherwise	1268	* just 'op' otherwise
1285	*/	1269	*/
1286	object *	1270	object *
1287	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)
1288	{	1272	{
1289	assert (!op->flag [FLAG_FREED]);	1273	if (op->is_on_map ())
		1274	{
		1275	LOG (llevError, "insert_ob_in_map called for object already on map");
		1276	abort ();
		1277	}
1290		1278
1291	object top, floor = NULL;	1279	if (op->env)
1292		1280	{
		1281	LOG (llevError, "insert_ob_in_map called for object in an inventory (proceeding)");
1293	op->remove ();	1282	op->remove ();
		1283	}
		1284
		1285	if (op->face && !face_info (op->face))//D TODO: remove soon
		1286	{//D
		1287	LOG (llevError \| logBacktrace, "op->face out of bounds: %s", op->debug_desc ());//D
		1288	op->face = 1;//D
		1289	}//D
1294		1290
1295	/* Ideally, the caller figures this out. However, it complicates a lot	1291	/* Ideally, the caller figures this out. However, it complicates a lot
1296	* of areas of callers (eg, anything that uses find_free_spot would now	1292	* of areas of callers (eg, anything that uses find_free_spot would now
1297	* need extra work	1293	* need extra work
1298	*/	1294	*/
1299	if (!xy_normalise (m, op->x, op->y))	1295	if (!xy_normalise (m, op->x, op->y))
1300	{	1296	{
1301	op->destroy ();	1297	op->head_ ()->destroy (1);// remove head_ once all tail object destroyers found
1302	return 0;	1298	return 0;
1303	}	1299	}
1304		1300
1305	if (object *more = op->more)	1301	if (object *more = op->more)
1306	if (!insert_ob_in_map (more, m, originator, flag))	1302	if (!insert_ob_in_map (more, m, originator, flag))
…		…
1315	*/	1311	*/
1316	if (op->nrof && !(flag & INS_NO_MERGE))	1312	if (op->nrof && !(flag & INS_NO_MERGE))
1317	for (object *tmp = ms.bot; tmp; tmp = tmp->above)	1313	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1318	if (object::can_merge (op, tmp))	1314	if (object::can_merge (op, tmp))
1319	{	1315	{
		1316	// TODO: we actually want to update tmp, not op,
		1317	// but some caller surely breaks when we return tmp
		1318	// from here :/
1320	op->nrof += tmp->nrof;	1319	op->nrof += tmp->nrof;
1321	tmp->destroy (1);	1320	tmp->destroy (1);
1322	}	1321	}
1323		1322
1324	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1323	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
…		…
1333	{	1332	{
1334	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");	1333	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");
1335	abort ();	1334	abort ();
1336	}	1335	}
1337		1336
		1337	if (!originator->is_on_map ())
		1338	LOG (llevDebug \| logBacktrace, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map",
		1339	op->debug_desc (), originator->debug_desc ());
		1340
1338	op->above = originator;	1341	op->above = originator;
1339	op->below = originator->below;	1342	op->below = originator->below;
1340
1341	if (op->below)
1342	op->below->above = op;
1343	else
1344	ms.bot = op;
1345
1346	/* since below originator, no need to update top */
1347	originator->below = op;	1343	originator->below = op;
		1344
		1345	*(op->below ? &op->below->above : &ms.bot) = op;
1348	}	1346	}
1349	else	1347	else
1350	{	1348	{
1351	top = ms.bot;	1349	object *floor = 0;
		1350	object *top = ms.top;
1352		1351
1353	/* If there are other objects, then */	1352	/* If there are other objects, then */
1354	if (top)	1353	if (top)
1355	{	1354	{
1356	object *last = 0;
1357
1358	/*	1355	/*
1359	* If there are multiple objects on this space, we do some trickier handling.	1356	* If there are multiple objects on this space, we do some trickier handling.
1360	* We've already dealt with merging if appropriate.	1357	* We've already dealt with merging if appropriate.
1361	* Generally, we want to put the new object on top. But if	1358	* Generally, we want to put the new object on top. But if
1362	* flag contains INS_ABOVE_FLOOR_ONLY, once we find the last	1359	* flag contains INS_ABOVE_FLOOR_ONLY, once we find the last
…		…
1365	* once we get to them. This reduces the need to traverse over all of	1362	* once we get to them. This reduces the need to traverse over all of
1366	* them when adding another one - this saves quite a bit of cpu time	1363	* them when adding another one - this saves quite a bit of cpu time
1367	* when lots of spells are cast in one area. Currently, it is presumed	1364	* when lots of spells are cast in one area. Currently, it is presumed
1368	* that flying non pickable objects are spell objects.	1365	* that flying non pickable objects are spell objects.
1369	*/	1366	*/
1370	for (top = ms.bot; top; top = top->above)	1367	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1371	{	1368	{
1372	if (QUERY_FLAG (top, FLAG_IS_FLOOR) \|\| QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))	1369	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) \|\| QUERY_FLAG (tmp, FLAG_OVERLAY_FLOOR))
1373	floor = top;	1370	floor = tmp;
1374		1371
1375	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW \| MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))	1372	if (QUERY_FLAG (tmp, FLAG_NO_PICK) && (tmp->move_type & (MOVE_FLY_LOW \| MOVE_FLY_HIGH)) && !QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1376	{	1373	{
1377	/* We insert above top, so we want this object below this */	1374	/* We insert above top, so we want this object below this */
1378	top = top->below;	1375	top = tmp->below;
1379	break;	1376	break;
1380	}	1377	}
1381		1378
1382	last = top;	1379	top = tmp;
1383	}	1380	}
1384
1385	/* Don't want top to be NULL, so set it to the last valid object */
1386	top = last;
1387		1381
1388	/* We let update_position deal with figuring out what the space	1382	/* We let update_position deal with figuring out what the space
1389	* looks like instead of lots of conditions here.	1383	* looks like instead of lots of conditions here.
1390	* makes things faster, and effectively the same result.	1384	* makes things faster, and effectively the same result.
1391	*/	1385	*/
…		…
1398	*/	1392	*/
1399	if (!(flag & INS_ON_TOP)	1393	if (!(flag & INS_ON_TOP)
1400	&& ms.flags () & P_BLOCKSVIEW	1394	&& ms.flags () & P_BLOCKSVIEW
1401	&& (op->face && !faces [op->face].visibility))	1395	&& (op->face && !faces [op->face].visibility))
1402	{	1396	{
		1397	object *last;
		1398
1403	for (last = top; last != floor; last = last->below)	1399	for (last = top; last != floor; last = last->below)
1404	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1400	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1405	break;	1401	break;
1406		1402
1407	/* Check to see if we found the object that blocks view,	1403	/* Check to see if we found the object that blocks view,
…		…
1415	} /* If objects on this space */	1411	} /* If objects on this space */
1416		1412
1417	if (flag & INS_ABOVE_FLOOR_ONLY)	1413	if (flag & INS_ABOVE_FLOOR_ONLY)
1418	top = floor;	1414	top = floor;
1419		1415
1420	/* Top is the object that our object (op) is going to get inserted above.	1416	// insert object above top, or bottom-most if top = 0
1421	*/
1422
1423	/* First object on this space */
1424	if (!top)	1417	if (!top)
1425	{	1418	{
		1419	op->below = 0;
1426	op->above = ms.bot;	1420	op->above = ms.bot;
1427
1428	if (op->above)
1429	op->above->below = op;
1430
1431	op->below = 0;
1432	ms.bot = op;	1421	ms.bot = op;
		1422
		1423	*(op->above ? &op->above->below : &ms.top) = op;
1433	}	1424	}
1434	else	1425	else
1435	{ /* get inserted into the stack above top */	1426	{
1436	op->above = top->above;	1427	op->above = top->above;
1437
1438	if (op->above)
1439	op->above->below = op;	1428	top->above = op;
1440		1429
1441	op->below = top;	1430	op->below = top;
1442	top->above = op;	1431	*(op->above ? &op->above->below : &ms.top) = op;
1443	}	1432	}
1444		1433	}
1445	if (!op->above)
1446	ms.top = op;
1447	} /* else not INS_BELOW_ORIGINATOR */
1448		1434
1449	if (op->type == PLAYER)	1435	if (op->type == PLAYER)
1450	{	1436	{
1451	op->contr->do_los = 1;	1437	op->contr->do_los = 1;
1452	++op->map->players;	1438	++op->map->players;
…		…
1454	}	1440	}
1455		1441
1456	op->map->dirty = true;	1442	op->map->dirty = true;
1457		1443
1458	if (object *pl = ms.player ())	1444	if (object *pl = ms.player ())
		1445	//TODO: the floorbox prev/next might need updating
		1446	//esrv_send_item (pl, op);
		1447	//TODO: update floorbox to preserve ordering
		1448	if (pl->contr->ns)
1459	pl->contr->ns->floorbox_update ();	1449	pl->contr->ns->floorbox_update ();
1460		1450
1461	/* If this object glows, it may affect lighting conditions that are	1451	/* If this object glows, it may affect lighting conditions that are
1462	* visible to others on this map. But update_all_los is really	1452	* visible to others on this map. But update_all_los is really
1463	* an inefficient way to do this, as it means los for all players	1453	* an inefficient way to do this, as it means los for all players
1464	* on the map will get recalculated. The players could very well	1454	* on the map will get recalculated. The players could very well
…		…
1544	if (!nr)	1534	if (!nr)
1545	return true;	1535	return true;
1546		1536
1547	nr = min (nr, nrof);	1537	nr = min (nr, nrof);
1548		1538
		1539	if (nrof > nr)
		1540	{
1549	nrof -= nr;	1541	nrof -= nr;
1550
1551	if (nrof)
1552	{
1553	adjust_weight (env, -weight * nr); // carrying == 0	1542	adjust_weight (env, -weight * max (1, nr)); // carrying == 0
1554		1543
1555	if (object *pl = visible_to ())	1544	if (object *pl = visible_to ())
1556	esrv_update_item (UPD_NROF, pl, this);	1545	esrv_update_item (UPD_NROF, pl, this);
1557		1546
1558	return true;	1547	return true;
1559	}	1548	}
1560	else	1549	else
1561	{	1550	{
1562	destroy (1);	1551	destroy ();
1563	return false;	1552	return false;
1564	}	1553	}
1565	}	1554	}
1566		1555
1567	/*	1556	/*
…		…
1584	}	1573	}
1585	else	1574	else
1586	{	1575	{
1587	decrease (nr);	1576	decrease (nr);
1588		1577
1589	object *op = object_create_clone (this);	1578	object *op = deep_clone ();
1590	op->nrof = nr;	1579	op->nrof = nr;
1591	return op;	1580	return op;
1592	}	1581	}
1593	}	1582	}
1594		1583
…		…
1815	LOG (llevError, "Present_arch called outside map.\n");	1804	LOG (llevError, "Present_arch called outside map.\n");
1816	return NULL;	1805	return NULL;
1817	}	1806	}
1818		1807
1819	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)	1808	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1820	if (tmp->arch == at)	1809	if (tmp->arch->archname == at->archname)
1821	return tmp;	1810	return tmp;
1822		1811
1823	return NULL;	1812	return NULL;
1824	}	1813	}
1825		1814
…		…
1889	* The first matching object is returned, or NULL if none.	1878	* The first matching object is returned, or NULL if none.
1890	*/	1879	*/
1891	object *	1880	object *
1892	present_arch_in_ob (const archetype at, const object op)	1881	present_arch_in_ob (const archetype at, const object op)
1893	{	1882	{
1894	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)	1883	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1895	if (tmp->arch == at)	1884	if (tmp->arch->archname == at->archname)
1896	return tmp;	1885	return tmp;
1897		1886
1898	return NULL;	1887	return NULL;
1899	}	1888	}
1900		1889
…		…
2309		2298
2310	/*	2299	/*
2311	* create clone from object to another	2300	* create clone from object to another
2312	*/	2301	*/
2313	object *	2302	object *
2314	object_create_clone (object *asrc)	2303	object::deep_clone ()
2315	{	2304	{
2316	object dst = 0, tmp, src, prev, *item;	2305	assert (("deep_clone called on non-head object", is_head ()));
2317		2306
2318	if (!asrc)	2307	object *dst = clone ();
2319	return 0;
2320		2308
2321	src = asrc->head_ ();	2309	object *prev = dst;
2322
2323	prev = 0;
2324	for (object *part = src; part; part = part->more)	2310	for (object *part = this->more; part; part = part->more)
2325	{	2311	{
2326	tmp = part->clone ();	2312	object *tmp = part->clone ();
2327	tmp->x -= src->x;
2328	tmp->y -= src->y;
2329
2330	if (!part->head)
2331	{
2332	dst = tmp;
2333	tmp->head = 0;
2334	}
2335	else
2336	tmp->head = dst;	2313	tmp->head = dst;
2337
2338	tmp->more = 0;
2339
2340	if (prev)
2341	prev->more = tmp;	2314	prev->more = tmp;
2342
2343	prev = tmp;	2315	prev = tmp;
2344	}	2316	}
2345		2317
2346	for (item = src->inv; item; item = item->below)	2318	for (object *item = inv; item; item = item->below)
2347	insert_ob_in_ob (object_create_clone (item), dst);	2319	insert_ob_in_ob (item->deep_clone (), dst);
2348		2320
2349	return dst;	2321	return dst;
2350	}	2322	}
2351		2323
2352	/* This returns the first object in who's inventory that	2324	/* This returns the first object in who's inventory that
…		…
2361	return tmp;	2333	return tmp;
2362		2334
2363	return 0;	2335	return 0;
2364	}	2336	}
2365		2337
2366	/* If ob has a field named key, return the link from the list,	2338	const shstr &
2367	* otherwise return NULL.	2339	object::kv_get (const shstr &key) const
2368	*
2369	* key must be a passed in shared string - otherwise, this won't
2370	* do the desired thing.
2371	*/
2372	key_value *
2373	get_ob_key_link (const object ob, const char key)
2374	{	2340	{
2375	for (key_value *link = ob->key_values; link; link = link->next)	2341	for (key_value *kv = key_values; kv; kv = kv->next)
2376	if (link->key == key)	2342	if (kv->key == key)
2377	return link;
2378
2379	return 0;
2380	}
2381
2382	/*
2383	* Returns the value of op has an extra_field for key, or NULL.
2384	*
2385	* The argument doesn't need to be a shared string.
2386	*
2387	* The returned string is shared.
2388	*/
2389	const char *
2390	get_ob_key_value (const object op, const char const key)
2391	{
2392	key_value *link;
2393	shstr_cmp canonical_key (key);
2394
2395	if (!canonical_key)
2396	{
2397	/* 1. There being a field named key on any object
2398	* implies there'd be a shared string to find.
2399	* 2. Since there isn't, no object has this field.
2400	* 3. Therefore, this object doesn't have this field.
2401	*/
2402	return 0;
2403	}
2404
2405	/* This is copied from get_ob_key_link() above -
2406	* only 4 lines, and saves the function call overhead.
2407	*/
2408	for (link = op->key_values; link; link = link->next)
2409	if (link->key == canonical_key)
2410	return link->value;	2343	return kv->value;
2411		2344
2412	return 0;	2345	return shstr_null;
2413	}	2346	}
2414		2347
2415	/*	2348	void
2416	* Updates the canonical_key in op to value.	2349	object::kv_set (const shstr &key, const shstr &value)
2417	*
2418	* canonical_key is a shared string (value doesn't have to be).
2419	*
2420	* Unless add_key is TRUE, it won't add fields, only change the value of existing
2421	* keys.
2422	*
2423	* Returns TRUE on success.
2424	*/
2425	int
2426	set_ob_key_value_s (object op, const shstr & canonical_key, const char value, int add_key)
2427	{	2350	{
2428	key_value field = NULL, last = NULL;	2351	for (key_value *kv = key_values; kv; kv = kv->next)
2429		2352	if (kv->key == key)
2430	for (field = op->key_values; field != NULL; field = field->next)
2431	{
2432	if (field->key != canonical_key)
2433	{	2353	{
2434	last = field;	2354	kv->value = value;
2435	continue;	2355	return;
2436	}	2356	}
2437		2357
2438	if (value)	2358	key_value *kv = new key_value;
2439	field->value = value;	2359
2440	else	2360	kv->next = key_values;
		2361	kv->key = key;
		2362	kv->value = value;
		2363
		2364	key_values = kv;
		2365	}
		2366
		2367	void
		2368	object::kv_del (const shstr &key)
		2369	{
		2370	for (key_value *kvp = &key_values; kvp; kvp = &(*kvp)->next)
		2371	if ((*kvp)->key == key)
2441	{	2372	{
2442	/* Basically, if the archetype has this key set,	2373	key_value kv = kvp;
2443	* we need to store the null value so when we save	2374	kvp = (kvp)->next;
2444	* it, we save the empty value so that when we load,	2375	delete kv;
2445	* we get this value back again.	2376	return;
2446	*/
2447	if (get_ob_key_link (op->arch, canonical_key))
2448	field->value = 0;
2449	else
2450	{
2451	if (last)
2452	last->next = field->next;
2453	else
2454	op->key_values = field->next;
2455
2456	delete field;
2457	}
2458	}	2377	}
2459	return TRUE;
2460	}
2461	/* IF we get here, key doesn't exist */
2462
2463	/* No field, we'll have to add it. */
2464
2465	if (!add_key)
2466	return FALSE;
2467
2468	/* There isn't any good reason to store a null
2469	* value in the key/value list. If the archetype has
2470	* this key, then we should also have it, so shouldn't
2471	* be here. If user wants to store empty strings,
2472	* should pass in ""
2473	*/
2474	if (value == NULL)
2475	return TRUE;
2476
2477	field = new key_value;
2478
2479	field->key = canonical_key;
2480	field->value = value;
2481	/* Usual prepend-addition. */
2482	field->next = op->key_values;
2483	op->key_values = field;
2484
2485	return TRUE;
2486	}
2487
2488	/*
2489	* Updates the key in op to value.
2490	*
2491	* If add_key is FALSE, this will only update existing keys,
2492	* and not add new ones.
2493	* In general, should be little reason FALSE is ever passed in for add_key
2494	*
2495	* Returns TRUE on success.
2496	*/
2497	int
2498	set_ob_key_value (object op, const char key, const char *value, int add_key)
2499	{
2500	shstr key_ (key);
2501
2502	return set_ob_key_value_s (op, key_, value, add_key);
2503	}	2378	}
2504		2379
2505	object::depth_iterator::depth_iterator (object *container)	2380	object::depth_iterator::depth_iterator (object *container)
2506	: iterator_base (container)	2381	: iterator_base (container)
2507	{	2382	{
…		…
2557	{	2432	{
2558	char flagdesc[512];	2433	char flagdesc[512];
2559	char info2[256 * 4];	2434	char info2[256 * 4];
2560	char *p = info;	2435	char *p = info;
2561		2436
2562	p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s,flags:[%s],type:%d}",	2437	p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s%s,flags:[%s],type:%d}",
2563	count,	2438	count,
2564	uuid.c_str (),	2439	uuid.c_str (),
2565	&name,	2440	&name,
2566	title ? "\",title:\"" : "",	2441	title ? ",title:\"" : "",
2567	title ? (const char *)title : "",	2442	title ? (const char *)title : "",
		2443	title ? "\"" : "",
2568	flag_desc (flagdesc, 512), type);	2444	flag_desc (flagdesc, 512), type);
2569		2445
2570	if (!this->flag[FLAG_REMOVED] && env)	2446	if (!flag[FLAG_REMOVED] && env)
2571	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2447	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2572		2448
2573	if (map)	2449	if (map)
2574	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);	2450	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2575		2451
…		…
2605	object::open_container (object *new_container)	2481	object::open_container (object *new_container)
2606	{	2482	{
2607	if (container == new_container)	2483	if (container == new_container)
2608	return;	2484	return;
2609		2485
2610	if (object *old_container = container)	2486	object *old_container = container;
		2487
		2488	if (old_container)
2611	{	2489	{
2612	if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))	2490	if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
2613	return;	2491	return;
2614		2492
2615	#if 0	2493	#if 0
…		…
2617	if (object *closer = old_container->inv)	2495	if (object *closer = old_container->inv)
2618	if (closer->type == CLOSE_CON)	2496	if (closer->type == CLOSE_CON)
2619	closer->destroy ();	2497	closer->destroy ();
2620	#endif	2498	#endif
2621		2499
		2500	// make sure the container is available
		2501	esrv_send_item (this, old_container);
		2502
2622	old_container->flag [FLAG_APPLIED] = 0;	2503	old_container->flag [FLAG_APPLIED] = false;
2623	container = 0;	2504	container = 0;
2624		2505
		2506	// client needs item update to make it work, client bug requires this to be separate
2625	esrv_update_item (UPD_FLAGS, this, old_container);	2507	esrv_update_item (UPD_FLAGS, this, old_container);
		2508
2626	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));	2509	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
2627	play_sound (sound_find ("chest_close"));	2510	play_sound (sound_find ("chest_close"));
2628	}	2511	}
2629		2512
2630	if (new_container)	2513	if (new_container)
…		…
2643	}	2526	}
2644	#endif	2527	#endif
2645		2528
2646	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));	2529	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));
2647		2530
		2531	// make sure the container is available, client bug requires this to be separate
		2532	esrv_send_item (this, new_container);
		2533
2648	new_container->flag [FLAG_APPLIED] = 1;	2534	new_container->flag [FLAG_APPLIED] = true;
2649	container = new_container;	2535	container = new_container;
2650		2536
		2537	// client needs flag change
2651	esrv_update_item (UPD_FLAGS, this, new_container);	2538	esrv_update_item (UPD_FLAGS, this, new_container);
2652	esrv_send_inventory (this, new_container);	2539	esrv_send_inventory (this, new_container);
2653	play_sound (sound_find ("chest_open"));	2540	play_sound (sound_find ("chest_open"));
2654	}	2541	}
		2542	// else if (!old_container->env && contr && contr->ns)
		2543	// contr->ns->floorbox_reset ();
2655	}	2544	}
2656		2545
2657	object *	2546	object *
2658	object::force_find (const shstr name)	2547	object::force_find (const shstr name)
2659	{	2548	{

Diff Legend

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

Comparing deliantra/server/common/object.C (file contents): Revision 1.214 by root, Tue Apr 22 07:01:46 2008 UTC vs. Revision 1.252 by root, Mon Aug 11 23:23:41 2008 UTC

Diff Legend

Comparing deliantra/server/common/object.C (file contents):
Revision 1.214 by root, Tue Apr 22 07:01:46 2008 UTC vs.
Revision 1.252 by root, Mon Aug 11 23:23:41 2008 UTC