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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.212 by root, Mon Apr 21 23:35:24 2008 UTC vs.
Revision 1.250 by root, Wed Jul 16 14:29:40 2008 UTC

…		…
139		139
140	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */	140	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */
141	static bool	141	static bool
142	compare_ob_value_lists_one (const object wants, const object has)	142	compare_ob_value_lists_one (const object wants, const object has)
143	{	143	{
144	key_value *wants_field;
145
146	/* n-squared behaviour (see get_ob_key_link()), but I'm hoping both	144	/* n-squared behaviour (see kv_get), but I'm hoping both
147	* objects with lists are rare, and lists stay short. If not, use a	145	* objects with lists are rare, and lists stay short. If not, use a
148	* different structure or at least keep the lists sorted...	146	* different structure or at least keep the lists sorted...
149	*/	147	*/
150		148
151	/* For each field in wants, */	149	/* For each field in wants, */
152	for (wants_field = wants->key_values; wants_field; wants_field = wants_field->next)	150	for (key_value *kv = wants->key_values; kv; kv = kv->next)
153	{	151	if (has->kv_get (kv->key) != kv->value)
154	key_value *has_field;	152	return false;
155
156	/* Look for a field in has with the same key. */
157	has_field = get_ob_key_link (has, wants_field->key);
158
159	if (!has_field)
160	return 0; /* No field with that name. */
161
162	/* Found the matching field. */
163	if (has_field->value != wants_field->value)
164	return 0; /* Values don't match, so this half of the comparison is false. */
165
166	/* If we get here, we found a match. Now for the next field in wants. */
167	}
168		153
169	/* If we get here, every field in wants has a matching field in has. */	154	/* If we get here, every field in wants has a matching field in has. */
170	return 1;	155	return true;
171	}	156	}
172		157
173	/* Returns TRUE if ob1 has the same key_values as ob2. */	158	/* Returns TRUE if ob1 has the same key_values as ob2. */
174	static bool	159	static bool
175	compare_ob_value_lists (const object ob1, const object ob2)	160	compare_ob_value_lists (const object ob1, const object ob2)
176	{	161	{
177	/* However, there may be fields in has which aren't partnered in wants,	162	/* However, there may be fields in has which aren't partnered in wants,
178	* so we need to run the comparison twice. :(	163	* so we need to run the comparison twice. :(
179	*/	164	*/
180	return compare_ob_value_lists_one (ob1, ob2) && compare_ob_value_lists_one (ob2, ob1);	165	return compare_ob_value_lists_one (ob1, ob2)
		166	&& compare_ob_value_lists_one (ob2, ob1);
181	}	167	}
182		168
183	/* Function examines the 2 objects given to it, and returns true if	169	/* Function examines the 2 objects given to it, and returns true if
184	* they can be merged together.	170	* they can be merged together.
185	*	171	*
…		…
220	SET_FLAG (ob1, FLAG_BEEN_APPLIED);	206	SET_FLAG (ob1, FLAG_BEEN_APPLIED);
221		207
222	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))	208	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))
223	SET_FLAG (ob2, FLAG_BEEN_APPLIED);	209	SET_FLAG (ob2, FLAG_BEEN_APPLIED);
224		210
225	if (ob1->arch->name != ob2->arch->name	211	if (ob1->arch->archname != ob2->arch->archname
226	\|\| ob1->name != ob2->name	212	\|\| ob1->name != ob2->name
227	\|\| ob1->title != ob2->title	213	\|\| ob1->title != ob2->title
228	\|\| ob1->msg != ob2->msg	214	\|\| ob1->msg != ob2->msg
229	\|\| ob1->weight != ob2->weight	215	\|\| ob1->weight != ob2->weight
230	\|\| ob1->attacktype != ob2->attacktype	216	\|\| ob1->attacktype != ob2->attacktype
231	\|\| ob1->magic != ob2->magic	217	\|\| ob1->magic != ob2->magic
232	\|\| ob1->slaying != ob2->slaying	218	\|\| ob1->slaying != ob2->slaying
233	\|\| ob1->skill != ob2->skill	219	\|\| ob1->skill != ob2->skill
234	\|\| ob1->value != ob2->value	220	\|\| ob1->value != ob2->value
235	\|\| ob1->animation_id != ob2->animation_id	221	\|\| ob1->animation_id != ob2->animation_id
		222	\|\| (ob1->face != ob2->face && !ob1->animation_id) // face and animation are dependent on each other
236	\|\| ob1->client_type != ob2->client_type	223	\|\| ob1->client_type != ob2->client_type
237	\|\| ob1->materialname != ob2->materialname	224	\|\| ob1->materialname != ob2->materialname
238	\|\| ob1->lore != ob2->lore	225	\|\| ob1->lore != ob2->lore
239	\|\| ob1->subtype != ob2->subtype	226	\|\| ob1->subtype != ob2->subtype
240	\|\| ob1->move_type != ob2->move_type	227	\|\| ob1->move_type != ob2->move_type
…		…
330		317
331	/* Everything passes, must be OK. */	318	/* Everything passes, must be OK. */
332	return 1;	319	return 1;
333	}	320	}
334		321
		322	// find player who can see this object
		323	object *
		324	object::visible_to () const
		325	{
		326	if (client_visible () && !flag [FLAG_REMOVED])
		327	{
		328	// see if we are in a container of sorts
		329	if (env)
		330	{
		331	// the player inventory itself is always visible
		332	if (env->type == PLAYER)
		333	return env;
		334
		335	// else a player could have our env open
		336	object *envest = env->outer_env ();
		337
		338	// the player itself is always on a map, so we will find him here
		339	// even if our inv is in a player.
		340	if (envest->is_on_map ())
		341	if (object *pl = envest->ms ().player ())
		342	if (pl->container == env)
		343	return pl;
		344	}
		345	else
		346	{
		347	// maybe there is a player standing on the same mapspace
		348	// this will catch the case where "this" is a player
		349	if (object *pl = ms ().player ())
		350	if ((!pl->container && pl->contr->ns && !pl->contr->ns->update_look)
		351	\|\| this == pl->container)
		352	return pl;
		353	}
		354	}
		355
		356	return 0;
		357	}
		358
