ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/server/common/object.C

Comparing deliantra/server/common/object.C (file contents):
Revision 1.304 by root, Tue Nov 10 16:29:20 2009 UTC vs.
Revision 1.367 by root, Sun Nov 18 15:19:48 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 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,2007 Mark Wedel & Crossfire Development Team	6	* Copyright (©) 2001 Mark Wedel & Crossfire Development Team
6	* Copyright (©) 1992,2007 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>
27	#include <sys/types.h>	28	#include <sys/types.h>
28	#include <sys/uio.h>	29	#include <sys/uio.h>
29	#include <object.h>	30	#include <object.h>
30	#include <sproto.h>	31	#include <sproto.h>
31	#include <loader.h>
32		32
33	#include <bitset>	33	#include <bitset>
34		34
35	UUID UUID::cur;	35	UUID UUID::cur;
36	static uint64_t seq_next_save;	36	static uint64_t seq_next_save;
…		…
38	uint32_t mapspace::smellcount = 10000;	38	uint32_t mapspace::smellcount = 10000;
39		39
40	objectvec objects;	40	objectvec objects;
41	activevec actives;	41	activevec actives;
42		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
43	//+GPL	49	//+GPL
44		50
45	short freearr_x[SIZEOFFREE] = {	51	int freearr_x[SIZEOFFREE] = {
46	0,	52	0,
47	0, 1, 1, 1, 0, -1, -1, -1,	53	0, 1, 1, 1, 0, -1, -1, -1,
48	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,
49	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
50	};	56	};
51	short freearr_y[SIZEOFFREE] = {	57	int freearr_y[SIZEOFFREE] = {
52	0,	58	0,
53	-1, -1, 0, 1, 1, 1, 0, -1,	59	-1, -1, 0, 1, 1, 1, 0, -1,
54	-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,
55	-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
56	};	62	};
…		…
66	9, 10, 13, 14, 17, 18, 21, 22,	72	9, 10, 13, 14, 17, 18, 21, 22,
67	25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45, 48,	73	25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45, 48,
68	49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49	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
69	};	75	};
70		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
71	static void	96	static void
72	write_uuid (uval64 skip, bool sync)	97	write_uuid (uval64 skip, bool sync)
73	{	98	{
74	CALL_BEGIN (2);	99	CALL_BEGIN (2);
75	CALL_ARG_SV (newSVval64 (skip));	100	CALL_ARG_SV (newSVval64 (skip));
…		…
77	CALL_CALL ("cf::write_uuid", G_DISCARD);	102	CALL_CALL ("cf::write_uuid", G_DISCARD);
78	CALL_END;	103	CALL_END;
79	}	104	}
80		105
81	static void	106	static void
82	read_uuid (void)	107	read_uuid ()
83	{	108	{
84	char filename[MAX_BUF];	109	char filename[MAX_BUF];
85		110
86	sprintf (filename, "%s/uuid", settings.localdir);	111	sprintf (filename, "%s/uuid", settings.localdir);
87		112
…		…
209		234
210	/* 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. */
211	static bool	236	static bool
212	compare_ob_value_lists_one (const object *wants, const object *has)	237	compare_ob_value_lists_one (const object *wants, const object *has)
213	{	238	{
214	/* n-squared behaviour (see kv_get), but I'm hoping both	239	/* n-squared behaviour (see kv.get), but I'm hoping both
215	* 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
216	* different structure or at least keep the lists sorted...	241	* different structure or at least keep the lists sorted...
217	*/	242	*/
218		243
219	/* For each field in wants, */	244	/* For each field in wants, */
220	for (key_value *kv = wants->key_values; kv; kv = kv->next)	245	for (key_value *kv = wants->kv.first; kv; kv = kv->next)
221	if (has->kv_get (kv->key) != kv->value)	246	if (has->kv.get (kv->key) != kv->value)
222	return false;	247	return false;
223		248
224	/* 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. */
225	return true;	250	return true;
226	}	251	}
…		…
248	* Improvements made with merge: Better checking on potion, and also	273	* Improvements made with merge: Better checking on potion, and also
249	* check weight	274	* check weight
250	*/	275	*/
251	bool object::can_merge_slow (object *ob1, object *ob2)	276	bool object::can_merge_slow (object *ob1, object *ob2)
252	{	277	{
253	/* A couple quicksanity checks */	278	/* A couple quick sanity checks */
254	if (ob1 == ob2	279	if (ob1 == ob2
255	|| ob1->type != ob2->type	280	|| ob1->type != ob2->type
		281	|| ob1->value != ob2->value
		282	|| ob1->name != ob2->name
		283	|| ob1->custom_name != ob2->custom_name
256	|| fabs (ob1->speed - ob2->speed) >= MIN_ACTIVE_SPEED	284	|| fabs (ob1->speed - ob2->speed) >= MIN_ACTIVE_SPEED)
257	|| ob1->value != ob2->value
258	|| ob1->name != ob2->name)
259	return 0;	285	return 0;
260		286
261	/* Do not merge objects if nrof would overflow, assume nrof	287	/* Do not merge objects if nrof would overflow, assume nrof
262	* is always 0 .. 2**31-1 */	288	* is always 0 .. 2**31-1 */
263	if (ob1->nrof > 0x7fffffff - ob2->nrof)	289	if (ob1->nrof > 0x7fffffff - ob2->nrof)
…		…
267	* 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
268	* 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
269	* 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
270	* flags lose any meaning.	296	* flags lose any meaning.
271	*/	297	*/
272	if (QUERY_FLAG (ob1, FLAG_IDENTIFIED))	298	if (ob1->flag [FLAG_IDENTIFIED])
273	SET_FLAG (ob1, FLAG_BEEN_APPLIED);	299	ob1->set_flag (FLAG_BEEN_APPLIED);
274		300
275	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))	301	if (ob2->flag [FLAG_IDENTIFIED])
276	SET_FLAG (ob2, FLAG_BEEN_APPLIED);	302	ob2->set_flag (FLAG_BEEN_APPLIED);
277		303
278	if (ob1->arch->archname != ob2->arch->archname	304	if (ob1->arch->archname != ob2->arch->archname
279	|| ob1->name != ob2->name	305	|| ob1->name != ob2->name
280	|| ob1->title != ob2->title	306	|| ob1->title != ob2->title
281	|| ob1->msg != ob2->msg	307	|| ob1->msg != ob2->msg
…		…
284	|| ob1->magic != ob2->magic	310	|| ob1->magic != ob2->magic
285	|| ob1->slaying != ob2->slaying	311	|| ob1->slaying != ob2->slaying
286	|| ob1->skill != ob2->skill	312	|| ob1->skill != ob2->skill
287	|| ob1->value != ob2->value	313	|| ob1->value != ob2->value
288	|| ob1->animation_id != ob2->animation_id	314	|| ob1->animation_id != ob2->animation_id
289	|| (ob1->face != ob2->face && !ob1->animation_id) // face and animation are dependent on each other	315	|| (ob1->face != ob2->face && !ob1->animation_id) // face and animation are dependend on each other
290	|| ob1->client_type != ob2->client_type	316	|| ob1->client_type != ob2->client_type
291	|| ob1->material != ob2->material	317	|| ob1->material != ob2->material
292	|| ob1->lore != ob2->lore	318	|| ob1->lore != ob2->lore
293	|| ob1->subtype != ob2->subtype	319	|| ob1->subtype != ob2->subtype
294	|| ob1->move_type != ob2->move_type	320	|| ob1->move_type != ob2->move_type
…		…
326	/* 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
327	* if it is valid.	353	* if it is valid.
328	*/	354	*/
329	}	355	}
330		356
331	/* 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,
332	* 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
333	* some items equipped, and we don't want those to merge.	359	* some items equipped, and we don't want those to merge.
334	*/	360	*/
335	if (QUERY_FLAG (ob1, FLAG_APPLIED) || QUERY_FLAG (ob2, FLAG_APPLIED))	361	if (ob1->flag [FLAG_APPLIED] || ob2->flag [FLAG_APPLIED])
336	return 0;	362	return 0;
337		363
338	/* 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
339	* 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
340	* check?	366	* check?
341	*/	367	*/
342	if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && ob1->has_active_speed ())	368	if (!ob1->flag [FLAG_ANIMATE] && ob1->has_active_speed ())
343	return 0;	369	return 0;
344		370
345	switch (ob1->type)	371	switch (ob1->type)
346	{	372	{
347	case SCROLL:	373	case SCROLL:
348	if (ob1->level != ob2->level)	374	if (ob1->level != ob2->level)
349	return 0;	375	return 0;
350	break;	376	break;
351	}	377	}
352		378
353	if (ob1->key_values || ob2->key_values)	379	if (!ob1->kv.empty () || !ob2->kv.empty ())
354	{	380	{
355	/* At least one of these has key_values. */	381	/* At least one of these has key_values. */
356	if ((!ob1->key_values) != (!ob2->key_values))	382	if (ob1->kv.empty () != ob2->kv.empty ())
357	return 0; /* One has fields, but the other one doesn't. */	383	return 0; /* One has fields, but the other one doesn't. */
358		384
359	if (!compare_ob_value_lists (ob1, ob2))	385	if (!compare_ob_value_lists (ob1, ob2))
360	return 0;	386	return 0;
361	}	387	}
…		…
421		447
422	return 0;	448	return 0;
423	}	449	}
424		450
425	// adjust weight per container type ("of holding")	451	// adjust weight per container type ("of holding")
426	static sint32	452	static weight_t
427	weight_adjust_for (object *op, sint32 weight)	453	weight_adjust_for (object *op, weight_t weight)
428	{	454	{
429	return op->type == CONTAINER	455	if (op->type == CONTAINER)
430	? lerp (weight, 0, 100, 0, 100 - op->stats.Str)	456	weight -= weight * op->stats.Str / 100;
431	: weight;
432	}
433		457
		458	return weight;
		459	}
		460
