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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.217 by root, Wed Apr 23 07:13:23 2008 UTC vs.
Revision 1.259 by root, Mon Sep 29 10:32:50 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
…		…
334		317
335	// find player who can see this object	318	// find player who can see this object
336	object *	319	object *
337	object::visible_to () const	320	object::visible_to () const
338	{	321	{
339	if (!flag [FLAG_REMOVED])	322	if (client_visible () && !flag [FLAG_REMOVED])
340	{	323	{
341	// see if we are in a container of sorts	324	// see if we are in a container of sorts
342	if (env)	325	if (env)
343	{	326	{
344	// the player inventory itself is always visible	327	// the player inventory itself is always visible
…		…
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)
		347	\|\| this == pl->container)
363	return pl;	348	return pl;
364	}	349	}
365	}	350	}
366		351
367	return 0;	352	return 0;
368	}	353	}
369		354
370	// adjust weight per container type ("of holding")	355	// adjust weight per container type ("of holding")
371	static sint32	356	static sint32
372	weight_adjust (object *op, sint32 weight)	357	weight_adjust_for (object *op, sint32 weight)
373	{	358	{
374	return op->type == CONTAINER	359	return op->type == CONTAINER
375	? lerp (weight, 0, 100, 0, 100 - op->stats.Str)	360	? lerp (weight, 0, 100, 0, 100 - op->stats.Str)
376	: weight;	361	: weight;
377	}	362	}
…		…
383	static void	368	static void
384	adjust_weight (object *op, sint32 weight)	369	adjust_weight (object *op, sint32 weight)
385	{	370	{
386	while (op)	371	while (op)
387	{	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
388	weight = weight_adjust (op, weight);	375	weight = weight_adjust_for (op, op->carrying)
		376	- weight_adjust_for (op, op->carrying - weight);
389		377
390	if (!weight)	378	if (!weight)
391	return;	379	return;
392		380
393	op->carrying += weight;	381	op->carrying += weight;
…		…
416	op->update_weight ();	404	op->update_weight ();
417		405
418	sum += op->total_weight ();	406	sum += op->total_weight ();
419	}	407	}
420		408
421	sum = weight_adjust (this, sum);	409	sum = weight_adjust_for (this, sum);
422		410
423	if (sum != carrying)	411	if (sum != carrying)
424	{	412	{
425	carrying = sum;	413	carrying = sum;
426		414
…		…
488	*/	476	*/
489	object *	477	object *
490	find_object_name (const char *str)	478	find_object_name (const char *str)
491	{	479	{
492	shstr_cmp str_ (str);	480	shstr_cmp str_ (str);
493	object *op;
494		481
		482	if (str_)
495	for_all_objects (op)	483	for_all_objects (op)
496	if (op->name == str_)	484	if (op->name == str_)
497	break;	485	return op;
498		486
499	return op;	487	return 0;
500	}	488	}
501		489
502	/*	490	/*
503	* 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
504	* skill and experience objects.	492	* skill and experience objects.
…		…
602	}	590	}
603		591
604	op->key_values = 0;	592	op->key_values = 0;
605	}	593	}
606		594
607	object &	595	/*
608	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)
609	{	605	{
610	bool is_freed = flag [FLAG_FREED];	606	dst->remove ();
611	bool is_removed = flag [FLAG_REMOVED];
612
613	(object_copy )this = src;	607	(object_copy )dst = *this;
614
615	flag [FLAG_FREED] = is_freed;
616	flag [FLAG_REMOVED] = is_removed;	608	dst->flag [FLAG_REMOVED] = true;
617		609
618	/* Copy over key_values, if any. */	610	/* Copy over key_values, if any. */
619	if (src.key_values)	611	if (key_values)
620	{	612	{
621	key_value *tail = 0;	613	key_value *tail = 0;
622	key_values = 0;	614	dst->key_values = 0;
623		615
624	for (key_value *i = src.key_values; i; i = i->next)	616	for (key_value *i = key_values; i; i = i->next)
625	{	617	{
626	key_value *new_link = new key_value;	618	key_value *new_link = new key_value;
627		619
628	new_link->next = 0;	620	new_link->next = 0;
629	new_link->key = i->key;	621	new_link->key = i->key;
630	new_link->value = i->value;	622	new_link->value = i->value;
631		623
632	/* Try and be clever here, too. */	624	/* Try and be clever here, too. */
633	if (!key_values)	625	if (!dst->key_values)
634	{	626	{
635	key_values = new_link;	627	dst->key_values = new_link;
636	tail = new_link;	628	tail = new_link;
637	}	629	}
638	else	630	else
639	{	631	{
640	tail->next = new_link;	632	tail->next = new_link;
641	tail = new_link;	633	tail = new_link;
642	}	634	}
643	}	635	}
644	}	636	}
645	}
646
647	/*
648	* copy_to first frees everything allocated by the dst object,
649	* and then copies the contents of itself into the second
650	* object, allocating what needs to be allocated. Basically, any
651	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
652	* if the first object is freed, the pointers in the new object
653	* will point at garbage.
654	*/
655	void
656	object::copy_to (object *dst)
657	{
658	dst = this;
659		637
660	if (speed < 0)	638	if (speed < 0)
661	dst->speed_left -= rndm ();	639	dst->speed_left -= rndm ();
662		640
663	dst->set_speed (dst->speed);	641	dst->activate ();
664	}	642	}
665		643
666	void	644	void
667	object::instantiate ()	645	object::instantiate ()
668	{	646	{
…		…
685	object *	663	object *
686	object::clone ()	664	object::clone ()
687	{	665	{
688	object *neu = create ();	666	object *neu = create ();
689	copy_to (neu);	667	copy_to (neu);
		668	neu->map = map; // not copied by copy_to
690	return neu;	669	return neu;
691	}	670	}
692		671
693	/*	672	/*
694	* 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
…		…
745	* UP_OBJ_FACE: only the objects face has changed.	724	* UP_OBJ_FACE: only the objects face has changed.
746	*/	725	*/
747	void	726	void
748	update_object (object *op, int action)	727	update_object (object *op, int action)
749	{	728	{
750	if (op == NULL)	729	if (!op)
751	{	730	{
752	/* this should never happen */	731	/* this should never happen */
753	LOG (llevDebug, "update_object() called for NULL object.\n");	732	LOG (llevError \| logBacktrace, "update_object() called for NULL object.\n");
754	return;	733	return;
755	}	734	}
756		735
757	if (op->env)	736	if (!op->is_on_map ())
758	{	737	{
759	/* Animation is currently handled by client, so nothing	738	/* Animation is currently handled by client, so nothing
760	* to do in this case.	739	* to do in this case.
761	*/	740	*/
762	return;	741	return;
763	}	742	}
764
765	/* If the map is saving, don't do anything as everything is
766	* going to get freed anyways.
767	*/
768	if (!op->map \|\| op->map->in_memory == MAP_SAVING)
769	return;
770		743
771	/* make sure the object is within map boundaries */	744	/* make sure the object is within map boundaries */
772	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)
773	{	746	{
774	LOG (llevError, "update_object() called for object out of map!\n");	747	LOG (llevError, "update_object() called for object out of map!\n");
…		…
793	\|\| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))	766	\|\| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))
794	\|\| (m.move_on \| op->move_on ) != m.move_on	767	\|\| (m.move_on \| op->move_on ) != m.move_on
795	\|\| (m.move_off \| op->move_off ) != m.move_off	768	\|\| (m.move_off \| op->move_off ) != m.move_off
796	\|\| (m.move_slow \| op->move_slow) != m.move_slow	769	\|\| (m.move_slow \| op->move_slow) != m.move_slow
797	/* 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
798	* to have move_allow right now.	771	* have move_allow right now.
799	*/	772	*/
800	\|\| ((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
801	\|\| 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)
802	m.flags_ = 0;	775	m.flags_ = 0;
803	}	776	}
…		…
857	{	830	{
858	/* If already on active list, don't do anything */	831	/* If already on active list, don't do anything */
859	if (active)	832	if (active)
860	return;	833	return;
861		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
862	if (has_active_speed ())	838	if (has_active_speed ())
863	actives.insert (this);	839	actives.insert (this);
864	}	840	}
865		841
866	void	842	void
…		…
929	* drop on that space.	905	* drop on that space.
930	*/	906	*/
931	if (!drop_to_ground	907	if (!drop_to_ground
932	\|\| !map	908	\|\| !map
933	\|\| map->in_memory != MAP_ACTIVE	909	\|\| map->in_memory != MAP_ACTIVE
934	\|\| map->nodrop	910	\|\| map->no_drop
935	\|\| ms ().move_block == MOVE_ALL)	911	\|\| ms ().move_block == MOVE_ALL)
936	{	912	{
937	while (inv)	913	while (inv)
938	{
939	inv->destroy_inv (false);
940	inv->destroy ();	914	inv->destroy ();
941	}
942	}	915	}
943	else	916	else
944	{ /* Put objects in inventory onto this space */	917	{ /* Put objects in inventory onto this space */
945	while (inv)	918	while (inv)
946	{	919	{
…		…
950	\|\| op->flag [FLAG_NO_DROP]	923	\|\| op->flag [FLAG_NO_DROP]
951	\|\| op->type == RUNE	924	\|\| op->type == RUNE
952	\|\| op->type == TRAP	925	\|\| op->type == TRAP
953	\|\| op->flag [FLAG_IS_A_TEMPLATE]	926	\|\| op->flag [FLAG_IS_A_TEMPLATE]
954	\|\| op->flag [FLAG_DESTROY_ON_DEATH])	927	\|\| op->flag [FLAG_DESTROY_ON_DEATH])
955	op->destroy (true);	928	op->destroy ();
956	else	929	else
957	map->insert (op, x, y);	930	map->insert (op, x, y);
958	}	931	}
959	}	932	}
960	}	933	}
…		…
964	object *op = new object;	937	object *op = new object;
965	op->link ();	938	op->link ();
966	return op;	939	return op;
967	}	940	}
968		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
969	void	963	void
970	object::do_destroy ()	964	object::do_destroy ()
971	{	965	{
972	if (flag [FLAG_IS_LINKED])	966	if (flag [FLAG_IS_LINKED])
973	remove_button_link (this);	967	remove_button_link (this);
…		…
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;
…		…
1025	void	1001	void
1026	object::destroy (bool destroy_inventory)	1002	object::destroy (bool destroy_inventory)
1027	{	1003	{
1028	if (destroyed ())	1004	if (destroyed ())
1029	return;	1005	return;
		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	}
1030		1013
1031	destroy_inv (!destroy_inventory);	1014	destroy_inv (!destroy_inventory);
1032		1015
1033	if (is_head ())	1016	if (is_head ())
1034	if (sound_destroy)	1017	if (sound_destroy)
…		…
1055	if (flag [FLAG_REMOVED])	1038	if (flag [FLAG_REMOVED])
1056	return;	1039	return;
1057		1040
1058	INVOKE_OBJECT (REMOVE, this);	1041	INVOKE_OBJECT (REMOVE, this);
1059		1042
1060	if (object *pl = visible_to ())
1061	esrv_del_item (pl->contr, count);
1062
1063	flag [FLAG_REMOVED] = true;	1043	flag [FLAG_REMOVED] = true;
1064		1044
1065	if (more)	1045	if (more)
1066	more->remove ();	1046	more->remove ();
1067		1047
…		…
1069	* In this case, the object to be removed is in someones	1049	* In this case, the object to be removed is in someones
1070	* inventory.	1050	* inventory.
1071	*/	1051	*/
1072	if (env)	1052	if (env)
1073	{	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
1074	adjust_weight (env, -total_weight ());	1059	adjust_weight (env, -total_weight ());
1075
1076	*(above ? &above->below : &env->inv) = below;
1077
1078	if (below)
1079	below->above = above;
1080		1060
1081	/* we set up values so that it could be inserted into	1061	/* we set up values so that it could be inserted into
1082	* 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
1083	* to the caller to decide what we want to do.	1063	* to the caller to decide what we want to do.
1084	*/	1064	*/
1085	map = env->map;	1065	map = env->map;
1086	x = env->x;	1066	x = env->x;
1087	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
1088	above = 0;	1073	above = 0;
1089	below = 0;	1074	below = 0;
1090	env = 0;	1075	env = 0;
1091		1076
1092	/* 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
…		…
1096	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))
1097	otmp->update_stats ();	1082	otmp->update_stats ();
1098	}	1083	}
1099	else if (map)	1084	else if (map)
1100	{	1085	{
1101	if (type == PLAYER)
1102	{
1103	// leaving a spot always closes any open container on the ground
1104	if (container && !container->env)
1105	// this causes spurious floorbox updates, but it ensures
1106	// that the CLOSE event is being sent.
1107	close_container ();
1108
1109	--map->players;
1110	map->touch ();
1111	}
1112
1113	map->dirty = true;	1086	map->dirty = true;
1114	mapspace &ms = this->ms ();	1087	mapspace &ms = this->ms ();
1115		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
1116	/* link the object above us */	1111	/* link the object above us */
1117	if (above)	1112	// re-link, make sure compiler can easily use cmove
1118	above->below = below;	1113	*(above ? &above->below : &ms.top) = below;
1119	else	1114	*(below ? &below->above : &ms.bot) = above;
1120	ms.top = below; /* we were top, set new top */
1121
1122	/* Relink the object below us, if there is one */
1123	if (below)
1124	below->above = above;
1125	else
1126	{
1127	/* Nothing below, which means we need to relink map object for this space
1128	* use translated coordinates in case some oddness with map tiling is
1129	* evident
1130	*/
1131	if (GET_MAP_OB (map, x, y) != this)
1132	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 ());
1133
1134	ms.bot = above; /* goes on above it. */
1135	}
1136		1115
1137	above = 0;	1116	above = 0;
1138	below = 0;	1117	below = 0;
		1118
		1119	ms.flags_ = 0;
1139		1120
1140	if (map->in_memory == MAP_SAVING)	1121	if (map->in_memory == MAP_SAVING)
1141	return;	1122	return;
1142		1123
1143	int check_walk_off = !flag [FLAG_NO_APPLY];	1124	int check_walk_off = !flag [FLAG_NO_APPLY];
…		…
1149	* removed (most likely destroyed), update the player view	1130	* removed (most likely destroyed), update the player view
1150	* appropriately.	1131	* appropriately.
1151	*/	1132	*/
1152	pl->close_container ();	1133	pl->close_container ();
1153		1134
		1135	//TODO: the floorbox prev/next might need updating
1154	esrv_del_item (pl, 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 ();
1155	}	1140	}
1156		1141
1157	for (tmp = ms.bot; tmp; tmp = tmp->above)	1142	for (tmp = ms.bot; tmp; tmp = tmp->above)
1158	{	1143	{
1159	/* 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
…		…
1172	}	1157	}
1173		1158
1174	last = tmp;	1159	last = tmp;
1175	}	1160	}
1176		1161
1177	/* last == NULL if there are no objects on this space */
1178	//TODO: this makes little sense, why only update the topmost object?
1179	if (!last)
1180	map->at (x, y).flags_ = 0;
1181	else
1182	update_object (last, UP_OBJ_REMOVE);
1183
1184	if (flag [FLAG_BLOCKSVIEW] \|\| glow_radius)	1162	if (flag [FLAG_BLOCKSVIEW] \|\| glow_radius)
1185	update_all_los (map, x, y);	1163	update_all_los (map, x, y);
1186	}	1164	}
1187	}	1165	}
1188		1166
…		…
1213	esrv_update_item (UPD_NROF, pl, top);	1191	esrv_update_item (UPD_NROF, pl, top);
1214		1192
1215	op->weight = 0; // cancel the addition above	1193	op->weight = 0; // cancel the addition above
1216	op->carrying = 0; // must be 0 already	1194	op->carrying = 0; // must be 0 already
1217		1195
1218	op->destroy (1);	1196	op->destroy ();
1219		1197
1220	return top;	1198	return top;
1221	}	1199	}
1222		1200
1223	return 0;	1201	return 0;
…		…
1251	* job preparing multi-part monsters.	1229	* job preparing multi-part monsters.
1252	*/	1230	*/
1253	object *	1231	object *
1254	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)
1255	{	1233	{
		1234	op->remove ();
		1235
1256	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)	1236	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1257	{	1237	{
1258	tmp->x = x + tmp->arch->x;	1238	tmp->x = x + tmp->arch->x;
1259	tmp->y = y + tmp->arch->y;	1239	tmp->y = y + tmp->arch->y;
1260	}	1240	}
…		…
1283	* just 'op' otherwise	1263	* just 'op' otherwise
1284	*/	1264	*/
1285	object *	1265	object *
1286	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)
1287	{	1267	{
1288	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	}
1289		1273
1290	object top, floor = NULL;	1274	if (op->env)
1291		1275	{
		1276	LOG (llevError, "insert_ob_in_map called for object in an inventory (proceeding)");
1292	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
1293		1284
1294	/* Ideally, the caller figures this out. However, it complicates a lot	1285	/* Ideally, the caller figures this out. However, it complicates a lot
1295	* 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
1296	* need extra work	1287	* need extra work
1297	*/	1288	*/
1298	if (!xy_normalise (m, op->x, op->y))	1289	if (!xy_normalise (m, op->x, op->y))
1299	{	1290	{
1300	op->destroy (1);	1291	op->head_ ()->destroy ();// remove head_ once all tail object destroyers found
1301	return 0;	1292	return 0;
1302	}	1293	}
1303		1294
1304	if (object *more = op->more)	1295	if (object *more = op->more)
1305	if (!insert_ob_in_map (more, m, originator, flag))	1296	if (!insert_ob_in_map (more, m, originator, flag))
…		…
1314	*/	1305	*/
1315	if (op->nrof && !(flag & INS_NO_MERGE))	1306	if (op->nrof && !(flag & INS_NO_MERGE))
1316	for (object *tmp = ms.bot; tmp; tmp = tmp->above)	1307	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1317	if (object::can_merge (op, tmp))	1308	if (object::can_merge (op, tmp))
1318	{	1309	{
		1310	// TODO: we actually want to update tmp, not op,
		1311	// but some caller surely breaks when we return tmp
		1312	// from here :/
1319	op->nrof += tmp->nrof;	1313	op->nrof += tmp->nrof;
1320	tmp->destroy (1);	1314	tmp->destroy ();
1321	}	1315	}
1322		1316
1323	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 */
1324	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1318	CLEAR_FLAG (op, FLAG_INV_LOCKED);
1325		1319
…		…
1332	{	1326	{
1333	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");
1334	abort ();	1328	abort ();
1335	}	1329	}
1336		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
1337	op->above = originator;	1335	op->above = originator;
1338	op->below = originator->below;	1336	op->below = originator->below;
1339
1340	if (op->below)
1341	op->below->above = op;
1342	else
1343	ms.bot = op;
1344
1345	/* since below originator, no need to update top */
1346	originator->below = op;	1337	originator->below = op;
		1338
		1339	*(op->below ? &op->below->above : &ms.bot) = op;
1347	}	1340	}
1348	else	1341	else
1349	{	1342	{
1350	top = ms.bot;	1343	object *floor = 0;
		1344	object *top = ms.top;
1351		1345
1352	/* If there are other objects, then */	1346	/* If there are other objects, then */
1353	if (top)	1347	if (top)
1354	{	1348	{
1355	object *last = 0;
1356
1357	/*	1349	/*
1358	* 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.
1359	* We've already dealt with merging if appropriate.	1351	* We've already dealt with merging if appropriate.
1360	* 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
1361	* flag contains INS_ABOVE_FLOOR_ONLY, once we find the last	1353	* flag contains INS_ABOVE_FLOOR_ONLY, once we find the last
…		…
1364	* 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
1365	* 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
1366	* 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
1367	* that flying non pickable objects are spell objects.	1359	* that flying non pickable objects are spell objects.
1368	*/	1360	*/
1369	for (top = ms.bot; top; top = top->above)	1361	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1370	{	1362	{
1371	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))
1372	floor = top;	1364	floor = tmp;
1373		1365
1374	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))
1375	{	1367	{
1376	/* We insert above top, so we want this object below this */	1368	/* We insert above top, so we want this object below this */
1377	top = top->below;	1369	top = tmp->below;
1378	break;	1370	break;
1379	}	1371	}
1380		1372
1381	last = top;	1373	top = tmp;
1382	}	1374	}
1383
1384	/* Don't want top to be NULL, so set it to the last valid object */
1385	top = last;
1386		1375
1387	/* We let update_position deal with figuring out what the space	1376	/* We let update_position deal with figuring out what the space
1388	* looks like instead of lots of conditions here.	1377	* looks like instead of lots of conditions here.
1389	* makes things faster, and effectively the same result.	1378	* makes things faster, and effectively the same result.
1390	*/	1379	*/
…		…
1397	*/	1386	*/
1398	if (!(flag & INS_ON_TOP)	1387	if (!(flag & INS_ON_TOP)
1399	&& ms.flags () & P_BLOCKSVIEW	1388	&& ms.flags () & P_BLOCKSVIEW
1400	&& (op->face && !faces [op->face].visibility))	1389	&& (op->face && !faces [op->face].visibility))
1401	{	1390	{
		1391	object *last;
		1392
1402	for (last = top; last != floor; last = last->below)	1393	for (last = top; last != floor; last = last->below)
1403	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1394	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1404	break;	1395	break;
1405		1396
1406	/* Check to see if we found the object that blocks view,	1397	/* Check to see if we found the object that blocks view,
…		…
1414	} /* If objects on this space */	1405	} /* If objects on this space */
1415		1406
1416	if (flag & INS_ABOVE_FLOOR_ONLY)	1407	if (flag & INS_ABOVE_FLOOR_ONLY)
1417	top = floor;	1408	top = floor;
1418		1409
1419	/* 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
1420	*/
1421
1422	/* First object on this space */
1423	if (!top)	1411	if (!top)
1424	{	1412	{
		1413	op->below = 0;
1425	op->above = ms.bot;	1414	op->above = ms.bot;
1426
1427	if (op->above)
1428	op->above->below = op;
1429
1430	op->below = 0;
1431	ms.bot = op;	1415	ms.bot = op;
		1416
		1417	*(op->above ? &op->above->below : &ms.top) = op;
1432	}	1418	}
1433	else	1419	else
1434	{ /* get inserted into the stack above top */	1420	{
1435	op->above = top->above;	1421	op->above = top->above;
1436
1437	if (op->above)
1438	op->above->below = op;	1422	top->above = op;
1439		1423
1440	op->below = top;	1424	op->below = top;
1441	top->above = op;	1425	*(op->above ? &op->above->below : &ms.top) = op;
1442	}	1426	}
1443		1427	}
1444	if (!op->above)
1445	ms.top = op;
1446	} /* else not INS_BELOW_ORIGINATOR */
1447		1428
1448	if (op->type == PLAYER)	1429	if (op->type == PLAYER)
1449	{	1430	{
1450	op->contr->do_los = 1;	1431	op->contr->do_los = 1;
1451	++op->map->players;	1432	++op->map->players;
…		…
1453	}	1434	}
1454		1435
1455	op->map->dirty = true;	1436	op->map->dirty = true;
1456		1437
1457	if (object *pl = ms.player ())	1438	if (object *pl = ms.player ())
		1439	//TODO: the floorbox prev/next might need updating
