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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.231 by root, Sun May 4 11:12:40 2008 UTC vs.
Revision 1.247 by root, Mon Jul 14 18:36:43 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
…		…
354	return 0;	355	return 0;
355	}	356	}
356		357
357	// adjust weight per container type ("of holding")	358	// adjust weight per container type ("of holding")
358	static sint32	359	static sint32
359	weight_adjust (object *op, sint32 weight)	360	weight_adjust_for (object *op, sint32 weight)
360	{	361	{
361	return op->type == CONTAINER	362	return op->type == CONTAINER
362	? lerp (weight, 0, 100, 0, 100 - op->stats.Str)	363	? lerp (weight, 0, 100, 0, 100 - op->stats.Str)
363	: weight;	364	: weight;
364	}	365	}
…		…
370	static void	371	static void
371	adjust_weight (object *op, sint32 weight)	372	adjust_weight (object *op, sint32 weight)
372	{	373	{
373	while (op)	374	while (op)
374	{	375	{
		376	// adjust by actual difference to account for rounding errors
		377	// i.e. (w2 - w1) / f != w2 / f - w1 / f and the latter is correct
375	weight = weight_adjust (op, weight);	378	weight = weight_adjust_for (op, op->carrying)
		379	- weight_adjust_for (op, op->carrying - weight);
376		380
377	if (!weight)	381	if (!weight)
378	return;	382	return;
379		383
380	op->carrying += weight;	384	op->carrying += weight;
…		…
403	op->update_weight ();	407	op->update_weight ();
404		408
405	sum += op->total_weight ();	409	sum += op->total_weight ();
406	}	410	}
407		411
408	sum = weight_adjust (this, sum);	412	sum = weight_adjust_for (this, sum);
409		413
410	if (sum != carrying)	414	if (sum != carrying)
411	{	415	{
412	carrying = sum;	416	carrying = sum;
413		417
…		…
475	*/	479	*/
476	object *	480	object *
477	find_object_name (const char *str)	481	find_object_name (const char *str)
478	{	482	{
479	shstr_cmp str_ (str);	483	shstr_cmp str_ (str);
480	object *op;
481		484
		485	if (str_)
482	for_all_objects (op)	486	for_all_objects (op)
483	if (op->name == str_)	487	if (op->name == str_)
484	break;	488	return op;
485		489
486	return op;	490	return 0;
487	}	491	}
488		492
489	/*	493	/*
490	* Sets the owner and sets the skill and exp pointers to owner's current	494	* Sets the owner and sets the skill and exp pointers to owner's current
491	* skill and experience objects.	495	* skill and experience objects.
…		…
901	* drop on that space.	905	* drop on that space.
902	*/	906	*/
903	if (!drop_to_ground	907	if (!drop_to_ground
904	\|\| !map	908	\|\| !map
905	\|\| map->in_memory != MAP_ACTIVE	909	\|\| map->in_memory != MAP_ACTIVE
906	\|\| map->nodrop	910	\|\| map->no_drop
907	\|\| ms ().move_block == MOVE_ALL)	911	\|\| ms ().move_block == MOVE_ALL)
908	{	912	{
909	while (inv)	913	while (inv)
910	{	914	{
911	inv->destroy_inv (false);	915	inv->destroy_inv (false);
…		…
940		944
941	static struct freed_map : maptile	945	static struct freed_map : maptile
942	{	946	{
943	freed_map ()	947	freed_map ()
944	{	948	{
945	path = "<freed objects map>";	949	path = "<freed objects map>";
946	name = "/internal/freed_objects_map";	950	name = "/internal/freed_objects_map";
947	width = 3;	951	width = 3;
948	height = 3;	952	height = 3;
949	nodrop = 1;	953	no_drop = 1;
		954	no_reset = 1;
950		955
951	alloc ();	956	alloc ();
952	in_memory = MAP_ACTIVE;	957	in_memory = MAP_ACTIVE;
953	}	958	}
954		959
…		…
1053	if (object *pl = visible_to ())	1058	if (object *pl = visible_to ())
1054	esrv_del_item (pl->contr, count);	1059	esrv_del_item (pl->contr, count);
1055	flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed	1060	flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed
1056		1061
1057	adjust_weight (env, -total_weight ());	1062	adjust_weight (env, -total_weight ());
1058
1059	*(above ? &above->below : &env->inv) = below;
1060
1061	if (below)
1062	below->above = above;
1063		1063
1064	/* we set up values so that it could be inserted into	1064	/* we set up values so that it could be inserted into
1065	* the map, but we don't actually do that - it is up	1065	* the map, but we don't actually do that - it is up
1066	* to the caller to decide what we want to do.	1066	* to the caller to decide what we want to do.
1067	*/	1067	*/
1068	map = env->map;	1068	map = env->map;
1069	x = env->x;	1069	x = env->x;
1070	y = env->y;	1070	y = env->y;
		1071
		1072	// make sure cmov optimisation is applicable
		1073	*(above ? &above->below : &env->inv) = below;
		1074	*(below ? &below->above : &above ) = above; // &above is just a dummy
		1075
1071	above = 0;	1076	above = 0;
1072	below = 0;	1077	below = 0;
1073	env = 0;	1078	env = 0;
1074		1079
1075	/* NO_FIX_PLAYER is set when a great many changes are being	1080	/* NO_FIX_PLAYER is set when a great many changes are being
…		…
1105		1110
1106	esrv_del_item (pl->contr, count);	1111	esrv_del_item (pl->contr, count);
1107	}	1112	}
1108		1113
1109	/* link the object above us */	1114	/* link the object above us */
1110	if (above)	1115	// re-link, make sure compiler can easily use cmove
1111	above->below = below;	1116	*(above ? &above->below : &ms.top) = below;
1112	else	1117	*(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		1118
1130	above = 0;	1119	above = 0;
1131	below = 0;	1120	below = 0;
1132		1121
1133	if (map->in_memory == MAP_SAVING)	1122	if (map->in_memory == MAP_SAVING)
…		…
1248	* job preparing multi-part monsters.	1237	* job preparing multi-part monsters.
1249	*/	1238	*/
1250	object *	1239	object *
1251	insert_ob_in_map_at (object op, maptile m, object *originator, int flag, int x, int y)	1240	insert_ob_in_map_at (object op, maptile m, object *originator, int flag, int x, int y)
1252	{	1241	{
		1242	op->remove ();
		1243
1253	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)	1244	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1254	{	1245	{
1255	tmp->x = x + tmp->arch->x;	1246	tmp->x = x + tmp->arch->x;
1256	tmp->y = y + tmp->arch->y;	1247	tmp->y = y + tmp->arch->y;
1257	}	1248	}
…		…
1280	* just 'op' otherwise	1271	* just 'op' otherwise
1281	*/	1272	*/
1282	object *	1273	object *
1283	insert_ob_in_map (object op, maptile m, object *originator, int flag)	1274	insert_ob_in_map (object op, maptile m, object *originator, int flag)
1284	{	1275	{
1285	assert (!op->flag [FLAG_FREED]);	1276	if (op->is_on_map ())
		1277	{
		1278	LOG (llevError, "insert_ob_in_map called for object already on map");
		1279	abort ();
		1280	}
1286		1281
		1282	if (op->env)
		1283	{
		1284	LOG (llevError, "insert_ob_in_map called for object in an inventory (proceeding)");
1287	op->remove ();	1285	op->remove ();
		1286	}
		1287
		1288	if (op->face && !face_info (op->face))//D TODO: remove soon
		1289	{//D
		1290	LOG (llevError \| logBacktrace, "op->face out of bounds: %s", op->debug_desc ());//D
		1291	op->face = 1;//D
		1292	}//D
1288		1293
1289	/* Ideally, the caller figures this out. However, it complicates a lot	1294	/* 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	1295	* of areas of callers (eg, anything that uses find_free_spot would now
1291	* need extra work	1296	* need extra work
1292	*/	1297	*/
1293	if (!xy_normalise (m, op->x, op->y))	1298	if (!xy_normalise (m, op->x, op->y))
1294	{	1299	{
1295	op->destroy (1);	1300	op->head_ ()->destroy (1);// remove head_ once all tail object destroyers found
1296	return 0;	1301	return 0;
1297	}	1302	}
1298		1303
1299	if (object *more = op->more)	1304	if (object *more = op->more)
1300	if (!insert_ob_in_map (more, m, originator, flag))	1305	if (!insert_ob_in_map (more, m, originator, flag))
…		…
1309	*/	1314	*/
1310	if (op->nrof && !(flag & INS_NO_MERGE))	1315	if (op->nrof && !(flag & INS_NO_MERGE))
1311	for (object *tmp = ms.bot; tmp; tmp = tmp->above)	1316	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1312	if (object::can_merge (op, tmp))	1317	if (object::can_merge (op, tmp))
1313	{	1318	{
1314	// TODO: we atcually want to update tmp, not op,	1319	// TODO: we actually want to update tmp, not op,
1315	// but some caller surely breaks when we return tmp	1320	// but some caller surely breaks when we return tmp
1316	// from here :/	1321	// from here :/
1317	op->nrof += tmp->nrof;	1322	op->nrof += tmp->nrof;
1318	tmp->destroy (1);	1323	tmp->destroy (1);
1319	}	1324	}
…		…
1330	{	1335	{
1331	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");	1336	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");
1332	abort ();	1337	abort ();
1333	}	1338	}
1334		1339
		1340	if (!originator->is_on_map ())
		1341	LOG (llevDebug \| logBacktrace, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map",
		1342	op->debug_desc (), originator->debug_desc ());
		1343
1335	op->above = originator;	1344	op->above = originator;
1336	op->below = originator->below;	1345	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;	1346	originator->below = op;
		1347
		1348	*(op->below ? &op->below->above : &ms.bot) = op;
1345	}	1349	}
1346	else	1350	else
1347	{	1351	{
1348	object top, floor = NULL;	1352	object *floor = 0;
1349		1353	object *top = ms.top;
1350	top = ms.bot;
1351		1354
1352	/* If there are other objects, then */	1355	/* If there are other objects, then */
1353	if (top)	1356	if (top)
1354	{	1357	{
1355	object *last = 0;
1356
1357	/*	1358	/*
1358	* If there are multiple objects on this space, we do some trickier handling.	1359	* If there are multiple objects on this space, we do some trickier handling.
1359	* We've already dealt with merging if appropriate.	1360	* We've already dealt with merging if appropriate.
1360	* Generally, we want to put the new object on top. But if	1361	* Generally, we want to put the new object on top. But if
1361	* flag contains INS_ABOVE_FLOOR_ONLY, once we find the last	1362	* 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	1365	* 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	1366	* 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	1367	* when lots of spells are cast in one area. Currently, it is presumed
1367	* that flying non pickable objects are spell objects.	1368	* that flying non pickable objects are spell objects.
1368	*/	1369	*/
1369	for (top = ms.bot; top; top = top->above)	1370	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1370	{	1371	{
1371	if (QUERY_FLAG (top, FLAG_IS_FLOOR) \|\| QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))	1372	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) \|\| QUERY_FLAG (tmp, FLAG_OVERLAY_FLOOR))
1372	floor = top;	1373	floor = tmp;
1373		1374
1374	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW \| MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))	1375	if (QUERY_FLAG (tmp, FLAG_NO_PICK) && (tmp->move_type & (MOVE_FLY_LOW \| MOVE_FLY_HIGH)) && !QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1375	{	1376	{
1376	/* We insert above top, so we want this object below this */	1377	/* We insert above top, so we want this object below this */
1377	top = top->below;	1378	top = tmp->below;
1378	break;	1379	break;
1379	}	1380	}
1380		1381
1381	last = top;	1382	top = tmp;
1382	}	1383	}
1383
1384	/* Don't want top to be NULL, so set it to the last valid object */
1385	top = last;
1386		1384
1387	/* We let update_position deal with figuring out what the space	1385	/* We let update_position deal with figuring out what the space
1388	* looks like instead of lots of conditions here.	1386	* looks like instead of lots of conditions here.
1389	* makes things faster, and effectively the same result.	1387	* makes things faster, and effectively the same result.
1390	*/	1388	*/
…		…
1397	*/	1395	*/
1398	if (!(flag & INS_ON_TOP)	1396	if (!(flag & INS_ON_TOP)
1399	&& ms.flags () & P_BLOCKSVIEW	1397	&& ms.flags () & P_BLOCKSVIEW
1400	&& (op->face && !faces [op->face].visibility))	1398	&& (op->face && !faces [op->face].visibility))
1401	{	1399	{
		1400	object *last;
		1401
1402	for (last = top; last != floor; last = last->below)	1402	for (last = top; last != floor; last = last->below)
1403	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1403	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1404	break;	1404	break;
1405		1405
1406	/* Check to see if we found the object that blocks view,	1406	/* Check to see if we found the object that blocks view,
…		…
1414	} /* If objects on this space */	1414	} /* If objects on this space */
1415		1415
1416	if (flag & INS_ABOVE_FLOOR_ONLY)	1416	if (flag & INS_ABOVE_FLOOR_ONLY)
1417	top = floor;	1417	top = floor;
1418		1418
1419	/* Top is the object that our object (op) is going to get inserted above.	1419	// insert object above top, or bottom-most if top = 0
1420	*/
1421
1422	/* First object on this space */
1423	if (!top)	1420	if (!top)
1424	{	1421	{
		1422	op->below = 0;
1425	op->above = ms.bot;	1423	op->above = ms.bot;
1426
1427	if (op->above)
1428	op->above->below = op;
1429
1430	op->below = 0;
1431	ms.bot = op;	1424	ms.bot = op;
		1425
		1426	*(op->above ? &op->above->below : &ms.top) = op;
1432	}	1427	}
1433	else	1428	else
1434	{ /* get inserted into the stack above top */	1429	{
1435	op->above = top->above;	1430	op->above = top->above;
1436
1437	if (op->above)
1438	op->above->below = op;	1431	top->above = op;
1439		1432
1440	op->below = top;	1433	op->below = top;
1441	top->above = op;	1434	*(op->above ? &op->above->below : &ms.top) = op;
1442	}	1435	}
1443		1436	}
1444	if (!op->above)
1445	ms.top = op;
1446	} /* else not INS_BELOW_ORIGINATOR */
1447		1437
1448	if (op->type == PLAYER)	1438	if (op->type == PLAYER)
1449	{	1439	{
1450	op->contr->do_los = 1;	1440	op->contr->do_los = 1;
1451	++op->map->players;	1441	++op->map->players;
…		…
1551		1541
1552	nrof -= nr;	1542	nrof -= nr;
1553		1543
1554	if (nrof)	1544	if (nrof)
1555	{	1545	{
1556	adjust_weight (env, -weight * nr); // carrying == 0	1546	adjust_weight (env, -weight * max (1, nr)); // carrying == 0
1557		1547
1558	if (object *pl = visible_to ())	1548	if (object *pl = visible_to ())
1559	esrv_update_item (UPD_NROF, pl, this);	1549	esrv_update_item (UPD_NROF, pl, this);
1560		1550
1561	return true;	1551	return true;
…		…
2446	{	2436	{
2447	char flagdesc[512];	2437	char flagdesc[512];
2448	char info2[256 * 4];	2438	char info2[256 * 4];
2449	char *p = info;	2439	char *p = info;
2450		2440
2451	p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s,flags:[%s],type:%d}",	2441	p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s%s,flags:[%s],type:%d}",
2452	count,	2442	count,
2453	uuid.c_str (),	2443	uuid.c_str (),
2454	&name,	2444	&name,
2455	title ? "\",title:\"" : "",	2445	title ? ",title:\"" : "",
2456	title ? (const char *)title : "",	2446	title ? (const char *)title : "",
		2447	title ? "\"" : "",
2457	flag_desc (flagdesc, 512), type);	2448	flag_desc (flagdesc, 512), type);
2458		2449
2459	if (!flag[FLAG_REMOVED] && env)	2450	if (!flag[FLAG_REMOVED] && env)
2460	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2451	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2461		2452

Diff Legend

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

Comparing deliantra/server/common/object.C (file contents): Revision 1.231 by root, Sun May 4 11:12:40 2008 UTC vs. Revision 1.247 by root, Mon Jul 14 18:36:43 2008 UTC

Diff Legend

Comparing deliantra/server/common/object.C (file contents):
Revision 1.231 by root, Sun May 4 11:12:40 2008 UTC vs.
Revision 1.247 by root, Mon Jul 14 18:36:43 2008 UTC