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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.212 by root, Mon Apr 21 23:35:24 2008 UTC vs.
Revision 1.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	*
…		…
330		316
331	/* Everything passes, must be OK. */	317	/* Everything passes, must be OK. */
332	return 1;	318	return 1;
333	}	319	}
334		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
335	// adjust weight per container type ("of holding")	357	// adjust weight per container type ("of holding")
336	static sint32	358	static sint32
337	weight_adjust (object *op, sint32 weight)	359	weight_adjust_for (object *op, sint32 weight)
338	{	360	{
339	return op->type == CONTAINER	361	return op->type == CONTAINER
340	? lerp (weight, 0, 100, 0, 100 - op->stats.Str)	362	? lerp (weight, 0, 100, 0, 100 - op->stats.Str)
341	: weight;	363	: weight;
342	}	364	}
…		…
348	static void	370	static void
349	adjust_weight (object *op, sint32 weight)	371	adjust_weight (object *op, sint32 weight)
350	{	372	{
351	while (op)	373	while (op)
352	{	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
353	weight = weight_adjust (op, weight);	377	weight = weight_adjust_for (op, op->carrying)
		378	- weight_adjust_for (op, op->carrying - weight);
354		379
355	if (!weight)	380	if (!weight)
356	return;	381	return;
357		382
358	op->carrying += weight;	383	op->carrying += weight;
359		384
360	if (object *pl = op->visible_to ())	385	if (object *pl = op->visible_to ())
		386	if (pl != op) // player is handled lazily
361	esrv_update_item (UPD_WEIGHT, pl, op);	387	esrv_update_item (UPD_WEIGHT, pl, op);
362		388
363	op = op->env;	389	op = op->env;
364	}	390	}
365	}	391	}
366		392
…		…
380	op->update_weight ();	406	op->update_weight ();
381		407
382	sum += op->total_weight ();	408	sum += op->total_weight ();
383	}	409	}
384		410
385	sum = weight_adjust (this, sum);	411	sum = weight_adjust_for (this, sum);
386		412
387	if (sum != carrying)	413	if (sum != carrying)
388	{	414	{
389	carrying = sum;	415	carrying = sum;
390		416
391	if (object *pl = visible_to ())	417	if (object *pl = visible_to ())
		418	if (pl != this) // player is handled lazily
392	esrv_update_item (UPD_WEIGHT, pl, this);	419	esrv_update_item (UPD_WEIGHT, pl, this);
393	}	420	}
394	}	421	}
395		422
396	/*	423	/*
397	* Used by: Server DM commands: dumpbelow, dump. Some error messages.	424	* Used by: Server DM commands: dumpbelow, dump. Some error messages.
…		…
565	}	592	}
566		593
567	op->key_values = 0;	594	op->key_values = 0;
568	}	595	}
569		596
570	object &	597	/*
571	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)
572	{	607	{
573	bool is_freed = flag [FLAG_FREED];	608	dst->remove ();
574	bool is_removed = flag [FLAG_REMOVED];
575
576	(object_copy )this = src;	609	(object_copy )dst = *this;
577
578	flag [FLAG_FREED] = is_freed;
579	flag [FLAG_REMOVED] = is_removed;	610	dst->flag [FLAG_REMOVED] = true;
580		611
581	/* Copy over key_values, if any. */	612	/* Copy over key_values, if any. */
582	if (src.key_values)	613	if (key_values)
583	{	614	{
584	key_value *tail = 0;	615	key_value *tail = 0;
585	key_values = 0;	616	dst->key_values = 0;
586		617
587	for (key_value *i = src.key_values; i; i = i->next)	618	for (key_value *i = key_values; i; i = i->next)
588	{	619	{
589	key_value *new_link = new key_value;	620	key_value *new_link = new key_value;
590		621
591	new_link->next = 0;	622	new_link->next = 0;
592	new_link->key = i->key;	623	new_link->key = i->key;
593	new_link->value = i->value;	624	new_link->value = i->value;
594		625
595	/* Try and be clever here, too. */	626	/* Try and be clever here, too. */
596	if (!key_values)	627	if (!dst->key_values)
597	{	628	{
598	key_values = new_link;	629	dst->key_values = new_link;
599	tail = new_link;	630	tail = new_link;
600	}	631	}
601	else	632	else
602	{	633	{
603	tail->next = new_link;	634	tail->next = new_link;
604	tail = new_link;	635	tail = new_link;
605	}	636	}
606	}	637	}
607	}	638	}
608	}
609
610	/*
611	* copy_to first frees everything allocated by the dst object,
612	* and then copies the contents of itself into the second
613	* object, allocating what needs to be allocated. Basically, any
614	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
615	* if the first object is freed, the pointers in the new object
616	* will point at garbage.
617	*/
618	void
619	object::copy_to (object *dst)
620	{
621	dst = this;
622		639
623	if (speed < 0)	640	if (speed < 0)
624	dst->speed_left -= rndm ();	641	dst->speed_left -= rndm ();
625		642
626	dst->set_speed (dst->speed);	643	dst->set_speed (dst->speed);
…		…
648	object *	665	object *
649	object::clone ()	666	object::clone ()
650	{	667	{
651	object *neu = create ();	668	object *neu = create ();
652	copy_to (neu);	669	copy_to (neu);
		670	neu->map = map; // not copied by copy_to
653	return neu;	671	return neu;
654	}	672	}
655		673
656	/*	674	/*
657	* 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
…		…
708	* UP_OBJ_FACE: only the objects face has changed.	726	* UP_OBJ_FACE: only the objects face has changed.
709	*/	727	*/
710	void	728	void
711	update_object (object *op, int action)	729	update_object (object *op, int action)
712	{	730	{
713	if (op == NULL)	731	if (!op)
714	{	732	{
715	/* this should never happen */	733	/* this should never happen */
716	LOG (llevDebug, "update_object() called for NULL object.\n");	734	LOG (llevError \| logBacktrace, "update_object() called for NULL object.\n");
717	return;	735	return;
718	}	736	}
719		737
720	if (op->env)	738	if (!op->is_on_map ())
721	{	739	{
722	/* Animation is currently handled by client, so nothing	740	/* Animation is currently handled by client, so nothing
723	* to do in this case.	741	* to do in this case.
724	*/	742	*/
725	return;	743	return;
726	}	744	}
727
728	/* If the map is saving, don't do anything as everything is
729	* going to get freed anyways.
730	*/
731	if (!op->map \|\| op->map->in_memory == MAP_SAVING)
732	return;
733		745
734	/* make sure the object is within map boundaries */	746	/* make sure the object is within map boundaries */
735	if (op->x < 0 \|\| op->x >= op->map->width \|\| op->y < 0 \|\| op->y >= op->map->height)	747	if (op->x < 0 \|\| op->x >= op->map->width \|\| op->y < 0 \|\| op->y >= op->map->height)
736	{	748	{
737	LOG (llevError, "update_object() called for object out of map!\n");	749	LOG (llevError, "update_object() called for object out of map!\n");
…		…
880	object::destroy_inv (bool drop_to_ground)	892	object::destroy_inv (bool drop_to_ground)
881	{	893	{
882	// need to check first, because the checks below might segfault	894	// need to check first, because the checks below might segfault
883	// as we might be on an invalid mapspace and crossfire code	895	// as we might be on an invalid mapspace and crossfire code
884	// is too buggy to ensure that the inventory is empty.	896	// is too buggy to ensure that the inventory is empty.
885	// corollary: if you create arrows etc. with stuff in tis inventory,	897	// corollary: if you create arrows etc. with stuff in its inventory,
886	// cf will crash below with off-map x and y	898	// cf will crash below with off-map x and y
887	if (!inv)	899	if (!inv)
888	return;	900	return;
889		901
890	/* Only if the space blocks everything do we not process -	902	/* Only if the space blocks everything do we not process -
…		…
897	\|\| map->nodrop	909	\|\| map->nodrop
898	\|\| ms ().move_block == MOVE_ALL)	910	\|\| ms ().move_block == MOVE_ALL)
899	{	911	{
900	while (inv)	912	while (inv)
901	{	913	{
902	inv->destroy_inv (drop_to_ground);	914	inv->destroy_inv (false);
903	inv->destroy ();	915	inv->destroy ();
904	}	916	}
905	}	917	}
906	else	918	else
907	{ /* Put objects in inventory onto this space */	919	{ /* Put objects in inventory onto this space */
…		…
913	\|\| op->flag [FLAG_NO_DROP]	925	\|\| op->flag [FLAG_NO_DROP]
914	\|\| op->type == RUNE	926	\|\| op->type == RUNE
915	\|\| op->type == TRAP	927	\|\| op->type == TRAP
916	\|\| op->flag [FLAG_IS_A_TEMPLATE]	928	\|\| op->flag [FLAG_IS_A_TEMPLATE]
917	\|\| op->flag [FLAG_DESTROY_ON_DEATH])	929	\|\| op->flag [FLAG_DESTROY_ON_DEATH])
918	op->destroy ();	930	op->destroy (true);
919	else	931	else
920	map->insert (op, x, y);	932	map->insert (op, x, y);
921	}	933	}
922	}	934	}
923	}	935	}
…		…
927	object *op = new object;	939	object *op = new object;
928	op->link ();	940	op->link ();
929	return op;	941	return op;
930	}	942	}
931		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
932	void	964	void
933	object::do_destroy ()	965	object::do_destroy ()
934	{	966	{
935	if (object *pl = visible_to ())
936	esrv_del_item (pl->contr, count);
937
938	attachable::do_destroy ();
939
940	if (flag [FLAG_IS_LINKED])	967	if (flag [FLAG_IS_LINKED])
941	remove_button_link (this);	968	remove_button_link (this);
942		969
943	if (flag [FLAG_FRIENDLY])	970	if (flag [FLAG_FRIENDLY])
944	remove_friendly_object (this);	971	remove_friendly_object (this);
945		972
946	if (!flag [FLAG_REMOVED])
947	remove ();	973	remove ();
948		974
949	destroy_inv (true);	975	attachable::do_destroy ();
950		976
951	deactivate ();	977	deactivate ();
952	unlink ();	978	unlink ();
953		979
954	flag [FLAG_FREED] = 1;	980	flag [FLAG_FREED] = 1;
955		981
956	// hack to ensure that freed objects still have a valid map	982	// hack to ensure that freed objects still have a valid map
957	{
958	static maptile *freed_map; // freed objects are moved here to avoid crashes
959
960	if (!freed_map)
961	{
962	freed_map = new maptile;
963
964	freed_map->path = "<freed objects map>";
965	freed_map->name = "/internal/freed_objects_map";
966	freed_map->width = 3;
967	freed_map->height = 3;
968	freed_map->nodrop = 1;
969
970	freed_map->alloc ();
971	freed_map->in_memory = MAP_ACTIVE;
972	}
973
974	map = freed_map;	983	map = &freed_map;
975	x = 1;	984	x = 1;
976	y = 1;	985	y = 1;
977	}
978		986
979	if (more)	987	if (more)
980	{	988	{
981	more->destroy ();	989	more->destroy ();
982	more = 0;	990	more = 0;
…		…
995	object::destroy (bool destroy_inventory)	1003	object::destroy (bool destroy_inventory)
996	{	1004	{
997	if (destroyed ())	1005	if (destroyed ())
998	return;	1006	return;
999		1007
		1008	if (!is_head () && !head->destroyed ())
		1009	{
		1010	LOG (llevError \| logBacktrace, "tried to destroy the tail of an object");
		1011	head->destroy (destroy_inventory);
		1012	return;
		1013	}
		1014
1000	if (destroy_inventory)	1015	destroy_inv (!destroy_inventory);
1001	destroy_inv (false);
1002		1016
1003	if (is_head ())	1017	if (is_head ())
1004	if (sound_destroy)	1018	if (sound_destroy)
1005	play_sound (sound_destroy);	1019	play_sound (sound_destroy);
1006	else if (flag [FLAG_MONSTER])	1020	else if (flag [FLAG_MONSTER])
…		…
1020	object::do_remove ()	1034	object::do_remove ()
1021	{	1035	{
1022	object tmp, last = 0;	1036	object tmp, last = 0;
1023	object *otmp;	1037	object *otmp;
1024		1038
1025	if (QUERY_FLAG (this, FLAG_REMOVED))	1039	if (flag [FLAG_REMOVED])
1026	return;	1040	return;
1027		1041
1028	SET_FLAG (this, FLAG_REMOVED);
1029	INVOKE_OBJECT (REMOVE, this);	1042	INVOKE_OBJECT (REMOVE, this);
		1043
		1044	flag [FLAG_REMOVED] = true;
1030		1045
1031	if (more)	1046	if (more)
1032	more->remove ();	1047	more->remove ();
1033		1048
1034	/*	1049	/*
1035	* In this case, the object to be removed is in someones	1050	* In this case, the object to be removed is in someones
1036	* inventory.	1051	* inventory.
1037	*/	1052	*/
1038	if (env)	1053	if (env)
1039	{	1054	{
		1055	flag [FLAG_REMOVED] = false; // hack around the issue of visible_to checking flag_removed
		1056	if (object *pl = visible_to ())
		1057	esrv_del_item (pl->contr, count);
		1058	flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed
		1059
1040	adjust_weight (env, -total_weight ());	1060	adjust_weight (env, -total_weight ());
1041		1061
1042	*(above ? &above->below : &env->inv) = below;	1062	*(above ? &above->below : &env->inv) = below;
1043		1063
1044	if (below)	1064	if (below)
…		…
1062	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1082	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1063	otmp->update_stats ();	1083	otmp->update_stats ();
1064	}	1084	}
1065	else if (map)	1085	else if (map)
1066	{	1086	{
1067	if (type == PLAYER)
1068	{
1069	// leaving a spot always closes any open container on the ground
1070	if (container && !container->env)
1071	// this causes spurious floorbox updates, but it ensures
1072	// that the CLOSE event is being sent.
1073	close_container ();
1074
1075	--map->players;
1076	map->touch ();
1077	}
1078
1079	map->dirty = true;	1087	map->dirty = true;
1080	mapspace &ms = this->ms ();	1088	mapspace &ms = this->ms ();
		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	}
1081		1111
1082	/* link the object above us */	1112	/* link the object above us */
1083	if (above)	1113	if (above)
1084	above->below = below;	1114	above->below = below;
1085	else	1115	else
…		…
1115	* removed (most likely destroyed), update the player view	1145	* removed (most likely destroyed), update the player view
1116	* appropriately.	1146	* appropriately.
1117	*/	1147	*/
1118	pl->close_container ();	1148	pl->close_container ();
1119		1149
		1150	//TODO: the floorbox prev/next might need updating
		1151	//esrv_del_item (pl->contr, count);
		1152	//TODO: update floorbox to preserve ordering
		1153	if (pl->contr->ns)
1120	pl->contr->ns->floorbox_update ();	1154	pl->contr->ns->floorbox_update ();
1121	}	1155	}
1122		1156
1123	for (tmp = ms.bot; tmp; tmp = tmp->above)	1157	for (tmp = ms.bot; tmp; tmp = tmp->above)
1124	{	1158	{
1125	/* 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
…		…
1169	if (!top)	1203	if (!top)
1170	for (top = op; top && top->above; top = top->above)	1204	for (top = op; top && top->above; top = top->above)
1171	;	1205	;
1172		1206
1173	for (; top; top = top->below)	1207	for (; top; top = top->below)
1174	{
1175	if (top == op)
1176	continue;
1177
1178	if (object::can_merge (op, top))	1208	if (object::can_merge (op, top))
1179	{	1209	{
1180	top->nrof += op->nrof;	1210	top->nrof += op->nrof;
1181		1211
1182	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/	1212	if (object *pl = top->visible_to ())
1183	op->weight = 0; /* Don't want any adjustements now */	1213	esrv_update_item (UPD_NROF, pl, top);
		1214
		1215	op->weight = 0; // cancel the addition above
		1216	op->carrying = 0; // must be 0 already
		1217
1184	op->destroy ();	1218	op->destroy (1);
		1219
1185	return top;	1220	return top;
1186	}	1221	}
1187	}
1188		1222
1189	return 0;	1223	return 0;
1190	}	1224	}
1191		1225
1192	void	1226	void
…		…
1251	object *	1285	object *
1252	insert_ob_in_map (object op, maptile m, object *originator, int flag)	1286	insert_ob_in_map (object op, maptile m, object *originator, int flag)
1253	{	1287	{
1254	assert (!op->flag [FLAG_FREED]);	1288	assert (!op->flag [FLAG_FREED]);
1255		1289
1256	object top, floor = NULL;
1257
1258	op->remove ();	1290	op->remove ();
1259		1291
1260	/* Ideally, the caller figures this out. However, it complicates a lot	1292	/* Ideally, the caller figures this out. However, it complicates a lot
1261	* of areas of callers (eg, anything that uses find_free_spot would now	1293	* of areas of callers (eg, anything that uses find_free_spot would now
1262	* need extra work	1294	* need extra work
1263	*/	1295	*/
1264	if (!xy_normalise (m, op->x, op->y))	1296	if (!xy_normalise (m, op->x, op->y))
1265	{	1297	{
1266	op->destroy ();	1298	op->head_ ()->destroy (1);// remove head_ once all tail object destroyers found
1267	return 0;	1299	return 0;
1268	}	1300	}
1269		1301
1270	if (object *more = op->more)	1302	if (object *more = op->more)
1271	if (!insert_ob_in_map (more, m, originator, flag))	1303	if (!insert_ob_in_map (more, m, originator, flag))
…		…
1280	*/	1312	*/
1281	if (op->nrof && !(flag & INS_NO_MERGE))	1313	if (op->nrof && !(flag & INS_NO_MERGE))
1282	for (object *tmp = ms.bot; tmp; tmp = tmp->above)	1314	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1283	if (object::can_merge (op, tmp))	1315	if (object::can_merge (op, tmp))
1284	{	1316	{
		1317	// TODO: we atcually want to update tmp, not op,
		1318	// but some caller surely breaks when we return tmp
		1319	// from here :/
1285	op->nrof += tmp->nrof;	1320	op->nrof += tmp->nrof;
1286	tmp->destroy (1);	1321	tmp->destroy (1);
1287	}	1322	}
1288		1323
1289	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1324	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
…		…
1311	/* since below originator, no need to update top */	1346	/* since below originator, no need to update top */
1312	originator->below = op;	1347	originator->below = op;
1313	}	1348	}
1314	else	1349	else
1315	{	1350	{
		1351	object top, floor = NULL;
		1352
1316	top = ms.bot;	1353	top = ms.bot;
1317		1354
1318	/* If there are other objects, then */	1355	/* If there are other objects, then */
1319	if (top)	1356	if (top)
1320	{	1357	{
…		…
1419	}	1456	}
1420		1457
1421	op->map->dirty = true;	1458	op->map->dirty = true;
1422		1459
1423	if (object *pl = ms.player ())	1460	if (object *pl = ms.player ())
		1461	//TODO: the floorbox prev/next might need updating
		1462	//esrv_send_item (pl, op);
		1463	//TODO: update floorbox to preserve ordering
		1464	if (pl->contr->ns)
1424	pl->contr->ns->floorbox_update ();	1465	pl->contr->ns->floorbox_update ();
1425		1466
1426	/* If this object glows, it may affect lighting conditions that are	1467	/* If this object glows, it may affect lighting conditions that are
1427	* 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
1428	* 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
1429	* on the map will get recalculated. The players could very well	1470	* on the map will get recalculated. The players could very well
…		…
1494	return where->env->insert (this);	1535	return where->env->insert (this);
1495	else	1536	else
1496	return where->map->insert (this, where->x, where->y, originator, flags);	1537	return where->map->insert (this, where->x, where->y, originator, flags);
1497	}	1538	}
1498		1539
1499	// find player who can see this object
1500	object *
1501	object::visible_to () const
1502	{
1503	if (!flag [FLAG_REMOVED])
1504	{
1505	// see if we are in a container of sorts
1506	if (env)
1507	{
1508	// the player inventory itself is always visible
1509	if (env->type == PLAYER)
1510	return env;
1511
1512	// else a player could have our env open
1513	object *envest = env->outer_env ();
1514
1515	// the player itself is always on a map, so we will find him here
1516	// even if our inv is in a player.
1517	if (envest->is_on_map ())
1518	if (object *pl = envest->ms ().player ())
1519	if (pl->container == env)
1520	return pl;
1521	}
1522	else
1523	{
1524	// maybe there is a player standing on the same mapspace
1525	// this will catch the case where "this" is a player
1526	if (object *pl = ms ().player ())
1527	return pl;
1528	}
1529	}
1530
1531	return 0;
1532	}
1533
1534	/*	1540	/*
1535	* decrease(object, number) decreases a specified number from	1541	* decrease(object, number) decreases a specified number from
1536	* the amount of an object. If the amount reaches 0, the object	1542	* the amount of an object. If the amount reaches 0, the object
1537	* is subsequently removed and freed.	1543	* is subsequently removed and freed.
1538	*	1544	*
…		…
1584	}	1590	}
1585	else	1591	else
1586	{	1592	{
1587	decrease (nr);	1593	decrease (nr);
1588		1594
1589	object *op = object_create_clone (this);	1595	object *op = deep_clone ();
1590	op->nrof = nr;	1596	op->nrof = nr;
1591	return op;	1597	return op;
1592	}	1598	}
1593	}	1599	}
1594		1600
…		…
1638	if (object::can_merge (tmp, op))	1644	if (object::can_merge (tmp, op))
1639	{	1645	{
1640	/* return the original object and remove inserted object	1646	/* return the original object and remove inserted object
1641	(client needs the original object) */	1647	(client needs the original object) */
1642	tmp->nrof += op->nrof;	1648	tmp->nrof += op->nrof;
		1649
		1650	if (object *pl = tmp->visible_to ())
		1651	esrv_update_item (UPD_NROF, pl, tmp);
		1652
1643	adjust_weight (this, op->total_weight ());	1653	adjust_weight (this, op->total_weight ());
1644		1654
1645	op->destroy (1);	1655	op->destroy (1);
1646	op = tmp;	1656	op = tmp;
1647	goto inserted;	1657	goto inserted;
…		…
1661		1671
1662	inv = op;	1672	inv = op;
1663		1673
1664	op->flag [FLAG_REMOVED] = 0;	1674	op->flag [FLAG_REMOVED] = 0;
1665		1675
		1676	if (object *pl = op->visible_to ())
		1677	esrv_send_item (pl, op);
		1678
1666	adjust_weight (this, op->total_weight ());	1679	adjust_weight (this, op->total_weight ());
1667		1680
1668	inserted:	1681	inserted:
1669	/* reset the light list and los of the players on the map */	1682	/* reset the light list and los of the players on the map */
1670	if (op->glow_radius && map && map->darkness)	1683	if (op->glow_radius && map && map->darkness)
1671	update_all_los (map, x, y);	1684	update_all_los (map, x, y);
1672		1685
1673	if (object *otmp = in_player ())	1686	// if this is a player's inventory, update stats
1674	if (otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1687	if (type == PLAYER && !flag [FLAG_NO_FIX_PLAYER])
1675	otmp->update_stats ();	1688	update_stats ();
1676		1689
1677	INVOKE_OBJECT (INSERT, this);	1690	INVOKE_OBJECT (INSERT, this);
1678		1691
1679	return op;	1692	return op;
1680	}	1693	}
…		…
1808	LOG (llevError, "Present_arch called outside map.\n");	1821	LOG (llevError, "Present_arch called outside map.\n");
1809	return NULL;	1822	return NULL;
1810	}	1823	}
1811		1824
1812	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)
1813	if (tmp->arch == at)	1826	if (tmp->arch->archname == at->archname)
1814	return tmp;	1827	return tmp;
1815		1828
1816	return NULL;	1829	return NULL;
1817	}	1830	}
1818		1831
…		…
1882	* The first matching object is returned, or NULL if none.	1895	* The first matching object is returned, or NULL if none.
1883	*/	1896	*/
1884	object *	1897	object *
1885	present_arch_in_ob (const archetype at, const object op)	1898	present_arch_in_ob (const archetype at, const object op)
1886	{	1899	{
1887	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)	1900	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1888	if (tmp->arch == at)	1901	if (tmp->arch->archname == at->archname)
1889	return tmp;	1902	return tmp;
1890		1903
1891	return NULL;	1904	return NULL;
1892	}	1905	}
1893		1906
…		…
2302		2315
2303	/*	2316	/*
2304	* create clone from object to another	2317	* create clone from object to another
2305	*/	2318	*/
2306	object *	2319	object *
2307	object_create_clone (object *asrc)	2320	object::deep_clone ()
2308	{	2321	{
2309	object dst = 0, tmp, src, prev, *item;	2322	assert (("deep_clone called on non-head object", is_head ()));
2310		2323
2311	if (!asrc)	2324	object *dst = clone ();
2312	return 0;
2313		2325
2314	src = asrc->head_ ();	2326	object *prev = dst;
2315
2316	prev = 0;
2317	for (object *part = src; part; part = part->more)	2327	for (object *part = this->more; part; part = part->more)
2318	{	2328	{
2319	tmp = part->clone ();	2329	object *tmp = part->clone ();
2320	tmp->x -= src->x;
2321	tmp->y -= src->y;
2322
2323	if (!part->head)
2324	{
2325	dst = tmp;
2326	tmp->head = 0;
2327	}
2328	else
2329	tmp->head = dst;	2330	tmp->head = dst;
2330
2331	tmp->more = 0;
2332
2333	if (prev)
2334	prev->more = tmp;	2331	prev->more = tmp;
2335
2336	prev = tmp;	2332	prev = tmp;
2337	}	2333	}
2338		2334
2339	for (item = src->inv; item; item = item->below)	2335	for (object *item = inv; item; item = item->below)
2340	insert_ob_in_ob (object_create_clone (item), dst);	2336	insert_ob_in_ob (item->deep_clone (), dst);
2341		2337
2342	return dst;	2338	return dst;
2343	}	2339	}
2344		2340
2345	/* This returns the first object in who's inventory that	2341	/* This returns the first object in who's inventory that
…		…
2354	return tmp;	2350	return tmp;
2355		2351
2356	return 0;	2352	return 0;
2357	}	2353	}
2358		2354
2359	/* If ob has a field named key, return the link from the list,	2355	const shstr &
2360	* otherwise return NULL.	2356	object::kv_get (const shstr &key) const
2361	*
2362	* key must be a passed in shared string - otherwise, this won't
2363	* do the desired thing.
2364	*/
2365	key_value *
2366	get_ob_key_link (const object ob, const char key)
2367	{	2357	{
2368	for (key_value *link = ob->key_values; link; link = link->next)	2358	for (key_value *kv = key_values; kv; kv = kv->next)
2369	if (link->key == key)	2359	if (kv->key == key)
2370	return link;
2371
2372	return 0;
2373	}
2374
2375	/*
2376	* Returns the value of op has an extra_field for key, or NULL.
2377	*
2378	* The argument doesn't need to be a shared string.
2379	*
2380	* The returned string is shared.
2381	*/
2382	const char *
2383	get_ob_key_value (const object op, const char const key)
2384	{
2385	key_value *link;
2386	shstr_cmp canonical_key (key);
2387
2388	if (!canonical_key)
2389	{
2390	/* 1. There being a field named key on any object
2391	* implies there'd be a shared string to find.
2392	* 2. Since there isn't, no object has this field.
2393	* 3. Therefore, this object doesn't have this field.
2394	*/
2395	return 0;
2396	}
2397
2398	/* This is copied from get_ob_key_link() above -
2399	* only 4 lines, and saves the function call overhead.
2400	*/
2401	for (link = op->key_values; link; link = link->next)
2402	if (link->key == canonical_key)
2403	return link->value;	2360	return kv->value;
2404		2361
2405	return 0;	2362	return shstr_null;
2406	}	2363	}
2407		2364
2408	/*	2365	void
2409	* Updates the canonical_key in op to value.	2366	object::kv_set (const shstr &key, const shstr &value)
2410	*
2411	* canonical_key is a shared string (value doesn't have to be).
2412	*
2413	* Unless add_key is TRUE, it won't add fields, only change the value of existing
2414	* keys.
2415	*
2416	* Returns TRUE on success.
2417	*/
2418	int
2419	set_ob_key_value_s (object op, const shstr & canonical_key, const char value, int add_key)
2420	{	2367	{
2421	key_value field = NULL, last = NULL;	2368	for (key_value *kv = key_values; kv; kv = kv->next)
2422		2369	if (kv->key == key)
2423	for (field = op->key_values; field != NULL; field = field->next)
2424	{
2425	if (field->key != canonical_key)
2426	{	2370	{
2427	last = field;	2371	kv->value = value;
2428	continue;	2372	return;
2429	}	2373	}
2430		2374
2431	if (value)	2375	key_value *kv = new key_value;
2432	field->value = value;	2376
2433	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)
2434	{	2389	{
2435	/* Basically, if the archetype has this key set,	2390	key_value kv = kvp;
2436	* we need to store the null value so when we save	2391	kvp = (kvp)->next;
2437	* it, we save the empty value so that when we load,	2392	delete kv;
2438	* we get this value back again.	2393	return;
2439	*/
2440	if (get_ob_key_link (op->arch, canonical_key))
2441	field->value = 0;
2442	else
2443	{
2444	if (last)
2445	last->next = field->next;
2446	else
2447	op->key_values = field->next;
2448
2449	delete field;
2450	}
2451	}	2394	}
2452	return TRUE;
2453	}
2454	/* IF we get here, key doesn't exist */
2455
2456	/* No field, we'll have to add it. */
2457
2458	if (!add_key)
2459	return FALSE;
2460
2461	/* There isn't any good reason to store a null
2462	* value in the key/value list. If the archetype has
2463	* this key, then we should also have it, so shouldn't
2464	* be here. If user wants to store empty strings,
2465	* should pass in ""
2466	*/
2467	if (value == NULL)
2468	return TRUE;
2469
2470	field = new key_value;
2471
2472	field->key = canonical_key;
2473	field->value = value;
2474	/* Usual prepend-addition. */
2475	field->next = op->key_values;
2476	op->key_values = field;
2477
2478	return TRUE;
2479	}
2480
2481	/*
2482	* Updates the key in op to value.
2483	*
2484	* If add_key is FALSE, this will only update existing keys,
2485	* and not add new ones.
2486	* In general, should be little reason FALSE is ever passed in for add_key
2487	*
2488	* Returns TRUE on success.
2489	*/
2490	int
2491	set_ob_key_value (object op, const char key, const char *value, int add_key)
2492	{
2493	shstr key_ (key);
2494
2495	return set_ob_key_value_s (op, key_, value, add_key);
2496	}	2395	}
2497		2396
2498	object::depth_iterator::depth_iterator (object *container)	2397	object::depth_iterator::depth_iterator (object *container)
2499	: iterator_base (container)	2398	: iterator_base (container)
2500	{	2399	{
…		…
2558	&name,	2457	&name,
2559	title ? "\",title:\"" : "",	2458	title ? "\",title:\"" : "",
2560	title ? (const char *)title : "",	2459	title ? (const char *)title : "",
2561	flag_desc (flagdesc, 512), type);	2460	flag_desc (flagdesc, 512), type);
2562		2461
2563	if (!this->flag[FLAG_REMOVED] && env)	2462	if (!flag[FLAG_REMOVED] && env)
2564	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2463	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2565		2464
2566	if (map)	2465	if (map)
2567	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);	2466	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2568		2467
…		…
2598	object::open_container (object *new_container)	2497	object::open_container (object *new_container)
2599	{	2498	{
2600	if (container == new_container)	2499	if (container == new_container)
2601	return;	2500	return;
2602		2501
2603	if (object *old_container = container)	2502	object *old_container = container;
		2503
		2504	if (old_container)
2604	{	2505	{
2605	if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))	2506	if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
2606	return;	2507	return;
2607		2508
2608	#if 0	2509	#if 0
…		…
2610	if (object *closer = old_container->inv)	2511	if (object *closer = old_container->inv)
2611	if (closer->type == CLOSE_CON)	2512	if (closer->type == CLOSE_CON)
2612	closer->destroy ();	2513	closer->destroy ();
2613	#endif	2514	#endif
2614		2515
		2516	// make sure the container is available
		2517	esrv_send_item (this, old_container);
		2518
2615	old_container->flag [FLAG_APPLIED] = 0;	2519	old_container->flag [FLAG_APPLIED] = false;
2616	container = 0;	2520	container = 0;
2617		2521
		2522	// client needs item update to make it work, client bug requires this to be separate
2618	esrv_update_item (UPD_FLAGS, this, old_container);	2523	esrv_update_item (UPD_FLAGS, this, old_container);
		2524
2619	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));
2620	play_sound (sound_find ("chest_close"));	2526	play_sound (sound_find ("chest_close"));
2621	}	2527	}
2622		2528
2623	if (new_container)	2529	if (new_container)
…		…
2636	}	2542	}
2637	#endif	2543	#endif
2638		2544
2639	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));
2640		2546
		2547	// make sure the container is available, client bug requires this to be separate
		2548	esrv_send_item (this, new_container);
		2549