335	// adjust weight per container type ("of holding")	359	// adjust weight per container type ("of holding")
336	static sint32	360	static sint32
337	weight_adjust (object *op, sint32 weight)	361	weight_adjust_for (object *op, sint32 weight)
338	{	362	{
339	return op->type == CONTAINER	363	return op->type == CONTAINER
340	? lerp (weight, 0, 100, 0, 100 - op->stats.Str)	364	? lerp (weight, 0, 100, 0, 100 - op->stats.Str)
341	: weight;	365	: weight;
342	}	366	}
…		…
348	static void	372	static void
349	adjust_weight (object *op, sint32 weight)	373	adjust_weight (object *op, sint32 weight)
350	{	374	{
351	while (op)	375	while (op)
352	{	376	{
		377	// adjust by actual difference to account for rounding errors
		378	// i.e. (w2 - w1) / f != w2 / f - w1 / f and the latter is correct
353	weight = weight_adjust (op, weight);	379	weight = weight_adjust_for (op, op->carrying)
		380	- weight_adjust_for (op, op->carrying - weight);
354		381
355	if (!weight)	382	if (!weight)
356	return;	383	return;
357		384
358	op->carrying += weight;	385	op->carrying += weight;
359		386
360	if (object *pl = op->visible_to ())	387	if (object *pl = op->visible_to ())
		388	if (pl != op) // player is handled lazily
361	esrv_update_item (UPD_WEIGHT, pl, op);	389	esrv_update_item (UPD_WEIGHT, pl, op);
362		390
363	op = op->env;	391	op = op->env;
364	}	392	}
365	}	393	}
366		394
…		…
380	op->update_weight ();	408	op->update_weight ();
381		409
382	sum += op->total_weight ();	410	sum += op->total_weight ();
383	}	411	}
384		412
385	sum = weight_adjust (this, sum);	413	sum = weight_adjust_for (this, sum);
386		414
387	if (sum != carrying)	415	if (sum != carrying)
388	{	416	{
389	carrying = sum;	417	carrying = sum;
390		418
391	if (object *pl = visible_to ())	419	if (object *pl = visible_to ())
		420	if (pl != this) // player is handled lazily
392	esrv_update_item (UPD_WEIGHT, pl, this);	421	esrv_update_item (UPD_WEIGHT, pl, this);
393	}	422	}
394	}	423	}
395		424
396	/*	425	/*
397	* Used by: Server DM commands: dumpbelow, dump. Some error messages.	426	* Used by: Server DM commands: dumpbelow, dump. Some error messages.
…		…
451	*/	480	*/
452	object *	481	object *
453	find_object_name (const char *str)	482	find_object_name (const char *str)
454	{	483	{
455	shstr_cmp str_ (str);	484	shstr_cmp str_ (str);
456	object *op;
457		485
		486	if (str_)
458	for_all_objects (op)	487	for_all_objects (op)
459	if (op->name == str_)	488	if (op->name == str_)
460	break;	489	return op;
461		490
462	return op;	491	return 0;
463	}	492	}
464		493
465	/*	494	/*
466	* Sets the owner and sets the skill and exp pointers to owner's current	495	* Sets the owner and sets the skill and exp pointers to owner's current
467	* skill and experience objects.	496	* skill and experience objects.
…		…
565	}	594	}
566		595
567	op->key_values = 0;	596	op->key_values = 0;
568	}	597	}
569		598
570	object &	599	/*
571	object::operator =(const object &src)	600	* copy_to first frees everything allocated by the dst object,
		601	* and then copies the contents of itself into the second
		602	* object, allocating what needs to be allocated. Basically, any
		603	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
		604	* if the first object is freed, the pointers in the new object
		605	* will point at garbage.
		606	*/
		607	void
		608	object::copy_to (object *dst)
