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.210 by root, Mon Apr 21 07:01:40 2008 UTC vs.
Revision 1.339 by root, Fri Jul 2 17:39:23 2010 UTC

1	/*	1	/*
2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.	2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.
3	*	3	*
4	* Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team	4	* Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5	* Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team	5	* Copyright (©) 2001 Mark Wedel & Crossfire Development Team
6	* Copyright (©) 1992,2007 Frank Tore Johansen	6	* Copyright (©) 1992 Frank Tore Johansen
7	*	7	*
8	* Deliantra is free software: you can redistribute it and/or modify	8	* Deliantra is free software: you can redistribute it and/or modify it under
9	* it under the terms of the GNU General Public License as published by	9	* the terms of the Affero GNU General Public License as published by the
10	* the Free Software Foundation, either version 3 of the License, or	10	* Free Software Foundation, either version 3 of the License, or (at your
11	* (at your option) any later version.	11	* option) any later version.
12	*	12	*
13	* This program is distributed in the hope that it will be useful,	13	* This program is distributed in the hope that it will be useful,
14	* but WITHOUT ANY WARRANTY; without even the implied warranty of	14	* but WITHOUT ANY WARRANTY; without even the implied warranty of
15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16	* GNU General Public License for more details.	16	* GNU General Public License for more details.
17	*	17	*
18	* You should have received a copy of the GNU General Public License	18	* You should have received a copy of the Affero GNU General Public License
19	* along with this program. If not, see <http://www.gnu.org/licenses/>.	19	* and the GNU General Public License along with this program. If not, see
		20	* <http://www.gnu.org/licenses/>.
20	*	21	*
21	* The authors can be reached via e-mail to <support@deliantra.net>	22	* The authors can be reached via e-mail to <support@deliantra.net>
22	*/	23	*/
23		24
24	#include <global.h>	25	#include <global.h>
25	#include <stdio.h>	26	#include <stdio.h>
26	#include <sys/types.h>	27	#include <sys/types.h>
27	#include <sys/uio.h>	28	#include <sys/uio.h>
28	#include <object.h>	29	#include <object.h>
29	#include <funcpoint.h>
30	#include <sproto.h>	30	#include <sproto.h>
31	#include <loader.h>
32		31
33	#include <bitset>	32	#include <bitset>
34		33
35	UUID UUID::cur;	34	UUID UUID::cur;
36	static uint64_t seq_next_save;	35	static uint64_t seq_next_save;
37	static const uint64 UUID_GAP = 1<<19;	36	static const uint64 UUID_GAP = 1<<19;
		37	uint32_t mapspace::smellcount = 10000;
38		38
39	objectvec objects;	39	objectvec objects;
40	activevec actives;	40	activevec actives;
		41
		42	freelist_item *object::freelist;
		43	uint32_t object::object_count;
		44	uint32_t object::free_count;
		45	uint32_t object::create_count;
		46	uint32_t object::destroy_count;
		47
		48	//+GPL
41		49
42	short freearr_x[SIZEOFFREE] = {	50	short freearr_x[SIZEOFFREE] = {
43	0,	51	0,
44	0, 1, 1, 1, 0, -1, -1, -1,	52	0, 1, 1, 1, 0, -1, -1, -1,
45	0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,	53	0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,
…		…
49	0,	57	0,
50	-1, -1, 0, 1, 1, 1, 0, -1,	58	-1, -1, 0, 1, 1, 1, 0, -1,
51	-2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2,	59	-2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2,
52	-3, -3, -3, -3, -2, -1, 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3	60	-3, -3, -3, -3, -2, -1, 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3
53	};	61	};
54	int maxfree[SIZEOFFREE] = {
55	0,
56	9, 10, 13, 14, 17, 18, 21, 22,
57	25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45, 48,
58	49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49
59	};
60	int freedir[SIZEOFFREE] = {	62	int freedir[SIZEOFFREE] = {
61	0,	63	0,
62	1, 2, 3, 4, 5, 6, 7, 8,	64	1, 2, 3, 4, 5, 6, 7, 8,
63	1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8,	65	1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8,
64	1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8	66	1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8
65	};	67	};
66		68
		69	static int maxfree[SIZEOFFREE] = {
		70	0,
		71	9, 10, 13, 14, 17, 18, 21, 22,
		72	25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45, 48,
		73	49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49
		74	};
		75
		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
67	static void	95	static void
68	write_uuid (uval64 skip, bool sync)	96	write_uuid (uval64 skip, bool sync)
69	{	97	{
70	CALL_BEGIN (2);	98	CALL_BEGIN (2);
71	CALL_ARG_SV (newSVval64 (skip));	99	CALL_ARG_SV (newSVval64 (skip));
…		…
73	CALL_CALL ("cf::write_uuid", G_DISCARD);	101	CALL_CALL ("cf::write_uuid", G_DISCARD);
74	CALL_END;	102	CALL_END;
75	}	103	}
76		104
77	static void	105	static void
78	read_uuid (void)	106	read_uuid ()
79	{	107	{
80	char filename[MAX_BUF];	108	char filename[MAX_BUF];
81		109
82	sprintf (filename, "%s/uuid", settings.localdir);	110	sprintf (filename, "%s/uuid", settings.localdir);
83		111
…		…
97		125
98	LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);	126	LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);
99	_exit (1);	127	_exit (1);
100	}	128	}
101		129
102	UUID::BUF buf;	130	char buf [UUID::MAX_LEN];
103	buf[0] = 0;	131	buf[0] = 0;
104	fgets (buf, sizeof (buf), fp);	132	fgets (buf, sizeof (buf), fp);
105		133
106	if (!UUID::cur.parse (buf))	134	if (!UUID::cur.parse (buf))
107	{	135	{
…		…
134		162
135	void	163	void
136	UUID::init ()	164	UUID::init ()
137	{	165	{
138	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;
139	}	232	}
140		233
141	/* 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. */
142	static bool	235	static bool
143	compare_ob_value_lists_one (const object *wants, const object *has)	236	compare_ob_value_lists_one (const object *wants, const object *has)
144	{	237	{
145	key_value *wants_field;
146
147	/* n-squared behaviour (see get_ob_key_link()), but I'm hoping both	238	/* n-squared behaviour (see kv_get), but I'm hoping both
148	* objects with lists are rare, and lists stay short. If not, use a	239	* objects with lists are rare, and lists stay short. If not, use a
149	* different structure or at least keep the lists sorted...	240	* different structure or at least keep the lists sorted...
150	*/	241	*/
151		242
152	/* For each field in wants, */	243	/* For each field in wants, */
153	for (wants_field = wants->key_values; wants_field; wants_field = wants_field->next)	244	for (key_value *kv = wants->key_values; kv; kv = kv->next)
154	{	245	if (has->kv_get (kv->key) != kv->value)
155	key_value *has_field;	246	return false;
156
157	/* Look for a field in has with the same key. */
158	has_field = get_ob_key_link (has, wants_field->key);
159
160	if (!has_field)
161	return 0; /* No field with that name. */
162
163	/* Found the matching field. */
164	if (has_field->value != wants_field->value)
165	return 0; /* Values don't match, so this half of the comparison is false. */
166
167	/* If we get here, we found a match. Now for the next field in wants. */
168	}
169		247
170	/* If we get here, every field in wants has a matching field in has. */	248	/* If we get here, every field in wants has a matching field in has. */
171	return 1;	249	return true;
172	}	250	}
173		251
174	/* Returns TRUE if ob1 has the same key_values as ob2. */	252	/* Returns TRUE if ob1 has the same key_values as ob2. */
175	static bool	253	static bool
176	compare_ob_value_lists (const object *ob1, const object *ob2)	254	compare_ob_value_lists (const object *ob1, const object *ob2)
177	{	255	{
178	/* However, there may be fields in has which aren't partnered in wants,	256	/* However, there may be fields in has which aren't partnered in wants,
179	* so we need to run the comparison *twice*. :(	257	* so we need to run the comparison *twice*. :(
180	*/	258	*/
181	return compare_ob_value_lists_one (ob1, ob2) && compare_ob_value_lists_one (ob2, ob1);	259	return compare_ob_value_lists_one (ob1, ob2)
		260	&& compare_ob_value_lists_one (ob2, ob1);
182	}	261	}
183		262
184	/* Function examines the 2 objects given to it, and returns true if	263	/* Function examines the 2 objects given to it, and returns true if
185	* they can be merged together.	264	* they can be merged together.
186	*	265	*
…		…
193	* Improvements made with merge: Better checking on potion, and also	272	* Improvements made with merge: Better checking on potion, and also
194	* check weight	273	* check weight
195	*/	274	*/
196	bool object::can_merge_slow (object *ob1, object *ob2)	275	bool object::can_merge_slow (object *ob1, object *ob2)
197	{	276	{
198	/* A couple quicksanity checks */	277	/* A couple quick sanity checks */
199	if (ob1 == ob2	278	if (ob1 == ob2
200	|| ob1->type != ob2->type	279	|| ob1->type != ob2->type
201	|| ob1->speed != ob2->speed
202	|| ob1->value != ob2->value	280	|| ob1->value != ob2->value
203	|| ob1->name != ob2->name)	281	|| ob1->name != ob2->name
		282	|| fabs (ob1->speed - ob2->speed) >= MIN_ACTIVE_SPEED)
204	return 0;	283	return 0;
205		284
206	/* Do not merge objects if nrof would overflow. First part checks	285	/* Do not merge objects if nrof would overflow, assume nrof
207	* for unsigned overflow (2c), second part checks whether the result	286	* is always 0 .. 2**31-1 */
208	* would fit into a 32 bit signed int, which is often used to hold	287	if (ob1->nrof > 0x7fffffff - ob2->nrof)
209	* nrof values.
210	*/
211	if (~ob1->nrof < ob2->nrof || ob1->nrof + ob2->nrof > (1UL << 31))
212	return 0;	288	return 0;
213		289
214	/* If the objects have been identified, set the BEEN_APPLIED flag.	290	/* If the objects have been identified, set the BEEN_APPLIED flag.
215	* This is to the comparison of the flags below will be OK. We	291	* This is to the comparison of the flags below will be OK. We
216	* just can't ignore the been applied or identified flags, as they	292	* just can't ignore the been applied or identified flags, as they
217	* are not equal - just if it has been identified, the been_applied	293	* are not equal - just if it has been identified, the been_applied
218	* flags lose any meaning.	294	* flags lose any meaning.
219	*/	295	*/
220	if (QUERY_FLAG (ob1, FLAG_IDENTIFIED))	296	if (ob1->flag [FLAG_IDENTIFIED])
221	SET_FLAG (ob1, FLAG_BEEN_APPLIED);	297	ob1->set_flag (FLAG_BEEN_APPLIED);
222		298
223	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))	299	if (ob2->flag [FLAG_IDENTIFIED])
224	SET_FLAG (ob2, FLAG_BEEN_APPLIED);	300	ob2->set_flag (FLAG_BEEN_APPLIED);
225		301
226	if (ob1->arch->name != ob2->arch->name	302	if (ob1->arch->archname != ob2->arch->archname
227	|| ob1->name != ob2->name	303	|| ob1->name != ob2->name
228	|| ob1->title != ob2->title	304	|| ob1->title != ob2->title
229	|| ob1->msg != ob2->msg	305	|| ob1->msg != ob2->msg
230	|| ob1->weight != ob2->weight	306	|| ob1->weight != ob2->weight
231	|| ob1->attacktype != ob2->attacktype	307	|| ob1->attacktype != ob2->attacktype
232	|| ob1->magic != ob2->magic	308	|| ob1->magic != ob2->magic
233	|| ob1->slaying != ob2->slaying	309	|| ob1->slaying != ob2->slaying
234	|| ob1->skill != ob2->skill	310	|| ob1->skill != ob2->skill
235	|| ob1->value != ob2->value	311	|| ob1->value != ob2->value
236	|| ob1->animation_id != ob2->animation_id	312	|| ob1->animation_id != ob2->animation_id
		313	|| (ob1->face != ob2->face && !ob1->animation_id) // face and animation are dependend on each other
237	|| ob1->client_type != ob2->client_type	314	|| ob1->client_type != ob2->client_type
238	|| ob1->materialname != ob2->materialname	315	|| ob1->material != ob2->material
239	|| ob1->lore != ob2->lore	316	|| ob1->lore != ob2->lore
240	|| ob1->subtype != ob2->subtype	317	|| ob1->subtype != ob2->subtype
241	|| ob1->move_type != ob2->move_type	318	|| ob1->move_type != ob2->move_type
242	|| ob1->move_block != ob2->move_block	319	|| ob1->move_block != ob2->move_block
243	|| ob1->move_allow != ob2->move_allow	320	|| ob1->move_allow != ob2->move_allow
244	|| ob1->move_on != ob2->move_on	321	|| ob1->move_on != ob2->move_on
245	|| ob1->move_off != ob2->move_off	322	|| ob1->move_off != ob2->move_off
246	|| ob1->move_slow != ob2->move_slow	323	|| ob1->move_slow != ob2->move_slow
247	|| ob1->move_slow_penalty != ob2->move_slow_penalty	324	|| fabs (ob1->move_slow_penalty - ob2->move_slow_penalty) >= (1.f / 1024.f)
248	|| memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))	325	|| memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
249	|| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats)))	326	|| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats)))
250	return 0;	327	return 0;
251		328
252	if ((ob1->flag ^ ob2->flag)	329	if ((ob1->flag ^ ob2->flag)
253	.reset (FLAG_INV_LOCKED)	330	.reset (FLAG_INV_LOCKED)
254	.reset (FLAG_CLIENT_SENT)
255	.reset (FLAG_REMOVED)	331	.reset (FLAG_REMOVED)
256	.any ())	332	.any ())
257	return 0;	333	return 0;
258		334
259	/* This is really a spellbook check - we should in general	335	/* This is really a spellbook check - we should in general
…		…
278		354
279	/* Don't merge objects that are applied. With the new 'body' code,	355	/* Don't merge objects that are applied. With the new 'body' code,
280	* it is possible for most any character to have more than one of	356	* it is possible for most any character to have more than one of
281	* some items equipped, and we don't want those to merge.	357	* some items equipped, and we don't want those to merge.
282	*/	358	*/
283	if (QUERY_FLAG (ob1, FLAG_APPLIED) || QUERY_FLAG (ob2, FLAG_APPLIED))	359	if (ob1->flag [FLAG_APPLIED] || ob2->flag [FLAG_APPLIED])
284	return 0;	360	return 0;
285		361
286	/* Note sure why the following is the case - either the object has to	362	/* Note sure why the following is the case - either the object has to
287	* be animated or have a very low speed. Is this an attempted monster	363	* be animated or have a very low speed. Is this an attempted monster
288	* check?	364	* check?
289	*/	365	*/
290	if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && ob1->has_active_speed ())	366	if (!ob1->flag [FLAG_ANIMATE] && ob1->has_active_speed ())
291	return 0;	367	return 0;
292		368
293	switch (ob1->type)	369	switch (ob1->type)
294	{	370	{
295	case SCROLL:	371	case SCROLL:
…		…
331		407
332	/* Everything passes, must be OK. */	408	/* Everything passes, must be OK. */
333	return 1;	409	return 1;
334	}	410	}
335		411
		412	// find player who can see this object
		413	object *
		414	object::visible_to () const
		415	{
		416	if (client_visible () && !flag [FLAG_REMOVED])
		417	{
		418	// see if we are in a container of sorts
		419	if (env)
		420	{
		421	// the player inventory itself is always visible
		422	if (env->is_player ())
		423	return env;
		424
		425	// else a player could have our env open
		426	object *envest = env->outer_env_or_self ();
		427
		428	// the player itself is always on a map, so we will find him here
		429	// even if our inv is in a player.
		430	if (envest->is_on_map ())
		431	if (object *pl = envest->ms ().player ())
		432	if (pl->container_ () == env)
		433	return pl;
		434	}
		435	else
		436	{
		437	// maybe there is a player standing on the same mapspace
		438	// this will catch the case where "this" is a player
		439	if (object *pl = ms ().player ())
		440	if ((pl->contr->ns && !pl->container_ () && !pl->contr->ns->update_look)
		441	|| pl->container_ () == this)
		442	return pl;
		443	}
		444	}
		445
		446	return 0;
		447	}
		448
