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.250 by root, Wed Jul 16 14:29:40 2008 UTC vs.
Revision 1.327 by root, Fri Apr 16 02:32:25 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. First part checks	266	/* Do not merge objects if nrof would overflow, assume nrof
192	* for unsigned overflow (2c), second part checks whether the result	267	* is always 0 .. 2**31-1 */
193	* would fit into a 32 bit signed int, which is often used to hold	268	if (ob1->nrof > 0x7fffffff - ob2->nrof)
194	* nrof values.
195	*/
196	if (~ob1->nrof < ob2->nrof || ob1->nrof + ob2->nrof > (1UL << 31))
197	return 0;	269	return 0;
198		270
199	/* If the objects have been identified, set the BEEN_APPLIED flag.	271	/* If the objects have been identified, set the BEEN_APPLIED flag.
200	* 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
201	* 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
202	* 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
203	* flags lose any meaning.	275	* flags lose any meaning.
204	*/	276	*/
205	if (QUERY_FLAG (ob1, FLAG_IDENTIFIED))	277	if (ob1->flag [FLAG_IDENTIFIED])
206	SET_FLAG (ob1, FLAG_BEEN_APPLIED);	278	ob1->set_flag (FLAG_BEEN_APPLIED);
207		279
208	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))	280	if (ob2->flag [FLAG_IDENTIFIED])
209	SET_FLAG (ob2, FLAG_BEEN_APPLIED);	281	ob2->set_flag (FLAG_BEEN_APPLIED);
210		282
211	if (ob1->arch->archname != ob2->arch->archname	283	if (ob1->arch->archname != ob2->arch->archname
212	|| ob1->name != ob2->name	284	|| ob1->name != ob2->name
213	|| ob1->title != ob2->title	285	|| ob1->title != ob2->title
214	|| ob1->msg != ob2->msg	286	|| ob1->msg != ob2->msg
…		…
217	|| ob1->magic != ob2->magic	289	|| ob1->magic != ob2->magic
218	|| ob1->slaying != ob2->slaying	290	|| ob1->slaying != ob2->slaying
219	|| ob1->skill != ob2->skill	291	|| ob1->skill != ob2->skill
220	|| ob1->value != ob2->value	292	|| ob1->value != ob2->value
221	|| ob1->animation_id != ob2->animation_id	293	|| ob1->animation_id != ob2->animation_id
222	|| (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
223	|| ob1->client_type != ob2->client_type	295	|| ob1->client_type != ob2->client_type
224	|| ob1->materialname != ob2->materialname	296	|| ob1->material != ob2->material
225	|| ob1->lore != ob2->lore	297	|| ob1->lore != ob2->lore
226	|| ob1->subtype != ob2->subtype	298	|| ob1->subtype != ob2->subtype
227	|| ob1->move_type != ob2->move_type	299	|| ob1->move_type != ob2->move_type
228	|| ob1->move_block != ob2->move_block	300	|| ob1->move_block != ob2->move_block
229	|| ob1->move_allow != ob2->move_allow	301	|| ob1->move_allow != ob2->move_allow
230	|| ob1->move_on != ob2->move_on	302	|| ob1->move_on != ob2->move_on
231	|| ob1->move_off != ob2->move_off	303	|| ob1->move_off != ob2->move_off
232	|| ob1->move_slow != ob2->move_slow	304	|| ob1->move_slow != ob2->move_slow
233	|| ob1->move_slow_penalty != ob2->move_slow_penalty	305	|| fabs (ob1->move_slow_penalty - ob2->move_slow_penalty) >= (1.f / 1024.f)
234	|| memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))	306	|| memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
235	|| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats)))	307	|| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats)))
236	return 0;	308	return 0;
237		309
238	if ((ob1->flag ^ ob2->flag)	310	if ((ob1->flag ^ ob2->flag)
239	.reset (FLAG_INV_LOCKED)	311	.reset (FLAG_INV_LOCKED)
240	.reset (FLAG_CLIENT_SENT)
241	.reset (FLAG_REMOVED)	312	.reset (FLAG_REMOVED)
242	.any ())	313	.any ())
243	return 0;	314	return 0;
244		315
245	/* This is really a spellbook check - we should in general	316	/* This is really a spellbook check - we should in general
…		…
264		335
265	/* 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,
266	* 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
267	* some items equipped, and we don't want those to merge.	338	* some items equipped, and we don't want those to merge.
268	*/	339	*/
269	if (QUERY_FLAG (ob1, FLAG_APPLIED) || QUERY_FLAG (ob2, FLAG_APPLIED))	340	if (ob1->flag [FLAG_APPLIED] || ob2->flag [FLAG_APPLIED])
270	return 0;	341	return 0;
271		342
272	/* 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
273	* 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
274	* check?	345	* check?
275	*/	346	*/
276	if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && ob1->has_active_speed ())	347	if (!ob1->flag [FLAG_ANIMATE] && ob1->has_active_speed ())
277	return 0;	348	return 0;
278		349
279	switch (ob1->type)	350	switch (ob1->type)
280	{	351	{
281	case SCROLL:	352	case SCROLL:
…		…
327	{	398	{
328	// see if we are in a container of sorts	399	// see if we are in a container of sorts
329	if (env)	400	if (env)
330	{	401	{
331	// the player inventory itself is always visible	402	// the player inventory itself is always visible
332	if (env->type == PLAYER)	403	if (env->is_player ())
333	return env;	404	return env;
334		405
335	// else a player could have our env open	406	// else a player could have our env open
336	object *envest = env->outer_env ();	407	object *envest = env->outer_env_or_self ();
337		408
338	// 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
339	// even if our inv is in a player.	410	// even if our inv is in a player.
340	if (envest->is_on_map ())	411	if (envest->is_on_map ())
341	if (object *pl = envest->ms ().player ())	412	if (object *pl = envest->ms ().player ())
342	if (pl->container == env)	413	if (pl->container_ () == env)
343	return pl;	414	return pl;
344	}	415	}
345	else	416	else
346	{	417	{
347	// maybe there is a player standing on the same mapspace	418	// maybe there is a player standing on the same mapspace
348	// this will catch the case where "this" is a player	419	// this will catch the case where "this" is a player
349	if (object *pl = ms ().player ())	420	if (object *pl = ms ().player ())
350	if ((!pl->container && pl->contr->ns && !pl->contr->ns->update_look)	421	if ((pl->contr->ns && !pl->container_ () && !pl->contr->ns->update_look)
351	|| this == pl->container)	422	|| pl->container_ () == this)
352	return pl;	423	return pl;
353	}	424	}
354	}	425	}
355		426
356	return 0;	427	return 0;
…		…
412		483
413	sum = weight_adjust_for (this, sum);	484	sum = weight_adjust_for (this, sum);
414		485
415	if (sum != carrying)	486	if (sum != carrying)
416	{	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
417	carrying = sum;	492	carrying = sum;
418		493
419	if (object *pl = visible_to ())	494	if (object *pl = visible_to ())
420	if (pl != this) // player is handled lazily	495	if (pl != this) // player is handled lazily
421	esrv_update_item (UPD_WEIGHT, pl, this);	496	esrv_update_item (UPD_WEIGHT, pl, this);
…		…
434	object_freezer freezer;	509	object_freezer freezer;
435	op->write (freezer);	510	op->write (freezer);
436	return freezer.as_string ();	511	return freezer.as_string ();
437	}	512	}
438		513
439	/*	514	char *
440	* get_nearest_part(multi-object, object 2) returns the part of the	515	object::as_string ()
441	* multi-object 1 which is closest to the second object.
442	* If it's not a multi-object, it is returned.
443	*/
444	object *
445	get_nearest_part (object *op, const object *pl)
446	{	516	{
447	object *tmp, *closest;	517	return dump_object (this);
448	int last_dist, i;
449
450	if (!op->more)
451	return op;
452
453	for (last_dist = distance (op, pl), closest = op, tmp = op->more;
454	tmp;
455	tmp = tmp->more)
456	if ((i = distance (tmp, pl)) < last_dist)
457	closest = tmp, last_dist = i;
458
459	return closest;
460	}	518	}
461		519
462	/*	520	/*
463	* 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.
464	* VERRRY slow.	522	* VERRRY slow.
…		…
466	object *	524	object *
467	find_object (tag_t i)	525	find_object (tag_t i)
468	{	526	{
469	for_all_objects (op)	527	for_all_objects (op)
470	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)
471	return op;	544	return op;
472		545
473	return 0;	546	return 0;
474	}	547	}
475		548
…		…
509	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 ());
510	return;	583	return;
511	}	584	}
512		585
513	this->owner = owner;	586	this->owner = owner;
514	}
515
516	int
517	object::slottype () const
518	{
519	if (type == SKILL)
520	{
521	if (IS_COMBAT_SKILL (subtype)) return slot_combat;
522	if (IS_RANGED_SKILL (subtype)) return slot_ranged;
523	}
524	else
525	{
526	if (slot [body_combat].info) return slot_combat;
527	if (slot [body_range ].info) return slot_ranged;
528	}
529
530	return slot_none;
531	}
532
533	bool
534	object::change_weapon (object *ob)
535	{
536	if (current_weapon == ob)
537	return true;
538
539	if (chosen_skill)
540	chosen_skill->flag [FLAG_APPLIED] = false;
541
542	current_weapon = ob;
543	chosen_skill = !ob || ob->type == SKILL ? ob : find_skill_by_name (this, ob->skill);
544
545	if (chosen_skill)
546	chosen_skill->flag [FLAG_APPLIED] = true;
547
548	update_stats ();
549
550	if (ob)
551	{
552	// now check wether any body locations became invalid, in which case
553	// we cannot apply the weapon at the moment.
554	for (int i = 0; i < NUM_BODY_LOCATIONS; ++i)
555	if (slot[i].used < 0)
556	{
557	current_weapon = chosen_skill = 0;
558	update_stats ();
559
560	new_draw_info_format (NDI_UNIQUE, 0, this,
561	"You try to balance all your items at once, "
562	"but the %s is just too much for your body. "
563	"[You need to unapply some items first.]", &ob->name);
564	return false;
565	}
566
567	//new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);
568	}
569	else
570	;//new_draw_info_format (NDI_UNIQUE, 0, this, "You unwield your weapons.");
571
572	if (ob && !ob->flag [FLAG_APPLIED] && ob->type != SPELL)
573	{
574	LOG (llevError | logBacktrace, "%s changed to unapplied weapon %s",
575	&name, ob->debug_desc ());
576	return false;
577	}
578
579	return true;
580	}	587	}
581		588
582	/* Zero the key_values on op, decrementing the shared-string	589	/* Zero the key_values on op, decrementing the shared-string
583	* refcounts and freeing the links.	590	* refcounts and freeing the links.
584	*/	591	*/
…		…
637	tail = new_link;	644	tail = new_link;
638	}	645	}
639	}	646	}
640	}	647	}
641		648
642	if (speed < 0)	649	dst->activate ();
643	dst->speed_left -= rndm ();
644
645	dst->set_speed (dst->speed);
646	}	650	}
647		651
648	void	652	void
649	object::instantiate ()	653	object::instantiate ()
650	{	654	{
651	if (!uuid.seq) // HACK	655	if (!uuid.seq) // HACK
652	uuid = UUID::gen ();	656	uuid = UUID::gen ();
653		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
654	speed_left = -0.1f;	662	speed_left = -1.;
		663
655	/* 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
656	* 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.
657	* 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
658	* values for the body_used info, so when items are created	667	* values for the body_used info, so when items are created
659	* for it, they can be properly equipped.	668	* for it, they can be properly equipped.
…		…
667	object *	676	object *
668	object::clone ()	677	object::clone ()
669	{	678	{
670	object *neu = create ();	679	object *neu = create ();
671	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
672	neu->map = map; // not copied by copy_to	686	neu->map = map; // not copied by copy_to
673	return neu;	687	return neu;
674	}	688	}
675		689
676	/*	690	/*
…		…
679	* 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.
680	*/	694	*/
681	void	695	void
682	update_turn_face (object *op)	696	update_turn_face (object *op)
683	{	697	{
684	if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || !op->arch)	698	if (!op->flag [FLAG_IS_TURNABLE] || !op->arch)
685	return;	699	return;
686		700
687	SET_ANIMATION (op, op->direction);	701	SET_ANIMATION (op, op->direction);
688	update_object (op, UP_OBJ_FACE);	702	update_object (op, UP_OBJ_FACE);
689	}	703	}
…		…
694	* 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.
695	*/	709	*/
696	void	710	void
697	object::set_speed (float speed)	711	object::set_speed (float speed)
698	{	712	{
699	if (flag [FLAG_FREED] && speed)
700	{
701	LOG (llevError, "Object %s is freed but has speed.\n", &name);
702	speed = 0;
703	}
704
705	this->speed = speed;	713	this->speed = speed;
706		714
707	if (has_active_speed ())	715	if (has_active_speed ())
708	activate ();	716	activate ();
709	else	717	else
…		…
759		767
760	if (!(m.flags_ & P_UPTODATE))	768	if (!(m.flags_ & P_UPTODATE))
761	/* nop */;	769	/* nop */;
762	else if (action == UP_OBJ_INSERT)	770	else if (action == UP_OBJ_INSERT)
763	{	771	{
		772	#if 0
764	// this is likely overkill, TODO: revisit (schmorp)	773	// this is likely overkill, TODO: revisit (schmorp)
765	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))	774	if ((op->flag [FLAG_BLOCKSVIEW] && !(m.flags_ & P_BLOCKSVIEW))
766	|| (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))	775	|| (op->flag [FLAG_NO_MAGIC] && !(m.flags_ & P_NO_MAGIC))
767	|| (op->type == PLAYER && !(m.flags_ & P_PLAYER))	776	|| (op->is_player () && !(m.flags_ & P_PLAYER))
768	|| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))	777	|| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
769	|| (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))	778	|| (op->flag [FLAG_ALIVE] && !(m.flags_ & P_IS_ALIVE))
770	|| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))	779	|| (op->flag [FLAG_DAMNED] && !(m.flags_ & P_NO_CLERIC))
771	|| (m.move_on | op->move_on ) != m.move_on	780	|| (m.move_on | op->move_on ) != m.move_on
772	|| (m.move_off | op->move_off ) != m.move_off	781	|| (m.move_off | op->move_off ) != m.move_off
773	|| (m.move_slow | op->move_slow) != m.move_slow	782	|| (m.move_slow | op->move_slow) != m.move_slow
774	/* 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
775	* to have move_allow right now.	784	* have move_allow right now.
776	*/	785	*/
777	|| ((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
		787	m.invalidate ();
		788	#else
778	|| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)	789	// the above is not strong enough a test to skip updating. los maybe? TODO (schmorp)
779	m.flags_ = 0;	790	m.invalidate ();
		791	#endif
780	}	792	}
781	/* if the object is being removed, we can't make intelligent	793	/* if the object is being removed, we can't make intelligent
782	* decisions, because remove_ob can't really pass the object	794	* decisions, because remove_ob can't really pass the object
783	* that is being removed.	795	* that is being removed.
784	*/	796	*/
785	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)	797	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
786	m.flags_ = 0;	798	m.invalidate ();
787	else if (action == UP_OBJ_FACE)	799	else if (action == UP_OBJ_FACE)
788	/* Nothing to do for that case */ ;	800	/* Nothing to do for that case */ ;
789	else	801	else
790	LOG (llevError, "update_object called with invalid action: %d\n", action);	802	LOG (llevError, "update_object called with invalid action: %d\n", action);
791		803
…		…
793	update_object (op->more, action);	805	update_object (op->more, action);
794	}	806	}
795		807
796	object::object ()	808	object::object ()
797	{	809	{
798	SET_FLAG (this, FLAG_REMOVED);	810	this->set_flag (FLAG_REMOVED);
799		811
800	expmul = 1.0;	812	//expmul = 1.0; declared const for the time being
801	face = blank_face;	813	face = blank_face;
		814	material = MATERIAL_NULL;
802	}	815	}
803		816
804	object::~object ()	817	object::~object ()
805	{	818	{
806	unlink ();	819	unlink ();
807		820
808	free_key_values (this);	821	free_key_values (this);
809	}	822	}
810
811	static int object_count;
812		823
813	void object::link ()	824	void object::link ()
814	{	825	{
815	assert (!index);//D	826	assert (!index);//D
816	uuid = UUID::gen ();	827	uuid = UUID::gen ();
817	count = ++object_count;
818		828
819	refcnt_inc ();	829	refcnt_inc ();
820	objects.insert (this);	830	objects.insert (this);
		831
		832	++create_count;
		833
821	}	834	}
822		835
823	void object::unlink ()	836	void object::unlink ()
824	{	837	{
825	if (!index)	838	if (!index)
826	return;	839	return;
		840
		841	++destroy_count;
827		842
828	objects.erase (this);	843	objects.erase (this);
829	refcnt_dec ();	844	refcnt_dec ();
830	}	845	}
831		846
…		…
835	/* If already on active list, don't do anything */	850	/* If already on active list, don't do anything */
836	if (active)	851	if (active)
837	return;	852	return;
838		853
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	{
…		…
910	|| map->in_memory != MAP_ACTIVE	930	|| map->in_memory != MAP_ACTIVE
911	|| map->no_drop	931	|| map->no_drop
912	|| ms ().move_block == MOVE_ALL)	932	|| ms ().move_block == MOVE_ALL)
913	{	933	{
914	while (inv)	934	while (inv)
915	inv->destroy (true);	935	inv->destroy ();
916	}	936	}
917	else	937	else
918	{ /* Put objects in inventory onto this space */	938	{ /* Put objects in inventory onto this space */
919	while (inv)	939	while (inv)
920	{	940	{
…		…
924	|| op->flag [FLAG_NO_DROP]	944	|| op->flag [FLAG_NO_DROP]
925	|| op->type == RUNE	945	|| op->type == RUNE
926	|| op->type == TRAP	946	|| op->type == TRAP
927	|| op->flag [FLAG_IS_A_TEMPLATE]	947	|| op->flag [FLAG_IS_A_TEMPLATE]
928	|| op->flag [FLAG_DESTROY_ON_DEATH])	948	|| op->flag [FLAG_DESTROY_ON_DEATH])
929	op->destroy (true);	949	op->destroy ();
930	else	950	else
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 ();
…		…
998	attacked_by = 0;	1090	attacked_by = 0;
999	current_weapon = 0;	1091	current_weapon = 0;
1000	}	1092	}
1001		1093
1002	void	1094	void
1003	object::destroy (bool destroy_inventory)	1095	object::destroy ()
1004	{	1096	{
1005	if (destroyed ())	1097	if (destroyed ())
1006	return;	1098	return;
1007		1099
1008	if (!is_head () && !head->destroyed ())	1100	if (!is_head () && !head->destroyed ())
1009	{	1101	{
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 (destroy_inventory);	1103	head->destroy ();
1012	return;	1104	return;
1013	}	1105	}
1014		1106
1015	destroy_inv (!destroy_inventory);	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
…		…
1056	if (object *pl = visible_to ())	1145	if (object *pl = visible_to ())
1057	esrv_del_item (pl->contr, count);	1146	esrv_del_item (pl->contr, count);
1058	flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed	1147	flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed
1059		1148
1060	adjust_weight (env, -total_weight ());	1149	adjust_weight (env, -total_weight ());
		1150
		1151	object *pl = in_player ();
1061		1152
1062	/* we set up values so that it could be inserted into	1153	/* we set up values so that it could be inserted into
1063	* the map, but we don't actually do that - it is up	1154	* the map, but we don't actually do that - it is up
1064	* to the caller to decide what we want to do.	1155	* to the caller to decide what we want to do.
1065	*/	1156	*/
…		…
1073		1164
1074	above = 0;	1165	above = 0;
1075	below = 0;	1166	below = 0;
1076	env = 0;	1167	env = 0;
1077		1168
1078	/* NO_FIX_PLAYER is set when a great many changes are being	1169	if (pl && pl->is_player ())
1079	* made to players inventory. If set, avoiding the call
1080	* to save cpu time.
1081	*/	1170	{
1082	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1171	if (expect_false (pl->contr->combat_ob == this))
1083	otmp->update_stats ();	1172	{
		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	}
		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
		1187	if (expect_false (glow_radius) && pl->is_on_map ())
		1188	update_all_los (pl->map, pl->x, pl->y);
		1189	}
1084	}	1190	}
1085	else if (map)	1191	else if (map)
1086	{	1192	{
1087	map->dirty = true;	1193	map->dirty = true;
1088	mapspace &ms = this->ms ();	1194	mapspace &ms = this->ms ();
1089		1195
1090	if (object *pl = ms.player ())	1196	if (object *pl = ms.player ())
1091	{	1197	{
1092	if (type == PLAYER) // this == pl(!)	1198	if (is_player ())
1093	{	1199	{
		1200	if (!flag [FLAG_WIZPASS])
		1201	ms.smell = ++mapspace::smellcount; // remember the smell of the player
		1202
1094	// leaving a spot always closes any open container on the ground	1203	// leaving a spot always closes any open container on the ground
1095	if (container && !container->env)	1204	if (container && !container->env)
1096	// this causes spurious floorbox updates, but it ensures	1205	// this causes spurious floorbox updates, but it ensures
1097	// that the CLOSE event is being sent.	1206	// that the CLOSE event is being sent.
1098	close_container ();	1207	close_container ();
1099		1208
1100	--map->players;	1209	--map->players;
1101	map->touch ();	1210	map->touch ();
1102	}	1211	}
1103	else if (pl->container == this)	1212	else if (pl->container_ () == this)
1104	{	1213	{
1105	// removing a container should close it	1214	// removing a container should close it
1106	close_container ();	1215	close_container ();
1107	}	1216	}
1108		1217	else
1109	esrv_del_item (pl->contr, count);	1218	esrv_del_item (pl->contr, count);
1110	}	1219	}
1111		1220
1112	/* link the object above us */	1221	/* link the object above us */
1113	// re-link, make sure compiler can easily use cmove	1222	// re-link, make sure compiler can easily use cmove
1114	*(above ? &above->below : &ms.top) = below;	1223	*(above ? &above->below : &ms.top) = below;
1115	*(below ? &below->above : &ms.bot) = above;	1224	*(below ? &below->above : &ms.bot) = above;
1116		1225
1117	above = 0;	1226	above = 0;
1118	below = 0;	1227	below = 0;
1119		1228
		1229	ms.invalidate ();
		1230
1120	if (map->in_memory == MAP_SAVING)	1231	if (map->in_memory == MAP_SAVING)
1121	return;	1232	return;
1122		1233
1123	int check_walk_off = !flag [FLAG_NO_APPLY];	1234	int check_walk_off = !flag [FLAG_NO_APPLY];
1124		1235
1125	if (object *pl = ms.player ())	1236	if (object *pl = ms.player ())
1126	{	1237	{
1127	if (pl->container == this)	1238	if (pl->container_ () == this)
1128	/* If a container that the player is currently using somehow gets	1239	/* If a container that the player is currently using somehow gets
1129	* removed (most likely destroyed), update the player view	1240	* removed (most likely destroyed), update the player view
1130	* appropriately.	1241	* appropriately.
1131	*/	1242	*/
1132	pl->close_container ();	1243	pl->close_container ();
…		…
1136	//TODO: update floorbox to preserve ordering	1247	//TODO: update floorbox to preserve ordering
1137	if (pl->contr->ns)	1248	if (pl->contr->ns)
1138	pl->contr->ns->floorbox_update ();	1249	pl->contr->ns->floorbox_update ();
1139	}	1250	}
1140		1251
		1252	if (check_walk_off)
1141	for (tmp = ms.bot; tmp; tmp = tmp->above)	1253	for (object *above, *tmp = ms.bot; tmp; tmp = above)
1142	{	1254	{
		1255	above = tmp->above;
		1256
1143	/* 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
1144	* being removed.	1258	* being removed.
1145	*/	1259	*/
1146		1260
1147	/* See if object moving off should effect something */	1261	/* See if object moving off should effect something */
1148	if (check_walk_off
1149	&& ((move_type & tmp->move_off)	1262	if ((move_type & tmp->move_off)
1150	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))	1263	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0)
1151	{
1152	move_apply (tmp, this, 0);	1264	move_apply (tmp, this, 0);
1153
1154	if (destroyed ())
1155	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1156	}	1265	}
1157		1266
1158	last = tmp;	1267	if (affects_los ())
1159	}
1160
1161	/* last == NULL if there are no objects on this space */
1162	//TODO: this makes little sense, why only update the topmost object?
1163	if (!last)
1164	map->at (x, y).flags_ = 0;
1165	else
1166	update_object (last, UP_OBJ_REMOVE);
1167
1168	if (flag [FLAG_BLOCKSVIEW] || glow_radius)
1169	update_all_los (map, x, y);	1268	update_all_los (map, x, y);
1170	}	1269	}
1171	}	1270	}
1172		1271
1173	/*	1272	/*
…		…
1197	esrv_update_item (UPD_NROF, pl, top);	1296	esrv_update_item (UPD_NROF, pl, top);
1198		1297
1199	op->weight = 0; // cancel the addition above	1298	op->weight = 0; // cancel the addition above
1200	op->carrying = 0; // must be 0 already	1299	op->carrying = 0; // must be 0 already
1201		1300
1202	op->destroy (1);	1301	op->destroy ();
1203		1302
1204	return top;	1303	return top;
1205	}	1304	}
1206		1305
1207	return 0;	1306	return 0;
…		…
1215		1314
1216	object *prev = this;	1315	object *prev = this;
1217		1316
1218	for (archetype *at = (archetype *)arch->more; at; at = (archetype *)at->more)	1317	for (archetype *at = (archetype *)arch->more; at; at = (archetype *)at->more)
1219	{	1318	{
1220	object *op = arch_to_object (at);	1319	object *op = at->instance ();
1221		1320
1222	op->name = name;	1321	op->name = name;
1223	op->name_pl = name_pl;	1322	op->name_pl = name_pl;
1224	op->title = title;	1323	op->title = title;
1225		1324
…		…
1263	* 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
1264	* to be set if special handling is needed.	1363	* to be set if special handling is needed.
1265	*	1364	*
1266	* Return value:	1365	* Return value:
1267	* new object if 'op' was merged with other object	1366	* new object if 'op' was merged with other object
1268	* NULL if 'op' was destroyed	1367	* NULL if there was an error (destroyed, blocked etc.)
1269	* just 'op' otherwise	1368	* just 'op' otherwise
1270	*/	1369	*/
1271	object *	1370	object *
1272	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)
1273	{	1372	{
1274	if (op->is_on_map ())
1275	{
1276	LOG (llevError, "insert_ob_in_map called for object already on map");
1277	abort ();
1278	}
1279
1280	if (op->env)
1281	{
1282	LOG (llevError, "insert_ob_in_map called for object in an inventory (proceeding)");
1283	op->remove ();	1373	op->remove ();
1284	}
1285		1374
1286	if (op->face && !face_info (op->face))//D TODO: remove soon	1375	if (m == &freed_map)//D TODO: remove soon
1287	{//D	1376	{//D
1288	LOG (llevError | logBacktrace, "op->face out of bounds: %s", op->debug_desc ());//D	1377	LOG (llevError | logBacktrace, "tries to insret object on freed objects map: %s", op->debug_desc ());//D
1289	op->face = 1;//D
1290	}//D	1378	}//D
1291		1379
1292	/* Ideally, the caller figures this out. However, it complicates a lot	1380	/* Ideally, the caller figures this out. However, it complicates a lot
1293	* 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
1294	* need extra work	1382	* need extra work
1295	*/	1383	*/
		1384	maptile *newmap = m;
1296	if (!xy_normalise (m, op->x, op->y))	1385	if (!xy_normalise (newmap, op->x, op->y))
1297	{	1386	{
1298	op->head_ ()->destroy (1);// remove head_ once all tail object destroyers found	1387	op->head_ ()->destroy ();// remove head_ once all tail object destroyers found
1299	return 0;	1388	return 0;
1300	}	1389	}
1301		1390
1302	if (object *more = op->more)	1391	if (object *more = op->more)
1303	if (!insert_ob_in_map (more, m, originator, flag))	1392	if (!insert_ob_in_map (more, m, originator, flag))
1304	return 0;	1393	return 0;
1305		1394
1306	CLEAR_FLAG (op, FLAG_REMOVED);	1395	op->flag [FLAG_REMOVED] = false;
1307		1396	op->env = 0;
1308	op->map = m;	1397	op->map = newmap;
		1398
1309	mapspace &ms = op->ms ();	1399	mapspace &ms = op->ms ();
1310		1400
1311	/* this has to be done after we translate the coordinates.	1401	/* this has to be done after we translate the coordinates.
1312	*/	1402	*/
1313	if (op->nrof && !(flag & INS_NO_MERGE))	1403	if (op->nrof && !(flag & INS_NO_MERGE))
…		…
1316	{	1406	{
1317	// TODO: we actually want to update tmp, not op,	1407	// TODO: we actually want to update tmp, not op,
1318	// but some caller surely breaks when we return tmp	1408	// but some caller surely breaks when we return tmp
1319	// from here :/	1409	// from here :/
1320	op->nrof += tmp->nrof;	1410	op->nrof += tmp->nrof;
1321	tmp->destroy (1);	1411	tmp->destroy ();
1322	}	1412	}
1323		1413
1324	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 */
1325	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1415	op->clr_flag (FLAG_INV_LOCKED);
1326		1416
1327	if (!QUERY_FLAG (op, FLAG_ALIVE))	1417	if (!op->flag [FLAG_ALIVE])
1328	CLEAR_FLAG (op, FLAG_NO_STEAL);	1418	op->clr_flag (FLAG_NO_STEAL);
1329		1419
1330	if (flag & INS_BELOW_ORIGINATOR)	1420	if (flag & INS_BELOW_ORIGINATOR)
1331	{	1421	{
1332	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)
1333	{	1423	{
1334	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");
1335	abort ();	1425	abort ();
1336	}	1426	}
1337		1427
1338	if (!originator->is_on_map ())	1428	if (!originator->is_on_map ())
		1429	{
1339	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",
1340	op->debug_desc (), originator->debug_desc ());	1431	op->debug_desc (), originator->debug_desc ());
		1432	abort ();
		1433	}
1341		1434
1342	op->above = originator;	1435	op->above = originator;
1343	op->below = originator->below;	1436	op->below = originator->below;
1344	originator->below = op;	1437	originator->below = op;
1345		1438
…		…
1365	* 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
1366	* that flying non pickable objects are spell objects.	1459	* that flying non pickable objects are spell objects.
1367	*/	1460	*/
1368	for (object *tmp = ms.bot; tmp; tmp = tmp->above)	1461	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1369	{	1462	{
1370	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])
1371	floor = tmp;	1464	floor = tmp;
1372		1465
1373	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])
1374	{	1467	{
1375	/* We insert above top, so we want this object below this */	1468	/* We insert above top, so we want this object below this */
1376	top = tmp->below;	1469	top = tmp->below;
1377	break;	1470	break;
1378	}	1471	}
…		…
1396	&& (op->face && !faces [op->face].visibility))	1489	&& (op->face && !faces [op->face].visibility))
1397	{	1490	{
1398	object *last;	1491	object *last;
1399		1492
1400	for (last = top; last != floor; last = last->below)	1493	for (last = top; last != floor; last = last->below)
1401	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1494	if (last->flag [FLAG_BLOCKSVIEW] && (last->type != EXIT))
1402	break;	1495	break;
1403		1496
1404	/* Check to see if we found the object that blocks view,	1497	/* Check to see if we found the object that blocks view,
1405	* 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
1406	* we can get inserted below this one, which requires we	1499	* we can get inserted below this one, which requires we
…		…
1431	op->below = top;	1524	op->below = top;
1432	*(op->above ? &op->above->below : &ms.top) = op;	1525	*(op->above ? &op->above->below : &ms.top) = op;
1433	}	1526	}
1434	}	1527	}
1435		1528
1436	if (op->type == PLAYER)	1529	if (op->is_player ())
1437	{	1530	{
1438	op->contr->do_los = 1;	1531	op->contr->do_los = 1;
1439	++op->map->players;	1532	++op->map->players;
1440	op->map->touch ();	1533	op->map->touch ();
1441	}	1534	}
…		…
1456	* be far away from this change and not affected in any way -	1549	* be far away from this change and not affected in any way -
1457	* this should get redone to only look for players within range,	1550	* this should get redone to only look for players within range,
1458	* or just updating the P_UPTODATE for spaces within this area	1551	* or just updating the P_UPTODATE for spaces within this area
1459	* of effect may be sufficient.	1552	* of effect may be sufficient.
1460	*/	1553	*/
1461	if (op->map->darkness && (op->glow_radius != 0))	1554	if (op->affects_los ())
		1555	{
		1556	op->ms ().invalidate ();
1462	update_all_los (op->map, op->x, op->y);	1557	update_all_los (op->map, op->x, op->y);
		1558	}
1463		1559
1464	/* updates flags (blocked, alive, no magic, etc) for this map space */	1560	/* updates flags (blocked, alive, no magic, etc) for this map space */
1465	update_object (op, UP_OBJ_INSERT);	1561	update_object (op, UP_OBJ_INSERT);
1466		1562
1467	INVOKE_OBJECT (INSERT, op);	1563	INVOKE_OBJECT (INSERT, op);
…		…
1474	* blocked() and wall() work properly), and these flags are updated by	1570	* blocked() and wall() work properly), and these flags are updated by
1475	* update_object().	1571	* update_object().
1476	*/	1572	*/
1477		1573
1478	/* 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 */
1479	if (!(flag & INS_NO_WALK_ON) && op->head_ () == op)	1575	if (!(flag & INS_NO_WALK_ON) && op->is_head ())
1480	{	1576	{
1481	if (check_move_on (op, originator))	1577	if (check_move_on (op, originator))
1482	return 0;	1578	return 0;
1483		1579
1484	/* 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
…		…
1495	/* this function inserts an object in the map, but if it	1591	/* this function inserts an object in the map, but if it
1496	* 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.
1497	* 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.
1498	*/	1594	*/
1499	void	1595	void
1500	replace_insert_ob_in_map (const char *arch_string, object *op)	1596	replace_insert_ob_in_map (shstr_tmp archname, object *op)
1501	{	1597	{
1502	/* first search for itself and remove any old instances */	1598	/* first search for itself and remove any old instances */
1503		1599
1504	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)	1600	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1505	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */	1601	if (tmp->arch->archname == archname) /* same archetype */
1506	tmp->destroy (1);	1602	tmp->destroy ();
1507		1603
1508	object *tmp = arch_to_object (archetype::find (arch_string));	1604	object *tmp = archetype::find (archname)->instance ();
1509		1605
1510	tmp->x = op->x;	1606	tmp->x = op->x;
1511	tmp->y = op->y;	1607	tmp->y = op->y;
1512		1608
1513	insert_ob_in_map (tmp, op->map, op, 0);	1609	insert_ob_in_map (tmp, op->map, op, 0);
…		…
1518	{	1614	{
1519	if (where->env)	1615	if (where->env)
1520	return where->env->insert (this);	1616	return where->env->insert (this);
1521	else	1617	else
1522	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;
1523	}	1641	}
1524		1642
1525	/*	1643	/*
1526	* decrease(object, number) decreases a specified number from	1644	* decrease(object, number) decreases a specified number from
1527	* 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
…		…
1535	if (!nr)	1653	if (!nr)
1536	return true;	1654	return true;
1537		1655
1538	nr = min (nr, nrof);	1656	nr = min (nr, nrof);
1539		1657
		1658	if (nrof > nr)
		1659	{
1540	nrof -= nr;	1660	nrof -= nr;
1541
1542	if (nrof)
1543	{
1544	adjust_weight (env, -weight * max (1, nr)); // carrying == 0	1661	adjust_weight (env, -weight * max (1, nr)); // carrying == 0
1545		1662
1546	if (object *pl = visible_to ())	1663	if (object *pl = visible_to ())
1547	esrv_update_item (UPD_NROF, pl, this);	1664	esrv_update_item (UPD_NROF, pl, this);
1548		1665
…		…
1635	if (object *pl = tmp->visible_to ())	1752	if (object *pl = tmp->visible_to ())
1636	esrv_update_item (UPD_NROF, pl, tmp);	1753	esrv_update_item (UPD_NROF, pl, tmp);
1637		1754
1638	adjust_weight (this, op->total_weight ());	1755	adjust_weight (this, op->total_weight ());
1639		1756
1640	op->destroy (1);	1757	op->destroy ();
1641	op = tmp;	1758	op = tmp;
1642	goto inserted;	1759	goto inserted;
1643	}	1760	}
1644		1761
1645	op->owner = 0; // it's his/hers now. period.	1762	op->owner = 0; // it's his/hers now. period.
…		…
1663		1780
1664	adjust_weight (this, op->total_weight ());	1781	adjust_weight (this, op->total_weight ());
1665		1782
1666	inserted:	1783	inserted:
1667	/* reset the light list and los of the players on the map */	1784	/* reset the light list and los of the players on the map */
1668	if (op->glow_radius && map && map->darkness)	1785	if (op->glow_radius && is_on_map ())
		1786	{
		1787	update_stats ();
1669	update_all_los (map, x, y);	1788	update_all_los (map, x, y);
1670		1789	}
		1790	else if (is_player ())
1671	// if this is a player's inventory, update stats	1791	// if this is a player's inventory, update stats
1672	if (type == PLAYER && !flag [FLAG_NO_FIX_PLAYER])	1792	contr->queue_stats_update ();
1673	update_stats ();
1674		1793
1675	INVOKE_OBJECT (INSERT, this);	1794	INVOKE_OBJECT (INSERT, this);
1676		1795
1677	return op;	1796	return op;
1678	}	1797	}
…		…
1698	* on top.	1817	* on top.
1699	*/	1818	*/
1700	int	1819	int
1701	check_move_on (object *op, object *originator)	1820	check_move_on (object *op, object *originator)
1702	{	1821	{
		1822	if (op->flag [FLAG_NO_APPLY])
		1823	return 0;
		1824
1703	object *tmp;	1825	object *tmp;
1704	maptile *m = op->map;	1826	maptile *m = op->map;
1705	int x = op->x, y = op->y;	1827	int x = op->x, y = op->y;
1706		1828
1707	MoveType move_on, move_slow, move_block;	1829	mapspace &ms = m->at (x, y);
1708		1830
1709	if (QUERY_FLAG (op, FLAG_NO_APPLY))	1831	ms.update ();
1710	return 0;
1711		1832
1712	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);	1833	MoveType move_on = ms.move_on;
1713	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);	1834	MoveType move_slow = ms.move_slow;
1714	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);	1835	MoveType move_block = ms.move_block;
1715		1836
1716	/* 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,
1717	* 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
1718	* 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
1719	* as walking.	1840	* as walking.
…		…
1730	return 0;	1851	return 0;
1731		1852
1732	/* The objects have to be checked from top to bottom.	1853	/* The objects have to be checked from top to bottom.
1733	* Hence, we first go to the top:	1854	* Hence, we first go to the top:
1734	*/	1855	*/
1735		1856	for (object *next, *tmp = ms.top; tmp; tmp = next)
1736	for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above)
1737	{
1738	/* Trim the search when we find the first other spell effect
1739	* this helps performance so that if a space has 50 spell objects,
1740	* we don't need to check all of them.
1741	*/
1742	if ((tmp->move_type & MOVE_FLY_LOW) && QUERY_FLAG (tmp, FLAG_NO_PICK))
1743	break;
1744	}	1857	{
		1858	next = tmp->below;
1745		1859
1746	for (; tmp; tmp = tmp->below)
1747	{
1748	if (tmp == op)	1860	if (tmp == op)
1749	continue; /* Can't apply yourself */	1861	continue; /* Can't apply yourself */
1750		1862
1751	/* 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.
1752	* Second check makes sure that the movement types not being slowed	1864	* Second check makes sure that the movement types not being slowed
1753	* (~slow_move) is not blocked on this space - just because the	1865	* (~slow_move) is not blocked on this space - just because the
1754	* 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
1755	* 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.
1756	*/	1868	*/
1757	if (!QUERY_FLAG (op, FLAG_WIZPASS))	1869	if (!op->flag [FLAG_WIZPASS])
1758	{	1870	{
1759	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||	1871	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
1760	((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))
1761	{	1873	{
1762
1763	float
1764	diff = tmp->move_slow_penalty * fabs (op->speed);	1874	float diff = tmp->move_slow_penalty * fabs (op->speed);
1765		1875
1766	if (op->type == PLAYER)	1876	if (op->is_player ())
1767	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)) ||
1768	(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)))
1769	diff /= 4.0;	1879	diff /= 4.0;
1770		1880
1771	op->speed_left -= diff;	1881	op->speed_left -= diff;
1772	}	1882	}
1773	}	1883	}
…		…
1895	void	2005	void
1896	flag_inv (object *op, int flag)	2006	flag_inv (object *op, int flag)
1897	{	2007	{
1898	for (object *tmp = op->inv; tmp; tmp = tmp->below)	2008	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1899	{	2009	{
1900	SET_FLAG (tmp, flag);	2010	tmp->set_flag (flag);
1901	flag_inv (tmp, flag);	2011	flag_inv (tmp, flag);
1902	}	2012	}
1903	}	2013	}
1904		2014
1905	/*	2015	/*
…		…
1908	void	2018	void
1909	unflag_inv (object *op, int flag)	2019	unflag_inv (object *op, int flag)
1910	{	2020	{
1911	for (object *tmp = op->inv; tmp; tmp = tmp->below)	2021	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1912	{	2022	{
1913	CLEAR_FLAG (tmp, flag);	2023	tmp->clr_flag (flag);
1914	unflag_inv (tmp, flag);	2024	unflag_inv (tmp, flag);
1915	}	2025	}
1916	}	2026	}
1917		2027
1918	/*	2028	/*
…		…
1979	* head of the object should correspond for the entire object.	2089	* head of the object should correspond for the entire object.
1980	*/	2090	*/
1981	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))	2091	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
1982	continue;	2092	continue;
1983		2093
1984	if (ob->blocked (m, pos.x, pos.y))	2094	if (ob->blocked (pos.m, pos.x, pos.y))
1985	continue;	2095	continue;
1986		2096
1987	altern [index++] = i;	2097	altern [index++] = i;
1988	}	2098	}
1989		2099
…		…
2057	* there is capable of.	2167	* there is capable of.
2058	*/	2168	*/
2059	int	2169	int
2060	find_dir (maptile *m, int x, int y, object *exclude)	2170	find_dir (maptile *m, int x, int y, object *exclude)
2061	{	2171	{
2062	int i, max = SIZEOFFREE, mflags;	2172	int max = SIZEOFFREE, mflags;
2063
2064	sint16 nx, ny;
2065	object *tmp;
2066	maptile *mp;
2067
2068	MoveType blocked, move_type;	2173	MoveType move_type;
2069		2174
2070	if (exclude && exclude->head_ () != exclude)	2175	if (exclude && exclude->head_ () != exclude)
2071	{	2176	{
2072	exclude = exclude->head;	2177	exclude = exclude->head;
2073	move_type = exclude->move_type;	2178	move_type = exclude->move_type;
…		…
2076	{	2181	{
2077	/* 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. */
2078	move_type = MOVE_ALL;	2183	move_type = MOVE_ALL;
2079	}	2184	}
2080		2185
2081	for (i = 1; i < max; i++)	2186	for (int i = 1; i < max; i++)
2082	{	2187	{
2083	mp = m;	2188	mapxy pos (m, x, y);
2084	nx = x + freearr_x[i];	2189	pos.move (i);
2085	ny = y + freearr_y[i];
2086		2190
2087	mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);	2191	if (!pos.normalise ())
2088
2089	if (mflags & P_OUT_OF_MAP)
2090	max = maxfree[i];	2192	max = maxfree[i];
2091	else	2193	else
2092	{	2194	{
2093	mapspace &ms = mp->at (nx, ny);	2195	mapspace &ms = *pos;
2094		2196
2095	blocked = ms.move_block;
2096
2097	if ((move_type & blocked) == move_type)	2197	if ((move_type & ms.move_block) == move_type)
2098	max = maxfree[i];	2198	max = maxfree [i];
2099	else if (mflags & P_IS_ALIVE)	2199	else if (ms.flags () & P_IS_ALIVE)
2100	{	2200	{
2101	for (tmp = ms.bot; tmp; tmp = tmp->above)	2201	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
2102	if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)	2202	if ((tmp->flag [FLAG_MONSTER] || tmp->is_player ())
2103	&& (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))	2203	&& (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2104	break;
2105
2106	if (tmp)
2107	return freedir[i];	2204	return freedir [i];
2108	}	2205	}
2109	}	2206	}
2110	}	2207	}
2111		2208
2112	return 0;	2209	return 0;
…		…
2187	* This basically means that if direction is 15, then it could either go	2284	* This basically means that if direction is 15, then it could either go
2188	* direction 4, 14, or 16 to get back to where we are.	2285	* direction 4, 14, or 16 to get back to where we are.
2189	* Moved from spell_util.c to object.c with the other related direction	2286	* Moved from spell_util.c to object.c with the other related direction
2190	* functions.	2287	* functions.
2191	*/	2288	*/
2192	int reduction_dir[SIZEOFFREE][3] = {	2289	static const int reduction_dir[SIZEOFFREE][3] = {
2193	{0, 0, 0}, /* 0 */	2290	{0, 0, 0}, /* 0 */
2194	{0, 0, 0}, /* 1 */	2291	{0, 0, 0}, /* 1 */
2195	{0, 0, 0}, /* 2 */	2292	{0, 0, 0}, /* 2 */
2196	{0, 0, 0}, /* 3 */	2293	{0, 0, 0}, /* 3 */
2197	{0, 0, 0}, /* 4 */	2294	{0, 0, 0}, /* 4 */
…		…
2291	* Add a check so we can't pick up invisible objects (0.93.8)	2388	* Add a check so we can't pick up invisible objects (0.93.8)
2292	*/	2389	*/
2293	int	2390	int
2294	can_pick (const object *who, const object *item)	2391	can_pick (const object *who, const object *item)
2295	{	2392	{
2296	return /*QUERY_FLAG(who,FLAG_WIZ)|| */	2393	return /*who->flag [FLAG_WIZ]|| */
2297	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&	2394	(item->weight > 0 && !item->flag [FLAG_NO_PICK] &&
2298	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3));	2395	!item->flag [FLAG_ALIVE] && !item->invisible && (who->is_player () || item->weight < who->weight / 3));
2299	}	2396	}
2300		2397
2301	/*	2398	/*
2302	* create clone from object to another	2399	* create clone from object to another
2303	*/	2400	*/
…		…
2335	return tmp;	2432	return tmp;
2336		2433
2337	return 0;	2434	return 0;
2338	}	2435	}
2339		2436
2340	const shstr &	2437	shstr_tmp
2341	object::kv_get (const shstr &key) const	2438	object::kv_get (shstr_tmp key) const
2342	{	2439	{
2343	for (key_value *kv = key_values; kv; kv = kv->next)	2440	for (key_value *kv = key_values; kv; kv = kv->next)
2344	if (kv->key == key)	2441	if (kv->key == key)
2345	return kv->value;	2442	return kv->value;
2346		2443
2347	return shstr_null;	2444	return shstr ();
2348	}	2445	}
2349		2446
2350	void	2447	void
2351	object::kv_set (const shstr &key, const shstr &value)	2448	object::kv_set (shstr_tmp key, shstr_tmp value)
2352	{	2449	{
2353	for (key_value *kv = key_values; kv; kv = kv->next)	2450	for (key_value *kv = key_values; kv; kv = kv->next)
2354	if (kv->key == key)	2451	if (kv->key == key)
2355	{	2452	{
2356	kv->value = value;	2453	kv->value = value;
…		…
2365		2462
2366	key_values = kv;	2463	key_values = kv;
2367	}	2464	}
2368		2465
2369	void	2466	void
2370	object::kv_del (const shstr &key)	2467	object::kv_del (shstr_tmp key)
2371	{	2468	{
2372	for (key_value **kvp = &key_values; *kvp; kvp = &(*kvp)->next)	2469	for (key_value **kvp = &key_values; *kvp; kvp = &(*kvp)->next)
2373	if ((*kvp)->key == key)	2470	if ((*kvp)->key == key)
2374	{	2471	{
2375	key_value *kv = *kvp;	2472	key_value *kv = *kvp;
…		…
2468	{	2565	{
2469	return map ? map->region (x, y)	2566	return map ? map->region (x, y)
2470	: region::default_region ();	2567	: region::default_region ();
2471	}	2568	}
2472		2569
2473	const materialtype_t *
2474	object::dominant_material () const
2475	{
2476	if (materialtype_t *mt = name_to_material (materialname))
2477	return mt;
2478
2479	return name_to_material (shstr_unknown);
2480	}
2481
2482	void	2570	void
2483	object::open_container (object *new_container)	2571	object::open_container (object *new_container)
2484	{	2572	{
2485	if (container == new_container)	2573	if (container == new_container)
2486	return;	2574	return;
…		…
2506	container = 0;	2594	container = 0;
2507		2595
2508	// client needs item update to make it work, client bug requires this to be separate	2596	// client needs item update to make it work, client bug requires this to be separate
2509	esrv_update_item (UPD_FLAGS, this, old_container);	2597	esrv_update_item (UPD_FLAGS, this, old_container);
2510		2598
2511	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));	2599	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", old_container->query_name ());
2512	play_sound (sound_find ("chest_close"));	2600	play_sound (sound_find ("chest_close"));
2513	}	2601	}
2514		2602
2515	if (new_container)	2603	if (new_container)
2516	{	2604	{
…		…
2520	// TODO: this does not seem to serve any purpose anymore?	2608	// TODO: this does not seem to serve any purpose anymore?
2521	#if 0	2609	#if 0
2522	// insert the "Close Container" object.	2610	// insert the "Close Container" object.
2523	if (archetype *closer = new_container->other_arch)	2611	if (archetype *closer = new_container->other_arch)
2524	{	2612	{
2525	object *closer = arch_to_object (new_container->other_arch);	2613	object *closer = new_container->other_arch->instance ();
2526	closer->flag [FLAG_NO_MAP_SAVE] = 1;	2614	closer->flag [FLAG_NO_MAP_SAVE] = 1;
2527	new_container->insert (closer);	2615	new_container->insert (closer);
2528	}	2616	}
2529	#endif	2617	#endif
2530		2618
2531	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));	2619	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", new_container->query_name ());
2532		2620
2533	// make sure the container is available, client bug requires this to be separate	2621	// make sure the container is available, client bug requires this to be separate
2534	esrv_send_item (this, new_container);	2622	esrv_send_item (this, new_container);
2535		2623
2536	new_container->flag [FLAG_APPLIED] = true;	2624	new_container->flag [FLAG_APPLIED] = true;
…		…
2544	// else if (!old_container->env && contr && contr->ns)	2632	// else if (!old_container->env && contr && contr->ns)
2545	// contr->ns->floorbox_reset ();	2633	// contr->ns->floorbox_reset ();
2546	}	2634	}
2547		2635
2548	object *	2636	object *
2549	object::force_find (const shstr name)	2637	object::force_find (shstr_tmp name)
2550	{	2638	{
2551	/* cycle through his inventory to look for the MARK we want to	2639	/* cycle through his inventory to look for the MARK we want to
2552	* place	2640	* place
2553	*/	2641	*/
2554	for (object *tmp = inv; tmp; tmp = tmp->below)	2642	for (object *tmp = inv; tmp; tmp = tmp->below)
…		…
2556	return splay (tmp);	2644	return splay (tmp);
2557		2645
2558	return 0;	2646	return 0;
2559	}	2647	}
2560		2648
		2649	//-GPL
		2650
2561	void	2651	void
		2652	object::force_set_timer (int duration)
		2653	{
		2654	this->duration = 1;
		2655	this->speed_left = -1.f;
		2656
		2657	this->set_speed (duration ? 1.f / duration : 0.f);
		2658	}
		2659
		2660	object *
2562	object::force_add (const shstr name, int duration)	2661	object::force_add (shstr_tmp name, int duration)
2563	{	2662	{
2564	if (object *force = force_find (name))	2663	if (object *force = force_find (name))
2565	force->destroy ();	2664	force->destroy ();
2566		2665
2567	object *force = get_archetype (FORCE_NAME);	2666	object *force = get_archetype (FORCE_NAME);
2568		2667
2569	force->slaying = name;	2668	force->slaying = name;
2570	force->stats.food = 1;	2669	force->force_set_timer (duration);
2571	force->speed_left = -1.f;
2572
2573	force->set_speed (duration ? 1.f / duration : 0.f);
2574	force->flag [FLAG_IS_USED_UP] = true;
2575	force->flag [FLAG_APPLIED] = true;	2670	force->flag [FLAG_APPLIED] = true;
2576		2671
2577	insert (force);	2672	return insert (force);
2578	}	2673	}
2579		2674
2580	void	2675	void
2581	object::play_sound (faceidx sound)	2676	object::play_sound (faceidx sound) const
2582	{	2677	{
2583	if (!sound)	2678	if (!sound)
2584	return;	2679	return;
2585		2680
2586	if (flag [FLAG_REMOVED])	2681	if (is_on_map ())
		2682	map->play_sound (sound, x, y);
		2683	else if (object *pl = in_player ())
		2684	pl->contr->play_sound (sound);
		2685	}
		2686
		2687	void
		2688	object::say_msg (const char *msg) const
		2689	{
		2690	if (is_on_map ())
		2691	map->say_msg (msg, x, y);
		2692	else if (object *pl = in_player ())
		2693	pl->contr->play_sound (sound);
		2694	}
		2695
		2696	void
		2697	object::make_noise ()
		2698	{
		2699	// we do not model noise in the map, so instead put
		2700	// a temporary light into the noise source
		2701	// could use the map instead, but that's less reliable for our
		2702	// goal, which is to make invisibility a bit harder to exploit
		2703
		2704	// currently only works sensibly for players
		2705	if (!is_player ())
2587	return;	2706	return;
2588		2707
2589	if (env)	2708	// find old force, or create new one
2590	{	2709	object *force = force_find (shstr_noise_force);
2591	if (object *pl = in_player ())	2710
2592	pl->contr->play_sound (sound);	2711	if (force)
2593	}	2712	force->speed_left = -1.f; // patch old speed up
2594	else	2713	else
2595	map->play_sound (sound, x, y);	2714	{
2596	}	2715	force = archetype::get (shstr_noise_force);
2597		2716
		2717	force->slaying = shstr_noise_force;
		2718	force->stats.food = 1;
		2719	force->speed_left = -1.f;
		2720
		2721	force->set_speed (1.f / 4.f);
		2722	force->flag [FLAG_IS_USED_UP] = true;
		2723	force->flag [FLAG_APPLIED] = true;
		2724
		2725	insert (force);
		2726	}
		2727	}
		2728
		2729	void object::change_move_type (MoveType mt)
		2730	{
		2731	if (move_type == mt)
		2732	return;
		2733
		2734	if (is_on_map ())
		2735	{
		2736	// we are on the map, so handle move_on/off effects
		2737	remove ();
		2738	move_type = mt;
		2739	map->insert (this, x, y, this);
		2740	}
		2741	else
		2742	move_type = mt;
		2743	}
		2744
		2745	/* object should be a player.
		2746	* we return the object the player has marked with the 'mark' command
		2747	* below. If no match is found (or object has changed), we return
		2748	* NULL. We leave it up to the calling function to print messages if
		2749	* nothing is found.
		2750	*/
		2751	object *
		2752	object::mark () const
		2753	{
		2754	if (contr && contr->mark && contr->mark->env == this)
		2755	return contr->mark;
		2756	else
		2757	return 0;
		2758	}
		2759

Diff Legend

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