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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.308 by root, Sun Nov 29 17:26:28 2009 UTC vs.
Revision 1.343 by root, Sat Apr 23 04:56:46 2011 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,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team	4	* Copyright (©) 2005,2006,2007,2008,2009,2010,2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5	* Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team	5	* Copyright (©) 2001 Mark Wedel & Crossfire Development Team
6	* Copyright (©) 1992,2007 Frank Tore Johansen	6	* Copyright (©) 1992 Frank Tore Johansen
7	*	7	*
8	* Deliantra is free software: you can redistribute it and/or modify it under	8	* Deliantra is free software: you can redistribute it and/or modify it under
9	* the terms of the Affero GNU General Public License as published by the	9	* the terms of the Affero GNU General Public License as published by the
10	* Free Software Foundation, either version 3 of the License, or (at your	10	* Free Software Foundation, either version 3 of the License, or (at your
11	* option) any later version.	11	* option) any later version.
26	#include <stdio.h>	26	#include <stdio.h>
27	#include <sys/types.h>	27	#include <sys/types.h>
28	#include <sys/uio.h>	28	#include <sys/uio.h>
29	#include <object.h>	29	#include <object.h>
30	#include <sproto.h>	30	#include <sproto.h>
31	#include <loader.h>
32		31
33	#include <bitset>	32	#include <bitset>
34		33
35	UUID UUID::cur;	34	UUID UUID::cur;
36	static uint64_t seq_next_save;	35	static uint64_t seq_next_save;
37	static const uint64 UUID_GAP = 1<<19;	36	static const uint64 UUID_GAP = 1<<19;
38	uint32_t mapspace::smellcount = 10000;	37	uint32_t mapspace::smellcount = 10000;
39		38
40	objectvec objects;	39	objectvec objects;
41	activevec actives;	40	activevec actives;
		41
		42	freelist_item *object::freelist;
		43	uint32_t object::object_count;
		44	uint32_t object::free_count;
		45	uint32_t object::create_count;
		46	uint32_t object::destroy_count;
42		47
43	//+GPL	48	//+GPL
44		49
45	short freearr_x[SIZEOFFREE] = {	50	short freearr_x[SIZEOFFREE] = {
46	0,	51	0,
…		…
66	9, 10, 13, 14, 17, 18, 21, 22,	71	9, 10, 13, 14, 17, 18, 21, 22,
67	25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45, 48,	72	25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45, 48,
68	49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49	73	49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49
69	};	74	};
70		75
		76	const char *wall_suffix[16] = {
		77	"0",
		78	"1_3",
		79	"1_4",
		80	"2_1_2",
		81	"1_2",
		82	"2_2_4",
		83	"2_2_1",
		84	"3_1",
		85	"1_1",
		86	"2_2_3",
		87	"2_2_2",
		88	"3_3",
		89	"2_1_1",
		90	"3_4",
		91	"3_2",
		92	"4"
		93	};
		94
