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.300 by root, Mon Nov 9 03:08:23 2009 UTC vs.
Revision 1.366 by root, Sat Nov 17 23:40:00 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->materialname != ob2->materialname	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
295	|| ob1->move_block != ob2->move_block	321	|| ob1->move_block != ob2->move_block
296	|| ob1->move_allow != ob2->move_allow	322	|| ob1->move_allow != ob2->move_allow
…		…
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;
724	}	663	}
725		664
726	/*	665	/*
…		…
729	* be called to update the face variable, _and_ how it looks on the map.	668	* be called to update the face variable, _and_ how it looks on the map.
730	*/	669	*/
731	void	670	void
732	update_turn_face (object *op)	671	update_turn_face (object *op)
733	{	672	{
734	if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || !op->arch)	673	if (!op->flag [FLAG_IS_TURNABLE] || !op->arch)
735	return;	674	return;
736		675
737	SET_ANIMATION (op, op->direction);	676	SET_ANIMATION (op, op->direction);
738	update_object (op, UP_OBJ_FACE);	677	update_object (op, UP_OBJ_FACE);
739	}	678	}
…		…
800	}	739	}
801		740
802	mapspace &m = op->ms ();	741	mapspace &m = op->ms ();
803		742
804	if (!(m.flags_ & P_UPTODATE))	743	if (!(m.flags_ & P_UPTODATE))
805	/* nop */;	744	m.update_up (); // nothing to do except copy up
806	else if (action == UP_OBJ_INSERT)	745	else if (action == UP_OBJ_INSERT)
807	{	746	{
808	#if 0	747	#if 0
809	// this is likely overkill, TODO: revisit (schmorp)	748	// this is likely overkill, TODO: revisit (schmorp)
810	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))	749	if ((op->flag [FLAG_BLOCKSVIEW] && !(m.flags_ & P_BLOCKSVIEW))
811	|| (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))	750	|| (op->flag [FLAG_NO_MAGIC] && !(m.flags_ & P_NO_MAGIC))
812	|| (op->is_player () && !(m.flags_ & P_PLAYER))	751	|| (op->is_player () && !(m.flags_ & P_PLAYER))
813	|| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))	752	|| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
814	|| (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))	753	|| (op->flag [FLAG_ALIVE] && !(m.flags_ & P_IS_ALIVE))
815	|| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))	754	|| (op->flag [FLAG_DAMNED] && !(m.flags_ & P_NO_CLERIC))
816	|| (m.move_on | op->move_on ) != m.move_on	755	|| (m.move_on | op->move_on ) != m.move_on
817	|| (m.move_off | op->move_off ) != m.move_off	756	|| (m.move_off | op->move_off ) != m.move_off
818	|| (m.move_slow | op->move_slow) != m.move_slow	757	|| (m.move_slow | op->move_slow) != m.move_slow
819	/* This isn't perfect, but I don't expect a lot of objects to	758	/* This isn't perfect, but I don't expect a lot of objects to
820	* have move_allow right now.	759	* have move_allow right now.
821	*/	760	*/
822	|| ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block	761	|| ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block
823	m.invalidate ();	762	m.invalidate ();
824	#else	763	#else
825	// the above is not strong enough a test to skip updating. los maybe? TODO (schmorp)	764	// the above is not strong enough a test to skip updating. los maybe? TODO (schmorp)
…		…
831	* that is being removed.	770	* that is being removed.
832	*/	771	*/
833	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)	772	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
834	m.invalidate ();	773	m.invalidate ();
835	else if (action == UP_OBJ_FACE)	774	else if (action == UP_OBJ_FACE)
836	/* Nothing to do for that case */ ;	775	m.update_up (); // nothing to do for that case, except copy up
837	else	776	else
838	LOG (llevError, "update_object called with invalid action: %d\n", action);	777	LOG (llevError, "update_object called with invalid action: %d\n", action);
839		778
840	if (op->more)	779	if (op->more)
841	update_object (op->more, action);	780	update_object (op->more, action);
842	}	781	}
843		782
844	object::object ()	783	object::object ()
845	{	784	{
846	SET_FLAG (this, FLAG_REMOVED);	785	this->set_flag (FLAG_REMOVED);
847		786
848	//expmul = 1.0; declared const for the time being	787	//expmul = 1.0; declared const for the time being
849	face = blank_face;	788	face = blank_face;
		789	material = MATERIAL_NULL;
850	}	790	}
851		791
852	object::~object ()	792	object::~object ()
853	{	793	{
854	unlink ();	794	unlink ();
855		795
856	free_key_values (this);	796	kv.clear ();
857	}	797	}
858
859	static int object_count;
860		798
861	void object::link ()	799	void object::link ()
862	{	800	{
863	assert (!index);//D	801	assert (!index);//D
864	uuid = UUID::gen ();	802	uuid = UUID::gen ();
865	count = ++object_count;
866		803
867	refcnt_inc ();	804	refcnt_inc ();
868	objects.insert (this);	805	objects.insert (this);
		806
		807	++create_count;
		808
869	}	809	}
870		810
871	void object::unlink ()	811	void object::unlink ()
872	{	812	{
873	if (!index)	813	if (!index)
874	return;	814	return;
		815
		816	++destroy_count;
875		817
876	objects.erase (this);	818	objects.erase (this);
877	refcnt_dec ();	819	refcnt_dec ();
878	}	820	}
879		821
…		…
902	op->activate_recursive ();	844	op->activate_recursive ();
903	}	845	}
904		846
905	/* This function removes object 'op' from the list of active	847	/* This function removes object 'op' from the list of active
906	* objects.	848	* objects.
907	* This should only be used for style maps or other such	849	* This should only be used for style maps or other such
908	* reference maps where you don't want an object that isn't	850	* reference maps where you don't want an object that isn't
909	* in play chewing up cpu time getting processed.	851	* in play chewing up cpu time getting processed.
910	* The reverse of this is to call update_ob_speed, which	852	* The reverse of this is to call update_ob_speed, which
911	* will do the right thing based on the speed of the object.	853	* will do the right thing based on the speed of the object.
912	*/	854	*/
…		…
958	* if some form of movement is allowed, let objects	900	* if some form of movement is allowed, let objects
959	* drop on that space.	901	* drop on that space.
960	*/	902	*/
961	if (!drop_to_ground	903	if (!drop_to_ground
962	|| !map	904	|| !map
963	|| map->in_memory != MAP_ACTIVE	905	|| !map->linkable ()
964	|| map->no_drop	906	|| map->no_drop
965	|| ms ().move_block == MOVE_ALL)	907	|| ms ().move_block == MOVE_ALL)
966	{	908	{
967	while (inv)	909	while (inv)
968	inv->destroy ();	910	inv->destroy ();
…		…
984	map->insert (op, x, y);	926	map->insert (op, x, y);
985	}	927	}
986	}	928	}
987	}	929	}
988		930
		931	/*
		932	* Remove and free all objects in the inventory of the given object.
		933	* Unlike destroy_inv, this assumes the *this is destroyed as well
		934	* well, so we can (and have to!) take shortcuts.
		935	*/
		936	void
		937	object::destroy_inv_fast ()
		938	{
		939	while (object *op = inv)
		940	{
		941	// remove from object the fast way
		942	op->flag [FLAG_REMOVED] = true;
		943	op->env = 0;
		944	if ((inv = inv->below))
		945	inv->above = 0;
		946
		947	// then destroy
		948	op->destroy ();
		949	}
		950	}
		951
		952	void
		953	object::freelist_free (int count)
		954	{
		955	while (count-- && freelist)
		956	{
		957	freelist_item *next = freelist->next;
		958	// count is being "destroyed"
		959
		960	sfree ((char *)freelist, sizeof (object));
		961
		962	freelist = next;
		963	--free_count;
		964	}
		965	}
		966
		967	object *
