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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.233 by root, Tue May 6 18:47:32 2008 UTC vs.
Revision 1.248 by root, Mon Jul 14 23:47:06 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;
…		…
406	op->update_weight ();	408	op->update_weight ();
407		409
408	sum += op->total_weight ();	410	sum += op->total_weight ();
409	}	411	}
410		412
411	sum = weight_adjust (this, sum);	413	sum = weight_adjust_for (this, sum);
412		414
413	if (sum != carrying)	415	if (sum != carrying)
414	{	416	{
415	carrying = sum;	417	carrying = sum;
416		418
…		…
478	*/	480	*/
479	object *	481	object *
480	find_object_name (const char *str)	482	find_object_name (const char *str)
481	{	483	{
482	shstr_cmp str_ (str);	484	shstr_cmp str_ (str);
483	object *op;
484		485
		486	if (str_)
485	for_all_objects (op)	487	for_all_objects (op)
486	if (op->name == str_)	488	if (op->name == str_)
487	break;	489	return op;
488		490
489	return op;	491	return 0;
490	}	492	}
491		493
492	/*	494	/*
493	* 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
494	* skill and experience objects.	496	* skill and experience objects.
…		…
904	* drop on that space.	906	* drop on that space.
905	*/	907	*/
906	if (!drop_to_ground	908	if (!drop_to_ground
907	\|\| !map	909	\|\| !map
908	\|\| map->in_memory != MAP_ACTIVE	910	\|\| map->in_memory != MAP_ACTIVE
909	\|\| map->nodrop	911	\|\| map->no_drop
910	\|\| ms ().move_block == MOVE_ALL)	912	\|\| ms ().move_block == MOVE_ALL)
911	{	913	{
912	while (inv)	914	while (inv)
913	{	915	{
914	inv->destroy_inv (false);	916	inv->destroy_inv (false);
…		…
943		945
944	static struct freed_map : maptile	946	static struct freed_map : maptile
945	{	947	{
946	freed_map ()	948	freed_map ()
947	{	949	{
948	path = "<freed objects map>";	950	path = "<freed objects map>";
949	name = "/internal/freed_objects_map";	951	name = "/internal/freed_objects_map";
950	width = 3;	952	width = 3;
951	height = 3;	953	height = 3;
952	nodrop = 1;	954	no_drop = 1;
		955	no_reset = 1;
953		956
954	alloc ();	957	alloc ();
955	in_memory = MAP_ACTIVE;	958	in_memory = MAP_ACTIVE;
956	}	959	}
957		960
…		…
1056	if (object *pl = visible_to ())	1059	if (object *pl = visible_to ())
1057	esrv_del_item (pl->contr, count);	1060	esrv_del_item (pl->contr, count);
1058	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
1059		1062
1060	adjust_weight (env, -total_weight ());	1063	adjust_weight (env, -total_weight ());
1061
1062	*(above ? &above->below : &env->inv) = below;
1063
1064	if (below)
1065	below->above = above;
1066		1064
1067	/* we set up values so that it could be inserted into	1065	/* we set up values so that it could be inserted into
1068	* 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
1069	* to the caller to decide what we want to do.	1067	* to the caller to decide what we want to do.
1070	*/	1068	*/
1071	map = env->map;	1069	map = env->map;
1072	x = env->x;	1070	x = env->x;
1073	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
1074	above = 0;	1077	above = 0;
1075	below = 0;	1078	below = 0;
1076	env = 0;	1079	env = 0;
1077		1080
1078	/* 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
…		…
1108		1111
1109	esrv_del_item (pl->contr, count);	1112	esrv_del_item (pl->contr, count);
1110	}	1113	}
1111		1114
1112	/* link the object above us */	1115	/* link the object above us */
1113	if (above)	1116	// re-link, make sure compiler can easily use cmove
1114	above->below = below;	1117	*(above ? &above->below : &ms.top) = below;
1115	else	1118	*(below ? &below->above : &ms.bot) = above;
1116	ms.top = below; /* we were top, set new top */
1117
1118	/* Relink the object below us, if there is one */
1119	if (below)
1120	below->above = above;
1121	else
1122	{
1123	/* Nothing below, which means we need to relink map object for this space
1124	* use translated coordinates in case some oddness with map tiling is
1125	* evident
1126	*/
1127	if (GET_MAP_OB (map, x, y) != this)
1128	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 ());
1129
1130	ms.bot = above; /* goes on above it. */
1131	}
1132		1119
1133	above = 0;	1120	above = 0;
1134	below = 0;	1121	below = 0;
1135		1122
1136	if (map->in_memory == MAP_SAVING)	1123	if (map->in_memory == MAP_SAVING)
…		…
1251	* job preparing multi-part monsters.	1238	* job preparing multi-part monsters.
1252	*/	1239	*/
1253	object *	1240	object *
1254	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)
1255	{	1242	{
		1243	op->remove ();
		1244
1256	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)	1245	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1257	{	1246	{
1258	tmp->x = x + tmp->arch->x;	1247	tmp->x = x + tmp->arch->x;
1259	tmp->y = y + tmp->arch->y;	1248	tmp->y = y + tmp->arch->y;
1260	}	1249	}
…		…
1283	* just 'op' otherwise	1272	* just 'op' otherwise
1284	*/	1273	*/
1285	object *	1274	object *
1286	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)
1287	{	1276	{
1288	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	}
1289		1282
		1283	if (op->env)
		1284	{
		1285	LOG (llevError, "insert_ob_in_map called for object in an inventory (proceeding)");
1290	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
1291		1294
1292	/* Ideally, the caller figures this out. However, it complicates a lot	1295	/* Ideally, the caller figures this out. However, it complicates a lot
1293	* 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
1294	* need extra work	1297	* need extra work
1295	*/	1298	*/
…		…
1312	*/	1315	*/
1313	if (op->nrof && !(flag & INS_NO_MERGE))	1316	if (op->nrof && !(flag & INS_NO_MERGE))
1314	for (object *tmp = ms.bot; tmp; tmp = tmp->above)	1317	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1315	if (object::can_merge (op, tmp))	1318	if (object::can_merge (op, tmp))
1316	{	1319	{
1317	// TODO: we atcually want to update tmp, not op,	1320	// TODO: we actually want to update tmp, not op,
1318	// but some caller surely breaks when we return tmp	1321	// but some caller surely breaks when we return tmp
1319	// from here :/	1322	// from here :/
1320	op->nrof += tmp->nrof;	1323	op->nrof += tmp->nrof;
1321	tmp->destroy (1);	1324	tmp->destroy (1);
1322	}	1325	}
…		…
1333	{	1336	{
1334	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");
1335	abort ();	1338	abort ();
1336	}	1339	}
1337		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
1338	op->above = originator;	1345	op->above = originator;
1339	op->below = originator->below;	1346	op->below = originator->below;
1340
1341	if (op->below)
1342	op->below->above = op;
1343	else
1344	ms.bot = op;
1345
1346	/* since below originator, no need to update top */
1347	originator->below = op;	1347	originator->below = op;
		1348
		1349	*(op->below ? &op->below->above : &ms.bot) = op;
1348	}	1350	}
1349	else	1351	else
1350	{	1352	{
1351	object top, floor = NULL;	1353	object *floor = 0;
1352		1354	object *top = ms.top;
1353	top = ms.bot;
1354		1355
1355	/* If there are other objects, then */	1356	/* If there are other objects, then */
1356	if (top)	1357	if (top)
1357	{	1358	{
1358	object *last = 0;
1359
1360	/*	1359	/*
1361	* 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.
1362	* We've already dealt with merging if appropriate.	1361	* We've already dealt with merging if appropriate.
1363	* 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
1364	* flag contains INS_ABOVE_FLOOR_ONLY, once we find the last	1363	* flag contains INS_ABOVE_FLOOR_ONLY, once we find the last
…		…
1367	* 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
1368	* 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
1369	* 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
1370	* that flying non pickable objects are spell objects.	1369	* that flying non pickable objects are spell objects.
1371	*/	1370	*/
1372	for (top = ms.bot; top; top = top->above)	1371	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1373	{	1372	{
1374	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))
1375	floor = top;	1374	floor = tmp;
1376		1375
1377	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))
1378	{	1377	{
1379	/* We insert above top, so we want this object below this */	1378	/* We insert above top, so we want this object below this */
1380	top = top->below;	1379	top = tmp->below;
1381	break;	1380	break;
1382	}	1381	}
1383		1382
1384	last = top;	1383	top = tmp;
1385	}	1384	}
1386
1387	/* Don't want top to be NULL, so set it to the last valid object */
1388	top = last;
1389		1385
1390	/* We let update_position deal with figuring out what the space	1386	/* We let update_position deal with figuring out what the space
1391	* looks like instead of lots of conditions here.	1387	* looks like instead of lots of conditions here.
1392	* makes things faster, and effectively the same result.	1388	* makes things faster, and effectively the same result.
1393	*/	1389	*/
…		…
1400	*/	1396	*/
1401	if (!(flag & INS_ON_TOP)	1397	if (!(flag & INS_ON_TOP)
1402	&& ms.flags () & P_BLOCKSVIEW	1398	&& ms.flags () & P_BLOCKSVIEW
1403	&& (op->face && !faces [op->face].visibility))	1399	&& (op->face && !faces [op->face].visibility))
1404	{	1400	{
		1401	object *last;
		1402
1405	for (last = top; last != floor; last = last->below)	1403	for (last = top; last != floor; last = last->below)
1406	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1404	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1407	break;	1405	break;
1408		1406
1409	/* Check to see if we found the object that blocks view,	1407	/* Check to see if we found the object that blocks view,
…		…
1417	} /* If objects on this space */	1415	} /* If objects on this space */
1418		1416
1419	if (flag & INS_ABOVE_FLOOR_ONLY)	1417	if (flag & INS_ABOVE_FLOOR_ONLY)
1420	top = floor;	1418	top = floor;
1421		1419
1422	/* 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
1423	*/
1424
1425	/* First object on this space */
1426	if (!top)	1421	if (!top)
1427	{	1422	{
		1423	op->below = 0;
1428	op->above = ms.bot;	1424	op->above = ms.bot;
1429
1430	if (op->above)
1431	op->above->below = op;
1432
1433	op->below = 0;
1434	ms.bot = op;	1425	ms.bot = op;
		1426
		1427	*(op->above ? &op->above->below : &ms.top) = op;
1435	}	1428	}
1436	else	1429	else
1437	{ /* get inserted into the stack above top */	1430	{
1438	op->above = top->above;	1431	op->above = top->above;
1439
1440	if (op->above)
1441	op->above->below = op;	1432	top->above = op;
1442		1433
1443	op->below = top;	1434	op->below = top;
1444	top->above = op;	1435	*(op->above ? &op->above->below : &ms.top) = op;
1445	}	1436	}
1446		1437	}
1447	if (!op->above)
1448	ms.top = op;
1449	} /* else not INS_BELOW_ORIGINATOR */
1450		1438
1451	if (op->type == PLAYER)	1439	if (op->type == PLAYER)
1452	{	1440	{
1453	op->contr->do_los = 1;	1441	op->contr->do_los = 1;
1454	++op->map->players;	1442	++op->map->players;
…		…
1554		1542
1555	nrof -= nr;	1543	nrof -= nr;
1556		1544
1557	if (nrof)	1545	if (nrof)
1558	{	1546	{
1559	adjust_weight (env, -weight * nr); // carrying == 0	1547	adjust_weight (env, -weight * max (1, nr)); // carrying == 0
1560		1548
1561	if (object *pl = visible_to ())	1549	if (object *pl = visible_to ())
1562	esrv_update_item (UPD_NROF, pl, this);	1550	esrv_update_item (UPD_NROF, pl, this);
1563		1551
1564	return true;	1552	return true;
…		…
2449	{	2437	{
2450	char flagdesc[512];	2438	char flagdesc[512];
2451	char info2[256 * 4];	2439	char info2[256 * 4];
2452	char *p = info;	2440	char *p = info;
2453		2441
2454	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}",
2455	count,	2443	count,
2456	uuid.c_str (),	2444	uuid.c_str (),
2457	&name,	2445	&name,
2458	title ? "\",title:\"" : "",	2446	title ? ",title:\"" : "",
2459	title ? (const char *)title : "",	2447	title ? (const char *)title : "",
		2448	title ? "\"" : "",
2460	flag_desc (flagdesc, 512), type);	2449	flag_desc (flagdesc, 512), type);
2461		2450
2462	if (!flag[FLAG_REMOVED] && env)	2451	if (!flag[FLAG_REMOVED] && env)
2463	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2452	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2464		2453

Diff Legend

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

Comparing deliantra/server/common/object.C (file contents): Revision 1.233 by root, Tue May 6 18:47:32 2008 UTC vs. Revision 1.248 by root, Mon Jul 14 23:47:06 2008 UTC

Diff Legend

Comparing deliantra/server/common/object.C (file contents):
Revision 1.233 by root, Tue May 6 18:47:32 2008 UTC vs.
Revision 1.248 by root, Mon Jul 14 23:47:06 2008 UTC