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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.317 by root, Fri Apr 2 03:41:24 2010 UTC vs.
Revision 1.363 by root, Sun Jan 29 02:47:04 2017 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,2012,2013,2014,2015,2016 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
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.
12	*	12	*
13	* This program is distributed in the hope that it will be useful,	13	* This program is distributed in the hope that it will be useful,
14	* but WITHOUT ANY WARRANTY; without even the implied warranty of	14	* but WITHOUT ANY WARRANTY; without even the implied warranty of
15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16	* GNU General Public License for more details.	16	* GNU General Public License for more details.
17	*	17	*
18	* You should have received a copy of the Affero GNU General Public License	18	* You should have received a copy of the Affero GNU General Public License
19	* and the GNU General Public License along with this program. If not, see	19	* and the GNU General Public License along with this program. If not, see
20	* <http://www.gnu.org/licenses/>.	20	* <http://www.gnu.org/licenses/>.
21	*	21	*
22	* The authors can be reached via e-mail to <support@deliantra.net>	22	* The authors can be reached via e-mail to <support@deliantra.net>
23	*/	23	*/
24		24
25	#include <global.h>	25	#include <global.h>
26	#include <stdio.h>	26	#include <stdio.h>
36	static const uint64 UUID_GAP = 1<<19;	36	static const uint64 UUID_GAP = 1<<19;
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
		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;
