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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.207 by root, Sun Apr 20 23:25:09 2008 UTC vs.
Revision 1.212 by root, Mon Apr 21 23:35:24 2008 UTC

…		…
1	/*	1	/*
2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.	2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.
3	*	3	*
4	* Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra team	4	* Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5	* Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team	5	* Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team
6	* Copyright (©) 1992,2007 Frank Tore Johansen	6	* Copyright (©) 1992,2007 Frank Tore Johansen
7	*	7	*
8	* Deliantra is free software: you can redistribute it and/or modify	8	* Deliantra is free software: you can redistribute it and/or modify
9	* it under the terms of the GNU General Public License as published by	9	* it under the terms of the GNU General Public License as published by
19	* along with this program. If not, see <http://www.gnu.org/licenses/>.	19	* along with this program. If not, see <http://www.gnu.org/licenses/>.
20	*	20	*
21	* The authors can be reached via e-mail to <support@deliantra.net>	21	* The authors can be reached via e-mail to <support@deliantra.net>
22	*/	22	*/
23		23
24	/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
25	sub/add_weight will transcend the environment updating the carrying
26	variable. */
27
28	#include <global.h>	24	#include <global.h>
29	#include <stdio.h>	25	#include <stdio.h>
30	#include <sys/types.h>	26	#include <sys/types.h>
31	#include <sys/uio.h>	27	#include <sys/uio.h>
32	#include <object.h>	28	#include <object.h>
33	#include <funcpoint.h>
34	#include <sproto.h>	29	#include <sproto.h>
35	#include <loader.h>	30	#include <loader.h>
36		31
37	#include <bitset>	32	#include <bitset>
38		33
…		…
206	\|\| ob1->value != ob2->value	201	\|\| ob1->value != ob2->value
207	\|\| ob1->name != ob2->name)	202	\|\| ob1->name != ob2->name)
208	return 0;	203	return 0;
209		204
210	/* Do not merge objects if nrof would overflow. First part checks	205	/* Do not merge objects if nrof would overflow. First part checks
211	* for unsigned overflow (2c), second part checks wether the result	206	* for unsigned overflow (2c), second part checks whether the result
212	* would fit into a 32 bit signed int, which is often used to hold	207	* would fit into a 32 bit signed int, which is often used to hold
213	* nrof values.	208	* nrof values.
214	*/	209	*/
215	if (~ob1->nrof < ob2->nrof \|\| ob1->nrof + ob2->nrof > (1UL << 31))	210	if (~ob1->nrof < ob2->nrof \|\| ob1->nrof + ob2->nrof > (1UL << 31))
216	return 0;	211	return 0;
…		…
225	SET_FLAG (ob1, FLAG_BEEN_APPLIED);	220	SET_FLAG (ob1, FLAG_BEEN_APPLIED);
226		221
227	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))	222	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))
228	SET_FLAG (ob2, FLAG_BEEN_APPLIED);	223	SET_FLAG (ob2, FLAG_BEEN_APPLIED);
229		224
230	if ((ob1->flag ^ ob2->flag).reset (FLAG_INV_LOCKED).reset (FLAG_CLIENT_SENT).any ()	225	if (ob1->arch->name != ob2->arch->name
231	\|\| ob1->arch != ob2->arch
232	\|\| ob1->name != ob2->name	226	\|\| ob1->name != ob2->name
233	\|\| ob1->title != ob2->title	227	\|\| ob1->title != ob2->title
234	\|\| ob1->msg != ob2->msg	228	\|\| ob1->msg != ob2->msg
235	\|\| ob1->weight != ob2->weight	229	\|\| ob1->weight != ob2->weight
236	\|\| memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
237	\|\| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats) )
238	\|\| ob1->attacktype != ob2->attacktype	230	\|\| ob1->attacktype != ob2->attacktype
239	\|\| ob1->magic != ob2->magic	231	\|\| ob1->magic != ob2->magic
240	\|\| ob1->slaying != ob2->slaying	232	\|\| ob1->slaying != ob2->slaying
241	\|\| ob1->skill != ob2->skill	233	\|\| ob1->skill != ob2->skill
242	\|\| ob1->value != ob2->value	234	\|\| ob1->value != ob2->value
…		…
249	\|\| ob1->move_block != ob2->move_block	241	\|\| ob1->move_block != ob2->move_block
250	\|\| ob1->move_allow != ob2->move_allow	242	\|\| ob1->move_allow != ob2->move_allow
251	\|\| ob1->move_on != ob2->move_on	243	\|\| ob1->move_on != ob2->move_on
252	\|\| ob1->move_off != ob2->move_off	244	\|\| ob1->move_off != ob2->move_off
253	\|\| ob1->move_slow != ob2->move_slow	245	\|\| ob1->move_slow != ob2->move_slow
254	\|\| ob1->move_slow_penalty != ob2->move_slow_penalty)	246	\|\| ob1->move_slow_penalty != ob2->move_slow_penalty
		247	\|\| memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
		248	\|\| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats)))
		249	return 0;
		250
		251	if ((ob1->flag ^ ob2->flag)
		252	.reset (FLAG_INV_LOCKED)
		253	.reset (FLAG_CLIENT_SENT)
		254	.reset (FLAG_REMOVED)
		255	.any ())
