[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.229 by root, Sat May 3 12:29:09 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	}
…		…
391	return;	378	return;
392		379
393	op->carrying += weight;	380	op->carrying += weight;
394		381
395	if (object *pl = op->visible_to ())	382	if (object *pl = op->visible_to ())
		383	if (pl != op) // player is handled lazily
396	esrv_update_item (UPD_WEIGHT, pl, op);	384	esrv_update_item (UPD_WEIGHT, pl, op);
397		385
398	op = op->env;	386	op = op->env;
399	}	387	}
400	}	388	}
401		389
…		…
422	if (sum != carrying)	410	if (sum != carrying)
423	{	411	{
424	carrying = sum;	412	carrying = sum;
425		413
426	if (object *pl = visible_to ())	414	if (object *pl = visible_to ())
		415	if (pl != this) // player is handled lazily
427	esrv_update_item (UPD_WEIGHT, pl, this);	416	esrv_update_item (UPD_WEIGHT, pl, this);
428	}	417	}
429	}	418	}
430		419
431	/*	420	/*
432	* Used by: Server DM commands: dumpbelow, dump. Some error messages.	421	* Used by: Server DM commands: dumpbelow, dump. Some error messages.
…		…
600	}	589	}
601		590
602	op->key_values = 0;	591	op->key_values = 0;
603	}	592	}
604		593
605	object &	594	/*
606	object::operator =(const object &src)	595	* copy_to first frees everything allocated by the dst object,
		596	* and then copies the contents of itself into the second
		597	* object, allocating what needs to be allocated. Basically, any
		598	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
		599	* if the first object is freed, the pointers in the new object
		600	* will point at garbage.
		601	*/
		602	void
		603	object::copy_to (object *dst)