41		47
42	//+GPL	48	//+GPL
43		49
44	short freearr_x[SIZEOFFREE] = {	50	short freearr_x[SIZEOFFREE] = {
45	0,	51	0,
…		…
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
…		…
325	/* inventory ok - still need to check rest of this object to see	351	/* inventory ok - still need to check rest of this object to see
326	* if it is valid.	352	* if it is valid.
327	*/	353	*/
328	}	354	}
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	/* Not 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 weight_t
426	weight_adjust_for (object *op, sint32 weight)	452	weight_adjust_for (object *op, weight_t weight)
427	{	453	{
428	return op->type == CONTAINER	454	if (op->type == CONTAINER)
429	? lerp (weight, 0, 100, 0, 100 - op->stats.Str)	455	weight -= weight * op->stats.Str / 100;
430	: weight;
431	}
432		456
		457	return weight;
		458	}
		459
433	/*	460	/*
434	* adjust_weight(object, weight) adds the specified weight to an object,	461	* subtracts, then adds, the specified weight to an object,
435	* and also updates how much the environment(s) is/are carrying.	462	* and also updates how much the environment(s) is/are carrying.
436	*/	463	*/
437	static void	464	static void
438	adjust_weight (object *op, sint32 weight)	465	adjust_weight (object *op, weight_t sub, weight_t add)
439	{	466	{
440	while (op)	467	while (op)
441	{	468	{
442	// adjust by actual difference to account for rounding errors	469	weight_t carrying = (weight_t)op->carrying
443	// i.e. (w2 - w1) / f != w2 / f - w1 / f and the latter is correct	470	- weight_adjust_for (op, sub)
444	weight = weight_adjust_for (op, op->carrying)	471	+ weight_adjust_for (op, add);
445	- weight_adjust_for (op, op->carrying - weight);
446		472
447	if (!weight)	473	sub = op->carrying;
448	return;
449
450	op->carrying += weight;	474	op->carrying = carrying;
		475	add = op->carrying;
451		476
452	if (object *pl = op->visible_to ())	477	if (object *pl = op->visible_to ())
453	if (pl != op) // player is handled lazily	478	if (pl != op) // player is handled lazily
454	esrv_update_item (UPD_WEIGHT, pl, op);	479	esrv_update_item (UPD_WEIGHT, pl, op);
455		480
…		…
463	* containers are carrying, and sums it up.	488	* containers are carrying, and sums it up.
464	*/	489	*/
465	void	490	void
466	object::update_weight ()	491	object::update_weight ()
467	{	492	{
468	sint32 sum = 0;	493	weight_t sum = 0;
469		494
470	for (object *op = inv; op; op = op->below)	495	for (object *op = inv; op; op = op->below)
471	{	496	{
472	if (op->inv)
473	op->update_weight ();	497	op->update_weight ();
474		498
475	sum += op->total_weight ();	499	sum += weight_adjust_for (this, op->total_weight ());
476	}	500	}
477
478	sum = weight_adjust_for (this, sum);
479		501
480	if (sum != carrying)	502	if (sum != carrying)
481	{	503	{
		504	if (carrying != sum && carrying)//D
		505	LOG (llevDebug, "updating carrying got %ld, expected %ld (%s)\n",
		506	(long long)sum, (long long)carrying, debug_desc ());
		507
482	carrying = sum;	508	carrying = sum;
483		509
484	if (object *pl = visible_to ())	510	if (object *pl = visible_to ())
485	if (pl != this) // player is handled lazily	511	if (pl != this) // player is handled lazily
486	esrv_update_item (UPD_WEIGHT, pl, this);	512	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 ());	598	LOG (llevError \| logBacktrace, "tried to set owner of %s to %s\n", debug_desc (), owner->debug_desc ());
573	return;	599	return;
574	}	600	}
575		601
576	this->owner = owner;	602	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	bool
597	object::change_weapon (object *ob)
598	{
599	if (current_weapon == ob)
600	return true;
601
602	if (current_weapon && current_weapon->flag [FLAG_APPLIED])
603	{
604	manual_apply (this, current_weapon, AP_UNAPPLY);
605
606	if (current_weapon && !current_weapon->flag [FLAG_APPLIED])//D
607	LOG (llevError, "FATAL: did not clear current_weapon (%s)\n", current_weapon->debug_desc ());
608
609	if (current_weapon && current_weapon->flag [FLAG_APPLIED])
610	return false;
611	}
612
613	current_weapon = 0;
614
615	if (ob && !ob->flag [FLAG_APPLIED])
616	{
617	manual_apply (this, ob, AP_APPLY);
618
619	if (ob->flag [FLAG_APPLIED])
620	current_weapon = ob;
621	else
622	return false;
623	}
624
625	return true;
626	}
627
628	/* Zero the key_values on op, decrementing the shared-string
629	* refcounts and freeing the links.
630	*/
631	static void
632	free_key_values (object *op)
633	{
634	for (key_value *i = op->key_values; i; )
635	{
636	key_value *next = i->next;
637	delete i;
638
639	i = next;
640	}
641
642	op->key_values = 0;
643	}	603	}
644		604
645	/*	605	/*
646	* copy_to first frees everything allocated by the dst object,	606	* copy_to first frees everything allocated by the dst object,
647	* and then copies the contents of itself into the second	607	* and then copies the contents of itself into the second
…		…
653	void	613	void
654	object::copy_to (object *dst)	614	object::copy_to (object *dst)
655	{	615	{
656	dst->remove ();	616	dst->remove ();
657	(object_copy )dst = *this;	617	(object_copy )dst = *this;
		618
		619	// maybe move to object_copy?
		620	dst->kv = kv;
		621
658	dst->flag [FLAG_REMOVED] = true;	622	dst->flag [FLAG_REMOVED] = true;
659
660	/* Copy over key_values, if any. */
661	if (key_values)
662	{
663	key_value *tail = 0;
664	dst->key_values = 0;
665
666	for (key_value *i = key_values; i; i = i->next)
667	{
668	key_value *new_link = new key_value;
669
670	new_link->next = 0;
671	new_link->key = i->key;
672	new_link->value = i->value;
673
674	/* Try and be clever here, too. */
675	if (!dst->key_values)
676	{
677	dst->key_values = new_link;
678	tail = new_link;
679	}
680	else
681	{
682	tail->next = new_link;
683	tail = new_link;
684	}
685	}
686	}
687
688	dst->activate ();	623	dst->activate ();
689	}	624	}
690		625
691	void	626	void
692	object::instantiate ()	627	object::instantiate ()
693	{	628	{
694	if (!uuid.seq) // HACK	629	if (!uuid.seq) // HACK
695	uuid = UUID::gen ();	630	uuid = UUID::gen ();
696		631
697	// TODO: unclean state changes, should nt be done in copy_to AND instantiate	632	// TODO: unclean state changes, should not be done in copy_to AND instantiate
698	if (flag [FLAG_RANDOM_SPEED] && speed)	633	if (flag [FLAG_RANDOM_SPEED] && speed)
699	speed_left = - speed - rndm (); // TODO animation	634	speed_left = - speed - rndm (); // TODO animation
700	else	635	else
701	speed_left = -1.;	636	speed_left = -1.;
702		637
703	/* copy the body_info to the body_used - this is only really	638	/* copy the body_info to the body_used - this is only really
704	* need for monsters, but doesn't hurt to do it for everything.	639	* need for monsters, but doesn't hurt to do it for everything.
705	* by doing so, when a monster is created, it has good starting	640	* by doing so, when a monster is created, it has good starting
706	* values for the body_used info, so when items are created	641	* values for the body_used info, so when items are created
707	* for it, they can be properly equipped.	642	* for it, they can be properly equipped.
708	*/	643	*/
709	for (int i = NUM_BODY_LOCATIONS; i--; )	644	for (int i = NUM_BODY_LOCATIONS; i--; )
710	slot[i].used = slot[i].info;	645	slot[i].used = slot[i].info;
711		646
…		…
732	* be called to update the face variable, _and_ how it looks on the map.	667	* be called to update the face variable, _and_ how it looks on the map.
733	*/	668	*/
734	void	669	void
735	update_turn_face (object *op)	670	update_turn_face (object *op)
736	{	671	{
737	if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) \|\| !op->arch)	672	if (!op->flag [FLAG_IS_TURNABLE] \|\| !op->arch)
738	return;	673	return;
739		674
740	SET_ANIMATION (op, op->direction);	675	SET_ANIMATION (op, op->direction);
741	update_object (op, UP_OBJ_FACE);	676	update_object (op, UP_OBJ_FACE);
742	}	677	}
…		…
803	}	738	}
804		739
805	mapspace &m = op->ms ();	740	mapspace &m = op->ms ();
806		741
807	if (!(m.flags_ & P_UPTODATE))	742	if (!(m.flags_ & P_UPTODATE))
808	/* nop */;	743	m.update_up (); // nothing to do except copy up
809	else if (action == UP_OBJ_INSERT)	744	else if (action == UP_OBJ_INSERT)
810	{	745	{
811	#if 0	746	#if 0
812	// this is likely overkill, TODO: revisit (schmorp)	747	// this is likely overkill, TODO: revisit (schmorp)
813	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))	748	if ((op->flag [FLAG_BLOCKSVIEW] && !(m.flags_ & P_BLOCKSVIEW))
814	\|\| (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))	749	\|\| (op->flag [FLAG_NO_MAGIC] && !(m.flags_ & P_NO_MAGIC))
815	\|\| (op->is_player () && !(m.flags_ & P_PLAYER))	750	\|\| (op->is_player () && !(m.flags_ & P_PLAYER))
816	\|\| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))	751	\|\| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
817	\|\| (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))	752	\|\| (op->flag [FLAG_ALIVE] && !(m.flags_ & P_IS_ALIVE))
818	\|\| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))	753	\|\| (op->flag [FLAG_DAMNED] && !(m.flags_ & P_NO_CLERIC))
819	\|\| (m.move_on \| op->move_on ) != m.move_on	754	\|\| (m.move_on \| op->move_on ) != m.move_on
820	\|\| (m.move_off \| op->move_off ) != m.move_off	755	\|\| (m.move_off \| op->move_off ) != m.move_off
821	\|\| (m.move_slow \| op->move_slow) != m.move_slow	756	\|\| (m.move_slow \| op->move_slow) != m.move_slow
822	/* This isn't perfect, but I don't expect a lot of objects to	757	/* This isn't perfect, but I don't expect a lot of objects to
823	* have move_allow right now.	758	* have move_allow right now.
824	*/	759	*/
825	\|\| ((m.move_block \| op->move_block) & ~op->move_allow) != m.move_block	760	\|\| ((m.move_block \| op->move_block) & ~op->move_allow) != m.move_block
826	m.invalidate ();	761	m.invalidate ();
827	#else	762	#else
828	// the above is not strong enough a test to skip updating. los maybe? TODO (schmorp)	763	// the above is not strong enough a test to skip updating. los maybe? TODO (schmorp)
…		…
834	* that is being removed.	769	* that is being removed.
835	*/	770	*/
836	else if (action == UP_OBJ_CHANGE \|\| action == UP_OBJ_REMOVE)	771	else if (action == UP_OBJ_CHANGE \|\| action == UP_OBJ_REMOVE)
837	m.invalidate ();	772	m.invalidate ();
838	else if (action == UP_OBJ_FACE)	773	else if (action == UP_OBJ_FACE)
839	/* Nothing to do for that case */ ;	774	m.update_up (); // nothing to do for that case, except copy up
840	else	775	else
841	LOG (llevError, "update_object called with invalid action: %d\n", action);	776	LOG (llevError, "update_object called with invalid action: %d\n", action);
842		777
843	if (op->more)	778	if (op->more)
844	update_object (op->more, action);	779	update_object (op->more, action);
845	}	780	}
846		781
847	object::object ()	782	object::object ()
848	{	783	{
849	SET_FLAG (this, FLAG_REMOVED);	784	this->set_flag (FLAG_REMOVED);
850		785
851	//expmul = 1.0; declared const for the time being	786	//expmul = 1.0; declared const for the time being
852	face = blank_face;	787	face = blank_face;
853	material = MATERIAL_NULL;	788	material = MATERIAL_NULL;
854	}	789	}
855		790
856	object::~object ()	791	object::~object ()
857	{	792	{
858	unlink ();	793	unlink ();
859		794
860	free_key_values (this);	795	kv.clear ();
861	}	796	}
862
863	static int object_count;
864		797
865	void object::link ()	798	void object::link ()
866	{	799	{
867	assert (!index);//D	800	assert (!index);//D
868	uuid = UUID::gen ();	801	uuid = UUID::gen ();
869	count = ++object_count;
870		802
871	refcnt_inc ();	803	refcnt_inc ();
872	objects.insert (this);	804	objects.insert (this);
		805
		806	++create_count;
		807
873	}	808	}
874		809
875	void object::unlink ()	810	void object::unlink ()
876	{	811	{
877	if (!index)	812	if (!index)
878	return;	813	return;
		814
		815	++destroy_count;
879		816
880	objects.erase (this);	817	objects.erase (this);
881	refcnt_dec ();	818	refcnt_dec ();
882	}	819	}
883		820
…		…
906	op->activate_recursive ();	843	op->activate_recursive ();
907	}	844	}
908		845
909	/* This function removes object 'op' from the list of active	846	/* This function removes object 'op' from the list of active
910	* objects.	847	* objects.
911	* This should only be used for style maps or other such	848	* This should only be used for style maps or other such
912	* reference maps where you don't want an object that isn't	849	* reference maps where you don't want an object that isn't
913	* in play chewing up cpu time getting processed.	850	* in play chewing up cpu time getting processed.
914	* The reverse of this is to call update_ob_speed, which	851	* The reverse of this is to call update_ob_speed, which
915	* will do the right thing based on the speed of the object.	852	* will do the right thing based on the speed of the object.
916	*/	853	*/
…		…
962	* if some form of movement is allowed, let objects	899	* if some form of movement is allowed, let objects
963	* drop on that space.	900	* drop on that space.
964	*/	901	*/
965	if (!drop_to_ground	902	if (!drop_to_ground
966	\|\| !map	903	\|\| !map
967	\|\| map->in_memory != MAP_ACTIVE	904	\|\| !map->linkable ()
968	\|\| map->no_drop	905	\|\| map->no_drop
969	\|\| ms ().move_block == MOVE_ALL)	906	\|\| ms ().move_block == MOVE_ALL)
970	{	907	{
971	while (inv)	908	while (inv)
972	inv->destroy ();	909	inv->destroy ();
…		…
988	map->insert (op, x, y);	925	map->insert (op, x, y);
989	}	926	}
990	}	927	}
991	}	928	}
992		929
		930	/*
		931	* Remove and free all objects in the inventory of the given object.
		932	* Unlike destroy_inv, this assumes the *this is destroyed as well
		933	* well, so we can (and have to!) take shortcuts.
		934	*/
		935	void
		936	object::destroy_inv_fast ()
		937	{
		938	while (object *op = inv)
		939	{
		940	// remove from object the fast way
		941	op->flag [FLAG_REMOVED] = true;
		942	op->env = 0;
		943	if ((inv = inv->below))
		944	inv->above = 0;
		945
		946	// then destroy
		947	op->destroy ();
		948	}
		949	}
		950
		951	void
		952	object::freelist_free (int count)
		953	{
		954	while (count-- && freelist)
		955	{
		956	freelist_item *next = freelist->next;
		957	// count is being "destroyed"
		958
		959	sfree ((char *)freelist, sizeof (object));
		960
		961	freelist = next;
		962	--free_count;
		963	}
		964	}
		965
		966	object *
