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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.236 by root, Tue May 6 20:08:37 2008 UTC vs.
Revision 1.237 by root, Tue May 6 21:04:37 2008 UTC

…		…
1057	esrv_del_item (pl->contr, count);	1057	esrv_del_item (pl->contr, count);
1058	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
1059		1059
1060	adjust_weight (env, -total_weight ());	1060	adjust_weight (env, -total_weight ());
1061		1061
1062	// make sure cmov optimisation is applicable
1063	*(above ? &above->below : &env->inv) = below;
1064	*(below ? &below->above : &above ) = above; // &above is just a dummy
1065
1066	above = 0;
1067	below = 0;
1068	env = 0;
1069
1070	/* we set up values so that it could be inserted into	1062	/* we set up values so that it could be inserted into
1071	* 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
1072	* to the caller to decide what we want to do.	1064	* to the caller to decide what we want to do.
1073	*/	1065	*/
1074	map = env->map;	1066	map = env->map;
1075	x = env->x;	1067	x = env->x;
1076	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
		1074	above = 0;
		1075	below = 0;
		1076	env = 0;
1077		1077
1078	/* 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
1079	* made to players inventory. If set, avoiding the call	1079	* made to players inventory. If set, avoiding the call
1080	* to save cpu time.	1080	* to save cpu time.
1081	*/	1081	*/
…		…
1267	* just 'op' otherwise	1267	* just 'op' otherwise
1268	*/	1268	*/
1269	object *	1269	object *
1270	insert_ob_in_map (object op, maptile m, object *originator, int flag)	1270	insert_ob_in_map (object op, maptile m, object *originator, int flag)
1271	{	1271	{
1272	assert (!op->flag [FLAG_FREED]);
1273
1274	op->remove ();	1272	op->remove ();
1275		1273
1276	/* Ideally, the caller figures this out. However, it complicates a lot	1274	/* Ideally, the caller figures this out. However, it complicates a lot
1277	* of areas of callers (eg, anything that uses find_free_spot would now	1275	* of areas of callers (eg, anything that uses find_free_spot would now
1278	* need extra work	1276	* need extra work
…		…
1296	*/	1294	*/
1297	if (op->nrof && !(flag & INS_NO_MERGE))	1295	if (op->nrof && !(flag & INS_NO_MERGE))
1298	for (object *tmp = ms.bot; tmp; tmp = tmp->above)	1296	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1299	if (object::can_merge (op, tmp))	1297	if (object::can_merge (op, tmp))
1300	{	1298	{
1301	// TODO: we atcually want to update tmp, not op,	1299	// TODO: we actually want to update tmp, not op,
1302	// but some caller surely breaks when we return tmp	1300	// but some caller surely breaks when we return tmp
1303	// from here :/	1301	// from here :/
1304	op->nrof += tmp->nrof;	1302	op->nrof += tmp->nrof;
1305	tmp->destroy (1);	1303	tmp->destroy (1);
1306	}	1304	}
…		…
1311	if (!QUERY_FLAG (op, FLAG_ALIVE))	1309	if (!QUERY_FLAG (op, FLAG_ALIVE))
1312	CLEAR_FLAG (op, FLAG_NO_STEAL);	1310	CLEAR_FLAG (op, FLAG_NO_STEAL);
1313		1311
1314	if (flag & INS_BELOW_ORIGINATOR)	1312	if (flag & INS_BELOW_ORIGINATOR)
1315	{	1313	{
1316	if (originator->map != op->map \|\| originator->x != op->x \|\| originator->y != op->y)	1314	if (originator->map != op->map \|\| originator->x != op->x \|\| originator->y != op->y \|\| !originator->is_on_map ())
1317	{	1315	{
1318	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");	1316	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");
1319	abort ();	1317	abort ();
1320	}	1318	}
1321		1319
1322	op->above = originator;	1320	op->above = originator;
1323	op->below = originator->below;	1321	op->below = originator->below;
1324
1325	if (op->below)
1326	op->below->above = op;
1327	else
1328	ms.bot = op;
1329
1330	/* since below originator, no need to update top */
1331	originator->below = op;	1322	originator->below = op;
		1323
		1324	*(op->below ? &op->below->above : &ms.bot) = op;
1332	}	1325	}
1333	else	1326	else
1334	{	1327	{
1335	object top, floor = NULL;	1328	object *floor = 0;
1336		1329	object *top = ms.top;
1337	top = ms.bot;
1338		1330
1339	/* If there are other objects, then */	1331	/* If there are other objects, then */
1340	if (top)	1332	if (top)
1341	{	1333	{
1342	object *last = 0;
1343
1344	/*	1334	/*
1345	* If there are multiple objects on this space, we do some trickier handling.	1335	* If there are multiple objects on this space, we do some trickier handling.
1346	* We've already dealt with merging if appropriate.	1336	* We've already dealt with merging if appropriate.
1347	* Generally, we want to put the new object on top. But if	1337	* Generally, we want to put the new object on top. But if
1348	* flag contains INS_ABOVE_FLOOR_ONLY, once we find the last	1338	* flag contains INS_ABOVE_FLOOR_ONLY, once we find the last
…		…
1351	* once we get to them. This reduces the need to traverse over all of	1341	* once we get to them. This reduces the need to traverse over all of
1352	* them when adding another one - this saves quite a bit of cpu time	1342	* them when adding another one - this saves quite a bit of cpu time
1353	* when lots of spells are cast in one area. Currently, it is presumed	1343	* when lots of spells are cast in one area. Currently, it is presumed
1354	* that flying non pickable objects are spell objects.	1344	* that flying non pickable objects are spell objects.
1355	*/	1345	*/
1356	for (top = ms.bot; top; top = top->above)	1346	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1357	{	1347	{
1358	if (QUERY_FLAG (top, FLAG_IS_FLOOR) \|\| QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))	1348	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) \|\| QUERY_FLAG (tmp, FLAG_OVERLAY_FLOOR))
1359	floor = top;	1349	floor = tmp;
1360		1350
1361	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW \| MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))	1351	if (QUERY_FLAG (tmp, FLAG_NO_PICK) && (tmp->move_type & (MOVE_FLY_LOW \| MOVE_FLY_HIGH)) && !QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1362	{	1352	{
1363	/* We insert above top, so we want this object below this */	1353	/* We insert above top, so we want this object below this */
1364	top = top->below;	1354	top = tmp->below;
1365	break;	1355	break;
1366	}	1356	}
1367		1357
1368	last = top;	1358	top = tmp;
1369	}	1359	}
1370
1371	/* Don't want top to be NULL, so set it to the last valid object */
1372	top = last;
1373		1360
1374	/* We let update_position deal with figuring out what the space	1361	/* We let update_position deal with figuring out what the space
1375	* looks like instead of lots of conditions here.	1362	* looks like instead of lots of conditions here.
1376	* makes things faster, and effectively the same result.	1363	* makes things faster, and effectively the same result.
1377	*/	1364	*/
…		…
1384	*/	1371	*/
1385	if (!(flag & INS_ON_TOP)	1372	if (!(flag & INS_ON_TOP)
1386	&& ms.flags () & P_BLOCKSVIEW	1373	&& ms.flags () & P_BLOCKSVIEW
1387	&& (op->face && !faces [op->face].visibility))	1374	&& (op->face && !faces [op->face].visibility))
1388	{	1375	{
		1376	object *last;
		1377
1389	for (last = top; last != floor; last = last->below)	1378	for (last = top; last != floor; last = last->below)
1390	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1379	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1391	break;	1380	break;
1392		1381
1393	/* Check to see if we found the object that blocks view,	1382	/* Check to see if we found the object that blocks view,
…		…
1404	top = floor;	1393	top = floor;
1405		1394
1406	/* Top is the object that our object (op) is going to get inserted above.	1395	/* Top is the object that our object (op) is going to get inserted above.
1407	*/	1396	*/
1408		1397
1409	/* First object on this space */	1398	/* no top found, insert on top */
1410	if (!top)	1399	if (!top)
1411	{	1400	{
1412	op->above = ms.bot;
1413
1414	if (op->above)
1415	op->above->below = op;
1416
1417	op->below = 0;	1401	op->above = 0;
		1402	op->below = ms.top;
1418	ms.bot = op;	1403	ms.top = op;
		1404
		1405	*(op->below ? &op->below->above : &ms.bot) = op;
1419	}	1406	}
1420	else	1407	else
1421	{ /* get inserted into the stack above top */	1408	{ /* get inserted into the stack above top */
1422	op->above = top->above;	1409	op->above = top->above;
1423
1424	if (op->above)
1425	op->above->below = op;	1410	top->above = op;
1426		1411
1427	op->below = top;	1412	op->below = top;
1428	top->above = op;	1413	*(op->above ? &op->above->below : &ms.top) = op;
1429	}	1414	}
1430
1431	if (!op->above)
1432	ms.top = op;
1433	} /* else not INS_BELOW_ORIGINATOR */	1415	} /* else not INS_BELOW_ORIGINATOR */
1434		1416
1435	if (op->type == PLAYER)	1417	if (op->type == PLAYER)
1436	{	1418	{
1437	op->contr->do_los = 1;	1419	op->contr->do_los = 1;

Diff Legend

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

Comparing deliantra/server/common/object.C (file contents): Revision 1.236 by root, Tue May 6 20:08:37 2008 UTC vs. Revision 1.237 by root, Tue May 6 21:04:37 2008 UTC

Diff Legend

Comparing deliantra/server/common/object.C (file contents):
Revision 1.236 by root, Tue May 6 20:08:37 2008 UTC vs.
Revision 1.237 by root, Tue May 6 21:04:37 2008 UTC