[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.241 by root, Wed May 7 19:19: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	}
369		356
370	// adjust weight per container type ("of holding")	357	// adjust weight per container type ("of holding")
371	static sint32	358	static sint32
372	weight_adjust (object *op, sint32 weight)	359	weight_adjust_for (object *op, sint32 weight)
373	{	360	{
374	return op->type == CONTAINER	361	return op->type == CONTAINER
375	? lerp (weight, 0, 100, 0, 100 - op->stats.Str)	362	? lerp (weight, 0, 100, 0, 100 - op->stats.Str)
376	: weight;	363	: weight;
377	}	364	}
…		…
383	static void	370	static void
384	adjust_weight (object *op, sint32 weight)	371	adjust_weight (object *op, sint32 weight)
385	{	372	{
386	while (op)	373	while (op)
387	{	374	{
		375	// adjust by actual difference to account for rounding errors
		376	// i.e. (w2 - w1) / f != w2 / f - w1 / f and the latter is correct
388	weight = weight_adjust (op, weight);	377	weight = weight_adjust_for (op, op->carrying)
		378	- weight_adjust_for (op, op->carrying - weight);
389		379
390	if (!weight)	380	if (!weight)
391	return;	381	return;
392		382
393	op->carrying += weight;	383	op->carrying += weight;
394		384
395	if (object *pl = op->visible_to ())	385	if (object *pl = op->visible_to ())
		386	if (pl != op) // player is handled lazily
396	esrv_update_item (UPD_WEIGHT, pl, op);	387	esrv_update_item (UPD_WEIGHT, pl, op);
397		388
398	op = op->env;	389	op = op->env;
399	}	390	}
400	}	391	}
401		392
…		…
415	op->update_weight ();	406	op->update_weight ();
416		407
417	sum += op->total_weight ();	408	sum += op->total_weight ();
418	}	409	}
419		410
420	sum = weight_adjust (this, sum);	411	sum = weight_adjust_for (this, sum);
421		412
422	if (sum != carrying)	413	if (sum != carrying)
423	{	414	{
424	carrying = sum;	415	carrying = sum;
425		416
426	if (object *pl = visible_to ())	417	if (object *pl = visible_to ())
		418	if (pl != this) // player is handled lazily
427	esrv_update_item (UPD_WEIGHT, pl, this);	419	esrv_update_item (UPD_WEIGHT, pl, this);
428	}	420	}
429	}	421	}
430		422
431	/*	423	/*
432	* Used by: Server DM commands: dumpbelow, dump. Some error messages.	424	* Used by: Server DM commands: dumpbelow, dump. Some error messages.
…		…
600	}	592	}
601		593
602	op->key_values = 0;	594	op->key_values = 0;
603	}	595	}
604		596
605	object &	597	/*
606	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)
607	{	607	{
608	bool is_freed = flag [FLAG_FREED];	608	dst->remove ();
609	bool is_removed = flag [FLAG_REMOVED];
610
611	(object_copy )this = src;	609	(object_copy )dst = *this;
612
613	flag [FLAG_FREED] = is_freed;
614	flag [FLAG_REMOVED] = is_removed;	610	dst->flag [FLAG_REMOVED] = true;
615		611
616	/* Copy over key_values, if any. */	612	/* Copy over key_values, if any. */
617	if (src.key_values)	613	if (key_values)
618	{	614	{
619	key_value *tail = 0;	615	key_value *tail = 0;
620	key_values = 0;	616	dst->key_values = 0;
621		617
622	for (key_value *i = src.key_values; i; i = i->next)	618	for (key_value *i = key_values; i; i = i->next)
623	{	619	{
624	key_value *new_link = new key_value;	620	key_value *new_link = new key_value;
625		621
626	new_link->next = 0;	622	new_link->next = 0;
627	new_link->key = i->key;	623	new_link->key = i->key;
628	new_link->value = i->value;	624	new_link->value = i->value;
629		625
630	/* Try and be clever here, too. */	626	/* Try and be clever here, too. */
631	if (!key_values)	627	if (!dst->key_values)
632	{	628	{
633	key_values = new_link;	629	dst->key_values = new_link;
634	tail = new_link;	630	tail = new_link;
635	}	631	}
636	else	632	else
637	{	633	{
638	tail->next = new_link;	634	tail->next = new_link;
639	tail = new_link;	635	tail = new_link;
640	}	636	}
641	}	637	}
642	}	638	}
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		639
658	if (speed < 0)	640	if (speed < 0)
659	dst->speed_left -= rndm ();	641	dst->speed_left -= rndm ();
660		642
661	dst->set_speed (dst->speed);	643	dst->set_speed (dst->speed);
…		…
683	object *	665	object *
684	object::clone ()	666	object::clone ()
685	{	667	{
686	object *neu = create ();	668	object *neu = create ();
687	copy_to (neu);	669	copy_to (neu);
		670	neu->map = map; // not copied by copy_to
688	return neu;	671	return neu;
689	}	672	}
690		673
691	/*	674	/*
692	* 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
…		…
743	* UP_OBJ_FACE: only the objects face has changed.	726	* UP_OBJ_FACE: only the objects face has changed.
744	*/	727	*/
745	void	728	void
746	update_object (object *op, int action)	729	update_object (object *op, int action)
747	{	730	{
748	if (op == NULL)	731	if (!op)
749	{	732	{
750	/* this should never happen */	733	/* this should never happen */
751	LOG (llevDebug, "update_object() called for NULL object.\n");	734	LOG (llevError \| logBacktrace, "update_object() called for NULL object.\n");
752	return;	735	return;
753	}	736	}
754		737
755	if (op->env)	738	if (!op->is_on_map ())
756	{	739	{
757	/* Animation is currently handled by client, so nothing	740	/* Animation is currently handled by client, so nothing
758	* to do in this case.	741	* to do in this case.
759	*/	742	*/
760	return;	743	return;
761	}	744	}
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		745
769	/* make sure the object is within map boundaries */	746	/* 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)	747	if (op->x < 0 \|\| op->x >= op->map->width \|\| op->y < 0 \|\| op->y >= op->map->height)
771	{	748	{
772	LOG (llevError, "update_object() called for object out of map!\n");	749	LOG (llevError, "update_object() called for object out of map!\n");
…		…
915	object::destroy_inv (bool drop_to_ground)	892	object::destroy_inv (bool drop_to_ground)
916	{	893	{
917	// need to check first, because the checks below might segfault	894	// need to check first, because the checks below might segfault
918	// as we might be on an invalid mapspace and crossfire code	895	// as we might be on an invalid mapspace and crossfire code
919	// is too buggy to ensure that the inventory is empty.	896	// is too buggy to ensure that the inventory is empty.
920	// corollary: if you create arrows etc. with stuff in tis inventory,	897	// corollary: if you create arrows etc. with stuff in its inventory,
921	// cf will crash below with off-map x and y	898	// cf will crash below with off-map x and y
922	if (!inv)	899	if (!inv)
923	return;	900	return;
924		901
925	/* Only if the space blocks everything do we not process -	902	/* Only if the space blocks everything do we not process -
…		…
927	* drop on that space.	904	* drop on that space.
928	*/	905	*/
929	if (!drop_to_ground	906	if (!drop_to_ground
930	\|\| !map	907	\|\| !map
931	\|\| map->in_memory != MAP_ACTIVE	908	\|\| map->in_memory != MAP_ACTIVE
932	\|\| map->nodrop	909	\|\| map->no_drop
933	\|\| ms ().move_block == MOVE_ALL)	910	\|\| ms ().move_block == MOVE_ALL)
934	{	911	{
935	while (inv)	912	while (inv)
936	{	913	{
937	inv->destroy_inv (drop_to_ground);	914	inv->destroy_inv (false);
938	inv->destroy ();	915	inv->destroy ();
939	}	916	}
940	}	917	}
941	else	918	else
942	{ /* Put objects in inventory onto this space */	919	{ /* Put objects in inventory onto this space */
…		…
948	\|\| op->flag [FLAG_NO_DROP]	925	\|\| op->flag [FLAG_NO_DROP]
949	\|\| op->type == RUNE	926	\|\| op->type == RUNE
950	\|\| op->type == TRAP	927	\|\| op->type == TRAP
951	\|\| op->flag [FLAG_IS_A_TEMPLATE]	928	\|\| op->flag [FLAG_IS_A_TEMPLATE]
952	\|\| op->flag [FLAG_DESTROY_ON_DEATH])	929	\|\| op->flag [FLAG_DESTROY_ON_DEATH])
953	op->destroy ();	930	op->destroy (true);
954	else	931	else
955	map->insert (op, x, y);	932	map->insert (op, x, y);
956	}	933	}
957	}	934	}
958	}	935	}
…		…
962	object *op = new object;	939	object *op = new object;
963	op->link ();	940	op->link ();
964	return op;	941	return op;
965	}	942	}
966		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	no_drop = 1;
		953	no_reset = 1;
		954
		955	alloc ();
		956	in_memory = MAP_ACTIVE;
		957	}
		958
		959	~freed_map ()
		960	{
		961	destroy ();
		962	}
		963	} freed_map; // freed objects are moved here to avoid crashes
		964
