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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.206 by root, Tue Apr 15 14:21:04 2008 UTC vs.
Revision 1.227 by root, Sat May 3 09:04:17 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	// find player who can see this object
		336	object *
		337	object::visible_to () const
		338	{
		339	if (client_visible () && !flag [FLAG_REMOVED])
		340	{
		341	// see if we are in a container of sorts
		342	if (env)
		343	{
		344	// the player inventory itself is always visible
		345	if (env->type == PLAYER)
		346	return env;
		347
		348	// else a player could have our env open
		349	object *envest = env->outer_env ();
		350
		351	// the player itself is always on a map, so we will find him here
		352	// even if our inv is in a player.
		353	if (envest->is_on_map ())
		354	if (object *pl = envest->ms ().player ())
		355	if (pl->container == env)
		356	return pl;
		357	}
		358	else
		359	{
		360	// maybe there is a player standing on the same mapspace
		361	// this will catch the case where "this" is a player
		362	if (object *pl = ms ().player ())
		363	if (!pl->container \|\| this == pl->container)
		364	return pl;
		365	}
		366	}
		367
		368	return 0;
		369	}
		370
		371	// adjust weight per container type ("of holding")
		372	static sint32
		373	weight_adjust (object *op, sint32 weight)
		374	{
		375	return op->type == CONTAINER
		376	? lerp (weight, 0, 100, 0, 100 - op->stats.Str)
		377	: weight;
		378	}
		379
331	/*	380	/*
		381	* adjust_weight(object, weight) adds the specified weight to an object,
		382	* and also updates how much the environment(s) is/are carrying.
		383	*/
		384	static void
		385	adjust_weight (object *op, sint32 weight)
		386	{
		387	while (op)
		388	{
		389	weight = weight_adjust (op, weight);
		390
		391	if (!weight)
		392	return;
		393
		394	op->carrying += weight;
		395
		396	if (object *pl = op->visible_to ())
		397	if (pl != op) // player is handled lazily
		398	esrv_update_item (UPD_WEIGHT, pl, op);
		399
		400	op = op->env;
		401	}
		402	}
		403
		404	/*
332	* sum_weight() is a recursive function which calculates the weight	405	* this is a recursive function which calculates the weight
333	* an object is carrying. It goes through in figures out how much	406	* an object is carrying. It goes through op and figures out how much
334	* containers are carrying, and sums it up.	407	* containers are carrying, and sums it up.
335	*/	408	*/
336	long	409	void
337	sum_weight (object *op)	410	object::update_weight ()
338	{	411	{
339	long sum;	412	sint32 sum = 0;
340	object *inv;
341		413
342	for (sum = 0, inv = op->inv; inv; inv = inv->below)	414	for (object *op = inv; op; op = op->below)
343	{	415	{
344	if (inv->inv)	416	if (op->inv)
345	sum_weight (inv);	417	op->update_weight ();
346		418
347	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);	419	sum += op->total_weight ();
		420	}
		421
		422	sum = weight_adjust (this, sum);
		423
		424	if (sum != carrying)
348	}	425	{
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;	426	carrying = sum;
355		427
356	return sum;	428	if (object *pl = visible_to ())
		429	if (pl != this) // player is handled lazily
		430	esrv_update_item (UPD_WEIGHT, pl, this);
		431	}
357	}	432	}
358		433
359	/**	434	/*
360	* Return the outermost environment object for a given object.	435	* 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	*/	436	*/
376	char *	437	char *
377	dump_object (object *op)	438	dump_object (object *op)
378	{	439	{
379	if (!op)	440	if (!op)
…		…
393	get_nearest_part (object op, const object pl)	454	get_nearest_part (object op, const object pl)
394	{	455	{
395	object tmp, closest;	456	object tmp, closest;
396	int last_dist, i;	457	int last_dist, i;
397		458
398	if (op->more == NULL)	459	if (!op->more)
399	return op;	460	return op;
		461
400	for (last_dist = distance (op, pl), closest = op, tmp = op->more; tmp != NULL; tmp = tmp->more)	462	for (last_dist = distance (op, pl), closest = op, tmp = op->more;
		463	tmp;
		464	tmp = tmp->more)
401	if ((i = distance (tmp, pl)) < last_dist)	465	if ((i = distance (tmp, pl)) < last_dist)
402	closest = tmp, last_dist = i;	466	closest = tmp, last_dist = i;
		467
403	return closest;	468	return closest;
404	}	469	}
405		470
406	/*	471	/*
407	* Returns the object which has the count-variable equal to the argument.	472	* Returns the object which has the count-variable equal to the argument.
		473	* VERRRY slow.
408	*/	474	*/
409	object *	475	object *
410	find_object (tag_t i)	476	find_object (tag_t i)
411	{	477	{
412	for_all_objects (op)	478	for_all_objects (op)
…		…
537	}	603	}
538		604
539	op->key_values = 0;	605	op->key_values = 0;
540	}	606	}
541		607
542	object &	608	/*
543	object::operator =(const object &src)	609	* copy_to first frees everything allocated by the dst object,
		610	* and then copies the contents of itself into the second
		611	* object, allocating what needs to be allocated. Basically, any
		612	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
		613	* if the first object is freed, the pointers in the new object
		614	* will point at garbage.
		615	*/
		616	void
		617	object::copy_to (object *dst)
