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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.318 by root, Sat Apr 3 02:27:24 2010 UTC vs.
Revision 1.347 by root, Wed May 4 07:41:13 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,2010 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 Mark Wedel & Crossfire Development Team	5	* Copyright (©) 2001 Mark Wedel & Crossfire Development Team
6	* Copyright (©) 1992 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
37	uint32_t mapspace::smellcount = 10000;	37	uint32_t mapspace::smellcount = 10000;
38		38
39	objectvec objects;	39	objectvec objects;
40	activevec actives;	40	activevec actives;
41		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;
		47
42	//+GPL	48	//+GPL
43		49
44	short freearr_x[SIZEOFFREE] = {	50	short freearr_x[SIZEOFFREE] = {
45	0,	51	0,
46	0, 1, 1, 1, 0, -1, -1, -1,	52	0, 1, 1, 1, 0, -1, -1, -1,
…		…
65	9, 10, 13, 14, 17, 18, 21, 22,	71	9, 10, 13, 14, 17, 18, 21, 22,
66	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,
67	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
68	};	74	};
69		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
70	static void	95	static void
71	write_uuid (uval64 skip, bool sync)	96	write_uuid (uval64 skip, bool sync)
72	{	97	{
73	CALL_BEGIN (2);	98	CALL_BEGIN (2);
74	CALL_ARG_SV (newSVval64 (skip));	99	CALL_ARG_SV (newSVval64 (skip));
…		…
208		233
209	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */	234	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */
210	static bool	235	static bool
211	compare_ob_value_lists_one (const object wants, const object has)	236	compare_ob_value_lists_one (const object wants, const object has)
212	{	237	{
213	/* n-squared behaviour (see kv_get), but I'm hoping both	238	/* n-squared behaviour (see kv.get), but I'm hoping both
214	* objects with lists are rare, and lists stay short. If not, use a	239	* objects with lists are rare, and lists stay short. If not, use a
215	* different structure or at least keep the lists sorted...	240	* different structure or at least keep the lists sorted...
216	*/	241	*/
217		242
218	/* For each field in wants, */	243	/* For each field in wants, */
219	for (key_value *kv = wants->key_values; kv; kv = kv->next)	244	for (key_value *kv = wants->kv.first; kv; kv = kv->next)
220	if (has->kv_get (kv->key) != kv->value)	245	if (has->kv.get (kv->key) != kv->value)
221	return false;	246	return false;
222		247
223	/* If we get here, every field in wants has a matching field in has. */	248	/* If we get here, every field in wants has a matching field in has. */
224	return true;	249	return true;
225	}	250	}
…		…
249	*/	274	*/
250	bool object::can_merge_slow (object ob1, object ob2)	275	bool object::can_merge_slow (object ob1, object ob2)
251	{	276	{
252	/* A couple quick sanity checks */	277	/* A couple quick sanity checks */
253	if (ob1 == ob2	278	if (ob1 == ob2
254	\|\| ob1->type != ob2->type	279	\|\| ob1->type != ob2->type
255	\|\| ob1->value != ob2->value	280	\|\| ob1->value != ob2->value
256	\|\| ob1->name != ob2->name	281	\|\| ob1->name != ob2->name
		282	\|\| ob1->custom_name != ob2->custom_name
257	\|\| fabs (ob1->speed - ob2->speed) >= MIN_ACTIVE_SPEED)	283	\|\| fabs (ob1->speed - ob2->speed) >= MIN_ACTIVE_SPEED)
258	return 0;	284	return 0;
259		285
260	/* Do not merge objects if nrof would overflow, assume nrof	286	/* Do not merge objects if nrof would overflow, assume nrof
261	* is always 0 .. 2*31-1 /	287	* is always 0 .. 2*31-1 /
…		…
266	* 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
267	* 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
268	* 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
269	* flags lose any meaning.	295	* flags lose any meaning.
270	*/	296	*/
271	if (QUERY_FLAG (ob1, FLAG_IDENTIFIED))	297	if (ob1->flag [FLAG_IDENTIFIED])
272	SET_FLAG (ob1, FLAG_BEEN_APPLIED);	298	ob1->set_flag (FLAG_BEEN_APPLIED);
273		299
274	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))	300	if (ob2->flag [FLAG_IDENTIFIED])
275	SET_FLAG (ob2, FLAG_BEEN_APPLIED);	301	ob2->set_flag (FLAG_BEEN_APPLIED);
276		302
277	if (ob1->arch->archname != ob2->arch->archname	303	if (ob1->arch->archname != ob2->arch->archname
278	\|\| ob1->name != ob2->name	304	\|\| ob1->name != ob2->name
279	\|\| ob1->title != ob2->title	305	\|\| ob1->title != ob2->title
280	\|\| ob1->msg != ob2->msg	306	\|\| ob1->msg != ob2->msg
…		…
329		355
330	/* 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,
331	* 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
332	* some items equipped, and we don't want those to merge.	358	* some items equipped, and we don't want those to merge.
333	*/	359	*/
334	if (QUERY_FLAG (ob1, FLAG_APPLIED) \|\| QUERY_FLAG (ob2, FLAG_APPLIED))	360	if (ob1->flag [FLAG_APPLIED] \|\| ob2->flag [FLAG_APPLIED])
335	return 0;	361	return 0;
336		362
337	/* 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
338	* 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
339	* check?	365	* check?
340	*/	366	*/
341	if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && ob1->has_active_speed ())	367	if (!ob1->flag [FLAG_ANIMATE] && ob1->has_active_speed ())
342	return 0;	368	return 0;
343		369
344	switch (ob1->type)	370	switch (ob1->type)
345	{	371	{
346	case SCROLL:	372	case SCROLL:
347	if (ob1->level != ob2->level)	373	if (ob1->level != ob2->level)
348	return 0;	374	return 0;
349	break;	375	break;
350	}	376	}
351		377
352	if (ob1->key_values \|\| ob2->key_values)	378	if (!ob1->kv.empty () \|\| !ob2->kv.empty ())
353	{	379	{
354	/* At least one of these has key_values. */	380	/* At least one of these has key_values. */
355	if ((!ob1->key_values) != (!ob2->key_values))	381	if (ob1->kv.empty () != ob2->kv.empty ())
356	return 0; /* One has fields, but the other one doesn't. */	382	return 0; /* One has fields, but the other one doesn't. */
357		383
358	if (!compare_ob_value_lists (ob1, ob2))	384	if (!compare_ob_value_lists (ob1, ob2))
359	return 0;	385	return 0;
360	}	386	}
…		…
420		446
421	return 0;	447	return 0;
422	}	448	}
423		449
424	// adjust weight per container type ("of holding")	450	// adjust weight per container type ("of holding")
425	static sint32	451	static uint32
426	weight_adjust_for (object *op, sint32 weight)	452	weight_adjust_for (object *op, uint32 weight)
427	{	453	{
428	return op->type == CONTAINER	454	return op->type == CONTAINER
429	? lerp (weight, 0, 100, 0, 100 - op->stats.Str)	455	? weight - weight * op->stats.Str / 100
430	: weight;	456	: weight;
431	}	457	}
432		458
433	/*	459	/*
434	* adjust_weight(object, weight) adds the specified weight to an object,	460	* subtracts, then adds, the specified weight to an object,
435	* and also updates how much the environment(s) is/are carrying.	461	* and also updates how much the environment(s) is/are carrying.
436	*/	462	*/
437	static void	463	static void
438	adjust_weight (object *op, sint32 weight)	464	adjust_weight (object *op, sint32 sub, sint32 add)
439	{	465	{
440	while (op)	466	while (op)
441	{	467	{
442	// adjust by actual difference to account for rounding errors	468	sint32 ocarrying = op->carrying;
443	// i.e. (w2 - w1) / f != w2 / f - w1 / f and the latter is correct
444	weight = weight_adjust_for (op, op->carrying)
445	- weight_adjust_for (op, op->carrying - weight);
446		469
447	if (!weight)	470	op->carrying -= weight_adjust_for (op, sub);
448	return;	471	op->carrying += weight_adjust_for (op, add);
449
450	op->carrying += weight;
451		472
452	if (object *pl = op->visible_to ())	473	if (object *pl = op->visible_to ())
453	if (pl != op) // player is handled lazily	474	if (pl != op) // player is handled lazily
454	esrv_update_item (UPD_WEIGHT, pl, op);	475	esrv_update_item (UPD_WEIGHT, pl, op);
455		476
		477	sub = ocarrying;
		478	add = op->carrying;
		479
456	op = op->env;	480	op = op->env;
457	}	481	}
458	}	482	}
459		483
460	/*	484	/*
…		…
467	{	491	{
468	sint32 sum = 0;	492	sint32 sum = 0;
469		493
470	for (object *op = inv; op; op = op->below)	494	for (object *op = inv; op; op = op->below)
471	{	495	{
472	if (op->inv)
473	op->update_weight ();	496	op->update_weight ();
474		497
475	sum += op->total_weight ();	498	sum += weight_adjust_for (this, op->total_weight ());
476	}	499	}
477
478	sum = weight_adjust_for (this, sum);
479		500
480	if (sum != carrying)	501	if (sum != carrying)
481	{	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
482	carrying = sum;	507	carrying = sum;
483		508
484	if (object *pl = visible_to ())	509	if (object *pl = visible_to ())
485	if (pl != this) // player is handled lazily	510	if (pl != this) // player is handled lazily
486	esrv_update_item (UPD_WEIGHT, pl, this);	511	esrv_update_item (UPD_WEIGHT, pl, this);
…		…
572	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 ());
573	return;	598	return;
574	}	599	}
575		600
576	this->owner = owner;	601	this->owner = owner;
577	}
578
579	int
580	object::slottype () const
581	{
582	if (type == SKILL)
583	{
584	if (IS_COMBAT_SKILL (subtype)) return slot_combat;
585	if (IS_RANGED_SKILL (subtype)) return slot_ranged;
586	}
587	else
588	{
589	if (slot [body_combat].info) return slot_combat;
590	if (slot [body_range ].info) return slot_ranged;
591	}
592
593	return slot_none;
594	}
595
596	/* Zero the key_values on op, decrementing the shared-string
597	* refcounts and freeing the links.
598	*/
599	static void
600	free_key_values (object *op)
601	{
602	for (key_value *i = op->key_values; i; )
603	{
604	key_value *next = i->next;
605	delete i;
606
607	i = next;
608	}
609
610	op->key_values = 0;
611	}	602	}
612		603
613	/*	604	/*
614	* copy_to first frees everything allocated by the dst object,	605	* copy_to first frees everything allocated by the dst object,
615	* and then copies the contents of itself into the second	606	* and then copies the contents of itself into the second
…		…
621	void	612	void
622	object::copy_to (object *dst)	613	object::copy_to (object *dst)
623	{	614	{
624	dst->remove ();	615	dst->remove ();
625	(object_copy )dst = *this;	616	(object_copy )dst = *this;
		617
		618	// maybe move to object_copy?
		619	dst->kv = kv;
		620
626	dst->flag [FLAG_REMOVED] = true;	621	dst->flag [FLAG_REMOVED] = true;
627
628	/* Copy over key_values, if any. */
629	if (key_values)
630	{
631	key_value *tail = 0;
632	dst->key_values = 0;
633
634	for (key_value *i = key_values; i; i = i->next)
635	{
636	key_value *new_link = new key_value;
637
638	new_link->next = 0;
639	new_link->key = i->key;
640	new_link->value = i->value;
641
642	/* Try and be clever here, too. */
643	if (!dst->key_values)
644	{
645	dst->key_values = new_link;
646	tail = new_link;
647	}
648	else
649	{
650	tail->next = new_link;
651	tail = new_link;
652	}
653	}
654	}
655
656	dst->activate ();	622	dst->activate ();
657	}	623	}
658		624
659	void	625	void
660	object::instantiate ()	626	object::instantiate ()
661	{	627	{
662	if (!uuid.seq) // HACK	628	if (!uuid.seq) // HACK
663	uuid = UUID::gen ();	629	uuid = UUID::gen ();
664		630
665	// TODO: unclean state changes, should nt be done in copy_to AND instantiate	631	// TODO: unclean state changes, should not be done in copy_to AND instantiate
666	if (flag [FLAG_RANDOM_SPEED] && speed)	632	if (flag [FLAG_RANDOM_SPEED] && speed)
667	speed_left = - speed - rndm (); // TODO animation	633	speed_left = - speed - rndm (); // TODO animation
668	else	634	else
669	speed_left = -1.;	635	speed_left = -1.;
670		636
…		…
700	* be called to update the face variable, _and_ how it looks on the map.	666	* be called to update the face variable, _and_ how it looks on the map.
701	*/	667	*/
702	void	668	void
703	update_turn_face (object *op)	669	update_turn_face (object *op)
704	{	670	{
705	if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) \|\| !op->arch)	671	if (!op->flag [FLAG_IS_TURNABLE] \|\| !op->arch)
706	return;	672	return;
707		673
708	SET_ANIMATION (op, op->direction);	674	SET_ANIMATION (op, op->direction);
709	update_object (op, UP_OBJ_FACE);	675	update_object (op, UP_OBJ_FACE);
710	}	676	}
…		…
776	/* nop */;	742	/* nop */;
777	else if (action == UP_OBJ_INSERT)	743	else if (action == UP_OBJ_INSERT)
778	{	744	{
779	#if 0	745	#if 0
780	// this is likely overkill, TODO: revisit (schmorp)	746	// this is likely overkill, TODO: revisit (schmorp)
781	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))	747	if ((op->flag [FLAG_BLOCKSVIEW] && !(m.flags_ & P_BLOCKSVIEW))
782	\|\| (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))	748	\|\| (op->flag [FLAG_NO_MAGIC] && !(m.flags_ & P_NO_MAGIC))
783	\|\| (op->is_player () && !(m.flags_ & P_PLAYER))	749	\|\| (op->is_player () && !(m.flags_ & P_PLAYER))
784	\|\| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))	750	\|\| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
785	\|\| (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))	751	\|\| (op->flag [FLAG_ALIVE] && !(m.flags_ & P_IS_ALIVE))
786	\|\| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))	752	\|\| (op->flag [FLAG_DAMNED] && !(m.flags_ & P_NO_CLERIC))
787	\|\| (m.move_on \| op->move_on ) != m.move_on	753	\|\| (m.move_on \| op->move_on ) != m.move_on
788	\|\| (m.move_off \| op->move_off ) != m.move_off	754	\|\| (m.move_off \| op->move_off ) != m.move_off
789	\|\| (m.move_slow \| op->move_slow) != m.move_slow	755	\|\| (m.move_slow \| op->move_slow) != m.move_slow
790	/* This isn't perfect, but I don't expect a lot of objects to	756	/* This isn't perfect, but I don't expect a lot of objects to
791	* have move_allow right now.	757	* have move_allow right now.
…		…
812	update_object (op->more, action);	778	update_object (op->more, action);
813	}	779	}
814		780
815	object::object ()	781	object::object ()
816	{	782	{
817	SET_FLAG (this, FLAG_REMOVED);	783	this->set_flag (FLAG_REMOVED);
818		784
819	//expmul = 1.0; declared const for the time being	785	//expmul = 1.0; declared const for the time being
820	face = blank_face;	786	face = blank_face;
821	material = MATERIAL_NULL;	787	material = MATERIAL_NULL;
822	}	788	}
823		789
824	object::~object ()	790	object::~object ()
825	{	791	{
826	unlink ();	792	unlink ();
827		793
828	free_key_values (this);	794	kv.clear ();
829	}	795	}
830
831	static int object_count;
832		796
833	void object::link ()	797	void object::link ()
834	{	798	{
835	assert (!index);//D	799	assert (!index);//D
836	uuid = UUID::gen ();	800	uuid = UUID::gen ();
837	count = ++object_count;
838		801
839	refcnt_inc ();	802	refcnt_inc ();
840	objects.insert (this);	803	objects.insert (this);
		804
		805	++create_count;
		806
841	}	807	}
842		808
843	void object::unlink ()	809	void object::unlink ()
844	{	810	{
845	if (!index)	811	if (!index)
846	return;	812	return;
		813
		814	++destroy_count;
847		815
848	objects.erase (this);	816	objects.erase (this);
849	refcnt_dec ();	817	refcnt_dec ();
850	}	818	}
851		819
…		…
930	* if some form of movement is allowed, let objects	898	* if some form of movement is allowed, let objects
931	* drop on that space.	899	* drop on that space.
932	*/	900	*/
933	if (!drop_to_ground	901	if (!drop_to_ground
934	\|\| !map	902	\|\| !map
935	\|\| map->in_memory != MAP_ACTIVE	903	\|\| !map->linkable ()
936	\|\| map->no_drop	904	\|\| map->no_drop
937	\|\| ms ().move_block == MOVE_ALL)	905	\|\| ms ().move_block == MOVE_ALL)
938	{	906	{
939	while (inv)	907	while (inv)
940	inv->destroy ();	908	inv->destroy ();
…		…
956	map->insert (op, x, y);	924	map->insert (op, x, y);
957	}	925	}
958	}	926	}
959	}	927	}
960		928
		929	/*
		930	* Remove and free all objects in the inventory of the given object.
		931	* Unlike destroy_inv, this assumes the *this is destroyed as well
		932	* well, so we can (and have to!) take shortcuts.
		933	*/
		934	void
		935	object::destroy_inv_fast ()
		936	{
		937	while (object *op = inv)
		938	{
		939	// remove from object the fast way
		940	op->flag [FLAG_REMOVED] = true;
		941	op->env = 0;
		942	if ((inv = inv->below))
		943	inv->above = 0;
		944
		945	// then destroy
		946	op->destroy ();
		947	}
		948	}
		949
		950	void
		951	object::freelist_free (int count)
		952	{
		953	while (count-- && freelist)
		954	{
		955	freelist_item *next = freelist->next;
		956	// count is being "destroyed"
		957
		958	sfree ((char *)freelist, sizeof (object));
		959
		960	freelist = next;
		961	--free_count;
		962	}
		963	}
		964
		965	object *