967	void	965	void
968	object::do_destroy ()	966	object::do_destroy ()
969	{	967	{
970	if (flag [FLAG_IS_LINKED])	968	if (flag [FLAG_IS_LINKED])
971	remove_button_link (this);	969	remove_button_link (this);
…		…
975		973
976	remove ();	974	remove ();
977		975
978	attachable::do_destroy ();	976	attachable::do_destroy ();
979		977
980	destroy_inv (true);
981
982	deactivate ();	978	deactivate ();
983	unlink ();	979	unlink ();
984		980
985	flag [FLAG_FREED] = 1;	981	flag [FLAG_FREED] = 1;
986		982
987	// hack to ensure that freed objects still have a valid map	983	// 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;	984	map = &freed_map;
1006	x = 1;	985	x = 1;
1007	y = 1;	986	y = 1;
1008	}
1009		987
1010	if (more)	988	if (more)
1011	{	989	{
1012	more->destroy ();	990	more->destroy ();
1013	more = 0;	991	more = 0;
…		…
1026	object::destroy (bool destroy_inventory)	1004	object::destroy (bool destroy_inventory)
1027	{	1005	{
1028	if (destroyed ())	1006	if (destroyed ())
1029	return;	1007	return;
1030		1008
		1009	if (!is_head () && !head->destroyed ())
		1010	{
		1011	LOG (llevError \| logBacktrace, "tried to destroy the tail of an object");
		1012	head->destroy (destroy_inventory);
		1013	return;
		1014	}
		1015
1031	if (destroy_inventory)	1016	destroy_inv (!destroy_inventory);
1032	destroy_inv (false);
1033		1017
1034	if (is_head ())	1018	if (is_head ())
1035	if (sound_destroy)	1019	if (sound_destroy)
1036	play_sound (sound_destroy);	1020	play_sound (sound_destroy);
1037	else if (flag [FLAG_MONSTER])	1021	else if (flag [FLAG_MONSTER])
…		…
1056	if (flag [FLAG_REMOVED])	1040	if (flag [FLAG_REMOVED])
1057	return;	1041	return;
1058		1042
1059	INVOKE_OBJECT (REMOVE, this);	1043	INVOKE_OBJECT (REMOVE, this);
1060		1044
1061	if (object *pl = visible_to ())
1062	esrv_del_item (pl->contr, count);
1063
1064	flag [FLAG_REMOVED] = true;	1045	flag [FLAG_REMOVED] = true;
1065		1046
1066	if (more)	1047	if (more)
1067	more->remove ();	1048	more->remove ();
1068		1049
…		…
1070	* In this case, the object to be removed is in someones	1051	* In this case, the object to be removed is in someones
1071	* inventory.	1052	* inventory.
1072	*/	1053	*/
1073	if (env)	1054	if (env)
1074	{	1055	{
		1056	flag [FLAG_REMOVED] = false; // hack around the issue of visible_to checking flag_removed
		1057	if (object *pl = visible_to ())
		1058	esrv_del_item (pl->contr, count);
		1059	flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed
		1060
1075	adjust_weight (env, -total_weight ());	1061	adjust_weight (env, -total_weight ());
1076
1077	*(above ? &above->below : &env->inv) = below;
1078
1079	if (below)
1080	below->above = above;
1081		1062
1082	/* we set up values so that it could be inserted into	1063	/* we set up values so that it could be inserted into
1083	* the map, but we don't actually do that - it is up	1064	* the map, but we don't actually do that - it is up
1084	* to the caller to decide what we want to do.	1065	* to the caller to decide what we want to do.
1085	*/	1066	*/
1086	map = env->map;	1067	map = env->map;
1087	x = env->x;	1068	x = env->x;
1088	y = env->y;	1069	y = env->y;
		1070
		1071	// make sure cmov optimisation is applicable
		1072	*(above ? &above->below : &env->inv) = below;
		1073	*(below ? &below->above : &above ) = above; // &above is just a dummy
		1074
1089	above = 0;	1075	above = 0;
1090	below = 0;	1076	below = 0;
1091	env = 0;	1077	env = 0;
1092		1078
1093	/* NO_FIX_PLAYER is set when a great many changes are being	1079	/* NO_FIX_PLAYER is set when a great many changes are being
…		…
1097	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1083	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1098	otmp->update_stats ();	1084	otmp->update_stats ();
1099	}	1085	}
1100	else if (map)	1086	else if (map)
1101	{	1087	{
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;	1088	map->dirty = true;
1115	mapspace &ms = this->ms ();	1089	mapspace &ms = this->ms ();
1116		1090
		1091	if (object *pl = ms.player ())
		1092	{
		1093	if (type == PLAYER) // this == pl(!)
		1094	{
		1095	// leaving a spot always closes any open container on the ground
		1096	if (container && !container->env)
		1097	// this causes spurious floorbox updates, but it ensures
		1098	// that the CLOSE event is being sent.
		1099	close_container ();
		1100
		1101	--map->players;
		1102	map->touch ();
		1103	}
		1104	else if (pl->container == this)
		1105	{
		1106	// removing a container should close it
		1107	close_container ();
		1108	}
		1109
		1110	esrv_del_item (pl->contr, count);
		1111	}
		1112
1117	/* link the object above us */	1113	/* link the object above us */
1118	if (above)	1114	// re-link, make sure compiler can easily use cmove
1119	above->below = below;	1115	*(above ? &above->below : &ms.top) = below;
1120	else	1116	*(below ? &below->above : &ms.bot) = above;
1121	ms.top = below; /* we were top, set new top */
1122
1123	/* Relink the object below us, if there is one */
1124	if (below)
1125	below->above = above;
1126	else
1127	{
1128	/* Nothing below, which means we need to relink map object for this space
1129	* use translated coordinates in case some oddness with map tiling is
1130	* evident
1131	*/
1132	if (GET_MAP_OB (map, x, y) != this)
1133	LOG (llevError, "remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom? %s\n", debug_desc ());
1134
1135	ms.bot = above; /* goes on above it. */
1136	}
1137		1117
1138	above = 0;	1118	above = 0;
1139	below = 0;	1119	below = 0;
1140		1120
1141	if (map->in_memory == MAP_SAVING)	1121	if (map->in_memory == MAP_SAVING)
…		…
1150	* removed (most likely destroyed), update the player view	1130	* removed (most likely destroyed), update the player view
1151	* appropriately.	1131	* appropriately.
1152	*/	1132	*/
1153	pl->close_container ();	1133	pl->close_container ();
1154		1134
		1135	//TODO: the floorbox prev/next might need updating
		1136	//esrv_del_item (pl->contr, count);
		1137	//TODO: update floorbox to preserve ordering
		1138	if (pl->contr->ns)
1155	pl->contr->ns->floorbox_update ();	1139	pl->contr->ns->floorbox_update ();
1156	}	1140	}
1157		1141
1158	for (tmp = ms.bot; tmp; tmp = tmp->above)	1142	for (tmp = ms.bot; tmp; tmp = tmp->above)
1159	{	1143	{
1160	/* No point updating the players look faces if he is the object	1144	/* No point updating the players look faces if he is the object
…		…
1284	* just 'op' otherwise	1268	* just 'op' otherwise
1285	*/	1269	*/
1286	object *	1270	object *
1287	insert_ob_in_map (object op, maptile m, object *originator, int flag)	1271	insert_ob_in_map (object op, maptile m, object *originator, int flag)
1288	{	1272	{
1289	assert (!op->flag [FLAG_FREED]);
1290
1291	object top, floor = NULL;
1292
1293	op->remove ();	1273	op->remove ();
1294		1274
1295	/* Ideally, the caller figures this out. However, it complicates a lot	1275	/* 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	1276	* of areas of callers (eg, anything that uses find_free_spot would now
1297	* need extra work	1277	* need extra work
1298	*/	1278	*/
1299	if (!xy_normalise (m, op->x, op->y))	1279	if (!xy_normalise (m, op->x, op->y))
1300	{	1280	{
1301	op->destroy ();	1281	op->head_ ()->destroy (1);// remove head_ once all tail object destroyers found
1302	return 0;	1282	return 0;
1303	}	1283	}
1304		1284
1305	if (object *more = op->more)	1285	if (object *more = op->more)
1306	if (!insert_ob_in_map (more, m, originator, flag))	1286	if (!insert_ob_in_map (more, m, originator, flag))
…		…
1315	*/	1295	*/
1316	if (op->nrof && !(flag & INS_NO_MERGE))	1296	if (op->nrof && !(flag & INS_NO_MERGE))
1317	for (object *tmp = ms.bot; tmp; tmp = tmp->above)	1297	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1318	if (object::can_merge (op, tmp))	1298	if (object::can_merge (op, tmp))
1319	{	1299	{
		1300	// TODO: we actually want to update tmp, not op,
		1301	// but some caller surely breaks when we return tmp
		1302	// from here :/
1320	op->nrof += tmp->nrof;	1303	op->nrof += tmp->nrof;
1321	tmp->destroy (1);	1304	tmp->destroy (1);
1322	}	1305	}
1323		1306
1324	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1307	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
…		…
1333	{	1316	{
1334	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");	1317	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");
1335	abort ();	1318	abort ();
1336	}	1319	}
1337		1320
		1321	if (!originator->is_on_map ())
		1322	LOG (llevDebug \| logBacktrace, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map",
		1323	op->debug_desc (), originator->debug_desc ());
		1324
1338	op->above = originator;	1325	op->above = originator;
1339	op->below = originator->below;	1326	op->below = originator->below;
1340
1341	if (op->below)
1342	op->below->above = op;
1343	else
1344	ms.bot = op;
1345
1346	/* since below originator, no need to update top */
1347	originator->below = op;	1327	originator->below = op;
		1328
		1329	*(op->below ? &op->below->above : &ms.bot) = op;
1348	}	1330	}
1349	else	1331	else
1350	{	1332	{
1351	top = ms.bot;	1333	object *floor = 0;
		1334	object *top = ms.top;
1352		1335
1353	/* If there are other objects, then */	1336	/* If there are other objects, then */
1354	if (top)	1337	if (top)
1355	{	1338	{
1356	object *last = 0;
1357
1358	/*	1339	/*
1359	* If there are multiple objects on this space, we do some trickier handling.	1340	* If there are multiple objects on this space, we do some trickier handling.
1360	* We've already dealt with merging if appropriate.	1341	* We've already dealt with merging if appropriate.
1361	* Generally, we want to put the new object on top. But if	1342	* Generally, we want to put the new object on top. But if
1362	* flag contains INS_ABOVE_FLOOR_ONLY, once we find the last	1343	* flag contains INS_ABOVE_FLOOR_ONLY, once we find the last
…		…
1365	* once we get to them. This reduces the need to traverse over all of	1346	* once we get to them. This reduces the need to traverse over all of
1366	* them when adding another one - this saves quite a bit of cpu time	1347	* them when adding another one - this saves quite a bit of cpu time
1367	* when lots of spells are cast in one area. Currently, it is presumed	1348	* when lots of spells are cast in one area. Currently, it is presumed
1368	* that flying non pickable objects are spell objects.	1349	* that flying non pickable objects are spell objects.
1369	*/	1350	*/
1370	for (top = ms.bot; top; top = top->above)	1351	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1371	{	1352	{
1372	if (QUERY_FLAG (top, FLAG_IS_FLOOR) \|\| QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))	1353	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) \|\| QUERY_FLAG (tmp, FLAG_OVERLAY_FLOOR))
1373	floor = top;	1354	floor = tmp;
1374		1355
1375	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW \| MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))	1356	if (QUERY_FLAG (tmp, FLAG_NO_PICK) && (tmp->move_type & (MOVE_FLY_LOW \| MOVE_FLY_HIGH)) && !QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1376	{	1357	{
1377	/* We insert above top, so we want this object below this */	1358	/* We insert above top, so we want this object below this */
1378	top = top->below;	1359	top = tmp->below;
1379	break;	1360	break;
1380	}	1361	}
1381		1362
1382	last = top;	1363	top = tmp;
1383	}	1364	}
1384
1385	/* Don't want top to be NULL, so set it to the last valid object */
1386	top = last;
1387		1365
1388	/* We let update_position deal with figuring out what the space	1366	/* We let update_position deal with figuring out what the space
1389	* looks like instead of lots of conditions here.	1367	* looks like instead of lots of conditions here.
1390	* makes things faster, and effectively the same result.	1368	* makes things faster, and effectively the same result.
1391	*/	1369	*/
…		…
1398	*/	1376	*/
1399	if (!(flag & INS_ON_TOP)	1377	if (!(flag & INS_ON_TOP)
1400	&& ms.flags () & P_BLOCKSVIEW	1378	&& ms.flags () & P_BLOCKSVIEW
1401	&& (op->face && !faces [op->face].visibility))	1379	&& (op->face && !faces [op->face].visibility))
1402	{	1380	{
		1381	object *last;
		1382
1403	for (last = top; last != floor; last = last->below)	1383	for (last = top; last != floor; last = last->below)
1404	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1384	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1405	break;	1385	break;
1406		1386
1407	/* Check to see if we found the object that blocks view,	1387	/* Check to see if we found the object that blocks view,
…		…
1415	} /* If objects on this space */	1395	} /* If objects on this space */
1416		1396
1417	if (flag & INS_ABOVE_FLOOR_ONLY)	1397	if (flag & INS_ABOVE_FLOOR_ONLY)
1418	top = floor;	1398	top = floor;
1419		1399
1420	/* Top is the object that our object (op) is going to get inserted above.	1400	// insert object above top, or bottom-most if top = 0
1421	*/
1422
1423	/* First object on this space */
1424	if (!top)	1401	if (!top)
1425	{	1402	{
		1403	op->below = 0;
1426	op->above = ms.bot;	1404	op->above = ms.bot;
1427
1428	if (op->above)
1429	op->above->below = op;
1430
1431	op->below = 0;
1432	ms.bot = op;	1405	ms.bot = op;
		1406
		1407	*(op->above ? &op->above->below : &ms.top) = op;
1433	}	1408	}
1434	else	1409	else
1435	{ /* get inserted into the stack above top */	1410	{
1436	op->above = top->above;	1411	op->above = top->above;
1437
1438	if (op->above)
1439	op->above->below = op;	1412	top->above = op;
1440		1413
1441	op->below = top;	1414	op->below = top;
1442	top->above = op;	1415	*(op->above ? &op->above->below : &ms.top) = op;
1443	}	1416	}
1444		1417	}
1445	if (!op->above)
1446	ms.top = op;
1447	} /* else not INS_BELOW_ORIGINATOR */
1448		1418
1449	if (op->type == PLAYER)	1419	if (op->type == PLAYER)
1450	{	1420	{
1451	op->contr->do_los = 1;	1421	op->contr->do_los = 1;
1452	++op->map->players;	1422	++op->map->players;
…		…
1454	}	1424	}
1455		1425
1456	op->map->dirty = true;	1426	op->map->dirty = true;
1457		1427
1458	if (object *pl = ms.player ())	1428	if (object *pl = ms.player ())
		1429	//TODO: the floorbox prev/next might need updating
		1430	//esrv_send_item (pl, op);
		1431	//TODO: update floorbox to preserve ordering
		1432	if (pl->contr->ns)
1459	pl->contr->ns->floorbox_update ();	1433	pl->contr->ns->floorbox_update ();
1460		1434
1461	/* If this object glows, it may affect lighting conditions that are	1435	/* If this object glows, it may affect lighting conditions that are
1462	* visible to others on this map. But update_all_los is really	1436	* 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	1437	* 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	1438	* on the map will get recalculated. The players could very well
…		…
1584	}	1558	}
1585	else	1559	else
1586	{	1560	{
1587	decrease (nr);	1561	decrease (nr);
1588		1562
1589	object *op = object_create_clone (this);	1563	object *op = deep_clone ();
1590	op->nrof = nr;	1564	op->nrof = nr;
1591	return op;	1565	return op;
1592	}	1566	}
1593	}	1567	}
1594		1568
…		…
1815	LOG (llevError, "Present_arch called outside map.\n");	1789	LOG (llevError, "Present_arch called outside map.\n");
1816	return NULL;	1790	return NULL;
1817	}	1791	}
1818		1792
1819	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)	1793	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1820	if (tmp->arch == at)	1794	if (tmp->arch->archname == at->archname)
1821	return tmp;	1795	return tmp;
1822		1796
1823	return NULL;	1797	return NULL;
1824	}	1798	}
1825		1799
…		…
1889	* The first matching object is returned, or NULL if none.	1863	* The first matching object is returned, or NULL if none.
1890	*/	1864	*/
1891	object *	1865	object *
1892	present_arch_in_ob (const archetype at, const object op)	1866	present_arch_in_ob (const archetype at, const object op)
1893	{	1867	{
1894	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)	1868	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1895	if (tmp->arch == at)	1869	if (tmp->arch->archname == at->archname)
1896	return tmp;	1870	return tmp;
1897		1871
1898	return NULL;	1872	return NULL;
1899	}	1873	}
1900		1874
…		…
2309		2283
2310	/*	2284	/*
2311	* create clone from object to another	2285	* create clone from object to another
2312	*/	2286	*/
2313	object *	2287	object *
2314	object_create_clone (object *asrc)	2288	object::deep_clone ()
2315	{	2289	{
2316	object dst = 0, tmp, src, prev, *item;	2290	assert (("deep_clone called on non-head object", is_head ()));
2317		2291
2318	if (!asrc)	2292	object *dst = clone ();
2319	return 0;
2320		2293
2321	src = asrc->head_ ();	2294	object *prev = dst;
2322
2323	prev = 0;
2324	for (object *part = src; part; part = part->more)	2295	for (object *part = this->more; part; part = part->more)
2325	{	2296	{
2326	tmp = part->clone ();	2297	object *tmp = part->clone ();
2327	tmp->x -= src->x;
2328	tmp->y -= src->y;
2329
2330	if (!part->head)
2331	{
2332	dst = tmp;
2333	tmp->head = 0;
2334	}
2335	else
2336	tmp->head = dst;	2298	tmp->head = dst;
2337
2338	tmp->more = 0;
2339
2340	if (prev)
2341	prev->more = tmp;	2299	prev->more = tmp;
2342
2343	prev = tmp;	2300	prev = tmp;
2344	}	2301	}
2345		2302
2346	for (item = src->inv; item; item = item->below)	2303	for (object *item = inv; item; item = item->below)
2347	insert_ob_in_ob (object_create_clone (item), dst);	2304	insert_ob_in_ob (item->deep_clone (), dst);
2348		2305
2349	return dst;	2306	return dst;
2350	}	2307	}
2351		2308
2352	/* This returns the first object in who's inventory that	2309	/* This returns the first object in who's inventory that
…		…
2361	return tmp;	2318	return tmp;
2362		2319
2363	return 0;	2320	return 0;
2364	}	2321	}
2365		2322
2366	/* If ob has a field named key, return the link from the list,	2323	const shstr &
2367	* otherwise return NULL.	2324	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	{	2325	{
2375	for (key_value *link = ob->key_values; link; link = link->next)	2326	for (key_value *kv = key_values; kv; kv = kv->next)
2376	if (link->key == key)	2327	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;	2328	return kv->value;
2411		2329
2412	return 0;	2330	return shstr_null;
2413	}	2331	}
2414		2332
2415	/*	2333	void
2416	* Updates the canonical_key in op to value.	2334	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	{	2335	{
2428	key_value field = NULL, last = NULL;	2336	for (key_value *kv = key_values; kv; kv = kv->next)
2429		2337	if (kv->key == key)
2430	for (field = op->key_values; field != NULL; field = field->next)
2431	{
2432	if (field->key != canonical_key)
2433	{	2338	{
2434	last = field;	2339	kv->value = value;
2435	continue;	2340	return;
2436	}	2341	}
2437		2342
2438	if (value)	2343	key_value *kv = new key_value;
2439	field->value = value;	2344
2440	else	2345	kv->next = key_values;
		2346	kv->key = key;
		2347	kv->value = value;
		2348
		2349	key_values = kv;
		2350	}
		2351
		2352	void
		2353	object::kv_del (const shstr &key)
		2354	{
		2355	for (key_value *kvp = &key_values; kvp; kvp = &(*kvp)->next)
		2356	if ((*kvp)->key == key)
2441	{	2357	{
2442	/* Basically, if the archetype has this key set,	2358	key_value kv = kvp;
2443	* we need to store the null value so when we save	2359	kvp = (kvp)->next;
2444	* it, we save the empty value so that when we load,	2360	delete kv;
2445	* we get this value back again.	2361	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	}	2362	}
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	}	2363	}
2504		2364
2505	object::depth_iterator::depth_iterator (object *container)	2365	object::depth_iterator::depth_iterator (object *container)
2506	: iterator_base (container)	2366	: iterator_base (container)
2507	{	2367	{
…		…
2565	&name,	2425	&name,
2566	title ? "\",title:\"" : "",	2426	title ? "\",title:\"" : "",
2567	title ? (const char *)title : "",	2427	title ? (const char *)title : "",
2568	flag_desc (flagdesc, 512), type);	2428	flag_desc (flagdesc, 512), type);
2569		2429
2570	if (!this->flag[FLAG_REMOVED] && env)	2430	if (!flag[FLAG_REMOVED] && env)
2571	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2431	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2572		2432
2573	if (map)	2433	if (map)
2574	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);	2434	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2575		2435
…		…
2605	object::open_container (object *new_container)	2465	object::open_container (object *new_container)
2606	{	2466	{
2607	if (container == new_container)	2467	if (container == new_container)
2608	return;	2468	return;
2609		2469
2610	if (object *old_container = container)	2470	object *old_container = container;
		2471
		2472	if (old_container)
2611	{	2473	{
2612	if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))	2474	if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
2613	return;	2475	return;
2614		2476
2615	#if 0	2477	#if 0
…		…
2617	if (object *closer = old_container->inv)	2479	if (object *closer = old_container->inv)
2618	if (closer->type == CLOSE_CON)	2480	if (closer->type == CLOSE_CON)
2619	closer->destroy ();	2481	closer->destroy ();
2620	#endif	2482	#endif
2621		2483
		2484	// make sure the container is available
		2485	esrv_send_item (this, old_container);
		2486
2622	old_container->flag [FLAG_APPLIED] = 0;	2487	old_container->flag [FLAG_APPLIED] = false;
2623	container = 0;	2488	container = 0;
2624		2489
		2490	// client needs item update to make it work, client bug requires this to be separate
2625	esrv_update_item (UPD_FLAGS, this, old_container);	2491	esrv_update_item (UPD_FLAGS, this, old_container);
		2492
2626	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));	2493	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
2627	play_sound (sound_find ("chest_close"));	2494	play_sound (sound_find ("chest_close"));
2628	}	2495	}
2629		2496
2630	if (new_container)	2497	if (new_container)
…		…
2643	}	2510	}
2644	#endif	2511	#endif
2645		2512
2646	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));	2513	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));
2647		2514
		2515	// make sure the container is available, client bug requires this to be separate
		2516	esrv_send_item (this, new_container);
		2517
2648	new_container->flag [FLAG_APPLIED] = 1;	2518	new_container->flag [FLAG_APPLIED] = true;
2649	container = new_container;	2519	container = new_container;
2650		2520
		2521	// client needs flag change
2651	esrv_update_item (UPD_FLAGS, this, new_container);	2522	esrv_update_item (UPD_FLAGS, this, new_container);
2652	esrv_send_inventory (this, new_container);	2523	esrv_send_inventory (this, new_container);
2653	play_sound (sound_find ("chest_open"));	2524	play_sound (sound_find ("chest_open"));
2654	}	2525	}
		2526	// else if (!old_container->env && contr && contr->ns)
		2527	// contr->ns->floorbox_reset ();
2655	}	2528	}
2656		2529
2657	object *	2530	object *
2658	object::force_find (const shstr name)	2531	object::force_find (const shstr name)
2659	{	2532	{

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.241 by root, Wed May 7 19:19: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.241 by root, Wed May 7 19:19:09 2008 UTC