336	// adjust weight per container type ("of holding")	449	// adjust weight per container type ("of holding")
337	static sint32	450	static uint32
338	weight_adjust (object *op, sint32 weight)	451	weight_adjust_for (object *op, uint32 weight)
339	{	452	{
340	return op->type == CONTAINER	453	return op->type == CONTAINER
341	? lerp (weight, 0, 100, 0, 100 - op->stats.Str)	454	? weight - weight * op->stats.Str / 100
342	: weight;	455	: weight;
343	}	456	}
344		457
345	/*	458	/*
346	* adjust_weight(object, weight) adds the specified weight to an object,	459	* subtracts, then adds, the specified weight to an object,
347	* and also updates how much the environment(s) is/are carrying.	460	* and also updates how much the environment(s) is/are carrying.
348	*/	461	*/
349	static void	462	static void
350	adjust_weight (object *op, sint32 weight)	463	adjust_weight (object *op, sint32 sub, sint32 add)
351	{	464	{
352	while (op)	465	while (op)
353	{	466	{
354	weight = weight_adjust (op, weight);	467	sint32 ocarrying = op->carrying;
355		468
356	op->carrying += weight;	469	op->carrying -= weight_adjust_for (op, sub);
		470	op->carrying += weight_adjust_for (op, add);
		471
		472	if (object *pl = op->visible_to ())
		473	if (pl != op) // player is handled lazily
		474	esrv_update_item (UPD_WEIGHT, pl, op);
		475
		476	sub = ocarrying;
		477	add = op->carrying;
		478
357	op = op->env;	479	op = op->env;
358	}	480	}
359	}	481	}
360		482
361	/*	483	/*
…		…
368	{	490	{
369	sint32 sum = 0;	491	sint32 sum = 0;
370		492
371	for (object *op = inv; op; op = op->below)	493	for (object *op = inv; op; op = op->below)
372	{	494	{
373	if (op->inv)
374	op->update_weight ();	495	op->update_weight ();
375		496
376	sum += op->total_weight ();	497	sum += weight_adjust_for (this, op->total_weight ());
		498	}
		499
		500	if (sum != carrying)
377	}	501	{
		502	if (carrying != sum && carrying)//D
		503	LOG (llevDebug, "updating carrying got %ld, expected %ld (%s)\n",
		504	(long long)sum, (long long)carrying, debug_desc ());
378		505
379	carrying = weight_adjust (this, sum);	506	carrying = sum;
		507
		508	if (object *pl = visible_to ())
		509	if (pl != this) // player is handled lazily
		510	esrv_update_item (UPD_WEIGHT, pl, this);
		511	}
380	}	512	}
381		513
382	/*	514	/*
383	* Used by: Server DM commands: dumpbelow, dump. Some error messages.	515	* Used by: Server DM commands: dumpbelow, dump. Some error messages.
384	*/	516	*/
…		…
391	object_freezer freezer;	523	object_freezer freezer;
392	op->write (freezer);	524	op->write (freezer);
393	return freezer.as_string ();	525	return freezer.as_string ();
394	}	526	}
395		527
396	/*	528	char *
397	* get_nearest_part(multi-object, object 2) returns the part of the	529	object::as_string ()
398	* multi-object 1 which is closest to the second object.
399	* If it's not a multi-object, it is returned.
400	*/
401	object *
402	get_nearest_part (object *op, const object *pl)
403	{	530	{
404	object *tmp, *closest;	531	return dump_object (this);
405	int last_dist, i;
406
407	if (!op->more)
408	return op;
409
410	for (last_dist = distance (op, pl), closest = op, tmp = op->more;
411	tmp;
412	tmp = tmp->more)
413	if ((i = distance (tmp, pl)) < last_dist)
414	closest = tmp, last_dist = i;
415
416	return closest;
417	}	532	}
418		533
419	/*	534	/*
420	* Returns the object which has the count-variable equal to the argument.	535	* Returns the object which has the count-variable equal to the argument.
421	* VERRRY slow.	536	* VERRRY slow.
…		…
429		544
430	return 0;	545	return 0;
431	}	546	}
432		547
433	/*	548	/*
		549	* Returns the object which has the uuid equal to the argument.
		550	* MOAR VERRRY slow.
		551	*/
		552
		553	object *
		554	find_object_uuid (UUID i)
		555	{
		556	for_all_objects (op)
		557	if (op->uuid == i)
		558	return op;
		559
		560	return 0;
		561	}
		562
		563	/*
434	* Returns the first object which has a name equal to the argument.	564	* Returns the first object which has a name equal to the argument.
435	* Used only by the patch command, but not all that useful.	565	* Used only by the patch command, but not all that useful.
436	* Enables features like "patch <name-of-other-player> food 999"	566	* Enables features like "patch <name-of-other-player> food 999"
437	*/	567	*/
438	object *	568	object *
439	find_object_name (const char *str)	569	find_object_name (const char *str)
440	{	570	{
441	shstr_cmp str_ (str);	571	shstr_cmp str_ (str);
442	object *op;
443		572
		573	if (str_)
444	for_all_objects (op)	574	for_all_objects (op)
445	if (op->name == str_)	575	if (op->name == str_)
446	break;	576	return op;
447		577
448	return op;	578	return 0;
449	}	579	}
450		580
451	/*	581	/*
452	* Sets the owner and sets the skill and exp pointers to owner's current	582	* Sets the owner and sets the skill and exp pointers to owner's current
453	* skill and experience objects.	583	* skill and experience objects.
…		…
468	}	598	}
469		599
470	this->owner = owner;	600	this->owner = owner;
471	}	601	}
472		602
473	int
474	object::slottype () const
475	{
476	if (type == SKILL)
477	{
478	if (IS_COMBAT_SKILL (subtype)) return slot_combat;
479	if (IS_RANGED_SKILL (subtype)) return slot_ranged;
480	}
481	else
482	{
483	if (slot [body_combat].info) return slot_combat;
484	if (slot [body_range ].info) return slot_ranged;
485	}
486
487	return slot_none;
488	}
489
490	bool
491	object::change_weapon (object *ob)
492	{
493	if (current_weapon == ob)
494	return true;
495
496	if (chosen_skill)
497	chosen_skill->flag [FLAG_APPLIED] = false;
498
499	current_weapon = ob;
500	chosen_skill = !ob || ob->type == SKILL ? ob : find_skill_by_name (this, ob->skill);
501
502	if (chosen_skill)
503	chosen_skill->flag [FLAG_APPLIED] = true;
504
505	update_stats ();
506
507	if (ob)
508	{
509	// now check wether any body locations became invalid, in which case
510	// we cannot apply the weapon at the moment.
511	for (int i = 0; i < NUM_BODY_LOCATIONS; ++i)
512	if (slot[i].used < 0)
513	{
514	current_weapon = chosen_skill = 0;
515	update_stats ();
516
517	new_draw_info_format (NDI_UNIQUE, 0, this,
518	"You try to balance all your items at once, "
519	"but the %s is just too much for your body. "
520	"[You need to unapply some items first.]", &ob->name);
521	return false;
522	}
523
524	//new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);
525	}
526	else
527	;//new_draw_info_format (NDI_UNIQUE, 0, this, "You unwield your weapons.");
528
529	if (ob && !ob->flag [FLAG_APPLIED] && ob->type != SPELL)
530	{
531	LOG (llevError | logBacktrace, "%s changed to unapplied weapon %s",
532	&name, ob->debug_desc ());
533	return false;
534	}
535
536	return true;
537	}
538
539	/* Zero the key_values on op, decrementing the shared-string	603	/* Zero the key_values on op, decrementing the shared-string
540	* refcounts and freeing the links.	604	* refcounts and freeing the links.
541	*/	605	*/
542	static void	606	static void
543	free_key_values (object *op)	607	free_key_values (object *op)
…		…
551	}	615	}
552		616
553	op->key_values = 0;	617	op->key_values = 0;
554	}	618	}
555		619
556	object &	620	/*
557	object::operator =(const object &src)	621	* copy_to first frees everything allocated by the dst object,
		622	* and then copies the contents of itself into the second
		623	* object, allocating what needs to be allocated. Basically, any
		624	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
		625	* if the first object is freed, the pointers in the new object
		626	* will point at garbage.
		627	*/
		628	void
		629	object::copy_to (object *dst)
