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.297 by root, Sat Nov 7 18:30:05 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	{
…		…
139		144
140	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */	145	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */
141	static bool	146	static bool
142	compare_ob_value_lists_one (const object *wants, const object *has)	147	compare_ob_value_lists_one (const object *wants, const object *has)
143	{	148	{
144	key_value *wants_field;
145
146	/* n-squared behaviour (see get_ob_key_link()), but I'm hoping both	149	/* 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	150	* objects with lists are rare, and lists stay short. If not, use a
148	* different structure or at least keep the lists sorted...	151	* different structure or at least keep the lists sorted...
149	*/	152	*/
150		153
151	/* For each field in wants, */	154	/* For each field in wants, */
152	for (wants_field = wants->key_values; wants_field; wants_field = wants_field->next)	155	for (key_value *kv = wants->key_values; kv; kv = kv->next)
153	{	156	if (has->kv_get (kv->key) != kv->value)
154	key_value *has_field;	157	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		158
169	/* If we get here, every field in wants has a matching field in has. */	159	/* If we get here, every field in wants has a matching field in has. */
170	return 1;	160	return true;
171	}	161	}
172		162
173	/* Returns TRUE if ob1 has the same key_values as ob2. */	163	/* Returns TRUE if ob1 has the same key_values as ob2. */
174	static bool	164	static bool
175	compare_ob_value_lists (const object *ob1, const object *ob2)	165	compare_ob_value_lists (const object *ob1, const object *ob2)
176	{	166	{
177	/* However, there may be fields in has which aren't partnered in wants,	167	/* However, there may be fields in has which aren't partnered in wants,
178	* so we need to run the comparison *twice*. :(	168	* so we need to run the comparison *twice*. :(
179	*/	169	*/
180	return compare_ob_value_lists_one (ob1, ob2) && compare_ob_value_lists_one (ob2, ob1);	170	return compare_ob_value_lists_one (ob1, ob2)
		171	&& compare_ob_value_lists_one (ob2, ob1);
181	}	172	}
182		173
183	/* Function examines the 2 objects given to it, and returns true if	174	/* Function examines the 2 objects given to it, and returns true if
184	* they can be merged together.	175	* they can be merged together.
185	*	176	*
…		…
195	bool object::can_merge_slow (object *ob1, object *ob2)	186	bool object::can_merge_slow (object *ob1, object *ob2)
196	{	187	{
197	/* A couple quicksanity checks */	188	/* A couple quicksanity checks */
198	if (ob1 == ob2	189	if (ob1 == ob2
199	|| ob1->type != ob2->type	190	|| ob1->type != ob2->type
200	|| ob1->speed != ob2->speed	191	|| fabs (ob1->speed - ob2->speed) < MIN_ACTIVE_SPEED
201	|| ob1->value != ob2->value	192	|| ob1->value != ob2->value
202	|| ob1->name != ob2->name)	193	|| ob1->name != ob2->name)
203	return 0;	194	return 0;
204		195
205	/* Do not merge objects if nrof would overflow. First part checks	196	/* Do not merge objects if nrof would overflow, assume nrof
206	* for unsigned overflow (2c), second part checks whether the result	197	* is always 0 .. 2**31-1 */
207	* would fit into a 32 bit signed int, which is often used to hold	198	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;	199	return 0;
212		200
213	/* If the objects have been identified, set the BEEN_APPLIED flag.	201	/* 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	202	* 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	203	* just can't ignore the been applied or identified flags, as they
…		…
220	SET_FLAG (ob1, FLAG_BEEN_APPLIED);	208	SET_FLAG (ob1, FLAG_BEEN_APPLIED);
221		209
222	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))	210	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))
223	SET_FLAG (ob2, FLAG_BEEN_APPLIED);	211	SET_FLAG (ob2, FLAG_BEEN_APPLIED);
224		212
225	if (ob1->arch->name != ob2->arch->name	213	if (ob1->arch->archname != ob2->arch->archname
226	|| ob1->name != ob2->name	214	|| ob1->name != ob2->name
227	|| ob1->title != ob2->title	215	|| ob1->title != ob2->title
228	|| ob1->msg != ob2->msg	216	|| ob1->msg != ob2->msg
229	|| ob1->weight != ob2->weight	217	|| ob1->weight != ob2->weight
230	|| ob1->attacktype != ob2->attacktype	218	|| ob1->attacktype != ob2->attacktype
231	|| ob1->magic != ob2->magic	219	|| ob1->magic != ob2->magic
232	|| ob1->slaying != ob2->slaying	220	|| ob1->slaying != ob2->slaying
233	|| ob1->skill != ob2->skill	221	|| ob1->skill != ob2->skill
234	|| ob1->value != ob2->value	222	|| ob1->value != ob2->value
235	|| ob1->animation_id != ob2->animation_id	223	|| ob1->animation_id != ob2->animation_id
		224	|| (ob1->face != ob2->face && !ob1->animation_id) // face and animation are dependent on each other
236	|| ob1->client_type != ob2->client_type	225	|| ob1->client_type != ob2->client_type
237	|| ob1->materialname != ob2->materialname	226	|| ob1->materialname != ob2->materialname
238	|| ob1->lore != ob2->lore	227	|| ob1->lore != ob2->lore
239	|| ob1->subtype != ob2->subtype	228	|| ob1->subtype != ob2->subtype
240	|| ob1->move_type != ob2->move_type	229	|| ob1->move_type != ob2->move_type
241	|| ob1->move_block != ob2->move_block	230	|| ob1->move_block != ob2->move_block
242	|| ob1->move_allow != ob2->move_allow	231	|| ob1->move_allow != ob2->move_allow
243	|| ob1->move_on != ob2->move_on	232	|| ob1->move_on != ob2->move_on
244	|| ob1->move_off != ob2->move_off	233	|| ob1->move_off != ob2->move_off
245	|| ob1->move_slow != ob2->move_slow	234	|| ob1->move_slow != ob2->move_slow
246	|| ob1->move_slow_penalty != ob2->move_slow_penalty	235	|| fabs (ob1->move_slow_penalty - ob2->move_slow_penalty) < (1.f / 1024.f)
247	|| memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))	236	|| memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
248	|| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats)))	237	|| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats)))
249	return 0;	238	return 0;
250		239
251	if ((ob1->flag ^ ob2->flag)	240	if ((ob1->flag ^ ob2->flag)
252	.reset (FLAG_INV_LOCKED)	241	.reset (FLAG_INV_LOCKED)
253	.reset (FLAG_CLIENT_SENT)
254	.reset (FLAG_REMOVED)	242	.reset (FLAG_REMOVED)
255	.any ())	243	.any ())
256	return 0;	244	return 0;
257		245
258	/* This is really a spellbook check - we should in general	246	/* This is really a spellbook check - we should in general
…		…
340	{	328	{
341	// see if we are in a container of sorts	329	// see if we are in a container of sorts
342	if (env)	330	if (env)
343	{	331	{
344	// the player inventory itself is always visible	332	// the player inventory itself is always visible
345	if (env->type == PLAYER)	333	if (env->is_player ())
346	return env;	334	return env;
347		335
348	// else a player could have our env open	336	// else a player could have our env open
349	object *envest = env->outer_env ();	337	object *envest = env->outer_env_or_self ();
350		338
351	// the player itself is always on a map, so we will find him here	339	// the player itself is always on a map, so we will find him here
352	// even if our inv is in a player.	340	// even if our inv is in a player.
353	if (envest->is_on_map ())	341	if (envest->is_on_map ())
354	if (object *pl = envest->ms ().player ())	342	if (object *pl = envest->ms ().player ())
355	if (pl->container == env)	343	if (pl->container_ () == env)
356	return pl;	344	return pl;
357	}	345	}
358	else	346	else
359	{	347	{
360	// maybe there is a player standing on the same mapspace	348	// maybe there is a player standing on the same mapspace
361	// this will catch the case where "this" is a player	349	// this will catch the case where "this" is a player
362	if (object *pl = ms ().player ())	350	if (object *pl = ms ().player ())
363	if (!pl->container || this == pl->container)	351	if ((pl->contr->ns && !pl->container_ () && !pl->contr->ns->update_look)
		352	|| pl->container_ () == this)
364	return pl;	353	return pl;
365	}	354	}
366	}	355	}
367		356
368	return 0;	357	return 0;
369	}	358	}
370		359
371	// adjust weight per container type ("of holding")	360	// adjust weight per container type ("of holding")
372	static sint32	361	static sint32
373	weight_adjust (object *op, sint32 weight)	362	weight_adjust_for (object *op, sint32 weight)
374	{	363	{
375	return op->type == CONTAINER	364	return op->type == CONTAINER
376	? lerp (weight, 0, 100, 0, 100 - op->stats.Str)	365	? lerp (weight, 0, 100, 0, 100 - op->stats.Str)
377	: weight;	366	: weight;
378	}	367	}
…		…
384	static void	373	static void
385	adjust_weight (object *op, sint32 weight)	374	adjust_weight (object *op, sint32 weight)
386	{	375	{
387	while (op)	376	while (op)
388	{	377	{
		378	// adjust by actual difference to account for rounding errors
		379	// i.e. (w2 - w1) / f != w2 / f - w1 / f and the latter is correct
389	weight = weight_adjust (op, weight);	380	weight = weight_adjust_for (op, op->carrying)
		381	- weight_adjust_for (op, op->carrying - weight);
390		382
391	if (!weight)	383	if (!weight)
392	return;	384	return;
393		385
394	op->carrying += weight;	386	op->carrying += weight;
…		…
417	op->update_weight ();	409	op->update_weight ();
418		410
419	sum += op->total_weight ();	411	sum += op->total_weight ();
420	}	412	}
421		413
422	sum = weight_adjust (this, sum);	414	sum = weight_adjust_for (this, sum);
423		415
424	if (sum != carrying)	416	if (sum != carrying)
425	{	417	{
426	carrying = sum;	418	carrying = sum;
427		419
…		…
443	object_freezer freezer;	435	object_freezer freezer;
444	op->write (freezer);	436	op->write (freezer);
445	return freezer.as_string ();	437	return freezer.as_string ();
446	}	438	}
447		439
448	/*	440	char *
449	* get_nearest_part(multi-object, object 2) returns the part of the	441	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	{	442	{
456	object *tmp, *closest;	443	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	}	444	}
470		445
471	/*	446	/*
472	* Returns the object which has the count-variable equal to the argument.	447	* Returns the object which has the count-variable equal to the argument.
473	* VERRRY slow.	448	* VERRRY slow.
…		…
489	*/	464	*/
490	object *	465	object *
491	find_object_name (const char *str)	466	find_object_name (const char *str)
492	{	467	{
493	shstr_cmp str_ (str);	468	shstr_cmp str_ (str);
494	object *op;
495		469
		470	if (str_)
496	for_all_objects (op)	471	for_all_objects (op)
497	if (op->name == str_)	472	if (op->name == str_)
498	break;	473	return op;
499		474
500	return op;	475	return 0;
501	}	476	}
502		477
503	/*	478	/*
504	* Sets the owner and sets the skill and exp pointers to owner's current	479	* Sets the owner and sets the skill and exp pointers to owner's current
505	* skill and experience objects.	480	* skill and experience objects.
…		…
567	update_stats ();	542	update_stats ();
568		543
569	new_draw_info_format (NDI_UNIQUE, 0, this,	544	new_draw_info_format (NDI_UNIQUE, 0, this,
570	"You try to balance all your items at once, "	545	"You try to balance all your items at once, "
571	"but the %s is just too much for your body. "	546	"but the %s is just too much for your body. "
572	"[You need to unapply some items first.]", &ob->name);	547	"[You need to unapply some items first - use the 'body' command to see "
		548	"how many items you cna wera on a specific body part.]", &ob->name);
573	return false;	549	return false;
574	}	550	}
575		551
576	//new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);	552	//new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);
577	}	553	}
…		…
649	}	625	}
650		626
651	if (speed < 0)	627	if (speed < 0)
652	dst->speed_left -= rndm ();	628	dst->speed_left -= rndm ();
653		629
654	dst->set_speed (dst->speed);	630	dst->activate ();
655	}	631	}
656		632
657	void	633	void
658	object::instantiate ()	634	object::instantiate ()
659	{	635	{
…		…
703	* This function needs to be called whenever the speed of an object changes.	679	* This function needs to be called whenever the speed of an object changes.
704	*/	680	*/
705	void	681	void
706	object::set_speed (float speed)	682	object::set_speed (float speed)
707	{	683	{
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;	684	this->speed = speed;
715		685
716	if (has_active_speed ())	686	if (has_active_speed ())
717	activate ();	687	activate ();
718	else	688	else
…		…
768		738
769	if (!(m.flags_ & P_UPTODATE))	739	if (!(m.flags_ & P_UPTODATE))
770	/* nop */;	740	/* nop */;
771	else if (action == UP_OBJ_INSERT)	741	else if (action == UP_OBJ_INSERT)
772	{	742	{
		743	#if 0
773	// this is likely overkill, TODO: revisit (schmorp)	744	// this is likely overkill, TODO: revisit (schmorp)
774	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))	745	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
775	|| (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))	746	|| (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))
776	|| (op->type == PLAYER && !(m.flags_ & P_PLAYER))	747	|| (op->is_player () && !(m.flags_ & P_PLAYER))
777	|| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))	748	|| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
778	|| (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))	749	|| (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))
779	|| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))	750	|| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))
780	|| (m.move_on | op->move_on ) != m.move_on	751	|| (m.move_on | op->move_on ) != m.move_on
781	|| (m.move_off | op->move_off ) != m.move_off	752	|| (m.move_off | op->move_off ) != m.move_off
782	|| (m.move_slow | op->move_slow) != m.move_slow	753	|| (m.move_slow | op->move_slow) != m.move_slow
783	/* This isn't perfect, but I don't expect a lot of objects to	754	/* This isn't perfect, but I don't expect a lot of objects to
784	* to have move_allow right now.	755	* have move_allow right now.
785	*/	756	*/
786	|| ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block	757	|| ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block
		758	m.invalidate ();
		759	#else