989	object *object::create ()	968	object::create ()
990	{	969	{
991	object *op = new object;	970	object *op;
		971
		972	if (freelist)
		973	{
		974	freelist_item li = *freelist;
		975	memset (freelist, 0, sizeof (object));
		976
		977	op = new (freelist) object;
		978	op->count = li.count;
		979
		980	freelist = li.next;
		981	--free_count;
		982	}
		983	else
		984	{
		985	void *ni = salloc0<char> (sizeof (object));
		986
		987	op = new(ni) object;
		988
		989	op->count = ++object_count;
		990	}
		991
992	op->link ();	992	op->link ();
		993
993	return op;	994	return op;
994	}	995	}
995		996
996	static struct freed_map : maptile	997	void
		998	object::do_delete ()
997	{	999	{
998	freed_map ()	1000	uint32_t count = this->count;
999	{
1000	path = "<freed objects map>";
1001	name = "/internal/freed_objects_map";
1002	width = 3;
1003	height = 3;
1004	no_drop = 1;
1005	no_reset = 1;
1006		1001
1007	alloc ();	1002	this->~object ();
1008	in_memory = MAP_ACTIVE;
1009	}
1010		1003
1011	~freed_map ()	1004	freelist_item *li = (freelist_item *)this;
1012	{	1005	li->next = freelist;
1013	destroy ();	1006	li->count = count;
1014	}	1007
1015	} freed_map; // freed objects are moved here to avoid crashes	1008	freelist = li;
		1009	++free_count;
		1010	}
