[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.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	#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>
32	#include <funcpoint.h>
33	#include <sproto.h>	29	#include <sproto.h>
34	#include <loader.h>	30	#include <loader.h>
35		31
36	#include <bitset>	32	#include <bitset>
37		33
…		…
205	\|\| ob1->value != ob2->value	201	\|\| ob1->value != ob2->value
206	\|\| ob1->name != ob2->name)	202	\|\| ob1->name != ob2->name)
207	return 0;	203	return 0;
208		204
209	/* Do not merge objects if nrof would overflow. First part checks	205	/* Do not merge objects if nrof would overflow. First part checks
210	* for unsigned overflow (2c), second part checks wether the result	206	* 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	207	* would fit into a 32 bit signed int, which is often used to hold
212	* nrof values.	208	* nrof values.
213	*/	209	*/
214	if (~ob1->nrof < ob2->nrof \|\| ob1->nrof + ob2->nrof > (1UL << 31))	210	if (~ob1->nrof < ob2->nrof \|\| ob1->nrof + ob2->nrof > (1UL << 31))
215	return 0;	211	return 0;
…		…
224	SET_FLAG (ob1, FLAG_BEEN_APPLIED);	220	SET_FLAG (ob1, FLAG_BEEN_APPLIED);
225		221
226	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))	222	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))
227	SET_FLAG (ob2, FLAG_BEEN_APPLIED);	223	SET_FLAG (ob2, FLAG_BEEN_APPLIED);
228		224
229	if ((ob1->flag ^ ob2->flag).reset (FLAG_INV_LOCKED).reset (FLAG_CLIENT_SENT).any ()	225	if (ob1->arch->name != ob2->arch->name
230	\|\| ob1->arch != ob2->arch
231	\|\| ob1->name != ob2->name	226	\|\| ob1->name != ob2->name
232	\|\| ob1->title != ob2->title	227	\|\| ob1->title != ob2->title
233	\|\| ob1->msg != ob2->msg	228	\|\| ob1->msg != ob2->msg
234	\|\| ob1->weight != ob2->weight	229	\|\| 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	230	\|\| ob1->attacktype != ob2->attacktype
238	\|\| ob1->magic != ob2->magic	231	\|\| ob1->magic != ob2->magic
239	\|\| ob1->slaying != ob2->slaying	232	\|\| ob1->slaying != ob2->slaying
240	\|\| ob1->skill != ob2->skill	233	\|\| ob1->skill != ob2->skill
241	\|\| ob1->value != ob2->value	234	\|\| ob1->value != ob2->value
…		…
248	\|\| ob1->move_block != ob2->move_block	241	\|\| ob1->move_block != ob2->move_block
249	\|\| ob1->move_allow != ob2->move_allow	242	\|\| ob1->move_allow != ob2->move_allow
250	\|\| ob1->move_on != ob2->move_on	243	\|\| ob1->move_on != ob2->move_on
251	\|\| ob1->move_off != ob2->move_off	244	\|\| ob1->move_off != ob2->move_off
252	\|\| ob1->move_slow != ob2->move_slow	245	\|\| ob1->move_slow != ob2->move_slow
253	\|\| 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 ())
254	return 0;	256	return 0;
255		257
256	/* This is really a spellbook check - we should in general	258	/* This is really a spellbook check - we should in general
257	* not merge objects with real inventories, as splitting them	259	* not merge objects with real inventories, as splitting them
258	* is hard.	260	* is hard.
…		…
297		299
298	if (ob1->key_values \|\| ob2->key_values)	300	if (ob1->key_values \|\| ob2->key_values)
299	{	301	{
300	/* At least one of these has key_values. */	302	/* At least one of these has key_values. */
301	if ((!ob1->key_values) != (!ob2->key_values))	303	if ((!ob1->key_values) != (!ob2->key_values))
302	/* One has fields, but the other one doesn't. */	304	return 0; /* One has fields, but the other one doesn't. */
303	return 0;	305
304	else if (!compare_ob_value_lists (ob1, ob2))	306	if (!compare_ob_value_lists (ob1, ob2))
305	return 0;	307	return 0;
306	}	308	}
307		309
308	if (ob1->self \|\| ob2->self)	310	if (ob1->self \|\| ob2->self)
309	{	311	{
…		…
315	int k1 = ob1->self ? HvTOTALKEYS (ob1->self) : 0;	317	int k1 = ob1->self ? HvTOTALKEYS (ob1->self) : 0;
316	int k2 = ob2->self ? HvTOTALKEYS (ob2->self) : 0;	318	int k2 = ob2->self ? HvTOTALKEYS (ob2->self) : 0;
317		319
318	if (k1 != k2)	320	if (k1 != k2)
319	return 0;	321	return 0;
		322
320	else if (k1 == 0)	323	if (k1 == 0)
321	return 1;	324	return 1;
		325
322	else if (!cfperl_can_merge (ob1, ob2))	326	if (!cfperl_can_merge (ob1, ob2))
323	return 0;	327	return 0;
324	}	328	}
325	}	329	}
326		330
327	/* Everything passes, must be OK. */	331	/* Everything passes, must be OK. */
328	return 1;	332	return 1;
329	}	333	}
330		334
		335	// adjust weight per container type ("of holding")
		336	static sint32
		337	weight_adjust (object *op, sint32 weight)
		338	{
		339	return op->type == CONTAINER
		340	? lerp (weight, 0, 100, 0, 100 - op->stats.Str)
		341	: weight;
		342	}
		343