787	|| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)	760	// the above is not strong enough a test to skip updating. los maybe? TODO (schmorp)
788	m.flags_ = 0;	761	m.invalidate ();
		762	#endif
789	}	763	}
790	/* if the object is being removed, we can't make intelligent	764	/* if the object is being removed, we can't make intelligent
791	* decisions, because remove_ob can't really pass the object	765	* decisions, because remove_ob can't really pass the object
792	* that is being removed.	766	* that is being removed.
793	*/	767	*/
794	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)	768	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
795	m.flags_ = 0;	769	m.invalidate ();
796	else if (action == UP_OBJ_FACE)	770	else if (action == UP_OBJ_FACE)
797	/* Nothing to do for that case */ ;	771	/* Nothing to do for that case */ ;
798	else	772	else
799	LOG (llevError, "update_object called with invalid action: %d\n", action);	773	LOG (llevError, "update_object called with invalid action: %d\n", action);
800		774
…		…
804		778
805	object::object ()	779	object::object ()
806	{	780	{
807	SET_FLAG (this, FLAG_REMOVED);	781	SET_FLAG (this, FLAG_REMOVED);
808		782
809	expmul = 1.0;	783	//expmul = 1.0; declared const for the time being
810	face = blank_face;	784	face = blank_face;
811	}	785	}
812		786
813	object::~object ()	787	object::~object ()
814	{	788	{
…		…
844	/* If already on active list, don't do anything */	818	/* If already on active list, don't do anything */
845	if (active)	819	if (active)
846	return;	820	return;
847		821
848	if (has_active_speed ())	822	if (has_active_speed ())
		823	{
		824	if (flag [FLAG_FREED])
		825	LOG (llevError | logBacktrace, "BUG: tried to activate freed object %s\n", debug_desc ());//D
		826
849	actives.insert (this);	827	actives.insert (this);
		828	}
850	}	829	}
851		830
852	void	831	void
853	object::activate_recursive ()	832	object::activate_recursive ()
854	{	833	{
…		…
915	* drop on that space.	894	* drop on that space.
916	*/	895	*/
917	if (!drop_to_ground	896	if (!drop_to_ground
918	|| !map	897	|| !map
919	|| map->in_memory != MAP_ACTIVE	898	|| map->in_memory != MAP_ACTIVE
920	|| map->nodrop	899	|| map->no_drop
921	|| ms ().move_block == MOVE_ALL)	900	|| ms ().move_block == MOVE_ALL)
922	{	901	{
923	while (inv)	902	while (inv)
924	{
925	inv->destroy_inv (false);
926	inv->destroy ();	903	inv->destroy ();
927	}
928	}	904	}
929	else	905	else
930	{ /* Put objects in inventory onto this space */	906	{ /* Put objects in inventory onto this space */
931	while (inv)	907	while (inv)
932	{	908	{
…		…
936	|| op->flag [FLAG_NO_DROP]	912	|| op->flag [FLAG_NO_DROP]
937	|| op->type == RUNE	913	|| op->type == RUNE
938	|| op->type == TRAP	914	|| op->type == TRAP
939	|| op->flag [FLAG_IS_A_TEMPLATE]	915	|| op->flag [FLAG_IS_A_TEMPLATE]
940	|| op->flag [FLAG_DESTROY_ON_DEATH])	916	|| op->flag [FLAG_DESTROY_ON_DEATH])
941	op->destroy (true);	917	op->destroy ();
942	else	918	else
943	map->insert (op, x, y);	919	map->insert (op, x, y);
944	}	920	}
945	}	921	}
946	}	922	}
…		…
954		930
955	static struct freed_map : maptile	931	static struct freed_map : maptile
956	{	932	{
957	freed_map ()	933	freed_map ()
958	{	934	{
959	path = "<freed objects map>";	935	path = "<freed objects map>";
960	name = "/internal/freed_objects_map";	936	name = "/internal/freed_objects_map";
961	width = 3;	937	width = 3;
962	height = 3;	938	height = 3;
963	nodrop = 1;	939	no_drop = 1;
		940	no_reset = 1;
964		941
965	alloc ();	942	alloc ();
966	in_memory = MAP_ACTIVE;	943	in_memory = MAP_ACTIVE;
967	}	944	}
		945
		946	~freed_map ()
		947	{
		948	destroy ();
		949	}
968	} freed_map; // freed objects are moved here to avoid crashes	950	} freed_map; // freed objects are moved here to avoid crashes
969		951
970	void	952	void
971	object::do_destroy ()	953	object::do_destroy ()
972	{	954	{
973	if (flag [FLAG_IS_LINKED])	955	if (flag [FLAG_IS_LINKED])
974	remove_button_link (this);	956	remove_link ();
975		957
976	if (flag [FLAG_FRIENDLY])	958	if (flag [FLAG_FRIENDLY])
977	remove_friendly_object (this);	959	remove_friendly_object (this);
978		960
979	remove ();	961	remove ();
…		…
1004	attacked_by = 0;	986	attacked_by = 0;
1005	current_weapon = 0;	987	current_weapon = 0;
1006	}	988	}
1007		989
1008	void	990	void
1009	object::destroy (bool destroy_inventory)	991	object::destroy ()
1010	{	992	{
1011	if (destroyed ())	993	if (destroyed ())
1012	return;	994	return;
1013		995
1014	if (!is_head () && !head->destroyed ())	996	if (!is_head () && !head->destroyed ())
1015	{	997	{
1016	LOG (llevError | logBacktrace, "tried to destroy the tail of an object");	998	LOG (llevError | logBacktrace, "tried to destroy the tail of an object");
1017	head->destroy (destroy_inventory);	999	head->destroy ();
1018	return;	1000	return;
1019	}	1001	}
1020		1002
1021	destroy_inv (!destroy_inventory);	1003	destroy_inv (false);
1022		1004
1023	if (is_head ())	1005	if (is_head ())
1024	if (sound_destroy)	1006	if (sound_destroy)
1025	play_sound (sound_destroy);	1007	play_sound (sound_destroy);
1026	else if (flag [FLAG_MONSTER])	1008	else if (flag [FLAG_MONSTER])
…		…
1037	* the previous environment.	1019	* the previous environment.
1038	*/	1020	*/
1039	void	1021	void
1040	object::do_remove ()	1022	object::do_remove ()
1041	{	1023	{
1042	object *tmp, *last = 0;
1043	object *otmp;
1044
1045	if (flag [FLAG_REMOVED])	1024	if (flag [FLAG_REMOVED])
1046	return;	1025	return;
1047		1026
1048	INVOKE_OBJECT (REMOVE, this);	1027	INVOKE_OBJECT (REMOVE, this);
1049		1028
…		…
1063	esrv_del_item (pl->contr, count);	1042	esrv_del_item (pl->contr, count);
1064	flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed	1043	flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed
1065		1044
1066	adjust_weight (env, -total_weight ());	1045	adjust_weight (env, -total_weight ());
1067		1046
1068	*(above ? &above->below : &env->inv) = below;	1047	object *pl = in_player ();
1069
1070	if (below)
1071	below->above = above;
1072		1048
1073	/* we set up values so that it could be inserted into	1049	/* we set up values so that it could be inserted into
1074	* the map, but we don't actually do that - it is up	1050	* the map, but we don't actually do that - it is up
1075	* to the caller to decide what we want to do.	1051	* to the caller to decide what we want to do.
1076	*/	1052	*/
1077	map = env->map;	1053	map = env->map;
1078	x = env->x;	1054	x = env->x;
1079	y = env->y;	1055	y = env->y;
		1056
		1057	// make sure cmov optimisation is applicable
		1058	*(above ? &above->below : &env->inv) = below;
		1059	*(below ? &below->above : &above ) = above; // &above is just a dummy
		1060
1080	above = 0;	1061	above = 0;
1081	below = 0;	1062	below = 0;
1082	env = 0;	1063	env = 0;
1083		1064
1084	/* NO_FIX_PLAYER is set when a great many changes are being	1065	/* NO_FIX_PLAYER is set when a great many changes are being
1085	* made to players inventory. If set, avoiding the call	1066	* made to players inventory. If set, avoiding the call
1086	* to save cpu time.	1067	* to save cpu time.
1087	*/	1068	*/
1088	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1069	if (pl)
		1070	if (pl->is_player () && (glow_radius || !QUERY_FLAG (pl, FLAG_NO_FIX_PLAYER)))
		1071	{
1089	otmp->update_stats ();	1072	pl->update_stats ();
		1073
		1074	if (glow_radius && pl->is_on_map ())
		1075	update_all_los (pl->map, pl->x, pl->y);
		1076	}
1090	}	1077	}
1091	else if (map)	1078	else if (map)
1092	{	1079	{
1093	map->dirty = true;	1080	map->dirty = true;
1094	mapspace &ms = this->ms ();	1081	mapspace &ms = this->ms ();
1095		1082
1096	if (object *pl = ms.player ())	1083	if (object *pl = ms.player ())
1097	{	1084	{
1098	if (type == PLAYER) // this == pl(!)	1085	if (is_player ())
1099	{	1086	{
		1087	if (!flag [FLAG_WIZPASS])
		1088	ms.smell = ++mapspace::smellcount; // remember the smell of the player
		1089
1100	// leaving a spot always closes any open container on the ground	1090	// leaving a spot always closes any open container on the ground
1101	if (container && !container->env)	1091	if (container && !container->env)
1102	// this causes spurious floorbox updates, but it ensures	1092	// this causes spurious floorbox updates, but it ensures
1103	// that the CLOSE event is being sent.	1093	// that the CLOSE event is being sent.
1104	close_container ();	1094	close_container ();
1105		1095
1106	--map->players;	1096	--map->players;
1107	map->touch ();	1097	map->touch ();
1108	}	1098	}
1109	else if (pl->container == this)	1099	else if (pl->container_ () == this)
1110	{	1100	{
1111	// removing a container should close it	1101	// removing a container should close it
1112	close_container ();	1102	close_container ();
1113	}	1103	}
1114		1104
1115	esrv_del_item (pl->contr, count);	1105	esrv_del_item (pl->contr, count);
1116	}	1106	}
1117		1107
1118	/* link the object above us */	1108	/* link the object above us */
1119	if (above)	1109	// re-link, make sure compiler can easily use cmove
1120	above->below = below;	1110	*(above ? &above->below : &ms.top) = below;
1121	else	1111	*(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		1112
1139	above = 0;	1113	above = 0;
1140	below = 0;	1114	below = 0;
1141		1115
		1116	ms.invalidate ();
		1117
1142	if (map->in_memory == MAP_SAVING)	1118	if (map->in_memory == MAP_SAVING)
1143	return;	1119	return;
1144		1120
1145	int check_walk_off = !flag [FLAG_NO_APPLY];	1121	int check_walk_off = !flag [FLAG_NO_APPLY];
1146		1122
1147	if (object *pl = ms.player ())	1123	if (object *pl = ms.player ())
1148	{	1124	{
1149	if (pl->container == this)	1125	if (pl->container_ () == this)
1150	/* If a container that the player is currently using somehow gets	1126	/* If a container that the player is currently using somehow gets
1151	* removed (most likely destroyed), update the player view	1127	* removed (most likely destroyed), update the player view
1152	* appropriately.	1128	* appropriately.
1153	*/	1129	*/
1154	pl->close_container ();	1130	pl->close_container ();
…		…
1158	//TODO: update floorbox to preserve ordering	1134	//TODO: update floorbox to preserve ordering
1159	if (pl->contr->ns)	1135	if (pl->contr->ns)
1160	pl->contr->ns->floorbox_update ();	1136	pl->contr->ns->floorbox_update ();
1161	}	1137	}
1162		1138
		1139	if (check_walk_off)
1163	for (tmp = ms.bot; tmp; tmp = tmp->above)	1140	for (object *above, *tmp = ms.bot; tmp; tmp = above)
1164	{	1141	{
		1142	above = tmp->above;
		1143
1165	/* No point updating the players look faces if he is the object	1144	/* No point updating the players look faces if he is the object
1166	* being removed.	1145	* being removed.
1167	*/	1146	*/
1168		1147
1169	/* See if object moving off should effect something */	1148	/* See if object moving off should effect something */
1170	if (check_walk_off
1171	&& ((move_type & tmp->move_off)	1149	if ((move_type & tmp->move_off)
1172	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))	1150	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0)
1173	{
1174	move_apply (tmp, this, 0);	1151	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	}	1152	}
1179		1153
1180	last = tmp;	1154	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);	1155	update_all_los (map, x, y);
1192	}	1156	}
1193	}	1157	}
1194		1158
1195	/*	1159	/*
…		…
1219	esrv_update_item (UPD_NROF, pl, top);	1183	esrv_update_item (UPD_NROF, pl, top);
1220		1184
1221	op->weight = 0; // cancel the addition above	1185	op->weight = 0; // cancel the addition above
1222	op->carrying = 0; // must be 0 already	1186	op->carrying = 0; // must be 0 already
1223		1187
1224	op->destroy (1);	1188	op->destroy ();
1225		1189
1226	return top;	1190	return top;
1227	}	1191	}
1228		1192
1229	return 0;	1193	return 0;
…		…
1257	* job preparing multi-part monsters.	1221	* job preparing multi-part monsters.
1258	*/	1222	*/
1259	object *	1223	object *
1260	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)	1224	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1261	{	1225	{
		1226	op->remove ();
		1227
1262	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)	1228	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1263	{	1229	{
1264	tmp->x = x + tmp->arch->x;	1230	tmp->x = x + tmp->arch->x;
1265	tmp->y = y + tmp->arch->y;	1231	tmp->y = y + tmp->arch->y;
1266	}	1232	}
…		…
1289	* just 'op' otherwise	1255	* just 'op' otherwise
1290	*/	1256	*/
1291	object *	1257	object *
1292	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)	1258	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1293	{	1259	{
1294	assert (!op->flag [FLAG_FREED]);
1295
1296	op->remove ();	1260	op->remove ();
		1261
		1262	if (m == &freed_map)//D TODO: remove soon
		1263	{//D
		1264	LOG (llevError | logBacktrace, "tries to insret object on freed objects map: %s", op->debug_desc ());//D
		1265	}//D
1297		1266
1298	/* Ideally, the caller figures this out. However, it complicates a lot	1267	/* 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	1268	* of areas of callers (eg, anything that uses find_free_spot would now
1300	* need extra work	1269	* need extra work
1301	*/	1270	*/
		1271	maptile *newmap = m;
1302	if (!xy_normalise (m, op->x, op->y))	1272	if (!xy_normalise (newmap, op->x, op->y))
1303	{	1273	{
1304	op->destroy (1);	1274	op->head_ ()->destroy ();// remove head_ once all tail object destroyers found
1305	return 0;	1275	return 0;
1306	}	1276	}
1307		1277
1308	if (object *more = op->more)	1278	if (object *more = op->more)
1309	if (!insert_ob_in_map (more, m, originator, flag))	1279	if (!insert_ob_in_map (more, m, originator, flag))
1310	return 0;	1280	return 0;
1311		1281
1312	CLEAR_FLAG (op, FLAG_REMOVED);	1282	op->flag [FLAG_REMOVED] = false;
1313		1283	op->env = 0;
1314	op->map = m;	1284	op->map = newmap;
		1285
1315	mapspace &ms = op->ms ();	1286	mapspace &ms = op->ms ();
1316		1287
1317	/* this has to be done after we translate the coordinates.	1288	/* this has to be done after we translate the coordinates.
1318	*/	1289	*/
1319	if (op->nrof && !(flag & INS_NO_MERGE))	1290	if (op->nrof && !(flag & INS_NO_MERGE))
1320	for (object *tmp = ms.bot; tmp; tmp = tmp->above)	1291	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1321	if (object::can_merge (op, tmp))	1292	if (object::can_merge (op, tmp))
1322	{	1293	{
1323	// TODO: we atcually want to update tmp, not op,	1294	// TODO: we actually want to update tmp, not op,
1324	// but some caller surely breaks when we return tmp	1295	// but some caller surely breaks when we return tmp
1325	// from here :/	1296	// from here :/
1326	op->nrof += tmp->nrof;	1297	op->nrof += tmp->nrof;
1327	tmp->destroy (1);	1298	tmp->destroy ();
1328	}	1299	}
1329		1300
1330	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1301	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1331	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1302	CLEAR_FLAG (op, FLAG_INV_LOCKED);
1332		1303
…		…
1339	{	1310	{
1340	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");	1311	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");
1341	abort ();	1312	abort ();
1342	}	1313	}
1343		1314
		1315	if (!originator->is_on_map ())
		1316	{
		1317	LOG (llevError, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map",
		1318	op->debug_desc (), originator->debug_desc ());
		1319	abort ();
		1320	}
		1321
1344	op->above = originator;	1322	op->above = originator;
1345	op->below = originator->below;	1323	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;	1324	originator->below = op;
		1325
		1326	*(op->below ? &op->below->above : &ms.bot) = op;
1354	}	1327	}
1355	else	1328	else
1356	{	1329	{
1357	object *top, *floor = NULL;	1330	object *floor = 0;
1358		1331	object *top = ms.top;
1359	top = ms.bot;
1360		1332
1361	/* If there are other objects, then */	1333	/* If there are other objects, then */
1362	if (top)	1334	if (top)
1363	{	1335	{
1364	object *last = 0;
1365
1366	/*	1336	/*
1367	* If there are multiple objects on this space, we do some trickier handling.	1337	* If there are multiple objects on this space, we do some trickier handling.
1368	* We've already dealt with merging if appropriate.	1338	* We've already dealt with merging if appropriate.
1369	* Generally, we want to put the new object on top. But if	1339	* Generally, we want to put the new object on top. But if
1370	* flag contains INS_ABOVE_FLOOR_ONLY, once we find the last	1340	* 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	1343	* 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	1344	* 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	1345	* when lots of spells are cast in one area. Currently, it is presumed
1376	* that flying non pickable objects are spell objects.	1346	* that flying non pickable objects are spell objects.
1377	*/	1347	*/
1378	for (top = ms.bot; top; top = top->above)	1348	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1379	{	1349	{
1380	if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))	1350	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) || QUERY_FLAG (tmp, FLAG_OVERLAY_FLOOR))
1381	floor = top;	1351	floor = tmp;
1382		1352
1383	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))	1353	if (QUERY_FLAG (tmp, FLAG_NO_PICK) && (tmp->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1384	{	1354	{
1385	/* We insert above top, so we want this object below this */	1355	/* We insert above top, so we want this object below this */
1386	top = top->below;	1356	top = tmp->below;
1387	break;	1357	break;
1388	}	1358	}
1389		1359
1390	last = top;	1360	top = tmp;
1391	}	1361	}
1392
1393	/* Don't want top to be NULL, so set it to the last valid object */
1394	top = last;
1395		1362
1396	/* We let update_position deal with figuring out what the space	1363	/* We let update_position deal with figuring out what the space
1397	* looks like instead of lots of conditions here.	1364	* looks like instead of lots of conditions here.
1398	* makes things faster, and effectively the same result.	1365	* makes things faster, and effectively the same result.
1399	*/	1366	*/
…		…
1406	*/	1373	*/
1407	if (!(flag & INS_ON_TOP)	1374	if (!(flag & INS_ON_TOP)
1408	&& ms.flags () & P_BLOCKSVIEW	1375	&& ms.flags () & P_BLOCKSVIEW
1409	&& (op->face && !faces [op->face].visibility))	1376	&& (op->face && !faces [op->face].visibility))
1410	{	1377	{
		1378	object *last;
		1379
1411	for (last = top; last != floor; last = last->below)	1380	for (last = top; last != floor; last = last->below)
1412	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1381	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1413	break;	1382	break;
1414		1383
1415	/* Check to see if we found the object that blocks view,	1384	/* Check to see if we found the object that blocks view,
…		…
1423	} /* If objects on this space */	1392	} /* If objects on this space */
1424		1393
1425	if (flag & INS_ABOVE_FLOOR_ONLY)	1394	if (flag & INS_ABOVE_FLOOR_ONLY)
1426	top = floor;	1395	top = floor;
1427		1396
1428	/* Top is the object that our object (op) is going to get inserted above.	1397	// insert object above top, or bottom-most if top = 0
1429	*/
1430
1431	/* First object on this space */
1432	if (!top)	1398	if (!top)
1433	{	1399	{
		1400	op->below = 0;
1434	op->above = ms.bot;	1401	op->above = ms.bot;
1435
1436	if (op->above)
1437	op->above->below = op;
1438
1439	op->below = 0;
1440	ms.bot = op;	1402	ms.bot = op;
		1403
		1404	*(op->above ? &op->above->below : &ms.top) = op;
1441	}	1405	}
1442	else	1406	else
1443	{ /* get inserted into the stack above top */	1407	{
1444	op->above = top->above;	1408	op->above = top->above;
1445
1446	if (op->above)
1447	op->above->below = op;	1409	top->above = op;
1448		1410
1449	op->below = top;	1411	op->below = top;
1450	top->above = op;	1412	*(op->above ? &op->above->below : &ms.top) = op;
1451	}	1413	}
		1414	}
