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

Diff Legend

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