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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.219 by root, Wed Apr 23 21:09:10 2008 UTC vs.
Revision 1.234 by root, Tue May 6 18:47:52 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	*
…		…
334		320
335	// find player who can see this object	321	// find player who can see this object
336	object *	322	object *
337	object::visible_to () const	323	object::visible_to () const
338	{	324	{
339	if (!flag [FLAG_REMOVED])	325	if (client_visible () && !flag [FLAG_REMOVED])
340	{	326	{
341	// see if we are in a container of sorts	327	// see if we are in a container of sorts
342	if (env)	328	if (env)
343	{	329	{
344	// the player inventory itself is always visible	330	// the player inventory itself is always visible
…		…
358	else	344	else
359	{	345	{
360	// maybe there is a player standing on the same mapspace	346	// maybe there is a player standing on the same mapspace
361	// this will catch the case where "this" is a player	347	// this will catch the case where "this" is a player
362	if (object *pl = ms ().player ())	348	if (object *pl = ms ().player ())
		349	if (!pl->container \|\| this == pl->container)
363	return pl;	350	return pl;
364	}	351	}
365	}	352	}
366		353
367	return 0;	354	return 0;
368	}	355	}
369		356
370	// adjust weight per container type ("of holding")	357	// adjust weight per container type ("of holding")
371	static sint32	358	static sint32
372	weight_adjust (object *op, sint32 weight)	359	weight_adjust_for (object *op, sint32 weight)
373	{	360	{
374	return op->type == CONTAINER	361	return op->type == CONTAINER
375	? lerp (weight, 0, 100, 0, 100 - op->stats.Str)	362	? lerp (weight, 0, 100, 0, 100 - op->stats.Str)
376	: weight;	363	: weight;
377	}	364	}
…		…
383	static void	370	static void
384	adjust_weight (object *op, sint32 weight)	371	adjust_weight (object *op, sint32 weight)
385	{	372	{
386	while (op)	373	while (op)
387	{	374	{
		375	// adjust by actual difference to account for rounding errors
		376	// i.e. (w2 - w1) / f != w2 / f - w1 / f and the latter is correct
388	weight = weight_adjust (op, weight);	377	weight = weight_adjust_for (op, op->carrying)
		378	- weight_adjust_for (op, op->carrying - weight);
389		379
390	if (!weight)	380	if (!weight)
391	return;	381	return;
392		382
393	op->carrying += weight;	383	op->carrying += weight;
…		…
416	op->update_weight ();	406	op->update_weight ();
417		407
418	sum += op->total_weight ();	408	sum += op->total_weight ();
419	}	409	}
420		410
421	sum = weight_adjust (this, sum);	411	sum = weight_adjust_for (this, sum);
422		412
423	if (sum != carrying)	413	if (sum != carrying)
424	{	414	{
425	carrying = sum;	415	carrying = sum;
426		416
…		…
602	}	592	}
603		593
604	op->key_values = 0;	594	op->key_values = 0;
605	}	595	}
606		596
607	object &	597	/*
608	object::operator =(const object &src)	598	* copy_to first frees everything allocated by the dst object,
		599	* and then copies the contents of itself into the second
		600	* object, allocating what needs to be allocated. Basically, any
		601	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
		602	* if the first object is freed, the pointers in the new object
		603	* will point at garbage.
		604	*/
		605	void
		606	object::copy_to (object *dst)
609	{	607	{
610	bool is_freed = flag [FLAG_FREED];	608	dst->remove ();
611	bool is_removed = flag [FLAG_REMOVED];
612
613	(object_copy )this = src;	609	(object_copy )dst = *this;
614
615	flag [FLAG_FREED] = is_freed;
616	flag [FLAG_REMOVED] = is_removed;	610	dst->flag [FLAG_REMOVED] = true;
617		611
618	/* Copy over key_values, if any. */	612	/* Copy over key_values, if any. */
619	if (src.key_values)	613	if (key_values)
620	{	614	{
621	key_value *tail = 0;	615	key_value *tail = 0;
622	key_values = 0;	616	dst->key_values = 0;
623		617
624	for (key_value *i = src.key_values; i; i = i->next)	618	for (key_value *i = key_values; i; i = i->next)
625	{	619	{
626	key_value *new_link = new key_value;	620	key_value *new_link = new key_value;
627		621
628	new_link->next = 0;	622	new_link->next = 0;
629	new_link->key = i->key;	623	new_link->key = i->key;
630	new_link->value = i->value;	624	new_link->value = i->value;
631		625
632	/* Try and be clever here, too. */	626	/* Try and be clever here, too. */
633	if (!key_values)	627	if (!dst->key_values)
634	{	628	{
635	key_values = new_link;	629	dst->key_values = new_link;
636	tail = new_link;	630	tail = new_link;
637	}	631	}
638	else	632	else
639	{	633	{
640	tail->next = new_link;	634	tail->next = new_link;
641	tail = new_link;	635	tail = new_link;
642	}	636	}
643	}	637	}
644	}	638	}
645	}
646
647	/*
648	* copy_to first frees everything allocated by the dst object,
649	* and then copies the contents of itself into the second
650	* object, allocating what needs to be allocated. Basically, any
651	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
652	* if the first object is freed, the pointers in the new object
653	* will point at garbage.
654	*/
655	void
656	object::copy_to (object *dst)
657	{
658	dst = this;
659		639
660	if (speed < 0)	640	if (speed < 0)
661	dst->speed_left -= rndm ();	641	dst->speed_left -= rndm ();
662		642
663	dst->set_speed (dst->speed);	643	dst->set_speed (dst->speed);
…		…
685	object *	665	object *
686	object::clone ()	666	object::clone ()
687	{	667	{
688	object *neu = create ();	668	object *neu = create ();
689	copy_to (neu);	669	copy_to (neu);
		670	neu->map = map; // not copied by copy_to
690	return neu;	671	return neu;
691	}	672	}
692		673
693	/*	674	/*
694	* If an object with the IS_TURNABLE() flag needs to be turned due	675	* If an object with the IS_TURNABLE() flag needs to be turned due
…		…
745	* UP_OBJ_FACE: only the objects face has changed.	726	* UP_OBJ_FACE: only the objects face has changed.
746	*/	727	*/
747	void	728	void
748	update_object (object *op, int action)	729	update_object (object *op, int action)
749	{	730	{
750	if (op == NULL)	731	if (!op)
751	{	732	{
752	/* this should never happen */	733	/* this should never happen */
753	LOG (llevDebug, "update_object() called for NULL object.\n");	734	LOG (llevError \| logBacktrace, "update_object() called for NULL object.\n");
754	return;	735	return;
755	}	736	}
756		737
757	if (op->env)	738	if (!op->is_on_map ())
758	{	739	{
759	/* Animation is currently handled by client, so nothing	740	/* Animation is currently handled by client, so nothing
760	* to do in this case.	741	* to do in this case.
761	*/	742	*/
762	return;	743	return;
763	}	744	}
764
765	/* If the map is saving, don't do anything as everything is
766	* going to get freed anyways.
767	*/
768	if (!op->map \|\| op->map->in_memory == MAP_SAVING)
769	return;
770		745
771	/* make sure the object is within map boundaries */	746	/* make sure the object is within map boundaries */
772	if (op->x < 0 \|\| op->x >= op->map->width \|\| op->y < 0 \|\| op->y >= op->map->height)	747	if (op->x < 0 \|\| op->x >= op->map->width \|\| op->y < 0 \|\| op->y >= op->map->height)
773	{	748	{
774	LOG (llevError, "update_object() called for object out of map!\n");	749	LOG (llevError, "update_object() called for object out of map!\n");
…		…
964	object *op = new object;	939	object *op = new object;
965	op->link ();	940	op->link ();
966	return op;	941	return op;
967	}	942	}
968		943
		944	static struct freed_map : maptile
		945	{
		946	freed_map ()
		947	{
		948	path = "<freed objects map>";
		949	name = "/internal/freed_objects_map";
		950	width = 3;
		951	height = 3;
		952	nodrop = 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
969	void	964	void
970	object::do_destroy ()	965	object::do_destroy ()
971	{	966	{
972	if (flag [FLAG_IS_LINKED])	967	if (flag [FLAG_IS_LINKED])
973	remove_button_link (this);	968	remove_button_link (this);
…		…
983	unlink ();	978	unlink ();
984		979
985	flag [FLAG_FREED] = 1;	980	flag [FLAG_FREED] = 1;
986		981
987	// hack to ensure that freed objects still have a valid map	982	// 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;	983	map = &freed_map;
1006	x = 1;	984	x = 1;
1007	y = 1;	985	y = 1;
1008	}
1009		986
1010	if (more)	987	if (more)
1011	{	988	{
1012	more->destroy ();	989	more->destroy ();
1013	more = 0;	990	more = 0;
…		…
1030		1007
1031	if (!is_head () && !head->destroyed ())	1008	if (!is_head () && !head->destroyed ())
1032	{	1009	{
1033	LOG (llevError \| logBacktrace, "tried to destroy the tail of an object");	1010	LOG (llevError \| logBacktrace, "tried to destroy the tail of an object");
1034	head->destroy (destroy_inventory);	1011	head->destroy (destroy_inventory);
		1012	return;
1035	}	1013	}
1036		1014
1037	destroy_inv (!destroy_inventory);	1015	destroy_inv (!destroy_inventory);
1038		1016
1039	if (is_head ())	1017	if (is_head ())
…		…
1061	if (flag [FLAG_REMOVED])	1039	if (flag [FLAG_REMOVED])
1062	return;	1040	return;
1063		1041
1064	INVOKE_OBJECT (REMOVE, this);	1042	INVOKE_OBJECT (REMOVE, this);
1065		1043
1066	if (object *pl = visible_to ())
1067	esrv_del_item (pl->contr, count);
1068
1069	flag [FLAG_REMOVED] = true;	1044	flag [FLAG_REMOVED] = true;
1070		1045
1071	if (more)	1046	if (more)
1072	more->remove ();	1047	more->remove ();
1073		1048
…		…
1075	* In this case, the object to be removed is in someones	1050	* In this case, the object to be removed is in someones
1076	* inventory.	1051	* inventory.
1077	*/	1052	*/
1078	if (env)	1053	if (env)
1079	{	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
1080	adjust_weight (env, -total_weight ());	1060	adjust_weight (env, -total_weight ());
1081		1061
1082	*(above ? &above->below : &env->inv) = below;	1062	*(above ? &above->below : &env->inv) = below;
1083		1063
1084	if (below)	1064	if (below)
…		…
1102	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))
1103	otmp->update_stats ();	1083	otmp->update_stats ();
1104	}	1084	}
1105	else if (map)	1085	else if (map)
1106	{	1086	{
1107	if (type == PLAYER)
1108	{
1109	// leaving a spot always closes any open container on the ground
1110	if (container && !container->env)
1111	// this causes spurious floorbox updates, but it ensures
1112	// that the CLOSE event is being sent.
1113	close_container ();
1114
1115	--map->players;
1116	map->touch ();
1117	}
1118
1119	map->dirty = true;	1087	map->dirty = true;
1120	mapspace &ms = this->ms ();	1088	mapspace &ms = this->ms ();
		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	}
1121		1111
1122	/* link the object above us */	1112	/* link the object above us */
1123	if (above)	1113	if (above)
1124	above->below = below;	1114	above->below = below;
1125	else	1115	else
…		…
1156	* appropriately.	1146	* appropriately.
1157	*/	1147	*/
1158	pl->close_container ();	1148	pl->close_container ();
1159		1149
1160	//TODO: the floorbox prev/next might need updating	1150	//TODO: the floorbox prev/next might need updating
1161	esrv_del_item (pl->contr, count);	1151	//esrv_del_item (pl->contr, count);
		1152	//TODO: update floorbox to preserve ordering
		1153	if (pl->contr->ns)
		1154	pl->contr->ns->floorbox_update ();
1162	}	1155	}
1163		1156
1164	for (tmp = ms.bot; tmp; tmp = tmp->above)	1157	for (tmp = ms.bot; tmp; tmp = tmp->above)
1165	{	1158	{
1166	/* No point updating the players look faces if he is the object	1159	/* No point updating the players look faces if he is the object
…		…
1300	* 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
1301	* need extra work	1294	* need extra work
1302	*/	1295	*/
1303	if (!xy_normalise (m, op->x, op->y))	1296	if (!xy_normalise (m, op->x, op->y))
1304	{	1297	{
1305	op->destroy (1);	1298	op->head_ ()->destroy (1);// remove head_ once all tail object destroyers found
1306	return 0;	1299	return 0;
1307	}	1300	}
1308		1301
1309	if (object *more = op->more)	1302	if (object *more = op->more)
1310	if (!insert_ob_in_map (more, m, originator, flag))	1303	if (!insert_ob_in_map (more, m, originator, flag))
…		…
1464		1457
1465	op->map->dirty = true;	1458	op->map->dirty = true;
1466		1459
1467	if (object *pl = ms.player ())	1460	if (object *pl = ms.player ())
1468	//TODO: the floorbox prev/next might need updating	1461	//TODO: the floorbox prev/next might need updating
1469	esrv_send_item (pl, op);	1462	//esrv_send_item (pl, op);
		1463	//TODO: update floorbox to preserve ordering
		1464	if (pl->contr->ns)
		1465	pl->contr->ns->floorbox_update ();
1470		1466
1471	/* If this object glows, it may affect lighting conditions that are	1467	/* If this object glows, it may affect lighting conditions that are
1472	* visible to others on this map. But update_all_los is really	1468	* visible to others on this map. But update_all_los is really
1473	* an inefficient way to do this, as it means los for all players	1469	* an inefficient way to do this, as it means los for all players
1474	* on the map will get recalculated. The players could very well	1470	* on the map will get recalculated. The players could very well
…		…
1594	}	1590	}
1595	else	1591	else
1596	{	1592	{
1597	decrease (nr);	1593	decrease (nr);
1598		1594
1599	object *op = object_create_clone (this);	1595	object *op = deep_clone ();
1600	op->nrof = nr;	1596	op->nrof = nr;
1601	return op;	1597	return op;
1602	}	1598	}
1603	}	1599	}
1604		1600
…		…
1825	LOG (llevError, "Present_arch called outside map.\n");	1821	LOG (llevError, "Present_arch called outside map.\n");
1826	return NULL;	1822	return NULL;
1827	}	1823	}
1828		1824
1829	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)	1825	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1830	if (tmp->arch == at)	1826	if (tmp->arch->archname == at->archname)
1831	return tmp;	1827	return tmp;
1832		1828
1833	return NULL;	1829	return NULL;
1834	}	1830	}
1835		1831
…		…
1899	* The first matching object is returned, or NULL if none.	1895	* The first matching object is returned, or NULL if none.
1900	*/	1896	*/
1901	object *	1897	object *
1902	present_arch_in_ob (const archetype at, const object op)	1898	present_arch_in_ob (const archetype at, const object op)
1903	{	1899	{
1904	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)	1900	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1905	if (tmp->arch == at)	1901	if (tmp->arch->archname == at->archname)
1906	return tmp;	1902	return tmp;
1907		1903
1908	return NULL;	1904	return NULL;
1909	}	1905	}
1910		1906
…		…
2319		2315
2320	/*	2316	/*
2321	* create clone from object to another	2317	* create clone from object to another
2322	*/	2318	*/
2323	object *	2319	object *
2324	object_create_clone (object *asrc)	2320	object::deep_clone ()
2325	{	2321	{
2326	object dst = 0, tmp, src, prev, *item;	2322	assert (("deep_clone called on non-head object", is_head ()));
2327		2323
2328	if (!asrc)	2324	object *dst = clone ();
2329	return 0;
2330		2325
2331	src = asrc->head_ ();	2326	object *prev = dst;
2332
2333	prev = 0;
2334	for (object *part = src; part; part = part->more)	2327	for (object *part = this->more; part; part = part->more)
2335	{	2328	{
2336	tmp = part->clone ();	2329	object *tmp = part->clone ();
2337	tmp->x -= src->x;
2338	tmp->y -= src->y;
2339
2340	if (!part->head)
2341	{
2342	dst = tmp;
2343	tmp->head = 0;
2344	}
2345	else
2346	tmp->head = dst;	2330	tmp->head = dst;
2347
2348	tmp->more = 0;
2349
2350	if (prev)
2351	prev->more = tmp;	2331	prev->more = tmp;
2352
2353	prev = tmp;	2332	prev = tmp;
2354	}	2333	}
2355		2334
2356	for (item = src->inv; item; item = item->below)	2335	for (object *item = inv; item; item = item->below)
2357	insert_ob_in_ob (object_create_clone (item), dst);	2336	insert_ob_in_ob (item->deep_clone (), dst);
2358		2337
2359	return dst;	2338	return dst;
2360	}	2339	}
2361		2340
2362	/* This returns the first object in who's inventory that	2341	/* This returns the first object in who's inventory that
…		…
2371	return tmp;	2350	return tmp;
2372		2351
2373	return 0;	2352	return 0;
2374	}	2353	}
2375		2354
2376	/* If ob has a field named key, return the link from the list,	2355	const shstr &
2377	* otherwise return NULL.	2356	object::kv_get (const shstr &key) const
2378	*
2379	* key must be a passed in shared string - otherwise, this won't
2380	* do the desired thing.
2381	*/
2382	key_value *
2383	get_ob_key_link (const object ob, const char key)
2384	{	2357	{
2385	for (key_value *link = ob->key_values; link; link = link->next)	2358	for (key_value *kv = key_values; kv; kv = kv->next)
2386	if (link->key == key)	2359	if (kv->key == key)
2387	return link;
2388
2389	return 0;
2390	}
2391
2392	/*
2393	* Returns the value of op has an extra_field for key, or NULL.
2394	*
2395	* The argument doesn't need to be a shared string.
2396	*
2397	* The returned string is shared.
2398	*/
2399	const char *
2400	get_ob_key_value (const object op, const char const key)
2401	{
2402	key_value *link;
2403	shstr_cmp canonical_key (key);
2404
2405	if (!canonical_key)
2406	{
2407	/* 1. There being a field named key on any object
2408	* implies there'd be a shared string to find.
2409	* 2. Since there isn't, no object has this field.
2410	* 3. Therefore, this object doesn't have this field.
2411	*/
2412	return 0;
2413	}
2414
2415	/* This is copied from get_ob_key_link() above -
2416	* only 4 lines, and saves the function call overhead.
2417	*/
2418	for (link = op->key_values; link; link = link->next)
2419	if (link->key == canonical_key)
2420	return link->value;	2360	return kv->value;
2421		2361
2422	return 0;	2362	return shstr_null;
2423	}	2363	}
2424		2364
2425	/*	2365	void
2426	* Updates the canonical_key in op to value.	2366	object::kv_set (const shstr &key, const shstr &value)
2427	*
2428	* canonical_key is a shared string (value doesn't have to be).
2429	*
2430	* Unless add_key is TRUE, it won't add fields, only change the value of existing
2431	* keys.
2432	*
2433	* Returns TRUE on success.
2434	*/
2435	int
2436	set_ob_key_value_s (object op, const shstr & canonical_key, const char value, int add_key)
2437	{	2367	{
2438	key_value field = NULL, last = NULL;	2368	for (key_value *kv = key_values; kv; kv = kv->next)
2439		2369	if (kv->key == key)
2440	for (field = op->key_values; field != NULL; field = field->next)
2441	{
2442	if (field->key != canonical_key)
2443	{	2370	{
2444	last = field;	2371	kv->value = value;
2445	continue;	2372	return;
2446	}	2373	}
2447		2374
2448	if (value)	2375	key_value *kv = new key_value;
2449	field->value = value;	2376
2450	else	2377	kv->next = key_values;
		2378	kv->key = key;
		2379	kv->value = value;
		2380
		2381	key_values = kv;
		2382	}
		2383
		2384	void
		2385	object::kv_del (const shstr &key)
		2386	{
		2387	for (key_value *kvp = &key_values; kvp; kvp = &(*kvp)->next)
		2388	if ((*kvp)->key == key)
2451	{	2389	{
2452	/* Basically, if the archetype has this key set,	2390	key_value kv = kvp;
2453	* we need to store the null value so when we save	2391	kvp = (kvp)->next;
2454	* it, we save the empty value so that when we load,	2392	delete kv;
2455	* we get this value back again.	2393	return;
2456	*/
2457	if (get_ob_key_link (op->arch, canonical_key))
2458	field->value = 0;
2459	else
2460	{
2461	if (last)
2462	last->next = field->next;
2463	else
2464	op->key_values = field->next;
2465
2466	delete field;
2467	}
2468	}	2394	}
2469	return TRUE;
2470	}
2471	/* IF we get here, key doesn't exist */
2472
2473	/* No field, we'll have to add it. */
2474
2475	if (!add_key)
2476	return FALSE;
2477
2478	/* There isn't any good reason to store a null
2479	* value in the key/value list. If the archetype has
2480	* this key, then we should also have it, so shouldn't
2481	* be here. If user wants to store empty strings,
2482	* should pass in ""
2483	*/
2484	if (value == NULL)
2485	return TRUE;
2486
2487	field = new key_value;
2488
2489	field->key = canonical_key;
2490	field->value = value;
2491	/* Usual prepend-addition. */
2492	field->next = op->key_values;
2493	op->key_values = field;
2494
2495	return TRUE;
2496	}
2497
2498	/*
2499	* Updates the key in op to value.
2500	*
2501	* If add_key is FALSE, this will only update existing keys,
2502	* and not add new ones.
2503	* In general, should be little reason FALSE is ever passed in for add_key
2504	*
2505	* Returns TRUE on success.
2506	*/
2507	int
2508	set_ob_key_value (object op, const char key, const char *value, int add_key)
2509	{
2510	shstr key_ (key);
2511
2512	return set_ob_key_value_s (op, key_, value, add_key);
2513	}	2395	}
2514		2396
2515	object::depth_iterator::depth_iterator (object *container)	2397	object::depth_iterator::depth_iterator (object *container)
2516	: iterator_base (container)	2398	: iterator_base (container)
2517	{	2399	{
…		…
2615	object::open_container (object *new_container)	2497	object::open_container (object *new_container)
2616	{	2498	{
2617	if (container == new_container)	2499	if (container == new_container)
2618	return;	2500	return;
2619		2501
2620	if (object *old_container = container)	2502	object *old_container = container;
		2503
		2504	if (old_container)
2621	{	2505	{
2622	if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))	2506	if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
2623	return;	2507	return;
2624		2508
2625	#if 0	2509	#if 0
…		…
2627	if (object *closer = old_container->inv)	2511	if (object *closer = old_container->inv)
2628	if (closer->type == CLOSE_CON)	2512	if (closer->type == CLOSE_CON)
2629	closer->destroy ();	2513	closer->destroy ();
2630	#endif	2514	#endif
2631		2515
		2516	// make sure the container is available
		2517	esrv_send_item (this, old_container);
		2518
2632	old_container->flag [FLAG_APPLIED] = false;	2519	old_container->flag [FLAG_APPLIED] = false;
2633	container = 0;	2520	container = 0;
2634		2521
		2522	// client needs item update to make it work, client bug requires this to be separate
2635	esrv_update_item (UPD_FLAGS, this, old_container);	2523	esrv_update_item (UPD_FLAGS, this, old_container);
		2524
2636	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));	2525	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
2637	play_sound (sound_find ("chest_close"));	2526	play_sound (sound_find ("chest_close"));
2638	}	2527	}
2639		2528
2640	if (new_container)	2529	if (new_container)
…		…
2653	}	2542	}
2654	#endif	2543	#endif
2655		2544
2656	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));	2545	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));
2657		2546
		2547	// make sure the container is available, client bug requires this to be separate
		2548	esrv_send_item (this, new_container);
		2549
2658	new_container->flag [FLAG_APPLIED] = true;	2550	new_container->flag [FLAG_APPLIED] = true;
2659	container = new_container;	2551	container = new_container;
2660		2552
		2553	// client needs flag change
2661	esrv_update_item (UPD_FLAGS, this, new_container);	2554	esrv_update_item (UPD_FLAGS, this, new_container);
2662	esrv_send_inventory (this, new_container);	2555	esrv_send_inventory (this, new_container);
2663	play_sound (sound_find ("chest_open"));	2556	play_sound (sound_find ("chest_open"));
2664	}	2557	}
		2558	// else if (!old_container->env && contr && contr->ns)
		2559	// contr->ns->floorbox_reset ();
2665	}	2560	}
2666		2561
2667	object *	2562	object *
2668	object::force_find (const shstr name)	2563	object::force_find (const shstr name)
2669	{	2564	{

Diff Legend

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

Comparing deliantra/server/common/object.C (file contents): Revision 1.219 by root, Wed Apr 23 21:09:10 2008 UTC vs. Revision 1.234 by root, Tue May 6 18:47:52 2008 UTC

Diff Legend

Comparing deliantra/server/common/object.C (file contents):
Revision 1.219 by root, Wed Apr 23 21:09:10 2008 UTC vs.
Revision 1.234 by root, Tue May 6 18:47:52 2008 UTC