[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.254 by root, Sun Aug 31 01:17:11 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
…		…
334		318
335	// find player who can see this object	319	// find player who can see this object
336	object *	320	object *
337	object::visible_to () const	321	object::visible_to () const
338	{	322	{
339	if (!flag [FLAG_REMOVED])	323	if (client_visible () && !flag [FLAG_REMOVED])
340	{	324	{
341	// see if we are in a container of sorts	325	// see if we are in a container of sorts
342	if (env)	326	if (env)
343	{	327	{
344	// the player inventory itself is always visible	328	// the player inventory itself is always visible
…		…
358	else	342	else
359	{	343	{
360	// maybe there is a player standing on the same mapspace	344	// maybe there is a player standing on the same mapspace
361	// this will catch the case where "this" is a player	345	// this will catch the case where "this" is a player
362	if (object *pl = ms ().player ())	346	if (object *pl = ms ().player ())
		347	if ((!pl->container && pl->contr->ns && !pl->contr->ns->update_look)
		348	\|\| this == pl->container)
363	return pl;	349	return pl;
364	}	350	}
365	}	351	}
366		352
367	return 0;	353	return 0;
368	}	354	}
369		355
370	// adjust weight per container type ("of holding")	356	// adjust weight per container type ("of holding")
371	static sint32	357	static sint32
372	weight_adjust (object *op, sint32 weight)	358	weight_adjust_for (object *op, sint32 weight)
373	{	359	{
374	return op->type == CONTAINER	360	return op->type == CONTAINER
375	? lerp (weight, 0, 100, 0, 100 - op->stats.Str)	361	? lerp (weight, 0, 100, 0, 100 - op->stats.Str)
376	: weight;	362	: weight;
377	}	363	}
…		…
383	static void	369	static void
384	adjust_weight (object *op, sint32 weight)	370	adjust_weight (object *op, sint32 weight)
385	{	371	{
386	while (op)	372	while (op)
387	{	373	{
		374	// adjust by actual difference to account for rounding errors
		375	// i.e. (w2 - w1) / f != w2 / f - w1 / f and the latter is correct
388	weight = weight_adjust (op, weight);	376	weight = weight_adjust_for (op, op->carrying)
		377	- weight_adjust_for (op, op->carrying - weight);
389		378
390	if (!weight)	379	if (!weight)
391	return;	380	return;
392		381
393	op->carrying += weight;	382	op->carrying += weight;
394		383
395	if (object *pl = op->visible_to ())	384	if (object *pl = op->visible_to ())
		385	if (pl != op) // player is handled lazily
396	esrv_update_item (UPD_WEIGHT, pl, op);	386	esrv_update_item (UPD_WEIGHT, pl, op);
397		387
398	op = op->env;	388	op = op->env;
399	}	389	}
400	}	390	}
401		391
…		…
415	op->update_weight ();	405	op->update_weight ();
416		406
417	sum += op->total_weight ();	407	sum += op->total_weight ();
418	}	408	}
419		409
420	sum = weight_adjust (this, sum);	410	sum = weight_adjust_for (this, sum);
421		411
422	if (sum != carrying)	412	if (sum != carrying)
423	{	413	{
424	carrying = sum;	414	carrying = sum;
425		415
426	if (object *pl = visible_to ())	416	if (object *pl = visible_to ())
		417	if (pl != this) // player is handled lazily
427	esrv_update_item (UPD_WEIGHT, pl, this);	418	esrv_update_item (UPD_WEIGHT, pl, this);
428	}	419	}
429	}	420	}
430		421
431	/*	422	/*
432	* Used by: Server DM commands: dumpbelow, dump. Some error messages.	423	* Used by: Server DM commands: dumpbelow, dump. Some error messages.
…		…
486	*/	477	*/
487	object *	478	object *
488	find_object_name (const char *str)	479	find_object_name (const char *str)
489	{	480	{
490	shstr_cmp str_ (str);	481	shstr_cmp str_ (str);
491	object *op;
492		482
		483	if (str_)
493	for_all_objects (op)	484	for_all_objects (op)
494	if (op->name == str_)	485	if (op->name == str_)
495	break;	486	return op;
496		487
497	return op;	488	return 0;
498	}	489	}
499		490
500	/*	491	/*
501	* Sets the owner and sets the skill and exp pointers to owner's current	492	* Sets the owner and sets the skill and exp pointers to owner's current
502	* skill and experience objects.	493	* skill and experience objects.
…		…
600	}	591	}
601		592
602	op->key_values = 0;	593	op->key_values = 0;
603	}	594	}
604		595
605	object &	596	/*
606	object::operator =(const object &src)	597	* copy_to first frees everything allocated by the dst object,
		598	* and then copies the contents of itself into the second
		599	* object, allocating what needs to be allocated. Basically, any
		600	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
		601	* if the first object is freed, the pointers in the new object
		602	* will point at garbage.
		603	*/
		604	void
		605	object::copy_to (object *dst)
