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.279 by root, Thu Jan 8 03:03:23 2009 UTC vs.
Revision 1.368 by root, Wed Dec 5 19:03:26 2018 UTC

1	/*	1	/*
2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.	2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.
3	*	3	*
		4	* Copyright (©) 2017,2018 Marc Alexander Lehmann / the Deliantra team
4	* Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team	5	* Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5	* Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team	6	* Copyright (©) 2001 Mark Wedel & Crossfire Development Team
6	* Copyright (©) 1992,2007 Frank Tore Johansen	7	* Copyright (©) 1992 Frank Tore Johansen
7	*	8	*
8	* Deliantra is free software: you can redistribute it and/or modify	9	* 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	10	* 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	11	* Free Software Foundation, either version 3 of the License, or (at your
11	* (at your option) any later version.	12	* option) any later version.
12	*	13	*
13	* This program is distributed in the hope that it will be useful,	14	* This program is distributed in the hope that it will be useful,
14	* but WITHOUT ANY WARRANTY; without even the implied warranty of	15	* but WITHOUT ANY WARRANTY; without even the implied warranty of
15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	16	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16	* GNU General Public License for more details.	17	* GNU General Public License for more details.
17	*	18	*
18	* You should have received a copy of the GNU General Public License	19	* 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/>.	20	* and the GNU General Public License along with this program. If not, see
		21	* <http://www.gnu.org/licenses/>.
20	*	22	*
21	* The authors can be reached via e-mail to <support@deliantra.net>	23	* The authors can be reached via e-mail to <support@deliantra.net>
22	*/	24	*/
23		25
24	#include <global.h>	26	#include <global.h>
25	#include <stdio.h>	27	#include <stdio.h>
26	#include <sys/types.h>	28	#include <sys/types.h>
27	#include <sys/uio.h>	29	#include <sys/uio.h>
28	#include <object.h>	30	#include <object.h>
29	#include <sproto.h>	31	#include <sproto.h>
30	#include <loader.h>
31		32
32	#include <bitset>	33	#include <bitset>
33		34
34	UUID UUID::cur;	35	UUID UUID::cur;
35	static uint64_t seq_next_save;	36	static uint64_t seq_next_save;
…		…
37	uint32_t mapspace::smellcount = 10000;	38	uint32_t mapspace::smellcount = 10000;
38		39
39	objectvec objects;	40	objectvec objects;
40	activevec actives;	41	activevec actives;
41		42
		43	freelist_item *object::freelist;
		44	uint32_t object::object_count;
		45	uint32_t object::free_count;
		46	uint32_t object::create_count;
		47	uint32_t object::destroy_count;
		48
		49	//+GPL
		50
42	short freearr_x[SIZEOFFREE] = {	51	int freearr_x[SIZEOFFREE] = {
43	0,	52	0,
44	0, 1, 1, 1, 0, -1, -1, -1,	53	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,	54	0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,
46	0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1	55	0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1
47	};	56	};
48	short freearr_y[SIZEOFFREE] = {	57	int freearr_y[SIZEOFFREE] = {
49	0,	58	0,
50	-1, -1, 0, 1, 1, 1, 0, -1,	59	-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,	60	-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	61	-3, -3, -3, -3, -2, -1, 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3
53	};
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	};	62	};
60	int freedir[SIZEOFFREE] = {	63	int freedir[SIZEOFFREE] = {
61	0,	64	0,
62	1, 2, 3, 4, 5, 6, 7, 8,	65	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,	66	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	67	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	};	68	};
66		69
		70	static int maxfree[SIZEOFFREE] = {
		71	0,
		72	9, 10, 13, 14, 17, 18, 21, 22,
		73	25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45, 48,
		74	49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49
		75	};
		76
		77	const char *wall_suffix[16] = {
		78	"0",
		79	"1_3",
		80	"1_4",
		81	"2_1_2",
		82	"1_2",
		83	"2_2_4",
		84	"2_2_1",
		85	"3_1",
		86	"1_1",
		87	"2_2_3",
		88	"2_2_2",
		89	"3_3",
		90	"2_1_1",
		91	"3_4",
		92	"3_2",
		93	"4"
		94	};
		95
67	static void	96	static void
68	write_uuid (uval64 skip, bool sync)	97	write_uuid (uval64 skip, bool sync)
69	{	98	{
70	CALL_BEGIN (2);	99	CALL_BEGIN (2);
71	CALL_ARG_SV (newSVval64 (skip));	100	CALL_ARG_SV (newSVval64 (skip));
…		…
73	CALL_CALL ("cf::write_uuid", G_DISCARD);	102	CALL_CALL ("cf::write_uuid", G_DISCARD);
74	CALL_END;	103	CALL_END;
75	}	104	}
76		105
77	static void	106	static void
78	read_uuid (void)	107	read_uuid ()
79	{	108	{
80	char filename[MAX_BUF];	109	char filename[MAX_BUF];
81		110
82	sprintf (filename, "%s/uuid", settings.localdir);	111	sprintf (filename, "%s/uuid", settings.localdir);
83		112
…		…
97		126
98	LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);	127	LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);
99	_exit (1);	128	_exit (1);
100	}	129	}
101		130
102	UUID::BUF buf;	131	char buf [UUID::MAX_LEN];
103	buf[0] = 0;	132	buf[0] = 0;
104	fgets (buf, sizeof (buf), fp);	133	fgets (buf, sizeof (buf), fp);
105		134
106	if (!UUID::cur.parse (buf))	135	if (!UUID::cur.parse (buf))
107	{	136	{
…		…
120	{	149	{
121	UUID uid;	150	UUID uid;
122		151
123	uid.seq = ++cur.seq;	152	uid.seq = ++cur.seq;
124		153
125	if (expect_false (cur.seq >= seq_next_save))	154	if (ecb_expect_false (cur.seq >= seq_next_save))
126	{	155	{
127	seq_next_save = UUID::cur.seq + (UUID_GAP >> 1);	156	seq_next_save = UUID::cur.seq + (UUID_GAP >> 1);
128	write_uuid (UUID_GAP, false);	157	write_uuid (UUID_GAP, false);
129	}	158	}
130		159
…		…
134		163
135	void	164	void
136	UUID::init ()	165	UUID::init ()
137	{	166	{
138	read_uuid ();	167	read_uuid ();
		168	}
		169
		170	bool
		171	UUID::parse (const char *s)
		172	{
		173	if (*s++ != '<' || *s++ != '1' || *s++ != '.')
		174	return false;
		175
		176	seq = 0;
		177
		178	while (*s != '>')
		179	{
		180	if (*s < '0')
		181	return false;
		182
		183	// this gives nice branchless code with gcc
		184	assert ('0' < 'a' && '0' == 48 && 'a' == 97);
		185	int digit = (*s + (*s & 0x40 ? 9 : 0)) & 15;
		186
		187	seq = (seq << 4) | digit;
		188
		189	++s;
		190	}
		191
		192	return true;
		193	}
		194
		195	char *
		196	UUID::append (char *buf) const
		197	{
		198	*buf++ = '<';
		199	*buf++ = '1';
		200	*buf++ = '.';
		201
		202	uint64_t seq = this->seq;
		203	const int bits = 64;
		204	char nz = 0;
		205	static const char tohex [] = "0123456789abcdef";
		206
		207	// assert (len >= 3 + bits / 4 + 1 + 1);
		208	for (int i = bits / 4; --i; )
		209	{
		210	uint8_t digit = seq >> (bits - 4);
		211
		212	*buf = tohex [digit];
		213	nz |= digit;
		214	buf += nz ? 1 : 0;
		215	seq <<= 4;
		216	}
		217
		218	// last digit is special - always emit
		219	uint8_t digit = seq >> (bits - 4);
		220	*buf++ = tohex [digit];
		221
		222	*buf++ = '>';
		223
		224	return buf;
		225	}
		226
		227	char *
		228	UUID::c_str () const
		229	{
		230	static char buf [MAX_LEN];
		231	*append (buf) = 0;
		232	return buf;
139	}	233	}
140		234
141	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */	235	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */
142	static bool	236	static bool
143	compare_ob_value_lists_one (const object *wants, const object *has)	237	compare_ob_value_lists_one (const object *wants, const object *has)
144	{	238	{
145	/* n-squared behaviour (see kv_get), but I'm hoping both	239	/* n-squared behaviour (see kv.get), but I'm hoping both
146	* objects with lists are rare, and lists stay short. If not, use a	240	* objects with lists are rare, and lists stay short. If not, use a
147	* different structure or at least keep the lists sorted...	241	* different structure or at least keep the lists sorted...
148	*/	242	*/
149		243
150	/* For each field in wants, */	244	/* For each field in wants, */
151	for (key_value *kv = wants->key_values; kv; kv = kv->next)	245	for (key_value *kv = wants->kv.first; kv; kv = kv->next)
152	if (has->kv_get (kv->key) != kv->value)	246	if (has->kv.get (kv->key) != kv->value)
153	return false;	247	return false;
154		248
155	/* If we get here, every field in wants has a matching field in has. */	249	/* If we get here, every field in wants has a matching field in has. */
156	return true;	250	return true;
157	}	251	}
…		…
179	* Improvements made with merge: Better checking on potion, and also	273	* Improvements made with merge: Better checking on potion, and also
180	* check weight	274	* check weight
181	*/	275	*/
182	bool object::can_merge_slow (object *ob1, object *ob2)	276	bool object::can_merge_slow (object *ob1, object *ob2)
183	{	277	{
184	/* A couple quicksanity checks */	278	/* A couple quick sanity checks */
185	if (ob1 == ob2	279	if (ob1 == ob2
186	|| ob1->type != ob2->type	280	|| ob1->type != ob2->type
187	|| ob1->speed != ob2->speed
188	|| ob1->value != ob2->value	281	|| ob1->value != ob2->value
189	|| ob1->name != ob2->name)	282	|| ob1->name != ob2->name
		283	|| ob1->custom_name != ob2->custom_name
		284	|| fabs (ob1->speed - ob2->speed) >= MIN_ACTIVE_SPEED)
190	return 0;	285	return 0;
191		286
192	/* Do not merge objects if nrof would overflow, assume nrof	287	/* Do not merge objects if nrof would overflow, assume nrof
193	* is always 0 .. 2**31-1 */	288	* is always 0 .. 2**31-1 */
194	if (ob1->nrof > 0x7fffffff - ob2->nrof)	289	if (ob1->nrof > 0x7fffffff - ob2->nrof)
…		…
198	* This is to the comparison of the flags below will be OK. We	293	* This is to the comparison of the flags below will be OK. We
199	* just can't ignore the been applied or identified flags, as they	294	* just can't ignore the been applied or identified flags, as they
200	* are not equal - just if it has been identified, the been_applied	295	* are not equal - just if it has been identified, the been_applied
201	* flags lose any meaning.	296	* flags lose any meaning.
202	*/	297	*/
203	if (QUERY_FLAG (ob1, FLAG_IDENTIFIED))	298	if (ob1->flag [FLAG_IDENTIFIED])
204	SET_FLAG (ob1, FLAG_BEEN_APPLIED);	299	ob1->set_flag (FLAG_BEEN_APPLIED);
205		300
206	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))	301	if (ob2->flag [FLAG_IDENTIFIED])
207	SET_FLAG (ob2, FLAG_BEEN_APPLIED);	302	ob2->set_flag (FLAG_BEEN_APPLIED);
208		303
209	if (ob1->arch->archname != ob2->arch->archname	304	if (ob1->arch->archname != ob2->arch->archname
210	|| ob1->name != ob2->name	305	|| ob1->name != ob2->name
211	|| ob1->title != ob2->title	306	|| ob1->title != ob2->title
212	|| ob1->msg != ob2->msg	307	|| ob1->msg != ob2->msg
…		…
215	|| ob1->magic != ob2->magic	310	|| ob1->magic != ob2->magic
216	|| ob1->slaying != ob2->slaying	311	|| ob1->slaying != ob2->slaying
217	|| ob1->skill != ob2->skill	312	|| ob1->skill != ob2->skill
218	|| ob1->value != ob2->value	313	|| ob1->value != ob2->value
219	|| ob1->animation_id != ob2->animation_id	314	|| ob1->animation_id != ob2->animation_id
220	|| (ob1->face != ob2->face && !ob1->animation_id) // face and animation are dependent on each other	315	|| (ob1->face != ob2->face && !ob1->animation_id) // face and animation are dependend on each other
221	|| ob1->client_type != ob2->client_type	316	|| ob1->client_type != ob2->client_type
222	|| ob1->materialname != ob2->materialname	317	|| ob1->material != ob2->material
223	|| ob1->lore != ob2->lore	318	|| ob1->lore != ob2->lore
224	|| ob1->subtype != ob2->subtype	319	|| ob1->subtype != ob2->subtype
225	|| ob1->move_type != ob2->move_type	320	|| ob1->move_type != ob2->move_type
226	|| ob1->move_block != ob2->move_block	321	|| ob1->move_block != ob2->move_block
227	|| ob1->move_allow != ob2->move_allow	322	|| ob1->move_allow != ob2->move_allow
228	|| ob1->move_on != ob2->move_on	323	|| ob1->move_on != ob2->move_on
229	|| ob1->move_off != ob2->move_off	324	|| ob1->move_off != ob2->move_off
230	|| ob1->move_slow != ob2->move_slow	325	|| ob1->move_slow != ob2->move_slow
231	|| ob1->move_slow_penalty != ob2->move_slow_penalty	326	|| fabs (ob1->move_slow_penalty - ob2->move_slow_penalty) >= (1.f / 1024.f)
232	|| memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))	327	|| memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
233	|| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats)))	328	|| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats)))
234	return 0;	329	return 0;
235		330
236	if ((ob1->flag ^ ob2->flag)	331	if ((ob1->flag ^ ob2->flag)
…		…
257	/* inventory ok - still need to check rest of this object to see	352	/* inventory ok - still need to check rest of this object to see
258	* if it is valid.	353	* if it is valid.
259	*/	354	*/
260	}	355	}
261		356
262	/* Don't merge objects that are applied. With the new 'body' code,	357	/* Don't merge objects that are applied. With the new 'body' code,
263	* it is possible for most any character to have more than one of	358	* it is possible for most any character to have more than one of
264	* some items equipped, and we don't want those to merge.	359	* some items equipped, and we don't want those to merge.
265	*/	360	*/
266	if (QUERY_FLAG (ob1, FLAG_APPLIED) || QUERY_FLAG (ob2, FLAG_APPLIED))	361	if (ob1->flag [FLAG_APPLIED] || ob2->flag [FLAG_APPLIED])
267	return 0;	362	return 0;
268		363
269	/* Note sure why the following is the case - either the object has to	364	/* Not sure why the following is the case - either the object has to
270	* be animated or have a very low speed. Is this an attempted monster	365	* be animated or have a very low speed. Is this an attempted monster
271	* check?	366	* check?
272	*/	367	*/
273	if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && ob1->has_active_speed ())	368	if (!ob1->flag [FLAG_ANIMATE] && ob1->has_active_speed ())
274	return 0;	369	return 0;
275		370
276	switch (ob1->type)	371	switch (ob1->type)
277	{	372	{
278	case SCROLL:	373	case SCROLL:
279	if (ob1->level != ob2->level)	374	if (ob1->level != ob2->level)
280	return 0;	375	return 0;
281	break;	376	break;
282	}	377	}
283		378
284	if (ob1->key_values || ob2->key_values)	379	if (!ob1->kv.empty () || !ob2->kv.empty ())
285	{	380	{
286	/* At least one of these has key_values. */	381	/* At least one of these has key_values. */
287	if ((!ob1->key_values) != (!ob2->key_values))	382	if (ob1->kv.empty () != ob2->kv.empty ())
288	return 0; /* One has fields, but the other one doesn't. */	383	return 0; /* One has fields, but the other one doesn't. */
289		384
290	if (!compare_ob_value_lists (ob1, ob2))	385	if (!compare_ob_value_lists (ob1, ob2))
291	return 0;	386	return 0;
292	}	387	}
…		…
328	// the player inventory itself is always visible	423	// the player inventory itself is always visible
329	if (env->is_player ())	424	if (env->is_player ())
330	return env;	425	return env;
331		426
332	// else a player could have our env open	427	// else a player could have our env open
333	object *envest = env->outer_env ();	428	object *envest = env->outer_env_or_self ();
334		429
335	// the player itself is always on a map, so we will find him here	430	// the player itself is always on a map, so we will find him here
336	// even if our inv is in a player.	431	// even if our inv is in a player.
337	if (envest->is_on_map ())	432	if (envest->is_on_map ())
338	if (object *pl = envest->ms ().player ())	433	if (object *pl = envest->ms ().player ())
339	if (pl->container == env)	434	if (pl->container_ () == env)
340	return pl;	435	return pl;
341	}	436	}
342	else	437	else
343	{	438	{
344	// maybe there is a player standing on the same mapspace	439	// maybe there is a player standing on the same mapspace
345	// this will catch the case where "this" is a player	440	// this will catch the case where "this" is a player
346	if (object *pl = ms ().player ())	441	if (object *pl = ms ().player ())
347	if ((!pl->container && pl->contr->ns && !pl->contr->ns->update_look)	442	if ((pl->contr->ns && !pl->container_ () && !pl->contr->ns->update_look)
348	|| this == pl->container)	443	|| pl->container_ () == this)
349	return pl;	444	return pl;
350	}	445	}
351	}	446	}
352		447
353	return 0;	448	return 0;
354	}	449	}
355		450
356	// adjust weight per container type ("of holding")	451	// adjust weight per container type ("of holding")
357	static sint32	452	static weight_t
358	weight_adjust_for (object *op, sint32 weight)	453	weight_adjust_for (object *op, weight_t weight)
359	{	454	{
360	return op->type == CONTAINER	455	if (op->type == CONTAINER)
361	? lerp (weight, 0, 100, 0, 100 - op->stats.Str)	456	weight -= weight * op->stats.Str / 100;
362	: weight;
363	}
364		457
		458	return weight;
		459	}
		460