558	{	630	{
559	bool is_freed = flag [FLAG_FREED];	631	dst->remove ();
560	bool is_removed = flag [FLAG_REMOVED];
561
562	*(object_copy *)this = src;	632	*(object_copy *)dst = *this;
563
564	flag [FLAG_FREED] = is_freed;
565	flag [FLAG_REMOVED] = is_removed;	633	dst->flag [FLAG_REMOVED] = true;
566		634
567	/* Copy over key_values, if any. */	635	/* Copy over key_values, if any. */
568	if (src.key_values)	636	if (key_values)
569	{	637	{
570	key_value *tail = 0;	638	key_value *tail = 0;
571	key_values = 0;	639	dst->key_values = 0;
572		640
573	for (key_value *i = src.key_values; i; i = i->next)	641	for (key_value *i = key_values; i; i = i->next)
574	{	642	{
575	key_value *new_link = new key_value;	643	key_value *new_link = new key_value;
576		644
577	new_link->next = 0;	645	new_link->next = 0;
578	new_link->key = i->key;	646	new_link->key = i->key;
579	new_link->value = i->value;	647	new_link->value = i->value;
580		648
581	/* Try and be clever here, too. */	649	/* Try and be clever here, too. */
582	if (!key_values)	650	if (!dst->key_values)
583	{	651	{
584	key_values = new_link;	652	dst->key_values = new_link;
585	tail = new_link;	653	tail = new_link;
586	}	654	}
587	else	655	else
588	{	656	{
589	tail->next = new_link;	657	tail->next = new_link;
590	tail = new_link;	658	tail = new_link;
591	}	659	}
592	}	660	}
593	}	661	}
594	}
595		662
596	/*	663	dst->activate ();
597	* copy_to first frees everything allocated by the dst object,
598	* and then copies the contents of itself into the second
599	* object, allocating what needs to be allocated. Basically, any
600	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
601	* if the first object is freed, the pointers in the new object
602	* will point at garbage.
603	*/
604	void
605	object::copy_to (object *dst)
606	{
607	*dst = *this;
608
609	if (speed < 0)
610	dst->speed_left -= rndm ();
611
612	dst->set_speed (dst->speed);
613	}	664	}
614		665
615	void	666	void
616	object::instantiate ()	667	object::instantiate ()
617	{	668	{
618	if (!uuid.seq) // HACK	669	if (!uuid.seq) // HACK
619	uuid = UUID::gen ();	670	uuid = UUID::gen ();
620		671
		672	// TODO: unclean state changes, should nt be done in copy_to AND instantiate
		673	if (flag [FLAG_RANDOM_SPEED] && speed)
		674	speed_left = - speed - rndm (); // TODO animation
		675	else
621	speed_left = -0.1f;	676	speed_left = -1.;
		677
622	/* copy the body_info to the body_used - this is only really	678	/* copy the body_info to the body_used - this is only really
623	* need for monsters, but doesn't hurt to do it for everything.	679	* need for monsters, but doesn't hurt to do it for everything.
624	* by doing so, when a monster is created, it has good starting	680	* by doing so, when a monster is created, it has good starting
625	* values for the body_used info, so when items are created	681	* values for the body_used info, so when items are created
626	* for it, they can be properly equipped.	682	* for it, they can be properly equipped.
…		…
634	object *	690	object *
635	object::clone ()	691	object::clone ()
636	{	692	{
637	object *neu = create ();	693	object *neu = create ();
638	copy_to (neu);	694	copy_to (neu);
		695
		696	// TODO: unclean state changes, should not be done in clone AND instantiate
		697	if (neu->flag [FLAG_RANDOM_SPEED] && neu->speed)
		698	neu->speed_left = - neu->speed - rndm (); // TODO animation
		699
		700	neu->map = map; // not copied by copy_to
639	return neu;	701	return neu;
640	}	702	}
641		703
642	/*	704	/*
643	* If an object with the IS_TURNABLE() flag needs to be turned due	705	* If an object with the IS_TURNABLE() flag needs to be turned due
…		…
645	* be called to update the face variable, _and_ how it looks on the map.	707	* be called to update the face variable, _and_ how it looks on the map.
646	*/	708	*/
647	void	709	void
648	update_turn_face (object *op)	710	update_turn_face (object *op)
649	{	711	{
650	if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || !op->arch)	712	if (!op->flag [FLAG_IS_TURNABLE] || !op->arch)
651	return;	713	return;
652		714
653	SET_ANIMATION (op, op->direction);	715	SET_ANIMATION (op, op->direction);
654	update_object (op, UP_OBJ_FACE);	716	update_object (op, UP_OBJ_FACE);
655	}	717	}
…		…
660	* This function needs to be called whenever the speed of an object changes.	722	* This function needs to be called whenever the speed of an object changes.
661	*/	723	*/
662	void	724	void
663	object::set_speed (float speed)	725	object::set_speed (float speed)
664	{	726	{
665	if (flag [FLAG_FREED] && speed)
666	{
667	LOG (llevError, "Object %s is freed but has speed.\n", &name);
668	speed = 0;
669	}
670
671	this->speed = speed;	727	this->speed = speed;
672		728
673	if (has_active_speed ())	729	if (has_active_speed ())
674	activate ();	730	activate ();
675	else	731	else
…		…
694	* UP_OBJ_FACE: only the objects face has changed.	750	* UP_OBJ_FACE: only the objects face has changed.
695	*/	751	*/
696	void	752	void
697	update_object (object *op, int action)	753	update_object (object *op, int action)
698	{	754	{
699	if (op == NULL)	755	if (!op)
700	{	756	{
701	/* this should never happen */	757	/* this should never happen */
702	LOG (llevDebug, "update_object() called for NULL object.\n");	758	LOG (llevError | logBacktrace, "update_object() called for NULL object.\n");
703	return;	759	return;
704	}	760	}
705		761
706	if (op->env)	762	if (!op->is_on_map ())
707	{	763	{
708	/* Animation is currently handled by client, so nothing	764	/* Animation is currently handled by client, so nothing
709	* to do in this case.	765	* to do in this case.
710	*/	766	*/
711	return;	767	return;
712	}	768	}
713
714	/* If the map is saving, don't do anything as everything is
715	* going to get freed anyways.
716	*/
717	if (!op->map || op->map->in_memory == MAP_SAVING)
718	return;
719		769
720	/* make sure the object is within map boundaries */	770	/* make sure the object is within map boundaries */
721	if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height)	771	if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height)
722	{	772	{
723	LOG (llevError, "update_object() called for object out of map!\n");	773	LOG (llevError, "update_object() called for object out of map!\n");
…		…
731		781
732	if (!(m.flags_ & P_UPTODATE))	782	if (!(m.flags_ & P_UPTODATE))
733	/* nop */;	783	/* nop */;
734	else if (action == UP_OBJ_INSERT)	784	else if (action == UP_OBJ_INSERT)
735	{	785	{
		786	#if 0
736	// this is likely overkill, TODO: revisit (schmorp)	787	// this is likely overkill, TODO: revisit (schmorp)
737	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))	788	if ((op->flag [FLAG_BLOCKSVIEW] && !(m.flags_ & P_BLOCKSVIEW))
738	|| (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))	789	|| (op->flag [FLAG_NO_MAGIC] && !(m.flags_ & P_NO_MAGIC))
739	|| (op->type == PLAYER && !(m.flags_ & P_PLAYER))	790	|| (op->is_player () && !(m.flags_ & P_PLAYER))
740	|| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))	791	|| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
741	|| (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))	792	|| (op->flag [FLAG_ALIVE] && !(m.flags_ & P_IS_ALIVE))
742	|| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))	793	|| (op->flag [FLAG_DAMNED] && !(m.flags_ & P_NO_CLERIC))
743	|| (m.move_on | op->move_on ) != m.move_on	794	|| (m.move_on | op->move_on ) != m.move_on
744	|| (m.move_off | op->move_off ) != m.move_off	795	|| (m.move_off | op->move_off ) != m.move_off
745	|| (m.move_slow | op->move_slow) != m.move_slow	796	|| (m.move_slow | op->move_slow) != m.move_slow
746	/* This isn't perfect, but I don't expect a lot of objects to	797	/* This isn't perfect, but I don't expect a lot of objects to
747	* to have move_allow right now.	798	* have move_allow right now.
748	*/	799	*/
749	|| ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block	800	|| ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block
		801	m.invalidate ();
		802	#else
750	|| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)	803	// the above is not strong enough a test to skip updating. los maybe? TODO (schmorp)
751	m.flags_ = 0;	804	m.invalidate ();
		805	#endif
752	}	806	}
753	/* if the object is being removed, we can't make intelligent	807	/* if the object is being removed, we can't make intelligent
754	* decisions, because remove_ob can't really pass the object	808	* decisions, because remove_ob can't really pass the object
755	* that is being removed.	809	* that is being removed.
756	*/	810	*/
757	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)	811	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
758	m.flags_ = 0;	812	m.invalidate ();
759	else if (action == UP_OBJ_FACE)	813	else if (action == UP_OBJ_FACE)
760	/* Nothing to do for that case */ ;	814	/* Nothing to do for that case */ ;
761	else	815	else
762	LOG (llevError, "update_object called with invalid action: %d\n", action);	816	LOG (llevError, "update_object called with invalid action: %d\n", action);
763		817
…		…
765	update_object (op->more, action);	819	update_object (op->more, action);
766	}	820	}
767		821
768	object::object ()	822	object::object ()
769	{	823	{
770	SET_FLAG (this, FLAG_REMOVED);	824	this->set_flag (FLAG_REMOVED);
771		825
772	expmul = 1.0;	826	//expmul = 1.0; declared const for the time being
773	face = blank_face;	827	face = blank_face;
		828	material = MATERIAL_NULL;
774	}	829	}
775		830
776	object::~object ()	831	object::~object ()
777	{	832	{
778	unlink ();	833	unlink ();
779		834
780	free_key_values (this);	835	free_key_values (this);
781	}	836	}
782
783	static int object_count;
784		837
785	void object::link ()	838	void object::link ()
786	{	839	{
787	assert (!index);//D	840	assert (!index);//D
788	uuid = UUID::gen ();	841	uuid = UUID::gen ();
789	count = ++object_count;
790		842
791	refcnt_inc ();	843	refcnt_inc ();
792	objects.insert (this);	844	objects.insert (this);
		845
		846	++create_count;
		847
793	}	848	}
794		849
795	void object::unlink ()	850	void object::unlink ()
796	{	851	{
797	if (!index)	852	if (!index)
798	return;	853	return;
		854
		855	++destroy_count;
799		856
800	objects.erase (this);	857	objects.erase (this);
801	refcnt_dec ();	858	refcnt_dec ();
802	}	859	}
803		860
…		…
807	/* If already on active list, don't do anything */	864	/* If already on active list, don't do anything */
808	if (active)	865	if (active)
809	return;	866	return;
810		867
811	if (has_active_speed ())	868	if (has_active_speed ())
		869	{
		870	if (flag [FLAG_FREED])
		871	LOG (llevError | logBacktrace, "BUG: tried to activate freed object %s\n", debug_desc ());//D
		872
812	actives.insert (this);	873	actives.insert (this);
		874	}