607	{	604	{
608	bool is_freed = flag [FLAG_FREED];	605	dst->remove ();
609	bool is_removed = flag [FLAG_REMOVED];
610
611	(object_copy )this = src;	606	(object_copy )dst = *this;
612
613	flag [FLAG_FREED] = is_freed;
614	flag [FLAG_REMOVED] = is_removed;	607	dst->flag [FLAG_REMOVED] = true;
615		608
616	/* Copy over key_values, if any. */	609	/* Copy over key_values, if any. */
617	if (src.key_values)	610	if (key_values)
618	{	611	{
619	key_value *tail = 0;	612	key_value *tail = 0;
620	key_values = 0;	613	dst->key_values = 0;
621		614
622	for (key_value *i = src.key_values; i; i = i->next)	615	for (key_value *i = key_values; i; i = i->next)
623	{	616	{
624	key_value *new_link = new key_value;	617	key_value *new_link = new key_value;
625		618
626	new_link->next = 0;	619	new_link->next = 0;
627	new_link->key = i->key;	620	new_link->key = i->key;
628	new_link->value = i->value;	621	new_link->value = i->value;
629		622
630	/* Try and be clever here, too. */	623	/* Try and be clever here, too. */
631	if (!key_values)	624	if (!dst->key_values)
632	{	625	{
633	key_values = new_link;	626	dst->key_values = new_link;
634	tail = new_link;	627	tail = new_link;
635	}	628	}
636	else	629	else
637	{	630	{
638	tail->next = new_link;	631	tail->next = new_link;
639	tail = new_link;	632	tail = new_link;
640	}	633	}
641	}	634	}
642	}	635	}
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		636
658	if (speed < 0)	637	if (speed < 0)
659	dst->speed_left -= rndm ();	638	dst->speed_left -= rndm ();
660		639
661	dst->set_speed (dst->speed);	640	dst->set_speed (dst->speed);
…		…
683	object *	662	object *
684	object::clone ()	663	object::clone ()
685	{	664	{
686	object *neu = create ();	665	object *neu = create ();
687	copy_to (neu);	666	copy_to (neu);
		667	neu->map = map; // not copied by copy_to
688	return neu;	668	return neu;
689	}	669	}
690		670
691	/*	671	/*
692	* If an object with the IS_TURNABLE() flag needs to be turned due	672	* If an object with the IS_TURNABLE() flag needs to be turned due
…		…
743	* UP_OBJ_FACE: only the objects face has changed.	723	* UP_OBJ_FACE: only the objects face has changed.
744	*/	724	*/
745	void	725	void
746	update_object (object *op, int action)	726	update_object (object *op, int action)
747	{	727	{
748	if (op == NULL)	728	if (!op)
749	{	729	{
750	/* this should never happen */	730	/* this should never happen */
751	LOG (llevDebug, "update_object() called for NULL object.\n");	731	LOG (llevError \| logBacktrace, "update_object() called for NULL object.\n");
752	return;	732	return;
753	}	733	}
754		734
755	if (op->env)	735	if (!op->is_on_map ())
756	{	736	{
757	/* Animation is currently handled by client, so nothing	737	/* Animation is currently handled by client, so nothing
758	* to do in this case.	738	* to do in this case.
759	*/	739	*/
760	return;	740	return;
761	}	741	}
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		742
769	/* make sure the object is within map boundaries */	743	/* 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)	744	if (op->x < 0 \|\| op->x >= op->map->width \|\| op->y < 0 \|\| op->y >= op->map->height)
771	{	745	{
772	LOG (llevError, "update_object() called for object out of map!\n");	746	LOG (llevError, "update_object() called for object out of map!\n");
…		…
915	object::destroy_inv (bool drop_to_ground)	889	object::destroy_inv (bool drop_to_ground)
916	{	890	{
917	// need to check first, because the checks below might segfault	891	// need to check first, because the checks below might segfault
918	// as we might be on an invalid mapspace and crossfire code	892	// as we might be on an invalid mapspace and crossfire code
919	// is too buggy to ensure that the inventory is empty.	893	// is too buggy to ensure that the inventory is empty.
920	// corollary: if you create arrows etc. with stuff in tis inventory,	894	// corollary: if you create arrows etc. with stuff in its inventory,
921	// cf will crash below with off-map x and y	895	// cf will crash below with off-map x and y
922	if (!inv)	896	if (!inv)
923	return;	897	return;
924		898
925	/* Only if the space blocks everything do we not process -	899	/* Only if the space blocks everything do we not process -
…		…
932	\|\| map->nodrop	906	\|\| map->nodrop
933	\|\| ms ().move_block == MOVE_ALL)	907	\|\| ms ().move_block == MOVE_ALL)
934	{	908	{
935	while (inv)	909	while (inv)
936	{	910	{
937	inv->destroy_inv (drop_to_ground);	911	inv->destroy_inv (false);
938	inv->destroy ();	912	inv->destroy ();
939	}	913	}
940	}	914	}
941	else	915	else
942	{ /* Put objects in inventory onto this space */	916	{ /* Put objects in inventory onto this space */
…		…
948	\|\| op->flag [FLAG_NO_DROP]	922	\|\| op->flag [FLAG_NO_DROP]
949	\|\| op->type == RUNE	923	\|\| op->type == RUNE
950	\|\| op->type == TRAP	924	\|\| op->type == TRAP
951	\|\| op->flag [FLAG_IS_A_TEMPLATE]	925	\|\| op->flag [FLAG_IS_A_TEMPLATE]
952	\|\| op->flag [FLAG_DESTROY_ON_DEATH])	926	\|\| op->flag [FLAG_DESTROY_ON_DEATH])
953	op->destroy ();	927	op->destroy (true);
954	else	928	else
955	map->insert (op, x, y);	929	map->insert (op, x, y);
956	}	930	}
957	}	931	}
958	}	932	}
…		…
962	object *op = new object;	936	object *op = new object;
963	op->link ();	937	op->link ();
964	return op;	938	return op;
965	}	939	}
966		940
		941	static struct freed_map : maptile
		942	{
		943	freed_map ()
		944	{
		945	path = "<freed objects map>";
		946	name = "/internal/freed_objects_map";
		947	width = 3;
		948	height = 3;
		949	nodrop = 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		1058
1077	*(above ? &above->below : &env->inv) = below;	1059	*(above ? &above->below : &env->inv) = below;
1078		1060
1079	if (below)	1061	if (below)
…		…
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 ();
		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	}
1116		1108
1117	/* link the object above us */	1109	/* link the object above us */
1118	if (above)	1110	if (above)
1119	above->below = below;	1111	above->below = below;
1120	else	1112	else
…		…
1150	* removed (most likely destroyed), update the player view	1142	* removed (most likely destroyed), update the player view
1151	* appropriately.	1143	* appropriately.
1152	*/	1144	*/
1153	pl->close_container ();	1145	pl->close_container ();
1154		1146
		1147	//TODO: the floorbox prev/next might need updating
		1148	//esrv_del_item (pl->contr, count);
		1149	//TODO: update floorbox to preserve ordering
		1150	if (pl->contr->ns)
1155	pl->contr->ns->floorbox_update ();	1151	pl->contr->ns->floorbox_update ();
1156	}	1152	}
1157		1153
1158	for (tmp = ms.bot; tmp; tmp = tmp->above)	1154	for (tmp = ms.bot; tmp; tmp = tmp->above)
1159	{	1155	{
1160	/* No point updating the players look faces if he is the object	1156	/* No point updating the players look faces if he is the object
…		…
1286	object *	1282	object *
1287	insert_ob_in_map (object op, maptile m, object *originator, int flag)	1283	insert_ob_in_map (object op, maptile m, object *originator, int flag)
1288	{	1284	{
1289	assert (!op->flag [FLAG_FREED]);	1285	assert (!op->flag [FLAG_FREED]);
1290		1286
1291	object top, floor = NULL;
1292
1293	op->remove ();	1287	op->remove ();
1294		1288
1295	/* Ideally, the caller figures this out. However, it complicates a lot	1289	/* 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	1290	* of areas of callers (eg, anything that uses find_free_spot would now
1297	* need extra work	1291	* need extra work
1298	*/	1292	*/
1299	if (!xy_normalise (m, op->x, op->y))	1293	if (!xy_normalise (m, op->x, op->y))
1300	{	1294	{
1301	op->destroy ();	1295	op->destroy (1);
1302	return 0;	1296	return 0;
1303	}	1297	}
1304		1298
1305	if (object *more = op->more)	1299	if (object *more = op->more)
1306	if (!insert_ob_in_map (more, m, originator, flag))	1300	if (!insert_ob_in_map (more, m, originator, flag))
…		…
1315	*/	1309	*/
1316	if (op->nrof && !(flag & INS_NO_MERGE))	1310	if (op->nrof && !(flag & INS_NO_MERGE))
1317	for (object *tmp = ms.bot; tmp; tmp = tmp->above)	1311	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1318	if (object::can_merge (op, tmp))	1312	if (object::can_merge (op, tmp))
1319	{	1313	{
		1314	// TODO: we atcually want to update tmp, not op,
		1315	// but some caller surely breaks when we return tmp
		1316	// from here :/
1320	op->nrof += tmp->nrof;	1317	op->nrof += tmp->nrof;
1321	tmp->destroy (1);	1318	tmp->destroy (1);
1322	}	1319	}
1323		1320
1324	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1321	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
…		…
1346	/* since below originator, no need to update top */	1343	/* since below originator, no need to update top */
1347	originator->below = op;	1344	originator->below = op;
1348	}	1345	}
1349	else	1346	else
1350	{	1347	{
		1348	object top, floor = NULL;
		1349
1351	top = ms.bot;	1350	top = ms.bot;
1352		1351
1353	/* If there are other objects, then */	1352	/* If there are other objects, then */
1354	if (top)	1353	if (top)
1355	{	1354	{
…		…
1454	}	1453	}
1455		1454
1456	op->map->dirty = true;	1455	op->map->dirty = true;
1457		1456
1458	if (object *pl = ms.player ())	1457	if (object *pl = ms.player ())
		1458	//TODO: the floorbox prev/next might need updating
		1459	//esrv_send_item (pl, op);
		1460	//TODO: update floorbox to preserve ordering
		1461	if (pl->contr->ns)
1459	pl->contr->ns->floorbox_update ();	1462	pl->contr->ns->floorbox_update ();
1460		1463
1461	/* If this object glows, it may affect lighting conditions that are	1464	/* If this object glows, it may affect lighting conditions that are
1462	* visible to others on this map. But update_all_los is really	1465	* 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	1466	* 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	1467	* on the map will get recalculated. The players could very well
…		…
2311	* create clone from object to another	2314	* create clone from object to another
2312	*/	2315	*/
2313	object *	2316	object *
2314	object_create_clone (object *asrc)	2317	object_create_clone (object *asrc)
2315	{	2318	{
2316	object dst = 0, tmp, src, prev, *item;	2319	object *dst = 0;
2317		2320
2318	if (!asrc)	2321	if (!asrc)
2319	return 0;	2322	return 0;
2320		2323
2321	src = asrc->head_ ();	2324	object *src = asrc->head_ ();
2322		2325
2323	prev = 0;	2326	object *prev = 0;
2324	for (object *part = src; part; part = part->more)	2327	for (object *part = src; part; part = part->more)
2325	{	2328	{
2326	tmp = part->clone ();	2329	object *tmp = part->clone ();
		2330
2327	tmp->x -= src->x;	2331	tmp->x -= src->x;
2328	tmp->y -= src->y;	2332	tmp->y -= src->y;
2329		2333
2330	if (!part->head)	2334	if (!part->head)
2331	{	2335	{
…		…
2341	prev->more = tmp;	2345	prev->more = tmp;
2342		2346
2343	prev = tmp;	2347	prev = tmp;
2344	}	2348	}
2345		2349
2346	for (item = src->inv; item; item = item->below)	2350	for (object *item = src->inv; item; item = item->below)
2347	insert_ob_in_ob (object_create_clone (item), dst);	2351	insert_ob_in_ob (object_create_clone (item), dst);
2348		2352
2349	return dst;	2353	return dst;
2350	}	2354	}
2351		2355
…		…
2361	return tmp;	2365	return tmp;
2362		2366
2363	return 0;	2367	return 0;
2364	}	2368	}
2365		2369
2366	/* If ob has a field named key, return the link from the list,	2370	const shstr &
2367	* otherwise return NULL.	2371	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	{	2372	{
2375	for (key_value *link = ob->key_values; link; link = link->next)	2373	for (key_value *kv = key_values; kv; kv = kv->next)
2376	if (link->key == key)	2374	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;	2375	return kv->value;
2411		2376
2412	return 0;	2377	return shstr_null;
2413	}	2378	}
2414		2379
2415	/*	2380	void
2416	* Updates the canonical_key in op to value.	2381	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	{	2382	{
2428	key_value field = NULL, last = NULL;	2383	for (key_value *kv = key_values; kv; kv = kv->next)
2429		2384	if (kv->key == key)
2430	for (field = op->key_values; field != NULL; field = field->next)
2431	{
2432	if (field->key != canonical_key)
2433	{	2385	{
2434	last = field;	2386	kv->value = value;
2435	continue;	2387	return;
2436	}	2388	}
2437		2389
2438	if (value)	2390	key_value *kv = new key_value;
2439	field->value = value;	2391
2440	else	2392	kv->next = key_values;
		2393	kv->key = key;
		2394	kv->value = value;
		2395
		2396	key_values = kv;
		2397	}
		2398
		2399	void
		2400	object::kv_del (const shstr &key)
		2401	{
		2402	for (key_value *kvp = &key_values; kvp; kvp = &(*kvp)->next)
		2403	if ((*kvp)->key == key)
2441	{	2404	{
2442	/* Basically, if the archetype has this key set,	2405	key_value kv = kvp;
2443	* we need to store the null value so when we save	2406	kvp = (kvp)->next;
2444	* it, we save the empty value so that when we load,	2407	delete kv;
2445	* we get this value back again.	2408	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	}	2409	}
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	}	2410	}
2504		2411
2505	object::depth_iterator::depth_iterator (object *container)	2412	object::depth_iterator::depth_iterator (object *container)
2506	: iterator_base (container)	2413	: iterator_base (container)
2507	{	2414	{
…		…
2565	&name,	2472	&name,
2566	title ? "\",title:\"" : "",	2473	title ? "\",title:\"" : "",
2567	title ? (const char *)title : "",	2474	title ? (const char *)title : "",
2568	flag_desc (flagdesc, 512), type);	2475	flag_desc (flagdesc, 512), type);
2569		2476
2570	if (!this->flag[FLAG_REMOVED] && env)	2477	if (!flag[FLAG_REMOVED] && env)
2571	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2478	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2572		2479
2573	if (map)	2480	if (map)
2574	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);	2481	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2575		2482
…		…
2605	object::open_container (object *new_container)	2512	object::open_container (object *new_container)
2606	{	2513	{
2607	if (container == new_container)	2514	if (container == new_container)
2608	return;	2515	return;
2609		2516
2610	if (object *old_container = container)	2517	object *old_container = container;
		2518
		2519	if (old_container)
2611	{	2520	{
2612	if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))	2521	if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
2613	return;	2522	return;
2614		2523
2615	#if 0	2524	#if 0
…		…
2617	if (object *closer = old_container->inv)	2526	if (object *closer = old_container->inv)
2618	if (closer->type == CLOSE_CON)	2527	if (closer->type == CLOSE_CON)
2619	closer->destroy ();	2528	closer->destroy ();
2620	#endif	2529	#endif
2621		2530
		2531	// make sure the container is available
		2532	esrv_send_item (this, old_container);
		2533
2622	old_container->flag [FLAG_APPLIED] = 0;	2534	old_container->flag [FLAG_APPLIED] = false;
2623	container = 0;	2535	container = 0;
2624		2536
		2537	// client needs item update to make it work, client bug requires this to be separate
2625	esrv_update_item (UPD_FLAGS, this, old_container);	2538	esrv_update_item (UPD_FLAGS, this, old_container);
		2539
2626	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));	2540	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
2627	play_sound (sound_find ("chest_close"));	2541	play_sound (sound_find ("chest_close"));
2628	}	2542	}
2629		2543
2630	if (new_container)	2544	if (new_container)
…		…
2643	}	2557	}
2644	#endif	2558	#endif
2645		2559
2646	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));	2560	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));
2647		2561
		2562	// make sure the container is available, client bug requires this to be separate
		2563	esrv_send_item (this, new_container);
		2564
2648	new_container->flag [FLAG_APPLIED] = 1;	2565	new_container->flag [FLAG_APPLIED] = true;
2649	container = new_container;	2566	container = new_container;
2650		2567
		2568	// client needs flag change
2651	esrv_update_item (UPD_FLAGS, this, new_container);	2569	esrv_update_item (UPD_FLAGS, this, new_container);
2652	esrv_send_inventory (this, new_container);	2570	esrv_send_inventory (this, new_container);
2653	play_sound (sound_find ("chest_open"));	2571	play_sound (sound_find ("chest_open"));
2654	}	2572	}
		2573	// else if (!old_container->env && contr && contr->ns)
		2574	// contr->ns->floorbox_reset ();
2655	}	2575	}
2656		2576
2657	object *	2577	object *
2658	object::force_find (const shstr name)	2578	object::force_find (const shstr name)
2659	{	2579	{

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.229 by root, Sat May 3 12:29:09 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.229 by root, Sat May 3 12:29:09 2008 UTC