434	/*	461	/*
435	* adjust_weight(object, weight) adds the specified weight to an object,	462	* subtracts, then adds, the specified weight to an object,
436	* and also updates how much the environment(s) is/are carrying.	463	* and also updates how much the environment(s) is/are carrying.
437	*/	464	*/
438	static void	465	static void
439	adjust_weight (object *op, sint32 weight)	466	adjust_weight (object *op, weight_t sub, weight_t add)
440	{	467	{
441	while (op)	468	while (op)
442	{	469	{
443	// adjust by actual difference to account for rounding errors	470	weight_t carrying = (weight_t)op->carrying
444	// i.e. (w2 - w1) / f != w2 / f - w1 / f and the latter is correct	471	- weight_adjust_for (op, sub)
445	weight = weight_adjust_for (op, op->carrying)	472	+ weight_adjust_for (op, add);
446	- weight_adjust_for (op, op->carrying - weight);
447		473
448	if (!weight)	474	sub = op->carrying;
449	return;
450
451	op->carrying += weight;	475	op->carrying = carrying;
		476	add = op->carrying;
452		477
453	if (object *pl = op->visible_to ())	478	if (object *pl = op->visible_to ())
454	if (pl != op) // player is handled lazily	479	if (pl != op) // player is handled lazily
455	esrv_update_item (UPD_WEIGHT, pl, op);	480	esrv_update_item (UPD_WEIGHT, pl, op);
456		481
…		…
464	* containers are carrying, and sums it up.	489	* containers are carrying, and sums it up.
465	*/	490	*/
466	void	491	void
467	object::update_weight ()	492	object::update_weight ()
468	{	493	{
469	sint32 sum = 0;	494	weight_t sum = 0;
470		495
471	for (object *op = inv; op; op = op->below)	496	for (object *op = inv; op; op = op->below)
472	{	497	{
473	if (op->inv)
474	op->update_weight ();	498	op->update_weight ();
475		499
476	sum += op->total_weight ();	500	sum += weight_adjust_for (this, op->total_weight ());
477	}	501	}
478
479	sum = weight_adjust_for (this, sum);
480		502
481	if (sum != carrying)	503	if (sum != carrying)
482	{	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
483	carrying = sum;	509	carrying = sum;
484		510
485	if (object *pl = visible_to ())	511	if (object *pl = visible_to ())
486	if (pl != this) // player is handled lazily	512	if (pl != this) // player is handled lazily
487	esrv_update_item (UPD_WEIGHT, pl, this);	513	esrv_update_item (UPD_WEIGHT, pl, this);
…		…
515	object *	541	object *
516	find_object (tag_t i)	542	find_object (tag_t i)
517	{	543	{
518	for_all_objects (op)	544	for_all_objects (op)
519	if (op->count == i)	545	if (op->count == i)
		546	return op;
		547
		548	return 0;
		549	}
		550
		551	/*
		552	* Returns the object which has the uuid equal to the argument.
		553	* MOAR VERRRY slow.
		554	*/
		555
		556	object *
		557	find_object_uuid (UUID i)
		558	{
		559	for_all_objects (op)
		560	if (op->uuid == i)
520	return op;	561	return op;
521		562
522	return 0;	563	return 0;
523	}	564	}
524		565
…		…
558	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 ());
559	return;	600	return;
560	}	601	}
561		602
562	this->owner = owner;	603	this->owner = owner;
563	}
564
565	int
566	object::slottype () const
567	{
568	if (type == SKILL)
569	{
570	if (IS_COMBAT_SKILL (subtype)) return slot_combat;
571	if (IS_RANGED_SKILL (subtype)) return slot_ranged;
572	}
573	else
574	{
575	if (slot [body_combat].info) return slot_combat;
576	if (slot [body_range ].info) return slot_ranged;
577	}
578
579	return slot_none;
580	}
581
582	bool
583	object::change_weapon (object *ob)
584	{
585	if (current_weapon == ob)
586	return true;
587
588	if (chosen_skill)
589	chosen_skill->flag [FLAG_APPLIED] = false;
590
591	current_weapon = ob;
592	chosen_skill = !ob || ob->type == SKILL ? ob : find_skill_by_name (this, ob->skill);
593
594	if (chosen_skill)
595	chosen_skill->flag [FLAG_APPLIED] = true;
596
597	update_stats ();
598
599	if (ob)
600	{
601	// now check wether any body locations became invalid, in which case
602	// we cannot apply the weapon at the moment.
603	for (int i = 0; i < NUM_BODY_LOCATIONS; ++i)
604	if (slot[i].used < 0)
605	{
606	current_weapon = chosen_skill = 0;
607	update_stats ();
608
609	new_draw_info_format (NDI_UNIQUE, 0, this,
610	"You try to balance all your items at once, "
611	"but the %s is just too much for your body. "
612	"[You need to unapply some items first - use the 'body' command to see "
613	"how many items you cna wera on a specific body part.]", &ob->name);
614	return false;
615	}
616
617	//new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);
618	}
619	else
620	;//new_draw_info_format (NDI_UNIQUE, 0, this, "You unwield your weapons.");
621
622	if (ob && !ob->flag [FLAG_APPLIED] && ob->type != SPELL)
623	{
624	LOG (llevError | logBacktrace, "%s changed to unapplied weapon %s",
625	&name, ob->debug_desc ());
626	return false;
627	}
628
629	return true;
630	}
631
632	/* Zero the key_values on op, decrementing the shared-string
633	* refcounts and freeing the links.
634	*/
635	static void
636	free_key_values (object *op)
637	{
638	for (key_value *i = op->key_values; i; )
639	{
640	key_value *next = i->next;
641	delete i;
642
643	i = next;
644	}
645
646	op->key_values = 0;
647	}	604	}
648		605
649	/*	606	/*
650	* copy_to first frees everything allocated by the dst object,	607	* copy_to first frees everything allocated by the dst object,
651	* and then copies the contents of itself into the second	608	* and then copies the contents of itself into the second
…		…
657	void	614	void
658	object::copy_to (object *dst)	615	object::copy_to (object *dst)
659	{	616	{
660	dst->remove ();	617	dst->remove ();
661	*(object_copy *)dst = *this;	618	*(object_copy *)dst = *this;
		619
		620	// maybe move to object_copy?
		621	dst->kv = kv;
		622
662	dst->flag [FLAG_REMOVED] = true;	623	dst->flag [FLAG_REMOVED] = true;
663
664	/* Copy over key_values, if any. */
665	if (key_values)
666	{
667	key_value *tail = 0;
668	dst->key_values = 0;
669
670	for (key_value *i = key_values; i; i = i->next)
671	{
672	key_value *new_link = new key_value;
673
674	new_link->next = 0;
675	new_link->key = i->key;
676	new_link->value = i->value;
677
678	/* Try and be clever here, too. */
679	if (!dst->key_values)
680	{
681	dst->key_values = new_link;
682	tail = new_link;
683	}
684	else
685	{
686	tail->next = new_link;
687	tail = new_link;
688	}
689	}
690	}
691
692	if (speed < 0)
693	dst->speed_left -= rndm ();
694
695	dst->activate ();	624	dst->activate ();
696	}	625	}
697		626
698	void	627	void
699	object::instantiate ()	628	object::instantiate ()
700	{	629	{
701	if (!uuid.seq) // HACK	630	if (!uuid.seq) // HACK
702	uuid = UUID::gen ();	631	uuid = UUID::gen ();
703		632
		633	// TODO: unclean state changes, should not be done in copy_to AND instantiate
		634	if (flag [FLAG_RANDOM_SPEED] && speed)
		635	speed_left = - speed - rndm (); // TODO animation
		636	else
704	speed_left = -0.1f;	637	speed_left = -1.;
		638
705	/* 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
706	* 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.
707	* 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
708	* values for the body_used info, so when items are created	642	* values for the body_used info, so when items are created
709	* for it, they can be properly equipped.	643	* for it, they can be properly equipped.
710	*/	644	*/
711	for (int i = NUM_BODY_LOCATIONS; i--; )	645	for (int i = 0; i < NUM_BODY_LOCATIONS; ++i)
712	slot[i].used = slot[i].info;	646	slot[i].used = slot[i].info;
713		647
714	attachable::instantiate ();	648	attachable::instantiate ();
715	}	649	}
716		650
717	object *	651	object *
718	object::clone ()	652	object::clone ()
719	{	653	{
720	object *neu = create ();	654	object *neu = create ();
721	copy_to (neu);	655	copy_to (neu);
		656
		657	// TODO: unclean state changes, should not be done in clone AND instantiate
		658	if (neu->flag [FLAG_RANDOM_SPEED] && neu->speed)
		659	neu->speed_left = - neu->speed - rndm (); // TODO animation
		660
722	neu->map = map; // not copied by copy_to	661	neu->map = map; // not copied by copy_to
723	return neu;	662	return neu;
		663	}
		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);