255	return 0;	256	return 0;
256		257
257	/* This is really a spellbook check - we should in general	258	/* This is really a spellbook check - we should in general
258	* not merge objects with real inventories, as splitting them	259	* not merge objects with real inventories, as splitting them
259	* is hard.	260	* is hard.
…		…
298		299
299	if (ob1->key_values \|\| ob2->key_values)	300	if (ob1->key_values \|\| ob2->key_values)
300	{	301	{
301	/* At least one of these has key_values. */	302	/* At least one of these has key_values. */
302	if ((!ob1->key_values) != (!ob2->key_values))	303	if ((!ob1->key_values) != (!ob2->key_values))
303	/* One has fields, but the other one doesn't. */	304	return 0; /* One has fields, but the other one doesn't. */
304	return 0;	305
305	else if (!compare_ob_value_lists (ob1, ob2))	306	if (!compare_ob_value_lists (ob1, ob2))
306	return 0;	307	return 0;
307	}	308	}
308		309
309	if (ob1->self \|\| ob2->self)	310	if (ob1->self \|\| ob2->self)
310	{	311	{
…		…
316	int k1 = ob1->self ? HvTOTALKEYS (ob1->self) : 0;	317	int k1 = ob1->self ? HvTOTALKEYS (ob1->self) : 0;
317	int k2 = ob2->self ? HvTOTALKEYS (ob2->self) : 0;	318	int k2 = ob2->self ? HvTOTALKEYS (ob2->self) : 0;
318		319
319	if (k1 != k2)	320	if (k1 != k2)
320	return 0;	321	return 0;
		322
321	else if (k1 == 0)	323	if (k1 == 0)
322	return 1;	324	return 1;
		325
323	else if (!cfperl_can_merge (ob1, ob2))	326	if (!cfperl_can_merge (ob1, ob2))
324	return 0;	327	return 0;
325	}	328	}
326	}	329	}
327		330
328	/* Everything passes, must be OK. */	331	/* Everything passes, must be OK. */
329	return 1;	332	return 1;
330	}	333	}
331		334
		335	// adjust weight per container type ("of holding")
