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.270 by root, Sat Dec 27 02:31:19 2008 UTC vs.
Revision 1.330 by root, Sun Apr 18 14:01:33 2010 UTC

1	/*	1	/*
2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.	2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.
3	*	3	*
4	* Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team	4	* Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5	* Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team	5	* Copyright (©) 2001 Mark Wedel & Crossfire Development Team
6	* Copyright (©) 1992,2007 Frank Tore Johansen	6	* Copyright (©) 1992 Frank Tore Johansen
7	*	7	*
8	* Deliantra is free software: you can redistribute it and/or modify	8	* Deliantra is free software: you can redistribute it and/or modify it under
9	* it under the terms of the GNU General Public License as published by	9	* the terms of the Affero GNU General Public License as published by the
10	* the Free Software Foundation, either version 3 of the License, or	10	* Free Software Foundation, either version 3 of the License, or (at your
11	* (at your option) any later version.	11	* option) any later version.
12	*	12	*
13	* This program is distributed in the hope that it will be useful,	13	* This program is distributed in the hope that it will be useful,
14	* but WITHOUT ANY WARRANTY; without even the implied warranty of	14	* but WITHOUT ANY WARRANTY; without even the implied warranty of
15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16	* GNU General Public License for more details.	16	* GNU General Public License for more details.
17	*	17	*
18	* You should have received a copy of the GNU General Public License	18	* You should have received a copy of the Affero GNU General Public License
19	* along with this program. If not, see <http://www.gnu.org/licenses/>.	19	* and the GNU General Public License along with this program. If not, see
		20	* <http://www.gnu.org/licenses/>.
20	*	21	*
21	* The authors can be reached via e-mail to <support@deliantra.net>	22	* The authors can be reached via e-mail to <support@deliantra.net>
22	*/	23	*/
23		24
24	#include <global.h>	25	#include <global.h>
25	#include <stdio.h>	26	#include <stdio.h>
26	#include <sys/types.h>	27	#include <sys/types.h>
27	#include <sys/uio.h>	28	#include <sys/uio.h>
28	#include <object.h>	29	#include <object.h>
29	#include <sproto.h>	30	#include <sproto.h>
30	#include <loader.h>
31		31
32	#include <bitset>	32	#include <bitset>
33		33
34	UUID UUID::cur;	34	UUID UUID::cur;
35	static uint64_t seq_next_save;	35	static uint64_t seq_next_save;
36	static const uint64 UUID_GAP = 1<<19;	36	static const uint64 UUID_GAP = 1<<19;
		37	uint32_t mapspace::smellcount = 10000;
37		38
38	objectvec objects;	39	objectvec objects;
39	activevec actives;	40	activevec actives;
		41
		42	freelist_item *object::freelist;
		43	uint32_t object::object_count;
		44	uint32_t object::free_count;
		45	uint32_t object::create_count;
		46	uint32_t object::destroy_count;
		47
		48	//+GPL
40		49
41	short freearr_x[SIZEOFFREE] = {	50	short freearr_x[SIZEOFFREE] = {
42	0,	51	0,
43	0, 1, 1, 1, 0, -1, -1, -1,	52	0, 1, 1, 1, 0, -1, -1, -1,
44	0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,	53	0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,
…		…
48	0,	57	0,
49	-1, -1, 0, 1, 1, 1, 0, -1,	58	-1, -1, 0, 1, 1, 1, 0, -1,
50	-2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2,	59	-2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2,
51	-3, -3, -3, -3, -2, -1, 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3	60	-3, -3, -3, -3, -2, -1, 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3
52	};	61	};
53	int maxfree[SIZEOFFREE] = {
54	0,
55	9, 10, 13, 14, 17, 18, 21, 22,
56	25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45, 48,
57	49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49
58	};
59	int freedir[SIZEOFFREE] = {	62	int freedir[SIZEOFFREE] = {
60	0,	63	0,
61	1, 2, 3, 4, 5, 6, 7, 8,	64	1, 2, 3, 4, 5, 6, 7, 8,
62	1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8,	65	1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8,
63	1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8	66	1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8
64	};	67	};
65		68
		69	static int maxfree[SIZEOFFREE] = {
		70	0,
		71	9, 10, 13, 14, 17, 18, 21, 22,
		72	25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45, 48,
		73	49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49
		74	};
		75
