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.247 by root, Mon Jul 14 18:36:43 2008 UTC vs.
Revision 1.343 by root, Sat Apr 23 04:56:46 2011 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,2011 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
		76	const char *wall_suffix[16] = {
		77	"0",
		78	"1_3",
		79	"1_4",
		80	"2_1_2",
		81	"1_2",
		82	"2_2_4",
		83	"2_2_1",
		84	"3_1",
		85	"1_1",
		86	"2_2_3",
		87	"2_2_2",
		88	"3_3",
		89	"2_1_1",
		90	"3_4",
		91	"3_2",
		92	"4"
		93	};
		94
66	static void	95	static void
67	write_uuid (uval64 skip, bool sync)	96	write_uuid (uval64 skip, bool sync)
68	{	97	{
69	CALL_BEGIN (2);	98	CALL_BEGIN (2);
70	CALL_ARG_SV (newSVval64 (skip));	99	CALL_ARG_SV (newSVval64 (skip));
…		…
72	CALL_CALL ("cf::write_uuid", G_DISCARD);	101	CALL_CALL ("cf::write_uuid", G_DISCARD);
73	CALL_END;	102	CALL_END;
74	}	103	}
75		104
76	static void	105	static void
77	read_uuid (void)	106	read_uuid ()
78	{	107	{
79	char filename[MAX_BUF];	108	char filename[MAX_BUF];
80		109
81	sprintf (filename, "%s/uuid", settings.localdir);	110	sprintf (filename, "%s/uuid", settings.localdir);
82		111
…		…
96		125
97	LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);	126	LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);
98	_exit (1);	127	_exit (1);
99	}	128	}
100		129
101	UUID::BUF buf;	130	char buf [UUID::MAX_LEN];
102	buf[0] = 0;	131	buf[0] = 0;
103	fgets (buf, sizeof (buf), fp);	132	fgets (buf, sizeof (buf), fp);
104		133
105	if (!UUID::cur.parse (buf))	134	if (!UUID::cur.parse (buf))
106	{	135	{
…		…
133		162
134	void	163	void
135	UUID::init ()	164	UUID::init ()
136	{	165	{
137	read_uuid ();	166	read_uuid ();
		167	}
		168
		169	bool
		170	UUID::parse (const char *s)
		171	{
		172	if (*s++ != '<' || *s++ != '1' || *s++ != '.')
		173	return false;
		174
		175	seq = 0;
		176
		177	while (*s != '>')
		178	{
		179	if (*s < '0')
		180	return false;
		181
		182	// this gives nice branchless code with gcc
		183	assert ('0' < 'a' && '0' == 48 && 'a' == 97);
		184	int digit = (*s + (*s & 0x40 ? 9 : 0)) & 15;
		185
		186	seq = (seq << 4) | digit;
		187
		188	++s;
		189	}
		190
		191	return true;
		192	}
		193
		194	char *
		195	UUID::append (char *buf) const
		196	{
		197	*buf++ = '<';
		198	*buf++ = '1';
		199	*buf++ = '.';
		200
		201	uint64_t seq = this->seq;
		202	const int bits = 64;
		203	char nz = 0;
		204	static const char tohex [] = "0123456789abcdef";
		205
		206	// assert (len >= 3 + bits / 4 + 1 + 1);
		207	for (int i = bits / 4; --i; )
		208	{
		209	uint8_t digit = seq >> (bits - 4);
		210
		211	*buf = tohex [digit];
		212	nz |= digit;
		213	buf += nz ? 1 : 0;
		214	seq <<= 4;
		215	}
		216
		217	// last digit is special - always emit
		218	uint8_t digit = seq >> (bits - 4);
		219	*buf++ = tohex [digit];
		220
		221	*buf++ = '>';
		222
		223	return buf;
		224	}
		225
		226	char *
		227	UUID::c_str () const
		228	{
		229	static char buf [MAX_LEN];
		230	*append (buf) = 0;
		231	return buf;
138	}	232	}
139		233
140	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */	234	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */
141	static bool	235	static bool
142	compare_ob_value_lists_one (const object *wants, const object *has)	236	compare_ob_value_lists_one (const object *wants, const object *has)
…		…
178	* Improvements made with merge: Better checking on potion, and also	272	* Improvements made with merge: Better checking on potion, and also
179	* check weight	273	* check weight
180	*/	274	*/
181	bool object::can_merge_slow (object *ob1, object *ob2)	275	bool object::can_merge_slow (object *ob1, object *ob2)
182	{	276	{
183	/* A couple quicksanity checks */	277	/* A couple quick sanity checks */
184	if (ob1 == ob2	278	if (ob1 == ob2
185	|| ob1->type != ob2->type	279	|| ob1->type != ob2->type
186	|| ob1->speed != ob2->speed
187	|| ob1->value != ob2->value	280	|| ob1->value != ob2->value
188	|| ob1->name != ob2->name)	281	|| ob1->name != ob2->name
		282	|| ob1->custom_name != ob2->custom_name
		283	|| fabs (ob1->speed - ob2->speed) >= MIN_ACTIVE_SPEED)
189	return 0;	284	return 0;
190		285
191	/* Do not merge objects if nrof would overflow. First part checks	286	/* Do not merge objects if nrof would overflow, assume nrof
192	* for unsigned overflow (2c), second part checks whether the result	287	* is always 0 .. 2**31-1 */
193	* would fit into a 32 bit signed int, which is often used to hold	288	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;	289	return 0;
198		290
199	/* If the objects have been identified, set the BEEN_APPLIED flag.	291	/* 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	292	* 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	293	* 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	294	* are not equal - just if it has been identified, the been_applied
203	* flags lose any meaning.	295	* flags lose any meaning.
204	*/	296	*/
205	if (QUERY_FLAG (ob1, FLAG_IDENTIFIED))	297	if (ob1->flag [FLAG_IDENTIFIED])
206	SET_FLAG (ob1, FLAG_BEEN_APPLIED);	298	ob1->set_flag (FLAG_BEEN_APPLIED);
207		299
208	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))	300	if (ob2->flag [FLAG_IDENTIFIED])
209	SET_FLAG (ob2, FLAG_BEEN_APPLIED);	301	ob2->set_flag (FLAG_BEEN_APPLIED);
210		302
211	if (ob1->arch->archname != ob2->arch->archname	303	if (ob1->arch->archname != ob2->arch->archname
212	|| ob1->name != ob2->name	304	|| ob1->name != ob2->name
213	|| ob1->title != ob2->title	305	|| ob1->title != ob2->title
214	|| ob1->msg != ob2->msg	306	|| ob1->msg != ob2->msg
…		…
217	|| ob1->magic != ob2->magic	309	|| ob1->magic != ob2->magic
218	|| ob1->slaying != ob2->slaying	310	|| ob1->slaying != ob2->slaying
219	|| ob1->skill != ob2->skill	311	|| ob1->skill != ob2->skill
220	|| ob1->value != ob2->value	312	|| ob1->value != ob2->value
221	|| ob1->animation_id != ob2->animation_id	313	|| ob1->animation_id != ob2->animation_id
222	|| (ob1->face != ob2->face && !ob1->animation_id) // face and animation are dependent on each other	314	|| (ob1->face != ob2->face && !ob1->animation_id) // face and animation are dependend on each other
223	|| ob1->client_type != ob2->client_type	315	|| ob1->client_type != ob2->client_type
224	|| ob1->materialname != ob2->materialname	316	|| ob1->material != ob2->material
225	|| ob1->lore != ob2->lore	317	|| ob1->lore != ob2->lore
226	|| ob1->subtype != ob2->subtype	318	|| ob1->subtype != ob2->subtype
227	|| ob1->move_type != ob2->move_type	319	|| ob1->move_type != ob2->move_type
228	|| ob1->move_block != ob2->move_block	320	|| ob1->move_block != ob2->move_block
229	|| ob1->move_allow != ob2->move_allow	321	|| ob1->move_allow != ob2->move_allow
230	|| ob1->move_on != ob2->move_on	322	|| ob1->move_on != ob2->move_on
231	|| ob1->move_off != ob2->move_off	323	|| ob1->move_off != ob2->move_off
232	|| ob1->move_slow != ob2->move_slow	324	|| ob1->move_slow != ob2->move_slow
233	|| ob1->move_slow_penalty != ob2->move_slow_penalty	325	|| fabs (ob1->move_slow_penalty - ob2->move_slow_penalty) >= (1.f / 1024.f)
234	|| memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))	326	|| memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
235	|| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats)))	327	|| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats)))
236	return 0;	328	return 0;
237		329
238	if ((ob1->flag ^ ob2->flag)	330	if ((ob1->flag ^ ob2->flag)
239	.reset (FLAG_INV_LOCKED)	331	.reset (FLAG_INV_LOCKED)
240	.reset (FLAG_CLIENT_SENT)
241	.reset (FLAG_REMOVED)	332	.reset (FLAG_REMOVED)
242	.any ())	333	.any ())
243	return 0;	334	return 0;
244		335
245	/* This is really a spellbook check - we should in general	336	/* This is really a spellbook check - we should in general
…		…
264		355
265	/* Don't merge objects that are applied. With the new 'body' code,	356	/* 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	357	* 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.	358	* some items equipped, and we don't want those to merge.
268	*/	359	*/
269	if (QUERY_FLAG (ob1, FLAG_APPLIED) || QUERY_FLAG (ob2, FLAG_APPLIED))	360	if (ob1->flag [FLAG_APPLIED] || ob2->flag [FLAG_APPLIED])
270	return 0;	361	return 0;
271		362
272	/* Note sure why the following is the case - either the object has to	363	/* 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	364	* be animated or have a very low speed. Is this an attempted monster
274	* check?	365	* check?
275	*/	366	*/
276	if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && ob1->has_active_speed ())	367	if (!ob1->flag [FLAG_ANIMATE] && ob1->has_active_speed ())
277	return 0;	368	return 0;
278		369
279	switch (ob1->type)	370	switch (ob1->type)
280	{	371	{
281	case SCROLL:	372	case SCROLL:
…		…
327	{	418	{
328	// see if we are in a container of sorts	419	// see if we are in a container of sorts
329	if (env)	420	if (env)
330	{	421	{
331	// the player inventory itself is always visible	422	// the player inventory itself is always visible
332	if (env->type == PLAYER)	423	if (env->is_player ())
333	return env;	424	return env;
334		425
335	// else a player could have our env open	426	// else a player could have our env open
336	object *envest = env->outer_env ();	427	object *envest = env->outer_env_or_self ();
337		428
338	// the player itself is always on a map, so we will find him here	429	// the player itself is always on a map, so we will find him here
339	// even if our inv is in a player.	430	// even if our inv is in a player.
340	if (envest->is_on_map ())	431	if (envest->is_on_map ())
341	if (object *pl = envest->ms ().player ())	432	if (object *pl = envest->ms ().player ())
342	if (pl->container == env)	433	if (pl->container_ () == env)
343	return pl;	434	return pl;
344	}	435	}
345	else	436	else
346	{	437	{
347	// maybe there is a player standing on the same mapspace	438	// maybe there is a player standing on the same mapspace
348	// this will catch the case where "this" is a player	439	// this will catch the case where "this" is a player
349	if (object *pl = ms ().player ())	440	if (object *pl = ms ().player ())
350	if (!pl->container || this == pl->container)	441	if ((pl->contr->ns && !pl->container_ () && !pl->contr->ns->update_look)
		442	|| pl->container_ () == this)
351	return pl;	443	return pl;
352	}	444	}
353	}	445	}
354		446
355	return 0;	447	return 0;
356	}	448	}
357		449
358	// adjust weight per container type ("of holding")	450	// adjust weight per container type ("of holding")
359	static sint32	451	static uint32
360	weight_adjust_for (object *op, sint32 weight)	452	weight_adjust_for (object *op, uint32 weight)
361	{	453	{
362	return op->type == CONTAINER	454	return op->type == CONTAINER
363	? lerp (weight, 0, 100, 0, 100 - op->stats.Str)	455	? weight - weight * op->stats.Str / 100
364	: weight;	456	: weight;
365	}	457	}
366		458
367	/*	459	/*
368	* adjust_weight(object, weight) adds the specified weight to an object,	460	* subtracts, then adds, the specified weight to an object,
369	* and also updates how much the environment(s) is/are carrying.	461	* and also updates how much the environment(s) is/are carrying.
370	*/	462	*/
371	static void	463	static void
372	adjust_weight (object *op, sint32 weight)	464	adjust_weight (object *op, sint32 sub, sint32 add)
373	{	465	{
374	while (op)	466	while (op)
375	{	467	{
376	// adjust by actual difference to account for rounding errors	468	sint32 ocarrying = op->carrying;
377	// i.e. (w2 - w1) / f != w2 / f - w1 / f and the latter is correct
378	weight = weight_adjust_for (op, op->carrying)
379	- weight_adjust_for (op, op->carrying - weight);
380		469
381	if (!weight)	470	op->carrying -= weight_adjust_for (op, sub);
382	return;	471	op->carrying += weight_adjust_for (op, add);
383
384	op->carrying += weight;
385		472
386	if (object *pl = op->visible_to ())	473	if (object *pl = op->visible_to ())
387	if (pl != op) // player is handled lazily	474	if (pl != op) // player is handled lazily
388	esrv_update_item (UPD_WEIGHT, pl, op);	475	esrv_update_item (UPD_WEIGHT, pl, op);
389		476
		477	sub = ocarrying;
		478	add = op->carrying;
		479
390	op = op->env;	480	op = op->env;
391	}	481	}
392	}	482	}
393		483
394	/*	484	/*
…		…
401	{	491	{
402	sint32 sum = 0;	492	sint32 sum = 0;
403		493
404	for (object *op = inv; op; op = op->below)	494	for (object *op = inv; op; op = op->below)
405	{	495	{
406	if (op->inv)
407	op->update_weight ();	496	op->update_weight ();
408		497
409	sum += op->total_weight ();	498	sum += weight_adjust_for (this, op->total_weight ());
410	}	499	}
411
412	sum = weight_adjust_for (this, sum);
413		500
414	if (sum != carrying)	501	if (sum != carrying)
415	{	502	{
		503	if (carrying != sum && carrying)//D
		504	LOG (llevDebug, "updating carrying got %ld, expected %ld (%s)\n",
		505	(long long)sum, (long long)carrying, debug_desc ());
		506
416	carrying = sum;	507	carrying = sum;
417		508
418	if (object *pl = visible_to ())	509	if (object *pl = visible_to ())
419	if (pl != this) // player is handled lazily	510	if (pl != this) // player is handled lazily
420	esrv_update_item (UPD_WEIGHT, pl, this);	511	esrv_update_item (UPD_WEIGHT, pl, this);
…		…
433	object_freezer freezer;	524	object_freezer freezer;
434	op->write (freezer);	525	op->write (freezer);
435	return freezer.as_string ();	526	return freezer.as_string ();
436	}	527	}
437		528
438	/*	529	char *
439	* get_nearest_part(multi-object, object 2) returns the part of the	530	object::as_string ()
440	* multi-object 1 which is closest to the second object.
441	* If it's not a multi-object, it is returned.
442	*/
443	object *
444	get_nearest_part (object *op, const object *pl)
445	{	531	{
446	object *tmp, *closest;	532	return dump_object (this);
447	int last_dist, i;
448
449	if (!op->more)
450	return op;
451
452	for (last_dist = distance (op, pl), closest = op, tmp = op->more;
453	tmp;
454	tmp = tmp->more)
455	if ((i = distance (tmp, pl)) < last_dist)
456	closest = tmp, last_dist = i;
457
458	return closest;
459	}	533	}
460		534
461	/*	535	/*
462	* Returns the object which has the count-variable equal to the argument.	536	* Returns the object which has the count-variable equal to the argument.
463	* VERRRY slow.	537	* VERRRY slow.
…		…
465	object *	539	object *
466	find_object (tag_t i)	540	find_object (tag_t i)
467	{	541	{
468	for_all_objects (op)	542	for_all_objects (op)
469	if (op->count == i)	543	if (op->count == i)
		544	return op;
		545
		546	return 0;
		547	}
		548
		549	/*
		550	* Returns the object which has the uuid equal to the argument.
		551	* MOAR VERRRY slow.
		552	*/
		553
		554	object *
		555	find_object_uuid (UUID i)
		556	{
		557	for_all_objects (op)
		558	if (op->uuid == i)
470	return op;	559	return op;
471		560
472	return 0;	561	return 0;
473	}	562	}
474		563
…		…
508	LOG (llevError | logBacktrace, "tried to set owner of %s to %s\n", debug_desc (), owner->debug_desc ());	597	LOG (llevError | logBacktrace, "tried to set owner of %s to %s\n", debug_desc (), owner->debug_desc ());
509	return;	598	return;
510	}	599	}
511		600
512	this->owner = owner;	601	this->owner = owner;
513	}
514
515	int
516	object::slottype () const
517	{
518	if (type == SKILL)
519	{
520	if (IS_COMBAT_SKILL (subtype)) return slot_combat;
521	if (IS_RANGED_SKILL (subtype)) return slot_ranged;
522	}
523	else
524	{
525	if (slot [body_combat].info) return slot_combat;
526	if (slot [body_range ].info) return slot_ranged;
527	}
528
529	return slot_none;
530	}
531
532	bool
533	object::change_weapon (object *ob)
534	{
535	if (current_weapon == ob)
536	return true;
537
538	if (chosen_skill)
539	chosen_skill->flag [FLAG_APPLIED] = false;
540
541	current_weapon = ob;
542	chosen_skill = !ob || ob->type == SKILL ? ob : find_skill_by_name (this, ob->skill);
543
544	if (chosen_skill)
545	chosen_skill->flag [FLAG_APPLIED] = true;
546
547	update_stats ();
548
549	if (ob)
550	{
551	// now check wether any body locations became invalid, in which case
552	// we cannot apply the weapon at the moment.
553	for (int i = 0; i < NUM_BODY_LOCATIONS; ++i)
554	if (slot[i].used < 0)
555	{
556	current_weapon = chosen_skill = 0;
557	update_stats ();
558
559	new_draw_info_format (NDI_UNIQUE, 0, this,
560	"You try to balance all your items at once, "
561	"but the %s is just too much for your body. "
562	"[You need to unapply some items first.]", &ob->name);
563	return false;
564	}
565
566	//new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);
567	}
568	else
569	;//new_draw_info_format (NDI_UNIQUE, 0, this, "You unwield your weapons.");
570
571	if (ob && !ob->flag [FLAG_APPLIED] && ob->type != SPELL)
572	{
573	LOG (llevError | logBacktrace, "%s changed to unapplied weapon %s",
574	&name, ob->debug_desc ());
575	return false;
576	}
577
578	return true;
579	}	602	}
580		603
581	/* Zero the key_values on op, decrementing the shared-string	604	/* Zero the key_values on op, decrementing the shared-string
582	* refcounts and freeing the links.	605	* refcounts and freeing the links.
583	*/	606	*/
…		…
636	tail = new_link;	659	tail = new_link;
637	}	660	}
638	}	661	}
639	}	662	}
640		663
641	if (speed < 0)	664	dst->activate ();
642	dst->speed_left -= rndm ();
643
644	dst->set_speed (dst->speed);
645	}	665	}
646		666
647	void	667	void
648	object::instantiate ()	668	object::instantiate ()
649	{	669	{
650	if (!uuid.seq) // HACK	670	if (!uuid.seq) // HACK
651	uuid = UUID::gen ();	671	uuid = UUID::gen ();
652		672
		673	// TODO: unclean state changes, should not be done in copy_to AND instantiate
		674	if (flag [FLAG_RANDOM_SPEED] && speed)
		675	speed_left = - speed - rndm (); // TODO animation
		676	else
653	speed_left = -0.1f;	677	speed_left = -1.;
		678
654	/* copy the body_info to the body_used - this is only really	679	/* copy the body_info to the body_used - this is only really
655	* need for monsters, but doesn't hurt to do it for everything.	680	* need for monsters, but doesn't hurt to do it for everything.
656	* by doing so, when a monster is created, it has good starting	681	* by doing so, when a monster is created, it has good starting
657	* values for the body_used info, so when items are created	682	* values for the body_used info, so when items are created
658	* for it, they can be properly equipped.	683	* for it, they can be properly equipped.
…		…
666	object *	691	object *
667	object::clone ()	692	object::clone ()
668	{	693	{
669	object *neu = create ();	694	object *neu = create ();
670	copy_to (neu);	695	copy_to (neu);
		696
		697	// TODO: unclean state changes, should not be done in clone AND instantiate
		698	if (neu->flag [FLAG_RANDOM_SPEED] && neu->speed)
		699	neu->speed_left = - neu->speed - rndm (); // TODO animation
		700
671	neu->map = map; // not copied by copy_to	701	neu->map = map; // not copied by copy_to
672	return neu;	702	return neu;
673	}	703	}
674		704
675	/*	705	/*
…		…
678	* be called to update the face variable, _and_ how it looks on the map.	708	* be called to update the face variable, _and_ how it looks on the map.
679	*/	709	*/
680	void	710	void
681	update_turn_face (object *op)	711	update_turn_face (object *op)
682	{	712	{
683	if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || !op->arch)	713	if (!op->flag [FLAG_IS_TURNABLE] || !op->arch)
684	return;	714	return;
685		715
686	SET_ANIMATION (op, op->direction);	716	SET_ANIMATION (op, op->direction);
687	update_object (op, UP_OBJ_FACE);	717	update_object (op, UP_OBJ_FACE);
688	}	718	}
…		…
693	* This function needs to be called whenever the speed of an object changes.	723	* This function needs to be called whenever the speed of an object changes.
694	*/	724	*/
695	void	725	void
696	object::set_speed (float speed)	726	object::set_speed (float speed)
697	{	727	{
698	if (flag [FLAG_FREED] && speed)
699	{
700	LOG (llevError, "Object %s is freed but has speed.\n", &name);
701	speed = 0;
702	}
703
704	this->speed = speed;	728	this->speed = speed;
705		729
706	if (has_active_speed ())	730	if (has_active_speed ())
707	activate ();	731	activate ();
708	else	732	else
…		…
758		782
759	if (!(m.flags_ & P_UPTODATE))	783	if (!(m.flags_ & P_UPTODATE))
760	/* nop */;	784	/* nop */;
761	else if (action == UP_OBJ_INSERT)	785	else if (action == UP_OBJ_INSERT)
762	{	786	{
		787	#if 0
763	// this is likely overkill, TODO: revisit (schmorp)	788	// this is likely overkill, TODO: revisit (schmorp)
764	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))	789	if ((op->flag [FLAG_BLOCKSVIEW] && !(m.flags_ & P_BLOCKSVIEW))
765	|| (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))	790	|| (op->flag [FLAG_NO_MAGIC] && !(m.flags_ & P_NO_MAGIC))
766	|| (op->type == PLAYER && !(m.flags_ & P_PLAYER))	791	|| (op->is_player () && !(m.flags_ & P_PLAYER))
767	|| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))	792	|| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
768	|| (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))	793	|| (op->flag [FLAG_ALIVE] && !(m.flags_ & P_IS_ALIVE))
769	|| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))	794	|| (op->flag [FLAG_DAMNED] && !(m.flags_ & P_NO_CLERIC))
770	|| (m.move_on | op->move_on ) != m.move_on	795	|| (m.move_on | op->move_on ) != m.move_on
771	|| (m.move_off | op->move_off ) != m.move_off	796	|| (m.move_off | op->move_off ) != m.move_off
772	|| (m.move_slow | op->move_slow) != m.move_slow	797	|| (m.move_slow | op->move_slow) != m.move_slow
773	/* This isn't perfect, but I don't expect a lot of objects to	798	/* This isn't perfect, but I don't expect a lot of objects to
774	* to have move_allow right now.	799	* have move_allow right now.
775	*/	800	*/
776	|| ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block	801	|| ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block
		802	m.invalidate ();
		803	#else