813	}	875	}
814		876
815	void	877	void
816	object::activate_recursive ()	878	object::activate_recursive ()
817	{	879	{
…		…
866	object::destroy_inv (bool drop_to_ground)	928	object::destroy_inv (bool drop_to_ground)
867	{	929	{
868	// need to check first, because the checks below might segfault	930	// need to check first, because the checks below might segfault
869	// as we might be on an invalid mapspace and crossfire code	931	// as we might be on an invalid mapspace and crossfire code
870	// is too buggy to ensure that the inventory is empty.	932	// is too buggy to ensure that the inventory is empty.
871	// corollary: if you create arrows etc. with stuff in tis inventory,	933	// corollary: if you create arrows etc. with stuff in its inventory,
872	// cf will crash below with off-map x and y	934	// cf will crash below with off-map x and y
873	if (!inv)	935	if (!inv)
874	return;	936	return;
875		937
876	/* Only if the space blocks everything do we not process -	938	/* Only if the space blocks everything do we not process -
…		…
878	* drop on that space.	940	* drop on that space.
879	*/	941	*/
880	if (!drop_to_ground	942	if (!drop_to_ground
881	|| !map	943	|| !map
882	|| map->in_memory != MAP_ACTIVE	944	|| map->in_memory != MAP_ACTIVE
883	|| map->nodrop	945	|| map->no_drop
884	|| ms ().move_block == MOVE_ALL)	946	|| ms ().move_block == MOVE_ALL)
885	{	947	{
886	while (inv)	948	while (inv)
887	{
888	inv->destroy_inv (drop_to_ground);
889	inv->destroy ();	949	inv->destroy ();
890	}
891	}	950	}
892	else	951	else
893	{ /* Put objects in inventory onto this space */	952	{ /* Put objects in inventory onto this space */
894	while (inv)	953	while (inv)
895	{	954	{
…		…
906	map->insert (op, x, y);	965	map->insert (op, x, y);
907	}	966	}
908	}	967	}
909	}	968	}
910		969
		970	/*
		971	* Remove and free all objects in the inventory of the given object.
		972	* Unlike destroy_inv, this assumes the *this is destroyed as well
		973	* well, so we can (and have to!) take shortcuts.
		974	*/
		975	void
		976	object::destroy_inv_fast ()
		977	{
		978	while (object *op = inv)
		979	{
		980	// remove from object the fast way
		981	op->flag [FLAG_REMOVED] = true;
		982	op->env = 0;
		983	if ((inv = inv->below))
		984	inv->above = 0;
		985
		986	// then destroy
		987	op->destroy ();
		988	}
		989	}
		990
		991	void
		992	object::freelist_free (int count)
		993	{
		994	while (count-- && freelist)
		995	{
		996	freelist_item *next = freelist->next;
		997	// count is being "destroyed"
		998
		999	sfree ((char *)freelist, sizeof (object));
		1000
		1001	freelist = next;
		1002	--free_count;
		1003	}
		1004	}
		1005
		1006	object *
911	object *object::create ()	1007	object::create ()
912	{	1008	{
913	object *op = new object;	1009	object *op;
		1010
		1011	if (freelist)
		1012	{
		1013	freelist_item li = *freelist;
		1014	memset (freelist, 0, sizeof (object));
		1015
		1016	op = new (freelist) object;
		1017	op->count = li.count;
		1018
		1019	freelist = li.next;
		1020	--free_count;
		1021	}
		1022	else
		1023	{
		1024	void *ni = salloc0<char> (sizeof (object));
		1025
		1026	op = new(ni) object;
		1027
		1028	op->count = ++object_count;
		1029	}
		1030
914	op->link ();	1031	op->link ();
		1032
915	return op;	1033	return op;
916	}	1034	}
917		1035
918	void	1036	void
		1037	object::do_delete ()
		1038	{
		1039	uint32_t count = this->count;
		1040
		1041	this->~object ();
		1042
		1043	freelist_item *li = (freelist_item *)this;
		1044	li->next = freelist;
		1045	li->count = count;
		1046
		1047	freelist = li;
		1048	++free_count;
		1049	}
		1050
		1051	static struct freed_map : maptile
		1052	{
		1053	freed_map ()
		1054	: maptile (3, 3)
		1055	{
		1056	path = "<freed objects map>";
		1057	name = "/internal/freed_objects_map";
		1058	no_drop = 1;
		1059	no_reset = 1;
		1060
		1061	in_memory = MAP_ACTIVE;
		1062	}
		1063
		1064	~freed_map ()
		1065	{
		1066	destroy ();
		1067	}
		1068	} freed_map; // freed objects are moved here to avoid crashes
		1069
		1070	void
919	object::do_destroy ()	1071	object::do_destroy ()
920	{	1072	{
921	attachable::do_destroy ();
922
923	if (flag [FLAG_IS_LINKED])	1073	if (flag [FLAG_IS_LINKED])
924	remove_button_link (this);	1074	remove_link ();
925		1075
926	if (flag [FLAG_FRIENDLY])	1076	if (flag [FLAG_FRIENDLY])
927	remove_friendly_object (this);	1077	remove_friendly_object (this);
928		1078
929	if (!flag [FLAG_REMOVED])
930	remove ();	1079	remove ();
931		1080
932	destroy_inv (true);	1081	attachable::do_destroy ();
933		1082
934	deactivate ();	1083	deactivate ();
935	unlink ();	1084	unlink ();
936		1085
937	flag [FLAG_FREED] = 1;	1086	flag [FLAG_FREED] = 1;
938		1087
939	// hack to ensure that freed objects still have a valid map	1088	// hack to ensure that freed objects still have a valid map
940	{
941	static maptile *freed_map; // freed objects are moved here to avoid crashes
942
943	if (!freed_map)
944	{
945	freed_map = new maptile;
946
947	freed_map->path = "<freed objects map>";
948	freed_map->name = "/internal/freed_objects_map";
949	freed_map->width = 3;
950	freed_map->height = 3;
951	freed_map->nodrop = 1;
952
953	freed_map->alloc ();
954	freed_map->in_memory = MAP_ACTIVE;
955	}
956
957	map = freed_map;	1089	map = &freed_map;
958	x = 1;	1090	x = 1;
959	y = 1;	1091	y = 1;
960	}
961		1092
962	if (more)	1093	if (more)
963	{	1094	{
964	more->destroy ();	1095	more->destroy ();
965	more = 0;	1096	more = 0;
…		…
973	attacked_by = 0;	1104	attacked_by = 0;
974	current_weapon = 0;	1105	current_weapon = 0;
975	}	1106	}
976		1107
977	void	1108	void
978	object::destroy (bool destroy_inventory)	1109	object::destroy ()
979	{	1110	{
980	if (destroyed ())	1111	if (destroyed ())
981	return;	1112	return;
982		1113
983	if (destroy_inventory)	1114	if (!is_head () && !head->destroyed ())
		1115	{
		1116	LOG (llevError | logBacktrace, "tried to destroy the tail of an object");
		1117	head->destroy ();
		1118	return;
		1119	}
		1120
984	destroy_inv (false);	1121	destroy_inv_fast ();
985		1122
986	if (is_head ())	1123	if (is_head ())
987	if (sound_destroy)	1124	if (sound_destroy)
988	play_sound (sound_destroy);	1125	play_sound (sound_destroy);
989	else if (flag [FLAG_MONSTER])	1126	else if (flag [FLAG_MONSTER])
…		…
1000	* the previous environment.	1137	* the previous environment.
1001	*/	1138	*/
1002	void	1139	void
1003	object::do_remove ()	1140	object::do_remove ()
1004	{	1141	{
1005	object *tmp, *last = 0;	1142	if (flag [FLAG_REMOVED])
1006	object *otmp;
1007
1008	if (QUERY_FLAG (this, FLAG_REMOVED))
1009	return;	1143	return;
1010		1144
1011	SET_FLAG (this, FLAG_REMOVED);
1012	INVOKE_OBJECT (REMOVE, this);	1145	INVOKE_OBJECT (REMOVE, this);
		1146
		1147	flag [FLAG_REMOVED] = true;
1013		1148
1014	if (more)	1149	if (more)
1015	more->remove ();	1150	more->remove ();
1016		1151
1017	/*	1152	/*
1018	* In this case, the object to be removed is in someones	1153	* In this case, the object to be removed is in someones
1019	* inventory.	1154	* inventory.
1020	*/	1155	*/
1021	if (env)	1156	if (env)
1022	{	1157	{
		1158	flag [FLAG_REMOVED] = false; // hack around the issue of visible_to checking flag_removed
		1159	if (object *pl = visible_to ())
		1160	esrv_del_item (pl->contr, count);
		1161	flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed
		1162
1023	adjust_weight (env, -total_weight ());	1163	adjust_weight (env, total_weight (), 0);
1024		1164
1025	*(above ? &above->below : &env->inv) = below;	1165	object *pl = in_player ();
1026
1027	if (below)
1028	below->above = above;
1029		1166
1030	/* we set up values so that it could be inserted into	1167	/* we set up values so that it could be inserted into
1031	* the map, but we don't actually do that - it is up	1168	* the map, but we don't actually do that - it is up
1032	* to the caller to decide what we want to do.	1169	* to the caller to decide what we want to do.
1033	*/	1170	*/
1034	map = env->map;	1171	map = env->map;
1035	x = env->x;	1172	x = env->x;
1036	y = env->y;	1173	y = env->y;
		1174
		1175	// make sure cmov optimisation is applicable
		1176	*(above ? &above->below : &env->inv) = below;
		1177	*(below ? &below->above : &above ) = above; // &above is just a dummy
		1178
1037	above = 0;	1179	above = 0;
1038	below = 0;	1180	below = 0;
1039	env = 0;	1181	env = 0;
1040		1182
1041	/* NO_FIX_PLAYER is set when a great many changes are being	1183	if (pl && pl->is_player ())
1042	* made to players inventory. If set, avoiding the call
1043	* to save cpu time.
1044	*/	1184	{
1045	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1185	if (expect_false (pl->contr->combat_ob == this))
1046	otmp->update_stats ();	1186	{
		1187	pl->apply (pl->contr->combat_ob, AP_UNAPPLY | AP_IGNORE_CURSE);
		1188	pl->contr->combat_ob = 0;
		1189	if (pl->contr->ranged_ob) pl->apply (pl->contr->ranged_ob);
		1190	}
		1191
		1192	if (expect_false (pl->contr->ranged_ob == this))
		1193	{
		1194	pl->apply (pl->contr->ranged_ob, AP_UNAPPLY | AP_IGNORE_CURSE);
		1195	pl->contr->ranged_ob = 0;
		1196	if (pl->contr->combat_ob) pl->apply (pl->contr->combat_ob);
		1197	}
		1198
		1199	pl->contr->queue_stats_update ();
		1200
		1201	if (expect_false (glow_radius) && pl->is_on_map ())
		1202	update_all_los (pl->map, pl->x, pl->y);
		1203	}
1047	}	1204	}
1048	else if (map)	1205	else if (map)
1049	{	1206	{
1050	if (type == PLAYER)
1051	{
1052	// leaving a spot always closes any open container on the ground
1053	if (container && !container->env)
1054	// this causes spurious floorbox updates, but it ensures
1055	// that the CLOSE event is being sent.
1056	close_container ();
1057
1058	--map->players;
1059	map->touch ();
1060	}
1061
1062	map->dirty = true;	1207	map->dirty = true;
1063	mapspace &ms = this->ms ();	1208	mapspace &ms = this->ms ();
1064		1209
		1210	if (object *pl = ms.player ())
		1211	{
		1212	if (is_player ())
		1213	{
		1214	if (!flag [FLAG_WIZPASS])
		1215	ms.smell = ++mapspace::smellcount; // remember the smell of the player
		1216
		1217	// leaving a spot always closes any open container on the ground
		1218	if (container && !container->env)
		1219	// this causes spurious floorbox updates, but it ensures
		1220	// that the CLOSE event is being sent.
		1221	close_container ();
		1222
		1223	--map->players;
		1224	map->touch ();
		1225	}
		1226	else if (pl->container_ () == this)
		1227	{
		1228	// removing a container should close it
		1229	close_container ();
		1230	}
		1231	else
		1232	esrv_del_item (pl->contr, count);
		1233	}
		1234
1065	/* link the object above us */	1235	/* link the object above us */
1066	if (above)	1236	// re-link, make sure compiler can easily use cmove
1067	above->below = below;	1237	*(above ? &above->below : &ms.top) = below;
1068	else	1238	*(below ? &below->above : &ms.bot) = above;
1069	ms.top = below; /* we were top, set new top */
1070
1071	/* Relink the object below us, if there is one */
1072	if (below)
1073	below->above = above;
1074	else
1075	{
1076	/* Nothing below, which means we need to relink map object for this space
1077	* use translated coordinates in case some oddness with map tiling is
1078	* evident
1079	*/
1080	if (GET_MAP_OB (map, x, y) != this)
1081	LOG (llevError, "remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom? %s\n", debug_desc ());
1082
1083	ms.bot = above; /* goes on above it. */
1084	}
1085		1239
1086	above = 0;	1240	above = 0;
1087	below = 0;	1241	below = 0;
1088		1242
		1243	ms.invalidate ();
		1244
1089	if (map->in_memory == MAP_SAVING)	1245	if (map->in_memory == MAP_SAVING)
1090	return;	1246	return;
1091		1247
1092	int check_walk_off = !flag [FLAG_NO_APPLY];	1248	int check_walk_off = !flag [FLAG_NO_APPLY];
1093		1249
1094	if (object *pl = ms.player ())	1250	if (object *pl = ms.player ())
1095	{	1251	{
1096	if (pl->container == this)	1252	if (pl->container_ () == this)
1097	/* If a container that the player is currently using somehow gets	1253	/* If a container that the player is currently using somehow gets
1098	* removed (most likely destroyed), update the player view	1254	* removed (most likely destroyed), update the player view
1099	* appropriately.	1255	* appropriately.
1100	*/	1256	*/
1101	pl->close_container ();	1257	pl->close_container ();
1102		1258
		1259	//TODO: the floorbox prev/next might need updating
		1260	//esrv_del_item (pl->contr, count);
		1261	//TODO: update floorbox to preserve ordering
		1262	if (pl->contr->ns)
1103	pl->contr->ns->floorbox_update ();	1263	pl->contr->ns->floorbox_update ();
1104	}	1264	}
1105		1265
		1266	if (check_walk_off)
1106	for (tmp = ms.bot; tmp; tmp = tmp->above)	1267	for (object *above, *tmp = ms.bot; tmp; tmp = above)
1107	{	1268	{
		1269	above = tmp->above;
		1270
1108	/* No point updating the players look faces if he is the object	1271	/* No point updating the players look faces if he is the object
1109	* being removed.	1272	* being removed.
1110	*/	1273	*/
1111		1274
1112	/* See if object moving off should effect something */	1275	/* See if object moving off should effect something */
1113	if (check_walk_off
1114	&& ((move_type & tmp->move_off)	1276	if ((move_type & tmp->move_off)
1115	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))	1277	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0)
1116	{
1117	move_apply (tmp, this, 0);	1278	move_apply (tmp, this, 0);
1118
1119	if (destroyed ())
1120	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1121	}	1279	}
1122		1280
1123	last = tmp;	1281	if (affects_los ())
1124	}
1125
1126	/* last == NULL if there are no objects on this space */
1127	//TODO: this makes little sense, why only update the topmost object?
1128	if (!last)
1129	map->at (x, y).flags_ = 0;
1130	else
1131	update_object (last, UP_OBJ_REMOVE);
1132
1133	if (flag [FLAG_BLOCKSVIEW] || glow_radius)
1134	update_all_los (map, x, y);	1282	update_all_los (map, x, y);
1135	}	1283	}
1136	}	1284	}
1137		1285
1138	/*	1286	/*
…		…
1152	if (!top)	1300	if (!top)
1153	for (top = op; top && top->above; top = top->above)	1301	for (top = op; top && top->above; top = top->above)
1154	;	1302	;
1155		1303
1156	for (; top; top = top->below)	1304	for (; top; top = top->below)
1157	{
1158	if (top == op)
1159	continue;
1160
1161	if (object::can_merge (op, top))	1305	if (object::can_merge (op, top))
1162	{	1306	{
1163	top->nrof += op->nrof;	1307	top->nrof += op->nrof;
1164		1308
1165	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/	1309	if (object *pl = top->visible_to ())
1166	op->weight = 0; /* Don't want any adjustements now */	1310	esrv_update_item (UPD_NROF, pl, top);
		1311
		1312	op->weight = 0; // cancel the addition above
		1313	op->carrying = 0; // must be 0 already
		1314
1167	op->destroy ();	1315	op->destroy ();
		1316
1168	return top;	1317	return top;
1169	}	1318	}
1170	}
1171		1319
1172	return 0;	1320	return 0;
1173	}	1321	}
1174		1322
1175	void	1323	void
…		…
1180		1328
1181	object *prev = this;	1329	object *prev = this;
1182		1330
1183	for (archetype *at = (archetype *)arch->more; at; at = (archetype *)at->more)	1331	for (archetype *at = (archetype *)arch->more; at; at = (archetype *)at->more)
1184	{	1332	{
1185	object *op = arch_to_object (at);	1333	object *op = at->instance ();
1186		1334
1187	op->name = name;	1335	op->name = name;
1188	op->name_pl = name_pl;	1336	op->name_pl = name_pl;
1189	op->title = title;	1337	op->title = title;
1190		1338
…		…
1200	* job preparing multi-part monsters.	1348	* job preparing multi-part monsters.
1201	*/	1349	*/
1202	object *	1350	object *
1203	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)	1351	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1204	{	1352	{
		1353	op->remove ();
		1354
1205	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)	1355	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1206	{	1356	{
1207	tmp->x = x + tmp->arch->x;	1357	tmp->x = x + tmp->arch->x;
1208	tmp->y = y + tmp->arch->y;	1358	tmp->y = y + tmp->arch->y;
1209	}	1359	}
…		…
1226	* Passing 0 for flag gives proper default values, so flag really only needs	1376	* Passing 0 for flag gives proper default values, so flag really only needs
1227	* to be set if special handling is needed.	1377	* to be set if special handling is needed.
1228	*	1378	*
1229	* Return value:	1379	* Return value:
1230	* new object if 'op' was merged with other object	1380	* new object if 'op' was merged with other object
1231	* NULL if 'op' was destroyed	1381	* NULL if there was an error (destroyed, blocked etc.)
1232	* just 'op' otherwise	1382	* just 'op' otherwise
1233	*/	1383	*/
1234	object *	1384	object *
1235	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)	1385	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1236	{	1386	{
1237	assert (!op->flag [FLAG_FREED]);
1238
1239	object *top, *floor = NULL;
1240
1241	op->remove ();	1387	op->remove ();
		1388
		1389	if (m == &freed_map)//D TODO: remove soon
		1390	{//D
		1391	LOG (llevError | logBacktrace, "tries to insret object on freed objects map: %s", op->debug_desc ());//D
		1392	}//D
1242		1393
1243	/* Ideally, the caller figures this out. However, it complicates a lot	1394	/* Ideally, the caller figures this out. However, it complicates a lot
1244	* of areas of callers (eg, anything that uses find_free_spot would now	1395	* of areas of callers (eg, anything that uses find_free_spot would now
1245	* need extra work	1396	* need extra work
1246	*/	1397	*/
		1398	maptile *newmap = m;
1247	if (!xy_normalise (m, op->x, op->y))	1399	if (!xy_normalise (newmap, op->x, op->y))
1248	{	1400	{
1249	op->destroy ();	1401	op->head_ ()->destroy ();// remove head_ once all tail object destroyers found
1250	return 0;	1402	return 0;
1251	}	1403	}
1252		1404
1253	if (object *more = op->more)	1405	if (object *more = op->more)
1254	if (!insert_ob_in_map (more, m, originator, flag))	1406	if (!insert_ob_in_map (more, m, originator, flag))
1255	return 0;	1407	return 0;
1256		1408
1257	CLEAR_FLAG (op, FLAG_REMOVED);	1409	op->flag [FLAG_REMOVED] = false;
1258		1410	op->env = 0;
1259	op->map = m;	1411	op->map = newmap;
		1412
1260	mapspace &ms = op->ms ();	1413	mapspace &ms = op->ms ();
1261		1414
1262	/* this has to be done after we translate the coordinates.	1415	/* this has to be done after we translate the coordinates.
1263	*/	1416	*/
1264	if (op->nrof && !(flag & INS_NO_MERGE))	1417	if (op->nrof && !(flag & INS_NO_MERGE))
1265	for (object *tmp = ms.bot; tmp; tmp = tmp->above)	1418	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1266	if (object::can_merge (op, tmp))	1419	if (object::can_merge (op, tmp))
1267	{	1420	{
		1421	// TODO: we actually want to update tmp, not op,
		1422	// but some caller surely breaks when we return tmp
		1423	// from here :/
1268	op->nrof += tmp->nrof;	1424	op->nrof += tmp->nrof;
1269	tmp->destroy (1);	1425	tmp->destroy ();
1270	}	1426	}
1271		1427
1272	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1428	op->clr_flag (FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1273	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1429	op->clr_flag (FLAG_INV_LOCKED);
1274		1430
1275	if (!QUERY_FLAG (op, FLAG_ALIVE))	1431	if (!op->flag [FLAG_ALIVE])
1276	CLEAR_FLAG (op, FLAG_NO_STEAL);	1432	op->clr_flag (FLAG_NO_STEAL);
1277		1433
1278	if (flag & INS_BELOW_ORIGINATOR)	1434	if (flag & INS_BELOW_ORIGINATOR)
1279	{	1435	{
1280	if (originator->map != op->map || originator->x != op->x || originator->y != op->y)	1436	if (originator->map != op->map || originator->x != op->x || originator->y != op->y)
1281	{	1437	{
1282	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");	1438	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");
1283	abort ();	1439	abort ();
1284	}	1440	}
1285		1441
		1442	if (!originator->is_on_map ())
		1443	{
		1444	LOG (llevError, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map",
		1445	op->debug_desc (), originator->debug_desc ());
		1446	abort ();
		1447	}
		1448
1286	op->above = originator;	1449	op->above = originator;
1287	op->below = originator->below;	1450	op->below = originator->below;
1288
1289	if (op->below)
1290	op->below->above = op;
1291	else
1292	ms.bot = op;
1293
1294	/* since *below* originator, no need to update top */
1295	originator->below = op;	1451	originator->below = op;
		1452
		1453	*(op->below ? &op->below->above : &ms.bot) = op;
1296	}	1454	}
1297	else	1455	else
1298	{	1456	{
1299	top = ms.bot;	1457	object *floor = 0;
		1458	object *top = ms.top;
1300		1459
1301	/* If there are other objects, then */	1460	/* If there are other objects, then */
1302	if (top)	1461	if (top)
1303	{	1462	{
1304	object *last = 0;
1305
1306	/*	1463	/*
1307	* If there are multiple objects on this space, we do some trickier handling.	1464	* If there are multiple objects on this space, we do some trickier handling.
1308	* We've already dealt with merging if appropriate.	1465	* We've already dealt with merging if appropriate.
1309	* Generally, we want to put the new object on top. But if	1466	* Generally, we want to put the new object on top. But if
1310	* flag contains INS_ABOVE_FLOOR_ONLY, once we find the last	1467	* flag contains INS_ABOVE_FLOOR_ONLY, once we find the last
…		…
1313	* once we get to them. This reduces the need to traverse over all of	1470	* once we get to them. This reduces the need to traverse over all of
1314	* them when adding another one - this saves quite a bit of cpu time	1471	* them when adding another one - this saves quite a bit of cpu time
1315	* when lots of spells are cast in one area. Currently, it is presumed	1472	* when lots of spells are cast in one area. Currently, it is presumed
1316	* that flying non pickable objects are spell objects.	1473	* that flying non pickable objects are spell objects.
1317	*/	1474	*/
1318	for (top = ms.bot; top; top = top->above)	1475	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1319	{	1476	{
1320	if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))	1477	if (tmp->flag [FLAG_IS_FLOOR] || tmp->flag [FLAG_OVERLAY_FLOOR])
1321	floor = top;	1478	floor = tmp;
1322		1479
1323	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))	1480	if (tmp->flag [FLAG_NO_PICK] && (tmp->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !tmp->flag [FLAG_IS_FLOOR])
1324	{	1481	{
1325	/* We insert above top, so we want this object below this */	1482	/* We insert above top, so we want this object below this */
1326	top = top->below;	1483	top = tmp->below;
1327	break;	1484	break;
1328	}	1485	}
1329		1486
1330	last = top;	1487	top = tmp;
1331	}	1488	}
1332
1333	/* Don't want top to be NULL, so set it to the last valid object */
1334	top = last;
1335		1489
1336	/* We let update_position deal with figuring out what the space	1490	/* We let update_position deal with figuring out what the space
1337	* looks like instead of lots of conditions here.	1491	* looks like instead of lots of conditions here.
1338	* makes things faster, and effectively the same result.	1492	* makes things faster, and effectively the same result.
1339	*/	1493	*/
…		…
1346	*/	1500	*/
1347	if (!(flag & INS_ON_TOP)	1501	if (!(flag & INS_ON_TOP)
1348	&& ms.flags () & P_BLOCKSVIEW	1502	&& ms.flags () & P_BLOCKSVIEW
1349	&& (op->face && !faces [op->face].visibility))	1503	&& (op->face && !faces [op->face].visibility))
1350	{	1504	{
		1505	object *last;
		1506
1351	for (last = top; last != floor; last = last->below)	1507	for (last = top; last != floor; last = last->below)
1352	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1508	if (last->flag [FLAG_BLOCKSVIEW] && (last->type != EXIT))
1353	break;	1509	break;
1354		1510
1355	/* Check to see if we found the object that blocks view,	1511	/* Check to see if we found the object that blocks view,
1356	* and make sure we have a below pointer for it so that	1512	* and make sure we have a below pointer for it so that
1357	* we can get inserted below this one, which requires we	1513	* we can get inserted below this one, which requires we
…		…
1363	} /* If objects on this space */	1519	} /* If objects on this space */
1364		1520
1365	if (flag & INS_ABOVE_FLOOR_ONLY)	1521	if (flag & INS_ABOVE_FLOOR_ONLY)
1366	top = floor;	1522	top = floor;
1367		1523
1368	/* Top is the object that our object (op) is going to get inserted above.	1524	// insert object above top, or bottom-most if top = 0
1369	*/
1370
1371	/* First object on this space */
1372	if (!top)	1525	if (!top)
1373	{	1526	{
		1527	op->below = 0;
1374	op->above = ms.bot;	1528	op->above = ms.bot;
1375
1376	if (op->above)
1377	op->above->below = op;
1378
1379	op->below = 0;
1380	ms.bot = op;	1529	ms.bot = op;
		1530
		1531	*(op->above ? &op->above->below : &ms.top) = op;
1381	}	1532	}
1382	else	1533	else
1383	{ /* get inserted into the stack above top */	1534	{
1384	op->above = top->above;	1535	op->above = top->above;
1385
1386	if (op->above)
1387	op->above->below = op;	1536	top->above = op;
1388		1537
1389	op->below = top;	1538	op->below = top;
1390	top->above = op;	1539	*(op->above ? &op->above->below : &ms.top) = op;
1391	}	1540	}
		1541	}
1392		1542
1393	if (!op->above)	1543	if (op->is_player ())
1394	ms.top = op;
1395	} /* else not INS_BELOW_ORIGINATOR */
1396
1397	if (op->type == PLAYER)
1398	{	1544	{
1399	op->contr->do_los = 1;	1545	op->contr->do_los = 1;
1400	++op->map->players;	1546	++op->map->players;
1401	op->map->touch ();	1547	op->map->touch ();
1402	}	1548	}
1403		1549
1404	op->map->dirty = true;	1550	op->map->dirty = true;
1405		1551
1406	if (object *pl = ms.player ())	1552	if (object *pl = ms.player ())
		1553	//TODO: the floorbox prev/next might need updating
		1554	//esrv_send_item (pl, op);
		1555	//TODO: update floorbox to preserve ordering
		1556	if (pl->contr->ns)
1407	pl->contr->ns->floorbox_update ();	1557	pl->contr->ns->floorbox_update ();
1408		1558
1409	/* If this object glows, it may affect lighting conditions that are	1559	/* If this object glows, it may affect lighting conditions that are
1410	* visible to others on this map. But update_all_los is really	1560	* visible to others on this map. But update_all_los is really
1411	* an inefficient way to do this, as it means los for all players	1561	* an inefficient way to do this, as it means los for all players
1412	* on the map will get recalculated. The players could very well	1562	* on the map will get recalculated. The players could very well
1413	* be far away from this change and not affected in any way -	1563	* be far away from this change and not affected in any way -
1414	* this should get redone to only look for players within range,	1564	* this should get redone to only look for players within range,
1415	* or just updating the P_UPTODATE for spaces within this area	1565	* or just updating the P_UPTODATE for spaces within this area
1416	* of effect may be sufficient.	1566	* of effect may be sufficient.
1417	*/	1567	*/
1418	if (op->map->darkness && (op->glow_radius != 0))	1568	if (op->affects_los ())
		1569	{
		1570	op->ms ().invalidate ();
1419	update_all_los (op->map, op->x, op->y);	1571	update_all_los (op->map, op->x, op->y);
		1572	}
1420		1573
1421	/* updates flags (blocked, alive, no magic, etc) for this map space */	1574	/* updates flags (blocked, alive, no magic, etc) for this map space */
1422	update_object (op, UP_OBJ_INSERT);	1575	update_object (op, UP_OBJ_INSERT);
1423		1576
1424	INVOKE_OBJECT (INSERT, op);	1577	INVOKE_OBJECT (INSERT, op);
…		…
1431	* blocked() and wall() work properly), and these flags are updated by	1584	* blocked() and wall() work properly), and these flags are updated by
1432	* update_object().	1585	* update_object().
1433	*/	1586	*/
1434		1587
1435	/* if this is not the head or flag has been passed, don't check walk on status */	1588	/* if this is not the head or flag has been passed, don't check walk on status */
1436	if (!(flag & INS_NO_WALK_ON) && op->head_ () == op)	1589	if (!(flag & INS_NO_WALK_ON) && op->is_head ())
1437	{	1590	{
1438	if (check_move_on (op, originator))	1591	if (check_move_on (op, originator, flag))
1439	return 0;	1592	return 0;
1440		1593
1441	/* If we are a multi part object, lets work our way through the check	1594	/* If we are a multi part object, let's work our way through the check
1442	* walk on's.	1595	* walk on's.
1443	*/	1596	*/
1444	for (object *tmp = op->more; tmp; tmp = tmp->more)	1597	for (object *tmp = op->more; tmp; tmp = tmp->more)
1445	if (check_move_on (tmp, originator))	1598	if (check_move_on (tmp, originator, flag))
1446	return 0;	1599	return 0;
1447	}	1600	}
1448		1601
1449	return op;	1602	return op;
1450	}	1603	}
…		…
1452	/* this function inserts an object in the map, but if it	1605	/* this function inserts an object in the map, but if it
1453	* finds an object of its own type, it'll remove that one first.	1606	* finds an object of its own type, it'll remove that one first.
1454	* op is the object to insert it under: supplies x and the map.	1607	* op is the object to insert it under: supplies x and the map.
1455	*/	1608	*/
1456	void	1609	void
1457	replace_insert_ob_in_map (const char *arch_string, object *op)	1610	replace_insert_ob_in_map (shstr_tmp archname, object *op)
1458	{	1611	{
1459	/* first search for itself and remove any old instances */	1612	/* first search for itself and remove any old instances */
1460		1613
1461	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)	1614	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1462	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */	1615	if (tmp->arch->archname == archname) /* same archetype */
1463	tmp->destroy (1);	1616	tmp->destroy ();
1464		1617
1465	object *tmp = arch_to_object (archetype::find (arch_string));	1618	object *tmp = archetype::find (archname)->instance ();
1466		1619
1467	tmp->x = op->x;	1620	tmp->x = op->x;
1468	tmp->y = op->y;	1621	tmp->y = op->y;
1469		1622
1470	insert_ob_in_map (tmp, op->map, op, 0);	1623	insert_ob_in_map (tmp, op->map, op, 0);
…		…
1477	return where->env->insert (this);	1630	return where->env->insert (this);
1478	else	1631	else
1479	return where->map->insert (this, where->x, where->y, originator, flags);	1632	return where->map->insert (this, where->x, where->y, originator, flags);
1480	}	1633	}
1481		1634
1482	// find player who can see this object	1635	// check whether we can put this into the map, respect max_volume, max_items
1483	static object *	1636	bool
1484	visible_to (object *op)	1637	object::can_drop_at (maptile *m, int x, int y, object *originator)
1485	{	1638	{
1486	if (!op->flag [FLAG_REMOVED])	1639	mapspace &ms = m->at (x, y);
1487	{
1488	// see if we are in a container of sorts
1489	if (object *env = op->env)
1490	{
1491	// the player inventory itself is always visible
1492	if (env->type == PLAYER)
1493	return env;
1494		1640
1495	// else a player could have our env open	1641	int items = ms.items ();
1496	env = env->outer_env ();
1497		1642
1498	// the player itself is always on a map, so we will find him here	1643	if (!items // testing !items ensures we can drop at least one item
1499	// even if our inv is in a player.	1644	|| (items < m->max_items
1500	if (env->is_on_map ())	1645	&& ms.volume () < m->max_volume))
1501	if (object *pl = env->ms ().player ())	1646	return true;
1502	if (pl->container == op->env)
1503	return pl;
1504	}
1505	else
1506	{
1507	// maybe there is a player standing on the same mapspace
1508	if (object *pl = env->ms ().player ())
1509	return pl;
1510	}
1511	}
1512		1647
		1648	if (originator && originator->is_player ())
		1649	originator->contr->failmsgf (
		1650	"No matter how hard you try, you just cannot put the %s here H<Try to remove some items from the floor first.>",
		1651	query_name ()
		1652	);
		1653
