[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.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;
355	}	353	}
356		354
357	// adjust weight per container type ("of holding")	355	// adjust weight per container type ("of holding")
358	static sint32	356	static sint32
359	weight_adjust (object *op, sint32 weight)	357	weight_adjust_for (object *op, sint32 weight)
360	{	358	{
361	return op->type == CONTAINER	359	return op->type == CONTAINER
362	? lerp (weight, 0, 100, 0, 100 - op->stats.Str)	360	? lerp (weight, 0, 100, 0, 100 - op->stats.Str)
363	: weight;	361	: weight;
364	}	362	}
…		…
370	static void	368	static void
371	adjust_weight (object *op, sint32 weight)	369	adjust_weight (object *op, sint32 weight)
372	{	370	{
373	while (op)	371	while (op)
374	{	372	{
		373	// adjust by actual difference to account for rounding errors
		374	// i.e. (w2 - w1) / f != w2 / f - w1 / f and the latter is correct
375	weight = weight_adjust (op, weight);	375	weight = weight_adjust_for (op, op->carrying)
		376	- weight_adjust_for (op, op->carrying - weight);
376		377
377	if (!weight)	378	if (!weight)
378	return;	379	return;
379		380
380	op->carrying += weight;	381	op->carrying += weight;
…		…
403	op->update_weight ();	404	op->update_weight ();
404		405
405	sum += op->total_weight ();	406	sum += op->total_weight ();
406	}	407	}
407		408
408	sum = weight_adjust (this, sum);	409	sum = weight_adjust_for (this, sum);
409		410
410	if (sum != carrying)	411	if (sum != carrying)
411	{	412	{
412	carrying = sum;	413	carrying = sum;
413		414
…		…
475	*/	476	*/
476	object *	477	object *
477	find_object_name (const char *str)	478	find_object_name (const char *str)
478	{	479	{
479	shstr_cmp str_ (str);	480	shstr_cmp str_ (str);
480	object *op;
481		481
		482	if (str_)
482	for_all_objects (op)	483	for_all_objects (op)
483	if (op->name == str_)	484	if (op->name == str_)
484	break;	485	return op;
485		486
486	return op;	487	return 0;
487	}	488	}
488		489
489	/*	490	/*
490	* 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
491	* skill and experience objects.	492	* skill and experience objects.
…		…
765	\|\| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))	766	\|\| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))
766	\|\| (m.move_on \| op->move_on ) != m.move_on	767	\|\| (m.move_on \| op->move_on ) != m.move_on
767	\|\| (m.move_off \| op->move_off ) != m.move_off	768	\|\| (m.move_off \| op->move_off ) != m.move_off
768	\|\| (m.move_slow \| op->move_slow) != m.move_slow	769	\|\| (m.move_slow \| op->move_slow) != m.move_slow
769	/* 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
770	* to have move_allow right now.	771	* have move_allow right now.
771	*/	772	*/
772	\|\| ((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
773	\|\| 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)
774	m.flags_ = 0;	775	m.flags_ = 0;
775	}	776	}
…		…
901	* drop on that space.	902	* drop on that space.
902	*/	903	*/
903	if (!drop_to_ground	904	if (!drop_to_ground
904	\|\| !map	905	\|\| !map
905	\|\| map->in_memory != MAP_ACTIVE	906	\|\| map->in_memory != MAP_ACTIVE
906	\|\| map->nodrop	907	\|\| map->no_drop
907	\|\| ms ().move_block == MOVE_ALL)	908	\|\| ms ().move_block == MOVE_ALL)
908	{	909	{
909	while (inv)	910	while (inv)
910	{
911	inv->destroy_inv (false);
912	inv->destroy ();	911	inv->destroy (true);
913	}
914	}	912	}
915	else	913	else
916	{ /* Put objects in inventory onto this space */	914	{ /* Put objects in inventory onto this space */
917	while (inv)	915	while (inv)
918	{	916	{
…		…
940		938
941	static struct freed_map : maptile	939	static struct freed_map : maptile
942	{	940	{
943	freed_map ()	941	freed_map ()
944	{	942	{
945	path = "<freed objects map>";	943	path = "<freed objects map>";
946	name = "/internal/freed_objects_map";	944	name = "/internal/freed_objects_map";
947	width = 3;	945	width = 3;
948	height = 3;	946	height = 3;
949	nodrop = 1;	947	no_drop = 1;
		948	no_reset = 1;
950		949
951	alloc ();	950	alloc ();
952	in_memory = MAP_ACTIVE;	951	in_memory = MAP_ACTIVE;
		952	}
		953
		954	~freed_map ()
		955	{
		956	destroy ();
953	}	957	}
954	} freed_map; // freed objects are moved here to avoid crashes	958	} freed_map; // freed objects are moved here to avoid crashes
955		959
956	void	960	void
957	object::do_destroy ()	961	object::do_destroy ()
…		…
1048	if (object *pl = visible_to ())	1052	if (object *pl = visible_to ())
1049	esrv_del_item (pl->contr, count);	1053	esrv_del_item (pl->contr, count);
1050	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
1051		1055
1052	adjust_weight (env, -total_weight ());	1056	adjust_weight (env, -total_weight ());
1053
1054	*(above ? &above->below : &env->inv) = below;
1055
1056	if (below)
1057	below->above = above;
1058		1057
1059	/* we set up values so that it could be inserted into	1058	/* we set up values so that it could be inserted into
1060	* 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
1061	* to the caller to decide what we want to do.	1060	* to the caller to decide what we want to do.
1062	*/	1061	*/
1063	map = env->map;	1062	map = env->map;
1064	x = env->x;	1063	x = env->x;
1065	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
1066	above = 0;	1070	above = 0;
1067	below = 0;	1071	below = 0;
1068	env = 0;	1072	env = 0;
1069		1073
1070	/* 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
…		…
1100		1104
1101	esrv_del_item (pl->contr, count);	1105	esrv_del_item (pl->contr, count);
1102	}	1106	}
1103		1107
1104	/* link the object above us */	1108	/* link the object above us */
1105	if (above)	1109	// re-link, make sure compiler can easily use cmove
1106	above->below = below;	1110	*(above ? &above->below : &ms.top) = below;
1107	else	1111	*(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		1112
1125	above = 0;	1113	above = 0;
1126	below = 0;	1114	below = 0;
		1115
		1116	ms.flags_ = 0;
1127		1117
1128	if (map->in_memory == MAP_SAVING)	1118	if (map->in_memory == MAP_SAVING)
1129	return;	1119	return;
1130		1120
1131	int check_walk_off = !flag [FLAG_NO_APPLY];	1121	int check_walk_off = !flag [FLAG_NO_APPLY];
…		…
1164	}	1154	}
1165		1155
1166	last = tmp;	1156	last = tmp;
1167	}	1157	}
1168		1158
1169	/* last == NULL if there are no objects on this space */
1170	//TODO: this makes little sense, why only update the topmost object?
1171	if (!last)
1172	map->at (x, y).flags_ = 0;
1173	else
1174	update_object (last, UP_OBJ_REMOVE);
1175
1176	if (flag [FLAG_BLOCKSVIEW] \|\| glow_radius)	1159	if (flag [FLAG_BLOCKSVIEW] \|\| glow_radius)
1177	update_all_los (map, x, y);	1160	update_all_los (map, x, y);
1178	}	1161	}
1179	}	1162	}
1180		1163
…		…
1243	* job preparing multi-part monsters.	1226	* job preparing multi-part monsters.
1244	*/	1227	*/
1245	object *	1228	object *
1246	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)
1247	{	1230	{
		1231	op->remove ();
		1232
1248	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)	1233	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1249	{	1234	{
1250	tmp->x = x + tmp->arch->x;	1235	tmp->x = x + tmp->arch->x;
1251	tmp->y = y + tmp->arch->y;	1236	tmp->y = y + tmp->arch->y;
1252	}	1237	}
…		…
1275	* just 'op' otherwise	1260	* just 'op' otherwise
1276	*/	1261	*/
1277	object *	1262	object *
1278	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)
1279	{	1264	{
1280	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	}
1281		1270
		1271	if (op->env)
		1272	{
		1273	LOG (llevError, "insert_ob_in_map called for object in an inventory (proceeding)");
1282	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
1283		1282
1284	/* Ideally, the caller figures this out. However, it complicates a lot	1283	/* 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	1284	* of areas of callers (eg, anything that uses find_free_spot would now
1286	* need extra work	1285	* need extra work
1287	*/	1286	*/
1288	if (!xy_normalise (m, op->x, op->y))	1287	if (!xy_normalise (m, op->x, op->y))
1289	{	1288	{
1290	op->destroy (1);	1289	op->head_ ()->destroy (1);// remove head_ once all tail object destroyers found
1291	return 0;	1290	return 0;
1292	}	1291	}
1293		1292
1294	if (object *more = op->more)	1293	if (object *more = op->more)
1295	if (!insert_ob_in_map (more, m, originator, flag))	1294	if (!insert_ob_in_map (more, m, originator, flag))
…		…
1304	*/	1303	*/
1305	if (op->nrof && !(flag & INS_NO_MERGE))	1304	if (op->nrof && !(flag & INS_NO_MERGE))
1306	for (object *tmp = ms.bot; tmp; tmp = tmp->above)	1305	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1307	if (object::can_merge (op, tmp))	1306	if (object::can_merge (op, tmp))
1308	{	1307	{
1309	// TODO: we atcually want to update tmp, not op,	1308	// TODO: we actually want to update tmp, not op,
1310	// but some caller surely breaks when we return tmp	1309	// but some caller surely breaks when we return tmp
1311	// from here :/	1310	// from here :/
1312	op->nrof += tmp->nrof;	1311	op->nrof += tmp->nrof;
1313	tmp->destroy (1);	1312	tmp->destroy (1);
1314	}	1313	}
…		…
1325	{	1324	{
1326	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");
1327	abort ();	1326	abort ();
1328	}	1327	}
1329		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
1330	op->above = originator;	1333	op->above = originator;
1331	op->below = originator->below;	1334	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;	1335	originator->below = op;
		1336
		1337	*(op->below ? &op->below->above : &ms.bot) = op;
1340	}	1338	}
1341	else	1339	else
1342	{	1340	{
1343	object top, floor = NULL;	1341	object *floor = 0;
1344		1342	object *top = ms.top;
1345	top = ms.bot;
1346		1343
1347	/* If there are other objects, then */	1344	/* If there are other objects, then */
1348	if (top)	1345	if (top)
1349	{	1346	{
1350	object *last = 0;
1351
1352	/*	1347	/*
1353	* 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.
1354	* We've already dealt with merging if appropriate.	1349	* We've already dealt with merging if appropriate.
1355	* 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
1356	* flag contains INS_ABOVE_FLOOR_ONLY, once we find the last	1351	* 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	1354	* 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	1355	* 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	1356	* when lots of spells are cast in one area. Currently, it is presumed
1362	* that flying non pickable objects are spell objects.	1357	* that flying non pickable objects are spell objects.
1363	*/	1358	*/
1364	for (top = ms.bot; top; top = top->above)	1359	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1365	{	1360	{
1366	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))
1367	floor = top;	1362	floor = tmp;
1368		1363
1369	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))
1370	{	1365	{
1371	/* We insert above top, so we want this object below this */	1366	/* We insert above top, so we want this object below this */
1372	top = top->below;	1367	top = tmp->below;
1373	break;	1368	break;
1374	}	1369	}
1375		1370
1376	last = top;	1371	top = tmp;
1377	}	1372	}
1378
1379	/* Don't want top to be NULL, so set it to the last valid object */
1380	top = last;
1381		1373
1382	/* We let update_position deal with figuring out what the space	1374	/* We let update_position deal with figuring out what the space
1383	* looks like instead of lots of conditions here.	1375	* looks like instead of lots of conditions here.
1384	* makes things faster, and effectively the same result.	1376	* makes things faster, and effectively the same result.
1385	*/	1377	*/
…		…
1392	*/	1384	*/
1393	if (!(flag & INS_ON_TOP)	1385	if (!(flag & INS_ON_TOP)
1394	&& ms.flags () & P_BLOCKSVIEW	1386	&& ms.flags () & P_BLOCKSVIEW
1395	&& (op->face && !faces [op->face].visibility))	1387	&& (op->face && !faces [op->face].visibility))
1396	{	1388	{
		1389	object *last;
		1390
1397	for (last = top; last != floor; last = last->below)	1391	for (last = top; last != floor; last = last->below)
1398	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1392	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1399	break;	1393	break;
1400		1394
1401	/* Check to see if we found the object that blocks view,	1395	/* Check to see if we found the object that blocks view,
…		…
1409	} /* If objects on this space */	1403	} /* If objects on this space */
1410		1404
1411	if (flag & INS_ABOVE_FLOOR_ONLY)	1405	if (flag & INS_ABOVE_FLOOR_ONLY)
1412	top = floor;	1406	top = floor;
1413		1407
1414	/* 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
1415	*/
1416
1417	/* First object on this space */
1418	if (!top)	1409	if (!top)
1419	{	1410	{
		1411	op->below = 0;
1420	op->above = ms.bot;	1412	op->above = ms.bot;
1421
1422	if (op->above)
1423	op->above->below = op;
1424
1425	op->below = 0;
1426	ms.bot = op;	1413	ms.bot = op;
		1414
		1415	*(op->above ? &op->above->below : &ms.top) = op;
1427	}	1416	}
1428	else	1417	else
1429	{ /* get inserted into the stack above top */	1418	{
1430	op->above = top->above;	1419	op->above = top->above;
1431
1432	if (op->above)
1433	op->above->below = op;	1420	top->above = op;
1434		1421
1435	op->below = top;	1422	op->below = top;
1436	top->above = op;	1423	*(op->above ? &op->above->below : &ms.top) = op;
1437	}	1424	}
1438		1425	}
1439	if (!op->above)
1440	ms.top = op;
1441	} /* else not INS_BELOW_ORIGINATOR */
1442		1426
1443	if (op->type == PLAYER)	1427	if (op->type == PLAYER)
1444	{	1428	{
1445	op->contr->do_los = 1;	1429	op->contr->do_los = 1;
1446	++op->map->players;	1430	++op->map->players;
…		…
1542	if (!nr)	1526	if (!nr)
1543	return true;	1527	return true;
1544		1528
1545	nr = min (nr, nrof);	1529	nr = min (nr, nrof);
1546		1530
		1531	if (nrof > nr)
		1532	{
1547	nrof -= nr;	1533	nrof -= nr;
1548
1549	if (nrof)
1550	{
1551	adjust_weight (env, -weight * nr); // carrying == 0	1534	adjust_weight (env, -weight * max (1, nr)); // carrying == 0
1552		1535
1553	if (object *pl = visible_to ())	1536	if (object *pl = visible_to ())
1554	esrv_update_item (UPD_NROF, pl, this);	1537	esrv_update_item (UPD_NROF, pl, this);
1555		1538
1556	return true;	1539	return true;
1557	}	1540	}
1558	else	1541	else
1559	{	1542	{
1560	destroy (1);	1543	destroy ();
1561	return false;	1544	return false;
1562	}	1545	}
1563	}	1546	}
1564		1547
1565	/*	1548	/*
…		…
1582	}	1565	}
1583	else	1566	else
1584	{	1567	{
1585	decrease (nr);	1568	decrease (nr);
1586		1569
1587	object *op = object_create_clone (this);	1570	object *op = deep_clone ();
1588	op->nrof = nr;	1571	op->nrof = nr;
1589	return op;	1572	return op;
1590	}	1573	}
1591	}	1574	}
1592		1575
…		…
1813	LOG (llevError, "Present_arch called outside map.\n");	1796	LOG (llevError, "Present_arch called outside map.\n");
1814	return NULL;	1797	return NULL;
1815	}	1798	}
1816		1799
1817	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)	1800	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1818	if (tmp->arch == at)	1801	if (tmp->arch->archname == at->archname)
1819	return tmp;	1802	return tmp;
1820		1803
1821	return NULL;	1804	return NULL;
1822	}	1805	}
1823		1806
…		…
1887	* The first matching object is returned, or NULL if none.	1870	* The first matching object is returned, or NULL if none.
1888	*/	1871	*/
1889	object *	1872	object *
1890	present_arch_in_ob (const archetype at, const object op)	1873	present_arch_in_ob (const archetype at, const object op)
1891	{	1874	{
1892	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)	1875	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1893	if (tmp->arch == at)	1876	if (tmp->arch->archname == at->archname)
1894	return tmp;	1877	return tmp;
1895		1878
1896	return NULL;	1879	return NULL;
1897	}	1880	}
1898		1881
…		…
2307		2290
2308	/*	2291	/*
2309	* create clone from object to another	2292	* create clone from object to another
2310	*/	2293	*/
2311	object *	2294	object *
2312	object_create_clone (object *asrc)	2295	object::deep_clone ()
2313	{	2296	{
		2297	assert (("deep_clone called on non-head object", is_head ()));
		2298
2314	object *dst = 0;	2299	object *dst = clone ();
2315		2300
2316	if (!asrc)
2317	return 0;
2318
2319	object *src = asrc->head_ ();
2320
2321	object *prev = 0;	2301	object *prev = dst;
2322	for (object *part = src; part; part = part->more)	2302	for (object *part = this->more; part; part = part->more)
2323	{	2303	{
2324	object *tmp = part->clone ();	2304	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;	2305	tmp->head = dst;
2336
2337	tmp->more = 0;
2338
2339	if (prev)
2340	prev->more = tmp;	2306	prev->more = tmp;
2341
2342	prev = tmp;	2307	prev = tmp;
2343	}	2308	}
2344		2309
2345	for (object *item = src->inv; item; item = item->below)	2310	for (object *item = inv; item; item = item->below)
2346	insert_ob_in_ob (object_create_clone (item), dst);	2311	insert_ob_in_ob (item->deep_clone (), dst);
2347		2312
2348	return dst;	2313	return dst;
2349	}	2314	}
2350		2315
2351	/* This returns the first object in who's inventory that	2316	/* This returns the first object in who's inventory that
…		…
2459	{	2424	{
2460	char flagdesc[512];	2425	char flagdesc[512];
2461	char info2[256 * 4];	2426	char info2[256 * 4];
2462	char *p = info;	2427	char *p = info;
2463		2428
2464	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}",
2465	count,	2430	count,
2466	uuid.c_str (),	2431	uuid.c_str (),
2467	&name,	2432	&name,
2468	title ? "\",title:\"" : "",	2433	title ? ",title:\"" : "",
2469	title ? (const char *)title : "",	2434	title ? (const char *)title : "",
		2435	title ? "\"" : "",
2470	flag_desc (flagdesc, 512), type);	2436	flag_desc (flagdesc, 512), type);
2471		2437
2472	if (!flag[FLAG_REMOVED] && env)	2438	if (!flag[FLAG_REMOVED] && env)
2473	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2439	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2474		2440

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