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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.218 by root, Wed Apr 23 07:25:54 2008 UTC vs.
Revision 1.238 by root, Wed May 7 11:02:50 2008 UTC

…		…
139		139
140	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */	140	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */
141	static bool	141	static bool
142	compare_ob_value_lists_one (const object wants, const object has)	142	compare_ob_value_lists_one (const object wants, const object has)
143	{	143	{
144	key_value *wants_field;
145
146	/* n-squared behaviour (see get_ob_key_link()), but I'm hoping both	144	/* n-squared behaviour (see kv_get), but I'm hoping both
147	* objects with lists are rare, and lists stay short. If not, use a	145	* objects with lists are rare, and lists stay short. If not, use a
148	* different structure or at least keep the lists sorted...	146	* different structure or at least keep the lists sorted...
149	*/	147	*/
150		148
151	/* For each field in wants, */	149	/* For each field in wants, */
152	for (wants_field = wants->key_values; wants_field; wants_field = wants_field->next)	150	for (key_value *kv = wants->key_values; kv; kv = kv->next)
153	{	151	if (has->kv_get (kv->key) != kv->value)
154	key_value *has_field;	152	return false;
155
156	/* Look for a field in has with the same key. */
157	has_field = get_ob_key_link (has, wants_field->key);
158
159	if (!has_field)
160	return 0; /* No field with that name. */
161
162	/* Found the matching field. */
163	if (has_field->value != wants_field->value)
164	return 0; /* Values don't match, so this half of the comparison is false. */
165
166	/* If we get here, we found a match. Now for the next field in wants. */
167	}
168		153
169	/* If we get here, every field in wants has a matching field in has. */	154	/* If we get here, every field in wants has a matching field in has. */
170	return 1;	155	return true;
171	}	156	}
172		157
173	/* Returns TRUE if ob1 has the same key_values as ob2. */	158	/* Returns TRUE if ob1 has the same key_values as ob2. */
174	static bool	159	static bool
175	compare_ob_value_lists (const object ob1, const object ob2)	160	compare_ob_value_lists (const object ob1, const object ob2)
176	{	161	{
177	/* However, there may be fields in has which aren't partnered in wants,	162	/* However, there may be fields in has which aren't partnered in wants,
178	* so we need to run the comparison twice. :(	163	* so we need to run the comparison twice. :(
179	*/	164	*/
180	return compare_ob_value_lists_one (ob1, ob2) && compare_ob_value_lists_one (ob2, ob1);	165	return compare_ob_value_lists_one (ob1, ob2)
		166	&& compare_ob_value_lists_one (ob2, ob1);
181	}	167	}
182		168
183	/* Function examines the 2 objects given to it, and returns true if	169	/* Function examines the 2 objects given to it, and returns true if
184	* they can be merged together.	170	* they can be merged together.
185	*	171	*
…		…
334		320
335	// find player who can see this object	321	// find player who can see this object
336	object *	322	object *
337	object::visible_to () const	323	object::visible_to () const
338	{	324	{
339	if (!flag [FLAG_REMOVED])	325	if (client_visible () && !flag [FLAG_REMOVED])
340	{	326	{
341	// see if we are in a container of sorts	327	// see if we are in a container of sorts
342	if (env)	328	if (env)
343	{	329	{
344	// the player inventory itself is always visible	330	// the player inventory itself is always visible
…		…
358	else	344	else
359	{	345	{
360	// maybe there is a player standing on the same mapspace	346	// maybe there is a player standing on the same mapspace
361	// this will catch the case where "this" is a player	347	// this will catch the case where "this" is a player
362	if (object *pl = ms ().player ())	348	if (object *pl = ms ().player ())
		349	if (!pl->container \|\| this == pl->container)
363	return pl;	350	return pl;
364	}	351	}
365	}	352	}
366		353
367	return 0;	354	return 0;
368	}	355	}
369		356
370	// adjust weight per container type ("of holding")	357	// adjust weight per container type ("of holding")
371	static sint32	358	static sint32
372	weight_adjust (object *op, sint32 weight)	359	weight_adjust_for (object *op, sint32 weight)
373	{	360	{
374	return op->type == CONTAINER	361	return op->type == CONTAINER
375	? lerp (weight, 0, 100, 0, 100 - op->stats.Str)	362	? lerp (weight, 0, 100, 0, 100 - op->stats.Str)
376	: weight;	363	: weight;
377	}	364	}
…		…
383	static void	370	static void
384	adjust_weight (object *op, sint32 weight)	371	adjust_weight (object *op, sint32 weight)
385	{	372	{
386	while (op)	373	while (op)
387	{	374	{
		375	// adjust by actual difference to account for rounding errors
		376	// i.e. (w2 - w1) / f != w2 / f - w1 / f and the latter is correct
388	weight = weight_adjust (op, weight);	377	weight = weight_adjust_for (op, op->carrying)
		378	- weight_adjust_for (op, op->carrying - weight);
389		379
390	if (!weight)	380	if (!weight)
391	return;	381	return;
392		382
393	op->carrying += weight;	383	op->carrying += weight;
…		…
416	op->update_weight ();	406	op->update_weight ();
417		407
418	sum += op->total_weight ();	408	sum += op->total_weight ();
419	}	409	}
420		410
421	sum = weight_adjust (this, sum);	411	sum = weight_adjust_for (this, sum);
422		412
423	if (sum != carrying)	413	if (sum != carrying)
424	{	414	{
425	carrying = sum;	415	carrying = sum;
426		416
…		…
602	}	592	}
603		593
604	op->key_values = 0;	594	op->key_values = 0;
605	}	595	}
606		596
607	object &	597	/*
608	object::operator =(const object &src)	598	* copy_to first frees everything allocated by the dst object,
		599	* and then copies the contents of itself into the second
		600	* object, allocating what needs to be allocated. Basically, any
		601	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
		602	* if the first object is freed, the pointers in the new object
		603	* will point at garbage.
		604	*/
		605	void
		606	object::copy_to (object *dst)
