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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.319 by root, Sat Apr 3 02:29:40 2010 UTC vs.
Revision 1.368 by root, Wed Dec 5 19:03:26 2018 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 (©) 2017,2018 Marc Alexander Lehmann / the Deliantra team
4	* Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team	5	* 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	6	* Copyright (©) 2001 Mark Wedel & Crossfire Development Team
6	* Copyright (©) 1992 Frank Tore Johansen	7	* Copyright (©) 1992 Frank Tore Johansen
7	*	8	*
8	* Deliantra is free software: you can redistribute it and/or modify it under	9	* 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	10	* 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	11	* Free Software Foundation, either version 3 of the License, or (at your
11	* option) any later version.	12	* option) any later version.
12	*	13	*
13	* This program is distributed in the hope that it will be useful,	14	* This program is distributed in the hope that it will be useful,
14	* but WITHOUT ANY WARRANTY; without even the implied warranty of	15	* but WITHOUT ANY WARRANTY; without even the implied warranty of
15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	16	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16	* GNU General Public License for more details.	17	* GNU General Public License for more details.
17	*	18	*
18	* You should have received a copy of the Affero GNU General Public License	19	* 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	20	* and the GNU General Public License along with this program. If not, see
20	* <http://www.gnu.org/licenses/>.	21	* <http://www.gnu.org/licenses/>.
21	*	22	*
22	* The authors can be reached via e-mail to <support@deliantra.net>	23	* The authors can be reached via e-mail to <support@deliantra.net>
23	*/	24	*/
24		25
25	#include <global.h>	26	#include <global.h>
26	#include <stdio.h>	27	#include <stdio.h>
37	uint32_t mapspace::smellcount = 10000;	38	uint32_t mapspace::smellcount = 10000;
38		39
39	objectvec objects;	40	objectvec objects;
40	activevec actives;	41	activevec actives;
41		42
		43	freelist_item *object::freelist;
		44	uint32_t object::object_count;
		45	uint32_t object::free_count;
		46	uint32_t object::create_count;
		47	uint32_t object::destroy_count;
		48
42	//+GPL	49	//+GPL
43		50
44	short freearr_x[SIZEOFFREE] = {	51	int freearr_x[SIZEOFFREE] = {
45	0,	52	0,
46	0, 1, 1, 1, 0, -1, -1, -1,	53	0, 1, 1, 1, 0, -1, -1, -1,
47	0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,	54	0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,
48	0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1	55	0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1
49	};	56	};
50	short freearr_y[SIZEOFFREE] = {	57	int freearr_y[SIZEOFFREE] = {
51	0,	58	0,
52	-1, -1, 0, 1, 1, 1, 0, -1,	59	-1, -1, 0, 1, 1, 1, 0, -1,
53	-2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2,	60	-2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2,
54	-3, -3, -3, -3, -2, -1, 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3	61	-3, -3, -3, -3, -2, -1, 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3
55	};	62	};
…		…
65	9, 10, 13, 14, 17, 18, 21, 22,	72	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,	73	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	74	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	};	75	};
69		76
		77	const char *wall_suffix[16] = {
		78	"0",
		79	"1_3",
		80	"1_4",
		81	"2_1_2",
		82	"1_2",
		83	"2_2_4",
		84	"2_2_1",
		85	"3_1",
		86	"1_1",
		87	"2_2_3",
		88	"2_2_2",
		89	"3_3",
		90	"2_1_1",
		91	"3_4",
		92	"3_2",
		93	"4"
		94	};
		95
