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.223 by root, Wed Apr 30 08:29:31 2008 UTC vs.
Revision 1.311 by root, Sat Jan 16 13:41:37 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,2007 Mark Wedel & Crossfire Development Team
6	* Copyright (©) 1992,2007 Frank Tore Johansen	6	* Copyright (©) 1992,2007 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	//+GPL
40		43
41	short freearr_x[SIZEOFFREE] = {	44	short freearr_x[SIZEOFFREE] = {
42	0,	45	0,
43	0, 1, 1, 1, 0, -1, -1, -1,	46	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,	47	0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,
…		…
48	0,	51	0,
49	-1, -1, 0, 1, 1, 1, 0, -1,	52	-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,	53	-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	54	-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	};	55	};
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] = {	56	int freedir[SIZEOFFREE] = {
60	0,	57	0,
61	1, 2, 3, 4, 5, 6, 7, 8,	58	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,	59	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	60	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	};	61	};
65		62
		63	static int maxfree[SIZEOFFREE] = {
		64	0,
		65	9, 10, 13, 14, 17, 18, 21, 22,
		66	25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45, 48,
		67	49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49
		68	};
		69
66	static void	70	static void
67	write_uuid (uval64 skip, bool sync)	71	write_uuid (uval64 skip, bool sync)
68	{	72	{
69	CALL_BEGIN (2);	73	CALL_BEGIN (2);
70	CALL_ARG_SV (newSVval64 (skip));	74	CALL_ARG_SV (newSVval64 (skip));
…		…
72	CALL_CALL ("cf::write_uuid", G_DISCARD);	76	CALL_CALL ("cf::write_uuid", G_DISCARD);
73	CALL_END;	77	CALL_END;
74	}	78	}
75		79
76	static void	80	static void
77	read_uuid (void)	81	read_uuid ()
78	{	82	{
79	char filename[MAX_BUF];	83	char filename[MAX_BUF];
80		84
81	sprintf (filename, "%s/uuid", settings.localdir);	85	sprintf (filename, "%s/uuid", settings.localdir);
82		86
…		…
96		100
97	LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);	101	LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);
98	_exit (1);	102	_exit (1);
99	}	103	}
100		104
101	UUID::BUF buf;	105	char buf [UUID::MAX_LEN];
102	buf[0] = 0;	106	buf[0] = 0;
103	fgets (buf, sizeof (buf), fp);	107	fgets (buf, sizeof (buf), fp);
104		108
105	if (!UUID::cur.parse (buf))	109	if (!UUID::cur.parse (buf))
106	{	110	{
…		…
133		137
134	void	138	void
135	UUID::init ()	139	UUID::init ()
136	{	140	{
137	read_uuid ();	141	read_uuid ();
		142	}
		143
		144	bool
		145	UUID::parse (const char *s)
		146	{
		147	if (*s++ != '<' || *s++ != '1' || *s++ != '.')
		148	return false;
		149
		150	seq = 0;
		151
		152	while (*s != '>')
		153	{
		154	if (*s < '0')
		155	return false;
		156
		157	// this gives nice branchless code with gcc
		158	assert ('0' < 'a' && '0' == 48 && 'a' == 97);
		159	int digit = (*s + (*s & 0x40 ? 9 : 0)) & 15;
		160
		161	seq = (seq << 4) | digit;
		162
		163	++s;
		164	}
		165
		166	return true;
		167	}
		168
		169	char *
		170	UUID::append (char *buf) const
		171	{
		172	*buf++ = '<';
		173	*buf++ = '1';
		174	*buf++ = '.';
		175
		176	uint64_t seq = this->seq;
		177	const int bits = 64;
		178	char nz = 0;
		179	static const char tohex [] = "0123456789abcdef";
		180
		181	// assert (len >= 3 + bits / 4 + 1 + 1);
		182	for (int i = bits / 4; --i; )
		183	{
		184	uint8_t digit = seq >> (bits - 4);
		185
		186	*buf = tohex [digit];
		187	nz |= digit;
		188	buf += nz ? 1 : 0;
		189	seq <<= 4;
		190	}
		191
		192	// last digit is special - always emit
		193	uint8_t digit = seq >> (bits - 4);
		194	*buf++ = tohex [digit];
		195
		196	*buf++ = '>';
		197
		198	return buf;
		199	}
		200
		201	char *
		202	UUID::c_str () const
		203	{
		204	static char buf [MAX_LEN];
		205	*append (buf) = 0;
		206	return buf;
138	}	207	}
139		208
140	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */	209	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */
141	static bool	210	static bool
142	compare_ob_value_lists_one (const object *wants, const object *has)	211	compare_ob_value_lists_one (const object *wants, const object *has)
143	{	212	{
144	key_value *wants_field;
145
146	/* n-squared behaviour (see get_ob_key_link()), but I'm hoping both	213	/* 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	214	* objects with lists are rare, and lists stay short. If not, use a
148	* different structure or at least keep the lists sorted...	215	* different structure or at least keep the lists sorted...
149	*/	216	*/
150		217
151	/* For each field in wants, */	218	/* For each field in wants, */
152	for (wants_field = wants->key_values; wants_field; wants_field = wants_field->next)	219	for (key_value *kv = wants->key_values; kv; kv = kv->next)
153	{	220	if (has->kv_get (kv->key) != kv->value)
154	key_value *has_field;	221	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		222
169	/* If we get here, every field in wants has a matching field in has. */	223	/* If we get here, every field in wants has a matching field in has. */
170	return 1;	224	return true;
171	}	225	}
172		226
173	/* Returns TRUE if ob1 has the same key_values as ob2. */	227	/* Returns TRUE if ob1 has the same key_values as ob2. */
174	static bool	228	static bool
175	compare_ob_value_lists (const object *ob1, const object *ob2)	229	compare_ob_value_lists (const object *ob1, const object *ob2)
176	{	230	{
177	/* However, there may be fields in has which aren't partnered in wants,	231	/* However, there may be fields in has which aren't partnered in wants,
178	* so we need to run the comparison *twice*. :(	232	* so we need to run the comparison *twice*. :(
179	*/	233	*/
180	return compare_ob_value_lists_one (ob1, ob2) && compare_ob_value_lists_one (ob2, ob1);	234	return compare_ob_value_lists_one (ob1, ob2)
		235	&& compare_ob_value_lists_one (ob2, ob1);
181	}	236	}
182		237
183	/* Function examines the 2 objects given to it, and returns true if	238	/* Function examines the 2 objects given to it, and returns true if
184	* they can be merged together.	239	* they can be merged together.
185	*	240	*
…		…
192	* Improvements made with merge: Better checking on potion, and also	247	* Improvements made with merge: Better checking on potion, and also
193	* check weight	248	* check weight
194	*/	249	*/
195	bool object::can_merge_slow (object *ob1, object *ob2)	250	bool object::can_merge_slow (object *ob1, object *ob2)
196	{	251	{
197	/* A couple quicksanity checks */	252	/* A couple quick sanity checks */
198	if (ob1 == ob2	253	if (ob1 == ob2
199	|| ob1->type != ob2->type	254	|| ob1->type != ob2->type
200	|| ob1->speed != ob2->speed
201	|| ob1->value != ob2->value	255	|| ob1->value != ob2->value
202	|| ob1->name != ob2->name)	256	|| ob1->name != ob2->name
		257	|| fabs (ob1->speed - ob2->speed) >= MIN_ACTIVE_SPEED)
203	return 0;	258	return 0;
204		259
205	/* Do not merge objects if nrof would overflow. First part checks	260	/* Do not merge objects if nrof would overflow, assume nrof
206	* for unsigned overflow (2c), second part checks whether the result	261	* is always 0 .. 2**31-1 */
207	* would fit into a 32 bit signed int, which is often used to hold	262	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;	263	return 0;
212		264
213	/* If the objects have been identified, set the BEEN_APPLIED flag.	265	/* 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	266	* 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	267	* just can't ignore the been applied or identified flags, as they
…		…
220	SET_FLAG (ob1, FLAG_BEEN_APPLIED);	272	SET_FLAG (ob1, FLAG_BEEN_APPLIED);
221		273
222	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))	274	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))
223	SET_FLAG (ob2, FLAG_BEEN_APPLIED);	275	SET_FLAG (ob2, FLAG_BEEN_APPLIED);
224		276
225	if (ob1->arch->name != ob2->arch->name	277	if (ob1->arch->archname != ob2->arch->archname
226	|| ob1->name != ob2->name	278	|| ob1->name != ob2->name
227	|| ob1->title != ob2->title	279	|| ob1->title != ob2->title
228	|| ob1->msg != ob2->msg	280	|| ob1->msg != ob2->msg
229	|| ob1->weight != ob2->weight	281	|| ob1->weight != ob2->weight
230	|| ob1->attacktype != ob2->attacktype	282	|| ob1->attacktype != ob2->attacktype
231	|| ob1->magic != ob2->magic	283	|| ob1->magic != ob2->magic
232	|| ob1->slaying != ob2->slaying	284	|| ob1->slaying != ob2->slaying
233	|| ob1->skill != ob2->skill	285	|| ob1->skill != ob2->skill
234	|| ob1->value != ob2->value	286	|| ob1->value != ob2->value
235	|| ob1->animation_id != ob2->animation_id	287	|| ob1->animation_id != ob2->animation_id
		288	|| (ob1->face != ob2->face && !ob1->animation_id) // face and animation are dependend on each other
236	|| ob1->client_type != ob2->client_type	289	|| ob1->client_type != ob2->client_type
237	|| ob1->materialname != ob2->materialname	290	|| ob1->material != ob2->material
238	|| ob1->lore != ob2->lore	291	|| ob1->lore != ob2->lore
239	|| ob1->subtype != ob2->subtype	292	|| ob1->subtype != ob2->subtype
240	|| ob1->move_type != ob2->move_type	293	|| ob1->move_type != ob2->move_type
241	|| ob1->move_block != ob2->move_block	294	|| ob1->move_block != ob2->move_block
242	|| ob1->move_allow != ob2->move_allow	295	|| ob1->move_allow != ob2->move_allow
243	|| ob1->move_on != ob2->move_on	296	|| ob1->move_on != ob2->move_on
244	|| ob1->move_off != ob2->move_off	297	|| ob1->move_off != ob2->move_off
245	|| ob1->move_slow != ob2->move_slow	298	|| ob1->move_slow != ob2->move_slow
246	|| ob1->move_slow_penalty != ob2->move_slow_penalty	299	|| fabs (ob1->move_slow_penalty - ob2->move_slow_penalty) >= (1.f / 1024.f)
247	|| memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))	300	|| memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
248	|| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats)))	301	|| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats)))
249	return 0;	302	return 0;
250		303
251	if ((ob1->flag ^ ob2->flag)	304	if ((ob1->flag ^ ob2->flag)
252	.reset (FLAG_INV_LOCKED)	305	.reset (FLAG_INV_LOCKED)
253	.reset (FLAG_CLIENT_SENT)
254	.reset (FLAG_REMOVED)	306	.reset (FLAG_REMOVED)
255	.any ())	307	.any ())
256	return 0;	308	return 0;
257		309
258	/* This is really a spellbook check - we should in general	310	/* This is really a spellbook check - we should in general
…		…
340	{	392	{
341	// see if we are in a container of sorts	393	// see if we are in a container of sorts
342	if (env)	394	if (env)
343	{	395	{
344	// the player inventory itself is always visible	396	// the player inventory itself is always visible
345	if (env->type == PLAYER)	397	if (env->is_player ())
346	return env;	398	return env;
347		399
348	// else a player could have our env open	400	// else a player could have our env open
349	object *envest = env->outer_env ();	401	object *envest = env->outer_env_or_self ();
350		402
351	// the player itself is always on a map, so we will find him here	403	// the player itself is always on a map, so we will find him here
352	// even if our inv is in a player.	404	// even if our inv is in a player.
353	if (envest->is_on_map ())	405	if (envest->is_on_map ())
354	if (object *pl = envest->ms ().player ())	406	if (object *pl = envest->ms ().player ())
355	if (pl->container == env)	407	if (pl->container_ () == env)
356	return pl;	408	return pl;
357	}	409	}
358	else	410	else
359	{	411	{
360	// maybe there is a player standing on the same mapspace	412	// maybe there is a player standing on the same mapspace
361	// this will catch the case where "this" is a player	413	// this will catch the case where "this" is a player
362	if (object *pl = ms ().player ())	414	if (object *pl = ms ().player ())
363	if (!pl->container || this == pl->container)	415	if ((pl->contr->ns && !pl->container_ () && !pl->contr->ns->update_look)
		416	|| pl->container_ () == this)
364	return pl;	417	return pl;
365	}	418	}
366	}	419	}
367		420
368	return 0;	421	return 0;
369	}	422	}
370		423
371	// adjust weight per container type ("of holding")	424	// adjust weight per container type ("of holding")
372	static sint32	425	static sint32
373	weight_adjust (object *op, sint32 weight)	426	weight_adjust_for (object *op, sint32 weight)
374	{	427	{
375	return op->type == CONTAINER	428	return op->type == CONTAINER
376	? lerp (weight, 0, 100, 0, 100 - op->stats.Str)	429	? lerp (weight, 0, 100, 0, 100 - op->stats.Str)
377	: weight;	430	: weight;
378	}	431	}
…		…
384	static void	437	static void
385	adjust_weight (object *op, sint32 weight)	438	adjust_weight (object *op, sint32 weight)
386	{	439	{
387	while (op)	440	while (op)
388	{	441	{
		442	// adjust by actual difference to account for rounding errors
		443	// i.e. (w2 - w1) / f != w2 / f - w1 / f and the latter is correct
389	weight = weight_adjust (op, weight);	444	weight = weight_adjust_for (op, op->carrying)
		445	- weight_adjust_for (op, op->carrying - weight);
390		446
391	if (!weight)	447	if (!weight)
392	return;	448	return;
393		449
394	op->carrying += weight;	450	op->carrying += weight;
…		…
417	op->update_weight ();	473	op->update_weight ();
418		474
419	sum += op->total_weight ();	475	sum += op->total_weight ();
420	}	476	}
421		477
422	sum = weight_adjust (this, sum);	478	sum = weight_adjust_for (this, sum);
423		479
424	if (sum != carrying)	480	if (sum != carrying)
425	{	481	{
426	carrying = sum;	482	carrying = sum;
427		483
…		…
443	object_freezer freezer;	499	object_freezer freezer;
444	op->write (freezer);	500	op->write (freezer);
445	return freezer.as_string ();	501	return freezer.as_string ();
446	}	502	}
447		503
448	/*	504	char *
449	* get_nearest_part(multi-object, object 2) returns the part of the	505	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	{	506	{
456	object *tmp, *closest;	507	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	}	508	}
470		509
471	/*	510	/*
472	* Returns the object which has the count-variable equal to the argument.	511	* Returns the object which has the count-variable equal to the argument.
473	* VERRRY slow.	512	* VERRRY slow.
…		…
489	*/	528	*/
490	object *	529	object *
491	find_object_name (const char *str)	530	find_object_name (const char *str)
492	{	531	{
493	shstr_cmp str_ (str);	532	shstr_cmp str_ (str);
494	object *op;
495		533
		534	if (str_)
496	for_all_objects (op)	535	for_all_objects (op)
497	if (op->name == str_)	536	if (op->name == str_)
498	break;	537	return op;
499		538
500	return op;	539	return 0;
501	}	540	}
502		541
503	/*	542	/*
504	* Sets the owner and sets the skill and exp pointers to owner's current	543	* Sets the owner and sets the skill and exp pointers to owner's current
505	* skill and experience objects.	544	* skill and experience objects.
…		…
567	update_stats ();	606	update_stats ();
568		607
569	new_draw_info_format (NDI_UNIQUE, 0, this,	608	new_draw_info_format (NDI_UNIQUE, 0, this,
570	"You try to balance all your items at once, "	609	"You try to balance all your items at once, "
571	"but the %s is just too much for your body. "	610	"but the %s is just too much for your body. "
572	"[You need to unapply some items first.]", &ob->name);	611	"[You need to unapply some items first - use the 'body' command to see "
		612	"how many items you cna wera on a specific body part.]", &ob->name);
573	return false;	613	return false;
574	}	614	}
575		615
576	//new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);	616	//new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);
577	}	617	}
…		…
603	}	643	}
604		644
605	op->key_values = 0;	645	op->key_values = 0;
606	}	646	}
607		647
608	object &	648	/*
609	object::operator =(const object &src)	649	* copy_to first frees everything allocated by the dst object,
		650	* and then copies the contents of itself into the second
		651	* object, allocating what needs to be allocated. Basically, any
		652	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
		653	* if the first object is freed, the pointers in the new object
		654	* will point at garbage.
		655	*/
		656	void
		657	object::copy_to (object *dst)
610	{	658	{
611	bool is_freed = flag [FLAG_FREED];	659	dst->remove ();
612	bool is_removed = flag [FLAG_REMOVED];
613
614	*(object_copy *)this = src;	660	*(object_copy *)dst = *this;
615
616	flag [FLAG_FREED] = is_freed;
617	flag [FLAG_REMOVED] = is_removed;	661	dst->flag [FLAG_REMOVED] = true;
618		662
619	/* Copy over key_values, if any. */	663	/* Copy over key_values, if any. */
620	if (src.key_values)	664	if (key_values)
621	{	665	{
622	key_value *tail = 0;	666	key_value *tail = 0;
623	key_values = 0;	667	dst->key_values = 0;
624		668
625	for (key_value *i = src.key_values; i; i = i->next)	669	for (key_value *i = key_values; i; i = i->next)
626	{	670	{
627	key_value *new_link = new key_value;	671	key_value *new_link = new key_value;
628		672
629	new_link->next = 0;	673	new_link->next = 0;
630	new_link->key = i->key;	674	new_link->key = i->key;
631	new_link->value = i->value;	675	new_link->value = i->value;
632		676
633	/* Try and be clever here, too. */	677	/* Try and be clever here, too. */
634	if (!key_values)	678	if (!dst->key_values)
635	{	679	{
636	key_values = new_link;	680	dst->key_values = new_link;
637	tail = new_link;	681	tail = new_link;
638	}	682	}
639	else	683	else
640	{	684	{
641	tail->next = new_link;	685	tail->next = new_link;
642	tail = new_link;	686	tail = new_link;
643	}	687	}
644	}	688	}
645	}	689	}
646	}
647		690
648	/*	691	dst->activate ();
649	* copy_to first frees everything allocated by the dst object,
650	* and then copies the contents of itself into the second
651	* object, allocating what needs to be allocated. Basically, any
652	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
653	* if the first object is freed, the pointers in the new object
654	* will point at garbage.
655	*/
656	void
657	object::copy_to (object *dst)
658	{
659	*dst = *this;
660
661	if (speed < 0)
662	dst->speed_left -= rndm ();
663
664	dst->set_speed (dst->speed);
665	}	692	}
666		693
667	void	694	void
668	object::instantiate ()	695	object::instantiate ()
669	{	696	{
670	if (!uuid.seq) // HACK	697	if (!uuid.seq) // HACK
671	uuid = UUID::gen ();	698	uuid = UUID::gen ();
672		699
		700	// TODO: unclean state changes, should nt be done in copy_to AND instantiate
		701	if (flag [FLAG_RANDOM_SPEED] && speed)
		702	speed_left = - speed - rndm (); // TODO animation
		703	else
673	speed_left = -0.1f;	704	speed_left = -1.;
		705
674	/* copy the body_info to the body_used - this is only really	706	/* copy the body_info to the body_used - this is only really
675	* need for monsters, but doesn't hurt to do it for everything.	707	* need for monsters, but doesn't hurt to do it for everything.
676	* by doing so, when a monster is created, it has good starting	708	* by doing so, when a monster is created, it has good starting
677	* values for the body_used info, so when items are created	709	* values for the body_used info, so when items are created
678	* for it, they can be properly equipped.	710	* for it, they can be properly equipped.
…		…
686	object *	718	object *
687	object::clone ()	719	object::clone ()
688	{	720	{
689	object *neu = create ();	721	object *neu = create ();
690	copy_to (neu);	722	copy_to (neu);
		723
		724	// TODO: unclean state changes, should not be done in clone AND instantiate
		725	if (neu->flag [FLAG_RANDOM_SPEED] && neu->speed)
		726	neu->speed_left = - neu->speed - rndm (); // TODO animation
		727
		728	neu->map = map; // not copied by copy_to
691	return neu;	729	return neu;
692	}	730	}
693		731
694	/*	732	/*
695	* If an object with the IS_TURNABLE() flag needs to be turned due	733	* If an object with the IS_TURNABLE() flag needs to be turned due
…		…
712	* This function needs to be called whenever the speed of an object changes.	750	* This function needs to be called whenever the speed of an object changes.
713	*/	751	*/
714	void	752	void
715	object::set_speed (float speed)	753	object::set_speed (float speed)
716	{	754	{
717	if (flag [FLAG_FREED] && speed)
718	{
719	LOG (llevError, "Object %s is freed but has speed.\n", &name);
720	speed = 0;
721	}
722
723	this->speed = speed;	755	this->speed = speed;
724		756
725	if (has_active_speed ())	757	if (has_active_speed ())
726	activate ();	758	activate ();
727	else	759	else
…		…
777		809
778	if (!(m.flags_ & P_UPTODATE))	810	if (!(m.flags_ & P_UPTODATE))
779	/* nop */;	811	/* nop */;
780	else if (action == UP_OBJ_INSERT)	812	else if (action == UP_OBJ_INSERT)
781	{	813	{
		814	#if 0
782	// this is likely overkill, TODO: revisit (schmorp)	815	// this is likely overkill, TODO: revisit (schmorp)
783	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))	816	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
784	|| (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))	817	|| (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))
785	|| (op->type == PLAYER && !(m.flags_ & P_PLAYER))	818	|| (op->is_player () && !(m.flags_ & P_PLAYER))
786	|| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))	819	|| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
787	|| (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))	820	|| (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))
788	|| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))	821	|| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))
789	|| (m.move_on | op->move_on ) != m.move_on	822	|| (m.move_on | op->move_on ) != m.move_on
790	|| (m.move_off | op->move_off ) != m.move_off	823	|| (m.move_off | op->move_off ) != m.move_off
791	|| (m.move_slow | op->move_slow) != m.move_slow	824	|| (m.move_slow | op->move_slow) != m.move_slow
792	/* This isn't perfect, but I don't expect a lot of objects to	825	/* This isn't perfect, but I don't expect a lot of objects to
793	* to have move_allow right now.	826	* have move_allow right now.
794	*/	827	*/
795	|| ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block	828	|| ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block
		829	m.invalidate ();
		830	#else
