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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.235 by root, Tue May 6 20:00:12 2008 UTC vs.
Revision 1.246 by root, Thu May 22 15:37:44 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
…		…
478	*/	479	*/
479	object *	480	object *
480	find_object_name (const char *str)	481	find_object_name (const char *str)
481	{	482	{
482	shstr_cmp str_ (str);	483	shstr_cmp str_ (str);
483	object *op;
484		484
		485	if (str_)
485	for_all_objects (op)	486	for_all_objects (op)
486	if (op->name == str_)	487	if (op->name == str_)
487	break;	488	return op;
488		489
489	return op;	490	return 0;
490	}	491	}
491		492
492	/*	493	/*
493	* 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
494	* skill and experience objects.	495	* skill and experience objects.
…		…
904	* drop on that space.	905	* drop on that space.
905	*/	906	*/
906	if (!drop_to_ground	907	if (!drop_to_ground
907	\|\| !map	908	\|\| !map
908	\|\| map->in_memory != MAP_ACTIVE	909	\|\| map->in_memory != MAP_ACTIVE
909	\|\| map->nodrop	910	\|\| map->no_drop
910	\|\| ms ().move_block == MOVE_ALL)	911	\|\| ms ().move_block == MOVE_ALL)
911	{	912	{
912	while (inv)	913	while (inv)
913	{	914	{
914	inv->destroy_inv (false);	915	inv->destroy_inv (false);
…		…
943		944
944	static struct freed_map : maptile	945	static struct freed_map : maptile
945	{	946	{
946	freed_map ()	947	freed_map ()
947	{	948	{
948	path = "<freed objects map>";	949	path = "<freed objects map>";
949	name = "/internal/freed_objects_map";	950	name = "/internal/freed_objects_map";
950	width = 3;	951	width = 3;
951	height = 3;	952	height = 3;
952	nodrop = 1;	953	no_drop = 1;
		954	no_reset = 1;
953		955
954	alloc ();	956	alloc ();
955	in_memory = MAP_ACTIVE;	957	in_memory = MAP_ACTIVE;
956	}	958	}
957		959
…		…
1056	if (object *pl = visible_to ())	1058	if (object *pl = visible_to ())
1057	esrv_del_item (pl->contr, count);	1059	esrv_del_item (pl->contr, count);
1058	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
1059		1061
1060	adjust_weight (env, -total_weight ());	1062	adjust_weight (env, -total_weight ());
1061
1062	*(above ? &above->below : &env->inv) = below;
1063
1064	if (below)
1065	below->above = above;
1066		1063
1067	/* we set up values so that it could be inserted into	1064	/* we set up values so that it could be inserted into
1068	* 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
1069	* to the caller to decide what we want to do.	1066	* to the caller to decide what we want to do.
1070	*/	1067	*/
1071	map = env->map;	1068	map = env->map;
1072	x = env->x;	1069	x = env->x;
1073	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
1074	above = 0;	1076	above = 0;
1075	below = 0;	1077	below = 0;
1076	env = 0;	1078	env = 0;
1077		1079
1078	/* 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
…		…
1108		1110
1109	esrv_del_item (pl->contr, count);	1111	esrv_del_item (pl->contr, count);
1110	}	1112	}
1111		1113
1112	/* link the object above us */	1114	/* link the object above us */
1113	if (above)	1115	// re-link, make sure compiler can easily use cmove
1114	above->below = below;	1116	*(above ? &above->below : &ms.top) = below;
1115	else	1117	*(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	ms.bot = above;
1123		1118
1124	above = 0;	1119	above = 0;
1125	below = 0;	1120	below = 0;
1126		1121
1127	if (map->in_memory == MAP_SAVING)	1122	if (map->in_memory == MAP_SAVING)
…		…
1242	* job preparing multi-part monsters.	1237	* job preparing multi-part monsters.
1243	*/	1238	*/
1244	object *	1239	object *
1245	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)
1246	{	1241	{
		1242	op->remove ();
		1243
1247	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)	1244	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1248	{	1245	{
1249	tmp->x = x + tmp->arch->x;	1246	tmp->x = x + tmp->arch->x;
1250	tmp->y = y + tmp->arch->y;	1247	tmp->y = y + tmp->arch->y;
1251	}	1248	}
…		…
1274	* just 'op' otherwise	1271	* just 'op' otherwise
1275	*/	1272	*/
1276	object *	1273	object *
1277	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)
1278	{	1275	{
1279	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	}
1280		1281
		1282	if (op->env)
		1283	{
		1284	LOG (llevError, "insert_ob_in_map called for object in an inventory (proceeding)");
1281	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
1282		1293
1283	/* Ideally, the caller figures this out. However, it complicates a lot	1294	/* Ideally, the caller figures this out. However, it complicates a lot
1284	* 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
1285	* need extra work	1296	* need extra work
1286	*/	1297	*/
…		…
1303	*/	1314	*/
1304	if (op->nrof && !(flag & INS_NO_MERGE))	1315	if (op->nrof && !(flag & INS_NO_MERGE))
1305	for (object *tmp = ms.bot; tmp; tmp = tmp->above)	1316	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1306	if (object::can_merge (op, tmp))	1317	if (object::can_merge (op, tmp))
1307	{	1318	{
1308	// TODO: we atcually want to update tmp, not op,	1319	// TODO: we actually want to update tmp, not op,
1309	// but some caller surely breaks when we return tmp	1320	// but some caller surely breaks when we return tmp
1310	// from here :/	1321	// from here :/
1311	op->nrof += tmp->nrof;	1322	op->nrof += tmp->nrof;
1312	tmp->destroy (1);	1323	tmp->destroy (1);
1313	}	1324	}
…		…
1324	{	1335	{
1325	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");
1326	abort ();	1337	abort ();
1327	}	1338	}
1328		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
1329	op->above = originator;	1344	op->above = originator;
1330	op->below = originator->below;	1345	op->below = originator->below;
1331
1332	if (op->below)
1333	op->below->above = op;
1334	else
1335	ms.bot = op;
1336
1337	/* since below originator, no need to update top */
1338	originator->below = op;	1346	originator->below = op;
		1347
		1348	*(op->below ? &op->below->above : &ms.bot) = op;
1339	}	1349	}
1340	else	1350	else
1341	{	1351	{
1342	object top, floor = NULL;	1352	object *floor = 0;
1343		1353	object *top = ms.top;
1344	top = ms.bot;
1345		1354
1346	/* If there are other objects, then */	1355	/* If there are other objects, then */
1347	if (top)	1356	if (top)
1348	{	1357	{
1349	object *last = 0;
1350
1351	/*	1358	/*
1352	* 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.
1353	* We've already dealt with merging if appropriate.	1360	* We've already dealt with merging if appropriate.
1354	* 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
1355	* flag contains INS_ABOVE_FLOOR_ONLY, once we find the last	1362	* flag contains INS_ABOVE_FLOOR_ONLY, once we find the last
…		…
1358	* 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
1359	* 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
1360	* 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
1361	* that flying non pickable objects are spell objects.	1368	* that flying non pickable objects are spell objects.
1362	*/	1369	*/
1363	for (top = ms.bot; top; top = top->above)	1370	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1364	{	1371	{
1365	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))
1366	floor = top;	1373	floor = tmp;
1367		1374
1368	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))
1369	{	1376	{
1370	/* We insert above top, so we want this object below this */	1377	/* We insert above top, so we want this object below this */
1371	top = top->below;	1378	top = tmp->below;
1372	break;	1379	break;
1373	}	1380	}
1374		1381
1375	last = top;	1382	top = tmp;
1376	}	1383	}
1377
1378	/* Don't want top to be NULL, so set it to the last valid object */
1379	top = last;
1380		1384
1381	/* We let update_position deal with figuring out what the space	1385	/* We let update_position deal with figuring out what the space
1382	* looks like instead of lots of conditions here.	1386	* looks like instead of lots of conditions here.
1383	* makes things faster, and effectively the same result.	1387	* makes things faster, and effectively the same result.
1384	*/	1388	*/
…		…
1391	*/	1395	*/
1392	if (!(flag & INS_ON_TOP)	1396	if (!(flag & INS_ON_TOP)
1393	&& ms.flags () & P_BLOCKSVIEW	1397	&& ms.flags () & P_BLOCKSVIEW
1394	&& (op->face && !faces [op->face].visibility))	1398	&& (op->face && !faces [op->face].visibility))
1395	{	1399	{
		1400	object *last;
		1401
1396	for (last = top; last != floor; last = last->below)	1402	for (last = top; last != floor; last = last->below)
1397	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1403	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1398	break;	1404	break;
1399		1405
1400	/* Check to see if we found the object that blocks view,	1406	/* Check to see if we found the object that blocks view,
…		…
1408	} /* If objects on this space */	1414	} /* If objects on this space */
1409		1415
1410	if (flag & INS_ABOVE_FLOOR_ONLY)	1416	if (flag & INS_ABOVE_FLOOR_ONLY)
1411	top = floor;	1417	top = floor;
1412		1418
1413	/* 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
1414	*/
1415
1416	/* First object on this space */
1417	if (!top)	1420	if (!top)
1418	{	1421	{
		1422	op->below = 0;
1419	op->above = ms.bot;	1423	op->above = ms.bot;
1420
1421	if (op->above)
1422	op->above->below = op;
1423
1424	op->below = 0;
1425	ms.bot = op;	1424	ms.bot = op;
		1425
		1426	*(op->above ? &op->above->below : &ms.top) = op;
1426	}	1427	}
1427	else	1428	else
1428	{ /* get inserted into the stack above top */	1429	{
1429	op->above = top->above;	1430	op->above = top->above;
1430
1431	if (op->above)
1432	op->above->below = op;	1431	top->above = op;
1433		1432
1434	op->below = top;	1433	op->below = top;
1435	top->above = op;	1434	*(op->above ? &op->above->below : &ms.top) = op;
1436	}	1435	}
1437		1436	}
1438	if (!op->above)
1439	ms.top = op;
1440	} /* else not INS_BELOW_ORIGINATOR */
1441		1437
1442	if (op->type == PLAYER)	1438	if (op->type == PLAYER)
1443	{	1439	{
1444	op->contr->do_los = 1;	1440	op->contr->do_los = 1;
1445	++op->map->players;	1441	++op->map->players;
…		…
2440	{	2436	{
2441	char flagdesc[512];	2437	char flagdesc[512];
2442	char info2[256 * 4];	2438	char info2[256 * 4];
2443	char *p = info;	2439	char *p = info;
2444		2440
2445	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}",
2446	count,	2442	count,
2447	uuid.c_str (),	2443	uuid.c_str (),
2448	&name,	2444	&name,
2449	title ? "\",title:\"" : "",	2445	title ? ",title:\"" : "",
2450	title ? (const char *)title : "",	2446	title ? (const char *)title : "",
		2447	title ? "\"" : "",
2451	flag_desc (flagdesc, 512), type);	2448	flag_desc (flagdesc, 512), type);
2452		2449
2453	if (!flag[FLAG_REMOVED] && env)	2450	if (!flag[FLAG_REMOVED] && env)
2454	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2451	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2455		2452

Diff Legend

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

Comparing deliantra/server/common/object.C (file contents): Revision 1.235 by root, Tue May 6 20:00:12 2008 UTC vs. Revision 1.246 by root, Thu May 22 15:37:44 2008 UTC

Diff Legend

Comparing deliantra/server/common/object.C (file contents):
Revision 1.235 by root, Tue May 6 20:00:12 2008 UTC vs.
Revision 1.246 by root, Thu May 22 15:37:44 2008 UTC