777	|| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)	804	// the above is not strong enough a test to skip updating. los maybe? TODO (schmorp)
778	m.flags_ = 0;	805	m.invalidate ();
		806	#endif
779	}	807	}
780	/* if the object is being removed, we can't make intelligent	808	/* if the object is being removed, we can't make intelligent
781	* decisions, because remove_ob can't really pass the object	809	* decisions, because remove_ob can't really pass the object
782	* that is being removed.	810	* that is being removed.
783	*/	811	*/
784	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)	812	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
785	m.flags_ = 0;	813	m.invalidate ();
786	else if (action == UP_OBJ_FACE)	814	else if (action == UP_OBJ_FACE)
787	/* Nothing to do for that case */ ;	815	/* Nothing to do for that case */ ;
788	else	816	else
789	LOG (llevError, "update_object called with invalid action: %d\n", action);	817	LOG (llevError, "update_object called with invalid action: %d\n", action);
790		818
…		…
792	update_object (op->more, action);	820	update_object (op->more, action);
793	}	821	}
794		822
795	object::object ()	823	object::object ()
796	{	824	{
797	SET_FLAG (this, FLAG_REMOVED);	825	this->set_flag (FLAG_REMOVED);
798		826
799	expmul = 1.0;	827	//expmul = 1.0; declared const for the time being
800	face = blank_face;	828	face = blank_face;
		829	material = MATERIAL_NULL;
801	}	830	}
802		831
803	object::~object ()	832	object::~object ()
804	{	833	{
805	unlink ();	834	unlink ();
806		835
807	free_key_values (this);	836	free_key_values (this);
808	}	837	}
809
810	static int object_count;
811		838
812	void object::link ()	839	void object::link ()
813	{	840	{
814	assert (!index);//D	841	assert (!index);//D
815	uuid = UUID::gen ();	842	uuid = UUID::gen ();
816	count = ++object_count;
817		843
818	refcnt_inc ();	844	refcnt_inc ();
819	objects.insert (this);	845	objects.insert (this);
		846
		847	++create_count;
		848
820	}	849	}
821		850
822	void object::unlink ()	851	void object::unlink ()
823	{	852	{
824	if (!index)	853	if (!index)
825	return;	854	return;
		855
		856	++destroy_count;
826		857
827	objects.erase (this);	858	objects.erase (this);
828	refcnt_dec ();	859	refcnt_dec ();
829	}	860	}
830		861
…		…
834	/* If already on active list, don't do anything */	865	/* If already on active list, don't do anything */
835	if (active)	866	if (active)
836	return;	867	return;
837		868
838	if (has_active_speed ())	869	if (has_active_speed ())
		870	{
		871	if (flag [FLAG_FREED])
		872	LOG (llevError | logBacktrace, "BUG: tried to activate freed object %s\n", debug_desc ());//D
		873
839	actives.insert (this);	874	actives.insert (this);
		875	}