1458	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 ();
1459		1444
1460	/* If this object glows, it may affect lighting conditions that are	1445	/* If this object glows, it may affect lighting conditions that are
1461	* 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
1462	* 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
1463	* on the map will get recalculated. The players could very well	1448	* on the map will get recalculated. The players could very well
…		…
1509	{	1494	{
1510	/* first search for itself and remove any old instances */	1495	/* first search for itself and remove any old instances */
1511		1496
1512	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)	1497	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1513	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */	1498	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */
1514	tmp->destroy (1);	1499	tmp->destroy ();
1515		1500
1516	object *tmp = arch_to_object (archetype::find (arch_string));	1501	object *tmp = arch_to_object (archetype::find (arch_string));
1517		1502
1518	tmp->x = op->x;	1503	tmp->x = op->x;
1519	tmp->y = op->y;	1504	tmp->y = op->y;
…		…
1543	if (!nr)	1528	if (!nr)
1544	return true;	1529	return true;
1545		1530
1546	nr = min (nr, nrof);	1531	nr = min (nr, nrof);
1547		1532
		1533	if (nrof > nr)
		1534	{
1548	nrof -= nr;	1535	nrof -= nr;
1549
1550	if (nrof)
1551	{
1552	adjust_weight (env, -weight * nr); // carrying == 0	1536	adjust_weight (env, -weight * max (1, nr)); // carrying == 0
1553		1537
1554	if (object *pl = visible_to ())	1538	if (object *pl = visible_to ())
1555	esrv_update_item (UPD_NROF, pl, this);	1539	esrv_update_item (UPD_NROF, pl, this);
1556		1540
1557	return true;	1541	return true;
1558	}	1542	}
1559	else	1543	else
1560	{	1544	{
1561	destroy (1);	1545	destroy ();
1562	return false;	1546	return false;
1563	}	1547	}
1564	}	1548	}
1565		1549
1566	/*	1550	/*
…		…
1583	}	1567	}
1584	else	1568	else
1585	{	1569	{
1586	decrease (nr);	1570	decrease (nr);
1587		1571
1588	object *op = object_create_clone (this);	1572	object *op = deep_clone ();
1589	op->nrof = nr;	1573	op->nrof = nr;
1590	return op;	1574	return op;
1591	}	1575	}
1592	}	1576	}
1593		1577
…		…
1643	if (object *pl = tmp->visible_to ())	1627	if (object *pl = tmp->visible_to ())
1644	esrv_update_item (UPD_NROF, pl, tmp);	1628	esrv_update_item (UPD_NROF, pl, tmp);
1645		1629
1646	adjust_weight (this, op->total_weight ());	1630	adjust_weight (this, op->total_weight ());
1647		1631
1648	op->destroy (1);	1632	op->destroy ();
1649	op = tmp;	1633	op = tmp;
1650	goto inserted;	1634	goto inserted;
1651	}	1635	}
1652		1636
1653	op->owner = 0; // it's his/hers now. period.	1637	op->owner = 0; // it's his/hers now. period.
…		…
1814	LOG (llevError, "Present_arch called outside map.\n");	1798	LOG (llevError, "Present_arch called outside map.\n");
1815	return NULL;	1799	return NULL;
1816	}	1800	}
1817		1801
1818	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)
1819	if (tmp->arch == at)	1803	if (tmp->arch->archname == at->archname)
1820	return tmp;	1804	return tmp;
1821		1805
1822	return NULL;	1806	return NULL;
1823	}	1807	}
1824		1808
…		…
1888	* The first matching object is returned, or NULL if none.	1872	* The first matching object is returned, or NULL if none.
1889	*/	1873	*/
1890	object *	1874	object *
1891	present_arch_in_ob (const archetype at, const object op)	1875	present_arch_in_ob (const archetype at, const object op)
1892	{	1876	{
1893	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)	1877	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1894	if (tmp->arch == at)	1878	if (tmp->arch->archname == at->archname)
1895	return tmp;	1879	return tmp;
1896		1880
1897	return NULL;	1881	return NULL;
1898	}	1882	}
1899		1883
…		…
2308		2292
2309	/*	2293	/*
2310	* create clone from object to another	2294	* create clone from object to another
2311	*/	2295	*/
2312	object *	2296	object *
2313	object_create_clone (object *asrc)	2297	object::deep_clone ()
2314	{	2298	{
2315	object dst = 0, tmp, src, prev, *item;	2299	assert (("deep_clone called on non-head object", is_head ()));
2316		2300
2317	if (!asrc)	2301	object *dst = clone ();
2318	return 0;
2319		2302
2320	src = asrc->head_ ();	2303	object *prev = dst;
2321
2322	prev = 0;
2323	for (object *part = src; part; part = part->more)	2304	for (object *part = this->more; part; part = part->more)
2324	{	2305	{
2325	tmp = part->clone ();	2306	object *tmp = part->clone ();
2326	tmp->x -= src->x;
2327	tmp->y -= src->y;
2328
2329	if (!part->head)
2330	{
2331	dst = tmp;
2332	tmp->head = 0;
2333	}
2334	else
2335	tmp->head = dst;	2307	tmp->head = dst;
2336
2337	tmp->more = 0;
2338
2339	if (prev)
2340	prev->more = tmp;	2308	prev->more = tmp;
2341
2342	prev = tmp;	2309	prev = tmp;
2343	}	2310	}
2344		2311
2345	for (item = src->inv; item; item = item->below)	2312	for (object *item = inv; item; item = item->below)
2346	insert_ob_in_ob (object_create_clone (item), dst);	2313	insert_ob_in_ob (item->deep_clone (), dst);
2347		2314
2348	return dst;	2315	return dst;
2349	}	2316	}
2350		2317
2351	/* This returns the first object in who's inventory that	2318	/* This returns the first object in who's inventory that
…		…
2360	return tmp;	2327	return tmp;
2361		2328
2362	return 0;	2329	return 0;
2363	}	2330	}
2364		2331
2365	/* If ob has a field named key, return the link from the list,	2332	const shstr &
2366	* otherwise return NULL.	2333	object::kv_get (const shstr &key) const
2367	*
2368	* key must be a passed in shared string - otherwise, this won't
2369	* do the desired thing.
2370	*/
2371	key_value *
2372	get_ob_key_link (const object ob, const char key)
2373	{	2334	{
2374	for (key_value *link = ob->key_values; link; link = link->next)	2335	for (key_value *kv = key_values; kv; kv = kv->next)
2375	if (link->key == key)	2336	if (kv->key == key)
2376	return link;
2377
2378	return 0;
2379	}
2380
2381	/*
2382	* Returns the value of op has an extra_field for key, or NULL.
2383	*
2384	* The argument doesn't need to be a shared string.
2385	*
2386	* The returned string is shared.
2387	*/
2388	const char *
2389	get_ob_key_value (const object op, const char const key)
2390	{
2391	key_value *link;
2392	shstr_cmp canonical_key (key);
2393
2394	if (!canonical_key)
2395	{
2396	/* 1. There being a field named key on any object
2397	* implies there'd be a shared string to find.
2398	* 2. Since there isn't, no object has this field.
2399	* 3. Therefore, this object doesn't have this field.
2400	*/
2401	return 0;
2402	}
2403
2404	/* This is copied from get_ob_key_link() above -
2405	* only 4 lines, and saves the function call overhead.
2406	*/
2407	for (link = op->key_values; link; link = link->next)
2408	if (link->key == canonical_key)
2409	return link->value;	2337	return kv->value;
2410		2338
2411	return 0;	2339	return shstr_null;
2412	}	2340	}
2413		2341
2414	/*	2342	void
2415	* Updates the canonical_key in op to value.	2343	object::kv_set (const shstr &key, const shstr &value)
2416	*
2417	* canonical_key is a shared string (value doesn't have to be).
2418	*
2419	* Unless add_key is TRUE, it won't add fields, only change the value of existing
2420	* keys.
2421	*
2422	* Returns TRUE on success.
2423	*/
2424	int
2425	set_ob_key_value_s (object op, const shstr & canonical_key, const char value, int add_key)
2426	{	2344	{
2427	key_value field = NULL, last = NULL;	2345	for (key_value *kv = key_values; kv; kv = kv->next)
2428		2346	if (kv->key == key)
2429	for (field = op->key_values; field != NULL; field = field->next)
2430	{
2431	if (field->key != canonical_key)
2432	{	2347	{
2433	last = field;	2348	kv->value = value;
2434	continue;	2349	return;
2435	}	2350	}
2436		2351
2437	if (value)	2352	key_value *kv = new key_value;
2438	field->value = value;	2353
2439	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)
2440	{	2366	{
2441	/* Basically, if the archetype has this key set,	2367	key_value kv = kvp;
2442	* we need to store the null value so when we save	2368	kvp = (kvp)->next;
2443	* it, we save the empty value so that when we load,	2369	delete kv;
2444	* we get this value back again.	2370	return;
2445	*/
2446	if (get_ob_key_link (op->arch, canonical_key))
2447	field->value = 0;
2448	else
2449	{
2450	if (last)
2451	last->next = field->next;
2452	else
2453	op->key_values = field->next;
2454
2455	delete field;
2456	}
2457	}	2371	}
2458	return TRUE;
2459	}
2460	/* IF we get here, key doesn't exist */
2461
2462	/* No field, we'll have to add it. */
2463
2464	if (!add_key)
2465	return FALSE;
2466
2467	/* There isn't any good reason to store a null
2468	* value in the key/value list. If the archetype has
2469	* this key, then we should also have it, so shouldn't
2470	* be here. If user wants to store empty strings,
2471	* should pass in ""
2472	*/
2473	if (value == NULL)
2474	return TRUE;
2475
2476	field = new key_value;
2477
2478	field->key = canonical_key;
2479	field->value = value;
2480	/* Usual prepend-addition. */
2481	field->next = op->key_values;
2482	op->key_values = field;
2483
2484	return TRUE;
2485	}
2486
2487	/*
2488	* Updates the key in op to value.
2489	*
2490	* If add_key is FALSE, this will only update existing keys,
2491	* and not add new ones.
2492	* In general, should be little reason FALSE is ever passed in for add_key
2493	*
2494	* Returns TRUE on success.
2495	*/
2496	int
2497	set_ob_key_value (object op, const char key, const char *value, int add_key)
2498	{
2499	shstr key_ (key);
2500
2501	return set_ob_key_value_s (op, key_, value, add_key);
2502	}	2372	}
2503		2373
2504	object::depth_iterator::depth_iterator (object *container)	2374	object::depth_iterator::depth_iterator (object *container)
2505	: iterator_base (container)	2375	: iterator_base (container)
2506	{	2376	{
…		…
2556	{	2426	{
2557	char flagdesc[512];	2427	char flagdesc[512];
2558	char info2[256 * 4];	2428	char info2[256 * 4];
2559	char *p = info;	2429	char *p = info;
2560		2430
2561	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}",
2562	count,	2432	count,
2563	uuid.c_str (),	2433	uuid.c_str (),
2564	&name,	2434	&name,
2565	title ? "\",title:\"" : "",	2435	title ? ",title:\"" : "",
2566	title ? (const char *)title : "",	2436	title ? (const char *)title : "",
		2437	title ? "\"" : "",
2567	flag_desc (flagdesc, 512), type);	2438	flag_desc (flagdesc, 512), type);
2568		2439
2569	if (!flag[FLAG_REMOVED] && env)	2440	if (!flag[FLAG_REMOVED] && env)
2570	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2441	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2571		2442
…		…
2604	object::open_container (object *new_container)	2475	object::open_container (object *new_container)
2605	{	2476	{
2606	if (container == new_container)	2477	if (container == new_container)
2607	return;	2478	return;
2608		2479
2609	if (object *old_container = container)	2480	object *old_container = container;
		2481
		2482	if (old_container)
2610	{	2483	{
2611	if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))	2484	if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
2612	return;	2485	return;
2613		2486
2614	#if 0	2487	#if 0
…		…
2616	if (object *closer = old_container->inv)	2489	if (object *closer = old_container->inv)
2617	if (closer->type == CLOSE_CON)	2490	if (closer->type == CLOSE_CON)
2618	closer->destroy ();	2491	closer->destroy ();
2619	#endif	2492	#endif
2620		2493
		2494	// make sure the container is available
		2495	esrv_send_item (this, old_container);
		2496
2621	old_container->flag [FLAG_APPLIED] = false;	2497	old_container->flag [FLAG_APPLIED] = false;
2622	container = 0;	2498	container = 0;
2623		2499
		2500	// client needs item update to make it work, client bug requires this to be separate
2624	esrv_update_item (UPD_FLAGS, this, old_container);	2501	esrv_update_item (UPD_FLAGS, this, old_container);
		2502
2625	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));	2503	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
2626	play_sound (sound_find ("chest_close"));	2504	play_sound (sound_find ("chest_close"));
2627	}	2505	}
2628		2506
2629	if (new_container)	2507	if (new_container)
…		…
2642	}	2520	}
2643	#endif	2521	#endif
2644		2522
2645	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));	2523	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));
2646		2524
		2525	// make sure the container is available, client bug requires this to be separate
		2526	esrv_send_item (this, new_container);
		2527