724	}	674	}
725		675
726	/*	676	/*
727	* 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
728	* 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
729	* 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.
730	*/	680	*/
731	void	681	void
732	update_turn_face (object *op)	682	update_turn_face (object *op)
733	{	683	{
734	if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || !op->arch)	684	if (!op->flag [FLAG_IS_TURNABLE] || !op->arch)
735	return;	685	return;
736		686
737	SET_ANIMATION (op, op->direction);	687	op->update_anim_frame (op->direction);
738	update_object (op, UP_OBJ_FACE);
739	}	688	}
740		689
741	/*	690	/*
742	* 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
743	* 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.
…		…
753	else	702	else
754	deactivate ();	703	deactivate ();
755	}	704	}
756		705
757	/*	706	/*
758	* update_object() updates the the map.	707	* update_object() updates the map.
759	* It takes into account invisible objects (and represent squares covered	708	* It takes into account invisible objects (and represent squares covered
760	* 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
761	* invisible object, etc...)	710	* invisible object, etc...)
762	* 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
763	* 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
…		…
800	}	749	}
801		750
802	mapspace &m = op->ms ();	751	mapspace &m = op->ms ();
803		752
804	if (!(m.flags_ & P_UPTODATE))	753	if (!(m.flags_ & P_UPTODATE))
805	/* nop */;	754	m.update_up (); // nothing to do except copy up
806	else if (action == UP_OBJ_INSERT)	755	else if (action == UP_OBJ_INSERT)
807	{	756	{
808	#if 0	757	#if 0
809	// this is likely overkill, TODO: revisit (schmorp)	758	// this is likely overkill, TODO: revisit (schmorp)
810	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))	759	if ((op->flag [FLAG_BLOCKSVIEW] && !(m.flags_ & P_BLOCKSVIEW))
811	|| (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))	760	|| (op->flag [FLAG_NO_MAGIC] && !(m.flags_ & P_NO_MAGIC))
812	|| (op->is_player () && !(m.flags_ & P_PLAYER))	761	|| (op->is_player () && !(m.flags_ & P_PLAYER))
813	|| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))	762	|| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
814	|| (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))	763	|| (op->flag [FLAG_ALIVE] && !(m.flags_ & P_IS_ALIVE))
815	|| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))	764	|| (op->flag [FLAG_DAMNED] && !(m.flags_ & P_NO_CLERIC))
816	|| (m.move_on | op->move_on ) != m.move_on	765	|| (m.move_on | op->move_on ) != m.move_on
817	|| (m.move_off | op->move_off ) != m.move_off	766	|| (m.move_off | op->move_off ) != m.move_off
818	|| (m.move_slow | op->move_slow) != m.move_slow	767	|| (m.move_slow | op->move_slow) != m.move_slow
819	/* 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
820	* have move_allow right now.	769	* have move_allow right now.
821	*/	770	*/
822	|| ((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
823	m.invalidate ();	772	m.invalidate ();
824	#else	773	#else
825	// 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)
…		…
831	* that is being removed.	780	* that is being removed.
832	*/	781	*/
833	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)	782	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
834	m.invalidate ();	783	m.invalidate ();
835	else if (action == UP_OBJ_FACE)	784	else if (action == UP_OBJ_FACE)
836	/* Nothing to do for that case */ ;	785	m.update_up (); // nothing to do for that case, except copy up
837	else	786	else
838	LOG (llevError, "update_object called with invalid action: %d\n", action);	787	LOG (llevError, "update_object called with invalid action: %d\n", action);
839		788
840	if (op->more)	789	if (op->more)
841	update_object (op->more, action);	790	update_object (op->more, action);
842	}	791	}
843		792
844	object::object ()	793	object::object ()
845	{	794	{
846	SET_FLAG (this, FLAG_REMOVED);	795	this->set_flag (FLAG_REMOVED);
847		796
848	//expmul = 1.0; declared const for the time being	797	//expmul = 1.0; declared const for the time being
849	face = blank_face;	798	face = blank_face;
850	material = MATERIAL_NULL;	799	material = MATERIAL_NULL;
851	}	800	}
852		801
853	object::~object ()	802	object::~object ()
854	{	803	{
855	unlink ();	804	unlink ();
856		805
857	free_key_values (this);	806	kv.clear ();
858	}	807	}
859
860	static int object_count;
861		808
862	void object::link ()	809	void object::link ()
863	{	810	{
864	assert (!index);//D	811	assert (!index);//D
865	uuid = UUID::gen ();	812	uuid = UUID::gen ();
866	count = ++object_count;
867		813
868	refcnt_inc ();	814	refcnt_inc ();
869	objects.insert (this);	815	objects.insert (this);
		816
		817	++create_count;
		818
870	}	819	}
871		820
872	void object::unlink ()	821	void object::unlink ()
873	{	822	{
874	if (!index)	823	if (!index)
875	return;	824	return;
		825
		826	++destroy_count;
876		827
877	objects.erase (this);	828	objects.erase (this);
878	refcnt_dec ();	829	refcnt_dec ();
879	}	830	}
880		831
…		…
903	op->activate_recursive ();	854	op->activate_recursive ();
904	}	855	}
905		856
906	/* This function removes object 'op' from the list of active	857	/* This function removes object 'op' from the list of active
907	* objects.	858	* objects.
908	* This should only be used for style maps or other such	859	* This should only be used for style maps or other such
909	* 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
910	* in play chewing up cpu time getting processed.	861	* in play chewing up cpu time getting processed.
911	* The reverse of this is to call update_ob_speed, which	862	* The reverse of this is to call update_ob_speed, which
912	* 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.
913	*/	864	*/
…		…
959	* if some form of movement is allowed, let objects	910	* if some form of movement is allowed, let objects
960	* drop on that space.	911	* drop on that space.
961	*/	912	*/
962	if (!drop_to_ground	913	if (!drop_to_ground
963	|| !map	914	|| !map
964	|| map->in_memory != MAP_ACTIVE	915	|| !map->linkable ()
965	|| map->no_drop	916	|| map->no_drop
966	|| ms ().move_block == MOVE_ALL)	917	|| ms ().move_block == MOVE_ALL)
967	{	918	{
968	while (inv)	919	while (inv)
969	inv->destroy ();	920	inv->destroy ();
…		…
985	map->insert (op, x, y);	936	map->insert (op, x, y);
986	}	937	}
987	}	938	}
988	}	939	}
989		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 *
990	object *object::create ()	978	object::create ()
991	{	979	{
992	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
993	op->link ();	1002	op->link ();
		1003
994	return op;	1004	return op;
995	}	1005	}
996		1006
997	static struct freed_map : maptile	1007	void
		1008	object::do_delete ()
