[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.255 by root, Sun Aug 31 02:01:41 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
…		…
234	\|\| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats)))	232	\|\| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats)))
235	return 0;	233	return 0;
236		234
237	if ((ob1->flag ^ ob2->flag)	235	if ((ob1->flag ^ ob2->flag)
238	.reset (FLAG_INV_LOCKED)	236	.reset (FLAG_INV_LOCKED)
239	.reset (FLAG_CLIENT_SENT)
240	.reset (FLAG_REMOVED)	237	.reset (FLAG_REMOVED)
241	.any ())	238	.any ())
242	return 0;	239	return 0;
243		240
244	/* This is really a spellbook check - we should in general	241	/* This is really a spellbook check - we should in general
…		…
344	else	341	else
345	{	342	{
346	// maybe there is a player standing on the same mapspace	343	// maybe there is a player standing on the same mapspace
347	// this will catch the case where "this" is a player	344	// this will catch the case where "this" is a player
348	if (object *pl = ms ().player ())	345	if (object *pl = ms ().player ())
		346	if ((!pl->container && pl->contr->ns && !pl->contr->ns->update_look)
349	if (!pl->container \|\| this == pl->container)	347	\|\| this == pl->container)
350	return pl;	348	return pl;
351	}	349	}
352	}	350	}
353		351
354	return 0;	352	return 0;
…		…
478	*/	476	*/
479	object *	477	object *
480	find_object_name (const char *str)	478	find_object_name (const char *str)
481	{	479	{
482	shstr_cmp str_ (str);	480	shstr_cmp str_ (str);
483	object *op;
484		481
		482	if (str_)
485	for_all_objects (op)	483	for_all_objects (op)
486	if (op->name == str_)	484	if (op->name == str_)
487	break;	485	return op;
488		486
489	return op;	487	return 0;
490	}	488	}
491		489
492	/*	490	/*
493	* Sets the owner and sets the skill and exp pointers to owner's current	491	* Sets the owner and sets the skill and exp pointers to owner's current
494	* skill and experience objects.	492	* skill and experience objects.
…		…
768	\|\| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))	766	\|\| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))
769	\|\| (m.move_on \| op->move_on ) != m.move_on	767	\|\| (m.move_on \| op->move_on ) != m.move_on
770	\|\| (m.move_off \| op->move_off ) != m.move_off	768	\|\| (m.move_off \| op->move_off ) != m.move_off
771	\|\| (m.move_slow \| op->move_slow) != m.move_slow	769	\|\| (m.move_slow \| op->move_slow) != m.move_slow
772	/* This isn't perfect, but I don't expect a lot of objects to	770	/* This isn't perfect, but I don't expect a lot of objects to
773	* to have move_allow right now.	771	* have move_allow right now.
774	*/	772	*/
775	\|\| ((m.move_block \| op->move_block) & ~op->move_allow) != m.move_block	773	\|\| ((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)	774	\|\| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)
777	m.flags_ = 0;	775	m.flags_ = 0;
778	}	776	}
…		…
904	* drop on that space.	902	* drop on that space.
905	*/	903	*/
906	if (!drop_to_ground	904	if (!drop_to_ground
907	\|\| !map	905	\|\| !map
908	\|\| map->in_memory != MAP_ACTIVE	906	\|\| map->in_memory != MAP_ACTIVE
909	\|\| map->nodrop	907	\|\| map->no_drop
910	\|\| ms ().move_block == MOVE_ALL)	908	\|\| ms ().move_block == MOVE_ALL)
911	{	909	{
912	while (inv)	910	while (inv)
913	{
914	inv->destroy_inv (false);
915	inv->destroy ();	911	inv->destroy (true);
916	}
917	}	912	}
918	else	913	else
919	{ /* Put objects in inventory onto this space */	914	{ /* Put objects in inventory onto this space */
920	while (inv)	915	while (inv)
921	{	916	{
…		…
943		938
944	static struct freed_map : maptile	939	static struct freed_map : maptile
945	{	940	{
946	freed_map ()	941	freed_map ()
947	{	942	{
948	path = "<freed objects map>";	943	path = "<freed objects map>";
949	name = "/internal/freed_objects_map";	944	name = "/internal/freed_objects_map";
950	width = 3;	945	width = 3;
951	height = 3;	946	height = 3;
952	nodrop = 1;	947	no_drop = 1;
		948	no_reset = 1;
953		949
954	alloc ();	950	alloc ();
955	in_memory = MAP_ACTIVE;	951	in_memory = MAP_ACTIVE;
956	}	952	}
957		953
…		…
1056	if (object *pl = visible_to ())	1052	if (object *pl = visible_to ())
1057	esrv_del_item (pl->contr, count);	1053	esrv_del_item (pl->contr, count);
1058	flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed	1054	flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed
1059		1055
1060	adjust_weight (env, -total_weight ());	1056	adjust_weight (env, -total_weight ());
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		1057
1070	/* we set up values so that it could be inserted into	1058	/* we set up values so that it could be inserted into
1071	* the map, but we don't actually do that - it is up	1059	* the map, but we don't actually do that - it is up
1072	* to the caller to decide what we want to do.	1060	* to the caller to decide what we want to do.
1073	*/	1061	*/
1074	map = env->map;	1062	map = env->map;
1075	x = env->x;	1063	x = env->x;
1076	y = env->y;	1064	y = env->y;
		1065
		1066	// make sure cmov optimisation is applicable
		1067	*(above ? &above->below : &env->inv) = below;
		1068	*(below ? &below->above : &above ) = above; // &above is just a dummy
		1069
		1070	above = 0;
		1071	below = 0;
		1072	env = 0;
1077		1073
1078	/* NO_FIX_PLAYER is set when a great many changes are being	1074	/* NO_FIX_PLAYER is set when a great many changes are being
1079	* made to players inventory. If set, avoiding the call	1075	* made to players inventory. If set, avoiding the call
1080	* to save cpu time.	1076	* to save cpu time.
1081	*/	1077	*/
…		…
1115	*(below ? &below->above : &ms.bot) = above;	1111	*(below ? &below->above : &ms.bot) = above;
1116		1112
1117	above = 0;	1113	above = 0;
1118	below = 0;	1114	below = 0;
1119		1115
		1116	ms.flags_ = 0;
		1117
1120	if (map->in_memory == MAP_SAVING)	1118	if (map->in_memory == MAP_SAVING)
1121	return;	1119	return;
1122		1120
1123	int check_walk_off = !flag [FLAG_NO_APPLY];	1121	int check_walk_off = !flag [FLAG_NO_APPLY];
1124		1122
…		…
1156	}	1154	}
1157		1155
1158	last = tmp;	1156	last = tmp;
1159	}	1157	}
1160		1158
1161	/* last == NULL if there are no objects on this space */
1162	//TODO: this makes little sense, why only update the topmost object?
1163	if (!last)
1164	map->at (x, y).flags_ = 0;
1165	else
1166	update_object (last, UP_OBJ_REMOVE);
1167
1168	if (flag [FLAG_BLOCKSVIEW] \|\| glow_radius)	1159	if (flag [FLAG_BLOCKSVIEW] \|\| glow_radius)
1169	update_all_los (map, x, y);	1160	update_all_los (map, x, y);
1170	}	1161	}
1171	}	1162	}
1172		1163
…		…
1235	* job preparing multi-part monsters.	1226	* job preparing multi-part monsters.
1236	*/	1227	*/
1237	object *	1228	object *
1238	insert_ob_in_map_at (object op, maptile m, object *originator, int flag, int x, int y)	1229	insert_ob_in_map_at (object op, maptile m, object *originator, int flag, int x, int y)
1239	{	1230	{
		1231	op->remove ();
		1232
1240	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)	1233	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1241	{	1234	{
1242	tmp->x = x + tmp->arch->x;	1235	tmp->x = x + tmp->arch->x;
1243	tmp->y = y + tmp->arch->y;	1236	tmp->y = y + tmp->arch->y;
1244	}	1237	}
…		…
1267	* just 'op' otherwise	1260	* just 'op' otherwise
1268	*/	1261	*/
1269	object *	1262	object *
1270	insert_ob_in_map (object op, maptile m, object *originator, int flag)	1263	insert_ob_in_map (object op, maptile m, object *originator, int flag)
1271	{	1264	{
1272	assert (!op->flag [FLAG_FREED]);	1265	if (op->is_on_map ())
		1266	{
		1267	LOG (llevError, "insert_ob_in_map called for object already on map");
		1268	abort ();
		1269	}
1273		1270
		1271	if (op->env)
		1272	{
		1273	LOG (llevError, "insert_ob_in_map called for object in an inventory (proceeding)");
1274	op->remove ();	1274	op->remove ();
		1275	}
		1276
		1277	if (op->face && !face_info (op->face))//D TODO: remove soon
		1278	{//D
		1279	LOG (llevError \| logBacktrace, "op->face out of bounds: %s", op->debug_desc ());//D
		1280	op->face = 1;//D
		1281	}//D
1275		1282
1276	/* Ideally, the caller figures this out. However, it complicates a lot	1283	/* 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	1284	* of areas of callers (eg, anything that uses find_free_spot would now
1278	* need extra work	1285	* need extra work
1279	*/	1286	*/
…		…
1296	*/	1303	*/
1297	if (op->nrof && !(flag & INS_NO_MERGE))	1304	if (op->nrof && !(flag & INS_NO_MERGE))
1298	for (object *tmp = ms.bot; tmp; tmp = tmp->above)	1305	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1299	if (object::can_merge (op, tmp))	1306	if (object::can_merge (op, tmp))
1300	{	1307	{
1301	// TODO: we atcually want to update tmp, not op,	1308	// TODO: we actually want to update tmp, not op,
1302	// but some caller surely breaks when we return tmp	1309	// but some caller surely breaks when we return tmp
1303	// from here :/	1310	// from here :/
1304	op->nrof += tmp->nrof;	1311	op->nrof += tmp->nrof;
1305	tmp->destroy (1);	1312	tmp->destroy (1);
1306	}	1313	}
…		…
1317	{	1324	{
1318	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");	1325	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");
1319	abort ();	1326	abort ();
1320	}	1327	}
1321		1328
		1329	if (!originator->is_on_map ())
		1330	LOG (llevDebug \| logBacktrace, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map",
		1331	op->debug_desc (), originator->debug_desc ());
		1332
1322	op->above = originator;	1333	op->above = originator;
1323	op->below = originator->below;	1334	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;	1335	originator->below = op;
		1336
		1337	*(op->below ? &op->below->above : &ms.bot) = op;
1332	}	1338	}
1333	else	1339	else
1334	{	1340	{
1335	object top, floor = NULL;	1341	object *floor = 0;
1336		1342	object *top = ms.top;
1337	top = ms.bot;
1338		1343
1339	/* If there are other objects, then */	1344	/* If there are other objects, then */
1340	if (top)	1345	if (top)
1341	{	1346	{
1342	object *last = 0;
1343
1344	/*	1347	/*
1345	* If there are multiple objects on this space, we do some trickier handling.	1348	* If there are multiple objects on this space, we do some trickier handling.
1346	* We've already dealt with merging if appropriate.	1349	* We've already dealt with merging if appropriate.
1347	* Generally, we want to put the new object on top. But if	1350	* Generally, we want to put the new object on top. But if
1348	* flag contains INS_ABOVE_FLOOR_ONLY, once we find the last	1351	* 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	1354	* 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	1355	* 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	1356	* when lots of spells are cast in one area. Currently, it is presumed
1354	* that flying non pickable objects are spell objects.	1357	* that flying non pickable objects are spell objects.
1355	*/	1358	*/
1356	for (top = ms.bot; top; top = top->above)	1359	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1357	{	1360	{
1358	if (QUERY_FLAG (top, FLAG_IS_FLOOR) \|\| QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))	1361	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) \|\| QUERY_FLAG (tmp, FLAG_OVERLAY_FLOOR))
1359	floor = top;	1362	floor = tmp;
1360		1363
1361	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW \| MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))	1364	if (QUERY_FLAG (tmp, FLAG_NO_PICK) && (tmp->move_type & (MOVE_FLY_LOW \| MOVE_FLY_HIGH)) && !QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1362	{	1365	{
1363	/* We insert above top, so we want this object below this */	1366	/* We insert above top, so we want this object below this */
1364	top = top->below;	1367	top = tmp->below;
1365	break;	1368	break;
1366	}	1369	}
1367		1370
1368	last = top;	1371	top = tmp;
1369	}	1372	}
1370
1371	/* Don't want top to be NULL, so set it to the last valid object */
1372	top = last;
1373		1373
1374	/* We let update_position deal with figuring out what the space	1374	/* We let update_position deal with figuring out what the space
1375	* looks like instead of lots of conditions here.	1375	* looks like instead of lots of conditions here.
1376	* makes things faster, and effectively the same result.	1376	* makes things faster, and effectively the same result.
1377	*/	1377	*/
…		…
1384	*/	1384	*/
1385	if (!(flag & INS_ON_TOP)	1385	if (!(flag & INS_ON_TOP)
1386	&& ms.flags () & P_BLOCKSVIEW	1386	&& ms.flags () & P_BLOCKSVIEW
1387	&& (op->face && !faces [op->face].visibility))	1387	&& (op->face && !faces [op->face].visibility))
1388	{	1388	{
		1389	object *last;
		1390
1389	for (last = top; last != floor; last = last->below)	1391	for (last = top; last != floor; last = last->below)
1390	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1392	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1391	break;	1393	break;
1392		1394
1393	/* Check to see if we found the object that blocks view,	1395	/* Check to see if we found the object that blocks view,
…		…
1401	} /* If objects on this space */	1403	} /* If objects on this space */
1402		1404
1403	if (flag & INS_ABOVE_FLOOR_ONLY)	1405	if (flag & INS_ABOVE_FLOOR_ONLY)
1404	top = floor;	1406	top = floor;
1405		1407
1406	/* Top is the object that our object (op) is going to get inserted above.	1408	// insert object above top, or bottom-most if top = 0
1407	*/
1408
1409	/* First object on this space */
1410	if (!top)	1409	if (!top)
1411	{	1410	{
		1411	op->below = 0;
1412	op->above = ms.bot;	1412	op->above = ms.bot;
1413
1414	if (op->above)
1415	op->above->below = op;
1416
1417	op->below = 0;
1418	ms.bot = op;	1413	ms.bot = op;
		1414
		1415	*(op->above ? &op->above->below : &ms.top) = op;
1419	}	1416	}
1420	else	1417	else
1421	{ /* get inserted into the stack above top */	1418	{
1422	op->above = top->above;	1419	op->above = top->above;
1423
1424	if (op->above)
1425	op->above->below = op;	1420	top->above = op;
1426		1421
1427	op->below = top;	1422	op->below = top;
1428	top->above = op;	1423	*(op->above ? &op->above->below : &ms.top) = op;
1429	}	1424	}
1430		1425	}
1431	if (!op->above)
1432	ms.top = op;
1433	} /* else not INS_BELOW_ORIGINATOR */
1434		1426
1435	if (op->type == PLAYER)	1427	if (op->type == PLAYER)
1436	{	1428	{
1437	op->contr->do_los = 1;	1429	op->contr->do_los = 1;
1438	++op->map->players;	1430	++op->map->players;
…		…
1534	if (!nr)	1526	if (!nr)
1535	return true;	1527	return true;
1536		1528
1537	nr = min (nr, nrof);	1529	nr = min (nr, nrof);
1538		1530
		1531	if (nrof > nr)
		1532	{
1539	nrof -= nr;	1533	nrof -= nr;
1540
1541	if (nrof)
1542	{
1543	adjust_weight (env, -weight * nr); // carrying == 0	1534	adjust_weight (env, -weight * max (1, nr)); // carrying == 0
1544		1535
1545	if (object *pl = visible_to ())	1536	if (object *pl = visible_to ())
1546	esrv_update_item (UPD_NROF, pl, this);	1537	esrv_update_item (UPD_NROF, pl, this);
1547		1538
1548	return true;	1539	return true;
1549	}	1540	}
1550	else	1541	else
1551	{	1542	{
1552	destroy (1);	1543	destroy ();
1553	return false;	1544	return false;
1554	}	1545	}
1555	}	1546	}
1556		1547
1557	/*	1548	/*
…		…
2433	{	2424	{
2434	char flagdesc[512];	2425	char flagdesc[512];
2435	char info2[256 * 4];	2426	char info2[256 * 4];
2436	char *p = info;	2427	char *p = info;
2437		2428
2438	p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s,flags:[%s],type:%d}",	2429	p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s%s,flags:[%s],type:%d}",
2439	count,	2430	count,
2440	uuid.c_str (),	2431	uuid.c_str (),
2441	&name,	2432	&name,
2442	title ? "\",title:\"" : "",	2433	title ? ",title:\"" : "",
2443	title ? (const char *)title : "",	2434	title ? (const char *)title : "",
		2435	title ? "\"" : "",
2444	flag_desc (flagdesc, 512), type);	2436	flag_desc (flagdesc, 512), type);
2445		2437
2446	if (!flag[FLAG_REMOVED] && env)	2438	if (!flag[FLAG_REMOVED] && env)
2447	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2439	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2448		2440

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.255 by root, Sun Aug 31 02:01:41 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.255 by root, Sun Aug 31 02:01:41 2008 UTC