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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.205 by root, Sun Apr 13 01:34:08 2008 UTC vs.
Revision 1.210 by root, Mon Apr 21 07:01:40 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	#include <global.h>	24	#include <global.h>
28	#include <stdio.h>	25	#include <stdio.h>
29	#include <sys/types.h>	26	#include <sys/types.h>
30	#include <sys/uio.h>	27	#include <sys/uio.h>
31	#include <object.h>	28	#include <object.h>
…		…
205	\|\| ob1->value != ob2->value	202	\|\| ob1->value != ob2->value
206	\|\| ob1->name != ob2->name)	203	\|\| ob1->name != ob2->name)
207	return 0;	204	return 0;
208		205
209	/* Do not merge objects if nrof would overflow. First part checks	206	/* Do not merge objects if nrof would overflow. First part checks
210	* for unsigned overflow (2c), second part checks wether the result	207	* for unsigned overflow (2c), second part checks whether the result
211	* 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
212	* nrof values.	209	* nrof values.
213	*/	210	*/
214	if (~ob1->nrof < ob2->nrof \|\| ob1->nrof + ob2->nrof > (1UL << 31))	211	if (~ob1->nrof < ob2->nrof \|\| ob1->nrof + ob2->nrof > (1UL << 31))
215	return 0;	212	return 0;
…		…
224	SET_FLAG (ob1, FLAG_BEEN_APPLIED);	221	SET_FLAG (ob1, FLAG_BEEN_APPLIED);
225		222
226	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))	223	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))
227	SET_FLAG (ob2, FLAG_BEEN_APPLIED);	224	SET_FLAG (ob2, FLAG_BEEN_APPLIED);
228		225
229	if ((ob1->flag ^ ob2->flag).reset (FLAG_INV_LOCKED).reset (FLAG_CLIENT_SENT).any ()	226	if (ob1->arch->name != ob2->arch->name
230	\|\| ob1->arch != ob2->arch
231	\|\| ob1->name != ob2->name	227	\|\| ob1->name != ob2->name
232	\|\| ob1->title != ob2->title	228	\|\| ob1->title != ob2->title
233	\|\| ob1->msg != ob2->msg	229	\|\| ob1->msg != ob2->msg
234	\|\| ob1->weight != ob2->weight	230	\|\| ob1->weight != ob2->weight
235	\|\| memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
236	\|\| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats) )
237	\|\| ob1->attacktype != ob2->attacktype	231	\|\| ob1->attacktype != ob2->attacktype
238	\|\| ob1->magic != ob2->magic	232	\|\| ob1->magic != ob2->magic
239	\|\| ob1->slaying != ob2->slaying	233	\|\| ob1->slaying != ob2->slaying
240	\|\| ob1->skill != ob2->skill	234	\|\| ob1->skill != ob2->skill
241	\|\| ob1->value != ob2->value	235	\|\| ob1->value != ob2->value
…		…
248	\|\| ob1->move_block != ob2->move_block	242	\|\| ob1->move_block != ob2->move_block
249	\|\| ob1->move_allow != ob2->move_allow	243	\|\| ob1->move_allow != ob2->move_allow
250	\|\| ob1->move_on != ob2->move_on	244	\|\| ob1->move_on != ob2->move_on
251	\|\| ob1->move_off != ob2->move_off	245	\|\| ob1->move_off != ob2->move_off
252	\|\| ob1->move_slow != ob2->move_slow	246	\|\| ob1->move_slow != ob2->move_slow
253	\|\| 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 ())
254	return 0;	257	return 0;
255		258
256	/* This is really a spellbook check - we should in general	259	/* This is really a spellbook check - we should in general
257	* not merge objects with real inventories, as splitting them	260	* not merge objects with real inventories, as splitting them
258	* is hard.	261	* is hard.
…		…
297		300
298	if (ob1->key_values \|\| ob2->key_values)	301	if (ob1->key_values \|\| ob2->key_values)
299	{	302	{
300	/* At least one of these has key_values. */	303	/* At least one of these has key_values. */
301	if ((!ob1->key_values) != (!ob2->key_values))	304	if ((!ob1->key_values) != (!ob2->key_values))
302	/* One has fields, but the other one doesn't. */	305	return 0; /* One has fields, but the other one doesn't. */
303	return 0;	306
304	else if (!compare_ob_value_lists (ob1, ob2))	307	if (!compare_ob_value_lists (ob1, ob2))
305	return 0;	308	return 0;
306	}	309	}
307		310
308	if (ob1->self \|\| ob2->self)	311	if (ob1->self \|\| ob2->self)
309	{	312	{
…		…
315	int k1 = ob1->self ? HvTOTALKEYS (ob1->self) : 0;	318	int k1 = ob1->self ? HvTOTALKEYS (ob1->self) : 0;
316	int k2 = ob2->self ? HvTOTALKEYS (ob2->self) : 0;	319	int k2 = ob2->self ? HvTOTALKEYS (ob2->self) : 0;
317		320
318	if (k1 != k2)	321	if (k1 != k2)
319	return 0;	322	return 0;
		323
320	else if (k1 == 0)	324	if (k1 == 0)
321	return 1;	325	return 1;
		326
322	else if (!cfperl_can_merge (ob1, ob2))	327	if (!cfperl_can_merge (ob1, ob2))
323	return 0;	328	return 0;
324	}	329	}
325	}	330	}
326		331
327	/* Everything passes, must be OK. */	332	/* Everything passes, must be OK. */
328	return 1;	333	return 1;
329	}	334	}
330		335
		336	// adjust weight per container type ("of holding")
		337	static sint32
		338	weight_adjust (object *op, sint32 weight)
		339	{
		340	return op->type == CONTAINER
		341	? lerp (weight, 0, 100, 0, 100 - op->stats.Str)
		342	: weight;
		343	}
		344