607	{	606	{
608	bool is_freed = flag [FLAG_FREED];	607	dst->remove ();
609	bool is_removed = flag [FLAG_REMOVED];
610
611	(object_copy )this = src;	608	(object_copy )dst = *this;
612
613	flag [FLAG_FREED] = is_freed;
614	flag [FLAG_REMOVED] = is_removed;	609	dst->flag [FLAG_REMOVED] = true;
615		610
616	/* Copy over key_values, if any. */	611	/* Copy over key_values, if any. */
617	if (src.key_values)	612	if (key_values)
618	{	613	{
619	key_value *tail = 0;	614	key_value *tail = 0;
620	key_values = 0;	615	dst->key_values = 0;
621		616
622	for (key_value *i = src.key_values; i; i = i->next)	617	for (key_value *i = key_values; i; i = i->next)
623	{	618	{
624	key_value *new_link = new key_value;	619	key_value *new_link = new key_value;
625		620
626	new_link->next = 0;	621	new_link->next = 0;
627	new_link->key = i->key;	622	new_link->key = i->key;
628	new_link->value = i->value;	623	new_link->value = i->value;
629		624
630	/* Try and be clever here, too. */	625	/* Try and be clever here, too. */
631	if (!key_values)	626	if (!dst->key_values)
632	{	627	{
633	key_values = new_link;	628	dst->key_values = new_link;
634	tail = new_link;	629	tail = new_link;
635	}	630	}
636	else	631	else
637	{	632	{
638	tail->next = new_link;	633	tail->next = new_link;
639	tail = new_link;	634	tail = new_link;
640	}	635	}
641	}	636	}
642	}	637	}
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		638
658	if (speed < 0)	639	if (speed < 0)
659	dst->speed_left -= rndm ();	640	dst->speed_left -= rndm ();
660		641
661	dst->set_speed (dst->speed);	642	dst->set_speed (dst->speed);
…		…
683	object *	664	object *
684	object::clone ()	665	object::clone ()
685	{	666	{
686	object *neu = create ();	667	object *neu = create ();
687	copy_to (neu);	668	copy_to (neu);
		669	neu->map = map; // not copied by copy_to
688	return neu;	670	return neu;
689	}	671	}
690		672
691	/*	673	/*
692	* If an object with the IS_TURNABLE() flag needs to be turned due	674	* If an object with the IS_TURNABLE() flag needs to be turned due
…		…
743	* UP_OBJ_FACE: only the objects face has changed.	725	* UP_OBJ_FACE: only the objects face has changed.
744	*/	726	*/
745	void	727	void
746	update_object (object *op, int action)	728	update_object (object *op, int action)
747	{	729	{
748	if (op == NULL)	730	if (!op)
749	{	731	{
750	/* this should never happen */	732	/* this should never happen */
751	LOG (llevDebug, "update_object() called for NULL object.\n");	733	LOG (llevError \| logBacktrace, "update_object() called for NULL object.\n");
752	return;	734	return;
753	}	735	}
754		736
755	if (op->env)	737	if (!op->is_on_map ())
756	{	738	{
757	/* Animation is currently handled by client, so nothing	739	/* Animation is currently handled by client, so nothing
758	* to do in this case.	740	* to do in this case.
759	*/	741	*/
760	return;	742	return;
761	}	743	}
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		744
769	/* make sure the object is within map boundaries */	745	/* 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)	746	if (op->x < 0 \|\| op->x >= op->map->width \|\| op->y < 0 \|\| op->y >= op->map->height)
771	{	747	{
772	LOG (llevError, "update_object() called for object out of map!\n");	748	LOG (llevError, "update_object() called for object out of map!\n");
…		…
791	\|\| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))	767	\|\| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))
792	\|\| (m.move_on \| op->move_on ) != m.move_on	768	\|\| (m.move_on \| op->move_on ) != m.move_on
793	\|\| (m.move_off \| op->move_off ) != m.move_off	769	\|\| (m.move_off \| op->move_off ) != m.move_off
794	\|\| (m.move_slow \| op->move_slow) != m.move_slow	770	\|\| (m.move_slow \| op->move_slow) != m.move_slow
795	/* This isn't perfect, but I don't expect a lot of objects to	771	/* This isn't perfect, but I don't expect a lot of objects to
796	* to have move_allow right now.	772	* have move_allow right now.
797	*/	773	*/
798	\|\| ((m.move_block \| op->move_block) & ~op->move_allow) != m.move_block	774	\|\| ((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)	775	\|\| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)
800	m.flags_ = 0;	776	m.flags_ = 0;
801	}	777	}
…		…
915	object::destroy_inv (bool drop_to_ground)	891	object::destroy_inv (bool drop_to_ground)
916	{	892	{
917	// need to check first, because the checks below might segfault	893	// need to check first, because the checks below might segfault
918	// as we might be on an invalid mapspace and crossfire code	894	// as we might be on an invalid mapspace and crossfire code
919	// is too buggy to ensure that the inventory is empty.	895	// is too buggy to ensure that the inventory is empty.
920	// corollary: if you create arrows etc. with stuff in tis inventory,	896	// corollary: if you create arrows etc. with stuff in its inventory,
921	// cf will crash below with off-map x and y	897	// cf will crash below with off-map x and y
922	if (!inv)	898	if (!inv)
923	return;	899	return;
924		900
925	/* Only if the space blocks everything do we not process -	901	/* Only if the space blocks everything do we not process -
…		…
927	* drop on that space.	903	* drop on that space.
928	*/	904	*/
929	if (!drop_to_ground	905	if (!drop_to_ground
930	\|\| !map	906	\|\| !map
931	\|\| map->in_memory != MAP_ACTIVE	907	\|\| map->in_memory != MAP_ACTIVE
932	\|\| map->nodrop	908	\|\| map->no_drop
933	\|\| ms ().move_block == MOVE_ALL)	909	\|\| ms ().move_block == MOVE_ALL)
934	{	910	{
935	while (inv)	911	while (inv)
936	{
937	inv->destroy_inv (drop_to_ground);
938	inv->destroy ();	912	inv->destroy (true);
939	}
940	}	913	}
941	else	914	else
942	{ /* Put objects in inventory onto this space */	915	{ /* Put objects in inventory onto this space */
943	while (inv)	916	while (inv)
944	{	917	{
…		…
948	\|\| op->flag [FLAG_NO_DROP]	921	\|\| op->flag [FLAG_NO_DROP]
949	\|\| op->type == RUNE	922	\|\| op->type == RUNE
950	\|\| op->type == TRAP	923	\|\| op->type == TRAP
951	\|\| op->flag [FLAG_IS_A_TEMPLATE]	924	\|\| op->flag [FLAG_IS_A_TEMPLATE]
952	\|\| op->flag [FLAG_DESTROY_ON_DEATH])	925	\|\| op->flag [FLAG_DESTROY_ON_DEATH])
953	op->destroy ();	926	op->destroy (true);
954	else	927	else
955	map->insert (op, x, y);	928	map->insert (op, x, y);
956	}	929	}
957	}	930	}
958	}	931	}
…		…
962	object *op = new object;	935	object *op = new object;
963	op->link ();	936	op->link ();
964	return op;	937	return op;
965	}	938	}
966		939
		940	static struct freed_map : maptile
		941	{
		942	freed_map ()
		943	{
		944	path = "<freed objects map>";
		945	name = "/internal/freed_objects_map";
		946	width = 3;
		947	height = 3;
		948	no_drop = 1;
		949	no_reset = 1;
		950
		951	alloc ();
		952	in_memory = MAP_ACTIVE;
		953	}
		954
		955	~freed_map ()
		956	{
		957	destroy ();
		958	}
		959	} freed_map; // freed objects are moved here to avoid crashes
		960