66	static void	76	static void
67	write_uuid (uval64 skip, bool sync)	77	write_uuid (uval64 skip, bool sync)
68	{	78	{
69	CALL_BEGIN (2);	79	CALL_BEGIN (2);
70	CALL_ARG_SV (newSVval64 (skip));	80	CALL_ARG_SV (newSVval64 (skip));
…		…
72	CALL_CALL ("cf::write_uuid", G_DISCARD);	82	CALL_CALL ("cf::write_uuid", G_DISCARD);
73	CALL_END;	83	CALL_END;
74	}	84	}
75		85
76	static void	86	static void
77	read_uuid (void)	87	read_uuid ()
78	{	88	{
79	char filename[MAX_BUF];	89	char filename[MAX_BUF];
80		90
81	sprintf (filename, "%s/uuid", settings.localdir);	91	sprintf (filename, "%s/uuid", settings.localdir);
82		92
…		…
96		106
97	LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);	107	LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);
98	_exit (1);	108	_exit (1);
99	}	109	}
100		110
101	UUID::BUF buf;	111	char buf [UUID::MAX_LEN];
102	buf[0] = 0;	112	buf[0] = 0;
103	fgets (buf, sizeof (buf), fp);	113	fgets (buf, sizeof (buf), fp);
104		114
105	if (!UUID::cur.parse (buf))	115	if (!UUID::cur.parse (buf))
106	{	116	{
…		…
133		143
134	void	144	void
135	UUID::init ()	145	UUID::init ()
136	{	146	{
137	read_uuid ();	147	read_uuid ();
		148	}
		149
		150	bool
		151	UUID::parse (const char *s)
		152	{
		153	if (*s++ != '<' || *s++ != '1' || *s++ != '.')
		154	return false;
		155
		156	seq = 0;
		157
		158	while (*s != '>')
		159	{
		160	if (*s < '0')
		161	return false;
		162
		163	// this gives nice branchless code with gcc
		164	assert ('0' < 'a' && '0' == 48 && 'a' == 97);
		165	int digit = (*s + (*s & 0x40 ? 9 : 0)) & 15;
		166
		167	seq = (seq << 4) | digit;
		168
		169	++s;
		170	}
		171
		172	return true;
		173	}
		174
		175	char *
		176	UUID::append (char *buf) const
		177	{
		178	*buf++ = '<';
		179	*buf++ = '1';
		180	*buf++ = '.';
		181
		182	uint64_t seq = this->seq;
		183	const int bits = 64;
		184	char nz = 0;
		185	static const char tohex [] = "0123456789abcdef";
		186
		187	// assert (len >= 3 + bits / 4 + 1 + 1);
		188	for (int i = bits / 4; --i; )
		189	{
		190	uint8_t digit = seq >> (bits - 4);
		191
		192	*buf = tohex [digit];
		193	nz |= digit;
		194	buf += nz ? 1 : 0;
		195	seq <<= 4;
		196	}
		197
		198	// last digit is special - always emit
		199	uint8_t digit = seq >> (bits - 4);
		200	*buf++ = tohex [digit];
		201
		202	*buf++ = '>';
		203
		204	return buf;
		205	}
		206
		207	char *
		208	UUID::c_str () const
		209	{
		210	static char buf [MAX_LEN];
		211	*append (buf) = 0;
		212	return buf;
138	}	213	}
139		214
140	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */	215	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */
141	static bool	216	static bool
142	compare_ob_value_lists_one (const object *wants, const object *has)	217	compare_ob_value_lists_one (const object *wants, const object *has)
…		…
178	* Improvements made with merge: Better checking on potion, and also	253	* Improvements made with merge: Better checking on potion, and also
179	* check weight	254	* check weight
180	*/	255	*/
181	bool object::can_merge_slow (object *ob1, object *ob2)	256	bool object::can_merge_slow (object *ob1, object *ob2)
182	{	257	{
183	/* A couple quicksanity checks */	258	/* A couple quick sanity checks */
184	if (ob1 == ob2	259	if (ob1 == ob2
185	|| ob1->type != ob2->type	260	|| ob1->type != ob2->type
186	|| ob1->speed != ob2->speed
187	|| ob1->value != ob2->value	261	|| ob1->value != ob2->value
188	|| ob1->name != ob2->name)	262	|| ob1->name != ob2->name
		263	|| fabs (ob1->speed - ob2->speed) >= MIN_ACTIVE_SPEED)
189	return 0;	264	return 0;
190		265
191	/* Do not merge objects if nrof would overflow, assume nrof	266	/* Do not merge objects if nrof would overflow, assume nrof
192	* is always 0 .. 2**31-1 */	267	* is always 0 .. 2**31-1 */
193	if (ob1->nrof > 0x7fffffff - ob2->nrof)	268	if (ob1->nrof > 0x7fffffff - ob2->nrof)
…		…
197	* This is to the comparison of the flags below will be OK. We	272	* This is to the comparison of the flags below will be OK. We
198	* just can't ignore the been applied or identified flags, as they	273	* just can't ignore the been applied or identified flags, as they
199	* are not equal - just if it has been identified, the been_applied	274	* are not equal - just if it has been identified, the been_applied
200	* flags lose any meaning.	275	* flags lose any meaning.
201	*/	276	*/
202	if (QUERY_FLAG (ob1, FLAG_IDENTIFIED))	277	if (ob1->flag [FLAG_IDENTIFIED])
203	SET_FLAG (ob1, FLAG_BEEN_APPLIED);	278	ob1->set_flag (FLAG_BEEN_APPLIED);
204		279
205	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))	280	if (ob2->flag [FLAG_IDENTIFIED])
206	SET_FLAG (ob2, FLAG_BEEN_APPLIED);	281	ob2->set_flag (FLAG_BEEN_APPLIED);
207		282
208	if (ob1->arch->archname != ob2->arch->archname	283	if (ob1->arch->archname != ob2->arch->archname
209	|| ob1->name != ob2->name	284	|| ob1->name != ob2->name
210	|| ob1->title != ob2->title	285	|| ob1->title != ob2->title
211	|| ob1->msg != ob2->msg	286	|| ob1->msg != ob2->msg
…		…
214	|| ob1->magic != ob2->magic	289	|| ob1->magic != ob2->magic
215	|| ob1->slaying != ob2->slaying	290	|| ob1->slaying != ob2->slaying
216	|| ob1->skill != ob2->skill	291	|| ob1->skill != ob2->skill
217	|| ob1->value != ob2->value	292	|| ob1->value != ob2->value
218	|| ob1->animation_id != ob2->animation_id	293	|| ob1->animation_id != ob2->animation_id
219	|| (ob1->face != ob2->face && !ob1->animation_id) // face and animation are dependent on each other	294	|| (ob1->face != ob2->face && !ob1->animation_id) // face and animation are dependend on each other
220	|| ob1->client_type != ob2->client_type	295	|| ob1->client_type != ob2->client_type
221	|| ob1->materialname != ob2->materialname	296	|| ob1->material != ob2->material
222	|| ob1->lore != ob2->lore	297	|| ob1->lore != ob2->lore
223	|| ob1->subtype != ob2->subtype	298	|| ob1->subtype != ob2->subtype
224	|| ob1->move_type != ob2->move_type	299	|| ob1->move_type != ob2->move_type
225	|| ob1->move_block != ob2->move_block	300	|| ob1->move_block != ob2->move_block
226	|| ob1->move_allow != ob2->move_allow	301	|| ob1->move_allow != ob2->move_allow
227	|| ob1->move_on != ob2->move_on	302	|| ob1->move_on != ob2->move_on
228	|| ob1->move_off != ob2->move_off	303	|| ob1->move_off != ob2->move_off
229	|| ob1->move_slow != ob2->move_slow	304	|| ob1->move_slow != ob2->move_slow
230	|| ob1->move_slow_penalty != ob2->move_slow_penalty	305	|| fabs (ob1->move_slow_penalty - ob2->move_slow_penalty) >= (1.f / 1024.f)
231	|| memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))	306	|| memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
232	|| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats)))	307	|| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats)))
233	return 0;	308	return 0;
234		309
235	if ((ob1->flag ^ ob2->flag)	310	if ((ob1->flag ^ ob2->flag)
…		…
260		335
261	/* Don't merge objects that are applied. With the new 'body' code,	336	/* Don't merge objects that are applied. With the new 'body' code,
262	* it is possible for most any character to have more than one of	337	* it is possible for most any character to have more than one of
263	* some items equipped, and we don't want those to merge.	338	* some items equipped, and we don't want those to merge.
264	*/	339	*/
265	if (QUERY_FLAG (ob1, FLAG_APPLIED) || QUERY_FLAG (ob2, FLAG_APPLIED))	340	if (ob1->flag [FLAG_APPLIED] || ob2->flag [FLAG_APPLIED])
266	return 0;	341	return 0;
267		342
268	/* Note sure why the following is the case - either the object has to	343	/* Note sure why the following is the case - either the object has to
269	* be animated or have a very low speed. Is this an attempted monster	344	* be animated or have a very low speed. Is this an attempted monster
270	* check?	345	* check?
271	*/	346	*/
272	if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && ob1->has_active_speed ())	347	if (!ob1->flag [FLAG_ANIMATE] && ob1->has_active_speed ())
273	return 0;	348	return 0;
274		349
275	switch (ob1->type)	350	switch (ob1->type)
276	{	351	{
277	case SCROLL:	352	case SCROLL:
…		…
327	// the player inventory itself is always visible	402	// the player inventory itself is always visible
328	if (env->is_player ())	403	if (env->is_player ())
329	return env;	404	return env;
330		405
331	// else a player could have our env open	406	// else a player could have our env open
332	object *envest = env->outer_env ();	407	object *envest = env->outer_env_or_self ();
333		408
334	// the player itself is always on a map, so we will find him here	409	// the player itself is always on a map, so we will find him here
335	// even if our inv is in a player.	410	// even if our inv is in a player.
336	if (envest->is_on_map ())	411	if (envest->is_on_map ())
337	if (object *pl = envest->ms ().player ())	412	if (object *pl = envest->ms ().player ())
338	if (pl->container == env)	413	if (pl->container_ () == env)
339	return pl;	414	return pl;
340	}	415	}
341	else	416	else
342	{	417	{
343	// maybe there is a player standing on the same mapspace	418	// maybe there is a player standing on the same mapspace
344	// this will catch the case where "this" is a player	419	// this will catch the case where "this" is a player
345	if (object *pl = ms ().player ())	420	if (object *pl = ms ().player ())
346	if ((!pl->container && pl->contr->ns && !pl->contr->ns->update_look)	421	if ((pl->contr->ns && !pl->container_ () && !pl->contr->ns->update_look)
347	|| this == pl->container)	422	|| pl->container_ () == this)
348	return pl;	423	return pl;
349	}	424	}
350	}	425	}
351		426
352	return 0;	427	return 0;
…		…
408		483
409	sum = weight_adjust_for (this, sum);	484	sum = weight_adjust_for (this, sum);
410		485
411	if (sum != carrying)	486	if (sum != carrying)
412	{	487	{
		488	if (carrying != sum)//D
		489	LOG (llevDebug, "updating weight got %ld, expected %ld (%s)\n",
		490	(long long)sum, (long long)carrying, debug_desc ());
		491
413	carrying = sum;	492	carrying = sum;
414		493
415	if (object *pl = visible_to ())	494	if (object *pl = visible_to ())
416	if (pl != this) // player is handled lazily	495	if (pl != this) // player is handled lazily
417	esrv_update_item (UPD_WEIGHT, pl, this);	496	esrv_update_item (UPD_WEIGHT, pl, this);
…		…
430	object_freezer freezer;	509	object_freezer freezer;
431	op->write (freezer);	510	op->write (freezer);
432	return freezer.as_string ();	511	return freezer.as_string ();
433	}	512	}
434		513
435	/*	514	char *
436	* get_nearest_part(multi-object, object 2) returns the part of the	515	object::as_string ()
437	* multi-object 1 which is closest to the second object.
438	* If it's not a multi-object, it is returned.
439	*/
440	object *
441	get_nearest_part (object *op, const object *pl)
442	{	516	{
443	object *tmp, *closest;	517	return dump_object (this);
444	int last_dist, i;
445
446	if (!op->more)
447	return op;
448
449	for (last_dist = distance (op, pl), closest = op, tmp = op->more;
450	tmp;
451	tmp = tmp->more)
452	if ((i = distance (tmp, pl)) < last_dist)
453	closest = tmp, last_dist = i;
454
455	return closest;
456	}	518	}
457		519
458	/*	520	/*
459	* Returns the object which has the count-variable equal to the argument.	521	* Returns the object which has the count-variable equal to the argument.
460	* VERRRY slow.	522	* VERRRY slow.
…		…
462	object *	524	object *
463	find_object (tag_t i)	525	find_object (tag_t i)
464	{	526	{
465	for_all_objects (op)	527	for_all_objects (op)
466	if (op->count == i)	528	if (op->count == i)
		529	return op;
		530
		531	return 0;
		532	}
		533
		534	/*
		535	* Returns the object which has the uuid equal to the argument.
		536	* MOAR VERRRY slow.
		537	*/
		538
		539	object *
		540	find_object_uuid (UUID i)
		541	{
		542	for_all_objects (op)
		543	if (op->uuid == i)
467	return op;	544	return op;
468		545
469	return 0;	546	return 0;
470	}	547	}
471		548
…		…
505	LOG (llevError | logBacktrace, "tried to set owner of %s to %s\n", debug_desc (), owner->debug_desc ());	582	LOG (llevError | logBacktrace, "tried to set owner of %s to %s\n", debug_desc (), owner->debug_desc ());
506	return;	583	return;
507	}	584	}
508		585
509	this->owner = owner;	586	this->owner = owner;
510	}
511
512	int
513	object::slottype () const
514	{
515	if (type == SKILL)
516	{
517	if (IS_COMBAT_SKILL (subtype)) return slot_combat;
518	if (IS_RANGED_SKILL (subtype)) return slot_ranged;
519	}
520	else
521	{
522	if (slot [body_combat].info) return slot_combat;
523	if (slot [body_range ].info) return slot_ranged;
524	}
525
526	return slot_none;
527	}
528
529	bool
530	object::change_weapon (object *ob)
531	{
532	if (current_weapon == ob)
533	return true;
534
535	if (chosen_skill)
536	chosen_skill->flag [FLAG_APPLIED] = false;
537
538	current_weapon = ob;
539	chosen_skill = !ob || ob->type == SKILL ? ob : find_skill_by_name (this, ob->skill);
540
541	if (chosen_skill)
542	chosen_skill->flag [FLAG_APPLIED] = true;
543
544	update_stats ();
545
546	if (ob)
547	{
548	// now check wether any body locations became invalid, in which case
549	// we cannot apply the weapon at the moment.
550	for (int i = 0; i < NUM_BODY_LOCATIONS; ++i)
551	if (slot[i].used < 0)
552	{
553	current_weapon = chosen_skill = 0;
554	update_stats ();
555
556	new_draw_info_format (NDI_UNIQUE, 0, this,
557	"You try to balance all your items at once, "
558	"but the %s is just too much for your body. "
559	"[You need to unapply some items first.]", &ob->name);
560	return false;
561	}
562
563	//new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);
564	}
565	else
566	;//new_draw_info_format (NDI_UNIQUE, 0, this, "You unwield your weapons.");
567
568	if (ob && !ob->flag [FLAG_APPLIED] && ob->type != SPELL)
569	{
570	LOG (llevError | logBacktrace, "%s changed to unapplied weapon %s",
571	&name, ob->debug_desc ());
572	return false;
573	}
574
575	return true;
576	}	587	}
577		588
578	/* Zero the key_values on op, decrementing the shared-string	589	/* Zero the key_values on op, decrementing the shared-string
579	* refcounts and freeing the links.	590	* refcounts and freeing the links.
580	*/	591	*/
…		…
633	tail = new_link;	644	tail = new_link;
634	}	645	}
635	}	646	}
636	}	647	}
637		648
638	if (speed < 0)
639	dst->speed_left -= rndm ();
640
641	dst->activate ();	649	dst->activate ();
642	}	650	}
643		651
644	void	652	void
645	object::instantiate ()	653	object::instantiate ()
646	{	654	{
647	if (!uuid.seq) // HACK	655	if (!uuid.seq) // HACK
648	uuid = UUID::gen ();	656	uuid = UUID::gen ();
649		657
		658	// TODO: unclean state changes, should nt be done in copy_to AND instantiate
		659	if (flag [FLAG_RANDOM_SPEED] && speed)
		660	speed_left = - speed - rndm (); // TODO animation
		661	else
650	speed_left = -0.1f;	662	speed_left = -1.;
		663
651	/* copy the body_info to the body_used - this is only really	664	/* copy the body_info to the body_used - this is only really
652	* need for monsters, but doesn't hurt to do it for everything.	665	* need for monsters, but doesn't hurt to do it for everything.
653	* by doing so, when a monster is created, it has good starting	666	* by doing so, when a monster is created, it has good starting
654	* values for the body_used info, so when items are created	667	* values for the body_used info, so when items are created
655	* for it, they can be properly equipped.	668	* for it, they can be properly equipped.
…		…
663	object *	676	object *
664	object::clone ()	677	object::clone ()
665	{	678	{
666	object *neu = create ();	679	object *neu = create ();
667	copy_to (neu);	680	copy_to (neu);
		681
		682	// TODO: unclean state changes, should not be done in clone AND instantiate
		683	if (neu->flag [FLAG_RANDOM_SPEED] && neu->speed)
		684	neu->speed_left = - neu->speed - rndm (); // TODO animation
		685
668	neu->map = map; // not copied by copy_to	686	neu->map = map; // not copied by copy_to
669	return neu;	687	return neu;
670	}	688	}
671		689
672	/*	690	/*
…		…
675	* be called to update the face variable, _and_ how it looks on the map.	693	* be called to update the face variable, _and_ how it looks on the map.
676	*/	694	*/
677	void	695	void
678	update_turn_face (object *op)	696	update_turn_face (object *op)
679	{	697	{
680	if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || !op->arch)	698	if (!op->flag [FLAG_IS_TURNABLE] || !op->arch)
681	return;	699	return;
682		700
683	SET_ANIMATION (op, op->direction);	701	SET_ANIMATION (op, op->direction);
684	update_object (op, UP_OBJ_FACE);	702	update_object (op, UP_OBJ_FACE);
685	}	703	}
…		…
690	* This function needs to be called whenever the speed of an object changes.	708	* This function needs to be called whenever the speed of an object changes.
691	*/	709	*/
692	void	710	void
693	object::set_speed (float speed)	711	object::set_speed (float speed)
694	{	712	{
695	if (flag [FLAG_FREED] && speed)
696	{
697	LOG (llevError, "Object %s is freed but has speed.\n", &name);
698	speed = 0;
699	}
700
701	this->speed = speed;	713	this->speed = speed;
702		714
703	if (has_active_speed ())	715	if (has_active_speed ())
704	activate ();	716	activate ();
705	else	717	else
…		…
755		767
756	if (!(m.flags_ & P_UPTODATE))	768	if (!(m.flags_ & P_UPTODATE))
757	/* nop */;	769	/* nop */;
758	else if (action == UP_OBJ_INSERT)	770	else if (action == UP_OBJ_INSERT)
759	{	771	{
		772	#if 0
760	// this is likely overkill, TODO: revisit (schmorp)	773	// this is likely overkill, TODO: revisit (schmorp)
761	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))	774	if ((op->flag [FLAG_BLOCKSVIEW] && !(m.flags_ & P_BLOCKSVIEW))
762	|| (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))	775	|| (op->flag [FLAG_NO_MAGIC] && !(m.flags_ & P_NO_MAGIC))
763	|| (op->is_player () && !(m.flags_ & P_PLAYER))	776	|| (op->is_player () && !(m.flags_ & P_PLAYER))
764	|| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))	777	|| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
765	|| (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))	778	|| (op->flag [FLAG_ALIVE] && !(m.flags_ & P_IS_ALIVE))
766	|| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))	779	|| (op->flag [FLAG_DAMNED] && !(m.flags_ & P_NO_CLERIC))
767	|| (m.move_on | op->move_on ) != m.move_on	780	|| (m.move_on | op->move_on ) != m.move_on
768	|| (m.move_off | op->move_off ) != m.move_off	781	|| (m.move_off | op->move_off ) != m.move_off
769	|| (m.move_slow | op->move_slow) != m.move_slow	782	|| (m.move_slow | op->move_slow) != m.move_slow
770	/* This isn't perfect, but I don't expect a lot of objects to	783	/* This isn't perfect, but I don't expect a lot of objects to
771	* have move_allow right now.	784	* have move_allow right now.
772	*/	785	*/
773	|| ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block	786	|| ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block
774	|| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)
775	m.invalidate ();	787	m.invalidate ();
		788	#else
		789	// the above is not strong enough a test to skip updating. los maybe? TODO (schmorp)
		790	m.invalidate ();
		791	#endif