332	static sint32	336	static sint32
333	weight_adjust (object *op, sint32 weight)	337	weight_adjust (object *op, sint32 weight)
334	{	338	{
335	return op->type == CONTAINER	339	return op->type == CONTAINER
336	? lerp (weight, 0, 100, 0, 100 - op->stats.Str)	340	? lerp (weight, 0, 100, 0, 100 - op->stats.Str)
337	: weight;	341	: weight;
338	}	342	}
339		343
340	/*	344	/*
341	* add_weight(object, weight) adds the specified weight to an object,	345	* adjust_weight(object, weight) adds the specified weight to an object,
342	* and also updates how much the environment(s) is/are carrying.	346	* and also updates how much the environment(s) is/are carrying.
343	*/	347	*/
344	static void	348	static void
345	add_weight (object *op, sint32 weight)	349	adjust_weight (object *op, sint32 weight)
346	{	350	{
347	while (op)	351	while (op)
348	{	352	{
349	weight = weight_adjust (op, weight);	353	weight = weight_adjust (op, weight);
350		354
		355	if (!weight)
		356	return;
		357
351	op->carrying += weight;	358	op->carrying += weight;
		359
		360	if (object *pl = op->visible_to ())
		361	esrv_update_item (UPD_WEIGHT, pl, op);
		362
352	op = op->env;	363	op = op->env;
353	}	364	}
354	}
355
356	/*
357	* sub_weight() recursively (outwards) subtracts a number from the
358	* weight of an object (and what is carried by it's environment(s)).
359	*/
360	static void
361	sub_weight (object *op, long weight)
362	{
363	add_weight (op, -weight);
364	}	365	}
365		366
366	/*	367	/*
367	* this is a recursive function which calculates the weight	368	* this is a recursive function which calculates the weight
368	* an object is carrying. It goes through op and figures out how much	369	* an object is carrying. It goes through op and figures out how much
…		…
379	op->update_weight ();	380	op->update_weight ();
380		381
381	sum += op->total_weight ();	382	sum += op->total_weight ();
382	}	383	}
383		384
384	carrying = weight_adjust (this, sum);	385	sum = weight_adjust (this, sum);
385	}
386		386
		387	if (sum != carrying)
		388	{
		389	carrying = sum;
		390
		391	if (object *pl = visible_to ())
		392	esrv_update_item (UPD_WEIGHT, pl, this);
		393	}
		394	}
		395
387	/*	396	/*
388	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.	397	* Used by: Server DM commands: dumpbelow, dump. Some error messages.
389	* Some error messages.
390	* The result of the dump is stored in the static global errmsg array.
391	*/	398	*/
392	char *	399	char *
393	dump_object (object *op)	400	dump_object (object *op)
394	{	401	{
395	if (!op)	402	if (!op)
…		…
409	get_nearest_part (object op, const object pl)	416	get_nearest_part (object op, const object pl)
410	{	417	{
411	object tmp, closest;	418	object tmp, closest;
412	int last_dist, i;	419	int last_dist, i;
413		420
414	if (op->more == NULL)	421	if (!op->more)
415	return op;	422	return op;
		423
416	for (last_dist = distance (op, pl), closest = op, tmp = op->more; tmp != NULL; tmp = tmp->more)	424	for (last_dist = distance (op, pl), closest = op, tmp = op->more;
		425	tmp;
		426	tmp = tmp->more)
417	if ((i = distance (tmp, pl)) < last_dist)	427	if ((i = distance (tmp, pl)) < last_dist)
418	closest = tmp, last_dist = i;	428	closest = tmp, last_dist = i;
		429
419	return closest;	430	return closest;
420	}	431	}
421		432
422	/*	433	/*
423	* Returns the object which has the count-variable equal to the argument.	434	* Returns the object which has the count-variable equal to the argument.
		435	* VERRRY slow.
424	*/	436	*/
425	object *	437	object *
426	find_object (tag_t i)	438	find_object (tag_t i)
427	{	439	{
428	for_all_objects (op)	440	for_all_objects (op)
…		…
918	}	930	}
919		931
920	void	932	void
921	object::do_destroy ()	933	object::do_destroy ()
922	{	934	{
		935	if (object *pl = visible_to ())
		936	esrv_del_item (pl->contr, count);
		937
923	attachable::do_destroy ();	938	attachable::do_destroy ();
924		939
925	if (flag [FLAG_IS_LINKED])	940	if (flag [FLAG_IS_LINKED])
926	remove_button_link (this);	941	remove_button_link (this);
927		942
…		…
1020	* In this case, the object to be removed is in someones	1035	* In this case, the object to be removed is in someones
1021	* inventory.	1036	* inventory.
1022	*/	1037	*/
1023	if (env)	1038	if (env)
1024	{	1039	{
		1040	adjust_weight (env, -total_weight ());
		1041
		1042	*(above ? &above->below : &env->inv) = below;
		1043
1025	if (nrof)	1044	if (below)
1026	sub_weight (env, weight * nrof);	1045	below->above = above;
1027	else	1046
1028	sub_weight (env, weight + carrying);	1047	/* we set up values so that it could be inserted into
		1048	* the map, but we don't actually do that - it is up
		1049	* to the caller to decide what we want to do.
		1050	*/
		1051	map = env->map;
		1052	x = env->x;
		1053	y = env->y;
		1054	above = 0;
		1055	below = 0;
		1056	env = 0;
1029		1057
1030	/* NO_FIX_PLAYER is set when a great many changes are being	1058	/* NO_FIX_PLAYER is set when a great many changes are being
1031	* made to players inventory. If set, avoiding the call	1059	* made to players inventory. If set, avoiding the call
1032	* to save cpu time.	1060	* to save cpu time.
1033	*/	1061	*/
1034	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1062	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1035	otmp->update_stats ();	1063	otmp->update_stats ();
1036
1037	if (above)
1038	above->below = below;
1039	else
1040	env->inv = below;
1041
1042	if (below)
1043	below->above = above;
1044
1045	/* we set up values so that it could be inserted into
1046	* the map, but we don't actually do that - it is up
1047	* to the caller to decide what we want to do.
1048	*/
1049	x = env->x, y = env->y;
1050	map = env->map;
1051	above = 0, below = 0;
1052	env = 0;
1053	}	1064	}
1054	else if (map)	1065	else if (map)
1055	{	1066	{
1056	if (type == PLAYER)	1067	if (type == PLAYER)
1057	{	1068	{
…		…
1270	if (op->nrof && !(flag & INS_NO_MERGE))	1281	if (op->nrof && !(flag & INS_NO_MERGE))
1271	for (object *tmp = ms.bot; tmp; tmp = tmp->above)	1282	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1272	if (object::can_merge (op, tmp))	1283	if (object::can_merge (op, tmp))
1273	{	1284	{
1274	op->nrof += tmp->nrof;	1285	op->nrof += tmp->nrof;
1275	tmp->destroy ();	1286	tmp->destroy (1);
1276	}	1287	}
1277		1288
1278	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1289	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1279	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1290	CLEAR_FLAG (op, FLAG_INV_LOCKED);
1280		1291
…		…
1460	* op is the object to insert it under: supplies x and the map.	1471	* op is the object to insert it under: supplies x and the map.
1461	*/	1472	*/
1462	void	1473	void
1463	replace_insert_ob_in_map (const char arch_string, object op)	1474	replace_insert_ob_in_map (const char arch_string, object op)
1464	{	1475	{
1465	object tmp, tmp1;
1466
1467	/* first search for itself and remove any old instances */	1476	/* first search for itself and remove any old instances */
1468		1477
1469	for (tmp = op->ms ().bot; tmp; tmp = tmp->above)	1478	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1470	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */	1479	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */
1471	tmp->destroy ();	1480	tmp->destroy (1);
1472		1481
1473	tmp1 = arch_to_object (archetype::find (arch_string));	1482	object *tmp = arch_to_object (archetype::find (arch_string));
1474		1483
1475	tmp1->x = op->x;	1484	tmp->x = op->x;
1476	tmp1->y = op->y;	1485	tmp->y = op->y;
		1486
1477	insert_ob_in_map (tmp1, op->map, op, 0);	1487	insert_ob_in_map (tmp, op->map, op, 0);
1478	}	1488	}
1479		1489
1480	object *	1490	object *
1481	object::insert_at (object where, object originator, int flags)	1491	object::insert_at (object where, object originator, int flags)
1482	{	1492	{
…		…
1484	return where->env->insert (this);	1494	return where->env->insert (this);
1485	else	1495	else
1486	return where->map->insert (this, where->x, where->y, originator, flags);	1496	return where->map->insert (this, where->x, where->y, originator, flags);
1487	}	1497	}
1488		1498
1489	/*	1499	// find player who can see this object
1490	* get_split_ob(ob,nr) splits up ob into two parts. The part which
1491	* is returned contains nr objects, and the remaining parts contains
1492	* the rest (or is removed and freed if that number is 0).
1493	* On failure, NULL is returned, and the reason put into the
1494	* global static errmsg array.
1495	*/
1496	object *	1500	object *
1497	get_split_ob (object *orig_ob, uint32 nr)	1501	object::visible_to () const
1498	{	1502	{
1499	object *newob;	1503	if (!flag [FLAG_REMOVED])
1500	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1501
1502	if (orig_ob->nrof < nr)
1503	{
1504	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1505	return NULL;
1506	}	1504	{
1507		1505	// see if we are in a container of sorts
1508	newob = object_create_clone (orig_ob);	1506	if (env)
1509
1510	if ((orig_ob->nrof -= nr) < 1)
1511	orig_ob->destroy (1);
1512	else if (!is_removed)
1513	{
1514	if (orig_ob->env != NULL)
1515	sub_weight (orig_ob->env, orig_ob->weight * nr);
1516	if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_ACTIVE)
1517	{
1518	strcpy (errmsg, "Tried to split object whose map is not in memory.");
1519	LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n");
1520	return NULL;
1521	}	1507	{
1522	}	1508	// the player inventory itself is always visible
		1509	if (env->type == PLAYER)
		1510	return env;
1523		1511
1524	newob->nrof = nr;	1512	// else a player could have our env open
		1513	object *envest = env->outer_env ();
1525		1514
		1515	// the player itself is always on a map, so we will find him here
		1516	// even if our inv is in a player.
		1517	if (envest->is_on_map ())
		1518	if (object *pl = envest->ms ().player ())
		1519	if (pl->container == env)
		1520	return pl;
		1521	}
		1522	else
		1523	{
		1524	// maybe there is a player standing on the same mapspace
		1525	// this will catch the case where "this" is a player
		1526	if (object *pl = ms ().player ())
		1527	return pl;
		1528	}
		1529	}
		1530
1526	return newob;	1531	return 0;
1527	}	1532	}
1528		1533
1529	/*	1534	/*
1530	* decrease_ob_nr(object, number) decreases a specified number from	1535	* decrease(object, number) decreases a specified number from
1531	* the amount of an object. If the amount reaches 0, the object	1536	* the amount of an object. If the amount reaches 0, the object
1532	* is subsequently removed and freed.	1537	* is subsequently removed and freed.
1533	*	1538	*
1534	* Return value: 'op' if something is left, NULL if the amount reached 0	1539	* Return value: 'op' if something is left, NULL if the amount reached 0
1535	*/	1540	*/
		1541	bool
		1542	object::decrease (sint32 nr)
		1543	{
		1544	if (!nr)
		1545	return true;
		1546
		1547	nr = min (nr, nrof);
		1548
		1549	nrof -= nr;
		1550
		1551	if (nrof)
		1552	{
		1553	adjust_weight (env, -weight * nr); // carrying == 0
		1554
		1555	if (object *pl = visible_to ())
		1556	esrv_update_item (UPD_NROF, pl, this);
		1557
		1558	return true;
		1559	}
		1560	else
		1561	{
		1562	destroy (1);
		1563	return false;
		1564	}
		1565	}
		1566
		1567	/*
		1568	* split(ob,nr) splits up ob into two parts. The part which
		1569	* is returned contains nr objects, and the remaining parts contains
		1570	* the rest (or is removed and returned if that number is 0).
		1571	* On failure, NULL is returned.
		1572	*/
1536	object *	1573	object *
1537	decrease_ob_nr (object *op, uint32 i)	1574	object::split (sint32 nr)
1538	{	1575	{
1539	object *tmp;	1576	int have = number_of ();
1540		1577
1541	if (i == 0) /* objects with op->nrof require this check */	1578	if (have < nr)
1542	return op;	1579	return 0;
1543		1580	else if (have == nr)
1544	if (i > op->nrof)
1545	i = op->nrof;
1546
1547	if (QUERY_FLAG (op, FLAG_REMOVED))
1548	op->nrof -= i;
1549	else if (op->env)
1550	{	1581	{
1551	/* is this object in the players inventory, or sub container
1552	* therein?
1553	*/
1554	tmp = op->in_player ();
1555	/* nope. Is this a container the player has opened?
1556	* If so, set tmp to that player.
1557	* IMO, searching through all the players will mostly
1558	* likely be quicker than following op->env to the map,
1559	* and then searching the map for a player.
1560	*/
1561	if (!tmp)
1562	for_all_players (pl)
1563	if (pl->ob->container == op->env)
1564	{
1565	tmp = pl->ob;
1566	break;
1567	}
1568
1569	if (i < op->nrof)
1570	{
1571	sub_weight (op->env, op->weight * i);
1572	op->nrof -= i;
1573	if (tmp)
1574	esrv_send_item (tmp, op);
1575	}
1576	else
1577	{
1578	op->remove ();	1582	remove ();
1579	op->nrof = 0;	1583	return this;
1580	if (tmp)
1581	esrv_del_item (tmp->contr, op->count);
1582	}
1583	}	1584	}
1584	else	1585	else
1585	{	1586	{
1586	object *above = op->above;	1587	decrease (nr);
1587		1588
1588	if (i < op->nrof)	1589	object *op = object_create_clone (this);
1589	op->nrof -= i;	1590	op->nrof = nr;
1590	else
1591	{
1592	op->remove ();
1593	op->nrof = 0;
1594	}
1595
1596	/* Since we just removed op, op->above is null */
1597	for (tmp = above; tmp; tmp = tmp->above)
1598	if (tmp->type == PLAYER)
1599	{
1600	if (op->nrof)
1601	esrv_send_item (tmp, op);
1602	else
1603	esrv_del_item (tmp->contr, op->count);
1604	}
1605	}
1606
1607	if (op->nrof)
1608	return op;	1591	return op;
1609	else
1610	{
1611	op->destroy ();
1612	return 0;
1613	}	1592	}
1614	}	1593	}
1615		1594
1616	object *	1595	object *
1617	insert_ob_in_ob (object op, object where)	1596	insert_ob_in_ob (object op, object where)
…		…
1642	* be != op, if items are merged. -Tero	1621	* be != op, if items are merged. -Tero
1643	*/	1622	*/
1644	object *	1623	object *
1645	object::insert (object *op)	1624	object::insert (object *op)
1646	{	1625	{
1647	if (!QUERY_FLAG (op, FLAG_REMOVED))
1648	op->remove ();
1649
1650	if (op->more)	1626	if (op->more)
1651	{	1627	{
1652	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);	1628	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1653	return op;	1629	return op;
1654	}	1630	}
1655		1631
1656	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1632	op->remove ();
1657	CLEAR_FLAG (op, FLAG_REMOVED);	1633
		1634	op->flag [FLAG_OBJ_ORIGINAL] = 0;
1658		1635
1659	if (op->nrof)	1636	if (op->nrof)
1660	{
1661	for (object *tmp = inv; tmp; tmp = tmp->below)	1637	for (object *tmp = inv; tmp; tmp = tmp->below)
1662	if (object::can_merge (tmp, op))	1638	if (object::can_merge (tmp, op))
1663	{	1639	{
1664	/* return the original object and remove inserted object	1640	/* return the original object and remove inserted object
1665	(client needs the original object) */	1641	(client needs the original object) */
1666	tmp->nrof += op->nrof;	1642	tmp->nrof += op->nrof;
1667	/* Weight handling gets pretty funky. Since we are adding to
1668	* tmp->nrof, we need to increase the weight.
1669	*/
1670	add_weight (this, op->weight * op->nrof);	1643	adjust_weight (this, op->total_weight ());
1671	SET_FLAG (op, FLAG_REMOVED);	1644
1672	op->destroy (); /* free the inserted object */	1645	op->destroy (1);
1673	op = tmp;	1646	op = tmp;
1674	op->remove (); /* and fix old object's links */	1647	goto inserted;
1675	CLEAR_FLAG (op, FLAG_REMOVED);
1676	break;
1677	}	1648	}
1678		1649
1679	/* I assume combined objects have no inventory	1650	op->owner = 0; // it's his/hers now. period.
1680	* We add the weight - this object could have just been removed	1651	op->map = 0;
1681	* (if it was possible to merge). calling remove_ob will subtract	1652	op->x = 0;
1682	* the weight, so we need to add it in again, since we actually do	1653	op->y = 0;
1683	* the linking below
1684	*/
1685	add_weight (this, op->weight * op->nrof);
1686	}
1687	else
1688	add_weight (this, (op->weight + op->carrying));
1689		1654
		1655	op->above = 0;
		1656	op->below = inv;
		1657	op->env = this;
		1658
		1659	if (inv)
		1660	inv->above = op;
		1661
		1662	inv = op;
		1663
		1664	op->flag [FLAG_REMOVED] = 0;
		1665
		1666	adjust_weight (this, op->total_weight ());
		1667
		1668	inserted:
		1669	/* reset the light list and los of the players on the map */
		1670	if (op->glow_radius && map && map->darkness)
		1671	update_all_los (map, x, y);
		1672
1690	if (object *otmp = this->in_player ())	1673	if (object *otmp = in_player ())
1691	if (otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1674	if (otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1692	otmp->update_stats ();	1675	otmp->update_stats ();
1693
1694	op->owner = 0; // its his/hers now. period.
1695	op->map = 0;
1696	op->env = this;
1697	op->above = 0;
1698	op->below = 0;
1699	op->x = op->y = 0;
1700
1701	/* reset the light list and los of the players on the map */
1702	if (op->glow_radius && map)
1703	{
1704	#ifdef DEBUG_LIGHTS
1705	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1706	#endif /* DEBUG_LIGHTS */
1707	if (map->darkness)
1708	update_all_los (map, x, y);
1709	}
1710
1711	/* Client has no idea of ordering so lets not bother ordering it here.
1712	* It sure simplifies this function...
1713	*/
1714	if (!inv)
1715	inv = op;
1716	else
1717	{
1718	op->below = inv;
1719	op->below->above = op;
1720	inv = op;
1721	}
1722		1676
1723	INVOKE_OBJECT (INSERT, this);	1677	INVOKE_OBJECT (INSERT, this);
1724		1678
1725	return op;	1679	return op;
1726	}	1680	}
…		…
2724		2678
2725	insert (force);	2679	insert (force);
2726	}	2680	}
2727		2681
2728	void	2682	void
2729	object::play_sound (faceidx sound) const	2683	object::play_sound (faceidx sound)
2730	{	2684	{
2731	if (!sound)	2685	if (!sound)
2732	return;	2686	return;
2733		2687
2734	if (flag [FLAG_REMOVED])	2688	if (flag [FLAG_REMOVED])

Diff Legend

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

Comparing deliantra/server/common/object.C (file contents): Revision 1.207 by root, Sun Apr 20 23:25:09 2008 UTC vs. Revision 1.212 by root, Mon Apr 21 23:35:24 2008 UTC

Diff Legend

Comparing deliantra/server/common/object.C (file contents):
Revision 1.207 by root, Sun Apr 20 23:25:09 2008 UTC vs.
Revision 1.212 by root, Mon Apr 21 23:35:24 2008 UTC