1452		1415
1453	if (!op->above)	1416	if (op->is_player ())
1454	ms.top = op;
1455	} /* else not INS_BELOW_ORIGINATOR */
1456
1457	if (op->type == PLAYER)
1458	{	1417	{
1459	op->contr->do_los = 1;	1418	op->contr->do_los = 1;
1460	++op->map->players;	1419	++op->map->players;
1461	op->map->touch ();	1420	op->map->touch ();
1462	}	1421	}
…		…
1477	* be far away from this change and not affected in any way -	1436	* be far away from this change and not affected in any way -
1478	* this should get redone to only look for players within range,	1437	* this should get redone to only look for players within range,
1479	* or just updating the P_UPTODATE for spaces within this area	1438	* or just updating the P_UPTODATE for spaces within this area
1480	* of effect may be sufficient.	1439	* of effect may be sufficient.
1481	*/	1440	*/
1482	if (op->map->darkness && (op->glow_radius != 0))	1441	if (op->affects_los ())
		1442	{
		1443	op->ms ().invalidate ();
1483	update_all_los (op->map, op->x, op->y);	1444	update_all_los (op->map, op->x, op->y);
		1445	}
1484		1446
1485	/* updates flags (blocked, alive, no magic, etc) for this map space */	1447	/* updates flags (blocked, alive, no magic, etc) for this map space */
1486	update_object (op, UP_OBJ_INSERT);	1448	update_object (op, UP_OBJ_INSERT);
1487		1449
1488	INVOKE_OBJECT (INSERT, op);	1450	INVOKE_OBJECT (INSERT, op);
…		…
1495	* blocked() and wall() work properly), and these flags are updated by	1457	* blocked() and wall() work properly), and these flags are updated by
1496	* update_object().	1458	* update_object().
1497	*/	1459	*/
1498		1460
1499	/* if this is not the head or flag has been passed, don't check walk on status */	1461	/* 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)	1462	if (!(flag & INS_NO_WALK_ON) && op->is_head ())
1501	{	1463	{
1502	if (check_move_on (op, originator))	1464	if (check_move_on (op, originator))
1503	return 0;	1465	return 0;
1504		1466
1505	/* If we are a multi part object, lets work our way through the check	1467	/* 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	1478	/* 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.	1479	* 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.	1480	* op is the object to insert it under: supplies x and the map.
1519	*/	1481	*/
1520	void	1482	void
1521	replace_insert_ob_in_map (const char *arch_string, object *op)	1483	replace_insert_ob_in_map (shstr_tmp archname, object *op)
1522	{	1484	{
1523	/* first search for itself and remove any old instances */	1485	/* first search for itself and remove any old instances */
1524		1486
1525	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)	1487	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1526	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */	1488	if (tmp->arch->archname == archname) /* same archetype */
1527	tmp->destroy (1);	1489	tmp->destroy ();
1528		1490
1529	object *tmp = arch_to_object (archetype::find (arch_string));	1491	object *tmp = arch_to_object (archetype::find (archname));
1530		1492
1531	tmp->x = op->x;	1493	tmp->x = op->x;
1532	tmp->y = op->y;	1494	tmp->y = op->y;
1533		1495
1534	insert_ob_in_map (tmp, op->map, op, 0);	1496	insert_ob_in_map (tmp, op->map, op, 0);
…		…
1556	if (!nr)	1518	if (!nr)
1557	return true;	1519	return true;
1558		1520
1559	nr = min (nr, nrof);	1521	nr = min (nr, nrof);
1560		1522
		1523	if (nrof > nr)
		1524	{
1561	nrof -= nr;	1525	nrof -= nr;
1562
1563	if (nrof)
1564	{
1565	adjust_weight (env, -weight * nr); // carrying == 0	1526	adjust_weight (env, -weight * max (1, nr)); // carrying == 0
1566		1527
1567	if (object *pl = visible_to ())	1528	if (object *pl = visible_to ())
1568	esrv_update_item (UPD_NROF, pl, this);	1529	esrv_update_item (UPD_NROF, pl, this);
1569		1530
1570	return true;	1531	return true;
1571	}	1532	}
1572	else	1533	else
1573	{	1534	{
1574	destroy (1);	1535	destroy ();
1575	return false;	1536	return false;
1576	}	1537	}
1577	}	1538	}
1578		1539
1579	/*	1540	/*
…		…
1596	}	1557	}
1597	else	1558	else
1598	{	1559	{
1599	decrease (nr);	1560	decrease (nr);
1600		1561
1601	object *op = object_create_clone (this);	1562	object *op = deep_clone ();
1602	op->nrof = nr;	1563	op->nrof = nr;
1603	return op;	1564	return op;
1604	}	1565	}
1605	}	1566	}
1606		1567
…		…
1656	if (object *pl = tmp->visible_to ())	1617	if (object *pl = tmp->visible_to ())
1657	esrv_update_item (UPD_NROF, pl, tmp);	1618	esrv_update_item (UPD_NROF, pl, tmp);
1658		1619
1659	adjust_weight (this, op->total_weight ());	1620	adjust_weight (this, op->total_weight ());
1660		1621
1661	op->destroy (1);	1622	op->destroy ();
1662	op = tmp;	1623	op = tmp;
1663	goto inserted;	1624	goto inserted;
1664	}	1625	}
1665		1626
1666	op->owner = 0; // it's his/hers now. period.	1627	op->owner = 0; // it's his/hers now. period.
…		…
1684		1645
1685	adjust_weight (this, op->total_weight ());	1646	adjust_weight (this, op->total_weight ());
1686		1647
1687	inserted:	1648	inserted:
1688	/* reset the light list and los of the players on the map */	1649	/* reset the light list and los of the players on the map */
1689	if (op->glow_radius && map && map->darkness)	1650	if (op->glow_radius && is_on_map ())
		1651	{
		1652	update_stats ();
1690	update_all_los (map, x, y);	1653	update_all_los (map, x, y);
1691		1654	}
		1655	else if (is_player () && !flag [FLAG_NO_FIX_PLAYER])