998	{	1009	{
999	freed_map ()	1010	uint32_t count = this->count;
1000	{
1001	path = "<freed objects map>";
1002	name = "/internal/freed_objects_map";
1003	width = 3;
1004	height = 3;
1005	no_drop = 1;
1006	no_reset = 1;
1007		1011
1008	alloc ();	1012	this->~object ();
1009	in_memory = MAP_ACTIVE;
1010	}
1011		1013
1012	~freed_map ()	1014	freelist_item *li = (freelist_item *)this;
1013	{	1015	li->next = freelist;
1014	destroy ();	1016	li->count = count;
1015	}	1017
1016	} freed_map; // freed objects are moved here to avoid crashes	1018	freelist = li;
		1019	++free_count;
		1020	}
1017		1021
1018	void	1022	void
1019	object::do_destroy ()	1023	object::do_destroy ()
1020	{	1024	{
1021	if (flag [FLAG_IS_LINKED])	1025	if (flag [FLAG_IS_LINKED])
…		…
1064	LOG (llevError | logBacktrace, "tried to destroy the tail of an object");	1068	LOG (llevError | logBacktrace, "tried to destroy the tail of an object");
1065	head->destroy ();	1069	head->destroy ();
1066	return;	1070	return;
1067	}	1071	}
1068		1072
1069	destroy_inv (false);	1073	destroy_inv_fast ();
1070		1074
1071	if (is_head ())	1075	if (is_head ())
1072	if (sound_destroy)	1076	if (sound_destroy)
1073	play_sound (sound_destroy);	1077	play_sound (sound_destroy);
1074	else if (flag [FLAG_MONSTER])	1078	else if (flag [FLAG_MONSTER])
…		…
1095	flag [FLAG_REMOVED] = true;	1099	flag [FLAG_REMOVED] = true;
1096		1100
1097	if (more)	1101	if (more)
1098	more->remove ();	1102	more->remove ();
1099		1103
1100	/*	1104	/*
1101	* In this case, the object to be removed is in someones	1105	* In this case, the object to be removed is in someones
1102	* inventory.	1106	* inventory.
1103	*/	1107	*/
1104	if (env)	1108	if (env)
1105	{	1109	{
1106	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
1107	if (object *pl = visible_to ())	1111	if (object *pl = visible_to ())
1108	esrv_del_item (pl->contr, count);	1112	esrv_del_item (pl->contr, count);
1109	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
1110		1114
1111	adjust_weight (env, -total_weight ());	1115	adjust_weight (env, total_weight (), 0);
1112		1116
1113	object *pl = in_player ();	1117	object *pl = in_player ();
1114		1118
1115	/* we set up values so that it could be inserted into	1119	/* we set up values so that it could be inserted into
1116	* 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
…		…
1126		1130
1127	above = 0;	1131	above = 0;
1128	below = 0;	1132	below = 0;
1129	env = 0;	1133	env = 0;
1130		1134
1131	/* NO_FIX_PLAYER is set when a great many changes are being	1135	if (pl && pl->is_player ())
1132	* made to players inventory. If set, avoiding the call
1133	* to save cpu time.
1134	*/	1136	{
1135	if (pl)	1137	if (expect_false (pl->contr->combat_ob == this))
1136	if (pl->is_player () && (glow_radius || !QUERY_FLAG (pl, FLAG_NO_FIX_PLAYER)))
1137	{	1138	{
1138	pl->update_stats ();	1139	pl->apply (pl->contr->combat_ob, AP_UNAPPLY | AP_IGNORE_CURSE);
		1140	pl->contr->combat_ob = 0;
		1141	if (pl->contr->ranged_ob) pl->apply (pl->contr->ranged_ob);
		1142	}
1139		1143
		1144	if (expect_false (pl->contr->ranged_ob == this))
		1145	{
		1146	pl->apply (pl->contr->ranged_ob, AP_UNAPPLY | AP_IGNORE_CURSE);
		1147	pl->contr->ranged_ob = 0;
		1148	if (pl->contr->combat_ob) pl->apply (pl->contr->combat_ob);
		1149	}
		1150
		1151	pl->contr->queue_stats_update ();
		1152
1140	if (glow_radius && pl->is_on_map ())	1153	if (expect_false (glow_radius) && pl->is_on_map ())
1141	update_all_los (pl->map, pl->x, pl->y);	1154	update_all_los (pl->map, pl->x, pl->y);
1142	}	1155	}
1143	}	1156	}
1144	else if (map)	1157	else if (map)
1145	{	1158	{
1146	map->dirty = true;	1159	map->dirty = true;
1147	mapspace &ms = this->ms ();	1160	mapspace &ms = this->ms ();
…		…
1165	else if (pl->container_ () == this)	1178	else if (pl->container_ () == this)
1166	{	1179	{
1167	// removing a container should close it	1180	// removing a container should close it
1168	close_container ();	1181	close_container ();
1169	}	1182	}
1170		1183	else
1171	esrv_del_item (pl->contr, count);	1184	esrv_del_item (pl->contr, count);
1172	}	1185	}
1173		1186
1174	/* link the object above us */	1187	/* link the object above us */
1175	// re-link, make sure compiler can easily use cmove	1188	// re-link, make sure compiler can easily use cmove
1176	*(above ? &above->below : &ms.top) = below;	1189	*(above ? &above->below : &ms.top) = below;
…		…
1178		1191
1179	above = 0;	1192	above = 0;
1180	below = 0;	1193	below = 0;
1181		1194
1182	ms.invalidate ();	1195	ms.invalidate ();
1183
1184	if (map->in_memory == MAP_SAVING)
1185	return;
1186		1196
1187	int check_walk_off = !flag [FLAG_NO_APPLY];	1197	int check_walk_off = !flag [FLAG_NO_APPLY];
1188		1198
1189	if (object *pl = ms.player ())	1199	if (object *pl = ms.player ())
1190	{	1200	{
…		…
1267		1277
1268	object *prev = this;	1278	object *prev = this;
1269		1279
1270	for (archetype *at = (archetype *)arch->more; at; at = (archetype *)at->more)	1280	for (archetype *at = (archetype *)arch->more; at; at = (archetype *)at->more)
1271	{	1281	{
1272	object *op = arch_to_object (at);	1282	object *op = at->instance ();
1273		1283
1274	op->name = name;	1284	op->name = name;
1275	op->name_pl = name_pl;	1285	op->name_pl = name_pl;
1276	op->title = title;	1286	op->title = title;
1277		1287
…		…
1315	* Passing 0 for flag gives proper default values, so flag really only needs	1325	* Passing 0 for flag gives proper default values, so flag really only needs
1316	* to be set if special handling is needed.	1326	* to be set if special handling is needed.
1317	*	1327	*
1318	* Return value:	1328	* Return value:
1319	* new object if 'op' was merged with other object	1329	* new object if 'op' was merged with other object
1320	* NULL if 'op' was destroyed	1330	* NULL if there was an error (destroyed, blocked etc.)
1321	* just 'op' otherwise	1331	* just 'op' otherwise
1322	*/	1332	*/
1323	object *	1333	object *
1324	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)	1334	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1325	{	1335	{
1326	op->remove ();	1336	op->remove ();
1327		1337
1328	if (m == &freed_map)//D TODO: remove soon	1338	if (m == &freed_map)//D TODO: remove soon
1329	{//D	1339	{//D
1330	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
1331	}//D	1341	}//D
1332		1342
1333	/* Ideally, the caller figures this out. However, it complicates a lot	1343	/* Ideally, the caller figures this out. However, it complicates a lot
1334	* 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
1335	* need extra work	1345	* need extra work
…		…
1362	// from here :/	1372	// from here :/
1363	op->nrof += tmp->nrof;	1373	op->nrof += tmp->nrof;
1364	tmp->destroy ();	1374	tmp->destroy ();
1365	}	1375	}
1366		1376
1367	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 */
1368	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1378	op->clr_flag (FLAG_INV_LOCKED);
1369		1379
1370	if (!QUERY_FLAG (op, FLAG_ALIVE))	1380	if (!op->flag [FLAG_ALIVE])
1371	CLEAR_FLAG (op, FLAG_NO_STEAL);	1381	op->clr_flag (FLAG_NO_STEAL);
1372		1382
1373	if (flag & INS_BELOW_ORIGINATOR)	1383	if (flag & INS_BELOW_ORIGINATOR)
1374	{	1384	{
1375	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)
1376	{	1386	{
…		…
1404	* We've already dealt with merging if appropriate.	1414	* We've already dealt with merging if appropriate.
1405	* 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
1406	* flag contains INS_ABOVE_FLOOR_ONLY, once we find the last	1416	* flag contains INS_ABOVE_FLOOR_ONLY, once we find the last
1407	* floor, we want to insert above that and no further.	1417	* floor, we want to insert above that and no further.
1408	* 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
1409	* 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
1410	* 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
1411	* 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
1412	* that flying non pickable objects are spell objects.	1422	* that flying non pickable objects are spell objects.
1413	*/	1423	*/
1414	for (object *tmp = ms.bot; tmp; tmp = tmp->above)	1424	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1415	{	1425	{
1416	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])
1417	floor = tmp;	1427	floor = tmp;
1418		1428
1419	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])
1420	{	1430	{
1421	/* We insert above top, so we want this object below this */	1431	/* We insert above top, so we want this object below this */
1422	top = tmp->below;	1432	top = tmp->below;
1423	break;	1433	break;
1424	}	1434	}
…		…
1442	&& (op->face && !faces [op->face].visibility))	1452	&& (op->face && !faces [op->face].visibility))
1443	{	1453	{
1444	object *last;	1454	object *last;
1445		1455
1446	for (last = top; last != floor; last = last->below)	1456	for (last = top; last != floor; last = last->below)
1447	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1457	if (last->flag [FLAG_BLOCKSVIEW] && (last->type != EXIT))
1448	break;	1458	break;
1449		1459
1450	/* Check to see if we found the object that blocks view,	1460	/* Check to see if we found the object that blocks view,
1451	* 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
1452	* we can get inserted below this one, which requires we	1462	* we can get inserted below this one, which requires we
…		…
1525	*/	1535	*/
1526		1536
1527	/* 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 */
1528	if (!(flag & INS_NO_WALK_ON) && op->is_head ())	1538	if (!(flag & INS_NO_WALK_ON) && op->is_head ())
1529	{	1539	{
1530	if (check_move_on (op, originator))	1540	if (check_move_on (op, originator, flag))
1531	return 0;	1541	return 0;
1532		1542
1533	/* 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
1534	* walk on's.	1544	* walk on's.
1535	*/	1545	*/
1536	for (object *tmp = op->more; tmp; tmp = tmp->more)	1546	for (object *tmp = op->more; tmp; tmp = tmp->more)
1537	if (check_move_on (tmp, originator))	1547	if (check_move_on (tmp, originator, flag))
1538	return 0;	1548	return 0;
1539	}	1549	}
1540		1550
1541	return op;	1551	return op;
1542	}	1552	}
1543		1553
1544	/* this function inserts an object in the map, but if it	1554	/* this function inserts an object in the map, but if it
1545	* 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.
1546	* 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.
1547	*/	1557	*/
1548	void	1558	void
1549	replace_insert_ob_in_map (shstr_tmp archname, object *op)	1559	replace_insert_ob_in_map (shstr_tmp archname, object *op)
1550	{	1560	{
…		…
1552		1562
1553	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)	1563	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1554	if (tmp->arch->archname == archname) /* same archetype */	1564	if (tmp->arch->archname == archname) /* same archetype */
1555	tmp->destroy ();	1565	tmp->destroy ();
1556		1566
1557	object *tmp = arch_to_object (archetype::find (archname));	1567	object *tmp = archetype::find (archname)->instance ();
1558		1568
1559	tmp->x = op->x;	1569	tmp->x = op->x;
1560	tmp->y = op->y;	1570	tmp->y = op->y;
1561		1571
1562	insert_ob_in_map (tmp, op->map, op, 0);	1572	insert_ob_in_map (tmp, op->map, op, 0);
…		…
1582	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
1583	|| (items < m->max_items	1593	|| (items < m->max_items
1584	&& ms.volume () < m->max_volume))	1594	&& ms.volume () < m->max_volume))
1585	return true;	1595	return true;
1586		1596
1587	if (originator && originator->is_player ())	1597	if (originator)
1588	originator->contr->failmsg (format (	1598	originator->failmsgf (
1589	"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.>",
1590	query_name ()	1600	query_name ()
1591	));	1601	);
1592		1602
1593	return false;	1603	return false;
1594	}	1604	}
1595		1605
1596	/*	1606	/*
…		…
1608		1618
1609	nr = min (nr, nrof);	1619	nr = min (nr, nrof);
1610		1620
1611	if (nrof > nr)	1621	if (nrof > nr)
1612	{	1622	{
		1623	weight_t oweight = total_weight ();
		1624
1613	nrof -= nr;	1625	nrof -= nr;
1614	adjust_weight (env, -weight * max (1, nr)); // carrying == 0
1615		1626
1616	if (object *pl = visible_to ())	1627	if (object *pl = visible_to ())
1617	esrv_update_item (UPD_NROF, pl, this);	1628	esrv_update_item (UPD_NROF, pl, this);
		1629
		1630	adjust_weight (env, oweight, total_weight ());
1618		1631
1619	return true;	1632	return true;
1620	}	1633	}
1621	else	1634	else
1622	{	1635	{
…		…
1676	/*	1689	/*
1677	* env->insert (op)	1690	* env->insert (op)
1678	* This function inserts the object op in the linked list	1691	* This function inserts the object op in the linked list
1679	* inside the object environment.	1692	* inside the object environment.
1680	*	1693	*
1681	* 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
1682	* be != op, if items are merged. -Tero	1695	* be != op, if items are merged. -Tero
1683	*/	1696	*/
1684	object *	1697	object *
1685	object::insert (object *op)	1698	object::insert (object *op)
1686	{	1699	{
…		…
1697	if (op->nrof)	1710	if (op->nrof)
1698	for (object *tmp = inv; tmp; tmp = tmp->below)	1711	for (object *tmp = inv; tmp; tmp = tmp->below)
1699	if (object::can_merge (tmp, op))	1712	if (object::can_merge (tmp, op))
1700	{	1713	{
1701	/* return the original object and remove inserted object	1714	/* return the original object and remove inserted object
1702	(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
1703	tmp->nrof += op->nrof;	1720	tmp->nrof += op->nrof;
1704		1721
1705	if (object *pl = tmp->visible_to ())	1722	if (object *pl = tmp->visible_to ())
1706	esrv_update_item (UPD_NROF, pl, tmp);	1723	esrv_update_item (UPD_NROF, pl, tmp);
1707		1724
1708	adjust_weight (this, op->total_weight ());	1725	adjust_weight (this, oweight, weight_t (tmp->weight) * tmp->nrof);
1709		1726
1710	op->destroy ();	1727	op->destroy ();
1711	op = tmp;	1728	op = tmp;
1712	goto inserted;	1729	goto inserted;
1713	}	1730	}
…		…
1729	op->flag [FLAG_REMOVED] = 0;	1746	op->flag [FLAG_REMOVED] = 0;
1730		1747
1731	if (object *pl = op->visible_to ())	1748	if (object *pl = op->visible_to ())
1732	esrv_send_item (pl, op);	1749	esrv_send_item (pl, op);
1733		1750
1734	adjust_weight (this, op->total_weight ());	1751	adjust_weight (this, 0, op->total_weight ());
1735		1752
1736	inserted:	1753	inserted:
1737	/* 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 */
1738	if (op->glow_radius && is_on_map ())	1755	if (op->glow_radius && is_on_map ())
1739	{	1756	{
1740	update_stats ();	1757	update_stats ();
1741	update_all_los (map, x, y);	1758	update_all_los (map, x, y);
1742	}	1759	}
1743	else if (is_player () && !flag [FLAG_NO_FIX_PLAYER])	1760	else if (is_player ())
1744	// if this is a player's inventory, update stats	1761	// if this is a player's inventory, update stats
1745	update_stats ();	1762	contr->queue_stats_update ();
1746		1763
1747	INVOKE_OBJECT (INSERT, this);	1764	INVOKE_OBJECT (INSERT, this);
1748		1765
1749	return op;	1766	return op;
1750	}	1767	}
…		…
1768	* 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
1769	* 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
1770	* on top.	1787	* on top.
1771	*/	1788	*/
1772	int	1789	int
1773	check_move_on (object *op, object *originator)	1790	check_move_on (object *op, object *originator, int flags)
1774	{	1791	{
1775	if (QUERY_FLAG (op, FLAG_NO_APPLY))	1792	if (op->flag [FLAG_NO_APPLY])
1776	return 0;	1793	return 0;
1777		1794
1778	object *tmp;	1795	object *tmp;
1779	maptile *m = op->map;	1796	maptile *m = op->map;
1780	int x = op->x, y = op->y;	1797	int x = op->x, y = op->y;
…		…
1802	*/	1819	*/
1803	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)
1804	return 0;	1821	return 0;
1805		1822
1806	/* The objects have to be checked from top to bottom.	1823	/* The objects have to be checked from top to bottom.
1807	* Hence, we first go to the top:	1824	* Hence, we first go to the top:
1808	*/	1825	*/
1809	for (object *next, *tmp = ms.top; tmp; tmp = next)	1826	for (object *next, *tmp = ms.top; tmp; tmp = next)
1810	{	1827	{
1811	next = tmp->below;	1828	next = tmp->below;
1812		1829
…		…
1817	* Second check makes sure that the movement types not being slowed	1834	* Second check makes sure that the movement types not being slowed
1818	* (~slow_move) is not blocked on this space - just because the	1835	* (~slow_move) is not blocked on this space - just because the
1819	* 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
1820	* 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.
1821	*/	1838	*/
1822	if (!QUERY_FLAG (op, FLAG_WIZPASS))	1839	if (!op->flag [FLAG_WIZPASS])
1823	{	1840	{
1824	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||	1841	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
1825	((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))
1826	{	1843	{
1827	float diff = tmp->move_slow_penalty * fabs (op->speed);	1844	float diff = tmp->move_slow_penalty * fabs (op->speed);
…		…
1837		1854
1838	/* Basically same logic as above, except now for actual apply. */	1855	/* Basically same logic as above, except now for actual apply. */
1839	if ((!op->move_type && tmp->move_on & MOVE_WALK) ||	1856	if ((!op->move_type && tmp->move_on & MOVE_WALK) ||
1840	((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))
1841	{	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
1842	move_apply (tmp, op, originator);	1864	move_apply (tmp, op, originator);
1843		1865
1844	if (op->destroyed ())	1866	if (op->destroyed ())
1845	return 1;	1867	return 1;
1846		1868
…		…
1958	void	1980	void
1959	flag_inv (object *op, int flag)	1981	flag_inv (object *op, int flag)
1960	{	1982	{
1961	for (object *tmp = op->inv; tmp; tmp = tmp->below)	1983	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1962	{	1984	{
1963	SET_FLAG (tmp, flag);	1985	tmp->set_flag (flag);
1964	flag_inv (tmp, flag);	1986	flag_inv (tmp, flag);
1965	}	1987	}
1966	}	1988	}
1967		1989
1968	/*	1990	/*
…		…
1971	void	1993	void
1972	unflag_inv (object *op, int flag)	1994	unflag_inv (object *op, int flag)
1973	{	1995	{
1974	for (object *tmp = op->inv; tmp; tmp = tmp->below)	1996	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1975	{	1997	{
1976	CLEAR_FLAG (tmp, flag);	1998	tmp->clr_flag (flag);
1977	unflag_inv (tmp, flag);	1999	unflag_inv (tmp, flag);
1978	}	2000	}
1979	}	2001	}
1980		2002
1981	/*	2003	/*
…		…
1991	* inform the caller. However, insert_ob_in_map will update as	2013	* inform the caller. However, insert_ob_in_map will update as
1992	* 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.
1993	* 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
1994	* 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
1995	* 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
1996	* 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
1997	* customized, changed states, etc.	2019	* customized, changed states, etc.
1998	*/	2020	*/
1999	int	2021	int
2000	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)
2001	{	2023	{
2002	int altern[SIZEOFFREE];	2024	int altern[SIZEOFFREE];
2003	int index = 0, flag;	2025	int index = 0;
2004		2026
2005	for (int i = start; i < stop; i++)	2027	for (int i = start; i < stop; i++)
2006	{	2028	{
2007	mapxy pos (m, x, y); pos.move (i);	2029	mapxy pos (m, x, y); pos.move (i);
2008		2030
…		…
2024	continue;	2046	continue;
2025	}	2047	}
2026		2048
2027	/* 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.
2028	* 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.
2029	* 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 -
2030	* 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
2031	* 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
2032	* to only the spaces immediately surrounding the target area, and	2054	* to only the spaces immediately surrounding the target area, and
2033	* won't look 2 spaces south of the target space.	2055	* won't look 2 spaces south of the target space.
2034	*/	2056	*/
…		…
2064	*/	2086	*/
2065	int	2087	int
2066	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)
2067	{	2089	{
2068	for (int i = 0; i < SIZEOFFREE; i++)	2090	for (int i = 0; i < SIZEOFFREE; i++)
2069	if (!ob->blocked (m, x + freearr_x[i], y + freearr_y[i]))	2091	if (!ob->blocked (m, x + DIRX (i), y + DIRY (i)))
2070	return i;	2092	return i;
2071		2093
2072	return -1;	2094	return -1;
2073	}	2095	}
2074		2096
…		…
2085		2107
2086	while (--end)	2108	while (--end)
2087	swap (arr [end], arr [rndm (end + 1)]);	2109	swap (arr [end], arr [rndm (end + 1)]);
2088	}	2110	}
2089		2111
2090	/* new function to make monster searching more efficient, and effective!	2112	/* new function to make monster searching more efficient, and effective!
2091	* This basically returns a randomized array (in the passed pointer) of	2113	* This basically returns a randomized array (in the passed pointer) of
2092	* 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
2093	* 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
2094	* 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
2095	* 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.
…		…
2120	* there is capable of.	2142	* there is capable of.
2121	*/	2143	*/
2122	int	2144	int
2123	find_dir (maptile *m, int x, int y, object *exclude)	2145	find_dir (maptile *m, int x, int y, object *exclude)
2124	{	2146	{
2125	int max = SIZEOFFREE, mflags;	2147	int max = SIZEOFFREE;
2126	MoveType move_type;	2148	MoveType move_type;
2127		2149
2128	if (exclude && exclude->head_ () != exclude)	2150	if (exclude && exclude->head_ () != exclude)
2129	{	2151	{
2130	exclude = exclude->head;	2152	exclude = exclude->head;
…		…
2171	{	2193	{
2172	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);
2173	}	2195	}
2174		2196
2175	/*	2197	/*
2176	* 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
2177	* an object which has subtracted the x and y coordinates of another	2199	* for running into direct [dx, dy].
2178	* object, needs to travel toward it.	2200	* (the opposite of crossfire's find_dir_2!)
2179	*/	2201	*/
2180	int	2202	int
2181	find_dir_2 (int x, int y)	2203	find_dir_2 (int x, int y)
2182	{	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
2183	int q;	2248	int q;
2184		2249
2185	if (y)	2250	if (y)
2186	q = x * 100 / y;	2251	q = 128 * x / y;
2187	else if (x)	2252	else if (x)
2188	q = -300 * x;	2253	q = -512 * x; // to make it > 309
2189	else	2254	else
2190	return 0;	2255	return 0;
2191		2256
2192	if (y > 0)	2257	if (y > 0)
2193	{	2258	{
2194	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
2195	return 3;	2264	return 3;
2196	if (q < -41)	2265	}
2197	return 2;	2266	else
2198	if (q < 41)	2267	{
2199	return 1;	2268	if (q < -309) return 3;
2200	if (q < 242)	2269	if (q < -52) return 2;
2201	return 8;	2270	if (q < 52) return 1;
		2271	if (q < 309) return 8;
		2272
2202	return 7;	2273	return 7;
2203	}	2274	}
2204		2275	#endif
2205	if (q < -242)
2206	return 7;
2207	if (q < -41)
2208	return 6;
2209	if (q < 41)
2210	return 5;
2211	if (q < 242)
2212	return 4;
2213
2214	return 3;
2215	}	2276	}
2216		2277
2217	/*	2278	/*
2218	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is	2279	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is
2219	* between two directions (which are expected to be absolute (see absdir())	2280	* between two directions (which are expected to be absolute (see absdir())
2220	*/	2281	*/
2221	int	2282	int
2222	dirdiff (int dir1, int dir2)	2283	dirdiff (int dir1, int dir2)
2223	{	2284	{
2224	int d;
2225
2226	d = abs (dir1 - dir2);	2285	int d = abs (dir1 - dir2);
2227	if (d > 4)
2228	d = 8 - d;
2229		2286
2230	return d;	2287	return d > 4 ? 8 - d : d;
2231	}	2288	}
2232		2289
2233	/* peterm:	2290	/* peterm:
2234	* 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.
2235	* Basically, this is a table of directions, and what directions	2292	* Basically, this is a table of directions, and what directions
…		…
2304	int mflags;	2361	int mflags;
2305		2362
2306	if (dir < 0)	2363	if (dir < 0)
2307	return 0; /* exit condition: invalid direction */	2364	return 0; /* exit condition: invalid direction */
2308		2365
2309	dx = x + freearr_x[dir];	2366	dx = x + DIRX (dir);
2310	dy = y + freearr_y[dir];	2367	dy = y + DIRY (dir);
2311		2368
2312	mflags = get_map_flags (m, &m, dx, dy, &dx, &dy);	2369	mflags = get_map_flags (m, &m, dx, dy, &dx, &dy);
2313		2370
2314	/* This functional arguably was incorrect before - it was	2371	/* This functional arguably was incorrect before - it was
2315	* checking for P_WALL - that was basically seeing if	2372	* checking for P_WALL - that was basically seeing if
…		…
2341	* 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)
2342	*/	2399	*/
2343	int	2400	int
2344	can_pick (const object *who, const object *item)	2401	can_pick (const object *who, const object *item)
2345	{	2402	{
2346	return /*QUERY_FLAG(who,FLAG_WIZ)|| */	2403	return /*who->flag [FLAG_WIZ]|| */
2347	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&	2404	(item->weight > 0 && !item->flag [FLAG_NO_PICK] &&
2348	!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));
2349	}	2406	}
		2407
		2408	//-GPL
2350		2409
2351	/*	2410	/*
2352	* create clone from object to another	2411	* create clone from object to another
2353	*/	2412	*/
2354	object *	2413	object *
…		…
2385	return tmp;	2444	return tmp;
2386		2445
2387	return 0;	2446	return 0;
2388	}	2447	}
2389		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
2390	shstr_tmp	2465	shstr_tmp
2391	object::kv_get (shstr_tmp key) const	2466	key_values::get (shstr_tmp key) const
2392	{	2467	{
2393	for (key_value *kv = key_values; kv; kv = kv->next)	2468	for (key_value *kv = first; kv; kv = kv->next)
2394	if (kv->key == key)	2469	if (kv->key == key)
2395	return kv->value;	2470	return kv->value;
2396		2471
2397	return shstr ();	2472	return shstr ();
2398	}	2473	}
2399		2474
2400	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
2401	object::kv_set (shstr_tmp key, shstr_tmp value)	2488	key_values::set (shstr_tmp key, shstr_tmp value)
2402	{	2489	{
2403	for (key_value *kv = key_values; kv; kv = kv->next)	2490	for (key_value *kv = first; kv; kv = kv->next)
2404	if (kv->key == key)	2491	if (kv->key == key)
2405	{	2492	{
2406	kv->value = value;	2493	kv->value = value;
2407	return;	2494	return;
2408	}	2495	}
2409		2496
2410	key_value *kv = new key_value;	2497	add (key, value);
2411
2412	kv->next = key_values;
2413	kv->key = key;
2414	kv->value = value;
2415
2416	key_values = kv;
2417	}	2498	}
2418		2499
2419	void	2500	void
2420	object::kv_del (shstr_tmp key)	2501	key_values::del (shstr_tmp key)
2421	{	2502	{
2422	for (key_value **kvp = &key_values; *kvp; kvp = &(*kvp)->next)	2503	for (key_value **kvp = &first; *kvp; kvp = &(*kvp)->next)
2423	if ((*kvp)->key == key)	2504	if ((*kvp)->key == key)
2424	{	2505	{
2425	key_value *kv = *kvp;	2506	key_value *kv = *kvp;
2426	*kvp = (*kvp)->next;	2507	*kvp = (*kvp)->next;
2427	delete kv;	2508	delete kv;
2428	return;	2509	return;
2429	}	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 ();
2430	}	2539	}
2431		2540
2432	object::depth_iterator::depth_iterator (object *container)	2541	object::depth_iterator::depth_iterator (object *container)
2433	: iterator_base (container)	2542	: iterator_base (container)
2434	{	2543	{
…		…
2518	{	2627	{
2519	return map ? map->region (x, y)	2628	return map ? map->region (x, y)
2520	: region::default_region ();	2629	: region::default_region ();
2521	}	2630	}
2522		2631
		2632	//+GPL
		2633
2523	void	2634	void
2524	object::open_container (object *new_container)	2635	object::open_container (object *new_container)
2525	{	2636	{
2526	if (container == new_container)	2637	if (container == new_container)
2527	return;	2638	return;
…		…
2561	// TODO: this does not seem to serve any purpose anymore?	2672	// TODO: this does not seem to serve any purpose anymore?
2562	#if 0	2673	#if 0
2563	// insert the "Close Container" object.	2674	// insert the "Close Container" object.
2564	if (archetype *closer = new_container->other_arch)	2675	if (archetype *closer = new_container->other_arch)
2565	{	2676	{
2566	object *closer = arch_to_object (new_container->other_arch);	2677	object *closer = new_container->other_arch->instance ();
2567	closer->flag [FLAG_NO_MAP_SAVE] = 1;	2678	closer->flag [FLAG_NO_MAP_SAVE] = 1;
2568	new_container->insert (closer);	2679	new_container->insert (closer);
2569	}	2680	}
2570	#endif	2681	#endif
2571		2682
…		…
2584	}	2695	}
2585	// else if (!old_container->env && contr && contr->ns)	2696	// else if (!old_container->env && contr && contr->ns)
2586	// contr->ns->floorbox_reset ();	2697	// contr->ns->floorbox_reset ();
2587	}	2698	}
2588		2699
		2700	//-GPL
		2701
		2702	// prefetch some flat area around the player
		2703	static void
		2704	prefetch_surrounding_area (object *op, maptile *map, int range)
		2705	{
		2706	for (maprect *rect = map->split_to_tiles (mapwalk_buf,
		2707	op->x - range , op->y - range ,
		2708	op->x + range + 1, op->y + range + 1);
		2709	rect->m;
		2710	++rect)
		2711	{
		2712	rect->m->touch ();
		2713	rect->m->activate ();
		2714	}
		2715	}
		2716
		2717	// prefetch a generous area around the player, also up and down
		2718	void
		2719	object::prefetch_surrounding_maps ()
		2720	{
		2721	prefetch_surrounding_area (this, map, 40);
		2722
		2723	if (maptile *m = map->tile_available (TILE_DOWN))
		2724	prefetch_surrounding_area (this, m, 20);
		2725
		2726	if (maptile *m = map->tile_available (TILE_UP))
		2727	prefetch_surrounding_area (this, m, 20);
		2728	}
		2729
		2730	//+GPL
		2731
2589	object *	2732	object *
2590	object::force_find (shstr_tmp name)	2733	object::force_find (shstr_tmp name)
2591	{	2734	{
2592	/* cycle through his inventory to look for the MARK we want to	2735	/* cycle through his inventory to look for the MARK we want to
2593	* place	2736	* place
2594	*/	2737	*/
2595	for (object *tmp = inv; tmp; tmp = tmp->below)	2738	for (object *tmp = inv; tmp; tmp = tmp->below)
2596	if (tmp->type == FORCE && tmp->slaying == name)	2739	if (tmp->type == FORCE && tmp->slaying == name)
2597	return splay (tmp);	2740	return splay (tmp);
2598		2741
2599	return 0;	2742	return 0;
2600	}	2743	}
2601		2744
2602	//-GPL
2603
2604	void	2745	void
2605	object::force_set_timer (int duration)	2746	object::force_set_timer (int duration)
2606	{	2747	{
2607	this->duration = 1;	2748	this->duration = 1;
2608	this->speed_left = -1.f;	2749	this->speed_left = -1.f;
…		…
2614	object::force_add (shstr_tmp name, int duration)	2755	object::force_add (shstr_tmp name, int duration)
2615	{	2756	{
2616	if (object *force = force_find (name))	2757	if (object *force = force_find (name))
2617	force->destroy ();	2758	force->destroy ();
2618		2759
2619	object *force = get_archetype (FORCE_NAME);	2760	object *force = archetype::get (FORCE_NAME);
2620		2761
2621	force->slaying = name;	2762	force->slaying = name;
2622	force->force_set_timer (duration);	2763	force->force_set_timer (duration);
2623	force->flag [FLAG_APPLIED] = true;	2764	force->flag [FLAG_APPLIED] = true;
2624		2765
…		…
2677		2818
2678	insert (force);	2819	insert (force);
2679	}	2820	}
2680	}	2821	}
2681		2822
		2823	void object::change_move_type (MoveType mt)
		2824	{
		2825	if (move_type == mt)
		2826	return;
		2827
		2828	if (is_on_map ())
		2829	{
		2830	// we are on the map, so handle move_on/off effects
		2831	remove ();
		2832	move_type = mt;
		2833	map->insert (this, x, y, this);
		2834	}
		2835	else
		2836	move_type = mt;
		2837	}
		2838
		2839	/* object should be a player.
		2840	* we return the object the player has marked with the 'mark' command
		2841	* below. If no match is found (or object has changed), we return
		2842	* NULL. We leave it up to the calling function to print messages if
		2843	* nothing is found.
		2844	*/
		2845	object *
		2846	object::mark () const
		2847	{
		2848	if (contr && contr->mark && contr->mark->env == this)
		2849	return contr->mark;
		2850	else
		2851	return 0;
		2852	}
		2853
		2854	// put marked object first in the inventory
		2855	// this is used by identify-like spells so players can influence
		2856	// the order a bit.
		2857	void
		2858	object::splay_marked ()
		2859	{
		2860	if (object *marked = mark ())
		2861	splay (marked);
		2862	}
		2863

Diff Legend

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