331	/*	344	/*
		345	* adjust_weight(object, weight) adds the specified weight to an object,
		346	* and also updates how much the environment(s) is/are carrying.
		347	*/
		348	static void
		349	adjust_weight (object *op, sint32 weight)
		350	{
		351	while (op)
		352	{
		353	weight = weight_adjust (op, weight);
		354
		355	if (!weight)
		356	return;
		357
		358	op->carrying += weight;
		359
		360	if (object *pl = op->visible_to ())
		361	esrv_update_item (UPD_WEIGHT, pl, op);
		362
		363	op = op->env;
		364	}
		365	}
		366
		367	/*
332	* sum_weight() is a recursive function which calculates the weight	368	* this is a recursive function which calculates the weight
333	* an object is carrying. It goes through in figures out how much	369	* an object is carrying. It goes through op and figures out how much
334	* containers are carrying, and sums it up.	370	* containers are carrying, and sums it up.
335	*/	371	*/
336	long	372	void
337	sum_weight (object *op)	373	object::update_weight ()
338	{	374	{
339	long sum;	375	sint32 sum = 0;
340	object *inv;
341		376
342	for (sum = 0, inv = op->inv; inv; inv = inv->below)	377	for (object *op = inv; op; op = op->below)
343	{	378	{
344	if (inv->inv)	379	if (op->inv)
345	sum_weight (inv);	380	op->update_weight ();
346		381
347	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);	382	sum += op->total_weight ();
		383	}
		384
		385	sum = weight_adjust (this, sum);
		386
		387	if (sum != carrying)
348	}	388	{
349
350	if (op->type == CONTAINER && op->stats.Str)
351	sum = (sum * (100 - op->stats.Str)) / 100;
352
353	if (op->carrying != sum)
354	op->carrying = sum;	389	carrying = sum;
355		390
356	return sum;	391	if (object *pl = visible_to ())
		392	esrv_update_item (UPD_WEIGHT, pl, this);
		393	}
357	}	394	}
358		395
359	/**	396	/*
360	* Return the outermost environment object for a given object.	397	* 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	*/	398	*/
376	char *	399	char *
377	dump_object (object *op)	400	dump_object (object *op)
378	{	401	{
379	if (!op)	402	if (!op)
…		…
393	get_nearest_part (object op, const object pl)	416	get_nearest_part (object op, const object pl)
394	{	417	{
395	object tmp, closest;	418	object tmp, closest;
396	int last_dist, i;	419	int last_dist, i;
397		420
398	if (op->more == NULL)	421	if (!op->more)
399	return op;	422	return op;
		423
400	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)
401	if ((i = distance (tmp, pl)) < last_dist)	427	if ((i = distance (tmp, pl)) < last_dist)
402	closest = tmp, last_dist = i;	428	closest = tmp, last_dist = i;
		429
403	return closest;	430	return closest;
404	}	431	}
405		432
406	/*	433	/*
407	* 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.
408	*/	436	*/
409	object *	437	object *
410	find_object (tag_t i)	438	find_object (tag_t i)
411	{	439	{
412	for_all_objects (op)	440	for_all_objects (op)
…		…
863	* if some form of movement is allowed, let objects	891	* if some form of movement is allowed, let objects
864	* drop on that space.	892	* drop on that space.
865	*/	893	*/
866	if (!drop_to_ground	894	if (!drop_to_ground
867	\|\| !map	895	\|\| !map
868	\|\| map->in_memory != MAP_IN_MEMORY	896	\|\| map->in_memory != MAP_ACTIVE
869	\|\| map->nodrop	897	\|\| map->nodrop
870	\|\| ms ().move_block == MOVE_ALL)	898	\|\| ms ().move_block == MOVE_ALL)
871	{	899	{
872	while (inv)	900	while (inv)
873	{	901	{
…		…
902	}	930	}
903		931
904	void	932	void
905	object::do_destroy ()	933	object::do_destroy ()
906	{	934	{
		935	if (object *pl = visible_to ())
		936	esrv_del_item (pl->contr, count);
		937
907	attachable::do_destroy ();	938	attachable::do_destroy ();
908		939
909	if (flag [FLAG_IS_LINKED])	940	if (flag [FLAG_IS_LINKED])
910	remove_button_link (this);	941	remove_button_link (this);
911		942
…		…
935	freed_map->width = 3;	966	freed_map->width = 3;
936	freed_map->height = 3;	967	freed_map->height = 3;
937	freed_map->nodrop = 1;	968	freed_map->nodrop = 1;
938		969
939	freed_map->alloc ();	970	freed_map->alloc ();
940	freed_map->in_memory = MAP_IN_MEMORY;	971	freed_map->in_memory = MAP_ACTIVE;
941	}	972	}
942		973
943	map = freed_map;	974	map = freed_map;
944	x = 1;	975	x = 1;
945	y = 1;	976	y = 1;
…		…
974	play_sound (sound_destroy);	1005	play_sound (sound_destroy);
975	else if (flag [FLAG_MONSTER])	1006	else if (flag [FLAG_MONSTER])
976	play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism	1007	play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism
977		1008
978	attachable::destroy ();	1009	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	}	1010	}
997		1011
998	/* op->remove ():	1012	/* op->remove ():
999	* This function removes the object op from the linked list of objects	1013	* 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	1014	* which it is currently tied to. When this function is done, the
…		…
1021	* In this case, the object to be removed is in someones	1035	* In this case, the object to be removed is in someones
1022	* inventory.	1036	* inventory.
1023	*/	1037	*/
1024	if (env)	1038	if (env)
1025	{	1039	{
		1040	adjust_weight (env, -total_weight ());
		1041
		1042	*(above ? &above->below : &env->inv) = below;
		1043
1026	if (nrof)	1044	if (below)
1027	sub_weight (env, weight * nrof);	1045	below->above = above;
1028	else	1046
1029	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;
1030		1057
1031	/* 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
1032	* made to players inventory. If set, avoiding the call	1059	* made to players inventory. If set, avoiding the call
1033	* to save cpu time.	1060	* to save cpu time.
1034	*/	1061	*/
1035	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))
1036	otmp->update_stats ();	1063	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	}	1064	}
1055	else if (map)	1065	else if (map)
1056	{	1066	{
1057	if (type == PLAYER)	1067	if (type == PLAYER)
1058	{	1068	{
…		…
1271	if (op->nrof && !(flag & INS_NO_MERGE))	1281	if (op->nrof && !(flag & INS_NO_MERGE))
1272	for (object *tmp = ms.bot; tmp; tmp = tmp->above)	1282	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1273	if (object::can_merge (op, tmp))	1283	if (object::can_merge (op, tmp))
1274	{	1284	{
1275	op->nrof += tmp->nrof;	1285	op->nrof += tmp->nrof;
1276	tmp->destroy ();	1286	tmp->destroy (1);
1277	}	1287	}
1278		1288
1279	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 */
1280	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1290	CLEAR_FLAG (op, FLAG_INV_LOCKED);
1281		1291
…		…
1461	* 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.
1462	*/	1472	*/
1463	void	1473	void
1464	replace_insert_ob_in_map (const char arch_string, object op)	1474	replace_insert_ob_in_map (const char arch_string, object op)
1465	{	1475	{
1466	object tmp, tmp1;
1467
1468	/* first search for itself and remove any old instances */	1476	/* first search for itself and remove any old instances */
1469		1477
1470	for (tmp = op->ms ().bot; tmp; tmp = tmp->above)	1478	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1471	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */	1479	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */
1472	tmp->destroy ();	1480	tmp->destroy (1);
1473		1481
1474	tmp1 = arch_to_object (archetype::find (arch_string));	1482	object *tmp = arch_to_object (archetype::find (arch_string));
1475		1483
1476	tmp1->x = op->x;	1484	tmp->x = op->x;
1477	tmp1->y = op->y;	1485	tmp->y = op->y;
		1486
1478	insert_ob_in_map (tmp1, op->map, op, 0);	1487	insert_ob_in_map (tmp, op->map, op, 0);
1479	}	1488	}
1480		1489
1481	object *	1490	object *
1482	object::insert_at (object where, object originator, int flags)	1491	object::insert_at (object where, object originator, int flags)
1483	{	1492	{
…		…
1485	return where->env->insert (this);	1494	return where->env->insert (this);
1486	else	1495	else
1487	return where->map->insert (this, where->x, where->y, originator, flags);	1496	return where->map->insert (this, where->x, where->y, originator, flags);
1488	}	1497	}
1489		1498
1490	/*	1499	// find player who can see this object
1491	* get_split_ob(ob,nr) splits up ob into two parts. The part which
1492	* is returned contains nr objects, and the remaining parts contains
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 *	1500	object *
1498	get_split_ob (object *orig_ob, uint32 nr)	1501	object::visible_to () const
1499	{	1502	{
1500	object *newob;	1503	if (!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	}	1504	{
1508		1505	// see if we are in a container of sorts
1509	newob = object_create_clone (orig_ob);	1506	if (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	}	1507	{
1523	}	1508	// the player inventory itself is always visible
		1509	if (env->type == PLAYER)
		1510	return env;
1524		1511
1525	newob->nrof = nr;	1512	// else a player could have our env open
		1513	object *envest = env->outer_env ();
1526		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
1527	return newob;	1531	return 0;
1528	}	1532	}
1529		1533
1530	/*	1534	/*
1531	* decrease_ob_nr(object, number) decreases a specified number from	1535	* decrease(object, number) decreases a specified number from
1532	* 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
1533	* is subsequently removed and freed.	1537	* is subsequently removed and freed.
1534	*	1538	*
1535	* 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
1536	*/	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	*/
1537	object *	1573	object *
1538	decrease_ob_nr (object *op, uint32 i)	1574	object::split (sint32 nr)
1539	{	1575	{
1540	object *tmp;	1576	int have = number_of ();
1541		1577
1542	if (i == 0) /* objects with op->nrof require this check */	1578	if (have < nr)
1543	return op;	1579	return 0;
1544		1580	else if (have == 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	{	1581	{
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 ();	1582	remove ();
1580	op->nrof = 0;	1583	return this;
1581	if (tmp)
1582	esrv_del_item (tmp->contr, op->count);
1583	}
1584	}	1584	}
1585	else	1585	else
1586	{	1586	{
1587	object *above = op->above;	1587	decrease (nr);
1588		1588
1589	if (i < op->nrof)	1589	object *op = object_create_clone (this);
1590	op->nrof -= i;	1590	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;	1591	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	}	1592	}
1632	}	1593	}
1633		1594
1634	object *	1595	object *
1635	insert_ob_in_ob (object op, object where)	1596	insert_ob_in_ob (object op, object where)
…		…
1660	* be != op, if items are merged. -Tero	1621	* be != op, if items are merged. -Tero
1661	*/	1622	*/
1662	object *	1623	object *
1663	object::insert (object *op)	1624	object::insert (object *op)
1664	{	1625	{
1665	if (!QUERY_FLAG (op, FLAG_REMOVED))
1666	op->remove ();
1667
1668	if (op->more)	1626	if (op->more)
1669	{	1627	{
1670	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);
1671	return op;	1629	return op;
1672	}	1630	}
1673		1631
1674	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1632	op->remove ();
1675	CLEAR_FLAG (op, FLAG_REMOVED);	1633
		1634	op->flag [FLAG_OBJ_ORIGINAL] = 0;
1676		1635
1677	if (op->nrof)	1636	if (op->nrof)
1678	{
1679	for (object *tmp = inv; tmp; tmp = tmp->below)	1637	for (object *tmp = inv; tmp; tmp = tmp->below)
1680	if (object::can_merge (tmp, op))	1638	if (object::can_merge (tmp, op))
1681	{	1639	{
1682	/* return the original object and remove inserted object	1640	/* return the original object and remove inserted object
1683	(client needs the original object) */	1641	(client needs the original object) */
1684	tmp->nrof += op->nrof;	1642	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);	1643	adjust_weight (this, op->total_weight ());
1689	SET_FLAG (op, FLAG_REMOVED);	1644
1690	op->destroy (); /* free the inserted object */	1645	op->destroy (1);
1691	op = tmp;	1646	op = tmp;
1692	op->remove (); /* and fix old object's links */	1647	goto inserted;
1693	CLEAR_FLAG (op, FLAG_REMOVED);
1694	break;
1695	}	1648	}
1696		1649
1697	/* I assume combined objects have no inventory	1650	op->owner = 0; // it's his/hers now. period.
1698	* We add the weight - this object could have just been removed	1651	op->map = 0;
1699	* (if it was possible to merge). calling remove_ob will subtract	1652	op->x = 0;
1700	* the weight, so we need to add it in again, since we actually do	1653	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		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
1708	if (object *otmp = this->in_player ())	1673	if (object *otmp = in_player ())
1709	if (otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1674	if (otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1710	otmp->update_stats ();	1675	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		1676
1741	INVOKE_OBJECT (INSERT, this);	1677	INVOKE_OBJECT (INSERT, this);
1742		1678
1743	return op;	1679	return op;
1744	}	1680	}
…		…
2742		2678
2743	insert (force);	2679	insert (force);
2744	}	2680	}
2745		2681
2746	void	2682	void
2747	object::play_sound (faceidx sound) const	2683	object::play_sound (faceidx sound)
2748	{	2684	{
2749	if (!sound)	2685	if (!sound)
2750	return;	2686	return;
2751		2687
2752	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.205 by root, Sun Apr 13 01:34:08 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.205 by root, Sun Apr 13 01:34:08 2008 UTC vs.
Revision 1.212 by root, Mon Apr 21 23:35:24 2008 UTC