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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.228 by root, Sat May 3 11:14:50 2008 UTC vs.
Revision 1.243 by root, Sat May 17 00:17:02 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
…		…
354	return 0;	359	return 0;
355	}	360	}
356		361
357	// adjust weight per container type ("of holding")	362	// adjust weight per container type ("of holding")
358	static sint32	363	static sint32
359	weight_adjust (object *op, sint32 weight)	364	weight_adjust_for (object *op, sint32 weight)
360	{	365	{
361	return op->type == CONTAINER	366	return op->type == CONTAINER
362	? lerp (weight, 0, 100, 0, 100 - op->stats.Str)	367	? lerp (weight, 0, 100, 0, 100 - op->stats.Str)
363	: weight;	368	: weight;
364	}	369	}
…		…
370	static void	375	static void
371	adjust_weight (object *op, sint32 weight)	376	adjust_weight (object *op, sint32 weight)
372	{	377	{
373	while (op)	378	while (op)
374	{	379	{
		380	// adjust by actual difference to account for rounding errors
		381	// i.e. (w2 - w1) / f != w2 / f - w1 / f and the latter is correct
375	weight = weight_adjust (op, weight);	382	weight = weight_adjust_for (op, op->carrying)
		383	- weight_adjust_for (op, op->carrying - weight);
376		384
377	if (!weight)	385	if (!weight)
378	return;	386	return;
379		387
380	op->carrying += weight;	388	op->carrying += weight;
…		…
403	op->update_weight ();	411	op->update_weight ();
404		412
405	sum += op->total_weight ();	413	sum += op->total_weight ();
406	}	414	}
407		415
408	sum = weight_adjust (this, sum);	416	sum = weight_adjust_for (this, sum);
409		417
410	if (sum != carrying)	418	if (sum != carrying)
411	{	419	{
412	carrying = sum;	420	carrying = sum;
413		421
…		…
475	*/	483	*/
476	object *	484	object *
477	find_object_name (const char *str)	485	find_object_name (const char *str)
478	{	486	{
479	shstr_cmp str_ (str);	487	shstr_cmp str_ (str);
480	object *op;
481		488
		489	if (str_)
482	for_all_objects (op)	490	for_all_objects (op)
483	if (op->name == str_)	491	if (op->name == str_)
484	break;	492	return op;
485		493
486	return op;	494	return 0;
487	}	495	}
488		496
489	/*	497	/*
490	* 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
491	* skill and experience objects.	499	* skill and experience objects.
…		…
901	* drop on that space.	909	* drop on that space.
902	*/	910	*/
903	if (!drop_to_ground	911	if (!drop_to_ground
904	\|\| !map	912	\|\| !map
905	\|\| map->in_memory != MAP_ACTIVE	913	\|\| map->in_memory != MAP_ACTIVE
906	\|\| map->nodrop	914	\|\| map->no_drop
907	\|\| ms ().move_block == MOVE_ALL)	915	\|\| ms ().move_block == MOVE_ALL)
908	{	916	{
909	while (inv)	917	while (inv)
910	{	918	{
911	inv->destroy_inv (false);	919	inv->destroy_inv (false);
…		…
940		948
941	static struct freed_map : maptile	949	static struct freed_map : maptile
942	{	950	{
943	freed_map ()	951	freed_map ()
944	{	952	{
945	path = "<freed objects map>";	953	path = "<freed objects map>";
946	name = "/internal/freed_objects_map";	954	name = "/internal/freed_objects_map";
947	width = 3;	955	width = 3;
948	height = 3;	956	height = 3;
949	nodrop = 1;	957	no_drop = 1;
		958	no_reset = 1;
950		959
951	alloc ();	960	alloc ();
952	in_memory = MAP_ACTIVE;	961	in_memory = MAP_ACTIVE;
		962	}
		963
		964	~freed_map ()
		965	{
		966	destroy ();
953	}	967	}
954	} freed_map; // freed objects are moved here to avoid crashes	968	} freed_map; // freed objects are moved here to avoid crashes
955		969
956	void	970	void
957	object::do_destroy ()	971	object::do_destroy ()
…		…
1048	if (object *pl = visible_to ())	1062	if (object *pl = visible_to ())
1049	esrv_del_item (pl->contr, count);	1063	esrv_del_item (pl->contr, count);
1050	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
1051		1065
1052	adjust_weight (env, -total_weight ());	1066	adjust_weight (env, -total_weight ());
1053
1054	*(above ? &above->below : &env->inv) = below;
1055
1056	if (below)
1057	below->above = above;
1058		1067
1059	/* we set up values so that it could be inserted into	1068	/* we set up values so that it could be inserted into
1060	* 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
1061	* to the caller to decide what we want to do.	1070	* to the caller to decide what we want to do.
1062	*/	1071	*/
1063	map = env->map;	1072	map = env->map;
1064	x = env->x;	1073	x = env->x;
1065	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
1066	above = 0;	1080	above = 0;
1067	below = 0;	1081	below = 0;
1068	env = 0;	1082	env = 0;
1069		1083
1070	/* 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
…		…
1100		1114
1101	esrv_del_item (pl->contr, count);	1115	esrv_del_item (pl->contr, count);
1102	}	1116	}
1103		1117
1104	/* link the object above us */	1118	/* link the object above us */
1105	if (above)	1119	// re-link, make sure compiler can easily use cmove
1106	above->below = below;	1120	*(above ? &above->below : &ms.top) = below;
1107	else	1121	*(below ? &below->above : &ms.bot) = above;
1108	ms.top = below; /* we were top, set new top */
1109
1110	/* Relink the object below us, if there is one */
1111	if (below)
1112	below->above = above;
1113	else
1114	{
1115	/* Nothing below, which means we need to relink map object for this space
1116	* use translated coordinates in case some oddness with map tiling is
1117	* evident
1118	*/
1119	if (GET_MAP_OB (map, x, y) != this)
1120	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 ());
1121
1122	ms.bot = above; /* goes on above it. */
1123	}
1124		1122
1125	above = 0;	1123	above = 0;
1126	below = 0;	1124	below = 0;
1127		1125
1128	if (map->in_memory == MAP_SAVING)	1126	if (map->in_memory == MAP_SAVING)
…		…
1275	* just 'op' otherwise	1273	* just 'op' otherwise
1276	*/	1274	*/
1277	object *	1275	object *
1278	insert_ob_in_map (object op, maptile m, object *originator, int flag)	1276	insert_ob_in_map (object op, maptile m, object *originator, int flag)
1279	{	1277	{
1280	assert (!op->flag [FLAG_FREED]);
1281
1282	op->remove ();	1278	op->remove ();
1283		1279
1284	/* Ideally, the caller figures this out. However, it complicates a lot	1280	/* Ideally, the caller figures this out. However, it complicates a lot
1285	* of areas of callers (eg, anything that uses find_free_spot would now	1281	* of areas of callers (eg, anything that uses find_free_spot would now
1286	* need extra work	1282	* need extra work
1287	*/	1283	*/
1288	if (!xy_normalise (m, op->x, op->y))	1284	if (!xy_normalise (m, op->x, op->y))
1289	{	1285	{
1290	op->destroy (1);	1286	op->head_ ()->destroy (1);// remove head_ once all tail object destroyers found
1291	return 0;	1287	return 0;
1292	}	1288	}
1293		1289
1294	if (object *more = op->more)	1290	if (object *more = op->more)
1295	if (!insert_ob_in_map (more, m, originator, flag))	1291	if (!insert_ob_in_map (more, m, originator, flag))
…		…
1304	*/	1300	*/
1305	if (op->nrof && !(flag & INS_NO_MERGE))	1301	if (op->nrof && !(flag & INS_NO_MERGE))
1306	for (object *tmp = ms.bot; tmp; tmp = tmp->above)	1302	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1307	if (object::can_merge (op, tmp))	1303	if (object::can_merge (op, tmp))
1308	{	1304	{
1309	// TODO: we atcually want to update tmp, not op,	1305	// TODO: we actually want to update tmp, not op,
1310	// but some caller surely breaks when we return tmp	1306	// but some caller surely breaks when we return tmp
1311	// from here :/	1307	// from here :/
1312	op->nrof += tmp->nrof;	1308	op->nrof += tmp->nrof;
1313	tmp->destroy (1);	1309	tmp->destroy (1);
1314	}	1310	}
…		…
1325	{	1321	{
1326	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");	1322	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");
1327	abort ();	1323	abort ();
1328	}	1324	}
1329		1325
		1326	if (!originator->is_on_map ())
		1327	LOG (llevDebug \| logBacktrace, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map",
		1328	op->debug_desc (), originator->debug_desc ());
		1329
1330	op->above = originator;	1330	op->above = originator;
1331	op->below = originator->below;	1331	op->below = originator->below;
1332
1333	if (op->below)
1334	op->below->above = op;
1335	else
1336	ms.bot = op;
1337
1338	/* since below originator, no need to update top */
1339	originator->below = op;	1332	originator->below = op;
		1333
		1334	*(op->below ? &op->below->above : &ms.bot) = op;
1340	}	1335	}
1341	else	1336	else
1342	{	1337	{
1343	object top, floor = NULL;	1338	object *floor = 0;
1344		1339	object *top = ms.top;
1345	top = ms.bot;
1346		1340
1347	/* If there are other objects, then */	1341	/* If there are other objects, then */
1348	if (top)	1342	if (top)
1349	{	1343	{
1350	object *last = 0;
1351
1352	/*	1344	/*
1353	* If there are multiple objects on this space, we do some trickier handling.	1345	* If there are multiple objects on this space, we do some trickier handling.
1354	* We've already dealt with merging if appropriate.	1346	* We've already dealt with merging if appropriate.
1355	* Generally, we want to put the new object on top. But if	1347	* Generally, we want to put the new object on top. But if
1356	* flag contains INS_ABOVE_FLOOR_ONLY, once we find the last	1348	* flag contains INS_ABOVE_FLOOR_ONLY, once we find the last
…		…
1359	* once we get to them. This reduces the need to traverse over all of	1351	* once we get to them. This reduces the need to traverse over all of
1360	* them when adding another one - this saves quite a bit of cpu time	1352	* them when adding another one - this saves quite a bit of cpu time
1361	* when lots of spells are cast in one area. Currently, it is presumed	1353	* when lots of spells are cast in one area. Currently, it is presumed
1362	* that flying non pickable objects are spell objects.	1354	* that flying non pickable objects are spell objects.
1363	*/	1355	*/
1364	for (top = ms.bot; top; top = top->above)	1356	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1365	{	1357	{
1366	if (QUERY_FLAG (top, FLAG_IS_FLOOR) \|\| QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))	1358	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) \|\| QUERY_FLAG (tmp, FLAG_OVERLAY_FLOOR))
1367	floor = top;	1359	floor = tmp;
1368		1360
1369	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW \| MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))	1361	if (QUERY_FLAG (tmp, FLAG_NO_PICK) && (tmp->move_type & (MOVE_FLY_LOW \| MOVE_FLY_HIGH)) && !QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1370	{	1362	{
1371	/* We insert above top, so we want this object below this */	1363	/* We insert above top, so we want this object below this */
1372	top = top->below;	1364	top = tmp->below;
1373	break;	1365	break;
1374	}	1366	}
1375		1367
1376	last = top;	1368	top = tmp;
1377	}	1369	}
1378
1379	/* Don't want top to be NULL, so set it to the last valid object */
1380	top = last;
1381		1370
1382	/* We let update_position deal with figuring out what the space	1371	/* We let update_position deal with figuring out what the space
1383	* looks like instead of lots of conditions here.	1372	* looks like instead of lots of conditions here.
1384	* makes things faster, and effectively the same result.	1373	* makes things faster, and effectively the same result.
1385	*/	1374	*/
…		…
1392	*/	1381	*/
1393	if (!(flag & INS_ON_TOP)	1382	if (!(flag & INS_ON_TOP)
1394	&& ms.flags () & P_BLOCKSVIEW	1383	&& ms.flags () & P_BLOCKSVIEW
1395	&& (op->face && !faces [op->face].visibility))	1384	&& (op->face && !faces [op->face].visibility))
1396	{	1385	{
		1386	object *last;
		1387
1397	for (last = top; last != floor; last = last->below)	1388	for (last = top; last != floor; last = last->below)
1398	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1389	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1399	break;	1390	break;
1400		1391
1401	/* Check to see if we found the object that blocks view,	1392	/* Check to see if we found the object that blocks view,
…		…
1409	} /* If objects on this space */	1400	} /* If objects on this space */
1410		1401
1411	if (flag & INS_ABOVE_FLOOR_ONLY)	1402	if (flag & INS_ABOVE_FLOOR_ONLY)
1412	top = floor;	1403	top = floor;
1413		1404
1414	/* Top is the object that our object (op) is going to get inserted above.	1405	// insert object above top, or bottom-most if top = 0
1415	*/
1416
1417	/* First object on this space */
1418	if (!top)	1406	if (!top)
1419	{	1407	{
		1408	op->below = 0;
1420	op->above = ms.bot;	1409	op->above = ms.bot;
1421
1422	if (op->above)
1423	op->above->below = op;
1424
1425	op->below = 0;
1426	ms.bot = op;	1410	ms.bot = op;
		1411
		1412	*(op->above ? &op->above->below : &ms.top) = op;
1427	}	1413	}
1428	else	1414	else
1429	{ /* get inserted into the stack above top */	1415	{
1430	op->above = top->above;	1416	op->above = top->above;
1431
1432	if (op->above)
1433	op->above->below = op;	1417	top->above = op;
1434		1418
1435	op->below = top;	1419	op->below = top;
1436	top->above = op;	1420	*(op->above ? &op->above->below : &ms.top) = op;
1437	}	1421	}
1438		1422	}
1439	if (!op->above)
1440	ms.top = op;
1441	} /* else not INS_BELOW_ORIGINATOR */
1442		1423
1443	if (op->type == PLAYER)	1424	if (op->type == PLAYER)
1444	{	1425	{
1445	op->contr->do_los = 1;	1426	op->contr->do_los = 1;
1446	++op->map->players;	1427	++op->map->players;
…		…
1582	}	1563	}
1583	else	1564	else
1584	{	1565	{
1585	decrease (nr);	1566	decrease (nr);
1586		1567
1587	object *op = object_create_clone (this);	1568	object *op = deep_clone ();
1588	op->nrof = nr;	1569	op->nrof = nr;
1589	return op;	1570	return op;
1590	}	1571	}
1591	}	1572	}
1592		1573
…		…
1813	LOG (llevError, "Present_arch called outside map.\n");	1794	LOG (llevError, "Present_arch called outside map.\n");
1814	return NULL;	1795	return NULL;
1815	}	1796	}
1816		1797
1817	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)	1798	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1818	if (tmp->arch == at)	1799	if (tmp->arch->archname == at->archname)
1819	return tmp;	1800	return tmp;
1820		1801
1821	return NULL;	1802	return NULL;
1822	}	1803	}
1823		1804
…		…
1887	* The first matching object is returned, or NULL if none.	1868	* The first matching object is returned, or NULL if none.
1888	*/	1869	*/
1889	object *	1870	object *
1890	present_arch_in_ob (const archetype at, const object op)	1871	present_arch_in_ob (const archetype at, const object op)
1891	{	1872	{
1892	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)	1873	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1893	if (tmp->arch == at)	1874	if (tmp->arch->archname == at->archname)
1894	return tmp;	1875	return tmp;
1895		1876
1896	return NULL;	1877	return NULL;
1897	}	1878	}
1898		1879
…		…
2307		2288
2308	/*	2289	/*
2309	* create clone from object to another	2290	* create clone from object to another
2310	*/	2291	*/
2311	object *	2292	object *
2312	object_create_clone (object *asrc)	2293	object::deep_clone ()
2313	{	2294	{
		2295	assert (("deep_clone called on non-head object", is_head ()));
		2296
2314	object *dst = 0;	2297	object *dst = clone ();
2315		2298
2316	if (!asrc)
2317	return 0;
2318
2319	object *src = asrc->head_ ();
2320
2321	object *prev = 0;	2299	object *prev = dst;
2322	for (object *part = src; part; part = part->more)	2300	for (object *part = this->more; part; part = part->more)
2323	{	2301	{
2324	object *tmp = part->clone ();	2302	object *tmp = part->clone ();
2325
2326	tmp->x -= src->x;
2327	tmp->y -= src->y;
2328
2329	if (!part->head)
2330	{
2331	dst = tmp;
2332	tmp->head = 0;
2333	}
2334	else
2335	tmp->head = dst;	2303	tmp->head = dst;
2336
2337	tmp->more = 0;
2338
2339	if (prev)
2340	prev->more = tmp;	2304	prev->more = tmp;
2341
2342	prev = tmp;	2305	prev = tmp;
2343	}	2306	}
2344		2307
2345	for (object *item = src->inv; item; item = item->below)	2308	for (object *item = inv; item; item = item->below)
2346	insert_ob_in_ob (object_create_clone (item), dst);	2309	insert_ob_in_ob (item->deep_clone (), dst);
2347		2310
2348	return dst;	2311	return dst;
2349	}	2312	}
2350		2313
2351	/* This returns the first object in who's inventory that	2314	/* This returns the first object in who's inventory that
…		…
2459	{	2422	{
2460	char flagdesc[512];	2423	char flagdesc[512];
2461	char info2[256 * 4];	2424	char info2[256 * 4];
2462	char *p = info;	2425	char *p = info;
2463		2426
2464	p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s,flags:[%s],type:%d}",	2427	p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s%s,flags:[%s],type:%d}",
2465	count,	2428	count,
2466	uuid.c_str (),	2429	uuid.c_str (),
2467	&name,	2430	&name,
2468	title ? "\",title:\"" : "",	2431	title ? ",title:\"" : "",
2469	title ? (const char *)title : "",	2432	title ? (const char *)title : "",
		2433	title ? "\"" : "",
2470	flag_desc (flagdesc, 512), type);	2434	flag_desc (flagdesc, 512), type);
2471		2435
2472	if (!flag[FLAG_REMOVED] && env)	2436	if (!flag[FLAG_REMOVED] && env)
2473	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2437	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2474		2438

Diff Legend

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

Comparing deliantra/server/common/object.C (file contents): Revision 1.228 by root, Sat May 3 11:14:50 2008 UTC vs. Revision 1.243 by root, Sat May 17 00:17:02 2008 UTC

Diff Legend

Comparing deliantra/server/common/object.C (file contents):
Revision 1.228 by root, Sat May 3 11:14:50 2008 UTC vs.
Revision 1.243 by root, Sat May 17 00:17:02 2008 UTC