796	|| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)	831	// the above is not strong enough a test to skip updating. los maybe? TODO (schmorp)
797	m.flags_ = 0;	832	m.invalidate ();
		833	#endif
798	}	834	}
799	/* if the object is being removed, we can't make intelligent	835	/* if the object is being removed, we can't make intelligent
800	* decisions, because remove_ob can't really pass the object	836	* decisions, because remove_ob can't really pass the object
801	* that is being removed.	837	* that is being removed.
802	*/	838	*/
803	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)	839	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
804	m.flags_ = 0;	840	m.invalidate ();
805	else if (action == UP_OBJ_FACE)	841	else if (action == UP_OBJ_FACE)
806	/* Nothing to do for that case */ ;	842	/* Nothing to do for that case */ ;
807	else	843	else
808	LOG (llevError, "update_object called with invalid action: %d\n", action);	844	LOG (llevError, "update_object called with invalid action: %d\n", action);
809		845
…		…
813		849
814	object::object ()	850	object::object ()
815	{	851	{
816	SET_FLAG (this, FLAG_REMOVED);	852	SET_FLAG (this, FLAG_REMOVED);
817		853
818	expmul = 1.0;	854	//expmul = 1.0; declared const for the time being
819	face = blank_face;	855	face = blank_face;
		856	material = MATERIAL_NULL;
820	}	857	}
821		858
822	object::~object ()	859	object::~object ()
823	{	860	{
824	unlink ();	861	unlink ();
…		…
853	/* If already on active list, don't do anything */	890	/* If already on active list, don't do anything */
854	if (active)	891	if (active)
855	return;	892	return;
856		893
857	if (has_active_speed ())	894	if (has_active_speed ())
		895	{
		896	if (flag [FLAG_FREED])
		897	LOG (llevError | logBacktrace, "BUG: tried to activate freed object %s\n", debug_desc ());//D
		898
858	actives.insert (this);	899	actives.insert (this);
		900	}
859	}	901	}
860		902
861	void	903	void
862	object::activate_recursive ()	904	object::activate_recursive ()
863	{	905	{
…		…
924	* drop on that space.	966	* drop on that space.
925	*/	967	*/
926	if (!drop_to_ground	968	if (!drop_to_ground
927	|| !map	969	|| !map
928	|| map->in_memory != MAP_ACTIVE	970	|| map->in_memory != MAP_ACTIVE
929	|| map->nodrop	971	|| map->no_drop
930	|| ms ().move_block == MOVE_ALL)	972	|| ms ().move_block == MOVE_ALL)
931	{	973	{
932	while (inv)	974	while (inv)
933	{
934	inv->destroy_inv (false);
935	inv->destroy ();	975	inv->destroy ();
936	}
937	}	976	}
938	else	977	else
939	{ /* Put objects in inventory onto this space */	978	{ /* Put objects in inventory onto this space */
940	while (inv)	979	while (inv)
941	{	980	{
…		…
945	|| op->flag [FLAG_NO_DROP]	984	|| op->flag [FLAG_NO_DROP]
946	|| op->type == RUNE	985	|| op->type == RUNE
947	|| op->type == TRAP	986	|| op->type == TRAP
948	|| op->flag [FLAG_IS_A_TEMPLATE]	987	|| op->flag [FLAG_IS_A_TEMPLATE]
949	|| op->flag [FLAG_DESTROY_ON_DEATH])	988	|| op->flag [FLAG_DESTROY_ON_DEATH])
950	op->destroy (true);	989	op->destroy ();
951	else	990	else
952	map->insert (op, x, y);	991	map->insert (op, x, y);
953	}	992	}
954	}	993	}
955	}	994	}
…		…
963		1002
964	static struct freed_map : maptile	1003	static struct freed_map : maptile
965	{	1004	{
966	freed_map ()	1005	freed_map ()
967	{	1006	{
968	path = "<freed objects map>";	1007	path = "<freed objects map>";
969	name = "/internal/freed_objects_map";	1008	name = "/internal/freed_objects_map";
970	width = 3;	1009	width = 3;
971	height = 3;	1010	height = 3;
972	nodrop = 1;	1011	no_drop = 1;
		1012	no_reset = 1;
973		1013
974	alloc ();	1014	alloc ();
975	in_memory = MAP_ACTIVE;	1015	in_memory = MAP_ACTIVE;
976	}	1016	}
		1017
		1018	~freed_map ()
		1019	{
		1020	destroy ();
		1021	}
977	} freed_map; // freed objects are moved here to avoid crashes	1022	} freed_map; // freed objects are moved here to avoid crashes
978		1023
979	void	1024	void
980	object::do_destroy ()	1025	object::do_destroy ()
981	{	1026	{
982	if (flag [FLAG_IS_LINKED])	1027	if (flag [FLAG_IS_LINKED])
983	remove_button_link (this);	1028	remove_link ();
984		1029
985	if (flag [FLAG_FRIENDLY])	1030	if (flag [FLAG_FRIENDLY])
986	remove_friendly_object (this);	1031	remove_friendly_object (this);
987		1032
988	remove ();	1033	remove ();
…		…
1013	attacked_by = 0;	1058	attacked_by = 0;
1014	current_weapon = 0;	1059	current_weapon = 0;
1015	}	1060	}
1016		1061
1017	void	1062	void
1018	object::destroy (bool destroy_inventory)	1063	object::destroy ()
1019	{	1064	{
1020	if (destroyed ())	1065	if (destroyed ())
1021	return;	1066	return;
1022		1067
1023	if (!is_head () && !head->destroyed ())	1068	if (!is_head () && !head->destroyed ())
1024	{	1069	{
1025	LOG (llevError | logBacktrace, "tried to destroy the tail of an object");	1070	LOG (llevError | logBacktrace, "tried to destroy the tail of an object");
1026	head->destroy (destroy_inventory);	1071	head->destroy ();
1027	return;	1072	return;
1028	}	1073	}
1029		1074
1030	destroy_inv (!destroy_inventory);	1075	destroy_inv (false);
1031		1076
1032	if (is_head ())	1077	if (is_head ())
1033	if (sound_destroy)	1078	if (sound_destroy)
1034	play_sound (sound_destroy);	1079	play_sound (sound_destroy);
1035	else if (flag [FLAG_MONSTER])	1080	else if (flag [FLAG_MONSTER])
…		…
1046	* the previous environment.	1091	* the previous environment.
1047	*/	1092	*/
1048	void	1093	void
1049	object::do_remove ()	1094	object::do_remove ()
1050	{	1095	{
1051	object *tmp, *last = 0;
1052	object *otmp;
1053
1054	if (flag [FLAG_REMOVED])	1096	if (flag [FLAG_REMOVED])
1055	return;	1097	return;
1056		1098
1057	INVOKE_OBJECT (REMOVE, this);	1099	INVOKE_OBJECT (REMOVE, this);
1058		1100
…		…
1072	esrv_del_item (pl->contr, count);	1114	esrv_del_item (pl->contr, count);
1073	flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed	1115	flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed
1074		1116
1075	adjust_weight (env, -total_weight ());	1117	adjust_weight (env, -total_weight ());
1076		1118
1077	*(above ? &above->below : &env->inv) = below;	1119	object *pl = in_player ();
1078
1079	if (below)
1080	below->above = above;
1081		1120
1082	/* we set up values so that it could be inserted into	1121	/* we set up values so that it could be inserted into
1083	* the map, but we don't actually do that - it is up	1122	* the map, but we don't actually do that - it is up
1084	* to the caller to decide what we want to do.	1123	* to the caller to decide what we want to do.
1085	*/	1124	*/
1086	map = env->map;	1125	map = env->map;
1087	x = env->x;	1126	x = env->x;
1088	y = env->y;	1127	y = env->y;
		1128
		1129	// make sure cmov optimisation is applicable
		1130	*(above ? &above->below : &env->inv) = below;
		1131	*(below ? &below->above : &above ) = above; // &above is just a dummy
		1132
1089	above = 0;	1133	above = 0;
1090	below = 0;	1134	below = 0;
1091	env = 0;	1135	env = 0;
1092		1136
1093	/* NO_FIX_PLAYER is set when a great many changes are being	1137	if (pl && pl->is_player ())
1094	* made to players inventory. If set, avoiding the call
1095	* to save cpu time.
1096	*/	1138	{
1097	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1139	pl->contr->queue_stats_update ();
1098	otmp->update_stats ();	1140
		1141	if (glow_radius && pl->is_on_map ())
		1142	update_all_los (pl->map, pl->x, pl->y);
		1143	}
1099	}	1144	}
1100	else if (map)	1145	else if (map)
1101	{	1146	{
1102	map->dirty = true;	1147	map->dirty = true;
1103	mapspace &ms = this->ms ();	1148	mapspace &ms = this->ms ();
1104		1149
1105	if (object *pl = ms.player ())	1150	if (object *pl = ms.player ())
1106	{	1151	{
1107	if (type == PLAYER) // this == pl(!)	1152	if (is_player ())
1108	{	1153	{
		1154	if (!flag [FLAG_WIZPASS])
		1155	ms.smell = ++mapspace::smellcount; // remember the smell of the player
		1156
1109	// leaving a spot always closes any open container on the ground	1157	// leaving a spot always closes any open container on the ground
1110	if (container && !container->env)	1158	if (container && !container->env)
1111	// this causes spurious floorbox updates, but it ensures	1159	// this causes spurious floorbox updates, but it ensures
1112	// that the CLOSE event is being sent.	1160	// that the CLOSE event is being sent.
1113	close_container ();	1161	close_container ();
1114		1162
1115	--map->players;	1163	--map->players;
1116	map->touch ();	1164	map->touch ();
1117	}	1165	}
1118	else if (pl->container == this)	1166	else if (pl->container_ () == this)
1119	{	1167	{
1120	// removing a container should close it	1168	// removing a container should close it
1121	close_container ();	1169	close_container ();
1122	}	1170	}
1123		1171
1124	esrv_del_item (pl->contr, count);	1172	esrv_del_item (pl->contr, count);
1125	}	1173	}
1126		1174
1127	/* link the object above us */	1175	/* link the object above us */
1128	if (above)	1176	// re-link, make sure compiler can easily use cmove
1129	above->below = below;	1177	*(above ? &above->below : &ms.top) = below;
1130	else	1178	*(below ? &below->above : &ms.bot) = above;
1131	ms.top = below; /* we were top, set new top */
1132
1133	/* Relink the object below us, if there is one */
1134	if (below)
1135	below->above = above;
1136	else
1137	{
1138	/* Nothing below, which means we need to relink map object for this space
1139	* use translated coordinates in case some oddness with map tiling is
1140	* evident
1141	*/
1142	if (GET_MAP_OB (map, x, y) != this)
1143	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 ());
1144
1145	ms.bot = above; /* goes on above it. */
1146	}
1147		1179
1148	above = 0;	1180	above = 0;
1149	below = 0;	1181	below = 0;
1150		1182
		1183	ms.invalidate ();
		1184
1151	if (map->in_memory == MAP_SAVING)	1185	if (map->in_memory == MAP_SAVING)
1152	return;	1186	return;
1153		1187
1154	int check_walk_off = !flag [FLAG_NO_APPLY];	1188	int check_walk_off = !flag [FLAG_NO_APPLY];
1155		1189
1156	if (object *pl = ms.player ())	1190	if (object *pl = ms.player ())
1157	{	1191	{
1158	if (pl->container == this)	1192	if (pl->container_ () == this)
1159	/* If a container that the player is currently using somehow gets	1193	/* If a container that the player is currently using somehow gets
1160	* removed (most likely destroyed), update the player view	1194	* removed (most likely destroyed), update the player view
1161	* appropriately.	1195	* appropriately.
1162	*/	1196	*/
1163	pl->close_container ();	1197	pl->close_container ();
1164		1198
1165	//TODO: the floorbox prev/next might need updating	1199	//TODO: the floorbox prev/next might need updating
1166	esrv_del_item (pl->contr, count);	1200	//esrv_del_item (pl->contr, count);
		1201	//TODO: update floorbox to preserve ordering
		1202	if (pl->contr->ns)
		1203	pl->contr->ns->floorbox_update ();
1167	}	1204	}
1168		1205
		1206	if (check_walk_off)
1169	for (tmp = ms.bot; tmp; tmp = tmp->above)	1207	for (object *above, *tmp = ms.bot; tmp; tmp = above)
1170	{	1208	{
		1209	above = tmp->above;
		1210
1171	/* No point updating the players look faces if he is the object	1211	/* No point updating the players look faces if he is the object
1172	* being removed.	1212	* being removed.
1173	*/	1213	*/
1174		1214
1175	/* See if object moving off should effect something */	1215	/* See if object moving off should effect something */
1176	if (check_walk_off
1177	&& ((move_type & tmp->move_off)	1216	if ((move_type & tmp->move_off)
1178	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))	1217	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0)
1179	{
1180	move_apply (tmp, this, 0);	1218	move_apply (tmp, this, 0);
1181
1182	if (destroyed ())
1183	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1184	}	1219	}
1185		1220
1186	last = tmp;	1221	if (affects_los ())
1187	}
1188
1189	/* last == NULL if there are no objects on this space */
1190	//TODO: this makes little sense, why only update the topmost object?
1191	if (!last)
1192	map->at (x, y).flags_ = 0;
1193	else
1194	update_object (last, UP_OBJ_REMOVE);
1195
1196	if (flag [FLAG_BLOCKSVIEW] || glow_radius)
1197	update_all_los (map, x, y);	1222	update_all_los (map, x, y);
1198	}	1223	}
1199	}	1224	}
1200		1225
1201	/*	1226	/*
…		…
1225	esrv_update_item (UPD_NROF, pl, top);	1250	esrv_update_item (UPD_NROF, pl, top);
1226		1251
1227	op->weight = 0; // cancel the addition above	1252	op->weight = 0; // cancel the addition above
1228	op->carrying = 0; // must be 0 already	1253	op->carrying = 0; // must be 0 already
1229		1254
1230	op->destroy (1);	1255	op->destroy ();
1231		1256
1232	return top;	1257	return top;
1233	}	1258	}
1234		1259
1235	return 0;	1260	return 0;
…		…
1243		1268
1244	object *prev = this;	1269	object *prev = this;
1245		1270
1246	for (archetype *at = (archetype *)arch->more; at; at = (archetype *)at->more)	1271	for (archetype *at = (archetype *)arch->more; at; at = (archetype *)at->more)
1247	{	1272	{
1248	object *op = arch_to_object (at);	1273	object *op = at->instance ();
1249		1274
1250	op->name = name;	1275	op->name = name;
1251	op->name_pl = name_pl;	1276	op->name_pl = name_pl;
1252	op->title = title;	1277	op->title = title;
1253		1278
…		…
1263	* job preparing multi-part monsters.	1288	* job preparing multi-part monsters.
1264	*/	1289	*/
1265	object *	1290	object *
1266	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)	1291	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1267	{	1292	{
		1293	op->remove ();
		1294
1268	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)	1295	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1269	{	1296	{
1270	tmp->x = x + tmp->arch->x;	1297	tmp->x = x + tmp->arch->x;
1271	tmp->y = y + tmp->arch->y;	1298	tmp->y = y + tmp->arch->y;
1272	}	1299	}
…		…
1295	* just 'op' otherwise	1322	* just 'op' otherwise
1296	*/	1323	*/
1297	object *	1324	object *
1298	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)	1325	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1299	{	1326	{
1300	assert (!op->flag [FLAG_FREED]);
1301
1302	op->remove ();	1327	op->remove ();
		1328
		1329	if (m == &freed_map)//D TODO: remove soon
		1330	{//D
		1331	LOG (llevError | logBacktrace, "tries to insret object on freed objects map: %s", op->debug_desc ());//D
		1332	}//D
1303		1333
1304	/* Ideally, the caller figures this out. However, it complicates a lot	1334	/* Ideally, the caller figures this out. However, it complicates a lot
1305	* of areas of callers (eg, anything that uses find_free_spot would now	1335	* of areas of callers (eg, anything that uses find_free_spot would now
1306	* need extra work	1336	* need extra work
1307	*/	1337	*/
		1338	maptile *newmap = m;
1308	if (!xy_normalise (m, op->x, op->y))	1339	if (!xy_normalise (newmap, op->x, op->y))
1309	{	1340	{
1310	op->destroy (1);	1341	op->head_ ()->destroy ();// remove head_ once all tail object destroyers found
1311	return 0;	1342	return 0;
1312	}	1343	}
1313		1344
1314	if (object *more = op->more)	1345	if (object *more = op->more)
1315	if (!insert_ob_in_map (more, m, originator, flag))	1346	if (!insert_ob_in_map (more, m, originator, flag))
1316	return 0;	1347	return 0;
1317		1348
1318	CLEAR_FLAG (op, FLAG_REMOVED);	1349	op->flag [FLAG_REMOVED] = false;
1319		1350	op->env = 0;
1320	op->map = m;	1351	op->map = newmap;
		1352
1321	mapspace &ms = op->ms ();	1353	mapspace &ms = op->ms ();
1322		1354
1323	/* this has to be done after we translate the coordinates.	1355	/* this has to be done after we translate the coordinates.
1324	*/	1356	*/
1325	if (op->nrof && !(flag & INS_NO_MERGE))	1357	if (op->nrof && !(flag & INS_NO_MERGE))
1326	for (object *tmp = ms.bot; tmp; tmp = tmp->above)	1358	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1327	if (object::can_merge (op, tmp))	1359	if (object::can_merge (op, tmp))
1328	{	1360	{
1329	// TODO: we atcually want to update tmp, not op,	1361	// TODO: we actually want to update tmp, not op,
1330	// but some caller surely breaks when we return tmp	1362	// but some caller surely breaks when we return tmp
1331	// from here :/	1363	// from here :/
1332	op->nrof += tmp->nrof;	1364	op->nrof += tmp->nrof;
1333	tmp->destroy (1);	1365	tmp->destroy ();
1334	}	1366	}
1335		1367
1336	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1368	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1337	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1369	CLEAR_FLAG (op, FLAG_INV_LOCKED);
1338		1370
…		…
1345	{	1377	{
1346	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");	1378	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");
1347	abort ();	1379	abort ();
1348	}	1380	}
1349		1381
		1382	if (!originator->is_on_map ())
		1383	{
		1384	LOG (llevError, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map",
		1385	op->debug_desc (), originator->debug_desc ());
		1386	abort ();
		1387	}
		1388
1350	op->above = originator;	1389	op->above = originator;
1351	op->below = originator->below;	1390	op->below = originator->below;
1352
1353	if (op->below)
1354	op->below->above = op;
1355	else
1356	ms.bot = op;
1357
1358	/* since *below* originator, no need to update top */
1359	originator->below = op;	1391	originator->below = op;
		1392
		1393	*(op->below ? &op->below->above : &ms.bot) = op;
1360	}	1394	}
1361	else	1395	else
1362	{	1396	{
1363	object *top, *floor = NULL;	1397	object *floor = 0;
1364		1398	object *top = ms.top;
1365	top = ms.bot;
1366		1399
1367	/* If there are other objects, then */	1400	/* If there are other objects, then */
1368	if (top)	1401	if (top)
1369	{	1402	{
1370	object *last = 0;
1371
1372	/*	1403	/*
1373	* If there are multiple objects on this space, we do some trickier handling.	1404	* If there are multiple objects on this space, we do some trickier handling.
1374	* We've already dealt with merging if appropriate.	1405	* We've already dealt with merging if appropriate.
1375	* Generally, we want to put the new object on top. But if	1406	* Generally, we want to put the new object on top. But if
1376	* flag contains INS_ABOVE_FLOOR_ONLY, once we find the last	1407	* flag contains INS_ABOVE_FLOOR_ONLY, once we find the last
…		…
1379	* once we get to them. This reduces the need to traverse over all of	1410	* once we get to them. This reduces the need to traverse over all of
1380	* them when adding another one - this saves quite a bit of cpu time	1411	* them when adding another one - this saves quite a bit of cpu time
1381	* when lots of spells are cast in one area. Currently, it is presumed	1412	* when lots of spells are cast in one area. Currently, it is presumed
1382	* that flying non pickable objects are spell objects.	1413	* that flying non pickable objects are spell objects.
1383	*/	1414	*/
1384	for (top = ms.bot; top; top = top->above)	1415	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1385	{	1416	{
1386	if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))	1417	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) || QUERY_FLAG (tmp, FLAG_OVERLAY_FLOOR))
1387	floor = top;	1418	floor = tmp;
1388		1419
1389	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))	1420	if (QUERY_FLAG (tmp, FLAG_NO_PICK) && (tmp->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1390	{	1421	{
1391	/* We insert above top, so we want this object below this */	1422	/* We insert above top, so we want this object below this */
1392	top = top->below;	1423	top = tmp->below;
1393	break;	1424	break;
1394	}	1425	}
1395		1426
1396	last = top;	1427	top = tmp;
1397	}	1428	}
1398
1399	/* Don't want top to be NULL, so set it to the last valid object */
1400	top = last;
1401		1429
1402	/* We let update_position deal with figuring out what the space	1430	/* We let update_position deal with figuring out what the space
1403	* looks like instead of lots of conditions here.	1431	* looks like instead of lots of conditions here.
1404	* makes things faster, and effectively the same result.	1432	* makes things faster, and effectively the same result.
1405	*/	1433	*/
…		…
1412	*/	1440	*/
1413	if (!(flag & INS_ON_TOP)	1441	if (!(flag & INS_ON_TOP)
1414	&& ms.flags () & P_BLOCKSVIEW	1442	&& ms.flags () & P_BLOCKSVIEW
1415	&& (op->face && !faces [op->face].visibility))	1443	&& (op->face && !faces [op->face].visibility))
1416	{	1444	{
		1445	object *last;
		1446
1417	for (last = top; last != floor; last = last->below)	1447	for (last = top; last != floor; last = last->below)
1418	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1448	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1419	break;	1449	break;
1420		1450
1421	/* Check to see if we found the object that blocks view,	1451	/* Check to see if we found the object that blocks view,
…		…
1429	} /* If objects on this space */	1459	} /* If objects on this space */
1430		1460
1431	if (flag & INS_ABOVE_FLOOR_ONLY)	1461	if (flag & INS_ABOVE_FLOOR_ONLY)
1432	top = floor;	1462	top = floor;
1433		1463
1434	/* Top is the object that our object (op) is going to get inserted above.	1464	// insert object above top, or bottom-most if top = 0
1435	*/
1436
1437	/* First object on this space */
1438	if (!top)	1465	if (!top)
1439	{	1466	{
		1467	op->below = 0;
1440	op->above = ms.bot;	1468	op->above = ms.bot;
1441
1442	if (op->above)
1443	op->above->below = op;
1444
1445	op->below = 0;
1446	ms.bot = op;	1469	ms.bot = op;
		1470
		1471	*(op->above ? &op->above->below : &ms.top) = op;
1447	}	1472	}
1448	else	1473	else
1449	{ /* get inserted into the stack above top */	1474	{
1450	op->above = top->above;	1475	op->above = top->above;
1451
1452	if (op->above)
1453	op->above->below = op;	1476	top->above = op;
1454		1477
1455	op->below = top;	1478	op->below = top;
1456	top->above = op;	1479	*(op->above ? &op->above->below : &ms.top) = op;
1457	}	1480	}
		1481	}
