[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.208 by root, Mon Apr 21 06:16:01 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
18	* You should have received a copy of the GNU General Public License	18	* You should have received a copy of the GNU General Public License
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
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		23
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>
…		…
206	\|\| ob1->value != ob2->value	202	\|\| ob1->value != ob2->value
207	\|\| ob1->name != ob2->name)	203	\|\| ob1->name != ob2->name)
208	return 0;	204	return 0;
209		205
210	/* Do not merge objects if nrof would overflow. First part checks	206	/* Do not merge objects if nrof would overflow. First part checks
211	* for unsigned overflow (2c), second part checks wether the result	207	* 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	208	* would fit into a 32 bit signed int, which is often used to hold
213	* nrof values.	209	* nrof values.
214	*/	210	*/
215	if (~ob1->nrof < ob2->nrof \|\| ob1->nrof + ob2->nrof > (1UL << 31))	211	if (~ob1->nrof < ob2->nrof \|\| ob1->nrof + ob2->nrof > (1UL << 31))
216	return 0;	212	return 0;
…		…
225	SET_FLAG (ob1, FLAG_BEEN_APPLIED);	221	SET_FLAG (ob1, FLAG_BEEN_APPLIED);
226		222
227	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))	223	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))
228	SET_FLAG (ob2, FLAG_BEEN_APPLIED);	224	SET_FLAG (ob2, FLAG_BEEN_APPLIED);
229		225
230	if ((ob1->flag ^ ob2->flag).reset (FLAG_INV_LOCKED).reset (FLAG_CLIENT_SENT).any ()	226	if (ob1->arch->name != ob2->arch->name
231	\|\| ob1->arch != ob2->arch
232	\|\| ob1->name != ob2->name	227	\|\| ob1->name != ob2->name
233	\|\| ob1->title != ob2->title	228	\|\| ob1->title != ob2->title
234	\|\| ob1->msg != ob2->msg	229	\|\| ob1->msg != ob2->msg
235	\|\| ob1->weight != ob2->weight	230	\|\| 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	231	\|\| ob1->attacktype != ob2->attacktype
239	\|\| ob1->magic != ob2->magic	232	\|\| ob1->magic != ob2->magic
240	\|\| ob1->slaying != ob2->slaying	233	\|\| ob1->slaying != ob2->slaying
241	\|\| ob1->skill != ob2->skill	234	\|\| ob1->skill != ob2->skill
242	\|\| ob1->value != ob2->value	235	\|\| ob1->value != ob2->value
…		…
249	\|\| ob1->move_block != ob2->move_block	242	\|\| ob1->move_block != ob2->move_block
250	\|\| ob1->move_allow != ob2->move_allow	243	\|\| ob1->move_allow != ob2->move_allow
251	\|\| ob1->move_on != ob2->move_on	244	\|\| ob1->move_on != ob2->move_on
252	\|\| ob1->move_off != ob2->move_off	245	\|\| ob1->move_off != ob2->move_off
253	\|\| ob1->move_slow != ob2->move_slow	246	\|\| ob1->move_slow != ob2->move_slow
254	\|\| ob1->move_slow_penalty != ob2->move_slow_penalty)	247	\|\| ob1->move_slow_penalty != ob2->move_slow_penalty
		248	\|\| memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
		249	\|\| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats)))
		250	return 0;
		251
		252	if ((ob1->flag ^ ob2->flag)
		253	.reset (FLAG_INV_LOCKED)
		254	.reset (FLAG_CLIENT_SENT)
		255	.reset (FLAG_REMOVED)
		256	.any ())
