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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.209 by root, Mon Apr 21 06:35:26 2008 UTC vs.
Revision 1.228 by root, Sat May 3 11:14:50 2008 UTC

…		…
24	#include <global.h>	24	#include <global.h>
25	#include <stdio.h>	25	#include <stdio.h>
26	#include <sys/types.h>	26	#include <sys/types.h>
27	#include <sys/uio.h>	27	#include <sys/uio.h>
28	#include <object.h>	28	#include <object.h>
29	#include <funcpoint.h>
30	#include <sproto.h>	29	#include <sproto.h>
31	#include <loader.h>	30	#include <loader.h>
32		31
33	#include <bitset>	32	#include <bitset>
34		33
…		…
140		139
141	/* 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. */
142	static bool	141	static bool
143	compare_ob_value_lists_one (const object wants, const object has)	142	compare_ob_value_lists_one (const object wants, const object has)
144	{	143	{
145	key_value *wants_field;
146
147	/* 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
148	* 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
149	* different structure or at least keep the lists sorted...	146	* different structure or at least keep the lists sorted...
150	*/	147	*/
151		148
152	/* For each field in wants, */	149	/* For each field in wants, */
153	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)
154	{	151	if (has->kv_get (kv->key) != kv->value)
155	key_value *has_field;	152	return false;
156
157	/* Look for a field in has with the same key. */
158	has_field = get_ob_key_link (has, wants_field->key);
159
160	if (!has_field)
161	return 0; /* No field with that name. */
162
163	/* Found the matching field. */
164	if (has_field->value != wants_field->value)
165	return 0; /* Values don't match, so this half of the comparison is false. */
166
167	/* If we get here, we found a match. Now for the next field in wants. */
168	}
169		153
170	/* 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. */
171	return 1;	155	return true;
172	}	156	}
173		157
174	/* Returns TRUE if ob1 has the same key_values as ob2. */	158	/* Returns TRUE if ob1 has the same key_values as ob2. */
175	static bool	159	static bool
176	compare_ob_value_lists (const object ob1, const object ob2)	160	compare_ob_value_lists (const object ob1, const object ob2)
177	{	161	{
178	/* 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,
179	* so we need to run the comparison twice. :(	163	* so we need to run the comparison twice. :(
180	*/	164	*/
181	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);
182	}	167	}
183		168
184	/* 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
185	* they can be merged together.	170	* they can be merged together.
186	*	171	*
…		…
331		316
332	/* Everything passes, must be OK. */	317	/* Everything passes, must be OK. */
333	return 1;	318	return 1;
334	}	319	}
335		320
		321	// find player who can see this object
		322	object *
		323	object::visible_to () const
		324	{
		325	if (client_visible () && !flag [FLAG_REMOVED])
		326	{
		327	// see if we are in a container of sorts
		328	if (env)
		329	{
		330	// the player inventory itself is always visible
		331	if (env->type == PLAYER)
		332	return env;
		333
		334	// else a player could have our env open
		335	object *envest = env->outer_env ();
		336
		337	// the player itself is always on a map, so we will find him here
		338	// even if our inv is in a player.
		339	if (envest->is_on_map ())
		340	if (object *pl = envest->ms ().player ())
		341	if (pl->container == env)
		342	return pl;
		343	}
		344	else
		345	{
		346	// maybe there is a player standing on the same mapspace
		347	// this will catch the case where "this" is a player
		348	if (object *pl = ms ().player ())
		349	if (!pl->container \|\| this == pl->container)
		350	return pl;
		351	}
		352	}
		353
		354	return 0;
		355	}
		356