1692	// if this is a player's inventory, update stats	1656	// if this is a player's inventory, update stats
1693	if (type == PLAYER && !flag [FLAG_NO_FIX_PLAYER])
1694	update_stats ();	1657	update_stats ();
1695		1658
1696	INVOKE_OBJECT (INSERT, this);	1659	INVOKE_OBJECT (INSERT, this);
1697		1660
1698	return op;	1661	return op;
…		…
1719	* on top.	1682	* on top.
1720	*/	1683	*/
1721	int	1684	int
1722	check_move_on (object *op, object *originator)	1685	check_move_on (object *op, object *originator)
1723	{	1686	{
		1687	if (QUERY_FLAG (op, FLAG_NO_APPLY))
		1688	return 0;
		1689
1724	object *tmp;	1690	object *tmp;
1725	maptile *m = op->map;	1691	maptile *m = op->map;
1726	int x = op->x, y = op->y;	1692	int x = op->x, y = op->y;
1727		1693
1728	MoveType move_on, move_slow, move_block;	1694	mapspace &ms = m->at (x, y);
1729		1695
1730	if (QUERY_FLAG (op, FLAG_NO_APPLY))	1696	ms.update ();
1731	return 0;
1732		1697
1733	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);	1698	MoveType move_on = ms.move_on;
1734	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);	1699	MoveType move_slow = ms.move_slow;
1735	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);	1700	MoveType move_block = ms.move_block;
1736		1701
1737	/* if nothing on this space will slow op down or be applied,	1702	/* 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	1703	* 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	1704	* is set, as lots of objects don't have it set - we treat that
1740	* as walking.	1705	* as walking.
…		…
1751	return 0;	1716	return 0;
1752		1717
1753	/* The objects have to be checked from top to bottom.	1718	/* The objects have to be checked from top to bottom.
1754	* Hence, we first go to the top:	1719	* Hence, we first go to the top:
1755	*/	1720	*/
1756		1721	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	}	1722	{
		1723	next = tmp->below;
1766		1724
1767	for (; tmp; tmp = tmp->below)
1768	{
1769	if (tmp == op)	1725	if (tmp == op)
1770	continue; /* Can't apply yourself */	1726	continue; /* Can't apply yourself */
1771		1727
1772	/* Check to see if one of the movement types should be slowed down.	1728	/* 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	1729	* Second check makes sure that the movement types not being slowed
…		…
1778	if (!QUERY_FLAG (op, FLAG_WIZPASS))	1734	if (!QUERY_FLAG (op, FLAG_WIZPASS))
1779	{	1735	{
1780	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||	1736	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))	1737	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1782	{	1738	{
1783
1784	float
1785	diff = tmp->move_slow_penalty * fabs (op->speed);	1739	float diff = tmp->move_slow_penalty * fabs (op->speed);
1786		1740
1787	if (op->type == PLAYER)	1741	if (op->is_player ())
1788	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||	1742	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)))	1743	(tmp->flag [FLAG_IS_WOODED] && find_skill_by_number (op, SK_WOODSMAN)))
1790	diff /= 4.0;	1744	diff /= 4.0;
1791		1745
1792	op->speed_left -= diff;	1746	op->speed_left -= diff;
1793	}	1747	}
1794	}	1748	}
…		…
1827	LOG (llevError, "Present_arch called outside map.\n");	1781	LOG (llevError, "Present_arch called outside map.\n");
1828	return NULL;	1782	return NULL;
1829	}	1783	}
1830		1784
1831	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)	1785	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1832	if (tmp->arch == at)	1786	if (tmp->arch->archname == at->archname)
1833	return tmp;	1787	return tmp;
1834		1788
1835	return NULL;	1789	return NULL;
1836	}	1790	}
1837		1791
…		…
1901	* The first matching object is returned, or NULL if none.	1855	* The first matching object is returned, or NULL if none.
1902	*/	1856	*/
1903	object *	1857	object *
1904	present_arch_in_ob (const archetype *at, const object *op)	1858	present_arch_in_ob (const archetype *at, const object *op)
1905	{	1859	{
1906	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)	1860	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1907	if (tmp->arch == at)	1861	if (tmp->arch->archname == at->archname)
1908	return tmp;	1862	return tmp;
1909		1863
1910	return NULL;	1864	return NULL;
1911	}	1865	}
1912		1866
…		…
2000	* head of the object should correspond for the entire object.	1954	* head of the object should correspond for the entire object.
2001	*/	1955	*/
2002	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))	1956	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
2003	continue;	1957	continue;
2004		1958
2005	if (ob->blocked (m, pos.x, pos.y))	1959	if (ob->blocked (pos.m, pos.x, pos.y))
2006	continue;	1960	continue;
2007		1961
2008	altern [index++] = i;	1962	altern [index++] = i;
2009	}	1963	}
2010		1964
…		…
2078	* there is capable of.	2032	* there is capable of.
2079	*/	2033	*/
2080	int	2034	int
2081	find_dir (maptile *m, int x, int y, object *exclude)	2035	find_dir (maptile *m, int x, int y, object *exclude)
2082	{	2036	{
2083	int i, max = SIZEOFFREE, mflags;	2037	int max = SIZEOFFREE, mflags;
2084
2085	sint16 nx, ny;
2086	object *tmp;
2087	maptile *mp;
2088
2089	MoveType blocked, move_type;	2038	MoveType move_type;
2090		2039
2091	if (exclude && exclude->head_ () != exclude)	2040	if (exclude && exclude->head_ () != exclude)
2092	{	2041	{
2093	exclude = exclude->head;	2042	exclude = exclude->head;
2094	move_type = exclude->move_type;	2043	move_type = exclude->move_type;
…		…
2097	{	2046	{
2098	/* If we don't have anything, presume it can use all movement types. */	2047	/* If we don't have anything, presume it can use all movement types. */
2099	move_type = MOVE_ALL;	2048	move_type = MOVE_ALL;
2100	}	2049	}
2101		2050
2102	for (i = 1; i < max; i++)	2051	for (int i = 1; i < max; i++)
2103	{	2052	{
2104	mp = m;	2053	mapxy pos (m, x, y);
2105	nx = x + freearr_x[i];	2054	pos.move (i);
2106	ny = y + freearr_y[i];
2107		2055
2108	mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);	2056	if (!pos.normalise ())
2109
2110	if (mflags & P_OUT_OF_MAP)
2111	max = maxfree[i];	2057	max = maxfree[i];
2112	else	2058	else
2113	{	2059	{
2114	mapspace &ms = mp->at (nx, ny);	2060	mapspace &ms = *pos;
2115		2061
2116	blocked = ms.move_block;
2117
2118	if ((move_type & blocked) == move_type)	2062	if ((move_type & ms.move_block) == move_type)
2119	max = maxfree[i];	2063	max = maxfree [i];
2120	else if (mflags & P_IS_ALIVE)	2064	else if (ms.flags () & P_IS_ALIVE)
2121	{	2065	{
2122	for (tmp = ms.bot; tmp; tmp = tmp->above)	2066	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
2123	if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)	2067	if ((tmp->flag [FLAG_MONSTER] || tmp->is_player ())
2124	&& (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))	2068	&& (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2125	break;
2126
2127	if (tmp)
2128	return freedir[i];	2069	return freedir [i];
2129	}	2070	}
2130	}	2071	}
2131	}	2072	}
2132		2073
2133	return 0;	2074	return 0;
…		…
2208	* This basically means that if direction is 15, then it could either go	2149	* 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.	2150	* 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	2151	* Moved from spell_util.c to object.c with the other related direction
2211	* functions.	2152	* functions.
2212	*/	2153	*/
2213	int reduction_dir[SIZEOFFREE][3] = {	2154	static const int reduction_dir[SIZEOFFREE][3] = {
2214	{0, 0, 0}, /* 0 */	2155	{0, 0, 0}, /* 0 */
2215	{0, 0, 0}, /* 1 */	2156	{0, 0, 0}, /* 1 */
2216	{0, 0, 0}, /* 2 */	2157	{0, 0, 0}, /* 2 */
2217	{0, 0, 0}, /* 3 */	2158	{0, 0, 0}, /* 3 */
2218	{0, 0, 0}, /* 4 */	2159	{0, 0, 0}, /* 4 */
…		…
2314	int	2255	int
2315	can_pick (const object *who, const object *item)	2256	can_pick (const object *who, const object *item)
2316	{	2257	{
2317	return /*QUERY_FLAG(who,FLAG_WIZ)|| */	2258	return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2318	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&	2259	(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));	2260	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->is_player () || item->weight < who->weight / 3));
2320	}	2261	}
2321		2262
2322	/*	2263	/*
2323	* create clone from object to another	2264	* create clone from object to another
2324	*/	2265	*/
2325	object *	2266	object *
2326	object_create_clone (object *asrc)	2267	object::deep_clone ()
2327	{	2268	{
		2269	assert (("deep_clone called on non-head object", is_head ()));
		2270
2328	object *dst = 0;	2271	object *dst = clone ();
2329		2272
2330	if (!asrc)
2331	return 0;
2332
2333	object *src = asrc->head_ ();
2334
2335	object *prev = 0;	2273	object *prev = dst;
2336	for (object *part = src; part; part = part->more)	2274	for (object *part = this->more; part; part = part->more)
2337	{	2275	{
2338	object *tmp = part->clone ();	2276	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;	2277	tmp->head = dst;
2350
2351	tmp->more = 0;
2352
2353	if (prev)
2354	prev->more = tmp;	2278	prev->more = tmp;
2355
2356	prev = tmp;	2279	prev = tmp;
2357	}	2280	}
2358		2281
2359	for (object *item = src->inv; item; item = item->below)	2282	for (object *item = inv; item; item = item->below)
2360	insert_ob_in_ob (object_create_clone (item), dst);	2283	insert_ob_in_ob (item->deep_clone (), dst);
2361		2284
2362	return dst;	2285	return dst;
2363	}	2286	}
2364		2287
2365	/* This returns the first object in who's inventory that	2288	/* This returns the first object in who's inventory that
…		…
2374	return tmp;	2297	return tmp;
2375		2298
2376	return 0;	2299	return 0;
2377	}	2300	}
2378		2301
2379	/* If ob has a field named key, return the link from the list,	2302	shstr_tmp
2380	* otherwise return NULL.	2303	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	{	2304	{
2388	for (key_value *link = ob->key_values; link; link = link->next)	2305	for (key_value *kv = key_values; kv; kv = kv->next)
2389	if (link->key == key)	2306	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;	2307	return kv->value;
2424		2308
2425	return 0;	2309	return shstr ();
2426	}	2310	}
2427		2311
2428	/*	2312	void
2429	* Updates the canonical_key in op to value.	2313	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	{	2314	{
2441	key_value *field = NULL, *last = NULL;	2315	for (key_value *kv = key_values; kv; kv = kv->next)
2442		2316	if (kv->key == key)
2443	for (field = op->key_values; field != NULL; field = field->next)
2444	{
2445	if (field->key != canonical_key)
2446	{	2317	{
2447	last = field;	2318	kv->value = value;
2448	continue;	2319	return;
2449	}	2320	}
2450		2321
2451	if (value)	2322	key_value *kv = new key_value;
2452	field->value = value;	2323
2453	else	2324	kv->next = key_values;
		2325	kv->key = key;
		2326	kv->value = value;
		2327
		2328	key_values = kv;
		2329	}
		2330
		2331	void
		2332	object::kv_del (shstr_tmp key)
		2333	{
		2334	for (key_value **kvp = &key_values; *kvp; kvp = &(*kvp)->next)
		2335	if ((*kvp)->key == key)
2454	{	2336	{
2455	/* Basically, if the archetype has this key set,	2337	key_value *kv = *kvp;
2456	* we need to store the null value so when we save	2338	*kvp = (*kvp)->next;
2457	* it, we save the empty value so that when we load,	2339	delete kv;
2458	* we get this value back again.	2340	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	}	2341	}
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	}	2342	}
2517		2343
2518	object::depth_iterator::depth_iterator (object *container)	2344	object::depth_iterator::depth_iterator (object *container)
2519	: iterator_base (container)	2345	: iterator_base (container)
2520	{	2346	{
…		…
2570	{	2396	{
2571	char flagdesc[512];	2397	char flagdesc[512];
2572	char info2[256 * 4];	2398	char info2[256 * 4];
2573	char *p = info;	2399	char *p = info;
2574		2400
2575	p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s,flags:[%s],type:%d}",	2401	p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s%s,flags:[%s],type:%d}",
2576	count,	2402	count,
2577	uuid.c_str (),	2403	uuid.c_str (),
2578	&name,	2404	&name,
2579	title ? "\",title:\"" : "",	2405	title ? ",title:\"" : "",
2580	title ? (const char *)title : "",	2406	title ? (const char *)title : "",
		2407	title ? "\"" : "",
2581	flag_desc (flagdesc, 512), type);	2408	flag_desc (flagdesc, 512), type);
2582		2409
2583	if (!flag[FLAG_REMOVED] && env)	2410	if (!flag[FLAG_REMOVED] && env)
2584	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2411	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2585		2412
…		…
2641	container = 0;	2468	container = 0;
2642		2469
2643	// client needs item update to make it work, client bug requires this to be separate	2470	// client needs item update to make it work, client bug requires this to be separate
2644	esrv_update_item (UPD_FLAGS, this, old_container);	2471	esrv_update_item (UPD_FLAGS, this, old_container);
2645		2472
2646	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));	2473	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", old_container->query_name ());
2647	play_sound (sound_find ("chest_close"));	2474	play_sound (sound_find ("chest_close"));
2648	}	2475	}
2649		2476
2650	if (new_container)	2477	if (new_container)
2651	{	2478	{
…		…
2661	closer->flag [FLAG_NO_MAP_SAVE] = 1;	2488	closer->flag [FLAG_NO_MAP_SAVE] = 1;
2662	new_container->insert (closer);	2489	new_container->insert (closer);
2663	}	2490	}
2664	#endif	2491	#endif
2665		2492
2666	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));	2493	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", new_container->query_name ());
2667		2494
2668	// make sure the container is available, client bug requires this to be separate	2495	// make sure the container is available, client bug requires this to be separate
2669	esrv_send_item (this, new_container);	2496	esrv_send_item (this, new_container);
2670		2497
2671	new_container->flag [FLAG_APPLIED] = true;	2498	new_container->flag [FLAG_APPLIED] = true;
…		…
2679	// else if (!old_container->env && contr && contr->ns)	2506	// else if (!old_container->env && contr && contr->ns)
2680	// contr->ns->floorbox_reset ();	2507	// contr->ns->floorbox_reset ();
2681	}	2508	}
2682		2509
2683	object *	2510	object *
2684	object::force_find (const shstr name)	2511	object::force_find (shstr_tmp name)
2685	{	2512	{
2686	/* cycle through his inventory to look for the MARK we want to	2513	/* cycle through his inventory to look for the MARK we want to
2687	* place	2514	* place
2688	*/	2515	*/
2689	for (object *tmp = inv; tmp; tmp = tmp->below)	2516	for (object *tmp = inv; tmp; tmp = tmp->below)
…		…
2691	return splay (tmp);	2518	return splay (tmp);
2692		2519
2693	return 0;	2520	return 0;
2694	}	2521	}
2695		2522
		2523	//-GPL
		2524