776	}	792	}
777	/* if the object is being removed, we can't make intelligent	793	/* if the object is being removed, we can't make intelligent
778	* decisions, because remove_ob can't really pass the object	794	* decisions, because remove_ob can't really pass the object
779	* that is being removed.	795	* that is being removed.
780	*/	796	*/
…		…
789	update_object (op->more, action);	805	update_object (op->more, action);
790	}	806	}
791		807
792	object::object ()	808	object::object ()
793	{	809	{
794	SET_FLAG (this, FLAG_REMOVED);	810	this->set_flag (FLAG_REMOVED);
795		811
796	expmul = 1.0;	812	//expmul = 1.0; declared const for the time being
797	face = blank_face;	813	face = blank_face;
		814	material = MATERIAL_NULL;
798	}	815	}
799		816
800	object::~object ()	817	object::~object ()
801	{	818	{
802	unlink ();	819	unlink ();
803		820
804	free_key_values (this);	821	free_key_values (this);
805	}	822	}
806
807	static int object_count;
808		823
809	void object::link ()	824	void object::link ()
810	{	825	{
811	assert (!index);//D	826	assert (!index);//D
812	uuid = UUID::gen ();	827	uuid = UUID::gen ();
813	count = ++object_count;
814		828
815	refcnt_inc ();	829	refcnt_inc ();
816	objects.insert (this);	830	objects.insert (this);
		831
		832	++create_count;
		833
817	}	834	}
818		835
819	void object::unlink ()	836	void object::unlink ()
820	{	837	{
821	if (!index)	838	if (!index)
822	return;	839	return;
		840
		841	++destroy_count;
823		842
824	objects.erase (this);	843	objects.erase (this);
825	refcnt_dec ();	844	refcnt_dec ();
826	}	845	}
827		846
…		…
830	{	849	{
831	/* If already on active list, don't do anything */	850	/* If already on active list, don't do anything */
832	if (active)	851	if (active)
833	return;	852	return;
834		853
835	if (has_active_speed () && flag [FLAG_FREED]) LOG (llevError | logBacktrace, "BUG: tried to activate freed object %s\n", debug_desc ());//D
836	if (has_active_speed () && flag [FLAG_DEBUG]) LOG (llevError | logBacktrace, "BUG: tried to activate DEBUG object %s\n", debug_desc ());//D temp
837
838	if (has_active_speed ())	854	if (has_active_speed ())
		855	{
		856	if (flag [FLAG_FREED])
		857	LOG (llevError | logBacktrace, "BUG: tried to activate freed object %s\n", debug_desc ());//D
		858
839	actives.insert (this);	859	actives.insert (this);
		860	}
840	}	861	}
841		862
842	void	863	void
843	object::activate_recursive ()	864	object::activate_recursive ()
844	{	865	{
…		…
930	map->insert (op, x, y);	951	map->insert (op, x, y);
931	}	952	}
932	}	953	}
933	}	954	}
934		955
		956	/*
		957	* Remove and free all objects in the inventory of the given object.
		958	* Unlike destroy_inv, this assumes the *this is destroyed as well
		959	* well, so we can (and have to!) take shortcuts.
		960	*/
		961	void
		962	object::destroy_inv_fast ()
		963	{
		964	while (object *op = inv)
		965	{
		966	// remove from object the fast way
		967	op->flag [FLAG_REMOVED] = true;
		968	op->env = 0;
		969	if ((inv = inv->below))
		970	inv->above = 0;
		971
		972	// then destroy
		973	op->destroy ();
		974	}
		975	}
		976
		977	void
		978	object::freelist_free (int count)
		979	{
		980	while (count-- && freelist)
		981	{
		982	freelist_item *next = freelist->next;
		983	// count is being "destroyed"
		984
		985	sfree ((char *)freelist, sizeof (object));
		986
		987	freelist = next;
		988	--free_count;
		989	}
		990	}
		991
		992	object *
