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.218 by root, Wed Apr 23 07:25:54 2008 UTC vs.
Revision 1.353 by root, Fri Jan 27 22:00:39 2012 UTC

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

Diff Legend

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