336	// adjust weight per container type ("of holding")	357	// adjust weight per container type ("of holding")
337	static sint32	358	static sint32
338	weight_adjust (object *op, sint32 weight)	359	weight_adjust (object *op, sint32 weight)
339	{	360	{
340	return op->type == CONTAINER	361	return op->type == CONTAINER
…		…
351	{	372	{
352	while (op)	373	while (op)
353	{	374	{
354	weight = weight_adjust (op, weight);	375	weight = weight_adjust (op, weight);
355		376
		377	if (!weight)
		378	return;
		379
356	op->carrying += weight;	380	op->carrying += weight;
		381
		382	if (object *pl = op->visible_to ())
		383	if (pl != op) // player is handled lazily
		384	esrv_update_item (UPD_WEIGHT, pl, op);
		385
357	op = op->env;	386	op = op->env;
358	}	387	}
359	}	388	}
360		389
361	/*	390	/*
…		…
374	op->update_weight ();	403	op->update_weight ();
375		404
376	sum += op->total_weight ();	405	sum += op->total_weight ();
377	}	406	}
378		407
379	carrying = weight_adjust (this, sum);	408	sum = weight_adjust (this, sum);
		409
		410	if (sum != carrying)
		411	{
		412	carrying = sum;
		413
		414	if (object *pl = visible_to ())
		415	if (pl != this) // player is handled lazily
		416	esrv_update_item (UPD_WEIGHT, pl, this);
		417	}
380	}	418	}
381		419
382	/*	420	/*
383	* Used by: Server DM commands: dumpbelow, dump. Some error messages.	421	* Used by: Server DM commands: dumpbelow, dump. Some error messages.
384	*/	422	*/
…		…
551	}	589	}
552		590
553	op->key_values = 0;	591	op->key_values = 0;
554	}	592	}
555		593
556	object &	594	/*
557	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)
558	{	604	{
559	bool is_freed = flag [FLAG_FREED];	605	dst->remove ();
560	bool is_removed = flag [FLAG_REMOVED];
561
562	(object_copy )this = src;	606	(object_copy )dst = *this;
563
564	flag [FLAG_FREED] = is_freed;
565	flag [FLAG_REMOVED] = is_removed;	607	dst->flag [FLAG_REMOVED] = true;
566		608
567	/* Copy over key_values, if any. */	609	/* Copy over key_values, if any. */
568	if (src.key_values)	610	if (key_values)
569	{	611	{
570	key_value *tail = 0;	612	key_value *tail = 0;
571	key_values = 0;	613	dst->key_values = 0;
572		614
573	for (key_value *i = src.key_values; i; i = i->next)	615	for (key_value *i = key_values; i; i = i->next)
574	{	616	{
575	key_value *new_link = new key_value;	617	key_value *new_link = new key_value;
576		618
577	new_link->next = 0;	619	new_link->next = 0;
578	new_link->key = i->key;	620	new_link->key = i->key;
579	new_link->value = i->value;	621	new_link->value = i->value;
580		622
581	/* Try and be clever here, too. */	623	/* Try and be clever here, too. */
582	if (!key_values)	624	if (!dst->key_values)
583	{	625	{
584	key_values = new_link;	626	dst->key_values = new_link;
585	tail = new_link;	627	tail = new_link;
586	}	628	}
587	else	629	else
588	{	630	{
589	tail->next = new_link;	631	tail->next = new_link;
590	tail = new_link;	632	tail = new_link;
591	}	633	}
592	}	634	}
593	}	635	}
594	}
595
596	/*
597	* copy_to first frees everything allocated by the dst object,
598	* and then copies the contents of itself into the second
599	* object, allocating what needs to be allocated. Basically, any
600	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
601	* if the first object is freed, the pointers in the new object
602	* will point at garbage.
603	*/
604	void
605	object::copy_to (object *dst)
606	{
607	dst = this;
608		636
609	if (speed < 0)	637	if (speed < 0)
610	dst->speed_left -= rndm ();	638	dst->speed_left -= rndm ();
611		639
612	dst->set_speed (dst->speed);	640	dst->set_speed (dst->speed);
…		…
634	object *	662	object *
635	object::clone ()	663	object::clone ()
636	{	664	{
637	object *neu = create ();	665	object *neu = create ();
638	copy_to (neu);	666	copy_to (neu);
		667	neu->map = map; // not copied by copy_to
639	return neu;	668	return neu;
640	}	669	}
641		670
642	/*	671	/*
643	* 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
…		…
694	* UP_OBJ_FACE: only the objects face has changed.	723	* UP_OBJ_FACE: only the objects face has changed.
695	*/	724	*/
696	void	725	void
697	update_object (object *op, int action)	726	update_object (object *op, int action)
698	{	727	{
699	if (op == NULL)	728	if (!op)
700	{	729	{
701	/* this should never happen */	730	/* this should never happen */
702	LOG (llevDebug, "update_object() called for NULL object.\n");	731	LOG (llevError \| logBacktrace, "update_object() called for NULL object.\n");
703	return;	732	return;
704	}	733	}
705		734
706	if (op->env)	735	if (!op->is_on_map ())
707	{	736	{
708	/* Animation is currently handled by client, so nothing	737	/* Animation is currently handled by client, so nothing
709	* to do in this case.	738	* to do in this case.
710	*/	739	*/
711	return;	740	return;
712	}	741	}
713
714	/* If the map is saving, don't do anything as everything is
715	* going to get freed anyways.
716	*/
717	if (!op->map \|\| op->map->in_memory == MAP_SAVING)
718	return;
719		742
720	/* make sure the object is within map boundaries */	743	/* make sure the object is within map boundaries */
721	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)
722	{	745	{
723	LOG (llevError, "update_object() called for object out of map!\n");	746	LOG (llevError, "update_object() called for object out of map!\n");
…		…
866	object::destroy_inv (bool drop_to_ground)	889	object::destroy_inv (bool drop_to_ground)
867	{	890	{
868	// need to check first, because the checks below might segfault	891	// need to check first, because the checks below might segfault
869	// as we might be on an invalid mapspace and crossfire code	892	// as we might be on an invalid mapspace and crossfire code
870	// is too buggy to ensure that the inventory is empty.	893	// is too buggy to ensure that the inventory is empty.
871	// corollary: if you create arrows etc. with stuff in tis inventory,	894	// corollary: if you create arrows etc. with stuff in its inventory,
872	// cf will crash below with off-map x and y	895	// cf will crash below with off-map x and y
873	if (!inv)	896	if (!inv)
874	return;	897	return;
875		898
876	/* Only if the space blocks everything do we not process -	899	/* Only if the space blocks everything do we not process -
…		…
883	\|\| map->nodrop	906	\|\| map->nodrop
884	\|\| ms ().move_block == MOVE_ALL)	907	\|\| ms ().move_block == MOVE_ALL)
885	{	908	{
886	while (inv)	909	while (inv)
887	{	910	{
888	inv->destroy_inv (drop_to_ground);	911	inv->destroy_inv (false);
889	inv->destroy ();	912	inv->destroy ();
890	}	913	}
891	}	914	}
892	else	915	else
893	{ /* Put objects in inventory onto this space */	916	{ /* Put objects in inventory onto this space */
…		…
899	\|\| op->flag [FLAG_NO_DROP]	922	\|\| op->flag [FLAG_NO_DROP]
900	\|\| op->type == RUNE	923	\|\| op->type == RUNE
901	\|\| op->type == TRAP	924	\|\| op->type == TRAP
902	\|\| op->flag [FLAG_IS_A_TEMPLATE]	925	\|\| op->flag [FLAG_IS_A_TEMPLATE]
903	\|\| op->flag [FLAG_DESTROY_ON_DEATH])	926	\|\| op->flag [FLAG_DESTROY_ON_DEATH])
904	op->destroy ();	927	op->destroy (true);
905	else	928	else
906	map->insert (op, x, y);	929	map->insert (op, x, y);
907	}	930	}
908	}	931	}
909	}	932	}
…		…
913	object *op = new object;	936	object *op = new object;
914	op->link ();	937	op->link ();
915	return op;	938	return op;
916	}	939	}
917		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	} freed_map; // freed objects are moved here to avoid crashes
		955
