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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.229 by root, Sat May 3 12:29:09 2008 UTC vs.
Revision 1.249 by root, Tue Jul 15 20:41:58 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.
…		…
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	{	915	{
911	inv->destroy_inv (false);	916	inv->destroy_inv (false);
…		…
940		945
941	static struct freed_map : maptile	946	static struct freed_map : maptile
942	{	947	{
943	freed_map ()	948	freed_map ()
944	{	949	{
945	path = "<freed objects map>";	950	path = "<freed objects map>";
946	name = "/internal/freed_objects_map";	951	name = "/internal/freed_objects_map";
947	width = 3;	952	width = 3;
948	height = 3;	953	height = 3;
949	nodrop = 1;	954	no_drop = 1;
		955	no_reset = 1;
950		956
951	alloc ();	957	alloc ();
952	in_memory = MAP_ACTIVE;	958	in_memory = MAP_ACTIVE;
953	}	959	}
954		960
…		…
1053	if (object *pl = visible_to ())	1059	if (object *pl = visible_to ())
1054	esrv_del_item (pl->contr, count);	1060	esrv_del_item (pl->contr, count);
1055	flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed	1061	flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed
1056		1062
1057	adjust_weight (env, -total_weight ());	1063	adjust_weight (env, -total_weight ());
1058
1059	*(above ? &above->below : &env->inv) = below;
1060
1061	if (below)
1062	below->above = above;
1063		1064
1064	/* we set up values so that it could be inserted into	1065	/* we set up values so that it could be inserted into
1065	* the map, but we don't actually do that - it is up	1066	* the map, but we don't actually do that - it is up
1066	* to the caller to decide what we want to do.	1067	* to the caller to decide what we want to do.
1067	*/	1068	*/
1068	map = env->map;	1069	map = env->map;
1069	x = env->x;	1070	x = env->x;
1070	y = env->y;	1071	y = env->y;
		1072
		1073	// make sure cmov optimisation is applicable
		1074	*(above ? &above->below : &env->inv) = below;
		1075	*(below ? &below->above : &above ) = above; // &above is just a dummy
		1076
1071	above = 0;	1077	above = 0;
1072	below = 0;	1078	below = 0;
1073	env = 0;	1079	env = 0;
1074		1080
1075	/* NO_FIX_PLAYER is set when a great many changes are being	1081	/* NO_FIX_PLAYER is set when a great many changes are being
…		…
1105		1111
1106	esrv_del_item (pl->contr, count);	1112	esrv_del_item (pl->contr, count);
1107	}	1113	}
1108		1114
1109	/* link the object above us */	1115	/* link the object above us */
1110	if (above)	1116	// re-link, make sure compiler can easily use cmove
1111	above->below = below;	1117	*(above ? &above->below : &ms.top) = below;
1112	else	1118	*(below ? &below->above : &ms.bot) = above;
1113	ms.top = below; /* we were top, set new top */
1114
1115	/* Relink the object below us, if there is one */
1116	if (below)
1117	below->above = above;
1118	else
1119	{
1120	/* Nothing below, which means we need to relink map object for this space
1121	* use translated coordinates in case some oddness with map tiling is
1122	* evident
1123	*/
1124	if (GET_MAP_OB (map, x, y) != this)
1125	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 ());
1126
1127	ms.bot = above; /* goes on above it. */
1128	}
1129		1119
1130	above = 0;	1120	above = 0;
1131	below = 0;	1121	below = 0;
1132		1122
1133	if (map->in_memory == MAP_SAVING)	1123	if (map->in_memory == MAP_SAVING)
…		…
1248	* job preparing multi-part monsters.	1238	* job preparing multi-part monsters.
1249	*/	1239	*/
1250	object *	1240	object *
1251	insert_ob_in_map_at (object op, maptile m, object *originator, int flag, int x, int y)	1241	insert_ob_in_map_at (object op, maptile m, object *originator, int flag, int x, int y)
1252	{	1242	{
		1243	op->remove ();
		1244
1253	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)	1245	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1254	{	1246	{
1255	tmp->x = x + tmp->arch->x;	1247	tmp->x = x + tmp->arch->x;
1256	tmp->y = y + tmp->arch->y;	1248	tmp->y = y + tmp->arch->y;
1257	}	1249	}
…		…
1280	* just 'op' otherwise	1272	* just 'op' otherwise
1281	*/	1273	*/
1282	object *	1274	object *
1283	insert_ob_in_map (object op, maptile m, object *originator, int flag)	1275	insert_ob_in_map (object op, maptile m, object *originator, int flag)
1284	{	1276	{
1285	assert (!op->flag [FLAG_FREED]);	1277	if (op->is_on_map ())
		1278	{
		1279	LOG (llevError, "insert_ob_in_map called for object already on map");
		1280	abort ();
		1281	}
1286		1282
		1283	if (op->env)
		1284	{
		1285	LOG (llevError, "insert_ob_in_map called for object in an inventory (proceeding)");
1287	op->remove ();	1286	op->remove ();
		1287	}
		1288
		1289	if (op->face && !face_info (op->face))//D TODO: remove soon
		1290	{//D
		1291	LOG (llevError \| logBacktrace, "op->face out of bounds: %s", op->debug_desc ());//D
		1292	op->face = 1;//D
		1293	}//D
1288		1294
1289	/* Ideally, the caller figures this out. However, it complicates a lot	1295	/* Ideally, the caller figures this out. However, it complicates a lot
1290	* of areas of callers (eg, anything that uses find_free_spot would now	1296	* of areas of callers (eg, anything that uses find_free_spot would now
1291	* need extra work	1297	* need extra work
1292	*/	1298	*/
1293	if (!xy_normalise (m, op->x, op->y))	1299	if (!xy_normalise (m, op->x, op->y))
1294	{	1300	{
1295	op->destroy (1);	1301	op->head_ ()->destroy (1);// remove head_ once all tail object destroyers found
1296	return 0;	1302	return 0;
1297	}	1303	}
1298		1304
1299	if (object *more = op->more)	1305	if (object *more = op->more)
1300	if (!insert_ob_in_map (more, m, originator, flag))	1306	if (!insert_ob_in_map (more, m, originator, flag))
…		…
1309	*/	1315	*/
1310	if (op->nrof && !(flag & INS_NO_MERGE))	1316	if (op->nrof && !(flag & INS_NO_MERGE))
1311	for (object *tmp = ms.bot; tmp; tmp = tmp->above)	1317	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1312	if (object::can_merge (op, tmp))	1318	if (object::can_merge (op, tmp))
1313	{	1319	{
1314	// TODO: we atcually want to update tmp, not op,	1320	// TODO: we actually want to update tmp, not op,
1315	// but some caller surely breaks when we return tmp	1321	// but some caller surely breaks when we return tmp
1316	// from here :/	1322	// from here :/
1317	op->nrof += tmp->nrof;	1323	op->nrof += tmp->nrof;
1318	tmp->destroy (1);	1324	tmp->destroy (1);
1319	}	1325	}
…		…
1330	{	1336	{
1331	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");	1337	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");
1332	abort ();	1338	abort ();
1333	}	1339	}
1334		1340
		1341	if (!originator->is_on_map ())
		1342	LOG (llevDebug \| logBacktrace, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map",
		1343	op->debug_desc (), originator->debug_desc ());
		1344
1335	op->above = originator;	1345	op->above = originator;
1336	op->below = originator->below;	1346	op->below = originator->below;
1337
1338	if (op->below)
1339	op->below->above = op;
1340	else
1341	ms.bot = op;
1342
1343	/* since below originator, no need to update top */
1344	originator->below = op;	1347	originator->below = op;
		1348
		1349	*(op->below ? &op->below->above : &ms.bot) = op;
1345	}	1350	}
1346	else	1351	else
1347	{	1352	{
1348	object top, floor = NULL;	1353	object *floor = 0;
1349		1354	object *top = ms.top;
1350	top = ms.bot;
1351		1355
1352	/* If there are other objects, then */	1356	/* If there are other objects, then */
1353	if (top)	1357	if (top)
1354	{	1358	{
1355	object *last = 0;
1356
1357	/*	1359	/*
1358	* If there are multiple objects on this space, we do some trickier handling.	1360	* If there are multiple objects on this space, we do some trickier handling.
1359	* We've already dealt with merging if appropriate.	1361	* We've already dealt with merging if appropriate.
1360	* Generally, we want to put the new object on top. But if	1362	* Generally, we want to put the new object on top. But if
1361	* flag contains INS_ABOVE_FLOOR_ONLY, once we find the last	1363	* flag contains INS_ABOVE_FLOOR_ONLY, once we find the last
…		…
1364	* once we get to them. This reduces the need to traverse over all of	1366	* once we get to them. This reduces the need to traverse over all of
1365	* them when adding another one - this saves quite a bit of cpu time	1367	* them when adding another one - this saves quite a bit of cpu time
1366	* when lots of spells are cast in one area. Currently, it is presumed	1368	* when lots of spells are cast in one area. Currently, it is presumed
1367	* that flying non pickable objects are spell objects.	1369	* that flying non pickable objects are spell objects.
1368	*/	1370	*/
1369	for (top = ms.bot; top; top = top->above)	1371	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1370	{	1372	{
1371	if (QUERY_FLAG (top, FLAG_IS_FLOOR) \|\| QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))	1373	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) \|\| QUERY_FLAG (tmp, FLAG_OVERLAY_FLOOR))
1372	floor = top;	1374	floor = tmp;
1373		1375
1374	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW \| MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))	1376	if (QUERY_FLAG (tmp, FLAG_NO_PICK) && (tmp->move_type & (MOVE_FLY_LOW \| MOVE_FLY_HIGH)) && !QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1375	{	1377	{
1376	/* We insert above top, so we want this object below this */	1378	/* We insert above top, so we want this object below this */
1377	top = top->below;	1379	top = tmp->below;
1378	break;	1380	break;
1379	}	1381	}
1380		1382
1381	last = top;	1383	top = tmp;
1382	}	1384	}
1383
1384	/* Don't want top to be NULL, so set it to the last valid object */
1385	top = last;
1386		1385
1387	/* We let update_position deal with figuring out what the space	1386	/* We let update_position deal with figuring out what the space
1388	* looks like instead of lots of conditions here.	1387	* looks like instead of lots of conditions here.
1389	* makes things faster, and effectively the same result.	1388	* makes things faster, and effectively the same result.
1390	*/	1389	*/
…		…
1397	*/	1396	*/
1398	if (!(flag & INS_ON_TOP)	1397	if (!(flag & INS_ON_TOP)
1399	&& ms.flags () & P_BLOCKSVIEW	1398	&& ms.flags () & P_BLOCKSVIEW
1400	&& (op->face && !faces [op->face].visibility))	1399	&& (op->face && !faces [op->face].visibility))
1401	{	1400	{
		1401	object *last;
		1402
1402	for (last = top; last != floor; last = last->below)	1403	for (last = top; last != floor; last = last->below)
1403	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1404	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1404	break;	1405	break;
1405		1406
1406	/* Check to see if we found the object that blocks view,	1407	/* Check to see if we found the object that blocks view,
…		…
1414	} /* If objects on this space */	1415	} /* If objects on this space */
1415		1416
1416	if (flag & INS_ABOVE_FLOOR_ONLY)	1417	if (flag & INS_ABOVE_FLOOR_ONLY)
1417	top = floor;	1418	top = floor;
1418		1419
1419	/* Top is the object that our object (op) is going to get inserted above.	1420	// insert object above top, or bottom-most if top = 0
1420	*/
1421
1422	/* First object on this space */
1423	if (!top)	1421	if (!top)
1424	{	1422	{
		1423	op->below = 0;
1425	op->above = ms.bot;	1424	op->above = ms.bot;
1426
1427	if (op->above)
1428	op->above->below = op;
1429
1430	op->below = 0;
1431	ms.bot = op;	1425	ms.bot = op;
		1426
		1427	*(op->above ? &op->above->below : &ms.top) = op;
1432	}	1428	}
1433	else	1429	else
1434	{ /* get inserted into the stack above top */	1430	{
1435	op->above = top->above;	1431	op->above = top->above;
1436
1437	if (op->above)
1438	op->above->below = op;	1432	top->above = op;
1439		1433
1440	op->below = top;	1434	op->below = top;
1441	top->above = op;	1435	*(op->above ? &op->above->below : &ms.top) = op;
1442	}	1436	}
1443		1437	}
1444	if (!op->above)
1445	ms.top = op;
1446	} /* else not INS_BELOW_ORIGINATOR */
1447		1438
1448	if (op->type == PLAYER)	1439	if (op->type == PLAYER)
1449	{	1440	{
1450	op->contr->do_los = 1;	1441	op->contr->do_los = 1;
1451	++op->map->players;	1442	++op->map->players;
…		…
1551		1542
1552	nrof -= nr;	1543	nrof -= nr;
1553		1544
1554	if (nrof)	1545	if (nrof)
1555	{	1546	{
1556	adjust_weight (env, -weight * nr); // carrying == 0	1547	adjust_weight (env, -weight * max (1, nr)); // carrying == 0
1557		1548
1558	if (object *pl = visible_to ())	1549	if (object *pl = visible_to ())
1559	esrv_update_item (UPD_NROF, pl, this);	1550	esrv_update_item (UPD_NROF, pl, this);
1560		1551
1561	return true;	1552	return true;
1562	}	1553	}
1563	else	1554	else
1564	{	1555	{
1565	destroy (1);	1556	destroy ();
1566	return false;	1557	return false;
1567	}	1558	}
1568	}	1559	}
1569		1560
1570	/*	1561	/*
…		…
1587	}	1578	}
1588	else	1579	else
1589	{	1580	{
1590	decrease (nr);	1581	decrease (nr);
1591		1582
1592	object *op = object_create_clone (this);	1583	object *op = deep_clone ();
1593	op->nrof = nr;	1584	op->nrof = nr;
1594	return op;	1585	return op;
1595	}	1586	}
1596	}	1587	}
1597		1588
…		…
1818	LOG (llevError, "Present_arch called outside map.\n");	1809	LOG (llevError, "Present_arch called outside map.\n");
1819	return NULL;	1810	return NULL;
1820	}	1811	}
1821		1812
1822	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)	1813	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1823	if (tmp->arch == at)	1814	if (tmp->arch->archname == at->archname)
1824	return tmp;	1815	return tmp;
1825		1816
1826	return NULL;	1817	return NULL;
1827	}	1818	}
1828		1819
…		…
1892	* The first matching object is returned, or NULL if none.	1883	* The first matching object is returned, or NULL if none.
1893	*/	1884	*/
1894	object *	1885	object *
1895	present_arch_in_ob (const archetype at, const object op)	1886	present_arch_in_ob (const archetype at, const object op)
1896	{	1887	{
1897	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)	1888	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1898	if (tmp->arch == at)	1889	if (tmp->arch->archname == at->archname)
1899	return tmp;	1890	return tmp;
1900		1891
1901	return NULL;	1892	return NULL;
1902	}	1893	}
1903		1894
…		…
2312		2303
2313	/*	2304	/*
2314	* create clone from object to another	2305	* create clone from object to another
2315	*/	2306	*/
2316	object *	2307	object *
2317	object_create_clone (object *asrc)	2308	object::deep_clone ()
2318	{	2309	{
		2310	assert (("deep_clone called on non-head object", is_head ()));
		2311
2319	object *dst = 0;	2312	object *dst = clone ();
2320		2313
2321	if (!asrc)
2322	return 0;
2323
2324	object *src = asrc->head_ ();
2325
2326	object *prev = 0;	2314	object *prev = dst;
2327	for (object *part = src; part; part = part->more)	2315	for (object *part = this->more; part; part = part->more)
2328	{	2316	{
2329	object *tmp = part->clone ();	2317	object *tmp = part->clone ();
2330
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;	2318	tmp->head = dst;
2341
2342	tmp->more = 0;
2343
2344	if (prev)
2345	prev->more = tmp;	2319	prev->more = tmp;
2346
2347	prev = tmp;	2320	prev = tmp;
2348	}	2321	}
2349		2322
2350	for (object *item = src->inv; item; item = item->below)	2323	for (object *item = inv; item; item = item->below)
2351	insert_ob_in_ob (object_create_clone (item), dst);	2324	insert_ob_in_ob (item->deep_clone (), dst);
2352		2325
2353	return dst;	2326	return dst;
2354	}	2327	}
2355		2328
2356	/* This returns the first object in who's inventory that	2329	/* This returns the first object in who's inventory that
…		…
2464	{	2437	{
2465	char flagdesc[512];	2438	char flagdesc[512];
2466	char info2[256 * 4];	2439	char info2[256 * 4];
2467	char *p = info;	2440	char *p = info;
2468		2441
2469	p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s,flags:[%s],type:%d}",	2442	p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s%s,flags:[%s],type:%d}",
2470	count,	2443	count,
2471	uuid.c_str (),	2444	uuid.c_str (),
2472	&name,	2445	&name,
2473	title ? "\",title:\"" : "",	2446	title ? ",title:\"" : "",
2474	title ? (const char *)title : "",	2447	title ? (const char *)title : "",
		2448	title ? "\"" : "",
2475	flag_desc (flagdesc, 512), type);	2449	flag_desc (flagdesc, 512), type);
2476		2450
2477	if (!flag[FLAG_REMOVED] && env)	2451	if (!flag[FLAG_REMOVED] && env)
2478	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2452	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2479		2453

Diff Legend

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

Comparing deliantra/server/common/object.C (file contents): Revision 1.229 by root, Sat May 3 12:29:09 2008 UTC vs. Revision 1.249 by root, Tue Jul 15 20:41:58 2008 UTC

Diff Legend

Comparing deliantra/server/common/object.C (file contents):
Revision 1.229 by root, Sat May 3 12:29:09 2008 UTC vs.
Revision 1.249 by root, Tue Jul 15 20:41:58 2008 UTC