840	}	876	}
841		877
842	void	878	void
843	object::activate_recursive ()	879	object::activate_recursive ()
844	{	880	{
…		…
909	|| map->in_memory != MAP_ACTIVE	945	|| map->in_memory != MAP_ACTIVE
910	|| map->no_drop	946	|| map->no_drop
911	|| ms ().move_block == MOVE_ALL)	947	|| ms ().move_block == MOVE_ALL)
912	{	948	{
913	while (inv)	949	while (inv)
914	{
915	inv->destroy_inv (false);
916	inv->destroy ();	950	inv->destroy ();
917	}
918	}	951	}
919	else	952	else
920	{ /* Put objects in inventory onto this space */	953	{ /* Put objects in inventory onto this space */
921	while (inv)	954	while (inv)
922	{	955	{
…		…
926	|| op->flag [FLAG_NO_DROP]	959	|| op->flag [FLAG_NO_DROP]
927	|| op->type == RUNE	960	|| op->type == RUNE
928	|| op->type == TRAP	961	|| op->type == TRAP
929	|| op->flag [FLAG_IS_A_TEMPLATE]	962	|| op->flag [FLAG_IS_A_TEMPLATE]
930	|| op->flag [FLAG_DESTROY_ON_DEATH])	963	|| op->flag [FLAG_DESTROY_ON_DEATH])
931	op->destroy (true);	964	op->destroy ();
932	else	965	else
933	map->insert (op, x, y);	966	map->insert (op, x, y);
934	}	967	}
935	}	968	}
936	}	969	}
937		970
		971	/*
		972	* Remove and free all objects in the inventory of the given object.
		973	* Unlike destroy_inv, this assumes the *this is destroyed as well
		974	* well, so we can (and have to!) take shortcuts.
		975	*/
		976	void
		977	object::destroy_inv_fast ()
		978	{
		979	while (object *op = inv)
		980	{
		981	// remove from object the fast way
		982	op->flag [FLAG_REMOVED] = true;
		983	op->env = 0;
		984	if ((inv = inv->below))
		985	inv->above = 0;
		986
		987	// then destroy
		988	op->destroy ();
		989	}
		990	}
		991
		992	void
		993	object::freelist_free (int count)
		994	{
		995	while (count-- && freelist)
		996	{
		997	freelist_item *next = freelist->next;
		998	// count is being "destroyed"
		999
		1000	sfree ((char *)freelist, sizeof (object));
		1001
		1002	freelist = next;
		1003	--free_count;
		1004	}
		1005	}
		1006
		1007	object *
938	object *object::create ()	1008	object::create ()
939	{	1009	{
940	object *op = new object;	1010	object *op;
		1011
		1012	if (freelist)
		1013	{
		1014	freelist_item li = *freelist;
		1015	memset (freelist, 0, sizeof (object));
		1016
		1017	op = new (freelist) object;
		1018	op->count = li.count;
		1019
		1020	freelist = li.next;
		1021	--free_count;
		1022	}
		1023	else
		1024	{
		1025	void *ni = salloc0<char> (sizeof (object));
		1026
		1027	op = new(ni) object;
		1028
		1029	op->count = ++object_count;
		1030	}
		1031
941	op->link ();	1032	op->link ();
		1033
942	return op;	1034	return op;
943	}	1035	}
944		1036
		1037	void
		1038	object::do_delete ()
		1039	{
		1040	uint32_t count = this->count;
		1041
		1042	this->~object ();
		1043
		1044	freelist_item *li = (freelist_item *)this;
		1045	li->next = freelist;
		1046	li->count = count;
		1047
		1048	freelist = li;
		1049	++free_count;
		1050	}
		1051