544	{	618	{
545	bool is_freed = flag [FLAG_FREED];	619	dst->remove ();
546	bool is_removed = flag [FLAG_REMOVED];
547
548	(object_copy )this = src;	620	(object_copy )dst = *this;
549
550	flag [FLAG_FREED] = is_freed;
551	flag [FLAG_REMOVED] = is_removed;	621	dst->flag [FLAG_REMOVED] = true;
552		622
553	/* Copy over key_values, if any. */	623	/* Copy over key_values, if any. */
554	if (src.key_values)	624	if (key_values)
555	{	625	{
556	key_value *tail = 0;	626	key_value *tail = 0;
557	key_values = 0;	627	dst->key_values = 0;
558		628
559	for (key_value *i = src.key_values; i; i = i->next)	629	for (key_value *i = key_values; i; i = i->next)
560	{	630	{
561	key_value *new_link = new key_value;	631	key_value *new_link = new key_value;
562		632
563	new_link->next = 0;	633	new_link->next = 0;
564	new_link->key = i->key;	634	new_link->key = i->key;
565	new_link->value = i->value;	635	new_link->value = i->value;
566		636
567	/* Try and be clever here, too. */	637	/* Try and be clever here, too. */
568	if (!key_values)	638	if (!dst->key_values)
569	{	639	{
570	key_values = new_link;	640	dst->key_values = new_link;
571	tail = new_link;	641	tail = new_link;
572	}	642	}
573	else	643	else
574	{	644	{
575	tail->next = new_link;	645	tail->next = new_link;
576	tail = new_link;	646	tail = new_link;
577	}	647	}
578	}	648	}
579	}	649	}
580	}
581
582	/*
583	* copy_to first frees everything allocated by the dst object,
584	* and then copies the contents of itself into the second
585	* object, allocating what needs to be allocated. Basically, any
586	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
587	* if the first object is freed, the pointers in the new object
588	* will point at garbage.
589	*/
590	void
591	object::copy_to (object *dst)
592	{
593	dst = this;
594		650
595	if (speed < 0)	651	if (speed < 0)
596	dst->speed_left -= rndm ();	652	dst->speed_left -= rndm ();
597		653
598	dst->set_speed (dst->speed);	654	dst->set_speed (dst->speed);
…		…
620	object *	676	object *
621	object::clone ()	677	object::clone ()
622	{	678	{
623	object *neu = create ();	679	object *neu = create ();
624	copy_to (neu);	680	copy_to (neu);
		681	neu->map = map; // not copied by copy_to
625	return neu;	682	return neu;
626	}	683	}
627		684
628	/*	685	/*
629	* If an object with the IS_TURNABLE() flag needs to be turned due	686	* If an object with the IS_TURNABLE() flag needs to be turned due
…		…
680	* UP_OBJ_FACE: only the objects face has changed.	737	* UP_OBJ_FACE: only the objects face has changed.
681	*/	738	*/
682	void	739	void
683	update_object (object *op, int action)	740	update_object (object *op, int action)
684	{	741	{
685	if (op == NULL)	742	if (!op)
686	{	743	{
687	/* this should never happen */	744	/* this should never happen */
688	LOG (llevDebug, "update_object() called for NULL object.\n");	745	LOG (llevError \| logBacktrace, "update_object() called for NULL object.\n");
689	return;	746	return;
690	}	747	}
691		748
692	if (op->env)	749	if (!op->is_on_map ())
693	{	750	{
694	/* Animation is currently handled by client, so nothing	751	/* Animation is currently handled by client, so nothing
695	* to do in this case.	752	* to do in this case.
696	*/	753	*/
697	return;	754	return;
698	}	755	}
699
700	/* If the map is saving, don't do anything as everything is
701	* going to get freed anyways.
702	*/
703	if (!op->map \|\| op->map->in_memory == MAP_SAVING)
704	return;
705		756
706	/* make sure the object is within map boundaries */	757	/* make sure the object is within map boundaries */
707	if (op->x < 0 \|\| op->x >= op->map->width \|\| op->y < 0 \|\| op->y >= op->map->height)	758	if (op->x < 0 \|\| op->x >= op->map->width \|\| op->y < 0 \|\| op->y >= op->map->height)
708	{	759	{
709	LOG (llevError, "update_object() called for object out of map!\n");	760	LOG (llevError, "update_object() called for object out of map!\n");
…		…
852	object::destroy_inv (bool drop_to_ground)	903	object::destroy_inv (bool drop_to_ground)
853	{	904	{
854	// need to check first, because the checks below might segfault	905	// need to check first, because the checks below might segfault
855	// as we might be on an invalid mapspace and crossfire code	906	// as we might be on an invalid mapspace and crossfire code
856	// is too buggy to ensure that the inventory is empty.	907	// is too buggy to ensure that the inventory is empty.
857	// corollary: if you create arrows etc. with stuff in tis inventory,	908	// corollary: if you create arrows etc. with stuff in its inventory,
858	// cf will crash below with off-map x and y	909	// cf will crash below with off-map x and y
859	if (!inv)	910	if (!inv)
860	return;	911	return;
861		912
862	/* Only if the space blocks everything do we not process -	913	/* Only if the space blocks everything do we not process -
…		…
869	\|\| map->nodrop	920	\|\| map->nodrop
870	\|\| ms ().move_block == MOVE_ALL)	921	\|\| ms ().move_block == MOVE_ALL)
871	{	922	{
872	while (inv)	923	while (inv)
873	{	924	{
874	inv->destroy_inv (drop_to_ground);	925	inv->destroy_inv (false);
875	inv->destroy ();	926	inv->destroy ();
876	}	927	}
877	}	928	}
878	else	929	else
879	{ /* Put objects in inventory onto this space */	930	{ /* Put objects in inventory onto this space */
…		…
885	\|\| op->flag [FLAG_NO_DROP]	936	\|\| op->flag [FLAG_NO_DROP]
886	\|\| op->type == RUNE	937	\|\| op->type == RUNE
887	\|\| op->type == TRAP	938	\|\| op->type == TRAP
888	\|\| op->flag [FLAG_IS_A_TEMPLATE]	939	\|\| op->flag [FLAG_IS_A_TEMPLATE]
889	\|\| op->flag [FLAG_DESTROY_ON_DEATH])	940	\|\| op->flag [FLAG_DESTROY_ON_DEATH])
890	op->destroy ();	941	op->destroy (true);
891	else	942	else
892	map->insert (op, x, y);	943	map->insert (op, x, y);
893	}	944	}
894	}	945	}
895	}	946	}
…		…
899	object *op = new object;	950	object *op = new object;
900	op->link ();	951	op->link ();
901	return op;	952	return op;
902	}	953	}
903		954
		955	static struct freed_map : maptile
		956	{
		957	freed_map ()
		958	{
		959	path = "<freed objects map>";
		960	name = "/internal/freed_objects_map";
		961	width = 3;
		962	height = 3;
		963	nodrop = 1;
		964
		965	alloc ();
		966	in_memory = MAP_ACTIVE;
		967	}
		968	} freed_map; // freed objects are moved here to avoid crashes
		969