609	{	607	{
610	bool is_freed = flag [FLAG_FREED];	608	dst->remove ();
611	bool is_removed = flag [FLAG_REMOVED];
612
613	(object_copy )this = src;	609	(object_copy )dst = *this;
614
615	flag [FLAG_FREED] = is_freed;
616	flag [FLAG_REMOVED] = is_removed;	610	dst->flag [FLAG_REMOVED] = true;
617		611
618	/* Copy over key_values, if any. */	612	/* Copy over key_values, if any. */
619	if (src.key_values)	613	if (key_values)
620	{	614	{
621	key_value *tail = 0;	615	key_value *tail = 0;
622	key_values = 0;	616	dst->key_values = 0;
623		617
624	for (key_value *i = src.key_values; i; i = i->next)	618	for (key_value *i = key_values; i; i = i->next)
625	{	619	{
626	key_value *new_link = new key_value;	620	key_value *new_link = new key_value;
627		621
628	new_link->next = 0;	622	new_link->next = 0;
629	new_link->key = i->key;	623	new_link->key = i->key;
630	new_link->value = i->value;	624	new_link->value = i->value;
631		625
632	/* Try and be clever here, too. */	626	/* Try and be clever here, too. */
633	if (!key_values)	627	if (!dst->key_values)
634	{	628	{
635	key_values = new_link;	629	dst->key_values = new_link;
636	tail = new_link;	630	tail = new_link;
637	}	631	}
638	else	632	else
639	{	633	{
640	tail->next = new_link;	634	tail->next = new_link;
641	tail = new_link;	635	tail = new_link;
642	}	636	}
643	}	637	}
644	}	638	}
645	}
646
647	/*
648	* copy_to first frees everything allocated by the dst object,
649	* and then copies the contents of itself into the second
650	* object, allocating what needs to be allocated. Basically, any
651	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
652	* if the first object is freed, the pointers in the new object
653	* will point at garbage.
654	*/
655	void
656	object::copy_to (object *dst)
657	{
658	dst = this;
659		639
660	if (speed < 0)	640	if (speed < 0)
661	dst->speed_left -= rndm ();	641	dst->speed_left -= rndm ();
662		642
663	dst->set_speed (dst->speed);	643	dst->set_speed (dst->speed);
…		…
685	object *	665	object *
686	object::clone ()	666	object::clone ()
687	{	667	{
688	object *neu = create ();	668	object *neu = create ();
689	copy_to (neu);	669	copy_to (neu);
		670	neu->map = map; // not copied by copy_to
690	return neu;	671	return neu;
691	}	672	}
692		673
693	/*	674	/*
694	* If an object with the IS_TURNABLE() flag needs to be turned due	675	* If an object with the IS_TURNABLE() flag needs to be turned due
…		…
745	* UP_OBJ_FACE: only the objects face has changed.	726	* UP_OBJ_FACE: only the objects face has changed.
746	*/	727	*/
747	void	728	void
748	update_object (object *op, int action)	729	update_object (object *op, int action)
749	{	730	{
750	if (op == NULL)	731	if (!op)
751	{	732	{
752	/* this should never happen */	733	/* this should never happen */
753	LOG (llevDebug, "update_object() called for NULL object.\n");	734	LOG (llevError \| logBacktrace, "update_object() called for NULL object.\n");
754	return;	735	return;
755	}	736	}
756		737
757	if (op->env)	738	if (!op->is_on_map ())
758	{	739	{
759	/* Animation is currently handled by client, so nothing	740	/* Animation is currently handled by client, so nothing
760	* to do in this case.	741	* to do in this case.
761	*/	742	*/
762	return;	743	return;
763	}	744	}
764
765	/* If the map is saving, don't do anything as everything is
766	* going to get freed anyways.
767	*/
768	if (!op->map \|\| op->map->in_memory == MAP_SAVING)
769	return;
770		745
771	/* make sure the object is within map boundaries */	746	/* make sure the object is within map boundaries */
772	if (op->x < 0 \|\| op->x >= op->map->width \|\| op->y < 0 \|\| op->y >= op->map->height)	747	if (op->x < 0 \|\| op->x >= op->map->width \|\| op->y < 0 \|\| op->y >= op->map->height)
773	{	748	{
774	LOG (llevError, "update_object() called for object out of map!\n");	749	LOG (llevError, "update_object() called for object out of map!\n");
…		…
929	* drop on that space.	904	* drop on that space.
930	*/	905	*/
931	if (!drop_to_ground	906	if (!drop_to_ground
932	\|\| !map	907	\|\| !map
933	\|\| map->in_memory != MAP_ACTIVE	908	\|\| map->in_memory != MAP_ACTIVE
934	\|\| map->nodrop	909	\|\| map->no_drop
935	\|\| ms ().move_block == MOVE_ALL)	910	\|\| ms ().move_block == MOVE_ALL)
936	{	911	{
937	while (inv)	912	while (inv)
938	{	913	{
939	inv->destroy_inv (false);	914	inv->destroy_inv (false);
…		…
964	object *op = new object;	939	object *op = new object;
965	op->link ();	940	op->link ();
966	return op;	941	return op;
967	}	942	}
968		943
		944	static struct freed_map : maptile
		945	{
		946	freed_map ()
		947	{
		948	path = "<freed objects map>";
		949	name = "/internal/freed_objects_map";
		950	width = 3;
		951	height = 3;
		952	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
969	void	965	void
970	object::do_destroy ()	966	object::do_destroy ()
971	{	967	{
972	if (flag [FLAG_IS_LINKED])	968	if (flag [FLAG_IS_LINKED])
973	remove_button_link (this);	969	remove_button_link (this);
…		…
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;
…		…
1025	void	1003	void
1026	object::destroy (bool destroy_inventory)	1004	object::destroy (bool destroy_inventory)
1027	{	1005	{
1028	if (destroyed ())	1006	if (destroyed ())
1029	return;	1007	return;
		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	}
1030		1015
1031	destroy_inv (!destroy_inventory);	1016	destroy_inv (!destroy_inventory);
1032		1017
1033	if (is_head ())	1018	if (is_head ())
1034	if (sound_destroy)	1019	if (sound_destroy)
…		…
1055	if (flag [FLAG_REMOVED])	1040	if (flag [FLAG_REMOVED])
1056	return;	1041	return;
1057		1042
1058	INVOKE_OBJECT (REMOVE, this);	1043	INVOKE_OBJECT (REMOVE, this);
1059		1044
1060	if (object *pl = visible_to ())
1061	esrv_del_item (pl->contr, count);
1062
1063	flag [FLAG_REMOVED] = true;	1045	flag [FLAG_REMOVED] = true;
1064		1046
1065	if (more)	1047	if (more)
1066	more->remove ();	1048	more->remove ();
1067		1049
…		…
1069	* In this case, the object to be removed is in someones	1051	* In this case, the object to be removed is in someones
1070	* inventory.	1052	* inventory.
1071	*/	1053	*/
1072	if (env)	1054	if (env)
1073	{	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
1074	adjust_weight (env, -total_weight ());	1061	adjust_weight (env, -total_weight ());
1075
1076	*(above ? &above->below : &env->inv) = below;
1077
1078	if (below)
1079	below->above = above;
1080		1062
1081	/* we set up values so that it could be inserted into	1063	/* we set up values so that it could be inserted into
1082	* 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
1083	* to the caller to decide what we want to do.	1065	* to the caller to decide what we want to do.
1084	*/	1066	*/
1085	map = env->map;	1067	map = env->map;
1086	x = env->x;	1068	x = env->x;
1087	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
1088	above = 0;	1075	above = 0;
1089	below = 0;	1076	below = 0;
1090	env = 0;	1077	env = 0;
1091		1078
1092	/* 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
…		…
1096	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))
1097	otmp->update_stats ();	1084	otmp->update_stats ();
1098	}	1085	}
1099	else if (map)	1086	else if (map)
1100	{	1087	{
1101	if (type == PLAYER)
1102	{
1103	// leaving a spot always closes any open container on the ground
1104	if (container && !container->env)
1105	// this causes spurious floorbox updates, but it ensures
1106	// that the CLOSE event is being sent.
1107	close_container ();
1108
1109	--map->players;
1110	map->touch ();
1111	}
1112
1113	map->dirty = true;	1088	map->dirty = true;
1114	mapspace &ms = this->ms ();	1089	mapspace &ms = this->ms ();
1115		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
1116	/* link the object above us */	1113	/* link the object above us */
1117	if (above)	1114	// re-link, make sure compiler can easily use cmove
1118	above->below = below;	1115	*(above ? &above->below : &ms.top) = below;
1119	else	1116	*(below ? &below->above : &ms.bot) = above;
1120	ms.top = below; /* we were top, set new top */
1121
1122	/* Relink the object below us, if there is one */
1123	if (below)
1124	below->above = above;
1125	else
1126	{
1127	/* Nothing below, which means we need to relink map object for this space
1128	* use translated coordinates in case some oddness with map tiling is
1129	* evident
1130	*/
1131	if (GET_MAP_OB (map, x, y) != this)
1132	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 ());
1133
1134	ms.bot = above; /* goes on above it. */
1135	}
1136		1117
1137	above = 0;	1118	above = 0;
1138	below = 0;	1119	below = 0;
1139		1120
1140	if (map->in_memory == MAP_SAVING)	1121	if (map->in_memory == MAP_SAVING)
…		…
1150	* appropriately.	1131	* appropriately.
1151	*/	1132	*/
1152	pl->close_container ();	1133	pl->close_container ();
1153		1134
1154	//TODO: the floorbox prev/next might need updating	1135	//TODO: the floorbox prev/next might need updating
1155	esrv_del_item (pl->contr, count);	1136	//esrv_del_item (pl->contr, count);
		1137	//TODO: update floorbox to preserve ordering
		1138	if (pl->contr->ns)
		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	op->remove ();	1273	op->remove ();
1292		1274
1293	/* Ideally, the caller figures this out. However, it complicates a lot	1275	/* Ideally, the caller figures this out. However, it complicates a lot
1294	* 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
1295	* need extra work	1277	* need extra work
1296	*/	1278	*/
1297	if (!xy_normalise (m, op->x, op->y))	1279	if (!xy_normalise (m, op->x, op->y))
1298	{	1280	{
1299	op->destroy (1);	1281	op->head_ ()->destroy (1);// remove head_ once all tail object destroyers found
1300	return 0;	1282	return 0;
1301	}	1283	}
1302		1284
1303	if (object *more = op->more)	1285	if (object *more = op->more)
1304	if (!insert_ob_in_map (more, m, originator, flag))	1286	if (!insert_ob_in_map (more, m, originator, flag))
…		…
1313	*/	1295	*/
1314	if (op->nrof && !(flag & INS_NO_MERGE))	1296	if (op->nrof && !(flag & INS_NO_MERGE))
1315	for (object *tmp = ms.bot; tmp; tmp = tmp->above)	1297	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1316	if (object::can_merge (op, tmp))	1298	if (object::can_merge (op, tmp))
1317	{	1299	{
1318	// TODO: we atcually want to update tmp, not op,	1300	// TODO: we actually want to update tmp, not op,
1319	// but some caller surely breaks when we return tmp	1301	// but some caller surely breaks when we return tmp
1320	// from here :/	1302	// from here :/
1321	op->nrof += tmp->nrof;	1303	op->nrof += tmp->nrof;
1322	tmp->destroy (1);	1304	tmp->destroy (1);
1323	}	1305	}
…		…
1328	if (!QUERY_FLAG (op, FLAG_ALIVE))	1310	if (!QUERY_FLAG (op, FLAG_ALIVE))
1329	CLEAR_FLAG (op, FLAG_NO_STEAL);	1311	CLEAR_FLAG (op, FLAG_NO_STEAL);
1330		1312
1331	if (flag & INS_BELOW_ORIGINATOR)	1313	if (flag & INS_BELOW_ORIGINATOR)
1332	{	1314	{
1333	if (originator->map != op->map \|\| originator->x != op->x \|\| originator->y != op->y)	1315	if (originator->map != op->map \|\| originator->x != op->x \|\| originator->y != op->y \|\| !originator->is_on_map ())
1334	{	1316	{
1335	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");
1336	abort ();	1318	abort ();
1337	}	1319	}
1338		1320
1339	op->above = originator;	1321	op->above = originator;
1340	op->below = originator->below;	1322	op->below = originator->below;
1341
1342	if (op->below)
1343	op->below->above = op;
1344	else
1345	ms.bot = op;
1346
1347	/* since below originator, no need to update top */
1348	originator->below = op;	1323	originator->below = op;
		1324
		1325	*(op->below ? &op->below->above : &ms.bot) = op;
1349	}	1326	}
1350	else	1327	else
1351	{	1328	{
1352	object top, floor = NULL;	1329	object *floor = 0;
1353		1330	object *top = ms.top;
1354	top = ms.bot;
1355		1331
1356	/* If there are other objects, then */	1332	/* If there are other objects, then */
1357	if (top)	1333	if (top)
1358	{	1334	{
1359	object *last = 0;
1360
1361	/*	1335	/*
1362	* If there are multiple objects on this space, we do some trickier handling.	1336	* If there are multiple objects on this space, we do some trickier handling.
1363	* We've already dealt with merging if appropriate.	1337	* We've already dealt with merging if appropriate.
1364	* Generally, we want to put the new object on top. But if	1338	* Generally, we want to put the new object on top. But if
1365	* flag contains INS_ABOVE_FLOOR_ONLY, once we find the last	1339	* flag contains INS_ABOVE_FLOOR_ONLY, once we find the last
…		…
1368	* once we get to them. This reduces the need to traverse over all of	1342	* once we get to them. This reduces the need to traverse over all of
1369	* them when adding another one - this saves quite a bit of cpu time	1343	* them when adding another one - this saves quite a bit of cpu time
1370	* when lots of spells are cast in one area. Currently, it is presumed	1344	* when lots of spells are cast in one area. Currently, it is presumed
1371	* that flying non pickable objects are spell objects.	1345	* that flying non pickable objects are spell objects.
1372	*/	1346	*/
1373	for (top = ms.bot; top; top = top->above)	1347	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1374	{	1348	{
1375	if (QUERY_FLAG (top, FLAG_IS_FLOOR) \|\| QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))	1349	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) \|\| QUERY_FLAG (tmp, FLAG_OVERLAY_FLOOR))
1376	floor = top;	1350	floor = tmp;
1377		1351
1378	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW \| MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))	1352	if (QUERY_FLAG (tmp, FLAG_NO_PICK) && (tmp->move_type & (MOVE_FLY_LOW \| MOVE_FLY_HIGH)) && !QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1379	{	1353	{
1380	/* We insert above top, so we want this object below this */	1354	/* We insert above top, so we want this object below this */
1381	top = top->below;	1355	top = tmp->below;
1382	break;	1356	break;
1383	}	1357	}
1384		1358
1385	last = top;	1359	top = tmp;
1386	}	1360	}
1387
1388	/* Don't want top to be NULL, so set it to the last valid object */
1389	top = last;
1390		1361
1391	/* We let update_position deal with figuring out what the space	1362	/* We let update_position deal with figuring out what the space
1392	* looks like instead of lots of conditions here.	1363	* looks like instead of lots of conditions here.
1393	* makes things faster, and effectively the same result.	1364	* makes things faster, and effectively the same result.
1394	*/	1365	*/
…		…
1401	*/	1372	*/
1402	if (!(flag & INS_ON_TOP)	1373	if (!(flag & INS_ON_TOP)
1403	&& ms.flags () & P_BLOCKSVIEW	1374	&& ms.flags () & P_BLOCKSVIEW
1404	&& (op->face && !faces [op->face].visibility))	1375	&& (op->face && !faces [op->face].visibility))
1405	{	1376	{
		1377	object *last;
		1378
1406	for (last = top; last != floor; last = last->below)	1379	for (last = top; last != floor; last = last->below)
1407	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1380	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1408	break;	1381	break;
1409		1382
1410	/* Check to see if we found the object that blocks view,	1383	/* Check to see if we found the object that blocks view,
…		…
1421	top = floor;	1394	top = floor;
1422		1395
1423	/* Top is the object that our object (op) is going to get inserted above.	1396	/* Top is the object that our object (op) is going to get inserted above.
1424	*/	1397	*/
1425		1398
1426	/* First object on this space */	1399	/* no top found, insert on top */
1427	if (!top)	1400	if (!top)
1428	{	1401	{
1429	op->above = ms.bot;
1430
1431	if (op->above)
1432	op->above->below = op;
1433
1434	op->below = 0;	1402	op->above = 0;
		1403	op->below = ms.top;
1435	ms.bot = op;	1404	ms.top = op;
		1405
		1406	*(op->below ? &op->below->above : &ms.bot) = op;
1436	}	1407	}
1437	else	1408	else
1438	{ /* get inserted into the stack above top */	1409	{ /* get inserted into the stack above top */
1439	op->above = top->above;	1410	op->above = top->above;
1440
1441	if (op->above)
1442	op->above->below = op;	1411	top->above = op;
1443		1412
1444	op->below = top;	1413	op->below = top;
1445	top->above = op;	1414	*(op->above ? &op->above->below : &ms.top) = op;
1446	}	1415	}
1447
1448	if (!op->above)
1449	ms.top = op;
1450	} /* else not INS_BELOW_ORIGINATOR */	1416	} /* else not INS_BELOW_ORIGINATOR */
1451		1417
1452	if (op->type == PLAYER)	1418	if (op->type == PLAYER)
1453	{	1419	{
1454	op->contr->do_los = 1;	1420	op->contr->do_los = 1;
…		…
1458		1424
1459	op->map->dirty = true;	1425	op->map->dirty = true;
1460		1426
1461	if (object *pl = ms.player ())	1427	if (object *pl = ms.player ())
1462	//TODO: the floorbox prev/next might need updating	1428	//TODO: the floorbox prev/next might need updating
1463	esrv_send_item (pl, op);	1429	//esrv_send_item (pl, op);
		1430	//TODO: update floorbox to preserve ordering
		1431	if (pl->contr->ns)
		1432	pl->contr->ns->floorbox_update ();
1464		1433
1465	/* If this object glows, it may affect lighting conditions that are	1434	/* If this object glows, it may affect lighting conditions that are
1466	* visible to others on this map. But update_all_los is really	1435	* visible to others on this map. But update_all_los is really
1467	* an inefficient way to do this, as it means los for all players	1436	* an inefficient way to do this, as it means los for all players
1468	* on the map will get recalculated. The players could very well	1437	* on the map will get recalculated. The players could very well
…		…
1588	}	1557	}
1589	else	1558	else
1590	{	1559	{
1591	decrease (nr);	1560	decrease (nr);
1592		1561
1593	object *op = object_create_clone (this);	1562	object *op = deep_clone ();
1594	op->nrof = nr;	1563	op->nrof = nr;
1595	return op;	1564	return op;
1596	}	1565	}
1597	}	1566	}
1598		1567
…		…
1819	LOG (llevError, "Present_arch called outside map.\n");	1788	LOG (llevError, "Present_arch called outside map.\n");
1820	return NULL;	1789	return NULL;
1821	}	1790	}
1822		1791
1823	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)	1792	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1824	if (tmp->arch == at)	1793	if (tmp->arch->archname == at->archname)
1825	return tmp;	1794	return tmp;
1826		1795
1827	return NULL;	1796	return NULL;
1828	}	1797	}
1829		1798
…		…
1893	* The first matching object is returned, or NULL if none.	1862	* The first matching object is returned, or NULL if none.
1894	*/	1863	*/
1895	object *	1864	object *
1896	present_arch_in_ob (const archetype at, const object op)	1865	present_arch_in_ob (const archetype at, const object op)
1897	{	1866	{
1898	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)	1867	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1899	if (tmp->arch == at)	1868	if (tmp->arch->archname == at->archname)
1900	return tmp;	1869	return tmp;
1901		1870
1902	return NULL;	1871	return NULL;
1903	}	1872	}
1904		1873
…		…
2313		2282
2314	/*	2283	/*
2315	* create clone from object to another	2284	* create clone from object to another
2316	*/	2285	*/
2317	object *	2286	object *
2318	object_create_clone (object *asrc)	2287	object::deep_clone ()
2319	{	2288	{
2320	object dst = 0, tmp, src, prev, *item;	2289	assert (("deep_clone called on non-head object", is_head ()));
2321		2290
2322	if (!asrc)	2291	object *dst = clone ();
2323	return 0;
2324		2292
2325	src = asrc->head_ ();	2293	object *prev = dst;
2326
2327	prev = 0;
2328	for (object *part = src; part; part = part->more)	2294	for (object *part = this->more; part; part = part->more)
2329	{	2295	{
2330	tmp = part->clone ();	2296	object *tmp = part->clone ();
2331	tmp->x -= src->x;
2332	tmp->y -= src->y;
2333
2334	if (!part->head)
2335	{
2336	dst = tmp;
2337	tmp->head = 0;
2338	}
2339	else
2340	tmp->head = dst;	2297	tmp->head = dst;
2341
2342	tmp->more = 0;
2343
2344	if (prev)
2345	prev->more = tmp;	2298	prev->more = tmp;
2346
2347	prev = tmp;	2299	prev = tmp;
2348	}	2300	}
2349		2301
2350	for (item = src->inv; item; item = item->below)	2302	for (object *item = inv; item; item = item->below)
2351	insert_ob_in_ob (object_create_clone (item), dst);	2303	insert_ob_in_ob (item->deep_clone (), dst);
2352		2304
2353	return dst;	2305	return dst;
2354	}	2306	}
2355		2307
2356	/* This returns the first object in who's inventory that	2308	/* This returns the first object in who's inventory that
…		…
2365	return tmp;	2317	return tmp;
2366		2318
2367	return 0;	2319	return 0;
2368	}	2320	}
2369		2321
2370	/* If ob has a field named key, return the link from the list,	2322	const shstr &
2371	* otherwise return NULL.	2323	object::kv_get (const shstr &key) const
2372	*
2373	* key must be a passed in shared string - otherwise, this won't
2374	* do the desired thing.
2375	*/
2376	key_value *
2377	get_ob_key_link (const object ob, const char key)
2378	{	2324	{
2379	for (key_value *link = ob->key_values; link; link = link->next)	2325	for (key_value *kv = key_values; kv; kv = kv->next)
2380	if (link->key == key)	2326	if (kv->key == key)
2381	return link;
2382
2383	return 0;
2384	}
2385
2386	/*
2387	* Returns the value of op has an extra_field for key, or NULL.
2388	*
2389	* The argument doesn't need to be a shared string.
2390	*
2391	* The returned string is shared.
2392	*/
2393	const char *
2394	get_ob_key_value (const object op, const char const key)
2395	{
2396	key_value *link;
2397	shstr_cmp canonical_key (key);
2398
2399	if (!canonical_key)
2400	{
2401	/* 1. There being a field named key on any object
2402	* implies there'd be a shared string to find.
2403	* 2. Since there isn't, no object has this field.
2404	* 3. Therefore, this object doesn't have this field.
2405	*/
2406	return 0;
2407	}
2408
2409	/* This is copied from get_ob_key_link() above -
2410	* only 4 lines, and saves the function call overhead.
2411	*/
2412	for (link = op->key_values; link; link = link->next)
2413	if (link->key == canonical_key)
2414	return link->value;	2327	return kv->value;
2415		2328
2416	return 0;	2329	return shstr_null;
2417	}	2330	}
2418		2331
2419	/*	2332	void
2420	* Updates the canonical_key in op to value.	2333	object::kv_set (const shstr &key, const shstr &value)
2421	*
2422	* canonical_key is a shared string (value doesn't have to be).
2423	*
2424	* Unless add_key is TRUE, it won't add fields, only change the value of existing
2425	* keys.
2426	*
2427	* Returns TRUE on success.
2428	*/
2429	int
2430	set_ob_key_value_s (object op, const shstr & canonical_key, const char value, int add_key)
2431	{	2334	{
2432	key_value field = NULL, last = NULL;	2335	for (key_value *kv = key_values; kv; kv = kv->next)
2433		2336	if (kv->key == key)
2434	for (field = op->key_values; field != NULL; field = field->next)
2435	{
2436	if (field->key != canonical_key)
2437	{	2337	{
2438	last = field;	2338	kv->value = value;
2439	continue;	2339	return;
2440	}	2340	}
2441		2341
2442	if (value)	2342	key_value *kv = new key_value;
2443	field->value = value;	2343
2444	else	2344	kv->next = key_values;
		2345	kv->key = key;
		2346	kv->value = value;
		2347
		2348	key_values = kv;
		2349	}
		2350
		2351	void
		2352	object::kv_del (const shstr &key)
		2353	{
		2354	for (key_value *kvp = &key_values; kvp; kvp = &(*kvp)->next)
		2355	if ((*kvp)->key == key)
2445	{	2356	{
2446	/* Basically, if the archetype has this key set,	2357	key_value kv = kvp;
2447	* we need to store the null value so when we save	2358	kvp = (kvp)->next;
2448	* it, we save the empty value so that when we load,	2359	delete kv;
2449	* we get this value back again.	2360	return;
2450	*/
2451	if (get_ob_key_link (op->arch, canonical_key))
2452	field->value = 0;
2453	else
2454	{
2455	if (last)
2456	last->next = field->next;
2457	else
2458	op->key_values = field->next;
2459
2460	delete field;
2461	}
2462	}	2361	}
2463	return TRUE;
2464	}
2465	/* IF we get here, key doesn't exist */
2466
2467	/* No field, we'll have to add it. */
2468
2469	if (!add_key)
2470	return FALSE;
2471
2472	/* There isn't any good reason to store a null
2473	* value in the key/value list. If the archetype has
2474	* this key, then we should also have it, so shouldn't
2475	* be here. If user wants to store empty strings,
2476	* should pass in ""
2477	*/
2478	if (value == NULL)
2479	return TRUE;
2480
2481	field = new key_value;
2482
2483	field->key = canonical_key;
2484	field->value = value;
2485	/* Usual prepend-addition. */
2486	field->next = op->key_values;
2487	op->key_values = field;
2488
2489	return TRUE;
2490	}
2491
2492	/*
2493	* Updates the key in op to value.
2494	*
2495	* If add_key is FALSE, this will only update existing keys,
2496	* and not add new ones.
2497	* In general, should be little reason FALSE is ever passed in for add_key
2498	*
2499	* Returns TRUE on success.
2500	*/
2501	int
2502	set_ob_key_value (object op, const char key, const char *value, int add_key)
2503	{
2504	shstr key_ (key);
2505
2506	return set_ob_key_value_s (op, key_, value, add_key);
2507	}	2362	}
2508		2363
2509	object::depth_iterator::depth_iterator (object *container)	2364	object::depth_iterator::depth_iterator (object *container)
2510	: iterator_base (container)	2365	: iterator_base (container)
2511	{	2366	{
…		…
2609	object::open_container (object *new_container)	2464	object::open_container (object *new_container)
2610	{	2465	{
2611	if (container == new_container)	2466	if (container == new_container)
2612	return;	2467	return;
2613		2468
2614	if (object *old_container = container)	2469	object *old_container = container;
		2470
		2471	if (old_container)
2615	{	2472	{
2616	if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))	2473	if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
2617	return;	2474	return;
2618		2475
2619	#if 0	2476	#if 0
…		…
2621	if (object *closer = old_container->inv)	2478	if (object *closer = old_container->inv)
2622	if (closer->type == CLOSE_CON)	2479	if (closer->type == CLOSE_CON)
2623	closer->destroy ();	2480	closer->destroy ();
2624	#endif	2481	#endif
2625		2482
		2483	// make sure the container is available
		2484	esrv_send_item (this, old_container);
		2485
2626	old_container->flag [FLAG_APPLIED] = false;	2486	old_container->flag [FLAG_APPLIED] = false;
2627	container = 0;	2487	container = 0;
2628		2488
		2489	// client needs item update to make it work, client bug requires this to be separate
2629	esrv_update_item (UPD_FLAGS, this, old_container);	2490	esrv_update_item (UPD_FLAGS, this, old_container);
		2491
2630	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));	2492	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
2631	play_sound (sound_find ("chest_close"));	2493	play_sound (sound_find ("chest_close"));
2632	}	2494	}
2633		2495
2634	if (new_container)	2496	if (new_container)
…		…
2647	}	2509	}
2648	#endif	2510	#endif
2649		2511
2650	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));	2512	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));
2651		2513
		2514	// make sure the container is available, client bug requires this to be separate
		2515	esrv_send_item (this, new_container);
		2516
2652	new_container->flag [FLAG_APPLIED] = true;	2517	new_container->flag [FLAG_APPLIED] = true;
2653	container = new_container;	2518	container = new_container;
2654		2519
		2520	// client needs flag change
2655	esrv_update_item (UPD_FLAGS, this, new_container);	2521	esrv_update_item (UPD_FLAGS, this, new_container);
2656	esrv_send_inventory (this, new_container);	2522	esrv_send_inventory (this, new_container);
2657	play_sound (sound_find ("chest_open"));	2523	play_sound (sound_find ("chest_open"));
2658	}	2524	}
		2525	// else if (!old_container->env && contr && contr->ns)
		2526	// contr->ns->floorbox_reset ();
2659	}	2527	}
2660		2528
2661	object *	2529	object *
2662	object::force_find (const shstr name)	2530	object::force_find (const shstr name)
2663	{	2531	{

Diff Legend

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

Comparing deliantra/server/common/object.C (file contents): Revision 1.218 by root, Wed Apr 23 07:25:54 2008 UTC vs. Revision 1.238 by root, Wed May 7 11:02:50 2008 UTC

Diff Legend

Comparing deliantra/server/common/object.C (file contents):
Revision 1.218 by root, Wed Apr 23 07:25:54 2008 UTC vs.
Revision 1.238 by root, Wed May 7 11:02:50 2008 UTC