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.226 by root, Sat May 3 08:50:30 2008 UTC vs.
Revision 1.338 by root, Fri Jul 2 16:24:24 2010 UTC

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

Diff Legend

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