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.221 by root, Thu Apr 24 12:06:01 2008 UTC vs.
Revision 1.337 by root, Thu May 6 21:45:49 2010 UTC

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

Diff Legend

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