70	static void	96	static void
71	write_uuid (uval64 skip, bool sync)	97	write_uuid (uval64 skip, bool sync)
72	{	98	{
73	CALL_BEGIN (2);	99	CALL_BEGIN (2);
74	CALL_ARG_SV (newSVval64 (skip));	100	CALL_ARG_SV (newSVval64 (skip));
…		…
123	{	149	{
124	UUID uid;	150	UUID uid;
125		151
126	uid.seq = ++cur.seq;	152	uid.seq = ++cur.seq;
127		153
128	if (expect_false (cur.seq >= seq_next_save))	154	if (ecb_expect_false (cur.seq >= seq_next_save))
129	{	155	{
130	seq_next_save = UUID::cur.seq + (UUID_GAP >> 1);	156	seq_next_save = UUID::cur.seq + (UUID_GAP >> 1);
131	write_uuid (UUID_GAP, false);	157	write_uuid (UUID_GAP, false);
132	}	158	}
133		159
…		…
208		234
209	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */	235	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */
210	static bool	236	static bool
211	compare_ob_value_lists_one (const object wants, const object has)	237	compare_ob_value_lists_one (const object wants, const object has)
212	{	238	{
213	/* n-squared behaviour (see kv_get), but I'm hoping both	239	/* 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	240	* objects with lists are rare, and lists stay short. If not, use a
215	* different structure or at least keep the lists sorted...	241	* different structure or at least keep the lists sorted...
216	*/	242	*/
217		243
218	/* For each field in wants, */	244	/* For each field in wants, */
219	for (key_value *kv = wants->key_values; kv; kv = kv->next)	245	for (key_value *kv = wants->kv.first; kv; kv = kv->next)
220	if (has->kv_get (kv->key) != kv->value)	246	if (has->kv.get (kv->key) != kv->value)
221	return false;	247	return false;
222		248
223	/* If we get here, every field in wants has a matching field in has. */	249	/* If we get here, every field in wants has a matching field in has. */
224	return true;	250	return true;
225	}	251	}
…		…
249	*/	275	*/
250	bool object::can_merge_slow (object ob1, object ob2)	276	bool object::can_merge_slow (object ob1, object ob2)
251	{	277	{
252	/* A couple quick sanity checks */	278	/* A couple quick sanity checks */
253	if (ob1 == ob2	279	if (ob1 == ob2
254	\|\| ob1->type != ob2->type	280	\|\| ob1->type != ob2->type
255	\|\| ob1->value != ob2->value	281	\|\| ob1->value != ob2->value
256	\|\| ob1->name != ob2->name	282	\|\| ob1->name != ob2->name
		283	\|\| ob1->custom_name != ob2->custom_name
257	\|\| fabs (ob1->speed - ob2->speed) >= MIN_ACTIVE_SPEED)	284	\|\| fabs (ob1->speed - ob2->speed) >= MIN_ACTIVE_SPEED)
258	return 0;	285	return 0;
259		286
260	/* Do not merge objects if nrof would overflow, assume nrof	287	/* Do not merge objects if nrof would overflow, assume nrof
261	* is always 0 .. 2*31-1 /	288	* is always 0 .. 2*31-1 /
…		…
266	* This is to the comparison of the flags below will be OK. We	293	* 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	294	* 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	295	* are not equal - just if it has been identified, the been_applied
269	* flags lose any meaning.	296	* flags lose any meaning.
270	*/	297	*/
271	if (QUERY_FLAG (ob1, FLAG_IDENTIFIED))	298	if (ob1->flag [FLAG_IDENTIFIED])
272	SET_FLAG (ob1, FLAG_BEEN_APPLIED);	299	ob1->set_flag (FLAG_BEEN_APPLIED);
273		300
274	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))	301	if (ob2->flag [FLAG_IDENTIFIED])
275	SET_FLAG (ob2, FLAG_BEEN_APPLIED);	302	ob2->set_flag (FLAG_BEEN_APPLIED);
276		303
277	if (ob1->arch->archname != ob2->arch->archname	304	if (ob1->arch->archname != ob2->arch->archname
278	\|\| ob1->name != ob2->name	305	\|\| ob1->name != ob2->name
279	\|\| ob1->title != ob2->title	306	\|\| ob1->title != ob2->title
280	\|\| ob1->msg != ob2->msg	307	\|\| ob1->msg != ob2->msg
…		…
325	/* inventory ok - still need to check rest of this object to see	352	/* inventory ok - still need to check rest of this object to see
326	* if it is valid.	353	* if it is valid.
327	*/	354	*/
328	}	355	}
329		356
330	/* Don't merge objects that are applied. With the new 'body' code,	357	/* 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	358	* 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.	359	* some items equipped, and we don't want those to merge.
333	*/	360	*/
334	if (QUERY_FLAG (ob1, FLAG_APPLIED) \|\| QUERY_FLAG (ob2, FLAG_APPLIED))	361	if (ob1->flag [FLAG_APPLIED] \|\| ob2->flag [FLAG_APPLIED])
335	return 0;	362	return 0;
336		363
337	/* Note sure why the following is the case - either the object has to	364	/* 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	365	* be animated or have a very low speed. Is this an attempted monster
339	* check?	366	* check?
340	*/	367	*/
341	if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && ob1->has_active_speed ())	368	if (!ob1->flag [FLAG_ANIMATE] && ob1->has_active_speed ())
342	return 0;	369	return 0;
343		370
344	switch (ob1->type)	371	switch (ob1->type)
345	{	372	{
346	case SCROLL:	373	case SCROLL:
347	if (ob1->level != ob2->level)	374	if (ob1->level != ob2->level)
348	return 0;	375	return 0;
349	break;	376	break;
350	}	377	}
351		378
352	if (ob1->key_values \|\| ob2->key_values)	379	if (!ob1->kv.empty () \|\| !ob2->kv.empty ())
353	{	380	{
354	/* At least one of these has key_values. */	381	/* At least one of these has key_values. */
355	if ((!ob1->key_values) != (!ob2->key_values))	382	if (ob1->kv.empty () != ob2->kv.empty ())
356	return 0; /* One has fields, but the other one doesn't. */	383	return 0; /* One has fields, but the other one doesn't. */
357		384
358	if (!compare_ob_value_lists (ob1, ob2))	385	if (!compare_ob_value_lists (ob1, ob2))
359	return 0;	386	return 0;
360	}	387	}
…		…
420		447
421	return 0;	448	return 0;
422	}	449	}
423		450
424	// adjust weight per container type ("of holding")	451	// adjust weight per container type ("of holding")
425	static sint32	452	static weight_t
426	weight_adjust_for (object *op, sint32 weight)	453	weight_adjust_for (object *op, weight_t weight)
427	{	454	{
428	return op->type == CONTAINER	455	if (op->type == CONTAINER)
429	? lerp (weight, 0, 100, 0, 100 - op->stats.Str)	456	weight -= weight * op->stats.Str / 100;
430	: weight;
431	}
432		457
		458	return weight;
		459	}
		460
433	/*	461	/*
434	* adjust_weight(object, weight) adds the specified weight to an object,	462	* subtracts, then adds, the specified weight to an object,
435	* and also updates how much the environment(s) is/are carrying.	463	* and also updates how much the environment(s) is/are carrying.
436	*/	464	*/
437	static void	465	static void
438	adjust_weight (object *op, sint32 weight)	466	adjust_weight (object *op, weight_t sub, weight_t add)
439	{	467	{
440	while (op)	468	while (op)
441	{	469	{
442	// adjust by actual difference to account for rounding errors	470	weight_t carrying = (weight_t)op->carrying
443	// i.e. (w2 - w1) / f != w2 / f - w1 / f and the latter is correct	471	- weight_adjust_for (op, sub)
444	weight = weight_adjust_for (op, op->carrying)	472	+ weight_adjust_for (op, add);
445	- weight_adjust_for (op, op->carrying - weight);
446		473
447	if (!weight)	474	sub = op->carrying;
448	return;
449
450	op->carrying += weight;	475	op->carrying = carrying;
		476	add = op->carrying;
451		477
452	if (object *pl = op->visible_to ())	478	if (object *pl = op->visible_to ())
453	if (pl != op) // player is handled lazily	479	if (pl != op) // player is handled lazily
454	esrv_update_item (UPD_WEIGHT, pl, op);	480	esrv_update_item (UPD_WEIGHT, pl, op);
455		481
…		…
463	* containers are carrying, and sums it up.	489	* containers are carrying, and sums it up.
464	*/	490	*/
465	void	491	void
466	object::update_weight ()	492	object::update_weight ()
467	{	493	{
468	sint32 sum = 0;	494	weight_t sum = 0;
469		495
470	for (object *op = inv; op; op = op->below)	496	for (object *op = inv; op; op = op->below)
471	{	497	{
472	if (op->inv)
473	op->update_weight ();	498	op->update_weight ();
474		499
475	sum += op->total_weight ();	500	sum += weight_adjust_for (this, op->total_weight ());
476	}	501	}
477
478	sum = weight_adjust_for (this, sum);
479		502
480	if (sum != carrying)	503	if (sum != carrying)
481	{	504	{
		505	if (carrying != sum && carrying)//D
		506	LOG (llevDebug, "updating carrying got %ld, expected %ld (%s)\n",
		507	(long long)sum, (long long)carrying, debug_desc ());
		508
482	carrying = sum;	509	carrying = sum;
483		510
484	if (object *pl = visible_to ())	511	if (object *pl = visible_to ())
485	if (pl != this) // player is handled lazily	512	if (pl != this) // player is handled lazily
486	esrv_update_item (UPD_WEIGHT, pl, this);	513	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 ());	599	LOG (llevError \| logBacktrace, "tried to set owner of %s to %s\n", debug_desc (), owner->debug_desc ());
573	return;	600	return;
574	}	601	}
575		602
576	this->owner = owner;	603	this->owner = owner;
577	}
578
579	/* Zero the key_values on op, decrementing the shared-string
580	* refcounts and freeing the links.
581	*/
582	static void
583	free_key_values (object *op)
584	{
585	for (key_value *i = op->key_values; i; )
586	{
587	key_value *next = i->next;
588	delete i;
589
590	i = next;
591	}
592
593	op->key_values = 0;
594	}	604	}
595		605
596	/*	606	/*
597	* copy_to first frees everything allocated by the dst object,	607	* copy_to first frees everything allocated by the dst object,
598	* and then copies the contents of itself into the second	608	* and then copies the contents of itself into the second
…		…
604	void	614	void
605	object::copy_to (object *dst)	615	object::copy_to (object *dst)
606	{	616	{
607	dst->remove ();	617	dst->remove ();
608	(object_copy )dst = *this;	618	(object_copy )dst = *this;
		619
		620	// maybe move to object_copy?
		621	dst->kv = kv;
		622
609	dst->flag [FLAG_REMOVED] = true;	623	dst->flag [FLAG_REMOVED] = true;
610
611	/* Copy over key_values, if any. */
612	if (key_values)
613	{
614	key_value *tail = 0;
615	dst->key_values = 0;
616
617	for (key_value *i = key_values; i; i = i->next)
618	{
619	key_value *new_link = new key_value;
620
621	new_link->next = 0;
622	new_link->key = i->key;
623	new_link->value = i->value;
624
625	/* Try and be clever here, too. */
626	if (!dst->key_values)
627	{
628	dst->key_values = new_link;
629	tail = new_link;
630	}
631	else
632	{
633	tail->next = new_link;
634	tail = new_link;
635	}
636	}
637	}
638
639	dst->activate ();	624	dst->activate ();
640	}	625	}
641		626
642	void	627	void
643	object::instantiate ()	628	object::instantiate ()
644	{	629	{
645	if (!uuid.seq) // HACK	630	if (!uuid.seq) // HACK
646	uuid = UUID::gen ();	631	uuid = UUID::gen ();
647		632
648	// TODO: unclean state changes, should nt be done in copy_to AND instantiate	633	// TODO: unclean state changes, should not be done in copy_to AND instantiate
649	if (flag [FLAG_RANDOM_SPEED] && speed)	634	if (flag [FLAG_RANDOM_SPEED] && speed)
650	speed_left = - speed - rndm (); // TODO animation	635	speed_left = - speed - rndm (); // TODO animation
651	else	636	else
652	speed_left = -1.;	637	speed_left = -1.;
653		638
654	/* copy the body_info to the body_used - this is only really	639	/* copy the body_info to the body_used - this is only really
655	* need for monsters, but doesn't hurt to do it for everything.	640	* need for monsters, but doesn't hurt to do it for everything.
656	* by doing so, when a monster is created, it has good starting	641	* by doing so, when a monster is created, it has good starting
657	* values for the body_used info, so when items are created	642	* values for the body_used info, so when items are created
658	* for it, they can be properly equipped.	643	* for it, they can be properly equipped.
659	*/	644	*/
660	for (int i = NUM_BODY_LOCATIONS; i--; )	645	for (int i = 0; i < NUM_BODY_LOCATIONS; ++i)
661	slot[i].used = slot[i].info;	646	slot[i].used = slot[i].info;
662		647
663	attachable::instantiate ();	648	attachable::instantiate ();
664	}	649	}
665		650
…		…
675		660
676	neu->map = map; // not copied by copy_to	661	neu->map = map; // not copied by copy_to
677	return neu;	662	return neu;
678	}	663	}
679		664
		665	// update the anhimation frame of an object, but only if it has an animation
		666	// assigned and the frame number if within the animation.
		667	void object::update_anim_frame (int frame)
		668	{
		669	if (ecb_expect_false (!has_anim () \|\| frame >= anim_frames ()))
		670	return;
		671
		672	set_anim_frame (frame);
		673	update_object (this, UP_OBJ_FACE);
		674	}
		675
