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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.214 by root, Tue Apr 22 07:01:46 2008 UTC vs.
Revision 1.257 by root, Tue Sep 16 16:03:02 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;
394		382
395	if (object *pl = op->visible_to ())	383	if (object *pl = op->visible_to ())
		384	if (pl != op) // player is handled lazily
396	esrv_update_item (UPD_WEIGHT, pl, op);	385	esrv_update_item (UPD_WEIGHT, pl, op);
397		386
398	op = op->env;	387	op = op->env;
399	}	388	}
400	}	389	}
401		390
…		…
415	op->update_weight ();	404	op->update_weight ();
416		405
417	sum += op->total_weight ();	406	sum += op->total_weight ();
418	}	407	}
419		408
420	sum = weight_adjust (this, sum);	409	sum = weight_adjust_for (this, sum);
421		410
422	if (sum != carrying)	411	if (sum != carrying)
423	{	412	{
424	carrying = sum;	413	carrying = sum;
425		414
426	if (object *pl = visible_to ())	415	if (object *pl = visible_to ())
		416	if (pl != this) // player is handled lazily
427	esrv_update_item (UPD_WEIGHT, pl, this);	417	esrv_update_item (UPD_WEIGHT, pl, this);
428	}	418	}
429	}	419	}
430		420
431	/*	421	/*
432	* Used by: Server DM commands: dumpbelow, dump. Some error messages.	422	* Used by: Server DM commands: dumpbelow, dump. Some error messages.
…		…
486	*/	476	*/
487	object *	477	object *
488	find_object_name (const char *str)	478	find_object_name (const char *str)
489	{	479	{
490	shstr_cmp str_ (str);	480	shstr_cmp str_ (str);
491	object *op;
492		481
		482	if (str_)
493	for_all_objects (op)	483	for_all_objects (op)
494	if (op->name == str_)	484	if (op->name == str_)
495	break;	485	return op;
496		486
497	return op;	487	return 0;
498	}	488	}
499		489
500	/*	490	/*
501	* 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
502	* skill and experience objects.	492	* skill and experience objects.
…		…
600	}	590	}
601		591
602	op->key_values = 0;	592	op->key_values = 0;
603	}	593	}
604		594
605	object &	595	/*
606	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)
607	{	605	{
608	bool is_freed = flag [FLAG_FREED];	606	dst->remove ();
609	bool is_removed = flag [FLAG_REMOVED];
610
611	(object_copy )this = src;	607	(object_copy )dst = *this;
612
613	flag [FLAG_FREED] = is_freed;
614	flag [FLAG_REMOVED] = is_removed;	608	dst->flag [FLAG_REMOVED] = true;
615		609
616	/* Copy over key_values, if any. */	610	/* Copy over key_values, if any. */
617	if (src.key_values)	611	if (key_values)
618	{	612	{
619	key_value *tail = 0;	613	key_value *tail = 0;
620	key_values = 0;	614	dst->key_values = 0;
621		615
622	for (key_value *i = src.key_values; i; i = i->next)	616	for (key_value *i = key_values; i; i = i->next)
623	{	617	{
624	key_value *new_link = new key_value;	618	key_value *new_link = new key_value;
625		619
626	new_link->next = 0;	620	new_link->next = 0;
627	new_link->key = i->key;	621	new_link->key = i->key;
628	new_link->value = i->value;	622	new_link->value = i->value;
629		623
630	/* Try and be clever here, too. */	624	/* Try and be clever here, too. */
631	if (!key_values)	625	if (!dst->key_values)
632	{	626	{
633	key_values = new_link;	627	dst->key_values = new_link;
634	tail = new_link;	628	tail = new_link;
635	}	629	}
636	else	630	else
637	{	631	{
638	tail->next = new_link;	632	tail->next = new_link;
639	tail = new_link;	633	tail = new_link;
640	}	634	}
641	}	635	}
642	}	636	}
643	}
644
645	/*
646	* copy_to first frees everything allocated by the dst object,
647	* and then copies the contents of itself into the second
648	* object, allocating what needs to be allocated. Basically, any
649	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
650	* if the first object is freed, the pointers in the new object
651	* will point at garbage.
652	*/
653	void
654	object::copy_to (object *dst)
655	{
656	dst = this;
657		637
658	if (speed < 0)	638	if (speed < 0)
659	dst->speed_left -= rndm ();	639	dst->speed_left -= rndm ();
660		640
661	dst->set_speed (dst->speed);	641	dst->activate ();
662	}	642	}
663		643
664	void	644	void
665	object::instantiate ()	645	object::instantiate ()
666	{	646	{
…		…
683	object *	663	object *
684	object::clone ()	664	object::clone ()
685	{	665	{
686	object *neu = create ();	666	object *neu = create ();
687	copy_to (neu);	667	copy_to (neu);
		668	neu->map = map; // not copied by copy_to
688	return neu;	669	return neu;
689	}	670	}
690		671
691	/*	672	/*
692	* 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
…		…
743	* UP_OBJ_FACE: only the objects face has changed.	724	* UP_OBJ_FACE: only the objects face has changed.
744	*/	725	*/
745	void	726	void
746	update_object (object *op, int action)	727	update_object (object *op, int action)
747	{	728	{
748	if (op == NULL)	729	if (!op)
749	{	730	{
750	/* this should never happen */	731	/* this should never happen */
751	LOG (llevDebug, "update_object() called for NULL object.\n");	732	LOG (llevError \| logBacktrace, "update_object() called for NULL object.\n");
752	return;	733	return;
753	}	734	}
754		735
755	if (op->env)	736	if (!op->is_on_map ())
756	{	737	{
757	/* Animation is currently handled by client, so nothing	738	/* Animation is currently handled by client, so nothing
758	* to do in this case.	739	* to do in this case.
759	*/	740	*/
760	return;	741	return;
761	}	742	}
762
763	/* If the map is saving, don't do anything as everything is
764	* going to get freed anyways.
765	*/
766	if (!op->map \|\| op->map->in_memory == MAP_SAVING)
767	return;
768		743
769	/* make sure the object is within map boundaries */	744	/* make sure the object is within map boundaries */
770	if (op->x < 0 \|\| op->x >= op->map->width \|\| op->y < 0 \|\| op->y >= op->map->height)	745	if (op->x < 0 \|\| op->x >= op->map->width \|\| op->y < 0 \|\| op->y >= op->map->height)
771	{	746	{
772	LOG (llevError, "update_object() called for object out of map!\n");	747	LOG (llevError, "update_object() called for object out of map!\n");
…		…
791	\|\| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))	766	\|\| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))
792	\|\| (m.move_on \| op->move_on ) != m.move_on	767	\|\| (m.move_on \| op->move_on ) != m.move_on
793	\|\| (m.move_off \| op->move_off ) != m.move_off	768	\|\| (m.move_off \| op->move_off ) != m.move_off
794	\|\| (m.move_slow \| op->move_slow) != m.move_slow	769	\|\| (m.move_slow \| op->move_slow) != m.move_slow
795	/* 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
796	* to have move_allow right now.	771	* have move_allow right now.
797	*/	772	*/
798	\|\| ((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
799	\|\| 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)
800	m.flags_ = 0;	775	m.flags_ = 0;
801	}	776	}
…		…
855	{	830	{
856	/* If already on active list, don't do anything */	831	/* If already on active list, don't do anything */
857	if (active)	832	if (active)
858	return;	833	return;
859		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
860	if (has_active_speed ())	838	if (has_active_speed ())
861	actives.insert (this);	839	actives.insert (this);
862	}	840	}
863		841
864	void	842	void
…		…
915	object::destroy_inv (bool drop_to_ground)	893	object::destroy_inv (bool drop_to_ground)
916	{	894	{
917	// need to check first, because the checks below might segfault	895	// need to check first, because the checks below might segfault
918	// as we might be on an invalid mapspace and crossfire code	896	// as we might be on an invalid mapspace and crossfire code
919	// is too buggy to ensure that the inventory is empty.	897	// is too buggy to ensure that the inventory is empty.
920	// corollary: if you create arrows etc. with stuff in tis inventory,	898	// corollary: if you create arrows etc. with stuff in its inventory,
921	// cf will crash below with off-map x and y	899	// cf will crash below with off-map x and y
922	if (!inv)	900	if (!inv)
923	return;	901	return;
924		902
925	/* Only if the space blocks everything do we not process -	903	/* Only if the space blocks everything do we not process -
…		…
927	* drop on that space.	905	* drop on that space.
928	*/	906	*/
929	if (!drop_to_ground	907	if (!drop_to_ground
930	\|\| !map	908	\|\| !map
931	\|\| map->in_memory != MAP_ACTIVE	909	\|\| map->in_memory != MAP_ACTIVE
932	\|\| map->nodrop	910	\|\| map->no_drop
933	\|\| ms ().move_block == MOVE_ALL)	911	\|\| ms ().move_block == MOVE_ALL)
934	{	912	{
935	while (inv)	913	while (inv)
936	{
937	inv->destroy_inv (drop_to_ground);
938	inv->destroy ();	914	inv->destroy (true);
939	}
940	}	915	}
941	else	916	else
942	{ /* Put objects in inventory onto this space */	917	{ /* Put objects in inventory onto this space */
943	while (inv)	918	while (inv)
944	{	919	{
…		…
948	\|\| op->flag [FLAG_NO_DROP]	923	\|\| op->flag [FLAG_NO_DROP]
949	\|\| op->type == RUNE	924	\|\| op->type == RUNE
950	\|\| op->type == TRAP	925	\|\| op->type == TRAP
951	\|\| op->flag [FLAG_IS_A_TEMPLATE]	926	\|\| op->flag [FLAG_IS_A_TEMPLATE]
952	\|\| op->flag [FLAG_DESTROY_ON_DEATH])	927	\|\| op->flag [FLAG_DESTROY_ON_DEATH])
953	op->destroy ();	928	op->destroy (true);
954	else	929	else
955	map->insert (op, x, y);	930	map->insert (op, x, y);
956	}	931	}
957	}	932	}
958	}	933	}
…		…
962	object *op = new object;	937	object *op = new object;
963	op->link ();	938	op->link ();
964	return op;	939	return op;
965	}	940	}
966		941
		942	static struct freed_map : maptile
		943	{
		944	freed_map ()
		945	{
		946	path = "<freed objects map>";
		947	name = "/internal/freed_objects_map";
		948	width = 3;
		949	height = 3;
		950	no_drop = 1;
		951	no_reset = 1;
		952
		953	alloc ();
		954	in_memory = MAP_ACTIVE;
		955	}
		956
		957	~freed_map ()
		958	{
		959	destroy ();
		960	}
		961	} freed_map; // freed objects are moved here to avoid crashes
		962