1513	return 0;	1654	return false;
1514	}	1655	}
1515		1656
1516	/*	1657	/*
1517	* decrease(object, number) decreases a specified number from	1658	* decrease(object, number) decreases a specified number from
1518	* the amount of an object. If the amount reaches 0, the object	1659	* the amount of an object. If the amount reaches 0, the object
…		…
1521	* Return value: 'op' if something is left, NULL if the amount reached 0	1662	* Return value: 'op' if something is left, NULL if the amount reached 0
1522	*/	1663	*/
1523	bool	1664	bool
1524	object::decrease (sint32 nr)	1665	object::decrease (sint32 nr)
1525	{	1666	{
		1667	if (!nr)
		1668	return true;
		1669
1526	nr = min (nr, nrof);	1670	nr = min (nr, nrof);
1527		1671
1528	if (!nr)	1672	if (nrof > nr)
1529	return 1;	1673	{
		1674	sint64 oweight = total_weight ();
1530		1675
1531	nrof -= nr;	1676	nrof -= nr;
1532		1677
1533	object *visible = visible_to (this);	1678	if (object *pl = visible_to ())
		1679	esrv_update_item (UPD_NROF, pl, this);
1534		1680
1535	if (nrof)	1681	adjust_weight (env, oweight, total_weight ());
1536	{
1537	adjust_weight (env, -weight * nr); // carrying == 0
1538		1682
1539	if (visible)
1540	esrv_send_item (visible, this);
1541
1542	return 1;	1683	return true;
1543	}	1684	}
1544	else	1685	else
1545	{	1686	{
1546	if (visible)
1547	esrv_del_item (visible->contr, count);
1548
1549	this->destroy (1);	1687	destroy ();
1550	return 0;	1688	return false;
1551	}	1689	}
1552	}	1690	}
1553		1691
1554	/*	1692	/*
1555	* split(ob,nr) splits up ob into two parts. The part which	1693	* split(ob,nr) splits up ob into two parts. The part which
…		…
1558	* On failure, NULL is returned.	1696	* On failure, NULL is returned.
1559	*/	1697	*/
1560	object *	1698	object *
1561	object::split (sint32 nr)	1699	object::split (sint32 nr)
1562	{	1700	{
		1701	int have = number_of ();
		1702
1563	if (nrof < nr)	1703	if (have < nr)
1564	return 0;	1704	return 0;
1565	else if (nrof == nr)	1705	else if (have == nr)
1566	{	1706	{
1567	remove ();	1707	remove ();
1568	return this;	1708	return this;
1569	}	1709	}
1570	else	1710	else
1571	{	1711	{
1572	decrease (nr);	1712	decrease (nr);
1573		1713
1574	object *op = object_create_clone (this);	1714	object *op = deep_clone ();
1575	op->nrof = nr;	1715	op->nrof = nr;
1576	return op;	1716	return op;
1577	}	1717	}
1578	}	1718	}
1579		1719
…		…
1621	if (op->nrof)	1761	if (op->nrof)
1622	for (object *tmp = inv; tmp; tmp = tmp->below)	1762	for (object *tmp = inv; tmp; tmp = tmp->below)
1623	if (object::can_merge (tmp, op))	1763	if (object::can_merge (tmp, op))
1624	{	1764	{
1625	/* return the original object and remove inserted object	1765	/* return the original object and remove inserted object
1626	(client needs the original object) */	1766	(client prefers the original object) */
		1767
		1768	// carring must be 0 for mergable objects
		1769	sint64 oweight = tmp->weight * tmp->nrof;
		1770
1627	tmp->nrof += op->nrof;	1771	tmp->nrof += op->nrof;
1628	adjust_weight (this, op->total_weight ());
1629		1772
		1773	if (object *pl = tmp->visible_to ())
		1774	esrv_update_item (UPD_NROF, pl, tmp);
		1775
		1776	adjust_weight (this, oweight, tmp->weight * tmp->nrof);
		1777
1630	op->destroy (1);	1778	op->destroy ();
1631	op = tmp;	1779	op = tmp;
1632	goto inserted;	1780	goto inserted;
1633	}	1781	}
1634		1782
1635	op->owner = 0; // it's his/hers now. period.	1783	op->owner = 0; // it's his/hers now. period.
…		…
1646		1794
1647	inv = op;	1795	inv = op;
1648		1796
1649	op->flag [FLAG_REMOVED] = 0;	1797	op->flag [FLAG_REMOVED] = 0;
1650		1798
		1799	if (object *pl = op->visible_to ())
		1800	esrv_send_item (pl, op);
		1801
