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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.220 by root, Thu Apr 24 00:30:52 2008 UTC vs.
Revision 1.260 by root, Mon Sep 29 10:35:36 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	*
…		…
200	\|\| ob1->speed != ob2->speed	186	\|\| ob1->speed != ob2->speed
201	\|\| ob1->value != ob2->value	187	\|\| ob1->value != ob2->value
202	\|\| ob1->name != ob2->name)	188	\|\| ob1->name != ob2->name)
203	return 0;	189	return 0;
204		190
205	/* Do not merge objects if nrof would overflow. First part checks	191	/* Do not merge objects if nrof would overflow, assume nrof
206	* for unsigned overflow (2c), second part checks whether the result	192	* is always 0 .. 2*31-1 /
207	* would fit into a 32 bit signed int, which is often used to hold	193	if (ob1->nrof > 0x7fffffff - ob2->nrof)
208	* nrof values.
209	*/
210	if (~ob1->nrof < ob2->nrof \|\| ob1->nrof + ob2->nrof > (1UL << 31))
211	return 0;	194	return 0;
212		195
213	/* If the objects have been identified, set the BEEN_APPLIED flag.	196	/* If the objects have been identified, set the BEEN_APPLIED flag.
214	* This is to the comparison of the flags below will be OK. We	197	* This is to the comparison of the flags below will be OK. We
215	* just can't ignore the been applied or identified flags, as they	198	* just can't ignore the been applied or identified flags, as they
…		…
220	SET_FLAG (ob1, FLAG_BEEN_APPLIED);	203	SET_FLAG (ob1, FLAG_BEEN_APPLIED);
221		204
222	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))	205	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))
223	SET_FLAG (ob2, FLAG_BEEN_APPLIED);	206	SET_FLAG (ob2, FLAG_BEEN_APPLIED);
224		207
225	if (ob1->arch->name != ob2->arch->name	208	if (ob1->arch->archname != ob2->arch->archname
226	\|\| ob1->name != ob2->name	209	\|\| ob1->name != ob2->name
227	\|\| ob1->title != ob2->title	210	\|\| ob1->title != ob2->title
228	\|\| ob1->msg != ob2->msg	211	\|\| ob1->msg != ob2->msg
229	\|\| ob1->weight != ob2->weight	212	\|\| ob1->weight != ob2->weight
230	\|\| ob1->attacktype != ob2->attacktype	213	\|\| ob1->attacktype != ob2->attacktype
231	\|\| ob1->magic != ob2->magic	214	\|\| ob1->magic != ob2->magic
232	\|\| ob1->slaying != ob2->slaying	215	\|\| ob1->slaying != ob2->slaying
233	\|\| ob1->skill != ob2->skill	216	\|\| ob1->skill != ob2->skill
234	\|\| ob1->value != ob2->value	217	\|\| ob1->value != ob2->value
235	\|\| ob1->animation_id != ob2->animation_id	218	\|\| ob1->animation_id != ob2->animation_id
		219	\|\| (ob1->face != ob2->face && !ob1->animation_id) // face and animation are dependent on each other
236	\|\| ob1->client_type != ob2->client_type	220	\|\| ob1->client_type != ob2->client_type
237	\|\| ob1->materialname != ob2->materialname	221	\|\| ob1->materialname != ob2->materialname
238	\|\| ob1->lore != ob2->lore	222	\|\| ob1->lore != ob2->lore
239	\|\| ob1->subtype != ob2->subtype	223	\|\| ob1->subtype != ob2->subtype
240	\|\| ob1->move_type != ob2->move_type	224	\|\| ob1->move_type != ob2->move_type
…		…
248	\|\| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats)))	232	\|\| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats)))
249	return 0;	233	return 0;
250		234
251	if ((ob1->flag ^ ob2->flag)	235	if ((ob1->flag ^ ob2->flag)
252	.reset (FLAG_INV_LOCKED)	236	.reset (FLAG_INV_LOCKED)
253	.reset (FLAG_CLIENT_SENT)
254	.reset (FLAG_REMOVED)	237	.reset (FLAG_REMOVED)
255	.any ())	238	.any ())
256	return 0;	239	return 0;
257		240
258	/* This is really a spellbook check - we should in general	241	/* This is really a spellbook check - we should in general
…		…
358	else	341	else
359	{	342	{
360	// maybe there is a player standing on the same mapspace	343	// maybe there is a player standing on the same mapspace
361	// this will catch the case where "this" is a player	344	// this will catch the case where "this" is a player
362	if (object *pl = ms ().player ())	345	if (object *pl = ms ().player ())
		346	if ((!pl->container && pl->contr->ns && !pl->contr->ns->update_look)
363	if (!pl->container \|\| this == pl->container)	347	\|\| this == pl->container)
364	return pl;	348	return pl;
365	}	349	}
366	}	350	}
367		351
368	return 0;	352	return 0;
369	}	353	}
370		354
371	// adjust weight per container type ("of holding")	355	// adjust weight per container type ("of holding")
372	static sint32	356	static sint32
373	weight_adjust (object *op, sint32 weight)	357	weight_adjust_for (object *op, sint32 weight)
374	{	358	{
375	return op->type == CONTAINER	359	return op->type == CONTAINER
376	? lerp (weight, 0, 100, 0, 100 - op->stats.Str)	360	? lerp (weight, 0, 100, 0, 100 - op->stats.Str)
377	: weight;	361	: weight;
378	}	362	}
…		…
384	static void	368	static void
385	adjust_weight (object *op, sint32 weight)	369	adjust_weight (object *op, sint32 weight)
386	{	370	{
387	while (op)	371	while (op)
388	{	372	{
		373	// adjust by actual difference to account for rounding errors
		374	// i.e. (w2 - w1) / f != w2 / f - w1 / f and the latter is correct
389	weight = weight_adjust (op, weight);	375	weight = weight_adjust_for (op, op->carrying)
		376	- weight_adjust_for (op, op->carrying - weight);
390		377
391	if (!weight)	378	if (!weight)
392	return;	379	return;
393		380
394	op->carrying += weight;	381	op->carrying += weight;
…		…
417	op->update_weight ();	404	op->update_weight ();
418		405
419	sum += op->total_weight ();	406	sum += op->total_weight ();
420	}	407	}
421		408
422	sum = weight_adjust (this, sum);	409	sum = weight_adjust_for (this, sum);
423		410
424	if (sum != carrying)	411	if (sum != carrying)
425	{	412	{
426	carrying = sum;	413	carrying = sum;
427		414
…		…
489	*/	476	*/
490	object *	477	object *
491	find_object_name (const char *str)	478	find_object_name (const char *str)
492	{	479	{
493	shstr_cmp str_ (str);	480	shstr_cmp str_ (str);
494	object *op;
495		481
		482	if (str_)
496	for_all_objects (op)	483	for_all_objects (op)
497	if (op->name == str_)	484	if (op->name == str_)
498	break;	485	return op;
499		486
500	return op;	487	return 0;
501	}	488	}
502		489
503	/*	490	/*
504	* Sets the owner and sets the skill and exp pointers to owner's current	491	* Sets the owner and sets the skill and exp pointers to owner's current
505	* skill and experience objects.	492	* skill and experience objects.
…		…
603	}	590	}
604		591
605	op->key_values = 0;	592	op->key_values = 0;
606	}	593	}
607		594
608	object &	595	/*
609	object::operator =(const object &src)	596	* copy_to first frees everything allocated by the dst object,
		597	* and then copies the contents of itself into the second
		598	* object, allocating what needs to be allocated. Basically, any
		599	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
		600	* if the first object is freed, the pointers in the new object
		601	* will point at garbage.
		602	*/
		603	void
		604	object::copy_to (object *dst)