365	/*	461	/*
366	* adjust_weight(object, weight) adds the specified weight to an object,	462	* subtracts, then adds, the specified weight to an object,
367	* and also updates how much the environment(s) is/are carrying.	463	* and also updates how much the environment(s) is/are carrying.
368	*/	464	*/
369	static void	465	static void
370	adjust_weight (object *op, sint32 weight)	466	adjust_weight (object *op, weight_t sub, weight_t add)
371	{	467	{
372	while (op)	468	while (op)
373	{	469	{
374	// adjust by actual difference to account for rounding errors	470	weight_t carrying = (weight_t)op->carrying
375	// i.e. (w2 - w1) / f != w2 / f - w1 / f and the latter is correct	471	- weight_adjust_for (op, sub)
376	weight = weight_adjust_for (op, op->carrying)	472	+ weight_adjust_for (op, add);
377	- weight_adjust_for (op, op->carrying - weight);
378		473
379	if (!weight)	474	sub = op->carrying;
380	return;
381
382	op->carrying += weight;	475	op->carrying = carrying;
		476	add = op->carrying;
383		477
384	if (object *pl = op->visible_to ())	478	if (object *pl = op->visible_to ())
385	if (pl != op) // player is handled lazily	479	if (pl != op) // player is handled lazily
386	esrv_update_item (UPD_WEIGHT, pl, op);	480	esrv_update_item (UPD_WEIGHT, pl, op);
387		481
…		…
395	* containers are carrying, and sums it up.	489	* containers are carrying, and sums it up.
396	*/	490	*/
397	void	491	void
398	object::update_weight ()	492	object::update_weight ()
399	{	493	{
400	sint32 sum = 0;	494	weight_t sum = 0;
401		495
402	for (object *op = inv; op; op = op->below)	496	for (object *op = inv; op; op = op->below)
403	{	497	{
404	if (op->inv)
405	op->update_weight ();	498	op->update_weight ();
406		499
407	sum += op->total_weight ();	500	sum += weight_adjust_for (this, op->total_weight ());
408	}	501	}
409
410	sum = weight_adjust_for (this, sum);
411		502
412	if (sum != carrying)	503	if (sum != carrying)
413	{	504	{
		505	if (carrying != sum && carrying)//D
		506	LOG (llevDebug, "updating carrying got %ld, expected %ld (%s)\n",
		507	(long long)sum, (long long)carrying, debug_desc ());
		508
414	carrying = sum;	509	carrying = sum;
415		510
416	if (object *pl = visible_to ())	511	if (object *pl = visible_to ())
417	if (pl != this) // player is handled lazily	512	if (pl != this) // player is handled lazily
418	esrv_update_item (UPD_WEIGHT, pl, this);	513	esrv_update_item (UPD_WEIGHT, pl, this);
…		…
431	object_freezer freezer;	526	object_freezer freezer;
432	op->write (freezer);	527	op->write (freezer);
433	return freezer.as_string ();	528	return freezer.as_string ();
434	}	529	}
435		530
436	/*	531	char *
437	* get_nearest_part(multi-object, object 2) returns the part of the	532	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	{	533	{
444	object *tmp, *closest;	534	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	}	535	}
458		536
459	/*	537	/*
460	* Returns the object which has the count-variable equal to the argument.	538	* Returns the object which has the count-variable equal to the argument.
461	* VERRRY slow.	539	* VERRRY slow.
…		…
463	object *	541	object *
464	find_object (tag_t i)	542	find_object (tag_t i)
465	{	543	{
466	for_all_objects (op)	544	for_all_objects (op)
467	if (op->count == i)	545	if (op->count == i)
		546	return op;
		547
		548	return 0;
		549	}
		550
		551	/*
		552	* Returns the object which has the uuid equal to the argument.
		553	* MOAR VERRRY slow.
		554	*/
		555
		556	object *
		557	find_object_uuid (UUID i)
		558	{
		559	for_all_objects (op)
		560	if (op->uuid == i)
468	return op;	561	return op;
469		562
470	return 0;	563	return 0;
471	}	564	}
472		565
…		…
506	LOG (llevError | logBacktrace, "tried to set owner of %s to %s\n", debug_desc (), owner->debug_desc ());	599	LOG (llevError | logBacktrace, "tried to set owner of %s to %s\n", debug_desc (), owner->debug_desc ());
507	return;	600	return;
508	}	601	}
509		602
510	this->owner = owner;	603	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	}
578
579	/* Zero the key_values on op, decrementing the shared-string
580	* refcounts and freeing the links.
581	*/
582	static void
583	free_key_values (object *op)
584	{
585	for (key_value *i = op->key_values; i; )
586	{
587	key_value *next = i->next;
588	delete i;
589
590	i = next;
591	}
592
593	op->key_values = 0;
594	}	604	}
595		605
596	/*	606	/*
597	* copy_to first frees everything allocated by the dst object,	607	* copy_to first frees everything allocated by the dst object,
598	* and then copies the contents of itself into the second	608	* and then copies the contents of itself into the second
…		…
604	void	614	void
605	object::copy_to (object *dst)	615	object::copy_to (object *dst)
606	{	616	{
607	dst->remove ();	617	dst->remove ();
608	*(object_copy *)dst = *this;	618	*(object_copy *)dst = *this;
		619
		620	// maybe move to object_copy?
		621	dst->kv = kv;
		622
609	dst->flag [FLAG_REMOVED] = true;	623	dst->flag [FLAG_REMOVED] = true;
610
611	/* Copy over key_values, if any. */
612	if (key_values)
613	{
614	key_value *tail = 0;
615	dst->key_values = 0;
616
617	for (key_value *i = key_values; i; i = i->next)
618	{
619	key_value *new_link = new key_value;
620
621	new_link->next = 0;
622	new_link->key = i->key;
623	new_link->value = i->value;
624
625	/* Try and be clever here, too. */
626	if (!dst->key_values)
627	{
628	dst->key_values = new_link;
629	tail = new_link;
630	}
631	else
632	{
633	tail->next = new_link;
634	tail = new_link;
635	}
636	}
637	}
638
639	if (speed < 0)
640	dst->speed_left -= rndm ();
641
642	dst->activate ();	624	dst->activate ();
643	}	625	}
644		626
645	void	627	void
646	object::instantiate ()	628	object::instantiate ()
647	{	629	{
648	if (!uuid.seq) // HACK	630	if (!uuid.seq) // HACK
649	uuid = UUID::gen ();	631	uuid = UUID::gen ();
650		632
		633	// TODO: unclean state changes, should not be done in copy_to AND instantiate
		634	if (flag [FLAG_RANDOM_SPEED] && speed)
		635	speed_left = - speed - rndm (); // TODO animation
		636	else
651	speed_left = -0.1f;	637	speed_left = -1.;
		638
652	/* copy the body_info to the body_used - this is only really	639	/* copy the body_info to the body_used - this is only really
653	* need for monsters, but doesn't hurt to do it for everything.	640	* need for monsters, but doesn't hurt to do it for everything.
654	* by doing so, when a monster is created, it has good starting	641	* by doing so, when a monster is created, it has good starting
655	* values for the body_used info, so when items are created	642	* values for the body_used info, so when items are created
656	* for it, they can be properly equipped.	643	* for it, they can be properly equipped.
657	*/	644	*/
658	for (int i = NUM_BODY_LOCATIONS; i--; )	645	for (int i = 0; i < NUM_BODY_LOCATIONS; ++i)
659	slot[i].used = slot[i].info;	646	slot[i].used = slot[i].info;
660		647
661	attachable::instantiate ();	648	attachable::instantiate ();
662	}	649	}
663		650
664	object *	651	object *
665	object::clone ()	652	object::clone ()
666	{	653	{
667	object *neu = create ();	654	object *neu = create ();
668	copy_to (neu);	655	copy_to (neu);
		656
		657	// TODO: unclean state changes, should not be done in clone AND instantiate
		658	if (neu->flag [FLAG_RANDOM_SPEED] && neu->speed)
		659	neu->speed_left = - neu->speed - rndm (); // TODO animation
		660
669	neu->map = map; // not copied by copy_to	661	neu->map = map; // not copied by copy_to
670	return neu;	662	return neu;
		663	}
		664
		665	// update the anhimation frame of an object, but only if it has an animation
		666	// assigned and the frame number if within the animation.
		667	void object::update_anim_frame (int frame)
		668	{
		669	if (ecb_expect_false (!has_anim () || frame >= anim_frames ()))
		670	return;
		671
		672	set_anim_frame (frame);
		673	update_object (this, UP_OBJ_FACE);
671	}	674	}
672		675
673	/*	676	/*
674	* If an object with the IS_TURNABLE() flag needs to be turned due	677	* If an object with the IS_TURNABLE() flag needs to be turned due
675	* to the closest player being on the other side, this function can	678	* to the closest player being on the other side, this function can
676	* be called to update the face variable, _and_ how it looks on the map.	679	* be called to update the face variable, _and_ how it looks on the map.
677	*/	680	*/
678	void	681	void
679	update_turn_face (object *op)	682	update_turn_face (object *op)
680	{	683	{
681	if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || !op->arch)	684	if (!op->flag [FLAG_IS_TURNABLE] || !op->arch)
682	return;	685	return;
683		686
684	SET_ANIMATION (op, op->direction);	687	op->update_anim_frame (op->direction);
685	update_object (op, UP_OBJ_FACE);
686	}	688	}
687		689
688	/*	690	/*
689	* Updates the speed of an object. If the speed changes from 0 to another	691	* Updates the speed of an object. If the speed changes from 0 to another
690	* value, or vice versa, then add/remove the object from the active list.	692	* value, or vice versa, then add/remove the object from the active list.
691	* This function needs to be called whenever the speed of an object changes.	693	* This function needs to be called whenever the speed of an object changes.
692	*/	694	*/
693	void	695	void
694	object::set_speed (float speed)	696	object::set_speed (float speed)
695	{	697	{
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;	698	this->speed = speed;
703		699
704	if (has_active_speed ())	700	if (has_active_speed ())
705	activate ();	701	activate ();
706	else	702	else
707	deactivate ();	703	deactivate ();
708	}	704	}
709		705
710	/*	706	/*
711	* update_object() updates the the map.	707	* update_object() updates the map.
712	* It takes into account invisible objects (and represent squares covered	708	* It takes into account invisible objects (and represent squares covered
713	* by invisible objects by whatever is below them (unless it's another	709	* by invisible objects by whatever is below them (unless it's another
714	* invisible object, etc...)	710	* invisible object, etc...)
715	* If the object being updated is beneath a player, the look-window	711	* If the object being updated is beneath a player, the look-window
716	* of that player is updated (this might be a suboptimal way of	712	* of that player is updated (this might be a suboptimal way of
…		…
753	}	749	}
754		750
755	mapspace &m = op->ms ();	751	mapspace &m = op->ms ();
756		752
757	if (!(m.flags_ & P_UPTODATE))	753	if (!(m.flags_ & P_UPTODATE))
758	/* nop */;	754	m.update_up (); // nothing to do except copy up
759	else if (action == UP_OBJ_INSERT)	755	else if (action == UP_OBJ_INSERT)
760	{	756	{
		757	#if 0
761	// this is likely overkill, TODO: revisit (schmorp)	758	// this is likely overkill, TODO: revisit (schmorp)
762	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))	759	if ((op->flag [FLAG_BLOCKSVIEW] && !(m.flags_ & P_BLOCKSVIEW))
763	|| (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))	760	|| (op->flag [FLAG_NO_MAGIC] && !(m.flags_ & P_NO_MAGIC))
764	|| (op->is_player () && !(m.flags_ & P_PLAYER))	761	|| (op->is_player () && !(m.flags_ & P_PLAYER))
765	|| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))	762	|| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
766	|| (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))	763	|| (op->flag [FLAG_ALIVE] && !(m.flags_ & P_IS_ALIVE))
767	|| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))	764	|| (op->flag [FLAG_DAMNED] && !(m.flags_ & P_NO_CLERIC))
768	|| (m.move_on | op->move_on ) != m.move_on	765	|| (m.move_on | op->move_on ) != m.move_on
769	|| (m.move_off | op->move_off ) != m.move_off	766	|| (m.move_off | op->move_off ) != m.move_off
770	|| (m.move_slow | op->move_slow) != m.move_slow	767	|| (m.move_slow | op->move_slow) != m.move_slow
771	/* This isn't perfect, but I don't expect a lot of objects to	768	/* This isn't perfect, but I don't expect a lot of objects to
772	* have move_allow right now.	769	* have move_allow right now.
773	*/	770	*/
774	|| ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block	771	|| ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block
775	|| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)
776	m.invalidate ();	772	m.invalidate ();
		773	#else
		774	// the above is not strong enough a test to skip updating. los maybe? TODO (schmorp)
		775	m.invalidate ();
		776	#endif