918	void	956	void
919	object::do_destroy ()	957	object::do_destroy ()
920	{	958	{
921	attachable::do_destroy ();
922
923	if (flag [FLAG_IS_LINKED])	959	if (flag [FLAG_IS_LINKED])
924	remove_button_link (this);	960	remove_button_link (this);
925		961
926	if (flag [FLAG_FRIENDLY])	962	if (flag [FLAG_FRIENDLY])
927	remove_friendly_object (this);	963	remove_friendly_object (this);
928		964
929	if (!flag [FLAG_REMOVED])
930	remove ();	965	remove ();
931		966
932	destroy_inv (true);	967	attachable::do_destroy ();
933		968
934	deactivate ();	969	deactivate ();
935	unlink ();	970	unlink ();
936		971
937	flag [FLAG_FREED] = 1;	972	flag [FLAG_FREED] = 1;
938		973
939	// hack to ensure that freed objects still have a valid map	974	// hack to ensure that freed objects still have a valid map
940	{
941	static maptile *freed_map; // freed objects are moved here to avoid crashes
942
943	if (!freed_map)
944	{
945	freed_map = new maptile;
946
947	freed_map->path = "<freed objects map>";
948	freed_map->name = "/internal/freed_objects_map";
949	freed_map->width = 3;
950	freed_map->height = 3;
951	freed_map->nodrop = 1;
952
953	freed_map->alloc ();
954	freed_map->in_memory = MAP_ACTIVE;
955	}
956
957	map = freed_map;	975	map = &freed_map;
958	x = 1;	976	x = 1;
959	y = 1;	977	y = 1;
960	}
961		978
962	if (more)	979	if (more)
963	{	980	{
964	more->destroy ();	981	more->destroy ();
965	more = 0;	982	more = 0;
…		…
978	object::destroy (bool destroy_inventory)	995	object::destroy (bool destroy_inventory)
979	{	996	{
980	if (destroyed ())	997	if (destroyed ())
981	return;	998	return;
982		999
		1000	if (!is_head () && !head->destroyed ())
		1001	{
		1002	LOG (llevError \| logBacktrace, "tried to destroy the tail of an object");
		1003	head->destroy (destroy_inventory);
		1004	return;
		1005	}
		1006
983	if (destroy_inventory)	1007	destroy_inv (!destroy_inventory);
984	destroy_inv (false);
985		1008
986	if (is_head ())	1009	if (is_head ())
987	if (sound_destroy)	1010	if (sound_destroy)
988	play_sound (sound_destroy);	1011	play_sound (sound_destroy);
989	else if (flag [FLAG_MONSTER])	1012	else if (flag [FLAG_MONSTER])
…		…
1003	object::do_remove ()	1026	object::do_remove ()
1004	{	1027	{
1005	object tmp, last = 0;	1028	object tmp, last = 0;
1006	object *otmp;	1029	object *otmp;
1007		1030
1008	if (QUERY_FLAG (this, FLAG_REMOVED))	1031	if (flag [FLAG_REMOVED])
1009	return;	1032	return;
1010		1033
1011	SET_FLAG (this, FLAG_REMOVED);
1012	INVOKE_OBJECT (REMOVE, this);	1034	INVOKE_OBJECT (REMOVE, this);
		1035
		1036	flag [FLAG_REMOVED] = true;
1013		1037
1014	if (more)	1038	if (more)
1015	more->remove ();	1039	more->remove ();
1016		1040
1017	/*	1041	/*
1018	* In this case, the object to be removed is in someones	1042	* In this case, the object to be removed is in someones
1019	* inventory.	1043	* inventory.
1020	*/	1044	*/
1021	if (env)	1045	if (env)
1022	{	1046	{
		1047	flag [FLAG_REMOVED] = false; // hack around the issue of visible_to checking flag_removed
		1048	if (object *pl = visible_to ())
		1049	esrv_del_item (pl->contr, count);
		1050	flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed
		1051
1023	adjust_weight (env, -total_weight ());	1052	adjust_weight (env, -total_weight ());
1024		1053
1025	*(above ? &above->below : &env->inv) = below;	1054	*(above ? &above->below : &env->inv) = below;
1026		1055
1027	if (below)	1056	if (below)
…		…
1045	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1074	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1046	otmp->update_stats ();	1075	otmp->update_stats ();
1047	}	1076	}
1048	else if (map)	1077	else if (map)
1049	{	1078	{
1050	if (type == PLAYER)
1051	{
1052	// leaving a spot always closes any open container on the ground
1053	if (container && !container->env)
1054	// this causes spurious floorbox updates, but it ensures
1055	// that the CLOSE event is being sent.
1056	close_container ();
1057
1058	--map->players;
1059	map->touch ();
1060	}
1061
1062	map->dirty = true;	1079	map->dirty = true;
1063	mapspace &ms = this->ms ();	1080	mapspace &ms = this->ms ();
		1081
		1082	if (object *pl = ms.player ())
		1083	{
		1084	if (type == PLAYER) // this == pl(!)
		1085	{
		1086	// leaving a spot always closes any open container on the ground
		1087	if (container && !container->env)
		1088	// this causes spurious floorbox updates, but it ensures
		1089	// that the CLOSE event is being sent.
		1090	close_container ();
		1091
		1092	--map->players;
		1093	map->touch ();
		1094	}
		1095	else if (pl->container == this)
		1096	{
		1097	// removing a container should close it
		1098	close_container ();
		1099	}
		1100
		1101	esrv_del_item (pl->contr, count);
		1102	}
1064		1103
1065	/* link the object above us */	1104	/* link the object above us */
1066	if (above)	1105	if (above)
1067	above->below = below;	1106	above->below = below;
1068	else	1107	else
…		…
1098	* removed (most likely destroyed), update the player view	1137	* removed (most likely destroyed), update the player view
1099	* appropriately.	1138	* appropriately.
1100	*/	1139	*/
1101	pl->close_container ();	1140	pl->close_container ();
1102		1141
		1142	//TODO: the floorbox prev/next might need updating
		1143	//esrv_del_item (pl->contr, count);
		1144	//TODO: update floorbox to preserve ordering
		1145	if (pl->contr->ns)
1103	pl->contr->ns->floorbox_update ();	1146	pl->contr->ns->floorbox_update ();
1104	}	1147	}
1105		1148
1106	for (tmp = ms.bot; tmp; tmp = tmp->above)	1149	for (tmp = ms.bot; tmp; tmp = tmp->above)
1107	{	1150	{
1108	/* No point updating the players look faces if he is the object	1151	/* No point updating the players look faces if he is the object
…		…
1152	if (!top)	1195	if (!top)
1153	for (top = op; top && top->above; top = top->above)	1196	for (top = op; top && top->above; top = top->above)
1154	;	1197	;
1155		1198
1156	for (; top; top = top->below)	1199	for (; top; top = top->below)
1157	{
1158	if (top == op)
1159	continue;
1160
1161	if (object::can_merge (op, top))	1200	if (object::can_merge (op, top))
1162	{	1201	{
1163	top->nrof += op->nrof;	1202	top->nrof += op->nrof;
1164		1203
1165	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/	1204	if (object *pl = top->visible_to ())
1166	op->weight = 0; /* Don't want any adjustements now */	1205	esrv_update_item (UPD_NROF, pl, top);
		1206
		1207	op->weight = 0; // cancel the addition above
		1208	op->carrying = 0; // must be 0 already
		1209
1167	op->destroy ();	1210	op->destroy (1);
		1211
1168	return top;	1212	return top;
1169	}	1213	}
1170	}
1171		1214
1172	return 0;	1215	return 0;
1173	}	1216	}
1174		1217
1175	void	1218	void
…		…
1234	object *	1277	object *
1235	insert_ob_in_map (object op, maptile m, object *originator, int flag)	1278	insert_ob_in_map (object op, maptile m, object *originator, int flag)
1236	{	1279	{
1237	assert (!op->flag [FLAG_FREED]);	1280	assert (!op->flag [FLAG_FREED]);
1238		1281
1239	object top, floor = NULL;
1240
1241	op->remove ();	1282	op->remove ();
1242		1283
1243	/* Ideally, the caller figures this out. However, it complicates a lot	1284	/* Ideally, the caller figures this out. However, it complicates a lot
1244	* of areas of callers (eg, anything that uses find_free_spot would now	1285	* of areas of callers (eg, anything that uses find_free_spot would now
1245	* need extra work	1286	* need extra work
1246	*/	1287	*/
1247	if (!xy_normalise (m, op->x, op->y))	1288	if (!xy_normalise (m, op->x, op->y))
1248	{	1289	{
1249	op->destroy ();	1290	op->destroy (1);
1250	return 0;	1291	return 0;
1251	}	1292	}
1252		1293
1253	if (object *more = op->more)	1294	if (object *more = op->more)
1254	if (!insert_ob_in_map (more, m, originator, flag))	1295	if (!insert_ob_in_map (more, m, originator, flag))
…		…
1263	*/	1304	*/
1264	if (op->nrof && !(flag & INS_NO_MERGE))	1305	if (op->nrof && !(flag & INS_NO_MERGE))
1265	for (object *tmp = ms.bot; tmp; tmp = tmp->above)	1306	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1266	if (object::can_merge (op, tmp))	1307	if (object::can_merge (op, tmp))
1267	{	1308	{
		1309	// TODO: we atcually want to update tmp, not op,
		1310	// but some caller surely breaks when we return tmp
		1311	// from here :/
1268	op->nrof += tmp->nrof;	1312	op->nrof += tmp->nrof;
1269	tmp->destroy (1);	1313	tmp->destroy (1);
1270	}	1314	}
1271		1315
1272	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1316	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
…		…
1294	/* since below originator, no need to update top */	1338	/* since below originator, no need to update top */
1295	originator->below = op;	1339	originator->below = op;
1296	}	1340	}
1297	else	1341	else
1298	{	1342	{
		1343	object top, floor = NULL;
		1344
1299	top = ms.bot;	1345	top = ms.bot;
1300		1346
1301	/* If there are other objects, then */	1347	/* If there are other objects, then */
1302	if (top)	1348	if (top)
1303	{	1349	{
…		…
1402	}	1448	}
1403		1449
1404	op->map->dirty = true;	1450	op->map->dirty = true;
1405		1451
1406	if (object *pl = ms.player ())	1452	if (object *pl = ms.player ())
		1453	//TODO: the floorbox prev/next might need updating
		1454	//esrv_send_item (pl, op);
		1455	//TODO: update floorbox to preserve ordering
		1456	if (pl->contr->ns)
1407	pl->contr->ns->floorbox_update ();	1457	pl->contr->ns->floorbox_update ();
1408		1458
1409	/* If this object glows, it may affect lighting conditions that are	1459	/* If this object glows, it may affect lighting conditions that are
1410	* visible to others on this map. But update_all_los is really	1460	* visible to others on this map. But update_all_los is really
1411	* an inefficient way to do this, as it means los for all players	1461	* an inefficient way to do this, as it means los for all players
1412	* on the map will get recalculated. The players could very well	1462	* on the map will get recalculated. The players could very well
…		…
1477	return where->env->insert (this);	1527	return where->env->insert (this);
1478	else	1528	else
1479	return where->map->insert (this, where->x, where->y, originator, flags);	1529	return where->map->insert (this, where->x, where->y, originator, flags);
1480	}	1530	}
1481		1531
1482	// find player who can see this object
1483	static object *
1484	visible_to (object *op)
1485	{
1486	if (!op->flag [FLAG_REMOVED])
1487	{
1488	// see if we are in a container of sorts
1489	if (object *env = op->env)
1490	{
1491	// the player inventory itself is always visible
1492	if (env->type == PLAYER)
1493	return env;
1494
1495	// else a player could have our env open
1496	env = env->outer_env ();
1497
1498	// the player itself is always on a map, so we will find him here
1499	// even if our inv is in a player.
1500	if (env->is_on_map ())
1501	if (object *pl = env->ms ().player ())
1502	if (pl->container == op->env)
1503	return pl;
1504	}
1505	else
1506	{
1507	// maybe there is a player standing on the same mapspace
1508	if (object *pl = env->ms ().player ())
1509	return pl;
1510	}
1511	}
1512
1513	return 0;
1514	}
1515
1516	/*	1532	/*
1517	* decrease(object, number) decreases a specified number from	1533	* decrease(object, number) decreases a specified number from
1518	* the amount of an object. If the amount reaches 0, the object	1534	* the amount of an object. If the amount reaches 0, the object
1519	* is subsequently removed and freed.	1535	* is subsequently removed and freed.
1520	*	1536	*
1521	* Return value: 'op' if something is left, NULL if the amount reached 0	1537	* Return value: 'op' if something is left, NULL if the amount reached 0
1522	*/	1538	*/
1523	bool	1539	bool
1524	object::decrease (sint32 nr)	1540	object::decrease (sint32 nr)
1525	{	1541	{
		1542	if (!nr)
		1543	return true;
		1544
1526	nr = min (nr, nrof);	1545	nr = min (nr, nrof);
1527		1546
1528	if (!nr)
1529	return 1;
1530
1531	nrof -= nr;	1547	nrof -= nr;
1532		1548
1533	object *visible = visible_to (this);
1534
1535	if (nrof)	1549	if (nrof)
1536	{	1550	{
1537	adjust_weight (env, -weight * nr); // carrying == 0	1551	adjust_weight (env, -weight * nr); // carrying == 0
1538		1552
1539	if (visible)	1553	if (object *pl = visible_to ())
1540	esrv_send_item (visible, this);	1554	esrv_update_item (UPD_NROF, pl, this);
1541		1555
1542	return 1;	1556	return true;
1543	}	1557	}
1544	else	1558	else
1545	{	1559	{
1546	if (visible)
1547	esrv_del_item (visible->contr, count);
1548
1549	this->destroy (1);	1560	destroy (1);
1550	return 0;	1561	return false;
1551	}	1562	}
1552	}	1563	}
1553		1564
1554	/*	1565	/*
1555	* get_split_ob(ob,nr) splits up ob into two parts. The part which	1566	* split(ob,nr) splits up ob into two parts. The part which
1556	* is returned contains nr objects, and the remaining parts contains	1567	* is returned contains nr objects, and the remaining parts contains
1557	* the rest (or is removed and freed if that number is 0).	1568	* the rest (or is removed and returned if that number is 0).
1558	* On failure, NULL is returned, and the reason put into the	1569	* On failure, NULL is returned.
1559	* global static errmsg array.
1560	*/	1570	*/
1561	object *	1571	object *
1562	object::split (sint32 nr)	1572	object::split (sint32 nr)
1563	{	1573	{
		1574	int have = number_of ();
		1575
1564	if (nrof < nr)	1576	if (have < nr)
1565	return 0;	1577	return 0;
1566	else if (nrof == nr)	1578	else if (have == nr)
1567	{	1579	{
1568	remove ();	1580	remove ();
1569	return this;	1581	return this;
1570	}	1582	}
1571	else	1583	else
…		…
1574		1586
1575	object *op = object_create_clone (this);	1587	object *op = object_create_clone (this);
1576	op->nrof = nr;	1588	op->nrof = nr;
1577	return op;	1589	return op;
1578	}	1590	}
1579	}
1580
1581	//TODO: remove, but semantics differs from split_nr
1582	object *
1583	get_split_ob (object *orig_ob, uint32 nr)
1584	{
1585	if (orig_ob->nrof < nr)
1586	{
1587	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1588	return 0;
1589	}
1590
1591	return orig_ob->split (nr);
1592	}	1591	}
1593		1592
1594	object *	1593	object *
1595	insert_ob_in_ob (object op, object where)	1594	insert_ob_in_ob (object op, object where)
1596	{	1595	{
…		…
1637	if (object::can_merge (tmp, op))	1636	if (object::can_merge (tmp, op))
1638	{	1637	{
1639	/* return the original object and remove inserted object	1638	/* return the original object and remove inserted object
1640	(client needs the original object) */	1639	(client needs the original object) */
1641	tmp->nrof += op->nrof;	1640	tmp->nrof += op->nrof;
		1641
		1642	if (object *pl = tmp->visible_to ())
		1643	esrv_update_item (UPD_NROF, pl, tmp);
		1644
		1645	adjust_weight (this, op->total_weight ());
		1646
1642	op->destroy (1);	1647	op->destroy (1);
1643	op = tmp;	1648	op = tmp;
1644	goto inserted;	1649	goto inserted;
1645	}	1650	}
1646		1651
…		…
1658		1663
1659	inv = op;	1664	inv = op;
1660		1665
1661	op->flag [FLAG_REMOVED] = 0;	1666	op->flag [FLAG_REMOVED] = 0;
1662		1667
		1668	if (object *pl = op->visible_to ())
		1669	esrv_send_item (pl, op);
		1670
1663	adjust_weight (this, op->total_weight ());	1671	adjust_weight (this, op->total_weight ());
1664		1672
1665	inserted:	1673	inserted:
1666	/* reset the light list and los of the players on the map */	1674	/* reset the light list and los of the players on the map */
1667	if (op->glow_radius && map && map->darkness)	1675	if (op->glow_radius && map && map->darkness)
1668	update_all_los (map, x, y);	1676	update_all_los (map, x, y);
1669		1677
1670	if (object *otmp = in_player ())	1678	// if this is a player's inventory, update stats
1671	if (otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1679	if (type == PLAYER && !flag [FLAG_NO_FIX_PLAYER])
1672	otmp->update_stats ();	1680	update_stats ();
1673		1681
1674	INVOKE_OBJECT (INSERT, this);	1682	INVOKE_OBJECT (INSERT, this);
1675		1683
1676	return op;	1684	return op;
1677	}	1685	}
…		…
2301	* create clone from object to another	2309	* create clone from object to another
2302	*/	2310	*/
2303	object *	2311	object *
2304	object_create_clone (object *asrc)	2312	object_create_clone (object *asrc)
2305	{	2313	{
2306	object dst = 0, tmp, src, prev, *item;	2314	object *dst = 0;
2307		2315
2308	if (!asrc)	2316	if (!asrc)
2309	return 0;	2317	return 0;
2310		2318
2311	src = asrc->head_ ();	2319	object *src = asrc->head_ ();
2312		2320
2313	prev = 0;	2321	object *prev = 0;
2314	for (object *part = src; part; part = part->more)	2322	for (object *part = src; part; part = part->more)
2315	{	2323	{
2316	tmp = part->clone ();	2324	object *tmp = part->clone ();
		2325
2317	tmp->x -= src->x;	2326	tmp->x -= src->x;
2318	tmp->y -= src->y;	2327	tmp->y -= src->y;
2319		2328
2320	if (!part->head)	2329	if (!part->head)
2321	{	2330	{
…		…
2331	prev->more = tmp;	2340	prev->more = tmp;
2332		2341
2333	prev = tmp;	2342	prev = tmp;
2334	}	2343	}
2335		2344
2336	for (item = src->inv; item; item = item->below)	2345	for (object *item = src->inv; item; item = item->below)
2337	insert_ob_in_ob (object_create_clone (item), dst);	2346	insert_ob_in_ob (object_create_clone (item), dst);
2338		2347
2339	return dst;	2348	return dst;
2340	}	2349	}
2341		2350
…		…
2351	return tmp;	2360	return tmp;
2352		2361
2353	return 0;	2362	return 0;
2354	}	2363	}
2355		2364
2356	/* If ob has a field named key, return the link from the list,	2365	const shstr &
2357	* otherwise return NULL.	2366	object::kv_get (const shstr &key) const
2358	*
2359	* key must be a passed in shared string - otherwise, this won't
2360	* do the desired thing.
2361	*/
2362	key_value *
2363	get_ob_key_link (const object ob, const char key)
2364	{	2367	{
2365	for (key_value *link = ob->key_values; link; link = link->next)	2368	for (key_value *kv = key_values; kv; kv = kv->next)
2366	if (link->key == key)	2369	if (kv->key == key)
2367	return link;
2368
2369	return 0;
2370	}
2371
2372	/*
2373	* Returns the value of op has an extra_field for key, or NULL.
2374	*
2375	* The argument doesn't need to be a shared string.
2376	*
2377	* The returned string is shared.
2378	*/
2379	const char *
2380	get_ob_key_value (const object op, const char const key)
2381	{
2382	key_value *link;
2383	shstr_cmp canonical_key (key);
2384
2385	if (!canonical_key)
2386	{
2387	/* 1. There being a field named key on any object
2388	* implies there'd be a shared string to find.
2389	* 2. Since there isn't, no object has this field.
2390	* 3. Therefore, this object doesn't have this field.
2391	*/
2392	return 0;
2393	}
2394
2395	/* This is copied from get_ob_key_link() above -
2396	* only 4 lines, and saves the function call overhead.
2397	*/
2398	for (link = op->key_values; link; link = link->next)
2399	if (link->key == canonical_key)
2400	return link->value;	2370	return kv->value;
2401		2371
2402	return 0;	2372	return shstr_null;
2403	}	2373	}
2404		2374
2405	/*	2375	void
2406	* Updates the canonical_key in op to value.	2376	object::kv_set (const shstr &key, const shstr &value)
2407	*
2408	* canonical_key is a shared string (value doesn't have to be).
2409	*
2410	* Unless add_key is TRUE, it won't add fields, only change the value of existing
2411	* keys.
2412	*
2413	* Returns TRUE on success.
2414	*/
2415	int
2416	set_ob_key_value_s (object op, const shstr & canonical_key, const char value, int add_key)
2417	{	2377	{
2418	key_value field = NULL, last = NULL;	2378	for (key_value *kv = key_values; kv; kv = kv->next)
2419		2379	if (kv->key == key)
2420	for (field = op->key_values; field != NULL; field = field->next)
2421	{
2422	if (field->key != canonical_key)
2423	{	2380	{
2424	last = field;	2381	kv->value = value;
2425	continue;	2382	return;
2426	}	2383	}
2427		2384
2428	if (value)	2385	key_value *kv = new key_value;
2429	field->value = value;	2386
2430	else	2387	kv->next = key_values;
		2388	kv->key = key;
		2389	kv->value = value;
		2390
		2391	key_values = kv;
		2392	}
		2393
		2394	void
		2395	object::kv_del (const shstr &key)
		2396	{
		2397	for (key_value *kvp = &key_values; kvp; kvp = &(*kvp)->next)
		2398	if ((*kvp)->key == key)
2431	{	2399	{
2432	/* Basically, if the archetype has this key set,	2400	key_value kv = kvp;
2433	* we need to store the null value so when we save	2401	kvp = (kvp)->next;
2434	* it, we save the empty value so that when we load,	2402	delete kv;
2435	* we get this value back again.	2403	return;
2436	*/
2437	if (get_ob_key_link (op->arch, canonical_key))
2438	field->value = 0;
2439	else
2440	{
2441	if (last)
2442	last->next = field->next;
2443	else
2444	op->key_values = field->next;
2445
2446	delete field;
2447	}
2448	}	2404	}
2449	return TRUE;
2450	}
2451	/* IF we get here, key doesn't exist */
2452
2453	/* No field, we'll have to add it. */
2454
2455	if (!add_key)
2456	return FALSE;
2457
2458	/* There isn't any good reason to store a null
2459	* value in the key/value list. If the archetype has
2460	* this key, then we should also have it, so shouldn't
2461	* be here. If user wants to store empty strings,
2462	* should pass in ""
2463	*/
2464	if (value == NULL)
2465	return TRUE;
2466
2467	field = new key_value;
2468
2469	field->key = canonical_key;
2470	field->value = value;
2471	/* Usual prepend-addition. */
2472	field->next = op->key_values;
2473	op->key_values = field;
2474
2475	return TRUE;
2476	}
2477
2478	/*
2479	* Updates the key in op to value.
2480	*
2481	* If add_key is FALSE, this will only update existing keys,
2482	* and not add new ones.
2483	* In general, should be little reason FALSE is ever passed in for add_key
2484	*
2485	* Returns TRUE on success.
2486	*/
2487	int
2488	set_ob_key_value (object op, const char key, const char *value, int add_key)
2489	{
2490	shstr key_ (key);
2491
2492	return set_ob_key_value_s (op, key_, value, add_key);
2493	}	2405	}
2494		2406
2495	object::depth_iterator::depth_iterator (object *container)	2407	object::depth_iterator::depth_iterator (object *container)
2496	: iterator_base (container)	2408	: iterator_base (container)
2497	{	2409	{
…		…
2555	&name,	2467	&name,
2556	title ? "\",title:\"" : "",	2468	title ? "\",title:\"" : "",
2557	title ? (const char *)title : "",	2469	title ? (const char *)title : "",
2558	flag_desc (flagdesc, 512), type);	2470	flag_desc (flagdesc, 512), type);
2559		2471
2560	if (!this->flag[FLAG_REMOVED] && env)	2472	if (!flag[FLAG_REMOVED] && env)
2561	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2473	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2562		2474
2563	if (map)	2475	if (map)
2564	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);	2476	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2565		2477
…		…
2595	object::open_container (object *new_container)	2507	object::open_container (object *new_container)
2596	{	2508	{
2597	if (container == new_container)	2509	if (container == new_container)
2598	return;	2510	return;
2599		2511
2600	if (object *old_container = container)	2512	object *old_container = container;
		2513
		2514	if (old_container)
2601	{	2515	{
2602	if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))	2516	if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
2603	return;	2517	return;
2604		2518
2605	#if 0	2519	#if 0
…		…
2607	if (object *closer = old_container->inv)	2521	if (object *closer = old_container->inv)
2608	if (closer->type == CLOSE_CON)	2522	if (closer->type == CLOSE_CON)
2609	closer->destroy ();	2523	closer->destroy ();
2610	#endif	2524	#endif
2611		2525
		2526	// make sure the container is available
		2527	esrv_send_item (this, old_container);
		2528
2612	old_container->flag [FLAG_APPLIED] = 0;	2529	old_container->flag [FLAG_APPLIED] = false;
2613	container = 0;	2530	container = 0;
2614		2531
		2532	// client needs item update to make it work, client bug requires this to be separate
2615	esrv_update_item (UPD_FLAGS, this, old_container);	2533	esrv_update_item (UPD_FLAGS, this, old_container);
		2534
2616	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));	2535	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
2617	play_sound (sound_find ("chest_close"));	2536	play_sound (sound_find ("chest_close"));
2618	}	2537	}
2619		2538
2620	if (new_container)	2539	if (new_container)
…		…
2633	}	2552	}
2634	#endif	2553	#endif
2635		2554
2636	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));	2555	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));
2637		2556
		2557	// make sure the container is available, client bug requires this to be separate
		2558	esrv_send_item (this, new_container);
		2559