610	{	605	{
611	bool is_freed = flag [FLAG_FREED];	606	dst->remove ();
612	bool is_removed = flag [FLAG_REMOVED];
613
614	(object_copy )this = src;	607	(object_copy )dst = *this;
615
616	flag [FLAG_FREED] = is_freed;
617	flag [FLAG_REMOVED] = is_removed;	608	dst->flag [FLAG_REMOVED] = true;
618		609
619	/* Copy over key_values, if any. */	610	/* Copy over key_values, if any. */
620	if (src.key_values)	611	if (key_values)
621	{	612	{
622	key_value *tail = 0;	613	key_value *tail = 0;
623	key_values = 0;	614	dst->key_values = 0;
624		615
625	for (key_value *i = src.key_values; i; i = i->next)	616	for (key_value *i = key_values; i; i = i->next)
626	{	617	{
627	key_value *new_link = new key_value;	618	key_value *new_link = new key_value;
628		619
629	new_link->next = 0;	620	new_link->next = 0;
630	new_link->key = i->key;	621	new_link->key = i->key;
631	new_link->value = i->value;	622	new_link->value = i->value;
632		623
633	/* Try and be clever here, too. */	624	/* Try and be clever here, too. */
634	if (!key_values)	625	if (!dst->key_values)
635	{	626	{
636	key_values = new_link;	627	dst->key_values = new_link;
637	tail = new_link;	628	tail = new_link;
638	}	629	}
639	else	630	else
640	{	631	{
641	tail->next = new_link;	632	tail->next = new_link;
642	tail = new_link;	633	tail = new_link;
643	}	634	}
644	}	635	}
645	}	636	}
646	}
647
648	/*
649	* copy_to first frees everything allocated by the dst object,
650	* and then copies the contents of itself into the second
651	* object, allocating what needs to be allocated. Basically, any
652	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
653	* if the first object is freed, the pointers in the new object
654	* will point at garbage.
655	*/
656	void
657	object::copy_to (object *dst)
658	{
659	dst = this;
660		637
661	if (speed < 0)	638	if (speed < 0)
662	dst->speed_left -= rndm ();	639	dst->speed_left -= rndm ();
663		640
664	dst->set_speed (dst->speed);	641	dst->activate ();
665	}	642	}
666		643
667	void	644	void
668	object::instantiate ()	645	object::instantiate ()
669	{	646	{
…		…
686	object *	663	object *
687	object::clone ()	664	object::clone ()
688	{	665	{
689	object *neu = create ();	666	object *neu = create ();
690	copy_to (neu);	667	copy_to (neu);
		668	neu->map = map; // not copied by copy_to
691	return neu;	669	return neu;
692	}	670	}
693		671
694	/*	672	/*
695	* If an object with the IS_TURNABLE() flag needs to be turned due	673	* If an object with the IS_TURNABLE() flag needs to be turned due
…		…
746	* UP_OBJ_FACE: only the objects face has changed.	724	* UP_OBJ_FACE: only the objects face has changed.
747	*/	725	*/
748	void	726	void
749	update_object (object *op, int action)	727	update_object (object *op, int action)
750	{	728	{
751	if (op == NULL)	729	if (!op)
752	{	730	{
753	/* this should never happen */	731	/* this should never happen */
754	LOG (llevDebug, "update_object() called for NULL object.\n");	732	LOG (llevError \| logBacktrace, "update_object() called for NULL object.\n");
755	return;	733	return;
756	}	734	}
757		735
758	if (op->env)	736	if (!op->is_on_map ())
759	{	737	{
760	/* Animation is currently handled by client, so nothing	738	/* Animation is currently handled by client, so nothing
761	* to do in this case.	739	* to do in this case.
762	*/	740	*/
763	return;	741	return;
764	}	742	}
765
766	/* If the map is saving, don't do anything as everything is
767	* going to get freed anyways.
768	*/
769	if (!op->map \|\| op->map->in_memory == MAP_SAVING)
770	return;
771		743
772	/* make sure the object is within map boundaries */	744	/* make sure the object is within map boundaries */
773	if (op->x < 0 \|\| op->x >= op->map->width \|\| op->y < 0 \|\| op->y >= op->map->height)	745	if (op->x < 0 \|\| op->x >= op->map->width \|\| op->y < 0 \|\| op->y >= op->map->height)
774	{	746	{
775	LOG (llevError, "update_object() called for object out of map!\n");	747	LOG (llevError, "update_object() called for object out of map!\n");
…		…
794	\|\| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))	766	\|\| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))
795	\|\| (m.move_on \| op->move_on ) != m.move_on	767	\|\| (m.move_on \| op->move_on ) != m.move_on
796	\|\| (m.move_off \| op->move_off ) != m.move_off	768	\|\| (m.move_off \| op->move_off ) != m.move_off
797	\|\| (m.move_slow \| op->move_slow) != m.move_slow	769	\|\| (m.move_slow \| op->move_slow) != m.move_slow
798	/* This isn't perfect, but I don't expect a lot of objects to	770	/* This isn't perfect, but I don't expect a lot of objects to
799	* to have move_allow right now.	771	* have move_allow right now.
800	*/	772	*/
801	\|\| ((m.move_block \| op->move_block) & ~op->move_allow) != m.move_block	773	\|\| ((m.move_block \| op->move_block) & ~op->move_allow) != m.move_block
802	\|\| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)	774	\|\| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)
803	m.flags_ = 0;	775	m.flags_ = 0;
804	}	776	}
…		…
858	{	830	{
859	/* If already on active list, don't do anything */	831	/* If already on active list, don't do anything */
860	if (active)	832	if (active)
861	return;	833	return;
862		834
		835	if (has_active_speed () && flag [FLAG_FREED]) LOG (llevError \| logBacktrace, "BUG: tried to activate freed object %s\n", debug_desc ());//D
		836	if (has_active_speed () && flag [FLAG_DEBUG]) LOG (llevError \| logBacktrace, "BUG: tried to activate DEBUG object %s\n", debug_desc ());//D temp
		837
863	if (has_active_speed ())	838	if (has_active_speed ())
864	actives.insert (this);	839	actives.insert (this);
865	}	840	}
866		841
867	void	842	void
…		…
930	* drop on that space.	905	* drop on that space.
931	*/	906	*/
932	if (!drop_to_ground	907	if (!drop_to_ground
933	\|\| !map	908	\|\| !map
934	\|\| map->in_memory != MAP_ACTIVE	909	\|\| map->in_memory != MAP_ACTIVE
935	\|\| map->nodrop	910	\|\| map->no_drop
936	\|\| ms ().move_block == MOVE_ALL)	911	\|\| ms ().move_block == MOVE_ALL)
937	{	912	{
938	while (inv)	913	while (inv)
939	{
940	inv->destroy_inv (false);
941	inv->destroy ();	914	inv->destroy ();
942	}
943	}	915	}
944	else	916	else
945	{ /* Put objects in inventory onto this space */	917	{ /* Put objects in inventory onto this space */
946	while (inv)	918	while (inv)
947	{	919	{
…		…
951	\|\| op->flag [FLAG_NO_DROP]	923	\|\| op->flag [FLAG_NO_DROP]
952	\|\| op->type == RUNE	924	\|\| op->type == RUNE
953	\|\| op->type == TRAP	925	\|\| op->type == TRAP
954	\|\| op->flag [FLAG_IS_A_TEMPLATE]	926	\|\| op->flag [FLAG_IS_A_TEMPLATE]
955	\|\| op->flag [FLAG_DESTROY_ON_DEATH])	927	\|\| op->flag [FLAG_DESTROY_ON_DEATH])
956	op->destroy (true);	928	op->destroy ();
957	else	929	else
958	map->insert (op, x, y);	930	map->insert (op, x, y);
959	}	931	}
960	}	932	}
961	}	933	}
…		…
965	object *op = new object;	937	object *op = new object;
966	op->link ();	938	op->link ();
967	return op;	939	return op;
968	}	940	}
969		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
970	void	963	void
971	object::do_destroy ()	964	object::do_destroy ()
972	{	965	{
973	if (flag [FLAG_IS_LINKED])	966	if (flag [FLAG_IS_LINKED])
974	remove_button_link (this);	967	remove_button_link (this);
…		…
984	unlink ();	977	unlink ();
985		978
986	flag [FLAG_FREED] = 1;	979	flag [FLAG_FREED] = 1;
987		980
988	// hack to ensure that freed objects still have a valid map	981	// hack to ensure that freed objects still have a valid map
989	{
990	static maptile *freed_map; // freed objects are moved here to avoid crashes
991
992	if (!freed_map)
993	{
994	freed_map = new maptile;
995
996	freed_map->path = "<freed objects map>";
997	freed_map->name = "/internal/freed_objects_map";
998	freed_map->width = 3;
999	freed_map->height = 3;
1000	freed_map->nodrop = 1;
1001
1002	freed_map->alloc ();
1003	freed_map->in_memory = MAP_ACTIVE;
1004	}
1005
1006	map = freed_map;	982	map = &freed_map;
1007	x = 1;	983	x = 1;
1008	y = 1;	984	y = 1;
1009	}
1010		985
1011	if (more)	986	if (more)
1012	{	987	{
1013	more->destroy ();	988	more->destroy ();
1014	more = 0;	989	more = 0;
…		…
1022	attacked_by = 0;	997	attacked_by = 0;
1023	current_weapon = 0;	998	current_weapon = 0;
1024	}	999	}
1025		1000
1026	void	1001	void
1027	object::destroy (bool destroy_inventory)	1002	object::destroy ()
1028	{	1003	{
1029	if (destroyed ())	1004	if (destroyed ())
1030	return;	1005	return;
1031		1006
1032	if (!is_head () && !head->destroyed ())	1007	if (!is_head () && !head->destroyed ())
1033	{	1008	{
1034	LOG (llevError \| logBacktrace, "tried to destroy the tail of an object");	1009	LOG (llevError \| logBacktrace, "tried to destroy the tail of an object");
1035	head->destroy (destroy_inventory);	1010	head->destroy ();
		1011	return;
1036	}	1012	}
1037		1013
1038	destroy_inv (!destroy_inventory);	1014	destroy_inv (false);
1039		1015
1040	if (is_head ())	1016	if (is_head ())
1041	if (sound_destroy)	1017	if (sound_destroy)
1042	play_sound (sound_destroy);	1018	play_sound (sound_destroy);
1043	else if (flag [FLAG_MONSTER])	1019	else if (flag [FLAG_MONSTER])
…		…
1073	* In this case, the object to be removed is in someones	1049	* In this case, the object to be removed is in someones
1074	* inventory.	1050	* inventory.
1075	*/	1051	*/
1076	if (env)	1052	if (env)
1077	{	1053	{
		1054	flag [FLAG_REMOVED] = false; // hack around the issue of visible_to checking flag_removed
1078	if (object *pl = visible_to ())	1055	if (object *pl = visible_to ())
1079	esrv_del_item (pl->contr, count);	1056	esrv_del_item (pl->contr, count);
		1057	flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed
1080		1058
1081	adjust_weight (env, -total_weight ());	1059	adjust_weight (env, -total_weight ());
1082
1083	*(above ? &above->below : &env->inv) = below;
1084
1085	if (below)
1086	below->above = above;
1087		1060
1088	/* we set up values so that it could be inserted into	1061	/* we set up values so that it could be inserted into
1089	* 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
1090	* to the caller to decide what we want to do.	1063	* to the caller to decide what we want to do.
1091	*/	1064	*/
1092	map = env->map;	1065	map = env->map;
1093	x = env->x;	1066	x = env->x;
1094	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
1095	above = 0;	1073	above = 0;
1096	below = 0;	1074	below = 0;
1097	env = 0;	1075	env = 0;
1098		1076
1099	/* 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
…		…
1129		1107
1130	esrv_del_item (pl->contr, count);	1108	esrv_del_item (pl->contr, count);
1131	}	1109	}
1132		1110
1133	/* link the object above us */	1111	/* link the object above us */
1134	if (above)	1112	// re-link, make sure compiler can easily use cmove
1135	above->below = below;	1113	*(above ? &above->below : &ms.top) = below;
1136	else	1114	*(below ? &below->above : &ms.bot) = above;
1137	ms.top = below; /* we were top, set new top */
1138
1139	/* Relink the object below us, if there is one */
1140	if (below)
1141	below->above = above;
1142	else
1143	{
1144	/* Nothing below, which means we need to relink map object for this space
1145	* use translated coordinates in case some oddness with map tiling is
1146	* evident
1147	*/
1148	if (GET_MAP_OB (map, x, y) != this)
1149	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 ());
1150
1151	ms.bot = above; /* goes on above it. */
1152	}
1153		1115
1154	above = 0;	1116	above = 0;
1155	below = 0;	1117	below = 0;
		1118
		1119	ms.flags_ = 0;
1156		1120
1157	if (map->in_memory == MAP_SAVING)	1121	if (map->in_memory == MAP_SAVING)
1158	return;	1122	return;
1159		1123
1160	int check_walk_off = !flag [FLAG_NO_APPLY];	1124	int check_walk_off = !flag [FLAG_NO_APPLY];
…		…
1167	* appropriately.	1131	* appropriately.
1168	*/	1132	*/
1169	pl->close_container ();	1133	pl->close_container ();
1170		1134
1171	//TODO: the floorbox prev/next might need updating	1135	//TODO: the floorbox prev/next might need updating
1172	esrv_del_item (pl->contr, count);	1136	//esrv_del_item (pl->contr, count);
		1137	//TODO: update floorbox to preserve ordering
		1138	if (pl->contr->ns)
		1139	pl->contr->ns->floorbox_update ();
1173	}	1140	}
1174		1141
1175	for (tmp = ms.bot; tmp; tmp = tmp->above)	1142	for (tmp = ms.bot; tmp; tmp = tmp->above)
1176	{	1143	{
1177	/* 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
…		…
1190	}	1157	}
1191		1158
1192	last = tmp;	1159	last = tmp;
1193	}	1160	}
1194		1161
1195	/* last == NULL if there are no objects on this space */
1196	//TODO: this makes little sense, why only update the topmost object?
1197	if (!last)
1198	map->at (x, y).flags_ = 0;
1199	else
1200	update_object (last, UP_OBJ_REMOVE);
1201
1202	if (flag [FLAG_BLOCKSVIEW] \|\| glow_radius)	1162	if (flag [FLAG_BLOCKSVIEW] \|\| glow_radius)
1203	update_all_los (map, x, y);	1163	update_all_los (map, x, y);
1204	}	1164	}
1205	}	1165	}
1206		1166
…		…
1231	esrv_update_item (UPD_NROF, pl, top);	1191	esrv_update_item (UPD_NROF, pl, top);
1232		1192
1233	op->weight = 0; // cancel the addition above	1193	op->weight = 0; // cancel the addition above
1234	op->carrying = 0; // must be 0 already	1194	op->carrying = 0; // must be 0 already
1235		1195
1236	op->destroy (1);	1196	op->destroy ();
1237		1197
1238	return top;	1198	return top;
1239	}	1199	}
1240		1200
1241	return 0;	1201	return 0;
…		…
1269	* job preparing multi-part monsters.	1229	* job preparing multi-part monsters.
1270	*/	1230	*/
1271	object *	1231	object *
1272	insert_ob_in_map_at (object op, maptile m, object *originator, int flag, int x, int y)	1232	insert_ob_in_map_at (object op, maptile m, object *originator, int flag, int x, int y)
1273	{	1233	{
		1234	op->remove ();
		1235
1274	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)	1236	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1275	{	1237	{
1276	tmp->x = x + tmp->arch->x;	1238	tmp->x = x + tmp->arch->x;
1277	tmp->y = y + tmp->arch->y;	1239	tmp->y = y + tmp->arch->y;
1278	}	1240	}
…		…
1301	* just 'op' otherwise	1263	* just 'op' otherwise
1302	*/	1264	*/
1303	object *	1265	object *
1304	insert_ob_in_map (object op, maptile m, object *originator, int flag)	1266	insert_ob_in_map (object op, maptile m, object *originator, int flag)
1305	{	1267	{
1306	assert (!op->flag [FLAG_FREED]);	1268	if (op->is_on_map ())
		1269	{
		1270	LOG (llevError, "insert_ob_in_map called for object already on map");
		1271	abort ();
		1272	}
1307		1273
		1274	if (op->env)
		1275	{
		1276	LOG (llevError, "insert_ob_in_map called for object in an inventory (proceeding)");
1308	op->remove ();	1277	op->remove ();
		1278	}
		1279
		1280	if (m == &freed_map)//D TODO: remove soon
		1281	{//D
		1282	LOG (llevError \| logBacktrace, "tries to insret object on freed objects map: %s", op->debug_desc ());//D
		1283	}//D
1309		1284
1310	/* Ideally, the caller figures this out. However, it complicates a lot	1285	/* Ideally, the caller figures this out. However, it complicates a lot
1311	* of areas of callers (eg, anything that uses find_free_spot would now	1286	* of areas of callers (eg, anything that uses find_free_spot would now
1312	* need extra work	1287	* need extra work
1313	*/	1288	*/
1314	if (!xy_normalise (m, op->x, op->y))	1289	if (!xy_normalise (m, op->x, op->y))
1315	{	1290	{
1316	op->destroy (1);	1291	op->head_ ()->destroy ();// remove head_ once all tail object destroyers found
1317	return 0;	1292	return 0;
1318	}	1293	}
1319		1294
1320	if (object *more = op->more)	1295	if (object *more = op->more)
1321	if (!insert_ob_in_map (more, m, originator, flag))	1296	if (!insert_ob_in_map (more, m, originator, flag))
…		…
1330	*/	1305	*/
1331	if (op->nrof && !(flag & INS_NO_MERGE))	1306	if (op->nrof && !(flag & INS_NO_MERGE))
1332	for (object *tmp = ms.bot; tmp; tmp = tmp->above)	1307	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1333	if (object::can_merge (op, tmp))	1308	if (object::can_merge (op, tmp))
1334	{	1309	{
1335	// TODO: we atcually want to update tmp, not op,	1310	// TODO: we actually want to update tmp, not op,
1336	// but some caller surely breaks when we return tmp	1311	// but some caller surely breaks when we return tmp
1337	// from here :/	1312	// from here :/
1338	op->nrof += tmp->nrof;	1313	op->nrof += tmp->nrof;
1339	tmp->destroy (1);	1314	tmp->destroy ();
1340	}	1315	}
1341		1316
1342	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1317	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1343	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1318	CLEAR_FLAG (op, FLAG_INV_LOCKED);
1344		1319
…		…
1351	{	1326	{
1352	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");	1327	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");
1353	abort ();	1328	abort ();
1354	}	1329	}
1355		1330
		1331	if (!originator->is_on_map ())
		1332	LOG (llevDebug \| logBacktrace, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map",
		1333	op->debug_desc (), originator->debug_desc ());
		1334
1356	op->above = originator;	1335	op->above = originator;
1357	op->below = originator->below;	1336	op->below = originator->below;
1358
1359	if (op->below)
1360	op->below->above = op;
1361	else
1362	ms.bot = op;
1363
1364	/* since below originator, no need to update top */
1365	originator->below = op;	1337	originator->below = op;
		1338
		1339	*(op->below ? &op->below->above : &ms.bot) = op;
1366	}	1340	}
1367	else	1341	else
1368	{	1342	{
1369	object top, floor = NULL;	1343	object *floor = 0;
1370		1344	object *top = ms.top;
1371	top = ms.bot;
1372		1345
1373	/* If there are other objects, then */	1346	/* If there are other objects, then */
1374	if (top)	1347	if (top)
1375	{	1348	{
1376	object *last = 0;
1377
1378	/*	1349	/*
1379	* If there are multiple objects on this space, we do some trickier handling.	1350	* If there are multiple objects on this space, we do some trickier handling.
1380	* We've already dealt with merging if appropriate.	1351	* We've already dealt with merging if appropriate.
1381	* Generally, we want to put the new object on top. But if	1352	* Generally, we want to put the new object on top. But if
1382	* flag contains INS_ABOVE_FLOOR_ONLY, once we find the last	1353	* flag contains INS_ABOVE_FLOOR_ONLY, once we find the last
…		…
1385	* once we get to them. This reduces the need to traverse over all of	1356	* once we get to them. This reduces the need to traverse over all of
1386	* them when adding another one - this saves quite a bit of cpu time	1357	* them when adding another one - this saves quite a bit of cpu time
1387	* when lots of spells are cast in one area. Currently, it is presumed	1358	* when lots of spells are cast in one area. Currently, it is presumed
1388	* that flying non pickable objects are spell objects.	1359	* that flying non pickable objects are spell objects.
1389	*/	1360	*/
1390	for (top = ms.bot; top; top = top->above)	1361	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1391	{	1362	{
1392	if (QUERY_FLAG (top, FLAG_IS_FLOOR) \|\| QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))	1363	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) \|\| QUERY_FLAG (tmp, FLAG_OVERLAY_FLOOR))
1393	floor = top;	1364	floor = tmp;
1394		1365
1395	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW \| MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))	1366	if (QUERY_FLAG (tmp, FLAG_NO_PICK) && (tmp->move_type & (MOVE_FLY_LOW \| MOVE_FLY_HIGH)) && !QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1396	{	1367	{
1397	/* We insert above top, so we want this object below this */	1368	/* We insert above top, so we want this object below this */
1398	top = top->below;	1369	top = tmp->below;
1399	break;	1370	break;
1400	}	1371	}
1401		1372
1402	last = top;	1373	top = tmp;
1403	}	1374	}
1404
1405	/* Don't want top to be NULL, so set it to the last valid object */
1406	top = last;
1407		1375
1408	/* We let update_position deal with figuring out what the space	1376	/* We let update_position deal with figuring out what the space
1409	* looks like instead of lots of conditions here.	1377	* looks like instead of lots of conditions here.
1410	* makes things faster, and effectively the same result.	1378	* makes things faster, and effectively the same result.
1411	*/	1379	*/
…		…
1418	*/	1386	*/
1419	if (!(flag & INS_ON_TOP)	1387	if (!(flag & INS_ON_TOP)
1420	&& ms.flags () & P_BLOCKSVIEW	1388	&& ms.flags () & P_BLOCKSVIEW
1421	&& (op->face && !faces [op->face].visibility))	1389	&& (op->face && !faces [op->face].visibility))
1422	{	1390	{
		1391	object *last;
		1392
1423	for (last = top; last != floor; last = last->below)	1393	for (last = top; last != floor; last = last->below)
1424	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1394	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1425	break;	1395	break;
1426		1396
1427	/* Check to see if we found the object that blocks view,	1397	/* Check to see if we found the object that blocks view,
…		…
1435	} /* If objects on this space */	1405	} /* If objects on this space */
1436		1406
1437	if (flag & INS_ABOVE_FLOOR_ONLY)	1407	if (flag & INS_ABOVE_FLOOR_ONLY)
1438	top = floor;	1408	top = floor;
1439		1409
1440	/* Top is the object that our object (op) is going to get inserted above.	1410	// insert object above top, or bottom-most if top = 0
1441	*/
1442
1443	/* First object on this space */
1444	if (!top)	1411	if (!top)
1445	{	1412	{
		1413	op->below = 0;
1446	op->above = ms.bot;	1414	op->above = ms.bot;
1447
1448	if (op->above)
1449	op->above->below = op;
1450
1451	op->below = 0;
1452	ms.bot = op;	1415	ms.bot = op;
		1416
		1417	*(op->above ? &op->above->below : &ms.top) = op;
1453	}	1418	}
1454	else	1419	else
1455	{ /* get inserted into the stack above top */	1420	{
1456	op->above = top->above;	1421	op->above = top->above;
1457
1458	if (op->above)
1459	op->above->below = op;	1422	top->above = op;
1460		1423
1461	op->below = top;	1424	op->below = top;
1462	top->above = op;	1425	*(op->above ? &op->above->below : &ms.top) = op;
1463	}	1426	}
1464		1427	}
1465	if (!op->above)
1466	ms.top = op;
1467	} /* else not INS_BELOW_ORIGINATOR */
1468		1428
1469	if (op->type == PLAYER)	1429	if (op->type == PLAYER)
1470	{	1430	{
1471	op->contr->do_los = 1;	1431	op->contr->do_los = 1;
1472	++op->map->players;	1432	++op->map->players;
…		…
1475		1435
1476	op->map->dirty = true;	1436	op->map->dirty = true;
1477		1437
1478	if (object *pl = ms.player ())	1438	if (object *pl = ms.player ())
1479	//TODO: the floorbox prev/next might need updating	1439	//TODO: the floorbox prev/next might need updating
1480	esrv_send_item (pl, op);	1440	//esrv_send_item (pl, op);
		1441	//TODO: update floorbox to preserve ordering
		1442	if (pl->contr->ns)
		1443	pl->contr->ns->floorbox_update ();
1481		1444
1482	/* If this object glows, it may affect lighting conditions that are	1445	/* If this object glows, it may affect lighting conditions that are
1483	* visible to others on this map. But update_all_los is really	1446	* visible to others on this map. But update_all_los is really
1484	* an inefficient way to do this, as it means los for all players	1447	* an inefficient way to do this, as it means los for all players
1485	* on the map will get recalculated. The players could very well	1448	* on the map will get recalculated. The players could very well
…		…
1531	{	1494	{
1532	/* first search for itself and remove any old instances */	1495	/* first search for itself and remove any old instances */
1533		1496
1534	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)	1497	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1535	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */	1498	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */
1536	tmp->destroy (1);	1499	tmp->destroy ();
1537		1500
1538	object *tmp = arch_to_object (archetype::find (arch_string));	1501	object *tmp = arch_to_object (archetype::find (arch_string));
1539		1502
1540	tmp->x = op->x;	1503	tmp->x = op->x;
1541	tmp->y = op->y;	1504	tmp->y = op->y;
…		…
1565	if (!nr)	1528	if (!nr)
1566	return true;	1529	return true;
1567		1530
1568	nr = min (nr, nrof);	1531	nr = min (nr, nrof);
1569		1532
		1533	if (nrof > nr)
		1534	{
1570	nrof -= nr;	1535	nrof -= nr;
1571
1572	if (nrof)
1573	{
1574	adjust_weight (env, -weight * nr); // carrying == 0	1536	adjust_weight (env, -weight * max (1, nr)); // carrying == 0
1575		1537
1576	if (object *pl = visible_to ())	1538	if (object *pl = visible_to ())
1577	esrv_update_item (UPD_NROF, pl, this);	1539	esrv_update_item (UPD_NROF, pl, this);
1578		1540
1579	return true;	1541	return true;
1580	}	1542	}
1581	else	1543	else
1582	{	1544	{
1583	destroy (1);	1545	destroy ();
1584	return false;	1546	return false;
1585	}	1547	}
1586	}	1548	}
1587		1549
1588	/*	1550	/*
…		…
1605	}	1567	}
1606	else	1568	else
1607	{	1569	{
1608	decrease (nr);	1570	decrease (nr);
1609		1571
1610	object *op = object_create_clone (this);	1572	object *op = deep_clone ();
1611	op->nrof = nr;	1573	op->nrof = nr;
1612	return op;	1574	return op;
1613	}	1575	}
1614	}	1576	}
1615		1577
…		…
1665	if (object *pl = tmp->visible_to ())	1627	if (object *pl = tmp->visible_to ())
1666	esrv_update_item (UPD_NROF, pl, tmp);	1628	esrv_update_item (UPD_NROF, pl, tmp);
1667		1629
1668	adjust_weight (this, op->total_weight ());	1630	adjust_weight (this, op->total_weight ());
1669		1631
1670	op->destroy (1);	1632	op->destroy ();
1671	op = tmp;	1633	op = tmp;
1672	goto inserted;	1634	goto inserted;
1673	}	1635	}
1674		1636
1675	op->owner = 0; // it's his/hers now. period.	1637	op->owner = 0; // it's his/hers now. period.
…		…
1836	LOG (llevError, "Present_arch called outside map.\n");	1798	LOG (llevError, "Present_arch called outside map.\n");
1837	return NULL;	1799	return NULL;
1838	}	1800	}
1839		1801
1840	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)	1802	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1841	if (tmp->arch == at)	1803	if (tmp->arch->archname == at->archname)
1842	return tmp;	1804	return tmp;
1843		1805
1844	return NULL;	1806	return NULL;
1845	}	1807	}
1846		1808
…		…
1910	* The first matching object is returned, or NULL if none.	1872	* The first matching object is returned, or NULL if none.
1911	*/	1873	*/
1912	object *	1874	object *
1913	present_arch_in_ob (const archetype at, const object op)	1875	present_arch_in_ob (const archetype at, const object op)
1914	{	1876	{
1915	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)	1877	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1916	if (tmp->arch == at)	1878	if (tmp->arch->archname == at->archname)
1917	return tmp;	1879	return tmp;
1918		1880
1919	return NULL;	1881	return NULL;
1920	}	1882	}
1921		1883
…		…
2330		2292
2331	/*	2293	/*
2332	* create clone from object to another	2294	* create clone from object to another
2333	*/	2295	*/
2334	object *	2296	object *
2335	object_create_clone (object *asrc)	2297	object::deep_clone ()
2336	{	2298	{
2337	object dst = 0, tmp, src, prev, *item;	2299	assert (("deep_clone called on non-head object", is_head ()));
2338		2300
2339	if (!asrc)	2301	object *dst = clone ();
2340	return 0;
2341		2302
2342	src = asrc->head_ ();	2303	object *prev = dst;
2343
2344	prev = 0;
2345	for (object *part = src; part; part = part->more)	2304	for (object *part = this->more; part; part = part->more)
2346	{	2305	{
2347	tmp = part->clone ();	2306	object *tmp = part->clone ();
2348	tmp->x -= src->x;
2349	tmp->y -= src->y;
2350
2351	if (!part->head)
2352	{
2353	dst = tmp;
2354	tmp->head = 0;
2355	}
2356	else
2357	tmp->head = dst;	2307	tmp->head = dst;
2358
2359	tmp->more = 0;
2360
2361	if (prev)
2362	prev->more = tmp;	2308	prev->more = tmp;
2363
2364	prev = tmp;	2309	prev = tmp;
2365	}	2310	}
2366		2311
2367	for (item = src->inv; item; item = item->below)	2312	for (object *item = inv; item; item = item->below)
2368	insert_ob_in_ob (object_create_clone (item), dst);	2313	insert_ob_in_ob (item->deep_clone (), dst);
2369		2314
2370	return dst;	2315	return dst;
2371	}	2316	}
2372		2317
2373	/* This returns the first object in who's inventory that	2318	/* This returns the first object in who's inventory that
…		…
2382	return tmp;	2327	return tmp;
2383		2328
2384	return 0;	2329	return 0;
2385	}	2330	}
2386		2331
2387	/* If ob has a field named key, return the link from the list,	2332	const shstr &
2388	* otherwise return NULL.	2333	object::kv_get (const shstr &key) const
2389	*
2390	* key must be a passed in shared string - otherwise, this won't
2391	* do the desired thing.
2392	*/
2393	key_value *
2394	get_ob_key_link (const object ob, const char key)
2395	{	2334	{
2396	for (key_value *link = ob->key_values; link; link = link->next)	2335	for (key_value *kv = key_values; kv; kv = kv->next)
2397	if (link->key == key)	2336	if (kv->key == key)
2398	return link;
2399
2400	return 0;
2401	}
2402
2403	/*
2404	* Returns the value of op has an extra_field for key, or NULL.
2405	*
2406	* The argument doesn't need to be a shared string.
2407	*
2408	* The returned string is shared.
2409	*/
2410	const char *
2411	get_ob_key_value (const object op, const char const key)
2412	{
2413	key_value *link;
2414	shstr_cmp canonical_key (key);
2415
2416	if (!canonical_key)
2417	{
2418	/* 1. There being a field named key on any object
2419	* implies there'd be a shared string to find.
2420	* 2. Since there isn't, no object has this field.
2421	* 3. Therefore, this object doesn't have this field.
2422	*/
2423	return 0;
2424	}
2425
2426	/* This is copied from get_ob_key_link() above -
2427	* only 4 lines, and saves the function call overhead.
2428	*/
2429	for (link = op->key_values; link; link = link->next)
2430	if (link->key == canonical_key)
2431	return link->value;	2337	return kv->value;
2432		2338
2433	return 0;	2339	return shstr_null;
2434	}	2340	}
2435		2341
2436	/*	2342	void
2437	* Updates the canonical_key in op to value.	2343	object::kv_set (const shstr &key, const shstr &value)
2438	*
2439	* canonical_key is a shared string (value doesn't have to be).
2440	*
2441	* Unless add_key is TRUE, it won't add fields, only change the value of existing
2442	* keys.
2443	*
2444	* Returns TRUE on success.
2445	*/
2446	int
2447	set_ob_key_value_s (object op, const shstr & canonical_key, const char value, int add_key)
2448	{	2344	{
2449	key_value field = NULL, last = NULL;	2345	for (key_value *kv = key_values; kv; kv = kv->next)
2450		2346	if (kv->key == key)
2451	for (field = op->key_values; field != NULL; field = field->next)
2452	{
2453	if (field->key != canonical_key)
2454	{	2347	{
2455	last = field;	2348	kv->value = value;
2456	continue;	2349	return;
2457	}	2350	}
2458		2351
2459	if (value)	2352	key_value *kv = new key_value;
2460	field->value = value;	2353
2461	else	2354	kv->next = key_values;
		2355	kv->key = key;
		2356	kv->value = value;
		2357
		2358	key_values = kv;
		2359	}
		2360
		2361	void
		2362	object::kv_del (const shstr &key)
		2363	{
		2364	for (key_value *kvp = &key_values; kvp; kvp = &(*kvp)->next)
		2365	if ((*kvp)->key == key)
2462	{	2366	{
2463	/* Basically, if the archetype has this key set,	2367	key_value kv = kvp;
2464	* we need to store the null value so when we save	2368	kvp = (kvp)->next;
2465	* it, we save the empty value so that when we load,	2369	delete kv;
2466	* we get this value back again.	2370	return;
2467	*/
2468	if (get_ob_key_link (op->arch, canonical_key))
2469	field->value = 0;
2470	else
2471	{
2472	if (last)
2473	last->next = field->next;
2474	else
2475	op->key_values = field->next;
2476
2477	delete field;
2478	}
2479	}	2371	}
2480	return TRUE;
2481	}
2482	/* IF we get here, key doesn't exist */
2483
2484	/* No field, we'll have to add it. */
2485
2486	if (!add_key)
2487	return FALSE;
2488
2489	/* There isn't any good reason to store a null
2490	* value in the key/value list. If the archetype has
2491	* this key, then we should also have it, so shouldn't
2492	* be here. If user wants to store empty strings,
2493	* should pass in ""
2494	*/
2495	if (value == NULL)
2496	return TRUE;
2497
2498	field = new key_value;
2499
2500	field->key = canonical_key;
2501	field->value = value;
2502	/* Usual prepend-addition. */
2503	field->next = op->key_values;
2504	op->key_values = field;
2505
2506	return TRUE;
2507	}
2508
2509	/*
2510	* Updates the key in op to value.
2511	*
2512	* If add_key is FALSE, this will only update existing keys,
2513	* and not add new ones.
2514	* In general, should be little reason FALSE is ever passed in for add_key
2515	*
2516	* Returns TRUE on success.
2517	*/
2518	int
2519	set_ob_key_value (object op, const char key, const char *value, int add_key)
2520	{
2521	shstr key_ (key);
2522
2523	return set_ob_key_value_s (op, key_, value, add_key);
2524	}	2372	}
2525		2373
2526	object::depth_iterator::depth_iterator (object *container)	2374	object::depth_iterator::depth_iterator (object *container)
2527	: iterator_base (container)	2375	: iterator_base (container)
2528	{	2376	{
…		…
2578	{	2426	{
2579	char flagdesc[512];	2427	char flagdesc[512];
2580	char info2[256 * 4];	2428	char info2[256 * 4];
2581	char *p = info;	2429	char *p = info;
2582		2430
2583	p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s,flags:[%s],type:%d}",	2431	p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s%s,flags:[%s],type:%d}",
2584	count,	2432	count,
2585	uuid.c_str (),	2433	uuid.c_str (),
2586	&name,	2434	&name,
2587	title ? "\",title:\"" : "",	2435	title ? ",title:\"" : "",
2588	title ? (const char *)title : "",	2436	title ? (const char *)title : "",
		2437	title ? "\"" : "",
2589	flag_desc (flagdesc, 512), type);	2438	flag_desc (flagdesc, 512), type);
2590		2439
2591	if (!flag[FLAG_REMOVED] && env)	2440	if (!flag[FLAG_REMOVED] && env)
2592	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2441	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2593		2442

Diff Legend

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

Comparing deliantra/server/common/object.C (file contents): Revision 1.220 by root, Thu Apr 24 00:30:52 2008 UTC vs. Revision 1.260 by root, Mon Sep 29 10:35:36 2008 UTC

Diff Legend

Comparing deliantra/server/common/object.C (file contents):
Revision 1.220 by root, Thu Apr 24 00:30:52 2008 UTC vs.
Revision 1.260 by root, Mon Sep 29 10:35:36 2008 UTC