967	void	961	void
968	object::do_destroy ()	962	object::do_destroy ()
969	{	963	{
970	if (flag [FLAG_IS_LINKED])	964	if (flag [FLAG_IS_LINKED])
971	remove_button_link (this);	965	remove_button_link (this);
…		…
975		969
976	remove ();	970	remove ();
977		971
978	attachable::do_destroy ();	972	attachable::do_destroy ();
979		973
980	destroy_inv (true);
981
982	deactivate ();	974	deactivate ();
983	unlink ();	975	unlink ();
984		976
985	flag [FLAG_FREED] = 1;	977	flag [FLAG_FREED] = 1;
986		978
987	// hack to ensure that freed objects still have a valid map	979	// 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;	980	map = &freed_map;
1006	x = 1;	981	x = 1;
1007	y = 1;	982	y = 1;
1008	}
1009		983
1010	if (more)	984	if (more)
1011	{	985	{
1012	more->destroy ();	986	more->destroy ();
1013	more = 0;	987	more = 0;
…		…
1026	object::destroy (bool destroy_inventory)	1000	object::destroy (bool destroy_inventory)
1027	{	1001	{
1028	if (destroyed ())	1002	if (destroyed ())
1029	return;	1003	return;
1030		1004
		1005	if (!is_head () && !head->destroyed ())
		1006	{
		1007	LOG (llevError \| logBacktrace, "tried to destroy the tail of an object");
		1008	head->destroy (destroy_inventory);
		1009	return;
		1010	}
		1011
1031	if (destroy_inventory)	1012	destroy_inv (!destroy_inventory);
1032	destroy_inv (false);
1033		1013
1034	if (is_head ())	1014	if (is_head ())
1035	if (sound_destroy)	1015	if (sound_destroy)
1036	play_sound (sound_destroy);	1016	play_sound (sound_destroy);
1037	else if (flag [FLAG_MONSTER])	1017	else if (flag [FLAG_MONSTER])
…		…
1056	if (flag [FLAG_REMOVED])	1036	if (flag [FLAG_REMOVED])
1057	return;	1037	return;
1058		1038
1059	INVOKE_OBJECT (REMOVE, this);	1039	INVOKE_OBJECT (REMOVE, this);
1060		1040
1061	if (object *pl = visible_to ())
1062	esrv_del_item (pl->contr, count);
1063
1064	flag [FLAG_REMOVED] = true;	1041	flag [FLAG_REMOVED] = true;
1065		1042
1066	if (more)	1043	if (more)
1067	more->remove ();	1044	more->remove ();
1068		1045
…		…
1070	* In this case, the object to be removed is in someones	1047	* In this case, the object to be removed is in someones
1071	* inventory.	1048	* inventory.
1072	*/	1049	*/
1073	if (env)	1050	if (env)
1074	{	1051	{
		1052	flag [FLAG_REMOVED] = false; // hack around the issue of visible_to checking flag_removed
		1053	if (object *pl = visible_to ())
		1054	esrv_del_item (pl->contr, count);
		1055	flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed
		1056
1075	adjust_weight (env, -total_weight ());	1057	adjust_weight (env, -total_weight ());
1076
1077	*(above ? &above->below : &env->inv) = below;
1078
1079	if (below)
1080	below->above = above;
1081		1058
1082	/* we set up values so that it could be inserted into	1059	/* we set up values so that it could be inserted into
1083	* the map, but we don't actually do that - it is up	1060	* the map, but we don't actually do that - it is up
1084	* to the caller to decide what we want to do.	1061	* to the caller to decide what we want to do.
1085	*/	1062	*/
1086	map = env->map;	1063	map = env->map;
1087	x = env->x;	1064	x = env->x;
1088	y = env->y;	1065	y = env->y;
		1066
		1067	// make sure cmov optimisation is applicable
		1068	*(above ? &above->below : &env->inv) = below;
		1069	*(below ? &below->above : &above ) = above; // &above is just a dummy
		1070
1089	above = 0;	1071	above = 0;
1090	below = 0;	1072	below = 0;
1091	env = 0;	1073	env = 0;
1092		1074
1093	/* NO_FIX_PLAYER is set when a great many changes are being	1075	/* 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))	1079	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1098	otmp->update_stats ();	1080	otmp->update_stats ();
1099	}	1081	}
1100	else if (map)	1082	else if (map)
1101	{	1083	{
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;	1084	map->dirty = true;
1115	mapspace &ms = this->ms ();	1085	mapspace &ms = this->ms ();
1116		1086
		1087	if (object *pl = ms.player ())
		1088	{
		1089	if (type == PLAYER) // this == pl(!)
		1090	{
		1091	// leaving a spot always closes any open container on the ground
		1092	if (container && !container->env)
		1093	// this causes spurious floorbox updates, but it ensures
		1094	// that the CLOSE event is being sent.
		1095	close_container ();
		1096
		1097	--map->players;
		1098	map->touch ();
		1099	}
		1100	else if (pl->container == this)
		1101	{
		1102	// removing a container should close it
		1103	close_container ();
		1104	}
		1105
		1106	esrv_del_item (pl->contr, count);
		1107	}
		1108
1117	/* link the object above us */	1109	/* link the object above us */
1118	if (above)	1110	// re-link, make sure compiler can easily use cmove
1119	above->below = below;	1111	*(above ? &above->below : &ms.top) = below;
1120	else	1112	*(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		1113
1138	above = 0;	1114	above = 0;
1139	below = 0;	1115	below = 0;
		1116
		1117	ms.flags_ = 0;
1140		1118
1141	if (map->in_memory == MAP_SAVING)	1119	if (map->in_memory == MAP_SAVING)
1142	return;	1120	return;
1143		1121
1144	int check_walk_off = !flag [FLAG_NO_APPLY];	1122	int check_walk_off = !flag [FLAG_NO_APPLY];
…		…
1150	* removed (most likely destroyed), update the player view	1128	* removed (most likely destroyed), update the player view
1151	* appropriately.	1129	* appropriately.
1152	*/	1130	*/
1153	pl->close_container ();	1131	pl->close_container ();
1154		1132
		1133	//TODO: the floorbox prev/next might need updating
		1134	//esrv_del_item (pl->contr, count);
		1135	//TODO: update floorbox to preserve ordering
		1136	if (pl->contr->ns)
1155	pl->contr->ns->floorbox_update ();	1137	pl->contr->ns->floorbox_update ();
1156	}	1138	}
1157		1139
1158	for (tmp = ms.bot; tmp; tmp = tmp->above)	1140	for (tmp = ms.bot; tmp; tmp = tmp->above)
1159	{	1141	{
1160	/* No point updating the players look faces if he is the object	1142	/* No point updating the players look faces if he is the object
…		…
1173	}	1155	}
1174		1156
1175	last = tmp;	1157	last = tmp;
1176	}	1158	}
1177		1159
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)	1160	if (flag [FLAG_BLOCKSVIEW] \|\| glow_radius)
1186	update_all_los (map, x, y);	1161	update_all_los (map, x, y);
1187	}	1162	}
1188	}	1163	}
1189		1164
…		…
1252	* job preparing multi-part monsters.	1227	* job preparing multi-part monsters.
1253	*/	1228	*/
1254	object *	1229	object *
1255	insert_ob_in_map_at (object op, maptile m, object *originator, int flag, int x, int y)	1230	insert_ob_in_map_at (object op, maptile m, object *originator, int flag, int x, int y)
1256	{	1231	{
		1232	op->remove ();
		1233
1257	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)	1234	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1258	{	1235	{
1259	tmp->x = x + tmp->arch->x;	1236	tmp->x = x + tmp->arch->x;
1260	tmp->y = y + tmp->arch->y;	1237	tmp->y = y + tmp->arch->y;
1261	}	1238	}
…		…
1284	* just 'op' otherwise	1261	* just 'op' otherwise
1285	*/	1262	*/
1286	object *	1263	object *
1287	insert_ob_in_map (object op, maptile m, object *originator, int flag)	1264	insert_ob_in_map (object op, maptile m, object *originator, int flag)
1288	{	1265	{
1289	assert (!op->flag [FLAG_FREED]);	1266	if (op->is_on_map ())
		1267	{
		1268	LOG (llevError, "insert_ob_in_map called for object already on map");
		1269	abort ();
		1270	}
1290		1271
1291	object top, floor = NULL;	1272	if (op->env)
1292		1273	{
		1274	LOG (llevError, "insert_ob_in_map called for object in an inventory (proceeding)");
1293	op->remove ();	1275	op->remove ();
		1276	}
		1277
		1278	if (op->face && !face_info (op->face))//D TODO: remove soon
		1279	{//D
		1280	LOG (llevError \| logBacktrace, "op->face out of bounds: %s", op->debug_desc ());//D
		1281	op->face = 1;//D
		1282	}//D
1294		1283
1295	/* Ideally, the caller figures this out. However, it complicates a lot	1284	/* 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	1285	* of areas of callers (eg, anything that uses find_free_spot would now
1297	* need extra work	1286	* need extra work
1298	*/	1287	*/
1299	if (!xy_normalise (m, op->x, op->y))	1288	if (!xy_normalise (m, op->x, op->y))
1300	{	1289	{
1301	op->destroy ();	1290	op->head_ ()->destroy (1);// remove head_ once all tail object destroyers found
1302	return 0;	1291	return 0;
1303	}	1292	}
1304		1293
1305	if (object *more = op->more)	1294	if (object *more = op->more)
1306	if (!insert_ob_in_map (more, m, originator, flag))	1295	if (!insert_ob_in_map (more, m, originator, flag))
…		…
1315	*/	1304	*/
1316	if (op->nrof && !(flag & INS_NO_MERGE))	1305	if (op->nrof && !(flag & INS_NO_MERGE))
1317	for (object *tmp = ms.bot; tmp; tmp = tmp->above)	1306	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1318	if (object::can_merge (op, tmp))	1307	if (object::can_merge (op, tmp))
1319	{	1308	{
		1309	// TODO: we actually want to update tmp, not op,
		1310	// but some caller surely breaks when we return tmp
		1311	// from here :/
1320	op->nrof += tmp->nrof;	1312	op->nrof += tmp->nrof;
1321	tmp->destroy (1);	1313	tmp->destroy (1);
1322	}	1314	}
1323		1315
1324	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1316	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
…		…
1333	{	1325	{
1334	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");	1326	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");
1335	abort ();	1327	abort ();
1336	}	1328	}
1337		1329
		1330	if (!originator->is_on_map ())
		1331	LOG (llevDebug \| logBacktrace, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map",
		1332	op->debug_desc (), originator->debug_desc ());
		1333
1338	op->above = originator;	1334	op->above = originator;
1339	op->below = originator->below;	1335	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;	1336	originator->below = op;
		1337
		1338	*(op->below ? &op->below->above : &ms.bot) = op;
1348	}	1339	}
1349	else	1340	else
1350	{	1341	{
1351	top = ms.bot;	1342	object *floor = 0;
		1343	object *top = ms.top;
1352		1344
1353	/* If there are other objects, then */	1345	/* If there are other objects, then */
1354	if (top)	1346	if (top)
1355	{	1347	{
1356	object *last = 0;
1357
1358	/*	1348	/*
1359	* If there are multiple objects on this space, we do some trickier handling.	1349	* If there are multiple objects on this space, we do some trickier handling.
1360	* We've already dealt with merging if appropriate.	1350	* We've already dealt with merging if appropriate.
1361	* Generally, we want to put the new object on top. But if	1351	* Generally, we want to put the new object on top. But if
1362	* flag contains INS_ABOVE_FLOOR_ONLY, once we find the last	1352	* 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	1355	* 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	1356	* 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	1357	* when lots of spells are cast in one area. Currently, it is presumed
1368	* that flying non pickable objects are spell objects.	1358	* that flying non pickable objects are spell objects.
1369	*/	1359	*/
1370	for (top = ms.bot; top; top = top->above)	1360	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1371	{	1361	{
1372	if (QUERY_FLAG (top, FLAG_IS_FLOOR) \|\| QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))	1362	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) \|\| QUERY_FLAG (tmp, FLAG_OVERLAY_FLOOR))
1373	floor = top;	1363	floor = tmp;
1374		1364
1375	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW \| MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))	1365	if (QUERY_FLAG (tmp, FLAG_NO_PICK) && (tmp->move_type & (MOVE_FLY_LOW \| MOVE_FLY_HIGH)) && !QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1376	{	1366	{
1377	/* We insert above top, so we want this object below this */	1367	/* We insert above top, so we want this object below this */
1378	top = top->below;	1368	top = tmp->below;
1379	break;	1369	break;
1380	}	1370	}
1381		1371
1382	last = top;	1372	top = tmp;
1383	}	1373	}
1384
1385	/* Don't want top to be NULL, so set it to the last valid object */
1386	top = last;
1387		1374
1388	/* We let update_position deal with figuring out what the space	1375	/* We let update_position deal with figuring out what the space
1389	* looks like instead of lots of conditions here.	1376	* looks like instead of lots of conditions here.
1390	* makes things faster, and effectively the same result.	1377	* makes things faster, and effectively the same result.
1391	*/	1378	*/
…		…
1398	*/	1385	*/
1399	if (!(flag & INS_ON_TOP)	1386	if (!(flag & INS_ON_TOP)
1400	&& ms.flags () & P_BLOCKSVIEW	1387	&& ms.flags () & P_BLOCKSVIEW
1401	&& (op->face && !faces [op->face].visibility))	1388	&& (op->face && !faces [op->face].visibility))
1402	{	1389	{
		1390	object *last;
		1391
1403	for (last = top; last != floor; last = last->below)	1392	for (last = top; last != floor; last = last->below)
1404	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1393	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1405	break;	1394	break;
1406		1395
1407	/* Check to see if we found the object that blocks view,	1396	/* Check to see if we found the object that blocks view,
…		…
1415	} /* If objects on this space */	1404	} /* If objects on this space */
1416		1405
1417	if (flag & INS_ABOVE_FLOOR_ONLY)	1406	if (flag & INS_ABOVE_FLOOR_ONLY)
1418	top = floor;	1407	top = floor;
1419		1408
1420	/* Top is the object that our object (op) is going to get inserted above.	1409	// insert object above top, or bottom-most if top = 0
1421	*/
1422
1423	/* First object on this space */
1424	if (!top)	1410	if (!top)
1425	{	1411	{
		1412	op->below = 0;
1426	op->above = ms.bot;	1413	op->above = ms.bot;
1427
1428	if (op->above)
1429	op->above->below = op;
1430
1431	op->below = 0;
1432	ms.bot = op;	1414	ms.bot = op;
		1415
		1416	*(op->above ? &op->above->below : &ms.top) = op;
1433	}	1417	}
1434	else	1418	else
1435	{ /* get inserted into the stack above top */	1419	{
1436	op->above = top->above;	1420	op->above = top->above;
1437
1438	if (op->above)
1439	op->above->below = op;	1421	top->above = op;
1440		1422
1441	op->below = top;	1423	op->below = top;
1442	top->above = op;	1424	*(op->above ? &op->above->below : &ms.top) = op;
1443	}	1425	}
1444		1426	}
1445	if (!op->above)
1446	ms.top = op;
1447	} /* else not INS_BELOW_ORIGINATOR */
1448		1427
1449	if (op->type == PLAYER)	1428	if (op->type == PLAYER)
1450	{	1429	{
1451	op->contr->do_los = 1;	1430	op->contr->do_los = 1;
1452	++op->map->players;	1431	++op->map->players;
…		…
1454	}	1433	}
1455		1434
1456	op->map->dirty = true;	1435	op->map->dirty = true;
1457		1436
1458	if (object *pl = ms.player ())	1437	if (object *pl = ms.player ())
		1438	//TODO: the floorbox prev/next might need updating
		1439	//esrv_send_item (pl, op);
		1440	//TODO: update floorbox to preserve ordering
		1441	if (pl->contr->ns)
1459	pl->contr->ns->floorbox_update ();	1442	pl->contr->ns->floorbox_update ();
1460		1443
1461	/* If this object glows, it may affect lighting conditions that are	1444	/* If this object glows, it may affect lighting conditions that are
1462	* visible to others on this map. But update_all_los is really	1445	* 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	1446	* 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	1447	* on the map will get recalculated. The players could very well
…		…
1544	if (!nr)	1527	if (!nr)
1545	return true;	1528	return true;
1546		1529
1547	nr = min (nr, nrof);	1530	nr = min (nr, nrof);
1548		1531
		1532	if (nrof > nr)
		1533	{
1549	nrof -= nr;	1534	nrof -= nr;
1550
1551	if (nrof)
1552	{
1553	adjust_weight (env, -weight * nr); // carrying == 0	1535	adjust_weight (env, -weight * max (1, nr)); // carrying == 0
1554		1536
1555	if (object *pl = visible_to ())	1537	if (object *pl = visible_to ())
1556	esrv_update_item (UPD_NROF, pl, this);	1538	esrv_update_item (UPD_NROF, pl, this);
1557		1539
1558	return true;	1540	return true;
1559	}	1541	}
1560	else	1542	else
1561	{	1543	{
1562	destroy (1);	1544	destroy ();
1563	return false;	1545	return false;
1564	}	1546	}
1565	}	1547	}
1566		1548
1567	/*	1549	/*
…		…
1584	}	1566	}
1585	else	1567	else
1586	{	1568	{
1587	decrease (nr);	1569	decrease (nr);
1588		1570
1589	object *op = object_create_clone (this);	1571	object *op = deep_clone ();
1590	op->nrof = nr;	1572	op->nrof = nr;
1591	return op;	1573	return op;
1592	}	1574	}
1593	}	1575	}
1594		1576
…		…
1815	LOG (llevError, "Present_arch called outside map.\n");	1797	LOG (llevError, "Present_arch called outside map.\n");
1816	return NULL;	1798	return NULL;
1817	}	1799	}
1818		1800
1819	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)	1801	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1820	if (tmp->arch == at)	1802	if (tmp->arch->archname == at->archname)
1821	return tmp;	1803	return tmp;
1822		1804
1823	return NULL;	1805	return NULL;
1824	}	1806	}
1825		1807
…		…
1889	* The first matching object is returned, or NULL if none.	1871	* The first matching object is returned, or NULL if none.
1890	*/	1872	*/
1891	object *	1873	object *
1892	present_arch_in_ob (const archetype at, const object op)	1874	present_arch_in_ob (const archetype at, const object op)
1893	{	1875	{
1894	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)	1876	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1895	if (tmp->arch == at)	1877	if (tmp->arch->archname == at->archname)
1896	return tmp;	1878	return tmp;
1897		1879
1898	return NULL;	1880	return NULL;
1899	}	1881	}
1900		1882
…		…
2309		2291
2310	/*	2292	/*
2311	* create clone from object to another	2293	* create clone from object to another
2312	*/	2294	*/
2313	object *	2295	object *
2314	object_create_clone (object *asrc)	2296	object::deep_clone ()
2315	{	2297	{
2316	object dst = 0, tmp, src, prev, *item;	2298	assert (("deep_clone called on non-head object", is_head ()));
2317		2299
2318	if (!asrc)	2300	object *dst = clone ();
2319	return 0;
2320		2301
2321	src = asrc->head_ ();	2302	object *prev = dst;
2322
2323	prev = 0;
2324	for (object *part = src; part; part = part->more)	2303	for (object *part = this->more; part; part = part->more)
2325	{	2304	{
2326	tmp = part->clone ();	2305	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;	2306	tmp->head = dst;
2337
2338	tmp->more = 0;
2339
2340	if (prev)
2341	prev->more = tmp;	2307	prev->more = tmp;
2342
2343	prev = tmp;	2308	prev = tmp;
2344	}	2309	}
2345		2310
2346	for (item = src->inv; item; item = item->below)	2311	for (object *item = inv; item; item = item->below)
2347	insert_ob_in_ob (object_create_clone (item), dst);	2312	insert_ob_in_ob (item->deep_clone (), dst);
2348		2313
2349	return dst;	2314	return dst;
2350	}	2315	}
2351		2316
2352	/* This returns the first object in who's inventory that	2317	/* This returns the first object in who's inventory that
…		…
2361	return tmp;	2326	return tmp;
2362		2327
2363	return 0;	2328	return 0;
2364	}	2329	}
2365		2330
2366	/* If ob has a field named key, return the link from the list,	2331	const shstr &
2367	* otherwise return NULL.	2332	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	{	2333	{
2375	for (key_value *link = ob->key_values; link; link = link->next)	2334	for (key_value *kv = key_values; kv; kv = kv->next)
2376	if (link->key == key)	2335	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;	2336	return kv->value;
2411		2337
2412	return 0;	2338	return shstr_null;
2413	}	2339	}
2414		2340
2415	/*	2341	void
2416	* Updates the canonical_key in op to value.	2342	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	{	2343	{
2428	key_value field = NULL, last = NULL;	2344	for (key_value *kv = key_values; kv; kv = kv->next)
2429		2345	if (kv->key == key)
2430	for (field = op->key_values; field != NULL; field = field->next)
2431	{
2432	if (field->key != canonical_key)
2433	{	2346	{
2434	last = field;	2347	kv->value = value;
2435	continue;	2348	return;
2436	}	2349	}
2437		2350
2438	if (value)	2351	key_value *kv = new key_value;
2439	field->value = value;	2352
2440	else	2353	kv->next = key_values;
		2354	kv->key = key;
		2355	kv->value = value;
		2356
		2357	key_values = kv;
		2358	}
		2359
		2360	void
		2361	object::kv_del (const shstr &key)
		2362	{
		2363	for (key_value *kvp = &key_values; kvp; kvp = &(*kvp)->next)
		2364	if ((*kvp)->key == key)
2441	{	2365	{
2442	/* Basically, if the archetype has this key set,	2366	key_value kv = kvp;
2443	* we need to store the null value so when we save	2367	kvp = (kvp)->next;
2444	* it, we save the empty value so that when we load,	2368	delete kv;
2445	* we get this value back again.	2369	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	}	2370	}
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	}	2371	}
2504		2372
2505	object::depth_iterator::depth_iterator (object *container)	2373	object::depth_iterator::depth_iterator (object *container)
2506	: iterator_base (container)	2374	: iterator_base (container)
2507	{	2375	{
…		…
2557	{	2425	{
2558	char flagdesc[512];	2426	char flagdesc[512];
2559	char info2[256 * 4];	2427	char info2[256 * 4];
2560	char *p = info;	2428	char *p = info;
2561		2429
2562	p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s,flags:[%s],type:%d}",	2430	p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s%s,flags:[%s],type:%d}",
2563	count,	2431	count,
2564	uuid.c_str (),	2432	uuid.c_str (),
2565	&name,	2433	&name,
2566	title ? "\",title:\"" : "",	2434	title ? ",title:\"" : "",
2567	title ? (const char *)title : "",	2435	title ? (const char *)title : "",
		2436	title ? "\"" : "",
2568	flag_desc (flagdesc, 512), type);	2437	flag_desc (flagdesc, 512), type);
2569		2438
2570	if (!this->flag[FLAG_REMOVED] && env)	2439	if (!flag[FLAG_REMOVED] && env)
2571	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2440	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2572		2441
2573	if (map)	2442	if (map)
2574	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);	2443	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2575		2444
…		…
2605	object::open_container (object *new_container)	2474	object::open_container (object *new_container)
2606	{	2475	{
2607	if (container == new_container)	2476	if (container == new_container)
2608	return;	2477	return;
2609		2478
2610	if (object *old_container = container)	2479	object *old_container = container;
		2480
		2481	if (old_container)
2611	{	2482	{
2612	if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))	2483	if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
2613	return;	2484	return;
2614		2485
2615	#if 0	2486	#if 0
…		…
2617	if (object *closer = old_container->inv)	2488	if (object *closer = old_container->inv)
2618	if (closer->type == CLOSE_CON)	2489	if (closer->type == CLOSE_CON)
2619	closer->destroy ();	2490	closer->destroy ();
2620	#endif	2491	#endif
2621		2492
		2493	// make sure the container is available
		2494	esrv_send_item (this, old_container);
		2495
2622	old_container->flag [FLAG_APPLIED] = 0;	2496	old_container->flag [FLAG_APPLIED] = false;
2623	container = 0;	2497	container = 0;
2624		2498
		2499	// client needs item update to make it work, client bug requires this to be separate
2625	esrv_update_item (UPD_FLAGS, this, old_container);	2500	esrv_update_item (UPD_FLAGS, this, old_container);
		2501
2626	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));	2502	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
2627	play_sound (sound_find ("chest_close"));	2503	play_sound (sound_find ("chest_close"));
2628	}	2504	}
2629		2505
2630	if (new_container)	2506	if (new_container)
…		…
2643	}	2519	}
2644	#endif	2520	#endif
2645		2521
2646	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));	2522	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));
2647		2523
		2524	// make sure the container is available, client bug requires this to be separate
		2525	esrv_send_item (this, new_container);
		2526
2648	new_container->flag [FLAG_APPLIED] = 1;	2527	new_container->flag [FLAG_APPLIED] = true;
2649	container = new_container;	2528	container = new_container;
2650		2529
		2530	// client needs flag change
2651	esrv_update_item (UPD_FLAGS, this, new_container);	2531	esrv_update_item (UPD_FLAGS, this, new_container);
2652	esrv_send_inventory (this, new_container);	2532	esrv_send_inventory (this, new_container);
2653	play_sound (sound_find ("chest_open"));	2533	play_sound (sound_find ("chest_open"));
2654	}	2534	}
		2535	// else if (!old_container->env && contr && contr->ns)
		2536	// contr->ns->floorbox_reset ();
2655	}	2537	}
2656		2538
2657	object *	2539	object *
2658	object::force_find (const shstr name)	2540	object::force_find (const shstr name)
2659	{	2541	{

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.254 by root, Sun Aug 31 01:17:11 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.254 by root, Sun Aug 31 01:17:11 2008 UTC