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.345 by root, Sun May 1 16:58:15 2011 UTC

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

Diff Legend

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