255	return 0;	257	return 0;
256		258
257	/* This is really a spellbook check - we should in general	259	/* This is really a spellbook check - we should in general
258	* not merge objects with real inventories, as splitting them	260	* not merge objects with real inventories, as splitting them
259	* is hard.	261	* is hard.
…		…
298		300
299	if (ob1->key_values \|\| ob2->key_values)	301	if (ob1->key_values \|\| ob2->key_values)
300	{	302	{
301	/* At least one of these has key_values. */	303	/* At least one of these has key_values. */
302	if ((!ob1->key_values) != (!ob2->key_values))	304	if ((!ob1->key_values) != (!ob2->key_values))
303	/* One has fields, but the other one doesn't. */	305	return 0; /* One has fields, but the other one doesn't. */
304	return 0;	306
305	else if (!compare_ob_value_lists (ob1, ob2))	307	if (!compare_ob_value_lists (ob1, ob2))
306	return 0;	308	return 0;
307	}	309	}
308		310
309	if (ob1->self \|\| ob2->self)	311	if (ob1->self \|\| ob2->self)
310	{	312	{
…		…
316	int k1 = ob1->self ? HvTOTALKEYS (ob1->self) : 0;	318	int k1 = ob1->self ? HvTOTALKEYS (ob1->self) : 0;
317	int k2 = ob2->self ? HvTOTALKEYS (ob2->self) : 0;	319	int k2 = ob2->self ? HvTOTALKEYS (ob2->self) : 0;
318		320
319	if (k1 != k2)	321	if (k1 != k2)
320	return 0;	322	return 0;
		323
321	else if (k1 == 0)	324	if (k1 == 0)
322	return 1;	325	return 1;
		326
323	else if (!cfperl_can_merge (ob1, ob2))	327	if (!cfperl_can_merge (ob1, ob2))
324	return 0;	328	return 0;
325	}	329	}
326	}	330	}
327		331
328	/* Everything passes, must be OK. */	332	/* Everything passes, must be OK. */
329	return 1;	333	return 1;
330	}	334	}
331		335
		336	// adjust weight per container type ("of holding")