904	void	970	void
905	object::do_destroy ()	971	object::do_destroy ()
906	{	972	{
907	attachable::do_destroy ();
908
909	if (flag [FLAG_IS_LINKED])	973	if (flag [FLAG_IS_LINKED])
910	remove_button_link (this);	974	remove_button_link (this);
911		975
912	if (flag [FLAG_FRIENDLY])	976	if (flag [FLAG_FRIENDLY])
913	remove_friendly_object (this);	977	remove_friendly_object (this);
914		978
915	if (!flag [FLAG_REMOVED])
916	remove ();	979	remove ();
917		980
918	destroy_inv (true);	981	attachable::do_destroy ();
919		982
920	deactivate ();	983	deactivate ();
921	unlink ();	984	unlink ();
922		985
923	flag [FLAG_FREED] = 1;	986	flag [FLAG_FREED] = 1;
924		987
925	// hack to ensure that freed objects still have a valid map	988	// hack to ensure that freed objects still have a valid map
926	{
927	static maptile *freed_map; // freed objects are moved here to avoid crashes
928
929	if (!freed_map)
930	{
931	freed_map = new maptile;
932
933	freed_map->path = "<freed objects map>";
934	freed_map->name = "/internal/freed_objects_map";
935	freed_map->width = 3;
936	freed_map->height = 3;
937	freed_map->nodrop = 1;
938
939	freed_map->alloc ();
940	freed_map->in_memory = MAP_ACTIVE;
941	}
942
943	map = freed_map;	989	map = &freed_map;
944	x = 1;	990	x = 1;
945	y = 1;	991	y = 1;
946	}
947		992
948	if (more)	993	if (more)
949	{	994	{
950	more->destroy ();	995	more->destroy ();
951	more = 0;	996	more = 0;
…		…
964	object::destroy (bool destroy_inventory)	1009	object::destroy (bool destroy_inventory)
965	{	1010	{
966	if (destroyed ())	1011	if (destroyed ())
967	return;	1012	return;
968		1013
		1014	if (!is_head () && !head->destroyed ())
		1015	{
		1016	LOG (llevError \| logBacktrace, "tried to destroy the tail of an object");
		1017	head->destroy (destroy_inventory);
		1018	return;
		1019	}
		1020
969	if (destroy_inventory)	1021	destroy_inv (!destroy_inventory);
970	destroy_inv (false);
971		1022
972	if (is_head ())	1023	if (is_head ())
973	if (sound_destroy)	1024	if (sound_destroy)
974	play_sound (sound_destroy);	1025	play_sound (sound_destroy);
975	else if (flag [FLAG_MONSTER])	1026	else if (flag [FLAG_MONSTER])
976	play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism	1027	play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism
977		1028
978	attachable::destroy ();	1029	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	}	1030	}
997		1031
998	/* op->remove ():	1032	/* op->remove ():
999	* This function removes the object op from the linked list of objects	1033	* 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	1034	* which it is currently tied to. When this function is done, the
…		…
1006	object::do_remove ()	1040	object::do_remove ()
1007	{	1041	{
1008	object tmp, last = 0;	1042	object tmp, last = 0;
1009	object *otmp;	1043	object *otmp;
1010		1044
1011	if (QUERY_FLAG (this, FLAG_REMOVED))	1045	if (flag [FLAG_REMOVED])
1012	return;	1046	return;
1013		1047
1014	SET_FLAG (this, FLAG_REMOVED);
1015	INVOKE_OBJECT (REMOVE, this);	1048	INVOKE_OBJECT (REMOVE, this);
		1049
		1050	flag [FLAG_REMOVED] = true;
1016		1051
1017	if (more)	1052	if (more)
1018	more->remove ();	1053	more->remove ();
1019		1054
1020	/*	1055	/*
1021	* In this case, the object to be removed is in someones	1056	* In this case, the object to be removed is in someones
1022	* inventory.	1057	* inventory.
1023	*/	1058	*/
1024	if (env)	1059	if (env)
1025	{	1060	{
		1061	flag [FLAG_REMOVED] = false; // hack around the issue of visible_to checking flag_removed
		1062	if (object *pl = visible_to ())
		1063	esrv_del_item (pl->contr, count);
		1064	flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed
		1065
		1066	adjust_weight (env, -total_weight ());
		1067
		1068	*(above ? &above->below : &env->inv) = below;
		1069
1026	if (nrof)	1070	if (below)
1027	sub_weight (env, weight * nrof);	1071	below->above = above;
1028	else	1072
1029	sub_weight (env, weight + carrying);	1073	/* we set up values so that it could be inserted into
		1074	* the map, but we don't actually do that - it is up
		1075	* to the caller to decide what we want to do.
		1076	*/
		1077	map = env->map;
		1078	x = env->x;
		1079	y = env->y;
		1080	above = 0;
		1081	below = 0;
		1082	env = 0;
1030		1083
1031	/* NO_FIX_PLAYER is set when a great many changes are being	1084	/* NO_FIX_PLAYER is set when a great many changes are being
1032	* made to players inventory. If set, avoiding the call	1085	* made to players inventory. If set, avoiding the call
1033	* to save cpu time.	1086	* to save cpu time.
1034	*/	1087	*/
1035	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1088	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1036	otmp->update_stats ();	1089	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	}	1090	}
1055	else if (map)	1091	else if (map)
1056	{	1092	{
1057	if (type == PLAYER)
1058	{
1059	// leaving a spot always closes any open container on the ground
1060	if (container && !container->env)
1061	// this causes spurious floorbox updates, but it ensures
1062	// that the CLOSE event is being sent.
1063	close_container ();
1064
1065	--map->players;
1066	map->touch ();
1067	}
1068
1069	map->dirty = true;	1093	map->dirty = true;
1070	mapspace &ms = this->ms ();	1094	mapspace &ms = this->ms ();
		1095
		1096	if (object *pl = ms.player ())
		1097	{
		1098	if (type == PLAYER) // this == pl(!)
		1099	{
		1100	// leaving a spot always closes any open container on the ground
		1101	if (container && !container->env)
		1102	// this causes spurious floorbox updates, but it ensures
		1103	// that the CLOSE event is being sent.
		1104	close_container ();
		1105
		1106	--map->players;
		1107	map->touch ();
		1108	}
		1109	else if (pl->container == this)
		1110	{
		1111	// removing a container should close it
		1112	close_container ();
		1113	}
		1114
		1115	esrv_del_item (pl->contr, count);
		1116	}
1071		1117
1072	/* link the object above us */	1118	/* link the object above us */
1073	if (above)	1119	if (above)
1074	above->below = below;	1120	above->below = below;
1075	else	1121	else
…		…
1105	* removed (most likely destroyed), update the player view	1151	* removed (most likely destroyed), update the player view
1106	* appropriately.	1152	* appropriately.
1107	*/	1153	*/
1108	pl->close_container ();	1154	pl->close_container ();
1109		1155
		1156	//TODO: the floorbox prev/next might need updating
		1157	//esrv_del_item (pl->contr, count);
		1158	//TODO: update floorbox to preserve ordering
		1159	if (pl->contr->ns)
1110	pl->contr->ns->floorbox_update ();	1160	pl->contr->ns->floorbox_update ();
1111	}	1161	}
1112		1162
1113	for (tmp = ms.bot; tmp; tmp = tmp->above)	1163	for (tmp = ms.bot; tmp; tmp = tmp->above)
1114	{	1164	{
1115	/* No point updating the players look faces if he is the object	1165	/* No point updating the players look faces if he is the object
…		…
1159	if (!top)	1209	if (!top)
1160	for (top = op; top && top->above; top = top->above)	1210	for (top = op; top && top->above; top = top->above)
1161	;	1211	;
1162		1212
1163	for (; top; top = top->below)	1213	for (; top; top = top->below)
1164	{
1165	if (top == op)
1166	continue;
1167
1168	if (object::can_merge (op, top))	1214	if (object::can_merge (op, top))
1169	{	1215	{
1170	top->nrof += op->nrof;	1216	top->nrof += op->nrof;
1171		1217
1172	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/	1218	if (object *pl = top->visible_to ())
1173	op->weight = 0; /* Don't want any adjustements now */	1219	esrv_update_item (UPD_NROF, pl, top);
		1220
		1221	op->weight = 0; // cancel the addition above
		1222	op->carrying = 0; // must be 0 already
		1223
1174	op->destroy ();	1224	op->destroy (1);
		1225
1175	return top;	1226	return top;
1176	}	1227	}
1177	}
1178		1228
1179	return 0;	1229	return 0;
1180	}	1230	}
1181		1231
1182	void	1232	void
…		…
1241	object *	1291	object *
1242	insert_ob_in_map (object op, maptile m, object *originator, int flag)	1292	insert_ob_in_map (object op, maptile m, object *originator, int flag)
1243	{	1293	{
1244	assert (!op->flag [FLAG_FREED]);	1294	assert (!op->flag [FLAG_FREED]);
1245		1295
1246	object top, floor = NULL;
1247
1248	op->remove ();	1296	op->remove ();
1249		1297
1250	/* Ideally, the caller figures this out. However, it complicates a lot	1298	/* Ideally, the caller figures this out. However, it complicates a lot
1251	* of areas of callers (eg, anything that uses find_free_spot would now	1299	* of areas of callers (eg, anything that uses find_free_spot would now
1252	* need extra work	1300	* need extra work
1253	*/	1301	*/
1254	if (!xy_normalise (m, op->x, op->y))	1302	if (!xy_normalise (m, op->x, op->y))
1255	{	1303	{
1256	op->destroy ();	1304	op->destroy (1);
1257	return 0;	1305	return 0;
1258	}	1306	}
1259		1307
1260	if (object *more = op->more)	1308	if (object *more = op->more)
1261	if (!insert_ob_in_map (more, m, originator, flag))	1309	if (!insert_ob_in_map (more, m, originator, flag))
…		…
1270	*/	1318	*/
1271	if (op->nrof && !(flag & INS_NO_MERGE))	1319	if (op->nrof && !(flag & INS_NO_MERGE))
1272	for (object *tmp = ms.bot; tmp; tmp = tmp->above)	1320	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1273	if (object::can_merge (op, tmp))	1321	if (object::can_merge (op, tmp))
1274	{	1322	{
		1323	// TODO: we atcually want to update tmp, not op,
		1324	// but some caller surely breaks when we return tmp
		1325	// from here :/
1275	op->nrof += tmp->nrof;	1326	op->nrof += tmp->nrof;
1276	tmp->destroy ();	1327	tmp->destroy (1);
1277	}	1328	}
1278		1329
1279	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1330	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1280	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1331	CLEAR_FLAG (op, FLAG_INV_LOCKED);
1281		1332
…		…
1301	/* since below originator, no need to update top */	1352	/* since below originator, no need to update top */
1302	originator->below = op;	1353	originator->below = op;
1303	}	1354	}
1304	else	1355	else
1305	{	1356	{
		1357	object top, floor = NULL;
		1358
1306	top = ms.bot;	1359	top = ms.bot;
1307		1360
1308	/* If there are other objects, then */	1361	/* If there are other objects, then */
1309	if (top)	1362	if (top)
1310	{	1363	{
…		…
1409	}	1462	}
1410		1463
1411	op->map->dirty = true;	1464	op->map->dirty = true;
1412		1465
1413	if (object *pl = ms.player ())	1466	if (object *pl = ms.player ())
		1467	//TODO: the floorbox prev/next might need updating
		1468	//esrv_send_item (pl, op);
		1469	//TODO: update floorbox to preserve ordering
		1470	if (pl->contr->ns)
1414	pl->contr->ns->floorbox_update ();	1471	pl->contr->ns->floorbox_update ();
1415		1472
1416	/* If this object glows, it may affect lighting conditions that are	1473	/* If this object glows, it may affect lighting conditions that are
1417	* visible to others on this map. But update_all_los is really	1474	* visible to others on this map. But update_all_los is really
1418	* an inefficient way to do this, as it means los for all players	1475	* an inefficient way to do this, as it means los for all players
1419	* on the map will get recalculated. The players could very well	1476	* on the map will get recalculated. The players could very well
…		…
1461	* op is the object to insert it under: supplies x and the map.	1518	* op is the object to insert it under: supplies x and the map.
1462	*/	1519	*/
1463	void	1520	void
1464	replace_insert_ob_in_map (const char arch_string, object op)	1521	replace_insert_ob_in_map (const char arch_string, object op)
1465	{	1522	{
1466	object tmp, tmp1;
1467
1468	/* first search for itself and remove any old instances */	1523	/* first search for itself and remove any old instances */
1469		1524
1470	for (tmp = op->ms ().bot; tmp; tmp = tmp->above)	1525	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1471	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */	1526	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */
1472	tmp->destroy ();	1527	tmp->destroy (1);
1473		1528
1474	tmp1 = arch_to_object (archetype::find (arch_string));	1529	object *tmp = arch_to_object (archetype::find (arch_string));
1475		1530
1476	tmp1->x = op->x;	1531	tmp->x = op->x;
1477	tmp1->y = op->y;	1532	tmp->y = op->y;
		1533
1478	insert_ob_in_map (tmp1, op->map, op, 0);	1534	insert_ob_in_map (tmp, op->map, op, 0);
1479	}	1535	}
1480		1536
1481	object *	1537	object *
1482	object::insert_at (object where, object originator, int flags)	1538	object::insert_at (object where, object originator, int flags)
1483	{	1539	{
…		…
1486	else	1542	else
1487	return where->map->insert (this, where->x, where->y, originator, flags);	1543	return where->map->insert (this, where->x, where->y, originator, flags);
1488	}	1544	}
1489		1545
1490	/*	1546	/*
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 *
1498	get_split_ob (object *orig_ob, uint32 nr)
1499	{
1500	object *newob;
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	}
1508
1509	newob = object_create_clone (orig_ob);
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_ACTIVE)
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	}
1523	}
1524
1525	newob->nrof = nr;
1526
1527	return newob;
1528	}
1529
1530	/*
1531	* decrease_ob_nr(object, number) decreases a specified number from	1547	* decrease(object, number) decreases a specified number from
1532	* the amount of an object. If the amount reaches 0, the object	1548	* the amount of an object. If the amount reaches 0, the object
1533	* is subsequently removed and freed.	1549	* is subsequently removed and freed.
1534	*	1550	*
1535	* Return value: 'op' if something is left, NULL if the amount reached 0	1551	* Return value: 'op' if something is left, NULL if the amount reached 0
1536	*/	1552	*/
		1553	bool
		1554	object::decrease (sint32 nr)
		1555	{
		1556	if (!nr)
		1557	return true;
		1558
		1559	nr = min (nr, nrof);
		1560
		1561	nrof -= nr;
		1562
		1563	if (nrof)
		1564	{
		1565	adjust_weight (env, -weight * nr); // carrying == 0
		1566
		1567	if (object *pl = visible_to ())
		1568	esrv_update_item (UPD_NROF, pl, this);
		1569
		1570	return true;
		1571	}
		1572	else
		1573	{
		1574	destroy (1);
		1575	return false;
		1576	}
		1577	}
		1578
		1579	/*
		1580	* split(ob,nr) splits up ob into two parts. The part which
		1581	* is returned contains nr objects, and the remaining parts contains
		1582	* the rest (or is removed and returned if that number is 0).
		1583	* On failure, NULL is returned.
		1584	*/
1537	object *	1585	object *
1538	decrease_ob_nr (object *op, uint32 i)	1586	object::split (sint32 nr)
1539	{	1587	{
1540	object *tmp;	1588	int have = number_of ();
1541		1589
1542	if (i == 0) /* objects with op->nrof require this check */	1590	if (have < nr)
1543	return op;	1591	return 0;
1544		1592	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	{	1593	{
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 ();	1594	remove ();
1580	op->nrof = 0;	1595	return this;
1581	if (tmp)
1582	esrv_del_item (tmp->contr, op->count);
1583	}
1584	}	1596	}
1585	else	1597	else
1586	{	1598	{
1587	object *above = op->above;	1599	decrease (nr);
1588		1600
1589	if (i < op->nrof)	1601	object *op = object_create_clone (this);
1590	op->nrof -= i;	1602	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;	1603	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	}	1604	}
1632	}	1605	}
1633		1606
1634	object *	1607	object *
1635	insert_ob_in_ob (object op, object where)	1608	insert_ob_in_ob (object op, object where)
…		…
1660	* be != op, if items are merged. -Tero	1633	* be != op, if items are merged. -Tero
1661	*/	1634	*/
1662	object *	1635	object *
1663	object::insert (object *op)	1636	object::insert (object *op)
1664	{	1637	{
1665	if (!QUERY_FLAG (op, FLAG_REMOVED))
1666	op->remove ();
1667
1668	if (op->more)	1638	if (op->more)
1669	{	1639	{
1670	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);	1640	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1671	return op;	1641	return op;
1672	}	1642	}
1673		1643
1674	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1644	op->remove ();
1675	CLEAR_FLAG (op, FLAG_REMOVED);	1645
		1646	op->flag [FLAG_OBJ_ORIGINAL] = 0;
1676		1647
1677	if (op->nrof)	1648	if (op->nrof)
1678	{
1679	for (object *tmp = inv; tmp; tmp = tmp->below)	1649	for (object *tmp = inv; tmp; tmp = tmp->below)
1680	if (object::can_merge (tmp, op))	1650	if (object::can_merge (tmp, op))
1681	{	1651	{
1682	/* return the original object and remove inserted object	1652	/* return the original object and remove inserted object
1683	(client needs the original object) */	1653	(client needs the original object) */
1684	tmp->nrof += op->nrof;	1654	tmp->nrof += op->nrof;
1685	/* Weight handling gets pretty funky. Since we are adding to	1655
1686	* tmp->nrof, we need to increase the weight.	1656	if (object *pl = tmp->visible_to ())
1687	*/	1657	esrv_update_item (UPD_NROF, pl, tmp);
		1658
1688	add_weight (this, op->weight * op->nrof);	1659	adjust_weight (this, op->total_weight ());
1689	SET_FLAG (op, FLAG_REMOVED);	1660
1690	op->destroy (); /* free the inserted object */	1661	op->destroy (1);
1691	op = tmp;	1662	op = tmp;
1692	op->remove (); /* and fix old object's links */	1663	goto inserted;
1693	CLEAR_FLAG (op, FLAG_REMOVED);
1694	break;
1695	}	1664	}
1696		1665
1697	/* I assume combined objects have no inventory
1698	* We add the weight - this object could have just been removed
1699	* (if it was possible to merge). calling remove_ob will subtract
1700	* the weight, so we need to add it in again, since we actually do
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
1708	if (object *otmp = this->in_player ())
1709	if (otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1710	otmp->update_stats ();
1711
1712	op->owner = 0; // its his/hers now. period.	1666	op->owner = 0; // it's his/hers now. period.
1713	op->map = 0;	1667	op->map = 0;
		1668	op->x = 0;
		1669	op->y = 0;
		1670
		1671	op->above = 0;
		1672	op->below = inv;
1714	op->env = this;	1673	op->env = this;
1715	op->above = 0;
1716	op->below = 0;
1717	op->x = op->y = 0;
1718		1674
		1675	if (inv)
		1676	inv->above = op;
		1677
		1678	inv = op;
		1679
		1680	op->flag [FLAG_REMOVED] = 0;
		1681
		1682	if (object *pl = op->visible_to ())
		1683	esrv_send_item (pl, op);
		1684
		1685	adjust_weight (this, op->total_weight ());
		1686
		1687	inserted:
1719	/* reset the light list and los of the players on the map */	1688	/* reset the light list and los of the players on the map */
1720	if (op->glow_radius && map)	1689	if (op->glow_radius && map && map->darkness)
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);	1690	update_all_los (map, x, y);
1727	}
1728		1691
1729	/* Client has no idea of ordering so lets not bother ordering it here.	1692	// if this is a player's inventory, update stats
1730	* It sure simplifies this function...	1693	if (type == PLAYER && !flag [FLAG_NO_FIX_PLAYER])
1731	*/	1694	update_stats ();
1732	if (!inv)
1733	inv = op;
1734	else
1735	{
1736	op->below = inv;
1737	op->below->above = op;
1738	inv = op;
1739	}
1740		1695
1741	INVOKE_OBJECT (INSERT, this);	1696	INVOKE_OBJECT (INSERT, this);
1742		1697
1743	return op;	1698	return op;
1744	}	1699	}
…		…
2368	* create clone from object to another	2323	* create clone from object to another
2369	*/	2324	*/
2370	object *	2325	object *
2371	object_create_clone (object *asrc)	2326	object_create_clone (object *asrc)
2372	{	2327	{
2373	object dst = 0, tmp, src, prev, *item;	2328	object *dst = 0;
2374		2329
2375	if (!asrc)	2330	if (!asrc)
2376	return 0;	2331	return 0;
2377		2332
2378	src = asrc->head_ ();	2333	object *src = asrc->head_ ();
2379		2334
2380	prev = 0;	2335	object *prev = 0;
2381	for (object *part = src; part; part = part->more)	2336	for (object *part = src; part; part = part->more)
2382	{	2337	{
2383	tmp = part->clone ();	2338	object *tmp = part->clone ();
		2339
2384	tmp->x -= src->x;	2340	tmp->x -= src->x;
2385	tmp->y -= src->y;	2341	tmp->y -= src->y;
2386		2342
2387	if (!part->head)	2343	if (!part->head)
2388	{	2344	{
…		…
2398	prev->more = tmp;	2354	prev->more = tmp;
2399		2355
2400	prev = tmp;	2356	prev = tmp;
2401	}	2357	}
2402		2358
2403	for (item = src->inv; item; item = item->below)	2359	for (object *item = src->inv; item; item = item->below)
2404	insert_ob_in_ob (object_create_clone (item), dst);	2360	insert_ob_in_ob (object_create_clone (item), dst);
2405		2361
2406	return dst;	2362	return dst;
2407	}	2363	}
2408		2364
…		…
2622	&name,	2578	&name,
2623	title ? "\",title:\"" : "",	2579	title ? "\",title:\"" : "",
2624	title ? (const char *)title : "",	2580	title ? (const char *)title : "",
2625	flag_desc (flagdesc, 512), type);	2581	flag_desc (flagdesc, 512), type);
2626		2582
2627	if (!this->flag[FLAG_REMOVED] && env)	2583	if (!flag[FLAG_REMOVED] && env)
2628	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2584	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2629		2585
2630	if (map)	2586	if (map)
2631	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);	2587	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2632		2588
…		…
2662	object::open_container (object *new_container)	2618	object::open_container (object *new_container)
2663	{	2619	{
2664	if (container == new_container)	2620	if (container == new_container)
2665	return;	2621	return;
2666		2622
2667	if (object *old_container = container)	2623	object *old_container = container;
		2624
		2625	if (old_container)
2668	{	2626	{
2669	if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))	2627	if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
2670	return;	2628	return;
2671		2629
2672	#if 0	2630	#if 0
…		…
2674	if (object *closer = old_container->inv)	2632	if (object *closer = old_container->inv)
2675	if (closer->type == CLOSE_CON)	2633	if (closer->type == CLOSE_CON)
2676	closer->destroy ();	2634	closer->destroy ();
2677	#endif	2635	#endif
2678		2636
		2637	// make sure the container is available
		2638	esrv_send_item (this, old_container);
		2639
2679	old_container->flag [FLAG_APPLIED] = 0;	2640	old_container->flag [FLAG_APPLIED] = false;
2680	container = 0;	2641	container = 0;
2681		2642
		2643	// client needs item update to make it work, client bug requires this to be separate
2682	esrv_update_item (UPD_FLAGS, this, old_container);	2644	esrv_update_item (UPD_FLAGS, this, old_container);
		2645
2683	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));	2646	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
2684	play_sound (sound_find ("chest_close"));	2647	play_sound (sound_find ("chest_close"));
2685	}	2648	}
2686		2649
2687	if (new_container)	2650	if (new_container)
…		…
2700	}	2663	}
2701	#endif	2664	#endif
2702		2665
2703	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));	2666	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));
2704		2667
		2668	// make sure the container is available, client bug requires this to be separate
		2669	esrv_send_item (this, new_container);
		2670