1458		1482
1459	if (!op->above)	1483	if (op->is_player ())
1460	ms.top = op;
1461	} /* else not INS_BELOW_ORIGINATOR */
1462
1463	if (op->type == PLAYER)
1464	{	1484	{
1465	op->contr->do_los = 1;	1485	op->contr->do_los = 1;
1466	++op->map->players;	1486	++op->map->players;
1467	op->map->touch ();	1487	op->map->touch ();
1468	}	1488	}
1469		1489
1470	op->map->dirty = true;	1490	op->map->dirty = true;
1471		1491
1472	if (object *pl = ms.player ())	1492	if (object *pl = ms.player ())
1473	//TODO: the floorbox prev/next might need updating	1493	//TODO: the floorbox prev/next might need updating
1474	esrv_send_item (pl, op);	1494	//esrv_send_item (pl, op);
		1495	//TODO: update floorbox to preserve ordering
		1496	if (pl->contr->ns)
		1497	pl->contr->ns->floorbox_update ();
1475		1498
1476	/* If this object glows, it may affect lighting conditions that are	1499	/* If this object glows, it may affect lighting conditions that are
1477	* visible to others on this map. But update_all_los is really	1500	* visible to others on this map. But update_all_los is really
1478	* an inefficient way to do this, as it means los for all players	1501	* an inefficient way to do this, as it means los for all players
1479	* on the map will get recalculated. The players could very well	1502	* on the map will get recalculated. The players could very well
1480	* be far away from this change and not affected in any way -	1503	* be far away from this change and not affected in any way -
1481	* this should get redone to only look for players within range,	1504	* this should get redone to only look for players within range,
1482	* or just updating the P_UPTODATE for spaces within this area	1505	* or just updating the P_UPTODATE for spaces within this area
1483	* of effect may be sufficient.	1506	* of effect may be sufficient.
1484	*/	1507	*/
1485	if (op->map->darkness && (op->glow_radius != 0))	1508	if (op->affects_los ())
		1509	{
		1510	op->ms ().invalidate ();
1486	update_all_los (op->map, op->x, op->y);	1511	update_all_los (op->map, op->x, op->y);
		1512	}