572	{	609	{
573	bool is_freed = flag [FLAG_FREED];	610	dst->remove ();
574	bool is_removed = flag [FLAG_REMOVED];
575
576	(object_copy )this = src;	611	(object_copy )dst = *this;
577
578	flag [FLAG_FREED] = is_freed;
579	flag [FLAG_REMOVED] = is_removed;	612	dst->flag [FLAG_REMOVED] = true;
580		613
581	/* Copy over key_values, if any. */	614	/* Copy over key_values, if any. */
582	if (src.key_values)	615	if (key_values)
583	{	616	{
584	key_value *tail = 0;	617	key_value *tail = 0;
585	key_values = 0;	618	dst->key_values = 0;
586		619
587	for (key_value *i = src.key_values; i; i = i->next)	620	for (key_value *i = key_values; i; i = i->next)
588	{	621	{
589	key_value *new_link = new key_value;	622	key_value *new_link = new key_value;
590		623
591	new_link->next = 0;	624	new_link->next = 0;
592	new_link->key = i->key;	625	new_link->key = i->key;
593	new_link->value = i->value;	626	new_link->value = i->value;
594		627
595	/* Try and be clever here, too. */	628	/* Try and be clever here, too. */
596	if (!key_values)	629	if (!dst->key_values)
597	{	630	{
598	key_values = new_link;	631	dst->key_values = new_link;
599	tail = new_link;	632	tail = new_link;
600	}	633	}
601	else	634	else
602	{	635	{
603	tail->next = new_link;	636	tail->next = new_link;
604	tail = new_link;	637	tail = new_link;
605	}	638	}
606	}	639	}
607	}	640	}
608	}
609
610	/*
611	* copy_to first frees everything allocated by the dst object,
612	* and then copies the contents of itself into the second
613	* object, allocating what needs to be allocated. Basically, any
614	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
615	* if the first object is freed, the pointers in the new object
616	* will point at garbage.
617	*/
618	void
619	object::copy_to (object *dst)
620	{
621	dst = this;
622		641
623	if (speed < 0)	642	if (speed < 0)
624	dst->speed_left -= rndm ();	643	dst->speed_left -= rndm ();
625		644
626	dst->set_speed (dst->speed);	645	dst->set_speed (dst->speed);
…		…
648	object *	667	object *
649	object::clone ()	668	object::clone ()
650	{	669	{
651	object *neu = create ();	670	object *neu = create ();
652	copy_to (neu);	671	copy_to (neu);
		672	neu->map = map; // not copied by copy_to
653	return neu;	673	return neu;
654	}	674	}
655		675
656	/*	676	/*
657	* If an object with the IS_TURNABLE() flag needs to be turned due	677	* If an object with the IS_TURNABLE() flag needs to be turned due
…		…
708	* UP_OBJ_FACE: only the objects face has changed.	728	* UP_OBJ_FACE: only the objects face has changed.
709	*/	729	*/
710	void	730	void
711	update_object (object *op, int action)	731	update_object (object *op, int action)
712	{	732	{
713	if (op == NULL)	733	if (!op)
714	{	734	{
715	/* this should never happen */	735	/* this should never happen */
716	LOG (llevDebug, "update_object() called for NULL object.\n");	736	LOG (llevError \| logBacktrace, "update_object() called for NULL object.\n");
717	return;	737	return;
718	}	738	}
719		739
720	if (op->env)	740	if (!op->is_on_map ())
721	{	741	{
722	/* Animation is currently handled by client, so nothing	742	/* Animation is currently handled by client, so nothing
723	* to do in this case.	743	* to do in this case.
724	*/	744	*/
725	return;	745	return;
726	}	746	}
727
728	/* If the map is saving, don't do anything as everything is
729	* going to get freed anyways.
730	*/
731	if (!op->map \|\| op->map->in_memory == MAP_SAVING)
732	return;
733		747
734	/* make sure the object is within map boundaries */	748	/* make sure the object is within map boundaries */
735	if (op->x < 0 \|\| op->x >= op->map->width \|\| op->y < 0 \|\| op->y >= op->map->height)	749	if (op->x < 0 \|\| op->x >= op->map->width \|\| op->y < 0 \|\| op->y >= op->map->height)
736	{	750	{
737	LOG (llevError, "update_object() called for object out of map!\n");	751	LOG (llevError, "update_object() called for object out of map!\n");
…		…
880	object::destroy_inv (bool drop_to_ground)	894	object::destroy_inv (bool drop_to_ground)
881	{	895	{
882	// need to check first, because the checks below might segfault	896	// need to check first, because the checks below might segfault
883	// as we might be on an invalid mapspace and crossfire code	897	// as we might be on an invalid mapspace and crossfire code
884	// is too buggy to ensure that the inventory is empty.	898	// is too buggy to ensure that the inventory is empty.
885	// corollary: if you create arrows etc. with stuff in tis inventory,	899	// corollary: if you create arrows etc. with stuff in its inventory,
886	// cf will crash below with off-map x and y	900	// cf will crash below with off-map x and y
887	if (!inv)	901	if (!inv)
888	return;	902	return;
889		903
890	/* Only if the space blocks everything do we not process -	904	/* Only if the space blocks everything do we not process -
…		…
892	* drop on that space.	906	* drop on that space.
893	*/	907	*/
894	if (!drop_to_ground	908	if (!drop_to_ground
895	\|\| !map	909	\|\| !map
896	\|\| map->in_memory != MAP_ACTIVE	910	\|\| map->in_memory != MAP_ACTIVE
897	\|\| map->nodrop	911	\|\| map->no_drop
898	\|\| ms ().move_block == MOVE_ALL)	912	\|\| ms ().move_block == MOVE_ALL)
899	{	913	{
900	while (inv)	914	while (inv)
901	{
902	inv->destroy_inv (drop_to_ground);
903	inv->destroy ();	915	inv->destroy (true);
904	}
905	}	916	}
906	else	917	else
907	{ /* Put objects in inventory onto this space */	918	{ /* Put objects in inventory onto this space */
908	while (inv)	919	while (inv)
909	{	920	{
…		…
913	\|\| op->flag [FLAG_NO_DROP]	924	\|\| op->flag [FLAG_NO_DROP]
914	\|\| op->type == RUNE	925	\|\| op->type == RUNE
915	\|\| op->type == TRAP	926	\|\| op->type == TRAP
916	\|\| op->flag [FLAG_IS_A_TEMPLATE]	927	\|\| op->flag [FLAG_IS_A_TEMPLATE]
917	\|\| op->flag [FLAG_DESTROY_ON_DEATH])	928	\|\| op->flag [FLAG_DESTROY_ON_DEATH])
918	op->destroy ();	929	op->destroy (true);
919	else	930	else
920	map->insert (op, x, y);	931	map->insert (op, x, y);
921	}	932	}
922	}	933	}
923	}	934	}
…		…
927	object *op = new object;	938	object *op = new object;
928	op->link ();	939	op->link ();
929	return op;	940	return op;
930	}	941	}
931		942
		943	static struct freed_map : maptile
		944	{
		945	freed_map ()
		946	{
		947	path = "<freed objects map>";
		948	name = "/internal/freed_objects_map";
		949	width = 3;
		950	height = 3;
		951	no_drop = 1;
		952	no_reset = 1;
		953
		954	alloc ();
		955	in_memory = MAP_ACTIVE;
		956	}
		957
		958	~freed_map ()
		959	{
		960	destroy ();
		961	}
		962	} freed_map; // freed objects are moved here to avoid crashes
		963
932	void	964	void
933	object::do_destroy ()	965	object::do_destroy ()
934	{	966	{
935	if (object *pl = visible_to ())
936	esrv_del_item (pl->contr, count);
937
938	attachable::do_destroy ();
939
940	if (flag [FLAG_IS_LINKED])	967	if (flag [FLAG_IS_LINKED])
941	remove_button_link (this);	968	remove_button_link (this);
942		969
943	if (flag [FLAG_FRIENDLY])	970	if (flag [FLAG_FRIENDLY])
944	remove_friendly_object (this);	971	remove_friendly_object (this);
945		972
946	if (!flag [FLAG_REMOVED])
947	remove ();	973	remove ();
948		974
949	destroy_inv (true);	975	attachable::do_destroy ();
950		976
951	deactivate ();	977	deactivate ();
952	unlink ();	978	unlink ();
953		979
954	flag [FLAG_FREED] = 1;	980	flag [FLAG_FREED] = 1;
955		981
956	// hack to ensure that freed objects still have a valid map	982	// hack to ensure that freed objects still have a valid map
957	{
958	static maptile *freed_map; // freed objects are moved here to avoid crashes
959
960	if (!freed_map)
961	{
962	freed_map = new maptile;
963
964	freed_map->path = "<freed objects map>";
965	freed_map->name = "/internal/freed_objects_map";
966	freed_map->width = 3;
967	freed_map->height = 3;
968	freed_map->nodrop = 1;
969
970	freed_map->alloc ();
971	freed_map->in_memory = MAP_ACTIVE;
972	}
973
974	map = freed_map;	983	map = &freed_map;
975	x = 1;	984	x = 1;
976	y = 1;	985	y = 1;
977	}
978		986
979	if (more)	987	if (more)
980	{	988	{
981	more->destroy ();	989	more->destroy ();
982	more = 0;	990	more = 0;
…		…
995	object::destroy (bool destroy_inventory)	1003	object::destroy (bool destroy_inventory)
996	{	1004	{
997	if (destroyed ())	1005	if (destroyed ())
998	return;	1006	return;
999		1007
		1008	if (!is_head () && !head->destroyed ())
		1009	{
		1010	LOG (llevError \| logBacktrace, "tried to destroy the tail of an object");
		1011	head->destroy (destroy_inventory);
		1012	return;
		1013	}
		1014
1000	if (destroy_inventory)	1015	destroy_inv (!destroy_inventory);
1001	destroy_inv (false);
1002		1016
1003	if (is_head ())	1017	if (is_head ())
1004	if (sound_destroy)	1018	if (sound_destroy)
1005	play_sound (sound_destroy);	1019	play_sound (sound_destroy);
1006	else if (flag [FLAG_MONSTER])	1020	else if (flag [FLAG_MONSTER])
…		…
1020	object::do_remove ()	1034	object::do_remove ()
1021	{	1035	{
1022	object tmp, last = 0;	1036	object tmp, last = 0;
1023	object *otmp;	1037	object *otmp;
1024		1038
1025	if (QUERY_FLAG (this, FLAG_REMOVED))	1039	if (flag [FLAG_REMOVED])
1026	return;	1040	return;
1027		1041
1028	SET_FLAG (this, FLAG_REMOVED);
1029	INVOKE_OBJECT (REMOVE, this);	1042	INVOKE_OBJECT (REMOVE, this);
		1043
		1044	flag [FLAG_REMOVED] = true;
1030		1045
1031	if (more)	1046	if (more)
1032	more->remove ();	1047	more->remove ();
1033		1048
1034	/*	1049	/*
1035	* In this case, the object to be removed is in someones	1050	* In this case, the object to be removed is in someones
1036	* inventory.	1051	* inventory.
1037	*/	1052	*/
1038	if (env)	1053	if (env)
1039	{	1054	{
		1055	flag [FLAG_REMOVED] = false; // hack around the issue of visible_to checking flag_removed
		1056	if (object *pl = visible_to ())
		1057	esrv_del_item (pl->contr, count);
		1058	flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed
		1059
1040	adjust_weight (env, -total_weight ());	1060	adjust_weight (env, -total_weight ());
1041
1042	*(above ? &above->below : &env->inv) = below;
1043
1044	if (below)
1045	below->above = above;
1046		1061
1047	/* we set up values so that it could be inserted into	1062	/* we set up values so that it could be inserted into
1048	* the map, but we don't actually do that - it is up	1063	* the map, but we don't actually do that - it is up
1049	* to the caller to decide what we want to do.	1064	* to the caller to decide what we want to do.
1050	*/	1065	*/
1051	map = env->map;	1066	map = env->map;
1052	x = env->x;	1067	x = env->x;
1053	y = env->y;	1068	y = env->y;
		1069
		1070	// make sure cmov optimisation is applicable
		1071	*(above ? &above->below : &env->inv) = below;
		1072	*(below ? &below->above : &above ) = above; // &above is just a dummy
		1073
1054	above = 0;	1074	above = 0;
1055	below = 0;	1075	below = 0;
1056	env = 0;	1076	env = 0;
1057		1077
1058	/* NO_FIX_PLAYER is set when a great many changes are being	1078	/* NO_FIX_PLAYER is set when a great many changes are being
…		…
1062	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1082	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1063	otmp->update_stats ();	1083	otmp->update_stats ();
1064	}	1084	}
1065	else if (map)	1085	else if (map)
1066	{	1086	{
1067	if (type == PLAYER)
1068	{
1069	// leaving a spot always closes any open container on the ground
1070	if (container && !container->env)
1071	// this causes spurious floorbox updates, but it ensures
1072	// that the CLOSE event is being sent.
1073	close_container ();
1074
1075	--map->players;
1076	map->touch ();
1077	}
1078
1079	map->dirty = true;	1087	map->dirty = true;
1080	mapspace &ms = this->ms ();	1088	mapspace &ms = this->ms ();
1081		1089
		1090	if (object *pl = ms.player ())
		1091	{
		1092	if (type == PLAYER) // this == pl(!)
		1093	{
		1094	// leaving a spot always closes any open container on the ground
		1095	if (container && !container->env)
		1096	// this causes spurious floorbox updates, but it ensures
		1097	// that the CLOSE event is being sent.
		1098	close_container ();
		1099
		1100	--map->players;
		1101	map->touch ();
		1102	}
		1103	else if (pl->container == this)
		1104	{
		1105	// removing a container should close it
		1106	close_container ();
		1107	}
		1108
		1109	esrv_del_item (pl->contr, count);
		1110	}
		1111
1082	/* link the object above us */	1112	/* link the object above us */
1083	if (above)	1113	// re-link, make sure compiler can easily use cmove
1084	above->below = below;	1114	*(above ? &above->below : &ms.top) = below;
1085	else	1115	*(below ? &below->above : &ms.bot) = above;
1086	ms.top = below; /* we were top, set new top */
1087
1088	/* Relink the object below us, if there is one */
1089	if (below)
1090	below->above = above;
1091	else
1092	{
1093	/* Nothing below, which means we need to relink map object for this space
1094	* use translated coordinates in case some oddness with map tiling is
1095	* evident
1096	*/
1097	if (GET_MAP_OB (map, x, y) != this)
1098	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 ());
1099
1100	ms.bot = above; /* goes on above it. */
1101	}
1102		1116
1103	above = 0;	1117	above = 0;
1104	below = 0;	1118	below = 0;
1105		1119
1106	if (map->in_memory == MAP_SAVING)	1120	if (map->in_memory == MAP_SAVING)
…		…
1115	* removed (most likely destroyed), update the player view	1129	* removed (most likely destroyed), update the player view
1116	* appropriately.	1130	* appropriately.
1117	*/	1131	*/
1118	pl->close_container ();	1132	pl->close_container ();
1119		1133
		1134	//TODO: the floorbox prev/next might need updating
		1135	//esrv_del_item (pl->contr, count);
		1136	//TODO: update floorbox to preserve ordering
		1137	if (pl->contr->ns)
1120	pl->contr->ns->floorbox_update ();	1138	pl->contr->ns->floorbox_update ();
1121	}	1139	}
1122		1140
1123	for (tmp = ms.bot; tmp; tmp = tmp->above)	1141	for (tmp = ms.bot; tmp; tmp = tmp->above)
1124	{	1142	{
1125	/* No point updating the players look faces if he is the object	1143	/* No point updating the players look faces if he is the object
…		…
1169	if (!top)	1187	if (!top)
1170	for (top = op; top && top->above; top = top->above)	1188	for (top = op; top && top->above; top = top->above)
1171	;	1189	;
1172		1190
1173	for (; top; top = top->below)	1191	for (; top; top = top->below)
1174	{
1175	if (top == op)
1176	continue;
1177
1178	if (object::can_merge (op, top))	1192	if (object::can_merge (op, top))
1179	{	1193	{
1180	top->nrof += op->nrof;	1194	top->nrof += op->nrof;
1181		1195
1182	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/	1196	if (object *pl = top->visible_to ())
1183	op->weight = 0; /* Don't want any adjustements now */	1197	esrv_update_item (UPD_NROF, pl, top);
		1198
		1199	op->weight = 0; // cancel the addition above
		1200	op->carrying = 0; // must be 0 already
		1201
1184	op->destroy ();	1202	op->destroy (1);
		1203
1185	return top;	1204	return top;
1186	}	1205	}
1187	}
1188		1206
1189	return 0;	1207	return 0;
1190	}	1208	}
1191		1209
1192	void	1210	void
…		…
1217	* job preparing multi-part monsters.	1235	* job preparing multi-part monsters.
1218	*/	1236	*/
1219	object *	1237	object *
1220	insert_ob_in_map_at (object op, maptile m, object *originator, int flag, int x, int y)	1238	insert_ob_in_map_at (object op, maptile m, object *originator, int flag, int x, int y)
1221	{	1239	{
		1240	op->remove ();
		1241
1222	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)	1242	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1223	{	1243	{
1224	tmp->x = x + tmp->arch->x;	1244	tmp->x = x + tmp->arch->x;
1225	tmp->y = y + tmp->arch->y;	1245	tmp->y = y + tmp->arch->y;
1226	}	1246	}
…		…
1249	* just 'op' otherwise	1269	* just 'op' otherwise
1250	*/	1270	*/
1251	object *	1271	object *
1252	insert_ob_in_map (object op, maptile m, object *originator, int flag)	1272	insert_ob_in_map (object op, maptile m, object *originator, int flag)
1253	{	1273	{
1254	assert (!op->flag [FLAG_FREED]);	1274	if (op->is_on_map ())
		1275	{
		1276	LOG (llevError, "insert_ob_in_map called for object already on map");
		1277	abort ();
		1278	}
1255		1279
1256	object top, floor = NULL;	1280	if (op->env)
1257		1281	{
		1282	LOG (llevError, "insert_ob_in_map called for object in an inventory (proceeding)");
1258	op->remove ();	1283	op->remove ();
		1284	}
		1285
		1286	if (op->face && !face_info (op->face))//D TODO: remove soon
		1287	{//D
		1288	LOG (llevError \| logBacktrace, "op->face out of bounds: %s", op->debug_desc ());//D
		1289	op->face = 1;//D
		1290	}//D
1259		1291
1260	/* Ideally, the caller figures this out. However, it complicates a lot	1292	/* Ideally, the caller figures this out. However, it complicates a lot
1261	* of areas of callers (eg, anything that uses find_free_spot would now	1293	* of areas of callers (eg, anything that uses find_free_spot would now
1262	* need extra work	1294	* need extra work
1263	*/	1295	*/
1264	if (!xy_normalise (m, op->x, op->y))	1296	if (!xy_normalise (m, op->x, op->y))
1265	{	1297	{
1266	op->destroy ();	1298	op->head_ ()->destroy (1);// remove head_ once all tail object destroyers found
1267	return 0;	1299	return 0;
1268	}	1300	}
1269		1301
1270	if (object *more = op->more)	1302	if (object *more = op->more)
1271	if (!insert_ob_in_map (more, m, originator, flag))	1303	if (!insert_ob_in_map (more, m, originator, flag))
…		…
1280	*/	1312	*/
1281	if (op->nrof && !(flag & INS_NO_MERGE))	1313	if (op->nrof && !(flag & INS_NO_MERGE))
1282	for (object *tmp = ms.bot; tmp; tmp = tmp->above)	1314	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1283	if (object::can_merge (op, tmp))	1315	if (object::can_merge (op, tmp))
1284	{	1316	{
		1317	// TODO: we actually want to update tmp, not op,
		1318	// but some caller surely breaks when we return tmp
		1319	// from here :/
1285	op->nrof += tmp->nrof;	1320	op->nrof += tmp->nrof;
1286	tmp->destroy (1);	1321	tmp->destroy (1);
1287	}	1322	}
1288		1323
1289	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1324	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
…		…
1298	{	1333	{
1299	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");	1334	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");
1300	abort ();	1335	abort ();
1301	}	1336	}
1302		1337
		1338	if (!originator->is_on_map ())
		1339	LOG (llevDebug \| logBacktrace, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map",
		1340	op->debug_desc (), originator->debug_desc ());
		1341
1303	op->above = originator;	1342	op->above = originator;
1304	op->below = originator->below;	1343	op->below = originator->below;
1305
1306	if (op->below)
1307	op->below->above = op;
1308	else
1309	ms.bot = op;
1310
1311	/* since below originator, no need to update top */
1312	originator->below = op;	1344	originator->below = op;
		1345
		1346	*(op->below ? &op->below->above : &ms.bot) = op;
1313	}	1347	}
1314	else	1348	else
1315	{	1349	{
1316	top = ms.bot;	1350	object *floor = 0;
		1351	object *top = ms.top;
1317		1352
1318	/* If there are other objects, then */	1353	/* If there are other objects, then */
1319	if (top)	1354	if (top)
1320	{	1355	{
1321	object *last = 0;
1322
1323	/*	1356	/*
1324	* If there are multiple objects on this space, we do some trickier handling.	1357	* If there are multiple objects on this space, we do some trickier handling.
1325	* We've already dealt with merging if appropriate.	1358	* We've already dealt with merging if appropriate.
1326	* Generally, we want to put the new object on top. But if	1359	* Generally, we want to put the new object on top. But if
1327	* flag contains INS_ABOVE_FLOOR_ONLY, once we find the last	1360	* flag contains INS_ABOVE_FLOOR_ONLY, once we find the last
…		…
1330	* once we get to them. This reduces the need to traverse over all of	1363	* once we get to them. This reduces the need to traverse over all of
1331	* them when adding another one - this saves quite a bit of cpu time	1364	* them when adding another one - this saves quite a bit of cpu time
1332	* when lots of spells are cast in one area. Currently, it is presumed	1365	* when lots of spells are cast in one area. Currently, it is presumed
1333	* that flying non pickable objects are spell objects.	1366	* that flying non pickable objects are spell objects.
1334	*/	1367	*/
1335	for (top = ms.bot; top; top = top->above)	1368	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1336	{	1369	{
1337	if (QUERY_FLAG (top, FLAG_IS_FLOOR) \|\| QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))	1370	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) \|\| QUERY_FLAG (tmp, FLAG_OVERLAY_FLOOR))
1338	floor = top;	1371	floor = tmp;
1339		1372
1340	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW \| MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))	1373	if (QUERY_FLAG (tmp, FLAG_NO_PICK) && (tmp->move_type & (MOVE_FLY_LOW \| MOVE_FLY_HIGH)) && !QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1341	{	1374	{
1342	/* We insert above top, so we want this object below this */	1375	/* We insert above top, so we want this object below this */
1343	top = top->below;	1376	top = tmp->below;
1344	break;	1377	break;
1345	}	1378	}
1346		1379
1347	last = top;	1380	top = tmp;
1348	}	1381	}
1349
1350	/* Don't want top to be NULL, so set it to the last valid object */
1351	top = last;
1352		1382
1353	/* We let update_position deal with figuring out what the space	1383	/* We let update_position deal with figuring out what the space
1354	* looks like instead of lots of conditions here.	1384	* looks like instead of lots of conditions here.
1355	* makes things faster, and effectively the same result.	1385	* makes things faster, and effectively the same result.
1356	*/	1386	*/
…		…
1363	*/	1393	*/
1364	if (!(flag & INS_ON_TOP)	1394	if (!(flag & INS_ON_TOP)
1365	&& ms.flags () & P_BLOCKSVIEW	1395	&& ms.flags () & P_BLOCKSVIEW
1366	&& (op->face && !faces [op->face].visibility))	1396	&& (op->face && !faces [op->face].visibility))
1367	{	1397	{
		1398	object *last;
		1399
1368	for (last = top; last != floor; last = last->below)	1400	for (last = top; last != floor; last = last->below)
1369	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1401	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1370	break;	1402	break;
1371		1403
1372	/* Check to see if we found the object that blocks view,	1404	/* Check to see if we found the object that blocks view,
…		…
1380	} /* If objects on this space */	1412	} /* If objects on this space */
1381		1413
1382	if (flag & INS_ABOVE_FLOOR_ONLY)	1414	if (flag & INS_ABOVE_FLOOR_ONLY)
1383	top = floor;	1415	top = floor;
1384		1416
1385	/* Top is the object that our object (op) is going to get inserted above.	1417	// insert object above top, or bottom-most if top = 0
1386	*/
1387
1388	/* First object on this space */
1389	if (!top)	1418	if (!top)
1390	{	1419	{
		1420	op->below = 0;
1391	op->above = ms.bot;	1421	op->above = ms.bot;
1392
1393	if (op->above)
1394	op->above->below = op;
1395
1396	op->below = 0;
1397	ms.bot = op;	1422	ms.bot = op;
		1423
		1424	*(op->above ? &op->above->below : &ms.top) = op;
1398	}	1425	}
1399	else	1426	else
1400	{ /* get inserted into the stack above top */	1427	{
1401	op->above = top->above;	1428	op->above = top->above;
1402
1403	if (op->above)
1404	op->above->below = op;	1429	top->above = op;
1405		1430
1406	op->below = top;	1431	op->below = top;
1407	top->above = op;	1432	*(op->above ? &op->above->below : &ms.top) = op;
1408	}	1433	}
1409		1434	}
1410	if (!op->above)
1411	ms.top = op;
1412	} /* else not INS_BELOW_ORIGINATOR */
1413		1435
1414	if (op->type == PLAYER)	1436	if (op->type == PLAYER)
1415	{	1437	{
1416	op->contr->do_los = 1;	1438	op->contr->do_los = 1;
1417	++op->map->players;	1439	++op->map->players;
…		…
1419	}	1441	}
1420		1442
1421	op->map->dirty = true;	1443	op->map->dirty = true;
1422		1444
1423	if (object *pl = ms.player ())	1445	if (object *pl = ms.player ())
		1446	//TODO: the floorbox prev/next might need updating
		1447	//esrv_send_item (pl, op);
		1448	//TODO: update floorbox to preserve ordering
		1449	if (pl->contr->ns)
1424	pl->contr->ns->floorbox_update ();	1450	pl->contr->ns->floorbox_update ();
1425		1451
1426	/* If this object glows, it may affect lighting conditions that are	1452	/* If this object glows, it may affect lighting conditions that are
1427	* visible to others on this map. But update_all_los is really	1453	* visible to others on this map. But update_all_los is really
1428	* an inefficient way to do this, as it means los for all players	1454	* an inefficient way to do this, as it means los for all players
1429	* on the map will get recalculated. The players could very well	1455	* on the map will get recalculated. The players could very well
…		…
1494	return where->env->insert (this);	1520	return where->env->insert (this);
1495	else	1521	else
1496	return where->map->insert (this, where->x, where->y, originator, flags);	1522	return where->map->insert (this, where->x, where->y, originator, flags);
1497	}	1523	}
1498		1524
1499	// find player who can see this object
1500	object *
1501	object::visible_to () const
1502	{
1503	if (!flag [FLAG_REMOVED])
1504	{
1505	// see if we are in a container of sorts
1506	if (env)
1507	{
1508	// the player inventory itself is always visible
1509	if (env->type == PLAYER)
1510	return env;
1511
1512	// else a player could have our env open
1513	object *envest = env->outer_env ();
1514
1515	// the player itself is always on a map, so we will find him here
1516	// even if our inv is in a player.
1517	if (envest->is_on_map ())
1518	if (object *pl = envest->ms ().player ())
1519	if (pl->container == env)
1520	return pl;
1521	}
1522	else
1523	{
1524	// maybe there is a player standing on the same mapspace
1525	// this will catch the case where "this" is a player
1526	if (object *pl = ms ().player ())
1527	return pl;
1528	}
1529	}
1530
1531	return 0;
1532	}
1533
1534	/*	1525	/*
1535	* decrease(object, number) decreases a specified number from	1526	* decrease(object, number) decreases a specified number from
1536	* the amount of an object. If the amount reaches 0, the object	1527	* the amount of an object. If the amount reaches 0, the object
1537	* is subsequently removed and freed.	1528	* is subsequently removed and freed.
1538	*	1529	*
…		…
1548		1539
1549	nrof -= nr;	1540	nrof -= nr;
1550		1541
1551	if (nrof)	1542	if (nrof)
1552	{	1543	{
1553	adjust_weight (env, -weight * nr); // carrying == 0	1544	adjust_weight (env, -weight * max (1, nr)); // carrying == 0
1554		1545
1555	if (object *pl = visible_to ())	1546	if (object *pl = visible_to ())
1556	esrv_update_item (UPD_NROF, pl, this);	1547	esrv_update_item (UPD_NROF, pl, this);
1557		1548
1558	return true;	1549	return true;
1559	}	1550	}
1560	else	1551	else
1561	{	1552	{
1562	destroy (1);	1553	destroy ();
1563	return false;	1554	return false;
1564	}	1555	}
1565	}	1556	}
1566		1557
1567	/*	1558	/*
…		…
1584	}	1575	}
1585	else	1576	else
1586	{	1577	{
1587	decrease (nr);	1578	decrease (nr);
1588		1579
1589	object *op = object_create_clone (this);	1580	object *op = deep_clone ();
1590	op->nrof = nr;	1581	op->nrof = nr;
1591	return op;	1582	return op;
1592	}	1583	}
1593	}	1584	}
1594		1585
…		…
1638	if (object::can_merge (tmp, op))	1629	if (object::can_merge (tmp, op))
1639	{	1630	{
1640	/* return the original object and remove inserted object	1631	/* return the original object and remove inserted object
1641	(client needs the original object) */	1632	(client needs the original object) */
1642	tmp->nrof += op->nrof;	1633	tmp->nrof += op->nrof;
		1634
		1635	if (object *pl = tmp->visible_to ())
		1636	esrv_update_item (UPD_NROF, pl, tmp);
		1637
1643	adjust_weight (this, op->total_weight ());	1638	adjust_weight (this, op->total_weight ());
1644		1639
1645	op->destroy (1);	1640	op->destroy (1);
1646	op = tmp;	1641	op = tmp;
1647	goto inserted;	1642	goto inserted;
…		…
1661		1656
1662	inv = op;	1657	inv = op;
1663		1658
1664	op->flag [FLAG_REMOVED] = 0;	1659	op->flag [FLAG_REMOVED] = 0;
1665		1660
		1661	if (object *pl = op->visible_to ())
		1662	esrv_send_item (pl, op);
		1663
1666	adjust_weight (this, op->total_weight ());	1664	adjust_weight (this, op->total_weight ());
1667		1665
1668	inserted:	1666	inserted:
1669	/* reset the light list and los of the players on the map */	1667	/* reset the light list and los of the players on the map */
1670	if (op->glow_radius && map && map->darkness)	1668	if (op->glow_radius && map && map->darkness)
1671	update_all_los (map, x, y);	1669	update_all_los (map, x, y);
1672		1670
1673	if (object *otmp = in_player ())	1671	// if this is a player's inventory, update stats
1674	if (otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1672	if (type == PLAYER && !flag [FLAG_NO_FIX_PLAYER])
1675	otmp->update_stats ();	1673	update_stats ();
1676		1674
1677	INVOKE_OBJECT (INSERT, this);	1675	INVOKE_OBJECT (INSERT, this);
1678		1676
1679	return op;	1677	return op;
1680	}	1678	}
…		…
1808	LOG (llevError, "Present_arch called outside map.\n");	1806	LOG (llevError, "Present_arch called outside map.\n");
1809	return NULL;	1807	return NULL;
1810	}	1808	}
1811		1809
1812	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)	1810	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1813	if (tmp->arch == at)	1811	if (tmp->arch->archname == at->archname)
1814	return tmp;	1812	return tmp;
1815		1813
1816	return NULL;	1814	return NULL;
1817	}	1815	}
1818		1816
…		…
1882	* The first matching object is returned, or NULL if none.	1880	* The first matching object is returned, or NULL if none.
1883	*/	1881	*/
1884	object *	1882	object *
1885	present_arch_in_ob (const archetype at, const object op)	1883	present_arch_in_ob (const archetype at, const object op)
1886	{	1884	{
1887	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)	1885	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1888	if (tmp->arch == at)	1886	if (tmp->arch->archname == at->archname)
1889	return tmp;	1887	return tmp;
1890		1888
1891	return NULL;	1889	return NULL;
1892	}	1890	}
1893		1891
…		…
2302		2300
2303	/*	2301	/*
2304	* create clone from object to another	2302	* create clone from object to another
2305	*/	2303	*/
2306	object *	2304	object *
2307	object_create_clone (object *asrc)	2305	object::deep_clone ()
2308	{	2306	{
2309	object dst = 0, tmp, src, prev, *item;	2307	assert (("deep_clone called on non-head object", is_head ()));
2310		2308
2311	if (!asrc)	2309	object *dst = clone ();
2312	return 0;
2313		2310
2314	src = asrc->head_ ();	2311	object *prev = dst;
2315
2316	prev = 0;
2317	for (object *part = src; part; part = part->more)	2312	for (object *part = this->more; part; part = part->more)
2318	{	2313	{
2319	tmp = part->clone ();	2314	object *tmp = part->clone ();
2320	tmp->x -= src->x;
2321	tmp->y -= src->y;
2322
2323	if (!part->head)
2324	{
2325	dst = tmp;
2326	tmp->head = 0;
2327	}
2328	else
2329	tmp->head = dst;	2315	tmp->head = dst;
2330
2331	tmp->more = 0;
2332
2333	if (prev)
2334	prev->more = tmp;	2316	prev->more = tmp;
2335
2336	prev = tmp;	2317	prev = tmp;
2337	}	2318	}
2338		2319
2339	for (item = src->inv; item; item = item->below)	2320	for (object *item = inv; item; item = item->below)
2340	insert_ob_in_ob (object_create_clone (item), dst);	2321	insert_ob_in_ob (item->deep_clone (), dst);
2341		2322
2342	return dst;	2323	return dst;
2343	}	2324	}
2344		2325
2345	/* This returns the first object in who's inventory that	2326	/* This returns the first object in who's inventory that
…		…
2354	return tmp;	2335	return tmp;
2355		2336
2356	return 0;	2337	return 0;
2357	}	2338	}
2358		2339
2359	/* If ob has a field named key, return the link from the list,	2340	const shstr &
2360	* otherwise return NULL.	2341	object::kv_get (const shstr &key) const
2361	*
2362	* key must be a passed in shared string - otherwise, this won't
2363	* do the desired thing.
2364	*/
2365	key_value *
2366	get_ob_key_link (const object ob, const char key)
2367	{	2342	{
2368	for (key_value *link = ob->key_values; link; link = link->next)	2343	for (key_value *kv = key_values; kv; kv = kv->next)
2369	if (link->key == key)	2344	if (kv->key == key)
2370	return link;
2371
2372	return 0;
2373	}
2374
2375	/*
2376	* Returns the value of op has an extra_field for key, or NULL.
2377	*
2378	* The argument doesn't need to be a shared string.
2379	*
2380	* The returned string is shared.
2381	*/
2382	const char *
2383	get_ob_key_value (const object op, const char const key)
2384	{
2385	key_value *link;
2386	shstr_cmp canonical_key (key);
2387
2388	if (!canonical_key)
2389	{
2390	/* 1. There being a field named key on any object
2391	* implies there'd be a shared string to find.
2392	* 2. Since there isn't, no object has this field.
2393	* 3. Therefore, this object doesn't have this field.
2394	*/
2395	return 0;
2396	}
2397
2398	/* This is copied from get_ob_key_link() above -
2399	* only 4 lines, and saves the function call overhead.
2400	*/
2401	for (link = op->key_values; link; link = link->next)
2402	if (link->key == canonical_key)
2403	return link->value;	2345	return kv->value;
2404		2346
2405	return 0;	2347	return shstr_null;
2406	}	2348	}
2407		2349
2408	/*	2350	void
2409	* Updates the canonical_key in op to value.	2351	object::kv_set (const shstr &key, const shstr &value)
2410	*
2411	* canonical_key is a shared string (value doesn't have to be).
2412	*
2413	* Unless add_key is TRUE, it won't add fields, only change the value of existing
2414	* keys.
2415	*
2416	* Returns TRUE on success.
2417	*/
2418	int
2419	set_ob_key_value_s (object op, const shstr & canonical_key, const char value, int add_key)
2420	{	2352	{
2421	key_value field = NULL, last = NULL;	2353	for (key_value *kv = key_values; kv; kv = kv->next)
2422		2354	if (kv->key == key)
2423	for (field = op->key_values; field != NULL; field = field->next)
2424	{
2425	if (field->key != canonical_key)
2426	{	2355	{
2427	last = field;	2356	kv->value = value;
2428	continue;	2357	return;
2429	}	2358	}
2430		2359
2431	if (value)	2360	key_value *kv = new key_value;
2432	field->value = value;	2361
2433	else	2362	kv->next = key_values;
		2363	kv->key = key;
		2364	kv->value = value;
		2365
		2366	key_values = kv;
		2367	}
		2368
		2369	void
		2370	object::kv_del (const shstr &key)
		2371	{
		2372	for (key_value *kvp = &key_values; kvp; kvp = &(*kvp)->next)
		2373	if ((*kvp)->key == key)
2434	{	2374	{
2435	/* Basically, if the archetype has this key set,	2375	key_value kv = kvp;
2436	* we need to store the null value so when we save	2376	kvp = (kvp)->next;
2437	* it, we save the empty value so that when we load,	2377	delete kv;
2438	* we get this value back again.	2378	return;
2439	*/
2440	if (get_ob_key_link (op->arch, canonical_key))
2441	field->value = 0;
2442	else
2443	{
2444	if (last)
2445	last->next = field->next;
2446	else
2447	op->key_values = field->next;
2448
2449	delete field;
2450	}
2451	}	2379	}
2452	return TRUE;
2453	}
2454	/* IF we get here, key doesn't exist */
2455
2456	/* No field, we'll have to add it. */
2457
2458	if (!add_key)
2459	return FALSE;
2460
2461	/* There isn't any good reason to store a null
2462	* value in the key/value list. If the archetype has
2463	* this key, then we should also have it, so shouldn't
2464	* be here. If user wants to store empty strings,
2465	* should pass in ""
2466	*/
2467	if (value == NULL)
2468	return TRUE;
2469
2470	field = new key_value;
2471
2472	field->key = canonical_key;
2473	field->value = value;
2474	/* Usual prepend-addition. */
2475	field->next = op->key_values;
2476	op->key_values = field;
2477
2478	return TRUE;
2479	}
2480
2481	/*
2482	* Updates the key in op to value.
2483	*
2484	* If add_key is FALSE, this will only update existing keys,
2485	* and not add new ones.
2486	* In general, should be little reason FALSE is ever passed in for add_key
2487	*
2488	* Returns TRUE on success.
2489	*/
2490	int
2491	set_ob_key_value (object op, const char key, const char *value, int add_key)
2492	{
2493	shstr key_ (key);
2494
2495	return set_ob_key_value_s (op, key_, value, add_key);
2496	}	2380	}
2497		2381
2498	object::depth_iterator::depth_iterator (object *container)	2382	object::depth_iterator::depth_iterator (object *container)
2499	: iterator_base (container)	2383	: iterator_base (container)
2500	{	2384	{
…		…
2550	{	2434	{
2551	char flagdesc[512];	2435	char flagdesc[512];
2552	char info2[256 * 4];	2436	char info2[256 * 4];
2553	char *p = info;	2437	char *p = info;
2554		2438
2555	p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s,flags:[%s],type:%d}",	2439	p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s%s,flags:[%s],type:%d}",
2556	count,	2440	count,
2557	uuid.c_str (),	2441	uuid.c_str (),
2558	&name,	2442	&name,
2559	title ? "\",title:\"" : "",	2443	title ? ",title:\"" : "",
2560	title ? (const char *)title : "",	2444	title ? (const char *)title : "",
		2445	title ? "\"" : "",
2561	flag_desc (flagdesc, 512), type);	2446	flag_desc (flagdesc, 512), type);
2562		2447
2563	if (!this->flag[FLAG_REMOVED] && env)	2448	if (!flag[FLAG_REMOVED] && env)
2564	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2449	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2565		2450
2566	if (map)	2451	if (map)
2567	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);	2452	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2568		2453
…		…
2598	object::open_container (object *new_container)	2483	object::open_container (object *new_container)
2599	{	2484	{
2600	if (container == new_container)	2485	if (container == new_container)
2601	return;	2486	return;
2602		2487
2603	if (object *old_container = container)	2488	object *old_container = container;
		2489
		2490	if (old_container)
2604	{	2491	{
2605	if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))	2492	if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
2606	return;	2493	return;
2607		2494
2608	#if 0	2495	#if 0
…		…
2610	if (object *closer = old_container->inv)	2497	if (object *closer = old_container->inv)
2611	if (closer->type == CLOSE_CON)	2498	if (closer->type == CLOSE_CON)
2612	closer->destroy ();	2499	closer->destroy ();
2613	#endif	2500	#endif
2614		2501
		2502	// make sure the container is available
		2503	esrv_send_item (this, old_container);
		2504
2615	old_container->flag [FLAG_APPLIED] = 0;	2505	old_container->flag [FLAG_APPLIED] = false;
2616	container = 0;	2506	container = 0;
2617		2507
		2508	// client needs item update to make it work, client bug requires this to be separate
2618	esrv_update_item (UPD_FLAGS, this, old_container);	2509	esrv_update_item (UPD_FLAGS, this, old_container);
		2510
2619	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));	2511	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
2620	play_sound (sound_find ("chest_close"));	2512	play_sound (sound_find ("chest_close"));
2621	}	2513	}
2622		2514
2623	if (new_container)	2515	if (new_container)
…		…
2636	}	2528	}
2637	#endif	2529	#endif
2638		2530
2639	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));	2531	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));
2640		2532
		2533	// make sure the container is available, client bug requires this to be separate
		2534	esrv_send_item (this, new_container);
		2535