2641	new_container->flag [FLAG_APPLIED] = 1;	2550	new_container->flag [FLAG_APPLIED] = true;
2642	container = new_container;	2551	container = new_container;
2643		2552
		2553	// client needs flag change
2644	esrv_update_item (UPD_FLAGS, this, new_container);	2554	esrv_update_item (UPD_FLAGS, this, new_container);
2645	esrv_send_inventory (this, new_container);	2555	esrv_send_inventory (this, new_container);
2646	play_sound (sound_find ("chest_open"));	2556	play_sound (sound_find ("chest_open"));
2647	}	2557	}
		2558	// else if (!old_container->env && contr && contr->ns)
		2559	// contr->ns->floorbox_reset ();
2648	}	2560	}
2649		2561
2650	object *	2562	object *
2651	object::force_find (const shstr name)	2563	object::force_find (const shstr name)
2652	{	2564	{

Diff Legend

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

Comparing deliantra/server/common/object.C (file contents): Revision 1.212 by root, Mon Apr 21 23:35:24 2008 UTC vs. Revision 1.234 by root, Tue May 6 18:47:52 2008 UTC

Diff Legend

Comparing deliantra/server/common/object.C (file contents):
Revision 1.212 by root, Mon Apr 21 23:35:24 2008 UTC vs.
Revision 1.234 by root, Tue May 6 18:47:52 2008 UTC