2705	new_container->flag [FLAG_APPLIED] = 1;	2671	new_container->flag [FLAG_APPLIED] = true;
2706	container = new_container;	2672	container = new_container;
2707		2673
		2674	// client needs flag change
2708	esrv_update_item (UPD_FLAGS, this, new_container);	2675	esrv_update_item (UPD_FLAGS, this, new_container);
2709	esrv_send_inventory (this, new_container);	2676	esrv_send_inventory (this, new_container);
2710	play_sound (sound_find ("chest_open"));	2677	play_sound (sound_find ("chest_open"));
2711	}	2678	}
		2679	// else if (!old_container->env && contr && contr->ns)
		2680	// contr->ns->floorbox_reset ();
2712	}	2681	}
2713		2682
2714	object *	2683	object *
2715	object::force_find (const shstr name)	2684	object::force_find (const shstr name)
2716	{	2685	{
…		…
2742		2711
2743	insert (force);	2712	insert (force);
2744	}	2713	}
2745		2714
2746	void	2715	void
2747	object::play_sound (faceidx sound) const	2716	object::play_sound (faceidx sound)
2748	{	2717	{
2749	if (!sound)	2718	if (!sound)
2750	return;	2719	return;
2751		2720
2752	if (flag [FLAG_REMOVED])	2721	if (flag [FLAG_REMOVED])

Diff Legend

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

Comparing deliantra/server/common/object.C (file contents): Revision 1.206 by root, Tue Apr 15 14:21:04 2008 UTC vs. Revision 1.227 by root, Sat May 3 09:04:17 2008 UTC

Diff Legend

Comparing deliantra/server/common/object.C (file contents):
Revision 1.206 by root, Tue Apr 15 14:21:04 2008 UTC vs.
Revision 1.227 by root, Sat May 3 09:04:17 2008 UTC