777	}	777	}
778	/* if the object is being removed, we can't make intelligent	778	/* if the object is being removed, we can't make intelligent
779	* decisions, because remove_ob can't really pass the object	779	* decisions, because remove_ob can't really pass the object
780	* that is being removed.	780	* that is being removed.
781	*/	781	*/
782	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)	782	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
783	m.invalidate ();	783	m.invalidate ();
784	else if (action == UP_OBJ_FACE)	784	else if (action == UP_OBJ_FACE)
785	/* Nothing to do for that case */ ;	785	m.update_up (); // nothing to do for that case, except copy up
786	else	786	else
787	LOG (llevError, "update_object called with invalid action: %d\n", action);	787	LOG (llevError, "update_object called with invalid action: %d\n", action);
788		788
789	if (op->more)	789	if (op->more)
790	update_object (op->more, action);	790	update_object (op->more, action);
791	}	791	}
792		792
793	object::object ()	793	object::object ()
794	{	794	{
795	SET_FLAG (this, FLAG_REMOVED);	795	this->set_flag (FLAG_REMOVED);
796		796
797	expmul = 1.0;	797	//expmul = 1.0; declared const for the time being
798	face = blank_face;	798	face = blank_face;
		799	material = MATERIAL_NULL;
799	}	800	}
800		801
801	object::~object ()	802	object::~object ()
802	{	803	{
803	unlink ();	804	unlink ();
804		805
805	free_key_values (this);	806	kv.clear ();
806	}	807	}
807
808	static int object_count;
809		808
810	void object::link ()	809	void object::link ()
811	{	810	{
812	assert (!index);//D	811	assert (!index);//D
813	uuid = UUID::gen ();	812	uuid = UUID::gen ();
814	count = ++object_count;
815		813
816	refcnt_inc ();	814	refcnt_inc ();
817	objects.insert (this);	815	objects.insert (this);
		816
		817	++create_count;
		818
818	}	819	}
819		820
820	void object::unlink ()	821	void object::unlink ()
821	{	822	{
822	if (!index)	823	if (!index)
823	return;	824	return;
		825
		826	++destroy_count;
824		827
825	objects.erase (this);	828	objects.erase (this);
826	refcnt_dec ();	829	refcnt_dec ();
827	}	830	}
828		831
…		…
831	{	834	{
832	/* If already on active list, don't do anything */	835	/* If already on active list, don't do anything */
833	if (active)	836	if (active)
834	return;	837	return;
835		838
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 ())	839	if (has_active_speed ())
		840	{
		841	if (flag [FLAG_FREED])
		842	LOG (llevError | logBacktrace, "BUG: tried to activate freed object %s\n", debug_desc ());//D
		843
840	actives.insert (this);	844	actives.insert (this);
		845	}
841	}	846	}
842		847
843	void	848	void
844	object::activate_recursive ()	849	object::activate_recursive ()
845	{	850	{
…		…
849	op->activate_recursive ();	854	op->activate_recursive ();
850	}	855	}
851		856
852	/* This function removes object 'op' from the list of active	857	/* This function removes object 'op' from the list of active
853	* objects.	858	* objects.
854	* This should only be used for style maps or other such	859	* This should only be used for style maps or other such
855	* reference maps where you don't want an object that isn't	860	* reference maps where you don't want an object that isn't
856	* in play chewing up cpu time getting processed.	861	* in play chewing up cpu time getting processed.
857	* The reverse of this is to call update_ob_speed, which	862	* The reverse of this is to call update_ob_speed, which
858	* will do the right thing based on the speed of the object.	863	* will do the right thing based on the speed of the object.
859	*/	864	*/
…		…
905	* if some form of movement is allowed, let objects	910	* if some form of movement is allowed, let objects
906	* drop on that space.	911	* drop on that space.
907	*/	912	*/
908	if (!drop_to_ground	913	if (!drop_to_ground
909	|| !map	914	|| !map
910	|| map->in_memory != MAP_ACTIVE	915	|| !map->linkable ()
911	|| map->no_drop	916	|| map->no_drop
912	|| ms ().move_block == MOVE_ALL)	917	|| ms ().move_block == MOVE_ALL)
913	{	918	{
914	while (inv)	919	while (inv)
915	inv->destroy ();	920	inv->destroy ();
…		…
931	map->insert (op, x, y);	936	map->insert (op, x, y);
932	}	937	}
933	}	938	}
934	}	939	}
935		940
		941	/*
		942	* Remove and free all objects in the inventory of the given object.
		943	* Unlike destroy_inv, this assumes the *this is destroyed as well
		944	* well, so we can (and have to!) take shortcuts.
		945	*/
		946	void
		947	object::destroy_inv_fast ()
		948	{
		949	while (object *op = inv)
		950	{
		951	// remove from object the fast way
		952	op->flag [FLAG_REMOVED] = true;
		953	op->env = 0;
		954	if ((inv = inv->below))
		955	inv->above = 0;
		956
		957	// then destroy
		958	op->destroy ();
		959	}
		960	}
		961
		962	void
		963	object::freelist_free (int count)
		964	{
		965	while (count-- && freelist)
		966	{
		967	freelist_item *next = freelist->next;
		968	// count is being "destroyed"
		969
		970	sfree ((char *)freelist, sizeof (object));
		971
		972	freelist = next;
		973	--free_count;
		974	}
		975	}
		976
		977	object *