945	static struct freed_map : maptile	1052	static struct freed_map : maptile
946	{	1053	{
947	freed_map ()	1054	freed_map ()
		1055	: maptile (3, 3)
948	{	1056	{
949	path = "<freed objects map>";	1057	path = "<freed objects map>";
950	name = "/internal/freed_objects_map";	1058	name = "/internal/freed_objects_map";
951	width = 3;
952	height = 3;
953	no_drop = 1;	1059	no_drop = 1;
954	no_reset = 1;	1060	no_reset = 1;
955		1061
956	alloc ();
957	in_memory = MAP_ACTIVE;	1062	in_memory = MAP_ACTIVE;
958	}	1063	}
959		1064
960	~freed_map ()	1065	~freed_map ()
961	{	1066	{
…		…
965		1070
966	void	1071	void
967	object::do_destroy ()	1072	object::do_destroy ()
968	{	1073	{
969	if (flag [FLAG_IS_LINKED])	1074	if (flag [FLAG_IS_LINKED])
970	remove_button_link (this);	1075	remove_link ();
971		1076
972	if (flag [FLAG_FRIENDLY])	1077	if (flag [FLAG_FRIENDLY])
973	remove_friendly_object (this);	1078	remove_friendly_object (this);
974		1079
975	remove ();	1080	remove ();
…		…
1000	attacked_by = 0;	1105	attacked_by = 0;
1001	current_weapon = 0;	1106	current_weapon = 0;
1002	}	1107	}
1003		1108
1004	void	1109	void
1005	object::destroy (bool destroy_inventory)	1110	object::destroy ()
1006	{	1111	{
1007	if (destroyed ())	1112	if (destroyed ())
1008	return;	1113	return;
1009		1114
1010	if (!is_head () && !head->destroyed ())	1115	if (!is_head () && !head->destroyed ())
1011	{	1116	{
1012	LOG (llevError | logBacktrace, "tried to destroy the tail of an object");	1117	LOG (llevError | logBacktrace, "tried to destroy the tail of an object");
1013	head->destroy (destroy_inventory);	1118	head->destroy ();
1014	return;	1119	return;
1015	}	1120	}
1016		1121
1017	destroy_inv (!destroy_inventory);	1122	destroy_inv_fast ();
1018		1123
1019	if (is_head ())	1124	if (is_head ())
1020	if (sound_destroy)	1125	if (sound_destroy)
1021	play_sound (sound_destroy);	1126	play_sound (sound_destroy);
1022	else if (flag [FLAG_MONSTER])	1127	else if (flag [FLAG_MONSTER])
…		…
1033	* the previous environment.	1138	* the previous environment.
1034	*/	1139	*/
1035	void	1140	void
1036	object::do_remove ()	1141	object::do_remove ()
1037	{	1142	{
1038	object *tmp, *last = 0;
1039	object *otmp;
1040
1041	if (flag [FLAG_REMOVED])	1143	if (flag [FLAG_REMOVED])
1042	return;	1144	return;
1043		1145
1044	INVOKE_OBJECT (REMOVE, this);	1146	INVOKE_OBJECT (REMOVE, this);
1045		1147
…		…
1057	flag [FLAG_REMOVED] = false; // hack around the issue of visible_to checking flag_removed	1159	flag [FLAG_REMOVED] = false; // hack around the issue of visible_to checking flag_removed
1058	if (object *pl = visible_to ())	1160	if (object *pl = visible_to ())
1059	esrv_del_item (pl->contr, count);	1161	esrv_del_item (pl->contr, count);
1060	flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed	1162	flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed
1061		1163
1062	adjust_weight (env, -total_weight ());	1164	adjust_weight (env, total_weight (), 0);
		1165
		1166	object *pl = in_player ();
1063		1167
1064	/* we set up values so that it could be inserted into	1168	/* we set up values so that it could be inserted into
1065	* the map, but we don't actually do that - it is up	1169	* the map, but we don't actually do that - it is up
1066	* to the caller to decide what we want to do.	1170	* to the caller to decide what we want to do.
1067	*/	1171	*/
…		…
1075		1179
1076	above = 0;	1180	above = 0;
1077	below = 0;	1181	below = 0;
1078	env = 0;	1182	env = 0;
1079		1183
1080	/* NO_FIX_PLAYER is set when a great many changes are being	1184	if (pl && pl->is_player ())
1081	* made to players inventory. If set, avoiding the call
1082	* to save cpu time.
1083	*/	1185	{
1084	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1186	if (expect_false (pl->contr->combat_ob == this))
1085	otmp->update_stats ();	1187	{
		1188	pl->apply (pl->contr->combat_ob, AP_UNAPPLY | AP_IGNORE_CURSE);
		1189	pl->contr->combat_ob = 0;
		1190	if (pl->contr->ranged_ob) pl->apply (pl->contr->ranged_ob);
		1191	}
		1192
		1193	if (expect_false (pl->contr->ranged_ob == this))
		1194	{
		1195	pl->apply (pl->contr->ranged_ob, AP_UNAPPLY | AP_IGNORE_CURSE);
		1196	pl->contr->ranged_ob = 0;
		1197	if (pl->contr->combat_ob) pl->apply (pl->contr->combat_ob);
		1198	}
		1199
		1200	pl->contr->queue_stats_update ();
		1201
		1202	if (expect_false (glow_radius) && pl->is_on_map ())
		1203	update_all_los (pl->map, pl->x, pl->y);
		1204	}
1086	}	1205	}
1087	else if (map)	1206	else if (map)
1088	{	1207	{
1089	map->dirty = true;	1208	map->dirty = true;
1090	mapspace &ms = this->ms ();	1209	mapspace &ms = this->ms ();
1091		1210
1092	if (object *pl = ms.player ())	1211	if (object *pl = ms.player ())
1093	{	1212	{
1094	if (type == PLAYER) // this == pl(!)	1213	if (is_player ())
1095	{	1214	{
		1215	if (!flag [FLAG_WIZPASS])
		1216	ms.smell = ++mapspace::smellcount; // remember the smell of the player
		1217
1096	// leaving a spot always closes any open container on the ground	1218	// leaving a spot always closes any open container on the ground
1097	if (container && !container->env)	1219	if (container && !container->env)
1098	// this causes spurious floorbox updates, but it ensures	1220	// this causes spurious floorbox updates, but it ensures
1099	// that the CLOSE event is being sent.	1221	// that the CLOSE event is being sent.
1100	close_container ();	1222	close_container ();
1101		1223
1102	--map->players;	1224	--map->players;
1103	map->touch ();	1225	map->touch ();
1104	}	1226	}
1105	else if (pl->container == this)	1227	else if (pl->container_ () == this)
1106	{	1228	{
1107	// removing a container should close it	1229	// removing a container should close it
1108	close_container ();	1230	close_container ();
1109	}	1231	}
1110		1232	else
1111	esrv_del_item (pl->contr, count);	1233	esrv_del_item (pl->contr, count);
1112	}	1234	}
1113		1235
1114	/* link the object above us */	1236	/* link the object above us */
1115	// re-link, make sure compiler can easily use cmove	1237	// re-link, make sure compiler can easily use cmove
1116	*(above ? &above->below : &ms.top) = below;	1238	*(above ? &above->below : &ms.top) = below;
1117	*(below ? &below->above : &ms.bot) = above;	1239	*(below ? &below->above : &ms.bot) = above;
1118		1240
1119	above = 0;	1241	above = 0;
1120	below = 0;	1242	below = 0;
1121		1243
		1244	ms.invalidate ();
		1245
1122	if (map->in_memory == MAP_SAVING)	1246	if (map->in_memory == MAP_SAVING)
1123	return;	1247	return;
1124		1248
1125	int check_walk_off = !flag [FLAG_NO_APPLY];	1249	int check_walk_off = !flag [FLAG_NO_APPLY];
1126		1250
1127	if (object *pl = ms.player ())	1251	if (object *pl = ms.player ())
1128	{	1252	{
1129	if (pl->container == this)	1253	if (pl->container_ () == this)
1130	/* If a container that the player is currently using somehow gets	1254	/* If a container that the player is currently using somehow gets
1131	* removed (most likely destroyed), update the player view	1255	* removed (most likely destroyed), update the player view
1132	* appropriately.	1256	* appropriately.
1133	*/	1257	*/
1134	pl->close_container ();	1258	pl->close_container ();
…		…
1138	//TODO: update floorbox to preserve ordering	1262	//TODO: update floorbox to preserve ordering
1139	if (pl->contr->ns)	1263	if (pl->contr->ns)
1140	pl->contr->ns->floorbox_update ();	1264	pl->contr->ns->floorbox_update ();
1141	}	1265	}
1142		1266
		1267	if (check_walk_off)
1143	for (tmp = ms.bot; tmp; tmp = tmp->above)	1268	for (object *above, *tmp = ms.bot; tmp; tmp = above)
1144	{	1269	{
		1270	above = tmp->above;
		1271
1145	/* No point updating the players look faces if he is the object	1272	/* No point updating the players look faces if he is the object
1146	* being removed.	1273	* being removed.
1147	*/	1274	*/
1148		1275
1149	/* See if object moving off should effect something */	1276	/* See if object moving off should effect something */
1150	if (check_walk_off
1151	&& ((move_type & tmp->move_off)	1277	if ((move_type & tmp->move_off)
1152	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))	1278	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0)
1153	{
1154	move_apply (tmp, this, 0);	1279	move_apply (tmp, this, 0);
1155
1156	if (destroyed ())
1157	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1158	}	1280	}
1159		1281
1160	last = tmp;	1282	if (affects_los ())
1161	}
1162
1163	/* last == NULL if there are no objects on this space */
1164	//TODO: this makes little sense, why only update the topmost object?
1165	if (!last)
1166	map->at (x, y).flags_ = 0;
1167	else
1168	update_object (last, UP_OBJ_REMOVE);
1169
1170	if (flag [FLAG_BLOCKSVIEW] || glow_radius)
1171	update_all_los (map, x, y);	1283	update_all_los (map, x, y);
1172	}	1284	}
1173	}	1285	}
1174		1286
1175	/*	1287	/*
…		…
1199	esrv_update_item (UPD_NROF, pl, top);	1311	esrv_update_item (UPD_NROF, pl, top);
1200		1312
1201	op->weight = 0; // cancel the addition above	1313	op->weight = 0; // cancel the addition above
1202	op->carrying = 0; // must be 0 already	1314	op->carrying = 0; // must be 0 already
1203		1315
1204	op->destroy (1);	1316	op->destroy ();
1205		1317
1206	return top;	1318	return top;
1207	}	1319	}
1208		1320
1209	return 0;	1321	return 0;
…		…
1217		1329
1218	object *prev = this;	1330	object *prev = this;
1219		1331
1220	for (archetype *at = (archetype *)arch->more; at; at = (archetype *)at->more)	1332	for (archetype *at = (archetype *)arch->more; at; at = (archetype *)at->more)
1221	{	1333	{
1222	object *op = arch_to_object (at);	1334	object *op = at->instance ();
1223		1335
1224	op->name = name;	1336	op->name = name;
1225	op->name_pl = name_pl;	1337	op->name_pl = name_pl;
1226	op->title = title;	1338	op->title = title;
1227		1339
…		…
1265	* Passing 0 for flag gives proper default values, so flag really only needs	1377	* Passing 0 for flag gives proper default values, so flag really only needs
1266	* to be set if special handling is needed.	1378	* to be set if special handling is needed.
1267	*	1379	*
1268	* Return value:	1380	* Return value:
1269	* new object if 'op' was merged with other object	1381	* new object if 'op' was merged with other object
1270	* NULL if 'op' was destroyed	1382	* NULL if there was an error (destroyed, blocked etc.)
1271	* just 'op' otherwise	1383	* just 'op' otherwise
1272	*/	1384	*/
1273	object *	1385	object *
1274	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)	1386	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1275	{	1387	{
1276	if (op->is_on_map ())
1277	{
1278	LOG (llevError, "insert_ob_in_map called for object already on map");
1279	abort ();
1280	}
1281
1282	if (op->env)
1283	{
1284	LOG (llevError, "insert_ob_in_map called for object in an inventory (proceeding)");
1285	op->remove ();	1388	op->remove ();
1286	}
1287		1389
1288	if (op->face && !face_info (op->face))//D TODO: remove soon	1390	if (m == &freed_map)//D TODO: remove soon
1289	{//D	1391	{//D
1290	LOG (llevError | logBacktrace, "op->face out of bounds: %s", op->debug_desc ());//D	1392	LOG (llevError | logBacktrace, "tries to insret object on freed objects map: %s", op->debug_desc ());//D
1291	op->face = 1;//D
1292	}//D	1393	}//D
1293		1394
1294	/* Ideally, the caller figures this out. However, it complicates a lot	1395	/* Ideally, the caller figures this out. However, it complicates a lot
1295	* of areas of callers (eg, anything that uses find_free_spot would now	1396	* of areas of callers (eg, anything that uses find_free_spot would now
1296	* need extra work	1397	* need extra work
1297	*/	1398	*/
		1399	maptile *newmap = m;
1298	if (!xy_normalise (m, op->x, op->y))	1400	if (!xy_normalise (newmap, op->x, op->y))
1299	{	1401	{
1300	op->head_ ()->destroy (1);// remove head_ once all tail object destroyers found	1402	op->head_ ()->destroy ();// remove head_ once all tail object destroyers found
1301	return 0;	1403	return 0;
1302	}	1404	}
1303		1405
1304	if (object *more = op->more)	1406	if (object *more = op->more)
1305	if (!insert_ob_in_map (more, m, originator, flag))	1407	if (!insert_ob_in_map (more, m, originator, flag))
1306	return 0;	1408	return 0;
1307		1409
1308	CLEAR_FLAG (op, FLAG_REMOVED);	1410	op->flag [FLAG_REMOVED] = false;
1309		1411	op->env = 0;
1310	op->map = m;	1412	op->map = newmap;
		1413
1311	mapspace &ms = op->ms ();	1414	mapspace &ms = op->ms ();
1312		1415
1313	/* this has to be done after we translate the coordinates.	1416	/* this has to be done after we translate the coordinates.
1314	*/	1417	*/
1315	if (op->nrof && !(flag & INS_NO_MERGE))	1418	if (op->nrof && !(flag & INS_NO_MERGE))
…		…
1318	{	1421	{
1319	// TODO: we actually want to update tmp, not op,	1422	// TODO: we actually want to update tmp, not op,
1320	// but some caller surely breaks when we return tmp	1423	// but some caller surely breaks when we return tmp
1321	// from here :/	1424	// from here :/
1322	op->nrof += tmp->nrof;	1425	op->nrof += tmp->nrof;
1323	tmp->destroy (1);	1426	tmp->destroy ();
1324	}	1427	}
1325		1428
1326	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1429	op->clr_flag (FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1327	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1430	op->clr_flag (FLAG_INV_LOCKED);
1328		1431
1329	if (!QUERY_FLAG (op, FLAG_ALIVE))	1432	if (!op->flag [FLAG_ALIVE])
1330	CLEAR_FLAG (op, FLAG_NO_STEAL);	1433	op->clr_flag (FLAG_NO_STEAL);
1331		1434
1332	if (flag & INS_BELOW_ORIGINATOR)	1435	if (flag & INS_BELOW_ORIGINATOR)
1333	{	1436	{
1334	if (originator->map != op->map || originator->x != op->x || originator->y != op->y)	1437	if (originator->map != op->map || originator->x != op->x || originator->y != op->y)
1335	{	1438	{
1336	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");	1439	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");
1337	abort ();	1440	abort ();
1338	}	1441	}
1339		1442
1340	if (!originator->is_on_map ())	1443	if (!originator->is_on_map ())
		1444	{
1341	LOG (llevDebug | logBacktrace, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map",	1445	LOG (llevError, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map",
1342	op->debug_desc (), originator->debug_desc ());	1446	op->debug_desc (), originator->debug_desc ());
		1447	abort ();
		1448	}
1343		1449
1344	op->above = originator;	1450	op->above = originator;
1345	op->below = originator->below;	1451	op->below = originator->below;
1346	originator->below = op;	1452	originator->below = op;
1347		1453
…		…
1367	* when lots of spells are cast in one area. Currently, it is presumed	1473	* when lots of spells are cast in one area. Currently, it is presumed
1368	* that flying non pickable objects are spell objects.	1474	* that flying non pickable objects are spell objects.
1369	*/	1475	*/
1370	for (object *tmp = ms.bot; tmp; tmp = tmp->above)	1476	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1371	{	1477	{
1372	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) || QUERY_FLAG (tmp, FLAG_OVERLAY_FLOOR))	1478	if (tmp->flag [FLAG_IS_FLOOR] || tmp->flag [FLAG_OVERLAY_FLOOR])
1373	floor = tmp;	1479	floor = tmp;
1374		1480
1375	if (QUERY_FLAG (tmp, FLAG_NO_PICK) && (tmp->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (tmp, FLAG_IS_FLOOR))	1481	if (tmp->flag [FLAG_NO_PICK] && (tmp->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !tmp->flag [FLAG_IS_FLOOR])
1376	{	1482	{
1377	/* We insert above top, so we want this object below this */	1483	/* We insert above top, so we want this object below this */
1378	top = tmp->below;	1484	top = tmp->below;
1379	break;	1485	break;
1380	}	1486	}
…		…
1398	&& (op->face && !faces [op->face].visibility))	1504	&& (op->face && !faces [op->face].visibility))
1399	{	1505	{
1400	object *last;	1506	object *last;
1401		1507
1402	for (last = top; last != floor; last = last->below)	1508	for (last = top; last != floor; last = last->below)
1403	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1509	if (last->flag [FLAG_BLOCKSVIEW] && (last->type != EXIT))
1404	break;	1510	break;
1405		1511
1406	/* Check to see if we found the object that blocks view,	1512	/* Check to see if we found the object that blocks view,
1407	* and make sure we have a below pointer for it so that	1513	* and make sure we have a below pointer for it so that
1408	* we can get inserted below this one, which requires we	1514	* we can get inserted below this one, which requires we
…		…
1433	op->below = top;	1539	op->below = top;
1434	*(op->above ? &op->above->below : &ms.top) = op;	1540	*(op->above ? &op->above->below : &ms.top) = op;
1435	}	1541	}
1436	}	1542	}
1437		1543
1438	if (op->type == PLAYER)	1544	if (op->is_player ())
1439	{	1545	{
1440	op->contr->do_los = 1;	1546	op->contr->do_los = 1;
1441	++op->map->players;	1547	++op->map->players;
1442	op->map->touch ();	1548	op->map->touch ();
1443	}	1549	}
…		…
1458	* be far away from this change and not affected in any way -	1564	* be far away from this change and not affected in any way -
1459	* this should get redone to only look for players within range,	1565	* this should get redone to only look for players within range,
1460	* or just updating the P_UPTODATE for spaces within this area	1566	* or just updating the P_UPTODATE for spaces within this area
1461	* of effect may be sufficient.	1567	* of effect may be sufficient.
1462	*/	1568	*/
1463	if (op->map->darkness && (op->glow_radius != 0))	1569	if (op->affects_los ())
		1570	{
		1571	op->ms ().invalidate ();
1464	update_all_los (op->map, op->x, op->y);	1572	update_all_los (op->map, op->x, op->y);
		1573	}
1465		1574
1466	/* updates flags (blocked, alive, no magic, etc) for this map space */	1575	/* updates flags (blocked, alive, no magic, etc) for this map space */
1467	update_object (op, UP_OBJ_INSERT);	1576	update_object (op, UP_OBJ_INSERT);
1468		1577
1469	INVOKE_OBJECT (INSERT, op);	1578	INVOKE_OBJECT (INSERT, op);
…		…
1476	* blocked() and wall() work properly), and these flags are updated by	1585	* blocked() and wall() work properly), and these flags are updated by
1477	* update_object().	1586	* update_object().
1478	*/	1587	*/
1479		1588
1480	/* if this is not the head or flag has been passed, don't check walk on status */	1589	/* if this is not the head or flag has been passed, don't check walk on status */
1481	if (!(flag & INS_NO_WALK_ON) && op->head_ () == op)	1590	if (!(flag & INS_NO_WALK_ON) && op->is_head ())
1482	{	1591	{
1483	if (check_move_on (op, originator))	1592	if (check_move_on (op, originator, flag))
1484	return 0;	1593	return 0;
1485		1594
1486	/* If we are a multi part object, lets work our way through the check	1595	/* If we are a multi part object, let's work our way through the check
1487	* walk on's.	1596	* walk on's.
1488	*/	1597	*/
1489	for (object *tmp = op->more; tmp; tmp = tmp->more)	1598	for (object *tmp = op->more; tmp; tmp = tmp->more)
1490	if (check_move_on (tmp, originator))	1599	if (check_move_on (tmp, originator, flag))
1491	return 0;	1600	return 0;
1492	}	1601	}
1493		1602
1494	return op;	1603	return op;
1495	}	1604	}
…		…
1497	/* this function inserts an object in the map, but if it	1606	/* this function inserts an object in the map, but if it
1498	* finds an object of its own type, it'll remove that one first.	1607	* finds an object of its own type, it'll remove that one first.
1499	* op is the object to insert it under: supplies x and the map.	1608	* op is the object to insert it under: supplies x and the map.
1500	*/	1609	*/
1501	void	1610	void
1502	replace_insert_ob_in_map (const char *arch_string, object *op)	1611	replace_insert_ob_in_map (shstr_tmp archname, object *op)
1503	{	1612	{
1504	/* first search for itself and remove any old instances */	1613	/* first search for itself and remove any old instances */
1505		1614
1506	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)	1615	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1507	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */	1616	if (tmp->arch->archname == archname) /* same archetype */
1508	tmp->destroy (1);	1617	tmp->destroy ();
1509		1618
1510	object *tmp = arch_to_object (archetype::find (arch_string));	1619	object *tmp = archetype::find (archname)->instance ();
1511		1620
1512	tmp->x = op->x;	1621	tmp->x = op->x;
1513	tmp->y = op->y;	1622	tmp->y = op->y;
1514		1623
1515	insert_ob_in_map (tmp, op->map, op, 0);	1624	insert_ob_in_map (tmp, op->map, op, 0);
…		…
1520	{	1629	{
1521	if (where->env)	1630	if (where->env)
1522	return where->env->insert (this);	1631	return where->env->insert (this);
1523	else	1632	else
1524	return where->map->insert (this, where->x, where->y, originator, flags);	1633	return where->map->insert (this, where->x, where->y, originator, flags);
		1634	}
		1635
		1636	// check whether we can put this into the map, respect max_volume, max_items
		1637	bool
		1638	object::can_drop_at (maptile *m, int x, int y, object *originator)
		1639	{
		1640	mapspace &ms = m->at (x, y);
		1641
		1642	int items = ms.items ();
		1643
		1644	if (!items // testing !items ensures we can drop at least one item
		1645	|| (items < m->max_items
		1646	&& ms.volume () < m->max_volume))
		1647	return true;
		1648
		1649	if (originator && originator->is_player ())
		1650	originator->contr->failmsgf (
		1651	"No matter how hard you try, you just cannot put the %s here H<Try to remove some items from the floor first.>",
		1652	query_name ()
		1653	);
		1654
		1655	return false;
1525	}	1656	}
1526		1657
1527	/*	1658	/*
1528	* decrease(object, number) decreases a specified number from	1659	* decrease(object, number) decreases a specified number from
1529	* the amount of an object. If the amount reaches 0, the object	1660	* the amount of an object. If the amount reaches 0, the object
…		…
1537	if (!nr)	1668	if (!nr)
1538	return true;	1669	return true;
1539		1670
1540	nr = min (nr, nrof);	1671	nr = min (nr, nrof);
1541		1672
		1673	if (nrof > nr)
		1674	{
		1675	sint64 oweight = total_weight ();
		1676
1542	nrof -= nr;	1677	nrof -= nr;
1543
1544	if (nrof)
1545	{
1546	adjust_weight (env, -weight * max (1, nr)); // carrying == 0
1547		1678
1548	if (object *pl = visible_to ())	1679	if (object *pl = visible_to ())
1549	esrv_update_item (UPD_NROF, pl, this);	1680	esrv_update_item (UPD_NROF, pl, this);
1550		1681
		1682	adjust_weight (env, oweight, total_weight ());
		1683
1551	return true;	1684	return true;
1552	}	1685	}
1553	else	1686	else
1554	{	1687	{
1555	destroy (1);	1688	destroy ();
1556	return false;	1689	return false;
1557	}	1690	}
1558	}	1691	}
1559		1692
1560	/*	1693	/*
…		…
1629	if (op->nrof)	1762	if (op->nrof)
1630	for (object *tmp = inv; tmp; tmp = tmp->below)	1763	for (object *tmp = inv; tmp; tmp = tmp->below)
1631	if (object::can_merge (tmp, op))	1764	if (object::can_merge (tmp, op))
1632	{	1765	{
1633	/* return the original object and remove inserted object	1766	/* return the original object and remove inserted object
1634	(client needs the original object) */	1767	(client prefers the original object) */
		1768
		1769	// carring must be 0 for mergable objects
		1770	sint64 oweight = tmp->weight * tmp->nrof;
		1771
1635	tmp->nrof += op->nrof;	1772	tmp->nrof += op->nrof;
1636		1773
1637	if (object *pl = tmp->visible_to ())	1774	if (object *pl = tmp->visible_to ())
1638	esrv_update_item (UPD_NROF, pl, tmp);	1775	esrv_update_item (UPD_NROF, pl, tmp);
1639		1776
1640	adjust_weight (this, op->total_weight ());	1777	adjust_weight (this, oweight, tmp->weight * tmp->nrof);
1641		1778
1642	op->destroy (1);	1779	op->destroy ();
1643	op = tmp;	1780	op = tmp;
1644	goto inserted;	1781	goto inserted;
1645	}	1782	}
1646		1783
1647	op->owner = 0; // it's his/hers now. period.	1784	op->owner = 0; // it's his/hers now. period.
…		…
1661	op->flag [FLAG_REMOVED] = 0;	1798	op->flag [FLAG_REMOVED] = 0;
1662		1799
1663	if (object *pl = op->visible_to ())	1800	if (object *pl = op->visible_to ())
1664	esrv_send_item (pl, op);	1801	esrv_send_item (pl, op);
1665		1802
1666	adjust_weight (this, op->total_weight ());	1803	adjust_weight (this, 0, op->total_weight ());
1667		1804
1668	inserted:	1805	inserted:
1669	/* reset the light list and los of the players on the map */	1806	/* reset the light list and los of the players on the map */
1670	if (op->glow_radius && map && map->darkness)	1807	if (op->glow_radius && is_on_map ())
		1808	{
		1809	update_stats ();
1671	update_all_los (map, x, y);	1810	update_all_los (map, x, y);
1672		1811	}
		1812	else if (is_player ())
1673	// if this is a player's inventory, update stats	1813	// if this is a player's inventory, update stats
1674	if (type == PLAYER && !flag [FLAG_NO_FIX_PLAYER])	1814	contr->queue_stats_update ();
1675	update_stats ();
1676		1815
1677	INVOKE_OBJECT (INSERT, this);	1816	INVOKE_OBJECT (INSERT, this);
1678		1817
1679	return op;	1818	return op;
1680	}	1819	}
…		…
1698	* MSW 2001-07-08: Check all objects on space, not just those below	1837	* MSW 2001-07-08: Check all objects on space, not just those below
1699	* object being inserted. insert_ob_in_map may not put new objects	1838	* object being inserted. insert_ob_in_map may not put new objects
1700	* on top.	1839	* on top.
1701	*/	1840	*/
1702	int	1841	int
1703	check_move_on (object *op, object *originator)	1842	check_move_on (object *op, object *originator, int flags)
1704	{	1843	{
		1844	if (op->flag [FLAG_NO_APPLY])
		1845	return 0;
		1846
1705	object *tmp;	1847	object *tmp;
1706	maptile *m = op->map;	1848	maptile *m = op->map;
1707	int x = op->x, y = op->y;	1849	int x = op->x, y = op->y;
1708		1850
1709	MoveType move_on, move_slow, move_block;	1851	mapspace &ms = m->at (x, y);
1710		1852
1711	if (QUERY_FLAG (op, FLAG_NO_APPLY))	1853	ms.update ();
1712	return 0;
1713		1854
1714	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);	1855	MoveType move_on = ms.move_on;
1715	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);	1856	MoveType move_slow = ms.move_slow;
1716	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);	1857	MoveType move_block = ms.move_block;
1717		1858
1718	/* if nothing on this space will slow op down or be applied,	1859	/* if nothing on this space will slow op down or be applied,
1719	* no need to do checking below. have to make sure move_type	1860	* no need to do checking below. have to make sure move_type
1720	* is set, as lots of objects don't have it set - we treat that	1861	* is set, as lots of objects don't have it set - we treat that
1721	* as walking.	1862	* as walking.
…		…
1732	return 0;	1873	return 0;
1733		1874
1734	/* The objects have to be checked from top to bottom.	1875	/* The objects have to be checked from top to bottom.
1735	* Hence, we first go to the top:	1876	* Hence, we first go to the top:
1736	*/	1877	*/
1737		1878	for (object *next, *tmp = ms.top; tmp; tmp = next)
1738	for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above)
1739	{
1740	/* Trim the search when we find the first other spell effect
1741	* this helps performance so that if a space has 50 spell objects,
1742	* we don't need to check all of them.
1743	*/
1744	if ((tmp->move_type & MOVE_FLY_LOW) && QUERY_FLAG (tmp, FLAG_NO_PICK))
1745	break;
1746	}	1879	{
		1880	next = tmp->below;
1747		1881
1748	for (; tmp; tmp = tmp->below)
1749	{
1750	if (tmp == op)	1882	if (tmp == op)
1751	continue; /* Can't apply yourself */	1883	continue; /* Can't apply yourself */
1752		1884
1753	/* Check to see if one of the movement types should be slowed down.	1885	/* Check to see if one of the movement types should be slowed down.
1754	* Second check makes sure that the movement types not being slowed	1886	* Second check makes sure that the movement types not being slowed
1755	* (~slow_move) is not blocked on this space - just because the	1887	* (~slow_move) is not blocked on this space - just because the
1756	* space doesn't slow down swimming (for example), if you can't actually	1888	* space doesn't slow down swimming (for example), if you can't actually
1757	* swim on that space, can't use it to avoid the penalty.	1889	* swim on that space, can't use it to avoid the penalty.
1758	*/	1890	*/
1759	if (!QUERY_FLAG (op, FLAG_WIZPASS))	1891	if (!op->flag [FLAG_WIZPASS])
1760	{	1892	{
1761	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||	1893	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
1762	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))	1894	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1763	{	1895	{
1764
1765	float
1766	diff = tmp->move_slow_penalty * fabs (op->speed);	1896	float diff = tmp->move_slow_penalty * fabs (op->speed);
1767		1897
1768	if (op->type == PLAYER)	1898	if (op->is_player ())
1769	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||	1899	if ((tmp->flag [FLAG_IS_HILLY ] && find_skill_by_number (op, SK_CLIMBING)) ||
1770	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))	1900	(tmp->flag [FLAG_IS_WOODED] && find_skill_by_number (op, SK_WOODSMAN)))
1771	diff /= 4.0;	1901	diff /= 4.0;
1772		1902
1773	op->speed_left -= diff;	1903	op->speed_left -= diff;
1774	}	1904	}
1775	}	1905	}
1776		1906
1777	/* Basically same logic as above, except now for actual apply. */	1907	/* Basically same logic as above, except now for actual apply. */
1778	if ((!op->move_type && tmp->move_on & MOVE_WALK) ||	1908	if ((!op->move_type && tmp->move_on & MOVE_WALK) ||
1779	((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))	1909	((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))
1780	{	1910	{
		1911	if ((flags & INS_NO_AUTO_EXIT)
		1912	&& (tmp->type == EXIT || tmp->type == TELEPORTER
		1913	|| tmp->type == HOLE || tmp->type == TRAPDOOR)) //TODO: temporary, fix exits instead
		1914	continue;
		1915
1781	move_apply (tmp, op, originator);	1916	move_apply (tmp, op, originator);
1782		1917
1783	if (op->destroyed ())	1918	if (op->destroyed ())
1784	return 1;	1919	return 1;
1785		1920
…		…
1897	void	2032	void
1898	flag_inv (object *op, int flag)	2033	flag_inv (object *op, int flag)
1899	{	2034	{
1900	for (object *tmp = op->inv; tmp; tmp = tmp->below)	2035	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1901	{	2036	{
1902	SET_FLAG (tmp, flag);	2037	tmp->set_flag (flag);
1903	flag_inv (tmp, flag);	2038	flag_inv (tmp, flag);
1904	}	2039	}
1905	}	2040	}
1906		2041
1907	/*	2042	/*
…		…
1910	void	2045	void
1911	unflag_inv (object *op, int flag)	2046	unflag_inv (object *op, int flag)
1912	{	2047	{
1913	for (object *tmp = op->inv; tmp; tmp = tmp->below)	2048	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1914	{	2049	{
1915	CLEAR_FLAG (tmp, flag);	2050	tmp->clr_flag (flag);
1916	unflag_inv (tmp, flag);	2051	unflag_inv (tmp, flag);
1917	}	2052	}
1918	}	2053	}
1919		2054
1920	/*	2055	/*
…		…
1981	* head of the object should correspond for the entire object.	2116	* head of the object should correspond for the entire object.
1982	*/	2117	*/
1983	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))	2118	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
1984	continue;	2119	continue;
1985		2120
1986	if (ob->blocked (m, pos.x, pos.y))	2121	if (ob->blocked (pos.m, pos.x, pos.y))
1987	continue;	2122	continue;
1988		2123
1989	altern [index++] = i;	2124	altern [index++] = i;
1990	}	2125	}
1991		2126
…		…
2059	* there is capable of.	2194	* there is capable of.
2060	*/	2195	*/
2061	int	2196	int
2062	find_dir (maptile *m, int x, int y, object *exclude)	2197	find_dir (maptile *m, int x, int y, object *exclude)
2063	{	2198	{
2064	int i, max = SIZEOFFREE, mflags;	2199	int max = SIZEOFFREE, mflags;
2065
2066	sint16 nx, ny;
2067	object *tmp;
2068	maptile *mp;
2069
2070	MoveType blocked, move_type;	2200	MoveType move_type;
2071		2201
2072	if (exclude && exclude->head_ () != exclude)	2202	if (exclude && exclude->head_ () != exclude)
2073	{	2203	{
2074	exclude = exclude->head;	2204	exclude = exclude->head;
2075	move_type = exclude->move_type;	2205	move_type = exclude->move_type;
…		…
2078	{	2208	{
2079	/* If we don't have anything, presume it can use all movement types. */	2209	/* If we don't have anything, presume it can use all movement types. */
2080	move_type = MOVE_ALL;	2210	move_type = MOVE_ALL;
2081	}	2211	}
2082		2212
2083	for (i = 1; i < max; i++)	2213	for (int i = 1; i < max; i++)
2084	{	2214	{
2085	mp = m;	2215	mapxy pos (m, x, y);
2086	nx = x + freearr_x[i];	2216	pos.move (i);
2087	ny = y + freearr_y[i];
2088		2217
2089	mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);	2218	if (!pos.normalise ())
2090
2091	if (mflags & P_OUT_OF_MAP)
2092	max = maxfree[i];	2219	max = maxfree[i];
2093	else	2220	else
2094	{	2221	{
2095	mapspace &ms = mp->at (nx, ny);	2222	mapspace &ms = *pos;
2096		2223
2097	blocked = ms.move_block;
2098
2099	if ((move_type & blocked) == move_type)	2224	if ((move_type & ms.move_block) == move_type)
2100	max = maxfree[i];	2225	max = maxfree [i];
2101	else if (mflags & P_IS_ALIVE)	2226	else if (ms.flags () & P_IS_ALIVE)
2102	{	2227	{
2103	for (tmp = ms.bot; tmp; tmp = tmp->above)	2228	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
2104	if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)	2229	if ((tmp->flag [FLAG_MONSTER] || tmp->is_player ())
2105	&& (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))	2230	&& (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2106	break;
2107
2108	if (tmp)
2109	return freedir[i];	2231	return freedir [i];
2110	}	2232	}
2111	}	2233	}
2112	}	2234	}
2113		2235
2114	return 0;	2236	return 0;
…		…
2123	{	2245	{
2124	return (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);	2246	return (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);
2125	}	2247	}
2126		2248
2127	/*	2249	/*
2128	* find_dir_2(delta-x,delta-y) will return a direction in which	2250	* find_dir_2(delta-x,delta-y) will return a direction value
2129	* an object which has subtracted the x and y coordinates of another	2251	* for running into direct [dx, dy].
2130	* object, needs to travel toward it.	2252	* (the opposite of crossfire's find_dir_2!)
2131	*/	2253	*/
2132	int	2254	int
2133	find_dir_2 (int x, int y)	2255	find_dir_2 (int x, int y)
2134	{	2256	{
		2257	#if 1 // new algorithm
		2258	// this works by putting x, y into 16 sectors, which
		2259	// are not equal sized, but are a better approximation
		2260	// then the old algorithm, and then using a mapping
		2261	// table to map it into a direction value.
		2262	// basically, it maps these comparisons to each bit
		2263	// bit #3: x < 0
		2264	// bit #2: y < 0
		2265	// bit #1: x > y
		2266	// bit #0: x > 2y
		2267
		2268	static const uint8 dir[16] = {
		2269	4, 5, 4, 3,
		2270	2, 1, 2, 3,
		2271	6, 5, 6, 7,
		2272	8, 1, 8, 7,
		2273	};
		2274	int sector = 0;
		2275
		2276	// this is a bit ugly, but more likely to result in branchless code
		2277	sector |= x < 0 ? 8 : 0;
		2278	x = x < 0 ? -x : x; // abs
		2279
		2280	sector |= y < 0 ? 4 : 0;
		2281	y = y < 0 ? -y : y; // abs
		2282
		2283	if (x > y)
		2284	{
		2285	sector |= 2;
		2286
		2287	if (x > y * 2)
		2288	sector |= 1;
		2289	}
		2290	else
		2291	{
		2292	if (y > x * 2)
		2293	sector |= 1;
		2294	else if (!y)
		2295	return 0; // x == 0 here
		2296	}
		2297
		2298	return dir [sector];
		2299	#else // old algorithm
2135	int q;	2300	int q;
2136		2301
2137	if (y)	2302	if (y)
2138	q = x * 100 / y;	2303	q = 128 * x / y;
2139	else if (x)	2304	else if (x)
2140	q = -300 * x;	2305	q = -512 * x; // to make it > 309
2141	else	2306	else
2142	return 0;	2307	return 0;
2143		2308
2144	if (y > 0)	2309	if (y > 0)
2145	{	2310	{
2146	if (q < -242)	2311	if (q < -309) return 7;
		2312	if (q < -52) return 6;
		2313	if (q < 52) return 5;
		2314	if (q < 309) return 4;
		2315
2147	return 3;	2316	return 3;
2148	if (q < -41)	2317	}
2149	return 2;	2318	else
2150	if (q < 41)	2319	{
2151	return 1;	2320	if (q < -309) return 3;
2152	if (q < 242)	2321	if (q < -52) return 2;
2153	return 8;	2322	if (q < 52) return 1;
		2323	if (q < 309) return 8;
		2324
2154	return 7;	2325	return 7;
2155	}	2326	}
2156		2327	#endif
2157	if (q < -242)
2158	return 7;
2159	if (q < -41)
2160	return 6;
2161	if (q < 41)
2162	return 5;
2163	if (q < 242)
2164	return 4;
2165
2166	return 3;
2167	}	2328	}
2168		2329
2169	/*	2330	/*
2170	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is	2331	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is
2171	* between two directions (which are expected to be absolute (see absdir())	2332	* between two directions (which are expected to be absolute (see absdir())
2172	*/	2333	*/
2173	int	2334	int
2174	dirdiff (int dir1, int dir2)	2335	dirdiff (int dir1, int dir2)
2175	{	2336	{
2176	int d;
2177
2178	d = abs (dir1 - dir2);	2337	int d = abs (dir1 - dir2);
2179	if (d > 4)
2180	d = 8 - d;
2181		2338
2182	return d;	2339	return d > 4 ? 8 - d : d;
2183	}	2340	}
2184		2341
2185	/* peterm:	2342	/* peterm:
2186	* do LOS stuff for ball lightning. Go after the closest VISIBLE monster.	2343	* do LOS stuff for ball lightning. Go after the closest VISIBLE monster.
2187	* Basically, this is a table of directions, and what directions	2344	* Basically, this is a table of directions, and what directions
…		…
2189	* This basically means that if direction is 15, then it could either go	2346	* This basically means that if direction is 15, then it could either go
2190	* direction 4, 14, or 16 to get back to where we are.	2347	* direction 4, 14, or 16 to get back to where we are.
2191	* Moved from spell_util.c to object.c with the other related direction	2348	* Moved from spell_util.c to object.c with the other related direction
2192	* functions.	2349	* functions.
2193	*/	2350	*/
2194	int reduction_dir[SIZEOFFREE][3] = {	2351	static const int reduction_dir[SIZEOFFREE][3] = {
2195	{0, 0, 0}, /* 0 */	2352	{0, 0, 0}, /* 0 */
2196	{0, 0, 0}, /* 1 */	2353	{0, 0, 0}, /* 1 */
2197	{0, 0, 0}, /* 2 */	2354	{0, 0, 0}, /* 2 */
2198	{0, 0, 0}, /* 3 */	2355	{0, 0, 0}, /* 3 */
2199	{0, 0, 0}, /* 4 */	2356	{0, 0, 0}, /* 4 */
…		…
2293	* Add a check so we can't pick up invisible objects (0.93.8)	2450	* Add a check so we can't pick up invisible objects (0.93.8)
2294	*/	2451	*/
2295	int	2452	int
2296	can_pick (const object *who, const object *item)	2453	can_pick (const object *who, const object *item)
2297	{	2454	{
2298	return /*QUERY_FLAG(who,FLAG_WIZ)|| */	2455	return /*who->flag [FLAG_WIZ]|| */
2299	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&	2456	(item->weight > 0 && !item->flag [FLAG_NO_PICK] &&
2300	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3));	2457	!item->flag [FLAG_ALIVE] && !item->invisible && (who->is_player () || item->weight < who->weight / 3));
2301	}	2458	}
2302		2459
2303	/*	2460	/*
2304	* create clone from object to another	2461	* create clone from object to another
2305	*/	2462	*/
…		…
2337	return tmp;	2494	return tmp;
2338		2495
2339	return 0;	2496	return 0;
2340	}	2497	}
2341		2498
2342	const shstr &	2499	shstr_tmp
2343	object::kv_get (const shstr &key) const	2500	object::kv_get (shstr_tmp key) const
2344	{	2501	{
2345	for (key_value *kv = key_values; kv; kv = kv->next)	2502	for (key_value *kv = key_values; kv; kv = kv->next)
2346	if (kv->key == key)	2503	if (kv->key == key)
2347	return kv->value;	2504	return kv->value;
2348		2505
2349	return shstr_null;	2506	return shstr ();
2350	}	2507	}
2351		2508
2352	void	2509	void
2353	object::kv_set (const shstr &key, const shstr &value)	2510	object::kv_set (shstr_tmp key, shstr_tmp value)
2354	{	2511	{
2355	for (key_value *kv = key_values; kv; kv = kv->next)	2512	for (key_value *kv = key_values; kv; kv = kv->next)
2356	if (kv->key == key)	2513	if (kv->key == key)
2357	{	2514	{
2358	kv->value = value;	2515	kv->value = value;
…		…
2367		2524
2368	key_values = kv;	2525	key_values = kv;
2369	}	2526	}
2370		2527
2371	void	2528	void
2372	object::kv_del (const shstr &key)	2529	object::kv_del (shstr_tmp key)
2373	{	2530	{
2374	for (key_value **kvp = &key_values; *kvp; kvp = &(*kvp)->next)	2531	for (key_value **kvp = &key_values; *kvp; kvp = &(*kvp)->next)
2375	if ((*kvp)->key == key)	2532	if ((*kvp)->key == key)
2376	{	2533	{
2377	key_value *kv = *kvp;	2534	key_value *kv = *kvp;
…		…
2470	{	2627	{
2471	return map ? map->region (x, y)	2628	return map ? map->region (x, y)
2472	: region::default_region ();	2629	: region::default_region ();
2473	}	2630	}
2474		2631
2475	const materialtype_t *
2476	object::dominant_material () const
2477	{
2478	if (materialtype_t *mt = name_to_material (materialname))
2479	return mt;
2480
2481	return name_to_material (shstr_unknown);
2482	}
2483
2484	void	2632	void
2485	object::open_container (object *new_container)	2633	object::open_container (object *new_container)
2486	{	2634	{
2487	if (container == new_container)	2635	if (container == new_container)
2488	return;	2636	return;
…		…
2508	container = 0;	2656	container = 0;
2509		2657
2510	// client needs item update to make it work, client bug requires this to be separate	2658	// client needs item update to make it work, client bug requires this to be separate
2511	esrv_update_item (UPD_FLAGS, this, old_container);	2659	esrv_update_item (UPD_FLAGS, this, old_container);
2512		2660
2513	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));	2661	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", old_container->query_name ());
2514	play_sound (sound_find ("chest_close"));	2662	play_sound (sound_find ("chest_close"));
2515	}	2663	}
2516		2664
2517	if (new_container)	2665	if (new_container)
2518	{	2666	{
…		…
2522	// TODO: this does not seem to serve any purpose anymore?	2670	// TODO: this does not seem to serve any purpose anymore?
2523	#if 0	2671	#if 0
2524	// insert the "Close Container" object.	2672	// insert the "Close Container" object.
2525	if (archetype *closer = new_container->other_arch)	2673	if (archetype *closer = new_container->other_arch)
2526	{	2674	{
2527	object *closer = arch_to_object (new_container->other_arch);	2675	object *closer = new_container->other_arch->instance ();
2528	closer->flag [FLAG_NO_MAP_SAVE] = 1;	2676	closer->flag [FLAG_NO_MAP_SAVE] = 1;
2529	new_container->insert (closer);	2677	new_container->insert (closer);
2530	}	2678	}
2531	#endif	2679	#endif
2532		2680
2533	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));	2681	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", new_container->query_name ());
2534		2682
2535	// make sure the container is available, client bug requires this to be separate	2683	// make sure the container is available, client bug requires this to be separate
2536	esrv_send_item (this, new_container);	2684	esrv_send_item (this, new_container);
2537		2685
2538	new_container->flag [FLAG_APPLIED] = true;	2686	new_container->flag [FLAG_APPLIED] = true;
…		…
2546	// else if (!old_container->env && contr && contr->ns)	2694	// else if (!old_container->env && contr && contr->ns)
2547	// contr->ns->floorbox_reset ();	2695	// contr->ns->floorbox_reset ();
2548	}	2696	}
2549		2697
2550	object *	2698	object *
2551	object::force_find (const shstr name)	2699	object::force_find (shstr_tmp name)
2552	{	2700	{
2553	/* cycle through his inventory to look for the MARK we want to	2701	/* cycle through his inventory to look for the MARK we want to
2554	* place	2702	* place
2555	*/	2703	*/
2556	for (object *tmp = inv; tmp; tmp = tmp->below)	2704	for (object *tmp = inv; tmp; tmp = tmp->below)
…		…
2558	return splay (tmp);	2706	return splay (tmp);
2559		2707
2560	return 0;	2708	return 0;
2561	}	2709	}
2562		2710
		2711	//-GPL
		2712
2563	void	2713	void
		2714	object::force_set_timer (int duration)
		2715	{
		2716	this->duration = 1;
		2717	this->speed_left = -1.f;
		2718
		2719	this->set_speed (duration ? 1.f / duration : 0.f);
		2720	}
		2721
		2722	object *
2564	object::force_add (const shstr name, int duration)	2723	object::force_add (shstr_tmp name, int duration)
2565	{	2724	{
2566	if (object *force = force_find (name))	2725	if (object *force = force_find (name))
2567	force->destroy ();	2726	force->destroy ();
2568		2727
2569	object *force = get_archetype (FORCE_NAME);	2728	object *force = get_archetype (FORCE_NAME);
2570		2729
2571	force->slaying = name;	2730	force->slaying = name;
2572	force->stats.food = 1;	2731	force->force_set_timer (duration);
2573	force->speed_left = -1.f;
2574
2575	force->set_speed (duration ? 1.f / duration : 0.f);
2576	force->flag [FLAG_IS_USED_UP] = true;
2577	force->flag [FLAG_APPLIED] = true;	2732	force->flag [FLAG_APPLIED] = true;
2578		2733
2579	insert (force);	2734	return insert (force);
2580	}	2735	}
2581		2736
2582	void	2737	void
2583	object::play_sound (faceidx sound)	2738	object::play_sound (faceidx sound) const
2584	{	2739	{
2585	if (!sound)	2740	if (!sound)
2586	return;	2741	return;
2587		2742
2588	if (flag [FLAG_REMOVED])	2743	if (is_on_map ())
		2744	map->play_sound (sound, x, y);
		2745	else if (object *pl = in_player ())
		2746	pl->contr->play_sound (sound);
		2747	}
		2748
		2749	void
		2750	object::say_msg (const char *msg) const
		2751	{
		2752	if (is_on_map ())
		2753	map->say_msg (msg, x, y);
		2754	else if (object *pl = in_player ())
		2755	pl->contr->play_sound (sound);
		2756	}
		2757
		2758	void
		2759	object::make_noise ()
		2760	{
		2761	// we do not model noise in the map, so instead put
		2762	// a temporary light into the noise source
		2763	// could use the map instead, but that's less reliable for our
		2764	// goal, which is to make invisibility a bit harder to exploit
		2765
		2766	// currently only works sensibly for players
		2767	if (!is_player ())
2589	return;	2768	return;
2590		2769
2591	if (env)	2770	// find old force, or create new one
2592	{	2771	object *force = force_find (shstr_noise_force);
2593	if (object *pl = in_player ())	2772
2594	pl->contr->play_sound (sound);	2773	if (force)
2595	}	2774	force->speed_left = -1.f; // patch old speed up
2596	else	2775	else
2597	map->play_sound (sound, x, y);	2776	{
2598	}	2777	force = archetype::get (shstr_noise_force);
2599		2778
		2779	force->slaying = shstr_noise_force;
		2780	force->stats.food = 1;
		2781	force->speed_left = -1.f;
		2782
		2783	force->set_speed (1.f / 4.f);
		2784	force->flag [FLAG_IS_USED_UP] = true;
		2785	force->flag [FLAG_APPLIED] = true;
		2786
		2787	insert (force);
		2788	}
		2789	}
		2790
		2791	void object::change_move_type (MoveType mt)
		2792	{
		2793	if (move_type == mt)
		2794	return;
		2795
		2796	if (is_on_map ())
		2797	{
		2798	// we are on the map, so handle move_on/off effects
		2799	remove ();
		2800	move_type = mt;
		2801	map->insert (this, x, y, this);
		2802	}
		2803	else
		2804	move_type = mt;
		2805	}
		2806
		2807	/* object should be a player.
		2808	* we return the object the player has marked with the 'mark' command
		2809	* below. If no match is found (or object has changed), we return
		2810	* NULL. We leave it up to the calling function to print messages if
		2811	* nothing is found.
		2812	*/
		2813	object *
		2814	object::mark () const
		2815	{
		2816	if (contr && contr->mark && contr->mark->env == this)
		2817	return contr->mark;
		2818	else
		2819	return 0;
		2820	}
		2821
		2822	// put marked object first in the inventory
		2823	// this is used by identify-like spells so players can influence
		2824	// the order a bit.
		2825	void
		2826	object::splay_marked ()
		2827	{
		2828	if (object *marked = mark ())
		2829	splay (marked);
		2830	}
		2831

Diff Legend

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