680	/*	676	/*
681	* If an object with the IS_TURNABLE() flag needs to be turned due	677	* If an object with the IS_TURNABLE() flag needs to be turned due
682	* to the closest player being on the other side, this function can	678	* to the closest player being on the other side, this function can
683	* be called to update the face variable, _and_ how it looks on the map.	679	* be called to update the face variable, _and_ how it looks on the map.
684	*/	680	*/
685	void	681	void
686	update_turn_face (object *op)	682	update_turn_face (object *op)
687	{	683	{
688	if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) \|\| !op->arch)	684	if (!op->flag [FLAG_IS_TURNABLE] \|\| !op->arch)
689	return;	685	return;
690		686
691	SET_ANIMATION (op, op->direction);	687	op->update_anim_frame (op->direction);
692	update_object (op, UP_OBJ_FACE);
693	}	688	}
694		689
695	/*	690	/*
696	* Updates the speed of an object. If the speed changes from 0 to another	691	* Updates the speed of an object. If the speed changes from 0 to another
697	* value, or vice versa, then add/remove the object from the active list.	692	* value, or vice versa, then add/remove the object from the active list.
…		…
707	else	702	else
708	deactivate ();	703	deactivate ();
709	}	704	}
710		705
711	/*	706	/*
712	* update_object() updates the the map.	707	* update_object() updates the map.
713	* It takes into account invisible objects (and represent squares covered	708	* It takes into account invisible objects (and represent squares covered
714	* by invisible objects by whatever is below them (unless it's another	709	* by invisible objects by whatever is below them (unless it's another
715	* invisible object, etc...)	710	* invisible object, etc...)
716	* If the object being updated is beneath a player, the look-window	711	* If the object being updated is beneath a player, the look-window
717	* of that player is updated (this might be a suboptimal way of	712	* of that player is updated (this might be a suboptimal way of
…		…
754	}	749	}
755		750
756	mapspace &m = op->ms ();	751	mapspace &m = op->ms ();
757		752
758	if (!(m.flags_ & P_UPTODATE))	753	if (!(m.flags_ & P_UPTODATE))
759	/* nop */;	754	m.update_up (); // nothing to do except copy up
760	else if (action == UP_OBJ_INSERT)	755	else if (action == UP_OBJ_INSERT)
761	{	756	{
762	#if 0	757	#if 0
763	// this is likely overkill, TODO: revisit (schmorp)	758	// this is likely overkill, TODO: revisit (schmorp)
764	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))	759	if ((op->flag [FLAG_BLOCKSVIEW] && !(m.flags_ & P_BLOCKSVIEW))
765	\|\| (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))	760	\|\| (op->flag [FLAG_NO_MAGIC] && !(m.flags_ & P_NO_MAGIC))
766	\|\| (op->is_player () && !(m.flags_ & P_PLAYER))	761	\|\| (op->is_player () && !(m.flags_ & P_PLAYER))
767	\|\| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))	762	\|\| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
768	\|\| (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))	763	\|\| (op->flag [FLAG_ALIVE] && !(m.flags_ & P_IS_ALIVE))
769	\|\| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))	764	\|\| (op->flag [FLAG_DAMNED] && !(m.flags_ & P_NO_CLERIC))
770	\|\| (m.move_on \| op->move_on ) != m.move_on	765	\|\| (m.move_on \| op->move_on ) != m.move_on
771	\|\| (m.move_off \| op->move_off ) != m.move_off	766	\|\| (m.move_off \| op->move_off ) != m.move_off
772	\|\| (m.move_slow \| op->move_slow) != m.move_slow	767	\|\| (m.move_slow \| op->move_slow) != m.move_slow
773	/* This isn't perfect, but I don't expect a lot of objects to	768	/* This isn't perfect, but I don't expect a lot of objects to
774	* have move_allow right now.	769	* have move_allow right now.
775	*/	770	*/
776	\|\| ((m.move_block \| op->move_block) & ~op->move_allow) != m.move_block	771	\|\| ((m.move_block \| op->move_block) & ~op->move_allow) != m.move_block
777	m.invalidate ();	772	m.invalidate ();
778	#else	773	#else
779	// the above is not strong enough a test to skip updating. los maybe? TODO (schmorp)	774	// the above is not strong enough a test to skip updating. los maybe? TODO (schmorp)
…		…
785	* that is being removed.	780	* that is being removed.
786	*/	781	*/
787	else if (action == UP_OBJ_CHANGE \|\| action == UP_OBJ_REMOVE)	782	else if (action == UP_OBJ_CHANGE \|\| action == UP_OBJ_REMOVE)
788	m.invalidate ();	783	m.invalidate ();
789	else if (action == UP_OBJ_FACE)	784	else if (action == UP_OBJ_FACE)
790	/* Nothing to do for that case */ ;	785	m.update_up (); // nothing to do for that case, except copy up
791	else	786	else
792	LOG (llevError, "update_object called with invalid action: %d\n", action);	787	LOG (llevError, "update_object called with invalid action: %d\n", action);
793		788
794	if (op->more)	789	if (op->more)
795	update_object (op->more, action);	790	update_object (op->more, action);
796	}	791	}
797		792
798	object::object ()	793	object::object ()
799	{	794	{
800	SET_FLAG (this, FLAG_REMOVED);	795	this->set_flag (FLAG_REMOVED);
801		796
802	//expmul = 1.0; declared const for the time being	797	//expmul = 1.0; declared const for the time being
803	face = blank_face;	798	face = blank_face;
804	material = MATERIAL_NULL;	799	material = MATERIAL_NULL;
805	}	800	}
806		801
807	object::~object ()	802	object::~object ()
808	{	803	{
809	unlink ();	804	unlink ();
810		805
811	free_key_values (this);	806	kv.clear ();
812	}	807	}
813
814	static int object_count;
815		808
816	void object::link ()	809	void object::link ()
817	{	810	{
818	assert (!index);//D	811	assert (!index);//D
819	uuid = UUID::gen ();	812	uuid = UUID::gen ();
820	count = ++object_count;
821		813
822	refcnt_inc ();	814	refcnt_inc ();
823	objects.insert (this);	815	objects.insert (this);
		816
		817	++create_count;
		818
824	}	819	}
825		820
826	void object::unlink ()	821	void object::unlink ()
827	{	822	{
828	if (!index)	823	if (!index)
829	return;	824	return;
		825
		826	++destroy_count;
830		827
831	objects.erase (this);	828	objects.erase (this);
832	refcnt_dec ();	829	refcnt_dec ();
833	}	830	}
834		831
…		…
857	op->activate_recursive ();	854	op->activate_recursive ();
858	}	855	}
859		856
860	/* This function removes object 'op' from the list of active	857	/* This function removes object 'op' from the list of active
861	* objects.	858	* objects.
862	* This should only be used for style maps or other such	859	* This should only be used for style maps or other such
863	* reference maps where you don't want an object that isn't	860	* reference maps where you don't want an object that isn't
864	* in play chewing up cpu time getting processed.	861	* in play chewing up cpu time getting processed.
865	* The reverse of this is to call update_ob_speed, which	862	* The reverse of this is to call update_ob_speed, which
866	* will do the right thing based on the speed of the object.	863	* will do the right thing based on the speed of the object.
867	*/	864	*/
…		…
913	* if some form of movement is allowed, let objects	910	* if some form of movement is allowed, let objects
914	* drop on that space.	911	* drop on that space.
915	*/	912	*/
916	if (!drop_to_ground	913	if (!drop_to_ground
917	\|\| !map	914	\|\| !map
918	\|\| map->in_memory != MAP_ACTIVE	915	\|\| !map->linkable ()
919	\|\| map->no_drop	916	\|\| map->no_drop
920	\|\| ms ().move_block == MOVE_ALL)	917	\|\| ms ().move_block == MOVE_ALL)
921	{	918	{
922	while (inv)	919	while (inv)
923	inv->destroy ();	920	inv->destroy ();
…		…
939	map->insert (op, x, y);	936	map->insert (op, x, y);
940	}	937	}
941	}	938	}
942	}	939	}
943		940
		941	/*
		942	* Remove and free all objects in the inventory of the given object.
		943	* Unlike destroy_inv, this assumes the *this is destroyed as well
		944	* well, so we can (and have to!) take shortcuts.
		945	*/
		946	void
		947	object::destroy_inv_fast ()
		948	{
		949	while (object *op = inv)
		950	{
		951	// remove from object the fast way
		952	op->flag [FLAG_REMOVED] = true;
		953	op->env = 0;
		954	if ((inv = inv->below))
		955	inv->above = 0;
		956
		957	// then destroy
		958	op->destroy ();
		959	}
		960	}
		961
		962	void
		963	object::freelist_free (int count)
		964	{
		965	while (count-- && freelist)
		966	{
		967	freelist_item *next = freelist->next;
		968	// count is being "destroyed"
		969
		970	sfree ((char *)freelist, sizeof (object));
		971
		972	freelist = next;
		973	--free_count;
		974	}
		975	}
		976
		977	object *