1487		1513
1488	/* updates flags (blocked, alive, no magic, etc) for this map space */	1514	/* updates flags (blocked, alive, no magic, etc) for this map space */
1489	update_object (op, UP_OBJ_INSERT);	1515	update_object (op, UP_OBJ_INSERT);
1490		1516
1491	INVOKE_OBJECT (INSERT, op);	1517	INVOKE_OBJECT (INSERT, op);
…		…
1498	* blocked() and wall() work properly), and these flags are updated by	1524	* blocked() and wall() work properly), and these flags are updated by
1499	* update_object().	1525	* update_object().
1500	*/	1526	*/
1501		1527
1502	/* if this is not the head or flag has been passed, don't check walk on status */	1528	/* if this is not the head or flag has been passed, don't check walk on status */
1503	if (!(flag & INS_NO_WALK_ON) && op->head_ () == op)	1529	if (!(flag & INS_NO_WALK_ON) && op->is_head ())
1504	{	1530	{
1505	if (check_move_on (op, originator))	1531	if (check_move_on (op, originator))
1506	return 0;	1532	return 0;
1507		1533
1508	/* If we are a multi part object, lets work our way through the check	1534	/* If we are a multi part object, lets work our way through the check
…		…
1519	/* this function inserts an object in the map, but if it	1545	/* this function inserts an object in the map, but if it
1520	* finds an object of its own type, it'll remove that one first.	1546	* finds an object of its own type, it'll remove that one first.
1521	* op is the object to insert it under: supplies x and the map.	1547	* op is the object to insert it under: supplies x and the map.
1522	*/	1548	*/
1523	void	1549	void
1524	replace_insert_ob_in_map (const char *arch_string, object *op)	1550	replace_insert_ob_in_map (shstr_tmp archname, object *op)
1525	{	1551	{
1526	/* first search for itself and remove any old instances */	1552	/* first search for itself and remove any old instances */
1527		1553
1528	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)	1554	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1529	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */	1555	if (tmp->arch->archname == archname) /* same archetype */
1530	tmp->destroy (1);	1556	tmp->destroy ();
1531		1557
1532	object *tmp = arch_to_object (archetype::find (arch_string));	1558	object *tmp = archetype::find (archname)->instance ();
1533		1559
1534	tmp->x = op->x;	1560	tmp->x = op->x;
1535	tmp->y = op->y;	1561	tmp->y = op->y;
1536		1562
1537	insert_ob_in_map (tmp, op->map, op, 0);	1563	insert_ob_in_map (tmp, op->map, op, 0);
…		…
1542	{	1568	{
1543	if (where->env)	1569	if (where->env)
1544	return where->env->insert (this);	1570	return where->env->insert (this);
1545	else	1571	else
1546	return where->map->insert (this, where->x, where->y, originator, flags);	1572	return where->map->insert (this, where->x, where->y, originator, flags);
		1573	}
		1574
		1575	// check whether we can put this into the map, respect max_volume, max_items
		1576	bool
		1577	object::can_drop_at (maptile *m, int x, int y, object *originator)
		1578	{
		1579	mapspace &ms = m->at (x, y);
		1580
		1581	int items = ms.items ();
		1582
		1583	if (!items // testing !items ensures we can drop at least one item
		1584	|| (items < m->max_items
		1585	&& ms.volume () < m->max_volume))
		1586	return true;
		1587
		1588	if (originator && originator->is_player ())
		1589	originator->contr->failmsg (format (
		1590	"No matter how hard you try, you just cannot put the %s here H<Try to remove some items from the floor first.>",
		1591	query_name ()
		1592	));
		1593
		1594	return false;
1547	}	1595	}
1548		1596
1549	/*	1597	/*
1550	* decrease(object, number) decreases a specified number from	1598	* decrease(object, number) decreases a specified number from
1551	* the amount of an object. If the amount reaches 0, the object	1599	* the amount of an object. If the amount reaches 0, the object
…		…
1559	if (!nr)	1607	if (!nr)
1560	return true;	1608	return true;
1561		1609
1562	nr = min (nr, nrof);	1610	nr = min (nr, nrof);
1563		1611
		1612	if (nrof > nr)
		1613	{
1564	nrof -= nr;	1614	nrof -= nr;
1565
1566	if (nrof)
1567	{
1568	adjust_weight (env, -weight * nr); // carrying == 0	1615	adjust_weight (env, -weight * max (1, nr)); // carrying == 0
1569		1616
1570	if (object *pl = visible_to ())	1617	if (object *pl = visible_to ())
1571	esrv_update_item (UPD_NROF, pl, this);	1618	esrv_update_item (UPD_NROF, pl, this);
1572		1619
1573	return true;	1620	return true;
1574	}	1621	}
1575	else	1622	else
1576	{	1623	{
1577	destroy (1);	1624	destroy ();
1578	return false;	1625	return false;
1579	}	1626	}
1580	}	1627	}
1581		1628
1582	/*	1629	/*
…		…
1599	}	1646	}
1600	else	1647	else
1601	{	1648	{
1602	decrease (nr);	1649	decrease (nr);
1603		1650
1604	object *op = object_create_clone (this);	1651	object *op = deep_clone ();
1605	op->nrof = nr;	1652	op->nrof = nr;
1606	return op;	1653	return op;
1607	}	1654	}
1608	}	1655	}
1609		1656
…		…
1659	if (object *pl = tmp->visible_to ())	1706	if (object *pl = tmp->visible_to ())
1660	esrv_update_item (UPD_NROF, pl, tmp);	1707	esrv_update_item (UPD_NROF, pl, tmp);
1661		1708
1662	adjust_weight (this, op->total_weight ());	1709	adjust_weight (this, op->total_weight ());
1663		1710
1664	op->destroy (1);	1711	op->destroy ();
1665	op = tmp;	1712	op = tmp;
1666	goto inserted;	1713	goto inserted;
1667	}	1714	}
1668		1715
1669	op->owner = 0; // it's his/hers now. period.	1716	op->owner = 0; // it's his/hers now. period.
…		…
1687		1734
1688	adjust_weight (this, op->total_weight ());	1735	adjust_weight (this, op->total_weight ());
1689		1736
1690	inserted:	1737	inserted:
1691	/* reset the light list and los of the players on the map */	1738	/* reset the light list and los of the players on the map */
1692	if (op->glow_radius && map && map->darkness)	1739	if (op->glow_radius && is_on_map ())
		1740	{
		1741	update_stats ();
1693	update_all_los (map, x, y);	1742	update_all_los (map, x, y);
1694		1743	}
		1744	else if (is_player ())
1695	// if this is a player's inventory, update stats	1745	// if this is a player's inventory, update stats
1696	if (type == PLAYER && !flag [FLAG_NO_FIX_PLAYER])	1746	contr->queue_stats_update ();
1697	update_stats ();
1698		1747
1699	INVOKE_OBJECT (INSERT, this);	1748	INVOKE_OBJECT (INSERT, this);
1700		1749
1701	return op;	1750	return op;
1702	}	1751	}
…		…
1722	* on top.	1771	* on top.
1723	*/	1772	*/
1724	int	1773	int
1725	check_move_on (object *op, object *originator)	1774	check_move_on (object *op, object *originator)
1726	{	1775	{
		1776	if (QUERY_FLAG (op, FLAG_NO_APPLY))
		1777	return 0;
		1778
1727	object *tmp;	1779	object *tmp;
1728	maptile *m = op->map;	1780	maptile *m = op->map;
1729	int x = op->x, y = op->y;	1781	int x = op->x, y = op->y;
1730		1782
1731	MoveType move_on, move_slow, move_block;	1783	mapspace &ms = m->at (x, y);
1732		1784
1733	if (QUERY_FLAG (op, FLAG_NO_APPLY))	1785	ms.update ();
1734	return 0;
1735		1786
1736	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);	1787	MoveType move_on = ms.move_on;
1737	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);	1788	MoveType move_slow = ms.move_slow;
1738	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);	1789	MoveType move_block = ms.move_block;
1739		1790
1740	/* if nothing on this space will slow op down or be applied,	1791	/* if nothing on this space will slow op down or be applied,
1741	* no need to do checking below. have to make sure move_type	1792	* no need to do checking below. have to make sure move_type
1742	* is set, as lots of objects don't have it set - we treat that	1793	* is set, as lots of objects don't have it set - we treat that
1743	* as walking.	1794	* as walking.
…		…
1754	return 0;	1805	return 0;
1755		1806
1756	/* The objects have to be checked from top to bottom.	1807	/* The objects have to be checked from top to bottom.
1757	* Hence, we first go to the top:	1808	* Hence, we first go to the top:
1758	*/	1809	*/
1759		1810	for (object *next, *tmp = ms.top; tmp; tmp = next)
1760	for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above)
1761	{
1762	/* Trim the search when we find the first other spell effect
1763	* this helps performance so that if a space has 50 spell objects,
1764	* we don't need to check all of them.
1765	*/
1766	if ((tmp->move_type & MOVE_FLY_LOW) && QUERY_FLAG (tmp, FLAG_NO_PICK))
1767	break;
1768	}	1811	{
		1812	next = tmp->below;
1769		1813
1770	for (; tmp; tmp = tmp->below)
1771	{
1772	if (tmp == op)	1814	if (tmp == op)
1773	continue; /* Can't apply yourself */	1815	continue; /* Can't apply yourself */
1774		1816
1775	/* Check to see if one of the movement types should be slowed down.	1817	/* Check to see if one of the movement types should be slowed down.
1776	* Second check makes sure that the movement types not being slowed	1818	* Second check makes sure that the movement types not being slowed
…		…
1781	if (!QUERY_FLAG (op, FLAG_WIZPASS))	1823	if (!QUERY_FLAG (op, FLAG_WIZPASS))
1782	{	1824	{
1783	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||	1825	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
1784	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))	1826	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1785	{	1827	{
1786
1787	float
1788	diff = tmp->move_slow_penalty * fabs (op->speed);	1828	float diff = tmp->move_slow_penalty * fabs (op->speed);
1789		1829
1790	if (op->type == PLAYER)	1830	if (op->is_player ())
1791	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||	1831	if ((tmp->flag [FLAG_IS_HILLY ] && find_skill_by_number (op, SK_CLIMBING)) ||
1792	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))	1832	(tmp->flag [FLAG_IS_WOODED] && find_skill_by_number (op, SK_WOODSMAN)))
1793	diff /= 4.0;	1833	diff /= 4.0;
1794		1834
1795	op->speed_left -= diff;	1835	op->speed_left -= diff;
1796	}	1836	}
1797	}	1837	}
…		…
1830	LOG (llevError, "Present_arch called outside map.\n");	1870	LOG (llevError, "Present_arch called outside map.\n");
1831	return NULL;	1871	return NULL;
1832	}	1872	}
1833		1873
1834	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)	1874	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1835	if (tmp->arch == at)	1875	if (tmp->arch->archname == at->archname)
1836	return tmp;	1876	return tmp;
1837		1877
1838	return NULL;	1878	return NULL;
1839	}	1879	}
1840		1880
…		…
1904	* The first matching object is returned, or NULL if none.	1944	* The first matching object is returned, or NULL if none.
1905	*/	1945	*/
1906	object *	1946	object *
1907	present_arch_in_ob (const archetype *at, const object *op)	1947	present_arch_in_ob (const archetype *at, const object *op)
1908	{	1948	{
1909	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)	1949	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1910	if (tmp->arch == at)	1950	if (tmp->arch->archname == at->archname)
1911	return tmp;	1951	return tmp;
1912		1952
1913	return NULL;	1953	return NULL;
1914	}	1954	}
1915		1955
…		…
2003	* head of the object should correspond for the entire object.	2043	* head of the object should correspond for the entire object.
2004	*/	2044	*/
2005	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))	2045	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
2006	continue;	2046	continue;
2007		2047
2008	if (ob->blocked (m, pos.x, pos.y))	2048	if (ob->blocked (pos.m, pos.x, pos.y))
2009	continue;	2049	continue;
2010		2050
2011	altern [index++] = i;	2051	altern [index++] = i;
2012	}	2052	}
2013		2053
…		…
2081	* there is capable of.	2121	* there is capable of.
2082	*/	2122	*/
2083	int	2123	int
2084	find_dir (maptile *m, int x, int y, object *exclude)	2124	find_dir (maptile *m, int x, int y, object *exclude)
2085	{	2125	{
2086	int i, max = SIZEOFFREE, mflags;	2126	int max = SIZEOFFREE, mflags;
2087
2088	sint16 nx, ny;
2089	object *tmp;
2090	maptile *mp;
2091
2092	MoveType blocked, move_type;	2127	MoveType move_type;
2093		2128
2094	if (exclude && exclude->head_ () != exclude)	2129	if (exclude && exclude->head_ () != exclude)
2095	{	2130	{
2096	exclude = exclude->head;	2131	exclude = exclude->head;
2097	move_type = exclude->move_type;	2132	move_type = exclude->move_type;
…		…
2100	{	2135	{
2101	/* If we don't have anything, presume it can use all movement types. */	2136	/* If we don't have anything, presume it can use all movement types. */
2102	move_type = MOVE_ALL;	2137	move_type = MOVE_ALL;
2103	}	2138	}
2104		2139
2105	for (i = 1; i < max; i++)	2140	for (int i = 1; i < max; i++)
2106	{	2141	{
2107	mp = m;	2142	mapxy pos (m, x, y);
2108	nx = x + freearr_x[i];	2143	pos.move (i);
2109	ny = y + freearr_y[i];
2110		2144
2111	mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);	2145	if (!pos.normalise ())
2112
2113	if (mflags & P_OUT_OF_MAP)
2114	max = maxfree[i];	2146	max = maxfree[i];
2115	else	2147	else
2116	{	2148	{
2117	mapspace &ms = mp->at (nx, ny);	2149	mapspace &ms = *pos;
2118		2150
2119	blocked = ms.move_block;
2120
2121	if ((move_type & blocked) == move_type)	2151	if ((move_type & ms.move_block) == move_type)
2122	max = maxfree[i];	2152	max = maxfree [i];
2123	else if (mflags & P_IS_ALIVE)	2153	else if (ms.flags () & P_IS_ALIVE)
2124	{	2154	{
2125	for (tmp = ms.bot; tmp; tmp = tmp->above)	2155	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
2126	if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)	2156	if ((tmp->flag [FLAG_MONSTER] || tmp->is_player ())
2127	&& (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))	2157	&& (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2128	break;
2129
2130	if (tmp)
2131	return freedir[i];	2158	return freedir [i];
2132	}	2159	}
2133	}	2160	}
2134	}	2161	}
2135		2162
2136	return 0;	2163	return 0;
…		…
2211	* This basically means that if direction is 15, then it could either go	2238	* This basically means that if direction is 15, then it could either go
2212	* direction 4, 14, or 16 to get back to where we are.	2239	* direction 4, 14, or 16 to get back to where we are.
2213	* Moved from spell_util.c to object.c with the other related direction	2240	* Moved from spell_util.c to object.c with the other related direction
2214	* functions.	2241	* functions.
2215	*/	2242	*/
2216	int reduction_dir[SIZEOFFREE][3] = {	2243	static const int reduction_dir[SIZEOFFREE][3] = {
2217	{0, 0, 0}, /* 0 */	2244	{0, 0, 0}, /* 0 */
2218	{0, 0, 0}, /* 1 */	2245	{0, 0, 0}, /* 1 */
2219	{0, 0, 0}, /* 2 */	2246	{0, 0, 0}, /* 2 */
2220	{0, 0, 0}, /* 3 */	2247	{0, 0, 0}, /* 3 */
2221	{0, 0, 0}, /* 4 */	2248	{0, 0, 0}, /* 4 */
…		…
2317	int	2344	int
2318	can_pick (const object *who, const object *item)	2345	can_pick (const object *who, const object *item)
2319	{	2346	{
2320	return /*QUERY_FLAG(who,FLAG_WIZ)|| */	2347	return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2321	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&	2348	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
2322	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3));	2349	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->is_player () || item->weight < who->weight / 3));
2323	}	2350	}
2324		2351
2325	/*	2352	/*
2326	* create clone from object to another	2353	* create clone from object to another
2327	*/	2354	*/
2328	object *	2355	object *
2329	object_create_clone (object *asrc)	2356	object::deep_clone ()
2330	{	2357	{
2331	object *dst = 0, *tmp, *src, *prev, *item;	2358	assert (("deep_clone called on non-head object", is_head ()));
2332		2359
2333	if (!asrc)	2360	object *dst = clone ();
2334	return 0;
2335		2361
2336	src = asrc->head_ ();	2362	object *prev = dst;
2337
2338	prev = 0;
2339	for (object *part = src; part; part = part->more)	2363	for (object *part = this->more; part; part = part->more)
2340	{	2364	{
2341	tmp = part->clone ();	2365	object *tmp = part->clone ();
2342	tmp->x -= src->x;
2343	tmp->y -= src->y;
2344
2345	if (!part->head)
2346	{
2347	dst = tmp;
2348	tmp->head = 0;
2349	}
2350	else
2351	tmp->head = dst;	2366	tmp->head = dst;
2352
2353	tmp->more = 0;
2354
2355	if (prev)
2356	prev->more = tmp;	2367	prev->more = tmp;
2357
2358	prev = tmp;	2368	prev = tmp;
2359	}	2369	}
2360		2370
2361	for (item = src->inv; item; item = item->below)	2371	for (object *item = inv; item; item = item->below)
2362	insert_ob_in_ob (object_create_clone (item), dst);	2372	insert_ob_in_ob (item->deep_clone (), dst);
2363		2373
2364	return dst;	2374	return dst;
2365	}	2375	}
2366		2376
2367	/* This returns the first object in who's inventory that	2377	/* This returns the first object in who's inventory that
…		…
2376	return tmp;	2386	return tmp;
2377		2387
2378	return 0;	2388	return 0;
2379	}	2389	}
2380		2390
2381	/* If ob has a field named key, return the link from the list,	2391	shstr_tmp
2382	* otherwise return NULL.	2392	object::kv_get (shstr_tmp key) const
2383	*
2384	* key must be a passed in shared string - otherwise, this won't
2385	* do the desired thing.
2386	*/
2387	key_value *
2388	get_ob_key_link (const object *ob, const char *key)
2389	{	2393	{
2390	for (key_value *link = ob->key_values; link; link = link->next)	2394	for (key_value *kv = key_values; kv; kv = kv->next)
2391	if (link->key == key)	2395	if (kv->key == key)
2392	return link;
2393
2394	return 0;
2395	}
2396
2397	/*
2398	* Returns the value of op has an extra_field for key, or NULL.
2399	*
2400	* The argument doesn't need to be a shared string.
2401	*
2402	* The returned string is shared.
2403	*/
2404	const char *
2405	get_ob_key_value (const object *op, const char *const key)
2406	{
2407	key_value *link;
2408	shstr_cmp canonical_key (key);
2409
2410	if (!canonical_key)
2411	{
2412	/* 1. There being a field named key on any object
2413	* implies there'd be a shared string to find.
2414	* 2. Since there isn't, no object has this field.
2415	* 3. Therefore, *this* object doesn't have this field.
2416	*/
2417	return 0;
2418	}
2419
2420	/* This is copied from get_ob_key_link() above -
2421	* only 4 lines, and saves the function call overhead.
2422	*/
2423	for (link = op->key_values; link; link = link->next)
2424	if (link->key == canonical_key)
2425	return link->value;	2396	return kv->value;
2426		2397
2427	return 0;	2398	return shstr ();
2428	}	2399	}
2429		2400
2430	/*	2401	void
2431	* Updates the canonical_key in op to value.	2402	object::kv_set (shstr_tmp key, shstr_tmp value)
2432	*
2433	* canonical_key is a shared string (value doesn't have to be).
2434	*
2435	* Unless add_key is TRUE, it won't add fields, only change the value of existing
2436	* keys.
2437	*
2438	* Returns TRUE on success.
2439	*/
2440	int
2441	set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key)
2442	{	2403	{
2443	key_value *field = NULL, *last = NULL;	2404	for (key_value *kv = key_values; kv; kv = kv->next)
2444		2405	if (kv->key == key)
2445	for (field = op->key_values; field != NULL; field = field->next)
2446	{
2447	if (field->key != canonical_key)
2448	{	2406	{
2449	last = field;	2407	kv->value = value;
2450	continue;	2408	return;
2451	}	2409	}
2452		2410
2453	if (value)	2411	key_value *kv = new key_value;
2454	field->value = value;	2412
2455	else	2413	kv->next = key_values;
		2414	kv->key = key;
		2415	kv->value = value;
		2416
		2417	key_values = kv;
		2418	}
		2419
		2420	void
		2421	object::kv_del (shstr_tmp key)
		2422	{
		2423	for (key_value **kvp = &key_values; *kvp; kvp = &(*kvp)->next)
		2424	if ((*kvp)->key == key)
2456	{	2425	{
2457	/* Basically, if the archetype has this key set,	2426	key_value *kv = *kvp;
2458	* we need to store the null value so when we save	2427	*kvp = (*kvp)->next;
2459	* it, we save the empty value so that when we load,	2428	delete kv;
2460	* we get this value back again.	2429	return;
2461	*/
2462	if (get_ob_key_link (op->arch, canonical_key))
2463	field->value = 0;
2464	else
2465	{
2466	if (last)
2467	last->next = field->next;
2468	else
2469	op->key_values = field->next;
2470
2471	delete field;
2472	}
2473	}	2430	}
2474	return TRUE;
2475	}
2476	/* IF we get here, key doesn't exist */
2477
2478	/* No field, we'll have to add it. */
2479
2480	if (!add_key)
2481	return FALSE;
2482
2483	/* There isn't any good reason to store a null
2484	* value in the key/value list. If the archetype has
2485	* this key, then we should also have it, so shouldn't
2486	* be here. If user wants to store empty strings,
2487	* should pass in ""
2488	*/
2489	if (value == NULL)
2490	return TRUE;
2491
2492	field = new key_value;
2493
2494	field->key = canonical_key;
2495	field->value = value;
2496	/* Usual prepend-addition. */
2497	field->next = op->key_values;
2498	op->key_values = field;
2499
2500	return TRUE;
2501	}
2502
2503	/*
2504	* Updates the key in op to value.
2505	*
2506	* If add_key is FALSE, this will only update existing keys,
2507	* and not add new ones.
2508	* In general, should be little reason FALSE is ever passed in for add_key
2509	*
2510	* Returns TRUE on success.
2511	*/
2512	int
2513	set_ob_key_value (object *op, const char *key, const char *value, int add_key)
2514	{
2515	shstr key_ (key);
2516
2517	return set_ob_key_value_s (op, key_, value, add_key);
2518	}	2431	}
2519		2432
2520	object::depth_iterator::depth_iterator (object *container)	2433	object::depth_iterator::depth_iterator (object *container)
2521	: iterator_base (container)	2434	: iterator_base (container)
2522	{	2435	{
…		…
2572	{	2485	{
2573	char flagdesc[512];	2486	char flagdesc[512];
2574	char info2[256 * 4];	2487	char info2[256 * 4];
2575	char *p = info;	2488	char *p = info;
2576		2489
2577	p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s,flags:[%s],type:%d}",	2490	p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s%s,flags:[%s],type:%d}",
2578	count,	2491	count,
2579	uuid.c_str (),	2492	uuid.c_str (),
2580	&name,	2493	&name,
2581	title ? "\",title:\"" : "",	2494	title ? ",title:\"" : "",
2582	title ? (const char *)title : "",	2495	title ? (const char *)title : "",
		2496	title ? "\"" : "",
2583	flag_desc (flagdesc, 512), type);	2497	flag_desc (flagdesc, 512), type);
2584		2498
2585	if (!flag[FLAG_REMOVED] && env)	2499	if (!flag[FLAG_REMOVED] && env)
2586	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2500	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2587		2501
…		…
2603	struct region *	2517	struct region *
2604	object::region () const	2518	object::region () const
2605	{	2519	{
2606	return map ? map->region (x, y)	2520	return map ? map->region (x, y)
2607	: region::default_region ();	2521	: region::default_region ();
2608	}
2609
2610	const materialtype_t *
2611	object::dominant_material () const
2612	{
2613	if (materialtype_t *mt = name_to_material (materialname))
2614	return mt;
2615
2616	return name_to_material (shstr_unknown);
2617	}	2522	}
2618		2523
2619	void	2524	void
2620	object::open_container (object *new_container)	2525	object::open_container (object *new_container)
2621	{	2526	{
…		…
2643	container = 0;	2548	container = 0;
2644		2549
2645	// client needs item update to make it work, client bug requires this to be separate	2550	// client needs item update to make it work, client bug requires this to be separate
2646	esrv_update_item (UPD_FLAGS, this, old_container);	2551	esrv_update_item (UPD_FLAGS, this, old_container);
2647		2552
2648	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));	2553	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", old_container->query_name ());
2649	play_sound (sound_find ("chest_close"));	2554	play_sound (sound_find ("chest_close"));
2650	}	2555	}
2651		2556
2652	if (new_container)	2557	if (new_container)
2653	{	2558	{
…		…
2657	// TODO: this does not seem to serve any purpose anymore?	2562	// TODO: this does not seem to serve any purpose anymore?
2658	#if 0	2563	#if 0
2659	// insert the "Close Container" object.	2564	// insert the "Close Container" object.
2660	if (archetype *closer = new_container->other_arch)	2565	if (archetype *closer = new_container->other_arch)
2661	{	2566	{
2662	object *closer = arch_to_object (new_container->other_arch);	2567	object *closer = new_container->other_arch->instance ();
2663	closer->flag [FLAG_NO_MAP_SAVE] = 1;	2568	closer->flag [FLAG_NO_MAP_SAVE] = 1;
2664	new_container->insert (closer);	2569	new_container->insert (closer);
2665	}	2570	}
2666	#endif	2571	#endif
2667		2572
2668	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));	2573	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", new_container->query_name ());
2669		2574
2670	// make sure the container is available, client bug requires this to be separate	2575	// make sure the container is available, client bug requires this to be separate
2671	esrv_send_item (this, new_container);	2576	esrv_send_item (this, new_container);
2672		2577
2673	new_container->flag [FLAG_APPLIED] = true;	2578	new_container->flag [FLAG_APPLIED] = true;
…		…
2681	// else if (!old_container->env && contr && contr->ns)	2586	// else if (!old_container->env && contr && contr->ns)
2682	// contr->ns->floorbox_reset ();	2587	// contr->ns->floorbox_reset ();
2683	}	2588	}
2684		2589
2685	object *	2590	object *
2686	object::force_find (const shstr name)	2591	object::force_find (shstr_tmp name)
2687	{	2592	{
2688	/* cycle through his inventory to look for the MARK we want to	2593	/* cycle through his inventory to look for the MARK we want to
2689	* place	2594	* place
2690	*/	2595	*/
2691	for (object *tmp = inv; tmp; tmp = tmp->below)	2596	for (object *tmp = inv; tmp; tmp = tmp->below)
…		…
2693	return splay (tmp);	2598	return splay (tmp);
2694		2599
2695	return 0;	2600	return 0;
2696	}	2601	}
2697		2602
		2603	//-GPL
		2604