1016		1011
1017	void	1012	void
1018	object::do_destroy ()	1013	object::do_destroy ()
1019	{	1014	{
1020	if (flag [FLAG_IS_LINKED])	1015	if (flag [FLAG_IS_LINKED])
…		…
1063	LOG (llevError | logBacktrace, "tried to destroy the tail of an object");	1058	LOG (llevError | logBacktrace, "tried to destroy the tail of an object");
1064	head->destroy ();	1059	head->destroy ();
1065	return;	1060	return;
1066	}	1061	}
1067		1062
1068	destroy_inv (false);	1063	destroy_inv_fast ();
1069		1064
1070	if (is_head ())	1065	if (is_head ())
1071	if (sound_destroy)	1066	if (sound_destroy)
1072	play_sound (sound_destroy);	1067	play_sound (sound_destroy);
1073	else if (flag [FLAG_MONSTER])	1068	else if (flag [FLAG_MONSTER])
…		…
1094	flag [FLAG_REMOVED] = true;	1089	flag [FLAG_REMOVED] = true;
1095		1090
1096	if (more)	1091	if (more)
1097	more->remove ();	1092	more->remove ();
1098		1093
1099	/*	1094	/*
1100	* In this case, the object to be removed is in someones	1095	* In this case, the object to be removed is in someones
1101	* inventory.	1096	* inventory.
1102	*/	1097	*/
1103	if (env)	1098	if (env)
1104	{	1099	{
1105	flag [FLAG_REMOVED] = false; // hack around the issue of visible_to checking flag_removed	1100	flag [FLAG_REMOVED] = false; // hack around the issue of visible_to checking flag_removed
1106	if (object *pl = visible_to ())	1101	if (object *pl = visible_to ())
1107	esrv_del_item (pl->contr, count);	1102	esrv_del_item (pl->contr, count);
1108	flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed	1103	flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed
1109		1104
1110	adjust_weight (env, -total_weight ());	1105	adjust_weight (env, total_weight (), 0);
1111		1106
1112	object *pl = in_player ();	1107	object *pl = in_player ();
1113		1108
1114	/* we set up values so that it could be inserted into	1109	/* we set up values so that it could be inserted into
1115	* the map, but we don't actually do that - it is up	1110	* the map, but we don't actually do that - it is up
…		…
1125		1120
1126	above = 0;	1121	above = 0;
1127	below = 0;	1122	below = 0;
1128	env = 0;	1123	env = 0;
1129		1124
1130	/* NO_FIX_PLAYER is set when a great many changes are being	1125	if (pl && pl->is_player ())
1131	* made to players inventory. If set, avoiding the call
1132	* to save cpu time.
1133	*/	1126	{
1134	if (pl)	1127	if (expect_false (pl->contr->combat_ob == this))
1135	if (pl->is_player () && (glow_radius || !QUERY_FLAG (pl, FLAG_NO_FIX_PLAYER)))
1136	{	1128	{
1137	pl->update_stats ();	1129	pl->apply (pl->contr->combat_ob, AP_UNAPPLY | AP_IGNORE_CURSE);
		1130	pl->contr->combat_ob = 0;
		1131	if (pl->contr->ranged_ob) pl->apply (pl->contr->ranged_ob);
		1132	}
1138		1133
		1134	if (expect_false (pl->contr->ranged_ob == this))
		1135	{
		1136	pl->apply (pl->contr->ranged_ob, AP_UNAPPLY | AP_IGNORE_CURSE);
		1137	pl->contr->ranged_ob = 0;
		1138	if (pl->contr->combat_ob) pl->apply (pl->contr->combat_ob);
		1139	}
		1140
		1141	pl->contr->queue_stats_update ();
		1142
1139	if (glow_radius && pl->is_on_map ())	1143	if (expect_false (glow_radius) && pl->is_on_map ())
1140	update_all_los (pl->map, pl->x, pl->y);	1144	update_all_los (pl->map, pl->x, pl->y);
1141	}	1145	}
1142	}	1146	}
1143	else if (map)	1147	else if (map)
1144	{	1148	{
1145	map->dirty = true;	1149	map->dirty = true;
1146	mapspace &ms = this->ms ();	1150	mapspace &ms = this->ms ();
…		…
1164	else if (pl->container_ () == this)	1168	else if (pl->container_ () == this)
1165	{	1169	{
1166	// removing a container should close it	1170	// removing a container should close it
1167	close_container ();	1171	close_container ();
1168	}	1172	}
1169		1173	else
1170	esrv_del_item (pl->contr, count);	1174	esrv_del_item (pl->contr, count);
1171	}	1175	}
1172		1176
1173	/* link the object above us */	1177	/* link the object above us */
1174	// re-link, make sure compiler can easily use cmove	1178	// re-link, make sure compiler can easily use cmove
1175	*(above ? &above->below : &ms.top) = below;	1179	*(above ? &above->below : &ms.top) = below;
…		…
1177		1181
1178	above = 0;	1182	above = 0;
1179	below = 0;	1183	below = 0;
1180		1184
1181	ms.invalidate ();	1185	ms.invalidate ();
1182
1183	if (map->in_memory == MAP_SAVING)
1184	return;
1185		1186
1186	int check_walk_off = !flag [FLAG_NO_APPLY];	1187	int check_walk_off = !flag [FLAG_NO_APPLY];
1187		1188
1188	if (object *pl = ms.player ())	1189	if (object *pl = ms.player ())
1189	{	1190	{
…		…
1266		1267
1267	object *prev = this;	1268	object *prev = this;
1268		1269
1269	for (archetype *at = (archetype *)arch->more; at; at = (archetype *)at->more)	1270	for (archetype *at = (archetype *)arch->more; at; at = (archetype *)at->more)
1270	{	1271	{
1271	object *op = arch_to_object (at);	1272	object *op = at->instance ();
1272		1273
1273	op->name = name;	1274	op->name = name;
1274	op->name_pl = name_pl;	1275	op->name_pl = name_pl;
1275	op->title = title;	1276	op->title = title;
1276		1277
…		…
1314	* Passing 0 for flag gives proper default values, so flag really only needs	1315	* Passing 0 for flag gives proper default values, so flag really only needs
1315	* to be set if special handling is needed.	1316	* to be set if special handling is needed.
1316	*	1317	*
1317	* Return value:	1318	* Return value:
1318	* new object if 'op' was merged with other object	1319	* new object if 'op' was merged with other object
1319	* NULL if 'op' was destroyed	1320	* NULL if there was an error (destroyed, blocked etc.)
1320	* just 'op' otherwise	1321	* just 'op' otherwise
1321	*/	1322	*/
1322	object *	1323	object *
1323	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)	1324	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1324	{	1325	{
1325	op->remove ();	1326	op->remove ();
1326		1327
1327	if (m == &freed_map)//D TODO: remove soon	1328	if (m == &freed_map)//D TODO: remove soon
1328	{//D	1329	{//D
1329	LOG (llevError | logBacktrace, "tries to insret object on freed objects map: %s", op->debug_desc ());//D	1330	LOG (llevError | logBacktrace, "tries to insert object on freed objects map: %s", op->debug_desc ());//D
1330	}//D	1331	}//D
1331		1332
1332	/* Ideally, the caller figures this out. However, it complicates a lot	1333	/* Ideally, the caller figures this out. However, it complicates a lot
1333	* of areas of callers (eg, anything that uses find_free_spot would now	1334	* of areas of callers (eg, anything that uses find_free_spot would now
1334	* need extra work	1335	* need extra work
…		…
1361	// from here :/	1362	// from here :/
1362	op->nrof += tmp->nrof;	1363	op->nrof += tmp->nrof;
1363	tmp->destroy ();	1364	tmp->destroy ();
1364	}	1365	}
1365		1366
1366	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1367	op->clr_flag (FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1367	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1368	op->clr_flag (FLAG_INV_LOCKED);
1368		1369
1369	if (!QUERY_FLAG (op, FLAG_ALIVE))	1370	if (!op->flag [FLAG_ALIVE])
1370	CLEAR_FLAG (op, FLAG_NO_STEAL);	1371	op->clr_flag (FLAG_NO_STEAL);
1371		1372
1372	if (flag & INS_BELOW_ORIGINATOR)	1373	if (flag & INS_BELOW_ORIGINATOR)
1373	{	1374	{
1374	if (originator->map != op->map || originator->x != op->x || originator->y != op->y)	1375	if (originator->map != op->map || originator->x != op->x || originator->y != op->y)
1375	{	1376	{
…		…
1403	* We've already dealt with merging if appropriate.	1404	* We've already dealt with merging if appropriate.
1404	* Generally, we want to put the new object on top. But if	1405	* Generally, we want to put the new object on top. But if
1405	* flag contains INS_ABOVE_FLOOR_ONLY, once we find the last	1406	* flag contains INS_ABOVE_FLOOR_ONLY, once we find the last
1406	* floor, we want to insert above that and no further.	1407	* floor, we want to insert above that and no further.
1407	* Also, if there are spell objects on this space, we stop processing	1408	* Also, if there are spell objects on this space, we stop processing
1408	* once we get to them. This reduces the need to traverse over all of	1409	* once we get to them. This reduces the need to traverse over all of
1409	* them when adding another one - this saves quite a bit of cpu time	1410	* them when adding another one - this saves quite a bit of cpu time
1410	* when lots of spells are cast in one area. Currently, it is presumed	1411	* when lots of spells are cast in one area. Currently, it is presumed
1411	* that flying non pickable objects are spell objects.	1412	* that flying non pickable objects are spell objects.
1412	*/	1413	*/
1413	for (object *tmp = ms.bot; tmp; tmp = tmp->above)	1414	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1414	{	1415	{
1415	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) || QUERY_FLAG (tmp, FLAG_OVERLAY_FLOOR))	1416	if (tmp->flag [FLAG_IS_FLOOR] || tmp->flag [FLAG_OVERLAY_FLOOR])
1416	floor = tmp;	1417	floor = tmp;
1417		1418
1418	if (QUERY_FLAG (tmp, FLAG_NO_PICK) && (tmp->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (tmp, FLAG_IS_FLOOR))	1419	if (tmp->flag [FLAG_NO_PICK] && (tmp->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !tmp->flag [FLAG_IS_FLOOR])
1419	{	1420	{
1420	/* We insert above top, so we want this object below this */	1421	/* We insert above top, so we want this object below this */
1421	top = tmp->below;	1422	top = tmp->below;
1422	break;	1423	break;
1423	}	1424	}
…		…
1441	&& (op->face && !faces [op->face].visibility))	1442	&& (op->face && !faces [op->face].visibility))
1442	{	1443	{
1443	object *last;	1444	object *last;
1444		1445
1445	for (last = top; last != floor; last = last->below)	1446	for (last = top; last != floor; last = last->below)
1446	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1447	if (last->flag [FLAG_BLOCKSVIEW] && (last->type != EXIT))
1447	break;	1448	break;
1448		1449
1449	/* Check to see if we found the object that blocks view,	1450	/* Check to see if we found the object that blocks view,
1450	* and make sure we have a below pointer for it so that	1451	* and make sure we have a below pointer for it so that
1451	* we can get inserted below this one, which requires we	1452	* we can get inserted below this one, which requires we
…		…
1524	*/	1525	*/
1525		1526
1526	/* if this is not the head or flag has been passed, don't check walk on status */	1527	/* if this is not the head or flag has been passed, don't check walk on status */
1527	if (!(flag & INS_NO_WALK_ON) && op->is_head ())	1528	if (!(flag & INS_NO_WALK_ON) && op->is_head ())
1528	{	1529	{
1529	if (check_move_on (op, originator))	1530	if (check_move_on (op, originator, flag))
1530	return 0;	1531	return 0;
1531		1532
1532	/* If we are a multi part object, lets work our way through the check	1533	/* If we are a multi part object, let's work our way through the check
1533	* walk on's.	1534	* walk on's.
1534	*/	1535	*/
1535	for (object *tmp = op->more; tmp; tmp = tmp->more)	1536	for (object *tmp = op->more; tmp; tmp = tmp->more)
1536	if (check_move_on (tmp, originator))	1537	if (check_move_on (tmp, originator, flag))
1537	return 0;	1538	return 0;
1538	}	1539	}
1539		1540
1540	return op;	1541	return op;
1541	}	1542	}
1542		1543
1543	/* this function inserts an object in the map, but if it	1544	/* this function inserts an object in the map, but if it
1544	* finds an object of its own type, it'll remove that one first.	1545	* finds an object of its own type, it'll remove that one first.
1545	* op is the object to insert it under: supplies x and the map.	1546	* op is the object to insert it under: supplies x and the map.
1546	*/	1547	*/
1547	void	1548	void
1548	replace_insert_ob_in_map (shstr_tmp archname, object *op)	1549	replace_insert_ob_in_map (shstr_tmp archname, object *op)
1549	{	1550	{
…		…
1551		1552
1552	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)	1553	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1553	if (tmp->arch->archname == archname) /* same archetype */	1554	if (tmp->arch->archname == archname) /* same archetype */
1554	tmp->destroy ();	1555	tmp->destroy ();
1555		1556
1556	object *tmp = arch_to_object (archetype::find (archname));	1557	object *tmp = archetype::find (archname)->instance ();
1557		1558
1558	tmp->x = op->x;	1559	tmp->x = op->x;
1559	tmp->y = op->y;	1560	tmp->y = op->y;
1560		1561
1561	insert_ob_in_map (tmp, op->map, op, 0);	1562	insert_ob_in_map (tmp, op->map, op, 0);
…		…
1568	return where->env->insert (this);	1569	return where->env->insert (this);
1569	else	1570	else
1570	return where->map->insert (this, where->x, where->y, originator, flags);	1571	return where->map->insert (this, where->x, where->y, originator, flags);
1571	}	1572	}
1572		1573
1573	// check whether we can put this into the map, respect max_nrof, max_volume, max_items	1574	// check whether we can put this into the map, respect max_volume, max_items
1574	bool	1575	bool
1575	object::can_drop_at (maptile *m, int x, int y, object *originator)	1576	object::can_drop_at (maptile *m, int x, int y, object *originator)
1576	{	1577	{
1577	mapspace &ms = m->at (x, y);	1578	mapspace &ms = m->at (x, y);
1578		1579
1579	int items = ms.items ();	1580	int items = ms.items ();
1580		1581
1581	if (!items // testing !items ensures we can drop at least one item	1582	if (!items // testing !items ensures we can drop at least one item
1582	|| (items < m->max_items	1583	|| (items < m->max_items
1583	&& ms.volume () < m->max_volume	1584	&& ms.volume () < m->max_volume))
1584	&& nrof <= m->max_nrof))
1585	return true;	1585	return true;
1586		1586
1587	if (originator && originator->is_player ())	1587	if (originator)
1588	originator->contr->failmsg (format (	1588	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.>",	1589	"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 ()	1590	query_name ()
1591	));	1591	);
1592		1592
1593	return false;	1593	return false;
1594	}	1594	}
1595		1595
1596	/*	1596	/*
…		…
1608		1608
1609	nr = min (nr, nrof);	1609	nr = min (nr, nrof);
1610		1610
1611	if (nrof > nr)	1611	if (nrof > nr)
1612	{	1612	{
		1613	weight_t oweight = total_weight ();
		1614
1613	nrof -= nr;	1615	nrof -= nr;
1614	adjust_weight (env, -weight * max (1, nr)); // carrying == 0
1615		1616
1616	if (object *pl = visible_to ())	1617	if (object *pl = visible_to ())
1617	esrv_update_item (UPD_NROF, pl, this);	1618	esrv_update_item (UPD_NROF, pl, this);
		1619
		1620	adjust_weight (env, oweight, total_weight ());
1618		1621
1619	return true;	1622	return true;
1620	}	1623	}
1621	else	1624	else
1622	{	1625	{
…		…
1676	/*	1679	/*
1677	* env->insert (op)	1680	* env->insert (op)
1678	* This function inserts the object op in the linked list	1681	* This function inserts the object op in the linked list
1679	* inside the object environment.	1682	* inside the object environment.
1680	*	1683	*
1681	* The function returns now pointer to inserted item, and return value can	1684	* The function returns now pointer to inserted item, and return value can
1682	* be != op, if items are merged. -Tero	1685	* be != op, if items are merged. -Tero
1683	*/	1686	*/
1684	object *	1687	object *
1685	object::insert (object *op)	1688	object::insert (object *op)
1686	{	1689	{
…		…
1697	if (op->nrof)	1700	if (op->nrof)
1698	for (object *tmp = inv; tmp; tmp = tmp->below)	1701	for (object *tmp = inv; tmp; tmp = tmp->below)
1699	if (object::can_merge (tmp, op))	1702	if (object::can_merge (tmp, op))
1700	{	1703	{
1701	/* return the original object and remove inserted object	1704	/* return the original object and remove inserted object
1702	(client needs the original object) */	1705	(client prefers the original object) */
		1706
		1707	// carrying must be 0 for mergable objects
		1708	weight_t oweight = weight_t (tmp->weight) * tmp->nrof;
		1709
1703	tmp->nrof += op->nrof;	1710	tmp->nrof += op->nrof;
1704		1711
1705	if (object *pl = tmp->visible_to ())	1712	if (object *pl = tmp->visible_to ())
1706	esrv_update_item (UPD_NROF, pl, tmp);	1713	esrv_update_item (UPD_NROF, pl, tmp);
1707		1714
1708	adjust_weight (this, op->total_weight ());	1715	adjust_weight (this, oweight, weight_t (tmp->weight) * tmp->nrof);
1709		1716
1710	op->destroy ();	1717	op->destroy ();
1711	op = tmp;	1718	op = tmp;
1712	goto inserted;	1719	goto inserted;
1713	}	1720	}
…		…
1729	op->flag [FLAG_REMOVED] = 0;	1736	op->flag [FLAG_REMOVED] = 0;
1730		1737
1731	if (object *pl = op->visible_to ())	1738	if (object *pl = op->visible_to ())
1732	esrv_send_item (pl, op);	1739	esrv_send_item (pl, op);
1733		1740
1734	adjust_weight (this, op->total_weight ());	1741	adjust_weight (this, 0, op->total_weight ());
1735		1742
1736	inserted:	1743	inserted:
1737	/* reset the light list and los of the players on the map */	1744	/* reset the light list and los of the players on the map */
1738	if (op->glow_radius && is_on_map ())	1745	if (op->glow_radius && is_on_map ())
1739	{	1746	{
1740	update_stats ();	1747	update_stats ();
1741	update_all_los (map, x, y);	1748	update_all_los (map, x, y);
1742	}	1749	}
1743	else if (is_player () && !flag [FLAG_NO_FIX_PLAYER])	1750	else if (is_player ())
1744	// if this is a player's inventory, update stats	1751	// if this is a player's inventory, update stats
1745	update_stats ();	1752	contr->queue_stats_update ();
1746		1753
1747	INVOKE_OBJECT (INSERT, this);	1754	INVOKE_OBJECT (INSERT, this);
1748		1755
1749	return op;	1756	return op;
1750	}	1757	}
…		…
1768	* MSW 2001-07-08: Check all objects on space, not just those below	1775	* 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	1776	* object being inserted. insert_ob_in_map may not put new objects
1770	* on top.	1777	* on top.
1771	*/	1778	*/
1772	int	1779	int
1773	check_move_on (object *op, object *originator)	1780	check_move_on (object *op, object *originator, int flags)
1774	{	1781	{
1775	if (QUERY_FLAG (op, FLAG_NO_APPLY))	1782	if (op->flag [FLAG_NO_APPLY])
1776	return 0;	1783	return 0;
1777		1784
1778	object *tmp;	1785	object *tmp;
1779	maptile *m = op->map;	1786	maptile *m = op->map;
1780	int x = op->x, y = op->y;	1787	int x = op->x, y = op->y;
…		…
1802	*/	1809	*/
1803	if ((op->move_type & ~move_on & ~move_block) != 0 && (op->move_type & ~move_slow & ~move_block) != 0)	1810	if ((op->move_type & ~move_on & ~move_block) != 0 && (op->move_type & ~move_slow & ~move_block) != 0)
1804	return 0;	1811	return 0;
1805		1812
1806	/* The objects have to be checked from top to bottom.	1813	/* The objects have to be checked from top to bottom.
1807	* Hence, we first go to the top:	1814	* Hence, we first go to the top:
1808	*/	1815	*/
1809	for (object *next, *tmp = ms.top; tmp; tmp = next)	1816	for (object *next, *tmp = ms.top; tmp; tmp = next)
1810	{	1817	{
1811	next = tmp->below;	1818	next = tmp->below;
1812		1819
…		…
1817	* Second check makes sure that the movement types not being slowed	1824	* Second check makes sure that the movement types not being slowed
1818	* (~slow_move) is not blocked on this space - just because the	1825	* (~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	1826	* 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.	1827	* swim on that space, can't use it to avoid the penalty.
1821	*/	1828	*/
1822	if (!QUERY_FLAG (op, FLAG_WIZPASS))	1829	if (!op->flag [FLAG_WIZPASS])
1823	{	1830	{
1824	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||	1831	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))	1832	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1826	{	1833	{
1827	float diff = tmp->move_slow_penalty * fabs (op->speed);	1834	float diff = tmp->move_slow_penalty * fabs (op->speed);
…		…
1837		1844
1838	/* Basically same logic as above, except now for actual apply. */	1845	/* Basically same logic as above, except now for actual apply. */
1839	if ((!op->move_type && tmp->move_on & MOVE_WALK) ||	1846	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))	1847	((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))
1841	{	1848	{
		1849	if ((flags & INS_NO_AUTO_EXIT)
		1850	&& (tmp->type == EXIT || tmp->type == TELEPORTER
		1851	|| tmp->type == HOLE || tmp->type == TRAPDOOR)) //TODO: temporary, fix exits instead
		1852	continue;
		1853
1842	move_apply (tmp, op, originator);	1854	move_apply (tmp, op, originator);
1843		1855
1844	if (op->destroyed ())	1856	if (op->destroyed ())
1845	return 1;	1857	return 1;
1846		1858
…		…
1958	void	1970	void
1959	flag_inv (object *op, int flag)	1971	flag_inv (object *op, int flag)
1960	{	1972	{
1961	for (object *tmp = op->inv; tmp; tmp = tmp->below)	1973	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1962	{	1974	{
1963	SET_FLAG (tmp, flag);	1975	tmp->set_flag (flag);
1964	flag_inv (tmp, flag);	1976	flag_inv (tmp, flag);
1965	}	1977	}
1966	}	1978	}
1967		1979
1968	/*	1980	/*
…		…
1971	void	1983	void
1972	unflag_inv (object *op, int flag)	1984	unflag_inv (object *op, int flag)
1973	{	1985	{
1974	for (object *tmp = op->inv; tmp; tmp = tmp->below)	1986	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1975	{	1987	{
1976	CLEAR_FLAG (tmp, flag);	1988	tmp->clr_flag (flag);
1977	unflag_inv (tmp, flag);	1989	unflag_inv (tmp, flag);
1978	}	1990	}
1979	}	1991	}
1980		1992
1981	/*	1993	/*
…		…
1991	* inform the caller. However, insert_ob_in_map will update as	2003	* inform the caller. However, insert_ob_in_map will update as
1992	* necessary, so the caller shouldn't need to do any special work.	2004	* 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	2005	* 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	2006	* 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	2007	* 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	2008	* the archetype because that isn't correct if the monster has been
1997	* customized, changed states, etc.	2009	* customized, changed states, etc.
1998	*/	2010	*/
1999	int	2011	int
2000	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)	2012	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2001	{	2013	{
2002	int altern[SIZEOFFREE];	2014	int altern[SIZEOFFREE];
2003	int index = 0, flag;	2015	int index = 0;
2004		2016
2005	for (int i = start; i < stop; i++)	2017	for (int i = start; i < stop; i++)
2006	{	2018	{
2007	mapxy pos (m, x, y); pos.move (i);	2019	mapxy pos (m, x, y); pos.move (i);
2008		2020
…		…
2024	continue;	2036	continue;
2025	}	2037	}
2026		2038
2027	/* Basically, if we find a wall on a space, we cut down the search size.	2039	/* 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.	2040	* 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 -	2041	* 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	2042	* 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	2043	* spaces in all the other directions, this will reduce the search space
2032	* to only the spaces immediately surrounding the target area, and	2044	* to only the spaces immediately surrounding the target area, and
2033	* won't look 2 spaces south of the target space.	2045	* won't look 2 spaces south of the target space.
2034	*/	2046	*/
…		…
2064	*/	2076	*/
2065	int	2077	int
2066	find_first_free_spot (const object *ob, maptile *m, int x, int y)	2078	find_first_free_spot (const object *ob, maptile *m, int x, int y)
2067	{	2079	{
2068	for (int i = 0; i < SIZEOFFREE; i++)	2080	for (int i = 0; i < SIZEOFFREE; i++)
2069	if (!ob->blocked (m, x + freearr_x[i], y + freearr_y[i]))	2081	if (!ob->blocked (m, x + DIRX (i), y + DIRY (i)))
2070	return i;	2082	return i;
2071		2083
2072	return -1;	2084	return -1;
2073	}	2085	}
2074		2086
…		…
2085		2097
2086	while (--end)	2098	while (--end)
2087	swap (arr [end], arr [rndm (end + 1)]);	2099	swap (arr [end], arr [rndm (end + 1)]);
2088	}	2100	}
2089		2101
2090	/* new function to make monster searching more efficient, and effective!	2102	/* new function to make monster searching more efficient, and effective!
2091	* This basically returns a randomized array (in the passed pointer) of	2103	* 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	2104	* 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	2105	* 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	2106	* 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.	2107	* the 3x3 area will be searched, just not in a predictable order.
…		…
2120	* there is capable of.	2132	* there is capable of.
2121	*/	2133	*/
2122	int	2134	int
2123	find_dir (maptile *m, int x, int y, object *exclude)	2135	find_dir (maptile *m, int x, int y, object *exclude)
2124	{	2136	{
2125	int max = SIZEOFFREE, mflags;	2137	int max = SIZEOFFREE;
2126	MoveType move_type;	2138	MoveType move_type;
2127		2139
2128	if (exclude && exclude->head_ () != exclude)	2140	if (exclude && exclude->head_ () != exclude)
2129	{	2141	{
2130	exclude = exclude->head;	2142	exclude = exclude->head;
…		…
2171	{	2183	{
2172	return (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);	2184	return (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);
2173	}	2185	}
2174		2186
2175	/*	2187	/*
2176	* find_dir_2(delta-x,delta-y) will return a direction in which	2188	* 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	2189	* for running into direct [dx, dy].
2178	* object, needs to travel toward it.	2190	* (the opposite of crossfire's find_dir_2!)
2179	*/	2191	*/
2180	int	2192	int
2181	find_dir_2 (int x, int y)	2193	find_dir_2 (int x, int y)
2182	{	2194	{
		2195	#if 1 // new algorithm
		2196	// this works by putting x, y into 16 sectors, which
		2197	// are not equal sized, but are a better approximation
		2198	// then the old algorithm, and then using a mapping
		2199	// table to map it into a direction value.
		2200	// basically, it maps these comparisons to each bit
		2201	// bit #3: x < 0
		2202	// bit #2: y < 0
		2203	// bit #1: x > y
		2204	// bit #0: x > 2y
		2205
		2206	static const uint8 dir[16] = {
		2207	4, 5, 4, 3,
		2208	2, 1, 2, 3,
		2209	6, 5, 6, 7,
		2210	8, 1, 8, 7,
		2211	};
		2212	int sector = 0;
		2213
		2214	// this is a bit ugly, but more likely to result in branchless code
		2215	sector |= x < 0 ? 8 : 0;
		2216	x = x < 0 ? -x : x; // abs
		2217
		2218	sector |= y < 0 ? 4 : 0;
		2219	y = y < 0 ? -y : y; // abs
		2220
		2221	if (x > y)
		2222	{
		2223	sector |= 2;
		2224
		2225	if (x > y * 2)
		2226	sector |= 1;
		2227	}
		2228	else
		2229	{
		2230	if (y > x * 2)
		2231	sector |= 1;
		2232	else if (!y)
		2233	return 0; // x == 0 here
		2234	}
		2235
		2236	return dir [sector];
		2237	#else // old algorithm
2183	int q;	2238	int q;
2184		2239
2185	if (y)	2240	if (y)
2186	q = x * 100 / y;	2241	q = 128 * x / y;
2187	else if (x)	2242	else if (x)
2188	q = -300 * x;	2243	q = -512 * x; // to make it > 309
2189	else	2244	else
2190	return 0;	2245	return 0;
2191		2246
2192	if (y > 0)	2247	if (y > 0)
2193	{	2248	{
2194	if (q < -242)	2249	if (q < -309) return 7;
		2250	if (q < -52) return 6;
		2251	if (q < 52) return 5;
		2252	if (q < 309) return 4;
		2253
2195	return 3;	2254	return 3;
2196	if (q < -41)	2255	}
2197	return 2;	2256	else
2198	if (q < 41)	2257	{
2199	return 1;	2258	if (q < -309) return 3;
2200	if (q < 242)	2259	if (q < -52) return 2;
2201	return 8;	2260	if (q < 52) return 1;
		2261	if (q < 309) return 8;
		2262
2202	return 7;	2263	return 7;
2203	}	2264	}
2204		2265	#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	}	2266	}
2216		2267
2217	/*	2268	/*
2218	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is	2269	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is
2219	* between two directions (which are expected to be absolute (see absdir())	2270	* between two directions (which are expected to be absolute (see absdir())
2220	*/	2271	*/
2221	int	2272	int
2222	dirdiff (int dir1, int dir2)	2273	dirdiff (int dir1, int dir2)
2223	{	2274	{
2224	int d;
2225
2226	d = abs (dir1 - dir2);	2275	int d = abs (dir1 - dir2);
2227	if (d > 4)
2228	d = 8 - d;
2229		2276
2230	return d;	2277	return d > 4 ? 8 - d : d;
2231	}	2278	}
2232		2279
2233	/* peterm:	2280	/* peterm:
2234	* do LOS stuff for ball lightning. Go after the closest VISIBLE monster.	2281	* do LOS stuff for ball lightning. Go after the closest VISIBLE monster.
2235	* Basically, this is a table of directions, and what directions	2282	* Basically, this is a table of directions, and what directions
…		…
2304	int mflags;	2351	int mflags;
2305		2352
2306	if (dir < 0)	2353	if (dir < 0)
2307	return 0; /* exit condition: invalid direction */	2354	return 0; /* exit condition: invalid direction */
2308		2355
2309	dx = x + freearr_x[dir];	2356	dx = x + DIRX (dir);
2310	dy = y + freearr_y[dir];	2357	dy = y + DIRY (dir);
2311		2358
2312	mflags = get_map_flags (m, &m, dx, dy, &dx, &dy);	2359	mflags = get_map_flags (m, &m, dx, dy, &dx, &dy);
2313		2360
2314	/* This functional arguably was incorrect before - it was	2361	/* This functional arguably was incorrect before - it was
2315	* checking for P_WALL - that was basically seeing if	2362	* checking for P_WALL - that was basically seeing if
…		…
2341	* Add a check so we can't pick up invisible objects (0.93.8)	2388	* Add a check so we can't pick up invisible objects (0.93.8)
2342	*/	2389	*/
2343	int	2390	int
2344	can_pick (const object *who, const object *item)	2391	can_pick (const object *who, const object *item)
2345	{	2392	{
2346	return /*QUERY_FLAG(who,FLAG_WIZ)|| */	2393	return /*who->flag [FLAG_WIZ]|| */
2347	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&	2394	(item->weight > 0 && !item->flag [FLAG_NO_PICK] &&
2348	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->is_player () || item->weight < who->weight / 3));	2395	!item->flag [FLAG_ALIVE] && !item->invisible && (who->is_player () || item->weight < who->weight / 3));
2349	}	2396	}
		2397
		2398	//-GPL
2350		2399
2351	/*	2400	/*
2352	* create clone from object to another	2401	* create clone from object to another
2353	*/	2402	*/
2354	object *	2403	object *
…		…
2385	return tmp;	2434	return tmp;
2386		2435
2387	return 0;	2436	return 0;
2388	}	2437	}
2389		2438
		2439	/* Zero the key_values on op, decrementing the shared-string
		2440	* refcounts and freeing the links.
		2441	*/
		2442	void
		2443	key_values::clear ()
		2444	{
		2445	for (key_value *kvp = first; kvp; )
		2446	{
		2447	key_value *next = kvp->next;
		2448	delete kvp;
		2449	kvp = next;
		2450	}
		2451
		2452	first = 0;
		2453	}
		2454
2390	shstr_tmp	2455	shstr_tmp
2391	object::kv_get (shstr_tmp key) const	2456	key_values::get (shstr_tmp key) const
2392	{	2457	{
2393	for (key_value *kv = key_values; kv; kv = kv->next)	2458	for (key_value *kv = first; kv; kv = kv->next)
2394	if (kv->key == key)	2459	if (kv->key == key)
2395	return kv->value;	2460	return kv->value;
2396		2461
2397	return shstr ();	2462	return shstr ();
2398	}	2463	}
2399		2464
2400	void	2465	void
		2466	key_values::add (shstr_tmp key, shstr_tmp value)
		2467	{
		2468	key_value *kv = new key_value;
		2469
		2470	kv->next = first;
		2471	kv->key = key;
		2472	kv->value = value;
		2473
		2474	first = kv;
		2475	}
		2476
		2477	void
2401	object::kv_set (shstr_tmp key, shstr_tmp value)	2478	key_values::set (shstr_tmp key, shstr_tmp value)
2402	{	2479	{
2403	for (key_value *kv = key_values; kv; kv = kv->next)	2480	for (key_value *kv = first; kv; kv = kv->next)
2404	if (kv->key == key)	2481	if (kv->key == key)
2405	{	2482	{
2406	kv->value = value;	2483	kv->value = value;
2407	return;	2484	return;
2408	}	2485	}
2409		2486
2410	key_value *kv = new key_value;	2487	add (key, value);
2411
2412	kv->next = key_values;
2413	kv->key = key;
2414	kv->value = value;
2415
2416	key_values = kv;
2417	}	2488	}
2418		2489
2419	void	2490	void
2420	object::kv_del (shstr_tmp key)	2491	key_values::del (shstr_tmp key)
2421	{	2492	{
2422	for (key_value **kvp = &key_values; *kvp; kvp = &(*kvp)->next)	2493	for (key_value **kvp = &first; *kvp; kvp = &(*kvp)->next)
2423	if ((*kvp)->key == key)	2494	if ((*kvp)->key == key)
2424	{	2495	{
2425	key_value *kv = *kvp;	2496	key_value *kv = *kvp;
2426	*kvp = (*kvp)->next;	2497	*kvp = (*kvp)->next;
2427	delete kv;	2498	delete kv;
2428	return;	2499	return;
2429	}	2500	}
		2501	}
		2502
		2503	void
		2504	key_values::reverse ()
		2505	{
		2506	key_value *prev = 0;
		2507	key_value *head = first;
		2508
		2509	while (head)
		2510	{
		2511	key_value *node = head;
		2512	head = head->next;
		2513	node->next = prev;
		2514	prev = node;
		2515	}
		2516
		2517	first = prev;
		2518	}
		2519
		2520	key_values &
		2521	key_values::operator =(const key_values &kv)
		2522	{
		2523	clear ();
		2524
		2525	for (key_value *kvp = kv.first; kvp; kvp = kvp->next)
		2526	add (kvp->key, kvp->value);
		2527
		2528	reverse ();
2430	}	2529	}
2431		2530
2432	object::depth_iterator::depth_iterator (object *container)	2531	object::depth_iterator::depth_iterator (object *container)
2433	: iterator_base (container)	2532	: iterator_base (container)
2434	{	2533	{
…		…
2518	{	2617	{
2519	return map ? map->region (x, y)	2618	return map ? map->region (x, y)
2520	: region::default_region ();	2619	: region::default_region ();
2521	}	2620	}
2522		2621
2523	const materialtype_t *	2622	//+GPL
2524	object::dominant_material () const
2525	{
2526	if (materialtype_t *mt = name_to_material (materialname))
2527	return mt;
2528
2529	return name_to_material (shstr_unknown);
2530	}
2531		2623
2532	void	2624	void
2533	object::open_container (object *new_container)	2625	object::open_container (object *new_container)
2534	{	2626	{
2535	if (container == new_container)	2627	if (container == new_container)
…		…
2570	// TODO: this does not seem to serve any purpose anymore?	2662	// TODO: this does not seem to serve any purpose anymore?
2571	#if 0	2663	#if 0
2572	// insert the "Close Container" object.	2664	// insert the "Close Container" object.
2573	if (archetype *closer = new_container->other_arch)	2665	if (archetype *closer = new_container->other_arch)
2574	{	2666	{
2575	object *closer = arch_to_object (new_container->other_arch);	2667	object *closer = new_container->other_arch->instance ();
2576	closer->flag [FLAG_NO_MAP_SAVE] = 1;	2668	closer->flag [FLAG_NO_MAP_SAVE] = 1;
2577	new_container->insert (closer);	2669	new_container->insert (closer);
2578	}	2670	}
2579	#endif	2671	#endif
2580		2672
…		…
2593	}	2685	}
2594	// else if (!old_container->env && contr && contr->ns)	2686	// else if (!old_container->env && contr && contr->ns)
2595	// contr->ns->floorbox_reset ();	2687	// contr->ns->floorbox_reset ();
2596	}	2688	}
2597		2689
		2690	//-GPL
		2691
		2692	// prefetch some flat area around the player
		2693	static void
		2694	prefetch_surrounding_area (object *op, maptile *map, int range)
		2695	{
		2696	for (maprect *rect = map->split_to_tiles (mapwalk_buf,
		2697	op->x - range , op->y - range ,
		2698	op->x + range + 1, op->y + range + 1);
		2699	rect->m;
		2700	++rect)
		2701	{
		2702	rect->m->touch ();
		2703	rect->m->activate ();
		2704	}
		2705	}
		2706
		2707	// prefetch a generous area around the player, also up and down
		2708	void
		2709	object::prefetch_surrounding_maps ()
		2710	{
		2711	prefetch_surrounding_area (this, map, 40);
		2712
		2713	if (maptile *m = map->tile_available (TILE_DOWN))
		2714	prefetch_surrounding_area (this, m, 20);
		2715
		2716	if (maptile *m = map->tile_available (TILE_UP))
		2717	prefetch_surrounding_area (this, m, 20);
		2718	}
		2719
		2720	//+GPL
		2721
2598	object *	2722	object *
2599	object::force_find (shstr_tmp name)	2723	object::force_find (shstr_tmp name)
2600	{	2724	{
2601	/* cycle through his inventory to look for the MARK we want to	2725	/* cycle through his inventory to look for the MARK we want to
2602	* place	2726	* place
2603	*/	2727	*/
2604	for (object *tmp = inv; tmp; tmp = tmp->below)	2728	for (object *tmp = inv; tmp; tmp = tmp->below)
2605	if (tmp->type == FORCE && tmp->slaying == name)	2729	if (tmp->type == FORCE && tmp->slaying == name)
2606	return splay (tmp);	2730	return splay (tmp);
2607		2731
2608	return 0;	2732	return 0;
2609	}	2733	}
2610		2734
2611	//-GPL
2612
2613	void	2735	void
2614	object::force_set_timer (int duration)	2736	object::force_set_timer (int duration)
2615	{	2737	{
2616	this->duration = 1;	2738	this->duration = 1;
2617	this->speed_left = -1.f;	2739	this->speed_left = -1.f;
…		…
2623	object::force_add (shstr_tmp name, int duration)	2745	object::force_add (shstr_tmp name, int duration)
2624	{	2746	{
2625	if (object *force = force_find (name))	2747	if (object *force = force_find (name))
2626	force->destroy ();	2748	force->destroy ();
2627		2749
2628	object *force = get_archetype (FORCE_NAME);	2750	object *force = archetype::get (FORCE_NAME);
2629		2751
2630	force->slaying = name;	2752	force->slaying = name;
2631	force->force_set_timer (duration);	2753	force->force_set_timer (duration);
2632	force->flag [FLAG_APPLIED] = true;	2754	force->flag [FLAG_APPLIED] = true;
2633		2755
…		…
2686		2808
2687	insert (force);	2809	insert (force);
2688	}	2810	}
2689	}	2811	}
2690		2812
		2813	void object::change_move_type (MoveType mt)
		2814	{
		2815	if (move_type == mt)
		2816	return;
		2817
		2818	if (is_on_map ())
		2819	{
		2820	// we are on the map, so handle move_on/off effects
		2821	remove ();
		2822	move_type = mt;
		2823	map->insert (this, x, y, this);
		2824	}
		2825	else
		2826	move_type = mt;
		2827	}
		2828
		2829	/* object should be a player.
		2830	* we return the object the player has marked with the 'mark' command
		2831	* below. If no match is found (or object has changed), we return
		2832	* NULL. We leave it up to the calling function to print messages if
		2833	* nothing is found.
		2834	*/
		2835	object *
		2836	object::mark () const
		2837	{
		2838	if (contr && contr->mark && contr->mark->env == this)
		2839	return contr->mark;
		2840	else
		2841	return 0;
		2842	}
		2843
		2844	// put marked object first in the inventory
		2845	// this is used by identify-like spells so players can influence
		2846	// the order a bit.
		2847	void
		2848	object::splay_marked ()
		2849	{
		2850	if (object *marked = mark ())
		2851	splay (marked);
		2852	}
		2853

Diff Legend

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