[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.245 by root, Sun May 18 19:53:07 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	// some objects are unmergable
		192	if (!ob1->nrof \|\| !ob2->nrof)
		193	return 0;
		194
191	/* Do not merge objects if nrof would overflow. First part checks	195	/* Do not merge objects if nrof would overflow. First part checks
192	* for unsigned overflow (2c), second part checks whether the result	196	* for unsigned overflow (2c), second part checks whether the result
193	* would fit into a 32 bit signed int, which is often used to hold	197	* would fit into a 32 bit signed int, which is often used to hold
194	* nrof values.	198	* nrof values.
195	*/	199	*/
…		…
206	SET_FLAG (ob1, FLAG_BEEN_APPLIED);	210	SET_FLAG (ob1, FLAG_BEEN_APPLIED);
207		211
208	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))	212	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))
209	SET_FLAG (ob2, FLAG_BEEN_APPLIED);	213	SET_FLAG (ob2, FLAG_BEEN_APPLIED);
210		214
211	if (ob1->arch->name != ob2->arch->name	215	if (ob1->arch->archname != ob2->arch->archname
212	\|\| ob1->name != ob2->name	216	\|\| ob1->name != ob2->name
213	\|\| ob1->title != ob2->title	217	\|\| ob1->title != ob2->title
214	\|\| ob1->msg != ob2->msg	218	\|\| ob1->msg != ob2->msg
215	\|\| ob1->weight != ob2->weight	219	\|\| ob1->weight != ob2->weight
216	\|\| ob1->attacktype != ob2->attacktype	220	\|\| ob1->attacktype != ob2->attacktype
217	\|\| ob1->magic != ob2->magic	221	\|\| ob1->magic != ob2->magic
218	\|\| ob1->slaying != ob2->slaying	222	\|\| ob1->slaying != ob2->slaying
219	\|\| ob1->skill != ob2->skill	223	\|\| ob1->skill != ob2->skill
220	\|\| ob1->value != ob2->value	224	\|\| ob1->value != ob2->value
221	\|\| ob1->animation_id != ob2->animation_id	225	\|\| ob1->animation_id != ob2->animation_id
		226	\|\| (ob1->face != ob2->face && !ob1->animation_id) // face and animation are dependent on each other
222	\|\| ob1->client_type != ob2->client_type	227	\|\| ob1->client_type != ob2->client_type
223	\|\| ob1->materialname != ob2->materialname	228	\|\| ob1->materialname != ob2->materialname
224	\|\| ob1->lore != ob2->lore	229	\|\| ob1->lore != ob2->lore
225	\|\| ob1->subtype != ob2->subtype	230	\|\| ob1->subtype != ob2->subtype
226	\|\| ob1->move_type != ob2->move_type	231	\|\| ob1->move_type != ob2->move_type
…		…
478	*/	483	*/
479	object *	484	object *
480	find_object_name (const char *str)	485	find_object_name (const char *str)
481	{	486	{
482	shstr_cmp str_ (str);	487	shstr_cmp str_ (str);
483	object *op;
484		488
		489	if (str_)
485	for_all_objects (op)	490	for_all_objects (op)
486	if (op->name == str_)	491	if (op->name == str_)
487	break;	492	return op;
488		493
489	return op;	494	return 0;
490	}	495	}
491		496
492	/*	497	/*
493	* Sets the owner and sets the skill and exp pointers to owner's current	498	* Sets the owner and sets the skill and exp pointers to owner's current
494	* skill and experience objects.	499	* skill and experience objects.
…		…
904	* drop on that space.	909	* drop on that space.
905	*/	910	*/
906	if (!drop_to_ground	911	if (!drop_to_ground
907	\|\| !map	912	\|\| !map
908	\|\| map->in_memory != MAP_ACTIVE	913	\|\| map->in_memory != MAP_ACTIVE
909	\|\| map->nodrop	914	\|\| map->no_drop
910	\|\| ms ().move_block == MOVE_ALL)	915	\|\| ms ().move_block == MOVE_ALL)
911	{	916	{
912	while (inv)	917	while (inv)
913	{	918	{
914	inv->destroy_inv (false);	919	inv->destroy_inv (false);
…		…
943		948
944	static struct freed_map : maptile	949	static struct freed_map : maptile
945	{	950	{
946	freed_map ()	951	freed_map ()
947	{	952	{
948	path = "<freed objects map>";	953	path = "<freed objects map>";
949	name = "/internal/freed_objects_map";	954	name = "/internal/freed_objects_map";
950	width = 3;	955	width = 3;
951	height = 3;	956	height = 3;
952	nodrop = 1;	957	no_drop = 1;
		958	no_reset = 1;
953		959
954	alloc ();	960	alloc ();
955	in_memory = MAP_ACTIVE;	961	in_memory = MAP_ACTIVE;
956	}	962	}
957		963
…		…
1056	if (object *pl = visible_to ())	1062	if (object *pl = visible_to ())
1057	esrv_del_item (pl->contr, count);	1063	esrv_del_item (pl->contr, count);
1058	flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed	1064	flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed
1059		1065
1060	adjust_weight (env, -total_weight ());	1066	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		1067
1070	/* we set up values so that it could be inserted into	1068	/* we set up values so that it could be inserted into
1071	* the map, but we don't actually do that - it is up	1069	* the map, but we don't actually do that - it is up
1072	* to the caller to decide what we want to do.	1070	* to the caller to decide what we want to do.
1073	*/	1071	*/
1074	map = env->map;	1072	map = env->map;
1075	x = env->x;	1073	x = env->x;
1076	y = env->y;	1074	y = env->y;
		1075
		1076	// make sure cmov optimisation is applicable
		1077	*(above ? &above->below : &env->inv) = below;
		1078	*(below ? &below->above : &above ) = above; // &above is just a dummy
		1079
		1080	above = 0;
		1081	below = 0;
		1082	env = 0;
1077		1083
1078	/* NO_FIX_PLAYER is set when a great many changes are being	1084	/* NO_FIX_PLAYER is set when a great many changes are being
1079	* made to players inventory. If set, avoiding the call	1085	* made to players inventory. If set, avoiding the call
1080	* to save cpu time.	1086	* to save cpu time.
1081	*/	1087	*/
…		…
1235	* job preparing multi-part monsters.	1241	* job preparing multi-part monsters.
1236	*/	1242	*/
1237	object *	1243	object *
1238	insert_ob_in_map_at (object op, maptile m, object *originator, int flag, int x, int y)	1244	insert_ob_in_map_at (object op, maptile m, object *originator, int flag, int x, int y)
1239	{	1245	{
		1246	op->remove ();
		1247
1240	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)	1248	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1241	{	1249	{
1242	tmp->x = x + tmp->arch->x;	1250	tmp->x = x + tmp->arch->x;
1243	tmp->y = y + tmp->arch->y;	1251	tmp->y = y + tmp->arch->y;
1244	}	1252	}
…		…
1267	* just 'op' otherwise	1275	* just 'op' otherwise
1268	*/	1276	*/
1269	object *	1277	object *
1270	insert_ob_in_map (object op, maptile m, object *originator, int flag)	1278	insert_ob_in_map (object op, maptile m, object *originator, int flag)
1271	{	1279	{
1272	assert (!op->flag [FLAG_FREED]);	1280	if (op->is_on_map ())
		1281	{
		1282	LOG (llevError, "insert_ob_in_map called for object already on map");
		1283	abort ();
		1284	}
1273		1285
		1286	if (op->env)
		1287	{
		1288	LOG (llevError, "insert_ob_in_map called for object in an inventory (proceeding)");
1274	op->remove ();	1289	op->remove ();
		1290	}
		1291
		1292	if (op->face && !face_info (op->face))//D TODO: remove soon
		1293	{//D
		1294	LOG (llevError \| logBacktrace, "op->face out of bounds: %s", op->debug_desc ());//D
		1295	op->face = 1;//D
		1296	}//D
1275		1297
1276	/* Ideally, the caller figures this out. However, it complicates a lot	1298	/* 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	1299	* of areas of callers (eg, anything that uses find_free_spot would now
1278	* need extra work	1300	* need extra work
1279	*/	1301	*/
…		…
1296	*/	1318	*/
1297	if (op->nrof && !(flag & INS_NO_MERGE))	1319	if (op->nrof && !(flag & INS_NO_MERGE))
1298	for (object *tmp = ms.bot; tmp; tmp = tmp->above)	1320	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1299	if (object::can_merge (op, tmp))	1321	if (object::can_merge (op, tmp))
1300	{	1322	{
1301	// TODO: we atcually want to update tmp, not op,	1323	// TODO: we actually want to update tmp, not op,
1302	// but some caller surely breaks when we return tmp	1324	// but some caller surely breaks when we return tmp
1303	// from here :/	1325	// from here :/
1304	op->nrof += tmp->nrof;	1326	op->nrof += tmp->nrof;
1305	tmp->destroy (1);	1327	tmp->destroy (1);
1306	}	1328	}
…		…
1317	{	1339	{
1318	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");	1340	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");
1319	abort ();	1341	abort ();
1320	}	1342	}
1321		1343
		1344	if (!originator->is_on_map ())
		1345	LOG (llevDebug \| logBacktrace, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map",
		1346	op->debug_desc (), originator->debug_desc ());
		1347
1322	op->above = originator;	1348	op->above = originator;
1323	op->below = originator->below;	1349	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;	1350	originator->below = op;
		1351
		1352	*(op->below ? &op->below->above : &ms.bot) = op;
1332	}	1353	}
1333	else	1354	else
1334	{	1355	{
1335	object top, floor = NULL;	1356	object *floor = 0;
1336		1357	object *top = ms.top;
1337	top = ms.bot;
1338		1358
1339	/* If there are other objects, then */	1359	/* If there are other objects, then */
1340	if (top)	1360	if (top)
1341	{	1361	{
1342	object *last = 0;
1343
1344	/*	1362	/*
1345	* If there are multiple objects on this space, we do some trickier handling.	1363	* If there are multiple objects on this space, we do some trickier handling.
1346	* We've already dealt with merging if appropriate.	1364	* We've already dealt with merging if appropriate.
1347	* Generally, we want to put the new object on top. But if	1365	* Generally, we want to put the new object on top. But if
1348	* flag contains INS_ABOVE_FLOOR_ONLY, once we find the last	1366	* 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	1369	* 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	1370	* 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	1371	* when lots of spells are cast in one area. Currently, it is presumed
1354	* that flying non pickable objects are spell objects.	1372	* that flying non pickable objects are spell objects.
1355	*/	1373	*/
1356	for (top = ms.bot; top; top = top->above)	1374	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1357	{	1375	{
1358	if (QUERY_FLAG (top, FLAG_IS_FLOOR) \|\| QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))	1376	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) \|\| QUERY_FLAG (tmp, FLAG_OVERLAY_FLOOR))
1359	floor = top;	1377	floor = tmp;
1360		1378
1361	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW \| MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))	1379	if (QUERY_FLAG (tmp, FLAG_NO_PICK) && (tmp->move_type & (MOVE_FLY_LOW \| MOVE_FLY_HIGH)) && !QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1362	{	1380	{
1363	/* We insert above top, so we want this object below this */	1381	/* We insert above top, so we want this object below this */
1364	top = top->below;	1382	top = tmp->below;
1365	break;	1383	break;
1366	}	1384	}
1367		1385
1368	last = top;	1386	top = tmp;
1369	}	1387	}
1370
1371	/* Don't want top to be NULL, so set it to the last valid object */
1372	top = last;
1373		1388
1374	/* We let update_position deal with figuring out what the space	1389	/* We let update_position deal with figuring out what the space
1375	* looks like instead of lots of conditions here.	1390	* looks like instead of lots of conditions here.
1376	* makes things faster, and effectively the same result.	1391	* makes things faster, and effectively the same result.
1377	*/	1392	*/
…		…
1384	*/	1399	*/
1385	if (!(flag & INS_ON_TOP)	1400	if (!(flag & INS_ON_TOP)
1386	&& ms.flags () & P_BLOCKSVIEW	1401	&& ms.flags () & P_BLOCKSVIEW
1387	&& (op->face && !faces [op->face].visibility))	1402	&& (op->face && !faces [op->face].visibility))
1388	{	1403	{
		1404	object *last;
		1405
1389	for (last = top; last != floor; last = last->below)	1406	for (last = top; last != floor; last = last->below)
1390	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1407	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1391	break;	1408	break;
1392		1409
1393	/* Check to see if we found the object that blocks view,	1410	/* Check to see if we found the object that blocks view,
…		…
1401	} /* If objects on this space */	1418	} /* If objects on this space */
1402		1419
1403	if (flag & INS_ABOVE_FLOOR_ONLY)	1420	if (flag & INS_ABOVE_FLOOR_ONLY)
1404	top = floor;	1421	top = floor;
1405		1422
1406	/* Top is the object that our object (op) is going to get inserted above.	1423	// insert object above top, or bottom-most if top = 0
1407	*/
1408
1409	/* First object on this space */
1410	if (!top)	1424	if (!top)
1411	{	1425	{
		1426	op->below = 0;
1412	op->above = ms.bot;	1427	op->above = ms.bot;
1413
1414	if (op->above)
1415	op->above->below = op;
1416
1417	op->below = 0;
1418	ms.bot = op;	1428	ms.bot = op;
		1429
		1430	*(op->above ? &op->above->below : &ms.top) = op;
1419	}	1431	}
1420	else	1432	else
1421	{ /* get inserted into the stack above top */	1433	{
1422	op->above = top->above;	1434	op->above = top->above;
1423
1424	if (op->above)
1425	op->above->below = op;	1435	top->above = op;
1426		1436
1427	op->below = top;	1437	op->below = top;
1428	top->above = op;	1438	*(op->above ? &op->above->below : &ms.top) = op;
1429	}	1439	}
1430		1440	}
1431	if (!op->above)
1432	ms.top = op;
1433	} /* else not INS_BELOW_ORIGINATOR */
1434		1441
1435	if (op->type == PLAYER)	1442	if (op->type == PLAYER)
1436	{	1443	{
1437	op->contr->do_los = 1;	1444	op->contr->do_los = 1;
1438	++op->map->players;	1445	++op->map->players;
…		…
2433	{	2440	{
2434	char flagdesc[512];	2441	char flagdesc[512];
2435	char info2[256 * 4];	2442	char info2[256 * 4];
2436	char *p = info;	2443	char *p = info;
2437		2444
2438	p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s,flags:[%s],type:%d}",	2445	p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s%s,flags:[%s],type:%d}",
2439	count,	2446	count,
2440	uuid.c_str (),	2447	uuid.c_str (),
2441	&name,	2448	&name,
2442	title ? "\",title:\"" : "",	2449	title ? ",title:\"" : "",
2443	title ? (const char *)title : "",	2450	title ? (const char *)title : "",
		2451	title ? "\"" : "",
2444	flag_desc (flagdesc, 512), type);	2452	flag_desc (flagdesc, 512), type);
2445		2453
2446	if (!flag[FLAG_REMOVED] && env)	2454	if (!flag[FLAG_REMOVED] && env)
2447	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2455	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2448		2456

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.245 by root, Sun May 18 19:53:07 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.245 by root, Sun May 18 19:53:07 2008 UTC