993	object *object::create ()	967	object::create ()
994	{	968	{
995	object *op = new object;	969	object *op;
		970
		971	if (freelist)
		972	{
		973	freelist_item li = *freelist;
		974	memset (freelist, 0, sizeof (object));
		975
		976	op = new (freelist) object;
		977	op->count = li.count;
		978
		979	freelist = li.next;
		980	--free_count;
		981	}
		982	else
		983	{
		984	void *ni = salloc0<char> (sizeof (object));
		985
		986	op = new(ni) object;
		987
		988	op->count = ++object_count;
		989	}
		990
996	op->link ();	991	op->link ();
		992
997	return op;	993	return op;
998	}	994	}
999		995
1000	static struct freed_map : maptile	996	void
		997	object::do_delete ()
1001	{	998	{
1002	freed_map ()	999	uint32_t count = this->count;
1003	{
1004	path = "<freed objects map>";
1005	name = "/internal/freed_objects_map";
1006	width = 3;
1007	height = 3;
1008	no_drop = 1;
1009	no_reset = 1;
1010		1000
1011	alloc ();	1001	this->~object ();
1012	in_memory = MAP_ACTIVE;
1013	}
1014		1002
1015	~freed_map ()	1003	freelist_item li = (freelist_item )this;
1016	{	1004	li->next = freelist;
1017	destroy ();	1005	li->count = count;
1018	}	1006
1019	} freed_map; // freed objects are moved here to avoid crashes	1007	freelist = li;
		1008	++free_count;
		1009	}