332	static sint32	337	static sint32
333	weight_adjust (object *op, sint32 weight)	338	weight_adjust (object *op, sint32 weight)
334	{	339	{
335	return op->type == CONTAINER	340	return op->type == CONTAINER
336	? lerp (weight, 0, 100, 0, 100 - op->stats.Str)	341	? lerp (weight, 0, 100, 0, 100 - op->stats.Str)
337	: weight;	342	: weight;
338	}	343	}
339		344
340	/*	345	/*
341	* add_weight(object, weight) adds the specified weight to an object,	346	* adjust_weight(object, weight) adds the specified weight to an object,
342	* and also updates how much the environment(s) is/are carrying.	347	* and also updates how much the environment(s) is/are carrying.
343	*/	348	*/
344	static void	349	static void
345	add_weight (object *op, sint32 weight)	350	adjust_weight (object *op, sint32 weight)
346	{	351	{
347	while (op)	352	while (op)
348	{	353	{
349	weight = weight_adjust (op, weight);	354	weight = weight_adjust (op, weight);
350		355
351	op->carrying += weight;	356	op->carrying += weight;
352	op = op->env;	357	op = op->env;
353	}	358	}
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	}	359	}
365		360
366	/*	361	/*
367	* this is a recursive function which calculates the weight	362	* this is a recursive function which calculates the weight
368	* an object is carrying. It goes through op and figures out how much	363	* an object is carrying. It goes through op and figures out how much
…		…
383		378
384	carrying = weight_adjust (this, sum);	379	carrying = weight_adjust (this, sum);
385	}	380	}
386		381
387	/*	382	/*
388	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.	383	* 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	*/	384	*/
392	char *	385	char *
393	dump_object (object *op)	386	dump_object (object *op)
394	{	387	{
395	if (!op)	388	if (!op)
…		…
409	get_nearest_part (object op, const object pl)	402	get_nearest_part (object op, const object pl)
410	{	403	{
411	object tmp, closest;	404	object tmp, closest;
412	int last_dist, i;	405	int last_dist, i;
413		406
414	if (op->more == NULL)	407	if (!op->more)
415	return op;	408	return op;
		409
416	for (last_dist = distance (op, pl), closest = op, tmp = op->more; tmp != NULL; tmp = tmp->more)	410	for (last_dist = distance (op, pl), closest = op, tmp = op->more;
		411	tmp;
		412	tmp = tmp->more)
417	if ((i = distance (tmp, pl)) < last_dist)	413	if ((i = distance (tmp, pl)) < last_dist)
418	closest = tmp, last_dist = i;	414	closest = tmp, last_dist = i;
		415
419	return closest;	416	return closest;
420	}	417	}
421		418
422	/*	419	/*
423	* Returns the object which has the count-variable equal to the argument.	420	* Returns the object which has the count-variable equal to the argument.
		421	* VERRRY slow.
424	*/	422	*/
425	object *	423	object *
426	find_object (tag_t i)	424	find_object (tag_t i)
427	{	425	{
428	for_all_objects (op)	426	for_all_objects (op)
…		…
1020	* In this case, the object to be removed is in someones	1018	* In this case, the object to be removed is in someones
1021	* inventory.	1019	* inventory.
1022	*/	1020	*/
1023	if (env)	1021	if (env)
1024	{	1022	{
		1023	adjust_weight (env, -total_weight ());
		1024
		1025	*(above ? &above->below : &env->inv) = below;
		1026
1025	if (nrof)	1027	if (below)
1026	sub_weight (env, weight * nrof);	1028	below->above = above;
1027	else	1029
1028	sub_weight (env, weight + carrying);	1030	/* we set up values so that it could be inserted into
		1031	* the map, but we don't actually do that - it is up
		1032	* to the caller to decide what we want to do.
		1033	*/
		1034	map = env->map;
		1035	x = env->x;
		1036	y = env->y;
		1037	above = 0;
		1038	below = 0;
		1039	env = 0;
1029		1040
1030	/* NO_FIX_PLAYER is set when a great many changes are being	1041	/* NO_FIX_PLAYER is set when a great many changes are being
1031	* made to players inventory. If set, avoiding the call	1042	* made to players inventory. If set, avoiding the call
1032	* to save cpu time.	1043	* to save cpu time.
1033	*/	1044	*/
1034	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1045	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1035	otmp->update_stats ();	1046	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	}	1047	}
1054	else if (map)	1048	else if (map)
1055	{	1049	{
1056	if (type == PLAYER)	1050	if (type == PLAYER)
1057	{	1051	{
…		…
1270	if (op->nrof && !(flag & INS_NO_MERGE))	1264	if (op->nrof && !(flag & INS_NO_MERGE))
1271	for (object *tmp = ms.bot; tmp; tmp = tmp->above)	1265	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1272	if (object::can_merge (op, tmp))	1266	if (object::can_merge (op, tmp))
1273	{	1267	{
1274	op->nrof += tmp->nrof;	1268	op->nrof += tmp->nrof;
1275	tmp->destroy ();	1269	tmp->destroy (1);
1276	}	1270	}
1277		1271
1278	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1272	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1279	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1273	CLEAR_FLAG (op, FLAG_INV_LOCKED);
1280		1274
…		…
1460	* op is the object to insert it under: supplies x and the map.	1454	* op is the object to insert it under: supplies x and the map.
1461	*/	1455	*/
1462	void	1456	void
1463	replace_insert_ob_in_map (const char arch_string, object op)	1457	replace_insert_ob_in_map (const char arch_string, object op)
1464	{	1458	{
1465	object tmp, tmp1;
1466
1467	/* first search for itself and remove any old instances */	1459	/* first search for itself and remove any old instances */
1468		1460
1469	for (tmp = op->ms ().bot; tmp; tmp = tmp->above)	1461	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1470	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */	1462	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */
1471	tmp->destroy ();	1463	tmp->destroy (1);
1472		1464
1473	tmp1 = arch_to_object (archetype::find (arch_string));	1465	object *tmp = arch_to_object (archetype::find (arch_string));
1474		1466
1475	tmp1->x = op->x;	1467	tmp->x = op->x;
1476	tmp1->y = op->y;	1468	tmp->y = op->y;
		1469
1477	insert_ob_in_map (tmp1, op->map, op, 0);	1470	insert_ob_in_map (tmp, op->map, op, 0);
1478	}	1471	}
1479		1472
1480	object *	1473	object *
1481	object::insert_at (object where, object originator, int flags)	1474	object::insert_at (object where, object originator, int flags)
1482	{	1475	{
…		…
1492	* the rest (or is removed and freed if that number is 0).	1485	* the rest (or is removed and freed if that number is 0).
1493	* On failure, NULL is returned, and the reason put into the	1486	* On failure, NULL is returned, and the reason put into the
1494	* global static errmsg array.	1487	* global static errmsg array.
1495	*/	1488	*/
1496	object *	1489	object *
		1490	object::split_nr (sint32 nr)
		1491	{
		1492	if (nrof < nr)
		1493	return 0;
		1494	else if (nrof == nr)
		1495	{
		1496	remove ();
		1497	return this;
		1498	}
		1499	else
		1500	{
		1501	decrease_nr (nr);
		1502
		1503	object *op = object_create_clone (this);
		1504	op->nrof = nr;
		1505	return op;
		1506	}
		1507	}
		1508
		1509	//TODO: remove, but semantics differs from split_nr
		1510	object *
1497	get_split_ob (object *orig_ob, uint32 nr)	1511	get_split_ob (object *orig_ob, uint32 nr)
1498	{	1512	{
1499	object *newob;
1500	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1501
1502	if (orig_ob->nrof < nr)	1513	if (orig_ob->nrof < nr)
1503	{	1514	{
1504	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);	1515	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1505	return NULL;	1516	return 0;
1506	}
1507
1508	newob = object_create_clone (orig_ob);
1509
1510	if ((orig_ob->nrof -= nr) < 1)
1511	orig_ob->destroy (1);
1512	else if (!is_removed)
1513	{	1517	}
1514	if (orig_ob->env != NULL)	1518
1515	sub_weight (orig_ob->env, orig_ob->weight * nr);	1519	return orig_ob->split_nr (nr);
1516	if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_ACTIVE)	1520	}
		1521
		1522	// find player who can see this object
		1523	static object *
		1524	visible_to (object *op)
		1525	{
		1526	if (!op->flag [FLAG_REMOVED])
		1527	{
		1528	// see if we are in a container of sorts
		1529	if (object *env = op->env)
1517	{	1530	{
1518	strcpy (errmsg, "Tried to split object whose map is not in memory.");	1531	// the player inventory itself is always visible
1519	LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n");	1532	if (env->type == PLAYER)
1520	return NULL;	1533	return env;
		1534
		1535	// else a player could have our env open
		1536	env = env->outer_env ();
		1537
		1538	// the player itself is always on a map, so we will find him here
		1539	// even if our inv is in a player.
		1540	if (env->is_on_map ())
		1541	if (object *pl = env->ms ().player ())
		1542	if (pl->container == op->env)
		1543	return pl;
1521	}	1544	}
		1545	else
		1546	{
		1547	// maybe there is a player standing on the same mapspace
		1548	if (object *pl = env->ms ().player ())
		1549	return pl;
		1550	}
1522	}	1551	}
1523		1552
1524	newob->nrof = nr;
1525
1526	return newob;	1553	return 0;
1527	}	1554	}
1528		1555
1529	/*	1556	/*
1530	* decrease_ob_nr(object, number) decreases a specified number from	1557	* decrease_ob_nr(object, number) decreases a specified number from
1531	* the amount of an object. If the amount reaches 0, the object	1558	* the amount of an object. If the amount reaches 0, the object
1532	* is subsequently removed and freed.	1559	* is subsequently removed and freed.
1533	*	1560	*
1534	* Return value: 'op' if something is left, NULL if the amount reached 0	1561	* Return value: 'op' if something is left, NULL if the amount reached 0
1535	*/	1562	*/
		1563	bool
		1564	object::decrease_nr (sint32 nr)
		1565	{
		1566	nr = min (nr, nrof);
		1567
		1568	if (!nr)
		1569	return 1;
		1570
		1571	nrof -= nr;
		1572
		1573	object *visible = visible_to (this);
		1574
		1575	if (nrof)
		1576	{
		1577	adjust_weight (env, -weight * nr); // carrying == 0
		1578
		1579	if (visible)
		1580	esrv_send_item (visible, this);
		1581
		1582	return 1;
		1583	}
		1584	else
		1585	{
		1586	if (visible)
		1587	esrv_del_item (visible->contr, count);
		1588
		1589	this->destroy (1);
		1590	return 0;
		1591	}
		1592	}
		1593
		1594	//TODO: remove
1536	object *	1595	object *
1537	decrease_ob_nr (object *op, uint32 i)	1596	decrease_ob_nr (object *op, uint32 i)
1538	{	1597	{
1539	object *tmp;	1598	return op->decrease_nr (i) ? op : 0;
1540
1541	if (i == 0) /* objects with op->nrof require this check */
1542	return op;
1543
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	{
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 ();
1579	op->nrof = 0;
1580	if (tmp)
1581	esrv_del_item (tmp->contr, op->count);
1582	}
1583	}
1584	else
1585	{
1586	object *above = op->above;
1587
1588	if (i < op->nrof)
1589	op->nrof -= i;
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;
1609	else
1610	{
1611	op->destroy ();
1612	return 0;
1613	}
1614	}	1599	}
1615		1600
1616	object *	1601	object *
1617	insert_ob_in_ob (object op, object where)	1602	insert_ob_in_ob (object op, object where)
1618	{	1603	{
…		…
1642	* be != op, if items are merged. -Tero	1627	* be != op, if items are merged. -Tero
1643	*/	1628	*/
1644	object *	1629	object *
1645	object::insert (object *op)	1630	object::insert (object *op)
1646	{	1631	{
1647	if (!QUERY_FLAG (op, FLAG_REMOVED))
1648	op->remove ();
1649
1650	if (op->more)	1632	if (op->more)
1651	{	1633	{
1652	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);	1634	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1653	return op;	1635	return op;
1654	}	1636	}
1655		1637
1656	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1638	op->remove ();
1657	CLEAR_FLAG (op, FLAG_REMOVED);	1639
		1640	op->flag [FLAG_OBJ_ORIGINAL] = 0;
1658		1641
1659	if (op->nrof)	1642	if (op->nrof)
1660	{
1661	for (object *tmp = inv; tmp; tmp = tmp->below)	1643	for (object *tmp = inv; tmp; tmp = tmp->below)
1662	if (object::can_merge (tmp, op))	1644	if (object::can_merge (tmp, op))
1663	{	1645	{
1664	/* return the original object and remove inserted object	1646	/* return the original object and remove inserted object
1665	(client needs the original object) */	1647	(client needs the original object) */
1666	tmp->nrof += op->nrof;	1648	tmp->nrof += op->nrof;
1667	/* Weight handling gets pretty funky. Since we are adding to	1649	op->destroy (1);
1668	* tmp->nrof, we need to increase the weight.
1669	*/
1670	add_weight (this, op->weight * op->nrof);
1671	SET_FLAG (op, FLAG_REMOVED);
1672	op->destroy (); /* free the inserted object */
1673	op = tmp;	1650	op = tmp;
1674	op->remove (); /* and fix old object's links */	1651	goto inserted;
1675	CLEAR_FLAG (op, FLAG_REMOVED);
1676	break;
1677	}	1652	}
1678		1653
1679	/* I assume combined objects have no inventory	1654	op->owner = 0; // it's his/hers now. period.
1680	* We add the weight - this object could have just been removed	1655	op->map = 0;
1681	* (if it was possible to merge). calling remove_ob will subtract	1656	op->x = 0;
1682	* the weight, so we need to add it in again, since we actually do	1657	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		1658
		1659	op->above = 0;
		1660	op->below = inv;
		1661	op->env = this;
		1662
		1663	if (inv)
		1664	inv->above = op;
		1665
		1666	inv = op;
		1667
		1668	op->flag [FLAG_REMOVED] = 0;
		1669
		1670	adjust_weight (this, op->total_weight ());
		1671
		1672	inserted:
		1673	/* reset the light list and los of the players on the map */
		1674	if (op->glow_radius && map && map->darkness)
		1675	update_all_los (map, x, y);
		1676
1690	if (object *otmp = this->in_player ())	1677	if (object *otmp = in_player ())
1691	if (otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1678	if (otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1692	otmp->update_stats ();	1679	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		1680
1723	INVOKE_OBJECT (INSERT, this);	1681	INVOKE_OBJECT (INSERT, this);
1724		1682
1725	return op;	1683	return op;
1726	}	1684	}
…		…
2724		2682
2725	insert (force);	2683	insert (force);
2726	}	2684	}
2727		2685
2728	void	2686	void
2729	object::play_sound (faceidx sound) const	2687	object::play_sound (faceidx sound)
2730	{	2688	{
2731	if (!sound)	2689	if (!sound)
2732	return;	2690	return;
2733		2691
2734	if (flag [FLAG_REMOVED])	2692	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.208 by root, Mon Apr 21 06:16:01 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.208 by root, Mon Apr 21 06:16:01 2008 UTC