944	object *object::create ()	978	object::create ()
945	{	979	{
946	object *op = new object;	980	object *op;
		981
		982	if (freelist)
		983	{
		984	freelist_item li = *freelist;
		985	memset (freelist, 0, sizeof (object));
		986
		987	op = new (freelist) object;
		988	op->count = li.count;
		989
		990	freelist = li.next;
		991	--free_count;
		992	}
		993	else
		994	{
		995	void *ni = salloc0<char> (sizeof (object));
		996
		997	op = new(ni) object;
		998
		999	op->count = ++object_count;
		1000	}
		1001
947	op->link ();	1002	op->link ();
		1003
948	return op;	1004	return op;
949	}	1005	}
950		1006
951	static struct freed_map : maptile	1007	void
		1008	object::do_delete ()
952	{	1009	{
953	freed_map ()	1010	uint32_t count = this->count;
954	{
955	path = "<freed objects map>";
956	name = "/internal/freed_objects_map";
957	width = 3;
958	height = 3;
959	no_drop = 1;
960	no_reset = 1;
961		1011
962	alloc ();	1012	this->~object ();
963	in_memory = MAP_ACTIVE;
964	}
965		1013
966	~freed_map ()	1014	freelist_item li = (freelist_item )this;
967	{	1015	li->next = freelist;
968	destroy ();	1016	li->count = count;
969	}	1017
970	} freed_map; // freed objects are moved here to avoid crashes	1018	freelist = li;
		1019	++free_count;
		1020	}