1020		1010
1021	void	1011	void
1022	object::do_destroy ()	1012	object::do_destroy ()
1023	{	1013	{
1024	if (flag [FLAG_IS_LINKED])	1014	if (flag [FLAG_IS_LINKED])
…		…
1067	LOG (llevError \| logBacktrace, "tried to destroy the tail of an object");	1057	LOG (llevError \| logBacktrace, "tried to destroy the tail of an object");
1068	head->destroy ();	1058	head->destroy ();
1069	return;	1059	return;
1070	}	1060	}
1071		1061
1072	destroy_inv (false);	1062	destroy_inv_fast ();
1073		1063
1074	if (is_head ())	1064	if (is_head ())
1075	if (sound_destroy)	1065	if (sound_destroy)
1076	play_sound (sound_destroy);	1066	play_sound (sound_destroy);
1077	else if (flag [FLAG_MONSTER])	1067	else if (flag [FLAG_MONSTER])
…		…
1098	flag [FLAG_REMOVED] = true;	1088	flag [FLAG_REMOVED] = true;
1099		1089
1100	if (more)	1090	if (more)
1101	more->remove ();	1091	more->remove ();
1102		1092
1103	/*	1093	/*
1104	* In this case, the object to be removed is in someones	1094	* In this case, the object to be removed is in someones
1105	* inventory.	1095	* inventory.
1106	*/	1096	*/
1107	if (env)	1097	if (env)
1108	{	1098	{
1109	flag [FLAG_REMOVED] = false; // hack around the issue of visible_to checking flag_removed	1099	flag [FLAG_REMOVED] = false; // hack around the issue of visible_to checking flag_removed
1110	if (object *pl = visible_to ())	1100	if (object *pl = visible_to ())
1111	esrv_del_item (pl->contr, count);	1101	esrv_del_item (pl->contr, count);
1112	flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed	1102	flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed
1113		1103
1114	adjust_weight (env, -total_weight ());	1104	adjust_weight (env, total_weight (), 0);
1115		1105
1116	object *pl = in_player ();	1106	object *pl = in_player ();
1117		1107
1118	/* we set up values so that it could be inserted into	1108	/* we set up values so that it could be inserted into
1119	* the map, but we don't actually do that - it is up	1109	* the map, but we don't actually do that - it is up
…		…
1133		1123
1134	if (pl && pl->is_player ())	1124	if (pl && pl->is_player ())
1135	{	1125	{
1136	if (expect_false (pl->contr->combat_ob == this))	1126	if (expect_false (pl->contr->combat_ob == this))
1137	{	1127	{
1138	pl->apply (pl->contr->combat_ob, AP_UNAPPLY);	1128	pl->apply (pl->contr->combat_ob, AP_UNAPPLY \| AP_IGNORE_CURSE);
1139	pl->contr->combat_ob = 0;	1129	pl->contr->combat_ob = 0;
1140	if (pl->contr->ranged_ob) pl->apply (pl->contr->ranged_ob);	1130	if (pl->contr->ranged_ob) pl->apply (pl->contr->ranged_ob);
1141	}	1131	}
1142		1132
1143	if (expect_false (pl->contr->ranged_ob == this))	1133	if (expect_false (pl->contr->ranged_ob == this))
1144	{	1134	{
1145	pl->apply (pl->contr->ranged_ob, AP_UNAPPLY);	1135	pl->apply (pl->contr->ranged_ob, AP_UNAPPLY \| AP_IGNORE_CURSE);
1146	pl->contr->ranged_ob = 0;	1136	pl->contr->ranged_ob = 0;
1147	if (pl->contr->combat_ob) pl->apply (pl->contr->combat_ob);	1137	if (pl->contr->combat_ob) pl->apply (pl->contr->combat_ob);
1148	}	1138	}
1149		1139
1150	pl->contr->queue_stats_update ();	1140	pl->contr->queue_stats_update ();
…		…
1177	else if (pl->container_ () == this)	1167	else if (pl->container_ () == this)
1178	{	1168	{
1179	// removing a container should close it	1169	// removing a container should close it
1180	close_container ();	1170	close_container ();
1181	}	1171	}
1182		1172	else
1183	esrv_del_item (pl->contr, count);	1173	esrv_del_item (pl->contr, count);
1184	}	1174	}
1185		1175
1186	/* link the object above us */	1176	/* link the object above us */
1187	// re-link, make sure compiler can easily use cmove	1177	// re-link, make sure compiler can easily use cmove
1188	*(above ? &above->below : &ms.top) = below;	1178	*(above ? &above->below : &ms.top) = below;
…		…
1190		1180
1191	above = 0;	1181	above = 0;
1192	below = 0;	1182	below = 0;
1193		1183
1194	ms.invalidate ();	1184	ms.invalidate ();
1195
1196	if (map->in_memory == MAP_SAVING)
1197	return;
1198		1185
1199	int check_walk_off = !flag [FLAG_NO_APPLY];	1186	int check_walk_off = !flag [FLAG_NO_APPLY];
1200		1187
1201	if (object *pl = ms.player ())	1188	if (object *pl = ms.player ())
1202	{	1189	{
…		…
1337	{	1324	{
1338	op->remove ();	1325	op->remove ();
1339		1326
1340	if (m == &freed_map)//D TODO: remove soon	1327	if (m == &freed_map)//D TODO: remove soon
1341	{//D	1328	{//D
1342	LOG (llevError \| logBacktrace, "tries to insret object on freed objects map: %s", op->debug_desc ());//D	1329	LOG (llevError \| logBacktrace, "tries to insert object on freed objects map: %s", op->debug_desc ());//D
1343	}//D	1330	}//D
1344		1331
1345	/* Ideally, the caller figures this out. However, it complicates a lot	1332	/* Ideally, the caller figures this out. However, it complicates a lot
1346	* of areas of callers (eg, anything that uses find_free_spot would now	1333	* of areas of callers (eg, anything that uses find_free_spot would now
1347	* need extra work	1334	* need extra work
…		…
1374	// from here :/	1361	// from here :/
1375	op->nrof += tmp->nrof;	1362	op->nrof += tmp->nrof;
1376	tmp->destroy ();	1363	tmp->destroy ();
1377	}	1364	}
1378		1365
1379	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1366	op->clr_flag (FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1380	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1367	op->clr_flag (FLAG_INV_LOCKED);
1381		1368
1382	if (!QUERY_FLAG (op, FLAG_ALIVE))	1369	if (!op->flag [FLAG_ALIVE])
1383	CLEAR_FLAG (op, FLAG_NO_STEAL);	1370	op->clr_flag (FLAG_NO_STEAL);
1384		1371
1385	if (flag & INS_BELOW_ORIGINATOR)	1372	if (flag & INS_BELOW_ORIGINATOR)
1386	{	1373	{
1387	if (originator->map != op->map \|\| originator->x != op->x \|\| originator->y != op->y)	1374	if (originator->map != op->map \|\| originator->x != op->x \|\| originator->y != op->y)
1388	{	1375	{
…		…
1416	* We've already dealt with merging if appropriate.	1403	* We've already dealt with merging if appropriate.
1417	* Generally, we want to put the new object on top. But if	1404	* Generally, we want to put the new object on top. But if
1418	* flag contains INS_ABOVE_FLOOR_ONLY, once we find the last	1405	* flag contains INS_ABOVE_FLOOR_ONLY, once we find the last
1419	* floor, we want to insert above that and no further.	1406	* floor, we want to insert above that and no further.
1420	* Also, if there are spell objects on this space, we stop processing	1407	* Also, if there are spell objects on this space, we stop processing
1421	* once we get to them. This reduces the need to traverse over all of	1408	* once we get to them. This reduces the need to traverse over all of
1422	* them when adding another one - this saves quite a bit of cpu time	1409	* them when adding another one - this saves quite a bit of cpu time
1423	* when lots of spells are cast in one area. Currently, it is presumed	1410	* when lots of spells are cast in one area. Currently, it is presumed
1424	* that flying non pickable objects are spell objects.	1411	* that flying non pickable objects are spell objects.
1425	*/	1412	*/
1426	for (object *tmp = ms.bot; tmp; tmp = tmp->above)	1413	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1427	{	1414	{
1428	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) \|\| QUERY_FLAG (tmp, FLAG_OVERLAY_FLOOR))	1415	if (tmp->flag [FLAG_IS_FLOOR] \|\| tmp->flag [FLAG_OVERLAY_FLOOR])
1429	floor = tmp;	1416	floor = tmp;
1430		1417
1431	if (QUERY_FLAG (tmp, FLAG_NO_PICK) && (tmp->move_type & (MOVE_FLY_LOW \| MOVE_FLY_HIGH)) && !QUERY_FLAG (tmp, FLAG_IS_FLOOR))	1418	if (tmp->flag [FLAG_NO_PICK] && (tmp->move_type & (MOVE_FLY_LOW \| MOVE_FLY_HIGH)) && !tmp->flag [FLAG_IS_FLOOR])
1432	{	1419	{
1433	/* We insert above top, so we want this object below this */	1420	/* We insert above top, so we want this object below this */
1434	top = tmp->below;	1421	top = tmp->below;
1435	break;	1422	break;
1436	}	1423	}
…		…
1454	&& (op->face && !faces [op->face].visibility))	1441	&& (op->face && !faces [op->face].visibility))
1455	{	1442	{
1456	object *last;	1443	object *last;
1457		1444
1458	for (last = top; last != floor; last = last->below)	1445	for (last = top; last != floor; last = last->below)
1459	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1446	if (last->flag [FLAG_BLOCKSVIEW] && (last->type != EXIT))
1460	break;	1447	break;
1461		1448
1462	/* Check to see if we found the object that blocks view,	1449	/* Check to see if we found the object that blocks view,
1463	* and make sure we have a below pointer for it so that	1450	* and make sure we have a below pointer for it so that
1464	* we can get inserted below this one, which requires we	1451	* we can get inserted below this one, which requires we
…		…
1537	*/	1524	*/
1538		1525
1539	/* if this is not the head or flag has been passed, don't check walk on status */	1526	/* if this is not the head or flag has been passed, don't check walk on status */
1540	if (!(flag & INS_NO_WALK_ON) && op->is_head ())	1527	if (!(flag & INS_NO_WALK_ON) && op->is_head ())
1541	{	1528	{
1542	if (check_move_on (op, originator))	1529	if (check_move_on (op, originator, flag))
1543	return 0;	1530	return 0;
1544		1531
1545	/* If we are a multi part object, lets work our way through the check	1532	/* If we are a multi part object, let's work our way through the check
1546	* walk on's.	1533	* walk on's.
1547	*/	1534	*/
1548	for (object *tmp = op->more; tmp; tmp = tmp->more)	1535	for (object *tmp = op->more; tmp; tmp = tmp->more)
1549	if (check_move_on (tmp, originator))	1536	if (check_move_on (tmp, originator, flag))
1550	return 0;	1537	return 0;
1551	}	1538	}
1552		1539
1553	return op;	1540	return op;
1554	}	1541	}
1555		1542
1556	/* this function inserts an object in the map, but if it	1543	/* this function inserts an object in the map, but if it
1557	* finds an object of its own type, it'll remove that one first.	1544	* finds an object of its own type, it'll remove that one first.
1558	* op is the object to insert it under: supplies x and the map.	1545	* op is the object to insert it under: supplies x and the map.
1559	*/	1546	*/
1560	void	1547	void
1561	replace_insert_ob_in_map (shstr_tmp archname, object *op)	1548	replace_insert_ob_in_map (shstr_tmp archname, object *op)
1562	{	1549	{
…		…
1594	if (!items // testing !items ensures we can drop at least one item	1581	if (!items // testing !items ensures we can drop at least one item
1595	\|\| (items < m->max_items	1582	\|\| (items < m->max_items
1596	&& ms.volume () < m->max_volume))	1583	&& ms.volume () < m->max_volume))
1597	return true;	1584	return true;
1598		1585
1599	if (originator && originator->is_player ())	1586	if (originator)
1600	originator->contr->failmsg (format (	1587	originator->failmsgf (
1601	"No matter how hard you try, you just cannot put the %s here H<Try to remove some items from the floor first.>",	1588	"No matter how hard you try, you just cannot put the %s here! H<Try to remove some items from the floor first.>",
1602	query_name ()	1589	query_name ()
1603	));	1590	);
1604		1591
1605	return false;	1592	return false;
1606	}	1593	}
1607		1594
1608	/*	1595	/*
…		…
1620		1607
1621	nr = min (nr, nrof);	1608	nr = min (nr, nrof);
1622		1609
1623	if (nrof > nr)	1610	if (nrof > nr)
1624	{	1611	{
		1612	weight_t oweight = total_weight ();
		1613
1625	nrof -= nr;	1614	nrof -= nr;
1626	adjust_weight (env, -weight * max (1, nr)); // carrying == 0
1627		1615
1628	if (object *pl = visible_to ())	1616	if (object *pl = visible_to ())
1629	esrv_update_item (UPD_NROF, pl, this);	1617	esrv_update_item (UPD_NROF, pl, this);
		1618
		1619	adjust_weight (env, oweight, total_weight ());
1630		1620
1631	return true;	1621	return true;
1632	}	1622	}
1633	else	1623	else
1634	{	1624	{
…		…
1688	/*	1678	/*
1689	* env->insert (op)	1679	* env->insert (op)
1690	* This function inserts the object op in the linked list	1680	* This function inserts the object op in the linked list
1691	* inside the object environment.	1681	* inside the object environment.
1692	*	1682	*
1693	* The function returns now pointer to inserted item, and return value can	1683	* The function returns now pointer to inserted item, and return value can
1694	* be != op, if items are merged. -Tero	1684	* be != op, if items are merged. -Tero
1695	*/	1685	*/
1696	object *	1686	object *
1697	object::insert (object *op)	1687	object::insert (object *op)
1698	{	1688	{
…		…
1709	if (op->nrof)	1699	if (op->nrof)
1710	for (object *tmp = inv; tmp; tmp = tmp->below)	1700	for (object *tmp = inv; tmp; tmp = tmp->below)
1711	if (object::can_merge (tmp, op))	1701	if (object::can_merge (tmp, op))
1712	{	1702	{
1713	/* return the original object and remove inserted object	1703	/* return the original object and remove inserted object
1714	(client needs the original object) */	1704	(client prefers the original object) */
		1705
		1706	// carrying must be 0 for mergable objects
		1707	weight_t oweight = weight_t (tmp->weight) * tmp->nrof;
		1708
1715	tmp->nrof += op->nrof;	1709	tmp->nrof += op->nrof;
1716		1710
1717	if (object *pl = tmp->visible_to ())	1711	if (object *pl = tmp->visible_to ())
1718	esrv_update_item (UPD_NROF, pl, tmp);	1712	esrv_update_item (UPD_NROF, pl, tmp);
1719		1713
1720	adjust_weight (this, op->total_weight ());	1714	adjust_weight (this, oweight, weight_t (tmp->weight) * tmp->nrof);
1721		1715
1722	op->destroy ();	1716	op->destroy ();
1723	op = tmp;	1717	op = tmp;
1724	goto inserted;	1718	goto inserted;
1725	}	1719	}
…		…
1741	op->flag [FLAG_REMOVED] = 0;	1735	op->flag [FLAG_REMOVED] = 0;
1742		1736
1743	if (object *pl = op->visible_to ())	1737	if (object *pl = op->visible_to ())
1744	esrv_send_item (pl, op);	1738	esrv_send_item (pl, op);
1745		1739
1746	adjust_weight (this, op->total_weight ());	1740	adjust_weight (this, 0, op->total_weight ());
1747		1741
1748	inserted:	1742	inserted:
1749	/* reset the light list and los of the players on the map */	1743	/* reset the light list and los of the players on the map */
1750	if (op->glow_radius && is_on_map ())	1744	if (op->glow_radius && is_on_map ())
1751	{	1745	{
…		…
1780	* MSW 2001-07-08: Check all objects on space, not just those below	1774	* MSW 2001-07-08: Check all objects on space, not just those below
1781	* object being inserted. insert_ob_in_map may not put new objects	1775	* object being inserted. insert_ob_in_map may not put new objects
1782	* on top.	1776	* on top.
1783	*/	1777	*/
1784	int	1778	int
1785	check_move_on (object op, object originator)	1779	check_move_on (object op, object originator, int flags)
1786	{	1780	{
1787	if (QUERY_FLAG (op, FLAG_NO_APPLY))	1781	if (op->flag [FLAG_NO_APPLY])
1788	return 0;	1782	return 0;
1789		1783
1790	object *tmp;	1784	object *tmp;
1791	maptile *m = op->map;	1785	maptile *m = op->map;
1792	int x = op->x, y = op->y;	1786	int x = op->x, y = op->y;
…		…
1814	*/	1808	*/
1815	if ((op->move_type & ~move_on & ~move_block) != 0 && (op->move_type & ~move_slow & ~move_block) != 0)	1809	if ((op->move_type & ~move_on & ~move_block) != 0 && (op->move_type & ~move_slow & ~move_block) != 0)
1816	return 0;	1810	return 0;
1817		1811
1818	/* The objects have to be checked from top to bottom.	1812	/* The objects have to be checked from top to bottom.
1819	* Hence, we first go to the top:	1813	* Hence, we first go to the top:
1820	*/	1814	*/
1821	for (object next, tmp = ms.top; tmp; tmp = next)	1815	for (object next, tmp = ms.top; tmp; tmp = next)
1822	{	1816	{
1823	next = tmp->below;	1817	next = tmp->below;
1824		1818
…		…
1829	* Second check makes sure that the movement types not being slowed	1823	* Second check makes sure that the movement types not being slowed
1830	* (~slow_move) is not blocked on this space - just because the	1824	* (~slow_move) is not blocked on this space - just because the
1831	* space doesn't slow down swimming (for example), if you can't actually	1825	* space doesn't slow down swimming (for example), if you can't actually
1832	* swim on that space, can't use it to avoid the penalty.	1826	* swim on that space, can't use it to avoid the penalty.
1833	*/	1827	*/
1834	if (!QUERY_FLAG (op, FLAG_WIZPASS))	1828	if (!op->flag [FLAG_WIZPASS])
1835	{	1829	{
1836	if ((!op->move_type && tmp->move_slow & MOVE_WALK) \|\|	1830	if ((!op->move_type && tmp->move_slow & MOVE_WALK) \|\|
1837	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))	1831	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1838	{	1832	{
1839	float diff = tmp->move_slow_penalty * fabs (op->speed);	1833	float diff = tmp->move_slow_penalty * fabs (op->speed);
…		…
1849		1843
1850	/* Basically same logic as above, except now for actual apply. */	1844	/* Basically same logic as above, except now for actual apply. */
1851	if ((!op->move_type && tmp->move_on & MOVE_WALK) \|\|	1845	if ((!op->move_type && tmp->move_on & MOVE_WALK) \|\|
1852	((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))	1846	((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))
1853	{	1847	{
		1848	if ((flags & INS_NO_AUTO_EXIT)
		1849	&& (tmp->type == EXIT \|\| tmp->type == TELEPORTER
		1850	\|\| tmp->type == HOLE \|\| tmp->type == TRAPDOOR)) //TODO: temporary, fix exits instead
		1851	continue;
		1852
1854	move_apply (tmp, op, originator);	1853	move_apply (tmp, op, originator);
1855		1854
1856	if (op->destroyed ())	1855	if (op->destroyed ())
1857	return 1;	1856	return 1;
1858		1857
…		…
1970	void	1969	void
1971	flag_inv (object *op, int flag)	1970	flag_inv (object *op, int flag)
1972	{	1971	{
1973	for (object *tmp = op->inv; tmp; tmp = tmp->below)	1972	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1974	{	1973	{
1975	SET_FLAG (tmp, flag);	1974	tmp->set_flag (flag);
1976	flag_inv (tmp, flag);	1975	flag_inv (tmp, flag);
1977	}	1976	}
1978	}	1977	}
1979		1978
1980	/*	1979	/*
…		…
1983	void	1982	void
1984	unflag_inv (object *op, int flag)	1983	unflag_inv (object *op, int flag)
1985	{	1984	{
1986	for (object *tmp = op->inv; tmp; tmp = tmp->below)	1985	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1987	{	1986	{
1988	CLEAR_FLAG (tmp, flag);	1987	tmp->clr_flag (flag);
1989	unflag_inv (tmp, flag);	1988	unflag_inv (tmp, flag);
1990	}	1989	}
1991	}	1990	}
1992		1991
1993	/*	1992	/*
…		…
2003	* inform the caller. However, insert_ob_in_map will update as	2002	* inform the caller. However, insert_ob_in_map will update as
2004	* necessary, so the caller shouldn't need to do any special work.	2003	* necessary, so the caller shouldn't need to do any special work.
2005	* Note - updated to take an object instead of archetype - this is necessary	2004	* Note - updated to take an object instead of archetype - this is necessary
2006	* because arch_blocked (now ob_blocked) needs to know the movement type	2005	* because arch_blocked (now ob_blocked) needs to know the movement type
2007	* to know if the space in question will block the object. We can't use	2006	* to know if the space in question will block the object. We can't use
2008	* the archetype because that isn't correct if the monster has been	2007	* the archetype because that isn't correct if the monster has been
2009	* customized, changed states, etc.	2008	* customized, changed states, etc.
2010	*/	2009	*/
2011	int	2010	int
2012	find_free_spot (const object ob, maptile m, int x, int y, int start, int stop)	2011	find_free_spot (const object ob, maptile m, int x, int y, int start, int stop)
2013	{	2012	{
2014	int altern[SIZEOFFREE];	2013	int altern[SIZEOFFREE];
2015	int index = 0, flag;	2014	int index = 0;
2016		2015
2017	for (int i = start; i < stop; i++)	2016	for (int i = start; i < stop; i++)
2018	{	2017	{
2019	mapxy pos (m, x, y); pos.move (i);	2018	mapxy pos (m, x, y); pos.move (i);
2020		2019
…		…
2036	continue;	2035	continue;
2037	}	2036	}
2038		2037
2039	/* Basically, if we find a wall on a space, we cut down the search size.	2038	/* Basically, if we find a wall on a space, we cut down the search size.
2040	* In this way, we won't return spaces that are on another side of a wall.	2039	* In this way, we won't return spaces that are on another side of a wall.
2041	* This mostly work, but it cuts down the search size in all directions -	2040	* This mostly work, but it cuts down the search size in all directions -
2042	* if the space being examined only has a wall to the north and empty	2041	* if the space being examined only has a wall to the north and empty
2043	* spaces in all the other directions, this will reduce the search space	2042	* spaces in all the other directions, this will reduce the search space
2044	* to only the spaces immediately surrounding the target area, and	2043	* to only the spaces immediately surrounding the target area, and
2045	* won't look 2 spaces south of the target space.	2044	* won't look 2 spaces south of the target space.
2046	*/	2045	*/
…		…
2097		2096
2098	while (--end)	2097	while (--end)
2099	swap (arr [end], arr [rndm (end + 1)]);	2098	swap (arr [end], arr [rndm (end + 1)]);
2100	}	2099	}
2101		2100
2102	/* new function to make monster searching more efficient, and effective!	2101	/* new function to make monster searching more efficient, and effective!
2103	* This basically returns a randomized array (in the passed pointer) of	2102	* This basically returns a randomized array (in the passed pointer) of
2104	* the spaces to find monsters. In this way, it won't always look for	2103	* the spaces to find monsters. In this way, it won't always look for
2105	* monsters to the north first. However, the size of the array passed	2104	* monsters to the north first. However, the size of the array passed
2106	* covers all the spaces, so within that size, all the spaces within	2105	* covers all the spaces, so within that size, all the spaces within
2107	* the 3x3 area will be searched, just not in a predictable order.	2106	* the 3x3 area will be searched, just not in a predictable order.
…		…
2132	* there is capable of.	2131	* there is capable of.
2133	*/	2132	*/
2134	int	2133	int
2135	find_dir (maptile m, int x, int y, object exclude)	2134	find_dir (maptile m, int x, int y, object exclude)
2136	{	2135	{
2137	int max = SIZEOFFREE, mflags;	2136	int max = SIZEOFFREE;
2138	MoveType move_type;	2137	MoveType move_type;
2139		2138
2140	if (exclude && exclude->head_ () != exclude)	2139	if (exclude && exclude->head_ () != exclude)
2141	{	2140	{
2142	exclude = exclude->head;	2141	exclude = exclude->head;
…		…
2183	{	2182	{
2184	return (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);	2183	return (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);
2185	}	2184	}
2186		2185
2187	/*	2186	/*
2188	* find_dir_2(delta-x,delta-y) will return a direction in which	2187	* find_dir_2(delta-x,delta-y) will return a direction value
2189	* an object which has subtracted the x and y coordinates of another	2188	* for running into direct [dx, dy].
2190	* object, needs to travel toward it.	2189	* (the opposite of crossfire's find_dir_2!)
2191	*/	2190	*/
2192	int	2191	int
2193	find_dir_2 (int x, int y)	2192	find_dir_2 (int x, int y)
2194	{	2193	{
		2194	#if 1 // new algorithm
		2195	// this works by putting x, y into 16 sectors, which
		2196	// are not equal sized, but are a better approximation
		2197	// then the old algorithm, and then using a mapping
		2198	// table to map it into a direction value.
		2199	// basically, it maps these comparisons to each bit
		2200	// bit #3: x < 0
		2201	// bit #2: y < 0
		2202	// bit #1: x > y
		2203	// bit #0: x > 2y
		2204
		2205	static const uint8 dir[16] = {
		2206	4, 5, 4, 3,
		2207	2, 1, 2, 3,
		2208	6, 5, 6, 7,
		2209	8, 1, 8, 7,
		2210	};
		2211	int sector = 0;
		2212
		2213	// this is a bit ugly, but more likely to result in branchless code
		2214	sector \|= x < 0 ? 8 : 0;
		2215	x = x < 0 ? -x : x; // abs
		2216
		2217	sector \|= y < 0 ? 4 : 0;
		2218	y = y < 0 ? -y : y; // abs
		2219
		2220	if (x > y)
		2221	{
		2222	sector \|= 2;
		2223
		2224	if (x > y * 2)
		2225	sector \|= 1;
		2226	}
		2227	else
		2228	{
		2229	if (y > x * 2)
		2230	sector \|= 1;
		2231	else if (!y)
		2232	return 0; // x == 0 here
		2233	}
		2234
		2235	return dir [sector];
		2236	#else // old algorithm
2195	int q;	2237	int q;
2196		2238
2197	if (y)	2239	if (y)
2198	q = x * 100 / y;	2240	q = 128 * x / y;
2199	else if (x)	2241	else if (x)
2200	q = -300 * x;	2242	q = -512 * x; // to make it > 309
2201	else	2243	else
2202	return 0;	2244	return 0;
2203		2245
2204	if (y > 0)	2246	if (y > 0)
2205	{	2247	{
2206	if (q < -242)	2248	if (q < -309) return 7;
		2249	if (q < -52) return 6;
		2250	if (q < 52) return 5;
		2251	if (q < 309) return 4;
		2252
2207	return 3;	2253	return 3;
2208	if (q < -41)	2254	}
2209	return 2;	2255	else
2210	if (q < 41)	2256	{
2211	return 1;	2257	if (q < -309) return 3;
2212	if (q < 242)	2258	if (q < -52) return 2;
2213	return 8;	2259	if (q < 52) return 1;
		2260	if (q < 309) return 8;
		2261
2214	return 7;	2262	return 7;
2215	}	2263	}
2216		2264	#endif
2217	if (q < -242)
2218	return 7;
2219	if (q < -41)
2220	return 6;
2221	if (q < 41)
2222	return 5;
2223	if (q < 242)
2224	return 4;
2225
2226	return 3;
2227	}	2265	}
2228		2266
2229	/*	2267	/*
2230	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is	2268	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is
2231	* between two directions (which are expected to be absolute (see absdir())	2269	* between two directions (which are expected to be absolute (see absdir())
2232	*/	2270	*/
2233	int	2271	int
2234	dirdiff (int dir1, int dir2)	2272	dirdiff (int dir1, int dir2)
2235	{	2273	{
2236	int d;
2237
2238	d = abs (dir1 - dir2);	2274	int d = abs (dir1 - dir2);
2239	if (d > 4)
2240	d = 8 - d;
2241		2275
2242	return d;	2276	return d > 4 ? 8 - d : d;
2243	}	2277	}
2244		2278
2245	/* peterm:	2279	/* peterm:
2246	* do LOS stuff for ball lightning. Go after the closest VISIBLE monster.	2280	* do LOS stuff for ball lightning. Go after the closest VISIBLE monster.
2247	* Basically, this is a table of directions, and what directions	2281	* Basically, this is a table of directions, and what directions
…		…
2353	* Add a check so we can't pick up invisible objects (0.93.8)	2387	* Add a check so we can't pick up invisible objects (0.93.8)
2354	*/	2388	*/
2355	int	2389	int
2356	can_pick (const object who, const object item)	2390	can_pick (const object who, const object item)
2357	{	2391	{
2358	return /QUERY_FLAG(who,FLAG_WIZ)\|\| /	2392	return /who->flag [FLAG_WIZ]\|\| /
2359	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&	2393	(item->weight > 0 && !item->flag [FLAG_NO_PICK] &&
2360	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->is_player () \|\| item->weight < who->weight / 3));	2394	!item->flag [FLAG_ALIVE] && !item->invisible && (who->is_player () \|\| item->weight < who->weight / 3));
2361	}	2395	}
		2396
		2397	//-GPL
2362		2398
2363	/*	2399	/*
2364	* create clone from object to another	2400	* create clone from object to another
2365	*/	2401	*/
2366	object *	2402	object *
…		…
2397	return tmp;	2433	return tmp;
2398		2434
2399	return 0;	2435	return 0;
2400	}	2436	}
2401		2437
		2438	/* Zero the key_values on op, decrementing the shared-string
		2439	* refcounts and freeing the links.
		2440	*/
		2441	void
		2442	key_values::clear ()
		2443	{
		2444	for (key_value *kvp = first; kvp; )
		2445	{
		2446	key_value *next = kvp->next;
		2447	delete kvp;
		2448	kvp = next;
		2449	}
		2450
		2451	first = 0;
		2452	}
		2453
2402	shstr_tmp	2454	shstr_tmp
2403	object::kv_get (shstr_tmp key) const	2455	key_values::get (shstr_tmp key) const
2404	{	2456	{
2405	for (key_value *kv = key_values; kv; kv = kv->next)	2457	for (key_value *kv = first; kv; kv = kv->next)
2406	if (kv->key == key)	2458	if (kv->key == key)
2407	return kv->value;	2459	return kv->value;
2408		2460
2409	return shstr ();	2461	return shstr ();
2410	}	2462	}
2411		2463
2412	void	2464	void
		2465	key_values::add (shstr_tmp key, shstr_tmp value)
		2466	{
		2467	key_value *kv = new key_value;
		2468
		2469	kv->next = first;
		2470	kv->key = key;
		2471	kv->value = value;
		2472
		2473	first = kv;
		2474	}
		2475
		2476	void
2413	object::kv_set (shstr_tmp key, shstr_tmp value)	2477	key_values::set (shstr_tmp key, shstr_tmp value)
2414	{	2478	{
2415	for (key_value *kv = key_values; kv; kv = kv->next)	2479	for (key_value *kv = first; kv; kv = kv->next)
2416	if (kv->key == key)	2480	if (kv->key == key)
2417	{	2481	{
2418	kv->value = value;	2482	kv->value = value;
2419	return;	2483	return;
2420	}	2484	}
2421		2485
2422	key_value *kv = new key_value;	2486	add (key, value);
2423
2424	kv->next = key_values;
2425	kv->key = key;
2426	kv->value = value;
2427
2428	key_values = kv;
2429	}	2487	}
2430		2488
2431	void	2489	void
2432	object::kv_del (shstr_tmp key)	2490	key_values::del (shstr_tmp key)
2433	{	2491	{
2434	for (key_value *kvp = &key_values; kvp; kvp = &(*kvp)->next)	2492	for (key_value *kvp = &first; kvp; kvp = &(*kvp)->next)
2435	if ((*kvp)->key == key)	2493	if ((*kvp)->key == key)
2436	{	2494	{
2437	key_value kv = kvp;	2495	key_value kv = kvp;
2438	kvp = (kvp)->next;	2496	kvp = (kvp)->next;
2439	delete kv;	2497	delete kv;
2440	return;	2498	return;
2441	}	2499	}
		2500	}
		2501
		2502	void
		2503	key_values::reverse ()
		2504	{
		2505	key_value *prev = 0;
		2506	key_value *head = first;
		2507
		2508	while (head)
		2509	{
		2510	key_value *node = head;
		2511	head = head->next;
		2512	node->next = prev;
		2513	prev = node;
		2514	}
		2515
		2516	first = prev;
		2517	}
		2518
		2519	key_values &
		2520	key_values::operator =(const key_values &kv)
		2521	{
		2522	clear ();
		2523
		2524	for (key_value *kvp = kv.first; kvp; kvp = kvp->next)
		2525	add (kvp->key, kvp->value);
		2526
		2527	reverse ();
2442	}	2528	}
2443		2529
2444	object::depth_iterator::depth_iterator (object *container)	2530	object::depth_iterator::depth_iterator (object *container)
2445	: iterator_base (container)	2531	: iterator_base (container)
2446	{	2532	{
…		…
2529	object::region () const	2615	object::region () const
2530	{	2616	{
2531	return map ? map->region (x, y)	2617	return map ? map->region (x, y)
2532	: region::default_region ();	2618	: region::default_region ();
2533	}	2619	}
		2620
		2621	//+GPL
2534		2622
2535	void	2623	void
2536	object::open_container (object *new_container)	2624	object::open_container (object *new_container)
2537	{	2625	{
2538	if (container == new_container)	2626	if (container == new_container)
…		…
2596	}	2684	}
2597	// else if (!old_container->env && contr && contr->ns)	2685	// else if (!old_container->env && contr && contr->ns)
2598	// contr->ns->floorbox_reset ();	2686	// contr->ns->floorbox_reset ();
2599	}	2687	}
2600		2688
		2689	//-GPL
		2690
		2691	// prefetch some flat area around the player
		2692	static void
		2693	prefetch_surrounding_area (object op, maptile map, int range)
		2694	{
		2695	for (maprect *rect = map->split_to_tiles (mapwalk_buf,
		2696	op->x - range , op->y - range ,
		2697	op->x + range + 1, op->y + range + 1);
		2698	rect->m;
		2699	++rect)
		2700	{
		2701	rect->m->touch ();
		2702	rect->m->activate ();
		2703	}
		2704	}
		2705
		2706	// prefetch a generous area around the player, also up and down
		2707	void
		2708	object::prefetch_surrounding_maps ()
		2709	{
		2710	prefetch_surrounding_area (this, map, 40);
		2711
		2712	if (maptile *m = map->tile_available (TILE_DOWN))
		2713	prefetch_surrounding_area (this, m, 20);
		2714
		2715	if (maptile *m = map->tile_available (TILE_UP))
		2716	prefetch_surrounding_area (this, m, 20);
		2717	}
		2718
		2719	//+GPL
		2720
2601	object *	2721	object *
2602	object::force_find (shstr_tmp name)	2722	object::force_find (shstr_tmp name)
2603	{	2723	{
2604	/* cycle through his inventory to look for the MARK we want to	2724	/* cycle through his inventory to look for the MARK we want to
2605	* place	2725	* place
2606	*/	2726	*/
2607	for (object *tmp = inv; tmp; tmp = tmp->below)	2727	for (object *tmp = inv; tmp; tmp = tmp->below)
2608	if (tmp->type == FORCE && tmp->slaying == name)	2728	if (tmp->type == FORCE && tmp->slaying == name)
2609	return splay (tmp);	2729	return splay (tmp);
2610		2730
2611	return 0;	2731	return 0;
2612	}	2732	}
2613		2733
2614	//-GPL
2615
2616	void	2734	void
2617	object::force_set_timer (int duration)	2735	object::force_set_timer (int duration)
2618	{	2736	{
2619	this->duration = 1;	2737	this->duration = 1;
2620	this->speed_left = -1.f;	2738	this->speed_left = -1.f;
…		…
2626	object::force_add (shstr_tmp name, int duration)	2744	object::force_add (shstr_tmp name, int duration)
2627	{	2745	{
2628	if (object *force = force_find (name))	2746	if (object *force = force_find (name))
2629	force->destroy ();	2747	force->destroy ();
2630		2748
2631	object *force = get_archetype (FORCE_NAME);	2749	object *force = archetype::get (FORCE_NAME);
2632		2750
2633	force->slaying = name;	2751	force->slaying = name;
2634	force->force_set_timer (duration);	2752	force->force_set_timer (duration);
2635	force->flag [FLAG_APPLIED] = true;	2753	force->flag [FLAG_APPLIED] = true;
2636		2754
…		…
2705	}	2823	}
2706	else	2824	else
2707	move_type = mt;	2825	move_type = mt;
2708	}	2826	}
2709		2827
		2828	/* object should be a player.
		2829	* we return the object the player has marked with the 'mark' command
		2830	* below. If no match is found (or object has changed), we return
		2831	* NULL. We leave it up to the calling function to print messages if
		2832	* nothing is found.
		2833	*/
		2834	object *
		2835	object::mark () const
		2836	{
		2837	if (contr && contr->mark && contr->mark->env == this)
		2838	return contr->mark;
		2839	else
		2840	return 0;
		2841	}
		2842
		2843	// put marked object first in the inventory
		2844	// this is used by identify-like spells so players can influence
		2845	// the order a bit.
		2846	void
		2847	object::splay_marked ()
		2848	{
		2849	if (object *marked = mark ())
		2850	splay (marked);
		2851	}
		2852

Diff Legend

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

Comparing deliantra/server/common/object.C (file contents): Revision 1.317 by root, Fri Apr 2 03:41:24 2010 UTC vs. Revision 1.363 by root, Sun Jan 29 02:47:04 2017 UTC

Diff Legend

Comparing deliantra/server/common/object.C (file contents):
Revision 1.317 by root, Fri Apr 2 03:41:24 2010 UTC vs.
Revision 1.363 by root, Sun Jan 29 02:47:04 2017 UTC