71	static void	95	static void
72	write_uuid (uval64 skip, bool sync)	96	write_uuid (uval64 skip, bool sync)
73	{	97	{
74	CALL_BEGIN (2);	98	CALL_BEGIN (2);
75	CALL_ARG_SV (newSVval64 (skip));	99	CALL_ARG_SV (newSVval64 (skip));
…		…
248	* Improvements made with merge: Better checking on potion, and also	272	* Improvements made with merge: Better checking on potion, and also
249	* check weight	273	* check weight
250	*/	274	*/
251	bool object::can_merge_slow (object ob1, object ob2)	275	bool object::can_merge_slow (object ob1, object ob2)
252	{	276	{
253	/* A couple quicksanity checks */	277	/* A couple quick sanity checks */
254	if (ob1 == ob2	278	if (ob1 == ob2
255	\|\| ob1->type != ob2->type	279	\|\| ob1->type != ob2->type
		280	\|\| ob1->value != ob2->value
		281	\|\| ob1->name != ob2->name
		282	\|\| ob1->custom_name != ob2->custom_name
256	\|\| fabs (ob1->speed - ob2->speed) >= MIN_ACTIVE_SPEED	283	\|\| fabs (ob1->speed - ob2->speed) >= MIN_ACTIVE_SPEED)
257	\|\| ob1->value != ob2->value
258	\|\| ob1->name != ob2->name)
259	return 0;	284	return 0;
260		285
261	/* Do not merge objects if nrof would overflow, assume nrof	286	/* Do not merge objects if nrof would overflow, assume nrof
262	* is always 0 .. 2*31-1 /	287	* is always 0 .. 2*31-1 /
263	if (ob1->nrof > 0x7fffffff - ob2->nrof)	288	if (ob1->nrof > 0x7fffffff - ob2->nrof)
…		…
267	* This is to the comparison of the flags below will be OK. We	292	* This is to the comparison of the flags below will be OK. We
268	* just can't ignore the been applied or identified flags, as they	293	* just can't ignore the been applied or identified flags, as they
269	* are not equal - just if it has been identified, the been_applied	294	* are not equal - just if it has been identified, the been_applied
270	* flags lose any meaning.	295	* flags lose any meaning.
271	*/	296	*/
272	if (QUERY_FLAG (ob1, FLAG_IDENTIFIED))	297	if (ob1->flag [FLAG_IDENTIFIED])
273	SET_FLAG (ob1, FLAG_BEEN_APPLIED);	298	ob1->set_flag (FLAG_BEEN_APPLIED);
274		299
275	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))	300	if (ob2->flag [FLAG_IDENTIFIED])
276	SET_FLAG (ob2, FLAG_BEEN_APPLIED);	301	ob2->set_flag (FLAG_BEEN_APPLIED);
277		302
278	if (ob1->arch->archname != ob2->arch->archname	303	if (ob1->arch->archname != ob2->arch->archname
279	\|\| ob1->name != ob2->name	304	\|\| ob1->name != ob2->name
280	\|\| ob1->title != ob2->title	305	\|\| ob1->title != ob2->title
281	\|\| ob1->msg != ob2->msg	306	\|\| ob1->msg != ob2->msg
…		…
284	\|\| ob1->magic != ob2->magic	309	\|\| ob1->magic != ob2->magic
285	\|\| ob1->slaying != ob2->slaying	310	\|\| ob1->slaying != ob2->slaying
286	\|\| ob1->skill != ob2->skill	311	\|\| ob1->skill != ob2->skill
287	\|\| ob1->value != ob2->value	312	\|\| ob1->value != ob2->value
288	\|\| ob1->animation_id != ob2->animation_id	313	\|\| ob1->animation_id != ob2->animation_id
289	\|\| (ob1->face != ob2->face && !ob1->animation_id) // face and animation are dependent on each other	314	\|\| (ob1->face != ob2->face && !ob1->animation_id) // face and animation are dependend on each other
290	\|\| ob1->client_type != ob2->client_type	315	\|\| ob1->client_type != ob2->client_type
291	\|\| ob1->material != ob2->material	316	\|\| ob1->material != ob2->material
292	\|\| ob1->lore != ob2->lore	317	\|\| ob1->lore != ob2->lore
293	\|\| ob1->subtype != ob2->subtype	318	\|\| ob1->subtype != ob2->subtype
294	\|\| ob1->move_type != ob2->move_type	319	\|\| ob1->move_type != ob2->move_type
…		…
330		355
331	/* Don't merge objects that are applied. With the new 'body' code,	356	/* Don't merge objects that are applied. With the new 'body' code,
332	* it is possible for most any character to have more than one of	357	* it is possible for most any character to have more than one of
333	* some items equipped, and we don't want those to merge.	358	* some items equipped, and we don't want those to merge.
334	*/	359	*/
335	if (QUERY_FLAG (ob1, FLAG_APPLIED) \|\| QUERY_FLAG (ob2, FLAG_APPLIED))	360	if (ob1->flag [FLAG_APPLIED] \|\| ob2->flag [FLAG_APPLIED])
336	return 0;	361	return 0;
337		362
338	/* Note sure why the following is the case - either the object has to	363	/* Note sure why the following is the case - either the object has to
339	* be animated or have a very low speed. Is this an attempted monster	364	* be animated or have a very low speed. Is this an attempted monster
340	* check?	365	* check?
341	*/	366	*/
342	if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && ob1->has_active_speed ())	367	if (!ob1->flag [FLAG_ANIMATE] && ob1->has_active_speed ())
343	return 0;	368	return 0;
344		369
345	switch (ob1->type)	370	switch (ob1->type)
346	{	371	{
347	case SCROLL:	372	case SCROLL:
…		…
421		446
422	return 0;	447	return 0;
423	}	448	}
424		449
425	// adjust weight per container type ("of holding")	450	// adjust weight per container type ("of holding")
426	static sint32	451	static uint32
427	weight_adjust_for (object *op, sint32 weight)	452	weight_adjust_for (object *op, uint32 weight)
428	{	453	{
429	return op->type == CONTAINER	454	return op->type == CONTAINER
430	? lerp (weight, 0, 100, 0, 100 - op->stats.Str)	455	? weight - weight * op->stats.Str / 100
431	: weight;	456	: weight;
432	}	457	}
433		458
434	/*	459	/*
435	* adjust_weight(object, weight) adds the specified weight to an object,	460	* subtracts, then adds, the specified weight to an object,
436	* and also updates how much the environment(s) is/are carrying.	461	* and also updates how much the environment(s) is/are carrying.
437	*/	462	*/
438	static void	463	static void
439	adjust_weight (object *op, sint32 weight)	464	adjust_weight (object *op, sint32 sub, sint32 add)
440	{	465	{
441	while (op)	466	while (op)
442	{	467	{
443	// adjust by actual difference to account for rounding errors	468	sint32 ocarrying = op->carrying;
444	// i.e. (w2 - w1) / f != w2 / f - w1 / f and the latter is correct
445	weight = weight_adjust_for (op, op->carrying)
446	- weight_adjust_for (op, op->carrying - weight);
447		469
448	if (!weight)	470	op->carrying -= weight_adjust_for (op, sub);
449	return;	471	op->carrying += weight_adjust_for (op, add);
450
451	op->carrying += weight;
452		472
453	if (object *pl = op->visible_to ())	473	if (object *pl = op->visible_to ())
454	if (pl != op) // player is handled lazily	474	if (pl != op) // player is handled lazily
455	esrv_update_item (UPD_WEIGHT, pl, op);	475	esrv_update_item (UPD_WEIGHT, pl, op);
456		476
		477	sub = ocarrying;
		478	add = op->carrying;
		479
457	op = op->env;	480	op = op->env;
458	}	481	}
459	}	482	}
460		483
461	/*	484	/*
…		…
468	{	491	{
469	sint32 sum = 0;	492	sint32 sum = 0;
470		493
471	for (object *op = inv; op; op = op->below)	494	for (object *op = inv; op; op = op->below)
472	{	495	{
473	if (op->inv)
474	op->update_weight ();	496	op->update_weight ();
475		497
476	sum += op->total_weight ();	498	sum += weight_adjust_for (this, op->total_weight ());
477	}	499	}
478
479	sum = weight_adjust_for (this, sum);
480		500
481	if (sum != carrying)	501	if (sum != carrying)
482	{	502	{
		503	if (carrying != sum && carrying)//D
		504	LOG (llevDebug, "updating carrying got %ld, expected %ld (%s)\n",
		505	(long long)sum, (long long)carrying, debug_desc ());
		506
483	carrying = sum;	507	carrying = sum;
484		508
485	if (object *pl = visible_to ())	509	if (object *pl = visible_to ())
486	if (pl != this) // player is handled lazily	510	if (pl != this) // player is handled lazily
487	esrv_update_item (UPD_WEIGHT, pl, this);	511	esrv_update_item (UPD_WEIGHT, pl, this);
…		…
515	object *	539	object *
516	find_object (tag_t i)	540	find_object (tag_t i)
517	{	541	{
518	for_all_objects (op)	542	for_all_objects (op)
519	if (op->count == i)	543	if (op->count == i)
		544	return op;
		545
		546	return 0;
		547	}
		548
		549	/*
		550	* Returns the object which has the uuid equal to the argument.
		551	* MOAR VERRRY slow.
		552	*/
		553
		554	object *
		555	find_object_uuid (UUID i)
		556	{
		557	for_all_objects (op)
		558	if (op->uuid == i)
520	return op;	559	return op;
521		560
522	return 0;	561	return 0;
523	}	562	}
524		563
…		…
558	LOG (llevError \| logBacktrace, "tried to set owner of %s to %s\n", debug_desc (), owner->debug_desc ());	597	LOG (llevError \| logBacktrace, "tried to set owner of %s to %s\n", debug_desc (), owner->debug_desc ());
559	return;	598	return;
560	}	599	}
561		600
562	this->owner = owner;	601	this->owner = owner;
563	}
564
565	int
566	object::slottype () const
567	{
568	if (type == SKILL)
569	{
570	if (IS_COMBAT_SKILL (subtype)) return slot_combat;
571	if (IS_RANGED_SKILL (subtype)) return slot_ranged;
572	}
573	else
574	{
575	if (slot [body_combat].info) return slot_combat;
576	if (slot [body_range ].info) return slot_ranged;
577	}
578
579	return slot_none;
580	}
581
582	bool
583	object::change_weapon (object *ob)
584	{
585	if (current_weapon == ob)
586	return true;
587
588	if (chosen_skill)
589	chosen_skill->flag [FLAG_APPLIED] = false;
590
591	current_weapon = ob;
592	chosen_skill = !ob \|\| ob->type == SKILL ? ob : find_skill_by_name (this, ob->skill);
593
594	if (chosen_skill)
595	chosen_skill->flag [FLAG_APPLIED] = true;
596
597	update_stats ();
598
599	if (ob)
600	{
601	// now check wether any body locations became invalid, in which case
602	// we cannot apply the weapon at the moment.
603	for (int i = 0; i < NUM_BODY_LOCATIONS; ++i)
604	if (slot[i].used < 0)
605	{
606	current_weapon = chosen_skill = 0;
607	update_stats ();
608
609	new_draw_info_format (NDI_UNIQUE, 0, this,
610	"You try to balance all your items at once, "
611	"but the %s is just too much for your body. "
612	"[You need to unapply some items first - use the 'body' command to see "
613	"how many items you cna wera on a specific body part.]", &ob->name);
614	return false;
615	}
616
617	//new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);
618	}
619	else
620	;//new_draw_info_format (NDI_UNIQUE, 0, this, "You unwield your weapons.");
621
622	if (ob && !ob->flag [FLAG_APPLIED] && ob->type != SPELL)
623	{
624	LOG (llevError \| logBacktrace, "%s changed to unapplied weapon %s",
625	&name, ob->debug_desc ());
626	return false;
627	}
628
629	return true;
630	}	602	}
631		603
632	/* Zero the key_values on op, decrementing the shared-string	604	/* Zero the key_values on op, decrementing the shared-string
633	* refcounts and freeing the links.	605	* refcounts and freeing the links.
634	*/	606	*/
…		…
696	object::instantiate ()	668	object::instantiate ()
697	{	669	{
698	if (!uuid.seq) // HACK	670	if (!uuid.seq) // HACK
699	uuid = UUID::gen ();	671	uuid = UUID::gen ();
700		672
701	// TODO: unclean state changes, should nt be done in copy_to AND instantiate	673	// TODO: unclean state changes, should not be done in copy_to AND instantiate
702	if (flag [FLAG_RANDOM_SPEED] && speed)	674	if (flag [FLAG_RANDOM_SPEED] && speed)
703	speed_left = - speed - rndm (); // TODO animation	675	speed_left = - speed - rndm (); // TODO animation
704	else	676	else
705	speed_left = -1.;	677	speed_left = -1.;
706		678
…		…
736	* be called to update the face variable, _and_ how it looks on the map.	708	* be called to update the face variable, _and_ how it looks on the map.
737	*/	709	*/
738	void	710	void
739	update_turn_face (object *op)	711	update_turn_face (object *op)
740	{	712	{
741	if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) \|\| !op->arch)	713	if (!op->flag [FLAG_IS_TURNABLE] \|\| !op->arch)
742	return;	714	return;
743		715
744	SET_ANIMATION (op, op->direction);	716	SET_ANIMATION (op, op->direction);
745	update_object (op, UP_OBJ_FACE);	717	update_object (op, UP_OBJ_FACE);
746	}	718	}
…		…
812	/* nop */;	784	/* nop */;
813	else if (action == UP_OBJ_INSERT)	785	else if (action == UP_OBJ_INSERT)
814	{	786	{
815	#if 0	787	#if 0
816	// this is likely overkill, TODO: revisit (schmorp)	788	// this is likely overkill, TODO: revisit (schmorp)
817	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))	789	if ((op->flag [FLAG_BLOCKSVIEW] && !(m.flags_ & P_BLOCKSVIEW))
818	\|\| (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))	790	\|\| (op->flag [FLAG_NO_MAGIC] && !(m.flags_ & P_NO_MAGIC))
819	\|\| (op->is_player () && !(m.flags_ & P_PLAYER))	791	\|\| (op->is_player () && !(m.flags_ & P_PLAYER))
820	\|\| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))	792	\|\| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
821	\|\| (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))	793	\|\| (op->flag [FLAG_ALIVE] && !(m.flags_ & P_IS_ALIVE))
822	\|\| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))	794	\|\| (op->flag [FLAG_DAMNED] && !(m.flags_ & P_NO_CLERIC))
823	\|\| (m.move_on \| op->move_on ) != m.move_on	795	\|\| (m.move_on \| op->move_on ) != m.move_on
824	\|\| (m.move_off \| op->move_off ) != m.move_off	796	\|\| (m.move_off \| op->move_off ) != m.move_off
825	\|\| (m.move_slow \| op->move_slow) != m.move_slow	797	\|\| (m.move_slow \| op->move_slow) != m.move_slow
826	/* This isn't perfect, but I don't expect a lot of objects to	798	/* This isn't perfect, but I don't expect a lot of objects to
827	* have move_allow right now.	799	* have move_allow right now.
…		…
848	update_object (op->more, action);	820	update_object (op->more, action);
849	}	821	}
850		822
851	object::object ()	823	object::object ()
852	{	824	{
853	SET_FLAG (this, FLAG_REMOVED);	825	this->set_flag (FLAG_REMOVED);
854		826
855	//expmul = 1.0; declared const for the time being	827	//expmul = 1.0; declared const for the time being
856	face = blank_face;	828	face = blank_face;
857	material = MATERIAL_NULL;	829	material = MATERIAL_NULL;
858	}	830	}
…		…
862	unlink ();	834	unlink ();
863		835
864	free_key_values (this);	836	free_key_values (this);
865	}	837	}
866		838
867	static int object_count;
868
869	void object::link ()	839	void object::link ()
870	{	840	{
871	assert (!index);//D	841	assert (!index);//D
872	uuid = UUID::gen ();	842	uuid = UUID::gen ();
873	count = ++object_count;
874		843
875	refcnt_inc ();	844	refcnt_inc ();
876	objects.insert (this);	845	objects.insert (this);
		846
		847	++create_count;
		848
877	}	849	}
878		850
879	void object::unlink ()	851	void object::unlink ()
880	{	852	{
881	if (!index)	853	if (!index)
882	return;	854	return;
		855
		856	++destroy_count;
883		857
884	objects.erase (this);	858	objects.erase (this);
885	refcnt_dec ();	859	refcnt_dec ();
886	}	860	}
887		861
…		…
992	map->insert (op, x, y);	966	map->insert (op, x, y);
993	}	967	}
994	}	968	}
995	}	969	}
996		970
		971	/*
		972	* Remove and free all objects in the inventory of the given object.
		973	* Unlike destroy_inv, this assumes the *this is destroyed as well
		974	* well, so we can (and have to!) take shortcuts.
		975	*/
		976	void
		977	object::destroy_inv_fast ()
		978	{
		979	while (object *op = inv)
		980	{
		981	// remove from object the fast way
		982	op->flag [FLAG_REMOVED] = true;
		983	op->env = 0;
		984	if ((inv = inv->below))
		985	inv->above = 0;
		986
		987	// then destroy
		988	op->destroy ();
		989	}
		990	}
		991
		992	void
		993	object::freelist_free (int count)
		994	{
		995	while (count-- && freelist)
		996	{
		997	freelist_item *next = freelist->next;
		998	// count is being "destroyed"
		999
		1000	sfree ((char *)freelist, sizeof (object));
		1001
		1002	freelist = next;
		1003	--free_count;
		1004	}
		1005	}
		1006
		1007	object *
