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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.234 by root, Tue May 6 18:47:52 2008 UTC vs.
Revision 1.254 by root, Sun Aug 31 01:17:11 2008 UTC

…		…
186	\|\| ob1->speed != ob2->speed	186	\|\| ob1->speed != ob2->speed
187	\|\| ob1->value != ob2->value	187	\|\| ob1->value != ob2->value
188	\|\| ob1->name != ob2->name)	188	\|\| ob1->name != ob2->name)
189	return 0;	189	return 0;
190		190
191	/* Do not merge objects if nrof would overflow. First part checks	191	/* Do not merge objects if nrof would overflow, assume nrof
192	* for unsigned overflow (2c), second part checks whether the result	192	* is always 0 .. 2*31-1 /
193	* would fit into a 32 bit signed int, which is often used to hold	193	if (ob1->nrof > 0x7fffffff - ob2->nrof)
194	* nrof values.
195	*/
196	if (~ob1->nrof < ob2->nrof \|\| ob1->nrof + ob2->nrof > (1UL << 31))
197	return 0;	194	return 0;
198		195
199	/* If the objects have been identified, set the BEEN_APPLIED flag.	196	/* If the objects have been identified, set the BEEN_APPLIED flag.
200	* This is to the comparison of the flags below will be OK. We	197	* This is to the comparison of the flags below will be OK. We
201	* just can't ignore the been applied or identified flags, as they	198	* just can't ignore the been applied or identified flags, as they
…		…
206	SET_FLAG (ob1, FLAG_BEEN_APPLIED);	203	SET_FLAG (ob1, FLAG_BEEN_APPLIED);
207		204
208	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))	205	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))
209	SET_FLAG (ob2, FLAG_BEEN_APPLIED);	206	SET_FLAG (ob2, FLAG_BEEN_APPLIED);
210		207
211	if (ob1->arch->name != ob2->arch->name	208	if (ob1->arch->archname != ob2->arch->archname
212	\|\| ob1->name != ob2->name	209	\|\| ob1->name != ob2->name
213	\|\| ob1->title != ob2->title	210	\|\| ob1->title != ob2->title
214	\|\| ob1->msg != ob2->msg	211	\|\| ob1->msg != ob2->msg
215	\|\| ob1->weight != ob2->weight	212	\|\| ob1->weight != ob2->weight
216	\|\| ob1->attacktype != ob2->attacktype	213	\|\| ob1->attacktype != ob2->attacktype
217	\|\| ob1->magic != ob2->magic	214	\|\| ob1->magic != ob2->magic
218	\|\| ob1->slaying != ob2->slaying	215	\|\| ob1->slaying != ob2->slaying
219	\|\| ob1->skill != ob2->skill	216	\|\| ob1->skill != ob2->skill
220	\|\| ob1->value != ob2->value	217	\|\| ob1->value != ob2->value
221	\|\| ob1->animation_id != ob2->animation_id	218	\|\| ob1->animation_id != ob2->animation_id
		219	\|\| (ob1->face != ob2->face && !ob1->animation_id) // face and animation are dependent on each other
222	\|\| ob1->client_type != ob2->client_type	220	\|\| ob1->client_type != ob2->client_type
223	\|\| ob1->materialname != ob2->materialname	221	\|\| ob1->materialname != ob2->materialname
224	\|\| ob1->lore != ob2->lore	222	\|\| ob1->lore != ob2->lore
225	\|\| ob1->subtype != ob2->subtype	223	\|\| ob1->subtype != ob2->subtype
226	\|\| ob1->move_type != ob2->move_type	224	\|\| ob1->move_type != ob2->move_type
…		…
344	else	342	else
345	{	343	{
346	// maybe there is a player standing on the same mapspace	344	// maybe there is a player standing on the same mapspace
347	// this will catch the case where "this" is a player	345	// this will catch the case where "this" is a player
348	if (object *pl = ms ().player ())	346	if (object *pl = ms ().player ())
		347	if ((!pl->container && pl->contr->ns && !pl->contr->ns->update_look)
349	if (!pl->container \|\| this == pl->container)	348	\|\| this == pl->container)
350	return pl;	349	return pl;
351	}	350	}
352	}	351	}
353		352
354	return 0;	353	return 0;
…		…
478	*/	477	*/
479	object *	478	object *
480	find_object_name (const char *str)	479	find_object_name (const char *str)
481	{	480	{
482	shstr_cmp str_ (str);	481	shstr_cmp str_ (str);
483	object *op;
484		482
		483	if (str_)
485	for_all_objects (op)	484	for_all_objects (op)
486	if (op->name == str_)	485	if (op->name == str_)
487	break;	486	return op;
488		487
489	return op;	488	return 0;
490	}	489	}
491		490
492	/*	491	/*
493	* Sets the owner and sets the skill and exp pointers to owner's current	492	* Sets the owner and sets the skill and exp pointers to owner's current
494	* skill and experience objects.	493	* skill and experience objects.
…		…
768	\|\| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))	767	\|\| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))
769	\|\| (m.move_on \| op->move_on ) != m.move_on	768	\|\| (m.move_on \| op->move_on ) != m.move_on
770	\|\| (m.move_off \| op->move_off ) != m.move_off	769	\|\| (m.move_off \| op->move_off ) != m.move_off
771	\|\| (m.move_slow \| op->move_slow) != m.move_slow	770	\|\| (m.move_slow \| op->move_slow) != m.move_slow
772	/* This isn't perfect, but I don't expect a lot of objects to	771	/* This isn't perfect, but I don't expect a lot of objects to
773	* to have move_allow right now.	772	* have move_allow right now.
774	*/	773	*/
775	\|\| ((m.move_block \| op->move_block) & ~op->move_allow) != m.move_block	774	\|\| ((m.move_block \| op->move_block) & ~op->move_allow) != m.move_block
776	\|\| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)	775	\|\| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)
777	m.flags_ = 0;	776	m.flags_ = 0;
778	}	777	}
…		…
904	* drop on that space.	903	* drop on that space.
905	*/	904	*/
906	if (!drop_to_ground	905	if (!drop_to_ground
907	\|\| !map	906	\|\| !map
908	\|\| map->in_memory != MAP_ACTIVE	907	\|\| map->in_memory != MAP_ACTIVE
909	\|\| map->nodrop	908	\|\| map->no_drop
910	\|\| ms ().move_block == MOVE_ALL)	909	\|\| ms ().move_block == MOVE_ALL)
911	{	910	{
912	while (inv)	911	while (inv)
913	{
914	inv->destroy_inv (false);
915	inv->destroy ();	912	inv->destroy (true);
916	}
917	}	913	}
918	else	914	else
919	{ /* Put objects in inventory onto this space */	915	{ /* Put objects in inventory onto this space */
920	while (inv)	916	while (inv)
921	{	917	{
…		…
943		939
944	static struct freed_map : maptile	940	static struct freed_map : maptile
945	{	941	{
946	freed_map ()	942	freed_map ()
947	{	943	{
948	path = "<freed objects map>";	944	path = "<freed objects map>";
949	name = "/internal/freed_objects_map";	945	name = "/internal/freed_objects_map";
950	width = 3;	946	width = 3;
951	height = 3;	947	height = 3;
952	nodrop = 1;	948	no_drop = 1;
		949	no_reset = 1;
953		950
954	alloc ();	951	alloc ();
955	in_memory = MAP_ACTIVE;	952	in_memory = MAP_ACTIVE;
956	}	953	}
957		954
…		…
1056	if (object *pl = visible_to ())	1053	if (object *pl = visible_to ())
1057	esrv_del_item (pl->contr, count);	1054	esrv_del_item (pl->contr, count);
1058	flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed	1055	flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed
1059		1056
1060	adjust_weight (env, -total_weight ());	1057	adjust_weight (env, -total_weight ());
1061
1062	*(above ? &above->below : &env->inv) = below;
1063
1064	if (below)
1065	below->above = above;
1066		1058
1067	/* we set up values so that it could be inserted into	1059	/* we set up values so that it could be inserted into
1068	* the map, but we don't actually do that - it is up	1060	* the map, but we don't actually do that - it is up
1069	* to the caller to decide what we want to do.	1061	* to the caller to decide what we want to do.
1070	*/	1062	*/
1071	map = env->map;	1063	map = env->map;
1072	x = env->x;	1064	x = env->x;
1073	y = env->y;	1065	y = env->y;
		1066
		1067	// make sure cmov optimisation is applicable
		1068	*(above ? &above->below : &env->inv) = below;
		1069	*(below ? &below->above : &above ) = above; // &above is just a dummy
		1070
1074	above = 0;	1071	above = 0;
1075	below = 0;	1072	below = 0;
1076	env = 0;	1073	env = 0;
1077		1074
1078	/* NO_FIX_PLAYER is set when a great many changes are being	1075	/* NO_FIX_PLAYER is set when a great many changes are being
…		…
1108		1105
1109	esrv_del_item (pl->contr, count);	1106	esrv_del_item (pl->contr, count);
1110	}	1107	}
1111		1108
1112	/* link the object above us */	1109	/* link the object above us */
1113	if (above)	1110	// re-link, make sure compiler can easily use cmove
1114	above->below = below;	1111	*(above ? &above->below : &ms.top) = below;
1115	else	1112	*(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		1113
1133	above = 0;	1114	above = 0;
1134	below = 0;	1115	below = 0;
		1116
		1117	ms.flags_ = 0;
1135		1118
1136	if (map->in_memory == MAP_SAVING)	1119	if (map->in_memory == MAP_SAVING)
1137	return;	1120	return;
1138		1121
1139	int check_walk_off = !flag [FLAG_NO_APPLY];	1122	int check_walk_off = !flag [FLAG_NO_APPLY];
…		…
1172	}	1155	}
1173		1156
1174	last = tmp;	1157	last = tmp;
1175	}	1158	}
1176		1159
1177	/* last == NULL if there are no objects on this space */
1178	//TODO: this makes little sense, why only update the topmost object?
1179	if (!last)
1180	map->at (x, y).flags_ = 0;
1181	else
1182	update_object (last, UP_OBJ_REMOVE);
1183
1184	if (flag [FLAG_BLOCKSVIEW] \|\| glow_radius)	1160	if (flag [FLAG_BLOCKSVIEW] \|\| glow_radius)
1185	update_all_los (map, x, y);	1161	update_all_los (map, x, y);
1186	}	1162	}
1187	}	1163	}
1188		1164
…		…
1251	* job preparing multi-part monsters.	1227	* job preparing multi-part monsters.
1252	*/	1228	*/
1253	object *	1229	object *
1254	insert_ob_in_map_at (object op, maptile m, object *originator, int flag, int x, int y)	1230	insert_ob_in_map_at (object op, maptile m, object *originator, int flag, int x, int y)
1255	{	1231	{
		1232	op->remove ();
		1233
1256	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)	1234	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1257	{	1235	{
1258	tmp->x = x + tmp->arch->x;	1236	tmp->x = x + tmp->arch->x;
1259	tmp->y = y + tmp->arch->y;	1237	tmp->y = y + tmp->arch->y;
1260	}	1238	}
…		…
1283	* just 'op' otherwise	1261	* just 'op' otherwise
1284	*/	1262	*/
1285	object *	1263	object *
1286	insert_ob_in_map (object op, maptile m, object *originator, int flag)	1264	insert_ob_in_map (object op, maptile m, object *originator, int flag)
1287	{	1265	{
1288	assert (!op->flag [FLAG_FREED]);	1266	if (op->is_on_map ())
		1267	{
		1268	LOG (llevError, "insert_ob_in_map called for object already on map");
		1269	abort ();
		1270	}
1289		1271
		1272	if (op->env)
		1273	{
		1274	LOG (llevError, "insert_ob_in_map called for object in an inventory (proceeding)");
1290	op->remove ();	1275	op->remove ();
		1276	}
		1277
		1278	if (op->face && !face_info (op->face))//D TODO: remove soon
		1279	{//D
		1280	LOG (llevError \| logBacktrace, "op->face out of bounds: %s", op->debug_desc ());//D
		1281	op->face = 1;//D
		1282	}//D
1291		1283
1292	/* Ideally, the caller figures this out. However, it complicates a lot	1284	/* 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	1285	* of areas of callers (eg, anything that uses find_free_spot would now
1294	* need extra work	1286	* need extra work
1295	*/	1287	*/
…		…
1312	*/	1304	*/
1313	if (op->nrof && !(flag & INS_NO_MERGE))	1305	if (op->nrof && !(flag & INS_NO_MERGE))
1314	for (object *tmp = ms.bot; tmp; tmp = tmp->above)	1306	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1315	if (object::can_merge (op, tmp))	1307	if (object::can_merge (op, tmp))
1316	{	1308	{
1317	// TODO: we atcually want to update tmp, not op,	1309	// TODO: we actually want to update tmp, not op,
1318	// but some caller surely breaks when we return tmp	1310	// but some caller surely breaks when we return tmp
1319	// from here :/	1311	// from here :/
1320	op->nrof += tmp->nrof;	1312	op->nrof += tmp->nrof;
1321	tmp->destroy (1);	1313	tmp->destroy (1);
1322	}	1314	}
…		…
1333	{	1325	{
1334	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");	1326	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");
1335	abort ();	1327	abort ();
1336	}	1328	}
1337		1329
		1330	if (!originator->is_on_map ())
		1331	LOG (llevDebug \| logBacktrace, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map",
		1332	op->debug_desc (), originator->debug_desc ());
		1333
1338	op->above = originator;	1334	op->above = originator;
1339	op->below = originator->below;	1335	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;	1336	originator->below = op;
		1337
		1338	*(op->below ? &op->below->above : &ms.bot) = op;
1348	}	1339	}
1349	else	1340	else
1350	{	1341	{
1351	object top, floor = NULL;	1342	object *floor = 0;
1352		1343	object *top = ms.top;
1353	top = ms.bot;
1354		1344
1355	/* If there are other objects, then */	1345	/* If there are other objects, then */
1356	if (top)	1346	if (top)
1357	{	1347	{
1358	object *last = 0;
1359
1360	/*	1348	/*
1361	* If there are multiple objects on this space, we do some trickier handling.	1349	* If there are multiple objects on this space, we do some trickier handling.
1362	* We've already dealt with merging if appropriate.	1350	* We've already dealt with merging if appropriate.
1363	* Generally, we want to put the new object on top. But if	1351	* Generally, we want to put the new object on top. But if
1364	* flag contains INS_ABOVE_FLOOR_ONLY, once we find the last	1352	* 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	1355	* 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	1356	* 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	1357	* when lots of spells are cast in one area. Currently, it is presumed
1370	* that flying non pickable objects are spell objects.	1358	* that flying non pickable objects are spell objects.
1371	*/	1359	*/
1372	for (top = ms.bot; top; top = top->above)	1360	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1373	{	1361	{
1374	if (QUERY_FLAG (top, FLAG_IS_FLOOR) \|\| QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))	1362	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) \|\| QUERY_FLAG (tmp, FLAG_OVERLAY_FLOOR))
1375	floor = top;	1363	floor = tmp;
1376		1364
1377	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW \| MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))	1365	if (QUERY_FLAG (tmp, FLAG_NO_PICK) && (tmp->move_type & (MOVE_FLY_LOW \| MOVE_FLY_HIGH)) && !QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1378	{	1366	{
1379	/* We insert above top, so we want this object below this */	1367	/* We insert above top, so we want this object below this */
1380	top = top->below;	1368	top = tmp->below;
1381	break;	1369	break;
1382	}	1370	}
1383		1371
1384	last = top;	1372	top = tmp;
1385	}	1373	}
1386
1387	/* Don't want top to be NULL, so set it to the last valid object */
1388	top = last;
1389		1374
1390	/* We let update_position deal with figuring out what the space	1375	/* We let update_position deal with figuring out what the space
1391	* looks like instead of lots of conditions here.	1376	* looks like instead of lots of conditions here.
1392	* makes things faster, and effectively the same result.	1377	* makes things faster, and effectively the same result.
1393	*/	1378	*/
…		…
1400	*/	1385	*/
1401	if (!(flag & INS_ON_TOP)	1386	if (!(flag & INS_ON_TOP)
1402	&& ms.flags () & P_BLOCKSVIEW	1387	&& ms.flags () & P_BLOCKSVIEW
1403	&& (op->face && !faces [op->face].visibility))	1388	&& (op->face && !faces [op->face].visibility))
1404	{	1389	{
		1390	object *last;
		1391
1405	for (last = top; last != floor; last = last->below)	1392	for (last = top; last != floor; last = last->below)
1406	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1393	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1407	break;	1394	break;
1408		1395
1409	/* Check to see if we found the object that blocks view,	1396	/* Check to see if we found the object that blocks view,
…		…
1417	} /* If objects on this space */	1404	} /* If objects on this space */
1418		1405
1419	if (flag & INS_ABOVE_FLOOR_ONLY)	1406	if (flag & INS_ABOVE_FLOOR_ONLY)
1420	top = floor;	1407	top = floor;
1421		1408
1422	/* Top is the object that our object (op) is going to get inserted above.	1409	// insert object above top, or bottom-most if top = 0
1423	*/
1424
1425	/* First object on this space */
1426	if (!top)	1410	if (!top)
1427	{	1411	{
		1412	op->below = 0;
1428	op->above = ms.bot;	1413	op->above = ms.bot;
1429
1430	if (op->above)
1431	op->above->below = op;
1432
1433	op->below = 0;
1434	ms.bot = op;	1414	ms.bot = op;
		1415
		1416	*(op->above ? &op->above->below : &ms.top) = op;
1435	}	1417	}
1436	else	1418	else
1437	{ /* get inserted into the stack above top */	1419	{
1438	op->above = top->above;	1420	op->above = top->above;
1439
1440	if (op->above)
1441	op->above->below = op;	1421	top->above = op;
1442		1422
1443	op->below = top;	1423	op->below = top;
1444	top->above = op;	1424	*(op->above ? &op->above->below : &ms.top) = op;
1445	}	1425	}
1446		1426	}
1447	if (!op->above)
1448	ms.top = op;
1449	} /* else not INS_BELOW_ORIGINATOR */
1450		1427
1451	if (op->type == PLAYER)	1428	if (op->type == PLAYER)
1452	{	1429	{
1453	op->contr->do_los = 1;	1430	op->contr->do_los = 1;
1454	++op->map->players;	1431	++op->map->players;
…		…
1550	if (!nr)	1527	if (!nr)
1551	return true;	1528	return true;
1552		1529
1553	nr = min (nr, nrof);	1530	nr = min (nr, nrof);
1554		1531
		1532	if (nrof > nr)
		1533	{
1555	nrof -= nr;	1534	nrof -= nr;
1556
1557	if (nrof)
1558	{
1559	adjust_weight (env, -weight * nr); // carrying == 0	1535	adjust_weight (env, -weight * max (1, nr)); // carrying == 0
1560		1536
1561	if (object *pl = visible_to ())	1537	if (object *pl = visible_to ())
1562	esrv_update_item (UPD_NROF, pl, this);	1538	esrv_update_item (UPD_NROF, pl, this);
1563		1539
1564	return true;	1540	return true;
1565	}	1541	}
1566	else	1542	else
1567	{	1543	{
1568	destroy (1);	1544	destroy ();
1569	return false;	1545	return false;
1570	}	1546	}
1571	}	1547	}
1572		1548
1573	/*	1549	/*
…		…
2449	{	2425	{
2450	char flagdesc[512];	2426	char flagdesc[512];
2451	char info2[256 * 4];	2427	char info2[256 * 4];
2452	char *p = info;	2428	char *p = info;
2453		2429
2454	p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s,flags:[%s],type:%d}",	2430	p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s%s,flags:[%s],type:%d}",
2455	count,	2431	count,
2456	uuid.c_str (),	2432	uuid.c_str (),
2457	&name,	2433	&name,
2458	title ? "\",title:\"" : "",	2434	title ? ",title:\"" : "",
2459	title ? (const char *)title : "",	2435	title ? (const char *)title : "",
		2436	title ? "\"" : "",
2460	flag_desc (flagdesc, 512), type);	2437	flag_desc (flagdesc, 512), type);
2461		2438
2462	if (!flag[FLAG_REMOVED] && env)	2439	if (!flag[FLAG_REMOVED] && env)
2463	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2440	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2464		2441

Diff Legend

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

Comparing deliantra/server/common/object.C (file contents): Revision 1.234 by root, Tue May 6 18:47:52 2008 UTC vs. Revision 1.254 by root, Sun Aug 31 01:17:11 2008 UTC

Diff Legend

Comparing deliantra/server/common/object.C (file contents):
Revision 1.234 by root, Tue May 6 18:47:52 2008 UTC vs.
Revision 1.254 by root, Sun Aug 31 01:17:11 2008 UTC