331	/*	345	/*
		346	* adjust_weight(object, weight) adds the specified weight to an object,
		347	* and also updates how much the environment(s) is/are carrying.
		348	*/
		349	static void
		350	adjust_weight (object *op, sint32 weight)
		351	{
		352	while (op)
		353	{
		354	weight = weight_adjust (op, weight);
		355
		356	op->carrying += weight;
		357	op = op->env;
		358	}
		359	}
		360
		361	/*
332	* sum_weight() is a recursive function which calculates the weight	362	* this is a recursive function which calculates the weight
333	* an object is carrying. It goes through in figures out how much	363	* an object is carrying. It goes through op and figures out how much
334	* containers are carrying, and sums it up.	364	* containers are carrying, and sums it up.
335	*/	365	*/
336	long	366	void
337	sum_weight (object *op)	367	object::update_weight ()
338	{	368	{
339	long sum;	369	sint32 sum = 0;
340	object *inv;
341		370
342	for (sum = 0, inv = op->inv; inv; inv = inv->below)	371	for (object *op = inv; op; op = op->below)
343	{	372	{
344	if (inv->inv)	373	if (op->inv)
345	sum_weight (inv);	374	op->update_weight ();
346		375
347	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);	376	sum += op->total_weight ();
348	}	377	}
349		378
350	if (op->type == CONTAINER && op->stats.Str)	379	carrying = weight_adjust (this, sum);
351	sum = (sum * (100 - op->stats.Str)) / 100;
352
353	if (op->carrying != sum)
354	op->carrying = sum;
355
356	return sum;
357	}	380	}
358		381
359	/**	382	/*
360	* Return the outermost environment object for a given object.	383	* Used by: Server DM commands: dumpbelow, dump. Some error messages.
361	*/
362
363	object *
364	object_get_env_recursive (object *op)
365	{
366	while (op->env != NULL)
367	op = op->env;
368	return op;
369	}
370
371	/*
372	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
373	* Some error messages.
374	* The result of the dump is stored in the static global errmsg array.
375	*/	384	*/
376	char *	385	char *
377	dump_object (object *op)	386	dump_object (object *op)
378	{	387	{
379	if (!op)	388	if (!op)
…		…
393	get_nearest_part (object op, const object pl)	402	get_nearest_part (object op, const object pl)
394	{	403	{
395	object tmp, closest;	404	object tmp, closest;
396	int last_dist, i;	405	int last_dist, i;
397		406
398	if (op->more == NULL)	407	if (!op->more)
399	return op;	408	return op;
		409
400	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)
401	if ((i = distance (tmp, pl)) < last_dist)	413	if ((i = distance (tmp, pl)) < last_dist)
402	closest = tmp, last_dist = i;	414	closest = tmp, last_dist = i;
		415
403	return closest;	416	return closest;
404	}	417	}
405		418
406	/*	419	/*
407	* 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.
408	*/	422	*/
409	object *	423	object *
410	find_object (tag_t i)	424	find_object (tag_t i)
411	{	425	{
412	for_all_objects (op)	426	for_all_objects (op)
…		…
863	* if some form of movement is allowed, let objects	877	* if some form of movement is allowed, let objects
864	* drop on that space.	878	* drop on that space.
865	*/	879	*/
866	if (!drop_to_ground	880	if (!drop_to_ground
867	\|\| !map	881	\|\| !map
868	\|\| map->in_memory != MAP_IN_MEMORY	882	\|\| map->in_memory != MAP_ACTIVE
869	\|\| map->nodrop	883	\|\| map->nodrop
870	\|\| ms ().move_block == MOVE_ALL)	884	\|\| ms ().move_block == MOVE_ALL)
871	{	885	{
872	while (inv)	886	while (inv)
873	{	887	{
…		…
935	freed_map->width = 3;	949	freed_map->width = 3;
936	freed_map->height = 3;	950	freed_map->height = 3;
937	freed_map->nodrop = 1;	951	freed_map->nodrop = 1;
938		952
939	freed_map->alloc ();	953	freed_map->alloc ();
940	freed_map->in_memory = MAP_IN_MEMORY;	954	freed_map->in_memory = MAP_ACTIVE;
941	}	955	}
942		956
943	map = freed_map;	957	map = freed_map;
944	x = 1;	958	x = 1;
945	y = 1;	959	y = 1;
…		…
974	play_sound (sound_destroy);	988	play_sound (sound_destroy);
975	else if (flag [FLAG_MONSTER])	989	else if (flag [FLAG_MONSTER])
976	play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism	990	play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism
977		991
978	attachable::destroy ();	992	attachable::destroy ();
979	}
980
981	/*
982	* sub_weight() recursively (outwards) subtracts a number from the
983	* weight of an object (and what is carried by it's environment(s)).
984	*/
985	void
986	sub_weight (object *op, signed long weight)
987	{
988	while (op != NULL)
989	{
990	if (op->type == CONTAINER)
991	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
992
993	op->carrying -= weight;
994	op = op->env;
995	}
996	}	993	}
997		994
998	/* op->remove ():	995	/* op->remove ():
999	* This function removes the object op from the linked list of objects	996	* This function removes the object op from the linked list of objects
1000	* which it is currently tied to. When this function is done, the	997	* which it is currently tied to. When this function is done, the
…		…
1021	* In this case, the object to be removed is in someones	1018	* In this case, the object to be removed is in someones
1022	* inventory.	1019	* inventory.
1023	*/	1020	*/
1024	if (env)	1021	if (env)
1025	{	1022	{
		1023	adjust_weight (env, -total_weight ());
		1024
		1025	*(above ? &above->below : &env->inv) = below;
		1026
1026	if (nrof)	1027	if (below)
1027	sub_weight (env, weight * nrof);	1028	below->above = above;
1028	else	1029
1029	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;
1030		1040
1031	/* 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
1032	* made to players inventory. If set, avoiding the call	1042	* made to players inventory. If set, avoiding the call
1033	* to save cpu time.	1043	* to save cpu time.
1034	*/	1044	*/
1035	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))
1036	otmp->update_stats ();	1046	otmp->update_stats ();
1037
1038	if (above)
1039	above->below = below;
1040	else
1041	env->inv = below;
1042
1043	if (below)
1044	below->above = above;
1045
1046	/* we set up values so that it could be inserted into
1047	* the map, but we don't actually do that - it is up
1048	* to the caller to decide what we want to do.
1049	*/
1050	x = env->x, y = env->y;
1051	map = env->map;
1052	above = 0, below = 0;
1053	env = 0;
1054	}	1047	}
1055	else if (map)	1048	else if (map)
1056	{	1049	{
1057	if (type == PLAYER)	1050	if (type == PLAYER)
1058	{	1051	{
…		…
1271	if (op->nrof && !(flag & INS_NO_MERGE))	1264	if (op->nrof && !(flag & INS_NO_MERGE))
1272	for (object *tmp = ms.bot; tmp; tmp = tmp->above)	1265	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1273	if (object::can_merge (op, tmp))	1266	if (object::can_merge (op, tmp))
1274	{	1267	{
1275	op->nrof += tmp->nrof;	1268	op->nrof += tmp->nrof;
1276	tmp->destroy ();	1269	tmp->destroy (1);
1277	}	1270	}
1278		1271
1279	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 */
1280	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1273	CLEAR_FLAG (op, FLAG_INV_LOCKED);
1281		1274
…		…
1461	* 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.
1462	*/	1455	*/
1463	void	1456	void
1464	replace_insert_ob_in_map (const char arch_string, object op)	1457	replace_insert_ob_in_map (const char arch_string, object op)
1465	{	1458	{
1466	object tmp, tmp1;
1467
1468	/* first search for itself and remove any old instances */	1459	/* first search for itself and remove any old instances */
1469		1460
1470	for (tmp = op->ms ().bot; tmp; tmp = tmp->above)	1461	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1471	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */	1462	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */
1472	tmp->destroy ();	1463	tmp->destroy (1);
1473		1464
1474	tmp1 = arch_to_object (archetype::find (arch_string));	1465	object *tmp = arch_to_object (archetype::find (arch_string));
1475		1466
1476	tmp1->x = op->x;	1467	tmp->x = op->x;
1477	tmp1->y = op->y;	1468	tmp->y = op->y;
		1469
1478	insert_ob_in_map (tmp1, op->map, op, 0);	1470	insert_ob_in_map (tmp, op->map, op, 0);
1479	}	1471	}
1480		1472
1481	object *	1473	object *
1482	object::insert_at (object where, object originator, int flags)	1474	object::insert_at (object where, object originator, int flags)
1483	{	1475	{
…		…
1485	return where->env->insert (this);	1477	return where->env->insert (this);
1486	else	1478	else
1487	return where->map->insert (this, where->x, where->y, originator, flags);	1479	return where->map->insert (this, where->x, where->y, originator, flags);
1488	}	1480	}
1489		1481
1490	/*	1482	// find player who can see this object
1491	* get_split_ob(ob,nr) splits up ob into two parts. The part which	1483	static object *
1492	* is returned contains nr objects, and the remaining parts contains	1484	visible_to (object *op)
1493	* the rest (or is removed and freed if that number is 0).
1494	* On failure, NULL is returned, and the reason put into the
1495	* global static errmsg array.
1496	*/
1497	object *
1498	get_split_ob (object *orig_ob, uint32 nr)
1499	{	1485	{
1500	object *newob;	1486	if (!op->flag [FLAG_REMOVED])
1501	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1502
1503	if (orig_ob->nrof < nr)
1504	{
1505	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1506	return NULL;
1507	}	1487	{
1508		1488	// see if we are in a container of sorts
1509	newob = object_create_clone (orig_ob);	1489	if (object *env = op->env)
1510
1511	if ((orig_ob->nrof -= nr) < 1)
1512	orig_ob->destroy (1);
1513	else if (!is_removed)
1514	{
1515	if (orig_ob->env != NULL)
1516	sub_weight (orig_ob->env, orig_ob->weight * nr);
1517	if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)
1518	{
1519	strcpy (errmsg, "Tried to split object whose map is not in memory.");
1520	LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n");
1521	return NULL;
1522	}	1490	{
1523	}	1491	// the player inventory itself is always visible
		1492	if (env->type == PLAYER)
		1493	return env;
1524		1494
1525	newob->nrof = nr;	1495	// else a player could have our env open
		1496	env = env->outer_env ();
1526		1497
		1498	// the player itself is always on a map, so we will find him here
		1499	// even if our inv is in a player.
		1500	if (env->is_on_map ())
		1501	if (object *pl = env->ms ().player ())
		1502	if (pl->container == op->env)
		1503	return pl;
		1504	}
		1505	else
		1506	{
		1507	// maybe there is a player standing on the same mapspace
		1508	if (object *pl = env->ms ().player ())
		1509	return pl;
		1510	}
		1511	}
		1512
1527	return newob;	1513	return 0;
1528	}	1514	}
1529		1515
1530	/*	1516	/*
1531	* decrease_ob_nr(object, number) decreases a specified number from	1517	* decrease(object, number) decreases a specified number from
1532	* the amount of an object. If the amount reaches 0, the object	1518	* the amount of an object. If the amount reaches 0, the object
1533	* is subsequently removed and freed.	1519	* is subsequently removed and freed.
1534	*	1520	*
1535	* Return value: 'op' if something is left, NULL if the amount reached 0	1521	* Return value: 'op' if something is left, NULL if the amount reached 0
1536	*/	1522	*/
		1523	bool
		1524	object::decrease (sint32 nr)
		1525	{
		1526	nr = min (nr, nrof);
		1527
		1528	if (!nr)
		1529	return 1;
		1530
		1531	nrof -= nr;
		1532
		1533	object *visible = visible_to (this);
		1534
		1535	if (nrof)
		1536	{
		1537	adjust_weight (env, -weight * nr); // carrying == 0
		1538
		1539	if (visible)
		1540	esrv_send_item (visible, this);
		1541
		1542	return 1;
		1543	}
		1544	else
		1545	{
		1546	if (visible)
		1547	esrv_del_item (visible->contr, count);
		1548
		1549	this->destroy (1);
		1550	return 0;
		1551	}
		1552	}
		1553
		1554	/*
		1555	* split(ob,nr) splits up ob into two parts. The part which
		1556	* is returned contains nr objects, and the remaining parts contains
		1557	* the rest (or is removed and returned if that number is 0).
		1558	* On failure, NULL is returned.
		1559	*/
1537	object *	1560	object *
1538	decrease_ob_nr (object *op, uint32 i)	1561	object::split (sint32 nr)
1539	{	1562	{
1540	object *tmp;	1563	if (nrof < nr)
1541
1542	if (i == 0) /* objects with op->nrof require this check */
1543	return op;	1564	return 0;
1544		1565	else if (nrof == nr)
1545	if (i > op->nrof)
1546	i = op->nrof;
1547
1548	if (QUERY_FLAG (op, FLAG_REMOVED))
1549	op->nrof -= i;
1550	else if (op->env)
1551	{	1566	{
1552	/* is this object in the players inventory, or sub container
1553	* therein?
1554	*/
1555	tmp = op->in_player ();
1556	/* nope. Is this a container the player has opened?
1557	* If so, set tmp to that player.
1558	* IMO, searching through all the players will mostly
1559	* likely be quicker than following op->env to the map,
1560	* and then searching the map for a player.
1561	*/
1562	if (!tmp)
1563	for_all_players (pl)
1564	if (pl->ob->container == op->env)
1565	{
1566	tmp = pl->ob;
1567	break;
1568	}
1569
1570	if (i < op->nrof)
1571	{
1572	sub_weight (op->env, op->weight * i);
1573	op->nrof -= i;
1574	if (tmp)
1575	esrv_send_item (tmp, op);
1576	}
1577	else
1578	{
1579	op->remove ();	1567	remove ();
1580	op->nrof = 0;	1568	return this;
1581	if (tmp)
1582	esrv_del_item (tmp->contr, op->count);
1583	}
1584	}	1569	}
1585	else	1570	else
1586	{	1571	{
1587	object *above = op->above;	1572	decrease (nr);
1588		1573
1589	if (i < op->nrof)	1574	object *op = object_create_clone (this);
1590	op->nrof -= i;	1575	op->nrof = nr;
1591	else
1592	{
1593	op->remove ();
1594	op->nrof = 0;
1595	}
1596
1597	/* Since we just removed op, op->above is null */
1598	for (tmp = above; tmp; tmp = tmp->above)
1599	if (tmp->type == PLAYER)
1600	{
1601	if (op->nrof)
1602	esrv_send_item (tmp, op);
1603	else
1604	esrv_del_item (tmp->contr, op->count);
1605	}
1606	}
1607
1608	if (op->nrof)
1609	return op;	1576	return op;
1610	else
1611	{
1612	op->destroy ();
1613	return 0;
1614	}
1615	}
1616
1617	/*
1618	* add_weight(object, weight) adds the specified weight to an object,
1619	* and also updates how much the environment(s) is/are carrying.
1620	*/
1621	void
1622	add_weight (object *op, signed long weight)
1623	{
1624	while (op != NULL)
1625	{
1626	if (op->type == CONTAINER)
1627	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1628
1629	op->carrying += weight;
1630	op = op->env;
1631	}	1577	}
1632	}	1578	}
1633		1579
1634	object *	1580	object *
1635	insert_ob_in_ob (object op, object where)	1581	insert_ob_in_ob (object op, object where)
…		…
1660	* be != op, if items are merged. -Tero	1606	* be != op, if items are merged. -Tero
1661	*/	1607	*/
1662	object *	1608	object *
1663	object::insert (object *op)	1609	object::insert (object *op)
1664	{	1610	{
1665	if (!QUERY_FLAG (op, FLAG_REMOVED))
1666	op->remove ();
1667
1668	if (op->more)	1611	if (op->more)
1669	{	1612	{
1670	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);	1613	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1671	return op;	1614	return op;
1672	}	1615	}
1673		1616
1674	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1617	op->remove ();
1675	CLEAR_FLAG (op, FLAG_REMOVED);	1618
		1619	op->flag [FLAG_OBJ_ORIGINAL] = 0;
1676		1620
1677	if (op->nrof)	1621	if (op->nrof)
1678	{
1679	for (object *tmp = inv; tmp; tmp = tmp->below)	1622	for (object *tmp = inv; tmp; tmp = tmp->below)
1680	if (object::can_merge (tmp, op))	1623	if (object::can_merge (tmp, op))
1681	{	1624	{
1682	/* return the original object and remove inserted object	1625	/* return the original object and remove inserted object
1683	(client needs the original object) */	1626	(client needs the original object) */
1684	tmp->nrof += op->nrof;	1627	tmp->nrof += op->nrof;
1685	/* Weight handling gets pretty funky. Since we are adding to
1686	* tmp->nrof, we need to increase the weight.
1687	*/
1688	add_weight (this, op->weight * op->nrof);	1628	adjust_weight (this, op->total_weight ());
1689	SET_FLAG (op, FLAG_REMOVED);	1629
1690	op->destroy (); /* free the inserted object */	1630	op->destroy (1);
1691	op = tmp;	1631	op = tmp;
1692	op->remove (); /* and fix old object's links */	1632	goto inserted;
1693	CLEAR_FLAG (op, FLAG_REMOVED);
1694	break;
1695	}	1633	}
1696		1634
1697	/* I assume combined objects have no inventory	1635	op->owner = 0; // it's his/hers now. period.
1698	* We add the weight - this object could have just been removed	1636	op->map = 0;
1699	* (if it was possible to merge). calling remove_ob will subtract	1637	op->x = 0;
1700	* the weight, so we need to add it in again, since we actually do	1638	op->y = 0;
1701	* the linking below
1702	*/
1703	add_weight (this, op->weight * op->nrof);
1704	}
1705	else
1706	add_weight (this, (op->weight + op->carrying));
1707		1639
		1640	op->above = 0;
		1641	op->below = inv;
		1642	op->env = this;
		1643
		1644	if (inv)
		1645	inv->above = op;
		1646
		1647	inv = op;
		1648
		1649	op->flag [FLAG_REMOVED] = 0;
		1650
		1651	adjust_weight (this, op->total_weight ());
		1652
		1653	inserted:
		1654	/* reset the light list and los of the players on the map */
		1655	if (op->glow_radius && map && map->darkness)
		1656	update_all_los (map, x, y);
		1657
1708	if (object *otmp = this->in_player ())	1658	if (object *otmp = in_player ())
1709	if (otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1659	if (otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1710	otmp->update_stats ();	1660	otmp->update_stats ();
1711
1712	op->owner = 0; // its his/hers now. period.
1713	op->map = 0;
1714	op->env = this;
1715	op->above = 0;
1716	op->below = 0;
1717	op->x = op->y = 0;
1718
1719	/* reset the light list and los of the players on the map */
1720	if (op->glow_radius && map)
1721	{
1722	#ifdef DEBUG_LIGHTS
1723	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1724	#endif /* DEBUG_LIGHTS */
1725	if (map->darkness)
1726	update_all_los (map, x, y);
1727	}
1728
1729	/* Client has no idea of ordering so lets not bother ordering it here.
1730	* It sure simplifies this function...
1731	*/
1732	if (!inv)
1733	inv = op;
1734	else
1735	{
1736	op->below = inv;
1737	op->below->above = op;
1738	inv = op;
1739	}
1740		1661
1741	INVOKE_OBJECT (INSERT, this);	1662	INVOKE_OBJECT (INSERT, this);
1742		1663
1743	return op;	1664	return op;
1744	}	1665	}
…		…
2742		2663
2743	insert (force);	2664	insert (force);
2744	}	2665	}
2745		2666
2746	void	2667	void
2747	object::play_sound (faceidx sound) const	2668	object::play_sound (faceidx sound)
2748	{	2669	{
2749	if (!sound)	2670	if (!sound)
2750	return;	2671	return;
2751		2672
2752	if (flag [FLAG_REMOVED])	2673	if (flag [FLAG_REMOVED])

Diff Legend

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

Comparing deliantra/server/common/object.C (file contents): Revision 1.205 by root, Sun Apr 13 01:34:08 2008 UTC vs. Revision 1.210 by root, Mon Apr 21 07:01:40 2008 UTC

Diff Legend

Comparing deliantra/server/common/object.C (file contents):
Revision 1.205 by root, Sun Apr 13 01:34:08 2008 UTC vs.
Revision 1.210 by root, Mon Apr 21 07:01:40 2008 UTC