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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.222 by root, Wed Apr 30 05:06:36 2008 UTC vs.
Revision 1.250 by root, Wed Jul 16 14:29:40 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	*
…		…
220	SET_FLAG (ob1, FLAG_BEEN_APPLIED);	206	SET_FLAG (ob1, FLAG_BEEN_APPLIED);
221		207
222	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))	208	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))
223	SET_FLAG (ob2, FLAG_BEEN_APPLIED);	209	SET_FLAG (ob2, FLAG_BEEN_APPLIED);
224		210
225	if (ob1->arch->name != ob2->arch->name	211	if (ob1->arch->archname != ob2->arch->archname
226	\|\| ob1->name != ob2->name	212	\|\| ob1->name != ob2->name
227	\|\| ob1->title != ob2->title	213	\|\| ob1->title != ob2->title
228	\|\| ob1->msg != ob2->msg	214	\|\| ob1->msg != ob2->msg
229	\|\| ob1->weight != ob2->weight	215	\|\| ob1->weight != ob2->weight
230	\|\| ob1->attacktype != ob2->attacktype	216	\|\| ob1->attacktype != ob2->attacktype
231	\|\| ob1->magic != ob2->magic	217	\|\| ob1->magic != ob2->magic
232	\|\| ob1->slaying != ob2->slaying	218	\|\| ob1->slaying != ob2->slaying
233	\|\| ob1->skill != ob2->skill	219	\|\| ob1->skill != ob2->skill
234	\|\| ob1->value != ob2->value	220	\|\| ob1->value != ob2->value
235	\|\| ob1->animation_id != ob2->animation_id	221	\|\| ob1->animation_id != ob2->animation_id
		222	\|\| (ob1->face != ob2->face && !ob1->animation_id) // face and animation are dependent on each other
236	\|\| ob1->client_type != ob2->client_type	223	\|\| ob1->client_type != ob2->client_type
237	\|\| ob1->materialname != ob2->materialname	224	\|\| ob1->materialname != ob2->materialname
238	\|\| ob1->lore != ob2->lore	225	\|\| ob1->lore != ob2->lore
239	\|\| ob1->subtype != ob2->subtype	226	\|\| ob1->subtype != ob2->subtype
240	\|\| ob1->move_type != ob2->move_type	227	\|\| ob1->move_type != ob2->move_type
…		…
358	else	345	else
359	{	346	{
360	// maybe there is a player standing on the same mapspace	347	// maybe there is a player standing on the same mapspace
361	// this will catch the case where "this" is a player	348	// this will catch the case where "this" is a player
362	if (object *pl = ms ().player ())	349	if (object *pl = ms ().player ())
		350	if ((!pl->container && pl->contr->ns && !pl->contr->ns->update_look)
363	if (!pl->container \|\| this == pl->container)	351	\|\| this == pl->container)
364	return pl;	352	return pl;
365	}	353	}
366	}	354	}
367		355
368	return 0;	356	return 0;
369	}	357	}
370		358
371	// adjust weight per container type ("of holding")	359	// adjust weight per container type ("of holding")
372	static sint32	360	static sint32
373	weight_adjust (object *op, sint32 weight)	361	weight_adjust_for (object *op, sint32 weight)
374	{	362	{
375	return op->type == CONTAINER	363	return op->type == CONTAINER
376	? lerp (weight, 0, 100, 0, 100 - op->stats.Str)	364	? lerp (weight, 0, 100, 0, 100 - op->stats.Str)
377	: weight;	365	: weight;
378	}	366	}
…		…
384	static void	372	static void
385	adjust_weight (object *op, sint32 weight)	373	adjust_weight (object *op, sint32 weight)
386	{	374	{
387	while (op)	375	while (op)
388	{	376	{
		377	// adjust by actual difference to account for rounding errors
		378	// i.e. (w2 - w1) / f != w2 / f - w1 / f and the latter is correct
389	weight = weight_adjust (op, weight);	379	weight = weight_adjust_for (op, op->carrying)
		380	- weight_adjust_for (op, op->carrying - weight);
390		381
391	if (!weight)	382	if (!weight)
392	return;	383	return;
393		384
394	op->carrying += weight;	385	op->carrying += weight;
…		…
417	op->update_weight ();	408	op->update_weight ();
418		409
419	sum += op->total_weight ();	410	sum += op->total_weight ();
420	}	411	}
421		412
422	sum = weight_adjust (this, sum);	413	sum = weight_adjust_for (this, sum);
423		414
424	if (sum != carrying)	415	if (sum != carrying)
425	{	416	{
426	carrying = sum;	417	carrying = sum;
427		418
…		…
489	*/	480	*/
490	object *	481	object *
491	find_object_name (const char *str)	482	find_object_name (const char *str)
492	{	483	{
493	shstr_cmp str_ (str);	484	shstr_cmp str_ (str);
494	object *op;
495		485
		486	if (str_)
496	for_all_objects (op)	487	for_all_objects (op)
497	if (op->name == str_)	488	if (op->name == str_)
498	break;	489	return op;
499		490
500	return op;	491	return 0;
501	}	492	}
502		493
503	/*	494	/*
504	* Sets the owner and sets the skill and exp pointers to owner's current	495	* Sets the owner and sets the skill and exp pointers to owner's current
505	* skill and experience objects.	496	* skill and experience objects.
…		…
603	}	594	}
604		595
605	op->key_values = 0;	596	op->key_values = 0;
606	}	597	}
607		598
608	object &	599	/*
609	object::operator =(const object &src)	600	* copy_to first frees everything allocated by the dst object,
		601	* and then copies the contents of itself into the second
		602	* object, allocating what needs to be allocated. Basically, any
		603	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
		604	* if the first object is freed, the pointers in the new object
		605	* will point at garbage.
		606	*/
		607	void
		608	object::copy_to (object *dst)
610	{	609	{
611	bool is_freed = flag [FLAG_FREED];	610	dst->remove ();
612	bool is_removed = flag [FLAG_REMOVED];
613
614	(object_copy )this = src;	611	(object_copy )dst = *this;
615
616	flag [FLAG_FREED] = is_freed;
617	flag [FLAG_REMOVED] = is_removed;	612	dst->flag [FLAG_REMOVED] = true;
618		613
619	/* Copy over key_values, if any. */	614	/* Copy over key_values, if any. */
620	if (src.key_values)	615	if (key_values)
621	{	616	{
622	key_value *tail = 0;	617	key_value *tail = 0;
623	key_values = 0;	618	dst->key_values = 0;
624		619
625	for (key_value *i = src.key_values; i; i = i->next)	620	for (key_value *i = key_values; i; i = i->next)
626	{	621	{
627	key_value *new_link = new key_value;	622	key_value *new_link = new key_value;
628		623
629	new_link->next = 0;	624	new_link->next = 0;
630	new_link->key = i->key;	625	new_link->key = i->key;
631	new_link->value = i->value;	626	new_link->value = i->value;
632		627
633	/* Try and be clever here, too. */	628	/* Try and be clever here, too. */
634	if (!key_values)	629	if (!dst->key_values)
635	{	630	{
636	key_values = new_link;	631	dst->key_values = new_link;
637	tail = new_link;	632	tail = new_link;
638	}	633	}
639	else	634	else
640	{	635	{
641	tail->next = new_link;	636	tail->next = new_link;
642	tail = new_link;	637	tail = new_link;
643	}	638	}
644	}	639	}
645	}	640	}
646	}
647
648	/*
649	* copy_to first frees everything allocated by the dst object,
650	* and then copies the contents of itself into the second
651	* object, allocating what needs to be allocated. Basically, any
652	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
653	* if the first object is freed, the pointers in the new object
654	* will point at garbage.
655	*/
656	void
657	object::copy_to (object *dst)
658	{
659	dst = this;
660		641
661	if (speed < 0)	642	if (speed < 0)
662	dst->speed_left -= rndm ();	643	dst->speed_left -= rndm ();
663		644
664	dst->set_speed (dst->speed);	645	dst->set_speed (dst->speed);
…		…
686	object *	667	object *
687	object::clone ()	668	object::clone ()
688	{	669	{
689	object *neu = create ();	670	object *neu = create ();
690	copy_to (neu);	671	copy_to (neu);
		672	neu->map = map; // not copied by copy_to
691	return neu;	673	return neu;
692	}	674	}
693		675
694	/*	676	/*
695	* If an object with the IS_TURNABLE() flag needs to be turned due	677	* If an object with the IS_TURNABLE() flag needs to be turned due
…		…
924	* drop on that space.	906	* drop on that space.
925	*/	907	*/
926	if (!drop_to_ground	908	if (!drop_to_ground
927	\|\| !map	909	\|\| !map
928	\|\| map->in_memory != MAP_ACTIVE	910	\|\| map->in_memory != MAP_ACTIVE
929	\|\| map->nodrop	911	\|\| map->no_drop
930	\|\| ms ().move_block == MOVE_ALL)	912	\|\| ms ().move_block == MOVE_ALL)
931	{	913	{
932	while (inv)	914	while (inv)
933	{
934	inv->destroy_inv (false);
935	inv->destroy ();	915	inv->destroy (true);
936	}
937	}	916	}
938	else	917	else
939	{ /* Put objects in inventory onto this space */	918	{ /* Put objects in inventory onto this space */
940	while (inv)	919	while (inv)
941	{	920	{
…		…
959	object *op = new object;	938	object *op = new object;
960	op->link ();	939	op->link ();
961	return op;	940	return op;
962	}	941	}
963		942
		943	static struct freed_map : maptile
		944	{
		945	freed_map ()
		946	{
		947	path = "<freed objects map>";
		948	name = "/internal/freed_objects_map";
		949	width = 3;
		950	height = 3;
		951	no_drop = 1;
		952	no_reset = 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
964	void	964	void
965	object::do_destroy ()	965	object::do_destroy ()
966	{	966	{
967	if (flag [FLAG_IS_LINKED])	967	if (flag [FLAG_IS_LINKED])
968	remove_button_link (this);	968	remove_button_link (this);
…		…
978	unlink ();	978	unlink ();
979		979
980	flag [FLAG_FREED] = 1;	980	flag [FLAG_FREED] = 1;
981		981
982	// hack to ensure that freed objects still have a valid map	982	// hack to ensure that freed objects still have a valid map
983	{
984	static maptile *freed_map; // freed objects are moved here to avoid crashes
985
986	if (!freed_map)
987	{
988	freed_map = new maptile;
989
990	freed_map->path = "<freed objects map>";
991	freed_map->name = "/internal/freed_objects_map";
992	freed_map->width = 3;
993	freed_map->height = 3;
994	freed_map->nodrop = 1;
995
996	freed_map->alloc ();
997	freed_map->in_memory = MAP_ACTIVE;
998	}
999
1000	map = freed_map;	983	map = &freed_map;
1001	x = 1;	984	x = 1;
1002	y = 1;	985	y = 1;
1003	}
1004		986
1005	if (more)	987	if (more)
1006	{	988	{
1007	more->destroy ();	989	more->destroy ();
1008	more = 0;	990	more = 0;
…		…
1025		1007
1026	if (!is_head () && !head->destroyed ())	1008	if (!is_head () && !head->destroyed ())
1027	{	1009	{
1028	LOG (llevError \| logBacktrace, "tried to destroy the tail of an object");	1010	LOG (llevError \| logBacktrace, "tried to destroy the tail of an object");
1029	head->destroy (destroy_inventory);	1011	head->destroy (destroy_inventory);
		1012	return;
1030	}	1013	}
1031		1014
1032	destroy_inv (!destroy_inventory);	1015	destroy_inv (!destroy_inventory);
1033		1016
1034	if (is_head ())	1017	if (is_head ())
…		…
1073	if (object *pl = visible_to ())	1056	if (object *pl = visible_to ())
1074	esrv_del_item (pl->contr, count);	1057	esrv_del_item (pl->contr, count);
1075	flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed	1058	flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed
1076		1059
1077	adjust_weight (env, -total_weight ());	1060	adjust_weight (env, -total_weight ());
1078
1079	*(above ? &above->below : &env->inv) = below;
1080
1081	if (below)
1082	below->above = above;
1083		1061
1084	/* we set up values so that it could be inserted into	1062	/* we set up values so that it could be inserted into
1085	* the map, but we don't actually do that - it is up	1063	* the map, but we don't actually do that - it is up
1086	* to the caller to decide what we want to do.	1064	* to the caller to decide what we want to do.
1087	*/	1065	*/
1088	map = env->map;	1066	map = env->map;
1089	x = env->x;	1067	x = env->x;
1090	y = env->y;	1068	y = env->y;
		1069
		1070	// make sure cmov optimisation is applicable
		1071	*(above ? &above->below : &env->inv) = below;
		1072	*(below ? &below->above : &above ) = above; // &above is just a dummy
		1073
1091	above = 0;	1074	above = 0;
1092	below = 0;	1075	below = 0;
1093	env = 0;	1076	env = 0;
1094		1077
1095	/* NO_FIX_PLAYER is set when a great many changes are being	1078	/* NO_FIX_PLAYER is set when a great many changes are being
…		…
1125		1108
1126	esrv_del_item (pl->contr, count);	1109	esrv_del_item (pl->contr, count);
1127	}	1110	}
1128		1111
1129	/* link the object above us */	1112	/* link the object above us */
1130	if (above)	1113	// re-link, make sure compiler can easily use cmove
1131	above->below = below;	1114	*(above ? &above->below : &ms.top) = below;
1132	else	1115	*(below ? &below->above : &ms.bot) = above;
1133	ms.top = below; /* we were top, set new top */
1134
1135	/* Relink the object below us, if there is one */
1136	if (below)
1137	below->above = above;
1138	else
1139	{
1140	/* Nothing below, which means we need to relink map object for this space
1141	* use translated coordinates in case some oddness with map tiling is
1142	* evident
1143	*/
1144	if (GET_MAP_OB (map, x, y) != this)
1145	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 ());
1146
1147	ms.bot = above; /* goes on above it. */
1148	}
1149		1116
1150	above = 0;	1117	above = 0;
1151	below = 0;	1118	below = 0;
1152		1119
1153	if (map->in_memory == MAP_SAVING)	1120	if (map->in_memory == MAP_SAVING)
…		…
1163	* appropriately.	1130	* appropriately.
1164	*/	1131	*/
1165	pl->close_container ();	1132	pl->close_container ();
1166		1133
1167	//TODO: the floorbox prev/next might need updating	1134	//TODO: the floorbox prev/next might need updating
1168	esrv_del_item (pl->contr, count);	1135	//esrv_del_item (pl->contr, count);
		1136	//TODO: update floorbox to preserve ordering
		1137	if (pl->contr->ns)
		1138	pl->contr->ns->floorbox_update ();
1169	}	1139	}
1170		1140
1171	for (tmp = ms.bot; tmp; tmp = tmp->above)	1141	for (tmp = ms.bot; tmp; tmp = tmp->above)
1172	{	1142	{
1173	/* No point updating the players look faces if he is the object	1143	/* No point updating the players look faces if he is the object
…		…
1265	* job preparing multi-part monsters.	1235	* job preparing multi-part monsters.
1266	*/	1236	*/
1267	object *	1237	object *
1268	insert_ob_in_map_at (object op, maptile m, object *originator, int flag, int x, int y)	1238	insert_ob_in_map_at (object op, maptile m, object *originator, int flag, int x, int y)
1269	{	1239	{
		1240	op->remove ();
		1241
1270	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)	1242	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1271	{	1243	{
1272	tmp->x = x + tmp->arch->x;	1244	tmp->x = x + tmp->arch->x;
1273	tmp->y = y + tmp->arch->y;	1245	tmp->y = y + tmp->arch->y;
1274	}	1246	}
…		…
1297	* just 'op' otherwise	1269	* just 'op' otherwise
1298	*/	1270	*/
1299	object *	1271	object *
1300	insert_ob_in_map (object op, maptile m, object *originator, int flag)	1272	insert_ob_in_map (object op, maptile m, object *originator, int flag)
1301	{	1273	{
1302	assert (!op->flag [FLAG_FREED]);	1274	if (op->is_on_map ())
		1275	{
		1276	LOG (llevError, "insert_ob_in_map called for object already on map");
		1277	abort ();
		1278	}
1303		1279
		1280	if (op->env)
		1281	{
		1282	LOG (llevError, "insert_ob_in_map called for object in an inventory (proceeding)");
1304	op->remove ();	1283	op->remove ();
		1284	}
		1285
		1286	if (op->face && !face_info (op->face))//D TODO: remove soon
		1287	{//D
		1288	LOG (llevError \| logBacktrace, "op->face out of bounds: %s", op->debug_desc ());//D
		1289	op->face = 1;//D
		1290	}//D
1305		1291
1306	/* Ideally, the caller figures this out. However, it complicates a lot	1292	/* Ideally, the caller figures this out. However, it complicates a lot
1307	* 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
1308	* need extra work	1294	* need extra work
1309	*/	1295	*/
1310	if (!xy_normalise (m, op->x, op->y))	1296	if (!xy_normalise (m, op->x, op->y))
1311	{	1297	{
1312	op->destroy (1);	1298	op->head_ ()->destroy (1);// remove head_ once all tail object destroyers found
1313	return 0;	1299	return 0;
1314	}	1300	}
1315		1301
1316	if (object *more = op->more)	1302	if (object *more = op->more)
1317	if (!insert_ob_in_map (more, m, originator, flag))	1303	if (!insert_ob_in_map (more, m, originator, flag))
…		…
1326	*/	1312	*/
1327	if (op->nrof && !(flag & INS_NO_MERGE))	1313	if (op->nrof && !(flag & INS_NO_MERGE))
1328	for (object *tmp = ms.bot; tmp; tmp = tmp->above)	1314	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1329	if (object::can_merge (op, tmp))	1315	if (object::can_merge (op, tmp))
1330	{	1316	{
1331	// TODO: we atcually want to update tmp, not op,	1317	// TODO: we actually want to update tmp, not op,
1332	// but some caller surely breaks when we return tmp	1318	// but some caller surely breaks when we return tmp
1333	// from here :/	1319	// from here :/
1334	op->nrof += tmp->nrof;	1320	op->nrof += tmp->nrof;
1335	tmp->destroy (1);	1321	tmp->destroy (1);
1336	}	1322	}
…		…
1347	{	1333	{
1348	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");	1334	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");
1349	abort ();	1335	abort ();
1350	}	1336	}
1351		1337
		1338	if (!originator->is_on_map ())
		1339	LOG (llevDebug \| logBacktrace, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map",
		1340	op->debug_desc (), originator->debug_desc ());
		1341
1352	op->above = originator;	1342	op->above = originator;
1353	op->below = originator->below;	1343	op->below = originator->below;
1354
1355	if (op->below)
1356	op->below->above = op;
1357	else
1358	ms.bot = op;
1359
1360	/* since below originator, no need to update top */
1361	originator->below = op;	1344	originator->below = op;
		1345
		1346	*(op->below ? &op->below->above : &ms.bot) = op;
1362	}	1347	}
1363	else	1348	else
1364	{	1349	{
1365	object top, floor = NULL;	1350	object *floor = 0;
1366		1351	object *top = ms.top;
1367	top = ms.bot;
1368		1352
1369	/* If there are other objects, then */	1353	/* If there are other objects, then */
1370	if (top)	1354	if (top)
1371	{	1355	{
1372	object *last = 0;
1373
1374	/*	1356	/*
1375	* If there are multiple objects on this space, we do some trickier handling.	1357	* If there are multiple objects on this space, we do some trickier handling.
1376	* We've already dealt with merging if appropriate.	1358	* We've already dealt with merging if appropriate.
1377	* Generally, we want to put the new object on top. But if	1359	* Generally, we want to put the new object on top. But if
1378	* flag contains INS_ABOVE_FLOOR_ONLY, once we find the last	1360	* flag contains INS_ABOVE_FLOOR_ONLY, once we find the last
…		…
1381	* once we get to them. This reduces the need to traverse over all of	1363	* once we get to them. This reduces the need to traverse over all of
1382	* them when adding another one - this saves quite a bit of cpu time	1364	* them when adding another one - this saves quite a bit of cpu time
1383	* when lots of spells are cast in one area. Currently, it is presumed	1365	* when lots of spells are cast in one area. Currently, it is presumed
1384	* that flying non pickable objects are spell objects.	1366	* that flying non pickable objects are spell objects.
1385	*/	1367	*/
1386	for (top = ms.bot; top; top = top->above)	1368	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1387	{	1369	{
1388	if (QUERY_FLAG (top, FLAG_IS_FLOOR) \|\| QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))	1370	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) \|\| QUERY_FLAG (tmp, FLAG_OVERLAY_FLOOR))
1389	floor = top;	1371	floor = tmp;
1390		1372
1391	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW \| MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))	1373	if (QUERY_FLAG (tmp, FLAG_NO_PICK) && (tmp->move_type & (MOVE_FLY_LOW \| MOVE_FLY_HIGH)) && !QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1392	{	1374	{
1393	/* We insert above top, so we want this object below this */	1375	/* We insert above top, so we want this object below this */
1394	top = top->below;	1376	top = tmp->below;
1395	break;	1377	break;
1396	}	1378	}
1397		1379
1398	last = top;	1380	top = tmp;
1399	}	1381	}
1400
1401	/* Don't want top to be NULL, so set it to the last valid object */
1402	top = last;
1403		1382
1404	/* We let update_position deal with figuring out what the space	1383	/* We let update_position deal with figuring out what the space
1405	* looks like instead of lots of conditions here.	1384	* looks like instead of lots of conditions here.
1406	* makes things faster, and effectively the same result.	1385	* makes things faster, and effectively the same result.
1407	*/	1386	*/
…		…
1414	*/	1393	*/
1415	if (!(flag & INS_ON_TOP)	1394	if (!(flag & INS_ON_TOP)
1416	&& ms.flags () & P_BLOCKSVIEW	1395	&& ms.flags () & P_BLOCKSVIEW
1417	&& (op->face && !faces [op->face].visibility))	1396	&& (op->face && !faces [op->face].visibility))
1418	{	1397	{
		1398	object *last;
		1399
1419	for (last = top; last != floor; last = last->below)	1400	for (last = top; last != floor; last = last->below)
1420	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1401	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1421	break;	1402	break;
1422		1403
1423	/* Check to see if we found the object that blocks view,	1404	/* Check to see if we found the object that blocks view,
…		…
1431	} /* If objects on this space */	1412	} /* If objects on this space */
1432		1413
1433	if (flag & INS_ABOVE_FLOOR_ONLY)	1414	if (flag & INS_ABOVE_FLOOR_ONLY)
1434	top = floor;	1415	top = floor;
1435		1416
1436	/* Top is the object that our object (op) is going to get inserted above.	1417	// insert object above top, or bottom-most if top = 0
1437	*/
1438
1439	/* First object on this space */
1440	if (!top)	1418	if (!top)
1441	{	1419	{
		1420	op->below = 0;
1442	op->above = ms.bot;	1421	op->above = ms.bot;
1443
1444	if (op->above)
1445	op->above->below = op;
1446
1447	op->below = 0;
1448	ms.bot = op;	1422	ms.bot = op;
		1423
		1424	*(op->above ? &op->above->below : &ms.top) = op;
1449	}	1425	}
1450	else	1426	else
1451	{ /* get inserted into the stack above top */	1427	{
1452	op->above = top->above;	1428	op->above = top->above;
1453
1454	if (op->above)
1455	op->above->below = op;	1429	top->above = op;
1456		1430
1457	op->below = top;	1431	op->below = top;
1458	top->above = op;	1432	*(op->above ? &op->above->below : &ms.top) = op;
1459	}	1433	}
1460		1434	}
1461	if (!op->above)
1462	ms.top = op;
1463	} /* else not INS_BELOW_ORIGINATOR */
1464		1435
1465	if (op->type == PLAYER)	1436	if (op->type == PLAYER)
1466	{	1437	{
1467	op->contr->do_los = 1;	1438	op->contr->do_los = 1;
1468	++op->map->players;	1439	++op->map->players;
…		…
1471		1442
1472	op->map->dirty = true;	1443	op->map->dirty = true;
1473		1444
1474	if (object *pl = ms.player ())	1445	if (object *pl = ms.player ())
1475	//TODO: the floorbox prev/next might need updating	1446	//TODO: the floorbox prev/next might need updating
1476	esrv_send_item (pl, op);	1447	//esrv_send_item (pl, op);
		1448	//TODO: update floorbox to preserve ordering
		1449	if (pl->contr->ns)
		1450	pl->contr->ns->floorbox_update ();
1477		1451
1478	/* If this object glows, it may affect lighting conditions that are	1452	/* If this object glows, it may affect lighting conditions that are
1479	* visible to others on this map. But update_all_los is really	1453	* visible to others on this map. But update_all_los is really
1480	* an inefficient way to do this, as it means los for all players	1454	* an inefficient way to do this, as it means los for all players
1481	* on the map will get recalculated. The players could very well	1455	* on the map will get recalculated. The players could very well
…		…
1565		1539
1566	nrof -= nr;	1540	nrof -= nr;
1567		1541
1568	if (nrof)	1542	if (nrof)
1569	{	1543	{
1570	adjust_weight (env, -weight * nr); // carrying == 0	1544	adjust_weight (env, -weight * max (1, nr)); // carrying == 0
1571		1545
1572	if (object *pl = visible_to ())	1546	if (object *pl = visible_to ())
1573	esrv_update_item (UPD_NROF, pl, this);	1547	esrv_update_item (UPD_NROF, pl, this);
1574		1548
1575	return true;	1549	return true;
1576	}	1550	}
1577	else	1551	else
1578	{	1552	{
1579	destroy (1);	1553	destroy ();
1580	return false;	1554	return false;
1581	}	1555	}
1582	}	1556	}
1583		1557
1584	/*	1558	/*
…		…
1601	}	1575	}
1602	else	1576	else
1603	{	1577	{
1604	decrease (nr);	1578	decrease (nr);
1605		1579
1606	object *op = object_create_clone (this);	1580	object *op = deep_clone ();
1607	op->nrof = nr;	1581	op->nrof = nr;
1608	return op;	1582	return op;
1609	}	1583	}
1610	}	1584	}
1611		1585
…		…
1832	LOG (llevError, "Present_arch called outside map.\n");	1806	LOG (llevError, "Present_arch called outside map.\n");
1833	return NULL;	1807	return NULL;
1834	}	1808	}
1835		1809
1836	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)	1810	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1837	if (tmp->arch == at)	1811	if (tmp->arch->archname == at->archname)
1838	return tmp;	1812	return tmp;
1839		1813
1840	return NULL;	1814	return NULL;
1841	}	1815	}
1842		1816
…		…
1906	* The first matching object is returned, or NULL if none.	1880	* The first matching object is returned, or NULL if none.
1907	*/	1881	*/
1908	object *	1882	object *
1909	present_arch_in_ob (const archetype at, const object op)	1883	present_arch_in_ob (const archetype at, const object op)
1910	{	1884	{
1911	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)	1885	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1912	if (tmp->arch == at)	1886	if (tmp->arch->archname == at->archname)
1913	return tmp;	1887	return tmp;
1914		1888
1915	return NULL;	1889	return NULL;
1916	}	1890	}
1917		1891
…		…
2326		2300
2327	/*	2301	/*
2328	* create clone from object to another	2302	* create clone from object to another
2329	*/	2303	*/
2330	object *	2304	object *
2331	object_create_clone (object *asrc)	2305	object::deep_clone ()
2332	{	2306	{
2333	object dst = 0, tmp, src, prev, *item;	2307	assert (("deep_clone called on non-head object", is_head ()));
2334		2308
2335	if (!asrc)	2309	object *dst = clone ();
2336	return 0;
2337		2310
2338	src = asrc->head_ ();	2311	object *prev = dst;
2339
2340	prev = 0;
2341	for (object *part = src; part; part = part->more)	2312	for (object *part = this->more; part; part = part->more)
2342	{	2313	{
2343	tmp = part->clone ();	2314	object *tmp = part->clone ();
2344	tmp->x -= src->x;
2345	tmp->y -= src->y;
2346
2347	if (!part->head)
2348	{
2349	dst = tmp;
2350	tmp->head = 0;
2351	}
2352	else
2353	tmp->head = dst;	2315	tmp->head = dst;
2354
2355	tmp->more = 0;
2356
2357	if (prev)
2358	prev->more = tmp;	2316	prev->more = tmp;
2359
2360	prev = tmp;	2317	prev = tmp;
2361	}	2318	}
2362		2319
2363	for (item = src->inv; item; item = item->below)	2320	for (object *item = inv; item; item = item->below)
2364	insert_ob_in_ob (object_create_clone (item), dst);	2321	insert_ob_in_ob (item->deep_clone (), dst);
2365		2322
2366	return dst;	2323	return dst;
2367	}	2324	}
2368		2325
2369	/* This returns the first object in who's inventory that	2326	/* This returns the first object in who's inventory that
…		…
2378	return tmp;	2335	return tmp;
2379		2336
2380	return 0;	2337	return 0;
2381	}	2338	}
2382		2339
2383	/* If ob has a field named key, return the link from the list,	2340	const shstr &
2384	* otherwise return NULL.	2341	object::kv_get (const shstr &key) const
2385	*
2386	* key must be a passed in shared string - otherwise, this won't
2387	* do the desired thing.
2388	*/
2389	key_value *
2390	get_ob_key_link (const object ob, const char key)
2391	{	2342	{
2392	for (key_value *link = ob->key_values; link; link = link->next)	2343	for (key_value *kv = key_values; kv; kv = kv->next)
2393	if (link->key == key)	2344	if (kv->key == key)
2394	return link;
2395
2396	return 0;
2397	}
2398
2399	/*
2400	* Returns the value of op has an extra_field for key, or NULL.
2401	*
2402	* The argument doesn't need to be a shared string.
2403	*
2404	* The returned string is shared.
2405	*/
2406	const char *
2407	get_ob_key_value (const object op, const char const key)
2408	{
2409	key_value *link;
2410	shstr_cmp canonical_key (key);
2411
2412	if (!canonical_key)
2413	{
2414	/* 1. There being a field named key on any object
2415	* implies there'd be a shared string to find.
2416	* 2. Since there isn't, no object has this field.
2417	* 3. Therefore, this object doesn't have this field.
2418	*/
2419	return 0;
2420	}
2421
2422	/* This is copied from get_ob_key_link() above -
2423	* only 4 lines, and saves the function call overhead.
2424	*/
2425	for (link = op->key_values; link; link = link->next)
2426	if (link->key == canonical_key)
2427	return link->value;	2345	return kv->value;
2428		2346
2429	return 0;	2347	return shstr_null;
2430	}	2348	}
2431		2349
2432	/*	2350	void
2433	* Updates the canonical_key in op to value.	2351	object::kv_set (const shstr &key, const shstr &value)
2434	*
2435	* canonical_key is a shared string (value doesn't have to be).
2436	*
2437	* Unless add_key is TRUE, it won't add fields, only change the value of existing
2438	* keys.
2439	*
2440	* Returns TRUE on success.
2441	*/
2442	int
2443	set_ob_key_value_s (object op, const shstr & canonical_key, const char value, int add_key)
2444	{	2352	{
2445	key_value field = NULL, last = NULL;	2353	for (key_value *kv = key_values; kv; kv = kv->next)
2446		2354	if (kv->key == key)
2447	for (field = op->key_values; field != NULL; field = field->next)
2448	{
2449	if (field->key != canonical_key)
2450	{	2355	{
2451	last = field;	2356	kv->value = value;
2452	continue;	2357	return;
2453	}	2358	}
2454		2359
2455	if (value)	2360	key_value *kv = new key_value;
2456	field->value = value;	2361
2457	else	2362	kv->next = key_values;
		2363	kv->key = key;
		2364	kv->value = value;
		2365
		2366	key_values = kv;
		2367	}
		2368
		2369	void
		2370	object::kv_del (const shstr &key)
		2371	{
		2372	for (key_value *kvp = &key_values; kvp; kvp = &(*kvp)->next)
		2373	if ((*kvp)->key == key)
2458	{	2374	{
2459	/* Basically, if the archetype has this key set,	2375	key_value kv = kvp;
2460	* we need to store the null value so when we save	2376	kvp = (kvp)->next;
2461	* it, we save the empty value so that when we load,	2377	delete kv;
2462	* we get this value back again.	2378	return;
2463	*/
2464	if (get_ob_key_link (op->arch, canonical_key))
2465	field->value = 0;
2466	else
2467	{
2468	if (last)
2469	last->next = field->next;
2470	else
2471	op->key_values = field->next;
2472
2473	delete field;
2474	}
2475	}	2379	}
2476	return TRUE;
2477	}
2478	/* IF we get here, key doesn't exist */
2479
2480	/* No field, we'll have to add it. */
2481
2482	if (!add_key)
2483	return FALSE;
2484
2485	/* There isn't any good reason to store a null
2486	* value in the key/value list. If the archetype has
2487	* this key, then we should also have it, so shouldn't
2488	* be here. If user wants to store empty strings,
2489	* should pass in ""
2490	*/
2491	if (value == NULL)
2492	return TRUE;
2493
2494	field = new key_value;
2495
2496	field->key = canonical_key;
2497	field->value = value;
2498	/* Usual prepend-addition. */
2499	field->next = op->key_values;
2500	op->key_values = field;
2501
2502	return TRUE;
2503	}
2504
2505	/*
2506	* Updates the key in op to value.
2507	*
2508	* If add_key is FALSE, this will only update existing keys,
2509	* and not add new ones.
2510	* In general, should be little reason FALSE is ever passed in for add_key
2511	*
2512	* Returns TRUE on success.
2513	*/
2514	int
2515	set_ob_key_value (object op, const char key, const char *value, int add_key)
2516	{
2517	shstr key_ (key);
2518
2519	return set_ob_key_value_s (op, key_, value, add_key);
2520	}	2380	}
2521		2381
2522	object::depth_iterator::depth_iterator (object *container)	2382	object::depth_iterator::depth_iterator (object *container)
2523	: iterator_base (container)	2383	: iterator_base (container)
2524	{	2384	{
…		…
2574	{	2434	{
2575	char flagdesc[512];	2435	char flagdesc[512];
2576	char info2[256 * 4];	2436	char info2[256 * 4];
2577	char *p = info;	2437	char *p = info;
2578		2438
2579	p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s,flags:[%s],type:%d}",	2439	p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s%s,flags:[%s],type:%d}",
2580	count,	2440	count,
2581	uuid.c_str (),	2441	uuid.c_str (),
2582	&name,	2442	&name,
2583	title ? "\",title:\"" : "",	2443	title ? ",title:\"" : "",
2584	title ? (const char *)title : "",	2444	title ? (const char *)title : "",
		2445	title ? "\"" : "",
2585	flag_desc (flagdesc, 512), type);	2446	flag_desc (flagdesc, 512), type);
2586		2447
2587	if (!flag[FLAG_REMOVED] && env)	2448	if (!flag[FLAG_REMOVED] && env)
2588	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2449	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2589		2450

Diff Legend

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

Comparing deliantra/server/common/object.C (file contents): Revision 1.222 by root, Wed Apr 30 05:06:36 2008 UTC vs. Revision 1.250 by root, Wed Jul 16 14:29:40 2008 UTC

Diff Legend

Comparing deliantra/server/common/object.C (file contents):
Revision 1.222 by root, Wed Apr 30 05:06:36 2008 UTC vs.
Revision 1.250 by root, Wed Jul 16 14:29:40 2008 UTC