1651	adjust_weight (this, op->total_weight ());	1802	adjust_weight (this, 0, op->total_weight ());
1652		1803
1653	inserted:	1804	inserted:
1654	/* reset the light list and los of the players on the map */	1805	/* reset the light list and los of the players on the map */
1655	if (op->glow_radius && map && map->darkness)	1806	if (op->glow_radius && is_on_map ())
		1807	{
		1808	update_stats ();
1656	update_all_los (map, x, y);	1809	update_all_los (map, x, y);
1657		1810	}
1658	if (object *otmp = in_player ())	1811	else if (is_player ())
1659	if (otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1812	// if this is a player's inventory, update stats
1660	otmp->update_stats ();	1813	contr->queue_stats_update ();
1661		1814
1662	INVOKE_OBJECT (INSERT, this);	1815	INVOKE_OBJECT (INSERT, this);
1663		1816
1664	return op;	1817	return op;
1665	}	1818	}
…		…
1683	* MSW 2001-07-08: Check all objects on space, not just those below	1836	* MSW 2001-07-08: Check all objects on space, not just those below
1684	* object being inserted. insert_ob_in_map may not put new objects	1837	* object being inserted. insert_ob_in_map may not put new objects
1685	* on top.	1838	* on top.
1686	*/	1839	*/
1687	int	1840	int
1688	check_move_on (object *op, object *originator)	1841	check_move_on (object *op, object *originator, int flags)
1689	{	1842	{
		1843	if (op->flag [FLAG_NO_APPLY])
		1844	return 0;
		1845
1690	object *tmp;	1846	object *tmp;
1691	maptile *m = op->map;	1847	maptile *m = op->map;
1692	int x = op->x, y = op->y;	1848	int x = op->x, y = op->y;
1693		1849
1694	MoveType move_on, move_slow, move_block;	1850	mapspace &ms = m->at (x, y);
1695		1851
1696	if (QUERY_FLAG (op, FLAG_NO_APPLY))	1852	ms.update ();
1697	return 0;
1698		1853
1699	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);	1854	MoveType move_on = ms.move_on;
1700	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);	1855	MoveType move_slow = ms.move_slow;
1701	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);	1856	MoveType move_block = ms.move_block;
1702		1857
1703	/* if nothing on this space will slow op down or be applied,	1858	/* if nothing on this space will slow op down or be applied,
1704	* no need to do checking below. have to make sure move_type	1859	* no need to do checking below. have to make sure move_type
1705	* is set, as lots of objects don't have it set - we treat that	1860	* is set, as lots of objects don't have it set - we treat that
1706	* as walking.	1861	* as walking.
…		…
1717	return 0;	1872	return 0;
1718		1873
1719	/* The objects have to be checked from top to bottom.	1874	/* The objects have to be checked from top to bottom.
1720	* Hence, we first go to the top:	1875	* Hence, we first go to the top:
1721	*/	1876	*/
1722		1877	for (object *next, *tmp = ms.top; tmp; tmp = next)
1723	for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above)
1724	{
1725	/* Trim the search when we find the first other spell effect
1726	* this helps performance so that if a space has 50 spell objects,
1727	* we don't need to check all of them.
1728	*/
1729	if ((tmp->move_type & MOVE_FLY_LOW) && QUERY_FLAG (tmp, FLAG_NO_PICK))
1730	break;
1731	}	1878	{
		1879	next = tmp->below;
1732		1880
1733	for (; tmp; tmp = tmp->below)
1734	{
1735	if (tmp == op)	1881	if (tmp == op)
1736	continue; /* Can't apply yourself */	1882	continue; /* Can't apply yourself */
1737		1883
1738	/* Check to see if one of the movement types should be slowed down.	1884	/* Check to see if one of the movement types should be slowed down.
1739	* Second check makes sure that the movement types not being slowed	1885	* Second check makes sure that the movement types not being slowed
1740	* (~slow_move) is not blocked on this space - just because the	1886	* (~slow_move) is not blocked on this space - just because the
1741	* space doesn't slow down swimming (for example), if you can't actually	1887	* space doesn't slow down swimming (for example), if you can't actually
1742	* swim on that space, can't use it to avoid the penalty.	1888	* swim on that space, can't use it to avoid the penalty.
1743	*/	1889	*/
1744	if (!QUERY_FLAG (op, FLAG_WIZPASS))	1890	if (!op->flag [FLAG_WIZPASS])
1745	{	1891	{
1746	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||	1892	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
1747	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))	1893	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1748	{	1894	{
1749
1750	float
1751	diff = tmp->move_slow_penalty * fabs (op->speed);	1895	float diff = tmp->move_slow_penalty * fabs (op->speed);
1752		1896
1753	if (op->type == PLAYER)	1897	if (op->is_player ())
1754	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||	1898	if ((tmp->flag [FLAG_IS_HILLY ] && find_skill_by_number (op, SK_CLIMBING)) ||
1755	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))	1899	(tmp->flag [FLAG_IS_WOODED] && find_skill_by_number (op, SK_WOODSMAN)))
1756	diff /= 4.0;	1900	diff /= 4.0;
1757		1901
1758	op->speed_left -= diff;	1902	op->speed_left -= diff;
1759	}	1903	}
1760	}	1904	}
1761		1905
1762	/* Basically same logic as above, except now for actual apply. */	1906	/* Basically same logic as above, except now for actual apply. */
1763	if ((!op->move_type && tmp->move_on & MOVE_WALK) ||	1907	if ((!op->move_type && tmp->move_on & MOVE_WALK) ||
1764	((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))	1908	((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))
1765	{	1909	{
		1910	if ((flags & INS_NO_AUTO_EXIT)
		1911	&& (tmp->type == EXIT || tmp->type == TELEPORTER
		1912	|| tmp->type == HOLE || tmp->type == TRAPDOOR)) //TODO: temporary, fix exits instead
		1913	continue;
		1914
1766	move_apply (tmp, op, originator);	1915	move_apply (tmp, op, originator);
1767		1916
1768	if (op->destroyed ())	1917	if (op->destroyed ())
1769	return 1;	1918	return 1;
1770		1919
…		…
1793	LOG (llevError, "Present_arch called outside map.\n");	1942	LOG (llevError, "Present_arch called outside map.\n");
1794	return NULL;	1943	return NULL;
1795	}	1944	}
1796		1945
1797	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)	1946	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1798	if (tmp->arch == at)	1947	if (tmp->arch->archname == at->archname)
1799	return tmp;	1948	return tmp;
1800		1949
1801	return NULL;	1950	return NULL;
1802	}	1951	}
1803		1952
…		…
1867	* The first matching object is returned, or NULL if none.	2016	* The first matching object is returned, or NULL if none.
1868	*/	2017	*/
1869	object *	2018	object *
1870	present_arch_in_ob (const archetype *at, const object *op)	2019	present_arch_in_ob (const archetype *at, const object *op)
1871	{	2020	{
1872	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)	2021	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1873	if (tmp->arch == at)	2022	if (tmp->arch->archname == at->archname)
1874	return tmp;	2023	return tmp;
1875		2024
1876	return NULL;	2025	return NULL;
1877	}	2026	}
1878		2027
…		…
1882	void	2031	void
1883	flag_inv (object *op, int flag)	2032	flag_inv (object *op, int flag)
1884	{	2033	{
1885	for (object *tmp = op->inv; tmp; tmp = tmp->below)	2034	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1886	{	2035	{
1887	SET_FLAG (tmp, flag);	2036	tmp->set_flag (flag);
1888	flag_inv (tmp, flag);	2037	flag_inv (tmp, flag);
1889	}	2038	}
1890	}	2039	}
1891		2040
1892	/*	2041	/*
…		…
1895	void	2044	void
1896	unflag_inv (object *op, int flag)	2045	unflag_inv (object *op, int flag)
1897	{	2046	{
1898	for (object *tmp = op->inv; tmp; tmp = tmp->below)	2047	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1899	{	2048	{
1900	CLEAR_FLAG (tmp, flag);	2049	tmp->clr_flag (flag);
1901	unflag_inv (tmp, flag);	2050	unflag_inv (tmp, flag);
1902	}	2051	}
1903	}	2052	}
1904		2053
1905	/*	2054	/*
…		…
1966	* head of the object should correspond for the entire object.	2115	* head of the object should correspond for the entire object.
1967	*/	2116	*/
1968	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))	2117	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
1969	continue;	2118	continue;
1970		2119
1971	if (ob->blocked (m, pos.x, pos.y))	2120	if (ob->blocked (pos.m, pos.x, pos.y))
1972	continue;	2121	continue;
1973		2122
1974	altern [index++] = i;	2123	altern [index++] = i;
1975	}	2124	}
1976		2125
…		…
2044	* there is capable of.	2193	* there is capable of.
2045	*/	2194	*/
2046	int	2195	int
2047	find_dir (maptile *m, int x, int y, object *exclude)	2196	find_dir (maptile *m, int x, int y, object *exclude)
2048	{	2197	{
2049	int i, max = SIZEOFFREE, mflags;	2198	int max = SIZEOFFREE, mflags;
2050
2051	sint16 nx, ny;
2052	object *tmp;
2053	maptile *mp;
2054
2055	MoveType blocked, move_type;	2199	MoveType move_type;
2056		2200
2057	if (exclude && exclude->head_ () != exclude)	2201	if (exclude && exclude->head_ () != exclude)
2058	{	2202	{
2059	exclude = exclude->head;	2203	exclude = exclude->head;
2060	move_type = exclude->move_type;	2204	move_type = exclude->move_type;
…		…
2063	{	2207	{
2064	/* If we don't have anything, presume it can use all movement types. */	2208	/* If we don't have anything, presume it can use all movement types. */
2065	move_type = MOVE_ALL;	2209	move_type = MOVE_ALL;
2066	}	2210	}
2067		2211
2068	for (i = 1; i < max; i++)	2212	for (int i = 1; i < max; i++)
2069	{	2213	{
2070	mp = m;	2214	mapxy pos (m, x, y);
2071	nx = x + freearr_x[i];	2215	pos.move (i);
2072	ny = y + freearr_y[i];
2073		2216
2074	mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);	2217	if (!pos.normalise ())
2075
2076	if (mflags & P_OUT_OF_MAP)
2077	max = maxfree[i];	2218	max = maxfree[i];
2078	else	2219	else
2079	{	2220	{
2080	mapspace &ms = mp->at (nx, ny);	2221	mapspace &ms = *pos;
2081		2222
2082	blocked = ms.move_block;
2083
2084	if ((move_type & blocked) == move_type)	2223	if ((move_type & ms.move_block) == move_type)
2085	max = maxfree[i];	2224	max = maxfree [i];
2086	else if (mflags & P_IS_ALIVE)	2225	else if (ms.flags () & P_IS_ALIVE)
2087	{	2226	{
2088	for (tmp = ms.bot; tmp; tmp = tmp->above)	2227	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
2089	if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)	2228	if ((tmp->flag [FLAG_MONSTER] || tmp->is_player ())
2090	&& (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))	2229	&& (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2091	break;
2092
2093	if (tmp)
2094	return freedir[i];	2230	return freedir [i];
2095	}	2231	}
2096	}	2232	}
2097	}	2233	}
2098		2234
2099	return 0;	2235	return 0;
…		…
2108	{	2244	{
2109	return (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);	2245	return (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);
2110	}	2246	}
2111		2247
2112	/*	2248	/*
2113	* find_dir_2(delta-x,delta-y) will return a direction in which	2249	* 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	2250	* for running into direct [dx, dy].
2115	* object, needs to travel toward it.	2251	* (the opposite of crossfire's find_dir_2!)
2116	*/	2252	*/
2117	int	2253	int
2118	find_dir_2 (int x, int y)	2254	find_dir_2 (int x, int y)
2119	{	2255	{
		2256	#if 1 // new algorithm
		2257	// this works by putting x, y into 16 sectors, which
		2258	// are not equal sized, but are a better approximation
		2259	// then the old algorithm, and then using a mapping
		2260	// table to map it into a direction value.
		2261	// basically, it maps these comparisons to each bit
		2262	// bit #3: x < 0
		2263	// bit #2: y < 0
		2264	// bit #1: x > y
		2265	// bit #0: x > 2y
		2266
		2267	static const uint8 dir[16] = {
		2268	4, 5, 4, 3,
		2269	2, 1, 2, 3,
		2270	6, 5, 6, 7,
		2271	8, 1, 8, 7,
		2272	};
		2273	int sector = 0;
		2274
		2275	// this is a bit ugly, but more likely to result in branchless code
		2276	sector |= x < 0 ? 8 : 0;
		2277	x = x < 0 ? -x : x; // abs
		2278
		2279	sector |= y < 0 ? 4 : 0;
		2280	y = y < 0 ? -y : y; // abs
		2281
		2282	if (x > y)
		2283	{
		2284	sector |= 2;
		2285
		2286	if (x > y * 2)
		2287	sector |= 1;
		2288	}
		2289	else
		2290	{
		2291	if (y > x * 2)
		2292	sector |= 1;
		2293	else if (!y)
		2294	return 0; // x == 0 here
		2295	}
		2296
		2297	return dir [sector];
		2298	#else // old algorithm
2120	int q;	2299	int q;
2121		2300
2122	if (y)	2301	if (y)
2123	q = x * 100 / y;	2302	q = 128 * x / y;
2124	else if (x)	2303	else if (x)
2125	q = -300 * x;	2304	q = -512 * x; // to make it > 309
2126	else	2305	else
2127	return 0;	2306	return 0;
2128		2307
2129	if (y > 0)	2308	if (y > 0)
2130	{	2309	{
2131	if (q < -242)	2310	if (q < -309) return 7;
		2311	if (q < -52) return 6;
		2312	if (q < 52) return 5;
		2313	if (q < 309) return 4;
		2314
2132	return 3;	2315	return 3;
2133	if (q < -41)	2316	}
2134	return 2;	2317	else
2135	if (q < 41)	2318	{
2136	return 1;	2319	if (q < -309) return 3;
2137	if (q < 242)	2320	if (q < -52) return 2;
2138	return 8;	2321	if (q < 52) return 1;
		2322	if (q < 309) return 8;
		2323
2139	return 7;	2324	return 7;
2140	}	2325	}
2141		2326	#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	}	2327	}
2153		2328
2154	/*	2329	/*
2155	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is	2330	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is
2156	* between two directions (which are expected to be absolute (see absdir())	2331	* between two directions (which are expected to be absolute (see absdir())
2157	*/	2332	*/
2158	int	2333	int
2159	dirdiff (int dir1, int dir2)	2334	dirdiff (int dir1, int dir2)
2160	{	2335	{
2161	int d;
2162
2163	d = abs (dir1 - dir2);	2336	int d = abs (dir1 - dir2);
2164	if (d > 4)
2165	d = 8 - d;
2166		2337
2167	return d;	2338	return d > 4 ? 8 - d : d;
2168	}	2339	}
2169		2340
2170	/* peterm:	2341	/* peterm:
2171	* do LOS stuff for ball lightning. Go after the closest VISIBLE monster.	2342	* do LOS stuff for ball lightning. Go after the closest VISIBLE monster.
2172	* Basically, this is a table of directions, and what directions	2343	* Basically, this is a table of directions, and what directions
…		…
2174	* This basically means that if direction is 15, then it could either go	2345	* 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.	2346	* 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	2347	* Moved from spell_util.c to object.c with the other related direction
2177	* functions.	2348	* functions.
2178	*/	2349	*/
2179	int reduction_dir[SIZEOFFREE][3] = {	2350	static const int reduction_dir[SIZEOFFREE][3] = {
2180	{0, 0, 0}, /* 0 */	2351	{0, 0, 0}, /* 0 */
2181	{0, 0, 0}, /* 1 */	2352	{0, 0, 0}, /* 1 */
2182	{0, 0, 0}, /* 2 */	2353	{0, 0, 0}, /* 2 */
2183	{0, 0, 0}, /* 3 */	2354	{0, 0, 0}, /* 3 */
2184	{0, 0, 0}, /* 4 */	2355	{0, 0, 0}, /* 4 */
…		…
2278	* Add a check so we can't pick up invisible objects (0.93.8)	2449	* Add a check so we can't pick up invisible objects (0.93.8)
2279	*/	2450	*/
2280	int	2451	int
2281	can_pick (const object *who, const object *item)	2452	can_pick (const object *who, const object *item)
2282	{	2453	{
2283	return /*QUERY_FLAG(who,FLAG_WIZ)|| */	2454	return /*who->flag [FLAG_WIZ]|| */
2284	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&	2455	(item->weight > 0 && !item->flag [FLAG_NO_PICK] &&
2285	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3));	2456	!item->flag [FLAG_ALIVE] && !item->invisible && (who->is_player () || item->weight < who->weight / 3));
2286	}	2457	}
2287		2458
2288	/*	2459	/*
2289	* create clone from object to another	2460	* create clone from object to another
2290	*/	2461	*/
2291	object *	2462	object *
2292	object_create_clone (object *asrc)	2463	object::deep_clone ()
2293	{	2464	{
2294	object *dst = 0, *tmp, *src, *prev, *item;	2465	assert (("deep_clone called on non-head object", is_head ()));
2295		2466
2296	if (!asrc)	2467	object *dst = clone ();
2297	return 0;
2298		2468
2299	src = asrc->head_ ();	2469	object *prev = dst;
2300
2301	prev = 0;
2302	for (object *part = src; part; part = part->more)	2470	for (object *part = this->more; part; part = part->more)
2303	{	2471	{
2304	tmp = part->clone ();	2472	object *tmp = part->clone ();
2305	tmp->x -= src->x;
2306	tmp->y -= src->y;
2307
2308	if (!part->head)
2309	{
2310	dst = tmp;
2311	tmp->head = 0;
2312	}
2313	else
2314	tmp->head = dst;	2473	tmp->head = dst;
2315
2316	tmp->more = 0;
2317
2318	if (prev)
2319	prev->more = tmp;	2474	prev->more = tmp;
2320
2321	prev = tmp;	2475	prev = tmp;
2322	}	2476	}
2323		2477
2324	for (item = src->inv; item; item = item->below)	2478	for (object *item = inv; item; item = item->below)
2325	insert_ob_in_ob (object_create_clone (item), dst);	2479	insert_ob_in_ob (item->deep_clone (), dst);
2326		2480
2327	return dst;	2481	return dst;
2328	}	2482	}
2329		2483
2330	/* This returns the first object in who's inventory that	2484	/* This returns the first object in who's inventory that
…		…
2339	return tmp;	2493	return tmp;
2340		2494
2341	return 0;	2495	return 0;
2342	}	2496	}
2343		2497
2344	/* If ob has a field named key, return the link from the list,	2498	shstr_tmp
2345	* otherwise return NULL.	2499	object::kv_get (shstr_tmp key) const
2346	*
2347	* key must be a passed in shared string - otherwise, this won't
2348	* do the desired thing.
2349	*/
2350	key_value *
2351	get_ob_key_link (const object *ob, const char *key)
2352	{	2500	{
2353	for (key_value *link = ob->key_values; link; link = link->next)	2501	for (key_value *kv = key_values; kv; kv = kv->next)
2354	if (link->key == key)	2502	if (kv->key == key)
2355	return link;
2356
2357	return 0;
2358	}
2359
2360	/*
2361	* Returns the value of op has an extra_field for key, or NULL.
2362	*
2363	* The argument doesn't need to be a shared string.
2364	*
2365	* The returned string is shared.
2366	*/
2367	const char *
2368	get_ob_key_value (const object *op, const char *const key)
2369	{
2370	key_value *link;
2371	shstr_cmp canonical_key (key);
2372
2373	if (!canonical_key)
2374	{
2375	/* 1. There being a field named key on any object
2376	* implies there'd be a shared string to find.
2377	* 2. Since there isn't, no object has this field.
2378	* 3. Therefore, *this* object doesn't have this field.
2379	*/
2380	return 0;
2381	}
2382
2383	/* This is copied from get_ob_key_link() above -
2384	* only 4 lines, and saves the function call overhead.
2385	*/
2386	for (link = op->key_values; link; link = link->next)
2387	if (link->key == canonical_key)
2388	return link->value;	2503	return kv->value;
2389		2504
2390	return 0;	2505	return shstr ();
2391	}	2506	}
2392		2507
2393	/*	2508	void
2394	* Updates the canonical_key in op to value.	2509	object::kv_set (shstr_tmp key, shstr_tmp value)
2395	*
2396	* canonical_key is a shared string (value doesn't have to be).
2397	*
2398	* Unless add_key is TRUE, it won't add fields, only change the value of existing
2399	* keys.
2400	*
2401	* Returns TRUE on success.
2402	*/
2403	int
2404	set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key)
2405	{	2510	{
2406	key_value *field = NULL, *last = NULL;	2511	for (key_value *kv = key_values; kv; kv = kv->next)
2407		2512	if (kv->key == key)
2408	for (field = op->key_values; field != NULL; field = field->next)
2409	{
2410	if (field->key != canonical_key)
2411	{	2513	{
2412	last = field;	2514	kv->value = value;
2413	continue;	2515	return;
2414	}	2516	}
2415		2517
2416	if (value)	2518	key_value *kv = new key_value;
2417	field->value = value;	2519
2418	else	2520	kv->next = key_values;
		2521	kv->key = key;
		2522	kv->value = value;
		2523
		2524	key_values = kv;
		2525	}
		2526
		2527	void
		2528	object::kv_del (shstr_tmp key)
		2529	{
		2530	for (key_value **kvp = &key_values; *kvp; kvp = &(*kvp)->next)
		2531	if ((*kvp)->key == key)
2419	{	2532	{
2420	/* Basically, if the archetype has this key set,	2533	key_value *kv = *kvp;
2421	* we need to store the null value so when we save	2534	*kvp = (*kvp)->next;
2422	* it, we save the empty value so that when we load,	2535	delete kv;
2423	* we get this value back again.	2536	return;
2424	*/
2425	if (get_ob_key_link (op->arch, canonical_key))
2426	field->value = 0;
2427	else
2428	{
2429	if (last)
2430	last->next = field->next;
2431	else
2432	op->key_values = field->next;
2433
2434	delete field;
2435	}
2436	}	2537	}
2437	return TRUE;
2438	}
2439	/* IF we get here, key doesn't exist */
2440
2441	/* No field, we'll have to add it. */
2442
2443	if (!add_key)
2444	return FALSE;
2445
2446	/* There isn't any good reason to store a null
2447	* value in the key/value list. If the archetype has
2448	* this key, then we should also have it, so shouldn't
2449	* be here. If user wants to store empty strings,
2450	* should pass in ""
2451	*/
2452	if (value == NULL)
2453	return TRUE;
2454
2455	field = new key_value;
2456
2457	field->key = canonical_key;
2458	field->value = value;
2459	/* Usual prepend-addition. */
2460	field->next = op->key_values;
2461	op->key_values = field;
2462
2463	return TRUE;
2464	}
2465
2466	/*
2467	* Updates the key in op to value.
2468	*
2469	* If add_key is FALSE, this will only update existing keys,
2470	* and not add new ones.
2471	* In general, should be little reason FALSE is ever passed in for add_key
2472	*
2473	* Returns TRUE on success.
2474	*/
2475	int
2476	set_ob_key_value (object *op, const char *key, const char *value, int add_key)
2477	{
2478	shstr key_ (key);
2479
2480	return set_ob_key_value_s (op, key_, value, add_key);
2481	}	2538	}
2482		2539
2483	object::depth_iterator::depth_iterator (object *container)	2540	object::depth_iterator::depth_iterator (object *container)
2484	: iterator_base (container)	2541	: iterator_base (container)
2485	{	2542	{
…		…
2535	{	2592	{
2536	char flagdesc[512];	2593	char flagdesc[512];
2537	char info2[256 * 4];	2594	char info2[256 * 4];
2538	char *p = info;	2595	char *p = info;
2539		2596
2540	p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s,flags:[%s],type:%d}",	2597	p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s%s,flags:[%s],type:%d}",
2541	count,	2598	count,
2542	uuid.c_str (),	2599	uuid.c_str (),
2543	&name,	2600	&name,
2544	title ? "\",title:\"" : "",	2601	title ? ",title:\"" : "",
2545	title ? (const char *)title : "",	2602	title ? (const char *)title : "",
		2603	title ? "\"" : "",
2546	flag_desc (flagdesc, 512), type);	2604	flag_desc (flagdesc, 512), type);
2547		2605
2548	if (!this->flag[FLAG_REMOVED] && env)	2606	if (!flag[FLAG_REMOVED] && env)
2549	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2607	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2550		2608
2551	if (map)	2609	if (map)
2552	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);	2610	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2553		2611
…		…
2568	{	2626	{
2569	return map ? map->region (x, y)	2627	return map ? map->region (x, y)
2570	: region::default_region ();	2628	: region::default_region ();
2571	}	2629	}
2572		2630
2573	const materialtype_t *
2574	object::dominant_material () const
2575	{
2576	if (materialtype_t *mt = name_to_material (materialname))
2577	return mt;
2578
2579	return name_to_material (shstr_unknown);
2580	}
2581
2582	void	2631	void
2583	object::open_container (object *new_container)	2632	object::open_container (object *new_container)
2584	{	2633	{
2585	if (container == new_container)	2634	if (container == new_container)
2586	return;	2635	return;
2587		2636
2588	if (object *old_container = container)	2637	object *old_container = container;
		2638
		2639	if (old_container)
2589	{	2640	{
2590	if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))	2641	if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
2591	return;	2642	return;
2592		2643
2593	#if 0	2644	#if 0
…		…
2595	if (object *closer = old_container->inv)	2646	if (object *closer = old_container->inv)
2596	if (closer->type == CLOSE_CON)	2647	if (closer->type == CLOSE_CON)
2597	closer->destroy ();	2648	closer->destroy ();
2598	#endif	2649	#endif
2599		2650
		2651	// make sure the container is available
		2652	esrv_send_item (this, old_container);
		2653
2600	old_container->flag [FLAG_APPLIED] = 0;	2654	old_container->flag [FLAG_APPLIED] = false;
2601	container = 0;	2655	container = 0;
2602		2656
		2657	// client needs item update to make it work, client bug requires this to be separate
2603	esrv_update_item (UPD_FLAGS, this, old_container);	2658	esrv_update_item (UPD_FLAGS, this, old_container);
		2659
2604	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));	2660	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", old_container->query_name ());
2605	play_sound (sound_find ("chest_close"));	2661	play_sound (sound_find ("chest_close"));
2606	}	2662	}
2607		2663
2608	if (new_container)	2664	if (new_container)
2609	{	2665	{
…		…
2613	// TODO: this does not seem to serve any purpose anymore?	2669	// TODO: this does not seem to serve any purpose anymore?
2614	#if 0	2670	#if 0
2615	// insert the "Close Container" object.	2671	// insert the "Close Container" object.
2616	if (archetype *closer = new_container->other_arch)	2672	if (archetype *closer = new_container->other_arch)
2617	{	2673	{
2618	object *closer = arch_to_object (new_container->other_arch);	2674	object *closer = new_container->other_arch->instance ();
2619	closer->flag [FLAG_NO_MAP_SAVE] = 1;	2675	closer->flag [FLAG_NO_MAP_SAVE] = 1;
2620	new_container->insert (closer);	2676	new_container->insert (closer);
2621	}	2677	}
2622	#endif	2678	#endif
2623		2679
2624	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));	2680	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", new_container->query_name ());
2625		2681
		2682	// make sure the container is available, client bug requires this to be separate
		2683	esrv_send_item (this, new_container);
		2684
2626	new_container->flag [FLAG_APPLIED] = 1;	2685	new_container->flag [FLAG_APPLIED] = true;
2627	container = new_container;	2686	container = new_container;
2628		2687
		2688	// client needs flag change
2629	esrv_update_item (UPD_FLAGS, this, new_container);	2689	esrv_update_item (UPD_FLAGS, this, new_container);
2630	esrv_send_inventory (this, new_container);	2690	esrv_send_inventory (this, new_container);
2631	play_sound (sound_find ("chest_open"));	2691	play_sound (sound_find ("chest_open"));
2632	}	2692	}
		2693	// else if (!old_container->env && contr && contr->ns)
		2694	// contr->ns->floorbox_reset ();