967	void	963	void
968	object::do_destroy ()	964	object::do_destroy ()
969	{	965	{
970	if (flag [FLAG_IS_LINKED])	966	if (flag [FLAG_IS_LINKED])
971	remove_button_link (this);	967	remove_button_link (this);
…		…
975		971
976	remove ();	972	remove ();
977		973
978	attachable::do_destroy ();	974	attachable::do_destroy ();
979		975
980	destroy_inv (true);
981
982	deactivate ();	976	deactivate ();
983	unlink ();	977	unlink ();
984		978
985	flag [FLAG_FREED] = 1;	979	flag [FLAG_FREED] = 1;
986		980
987	// hack to ensure that freed objects still have a valid map	981	// hack to ensure that freed objects still have a valid map
988	{
989	static maptile *freed_map; // freed objects are moved here to avoid crashes
990
991	if (!freed_map)
992	{
993	freed_map = new maptile;
994
995	freed_map->path = "<freed objects map>";
996	freed_map->name = "/internal/freed_objects_map";
997	freed_map->width = 3;
998	freed_map->height = 3;
999	freed_map->nodrop = 1;
1000
1001	freed_map->alloc ();
1002	freed_map->in_memory = MAP_ACTIVE;
1003	}
1004
1005	map = freed_map;	982	map = &freed_map;
1006	x = 1;	983	x = 1;
1007	y = 1;	984	y = 1;
1008	}
1009		985
1010	if (more)	986	if (more)
1011	{	987	{
1012	more->destroy ();	988	more->destroy ();
1013	more = 0;	989	more = 0;
…		…
1026	object::destroy (bool destroy_inventory)	1002	object::destroy (bool destroy_inventory)
1027	{	1003	{
1028	if (destroyed ())	1004	if (destroyed ())
1029	return;	1005	return;
1030		1006
		1007	if (!is_head () && !head->destroyed ())
		1008	{
		1009	LOG (llevError \| logBacktrace, "tried to destroy the tail of an object");
		1010	head->destroy (destroy_inventory);
		1011	return;
		1012	}
		1013
1031	if (destroy_inventory)	1014	destroy_inv (!destroy_inventory);
1032	destroy_inv (false);
1033		1015
1034	if (is_head ())	1016	if (is_head ())
1035	if (sound_destroy)	1017	if (sound_destroy)
1036	play_sound (sound_destroy);	1018	play_sound (sound_destroy);
1037	else if (flag [FLAG_MONSTER])	1019	else if (flag [FLAG_MONSTER])
…		…
1056	if (flag [FLAG_REMOVED])	1038	if (flag [FLAG_REMOVED])
1057	return;	1039	return;
1058		1040
1059	INVOKE_OBJECT (REMOVE, this);	1041	INVOKE_OBJECT (REMOVE, this);
1060		1042
1061	if (object *pl = visible_to ())
1062	esrv_del_item (pl->contr, count);
1063
1064	flag [FLAG_REMOVED] = true;	1043	flag [FLAG_REMOVED] = true;
1065		1044
1066	if (more)	1045	if (more)
1067	more->remove ();	1046	more->remove ();
1068		1047
…		…
1070	* In this case, the object to be removed is in someones	1049	* In this case, the object to be removed is in someones
1071	* inventory.	1050	* inventory.
1072	*/	1051	*/
1073	if (env)	1052	if (env)
1074	{	1053	{
		1054	flag [FLAG_REMOVED] = false; // hack around the issue of visible_to checking flag_removed
		1055	if (object *pl = visible_to ())
		1056	esrv_del_item (pl->contr, count);
		1057	flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed
		1058
1075	adjust_weight (env, -total_weight ());	1059	adjust_weight (env, -total_weight ());
1076
1077	*(above ? &above->below : &env->inv) = below;
1078
1079	if (below)
1080	below->above = above;
1081		1060
1082	/* we set up values so that it could be inserted into	1061	/* we set up values so that it could be inserted into
1083	* the map, but we don't actually do that - it is up	1062	* the map, but we don't actually do that - it is up
1084	* to the caller to decide what we want to do.	1063	* to the caller to decide what we want to do.
1085	*/	1064	*/
1086	map = env->map;	1065	map = env->map;
1087	x = env->x;	1066	x = env->x;
1088	y = env->y;	1067	y = env->y;
		1068
		1069	// make sure cmov optimisation is applicable
		1070	*(above ? &above->below : &env->inv) = below;
		1071	*(below ? &below->above : &above ) = above; // &above is just a dummy
		1072
1089	above = 0;	1073	above = 0;
1090	below = 0;	1074	below = 0;
1091	env = 0;	1075	env = 0;
1092		1076
1093	/* NO_FIX_PLAYER is set when a great many changes are being	1077	/* NO_FIX_PLAYER is set when a great many changes are being
…		…
1097	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1081	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1098	otmp->update_stats ();	1082	otmp->update_stats ();
1099	}	1083	}
1100	else if (map)	1084	else if (map)
1101	{	1085	{
1102	if (type == PLAYER)
1103	{
1104	// leaving a spot always closes any open container on the ground
1105	if (container && !container->env)
1106	// this causes spurious floorbox updates, but it ensures
1107	// that the CLOSE event is being sent.
1108	close_container ();
1109
1110	--map->players;
1111	map->touch ();
1112	}
1113
1114	map->dirty = true;	1086	map->dirty = true;
1115	mapspace &ms = this->ms ();	1087	mapspace &ms = this->ms ();
1116		1088
		1089	if (object *pl = ms.player ())
		1090	{
		1091	if (type == PLAYER) // this == pl(!)
		1092	{
		1093	// leaving a spot always closes any open container on the ground
		1094	if (container && !container->env)
		1095	// this causes spurious floorbox updates, but it ensures
		1096	// that the CLOSE event is being sent.
		1097	close_container ();
		1098
		1099	--map->players;
		1100	map->touch ();
		1101	}
		1102	else if (pl->container == this)
		1103	{
		1104	// removing a container should close it
		1105	close_container ();
		1106	}
		1107
		1108	esrv_del_item (pl->contr, count);
		1109	}
		1110
1117	/* link the object above us */	1111	/* link the object above us */
1118	if (above)	1112	// re-link, make sure compiler can easily use cmove
1119	above->below = below;	1113	*(above ? &above->below : &ms.top) = below;
1120	else	1114	*(below ? &below->above : &ms.bot) = above;
1121	ms.top = below; /* we were top, set new top */
1122
1123	/* Relink the object below us, if there is one */
1124	if (below)
1125	below->above = above;
1126	else
1127	{
1128	/* Nothing below, which means we need to relink map object for this space
1129	* use translated coordinates in case some oddness with map tiling is
1130	* evident
1131	*/
1132	if (GET_MAP_OB (map, x, y) != this)
1133	LOG (llevError, "remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom? %s\n", debug_desc ());
1134
1135	ms.bot = above; /* goes on above it. */
1136	}
1137		1115
1138	above = 0;	1116	above = 0;
1139	below = 0;	1117	below = 0;
		1118
		1119	ms.flags_ = 0;
1140		1120
1141	if (map->in_memory == MAP_SAVING)	1121	if (map->in_memory == MAP_SAVING)
1142	return;	1122	return;
1143		1123
1144	int check_walk_off = !flag [FLAG_NO_APPLY];	1124	int check_walk_off = !flag [FLAG_NO_APPLY];
…		…
1150	* removed (most likely destroyed), update the player view	1130	* removed (most likely destroyed), update the player view
1151	* appropriately.	1131	* appropriately.
1152	*/	1132	*/
1153	pl->close_container ();	1133	pl->close_container ();
1154		1134
		1135	//TODO: the floorbox prev/next might need updating
		1136	//esrv_del_item (pl->contr, count);
		1137	//TODO: update floorbox to preserve ordering
		1138	if (pl->contr->ns)
1155	pl->contr->ns->floorbox_update ();	1139	pl->contr->ns->floorbox_update ();
1156	}	1140	}
1157		1141
1158	for (tmp = ms.bot; tmp; tmp = tmp->above)	1142	for (tmp = ms.bot; tmp; tmp = tmp->above)
1159	{	1143	{
1160	/* 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
…		…
1173	}	1157	}
1174		1158
1175	last = tmp;	1159	last = tmp;
1176	}	1160	}
1177		1161
1178	/* last == NULL if there are no objects on this space */
1179	//TODO: this makes little sense, why only update the topmost object?
1180	if (!last)
1181	map->at (x, y).flags_ = 0;
1182	else
1183	update_object (last, UP_OBJ_REMOVE);
1184
1185	if (flag [FLAG_BLOCKSVIEW] \|\| glow_radius)	1162	if (flag [FLAG_BLOCKSVIEW] \|\| glow_radius)
1186	update_all_los (map, x, y);	1163	update_all_los (map, x, y);
1187	}	1164	}
1188	}	1165	}
1189		1166
…		…
1252	* job preparing multi-part monsters.	1229	* job preparing multi-part monsters.
1253	*/	1230	*/
1254	object *	1231	object *
1255	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)
1256	{	1233	{
		1234	op->remove ();
		1235
1257	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)	1236	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1258	{	1237	{
1259	tmp->x = x + tmp->arch->x;	1238	tmp->x = x + tmp->arch->x;
1260	tmp->y = y + tmp->arch->y;	1239	tmp->y = y + tmp->arch->y;
1261	}	1240	}
…		…
1284	* just 'op' otherwise	1263	* just 'op' otherwise
1285	*/	1264	*/
1286	object *	1265	object *
1287	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)
1288	{	1267	{
1289	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	}
1290		1273
1291	object top, floor = NULL;	1274	if (op->env)
1292		1275	{
		1276	LOG (llevError, "insert_ob_in_map called for object in an inventory (proceeding)");
1293	op->remove ();	1277	op->remove ();
		1278	}
		1279
		1280	if (op->face && !face_info (op->face))//D TODO: remove soon
		1281	{//D
		1282	LOG (llevError \| logBacktrace, "op->face out of bounds: %s", op->debug_desc ());//D
		1283	op->face = 1;//D
		1284	}//D
1294		1285
1295	/* Ideally, the caller figures this out. However, it complicates a lot	1286	/* Ideally, the caller figures this out. However, it complicates a lot
1296	* of areas of callers (eg, anything that uses find_free_spot would now	1287	* of areas of callers (eg, anything that uses find_free_spot would now
1297	* need extra work	1288	* need extra work
1298	*/	1289	*/
1299	if (!xy_normalise (m, op->x, op->y))	1290	if (!xy_normalise (m, op->x, op->y))
1300	{	1291	{
1301	op->destroy ();	1292	op->head_ ()->destroy (1);// remove head_ once all tail object destroyers found
1302	return 0;	1293	return 0;
1303	}	1294	}
1304		1295
1305	if (object *more = op->more)	1296	if (object *more = op->more)
1306	if (!insert_ob_in_map (more, m, originator, flag))	1297	if (!insert_ob_in_map (more, m, originator, flag))
…		…
1315	*/	1306	*/
1316	if (op->nrof && !(flag & INS_NO_MERGE))	1307	if (op->nrof && !(flag & INS_NO_MERGE))
1317	for (object *tmp = ms.bot; tmp; tmp = tmp->above)	1308	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1318	if (object::can_merge (op, tmp))	1309	if (object::can_merge (op, tmp))
1319	{	1310	{
		1311	// TODO: we actually want to update tmp, not op,
		1312	// but some caller surely breaks when we return tmp
		1313	// from here :/
1320	op->nrof += tmp->nrof;	1314	op->nrof += tmp->nrof;
1321	tmp->destroy (1);	1315	tmp->destroy (1);
1322	}	1316	}
1323		1317
1324	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1318	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
…		…
1333	{	1327	{
1334	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");	1328	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");
1335	abort ();	1329	abort ();
1336	}	1330	}
1337		1331
		1332	if (!originator->is_on_map ())
		1333	LOG (llevDebug \| logBacktrace, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map",
		1334	op->debug_desc (), originator->debug_desc ());
		1335
1338	op->above = originator;	1336	op->above = originator;
1339	op->below = originator->below;	1337	op->below = originator->below;
1340
1341	if (op->below)
1342	op->below->above = op;
1343	else
1344	ms.bot = op;
1345
1346	/* since below originator, no need to update top */
1347	originator->below = op;	1338	originator->below = op;
		1339
		1340	*(op->below ? &op->below->above : &ms.bot) = op;
1348	}	1341	}
1349	else	1342	else
1350	{	1343	{
1351	top = ms.bot;	1344	object *floor = 0;
		1345	object *top = ms.top;
1352		1346
1353	/* If there are other objects, then */	1347	/* If there are other objects, then */
1354	if (top)	1348	if (top)
1355	{	1349	{
1356	object *last = 0;
1357
1358	/*	1350	/*
1359	* If there are multiple objects on this space, we do some trickier handling.	1351	* If there are multiple objects on this space, we do some trickier handling.
1360	* We've already dealt with merging if appropriate.	1352	* We've already dealt with merging if appropriate.
1361	* Generally, we want to put the new object on top. But if	1353	* Generally, we want to put the new object on top. But if
1362	* flag contains INS_ABOVE_FLOOR_ONLY, once we find the last	1354	* flag contains INS_ABOVE_FLOOR_ONLY, once we find the last
…		…
1365	* once we get to them. This reduces the need to traverse over all of	1357	* once we get to them. This reduces the need to traverse over all of
1366	* them when adding another one - this saves quite a bit of cpu time	1358	* them when adding another one - this saves quite a bit of cpu time
1367	* when lots of spells are cast in one area. Currently, it is presumed	1359	* when lots of spells are cast in one area. Currently, it is presumed
1368	* that flying non pickable objects are spell objects.	1360	* that flying non pickable objects are spell objects.
1369	*/	1361	*/
1370	for (top = ms.bot; top; top = top->above)	1362	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1371	{	1363	{
1372	if (QUERY_FLAG (top, FLAG_IS_FLOOR) \|\| QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))	1364	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) \|\| QUERY_FLAG (tmp, FLAG_OVERLAY_FLOOR))
1373	floor = top;	1365	floor = tmp;
1374		1366
1375	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW \| MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))	1367	if (QUERY_FLAG (tmp, FLAG_NO_PICK) && (tmp->move_type & (MOVE_FLY_LOW \| MOVE_FLY_HIGH)) && !QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1376	{	1368	{
1377	/* We insert above top, so we want this object below this */	1369	/* We insert above top, so we want this object below this */
1378	top = top->below;	1370	top = tmp->below;
1379	break;	1371	break;
1380	}	1372	}
1381		1373
1382	last = top;	1374	top = tmp;
1383	}	1375	}
1384
1385	/* Don't want top to be NULL, so set it to the last valid object */
1386	top = last;
1387		1376
1388	/* We let update_position deal with figuring out what the space	1377	/* We let update_position deal with figuring out what the space
1389	* looks like instead of lots of conditions here.	1378	* looks like instead of lots of conditions here.
1390	* makes things faster, and effectively the same result.	1379	* makes things faster, and effectively the same result.
1391	*/	1380	*/
…		…
1398	*/	1387	*/
1399	if (!(flag & INS_ON_TOP)	1388	if (!(flag & INS_ON_TOP)
1400	&& ms.flags () & P_BLOCKSVIEW	1389	&& ms.flags () & P_BLOCKSVIEW
1401	&& (op->face && !faces [op->face].visibility))	1390	&& (op->face && !faces [op->face].visibility))
1402	{	1391	{
		1392	object *last;
		1393
1403	for (last = top; last != floor; last = last->below)	1394	for (last = top; last != floor; last = last->below)
1404	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1395	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1405	break;	1396	break;
1406		1397
1407	/* Check to see if we found the object that blocks view,	1398	/* Check to see if we found the object that blocks view,
…		…
1415	} /* If objects on this space */	1406	} /* If objects on this space */
1416		1407
1417	if (flag & INS_ABOVE_FLOOR_ONLY)	1408	if (flag & INS_ABOVE_FLOOR_ONLY)
1418	top = floor;	1409	top = floor;
1419		1410
1420	/* Top is the object that our object (op) is going to get inserted above.	1411	// insert object above top, or bottom-most if top = 0
1421	*/
1422
1423	/* First object on this space */
1424	if (!top)	1412	if (!top)
1425	{	1413	{
		1414	op->below = 0;
1426	op->above = ms.bot;	1415	op->above = ms.bot;
1427
1428	if (op->above)
1429	op->above->below = op;
1430
1431	op->below = 0;
1432	ms.bot = op;	1416	ms.bot = op;
		1417
		1418	*(op->above ? &op->above->below : &ms.top) = op;
1433	}	1419	}
1434	else	1420	else
1435	{ /* get inserted into the stack above top */	1421	{
1436	op->above = top->above;	1422	op->above = top->above;
1437
1438	if (op->above)
1439	op->above->below = op;	1423	top->above = op;
1440		1424
1441	op->below = top;	1425	op->below = top;
1442	top->above = op;	1426	*(op->above ? &op->above->below : &ms.top) = op;
1443	}	1427	}
1444		1428	}
1445	if (!op->above)
1446	ms.top = op;
1447	} /* else not INS_BELOW_ORIGINATOR */
1448		1429
1449	if (op->type == PLAYER)	1430	if (op->type == PLAYER)
1450	{	1431	{
1451	op->contr->do_los = 1;	1432	op->contr->do_los = 1;
1452	++op->map->players;	1433	++op->map->players;
…		…
1454	}	1435	}
1455		1436
1456	op->map->dirty = true;	1437	op->map->dirty = true;
1457		1438
1458	if (object *pl = ms.player ())	1439	if (object *pl = ms.player ())
		1440	//TODO: the floorbox prev/next might need updating
		1441	//esrv_send_item (pl, op);
		1442	//TODO: update floorbox to preserve ordering
		1443	if (pl->contr->ns)