997	object *object::create ()	1008	object::create ()
998	{	1009	{
999	object *op = new object;	1010	object *op;
		1011
		1012	if (freelist)
		1013	{
		1014	freelist_item li = *freelist;
		1015	memset (freelist, 0, sizeof (object));
		1016
		1017	op = new (freelist) object;
		1018	op->count = li.count;
		1019
		1020	freelist = li.next;
		1021	--free_count;
		1022	}
		1023	else
		1024	{
		1025	void *ni = salloc0<char> (sizeof (object));
		1026
		1027	op = new(ni) object;
		1028
		1029	op->count = ++object_count;
		1030	}
		1031
1000	op->link ();	1032	op->link ();
		1033
1001	return op;	1034	return op;
1002	}	1035	}
1003		1036
		1037	void
		1038	object::do_delete ()
		1039	{
		1040	uint32_t count = this->count;
		1041
		1042	this->~object ();
		1043
		1044	freelist_item li = (freelist_item )this;
		1045	li->next = freelist;
		1046	li->count = count;
		1047
		1048	freelist = li;
		1049	++free_count;
		1050	}
		1051
1004	static struct freed_map : maptile	1052	static struct freed_map : maptile
1005	{	1053	{
1006	freed_map ()	1054	freed_map ()
		1055	: maptile (3, 3)
1007	{	1056	{
1008	path = "<freed objects map>";	1057	path = "<freed objects map>";
1009	name = "/internal/freed_objects_map";	1058	name = "/internal/freed_objects_map";
1010	width = 3;
1011	height = 3;
1012	no_drop = 1;	1059	no_drop = 1;
1013	no_reset = 1;	1060	no_reset = 1;
1014		1061
1015	alloc ();
1016	in_memory = MAP_ACTIVE;	1062	in_memory = MAP_ACTIVE;
1017	}	1063	}
1018		1064
1019	~freed_map ()	1065	~freed_map ()
1020	{	1066	{
…		…
1071	LOG (llevError \| logBacktrace, "tried to destroy the tail of an object");	1117	LOG (llevError \| logBacktrace, "tried to destroy the tail of an object");
1072	head->destroy ();	1118	head->destroy ();
1073	return;	1119	return;
1074	}	1120	}
1075		1121
1076	destroy_inv (false);	1122	destroy_inv_fast ();
1077		1123
1078	if (is_head ())	1124	if (is_head ())
1079	if (sound_destroy)	1125	if (sound_destroy)
1080	play_sound (sound_destroy);	1126	play_sound (sound_destroy);
1081	else if (flag [FLAG_MONSTER])	1127	else if (flag [FLAG_MONSTER])
…		…
1113	flag [FLAG_REMOVED] = false; // hack around the issue of visible_to checking flag_removed	1159	flag [FLAG_REMOVED] = false; // hack around the issue of visible_to checking flag_removed
1114	if (object *pl = visible_to ())	1160	if (object *pl = visible_to ())
1115	esrv_del_item (pl->contr, count);	1161	esrv_del_item (pl->contr, count);
1116	flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed	1162	flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed
1117		1163
1118	adjust_weight (env, -total_weight ());	1164	adjust_weight (env, total_weight (), 0);
1119		1165
1120	object *pl = in_player ();	1166	object *pl = in_player ();
1121		1167
1122	/* we set up values so that it could be inserted into	1168	/* we set up values so that it could be inserted into
1123	* the map, but we don't actually do that - it is up	1169	* the map, but we don't actually do that - it is up
…		…
1135	below = 0;	1181	below = 0;
1136	env = 0;	1182	env = 0;
1137		1183
1138	if (pl && pl->is_player ())	1184	if (pl && pl->is_player ())
1139	{	1185	{
		1186	if (expect_false (pl->contr->combat_ob == this))
		1187	{
		1188	pl->apply (pl->contr->combat_ob, AP_UNAPPLY \| AP_IGNORE_CURSE);
		1189	pl->contr->combat_ob = 0;
		1190	if (pl->contr->ranged_ob) pl->apply (pl->contr->ranged_ob);
		1191	}
		1192
		1193	if (expect_false (pl->contr->ranged_ob == this))
		1194	{
		1195	pl->apply (pl->contr->ranged_ob, AP_UNAPPLY \| AP_IGNORE_CURSE);
		1196	pl->contr->ranged_ob = 0;
		1197	if (pl->contr->combat_ob) pl->apply (pl->contr->combat_ob);
		1198	}
		1199
1140	pl->contr->queue_stats_update ();	1200	pl->contr->queue_stats_update ();
1141		1201
1142	if (glow_radius && pl->is_on_map ())	1202	if (expect_false (glow_radius) && pl->is_on_map ())
1143	update_all_los (pl->map, pl->x, pl->y);	1203	update_all_los (pl->map, pl->x, pl->y);
1144	}	1204	}
1145	}	1205	}
1146	else if (map)	1206	else if (map)
1147	{	1207	{
…		…
1167	else if (pl->container_ () == this)	1227	else if (pl->container_ () == this)
1168	{	1228	{
1169	// removing a container should close it	1229	// removing a container should close it
1170	close_container ();	1230	close_container ();
1171	}	1231	}
1172		1232	else
1173	esrv_del_item (pl->contr, count);	1233	esrv_del_item (pl->contr, count);
1174	}	1234	}
1175		1235
1176	/* link the object above us */	1236	/* link the object above us */
1177	// re-link, make sure compiler can easily use cmove	1237	// re-link, make sure compiler can easily use cmove
1178	*(above ? &above->below : &ms.top) = below;	1238	*(above ? &above->below : &ms.top) = below;
…		…
1269		1329
1270	object *prev = this;	1330	object *prev = this;
1271		1331
1272	for (archetype at = (archetype )arch->more; at; at = (archetype *)at->more)	1332	for (archetype at = (archetype )arch->more; at; at = (archetype *)at->more)
1273	{	1333	{
1274	object *op = arch_to_object (at);	1334	object *op = at->instance ();
1275		1335
1276	op->name = name;	1336	op->name = name;
1277	op->name_pl = name_pl;	1337	op->name_pl = name_pl;
1278	op->title = title;	1338	op->title = title;
1279		1339
…		…
1317	* Passing 0 for flag gives proper default values, so flag really only needs	1377	* Passing 0 for flag gives proper default values, so flag really only needs
1318	* to be set if special handling is needed.	1378	* to be set if special handling is needed.
1319	*	1379	*
1320	* Return value:	1380	* Return value:
1321	* new object if 'op' was merged with other object	1381	* new object if 'op' was merged with other object
1322	* NULL if 'op' was destroyed	1382	* NULL if there was an error (destroyed, blocked etc.)
1323	* just 'op' otherwise	1383	* just 'op' otherwise
1324	*/	1384	*/
1325	object *	1385	object *
1326	insert_ob_in_map (object op, maptile m, object *originator, int flag)	1386	insert_ob_in_map (object op, maptile m, object *originator, int flag)
1327	{	1387	{
…		…
1364	// from here :/	1424	// from here :/
1365	op->nrof += tmp->nrof;	1425	op->nrof += tmp->nrof;
1366	tmp->destroy ();	1426	tmp->destroy ();
1367	}	1427	}
1368		1428
1369	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1429	op->clr_flag (FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1370	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1430	op->clr_flag (FLAG_INV_LOCKED);
1371		1431
1372	if (!QUERY_FLAG (op, FLAG_ALIVE))	1432	if (!op->flag [FLAG_ALIVE])
1373	CLEAR_FLAG (op, FLAG_NO_STEAL);	1433	op->clr_flag (FLAG_NO_STEAL);
1374		1434
1375	if (flag & INS_BELOW_ORIGINATOR)	1435	if (flag & INS_BELOW_ORIGINATOR)
1376	{	1436	{
1377	if (originator->map != op->map \|\| originator->x != op->x \|\| originator->y != op->y)	1437	if (originator->map != op->map \|\| originator->x != op->x \|\| originator->y != op->y)
1378	{	1438	{
…		…
1413	* when lots of spells are cast in one area. Currently, it is presumed	1473	* when lots of spells are cast in one area. Currently, it is presumed
1414	* that flying non pickable objects are spell objects.	1474	* that flying non pickable objects are spell objects.
1415	*/	1475	*/
1416	for (object *tmp = ms.bot; tmp; tmp = tmp->above)	1476	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1417	{	1477	{
1418	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) \|\| QUERY_FLAG (tmp, FLAG_OVERLAY_FLOOR))	1478	if (tmp->flag [FLAG_IS_FLOOR] \|\| tmp->flag [FLAG_OVERLAY_FLOOR])
1419	floor = tmp;	1479	floor = tmp;
1420		1480
1421	if (QUERY_FLAG (tmp, FLAG_NO_PICK) && (tmp->move_type & (MOVE_FLY_LOW \| MOVE_FLY_HIGH)) && !QUERY_FLAG (tmp, FLAG_IS_FLOOR))	1481	if (tmp->flag [FLAG_NO_PICK] && (tmp->move_type & (MOVE_FLY_LOW \| MOVE_FLY_HIGH)) && !tmp->flag [FLAG_IS_FLOOR])
1422	{	1482	{
1423	/* We insert above top, so we want this object below this */	1483	/* We insert above top, so we want this object below this */
1424	top = tmp->below;	1484	top = tmp->below;
1425	break;	1485	break;
1426	}	1486	}
…		…
1444	&& (op->face && !faces [op->face].visibility))	1504	&& (op->face && !faces [op->face].visibility))
1445	{	1505	{
1446	object *last;	1506	object *last;
1447		1507
1448	for (last = top; last != floor; last = last->below)	1508	for (last = top; last != floor; last = last->below)
1449	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1509	if (last->flag [FLAG_BLOCKSVIEW] && (last->type != EXIT))
1450	break;	1510	break;
1451		1511
1452	/* Check to see if we found the object that blocks view,	1512	/* Check to see if we found the object that blocks view,
1453	* and make sure we have a below pointer for it so that	1513	* and make sure we have a below pointer for it so that
1454	* we can get inserted below this one, which requires we	1514	* we can get inserted below this one, which requires we
…		…
1527	*/	1587	*/
1528		1588
1529	/* if this is not the head or flag has been passed, don't check walk on status */	1589	/* if this is not the head or flag has been passed, don't check walk on status */
1530	if (!(flag & INS_NO_WALK_ON) && op->is_head ())	1590	if (!(flag & INS_NO_WALK_ON) && op->is_head ())
1531	{	1591	{
1532	if (check_move_on (op, originator))	1592	if (check_move_on (op, originator, flag))
1533	return 0;	1593	return 0;
1534		1594
1535	/* If we are a multi part object, lets work our way through the check	1595	/* If we are a multi part object, let's work our way through the check
1536	* walk on's.	1596	* walk on's.
1537	*/	1597	*/
1538	for (object *tmp = op->more; tmp; tmp = tmp->more)	1598	for (object *tmp = op->more; tmp; tmp = tmp->more)
1539	if (check_move_on (tmp, originator))	1599	if (check_move_on (tmp, originator, flag))
1540	return 0;	1600	return 0;
1541	}	1601	}
1542		1602
1543	return op;	1603	return op;
1544	}	1604	}
…		…
1585	\|\| (items < m->max_items	1645	\|\| (items < m->max_items
1586	&& ms.volume () < m->max_volume))	1646	&& ms.volume () < m->max_volume))
1587	return true;	1647	return true;
1588		1648
1589	if (originator && originator->is_player ())	1649	if (originator && originator->is_player ())
1590	originator->contr->failmsg (format (	1650	originator->contr->failmsgf (
1591	"No matter how hard you try, you just cannot put the %s here H<Try to remove some items from the floor first.>",	1651	"No matter how hard you try, you just cannot put the %s here H<Try to remove some items from the floor first.>",
1592	query_name ()	1652	query_name ()
1593	));	1653	);
1594		1654
1595	return false;	1655	return false;
1596	}	1656	}
1597		1657
1598	/*	1658	/*
…		…
1610		1670
1611	nr = min (nr, nrof);	1671	nr = min (nr, nrof);
1612		1672
1613	if (nrof > nr)	1673	if (nrof > nr)
1614	{	1674	{
		1675	sint64 oweight = total_weight ();
		1676
1615	nrof -= nr;	1677	nrof -= nr;
1616	adjust_weight (env, -weight * max (1, nr)); // carrying == 0
1617		1678
1618	if (object *pl = visible_to ())	1679	if (object *pl = visible_to ())
1619	esrv_update_item (UPD_NROF, pl, this);	1680	esrv_update_item (UPD_NROF, pl, this);
		1681
		1682	adjust_weight (env, oweight, total_weight ());
1620		1683
1621	return true;	1684	return true;
1622	}	1685	}
1623	else	1686	else
1624	{	1687	{
…		…
1699	if (op->nrof)	1762	if (op->nrof)
1700	for (object *tmp = inv; tmp; tmp = tmp->below)	1763	for (object *tmp = inv; tmp; tmp = tmp->below)
1701	if (object::can_merge (tmp, op))	1764	if (object::can_merge (tmp, op))
1702	{	1765	{
1703	/* return the original object and remove inserted object	1766	/* return the original object and remove inserted object
1704	(client needs the original object) */	1767	(client prefers the original object) */
		1768
		1769	// carring must be 0 for mergable objects
		1770	sint64 oweight = tmp->weight * tmp->nrof;
		1771
1705	tmp->nrof += op->nrof;	1772	tmp->nrof += op->nrof;
1706		1773
1707	if (object *pl = tmp->visible_to ())	1774	if (object *pl = tmp->visible_to ())
1708	esrv_update_item (UPD_NROF, pl, tmp);	1775	esrv_update_item (UPD_NROF, pl, tmp);
1709		1776
1710	adjust_weight (this, op->total_weight ());	1777	adjust_weight (this, oweight, tmp->weight * tmp->nrof);
1711		1778
1712	op->destroy ();	1779	op->destroy ();
1713	op = tmp;	1780	op = tmp;
1714	goto inserted;	1781	goto inserted;
1715	}	1782	}
…		…
1731	op->flag [FLAG_REMOVED] = 0;	1798	op->flag [FLAG_REMOVED] = 0;
1732		1799
1733	if (object *pl = op->visible_to ())	1800	if (object *pl = op->visible_to ())
1734	esrv_send_item (pl, op);	1801	esrv_send_item (pl, op);
1735		1802
1736	adjust_weight (this, op->total_weight ());	1803	adjust_weight (this, 0, op->total_weight ());
1737		1804
1738	inserted:	1805	inserted:
1739	/* reset the light list and los of the players on the map */	1806	/* reset the light list and los of the players on the map */
1740	if (op->glow_radius && is_on_map ())	1807	if (op->glow_radius && is_on_map ())
1741	{	1808	{
…		…
1770	* MSW 2001-07-08: Check all objects on space, not just those below	1837	* MSW 2001-07-08: Check all objects on space, not just those below
1771	* object being inserted. insert_ob_in_map may not put new objects	1838	* object being inserted. insert_ob_in_map may not put new objects
1772	* on top.	1839	* on top.
1773	*/	1840	*/
1774	int	1841	int
1775	check_move_on (object op, object originator)	1842	check_move_on (object op, object originator, int flags)
1776	{	1843	{
1777	if (QUERY_FLAG (op, FLAG_NO_APPLY))	1844	if (op->flag [FLAG_NO_APPLY])
1778	return 0;	1845	return 0;
1779		1846
1780	object *tmp;	1847	object *tmp;
1781	maptile *m = op->map;	1848	maptile *m = op->map;
1782	int x = op->x, y = op->y;	1849	int x = op->x, y = op->y;
…		…
1819	* Second check makes sure that the movement types not being slowed	1886	* Second check makes sure that the movement types not being slowed
1820	* (~slow_move) is not blocked on this space - just because the	1887	* (~slow_move) is not blocked on this space - just because the
1821	* space doesn't slow down swimming (for example), if you can't actually	1888	* space doesn't slow down swimming (for example), if you can't actually
1822	* swim on that space, can't use it to avoid the penalty.	1889	* swim on that space, can't use it to avoid the penalty.
1823	*/	1890	*/
1824	if (!QUERY_FLAG (op, FLAG_WIZPASS))	1891	if (!op->flag [FLAG_WIZPASS])
1825	{	1892	{
1826	if ((!op->move_type && tmp->move_slow & MOVE_WALK) \|\|	1893	if ((!op->move_type && tmp->move_slow & MOVE_WALK) \|\|
1827	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))	1894	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1828	{	1895	{
1829	float diff = tmp->move_slow_penalty * fabs (op->speed);	1896	float diff = tmp->move_slow_penalty * fabs (op->speed);
…		…
1839		1906
1840	/* Basically same logic as above, except now for actual apply. */	1907	/* Basically same logic as above, except now for actual apply. */
1841	if ((!op->move_type && tmp->move_on & MOVE_WALK) \|\|	1908	if ((!op->move_type && tmp->move_on & MOVE_WALK) \|\|
1842	((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))	1909	((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))
1843	{	1910	{
		1911	if ((flags & INS_NO_AUTO_EXIT)
		1912	&& (tmp->type == EXIT \|\| tmp->type == TELEPORTER
		1913	\|\| tmp->type == HOLE \|\| tmp->type == TRAPDOOR)) //TODO: temporary, fix exits instead
		1914	continue;
		1915
1844	move_apply (tmp, op, originator);	1916	move_apply (tmp, op, originator);
1845		1917
1846	if (op->destroyed ())	1918	if (op->destroyed ())
1847	return 1;	1919	return 1;
1848		1920
…		…
1960	void	2032	void
1961	flag_inv (object *op, int flag)	2033	flag_inv (object *op, int flag)
1962	{	2034	{
1963	for (object *tmp = op->inv; tmp; tmp = tmp->below)	2035	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1964	{	2036	{
1965	SET_FLAG (tmp, flag);	2037	tmp->set_flag (flag);
1966	flag_inv (tmp, flag);	2038	flag_inv (tmp, flag);
1967	}	2039	}
1968	}	2040	}
1969		2041
1970	/*	2042	/*
…		…
1973	void	2045	void
1974	unflag_inv (object *op, int flag)	2046	unflag_inv (object *op, int flag)
1975	{	2047	{
1976	for (object *tmp = op->inv; tmp; tmp = tmp->below)	2048	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1977	{	2049	{
1978	CLEAR_FLAG (tmp, flag);	2050	tmp->clr_flag (flag);
1979	unflag_inv (tmp, flag);	2051	unflag_inv (tmp, flag);
1980	}	2052	}
1981	}	2053	}
1982		2054
1983	/*	2055	/*
…		…
2173	{	2245	{
2174	return (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);	2246	return (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);
2175	}	2247	}
2176		2248
2177	/*	2249	/*
2178	* find_dir_2(delta-x,delta-y) will return a direction in which	2250	* find_dir_2(delta-x,delta-y) will return a direction value
2179	* an object which has subtracted the x and y coordinates of another	2251	* for running into direct [dx, dy].
2180	* object, needs to travel toward it.	2252	* (the opposite of crossfire's find_dir_2!)
2181	*/	2253	*/
2182	int	2254	int
2183	find_dir_2 (int x, int y)	2255	find_dir_2 (int x, int y)
2184	{	2256	{
		2257	#if 1 // new algorithm
		2258	// this works by putting x, y into 16 sectors, which
		2259	// are not equal sized, but are a better approximation
		2260	// then the old algorithm, and then using a mapping
		2261	// table to map it into a direction value.
		2262	// basically, it maps these comparisons to each bit
		2263	// bit #3: x < 0
		2264	// bit #2: y < 0
		2265	// bit #1: x > y
		2266	// bit #0: x > 2y
		2267
		2268	static const uint8 dir[16] = {
		2269	4, 5, 4, 3,
		2270	2, 1, 2, 3,
		2271	6, 5, 6, 7,
		2272	8, 1, 8, 7,
		2273	};
		2274	int sector = 0;
		2275
		2276	// this is a bit ugly, but more likely to result in branchless code
		2277	sector \|= x < 0 ? 8 : 0;
		2278	x = x < 0 ? -x : x; // abs
		2279
		2280	sector \|= y < 0 ? 4 : 0;
		2281	y = y < 0 ? -y : y; // abs
		2282
		2283	if (x > y)
		2284	{
		2285	sector \|= 2;
		2286
		2287	if (x > y * 2)
		2288	sector \|= 1;
		2289	}
		2290	else
		2291	{
		2292	if (y > x * 2)
		2293	sector \|= 1;
		2294	else if (!y)
		2295	return 0; // x == 0 here
		2296	}
		2297
		2298	return dir [sector];
		2299	#else // old algorithm
2185	int q;	2300	int q;
2186		2301
2187	if (y)	2302	if (y)
2188	q = x * 100 / y;	2303	q = 128 * x / y;
2189	else if (x)	2304	else if (x)
2190	q = -300 * x;	2305	q = -512 * x; // to make it > 309
2191	else	2306	else
2192	return 0;	2307	return 0;
2193		2308
2194	if (y > 0)	2309	if (y > 0)
2195	{	2310	{
2196	if (q < -242)	2311	if (q < -309) return 7;
		2312	if (q < -52) return 6;
		2313	if (q < 52) return 5;
		2314	if (q < 309) return 4;
		2315
2197	return 3;	2316	return 3;
2198	if (q < -41)	2317	}
2199	return 2;	2318	else
2200	if (q < 41)	2319	{
2201	return 1;	2320	if (q < -309) return 3;
2202	if (q < 242)	2321	if (q < -52) return 2;
2203	return 8;	2322	if (q < 52) return 1;
		2323	if (q < 309) return 8;
		2324
2204	return 7;	2325	return 7;
2205	}	2326	}
2206		2327	#endif
2207	if (q < -242)
2208	return 7;
2209	if (q < -41)
2210	return 6;
2211	if (q < 41)
2212	return 5;
2213	if (q < 242)
2214	return 4;
2215
2216	return 3;
2217	}	2328	}
2218		2329
2219	/*	2330	/*
2220	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is	2331	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is
2221	* between two directions (which are expected to be absolute (see absdir())	2332	* between two directions (which are expected to be absolute (see absdir())
2222	*/	2333	*/
2223	int	2334	int
2224	dirdiff (int dir1, int dir2)	2335	dirdiff (int dir1, int dir2)
2225	{	2336	{
2226	int d;
2227
2228	d = abs (dir1 - dir2);	2337	int d = abs (dir1 - dir2);
2229	if (d > 4)
2230	d = 8 - d;
2231		2338
2232	return d;	2339	return d > 4 ? 8 - d : d;
2233	}	2340	}
2234		2341
2235	/* peterm:	2342	/* peterm:
2236	* do LOS stuff for ball lightning. Go after the closest VISIBLE monster.	2343	* do LOS stuff for ball lightning. Go after the closest VISIBLE monster.
2237	* Basically, this is a table of directions, and what directions	2344	* Basically, this is a table of directions, and what directions
…		…
2343	* Add a check so we can't pick up invisible objects (0.93.8)	2450	* Add a check so we can't pick up invisible objects (0.93.8)
2344	*/	2451	*/
2345	int	2452	int
2346	can_pick (const object who, const object item)	2453	can_pick (const object who, const object item)
2347	{	2454	{
2348	return /QUERY_FLAG(who,FLAG_WIZ)\|\| /	2455	return /who->flag [FLAG_WIZ]\|\| /
2349	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&	2456	(item->weight > 0 && !item->flag [FLAG_NO_PICK] &&
2350	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->is_player () \|\| item->weight < who->weight / 3));	2457	!item->flag [FLAG_ALIVE] && !item->invisible && (who->is_player () \|\| item->weight < who->weight / 3));
2351	}	2458	}
2352		2459
2353	/*	2460	/*
2354	* create clone from object to another	2461	* create clone from object to another
2355	*/	2462	*/
…		…
2563	// TODO: this does not seem to serve any purpose anymore?	2670	// TODO: this does not seem to serve any purpose anymore?
2564	#if 0	2671	#if 0
2565	// insert the "Close Container" object.	2672	// insert the "Close Container" object.
2566	if (archetype *closer = new_container->other_arch)	2673	if (archetype *closer = new_container->other_arch)
2567	{	2674	{
2568	object *closer = arch_to_object (new_container->other_arch);	2675	object *closer = new_container->other_arch->instance ();
2569	closer->flag [FLAG_NO_MAP_SAVE] = 1;	2676	closer->flag [FLAG_NO_MAP_SAVE] = 1;
2570	new_container->insert (closer);	2677	new_container->insert (closer);
2571	}	2678	}
2572	#endif	2679	#endif
2573		2680
…		…
2679		2786
2680	insert (force);	2787	insert (force);
2681	}	2788	}
2682	}	2789	}
2683		2790
		2791	void object::change_move_type (MoveType mt)
		2792	{
		2793	if (move_type == mt)
		2794	return;
		2795
		2796	if (is_on_map ())
		2797	{
		2798	// we are on the map, so handle move_on/off effects
		2799	remove ();
		2800	move_type = mt;
		2801	map->insert (this, x, y, this);
		2802	}
		2803	else
		2804	move_type = mt;
		2805	}
		2806
		2807	/* object should be a player.
		2808	* we return the object the player has marked with the 'mark' command
		2809	* below. If no match is found (or object has changed), we return
		2810	* NULL. We leave it up to the calling function to print messages if
		2811	* nothing is found.
		2812	*/
		2813	object *
		2814	object::mark () const
		2815	{
		2816	if (contr && contr->mark && contr->mark->env == this)
		2817	return contr->mark;
		2818	else
		2819	return 0;
		2820	}
		2821
		2822	// put marked object first in the inventory
		2823	// this is used by identify-like spells so players can influence
		2824	// the order a bit.
		2825	void
		2826	object::splay_marked ()
		2827	{
		2828	if (object *marked = mark ())
		2829	splay (marked);
		2830	}
		2831

Diff Legend

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

Comparing deliantra/server/common/object.C (file contents): Revision 1.308 by root, Sun Nov 29 17:26:28 2009 UTC vs. Revision 1.343 by root, Sat Apr 23 04:56:46 2011 UTC

Diff Legend

Comparing deliantra/server/common/object.C (file contents):
Revision 1.308 by root, Sun Nov 29 17:26:28 2009 UTC vs.
Revision 1.343 by root, Sat Apr 23 04:56:46 2011 UTC