935	object *object::create ()	993	object::create ()
936	{	994	{
937	object *op = new object;	995	object *op;
		996
		997	if (freelist)
		998	{
		999	freelist_item li = *freelist;
		1000	memset (freelist, 0, sizeof (object));
		1001
		1002	op = new (freelist) object;
		1003	op->count = li.count;
		1004
		1005	freelist = li.next;
		1006	--free_count;
		1007	}
		1008	else
		1009	{
		1010	void *ni = salloc0<char> (sizeof (object));
		1011
		1012	op = new(ni) object;
		1013
		1014	op->count = ++object_count;
		1015	}
		1016
938	op->link ();	1017	op->link ();
		1018
939	return op;	1019	return op;
940	}	1020	}
941		1021
		1022	void
		1023	object::do_delete ()
		1024	{
		1025	uint32_t count = this->count;
		1026
		1027	this->~object ();
		1028
		1029	freelist_item *li = (freelist_item *)this;
		1030	li->next = freelist;
		1031	li->count = count;
		1032
		1033	freelist = li;
		1034	++free_count;
		1035	}
		1036
942	static struct freed_map : maptile	1037	static struct freed_map : maptile
943	{	1038	{
944	freed_map ()	1039	freed_map ()
		1040	: maptile (3, 3)
945	{	1041	{
946	path = "<freed objects map>";	1042	path = "<freed objects map>";
947	name = "/internal/freed_objects_map";	1043	name = "/internal/freed_objects_map";
948	width = 3;
949	height = 3;
950	no_drop = 1;	1044	no_drop = 1;
951	no_reset = 1;	1045	no_reset = 1;
952		1046
953	alloc ();
954	in_memory = MAP_ACTIVE;	1047	in_memory = MAP_ACTIVE;
955	}	1048	}
956		1049
957	~freed_map ()	1050	~freed_map ()
958	{	1051	{
…		…
962		1055
963	void	1056	void
964	object::do_destroy ()	1057	object::do_destroy ()
965	{	1058	{
966	if (flag [FLAG_IS_LINKED])	1059	if (flag [FLAG_IS_LINKED])
967	remove_button_link (this);	1060	remove_link ();
968		1061
969	if (flag [FLAG_FRIENDLY])	1062	if (flag [FLAG_FRIENDLY])
970	remove_friendly_object (this);	1063	remove_friendly_object (this);
971		1064
972	remove ();	1065	remove ();
…		…
1009	LOG (llevError | logBacktrace, "tried to destroy the tail of an object");	1102	LOG (llevError | logBacktrace, "tried to destroy the tail of an object");
1010	head->destroy ();	1103	head->destroy ();
1011	return;	1104	return;
1012	}	1105	}
1013		1106
1014	destroy_inv (false);	1107	destroy_inv_fast ();
1015		1108
1016	if (is_head ())	1109	if (is_head ())
1017	if (sound_destroy)	1110	if (sound_destroy)
1018	play_sound (sound_destroy);	1111	play_sound (sound_destroy);
1019	else if (flag [FLAG_MONSTER])	1112	else if (flag [FLAG_MONSTER])
…		…
1030	* the previous environment.	1123	* the previous environment.
1031	*/	1124	*/
1032	void	1125	void
1033	object::do_remove ()	1126	object::do_remove ()
1034	{	1127	{
1035	object *tmp, *last = 0;
1036	object *otmp;
1037
1038	if (flag [FLAG_REMOVED])	1128	if (flag [FLAG_REMOVED])
1039	return;	1129	return;
1040		1130
1041	INVOKE_OBJECT (REMOVE, this);	1131	INVOKE_OBJECT (REMOVE, this);
1042		1132
…		…
1074		1164
1075	above = 0;	1165	above = 0;
1076	below = 0;	1166	below = 0;
1077	env = 0;	1167	env = 0;
1078		1168
1079	/* NO_FIX_PLAYER is set when a great many changes are being	1169	if (pl && pl->is_player ())
1080	* made to players inventory. If set, avoiding the call
1081	* to save cpu time.
1082	*/	1170	{
1083	if (pl)	1171	if (expect_false (pl->contr->combat_ob == this))
1084	if (pl->is_player () && (glow_radius || !QUERY_FLAG (pl, FLAG_NO_FIX_PLAYER)))
1085	{	1172	{
1086	pl->update_stats ();	1173	pl->apply (pl->contr->combat_ob, AP_UNAPPLY);
		1174	pl->contr->combat_ob = 0;
		1175	if (pl->contr->ranged_ob) pl->apply (pl->contr->ranged_ob);
		1176	}
1087		1177
		1178	if (expect_false (pl->contr->ranged_ob == this))
		1179	{
		1180	pl->apply (pl->contr->ranged_ob, AP_UNAPPLY);
		1181	pl->contr->ranged_ob = 0;
		1182	if (pl->contr->combat_ob) pl->apply (pl->contr->combat_ob);
		1183	}
		1184
		1185	pl->contr->queue_stats_update ();
		1186
1088	if (glow_radius && pl->is_on_map ())	1187	if (expect_false (glow_radius) && pl->is_on_map ())
1089	update_all_los (pl->map, pl->x, pl->y);	1188	update_all_los (pl->map, pl->x, pl->y);
1090	}	1189	}
1091	}	1190	}
1092	else if (map)	1191	else if (map)
1093	{	1192	{
1094	map->dirty = true;	1193	map->dirty = true;
1095	mapspace &ms = this->ms ();	1194	mapspace &ms = this->ms ();
1096		1195
1097	if (object *pl = ms.player ())	1196	if (object *pl = ms.player ())
1098	{	1197	{
1099	if (is_player ())	1198	if (is_player ())
1100	{	1199	{
		1200	if (!flag [FLAG_WIZPASS])
1101	ms.smell = pticks; // remember the smell of the player	1201	ms.smell = ++mapspace::smellcount; // remember the smell of the player
1102		1202
1103	// leaving a spot always closes any open container on the ground	1203	// leaving a spot always closes any open container on the ground
1104	if (container && !container->env)	1204	if (container && !container->env)
1105	// this causes spurious floorbox updates, but it ensures	1205	// this causes spurious floorbox updates, but it ensures
1106	// that the CLOSE event is being sent.	1206	// that the CLOSE event is being sent.
1107	close_container ();	1207	close_container ();
1108		1208
1109	--map->players;	1209	--map->players;
1110	map->touch ();	1210	map->touch ();
1111	}	1211	}
1112	else if (pl->container == this)	1212	else if (pl->container_ () == this)
1113	{	1213	{
1114	// removing a container should close it	1214	// removing a container should close it
1115	close_container ();	1215	close_container ();
1116	}	1216	}
1117		1217	else
1118	esrv_del_item (pl->contr, count);	1218	esrv_del_item (pl->contr, count);
1119	}	1219	}
1120		1220
1121	/* link the object above us */	1221	/* link the object above us */
1122	// re-link, make sure compiler can easily use cmove	1222	// re-link, make sure compiler can easily use cmove
1123	*(above ? &above->below : &ms.top) = below;	1223	*(above ? &above->below : &ms.top) = below;
…		…
1133		1233
1134	int check_walk_off = !flag [FLAG_NO_APPLY];	1234	int check_walk_off = !flag [FLAG_NO_APPLY];
1135		1235
1136	if (object *pl = ms.player ())	1236	if (object *pl = ms.player ())
1137	{	1237	{
1138	if (pl->container == this)	1238	if (pl->container_ () == this)
1139	/* If a container that the player is currently using somehow gets	1239	/* If a container that the player is currently using somehow gets
1140	* removed (most likely destroyed), update the player view	1240	* removed (most likely destroyed), update the player view
1141	* appropriately.	1241	* appropriately.
1142	*/	1242	*/
1143	pl->close_container ();	1243	pl->close_container ();
…		…
1147	//TODO: update floorbox to preserve ordering	1247	//TODO: update floorbox to preserve ordering
1148	if (pl->contr->ns)	1248	if (pl->contr->ns)
1149	pl->contr->ns->floorbox_update ();	1249	pl->contr->ns->floorbox_update ();
1150	}	1250	}
1151		1251
		1252	if (check_walk_off)
1152	for (tmp = ms.bot; tmp; tmp = tmp->above)	1253	for (object *above, *tmp = ms.bot; tmp; tmp = above)
1153	{	1254	{
		1255	above = tmp->above;
		1256
1154	/* No point updating the players look faces if he is the object	1257	/* No point updating the players look faces if he is the object
1155	* being removed.	1258	* being removed.
1156	*/	1259	*/
1157		1260
1158	/* See if object moving off should effect something */	1261	/* See if object moving off should effect something */
1159	if (check_walk_off
1160	&& ((move_type & tmp->move_off)	1262	if ((move_type & tmp->move_off)
1161	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))	1263	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0)
1162	{
1163	move_apply (tmp, this, 0);	1264	move_apply (tmp, this, 0);
1164
1165	if (destroyed ())
1166	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1167	}	1265	}
1168
1169	last = tmp;
1170	}
1171		1266
1172	if (affects_los ())	1267	if (affects_los ())
1173	update_all_los (map, x, y);	1268	update_all_los (map, x, y);
1174	}	1269	}
1175	}	1270	}
…		…
1219		1314
1220	object *prev = this;	1315	object *prev = this;
1221		1316
1222	for (archetype *at = (archetype *)arch->more; at; at = (archetype *)at->more)	1317	for (archetype *at = (archetype *)arch->more; at; at = (archetype *)at->more)
1223	{	1318	{
1224	object *op = arch_to_object (at);	1319	object *op = at->instance ();
1225		1320
1226	op->name = name;	1321	op->name = name;
1227	op->name_pl = name_pl;	1322	op->name_pl = name_pl;
1228	op->title = title;	1323	op->title = title;
1229		1324
…		…
1267	* Passing 0 for flag gives proper default values, so flag really only needs	1362	* Passing 0 for flag gives proper default values, so flag really only needs
1268	* to be set if special handling is needed.	1363	* to be set if special handling is needed.
1269	*	1364	*
1270	* Return value:	1365	* Return value:
1271	* new object if 'op' was merged with other object	1366	* new object if 'op' was merged with other object
1272	* NULL if 'op' was destroyed	1367	* NULL if there was an error (destroyed, blocked etc.)
1273	* just 'op' otherwise	1368	* just 'op' otherwise
1274	*/	1369	*/
1275	object *	1370	object *
1276	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)	1371	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1277	{	1372	{
…		…
1284		1379
1285	/* Ideally, the caller figures this out. However, it complicates a lot	1380	/* Ideally, the caller figures this out. However, it complicates a lot
1286	* of areas of callers (eg, anything that uses find_free_spot would now	1381	* of areas of callers (eg, anything that uses find_free_spot would now
1287	* need extra work	1382	* need extra work
1288	*/	1383	*/
		1384	maptile *newmap = m;
1289	if (!xy_normalise (m, op->x, op->y))	1385	if (!xy_normalise (newmap, op->x, op->y))
1290	{	1386	{
1291	op->head_ ()->destroy ();// remove head_ once all tail object destroyers found	1387	op->head_ ()->destroy ();// remove head_ once all tail object destroyers found
1292	return 0;	1388	return 0;
1293	}	1389	}
1294		1390
1295	if (object *more = op->more)	1391	if (object *more = op->more)
1296	if (!insert_ob_in_map (more, m, originator, flag))	1392	if (!insert_ob_in_map (more, m, originator, flag))
1297	return 0;	1393	return 0;
1298		1394
1299	CLEAR_FLAG (op, FLAG_REMOVED);	1395	op->flag [FLAG_REMOVED] = false;
1300		1396	op->env = 0;
1301	op->map = m;	1397	op->map = newmap;
		1398
1302	mapspace &ms = op->ms ();	1399	mapspace &ms = op->ms ();
1303		1400
1304	/* this has to be done after we translate the coordinates.	1401	/* this has to be done after we translate the coordinates.
1305	*/	1402	*/
1306	if (op->nrof && !(flag & INS_NO_MERGE))	1403	if (op->nrof && !(flag & INS_NO_MERGE))
…		…
1312	// from here :/	1409	// from here :/
1313	op->nrof += tmp->nrof;	1410	op->nrof += tmp->nrof;
1314	tmp->destroy ();	1411	tmp->destroy ();
1315	}	1412	}
1316		1413
1317	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1414	op->clr_flag (FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1318	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1415	op->clr_flag (FLAG_INV_LOCKED);
1319		1416
1320	if (!QUERY_FLAG (op, FLAG_ALIVE))	1417	if (!op->flag [FLAG_ALIVE])
1321	CLEAR_FLAG (op, FLAG_NO_STEAL);	1418	op->clr_flag (FLAG_NO_STEAL);
1322		1419
1323	if (flag & INS_BELOW_ORIGINATOR)	1420	if (flag & INS_BELOW_ORIGINATOR)
1324	{	1421	{
1325	if (originator->map != op->map || originator->x != op->x || originator->y != op->y)	1422	if (originator->map != op->map || originator->x != op->x || originator->y != op->y)
1326	{	1423	{
1327	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");	1424	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");
1328	abort ();	1425	abort ();
1329	}	1426	}
1330		1427
1331	if (!originator->is_on_map ())	1428	if (!originator->is_on_map ())
		1429	{
1332	LOG (llevDebug | logBacktrace, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map",	1430	LOG (llevError, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map",
1333	op->debug_desc (), originator->debug_desc ());	1431	op->debug_desc (), originator->debug_desc ());
		1432	abort ();
		1433	}
1334		1434
1335	op->above = originator;	1435	op->above = originator;
1336	op->below = originator->below;	1436	op->below = originator->below;
1337	originator->below = op;	1437	originator->below = op;
1338		1438
…		…
1358	* when lots of spells are cast in one area. Currently, it is presumed	1458	* when lots of spells are cast in one area. Currently, it is presumed
1359	* that flying non pickable objects are spell objects.	1459	* that flying non pickable objects are spell objects.
1360	*/	1460	*/
1361	for (object *tmp = ms.bot; tmp; tmp = tmp->above)	1461	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1362	{	1462	{
1363	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) || QUERY_FLAG (tmp, FLAG_OVERLAY_FLOOR))	1463	if (tmp->flag [FLAG_IS_FLOOR] || tmp->flag [FLAG_OVERLAY_FLOOR])
1364	floor = tmp;	1464	floor = tmp;
1365		1465
1366	if (QUERY_FLAG (tmp, FLAG_NO_PICK) && (tmp->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (tmp, FLAG_IS_FLOOR))	1466	if (tmp->flag [FLAG_NO_PICK] && (tmp->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !tmp->flag [FLAG_IS_FLOOR])
1367	{	1467	{
1368	/* We insert above top, so we want this object below this */	1468	/* We insert above top, so we want this object below this */
1369	top = tmp->below;	1469	top = tmp->below;
1370	break;	1470	break;
1371	}	1471	}
…		…
1389	&& (op->face && !faces [op->face].visibility))	1489	&& (op->face && !faces [op->face].visibility))
1390	{	1490	{
1391	object *last;	1491	object *last;
1392		1492
1393	for (last = top; last != floor; last = last->below)	1493	for (last = top; last != floor; last = last->below)
1394	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1494	if (last->flag [FLAG_BLOCKSVIEW] && (last->type != EXIT))
1395	break;	1495	break;
1396		1496
1397	/* Check to see if we found the object that blocks view,	1497	/* Check to see if we found the object that blocks view,
1398	* and make sure we have a below pointer for it so that	1498	* and make sure we have a below pointer for it so that
1399	* we can get inserted below this one, which requires we	1499	* we can get inserted below this one, which requires we
…		…
1470	* blocked() and wall() work properly), and these flags are updated by	1570	* blocked() and wall() work properly), and these flags are updated by
1471	* update_object().	1571	* update_object().
1472	*/	1572	*/
1473		1573
1474	/* if this is not the head or flag has been passed, don't check walk on status */	1574	/* if this is not the head or flag has been passed, don't check walk on status */
1475	if (!(flag & INS_NO_WALK_ON) && op->head_ () == op)	1575	if (!(flag & INS_NO_WALK_ON) && op->is_head ())
1476	{	1576	{
1477	if (check_move_on (op, originator))	1577	if (check_move_on (op, originator))
1478	return 0;	1578	return 0;
1479		1579
1480	/* If we are a multi part object, lets work our way through the check	1580	/* If we are a multi part object, lets work our way through the check
…		…
1491	/* this function inserts an object in the map, but if it	1591	/* this function inserts an object in the map, but if it
1492	* finds an object of its own type, it'll remove that one first.	1592	* finds an object of its own type, it'll remove that one first.
1493	* op is the object to insert it under: supplies x and the map.	1593	* op is the object to insert it under: supplies x and the map.
1494	*/	1594	*/
1495	void	1595	void
1496	replace_insert_ob_in_map (const char *arch_string, object *op)	1596	replace_insert_ob_in_map (shstr_tmp archname, object *op)
1497	{	1597	{
1498	/* first search for itself and remove any old instances */	1598	/* first search for itself and remove any old instances */
1499		1599
1500	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)	1600	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1501	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */	1601	if (tmp->arch->archname == archname) /* same archetype */
1502	tmp->destroy ();	1602	tmp->destroy ();
1503		1603
1504	object *tmp = arch_to_object (archetype::find (arch_string));	1604	object *tmp = archetype::find (archname)->instance ();
1505		1605
1506	tmp->x = op->x;	1606	tmp->x = op->x;
1507	tmp->y = op->y;	1607	tmp->y = op->y;
1508		1608
1509	insert_ob_in_map (tmp, op->map, op, 0);	1609	insert_ob_in_map (tmp, op->map, op, 0);
…		…
1514	{	1614	{
1515	if (where->env)	1615	if (where->env)
1516	return where->env->insert (this);	1616	return where->env->insert (this);
1517	else	1617	else
1518	return where->map->insert (this, where->x, where->y, originator, flags);	1618	return where->map->insert (this, where->x, where->y, originator, flags);
		1619	}
		1620
		1621	// check whether we can put this into the map, respect max_volume, max_items
		1622	bool
		1623	object::can_drop_at (maptile *m, int x, int y, object *originator)
		1624	{
		1625	mapspace &ms = m->at (x, y);
		1626
		1627	int items = ms.items ();
		1628
		1629	if (!items // testing !items ensures we can drop at least one item
		1630	|| (items < m->max_items
		1631	&& ms.volume () < m->max_volume))
		1632	return true;
		1633
		1634	if (originator && originator->is_player ())
		1635	originator->contr->failmsgf (
		1636	"No matter how hard you try, you just cannot put the %s here H<Try to remove some items from the floor first.>",
		1637	query_name ()
		1638	);
		1639
		1640	return false;
1519	}	1641	}
1520		1642
1521	/*	1643	/*
1522	* decrease(object, number) decreases a specified number from	1644	* decrease(object, number) decreases a specified number from
1523	* the amount of an object. If the amount reaches 0, the object	1645	* the amount of an object. If the amount reaches 0, the object
…		…
1663	if (op->glow_radius && is_on_map ())	1785	if (op->glow_radius && is_on_map ())
1664	{	1786	{
1665	update_stats ();	1787	update_stats ();
1666	update_all_los (map, x, y);	1788	update_all_los (map, x, y);
1667	}	1789	}
1668	else if (is_player () && !flag [FLAG_NO_FIX_PLAYER])	1790	else if (is_player ())
1669	// if this is a player's inventory, update stats	1791	// if this is a player's inventory, update stats
1670	update_stats ();	1792	contr->queue_stats_update ();
1671		1793
1672	INVOKE_OBJECT (INSERT, this);	1794	INVOKE_OBJECT (INSERT, this);
1673		1795
1674	return op;	1796	return op;
1675	}	1797	}
…		…
1695	* on top.	1817	* on top.
1696	*/	1818	*/
1697	int	1819	int
1698	check_move_on (object *op, object *originator)	1820	check_move_on (object *op, object *originator)
1699	{	1821	{
		1822	if (op->flag [FLAG_NO_APPLY])
		1823	return 0;
		1824
1700	object *tmp;	1825	object *tmp;
1701	maptile *m = op->map;	1826	maptile *m = op->map;
1702	int x = op->x, y = op->y;	1827	int x = op->x, y = op->y;
1703		1828
1704	MoveType move_on, move_slow, move_block;	1829	mapspace &ms = m->at (x, y);
1705		1830
1706	if (QUERY_FLAG (op, FLAG_NO_APPLY))	1831	ms.update ();
1707	return 0;
1708		1832
1709	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);	1833	MoveType move_on = ms.move_on;
1710	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);	1834	MoveType move_slow = ms.move_slow;
1711	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);	1835	MoveType move_block = ms.move_block;
1712		1836
1713	/* if nothing on this space will slow op down or be applied,	1837	/* if nothing on this space will slow op down or be applied,
1714	* no need to do checking below. have to make sure move_type	1838	* no need to do checking below. have to make sure move_type
1715	* is set, as lots of objects don't have it set - we treat that	1839	* is set, as lots of objects don't have it set - we treat that
1716	* as walking.	1840	* as walking.
…		…
1727	return 0;	1851	return 0;
1728		1852
1729	/* The objects have to be checked from top to bottom.	1853	/* The objects have to be checked from top to bottom.
1730	* Hence, we first go to the top:	1854	* Hence, we first go to the top:
1731	*/	1855	*/
1732		1856	for (object *next, *tmp = ms.top; tmp; tmp = next)
1733	for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above)
1734	{
1735	/* Trim the search when we find the first other spell effect
1736	* this helps performance so that if a space has 50 spell objects,
1737	* we don't need to check all of them.
1738	*/
1739	if ((tmp->move_type & MOVE_FLY_LOW) && QUERY_FLAG (tmp, FLAG_NO_PICK))
1740	break;
1741	}	1857	{
		1858	next = tmp->below;
1742		1859
1743	for (; tmp; tmp = tmp->below)
1744	{
1745	if (tmp == op)	1860	if (tmp == op)
1746	continue; /* Can't apply yourself */	1861	continue; /* Can't apply yourself */
1747		1862
1748	/* Check to see if one of the movement types should be slowed down.	1863	/* Check to see if one of the movement types should be slowed down.
1749	* Second check makes sure that the movement types not being slowed	1864	* Second check makes sure that the movement types not being slowed
1750	* (~slow_move) is not blocked on this space - just because the	1865	* (~slow_move) is not blocked on this space - just because the
1751	* space doesn't slow down swimming (for example), if you can't actually	1866	* space doesn't slow down swimming (for example), if you can't actually
1752	* swim on that space, can't use it to avoid the penalty.	1867	* swim on that space, can't use it to avoid the penalty.
1753	*/	1868	*/
1754	if (!QUERY_FLAG (op, FLAG_WIZPASS))	1869	if (!op->flag [FLAG_WIZPASS])
1755	{	1870	{
1756	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||	1871	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
1757	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))	1872	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1758	{	1873	{
1759
1760	float
1761	diff = tmp->move_slow_penalty * fabs (op->speed);	1874	float diff = tmp->move_slow_penalty * fabs (op->speed);
1762		1875
1763	if (op->is_player ())	1876	if (op->is_player ())
1764	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||	1877	if ((tmp->flag [FLAG_IS_HILLY ] && find_skill_by_number (op, SK_CLIMBING)) ||
1765	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))	1878	(tmp->flag [FLAG_IS_WOODED] && find_skill_by_number (op, SK_WOODSMAN)))
1766	diff /= 4.0;	1879	diff /= 4.0;
1767		1880
1768	op->speed_left -= diff;	1881	op->speed_left -= diff;
1769	}	1882	}
1770	}	1883	}
…		…
1892	void	2005	void
1893	flag_inv (object *op, int flag)	2006	flag_inv (object *op, int flag)
1894	{	2007	{
1895	for (object *tmp = op->inv; tmp; tmp = tmp->below)	2008	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1896	{	2009	{
1897	SET_FLAG (tmp, flag);	2010	tmp->set_flag (flag);
1898	flag_inv (tmp, flag);	2011	flag_inv (tmp, flag);
1899	}	2012	}
1900	}	2013	}
1901		2014
1902	/*	2015	/*
…		…
1905	void	2018	void
1906	unflag_inv (object *op, int flag)	2019	unflag_inv (object *op, int flag)
1907	{	2020	{
1908	for (object *tmp = op->inv; tmp; tmp = tmp->below)	2021	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1909	{	2022	{
1910	CLEAR_FLAG (tmp, flag);	2023	tmp->clr_flag (flag);
1911	unflag_inv (tmp, flag);	2024	unflag_inv (tmp, flag);
1912	}	2025	}
1913	}	2026	}
1914		2027
1915	/*	2028	/*
…		…
2054	* there is capable of.	2167	* there is capable of.
2055	*/	2168	*/
2056	int	2169	int
2057	find_dir (maptile *m, int x, int y, object *exclude)	2170	find_dir (maptile *m, int x, int y, object *exclude)
2058	{	2171	{
2059	int i, max = SIZEOFFREE, mflags;	2172	int max = SIZEOFFREE, mflags;
2060
2061	sint16 nx, ny;
2062	object *tmp;
2063	maptile *mp;
2064
2065	MoveType blocked, move_type;	2173	MoveType move_type;
2066		2174
2067	if (exclude && exclude->head_ () != exclude)	2175	if (exclude && exclude->head_ () != exclude)
2068	{	2176	{
2069	exclude = exclude->head;	2177	exclude = exclude->head;
2070	move_type = exclude->move_type;	2178	move_type = exclude->move_type;
…		…
2073	{	2181	{
2074	/* If we don't have anything, presume it can use all movement types. */	2182	/* If we don't have anything, presume it can use all movement types. */
2075	move_type = MOVE_ALL;	2183	move_type = MOVE_ALL;
2076	}	2184	}
2077		2185
2078	for (i = 1; i < max; i++)	2186	for (int i = 1; i < max; i++)
2079	{	2187	{
2080	mp = m;	2188	mapxy pos (m, x, y);
2081	nx = x + freearr_x[i];	2189	pos.move (i);
2082	ny = y + freearr_y[i];
2083		2190
2084	mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);	2191	if (!pos.normalise ())
2085
2086	if (mflags & P_OUT_OF_MAP)
2087	max = maxfree[i];	2192	max = maxfree[i];
2088	else	2193	else
2089	{	2194	{
2090	mapspace &ms = mp->at (nx, ny);	2195	mapspace &ms = *pos;
2091		2196
2092	blocked = ms.move_block;
2093
2094	if ((move_type & blocked) == move_type)	2197	if ((move_type & ms.move_block) == move_type)
2095	max = maxfree[i];	2198	max = maxfree [i];
2096	else if (mflags & P_IS_ALIVE)	2199	else if (ms.flags () & P_IS_ALIVE)
2097	{	2200	{
2098	for (tmp = ms.bot; tmp; tmp = tmp->above)	2201	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
2099	if ((tmp->flag [FLAG_MONSTER] || tmp->is_player ())	2202	if ((tmp->flag [FLAG_MONSTER] || tmp->is_player ())
2100	&& (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))	2203	&& (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2101	break;
2102
2103	if (tmp)
2104	return freedir[i];	2204	return freedir [i];
2105	}	2205	}
2106	}	2206	}
2107	}	2207	}
2108		2208
2109	return 0;	2209	return 0;
…		…
2118	{	2218	{
2119	return (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);	2219	return (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);
2120	}	2220	}
2121		2221
2122	/*	2222	/*
2123	* find_dir_2(delta-x,delta-y) will return a direction in which	2223	* find_dir_2(delta-x,delta-y) will return a direction value
2124	* an object which has subtracted the x and y coordinates of another	2224	* for running into direct [dx, dy].
2125	* object, needs to travel toward it.	2225	* (the opposite of crossfire's find_dir_2!)
2126	*/	2226	*/
2127	int	2227	int
2128	find_dir_2 (int x, int y)	2228	find_dir_2 (int x, int y)
2129	{	2229	{
		2230	#if 1 // new algorithm
		2231	// this works by putting x, y into 16 sectors, which
		2232	// are not equal sized, but are a better approximation
		2233	// then the old algorithm, and then using a mapping
		2234	// table to map it into a direction value.
		2235
		2236	static const uint8 dir[16] = {
		2237	4, 5, 4, 3,
		2238	2, 1, 2, 3,
		2239	6, 5, 6, 7,
		2240	8, 1, 8, 7,
		2241	};
		2242	int sector = 0;
		2243
		2244	// this is a bit ugly, but more likely to result in branchless code
		2245	sector |= x < 0 ? 8 : 0;
		2246	x = x < 0 ? -x : x; // abs
		2247
		2248	sector |= y < 0 ? 4 : 0;
		2249	y = y < 0 ? -y : y; // abs
		2250
		2251	if (x > y)
		2252	{
		2253	sector |= 2;
		2254
		2255	if (x > y * 2)
		2256	sector |= 1;
		2257	}
		2258	else
		2259	{
		2260	if (y > x * 2)
		2261	sector |= 1;
		2262	else if (!y)
		2263	return 0; // x == 0 here
		2264	}
		2265
		2266	return dir [sector];
		2267	#else // old algorithm
2130	int q;	2268	int q;
2131		2269
2132	if (y)	2270	if (y)
2133	q = x * 100 / y;	2271	q = 128 * x / y;
2134	else if (x)	2272	else if (x)
2135	q = -300 * x;	2273	q = -512 * x; // to make it > 309
2136	else	2274	else
2137	return 0;	2275	return 0;
2138		2276
2139	if (y > 0)	2277	if (y > 0)
2140	{	2278	{
2141	if (q < -242)	2279	if (q < -309) return 7;
		2280	if (q < -52) return 6;
		2281	if (q < 52) return 5;
		2282	if (q < 309) return 4;
		2283
2142	return 3;	2284	return 3;
2143	if (q < -41)	2285	}
2144	return 2;	2286	else
2145	if (q < 41)	2287	{
2146	return 1;	2288	if (q < -309) return 3;
2147	if (q < 242)	2289	if (q < -52) return 2;
2148	return 8;	2290	if (q < 52) return 1;
		2291	if (q < 309) return 8;
		2292
2149	return 7;	2293	return 7;
2150	}	2294	}
2151		2295	#endif
2152	if (q < -242)
2153	return 7;
2154	if (q < -41)
2155	return 6;
2156	if (q < 41)
2157	return 5;
2158	if (q < 242)
2159	return 4;
2160
2161	return 3;
2162	}	2296	}
2163		2297
2164	/*	2298	/*
2165	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is	2299	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is
2166	* between two directions (which are expected to be absolute (see absdir())	2300	* between two directions (which are expected to be absolute (see absdir())
2167	*/	2301	*/
2168	int	2302	int
2169	dirdiff (int dir1, int dir2)	2303	dirdiff (int dir1, int dir2)
2170	{	2304	{
2171	int d;
2172
2173	d = abs (dir1 - dir2);	2305	int d = abs (dir1 - dir2);
2174	if (d > 4)
2175	d = 8 - d;
2176		2306
2177	return d;	2307	return d > 4 ? 8 - d : d;
2178	}	2308	}
2179		2309
2180	/* peterm:	2310	/* peterm:
2181	* do LOS stuff for ball lightning. Go after the closest VISIBLE monster.	2311	* do LOS stuff for ball lightning. Go after the closest VISIBLE monster.
2182	* Basically, this is a table of directions, and what directions	2312	* Basically, this is a table of directions, and what directions
…		…
2184	* This basically means that if direction is 15, then it could either go	2314	* This basically means that if direction is 15, then it could either go
2185	* direction 4, 14, or 16 to get back to where we are.	2315	* direction 4, 14, or 16 to get back to where we are.
2186	* Moved from spell_util.c to object.c with the other related direction	2316	* Moved from spell_util.c to object.c with the other related direction
2187	* functions.	2317	* functions.
2188	*/	2318	*/
2189	int reduction_dir[SIZEOFFREE][3] = {	2319	static const int reduction_dir[SIZEOFFREE][3] = {
2190	{0, 0, 0}, /* 0 */	2320	{0, 0, 0}, /* 0 */
2191	{0, 0, 0}, /* 1 */	2321	{0, 0, 0}, /* 1 */
2192	{0, 0, 0}, /* 2 */	2322	{0, 0, 0}, /* 2 */
2193	{0, 0, 0}, /* 3 */	2323	{0, 0, 0}, /* 3 */
2194	{0, 0, 0}, /* 4 */	2324	{0, 0, 0}, /* 4 */
…		…
2288	* Add a check so we can't pick up invisible objects (0.93.8)	2418	* Add a check so we can't pick up invisible objects (0.93.8)
2289	*/	2419	*/
2290	int	2420	int
2291	can_pick (const object *who, const object *item)	2421	can_pick (const object *who, const object *item)
2292	{	2422	{
2293	return /*QUERY_FLAG(who,FLAG_WIZ)|| */	2423	return /*who->flag [FLAG_WIZ]|| */
2294	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&	2424	(item->weight > 0 && !item->flag [FLAG_NO_PICK] &&
2295	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->is_player () || item->weight < who->weight / 3));	2425	!item->flag [FLAG_ALIVE] && !item->invisible && (who->is_player () || item->weight < who->weight / 3));
2296	}	2426	}
2297		2427
2298	/*	2428	/*
2299	* create clone from object to another	2429	* create clone from object to another
2300	*/	2430	*/
…		…
2332	return tmp;	2462	return tmp;
2333		2463
2334	return 0;	2464	return 0;
2335	}	2465	}
2336		2466
2337	const shstr &	2467	shstr_tmp
2338	object::kv_get (const shstr &key) const	2468	object::kv_get (shstr_tmp key) const
2339	{	2469	{
2340	for (key_value *kv = key_values; kv; kv = kv->next)	2470	for (key_value *kv = key_values; kv; kv = kv->next)
2341	if (kv->key == key)	2471	if (kv->key == key)
2342	return kv->value;	2472	return kv->value;
2343		2473
2344	return shstr_null;	2474	return shstr ();
2345	}	2475	}
2346		2476
2347	void	2477	void
2348	object::kv_set (const shstr &key, const shstr &value)	2478	object::kv_set (shstr_tmp key, shstr_tmp value)
2349	{	2479	{
2350	for (key_value *kv = key_values; kv; kv = kv->next)	2480	for (key_value *kv = key_values; kv; kv = kv->next)
2351	if (kv->key == key)	2481	if (kv->key == key)
2352	{	2482	{
2353	kv->value = value;	2483	kv->value = value;
…		…
2362		2492
2363	key_values = kv;	2493	key_values = kv;
2364	}	2494	}
2365		2495
2366	void	2496	void
2367	object::kv_del (const shstr &key)	2497	object::kv_del (shstr_tmp key)
2368	{	2498	{
2369	for (key_value **kvp = &key_values; *kvp; kvp = &(*kvp)->next)	2499	for (key_value **kvp = &key_values; *kvp; kvp = &(*kvp)->next)
2370	if ((*kvp)->key == key)	2500	if ((*kvp)->key == key)
2371	{	2501	{
2372	key_value *kv = *kvp;	2502	key_value *kv = *kvp;
…		…
2465	{	2595	{
2466	return map ? map->region (x, y)	2596	return map ? map->region (x, y)
2467	: region::default_region ();	2597	: region::default_region ();
2468	}	2598	}
2469		2599
2470	const materialtype_t *
2471	object::dominant_material () const
2472	{
2473	if (materialtype_t *mt = name_to_material (materialname))
2474	return mt;
2475
2476	return name_to_material (shstr_unknown);
2477	}
2478
2479	void	2600	void
2480	object::open_container (object *new_container)	2601	object::open_container (object *new_container)
2481	{	2602	{
2482	if (container == new_container)	2603	if (container == new_container)
2483	return;	2604	return;
…		…
2503	container = 0;	2624	container = 0;
2504		2625
2505	// client needs item update to make it work, client bug requires this to be separate	2626	// client needs item update to make it work, client bug requires this to be separate
2506	esrv_update_item (UPD_FLAGS, this, old_container);	2627	esrv_update_item (UPD_FLAGS, this, old_container);
2507		2628
2508	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));	2629	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", old_container->query_name ());
2509	play_sound (sound_find ("chest_close"));	2630	play_sound (sound_find ("chest_close"));
2510	}	2631	}
2511		2632
2512	if (new_container)	2633	if (new_container)
2513	{	2634	{
…		…
2517	// TODO: this does not seem to serve any purpose anymore?	2638	// TODO: this does not seem to serve any purpose anymore?
2518	#if 0	2639	#if 0
2519	// insert the "Close Container" object.	2640	// insert the "Close Container" object.
2520	if (archetype *closer = new_container->other_arch)	2641	if (archetype *closer = new_container->other_arch)
2521	{	2642	{
2522	object *closer = arch_to_object (new_container->other_arch);	2643	object *closer = new_container->other_arch->instance ();
2523	closer->flag [FLAG_NO_MAP_SAVE] = 1;	2644	closer->flag [FLAG_NO_MAP_SAVE] = 1;
2524	new_container->insert (closer);	2645	new_container->insert (closer);
2525	}	2646	}
2526	#endif	2647	#endif
2527		2648
2528	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));	2649	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", new_container->query_name ());
2529		2650
2530	// make sure the container is available, client bug requires this to be separate	2651	// make sure the container is available, client bug requires this to be separate
2531	esrv_send_item (this, new_container);	2652	esrv_send_item (this, new_container);
2532		2653
2533	new_container->flag [FLAG_APPLIED] = true;	2654	new_container->flag [FLAG_APPLIED] = true;
…		…
2541	// else if (!old_container->env && contr && contr->ns)	2662	// else if (!old_container->env && contr && contr->ns)
2542	// contr->ns->floorbox_reset ();	2663	// contr->ns->floorbox_reset ();
2543	}	2664	}
2544		2665
2545	object *	2666	object *
2546	object::force_find (const shstr name)	2667	object::force_find (shstr_tmp name)
2547	{	2668	{
2548	/* cycle through his inventory to look for the MARK we want to	2669	/* cycle through his inventory to look for the MARK we want to
2549	* place	2670	* place
2550	*/	2671	*/
2551	for (object *tmp = inv; tmp; tmp = tmp->below)	2672	for (object *tmp = inv; tmp; tmp = tmp->below)
…		…
2553	return splay (tmp);	2674	return splay (tmp);
2554		2675
2555	return 0;	2676	return 0;
2556	}	2677	}
2557		2678
		2679	//-GPL
		2680
		2681	void
		2682	object::force_set_timer (int duration)
		2683	{
		2684	this->duration = 1;
		2685	this->speed_left = -1.f;
		2686
		2687	this->set_speed (duration ? 1.f / duration : 0.f);
		2688	}
		2689
2558	object *	2690	object *
2559	object::force_add (const shstr name, int duration)	2691	object::force_add (shstr_tmp name, int duration)
2560	{	2692	{
2561	if (object *force = force_find (name))	2693	if (object *force = force_find (name))
2562	force->destroy ();	2694	force->destroy ();
2563		2695
2564	object *force = get_archetype (FORCE_NAME);	2696	object *force = get_archetype (FORCE_NAME);
2565		2697
2566	force->slaying = name;	2698	force->slaying = name;
2567	force->stats.food = 1;	2699	force->force_set_timer (duration);
2568	force->speed_left = -1.f;
2569
2570	force->set_speed (duration ? 1.f / duration : 0.f);
2571	force->flag [FLAG_IS_USED_UP] = true;
2572	force->flag [FLAG_APPLIED] = true;	2700	force->flag [FLAG_APPLIED] = true;
2573		2701
2574	return insert (force);	2702	return insert (force);
2575	}	2703	}
2576		2704
2577	void	2705	void
2578	object::play_sound (faceidx sound)	2706	object::play_sound (faceidx sound) const
2579	{	2707	{
2580	if (!sound)	2708	if (!sound)
2581	return;	2709	return;
2582		2710
2583	if (flag [FLAG_REMOVED])	2711	if (is_on_map ())
2584	return;
2585
2586	if (env)
2587	{
2588	if (object *pl = in_player ())
2589	pl->contr->play_sound (sound);
2590	}
2591	else
2592	map->play_sound (sound, x, y);	2712	map->play_sound (sound, x, y);
		2713	else if (object *pl = in_player ())
		2714	pl->contr->play_sound (sound);
		2715	}
		2716
		2717	void
		2718	object::say_msg (const char *msg) const
		2719	{
		2720	if (is_on_map ())
		2721	map->say_msg (msg, x, y);
		2722	else if (object *pl = in_player ())
		2723	pl->contr->play_sound (sound);
2593	}	2724	}
2594		2725
2595	void	2726	void
2596	object::make_noise ()	2727	object::make_noise ()
2597	{	2728	{
…		…
2623		2754
2624	insert (force);	2755	insert (force);
2625	}	2756	}
2626	}	2757	}
2627		2758
		2759	void object::change_move_type (MoveType mt)
		2760	{
		2761	if (move_type == mt)
		2762	return;
		2763
		2764	if (is_on_map ())
		2765	{
		2766	// we are on the map, so handle move_on/off effects
		2767	remove ();
		2768	move_type = mt;
		2769	map->insert (this, x, y, this);
		2770	}
		2771	else
		2772	move_type = mt;
		2773	}
		2774
		2775	/* object should be a player.
		2776	* we return the object the player has marked with the 'mark' command
		2777	* below. If no match is found (or object has changed), we return
		2778	* NULL. We leave it up to the calling function to print messages if
		2779	* nothing is found.
		2780	*/
		2781	object *
		2782	object::mark () const
		2783	{
		2784	if (contr && contr->mark && contr->mark->env == this)
		2785	return contr->mark;
		2786	else
		2787	return 0;
		2788	}
		2789

Diff Legend

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