2696	void	2525	void
		2526	object::force_set_timer (int duration)
		2527	{
		2528	this->duration = 1;
		2529	this->speed_left = -1.f;
		2530
		2531	this->set_speed (duration ? 1.f / duration : 0.f);
		2532	}
		2533
		2534	object *
2697	object::force_add (const shstr name, int duration)	2535	object::force_add (shstr_tmp name, int duration)
2698	{	2536	{
2699	if (object *force = force_find (name))	2537	if (object *force = force_find (name))
2700	force->destroy ();	2538	force->destroy ();
2701		2539
2702	object *force = get_archetype (FORCE_NAME);	2540	object *force = get_archetype (FORCE_NAME);
2703		2541
2704	force->slaying = name;	2542	force->slaying = name;
2705	force->stats.food = 1;	2543	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;	2544	force->flag [FLAG_APPLIED] = true;
2711		2545
2712	insert (force);	2546	return insert (force);
2713	}	2547	}
2714		2548
2715	void	2549	void
2716	object::play_sound (faceidx sound)	2550	object::play_sound (faceidx sound) const
2717	{	2551	{
2718	if (!sound)	2552	if (!sound)
2719	return;	2553	return;
2720		2554
2721	if (flag [FLAG_REMOVED])	2555	if (is_on_map ())
		2556	map->play_sound (sound, x, y);
		2557	else if (object *pl = in_player ())
		2558	pl->contr->play_sound (sound);
		2559	}
		2560
		2561	void
		2562	object::say_msg (const char *msg) const
		2563	{
		2564	if (is_on_map ())
		2565	map->say_msg (msg, x, y);
		2566	else if (object *pl = in_player ())
		2567	pl->contr->play_sound (sound);
		2568	}
		2569
		2570	void
		2571	object::make_noise ()
		2572	{
		2573	// we do not model noise in the map, so instead put
		2574	// a temporary light into the noise source
		2575	// could use the map instead, but that's less reliable for our
		2576	// goal, which is to make invisibility a bit harder to exploit
		2577
		2578	// currently only works sensibly for players
		2579	if (!is_player ())
2722	return;	2580	return;
2723		2581
2724	if (env)	2582	// find old force, or create new one
2725	{	2583	object *force = force_find (shstr_noise_force);
2726	if (object *pl = in_player ())	2584
2727	pl->contr->play_sound (sound);	2585	if (force)
2728	}	2586	force->speed_left = -1.f; // patch old speed up
2729	else	2587	else
2730	map->play_sound (sound, x, y);	2588	{
2731	}	2589	force = archetype::get (shstr_noise_force);
2732		2590
		2591	force->slaying = shstr_noise_force;
		2592	force->stats.food = 1;
		2593	force->speed_left = -1.f;
		2594
		2595	force->set_speed (1.f / 4.f);
		2596	force->flag [FLAG_IS_USED_UP] = true;
		2597	force->flag [FLAG_APPLIED] = true;
		2598
		2599	insert (force);
		2600	}
		2601	}
		2602

Diff Legend

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