1459	pl->contr->ns->floorbox_update ();	1444	pl->contr->ns->floorbox_update ();
1460		1445
1461	/* If this object glows, it may affect lighting conditions that are	1446	/* If this object glows, it may affect lighting conditions that are
1462	* visible to others on this map. But update_all_los is really	1447	* visible to others on this map. But update_all_los is really
1463	* an inefficient way to do this, as it means los for all players	1448	* an inefficient way to do this, as it means los for all players
1464	* on the map will get recalculated. The players could very well	1449	* on the map will get recalculated. The players could very well
…		…
1544	if (!nr)	1529	if (!nr)
1545	return true;	1530	return true;
1546		1531
1547	nr = min (nr, nrof);	1532	nr = min (nr, nrof);
1548		1533
		1534	if (nrof > nr)
		1535	{
1549	nrof -= nr;	1536	nrof -= nr;
1550
1551	if (nrof)
1552	{
1553	adjust_weight (env, -weight * nr); // carrying == 0	1537	adjust_weight (env, -weight * max (1, nr)); // carrying == 0
1554		1538
1555	if (object *pl = visible_to ())	1539	if (object *pl = visible_to ())
1556	esrv_update_item (UPD_NROF, pl, this);	1540	esrv_update_item (UPD_NROF, pl, this);
1557		1541
1558	return true;	1542	return true;
1559	}	1543	}
1560	else	1544	else
1561	{	1545	{
1562	destroy (1);	1546	destroy ();
1563	return false;	1547	return false;
1564	}	1548	}
1565	}	1549	}
1566		1550
1567	/*	1551	/*
…		…
1584	}	1568	}
1585	else	1569	else
1586	{	1570	{
1587	decrease (nr);	1571	decrease (nr);
1588		1572
1589	object *op = object_create_clone (this);	1573	object *op = deep_clone ();
1590	op->nrof = nr;	1574	op->nrof = nr;
1591	return op;	1575	return op;
1592	}	1576	}
1593	}	1577	}
1594		1578
…		…
1815	LOG (llevError, "Present_arch called outside map.\n");	1799	LOG (llevError, "Present_arch called outside map.\n");
1816	return NULL;	1800	return NULL;
1817	}	1801	}
1818		1802
1819	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)	1803	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1820	if (tmp->arch == at)	1804	if (tmp->arch->archname == at->archname)
1821	return tmp;	1805	return tmp;
1822		1806
1823	return NULL;	1807	return NULL;
1824	}	1808	}
1825		1809
…		…
1889	* The first matching object is returned, or NULL if none.	1873	* The first matching object is returned, or NULL if none.
1890	*/	1874	*/
1891	object *	1875	object *
1892	present_arch_in_ob (const archetype at, const object op)	1876	present_arch_in_ob (const archetype at, const object op)
1893	{	1877	{
1894	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)	1878	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1895	if (tmp->arch == at)	1879	if (tmp->arch->archname == at->archname)
1896	return tmp;	1880	return tmp;
1897		1881
1898	return NULL;	1882	return NULL;
1899	}	1883	}
1900		1884
…		…
2309		2293
2310	/*	2294	/*
2311	* create clone from object to another	2295	* create clone from object to another
2312	*/	2296	*/
2313	object *	2297	object *
2314	object_create_clone (object *asrc)	2298	object::deep_clone ()
2315	{	2299	{
2316	object dst = 0, tmp, src, prev, *item;	2300	assert (("deep_clone called on non-head object", is_head ()));
2317		2301
2318	if (!asrc)	2302	object *dst = clone ();
2319	return 0;
2320		2303
2321	src = asrc->head_ ();	2304	object *prev = dst;
2322
2323	prev = 0;
2324	for (object *part = src; part; part = part->more)	2305	for (object *part = this->more; part; part = part->more)
2325	{	2306	{
2326	tmp = part->clone ();	2307	object *tmp = part->clone ();
2327	tmp->x -= src->x;
2328	tmp->y -= src->y;
2329
2330	if (!part->head)
2331	{
2332	dst = tmp;
2333	tmp->head = 0;
2334	}
2335	else
2336	tmp->head = dst;	2308	tmp->head = dst;
2337
2338	tmp->more = 0;
2339
2340	if (prev)
2341	prev->more = tmp;	2309	prev->more = tmp;
2342
2343	prev = tmp;	2310	prev = tmp;
2344	}	2311	}
2345		2312
2346	for (item = src->inv; item; item = item->below)	2313	for (object *item = inv; item; item = item->below)
2347	insert_ob_in_ob (object_create_clone (item), dst);	2314	insert_ob_in_ob (item->deep_clone (), dst);
2348		2315
2349	return dst;	2316	return dst;
2350	}	2317	}
2351		2318
2352	/* This returns the first object in who's inventory that	2319	/* This returns the first object in who's inventory that
…		…
2361	return tmp;	2328	return tmp;
2362		2329
2363	return 0;	2330	return 0;
2364	}	2331	}
2365		2332
2366	/* If ob has a field named key, return the link from the list,	2333	const shstr &
2367	* otherwise return NULL.	2334	object::kv_get (const shstr &key) const
2368	*
2369	* key must be a passed in shared string - otherwise, this won't
2370	* do the desired thing.
2371	*/
2372	key_value *
2373	get_ob_key_link (const object ob, const char key)
2374	{	2335	{
2375	for (key_value *link = ob->key_values; link; link = link->next)	2336	for (key_value *kv = key_values; kv; kv = kv->next)
2376	if (link->key == key)	2337	if (kv->key == key)
2377	return link;
2378
2379	return 0;
2380	}
2381
2382	/*
2383	* Returns the value of op has an extra_field for key, or NULL.
2384	*
2385	* The argument doesn't need to be a shared string.
2386	*
2387	* The returned string is shared.
2388	*/
2389	const char *
2390	get_ob_key_value (const object op, const char const key)
2391	{
2392	key_value *link;
2393	shstr_cmp canonical_key (key);
2394
2395	if (!canonical_key)
2396	{
2397	/* 1. There being a field named key on any object
2398	* implies there'd be a shared string to find.
2399	* 2. Since there isn't, no object has this field.
2400	* 3. Therefore, this object doesn't have this field.
2401	*/
2402	return 0;
2403	}
2404
2405	/* This is copied from get_ob_key_link() above -
2406	* only 4 lines, and saves the function call overhead.
2407	*/
2408	for (link = op->key_values; link; link = link->next)
2409	if (link->key == canonical_key)
2410	return link->value;	2338	return kv->value;
2411		2339
2412	return 0;	2340	return shstr_null;
2413	}	2341	}
2414		2342
2415	/*	2343	void
2416	* Updates the canonical_key in op to value.	2344	object::kv_set (const shstr &key, const shstr &value)
2417	*
2418	* canonical_key is a shared string (value doesn't have to be).
2419	*
2420	* Unless add_key is TRUE, it won't add fields, only change the value of existing
2421	* keys.
2422	*
2423	* Returns TRUE on success.
2424	*/
2425	int
2426	set_ob_key_value_s (object op, const shstr & canonical_key, const char value, int add_key)
2427	{	2345	{
2428	key_value field = NULL, last = NULL;	2346	for (key_value *kv = key_values; kv; kv = kv->next)
2429		2347	if (kv->key == key)
2430	for (field = op->key_values; field != NULL; field = field->next)
2431	{
2432	if (field->key != canonical_key)
2433	{	2348	{
2434	last = field;	2349	kv->value = value;
2435	continue;	2350	return;
2436	}	2351	}
2437		2352
2438	if (value)	2353	key_value *kv = new key_value;
2439	field->value = value;	2354
2440	else	2355	kv->next = key_values;
		2356	kv->key = key;
		2357	kv->value = value;
		2358
		2359	key_values = kv;
		2360	}
		2361
		2362	void
		2363	object::kv_del (const shstr &key)
		2364	{
		2365	for (key_value *kvp = &key_values; kvp; kvp = &(*kvp)->next)
		2366	if ((*kvp)->key == key)
2441	{	2367	{
2442	/* Basically, if the archetype has this key set,	2368	key_value kv = kvp;
2443	* we need to store the null value so when we save	2369	kvp = (kvp)->next;
2444	* it, we save the empty value so that when we load,	2370	delete kv;
2445	* we get this value back again.	2371	return;
2446	*/
2447	if (get_ob_key_link (op->arch, canonical_key))
2448	field->value = 0;
2449	else
2450	{
2451	if (last)
2452	last->next = field->next;
2453	else
2454	op->key_values = field->next;
2455
2456	delete field;
2457	}
2458	}	2372	}
2459	return TRUE;
2460	}
2461	/* IF we get here, key doesn't exist */
2462
2463	/* No field, we'll have to add it. */
2464
2465	if (!add_key)
2466	return FALSE;
2467
2468	/* There isn't any good reason to store a null
2469	* value in the key/value list. If the archetype has
2470	* this key, then we should also have it, so shouldn't
2471	* be here. If user wants to store empty strings,
2472	* should pass in ""
2473	*/
2474	if (value == NULL)
2475	return TRUE;
2476
2477	field = new key_value;
2478
2479	field->key = canonical_key;
2480	field->value = value;
2481	/* Usual prepend-addition. */
2482	field->next = op->key_values;
2483	op->key_values = field;
2484
2485	return TRUE;
2486	}
2487
2488	/*
2489	* Updates the key in op to value.
2490	*
2491	* If add_key is FALSE, this will only update existing keys,
2492	* and not add new ones.
2493	* In general, should be little reason FALSE is ever passed in for add_key
2494	*
2495	* Returns TRUE on success.
2496	*/
2497	int
2498	set_ob_key_value (object op, const char key, const char *value, int add_key)
2499	{
2500	shstr key_ (key);
2501
2502	return set_ob_key_value_s (op, key_, value, add_key);
2503	}	2373	}
2504		2374
2505	object::depth_iterator::depth_iterator (object *container)	2375	object::depth_iterator::depth_iterator (object *container)
2506	: iterator_base (container)	2376	: iterator_base (container)
2507	{	2377	{
…		…
2557	{	2427	{
2558	char flagdesc[512];	2428	char flagdesc[512];
2559	char info2[256 * 4];	2429	char info2[256 * 4];
2560	char *p = info;	2430	char *p = info;
2561		2431
2562	p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s,flags:[%s],type:%d}",	2432	p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s%s,flags:[%s],type:%d}",
2563	count,	2433	count,
2564	uuid.c_str (),	2434	uuid.c_str (),
2565	&name,	2435	&name,
2566	title ? "\",title:\"" : "",	2436	title ? ",title:\"" : "",
2567	title ? (const char *)title : "",	2437	title ? (const char *)title : "",
		2438	title ? "\"" : "",
2568	flag_desc (flagdesc, 512), type);	2439	flag_desc (flagdesc, 512), type);
2569		2440
2570	if (!this->flag[FLAG_REMOVED] && env)	2441	if (!flag[FLAG_REMOVED] && env)
2571	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2442	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2572		2443
2573	if (map)	2444	if (map)
2574	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);	2445	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2575		2446
…		…
2605	object::open_container (object *new_container)	2476	object::open_container (object *new_container)
2606	{	2477	{
2607	if (container == new_container)	2478	if (container == new_container)
2608	return;	2479	return;
2609		2480
2610	if (object *old_container = container)	2481	object *old_container = container;
		2482
		2483	if (old_container)
2611	{	2484	{
2612	if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))	2485	if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
2613	return;	2486	return;
2614		2487
2615	#if 0	2488	#if 0
…		…
2617	if (object *closer = old_container->inv)	2490	if (object *closer = old_container->inv)
2618	if (closer->type == CLOSE_CON)	2491	if (closer->type == CLOSE_CON)
2619	closer->destroy ();	2492	closer->destroy ();
2620	#endif	2493	#endif
2621		2494
		2495	// make sure the container is available
		2496	esrv_send_item (this, old_container);
		2497
2622	old_container->flag [FLAG_APPLIED] = 0;	2498	old_container->flag [FLAG_APPLIED] = false;
2623	container = 0;	2499	container = 0;
2624		2500
		2501	// client needs item update to make it work, client bug requires this to be separate
2625	esrv_update_item (UPD_FLAGS, this, old_container);	2502	esrv_update_item (UPD_FLAGS, this, old_container);
		2503
2626	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));	2504	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
2627	play_sound (sound_find ("chest_close"));	2505	play_sound (sound_find ("chest_close"));
2628	}	2506	}
2629		2507
2630	if (new_container)	2508	if (new_container)
…		…
2643	}	2521	}
2644	#endif	2522	#endif
2645		2523
2646	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));	2524	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));
2647		2525
		2526	// make sure the container is available, client bug requires this to be separate
		2527	esrv_send_item (this, new_container);
		2528