961	object *object::create ()	966	object::create ()
962	{	967	{
963	object *op = new object;	968	object *op;
		969
		970	if (freelist)
		971	{
		972	freelist_item li = *freelist;
		973	memset (freelist, 0, sizeof (object));
		974
		975	op = new (freelist) object;
		976	op->count = li.count;
		977
		978	freelist = li.next;
		979	--free_count;
		980	}
		981	else
		982	{
		983	void *ni = salloc0<char> (sizeof (object));
		984
		985	op = new(ni) object;
		986
		987	op->count = ++object_count;
		988	}
		989
964	op->link ();	990	op->link ();
		991
965	return op;	992	return op;
966	}	993	}
967		994
		995	void
		996	object::do_delete ()
		997	{
		998	uint32_t count = this->count;
		999
		1000	this->~object ();
		1001
		1002	freelist_item li = (freelist_item )this;
		1003	li->next = freelist;
		1004	li->count = count;
		1005
		1006	freelist = li;
		1007	++free_count;
		1008	}
		1009
968	static struct freed_map : maptile	1010	static struct freed_map : maptile
969	{	1011	{
970	freed_map ()	1012	freed_map ()
		1013	: maptile (3, 3)
971	{	1014	{
972	path = "<freed objects map>";	1015	path = "<freed objects map>";
973	name = "/internal/freed_objects_map";	1016	name = "/internal/freed_objects_map";
974	width = 3;
975	height = 3;
976	no_drop = 1;	1017	no_drop = 1;
977	no_reset = 1;	1018	no_reset = 1;
978		1019
979	alloc ();
980	in_memory = MAP_ACTIVE;	1020	state = MAP_ACTIVE;
981	}	1021	}
982		1022
983	~freed_map ()	1023	~freed_map ()
984	{	1024	{
985	destroy ();	1025	destroy ();
…		…
1035	LOG (llevError \| logBacktrace, "tried to destroy the tail of an object");	1075	LOG (llevError \| logBacktrace, "tried to destroy the tail of an object");
1036	head->destroy ();	1076	head->destroy ();
1037	return;	1077	return;
1038	}	1078	}
1039		1079
1040	destroy_inv (false);	1080	destroy_inv_fast ();
1041		1081
1042	if (is_head ())	1082	if (is_head ())
1043	if (sound_destroy)	1083	if (sound_destroy)
1044	play_sound (sound_destroy);	1084	play_sound (sound_destroy);
1045	else if (flag [FLAG_MONSTER])	1085	else if (flag [FLAG_MONSTER])
…		…
1077	flag [FLAG_REMOVED] = false; // hack around the issue of visible_to checking flag_removed	1117	flag [FLAG_REMOVED] = false; // hack around the issue of visible_to checking flag_removed
1078	if (object *pl = visible_to ())	1118	if (object *pl = visible_to ())
1079	esrv_del_item (pl->contr, count);	1119	esrv_del_item (pl->contr, count);
1080	flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed	1120	flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed
1081		1121
1082	adjust_weight (env, -total_weight ());	1122	adjust_weight (env, total_weight (), 0);
1083		1123
1084	object *pl = in_player ();	1124	object *pl = in_player ();
1085		1125
1086	/* we set up values so that it could be inserted into	1126	/* we set up values so that it could be inserted into
1087	* the map, but we don't actually do that - it is up	1127	* the map, but we don't actually do that - it is up
…		…
1101		1141
1102	if (pl && pl->is_player ())	1142	if (pl && pl->is_player ())
1103	{	1143	{
1104	if (expect_false (pl->contr->combat_ob == this))	1144	if (expect_false (pl->contr->combat_ob == this))
1105	{	1145	{
1106	pl->apply (pl->contr->combat_ob, AP_UNAPPLY);	1146	pl->apply (pl->contr->combat_ob, AP_UNAPPLY \| AP_IGNORE_CURSE);
1107	pl->contr->combat_ob = 0;	1147	pl->contr->combat_ob = 0;
1108	if (pl->contr->ranged_ob) pl->apply (pl->contr->ranged_ob);	1148	if (pl->contr->ranged_ob) pl->apply (pl->contr->ranged_ob);
1109	}	1149	}
1110		1150
1111	if (expect_false (pl->contr->ranged_ob == this))	1151	if (expect_false (pl->contr->ranged_ob == this))
1112	{	1152	{
1113	pl->apply (pl->contr->ranged_ob, AP_UNAPPLY);	1153	pl->apply (pl->contr->ranged_ob, AP_UNAPPLY \| AP_IGNORE_CURSE);
1114	pl->contr->ranged_ob = 0;	1154	pl->contr->ranged_ob = 0;
1115	if (pl->contr->combat_ob) pl->apply (pl->contr->combat_ob);	1155	if (pl->contr->combat_ob) pl->apply (pl->contr->combat_ob);
1116	}	1156	}
1117		1157
1118	pl->contr->queue_stats_update ();	1158	pl->contr->queue_stats_update ();
…		…
1145	else if (pl->container_ () == this)	1185	else if (pl->container_ () == this)
1146	{	1186	{
1147	// removing a container should close it	1187	// removing a container should close it
1148	close_container ();	1188	close_container ();
1149	}	1189	}
1150		1190	else
1151	esrv_del_item (pl->contr, count);	1191	esrv_del_item (pl->contr, count);
1152	}	1192	}
1153		1193
1154	/* link the object above us */	1194	/* link the object above us */
1155	// re-link, make sure compiler can easily use cmove	1195	// re-link, make sure compiler can easily use cmove
1156	*(above ? &above->below : &ms.top) = below;	1196	*(above ? &above->below : &ms.top) = below;
…		…
1158		1198
1159	above = 0;	1199	above = 0;
1160	below = 0;	1200	below = 0;
1161		1201
1162	ms.invalidate ();	1202	ms.invalidate ();
1163
1164	if (map->in_memory == MAP_SAVING)
1165	return;
1166		1203
1167	int check_walk_off = !flag [FLAG_NO_APPLY];	1204	int check_walk_off = !flag [FLAG_NO_APPLY];
1168		1205
1169	if (object *pl = ms.player ())	1206	if (object *pl = ms.player ())
1170	{	1207	{
…		…
1305	{	1342	{
1306	op->remove ();	1343	op->remove ();
1307		1344
1308	if (m == &freed_map)//D TODO: remove soon	1345	if (m == &freed_map)//D TODO: remove soon
1309	{//D	1346	{//D
1310	LOG (llevError \| logBacktrace, "tries to insret object on freed objects map: %s", op->debug_desc ());//D	1347	LOG (llevError \| logBacktrace, "tries to insert object on freed objects map: %s", op->debug_desc ());//D
1311	}//D	1348	}//D
1312		1349
1313	/* Ideally, the caller figures this out. However, it complicates a lot	1350	/* Ideally, the caller figures this out. However, it complicates a lot
1314	* of areas of callers (eg, anything that uses find_free_spot would now	1351	* of areas of callers (eg, anything that uses find_free_spot would now
1315	* need extra work	1352	* need extra work
…		…
1342	// from here :/	1379	// from here :/
1343	op->nrof += tmp->nrof;	1380	op->nrof += tmp->nrof;
1344	tmp->destroy ();	1381	tmp->destroy ();
1345	}	1382	}
1346		1383
1347	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1384	op->clr_flag (FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1348	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1385	op->clr_flag (FLAG_INV_LOCKED);
1349		1386
1350	if (!QUERY_FLAG (op, FLAG_ALIVE))	1387	if (!op->flag [FLAG_ALIVE])
1351	CLEAR_FLAG (op, FLAG_NO_STEAL);	1388	op->clr_flag (FLAG_NO_STEAL);
1352		1389
1353	if (flag & INS_BELOW_ORIGINATOR)	1390	if (flag & INS_BELOW_ORIGINATOR)
1354	{	1391	{
1355	if (originator->map != op->map \|\| originator->x != op->x \|\| originator->y != op->y)	1392	if (originator->map != op->map \|\| originator->x != op->x \|\| originator->y != op->y)
1356	{	1393	{
…		…
1391	* when lots of spells are cast in one area. Currently, it is presumed	1428	* when lots of spells are cast in one area. Currently, it is presumed
1392	* that flying non pickable objects are spell objects.	1429	* that flying non pickable objects are spell objects.
1393	*/	1430	*/
1394	for (object *tmp = ms.bot; tmp; tmp = tmp->above)	1431	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1395	{	1432	{
1396	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) \|\| QUERY_FLAG (tmp, FLAG_OVERLAY_FLOOR))	1433	if (tmp->flag [FLAG_IS_FLOOR] \|\| tmp->flag [FLAG_OVERLAY_FLOOR])
1397	floor = tmp;	1434	floor = tmp;
1398		1435
1399	if (QUERY_FLAG (tmp, FLAG_NO_PICK) && (tmp->move_type & (MOVE_FLY_LOW \| MOVE_FLY_HIGH)) && !QUERY_FLAG (tmp, FLAG_IS_FLOOR))	1436	if (tmp->flag [FLAG_NO_PICK] && (tmp->move_type & (MOVE_FLY_LOW \| MOVE_FLY_HIGH)) && !tmp->flag [FLAG_IS_FLOOR])
1400	{	1437	{
1401	/* We insert above top, so we want this object below this */	1438	/* We insert above top, so we want this object below this */
1402	top = tmp->below;	1439	top = tmp->below;
1403	break;	1440	break;
1404	}	1441	}
…		…
1422	&& (op->face && !faces [op->face].visibility))	1459	&& (op->face && !faces [op->face].visibility))
1423	{	1460	{
1424	object *last;	1461	object *last;
1425		1462
1426	for (last = top; last != floor; last = last->below)	1463	for (last = top; last != floor; last = last->below)
1427	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1464	if (last->flag [FLAG_BLOCKSVIEW] && (last->type != EXIT))
1428	break;	1465	break;
1429		1466
1430	/* Check to see if we found the object that blocks view,	1467	/* Check to see if we found the object that blocks view,
1431	* and make sure we have a below pointer for it so that	1468	* and make sure we have a below pointer for it so that
1432	* we can get inserted below this one, which requires we	1469	* we can get inserted below this one, which requires we
…		…
1505	*/	1542	*/
1506		1543
1507	/* if this is not the head or flag has been passed, don't check walk on status */	1544	/* if this is not the head or flag has been passed, don't check walk on status */
1508	if (!(flag & INS_NO_WALK_ON) && op->is_head ())	1545	if (!(flag & INS_NO_WALK_ON) && op->is_head ())
1509	{	1546	{
1510	if (check_move_on (op, originator))	1547	if (check_move_on (op, originator, flag))
1511	return 0;	1548	return 0;
1512		1549
1513	/* If we are a multi part object, lets work our way through the check	1550	/* If we are a multi part object, let's work our way through the check
1514	* walk on's.	1551	* walk on's.
1515	*/	1552	*/
1516	for (object *tmp = op->more; tmp; tmp = tmp->more)	1553	for (object *tmp = op->more; tmp; tmp = tmp->more)
1517	if (check_move_on (tmp, originator))	1554	if (check_move_on (tmp, originator, flag))
1518	return 0;	1555	return 0;
1519	}	1556	}
1520		1557
1521	return op;	1558	return op;
1522	}	1559	}
…		…
1563	\|\| (items < m->max_items	1600	\|\| (items < m->max_items
1564	&& ms.volume () < m->max_volume))	1601	&& ms.volume () < m->max_volume))
1565	return true;	1602	return true;
1566		1603
1567	if (originator && originator->is_player ())	1604	if (originator && originator->is_player ())
1568	originator->contr->failmsg (format (	1605	originator->contr->failmsgf (
1569	"No matter how hard you try, you just cannot put the %s here H<Try to remove some items from the floor first.>",	1606	"No matter how hard you try, you just cannot put the %s here H<Try to remove some items from the floor first.>",
1570	query_name ()	1607	query_name ()
1571	));	1608	);
1572		1609
1573	return false;	1610	return false;
1574	}	1611	}
1575		1612
1576	/*	1613	/*
…		…
1588		1625
1589	nr = min (nr, nrof);	1626	nr = min (nr, nrof);
1590		1627
1591	if (nrof > nr)	1628	if (nrof > nr)
1592	{	1629	{
		1630	sint64 oweight = total_weight ();
		1631
1593	nrof -= nr;	1632	nrof -= nr;
1594	adjust_weight (env, -weight * max (1, nr)); // carrying == 0
1595		1633
1596	if (object *pl = visible_to ())	1634	if (object *pl = visible_to ())
1597	esrv_update_item (UPD_NROF, pl, this);	1635	esrv_update_item (UPD_NROF, pl, this);
		1636
		1637	adjust_weight (env, oweight, total_weight ());
1598		1638
1599	return true;	1639	return true;
1600	}	1640	}
1601	else	1641	else
1602	{	1642	{
…		…
1677	if (op->nrof)	1717	if (op->nrof)
1678	for (object *tmp = inv; tmp; tmp = tmp->below)	1718	for (object *tmp = inv; tmp; tmp = tmp->below)
1679	if (object::can_merge (tmp, op))	1719	if (object::can_merge (tmp, op))
1680	{	1720	{
1681	/* return the original object and remove inserted object	1721	/* return the original object and remove inserted object
1682	(client needs the original object) */	1722	(client prefers the original object) */
		1723
		1724	// carring must be 0 for mergable objects
		1725	sint64 oweight = tmp->weight * tmp->nrof;
		1726