936	object *object::create ()	978	object::create ()
937	{	979	{
938	object *op = new object;	980	object *op;
		981
		982	if (freelist)
		983	{
		984	freelist_item li = *freelist;
		985	memset (freelist, 0, sizeof (object));
		986
		987	op = new (freelist) object;
		988	op->count = li.count;
		989
		990	freelist = li.next;
		991	--free_count;
		992	}
		993	else
		994	{
		995	void *ni = salloc0<char> (sizeof (object));
		996
		997	op = new(ni) object;
		998
		999	op->count = ++object_count;
		1000	}
		1001
939	op->link ();	1002	op->link ();
		1003
940	return op;	1004	return op;
941	}	1005	}
942		1006
943	static struct freed_map : maptile	1007	void
		1008	object::do_delete ()
944	{	1009	{
945	freed_map ()	1010	uint32_t count = this->count;
946	{
947	path = "<freed objects map>";
948	name = "/internal/freed_objects_map";
949	width = 3;
950	height = 3;
951	no_drop = 1;
952	no_reset = 1;
953		1011
954	alloc ();	1012	this->~object ();
955	in_memory = MAP_ACTIVE;
956	}
957		1013
958	~freed_map ()	1014	freelist_item *li = (freelist_item *)this;
959	{	1015	li->next = freelist;
960	destroy ();	1016	li->count = count;
961	}	1017
962	} freed_map; // freed objects are moved here to avoid crashes	1018	freelist = li;
		1019	++free_count;
		1020	}
963		1021
964	void	1022	void
965	object::do_destroy ()	1023	object::do_destroy ()
966	{	1024	{
967	if (flag [FLAG_IS_LINKED])	1025	if (flag [FLAG_IS_LINKED])
…		…
1010	LOG (llevError | logBacktrace, "tried to destroy the tail of an object");	1068	LOG (llevError | logBacktrace, "tried to destroy the tail of an object");
1011	head->destroy ();	1069	head->destroy ();
1012	return;	1070	return;
1013	}	1071	}
1014		1072
1015	destroy_inv (false);	1073	destroy_inv_fast ();
1016		1074
1017	if (is_head ())	1075	if (is_head ())
1018	if (sound_destroy)	1076	if (sound_destroy)
1019	play_sound (sound_destroy);	1077	play_sound (sound_destroy);
1020	else if (flag [FLAG_MONSTER])	1078	else if (flag [FLAG_MONSTER])
…		…
1031	* the previous environment.	1089	* the previous environment.
1032	*/	1090	*/
1033	void	1091	void
1034	object::do_remove ()	1092	object::do_remove ()
1035	{	1093	{
1036	object *tmp, *last = 0;
1037	object *otmp;
1038
1039	if (flag [FLAG_REMOVED])	1094	if (flag [FLAG_REMOVED])
1040	return;	1095	return;
1041		1096
1042	INVOKE_OBJECT (REMOVE, this);	1097	INVOKE_OBJECT (REMOVE, this);
1043		1098
1044	flag [FLAG_REMOVED] = true;	1099	flag [FLAG_REMOVED] = true;
1045		1100
1046	if (more)	1101	if (more)
1047	more->remove ();	1102	more->remove ();
1048		1103
1049	/*	1104	/*
1050	* In this case, the object to be removed is in someones	1105	* In this case, the object to be removed is in someones
1051	* inventory.	1106	* inventory.
1052	*/	1107	*/
1053	if (env)	1108	if (env)
1054	{	1109	{
1055	flag [FLAG_REMOVED] = false; // hack around the issue of visible_to checking flag_removed	1110	flag [FLAG_REMOVED] = false; // hack around the issue of visible_to checking flag_removed
1056	if (object *pl = visible_to ())	1111	if (object *pl = visible_to ())
1057	esrv_del_item (pl->contr, count);	1112	esrv_del_item (pl->contr, count);
1058	flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed	1113	flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed
1059		1114
1060	adjust_weight (env, -total_weight ());	1115	adjust_weight (env, total_weight (), 0);
1061		1116
1062	object *pl = in_player ();	1117	object *pl = in_player ();
1063		1118
1064	/* we set up values so that it could be inserted into	1119	/* we set up values so that it could be inserted into
1065	* the map, but we don't actually do that - it is up	1120	* the map, but we don't actually do that - it is up
…		…
1075		1130
1076	above = 0;	1131	above = 0;
1077	below = 0;	1132	below = 0;
1078	env = 0;	1133	env = 0;
1079		1134
1080	/* NO_FIX_PLAYER is set when a great many changes are being	1135	if (pl && pl->is_player ())
1081	* made to players inventory. If set, avoiding the call
1082	* to save cpu time.
1083	*/	1136	{
1084	if (pl)	1137	if (ecb_expect_false (pl->contr->combat_ob == this))
1085	if (pl->is_player () && (glow_radius || !QUERY_FLAG (pl, FLAG_NO_FIX_PLAYER)))
1086	{	1138	{
1087	pl->update_stats ();	1139	pl->apply (pl->contr->combat_ob, AP_UNAPPLY | AP_IGNORE_CURSE);
		1140	pl->contr->combat_ob = 0;
		1141	if (pl->contr->ranged_ob) pl->apply (pl->contr->ranged_ob);
		1142	}
1088		1143
		1144	if (ecb_expect_false (pl->contr->ranged_ob == this))
		1145	{
		1146	pl->apply (pl->contr->ranged_ob, AP_UNAPPLY | AP_IGNORE_CURSE);
		1147	pl->contr->ranged_ob = 0;
		1148	if (pl->contr->combat_ob) pl->apply (pl->contr->combat_ob);
		1149	}
		1150
		1151	pl->contr->queue_stats_update ();
		1152
1089	if (glow_radius && pl->is_on_map ())	1153	if (ecb_expect_false (glow_radius) && pl->is_on_map ())
1090	update_all_los (pl->map, pl->x, pl->y);	1154	update_all_los (pl->map, pl->x, pl->y);
1091	}	1155	}
1092	}	1156	}
1093	else if (map)	1157	else if (map)
1094	{	1158	{
1095	map->dirty = true;	1159	map->dirty = true;
1096	mapspace &ms = this->ms ();	1160	mapspace &ms = this->ms ();
…		…
1109	close_container ();	1173	close_container ();
1110		1174
1111	--map->players;	1175	--map->players;
1112	map->touch ();	1176	map->touch ();
1113	}	1177	}
1114	else if (pl->container == this)	1178	else if (pl->container_ () == this)
1115	{	1179	{
1116	// removing a container should close it	1180	// removing a container should close it
1117	close_container ();	1181	close_container ();
1118	}	1182	}
1119		1183	else
1120	esrv_del_item (pl->contr, count);	1184	esrv_del_item (pl->contr, count);
1121	}	1185	}
1122		1186
1123	/* link the object above us */	1187	/* link the object above us */
1124	// re-link, make sure compiler can easily use cmove	1188	// re-link, make sure compiler can easily use cmove
1125	*(above ? &above->below : &ms.top) = below;	1189	*(above ? &above->below : &ms.top) = below;
…		…
1128	above = 0;	1192	above = 0;
1129	below = 0;	1193	below = 0;
1130		1194
1131	ms.invalidate ();	1195	ms.invalidate ();
1132		1196
1133	if (map->in_memory == MAP_SAVING)
1134	return;
1135
1136	int check_walk_off = !flag [FLAG_NO_APPLY];	1197	int check_walk_off = !flag [FLAG_NO_APPLY];
1137		1198
1138	if (object *pl = ms.player ())	1199	if (object *pl = ms.player ())
1139	{	1200	{
1140	if (pl->container == this)	1201	if (pl->container_ () == this)
1141	/* If a container that the player is currently using somehow gets	1202	/* If a container that the player is currently using somehow gets
1142	* removed (most likely destroyed), update the player view	1203	* removed (most likely destroyed), update the player view
1143	* appropriately.	1204	* appropriately.
1144	*/	1205	*/
1145	pl->close_container ();	1206	pl->close_container ();
…		…
1149	//TODO: update floorbox to preserve ordering	1210	//TODO: update floorbox to preserve ordering
1150	if (pl->contr->ns)	1211	if (pl->contr->ns)
1151	pl->contr->ns->floorbox_update ();	1212	pl->contr->ns->floorbox_update ();
1152	}	1213	}
1153		1214
		1215	if (check_walk_off)