2698	void	2605	void
		2606	object::force_set_timer (int duration)
		2607	{
		2608	this->duration = 1;
		2609	this->speed_left = -1.f;
		2610
		2611	this->set_speed (duration ? 1.f / duration : 0.f);
		2612	}
		2613
		2614	object *
2699	object::force_add (const shstr name, int duration)	2615	object::force_add (shstr_tmp name, int duration)
2700	{	2616	{
2701	if (object *force = force_find (name))	2617	if (object *force = force_find (name))
2702	force->destroy ();	2618	force->destroy ();
2703		2619
2704	object *force = get_archetype (FORCE_NAME);	2620	object *force = get_archetype (FORCE_NAME);
2705		2621
2706	force->slaying = name;	2622	force->slaying = name;
2707	force->stats.food = 1;	2623	force->force_set_timer (duration);
2708	force->speed_left = -1.f;
2709
2710	force->set_speed (duration ? 1.f / duration : 0.f);
2711	force->flag [FLAG_IS_USED_UP] = true;
2712	force->flag [FLAG_APPLIED] = true;	2624	force->flag [FLAG_APPLIED] = true;
2713		2625
2714	insert (force);	2626	return insert (force);
2715	}	2627	}
2716		2628
2717	void	2629	void
2718	object::play_sound (faceidx sound)	2630	object::play_sound (faceidx sound) const
2719	{	2631	{
2720	if (!sound)	2632	if (!sound)
2721	return;	2633	return;
2722		2634
2723	if (flag [FLAG_REMOVED])	2635	if (is_on_map ())
		2636	map->play_sound (sound, x, y);
		2637	else if (object *pl = in_player ())
		2638	pl->contr->play_sound (sound);
		2639	}
		2640
		2641	void
		2642	object::say_msg (const char *msg) const
		2643	{
		2644	if (is_on_map ())
		2645	map->say_msg (msg, x, y);
		2646	else if (object *pl = in_player ())
		2647	pl->contr->play_sound (sound);
		2648	}
		2649
		2650	void
		2651	object::make_noise ()
		2652	{
		2653	// we do not model noise in the map, so instead put
		2654	// a temporary light into the noise source
		2655	// could use the map instead, but that's less reliable for our
		2656	// goal, which is to make invisibility a bit harder to exploit
		2657
		2658	// currently only works sensibly for players
		2659	if (!is_player ())
2724	return;	2660	return;
2725		2661
2726	if (env)	2662	// find old force, or create new one
2727	{	2663	object *force = force_find (shstr_noise_force);
2728	if (object *pl = in_player ())	2664
2729	pl->contr->play_sound (sound);	2665	if (force)
2730	}	2666	force->speed_left = -1.f; // patch old speed up
2731	else	2667	else
2732	map->play_sound (sound, x, y);	2668	{
2733	}	2669	force = archetype::get (shstr_noise_force);
2734		2670
		2671	force->slaying = shstr_noise_force;
		2672	force->stats.food = 1;
		2673	force->speed_left = -1.f;
		2674
		2675	force->set_speed (1.f / 4.f);
		2676	force->flag [FLAG_IS_USED_UP] = true;
		2677	force->flag [FLAG_APPLIED] = true;
		2678
		2679	insert (force);
		2680	}
		2681	}
		2682

Diff Legend

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