2647	new_container->flag [FLAG_APPLIED] = true;	2528	new_container->flag [FLAG_APPLIED] = true;
2648	container = new_container;	2529	container = new_container;
2649		2530
		2531	// client needs flag change
2650	esrv_update_item (UPD_FLAGS, this, new_container);	2532	esrv_update_item (UPD_FLAGS, this, new_container);
2651	esrv_send_inventory (this, new_container);	2533	esrv_send_inventory (this, new_container);
2652	play_sound (sound_find ("chest_open"));	2534	play_sound (sound_find ("chest_open"));
2653	}	2535	}
		2536	// else if (!old_container->env && contr && contr->ns)
		2537	// contr->ns->floorbox_reset ();
2654	}	2538	}
2655		2539
2656	object *	2540	object *
2657	object::force_find (const shstr name)	2541	object::force_find (const shstr name)
2658	{	2542	{

Diff Legend

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

Comparing deliantra/server/common/object.C (file contents): Revision 1.217 by root, Wed Apr 23 07:13:23 2008 UTC vs. Revision 1.259 by root, Mon Sep 29 10:32:50 2008 UTC

Diff Legend

Comparing deliantra/server/common/object.C (file contents):
Revision 1.217 by root, Wed Apr 23 07:13:23 2008 UTC vs.
Revision 1.259 by root, Mon Sep 29 10:32:50 2008 UTC