2648	new_container->flag [FLAG_APPLIED] = 1;	2529	new_container->flag [FLAG_APPLIED] = true;
2649	container = new_container;	2530	container = new_container;
2650		2531
		2532	// client needs flag change
2651	esrv_update_item (UPD_FLAGS, this, new_container);	2533	esrv_update_item (UPD_FLAGS, this, new_container);
2652	esrv_send_inventory (this, new_container);	2534	esrv_send_inventory (this, new_container);
2653	play_sound (sound_find ("chest_open"));	2535	play_sound (sound_find ("chest_open"));
2654	}	2536	}
		2537	// else if (!old_container->env && contr && contr->ns)
		2538	// contr->ns->floorbox_reset ();
2655	}	2539	}
2656		2540
2657	object *	2541	object *
2658	object::force_find (const shstr name)	2542	object::force_find (const shstr name)
2659	{	2543	{

Diff Legend

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

Comparing deliantra/server/common/object.C (file contents): Revision 1.214 by root, Tue Apr 22 07:01:46 2008 UTC vs. Revision 1.257 by root, Tue Sep 16 16:03:02 2008 UTC

Diff Legend

Comparing deliantra/server/common/object.C (file contents):
Revision 1.214 by root, Tue Apr 22 07:01:46 2008 UTC vs.
Revision 1.257 by root, Tue Sep 16 16:03:02 2008 UTC