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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.228 by root, Sat May 3 11:14:50 2008 UTC vs.
Revision 1.253 by root, Sun Aug 17 22:46:26 2008 UTC

…		…
206	SET_FLAG (ob1, FLAG_BEEN_APPLIED);	206	SET_FLAG (ob1, FLAG_BEEN_APPLIED);
207		207
208	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))	208	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))
209	SET_FLAG (ob2, FLAG_BEEN_APPLIED);	209	SET_FLAG (ob2, FLAG_BEEN_APPLIED);
210		210
211	if (ob1->arch->name != ob2->arch->name	211	if (ob1->arch->archname != ob2->arch->archname
212	\|\| ob1->name != ob2->name	212	\|\| ob1->name != ob2->name
213	\|\| ob1->title != ob2->title	213	\|\| ob1->title != ob2->title
214	\|\| ob1->msg != ob2->msg	214	\|\| ob1->msg != ob2->msg
215	\|\| ob1->weight != ob2->weight	215	\|\| ob1->weight != ob2->weight
216	\|\| ob1->attacktype != ob2->attacktype	216	\|\| ob1->attacktype != ob2->attacktype
217	\|\| ob1->magic != ob2->magic	217	\|\| ob1->magic != ob2->magic
218	\|\| ob1->slaying != ob2->slaying	218	\|\| ob1->slaying != ob2->slaying
219	\|\| ob1->skill != ob2->skill	219	\|\| ob1->skill != ob2->skill
220	\|\| ob1->value != ob2->value	220	\|\| ob1->value != ob2->value
221	\|\| 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
222	\|\| ob1->client_type != ob2->client_type	223	\|\| ob1->client_type != ob2->client_type
223	\|\| ob1->materialname != ob2->materialname	224	\|\| ob1->materialname != ob2->materialname
224	\|\| ob1->lore != ob2->lore	225	\|\| ob1->lore != ob2->lore
225	\|\| ob1->subtype != ob2->subtype	226	\|\| ob1->subtype != ob2->subtype
226	\|\| ob1->move_type != ob2->move_type	227	\|\| ob1->move_type != ob2->move_type
…		…
344	else	345	else
345	{	346	{
346	// maybe there is a player standing on the same mapspace	347	// maybe there is a player standing on the same mapspace
347	// this will catch the case where "this" is a player	348	// this will catch the case where "this" is a player
348	if (object *pl = ms ().player ())	349	if (object *pl = ms ().player ())
		350	if ((!pl->container && pl->contr->ns && !pl->contr->ns->update_look)
349	if (!pl->container \|\| this == pl->container)	351	\|\| this == pl->container)
350	return pl;	352	return pl;
351	}	353	}
352	}	354	}
353		355
354	return 0;	356	return 0;
355	}	357	}
356		358
357	// adjust weight per container type ("of holding")	359	// adjust weight per container type ("of holding")
358	static sint32	360	static sint32
359	weight_adjust (object *op, sint32 weight)	361	weight_adjust_for (object *op, sint32 weight)
360	{	362	{
361	return op->type == CONTAINER	363	return op->type == CONTAINER
362	? lerp (weight, 0, 100, 0, 100 - op->stats.Str)	364	? lerp (weight, 0, 100, 0, 100 - op->stats.Str)
363	: weight;	365	: weight;
364	}	366	}
…		…
370	static void	372	static void
371	adjust_weight (object *op, sint32 weight)	373	adjust_weight (object *op, sint32 weight)
372	{	374	{
373	while (op)	375	while (op)
374	{	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
375	weight = weight_adjust (op, weight);	379	weight = weight_adjust_for (op, op->carrying)
		380	- weight_adjust_for (op, op->carrying - weight);
376		381
377	if (!weight)	382	if (!weight)
378	return;	383	return;
379		384
380	op->carrying += weight;	385	op->carrying += weight;
…		…
403	op->update_weight ();	408	op->update_weight ();
404		409
405	sum += op->total_weight ();	410	sum += op->total_weight ();
406	}	411	}
407		412
408	sum = weight_adjust (this, sum);	413	sum = weight_adjust_for (this, sum);
409		414
410	if (sum != carrying)	415	if (sum != carrying)
411	{	416	{
412	carrying = sum;	417	carrying = sum;
413		418
…		…
475	*/	480	*/
476	object *	481	object *
477	find_object_name (const char *str)	482	find_object_name (const char *str)
478	{	483	{
479	shstr_cmp str_ (str);	484	shstr_cmp str_ (str);
480	object *op;
481		485
		486	if (str_)
482	for_all_objects (op)	487	for_all_objects (op)
483	if (op->name == str_)	488	if (op->name == str_)
484	break;	489	return op;
485		490
486	return op;	491	return 0;
487	}	492	}
488		493
489	/*	494	/*
490	* 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
491	* skill and experience objects.	496	* skill and experience objects.
…		…
765	\|\| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))	770	\|\| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))
766	\|\| (m.move_on \| op->move_on ) != m.move_on	771	\|\| (m.move_on \| op->move_on ) != m.move_on
767	\|\| (m.move_off \| op->move_off ) != m.move_off	772	\|\| (m.move_off \| op->move_off ) != m.move_off
768	\|\| (m.move_slow \| op->move_slow) != m.move_slow	773	\|\| (m.move_slow \| op->move_slow) != m.move_slow
769	/* This isn't perfect, but I don't expect a lot of objects to	774	/* This isn't perfect, but I don't expect a lot of objects to
770	* to have move_allow right now.	775	* have move_allow right now.
771	*/	776	*/
772	\|\| ((m.move_block \| op->move_block) & ~op->move_allow) != m.move_block	777	\|\| ((m.move_block \| op->move_block) & ~op->move_allow) != m.move_block
773	\|\| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)	778	\|\| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)
774	m.flags_ = 0;	779	m.flags_ = 0;
775	}	780	}
…		…
901	* drop on that space.	906	* drop on that space.
902	*/	907	*/
903	if (!drop_to_ground	908	if (!drop_to_ground
904	\|\| !map	909	\|\| !map
905	\|\| map->in_memory != MAP_ACTIVE	910	\|\| map->in_memory != MAP_ACTIVE
906	\|\| map->nodrop	911	\|\| map->no_drop
907	\|\| ms ().move_block == MOVE_ALL)	912	\|\| ms ().move_block == MOVE_ALL)
908	{	913	{
909	while (inv)	914	while (inv)
910	{
911	inv->destroy_inv (false);
912	inv->destroy ();	915	inv->destroy (true);
913	}
914	}	916	}
915	else	917	else
916	{ /* Put objects in inventory onto this space */	918	{ /* Put objects in inventory onto this space */
917	while (inv)	919	while (inv)
918	{	920	{
…		…
940		942
941	static struct freed_map : maptile	943	static struct freed_map : maptile
942	{	944	{
943	freed_map ()	945	freed_map ()
944	{	946	{
945	path = "<freed objects map>";	947	path = "<freed objects map>";
946	name = "/internal/freed_objects_map";	948	name = "/internal/freed_objects_map";
947	width = 3;	949	width = 3;
948	height = 3;	950	height = 3;
949	nodrop = 1;	951	no_drop = 1;
		952	no_reset = 1;
950		953
951	alloc ();	954	alloc ();
952	in_memory = MAP_ACTIVE;	955	in_memory = MAP_ACTIVE;
		956	}
		957
		958	~freed_map ()
		959	{
		960	destroy ();
953	}	961	}
954	} freed_map; // freed objects are moved here to avoid crashes	962	} freed_map; // freed objects are moved here to avoid crashes
955		963
956	void	964	void
957	object::do_destroy ()	965	object::do_destroy ()
…		…
1048	if (object *pl = visible_to ())	1056	if (object *pl = visible_to ())
1049	esrv_del_item (pl->contr, count);	1057	esrv_del_item (pl->contr, count);
1050	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
1051		1059
1052	adjust_weight (env, -total_weight ());	1060	adjust_weight (env, -total_weight ());
1053
1054	*(above ? &above->below : &env->inv) = below;
1055
1056	if (below)
1057	below->above = above;
1058		1061
1059	/* we set up values so that it could be inserted into	1062	/* we set up values so that it could be inserted into
1060	* 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
1061	* to the caller to decide what we want to do.	1064	* to the caller to decide what we want to do.
1062	*/	1065	*/
1063	map = env->map;	1066	map = env->map;
1064	x = env->x;	1067	x = env->x;
1065	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
1066	above = 0;	1074	above = 0;
1067	below = 0;	1075	below = 0;
1068	env = 0;	1076	env = 0;
1069		1077
1070	/* 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
…		…
1100		1108
1101	esrv_del_item (pl->contr, count);	1109	esrv_del_item (pl->contr, count);
1102	}	1110	}
1103		1111
1104	/* link the object above us */	1112	/* link the object above us */
1105	if (above)	1113	// re-link, make sure compiler can easily use cmove
1106	above->below = below;	1114	*(above ? &above->below : &ms.top) = below;
1107	else	1115	*(below ? &below->above : &ms.bot) = above;
1108	ms.top = below; /* we were top, set new top */
1109
1110	/* Relink the object below us, if there is one */
1111	if (below)
1112	below->above = above;
1113	else
1114	{
1115	/* Nothing below, which means we need to relink map object for this space
1116	* use translated coordinates in case some oddness with map tiling is
1117	* evident
1118	*/
1119	if (GET_MAP_OB (map, x, y) != this)
1120	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 ());
1121
1122	ms.bot = above; /* goes on above it. */
1123	}
1124		1116
1125	above = 0;	1117	above = 0;
1126	below = 0;	1118	below = 0;
		1119
		1120	ms.flags_ = 0;
1127		1121
1128	if (map->in_memory == MAP_SAVING)	1122	if (map->in_memory == MAP_SAVING)
1129	return;	1123	return;
1130		1124
1131	int check_walk_off = !flag [FLAG_NO_APPLY];	1125	int check_walk_off = !flag [FLAG_NO_APPLY];
…		…
1164	}	1158	}
1165		1159
1166	last = tmp;	1160	last = tmp;
1167	}	1161	}
1168		1162
1169	/* last == NULL if there are no objects on this space */
1170	//TODO: this makes little sense, why only update the topmost object?
1171	if (!last)
1172	map->at (x, y).flags_ = 0;
1173	else
1174	update_object (last, UP_OBJ_REMOVE);
1175
1176	if (flag [FLAG_BLOCKSVIEW] \|\| glow_radius)	1163	if (flag [FLAG_BLOCKSVIEW] \|\| glow_radius)
1177	update_all_los (map, x, y);	1164	update_all_los (map, x, y);
1178	}	1165	}
1179	}	1166	}
1180		1167
…		…
1243	* job preparing multi-part monsters.	1230	* job preparing multi-part monsters.
1244	*/	1231	*/
1245	object *	1232	object *
1246	insert_ob_in_map_at (object op, maptile m, object *originator, int flag, int x, int y)	1233	insert_ob_in_map_at (object op, maptile m, object *originator, int flag, int x, int y)
1247	{	1234	{
		1235	op->remove ();
		1236
1248	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)	1237	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1249	{	1238	{
1250	tmp->x = x + tmp->arch->x;	1239	tmp->x = x + tmp->arch->x;
1251	tmp->y = y + tmp->arch->y;	1240	tmp->y = y + tmp->arch->y;
1252	}	1241	}
…		…
1275	* just 'op' otherwise	1264	* just 'op' otherwise
1276	*/	1265	*/
1277	object *	1266	object *
1278	insert_ob_in_map (object op, maptile m, object *originator, int flag)	1267	insert_ob_in_map (object op, maptile m, object *originator, int flag)
1279	{	1268	{
1280	assert (!op->flag [FLAG_FREED]);	1269	if (op->is_on_map ())
		1270	{
		1271	LOG (llevError, "insert_ob_in_map called for object already on map");
		1272	abort ();
		1273	}
1281		1274
		1275	if (op->env)
		1276	{
		1277	LOG (llevError, "insert_ob_in_map called for object in an inventory (proceeding)");
1282	op->remove ();	1278	op->remove ();
		1279	}
		1280
		1281	if (op->face && !face_info (op->face))//D TODO: remove soon
		1282	{//D
		1283	LOG (llevError \| logBacktrace, "op->face out of bounds: %s", op->debug_desc ());//D
		1284	op->face = 1;//D
		1285	}//D
1283		1286
1284	/* Ideally, the caller figures this out. However, it complicates a lot	1287	/* Ideally, the caller figures this out. However, it complicates a lot
1285	* of areas of callers (eg, anything that uses find_free_spot would now	1288	* of areas of callers (eg, anything that uses find_free_spot would now
1286	* need extra work	1289	* need extra work
1287	*/	1290	*/
1288	if (!xy_normalise (m, op->x, op->y))	1291	if (!xy_normalise (m, op->x, op->y))
1289	{	1292	{
1290	op->destroy (1);	1293	op->head_ ()->destroy (1);// remove head_ once all tail object destroyers found
1291	return 0;	1294	return 0;
1292	}	1295	}
1293		1296
1294	if (object *more = op->more)	1297	if (object *more = op->more)
1295	if (!insert_ob_in_map (more, m, originator, flag))	1298	if (!insert_ob_in_map (more, m, originator, flag))
…		…
1304	*/	1307	*/
1305	if (op->nrof && !(flag & INS_NO_MERGE))	1308	if (op->nrof && !(flag & INS_NO_MERGE))
1306	for (object *tmp = ms.bot; tmp; tmp = tmp->above)	1309	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1307	if (object::can_merge (op, tmp))	1310	if (object::can_merge (op, tmp))
1308	{	1311	{
1309	// TODO: we atcually want to update tmp, not op,	1312	// TODO: we actually want to update tmp, not op,
1310	// but some caller surely breaks when we return tmp	1313	// but some caller surely breaks when we return tmp
1311	// from here :/	1314	// from here :/
1312	op->nrof += tmp->nrof;	1315	op->nrof += tmp->nrof;
1313	tmp->destroy (1);	1316	tmp->destroy (1);
1314	}	1317	}
…		…
1325	{	1328	{
1326	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");	1329	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");
1327	abort ();	1330	abort ();
1328	}	1331	}
1329		1332
		1333	if (!originator->is_on_map ())
		1334	LOG (llevDebug \| logBacktrace, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map",
		1335	op->debug_desc (), originator->debug_desc ());
		1336
1330	op->above = originator;	1337	op->above = originator;
1331	op->below = originator->below;	1338	op->below = originator->below;
1332
1333	if (op->below)
1334	op->below->above = op;
1335	else
1336	ms.bot = op;
1337
1338	/* since below originator, no need to update top */
1339	originator->below = op;	1339	originator->below = op;
		1340
		1341	*(op->below ? &op->below->above : &ms.bot) = op;
1340	}	1342	}
1341	else	1343	else
1342	{	1344	{
1343	object top, floor = NULL;	1345	object *floor = 0;
1344		1346	object *top = ms.top;
1345	top = ms.bot;
1346		1347
1347	/* If there are other objects, then */	1348	/* If there are other objects, then */
1348	if (top)	1349	if (top)
1349	{	1350	{
1350	object *last = 0;
1351
1352	/*	1351	/*
1353	* If there are multiple objects on this space, we do some trickier handling.	1352	* If there are multiple objects on this space, we do some trickier handling.
1354	* We've already dealt with merging if appropriate.	1353	* We've already dealt with merging if appropriate.
1355	* Generally, we want to put the new object on top. But if	1354	* Generally, we want to put the new object on top. But if
1356	* flag contains INS_ABOVE_FLOOR_ONLY, once we find the last	1355	* flag contains INS_ABOVE_FLOOR_ONLY, once we find the last
…		…
1359	* once we get to them. This reduces the need to traverse over all of	1358	* once we get to them. This reduces the need to traverse over all of
1360	* them when adding another one - this saves quite a bit of cpu time	1359	* them when adding another one - this saves quite a bit of cpu time
1361	* when lots of spells are cast in one area. Currently, it is presumed	1360	* when lots of spells are cast in one area. Currently, it is presumed
1362	* that flying non pickable objects are spell objects.	1361	* that flying non pickable objects are spell objects.
1363	*/	1362	*/
1364	for (top = ms.bot; top; top = top->above)	1363	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1365	{	1364	{
1366	if (QUERY_FLAG (top, FLAG_IS_FLOOR) \|\| QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))	1365	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) \|\| QUERY_FLAG (tmp, FLAG_OVERLAY_FLOOR))
1367	floor = top;	1366	floor = tmp;
1368		1367
1369	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW \| MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))	1368	if (QUERY_FLAG (tmp, FLAG_NO_PICK) && (tmp->move_type & (MOVE_FLY_LOW \| MOVE_FLY_HIGH)) && !QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1370	{	1369	{
1371	/* We insert above top, so we want this object below this */	1370	/* We insert above top, so we want this object below this */
1372	top = top->below;	1371	top = tmp->below;
1373	break;	1372	break;
1374	}	1373	}
1375		1374
1376	last = top;	1375	top = tmp;
1377	}	1376	}
1378
1379	/* Don't want top to be NULL, so set it to the last valid object */
1380	top = last;
1381		1377
1382	/* We let update_position deal with figuring out what the space	1378	/* We let update_position deal with figuring out what the space
1383	* looks like instead of lots of conditions here.	1379	* looks like instead of lots of conditions here.
1384	* makes things faster, and effectively the same result.	1380	* makes things faster, and effectively the same result.
1385	*/	1381	*/
…		…
1392	*/	1388	*/
1393	if (!(flag & INS_ON_TOP)	1389	if (!(flag & INS_ON_TOP)
1394	&& ms.flags () & P_BLOCKSVIEW	1390	&& ms.flags () & P_BLOCKSVIEW
1395	&& (op->face && !faces [op->face].visibility))	1391	&& (op->face && !faces [op->face].visibility))
1396	{	1392	{
		1393	object *last;
		1394
1397	for (last = top; last != floor; last = last->below)	1395	for (last = top; last != floor; last = last->below)
1398	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1396	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1399	break;	1397	break;
1400		1398
1401	/* Check to see if we found the object that blocks view,	1399	/* Check to see if we found the object that blocks view,
…		…
1409	} /* If objects on this space */	1407	} /* If objects on this space */
1410		1408
1411	if (flag & INS_ABOVE_FLOOR_ONLY)	1409	if (flag & INS_ABOVE_FLOOR_ONLY)
1412	top = floor;	1410	top = floor;
1413		1411
1414	/* Top is the object that our object (op) is going to get inserted above.	1412	// insert object above top, or bottom-most if top = 0
1415	*/
1416
1417	/* First object on this space */
1418	if (!top)	1413	if (!top)
1419	{	1414	{
		1415	op->below = 0;
1420	op->above = ms.bot;	1416	op->above = ms.bot;
1421
1422	if (op->above)
1423	op->above->below = op;
1424
1425	op->below = 0;
1426	ms.bot = op;	1417	ms.bot = op;
		1418
		1419	*(op->above ? &op->above->below : &ms.top) = op;
1427	}	1420	}
1428	else	1421	else
1429	{ /* get inserted into the stack above top */	1422	{
1430	op->above = top->above;	1423	op->above = top->above;
1431
1432	if (op->above)
1433	op->above->below = op;	1424	top->above = op;
1434		1425
1435	op->below = top;	1426	op->below = top;
1436	top->above = op;	1427	*(op->above ? &op->above->below : &ms.top) = op;
1437	}	1428	}
1438		1429	}
1439	if (!op->above)
1440	ms.top = op;
1441	} /* else not INS_BELOW_ORIGINATOR */
1442		1430
1443	if (op->type == PLAYER)	1431	if (op->type == PLAYER)
1444	{	1432	{
1445	op->contr->do_los = 1;	1433	op->contr->do_los = 1;
1446	++op->map->players;	1434	++op->map->players;
…		…
1542	if (!nr)	1530	if (!nr)
1543	return true;	1531	return true;
1544		1532
1545	nr = min (nr, nrof);	1533	nr = min (nr, nrof);
1546		1534
		1535	if (nrof > nr)
		1536	{
1547	nrof -= nr;	1537	nrof -= nr;
1548
1549	if (nrof)
1550	{
1551	adjust_weight (env, -weight * nr); // carrying == 0	1538	adjust_weight (env, -weight * max (1, nr)); // carrying == 0
1552		1539
1553	if (object *pl = visible_to ())	1540	if (object *pl = visible_to ())
1554	esrv_update_item (UPD_NROF, pl, this);	1541	esrv_update_item (UPD_NROF, pl, this);
1555		1542
1556	return true;	1543	return true;
1557	}	1544	}
1558	else	1545	else
1559	{	1546	{
1560	destroy (1);	1547	destroy ();
1561	return false;	1548	return false;
1562	}	1549	}
1563	}	1550	}
1564		1551
1565	/*	1552	/*
…		…
1582	}	1569	}
1583	else	1570	else
1584	{	1571	{
1585	decrease (nr);	1572	decrease (nr);
1586		1573
1587	object *op = object_create_clone (this);	1574	object *op = deep_clone ();
1588	op->nrof = nr;	1575	op->nrof = nr;
1589	return op;	1576	return op;
1590	}	1577	}
1591	}	1578	}
1592		1579
…		…
1813	LOG (llevError, "Present_arch called outside map.\n");	1800	LOG (llevError, "Present_arch called outside map.\n");
1814	return NULL;	1801	return NULL;
1815	}	1802	}
1816		1803
1817	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)	1804	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1818	if (tmp->arch == at)	1805	if (tmp->arch->archname == at->archname)
1819	return tmp;	1806	return tmp;
1820		1807
1821	return NULL;	1808	return NULL;
1822	}	1809	}
1823		1810
…		…
1887	* The first matching object is returned, or NULL if none.	1874	* The first matching object is returned, or NULL if none.
1888	*/	1875	*/
1889	object *	1876	object *
1890	present_arch_in_ob (const archetype at, const object op)	1877	present_arch_in_ob (const archetype at, const object op)
1891	{	1878	{
1892	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)	1879	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1893	if (tmp->arch == at)	1880	if (tmp->arch->archname == at->archname)
1894	return tmp;	1881	return tmp;
1895		1882
1896	return NULL;	1883	return NULL;
1897	}	1884	}
1898		1885
…		…
2307		2294
2308	/*	2295	/*
2309	* create clone from object to another	2296	* create clone from object to another
2310	*/	2297	*/
2311	object *	2298	object *
2312	object_create_clone (object *asrc)	2299	object::deep_clone ()
2313	{	2300	{
		2301	assert (("deep_clone called on non-head object", is_head ()));
		2302
2314	object *dst = 0;	2303	object *dst = clone ();
2315		2304
2316	if (!asrc)
2317	return 0;
2318
2319	object *src = asrc->head_ ();
2320
2321	object *prev = 0;	2305	object *prev = dst;
2322	for (object *part = src; part; part = part->more)	2306	for (object *part = this->more; part; part = part->more)
2323	{	2307	{
2324	object *tmp = part->clone ();	2308	object *tmp = part->clone ();
2325
2326	tmp->x -= src->x;
2327	tmp->y -= src->y;
2328
2329	if (!part->head)
2330	{
2331	dst = tmp;
2332	tmp->head = 0;
2333	}
2334	else
2335	tmp->head = dst;	2309	tmp->head = dst;
2336
2337	tmp->more = 0;
2338
2339	if (prev)
2340	prev->more = tmp;	2310	prev->more = tmp;
2341
2342	prev = tmp;	2311	prev = tmp;
2343	}	2312	}
2344		2313
2345	for (object *item = src->inv; item; item = item->below)	2314	for (object *item = inv; item; item = item->below)
2346	insert_ob_in_ob (object_create_clone (item), dst);	2315	insert_ob_in_ob (item->deep_clone (), dst);
2347		2316
2348	return dst;	2317	return dst;
2349	}	2318	}
2350		2319
2351	/* This returns the first object in who's inventory that	2320	/* This returns the first object in who's inventory that
…		…
2459	{	2428	{
2460	char flagdesc[512];	2429	char flagdesc[512];
2461	char info2[256 * 4];	2430	char info2[256 * 4];
2462	char *p = info;	2431	char *p = info;
2463		2432
2464	p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s,flags:[%s],type:%d}",	2433	p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s%s,flags:[%s],type:%d}",
2465	count,	2434	count,
2466	uuid.c_str (),	2435	uuid.c_str (),
2467	&name,	2436	&name,
2468	title ? "\",title:\"" : "",	2437	title ? ",title:\"" : "",
2469	title ? (const char *)title : "",	2438	title ? (const char *)title : "",
		2439	title ? "\"" : "",
2470	flag_desc (flagdesc, 512), type);	2440	flag_desc (flagdesc, 512), type);
2471		2441
2472	if (!flag[FLAG_REMOVED] && env)	2442	if (!flag[FLAG_REMOVED] && env)
2473	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2443	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2474		2444

Diff Legend

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

Comparing deliantra/server/common/object.C (file contents): Revision 1.228 by root, Sat May 3 11:14:50 2008 UTC vs. Revision 1.253 by root, Sun Aug 17 22:46:26 2008 UTC

Diff Legend

Comparing deliantra/server/common/object.C (file contents):
Revision 1.228 by root, Sat May 3 11:14:50 2008 UTC vs.
Revision 1.253 by root, Sun Aug 17 22:46:26 2008 UTC