1683	tmp->nrof += op->nrof;	1727	tmp->nrof += op->nrof;
1684		1728
1685	if (object *pl = tmp->visible_to ())	1729	if (object *pl = tmp->visible_to ())
1686	esrv_update_item (UPD_NROF, pl, tmp);	1730	esrv_update_item (UPD_NROF, pl, tmp);
1687		1731
1688	adjust_weight (this, op->total_weight ());	1732	adjust_weight (this, oweight, tmp->weight * tmp->nrof);
1689		1733
1690	op->destroy ();	1734	op->destroy ();
1691	op = tmp;	1735	op = tmp;
1692	goto inserted;	1736	goto inserted;
1693	}	1737	}
…		…
1709	op->flag [FLAG_REMOVED] = 0;	1753	op->flag [FLAG_REMOVED] = 0;
1710		1754
1711	if (object *pl = op->visible_to ())	1755	if (object *pl = op->visible_to ())
1712	esrv_send_item (pl, op);	1756	esrv_send_item (pl, op);
1713		1757
1714	adjust_weight (this, op->total_weight ());	1758	adjust_weight (this, 0, op->total_weight ());
1715		1759
1716	inserted:	1760	inserted:
1717	/* reset the light list and los of the players on the map */	1761	/* reset the light list and los of the players on the map */
1718	if (op->glow_radius && is_on_map ())	1762	if (op->glow_radius && is_on_map ())
1719	{	1763	{
…		…
1748	* MSW 2001-07-08: Check all objects on space, not just those below	1792	* MSW 2001-07-08: Check all objects on space, not just those below
1749	* object being inserted. insert_ob_in_map may not put new objects	1793	* object being inserted. insert_ob_in_map may not put new objects
1750	* on top.	1794	* on top.
1751	*/	1795	*/
1752	int	1796	int
1753	check_move_on (object op, object originator)	1797	check_move_on (object op, object originator, int flags)
1754	{	1798	{
1755	if (QUERY_FLAG (op, FLAG_NO_APPLY))	1799	if (op->flag [FLAG_NO_APPLY])
1756	return 0;	1800	return 0;
1757		1801
1758	object *tmp;	1802	object *tmp;
1759	maptile *m = op->map;	1803	maptile *m = op->map;
1760	int x = op->x, y = op->y;	1804	int x = op->x, y = op->y;
…		…
1797	* Second check makes sure that the movement types not being slowed	1841	* Second check makes sure that the movement types not being slowed
1798	* (~slow_move) is not blocked on this space - just because the	1842	* (~slow_move) is not blocked on this space - just because the
1799	* space doesn't slow down swimming (for example), if you can't actually	1843	* space doesn't slow down swimming (for example), if you can't actually
1800	* swim on that space, can't use it to avoid the penalty.	1844	* swim on that space, can't use it to avoid the penalty.
1801	*/	1845	*/
1802	if (!QUERY_FLAG (op, FLAG_WIZPASS))	1846	if (!op->flag [FLAG_WIZPASS])
1803	{	1847	{
1804	if ((!op->move_type && tmp->move_slow & MOVE_WALK) \|\|	1848	if ((!op->move_type && tmp->move_slow & MOVE_WALK) \|\|
1805	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))	1849	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1806	{	1850	{
1807	float diff = tmp->move_slow_penalty * fabs (op->speed);	1851	float diff = tmp->move_slow_penalty * fabs (op->speed);
…		…
1817		1861
1818	/* Basically same logic as above, except now for actual apply. */	1862	/* Basically same logic as above, except now for actual apply. */
1819	if ((!op->move_type && tmp->move_on & MOVE_WALK) \|\|	1863	if ((!op->move_type && tmp->move_on & MOVE_WALK) \|\|
1820	((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))	1864	((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))
1821	{	1865	{
		1866	if ((flags & INS_NO_AUTO_EXIT)
		1867	&& (tmp->type == EXIT \|\| tmp->type == TELEPORTER
		1868	\|\| tmp->type == HOLE \|\| tmp->type == TRAPDOOR)) //TODO: temporary, fix exits instead
		1869	continue;
		1870
1822	move_apply (tmp, op, originator);	1871	move_apply (tmp, op, originator);
1823		1872
1824	if (op->destroyed ())	1873	if (op->destroyed ())
1825	return 1;	1874	return 1;
1826		1875
…		…
1938	void	1987	void
1939	flag_inv (object *op, int flag)	1988	flag_inv (object *op, int flag)
1940	{	1989	{
1941	for (object *tmp = op->inv; tmp; tmp = tmp->below)	1990	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1942	{	1991	{
1943	SET_FLAG (tmp, flag);	1992	tmp->set_flag (flag);
1944	flag_inv (tmp, flag);	1993	flag_inv (tmp, flag);
1945	}	1994	}
1946	}	1995	}
1947		1996
1948	/*	1997	/*
…		…
1951	void	2000	void
1952	unflag_inv (object *op, int flag)	2001	unflag_inv (object *op, int flag)
1953	{	2002	{
1954	for (object *tmp = op->inv; tmp; tmp = tmp->below)	2003	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1955	{	2004	{
1956	CLEAR_FLAG (tmp, flag);	2005	tmp->clr_flag (flag);
1957	unflag_inv (tmp, flag);	2006	unflag_inv (tmp, flag);
1958	}	2007	}
1959	}	2008	}
1960		2009
1961	/*	2010	/*
…		…
2151	{	2200	{
2152	return (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);	2201	return (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);
2153	}	2202	}
2154		2203
2155	/*	2204	/*
2156	* find_dir_2(delta-x,delta-y) will return a direction in which	2205	* find_dir_2(delta-x,delta-y) will return a direction value
2157	* an object which has subtracted the x and y coordinates of another	2206	* for running into direct [dx, dy].
2158	* object, needs to travel toward it.	2207	* (the opposite of crossfire's find_dir_2!)
2159	*/	2208	*/
2160	int	2209	int
2161	find_dir_2 (int x, int y)	2210	find_dir_2 (int x, int y)
2162	{	2211	{
		2212	#if 1 // new algorithm
		2213	// this works by putting x, y into 16 sectors, which
		2214	// are not equal sized, but are a better approximation
		2215	// then the old algorithm, and then using a mapping
		2216	// table to map it into a direction value.
		2217	// basically, it maps these comparisons to each bit
		2218	// bit #3: x < 0
		2219	// bit #2: y < 0
		2220	// bit #1: x > y
		2221	// bit #0: x > 2y
		2222
		2223	static const uint8 dir[16] = {
		2224	4, 5, 4, 3,
		2225	2, 1, 2, 3,
		2226	6, 5, 6, 7,
		2227	8, 1, 8, 7,
		2228	};
		2229	int sector = 0;
		2230
		2231	// this is a bit ugly, but more likely to result in branchless code
		2232	sector \|= x < 0 ? 8 : 0;
		2233	x = x < 0 ? -x : x; // abs
		2234
		2235	sector \|= y < 0 ? 4 : 0;
		2236	y = y < 0 ? -y : y; // abs
		2237
		2238	if (x > y)
		2239	{
		2240	sector \|= 2;
		2241
		2242	if (x > y * 2)
		2243	sector \|= 1;
		2244	}
		2245	else
		2246	{
		2247	if (y > x * 2)
		2248	sector \|= 1;
		2249	else if (!y)
		2250	return 0; // x == 0 here
		2251	}
		2252
		2253	return dir [sector];
		2254	#else // old algorithm
2163	int q;	2255	int q;
2164		2256
2165	if (y)	2257	if (y)
2166	q = x * 100 / y;	2258	q = 128 * x / y;
2167	else if (x)	2259	else if (x)
2168	q = -300 * x;	2260	q = -512 * x; // to make it > 309
2169	else	2261	else
2170	return 0;	2262	return 0;
2171		2263
2172	if (y > 0)	2264	if (y > 0)
2173	{	2265	{
2174	if (q < -242)	2266	if (q < -309) return 7;
		2267	if (q < -52) return 6;
		2268	if (q < 52) return 5;
		2269	if (q < 309) return 4;
		2270
2175	return 3;	2271	return 3;
2176	if (q < -41)	2272	}
2177	return 2;	2273	else
2178	if (q < 41)	2274	{
2179	return 1;	2275	if (q < -309) return 3;
2180	if (q < 242)	2276	if (q < -52) return 2;
2181	return 8;	2277	if (q < 52) return 1;
		2278	if (q < 309) return 8;
		2279
2182	return 7;	2280	return 7;
2183	}	2281	}
2184		2282	#endif
2185	if (q < -242)
2186	return 7;
2187	if (q < -41)
2188	return 6;
2189	if (q < 41)
2190	return 5;
2191	if (q < 242)
2192	return 4;
2193
2194	return 3;
2195	}	2283	}
2196		2284
2197	/*	2285	/*
2198	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is	2286	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is
2199	* between two directions (which are expected to be absolute (see absdir())	2287	* between two directions (which are expected to be absolute (see absdir())
2200	*/	2288	*/
2201	int	2289	int
2202	dirdiff (int dir1, int dir2)	2290	dirdiff (int dir1, int dir2)
2203	{	2291	{
2204	int d;
2205
2206	d = abs (dir1 - dir2);	2292	int d = abs (dir1 - dir2);
2207	if (d > 4)
2208	d = 8 - d;
2209		2293
2210	return d;	2294	return d > 4 ? 8 - d : d;
2211	}	2295	}
2212		2296
2213	/* peterm:	2297	/* peterm:
2214	* do LOS stuff for ball lightning. Go after the closest VISIBLE monster.	2298	* do LOS stuff for ball lightning. Go after the closest VISIBLE monster.
2215	* Basically, this is a table of directions, and what directions	2299	* Basically, this is a table of directions, and what directions
…		…
2321	* Add a check so we can't pick up invisible objects (0.93.8)	2405	* Add a check so we can't pick up invisible objects (0.93.8)
2322	*/	2406	*/
2323	int	2407	int
2324	can_pick (const object who, const object item)	2408	can_pick (const object who, const object item)
2325	{	2409	{
2326	return /QUERY_FLAG(who,FLAG_WIZ)\|\| /	2410	return /who->flag [FLAG_WIZ]\|\| /
2327	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&	2411	(item->weight > 0 && !item->flag [FLAG_NO_PICK] &&
2328	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->is_player () \|\| item->weight < who->weight / 3));	2412	!item->flag [FLAG_ALIVE] && !item->invisible && (who->is_player () \|\| item->weight < who->weight / 3));
2329	}	2413	}
2330		2414
2331	/*	2415	/*
2332	* create clone from object to another	2416	* create clone from object to another
2333	*/	2417	*/
…		…
2365	return tmp;	2449	return tmp;
2366		2450
2367	return 0;	2451	return 0;
2368	}	2452	}
2369		2453
		2454	/* Zero the key_values on op, decrementing the shared-string
		2455	* refcounts and freeing the links.
		2456	*/
		2457	void
		2458	key_values::clear ()
		2459	{
		2460	for (key_value *kvp = first; kvp; )
		2461	{
		2462	key_value *next = kvp->next;
		2463	delete kvp;
		2464	kvp = next;
		2465	}
		2466
		2467	first = 0;
		2468	}
		2469
2370	shstr_tmp	2470	shstr_tmp
2371	object::kv_get (shstr_tmp key) const	2471	key_values::get (shstr_tmp key) const
2372	{	2472	{
2373	for (key_value *kv = key_values; kv; kv = kv->next)	2473	for (key_value *kv = first; kv; kv = kv->next)
2374	if (kv->key == key)	2474	if (kv->key == key)
2375	return kv->value;	2475	return kv->value;
2376		2476
2377	return shstr ();	2477	return shstr ();
2378	}	2478	}
2379		2479
2380	void	2480	void
		2481	key_values::add (shstr_tmp key, shstr_tmp value)
		2482	{
		2483	key_value *kv = new key_value;
		2484
		2485	kv->next = first;
		2486	kv->key = key;
		2487	kv->value = value;
		2488
		2489	first = kv;
		2490	}
		2491
		2492	void
2381	object::kv_set (shstr_tmp key, shstr_tmp value)	2493	key_values::set (shstr_tmp key, shstr_tmp value)
2382	{	2494	{
2383	for (key_value *kv = key_values; kv; kv = kv->next)	2495	for (key_value *kv = first; kv; kv = kv->next)
2384	if (kv->key == key)	2496	if (kv->key == key)
2385	{	2497	{
2386	kv->value = value;	2498	kv->value = value;
2387	return;	2499	return;
2388	}	2500	}
2389		2501
2390	key_value *kv = new key_value;	2502	add (key, value);
2391
2392	kv->next = key_values;
2393	kv->key = key;
2394	kv->value = value;
2395
2396	key_values = kv;
2397	}	2503	}
2398		2504
2399	void	2505	void
2400	object::kv_del (shstr_tmp key)	2506	key_values::del (shstr_tmp key)
2401	{	2507	{
2402	for (key_value *kvp = &key_values; kvp; kvp = &(*kvp)->next)	2508	for (key_value *kvp = &first; kvp; kvp = &(*kvp)->next)
2403	if ((*kvp)->key == key)	2509	if ((*kvp)->key == key)
2404	{	2510	{
2405	key_value kv = kvp;	2511	key_value kv = kvp;
2406	kvp = (kvp)->next;	2512	kvp = (kvp)->next;
2407	delete kv;	2513	delete kv;
2408	return;	2514	return;
2409	}	2515	}
		2516	}
		2517
		2518	void
		2519	key_values::reverse ()
		2520	{
		2521	key_value *prev = 0;
		2522	key_value *head = first;
		2523
		2524	while (head)
		2525	{
		2526	key_value *node = head;
		2527	head = head->next;
		2528	node->next = prev;
		2529	prev = node;
		2530	}
		2531
		2532	first = prev;
		2533	}
		2534
		2535	key_values &
		2536	key_values::operator =(const key_values &kv)
		2537	{
		2538	clear ();
		2539
		2540	for (key_value *kvp = kv.first; kvp; kvp = kvp->next)
		2541	add (kvp->key, kvp->value);
		2542
		2543	reverse ();
2410	}	2544	}
2411		2545
2412	object::depth_iterator::depth_iterator (object *container)	2546	object::depth_iterator::depth_iterator (object *container)
2413	: iterator_base (container)	2547	: iterator_base (container)
2414	{	2548	{
…		…
2594	object::force_add (shstr_tmp name, int duration)	2728	object::force_add (shstr_tmp name, int duration)
2595	{	2729	{
2596	if (object *force = force_find (name))	2730	if (object *force = force_find (name))
2597	force->destroy ();	2731	force->destroy ();
2598		2732
2599	object *force = get_archetype (FORCE_NAME);	2733	object *force = archetype::get (FORCE_NAME);
2600		2734
2601	force->slaying = name;	2735	force->slaying = name;
2602	force->force_set_timer (duration);	2736	force->force_set_timer (duration);
2603	force->flag [FLAG_APPLIED] = true;	2737	force->flag [FLAG_APPLIED] = true;
2604		2738
…		…
2673	}	2807	}
2674	else	2808	else
2675	move_type = mt;	2809	move_type = mt;
2676	}	2810	}
2677		2811
		2812	/* object should be a player.
		2813	* we return the object the player has marked with the 'mark' command
		2814	* below. If no match is found (or object has changed), we return
		2815	* NULL. We leave it up to the calling function to print messages if
		2816	* nothing is found.
		2817	*/
		2818	object *
		2819	object::mark () const
		2820	{
		2821	if (contr && contr->mark && contr->mark->env == this)
		2822	return contr->mark;
		2823	else
		2824	return 0;
		2825	}
		2826
		2827	// put marked object first in the inventory
		2828	// this is used by identify-like spells so players can influence
		2829	// the order a bit.
		2830	void
		2831	object::splay_marked ()
		2832	{
		2833	if (object *marked = mark ())
		2834	splay (marked);
		2835	}
		2836

Diff Legend

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

Comparing deliantra/server/common/object.C (file contents): Revision 1.318 by root, Sat Apr 3 02:27:24 2010 UTC vs. Revision 1.347 by root, Wed May 4 07:41:13 2011 UTC

Diff Legend

Comparing deliantra/server/common/object.C (file contents):
Revision 1.318 by root, Sat Apr 3 02:27:24 2010 UTC vs.
Revision 1.347 by root, Wed May 4 07:41:13 2011 UTC