2638	new_container->flag [FLAG_APPLIED] = 1;	2560	new_container->flag [FLAG_APPLIED] = true;
2639	container = new_container;	2561	container = new_container;
2640		2562
		2563	// client needs flag change
2641	esrv_update_item (UPD_FLAGS, this, new_container);	2564	esrv_update_item (UPD_FLAGS, this, new_container);
2642	esrv_send_inventory (this, new_container);	2565	esrv_send_inventory (this, new_container);
2643	play_sound (sound_find ("chest_open"));	2566	play_sound (sound_find ("chest_open"));
2644	}	2567	}
		2568	// else if (!old_container->env && contr && contr->ns)
		2569	// contr->ns->floorbox_reset ();
2645	}	2570	}
2646		2571
2647	object *	2572	object *
2648	object::force_find (const shstr name)	2573	object::force_find (const shstr name)
2649	{	2574	{

Diff Legend

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

Comparing deliantra/server/common/object.C (file contents): Revision 1.209 by root, Mon Apr 21 06:35:26 2008 UTC vs. Revision 1.228 by root, Sat May 3 11:14:50 2008 UTC

Diff Legend

Comparing deliantra/server/common/object.C (file contents):
Revision 1.209 by root, Mon Apr 21 06:35:26 2008 UTC vs.
Revision 1.228 by root, Sat May 3 11:14:50 2008 UTC