1154	for (tmp = ms.bot; tmp; tmp = tmp->above)	1216	for (object *above, *tmp = ms.bot; tmp; tmp = above)
1155	{	1217	{
		1218	above = tmp->above;
		1219
1156	/* No point updating the players look faces if he is the object	1220	/* No point updating the players look faces if he is the object
1157	* being removed.	1221	* being removed.
1158	*/	1222	*/
1159		1223
1160	/* See if object moving off should effect something */	1224	/* See if object moving off should effect something */
1161	if (check_walk_off
1162	&& ((move_type & tmp->move_off)	1225	if ((move_type & tmp->move_off)
1163	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))	1226	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0)
1164	{
1165	move_apply (tmp, this, 0);	1227	move_apply (tmp, this, 0);
1166
1167	if (destroyed ())
1168	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1169	}	1228	}
1170
1171	last = tmp;
1172	}
1173		1229
1174	if (affects_los ())	1230	if (affects_los ())
1175	update_all_los (map, x, y);	1231	update_all_los (map, x, y);
1176	}	1232	}
1177	}	1233	}
…		…
1221		1277
1222	object *prev = this;	1278	object *prev = this;
1223		1279
1224	for (archetype *at = (archetype *)arch->more; at; at = (archetype *)at->more)	1280	for (archetype *at = (archetype *)arch->more; at; at = (archetype *)at->more)
1225	{	1281	{
1226	object *op = arch_to_object (at);	1282	object *op = at->instance ();
1227		1283
1228	op->name = name;	1284	op->name = name;
1229	op->name_pl = name_pl;	1285	op->name_pl = name_pl;
1230	op->title = title;	1286	op->title = title;
1231		1287
…		…
1269	* Passing 0 for flag gives proper default values, so flag really only needs	1325	* Passing 0 for flag gives proper default values, so flag really only needs
1270	* to be set if special handling is needed.	1326	* to be set if special handling is needed.
1271	*	1327	*
1272	* Return value:	1328	* Return value:
1273	* new object if 'op' was merged with other object	1329	* new object if 'op' was merged with other object
1274	* NULL if 'op' was destroyed	1330	* NULL if there was an error (destroyed, blocked etc.)
1275	* just 'op' otherwise	1331	* just 'op' otherwise
1276	*/	1332	*/
1277	object *	1333	object *
1278	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)	1334	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1279	{	1335	{
1280	op->remove ();	1336	op->remove ();
1281		1337
1282	if (m == &freed_map)//D TODO: remove soon	1338	if (m == &freed_map)//D TODO: remove soon
1283	{//D	1339	{//D
1284	LOG (llevError | logBacktrace, "tries to insret object on freed objects map: %s", op->debug_desc ());//D	1340	LOG (llevError | logBacktrace, "tries to insert object on freed objects map: %s", op->debug_desc ());//D
1285	}//D	1341	}//D
1286		1342
1287	/* Ideally, the caller figures this out. However, it complicates a lot	1343	/* Ideally, the caller figures this out. However, it complicates a lot
1288	* of areas of callers (eg, anything that uses find_free_spot would now	1344	* of areas of callers (eg, anything that uses find_free_spot would now
1289	* need extra work	1345	* need extra work
…		…
1297		1353
1298	if (object *more = op->more)	1354	if (object *more = op->more)
1299	if (!insert_ob_in_map (more, m, originator, flag))	1355	if (!insert_ob_in_map (more, m, originator, flag))
1300	return 0;	1356	return 0;
1301		1357
1302	CLEAR_FLAG (op, FLAG_REMOVED);	1358	op->flag [FLAG_REMOVED] = false;
1303		1359	op->env = 0;
1304	op->map = newmap;	1360	op->map = newmap;
		1361
1305	mapspace &ms = op->ms ();	1362	mapspace &ms = op->ms ();
1306		1363
1307	/* this has to be done after we translate the coordinates.	1364	/* this has to be done after we translate the coordinates.
1308	*/	1365	*/
1309	if (op->nrof && !(flag & INS_NO_MERGE))	1366	if (op->nrof && !(flag & INS_NO_MERGE))
…		…
1315	// from here :/	1372	// from here :/
1316	op->nrof += tmp->nrof;	1373	op->nrof += tmp->nrof;
1317	tmp->destroy ();	1374	tmp->destroy ();
1318	}	1375	}
1319		1376
1320	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1377	op->clr_flag (FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1321	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1378	op->clr_flag (FLAG_INV_LOCKED);
1322		1379
1323	if (!QUERY_FLAG (op, FLAG_ALIVE))	1380	if (!op->flag [FLAG_ALIVE])
1324	CLEAR_FLAG (op, FLAG_NO_STEAL);	1381	op->clr_flag (FLAG_NO_STEAL);
1325		1382
1326	if (flag & INS_BELOW_ORIGINATOR)	1383	if (flag & INS_BELOW_ORIGINATOR)
1327	{	1384	{
1328	if (originator->map != op->map || originator->x != op->x || originator->y != op->y)	1385	if (originator->map != op->map || originator->x != op->x || originator->y != op->y)
1329	{	1386	{
1330	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");	1387	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");
1331	abort ();	1388	abort ();
1332	}	1389	}
1333		1390
1334	if (!originator->is_on_map ())	1391	if (!originator->is_on_map ())
		1392	{
1335	LOG (llevDebug | logBacktrace, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map",	1393	LOG (llevError, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map",
1336	op->debug_desc (), originator->debug_desc ());	1394	op->debug_desc (), originator->debug_desc ());
		1395	abort ();
		1396	}
1337		1397
1338	op->above = originator;	1398	op->above = originator;
1339	op->below = originator->below;	1399	op->below = originator->below;
1340	originator->below = op;	1400	originator->below = op;
1341		1401
…		…
1354	* We've already dealt with merging if appropriate.	1414	* We've already dealt with merging if appropriate.
1355	* Generally, we want to put the new object on top. But if	1415	* Generally, we want to put the new object on top. But if
1356	* flag contains INS_ABOVE_FLOOR_ONLY, once we find the last	1416	* flag contains INS_ABOVE_FLOOR_ONLY, once we find the last
1357	* floor, we want to insert above that and no further.	1417	* floor, we want to insert above that and no further.
1358	* Also, if there are spell objects on this space, we stop processing	1418	* Also, if there are spell objects on this space, we stop processing
1359	* once we get to them. This reduces the need to traverse over all of	1419	* once we get to them. This reduces the need to traverse over all of
1360	* them when adding another one - this saves quite a bit of cpu time	1420	* them when adding another one - this saves quite a bit of cpu time
1361	* when lots of spells are cast in one area. Currently, it is presumed	1421	* when lots of spells are cast in one area. Currently, it is presumed
1362	* that flying non pickable objects are spell objects.	1422	* that flying non pickable objects are spell objects.
1363	*/	1423	*/
1364	for (object *tmp = ms.bot; tmp; tmp = tmp->above)	1424	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1365	{	1425	{
1366	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) || QUERY_FLAG (tmp, FLAG_OVERLAY_FLOOR))	1426	if (tmp->flag [FLAG_IS_FLOOR] || tmp->flag [FLAG_OVERLAY_FLOOR])
1367	floor = tmp;	1427	floor = tmp;
1368		1428
1369	if (QUERY_FLAG (tmp, FLAG_NO_PICK) && (tmp->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (tmp, FLAG_IS_FLOOR))	1429	if (tmp->flag [FLAG_NO_PICK] && (tmp->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !tmp->flag [FLAG_IS_FLOOR])
1370	{	1430	{
1371	/* We insert above top, so we want this object below this */	1431	/* We insert above top, so we want this object below this */
1372	top = tmp->below;	1432	top = tmp->below;
1373	break;	1433	break;
1374	}	1434	}
…		…
1392	&& (op->face && !faces [op->face].visibility))	1452	&& (op->face && !faces [op->face].visibility))
1393	{	1453	{
1394	object *last;	1454	object *last;
1395		1455
1396	for (last = top; last != floor; last = last->below)	1456	for (last = top; last != floor; last = last->below)
1397	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1457	if (last->flag [FLAG_BLOCKSVIEW] && (last->type != EXIT))
1398	break;	1458	break;
1399		1459
1400	/* Check to see if we found the object that blocks view,	1460	/* Check to see if we found the object that blocks view,
1401	* and make sure we have a below pointer for it so that	1461	* and make sure we have a below pointer for it so that
1402	* we can get inserted below this one, which requires we	1462	* we can get inserted below this one, which requires we
…		…
1473	* blocked() and wall() work properly), and these flags are updated by	1533	* blocked() and wall() work properly), and these flags are updated by
1474	* update_object().	1534	* update_object().
1475	*/	1535	*/
1476		1536
1477	/* if this is not the head or flag has been passed, don't check walk on status */	1537	/* if this is not the head or flag has been passed, don't check walk on status */
1478	if (!(flag & INS_NO_WALK_ON) && op->head_ () == op)	1538	if (!(flag & INS_NO_WALK_ON) && op->is_head ())
1479	{	1539	{
1480	if (check_move_on (op, originator))	1540	if (check_move_on (op, originator, flag))
1481	return 0;	1541	return 0;
1482		1542
1483	/* If we are a multi part object, lets work our way through the check	1543	/* If we are a multi part object, let's work our way through the check
1484	* walk on's.	1544	* walk on's.
1485	*/	1545	*/
1486	for (object *tmp = op->more; tmp; tmp = tmp->more)	1546	for (object *tmp = op->more; tmp; tmp = tmp->more)
1487	if (check_move_on (tmp, originator))	1547	if (check_move_on (tmp, originator, flag))
1488	return 0;	1548	return 0;
1489	}	1549	}
1490		1550
1491	return op;	1551	return op;
1492	}	1552	}
1493		1553
1494	/* this function inserts an object in the map, but if it	1554	/* this function inserts an object in the map, but if it
1495	* finds an object of its own type, it'll remove that one first.	1555	* finds an object of its own type, it'll remove that one first.
1496	* op is the object to insert it under: supplies x and the map.	1556	* op is the object to insert it under: supplies x and the map.
1497	*/	1557	*/
1498	void	1558	void
1499	replace_insert_ob_in_map (shstr_tmp archname, object *op)	1559	replace_insert_ob_in_map (shstr_tmp archname, object *op)
1500	{	1560	{
…		…
1502		1562
1503	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)	1563	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1504	if (tmp->arch->archname == archname) /* same archetype */	1564	if (tmp->arch->archname == archname) /* same archetype */
1505	tmp->destroy ();	1565	tmp->destroy ();
1506		1566
1507	object *tmp = arch_to_object (archetype::find (archname));	1567	object *tmp = archetype::find (archname)->instance ();
1508		1568
1509	tmp->x = op->x;	1569	tmp->x = op->x;
1510	tmp->y = op->y;	1570	tmp->y = op->y;
1511		1571
1512	insert_ob_in_map (tmp, op->map, op, 0);	1572	insert_ob_in_map (tmp, op->map, op, 0);
…		…
1517	{	1577	{
1518	if (where->env)	1578	if (where->env)
1519	return where->env->insert (this);	1579	return where->env->insert (this);
1520	else	1580	else
1521	return where->map->insert (this, where->x, where->y, originator, flags);	1581	return where->map->insert (this, where->x, where->y, originator, flags);
		1582	}
		1583
		1584	// check whether we can put this into the map, respect max_volume, max_items
		1585	bool
		1586	object::can_drop_at (maptile *m, int x, int y, object *originator)
		1587	{
		1588	mapspace &ms = m->at (x, y);
		1589
		1590	int items = ms.items ();
		1591
		1592	if (!items // testing !items ensures we can drop at least one item
		1593	|| (items < m->max_items
		1594	&& ms.volume () < m->max_volume))
		1595	return true;
		1596
		1597	if (originator)
		1598	originator->failmsgf (
		1599	"No matter how hard you try, you just cannot put the %s here! H<Try to remove some items from the floor first.>",
		1600	query_name ()
		1601	);
		1602
		1603	return false;
1522	}	1604	}
1523		1605
1524	/*	1606	/*
1525	* decrease(object, number) decreases a specified number from	1607	* decrease(object, number) decreases a specified number from
1526	* the amount of an object. If the amount reaches 0, the object	1608	* the amount of an object. If the amount reaches 0, the object
…		…
1536		1618
1537	nr = min (nr, nrof);	1619	nr = min (nr, nrof);
1538		1620
1539	if (nrof > nr)	1621	if (nrof > nr)
1540	{	1622	{
		1623	weight_t oweight = total_weight ();
		1624
1541	nrof -= nr;	1625	nrof -= nr;
1542	adjust_weight (env, -weight * max (1, nr)); // carrying == 0
1543		1626
1544	if (object *pl = visible_to ())	1627	if (object *pl = visible_to ())
1545	esrv_update_item (UPD_NROF, pl, this);	1628	esrv_update_item (UPD_NROF, pl, this);
		1629
		1630	adjust_weight (env, oweight, total_weight ());
1546		1631
1547	return true;	1632	return true;
1548	}	1633	}
1549	else	1634	else
1550	{	1635	{
…		…
1604	/*	1689	/*
1605	* env->insert (op)	1690	* env->insert (op)
1606	* This function inserts the object op in the linked list	1691	* This function inserts the object op in the linked list
1607	* inside the object environment.	1692	* inside the object environment.
1608	*	1693	*
1609	* The function returns now pointer to inserted item, and return value can	1694	* The function returns now pointer to inserted item, and return value can
1610	* be != op, if items are merged. -Tero	1695	* be != op, if items are merged. -Tero
1611	*/	1696	*/
1612	object *	1697	object *
1613	object::insert (object *op)	1698	object::insert (object *op)
1614	{	1699	{
…		…
1625	if (op->nrof)	1710	if (op->nrof)
1626	for (object *tmp = inv; tmp; tmp = tmp->below)	1711	for (object *tmp = inv; tmp; tmp = tmp->below)
1627	if (object::can_merge (tmp, op))	1712	if (object::can_merge (tmp, op))
1628	{	1713	{
1629	/* return the original object and remove inserted object	1714	/* return the original object and remove inserted object
1630	(client needs the original object) */	1715	(client prefers the original object) */
		1716
		1717	// carrying must be 0 for mergable objects
		1718	weight_t oweight = weight_t (tmp->weight) * tmp->nrof;
		1719
1631	tmp->nrof += op->nrof;	1720	tmp->nrof += op->nrof;
1632		1721
1633	if (object *pl = tmp->visible_to ())	1722	if (object *pl = tmp->visible_to ())
1634	esrv_update_item (UPD_NROF, pl, tmp);	1723	esrv_update_item (UPD_NROF, pl, tmp);
1635		1724
1636	adjust_weight (this, op->total_weight ());	1725	adjust_weight (this, oweight, weight_t (tmp->weight) * tmp->nrof);
1637		1726
1638	op->destroy ();	1727	op->destroy ();
1639	op = tmp;	1728	op = tmp;
1640	goto inserted;	1729	goto inserted;
1641	}	1730	}
…		…
1657	op->flag [FLAG_REMOVED] = 0;	1746	op->flag [FLAG_REMOVED] = 0;
1658		1747
1659	if (object *pl = op->visible_to ())	1748	if (object *pl = op->visible_to ())
1660	esrv_send_item (pl, op);	1749	esrv_send_item (pl, op);
1661		1750
1662	adjust_weight (this, op->total_weight ());	1751	adjust_weight (this, 0, op->total_weight ());
1663		1752
1664	inserted:	1753	inserted:
1665	/* reset the light list and los of the players on the map */	1754	/* reset the light list and los of the players on the map */
1666	if (op->glow_radius && is_on_map ())	1755	if (op->glow_radius && is_on_map ())
1667	{	1756	{
1668	update_stats ();	1757	update_stats ();
1669	update_all_los (map, x, y);	1758	update_all_los (map, x, y);
1670	}	1759	}
1671	else if (is_player () && !flag [FLAG_NO_FIX_PLAYER])	1760	else if (is_player ())
1672	// if this is a player's inventory, update stats	1761	// if this is a player's inventory, update stats
1673	update_stats ();	1762	contr->queue_stats_update ();
1674		1763
1675	INVOKE_OBJECT (INSERT, this);	1764	INVOKE_OBJECT (INSERT, this);
1676		1765
1677	return op;	1766	return op;
1678	}	1767	}
…		…
1696	* MSW 2001-07-08: Check all objects on space, not just those below	1785	* MSW 2001-07-08: Check all objects on space, not just those below
1697	* object being inserted. insert_ob_in_map may not put new objects	1786	* object being inserted. insert_ob_in_map may not put new objects
1698	* on top.	1787	* on top.
1699	*/	1788	*/
1700	int	1789	int
1701	check_move_on (object *op, object *originator)	1790	check_move_on (object *op, object *originator, int flags)
1702	{	1791	{
		1792	if (op->flag [FLAG_NO_APPLY])
		1793	return 0;
		1794
1703	object *tmp;	1795	object *tmp;
1704	maptile *m = op->map;	1796	maptile *m = op->map;
1705	int x = op->x, y = op->y;	1797	int x = op->x, y = op->y;
1706		1798
1707	MoveType move_on, move_slow, move_block;	1799	mapspace &ms = m->at (x, y);
1708		1800
1709	if (QUERY_FLAG (op, FLAG_NO_APPLY))	1801	ms.update ();
1710	return 0;
1711		1802
1712	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);	1803	MoveType move_on = ms.move_on;
1713	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);	1804	MoveType move_slow = ms.move_slow;
1714	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);	1805	MoveType move_block = ms.move_block;
1715		1806
1716	/* if nothing on this space will slow op down or be applied,	1807	/* 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	1808	* 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	1809	* is set, as lots of objects don't have it set - we treat that
1719	* as walking.	1810	* as walking.
…		…
1728	*/	1819	*/
1729	if ((op->move_type & ~move_on & ~move_block) != 0 && (op->move_type & ~move_slow & ~move_block) != 0)	1820	if ((op->move_type & ~move_on & ~move_block) != 0 && (op->move_type & ~move_slow & ~move_block) != 0)
1730	return 0;	1821	return 0;
1731		1822
1732	/* The objects have to be checked from top to bottom.	1823	/* The objects have to be checked from top to bottom.
1733	* Hence, we first go to the top:	1824	* Hence, we first go to the top:
1734	*/	1825	*/
1735		1826	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	}	1827	{
		1828	next = tmp->below;
1745		1829
1746	for (; tmp; tmp = tmp->below)
1747	{
1748	if (tmp == op)	1830	if (tmp == op)
1749	continue; /* Can't apply yourself */	1831	continue; /* Can't apply yourself */
1750		1832
1751	/* Check to see if one of the movement types should be slowed down.	1833	/* 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	1834	* Second check makes sure that the movement types not being slowed
1753	* (~slow_move) is not blocked on this space - just because the	1835	* (~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	1836	* 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.	1837	* swim on that space, can't use it to avoid the penalty.
1756	*/	1838	*/
1757	if (!QUERY_FLAG (op, FLAG_WIZPASS))	1839	if (!op->flag [FLAG_WIZPASS])
1758	{	1840	{
1759	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||	1841	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))	1842	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1761	{	1843	{
1762
1763	float
1764	diff = tmp->move_slow_penalty * fabs (op->speed);	1844	float diff = tmp->move_slow_penalty * fabs (op->speed);
1765		1845
1766	if (op->is_player ())	1846	if (op->is_player ())
1767	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||	1847	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)))	1848	(tmp->flag [FLAG_IS_WOODED] && find_skill_by_number (op, SK_WOODSMAN)))
1769	diff /= 4.0;	1849	diff /= 4.0;
1770		1850
1771	op->speed_left -= diff;	1851	op->speed_left -= diff;
1772	}	1852	}
1773	}	1853	}
1774		1854
1775	/* Basically same logic as above, except now for actual apply. */	1855	/* Basically same logic as above, except now for actual apply. */
1776	if ((!op->move_type && tmp->move_on & MOVE_WALK) ||	1856	if ((!op->move_type && tmp->move_on & MOVE_WALK) ||
1777	((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))	1857	((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))
1778	{	1858	{
		1859	if ((flags & INS_NO_AUTO_EXIT)
		1860	&& (tmp->type == EXIT || tmp->type == TELEPORTER
		1861	|| tmp->type == HOLE || tmp->type == TRAPDOOR)) //TODO: temporary, fix exits instead
		1862	continue;
		1863
1779	move_apply (tmp, op, originator);	1864	move_apply (tmp, op, originator);
1780		1865
1781	if (op->destroyed ())	1866	if (op->destroyed ())
1782	return 1;	1867	return 1;
1783		1868
…		…
1895	void	1980	void
1896	flag_inv (object *op, int flag)	1981	flag_inv (object *op, int flag)
1897	{	1982	{
1898	for (object *tmp = op->inv; tmp; tmp = tmp->below)	1983	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1899	{	1984	{
1900	SET_FLAG (tmp, flag);	1985	tmp->set_flag (flag);
1901	flag_inv (tmp, flag);	1986	flag_inv (tmp, flag);
1902	}	1987	}
1903	}	1988	}
1904		1989
1905	/*	1990	/*
…		…
1908	void	1993	void
1909	unflag_inv (object *op, int flag)	1994	unflag_inv (object *op, int flag)
1910	{	1995	{
1911	for (object *tmp = op->inv; tmp; tmp = tmp->below)	1996	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1912	{	1997	{
1913	CLEAR_FLAG (tmp, flag);	1998	tmp->clr_flag (flag);
1914	unflag_inv (tmp, flag);	1999	unflag_inv (tmp, flag);
1915	}	2000	}
1916	}	2001	}
1917		2002
1918	/*	2003	/*
…		…
1928	* inform the caller. However, insert_ob_in_map will update as	2013	* inform the caller. However, insert_ob_in_map will update as
1929	* necessary, so the caller shouldn't need to do any special work.	2014	* necessary, so the caller shouldn't need to do any special work.
1930	* Note - updated to take an object instead of archetype - this is necessary	2015	* Note - updated to take an object instead of archetype - this is necessary
1931	* because arch_blocked (now ob_blocked) needs to know the movement type	2016	* because arch_blocked (now ob_blocked) needs to know the movement type
1932	* to know if the space in question will block the object. We can't use	2017	* to know if the space in question will block the object. We can't use
1933	* the archetype because that isn't correct if the monster has been	2018	* the archetype because that isn't correct if the monster has been
1934	* customized, changed states, etc.	2019	* customized, changed states, etc.
1935	*/	2020	*/
1936	int	2021	int
1937	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)	2022	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
1938	{	2023	{
1939	int altern[SIZEOFFREE];	2024	int altern[SIZEOFFREE];
1940	int index = 0, flag;	2025	int index = 0;
1941		2026
1942	for (int i = start; i < stop; i++)	2027	for (int i = start; i < stop; i++)
1943	{	2028	{
1944	mapxy pos (m, x, y); pos.move (i);	2029	mapxy pos (m, x, y); pos.move (i);
1945		2030
…		…
1961	continue;	2046	continue;
1962	}	2047	}
1963		2048
1964	/* Basically, if we find a wall on a space, we cut down the search size.	2049	/* Basically, if we find a wall on a space, we cut down the search size.
1965	* In this way, we won't return spaces that are on another side of a wall.	2050	* In this way, we won't return spaces that are on another side of a wall.
1966	* This mostly work, but it cuts down the search size in all directions -	2051	* This mostly work, but it cuts down the search size in all directions -
1967	* if the space being examined only has a wall to the north and empty	2052	* if the space being examined only has a wall to the north and empty
1968	* spaces in all the other directions, this will reduce the search space	2053	* spaces in all the other directions, this will reduce the search space
1969	* to only the spaces immediately surrounding the target area, and	2054	* to only the spaces immediately surrounding the target area, and
1970	* won't look 2 spaces south of the target space.	2055	* won't look 2 spaces south of the target space.
1971	*/	2056	*/
…		…
2001	*/	2086	*/
2002	int	2087	int
2003	find_first_free_spot (const object *ob, maptile *m, int x, int y)	2088	find_first_free_spot (const object *ob, maptile *m, int x, int y)
2004	{	2089	{
2005	for (int i = 0; i < SIZEOFFREE; i++)	2090	for (int i = 0; i < SIZEOFFREE; i++)
2006	if (!ob->blocked (m, x + freearr_x[i], y + freearr_y[i]))	2091	if (!ob->blocked (m, x + DIRX (i), y + DIRY (i)))
2007	return i;	2092	return i;
2008		2093
2009	return -1;	2094	return -1;
2010	}	2095	}
2011		2096
…		…
2022		2107
2023	while (--end)	2108	while (--end)
2024	swap (arr [end], arr [rndm (end + 1)]);	2109	swap (arr [end], arr [rndm (end + 1)]);
2025	}	2110	}
2026		2111
2027	/* new function to make monster searching more efficient, and effective!	2112	/* new function to make monster searching more efficient, and effective!
2028	* This basically returns a randomized array (in the passed pointer) of	2113	* This basically returns a randomized array (in the passed pointer) of
2029	* the spaces to find monsters. In this way, it won't always look for	2114	* the spaces to find monsters. In this way, it won't always look for
2030	* monsters to the north first. However, the size of the array passed	2115	* monsters to the north first. However, the size of the array passed
2031	* covers all the spaces, so within that size, all the spaces within	2116	* covers all the spaces, so within that size, all the spaces within
2032	* the 3x3 area will be searched, just not in a predictable order.	2117	* the 3x3 area will be searched, just not in a predictable order.
…		…
2057	* there is capable of.	2142	* there is capable of.
2058	*/	2143	*/
2059	int	2144	int
2060	find_dir (maptile *m, int x, int y, object *exclude)	2145	find_dir (maptile *m, int x, int y, object *exclude)
2061	{	2146	{
2062	int max = SIZEOFFREE, mflags;	2147	int max = SIZEOFFREE;
2063	MoveType move_type;	2148	MoveType move_type;
2064		2149
2065	if (exclude && exclude->head_ () != exclude)	2150	if (exclude && exclude->head_ () != exclude)
2066	{	2151	{
2067	exclude = exclude->head;	2152	exclude = exclude->head;
…		…
2108	{	2193	{
2109	return (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);	2194	return (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);
2110	}	2195	}
2111		2196
2112	/*	2197	/*
2113	* find_dir_2(delta-x,delta-y) will return a direction in which	2198	* find_dir_2(delta-x,delta-y) will return a direction value
2114	* an object which has subtracted the x and y coordinates of another	2199	* for running into direct [dx, dy].
2115	* object, needs to travel toward it.	2200	* (the opposite of crossfire's find_dir_2!)
2116	*/	2201	*/
2117	int	2202	int
2118	find_dir_2 (int x, int y)	2203	find_dir_2 (int x, int y)
2119	{	2204	{
		2205	#if 1 // new algorithm
		2206	// this works by putting x, y into 16 sectors, which
		2207	// are not equal sized, but are a better approximation
		2208	// then the old algorithm, and then using a mapping
		2209	// table to map it into a direction value.
		2210	// basically, it maps these comparisons to each bit
		2211	// bit #3: x < 0
		2212	// bit #2: y < 0
		2213	// bit #1: x > y
		2214	// bit #0: x > 2y
		2215
		2216	static const uint8 dir[16] = {
		2217	4, 5, 4, 3,
		2218	2, 1, 2, 3,
		2219	6, 5, 6, 7,
		2220	8, 1, 8, 7,
		2221	};
		2222	int sector = 0;
		2223
		2224	// this is a bit ugly, but more likely to result in branchless code
		2225	sector |= x < 0 ? 8 : 0;
		2226	x = x < 0 ? -x : x; // abs
		2227
		2228	sector |= y < 0 ? 4 : 0;
		2229	y = y < 0 ? -y : y; // abs
		2230
		2231	if (x > y)
		2232	{
		2233	sector |= 2;
		2234
		2235	if (x > y * 2)
		2236	sector |= 1;
		2237	}
		2238	else
		2239	{
		2240	if (y > x * 2)
		2241	sector |= 1;
		2242	else if (!y)
		2243	return 0; // x == 0 here
		2244	}
		2245
		2246	return dir [sector];
		2247	#else // old algorithm
2120	int q;	2248	int q;
2121		2249
2122	if (y)	2250	if (y)
2123	q = x * 100 / y;	2251	q = 128 * x / y;
2124	else if (x)	2252	else if (x)
2125	q = -300 * x;	2253	q = -512 * x; // to make it > 309
2126	else	2254	else
2127	return 0;	2255	return 0;
2128		2256
2129	if (y > 0)	2257	if (y > 0)
2130	{	2258	{
2131	if (q < -242)	2259	if (q < -309) return 7;
		2260	if (q < -52) return 6;
		2261	if (q < 52) return 5;
		2262	if (q < 309) return 4;
		2263
2132	return 3;	2264	return 3;
2133	if (q < -41)	2265	}
2134	return 2;	2266	else
2135	if (q < 41)	2267	{
2136	return 1;	2268	if (q < -309) return 3;
2137	if (q < 242)	2269	if (q < -52) return 2;
2138	return 8;	2270	if (q < 52) return 1;
		2271	if (q < 309) return 8;
		2272
2139	return 7;	2273	return 7;
2140	}	2274	}
2141		2275	#endif
2142	if (q < -242)
2143	return 7;
2144	if (q < -41)
2145	return 6;
2146	if (q < 41)
2147	return 5;
2148	if (q < 242)
2149	return 4;
2150
2151	return 3;
2152	}	2276	}
2153		2277
2154	/*	2278	/*
2155	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is	2279	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is
2156	* between two directions (which are expected to be absolute (see absdir())	2280	* between two directions (which are expected to be absolute (see absdir())
2157	*/	2281	*/
2158	int	2282	int
2159	dirdiff (int dir1, int dir2)	2283	dirdiff (int dir1, int dir2)
2160	{	2284	{
2161	int d;
2162
2163	d = abs (dir1 - dir2);	2285	int d = abs (dir1 - dir2);
2164	if (d > 4)
2165	d = 8 - d;
2166		2286
2167	return d;	2287	return d > 4 ? 8 - d : d;
2168	}	2288	}
2169		2289
2170	/* peterm:	2290	/* peterm:
2171	* do LOS stuff for ball lightning. Go after the closest VISIBLE monster.	2291	* do LOS stuff for ball lightning. Go after the closest VISIBLE monster.
2172	* Basically, this is a table of directions, and what directions	2292	* Basically, this is a table of directions, and what directions
…		…
2174	* This basically means that if direction is 15, then it could either go	2294	* This basically means that if direction is 15, then it could either go
2175	* direction 4, 14, or 16 to get back to where we are.	2295	* direction 4, 14, or 16 to get back to where we are.
2176	* Moved from spell_util.c to object.c with the other related direction	2296	* Moved from spell_util.c to object.c with the other related direction
2177	* functions.	2297	* functions.
2178	*/	2298	*/
2179	const int reduction_dir[SIZEOFFREE][3] = {	2299	static const int reduction_dir[SIZEOFFREE][3] = {
2180	{0, 0, 0}, /* 0 */	2300	{0, 0, 0}, /* 0 */
2181	{0, 0, 0}, /* 1 */	2301	{0, 0, 0}, /* 1 */
2182	{0, 0, 0}, /* 2 */	2302	{0, 0, 0}, /* 2 */
2183	{0, 0, 0}, /* 3 */	2303	{0, 0, 0}, /* 3 */
2184	{0, 0, 0}, /* 4 */	2304	{0, 0, 0}, /* 4 */
…		…
2241	int mflags;	2361	int mflags;
2242		2362
2243	if (dir < 0)	2363	if (dir < 0)
2244	return 0; /* exit condition: invalid direction */	2364	return 0; /* exit condition: invalid direction */
2245		2365
2246	dx = x + freearr_x[dir];	2366	dx = x + DIRX (dir);
2247	dy = y + freearr_y[dir];	2367	dy = y + DIRY (dir);
2248		2368
2249	mflags = get_map_flags (m, &m, dx, dy, &dx, &dy);	2369	mflags = get_map_flags (m, &m, dx, dy, &dx, &dy);
2250		2370
2251	/* This functional arguably was incorrect before - it was	2371	/* This functional arguably was incorrect before - it was
2252	* checking for P_WALL - that was basically seeing if	2372	* checking for P_WALL - that was basically seeing if
…		…
2278	* Add a check so we can't pick up invisible objects (0.93.8)	2398	* Add a check so we can't pick up invisible objects (0.93.8)
2279	*/	2399	*/
2280	int	2400	int
2281	can_pick (const object *who, const object *item)	2401	can_pick (const object *who, const object *item)
2282	{	2402	{
2283	return /*QUERY_FLAG(who,FLAG_WIZ)|| */	2403	return /*who->flag [FLAG_WIZ]|| */
2284	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&	2404	(item->weight > 0 && !item->flag [FLAG_NO_PICK] &&
2285	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->is_player () || item->weight < who->weight / 3));	2405	!item->flag [FLAG_ALIVE] && !item->invisible && (who->is_player () || item->weight < who->weight / 3));
2286	}	2406	}
		2407
		2408	//-GPL
2287		2409
2288	/*	2410	/*
2289	* create clone from object to another	2411	* create clone from object to another
2290	*/	2412	*/
2291	object *	2413	object *
…		…
2322	return tmp;	2444	return tmp;
2323		2445
2324	return 0;	2446	return 0;
2325	}	2447	}
2326		2448
		2449	/* Zero the key_values on op, decrementing the shared-string
		2450	* refcounts and freeing the links.
		2451	*/
		2452	void
		2453	key_values::clear ()
		2454	{
		2455	for (key_value *kvp = first; kvp; )
		2456	{
		2457	key_value *next = kvp->next;
		2458	delete kvp;
		2459	kvp = next;
		2460	}
		2461
		2462	first = 0;
		2463	}
		2464
2327	shstr_tmp	2465	shstr_tmp
2328	object::kv_get (shstr_tmp key) const	2466	key_values::get (shstr_tmp key) const
2329	{	2467	{
2330	for (key_value *kv = key_values; kv; kv = kv->next)	2468	for (key_value *kv = first; kv; kv = kv->next)
2331	if (kv->key == key)	2469	if (kv->key == key)
2332	return kv->value;	2470	return kv->value;
2333		2471
2334	return shstr ();	2472	return shstr ();
2335	}	2473	}
2336		2474
2337	void	2475	void
		2476	key_values::add (shstr_tmp key, shstr_tmp value)
		2477	{
		2478	key_value *kv = new key_value;
		2479
		2480	kv->next = first;
		2481	kv->key = key;
		2482	kv->value = value;
		2483
		2484	first = kv;
		2485	}
		2486
		2487	void
2338	object::kv_set (shstr_tmp key, shstr_tmp value)	2488	key_values::set (shstr_tmp key, shstr_tmp value)
2339	{	2489	{
2340	for (key_value *kv = key_values; kv; kv = kv->next)	2490	for (key_value *kv = first; kv; kv = kv->next)
2341	if (kv->key == key)	2491	if (kv->key == key)
2342	{	2492	{
2343	kv->value = value;	2493	kv->value = value;
2344	return;	2494	return;
2345	}	2495	}
2346		2496
2347	key_value *kv = new key_value;	2497	add (key, value);
2348
2349	kv->next = key_values;
2350	kv->key = key;
2351	kv->value = value;
2352
2353	key_values = kv;
2354	}	2498	}
2355		2499
2356	void	2500	void
2357	object::kv_del (shstr_tmp key)	2501	key_values::del (shstr_tmp key)
2358	{	2502	{
2359	for (key_value **kvp = &key_values; *kvp; kvp = &(*kvp)->next)	2503	for (key_value **kvp = &first; *kvp; kvp = &(*kvp)->next)
2360	if ((*kvp)->key == key)	2504	if ((*kvp)->key == key)
2361	{	2505	{
2362	key_value *kv = *kvp;	2506	key_value *kv = *kvp;
2363	*kvp = (*kvp)->next;	2507	*kvp = (*kvp)->next;
2364	delete kv;	2508	delete kv;
2365	return;	2509	return;
2366	}	2510	}
		2511	}
		2512
		2513	void
		2514	key_values::reverse ()
		2515	{
		2516	key_value *prev = 0;
		2517	key_value *head = first;
		2518
		2519	while (head)
		2520	{
		2521	key_value *node = head;
		2522	head = head->next;
		2523	node->next = prev;
		2524	prev = node;
		2525	}
		2526
		2527	first = prev;
		2528	}
		2529
		2530	key_values &
		2531	key_values::operator =(const key_values &kv)
		2532	{
		2533	clear ();
		2534
		2535	for (key_value *kvp = kv.first; kvp; kvp = kvp->next)
		2536	add (kvp->key, kvp->value);
		2537
		2538	reverse ();
		2539
		2540	return *this;
2367	}	2541	}
2368		2542
2369	object::depth_iterator::depth_iterator (object *container)	2543	object::depth_iterator::depth_iterator (object *container)
2370	: iterator_base (container)	2544	: iterator_base (container)
2371	{	2545	{
…		…
2455	{	2629	{
2456	return map ? map->region (x, y)	2630	return map ? map->region (x, y)
2457	: region::default_region ();	2631	: region::default_region ();
2458	}	2632	}
2459		2633
2460	const materialtype_t *	2634	//+GPL
2461	object::dominant_material () const
2462	{
2463	if (materialtype_t *mt = name_to_material (materialname))
2464	return mt;
2465
2466	return name_to_material (shstr_unknown);
2467	}
2468		2635
2469	void	2636	void
2470	object::open_container (object *new_container)	2637	object::open_container (object *new_container)
2471	{	2638	{
2472	if (container == new_container)	2639	if (container == new_container)
…		…
2493	container = 0;	2660	container = 0;
2494		2661
2495	// client needs item update to make it work, client bug requires this to be separate	2662	// client needs item update to make it work, client bug requires this to be separate
2496	esrv_update_item (UPD_FLAGS, this, old_container);	2663	esrv_update_item (UPD_FLAGS, this, old_container);
2497		2664
2498	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));	2665	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", old_container->query_name ());
2499	play_sound (sound_find ("chest_close"));	2666	play_sound (sound_find ("chest_close"));
2500	}	2667	}
2501		2668
2502	if (new_container)	2669	if (new_container)
2503	{	2670	{
…		…
2507	// TODO: this does not seem to serve any purpose anymore?	2674	// TODO: this does not seem to serve any purpose anymore?
2508	#if 0	2675	#if 0
2509	// insert the "Close Container" object.	2676	// insert the "Close Container" object.
2510	if (archetype *closer = new_container->other_arch)	2677	if (archetype *closer = new_container->other_arch)
2511	{	2678	{
2512	object *closer = arch_to_object (new_container->other_arch);	2679	object *closer = new_container->other_arch->instance ();
2513	closer->flag [FLAG_NO_MAP_SAVE] = 1;	2680	closer->flag [FLAG_NO_MAP_SAVE] = 1;
2514	new_container->insert (closer);	2681	new_container->insert (closer);
2515	}	2682	}
2516	#endif	2683	#endif
2517		2684
2518	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));	2685	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", new_container->query_name ());
2519		2686
2520	// make sure the container is available, client bug requires this to be separate	2687	// make sure the container is available, client bug requires this to be separate
2521	esrv_send_item (this, new_container);	2688	esrv_send_item (this, new_container);
2522		2689
2523	new_container->flag [FLAG_APPLIED] = true;	2690	new_container->flag [FLAG_APPLIED] = true;
…		…
2530	}	2697	}
2531	// else if (!old_container->env && contr && contr->ns)	2698	// else if (!old_container->env && contr && contr->ns)
2532	// contr->ns->floorbox_reset ();	2699	// contr->ns->floorbox_reset ();
2533	}	2700	}
2534		2701
		2702	//-GPL
		2703
		2704	// prefetch some flat area around the player
		2705	static void
		2706	prefetch_surrounding_area (object *op, maptile *map, int range)
		2707	{
		2708	for (maprect *rect = map->split_to_tiles (mapwalk_buf,
		2709	op->x - range , op->y - range ,
		2710	op->x + range + 1, op->y + range + 1);
		2711	rect->m;
		2712	++rect)
		2713	{
		2714	rect->m->touch ();
		2715	rect->m->activate ();
		2716	}
		2717	}
		2718
		2719	// prefetch a generous area around the player, also up and down
		2720	void
		2721	object::prefetch_surrounding_maps ()
		2722	{
		2723	prefetch_surrounding_area (this, map, 40);
		2724
		2725	if (maptile *m = map->tile_available (TILE_DOWN))
		2726	prefetch_surrounding_area (this, m, 20);
		2727
		2728	if (maptile *m = map->tile_available (TILE_UP))
		2729	prefetch_surrounding_area (this, m, 20);
		2730	}
		2731
		2732	//+GPL
		2733
2535	object *	2734	object *
2536	object::force_find (shstr_tmp name)	2735	object::force_find (shstr_tmp name)
2537	{	2736	{
2538	/* cycle through his inventory to look for the MARK we want to	2737	/* cycle through his inventory to look for the MARK we want to
2539	* place	2738	* place
2540	*/	2739	*/
2541	for (object *tmp = inv; tmp; tmp = tmp->below)	2740	for (object *tmp = inv; tmp; tmp = tmp->below)
2542	if (tmp->type == FORCE && tmp->slaying == name)	2741	if (tmp->type == FORCE && tmp->slaying == name)
2543	return splay (tmp);	2742	return splay (tmp);
2544		2743
2545	return 0;	2744	return 0;
2546	}	2745	}
2547		2746
		2747	void
		2748	object::force_set_timer (int duration)
		2749	{
		2750	this->duration = 1;
		2751	this->speed_left = -1.f;
		2752
		2753	this->set_speed (duration ? 1.f / duration : 0.f);
		2754	}
		2755
2548	object *	2756	object *
2549	object::force_add (shstr_tmp name, int duration)	2757	object::force_add (shstr_tmp name, int duration)
2550	{	2758	{
2551	if (object *force = force_find (name))	2759	if (object *force = force_find (name))
2552	force->destroy ();	2760	force->destroy ();
2553		2761
2554	object *force = get_archetype (FORCE_NAME);	2762	object *force = archetype::get (FORCE_NAME);
2555		2763
2556	force->slaying = name;	2764	force->slaying = name;
2557	force->stats.food = 1;	2765	force->force_set_timer (duration);
2558	force->speed_left = -1.f;
2559
2560	force->set_speed (duration ? 1.f / duration : 0.f);
2561	force->flag [FLAG_IS_USED_UP] = true;
2562	force->flag [FLAG_APPLIED] = true;	2766	force->flag [FLAG_APPLIED] = true;
2563		2767
2564	return insert (force);	2768	return insert (force);
2565	}	2769	}
2566		2770
2567	void	2771	void
2568	object::play_sound (faceidx sound)	2772	object::play_sound (faceidx sound) const
2569	{	2773	{
2570	if (!sound)	2774	if (!sound)
2571	return;	2775	return;
2572		2776
2573	if (flag [FLAG_REMOVED])	2777	if (is_on_map ())
2574	return;
2575
2576	if (env)
2577	{
2578	if (object *pl = in_player ())
2579	pl->contr->play_sound (sound);
2580	}
2581	else
2582	map->play_sound (sound, x, y);	2778	map->play_sound (sound, x, y);
		2779	else if (object *pl = in_player ())
		2780	pl->contr->play_sound (sound);
		2781	}
		2782
		2783	void
		2784	object::say_msg (const char *msg) const
		2785	{
		2786	if (is_on_map ())
		2787	map->say_msg (msg, x, y);
		2788	else if (object *pl = in_player ())
		2789	pl->contr->play_sound (sound);
2583	}	2790	}
2584		2791
2585	void	2792	void
2586	object::make_noise ()	2793	object::make_noise ()
2587	{	2794	{
…		…
2613		2820
2614	insert (force);	2821	insert (force);
2615	}	2822	}
2616	}	2823	}
2617		2824
		2825	void object::change_move_type (MoveType mt)
		2826	{
		2827	if (move_type == mt)
		2828	return;
		2829
		2830	if (is_on_map ())
		2831	{
		2832	// we are on the map, so handle move_on/off effects
		2833	remove ();
		2834	move_type = mt;
		2835	map->insert (this, x, y, this);
		2836	}
		2837	else
		2838	move_type = mt;
		2839	}
		2840
		2841	/* object should be a player.
		2842	* we return the object the player has marked with the 'mark' command
		2843	* below. If no match is found (or object has changed), we return
		2844	* NULL. We leave it up to the calling function to print messages if
		2845	* nothing is found.
		2846	*/
		2847	object *
		2848	object::mark () const
		2849	{
		2850	if (contr && contr->mark && contr->mark->env == this)
		2851	return contr->mark;
		2852	else
		2853	return 0;
		2854	}
		2855
		2856	// put marked object first in the inventory
		2857	// this is used by identify-like spells so players can influence
		2858	// the order a bit.
		2859	void
		2860	object::splay_marked ()
		2861	{
		2862	if (object *marked = mark ())
		2863	splay (marked);
		2864	}
		2865

Diff Legend

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