2641	new_container->flag [FLAG_APPLIED] = 1;	2536	new_container->flag [FLAG_APPLIED] = true;
2642	container = new_container;	2537	container = new_container;
2643		2538
		2539	// client needs flag change
2644	esrv_update_item (UPD_FLAGS, this, new_container);	2540	esrv_update_item (UPD_FLAGS, this, new_container);
2645	esrv_send_inventory (this, new_container);	2541	esrv_send_inventory (this, new_container);
2646	play_sound (sound_find ("chest_open"));	2542	play_sound (sound_find ("chest_open"));
2647	}	2543	}
		2544	// else if (!old_container->env && contr && contr->ns)
		2545	// contr->ns->floorbox_reset ();
2648	}	2546	}
2649		2547
2650	object *	2548	object *
2651	object::force_find (const shstr name)	2549	object::force_find (const shstr name)
2652	{	2550	{

Diff Legend

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

Comparing deliantra/server/common/object.C (file contents): Revision 1.212 by root, Mon Apr 21 23:35:24 2008 UTC vs. Revision 1.250 by root, Wed Jul 16 14:29:40 2008 UTC

Diff Legend

Comparing deliantra/server/common/object.C (file contents):
Revision 1.212 by root, Mon Apr 21 23:35:24 2008 UTC vs.
Revision 1.250 by root, Wed Jul 16 14:29:40 2008 UTC