971		1021
972	void	1022	void
973	object::do_destroy ()	1023	object::do_destroy ()
974	{	1024	{
975	if (flag [FLAG_IS_LINKED])	1025	if (flag [FLAG_IS_LINKED])
…		…
1018	LOG (llevError \| logBacktrace, "tried to destroy the tail of an object");	1068	LOG (llevError \| logBacktrace, "tried to destroy the tail of an object");
1019	head->destroy ();	1069	head->destroy ();
1020	return;	1070	return;
1021	}	1071	}
1022		1072
1023	destroy_inv (false);	1073	destroy_inv_fast ();
1024		1074
1025	if (is_head ())	1075	if (is_head ())
1026	if (sound_destroy)	1076	if (sound_destroy)
1027	play_sound (sound_destroy);	1077	play_sound (sound_destroy);
1028	else if (flag [FLAG_MONSTER])	1078	else if (flag [FLAG_MONSTER])
…		…
1049	flag [FLAG_REMOVED] = true;	1099	flag [FLAG_REMOVED] = true;
1050		1100
1051	if (more)	1101	if (more)
1052	more->remove ();	1102	more->remove ();
1053		1103
1054	/*	1104	/*
1055	* In this case, the object to be removed is in someones	1105	* In this case, the object to be removed is in someones
1056	* inventory.	1106	* inventory.
1057	*/	1107	*/
1058	if (env)	1108	if (env)
1059	{	1109	{
1060	flag [FLAG_REMOVED] = false; // hack around the issue of visible_to checking flag_removed	1110	flag [FLAG_REMOVED] = false; // hack around the issue of visible_to checking flag_removed
1061	if (object *pl = visible_to ())	1111	if (object *pl = visible_to ())
1062	esrv_del_item (pl->contr, count);	1112	esrv_del_item (pl->contr, count);
1063	flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed	1113	flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed
1064		1114
1065	adjust_weight (env, -total_weight ());	1115	adjust_weight (env, total_weight (), 0);
1066		1116
1067	object *pl = in_player ();	1117	object *pl = in_player ();
1068		1118
1069	/* we set up values so that it could be inserted into	1119	/* we set up values so that it could be inserted into
1070	* the map, but we don't actually do that - it is up	1120	* the map, but we don't actually do that - it is up
…		…
1082	below = 0;	1132	below = 0;
1083	env = 0;	1133	env = 0;
1084		1134
1085	if (pl && pl->is_player ())	1135	if (pl && pl->is_player ())
1086	{	1136	{
1087	if (expect_false (pl->contr->combat_ob == this))	1137	if (ecb_expect_false (pl->contr->combat_ob == this))
1088	{	1138	{
1089	pl->apply (pl->contr->combat_ob, AP_UNAPPLY);	1139	pl->apply (pl->contr->combat_ob, AP_UNAPPLY \| AP_IGNORE_CURSE);
1090	pl->contr->combat_ob = 0;	1140	pl->contr->combat_ob = 0;
1091	if (pl->contr->ranged_ob) pl->apply (pl->contr->ranged_ob);	1141	if (pl->contr->ranged_ob) pl->apply (pl->contr->ranged_ob);
1092	}	1142	}
1093		1143
1094	if (expect_false (pl->contr->ranged_ob == this))	1144	if (ecb_expect_false (pl->contr->ranged_ob == this))
1095	{	1145	{
1096	pl->apply (pl->contr->ranged_ob, AP_UNAPPLY);	1146	pl->apply (pl->contr->ranged_ob, AP_UNAPPLY \| AP_IGNORE_CURSE);
1097	pl->contr->ranged_ob = 0;	1147	pl->contr->ranged_ob = 0;
1098	if (pl->contr->combat_ob) pl->apply (pl->contr->combat_ob);	1148	if (pl->contr->combat_ob) pl->apply (pl->contr->combat_ob);
1099	}	1149	}
1100		1150
1101	pl->contr->queue_stats_update ();	1151	pl->contr->queue_stats_update ();
1102		1152
1103	if (expect_false (glow_radius) && pl->is_on_map ())	1153	if (ecb_expect_false (glow_radius) && pl->is_on_map ())
1104	update_all_los (pl->map, pl->x, pl->y);	1154	update_all_los (pl->map, pl->x, pl->y);
1105	}	1155	}
1106	}	1156	}
1107	else if (map)	1157	else if (map)
1108	{	1158	{
…		…
1128	else if (pl->container_ () == this)	1178	else if (pl->container_ () == this)
1129	{	1179	{
1130	// removing a container should close it	1180	// removing a container should close it
1131	close_container ();	1181	close_container ();
1132	}	1182	}
1133		1183	else
1134	esrv_del_item (pl->contr, count);	1184	esrv_del_item (pl->contr, count);
1135	}	1185	}
1136		1186
1137	/* link the object above us */	1187	/* link the object above us */
1138	// re-link, make sure compiler can easily use cmove	1188	// re-link, make sure compiler can easily use cmove
1139	*(above ? &above->below : &ms.top) = below;	1189	*(above ? &above->below : &ms.top) = below;
…		…
1141		1191
1142	above = 0;	1192	above = 0;
1143	below = 0;	1193	below = 0;
1144		1194
1145	ms.invalidate ();	1195	ms.invalidate ();
1146
1147	if (map->in_memory == MAP_SAVING)
1148	return;
1149		1196
1150	int check_walk_off = !flag [FLAG_NO_APPLY];	1197	int check_walk_off = !flag [FLAG_NO_APPLY];
1151		1198
1152	if (object *pl = ms.player ())	1199	if (object *pl = ms.player ())
1153	{	1200	{
…		…
1288	{	1335	{
1289	op->remove ();	1336	op->remove ();
1290		1337
1291	if (m == &freed_map)//D TODO: remove soon	1338	if (m == &freed_map)//D TODO: remove soon
1292	{//D	1339	{//D
1293	LOG (llevError \| logBacktrace, "tries to insret object on freed objects map: %s", op->debug_desc ());//D	1340	LOG (llevError \| logBacktrace, "tries to insert object on freed objects map: %s", op->debug_desc ());//D
1294	}//D	1341	}//D
1295		1342
1296	/* Ideally, the caller figures this out. However, it complicates a lot	1343	/* Ideally, the caller figures this out. However, it complicates a lot
1297	* of areas of callers (eg, anything that uses find_free_spot would now	1344	* of areas of callers (eg, anything that uses find_free_spot would now
1298	* need extra work	1345	* need extra work
…		…
1325	// from here :/	1372	// from here :/
1326	op->nrof += tmp->nrof;	1373	op->nrof += tmp->nrof;
1327	tmp->destroy ();	1374	tmp->destroy ();
1328	}	1375	}
1329		1376
1330	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1377	op->clr_flag (FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1331	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1378	op->clr_flag (FLAG_INV_LOCKED);
1332		1379
1333	if (!QUERY_FLAG (op, FLAG_ALIVE))	1380	if (!op->flag [FLAG_ALIVE])
1334	CLEAR_FLAG (op, FLAG_NO_STEAL);	1381	op->clr_flag (FLAG_NO_STEAL);
1335		1382
1336	if (flag & INS_BELOW_ORIGINATOR)	1383	if (flag & INS_BELOW_ORIGINATOR)
1337	{	1384	{
1338	if (originator->map != op->map \|\| originator->x != op->x \|\| originator->y != op->y)	1385	if (originator->map != op->map \|\| originator->x != op->x \|\| originator->y != op->y)
1339	{	1386	{
…		…
1367	* We've already dealt with merging if appropriate.	1414	* We've already dealt with merging if appropriate.
1368	* Generally, we want to put the new object on top. But if	1415	* Generally, we want to put the new object on top. But if
1369	* flag contains INS_ABOVE_FLOOR_ONLY, once we find the last	1416	* flag contains INS_ABOVE_FLOOR_ONLY, once we find the last
1370	* floor, we want to insert above that and no further.	1417	* floor, we want to insert above that and no further.
1371	* Also, if there are spell objects on this space, we stop processing	1418	* Also, if there are spell objects on this space, we stop processing
1372	* once we get to them. This reduces the need to traverse over all of	1419	* once we get to them. This reduces the need to traverse over all of
1373	* them when adding another one - this saves quite a bit of cpu time	1420	* them when adding another one - this saves quite a bit of cpu time
1374	* when lots of spells are cast in one area. Currently, it is presumed	1421	* when lots of spells are cast in one area. Currently, it is presumed
1375	* that flying non pickable objects are spell objects.	1422	* that flying non pickable objects are spell objects.
1376	*/	1423	*/
1377	for (object *tmp = ms.bot; tmp; tmp = tmp->above)	1424	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1378	{	1425	{
1379	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) \|\| QUERY_FLAG (tmp, FLAG_OVERLAY_FLOOR))	1426	if (tmp->flag [FLAG_IS_FLOOR] \|\| tmp->flag [FLAG_OVERLAY_FLOOR])
1380	floor = tmp;	1427	floor = tmp;
1381		1428
1382	if (QUERY_FLAG (tmp, FLAG_NO_PICK) && (tmp->move_type & (MOVE_FLY_LOW \| MOVE_FLY_HIGH)) && !QUERY_FLAG (tmp, FLAG_IS_FLOOR))	1429	if (tmp->flag [FLAG_NO_PICK] && (tmp->move_type & (MOVE_FLY_LOW \| MOVE_FLY_HIGH)) && !tmp->flag [FLAG_IS_FLOOR])
1383	{	1430	{
1384	/* We insert above top, so we want this object below this */	1431	/* We insert above top, so we want this object below this */
1385	top = tmp->below;	1432	top = tmp->below;
1386	break;	1433	break;
1387	}	1434	}
…		…
1405	&& (op->face && !faces [op->face].visibility))	1452	&& (op->face && !faces [op->face].visibility))
1406	{	1453	{
1407	object *last;	1454	object *last;
1408		1455
1409	for (last = top; last != floor; last = last->below)	1456	for (last = top; last != floor; last = last->below)
1410	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1457	if (last->flag [FLAG_BLOCKSVIEW] && (last->type != EXIT))
1411	break;	1458	break;
1412		1459
1413	/* Check to see if we found the object that blocks view,	1460	/* Check to see if we found the object that blocks view,
1414	* and make sure we have a below pointer for it so that	1461	* and make sure we have a below pointer for it so that
1415	* we can get inserted below this one, which requires we	1462	* we can get inserted below this one, which requires we
…		…
1488	*/	1535	*/
1489		1536
1490	/* if this is not the head or flag has been passed, don't check walk on status */	1537	/* if this is not the head or flag has been passed, don't check walk on status */
1491	if (!(flag & INS_NO_WALK_ON) && op->is_head ())	1538	if (!(flag & INS_NO_WALK_ON) && op->is_head ())
1492	{	1539	{
1493	if (check_move_on (op, originator))	1540	if (check_move_on (op, originator, flag))
1494	return 0;	1541	return 0;
1495		1542
1496	/* If we are a multi part object, lets work our way through the check	1543	/* If we are a multi part object, let's work our way through the check
1497	* walk on's.	1544	* walk on's.
1498	*/	1545	*/
1499	for (object *tmp = op->more; tmp; tmp = tmp->more)	1546	for (object *tmp = op->more; tmp; tmp = tmp->more)
1500	if (check_move_on (tmp, originator))	1547	if (check_move_on (tmp, originator, flag))
1501	return 0;	1548	return 0;
1502	}	1549	}
1503		1550
1504	return op;	1551	return op;
1505	}	1552	}
1506		1553
1507	/* this function inserts an object in the map, but if it	1554	/* this function inserts an object in the map, but if it
1508	* finds an object of its own type, it'll remove that one first.	1555	* finds an object of its own type, it'll remove that one first.
1509	* op is the object to insert it under: supplies x and the map.	1556	* op is the object to insert it under: supplies x and the map.
1510	*/	1557	*/
1511	void	1558	void
1512	replace_insert_ob_in_map (shstr_tmp archname, object *op)	1559	replace_insert_ob_in_map (shstr_tmp archname, object *op)
1513	{	1560	{
…		…
1545	if (!items // testing !items ensures we can drop at least one item	1592	if (!items // testing !items ensures we can drop at least one item
1546	\|\| (items < m->max_items	1593	\|\| (items < m->max_items
1547	&& ms.volume () < m->max_volume))	1594	&& ms.volume () < m->max_volume))
1548	return true;	1595	return true;
1549		1596
1550	if (originator && originator->is_player ())	1597	if (originator)
1551	originator->contr->failmsg (format (	1598	originator->failmsgf (
1552	"No matter how hard you try, you just cannot put the %s here H<Try to remove some items from the floor first.>",	1599	"No matter how hard you try, you just cannot put the %s here! H<Try to remove some items from the floor first.>",
1553	query_name ()	1600	query_name ()
1554	));	1601	);
1555		1602
1556	return false;	1603	return false;
1557	}	1604	}
1558		1605
1559	/*	1606	/*
…		…
1571		1618
1572	nr = min (nr, nrof);	1619	nr = min (nr, nrof);
1573		1620
1574	if (nrof > nr)	1621	if (nrof > nr)
1575	{	1622	{
		1623	weight_t oweight = total_weight ();
		1624
1576	nrof -= nr;	1625	nrof -= nr;
1577	adjust_weight (env, -weight * max (1, nr)); // carrying == 0
1578		1626
1579	if (object *pl = visible_to ())	1627	if (object *pl = visible_to ())
1580	esrv_update_item (UPD_NROF, pl, this);	1628	esrv_update_item (UPD_NROF, pl, this);
		1629
		1630	adjust_weight (env, oweight, total_weight ());
1581		1631
1582	return true;	1632	return true;
1583	}	1633	}
1584	else	1634	else
1585	{	1635	{
…		…
1639	/*	1689	/*
1640	* env->insert (op)	1690	* env->insert (op)
1641	* This function inserts the object op in the linked list	1691	* This function inserts the object op in the linked list
1642	* inside the object environment.	1692	* inside the object environment.
1643	*	1693	*
1644	* The function returns now pointer to inserted item, and return value can	1694	* The function returns now pointer to inserted item, and return value can
1645	* be != op, if items are merged. -Tero	1695	* be != op, if items are merged. -Tero
1646	*/	1696	*/
1647	object *	1697	object *
1648	object::insert (object *op)	1698	object::insert (object *op)
1649	{	1699	{
…		…
1660	if (op->nrof)	1710	if (op->nrof)
1661	for (object *tmp = inv; tmp; tmp = tmp->below)	1711	for (object *tmp = inv; tmp; tmp = tmp->below)
1662	if (object::can_merge (tmp, op))	1712	if (object::can_merge (tmp, op))
1663	{	1713	{
1664	/* return the original object and remove inserted object	1714	/* return the original object and remove inserted object
1665	(client needs the original object) */	1715	(client prefers the original object) */
		1716
		1717	// carrying must be 0 for mergable objects
		1718	weight_t oweight = weight_t (tmp->weight) * tmp->nrof;
		1719
1666	tmp->nrof += op->nrof;	1720	tmp->nrof += op->nrof;
1667		1721
1668	if (object *pl = tmp->visible_to ())	1722	if (object *pl = tmp->visible_to ())
1669	esrv_update_item (UPD_NROF, pl, tmp);	1723	esrv_update_item (UPD_NROF, pl, tmp);
1670		1724
1671	adjust_weight (this, op->total_weight ());	1725	adjust_weight (this, oweight, weight_t (tmp->weight) * tmp->nrof);
1672		1726
1673	op->destroy ();	1727	op->destroy ();
1674	op = tmp;	1728	op = tmp;
1675	goto inserted;	1729	goto inserted;
1676	}	1730	}
…		…
1692	op->flag [FLAG_REMOVED] = 0;	1746	op->flag [FLAG_REMOVED] = 0;
1693		1747
1694	if (object *pl = op->visible_to ())	1748	if (object *pl = op->visible_to ())
1695	esrv_send_item (pl, op);	1749	esrv_send_item (pl, op);
1696		1750
1697	adjust_weight (this, op->total_weight ());	1751	adjust_weight (this, 0, op->total_weight ());
1698		1752
1699	inserted:	1753	inserted:
1700	/* reset the light list and los of the players on the map */	1754	/* reset the light list and los of the players on the map */
1701	if (op->glow_radius && is_on_map ())	1755	if (op->glow_radius && is_on_map ())
1702	{	1756	{
…		…
1731	* MSW 2001-07-08: Check all objects on space, not just those below	1785	* MSW 2001-07-08: Check all objects on space, not just those below
1732	* object being inserted. insert_ob_in_map may not put new objects	1786	* object being inserted. insert_ob_in_map may not put new objects
1733	* on top.	1787	* on top.
1734	*/	1788	*/
1735	int	1789	int
1736	check_move_on (object op, object originator)	1790	check_move_on (object op, object originator, int flags)
1737	{	1791	{
1738	if (QUERY_FLAG (op, FLAG_NO_APPLY))	1792	if (op->flag [FLAG_NO_APPLY])
1739	return 0;	1793	return 0;
1740		1794
1741	object *tmp;	1795	object *tmp;
1742	maptile *m = op->map;	1796	maptile *m = op->map;
1743	int x = op->x, y = op->y;	1797	int x = op->x, y = op->y;
…		…
1765	*/	1819	*/
1766	if ((op->move_type & ~move_on & ~move_block) != 0 && (op->move_type & ~move_slow & ~move_block) != 0)	1820	if ((op->move_type & ~move_on & ~move_block) != 0 && (op->move_type & ~move_slow & ~move_block) != 0)
1767	return 0;	1821	return 0;
1768		1822
1769	/* The objects have to be checked from top to bottom.	1823	/* The objects have to be checked from top to bottom.
1770	* Hence, we first go to the top:	1824	* Hence, we first go to the top:
1771	*/	1825	*/
1772	for (object next, tmp = ms.top; tmp; tmp = next)	1826	for (object next, tmp = ms.top; tmp; tmp = next)
1773	{	1827	{
1774	next = tmp->below;	1828	next = tmp->below;
1775		1829
…		…
1780	* Second check makes sure that the movement types not being slowed	1834	* Second check makes sure that the movement types not being slowed
1781	* (~slow_move) is not blocked on this space - just because the	1835	* (~slow_move) is not blocked on this space - just because the
1782	* space doesn't slow down swimming (for example), if you can't actually	1836	* space doesn't slow down swimming (for example), if you can't actually
1783	* swim on that space, can't use it to avoid the penalty.	1837	* swim on that space, can't use it to avoid the penalty.
1784	*/	1838	*/
1785	if (!QUERY_FLAG (op, FLAG_WIZPASS))	1839	if (!op->flag [FLAG_WIZPASS])
1786	{	1840	{
1787	if ((!op->move_type && tmp->move_slow & MOVE_WALK) \|\|	1841	if ((!op->move_type && tmp->move_slow & MOVE_WALK) \|\|
1788	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))	1842	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1789	{	1843	{
1790	float diff = tmp->move_slow_penalty * fabs (op->speed);	1844	float diff = tmp->move_slow_penalty * fabs (op->speed);
…		…
1800		1854
1801	/* Basically same logic as above, except now for actual apply. */	1855	/* Basically same logic as above, except now for actual apply. */
1802	if ((!op->move_type && tmp->move_on & MOVE_WALK) \|\|	1856	if ((!op->move_type && tmp->move_on & MOVE_WALK) \|\|
1803	((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))	1857	((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))
1804	{	1858	{
		1859	if ((flags & INS_NO_AUTO_EXIT)
		1860	&& (tmp->type == EXIT \|\| tmp->type == TELEPORTER
		1861	\|\| tmp->type == HOLE \|\| tmp->type == TRAPDOOR)) //TODO: temporary, fix exits instead
		1862	continue;
		1863
1805	move_apply (tmp, op, originator);	1864	move_apply (tmp, op, originator);
1806		1865
1807	if (op->destroyed ())	1866	if (op->destroyed ())
1808	return 1;	1867	return 1;
1809		1868
…		…
1921	void	1980	void
1922	flag_inv (object *op, int flag)	1981	flag_inv (object *op, int flag)
1923	{	1982	{
1924	for (object *tmp = op->inv; tmp; tmp = tmp->below)	1983	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1925	{	1984	{
1926	SET_FLAG (tmp, flag);	1985	tmp->set_flag (flag);
1927	flag_inv (tmp, flag);	1986	flag_inv (tmp, flag);
1928	}	1987	}
1929	}	1988	}
1930		1989
1931	/*	1990	/*
…		…
1934	void	1993	void
1935	unflag_inv (object *op, int flag)	1994	unflag_inv (object *op, int flag)
1936	{	1995	{
1937	for (object *tmp = op->inv; tmp; tmp = tmp->below)	1996	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1938	{	1997	{
1939	CLEAR_FLAG (tmp, flag);	1998	tmp->clr_flag (flag);
1940	unflag_inv (tmp, flag);	1999	unflag_inv (tmp, flag);
1941	}	2000	}
1942	}	2001	}
1943		2002
1944	/*	2003	/*
…		…
1954	* inform the caller. However, insert_ob_in_map will update as	2013	* inform the caller. However, insert_ob_in_map will update as
1955	* necessary, so the caller shouldn't need to do any special work.	2014	* necessary, so the caller shouldn't need to do any special work.
1956	* Note - updated to take an object instead of archetype - this is necessary	2015	* Note - updated to take an object instead of archetype - this is necessary
1957	* because arch_blocked (now ob_blocked) needs to know the movement type	2016	* because arch_blocked (now ob_blocked) needs to know the movement type
1958	* to know if the space in question will block the object. We can't use	2017	* to know if the space in question will block the object. We can't use
1959	* the archetype because that isn't correct if the monster has been	2018	* the archetype because that isn't correct if the monster has been
1960	* customized, changed states, etc.	2019	* customized, changed states, etc.
1961	*/	2020	*/
1962	int	2021	int
1963	find_free_spot (const object ob, maptile m, int x, int y, int start, int stop)	2022	find_free_spot (const object ob, maptile m, int x, int y, int start, int stop)
1964	{	2023	{
1965	int altern[SIZEOFFREE];	2024	int altern[SIZEOFFREE];
1966	int index = 0, flag;	2025	int index = 0;
1967		2026
1968	for (int i = start; i < stop; i++)	2027	for (int i = start; i < stop; i++)
1969	{	2028	{
1970	mapxy pos (m, x, y); pos.move (i);	2029	mapxy pos (m, x, y); pos.move (i);
1971		2030
…		…
1987	continue;	2046	continue;
1988	}	2047	}
1989		2048
1990	/* Basically, if we find a wall on a space, we cut down the search size.	2049	/* Basically, if we find a wall on a space, we cut down the search size.
1991	* In this way, we won't return spaces that are on another side of a wall.	2050	* In this way, we won't return spaces that are on another side of a wall.
1992	* This mostly work, but it cuts down the search size in all directions -	2051	* This mostly work, but it cuts down the search size in all directions -
1993	* if the space being examined only has a wall to the north and empty	2052	* if the space being examined only has a wall to the north and empty
1994	* spaces in all the other directions, this will reduce the search space	2053	* spaces in all the other directions, this will reduce the search space
1995	* to only the spaces immediately surrounding the target area, and	2054	* to only the spaces immediately surrounding the target area, and
1996	* won't look 2 spaces south of the target space.	2055	* won't look 2 spaces south of the target space.
1997	*/	2056	*/
…		…
2027	*/	2086	*/
2028	int	2087	int
2029	find_first_free_spot (const object ob, maptile m, int x, int y)	2088	find_first_free_spot (const object ob, maptile m, int x, int y)
2030	{	2089	{
2031	for (int i = 0; i < SIZEOFFREE; i++)	2090	for (int i = 0; i < SIZEOFFREE; i++)
2032	if (!ob->blocked (m, x + freearr_x[i], y + freearr_y[i]))	2091	if (!ob->blocked (m, x + DIRX (i), y + DIRY (i)))
2033	return i;	2092	return i;
2034		2093
2035	return -1;	2094	return -1;
2036	}	2095	}
2037		2096
…		…
2048		2107
2049	while (--end)	2108	while (--end)
2050	swap (arr [end], arr [rndm (end + 1)]);	2109	swap (arr [end], arr [rndm (end + 1)]);
2051	}	2110	}
2052		2111
2053	/* new function to make monster searching more efficient, and effective!	2112	/* new function to make monster searching more efficient, and effective!
2054	* This basically returns a randomized array (in the passed pointer) of	2113	* This basically returns a randomized array (in the passed pointer) of
2055	* the spaces to find monsters. In this way, it won't always look for	2114	* the spaces to find monsters. In this way, it won't always look for
2056	* monsters to the north first. However, the size of the array passed	2115	* monsters to the north first. However, the size of the array passed
2057	* covers all the spaces, so within that size, all the spaces within	2116	* covers all the spaces, so within that size, all the spaces within
2058	* the 3x3 area will be searched, just not in a predictable order.	2117	* the 3x3 area will be searched, just not in a predictable order.
…		…
2083	* there is capable of.	2142	* there is capable of.
2084	*/	2143	*/
2085	int	2144	int
2086	find_dir (maptile m, int x, int y, object exclude)	2145	find_dir (maptile m, int x, int y, object exclude)
2087	{	2146	{
2088	int max = SIZEOFFREE, mflags;	2147	int max = SIZEOFFREE;
2089	MoveType move_type;	2148	MoveType move_type;
2090		2149
2091	if (exclude && exclude->head_ () != exclude)	2150	if (exclude && exclude->head_ () != exclude)
2092	{	2151	{
2093	exclude = exclude->head;	2152	exclude = exclude->head;
…		…
2134	{	2193	{
2135	return (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);	2194	return (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);
2136	}	2195	}
2137		2196
2138	/*	2197	/*
2139	* find_dir_2(delta-x,delta-y) will return a direction in which	2198	* find_dir_2(delta-x,delta-y) will return a direction value
2140	* an object which has subtracted the x and y coordinates of another	2199	* for running into direct [dx, dy].
2141	* object, needs to travel toward it.	2200	* (the opposite of crossfire's find_dir_2!)
2142	*/	2201	*/
2143	int	2202	int
2144	find_dir_2 (int x, int y)	2203	find_dir_2 (int x, int y)
2145	{	2204	{
		2205	#if 1 // new algorithm
		2206	// this works by putting x, y into 16 sectors, which
		2207	// are not equal sized, but are a better approximation
		2208	// then the old algorithm, and then using a mapping
		2209	// table to map it into a direction value.
		2210	// basically, it maps these comparisons to each bit
		2211	// bit #3: x < 0
		2212	// bit #2: y < 0
		2213	// bit #1: x > y
		2214	// bit #0: x > 2y
		2215
		2216	static const uint8 dir[16] = {
		2217	4, 5, 4, 3,
		2218	2, 1, 2, 3,
		2219	6, 5, 6, 7,
		2220	8, 1, 8, 7,
		2221	};
		2222	int sector = 0;
		2223
		2224	// this is a bit ugly, but more likely to result in branchless code
		2225	sector \|= x < 0 ? 8 : 0;
		2226	x = x < 0 ? -x : x; // abs
		2227
		2228	sector \|= y < 0 ? 4 : 0;
		2229	y = y < 0 ? -y : y; // abs
		2230
		2231	if (x > y)
		2232	{
		2233	sector \|= 2;
		2234
		2235	if (x > y * 2)
		2236	sector \|= 1;
		2237	}
		2238	else
		2239	{
		2240	if (y > x * 2)
		2241	sector \|= 1;
		2242	else if (!y)
		2243	return 0; // x == 0 here
		2244	}
		2245
		2246	return dir [sector];
		2247	#else // old algorithm
2146	int q;	2248	int q;
2147		2249
2148	if (y)	2250	if (y)
2149	q = x * 100 / y;	2251	q = 128 * x / y;
2150	else if (x)	2252	else if (x)
2151	q = -300 * x;	2253	q = -512 * x; // to make it > 309
2152	else	2254	else
2153	return 0;	2255	return 0;
2154		2256
2155	if (y > 0)	2257	if (y > 0)
2156	{	2258	{
2157	if (q < -242)	2259	if (q < -309) return 7;
		2260	if (q < -52) return 6;
		2261	if (q < 52) return 5;
		2262	if (q < 309) return 4;
		2263
2158	return 3;	2264	return 3;
2159	if (q < -41)	2265	}
2160	return 2;	2266	else
2161	if (q < 41)	2267	{
2162	return 1;	2268	if (q < -309) return 3;
2163	if (q < 242)	2269	if (q < -52) return 2;
2164	return 8;	2270	if (q < 52) return 1;
		2271	if (q < 309) return 8;
		2272
2165	return 7;	2273	return 7;
2166	}	2274	}
2167		2275	#endif
2168	if (q < -242)
2169	return 7;
2170	if (q < -41)
2171	return 6;
2172	if (q < 41)
2173	return 5;
2174	if (q < 242)
2175	return 4;
2176
2177	return 3;
2178	}	2276	}
2179		2277
2180	/*	2278	/*
2181	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is	2279	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is
2182	* between two directions (which are expected to be absolute (see absdir())	2280	* between two directions (which are expected to be absolute (see absdir())
2183	*/	2281	*/
2184	int	2282	int
2185	dirdiff (int dir1, int dir2)	2283	dirdiff (int dir1, int dir2)
2186	{	2284	{
2187	int d;
2188
2189	d = abs (dir1 - dir2);	2285	int d = abs (dir1 - dir2);
2190	if (d > 4)
2191	d = 8 - d;
2192		2286
2193	return d;	2287	return d > 4 ? 8 - d : d;
2194	}	2288	}
2195		2289
2196	/* peterm:	2290	/* peterm:
2197	* do LOS stuff for ball lightning. Go after the closest VISIBLE monster.	2291	* do LOS stuff for ball lightning. Go after the closest VISIBLE monster.
2198	* Basically, this is a table of directions, and what directions	2292	* Basically, this is a table of directions, and what directions
…		…
2267	int mflags;	2361	int mflags;
2268		2362
2269	if (dir < 0)	2363	if (dir < 0)
2270	return 0; /* exit condition: invalid direction */	2364	return 0; /* exit condition: invalid direction */
2271		2365
2272	dx = x + freearr_x[dir];	2366	dx = x + DIRX (dir);
2273	dy = y + freearr_y[dir];	2367	dy = y + DIRY (dir);
2274		2368
2275	mflags = get_map_flags (m, &m, dx, dy, &dx, &dy);	2369	mflags = get_map_flags (m, &m, dx, dy, &dx, &dy);
2276		2370
2277	/* This functional arguably was incorrect before - it was	2371	/* This functional arguably was incorrect before - it was
2278	* checking for P_WALL - that was basically seeing if	2372	* checking for P_WALL - that was basically seeing if
…		…
2304	* Add a check so we can't pick up invisible objects (0.93.8)	2398	* Add a check so we can't pick up invisible objects (0.93.8)
2305	*/	2399	*/
2306	int	2400	int
2307	can_pick (const object who, const object item)	2401	can_pick (const object who, const object item)
2308	{	2402	{
2309	return /QUERY_FLAG(who,FLAG_WIZ)\|\| /	2403	return /who->flag [FLAG_WIZ]\|\| /
2310	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&	2404	(item->weight > 0 && !item->flag [FLAG_NO_PICK] &&
2311	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->is_player () \|\| item->weight < who->weight / 3));	2405	!item->flag [FLAG_ALIVE] && !item->invisible && (who->is_player () \|\| item->weight < who->weight / 3));
2312	}	2406	}
		2407
		2408	//-GPL
2313		2409
2314	/*	2410	/*
2315	* create clone from object to another	2411	* create clone from object to another
2316	*/	2412	*/
2317	object *	2413	object *
…		…
2348	return tmp;	2444	return tmp;
2349		2445
2350	return 0;	2446	return 0;
2351	}	2447	}
2352		2448
		2449	/* Zero the key_values on op, decrementing the shared-string
		2450	* refcounts and freeing the links.
		2451	*/
		2452	void
		2453	key_values::clear ()
		2454	{
		2455	for (key_value *kvp = first; kvp; )
		2456	{
		2457	key_value *next = kvp->next;
		2458	delete kvp;
		2459	kvp = next;
		2460	}
		2461
		2462	first = 0;
		2463	}
		2464
2353	shstr_tmp	2465	shstr_tmp
2354	object::kv_get (shstr_tmp key) const	2466	key_values::get (shstr_tmp key) const
2355	{	2467	{
2356	for (key_value *kv = key_values; kv; kv = kv->next)	2468	for (key_value *kv = first; kv; kv = kv->next)
2357	if (kv->key == key)	2469	if (kv->key == key)
2358	return kv->value;	2470	return kv->value;
2359		2471
2360	return shstr ();	2472	return shstr ();
2361	}	2473	}
2362		2474
2363	void	2475	void
		2476	key_values::add (shstr_tmp key, shstr_tmp value)
		2477	{
		2478	key_value *kv = new key_value;
		2479
		2480	kv->next = first;
		2481	kv->key = key;
		2482	kv->value = value;
		2483
		2484	first = kv;
		2485	}
		2486
		2487	void
2364	object::kv_set (shstr_tmp key, shstr_tmp value)	2488	key_values::set (shstr_tmp key, shstr_tmp value)
2365	{	2489	{
2366	for (key_value *kv = key_values; kv; kv = kv->next)	2490	for (key_value *kv = first; kv; kv = kv->next)
2367	if (kv->key == key)	2491	if (kv->key == key)
2368	{	2492	{
2369	kv->value = value;	2493	kv->value = value;
2370	return;	2494	return;
2371	}	2495	}
2372		2496
2373	key_value *kv = new key_value;	2497	add (key, value);
2374
2375	kv->next = key_values;
2376	kv->key = key;
2377	kv->value = value;
2378
2379	key_values = kv;
2380	}	2498	}
2381		2499
2382	void	2500	void
2383	object::kv_del (shstr_tmp key)	2501	key_values::del (shstr_tmp key)
2384	{	2502	{
2385	for (key_value *kvp = &key_values; kvp; kvp = &(*kvp)->next)	2503	for (key_value *kvp = &first; kvp; kvp = &(*kvp)->next)
2386	if ((*kvp)->key == key)	2504	if ((*kvp)->key == key)
2387	{	2505	{
2388	key_value kv = kvp;	2506	key_value kv = kvp;
2389	kvp = (kvp)->next;	2507	kvp = (kvp)->next;
2390	delete kv;	2508	delete kv;
2391	return;	2509	return;
2392	}	2510	}
		2511	}
		2512
		2513	void
		2514	key_values::reverse ()
		2515	{
		2516	key_value *prev = 0;
		2517	key_value *head = first;
		2518
		2519	while (head)
		2520	{
		2521	key_value *node = head;
		2522	head = head->next;
		2523	node->next = prev;
		2524	prev = node;
		2525	}
		2526
		2527	first = prev;
		2528	}
		2529
		2530	key_values &
		2531	key_values::operator =(const key_values &kv)
		2532	{
		2533	clear ();
		2534
		2535	for (key_value *kvp = kv.first; kvp; kvp = kvp->next)
		2536	add (kvp->key, kvp->value);
		2537
		2538	reverse ();
		2539
		2540	return *this;
2393	}	2541	}
2394		2542
2395	object::depth_iterator::depth_iterator (object *container)	2543	object::depth_iterator::depth_iterator (object *container)
2396	: iterator_base (container)	2544	: iterator_base (container)
2397	{	2545	{
…		…
2480	object::region () const	2628	object::region () const
2481	{	2629	{
2482	return map ? map->region (x, y)	2630	return map ? map->region (x, y)
2483	: region::default_region ();	2631	: region::default_region ();
2484	}	2632	}
		2633
		2634	//+GPL
2485		2635
2486	void	2636	void
2487	object::open_container (object *new_container)	2637	object::open_container (object *new_container)
2488	{	2638	{
2489	if (container == new_container)	2639	if (container == new_container)
…		…
2547	}	2697	}
2548	// else if (!old_container->env && contr && contr->ns)	2698	// else if (!old_container->env && contr && contr->ns)
2549	// contr->ns->floorbox_reset ();	2699	// contr->ns->floorbox_reset ();
2550	}	2700	}
2551		2701
		2702	//-GPL
		2703
		2704	// prefetch some flat area around the player
		2705	static void
		2706	prefetch_surrounding_area (object op, maptile map, int range)
		2707	{
		2708	for (maprect *rect = map->split_to_tiles (mapwalk_buf,
		2709	op->x - range , op->y - range ,
		2710	op->x + range + 1, op->y + range + 1);
		2711	rect->m;
		2712	++rect)
		2713	{
		2714	rect->m->touch ();
		2715	rect->m->activate ();
		2716	}
		2717	}
		2718
		2719	// prefetch a generous area around the player, also up and down
		2720	void
		2721	object::prefetch_surrounding_maps ()
		2722	{
		2723	prefetch_surrounding_area (this, map, 40);
		2724
		2725	if (maptile *m = map->tile_available (TILE_DOWN))
		2726	prefetch_surrounding_area (this, m, 20);
		2727
		2728	if (maptile *m = map->tile_available (TILE_UP))
		2729	prefetch_surrounding_area (this, m, 20);
		2730	}
		2731
		2732	//+GPL
		2733
2552	object *	2734	object *
2553	object::force_find (shstr_tmp name)	2735	object::force_find (shstr_tmp name)
2554	{	2736	{
2555	/* cycle through his inventory to look for the MARK we want to	2737	/* cycle through his inventory to look for the MARK we want to
2556	* place	2738	* place
2557	*/	2739	*/
2558	for (object *tmp = inv; tmp; tmp = tmp->below)	2740	for (object *tmp = inv; tmp; tmp = tmp->below)
2559	if (tmp->type == FORCE && tmp->slaying == name)	2741	if (tmp->type == FORCE && tmp->slaying == name)
2560	return splay (tmp);	2742	return splay (tmp);
2561		2743
2562	return 0;	2744	return 0;
2563	}	2745	}
2564		2746
2565	//-GPL
2566
2567	void	2747	void
2568	object::force_set_timer (int duration)	2748	object::force_set_timer (int duration)
2569	{	2749	{
2570	this->duration = 1;	2750	this->duration = 1;
2571	this->speed_left = -1.f;	2751	this->speed_left = -1.f;
…		…
2577	object::force_add (shstr_tmp name, int duration)	2757	object::force_add (shstr_tmp name, int duration)
2578	{	2758	{
2579	if (object *force = force_find (name))	2759	if (object *force = force_find (name))
2580	force->destroy ();	2760	force->destroy ();
2581		2761
2582	object *force = get_archetype (FORCE_NAME);	2762	object *force = archetype::get (FORCE_NAME);
2583		2763
2584	force->slaying = name;	2764	force->slaying = name;
2585	force->force_set_timer (duration);	2765	force->force_set_timer (duration);
2586	force->flag [FLAG_APPLIED] = true;	2766	force->flag [FLAG_APPLIED] = true;
2587		2767
…		…
2656	}	2836	}
2657	else	2837	else
2658	move_type = mt;	2838	move_type = mt;
2659	}	2839	}
2660		2840
		2841	/* object should be a player.
		2842	* we return the object the player has marked with the 'mark' command
		2843	* below. If no match is found (or object has changed), we return
		2844	* NULL. We leave it up to the calling function to print messages if
		2845	* nothing is found.
		2846	*/
		2847	object *
		2848	object::mark () const
		2849	{
		2850	if (contr && contr->mark && contr->mark->env == this)
		2851	return contr->mark;
		2852	else
		2853	return 0;
		2854	}
		2855
		2856	// put marked object first in the inventory
		2857	// this is used by identify-like spells so players can influence
		2858	// the order a bit.
		2859	void
		2860	object::splay_marked ()
		2861	{
		2862	if (object *marked = mark ())
		2863	splay (marked);
		2864	}
		2865

Diff Legend

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

Comparing deliantra/server/common/object.C (file contents): Revision 1.319 by root, Sat Apr 3 02:29:40 2010 UTC vs. Revision 1.368 by root, Wed Dec 5 19:03:26 2018 UTC

Diff Legend

Comparing deliantra/server/common/object.C (file contents):
Revision 1.319 by root, Sat Apr 3 02:29:40 2010 UTC vs.
Revision 1.368 by root, Wed Dec 5 19:03:26 2018 UTC