2633	}	2695	}
2634		2696
2635	object *	2697	object *
2636	object::force_find (const shstr name)	2698	object::force_find (shstr_tmp name)
2637	{	2699	{
2638	/* cycle through his inventory to look for the MARK we want to	2700	/* cycle through his inventory to look for the MARK we want to
2639	* place	2701	* place
2640	*/	2702	*/
2641	for (object *tmp = inv; tmp; tmp = tmp->below)	2703	for (object *tmp = inv; tmp; tmp = tmp->below)
…		…
2643	return splay (tmp);	2705	return splay (tmp);
2644		2706
2645	return 0;	2707	return 0;
2646	}	2708	}
2647		2709
		2710	//-GPL
		2711
2648	void	2712	void
		2713	object::force_set_timer (int duration)
		2714	{
		2715	this->duration = 1;
		2716	this->speed_left = -1.f;
		2717
		2718	this->set_speed (duration ? 1.f / duration : 0.f);
		2719	}
		2720
		2721	object *
2649	object::force_add (const shstr name, int duration)	2722	object::force_add (shstr_tmp name, int duration)
2650	{	2723	{
2651	if (object *force = force_find (name))	2724	if (object *force = force_find (name))
2652	force->destroy ();	2725	force->destroy ();
2653		2726
2654	object *force = get_archetype (FORCE_NAME);	2727	object *force = get_archetype (FORCE_NAME);
2655		2728
2656	force->slaying = name;	2729	force->slaying = name;
2657	force->stats.food = 1;	2730	force->force_set_timer (duration);
2658	force->speed_left = -1.f;
2659
2660	force->set_speed (duration ? 1.f / duration : 0.f);
2661	force->flag [FLAG_IS_USED_UP] = true;
2662	force->flag [FLAG_APPLIED] = true;	2731	force->flag [FLAG_APPLIED] = true;
2663		2732
2664	insert (force);	2733	return insert (force);
2665	}	2734	}
2666		2735
2667	void	2736	void
2668	object::play_sound (faceidx sound)	2737	object::play_sound (faceidx sound) const
2669	{	2738	{
2670	if (!sound)	2739	if (!sound)
2671	return;	2740	return;
2672		2741
2673	if (flag [FLAG_REMOVED])	2742	if (is_on_map ())
		2743	map->play_sound (sound, x, y);
		2744	else if (object *pl = in_player ())
		2745	pl->contr->play_sound (sound);
		2746	}
		2747
		2748	void
		2749	object::say_msg (const char *msg) const
		2750	{
		2751	if (is_on_map ())
		2752	map->say_msg (msg, x, y);
		2753	else if (object *pl = in_player ())
		2754	pl->contr->play_sound (sound);
		2755	}
		2756
		2757	void
		2758	object::make_noise ()
		2759	{
		2760	// we do not model noise in the map, so instead put
		2761	// a temporary light into the noise source
		2762	// could use the map instead, but that's less reliable for our
		2763	// goal, which is to make invisibility a bit harder to exploit
		2764
		2765	// currently only works sensibly for players
		2766	if (!is_player ())
2674	return;	2767	return;
2675		2768
2676	if (env)	2769	// find old force, or create new one
2677	{	2770	object *force = force_find (shstr_noise_force);
2678	if (object *pl = in_player ())	2771
2679	pl->contr->play_sound (sound);	2772	if (force)
2680	}	2773	force->speed_left = -1.f; // patch old speed up
2681	else	2774	else
2682	map->play_sound (sound, x, y);	2775	{
2683	}	2776	force = archetype::get (shstr_noise_force);
2684		2777
		2778	force->slaying = shstr_noise_force;
		2779	force->stats.food = 1;
		2780	force->speed_left = -1.f;
		2781
		2782	force->set_speed (1.f / 4.f);
		2783	force->flag [FLAG_IS_USED_UP] = true;
		2784	force->flag [FLAG_APPLIED] = true;
		2785
		2786	insert (force);
		2787	}
		2788	}
		2789
		2790	void object::change_move_type (MoveType mt)
		2791	{
		2792	if (move_type == mt)
		2793	return;
		2794
		2795	if (is_on_map ())
		2796	{
		2797	// we are on the map, so handle move_on/off effects
		2798	remove ();
		2799	move_type = mt;
		2800	map->insert (this, x, y, this);
		2801	}
		2802	else
		2803	move_type = mt;
		2804	}
		2805
		2806	/* object should be a player.
		2807	* we return the object the player has marked with the 'mark' command
		2808	* below. If no match is found (or object has changed), we return
		2809	* NULL. We leave it up to the calling function to print messages if
		2810	* nothing is found.
		2811	*/
		2812	object *
		2813	object::mark () const
		2814	{
		2815	if (contr && contr->mark && contr->mark->env == this)
		2816	return contr->mark;
		2817	else
		2818	return 0;
		2819	}
		2820

Diff Legend

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