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

Diff Legend

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