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.214 by root, Tue Apr 22 07:01:46 2008 UTC vs.
Revision 1.298 by root, Sun Nov 8 00:01:33 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
…		…
334		322
335	// find player who can see this object	323	// find player who can see this object
336	object *	324	object *
337	object::visible_to () const	325	object::visible_to () const
338	{	326	{
339	if (!flag [FLAG_REMOVED])	327	if (client_visible () && !flag [FLAG_REMOVED])
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 ())
		351	if ((pl->contr->ns && !pl->container_ () && !pl->contr->ns->update_look)
		352	|| pl->container_ () == this)
363	return pl;	353	return pl;
364	}	354	}
365	}	355	}
366		356
367	return 0;	357	return 0;
368	}	358	}
369		359
370	// adjust weight per container type ("of holding")	360	// adjust weight per container type ("of holding")
371	static sint32	361	static sint32
372	weight_adjust (object *op, sint32 weight)	362	weight_adjust_for (object *op, sint32 weight)
373	{	363	{
374	return op->type == CONTAINER	364	return op->type == CONTAINER
375	? lerp (weight, 0, 100, 0, 100 - op->stats.Str)	365	? lerp (weight, 0, 100, 0, 100 - op->stats.Str)
376	: weight;	366	: weight;
377	}	367	}
…		…
383	static void	373	static void
384	adjust_weight (object *op, sint32 weight)	374	adjust_weight (object *op, sint32 weight)
385	{	375	{
386	while (op)	376	while (op)
387	{	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
388	weight = weight_adjust (op, weight);	380	weight = weight_adjust_for (op, op->carrying)
		381	- weight_adjust_for (op, op->carrying - weight);
389		382
390	if (!weight)	383	if (!weight)
391	return;	384	return;
392		385
393	op->carrying += weight;	386	op->carrying += weight;
394		387
395	if (object *pl = op->visible_to ())	388	if (object *pl = op->visible_to ())
		389	if (pl != op) // player is handled lazily
396	esrv_update_item (UPD_WEIGHT, pl, op);	390	esrv_update_item (UPD_WEIGHT, pl, op);
397		391
398	op = op->env;	392	op = op->env;
399	}	393	}
400	}	394	}
401		395
…		…
415	op->update_weight ();	409	op->update_weight ();
416		410
417	sum += op->total_weight ();	411	sum += op->total_weight ();
418	}	412	}
419		413
420	sum = weight_adjust (this, sum);	414	sum = weight_adjust_for (this, sum);
421		415
422	if (sum != carrying)	416	if (sum != carrying)
423	{	417	{
424	carrying = sum;	418	carrying = sum;
425		419
426	if (object *pl = visible_to ())	420	if (object *pl = visible_to ())
		421	if (pl != this) // player is handled lazily
427	esrv_update_item (UPD_WEIGHT, pl, this);	422	esrv_update_item (UPD_WEIGHT, pl, this);
428	}	423	}
429	}	424	}
430		425
431	/*	426	/*
432	* Used by: Server DM commands: dumpbelow, dump. Some error messages.	427	* Used by: Server DM commands: dumpbelow, dump. Some error messages.
…		…
440	object_freezer freezer;	435	object_freezer freezer;
441	op->write (freezer);	436	op->write (freezer);
442	return freezer.as_string ();	437	return freezer.as_string ();
443	}	438	}
444		439
445	/*	440	char *
446	* get_nearest_part(multi-object, object 2) returns the part of the	441	object::as_string ()
447	* multi-object 1 which is closest to the second object.
448	* If it's not a multi-object, it is returned.
449	*/
450	object *
451	get_nearest_part (object *op, const object *pl)
452	{	442	{
453	object *tmp, *closest;	443	return dump_object (this);
454	int last_dist, i;
455
456	if (!op->more)
457	return op;
458
459	for (last_dist = distance (op, pl), closest = op, tmp = op->more;
460	tmp;
461	tmp = tmp->more)
462	if ((i = distance (tmp, pl)) < last_dist)
463	closest = tmp, last_dist = i;
464
465	return closest;
466	}	444	}
467		445
468	/*	446	/*
469	* 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.
470	* VERRRY slow.	448	* VERRRY slow.
…		…
486	*/	464	*/
487	object *	465	object *
488	find_object_name (const char *str)	466	find_object_name (const char *str)
489	{	467	{
490	shstr_cmp str_ (str);	468	shstr_cmp str_ (str);
491	object *op;
492		469
		470	if (str_)
493	for_all_objects (op)	471	for_all_objects (op)
494	if (op->name == str_)	472	if (op->name == str_)
495	break;	473	return op;
496		474
497	return op;	475	return 0;
498	}	476	}
499		477
500	/*	478	/*
501	* 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
502	* skill and experience objects.	480	* skill and experience objects.
…		…
564	update_stats ();	542	update_stats ();
565		543
566	new_draw_info_format (NDI_UNIQUE, 0, this,	544	new_draw_info_format (NDI_UNIQUE, 0, this,
567	"You try to balance all your items at once, "	545	"You try to balance all your items at once, "
568	"but the %s is just too much for your body. "	546	"but the %s is just too much for your body. "
569	"[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);
570	return false;	549	return false;
571	}	550	}
572		551
573	//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);
574	}	553	}
…		…
600	}	579	}
601		580
602	op->key_values = 0;	581	op->key_values = 0;
603	}	582	}
604		583
605	object &	584	/*
606	object::operator =(const object &src)	585	* copy_to first frees everything allocated by the dst object,
		586	* and then copies the contents of itself into the second
		587	* object, allocating what needs to be allocated. Basically, any
		588	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
		589	* if the first object is freed, the pointers in the new object
		590	* will point at garbage.
		591	*/
		592	void
		593	object::copy_to (object *dst)
607	{	594	{
608	bool is_freed = flag [FLAG_FREED];	595	dst->remove ();
609	bool is_removed = flag [FLAG_REMOVED];
610
611	*(object_copy *)this = src;	596	*(object_copy *)dst = *this;
612
613	flag [FLAG_FREED] = is_freed;
614	flag [FLAG_REMOVED] = is_removed;	597	dst->flag [FLAG_REMOVED] = true;
615		598
616	/* Copy over key_values, if any. */	599	/* Copy over key_values, if any. */
617	if (src.key_values)	600	if (key_values)
618	{	601	{
619	key_value *tail = 0;	602	key_value *tail = 0;
620	key_values = 0;	603	dst->key_values = 0;
621		604
622	for (key_value *i = src.key_values; i; i = i->next)	605	for (key_value *i = key_values; i; i = i->next)
623	{	606	{
624	key_value *new_link = new key_value;	607	key_value *new_link = new key_value;
625		608
626	new_link->next = 0;	609	new_link->next = 0;
627	new_link->key = i->key;	610	new_link->key = i->key;
628	new_link->value = i->value;	611	new_link->value = i->value;
629		612
630	/* Try and be clever here, too. */	613	/* Try and be clever here, too. */
631	if (!key_values)	614	if (!dst->key_values)
632	{	615	{
633	key_values = new_link;	616	dst->key_values = new_link;
634	tail = new_link;	617	tail = new_link;
635	}	618	}
636	else	619	else
637	{	620	{
638	tail->next = new_link;	621	tail->next = new_link;
639	tail = new_link;	622	tail = new_link;
640	}	623	}
641	}	624	}
642	}	625	}
643	}
644
645	/*
646	* copy_to first frees everything allocated by the dst object,
647	* and then copies the contents of itself into the second
648	* object, allocating what needs to be allocated. Basically, any
649	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
650	* if the first object is freed, the pointers in the new object
651	* will point at garbage.
652	*/
653	void
654	object::copy_to (object *dst)
655	{
656	*dst = *this;
657		626
658	if (speed < 0)	627	if (speed < 0)
659	dst->speed_left -= rndm ();	628	dst->speed_left -= rndm ();
660		629
661	dst->set_speed (dst->speed);	630	dst->activate ();
662	}	631	}
663		632
664	void	633	void
665	object::instantiate ()	634	object::instantiate ()
666	{	635	{
…		…
683	object *	652	object *
684	object::clone ()	653	object::clone ()
685	{	654	{
686	object *neu = create ();	655	object *neu = create ();
687	copy_to (neu);	656	copy_to (neu);
		657	neu->map = map; // not copied by copy_to
688	return neu;	658	return neu;
689	}	659	}
690		660
691	/*	661	/*
692	* If an object with the IS_TURNABLE() flag needs to be turned due	662	* If an object with the IS_TURNABLE() flag needs to be turned due
…		…
709	* 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.
710	*/	680	*/
711	void	681	void
712	object::set_speed (float speed)	682	object::set_speed (float speed)
713	{	683	{
714	if (flag [FLAG_FREED] && speed)
715	{
716	LOG (llevError, "Object %s is freed but has speed.\n", &name);
717	speed = 0;
718	}
719
720	this->speed = speed;	684	this->speed = speed;
721		685
722	if (has_active_speed ())	686	if (has_active_speed ())
723	activate ();	687	activate ();
724	else	688	else
…		…
743	* UP_OBJ_FACE: only the objects face has changed.	707	* UP_OBJ_FACE: only the objects face has changed.
744	*/	708	*/
745	void	709	void
746	update_object (object *op, int action)	710	update_object (object *op, int action)
747	{	711	{
748	if (op == NULL)	712	if (!op)
749	{	713	{
750	/* this should never happen */	714	/* this should never happen */
751	LOG (llevDebug, "update_object() called for NULL object.\n");	715	LOG (llevError | logBacktrace, "update_object() called for NULL object.\n");
752	return;	716	return;
753	}	717	}
754		718
755	if (op->env)	719	if (!op->is_on_map ())
756	{	720	{
757	/* Animation is currently handled by client, so nothing	721	/* Animation is currently handled by client, so nothing
758	* to do in this case.	722	* to do in this case.
759	*/	723	*/
760	return;	724	return;
761	}	725	}
762
763	/* If the map is saving, don't do anything as everything is
764	* going to get freed anyways.
765	*/
766	if (!op->map || op->map->in_memory == MAP_SAVING)
767	return;
768		726
769	/* make sure the object is within map boundaries */	727	/* make sure the object is within map boundaries */
770	if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height)	728	if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height)
771	{	729	{
772	LOG (llevError, "update_object() called for object out of map!\n");	730	LOG (llevError, "update_object() called for object out of map!\n");
…		…
780		738
781	if (!(m.flags_ & P_UPTODATE))	739	if (!(m.flags_ & P_UPTODATE))
782	/* nop */;	740	/* nop */;
783	else if (action == UP_OBJ_INSERT)	741	else if (action == UP_OBJ_INSERT)
784	{	742	{
		743	#if 0
785	// this is likely overkill, TODO: revisit (schmorp)	744	// this is likely overkill, TODO: revisit (schmorp)
786	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))	745	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
787	|| (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))	746	|| (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))
788	|| (op->type == PLAYER && !(m.flags_ & P_PLAYER))	747	|| (op->is_player () && !(m.flags_ & P_PLAYER))
789	|| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))	748	|| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
790	|| (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))	749	|| (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))
791	|| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))	750	|| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))
792	|| (m.move_on | op->move_on ) != m.move_on	751	|| (m.move_on | op->move_on ) != m.move_on
793	|| (m.move_off | op->move_off ) != m.move_off	752	|| (m.move_off | op->move_off ) != m.move_off
794	|| (m.move_slow | op->move_slow) != m.move_slow	753	|| (m.move_slow | op->move_slow) != m.move_slow
795	/* 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
796	* to have move_allow right now.	755	* have move_allow right now.
797	*/	756	*/
798	|| ((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
799	|| 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)
800	m.flags_ = 0;	761	m.invalidate ();
		762	#endif
801	}	763	}
802	/* if the object is being removed, we can't make intelligent	764	/* if the object is being removed, we can't make intelligent
803	* decisions, because remove_ob can't really pass the object	765	* decisions, because remove_ob can't really pass the object
804	* that is being removed.	766	* that is being removed.
805	*/	767	*/
806	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)	768	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
807	m.flags_ = 0;	769	m.invalidate ();
808	else if (action == UP_OBJ_FACE)	770	else if (action == UP_OBJ_FACE)
809	/* Nothing to do for that case */ ;	771	/* Nothing to do for that case */ ;
810	else	772	else
811	LOG (llevError, "update_object called with invalid action: %d\n", action);	773	LOG (llevError, "update_object called with invalid action: %d\n", action);
812		774
…		…
816		778
817	object::object ()	779	object::object ()
818	{	780	{
819	SET_FLAG (this, FLAG_REMOVED);	781	SET_FLAG (this, FLAG_REMOVED);
820		782
821	expmul = 1.0;	783	//expmul = 1.0; declared const for the time being
822	face = blank_face;	784	face = blank_face;
823	}	785	}
824		786
825	object::~object ()	787	object::~object ()
826	{	788	{
…		…
856	/* If already on active list, don't do anything */	818	/* If already on active list, don't do anything */
857	if (active)	819	if (active)
858	return;	820	return;
859		821
860	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
861	actives.insert (this);	827	actives.insert (this);
		828	}
862	}	829	}
863		830
864	void	831	void
865	object::activate_recursive ()	832	object::activate_recursive ()
866	{	833	{
…		…
915	object::destroy_inv (bool drop_to_ground)	882	object::destroy_inv (bool drop_to_ground)
916	{	883	{
917	// need to check first, because the checks below might segfault	884	// need to check first, because the checks below might segfault
918	// as we might be on an invalid mapspace and crossfire code	885	// as we might be on an invalid mapspace and crossfire code
919	// is too buggy to ensure that the inventory is empty.	886	// is too buggy to ensure that the inventory is empty.
920	// corollary: if you create arrows etc. with stuff in tis inventory,	887	// corollary: if you create arrows etc. with stuff in its inventory,
921	// cf will crash below with off-map x and y	888	// cf will crash below with off-map x and y
922	if (!inv)	889	if (!inv)
923	return;	890	return;
924		891
925	/* Only if the space blocks everything do we not process -	892	/* Only if the space blocks everything do we not process -
…		…
927	* drop on that space.	894	* drop on that space.
928	*/	895	*/
929	if (!drop_to_ground	896	if (!drop_to_ground
930	|| !map	897	|| !map
931	|| map->in_memory != MAP_ACTIVE	898	|| map->in_memory != MAP_ACTIVE
932	|| map->nodrop	899	|| map->no_drop
933	|| ms ().move_block == MOVE_ALL)	900	|| ms ().move_block == MOVE_ALL)
934	{	901	{
935	while (inv)	902	while (inv)
936	{
937	inv->destroy_inv (drop_to_ground);
938	inv->destroy ();	903	inv->destroy ();
939	}
940	}	904	}
941	else	905	else
942	{ /* Put objects in inventory onto this space */	906	{ /* Put objects in inventory onto this space */
943	while (inv)	907	while (inv)
944	{	908	{
…		…
962	object *op = new object;	926	object *op = new object;
963	op->link ();	927	op->link ();
964	return op;	928	return op;
965	}	929	}
966		930
		931	static struct freed_map : maptile
		932	{
		933	freed_map ()
		934	{
		935	path = "<freed objects map>";
		936	name = "/internal/freed_objects_map";
		937	width = 3;
		938	height = 3;
		939	no_drop = 1;
		940	no_reset = 1;
		941
		942	alloc ();
		943	in_memory = MAP_ACTIVE;
		944	}
		945
		946	~freed_map ()
		947	{
		948	destroy ();
		949	}
		950	} freed_map; // freed objects are moved here to avoid crashes
		951
967	void	952	void
968	object::do_destroy ()	953	object::do_destroy ()
969	{	954	{
970	if (flag [FLAG_IS_LINKED])	955	if (flag [FLAG_IS_LINKED])
971	remove_button_link (this);	956	remove_link ();
972		957
973	if (flag [FLAG_FRIENDLY])	958	if (flag [FLAG_FRIENDLY])
974	remove_friendly_object (this);	959	remove_friendly_object (this);
975		960
976	remove ();	961	remove ();
977		962
978	attachable::do_destroy ();	963	attachable::do_destroy ();
979		964
980	destroy_inv (true);
981
982	deactivate ();	965	deactivate ();
983	unlink ();	966	unlink ();
984		967
985	flag [FLAG_FREED] = 1;	968	flag [FLAG_FREED] = 1;
986		969
987	// hack to ensure that freed objects still have a valid map	970	// hack to ensure that freed objects still have a valid map
988	{
989	static maptile *freed_map; // freed objects are moved here to avoid crashes
990
991	if (!freed_map)
992	{
993	freed_map = new maptile;
994
995	freed_map->path = "<freed objects map>";
996	freed_map->name = "/internal/freed_objects_map";
997	freed_map->width = 3;
998	freed_map->height = 3;
999	freed_map->nodrop = 1;
1000
1001	freed_map->alloc ();
1002	freed_map->in_memory = MAP_ACTIVE;
1003	}
1004
1005	map = freed_map;	971	map = &freed_map;
1006	x = 1;	972	x = 1;
1007	y = 1;	973	y = 1;
1008	}
1009		974
1010	if (more)	975	if (more)
1011	{	976	{
1012	more->destroy ();	977	more->destroy ();
1013	more = 0;	978	more = 0;
…		…
1021	attacked_by = 0;	986	attacked_by = 0;
1022	current_weapon = 0;	987	current_weapon = 0;
1023	}	988	}
1024		989
1025	void	990	void
1026	object::destroy (bool destroy_inventory)	991	object::destroy ()
1027	{	992	{
1028	if (destroyed ())	993	if (destroyed ())
1029	return;	994	return;
1030		995
1031	if (destroy_inventory)	996	if (!is_head () && !head->destroyed ())
		997	{
		998	LOG (llevError | logBacktrace, "tried to destroy the tail of an object");
		999	head->destroy ();
		1000	return;
		1001	}
		1002
1032	destroy_inv (false);	1003	destroy_inv (false);
1033		1004
1034	if (is_head ())	1005	if (is_head ())
1035	if (sound_destroy)	1006	if (sound_destroy)
1036	play_sound (sound_destroy);	1007	play_sound (sound_destroy);
1037	else if (flag [FLAG_MONSTER])	1008	else if (flag [FLAG_MONSTER])
…		…
1048	* the previous environment.	1019	* the previous environment.
1049	*/	1020	*/
1050	void	1021	void
1051	object::do_remove ()	1022	object::do_remove ()
1052	{	1023	{
1053	object *tmp, *last = 0;
1054	object *otmp;
1055
1056	if (flag [FLAG_REMOVED])	1024	if (flag [FLAG_REMOVED])
1057	return;	1025	return;
1058		1026
1059	INVOKE_OBJECT (REMOVE, this);	1027	INVOKE_OBJECT (REMOVE, this);
1060
1061	if (object *pl = visible_to ())
1062	esrv_del_item (pl->contr, count);
1063		1028
1064	flag [FLAG_REMOVED] = true;	1029	flag [FLAG_REMOVED] = true;
1065		1030
1066	if (more)	1031	if (more)
1067	more->remove ();	1032	more->remove ();
…		…
1070	* In this case, the object to be removed is in someones	1035	* In this case, the object to be removed is in someones
1071	* inventory.	1036	* inventory.
1072	*/	1037	*/
1073	if (env)	1038	if (env)
1074	{	1039	{
		1040	flag [FLAG_REMOVED] = false; // hack around the issue of visible_to checking flag_removed
		1041	if (object *pl = visible_to ())
		1042	esrv_del_item (pl->contr, count);
		1043	flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed
		1044
1075	adjust_weight (env, -total_weight ());	1045	adjust_weight (env, -total_weight ());
1076		1046
1077	*(above ? &above->below : &env->inv) = below;	1047	object *pl = in_player ();
1078
1079	if (below)
1080	below->above = above;
1081		1048
1082	/* we set up values so that it could be inserted into	1049	/* we set up values so that it could be inserted into
1083	* 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
1084	* to the caller to decide what we want to do.	1051	* to the caller to decide what we want to do.
1085	*/	1052	*/
1086	map = env->map;	1053	map = env->map;
1087	x = env->x;	1054	x = env->x;
1088	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
1089	above = 0;	1061	above = 0;
1090	below = 0;	1062	below = 0;
1091	env = 0;	1063	env = 0;
1092		1064
1093	/* 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
1094	* made to players inventory. If set, avoiding the call	1066	* made to players inventory. If set, avoiding the call
1095	* to save cpu time.	1067	* to save cpu time.
1096	*/	1068	*/
1097	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	{
1098	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	}
1099	}	1077	}
1100	else if (map)	1078	else if (map)
1101	{	1079	{
1102	if (type == PLAYER)
1103	{
1104	// leaving a spot always closes any open container on the ground
1105	if (container && !container->env)
1106	// this causes spurious floorbox updates, but it ensures
1107	// that the CLOSE event is being sent.
1108	close_container ();
1109
1110	--map->players;
1111	map->touch ();
1112	}
1113
1114	map->dirty = true;	1080	map->dirty = true;
1115	mapspace &ms = this->ms ();	1081	mapspace &ms = this->ms ();
1116		1082
		1083	if (object *pl = ms.player ())
		1084	{
		1085	if (is_player ())
		1086	{
		1087	if (!flag [FLAG_WIZPASS])
		1088	ms.smell = ++mapspace::smellcount; // remember the smell of the player
		1089
		1090	// leaving a spot always closes any open container on the ground
		1091	if (container && !container->env)
		1092	// this causes spurious floorbox updates, but it ensures
		1093	// that the CLOSE event is being sent.
		1094	close_container ();
		1095
		1096	--map->players;
		1097	map->touch ();
		1098	}
		1099	else if (pl->container_ () == this)
		1100	{
		1101	// removing a container should close it
		1102	close_container ();
		1103	}
		1104
		1105	esrv_del_item (pl->contr, count);
		1106	}
		1107
1117	/* link the object above us */	1108	/* link the object above us */
1118	if (above)	1109	// re-link, make sure compiler can easily use cmove
1119	above->below = below;	1110	*(above ? &above->below : &ms.top) = below;
1120	else	1111	*(below ? &below->above : &ms.bot) = above;
1121	ms.top = below; /* we were top, set new top */
1122
1123	/* Relink the object below us, if there is one */
1124	if (below)
1125	below->above = above;
1126	else
1127	{
1128	/* Nothing below, which means we need to relink map object for this space
1129	* use translated coordinates in case some oddness with map tiling is
1130	* evident
1131	*/
1132	if (GET_MAP_OB (map, x, y) != this)
1133	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 ());
1134
1135	ms.bot = above; /* goes on above it. */
1136	}
1137		1112
1138	above = 0;	1113	above = 0;
1139	below = 0;	1114	below = 0;
1140		1115
		1116	ms.invalidate ();
		1117
1141	if (map->in_memory == MAP_SAVING)	1118	if (map->in_memory == MAP_SAVING)
1142	return;	1119	return;
1143		1120
1144	int check_walk_off = !flag [FLAG_NO_APPLY];	1121	int check_walk_off = !flag [FLAG_NO_APPLY];
1145		1122
1146	if (object *pl = ms.player ())	1123	if (object *pl = ms.player ())
1147	{	1124	{
1148	if (pl->container == this)	1125	if (pl->container_ () == this)
1149	/* If a container that the player is currently using somehow gets	1126	/* If a container that the player is currently using somehow gets
1150	* removed (most likely destroyed), update the player view	1127	* removed (most likely destroyed), update the player view
1151	* appropriately.	1128	* appropriately.
1152	*/	1129	*/
1153	pl->close_container ();	1130	pl->close_container ();
1154		1131
		1132	//TODO: the floorbox prev/next might need updating
		1133	//esrv_del_item (pl->contr, count);
		1134	//TODO: update floorbox to preserve ordering
		1135	if (pl->contr->ns)
1155	pl->contr->ns->floorbox_update ();	1136	pl->contr->ns->floorbox_update ();
1156	}	1137	}
1157		1138
		1139	if (check_walk_off)
1158	for (tmp = ms.bot; tmp; tmp = tmp->above)	1140	for (object *above, *tmp = ms.bot; tmp; tmp = above)
1159	{	1141	{
		1142	above = tmp->above;
		1143
1160	/* 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
1161	* being removed.	1145	* being removed.
1162	*/	1146	*/
1163		1147
1164	/* See if object moving off should effect something */	1148	/* See if object moving off should effect something */
1165	if (check_walk_off
1166	&& ((move_type & tmp->move_off)	1149	if ((move_type & tmp->move_off)
1167	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))	1150	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0)
1168	{
1169	move_apply (tmp, this, 0);	1151	move_apply (tmp, this, 0);
1170
1171	if (destroyed ())
1172	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1173	}	1152	}
1174		1153
1175	last = tmp;	1154	if (affects_los ())
1176	}
1177
1178	/* last == NULL if there are no objects on this space */
1179	//TODO: this makes little sense, why only update the topmost object?
1180	if (!last)
1181	map->at (x, y).flags_ = 0;
1182	else
1183	update_object (last, UP_OBJ_REMOVE);
1184
1185	if (flag [FLAG_BLOCKSVIEW] || glow_radius)
1186	update_all_los (map, x, y);	1155	update_all_los (map, x, y);
1187	}	1156	}
1188	}	1157	}
1189		1158
1190	/*	1159	/*
…		…
1214	esrv_update_item (UPD_NROF, pl, top);	1183	esrv_update_item (UPD_NROF, pl, top);
1215		1184
1216	op->weight = 0; // cancel the addition above	1185	op->weight = 0; // cancel the addition above
1217	op->carrying = 0; // must be 0 already	1186	op->carrying = 0; // must be 0 already
1218		1187
1219	op->destroy (1);	1188	op->destroy ();
1220		1189
1221	return top;	1190	return top;
1222	}	1191	}
1223		1192
1224	return 0;	1193	return 0;
…		…
1252	* job preparing multi-part monsters.	1221	* job preparing multi-part monsters.
1253	*/	1222	*/
1254	object *	1223	object *
1255	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)
1256	{	1225	{
		1226	op->remove ();
		1227
1257	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)	1228	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1258	{	1229	{
1259	tmp->x = x + tmp->arch->x;	1230	tmp->x = x + tmp->arch->x;
1260	tmp->y = y + tmp->arch->y;	1231	tmp->y = y + tmp->arch->y;
1261	}	1232	}
…		…
1284	* just 'op' otherwise	1255	* just 'op' otherwise
1285	*/	1256	*/
1286	object *	1257	object *
1287	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)
1288	{	1259	{
1289	assert (!op->flag [FLAG_FREED]);
1290
1291	object *top, *floor = NULL;
1292
1293	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
1294		1266
1295	/* Ideally, the caller figures this out. However, it complicates a lot	1267	/* Ideally, the caller figures this out. However, it complicates a lot
1296	* 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
1297	* need extra work	1269	* need extra work
1298	*/	1270	*/
		1271	maptile *newmap = m;
1299	if (!xy_normalise (m, op->x, op->y))	1272	if (!xy_normalise (newmap, op->x, op->y))
1300	{	1273	{
1301	op->destroy ();	1274	op->head_ ()->destroy ();// remove head_ once all tail object destroyers found
1302	return 0;	1275	return 0;
1303	}	1276	}
1304		1277
1305	if (object *more = op->more)	1278	if (object *more = op->more)
1306	if (!insert_ob_in_map (more, m, originator, flag))	1279	if (!insert_ob_in_map (more, m, originator, flag))
1307	return 0;	1280	return 0;
1308		1281
1309	CLEAR_FLAG (op, FLAG_REMOVED);	1282	op->flag [FLAG_REMOVED] = false;
1310		1283	op->env = 0;
1311	op->map = m;	1284	op->map = newmap;
		1285
1312	mapspace &ms = op->ms ();	1286	mapspace &ms = op->ms ();
1313		1287
1314	/* this has to be done after we translate the coordinates.	1288	/* this has to be done after we translate the coordinates.
1315	*/	1289	*/
1316	if (op->nrof && !(flag & INS_NO_MERGE))	1290	if (op->nrof && !(flag & INS_NO_MERGE))
1317	for (object *tmp = ms.bot; tmp; tmp = tmp->above)	1291	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1318	if (object::can_merge (op, tmp))	1292	if (object::can_merge (op, tmp))
1319	{	1293	{
		1294	// TODO: we actually want to update tmp, not op,
		1295	// but some caller surely breaks when we return tmp
		1296	// from here :/
1320	op->nrof += tmp->nrof;	1297	op->nrof += tmp->nrof;
1321	tmp->destroy (1);	1298	tmp->destroy ();
1322	}	1299	}
1323		1300
1324	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 */
1325	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1302	CLEAR_FLAG (op, FLAG_INV_LOCKED);
1326		1303
…		…
1333	{	1310	{
1334	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");
1335	abort ();	1312	abort ();
1336	}	1313	}
1337		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
1338	op->above = originator;	1322	op->above = originator;
1339	op->below = originator->below;	1323	op->below = originator->below;
1340
1341	if (op->below)
1342	op->below->above = op;
1343	else
1344	ms.bot = op;
1345
1346	/* since *below* originator, no need to update top */
1347	originator->below = op;	1324	originator->below = op;
		1325
		1326	*(op->below ? &op->below->above : &ms.bot) = op;
1348	}	1327	}
1349	else	1328	else
1350	{	1329	{
1351	top = ms.bot;	1330	object *floor = 0;
		1331	object *top = ms.top;
1352		1332
1353	/* If there are other objects, then */	1333	/* If there are other objects, then */
1354	if (top)	1334	if (top)
1355	{	1335	{
1356	object *last = 0;
1357
1358	/*	1336	/*
1359	* 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.
1360	* We've already dealt with merging if appropriate.	1338	* We've already dealt with merging if appropriate.
1361	* 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
1362	* flag contains INS_ABOVE_FLOOR_ONLY, once we find the last	1340	* flag contains INS_ABOVE_FLOOR_ONLY, once we find the last
…		…
1365	* 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
1366	* 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
1367	* 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
1368	* that flying non pickable objects are spell objects.	1346	* that flying non pickable objects are spell objects.
1369	*/	1347	*/
1370	for (top = ms.bot; top; top = top->above)	1348	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1371	{	1349	{
1372	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))
1373	floor = top;	1351	floor = tmp;
1374		1352
1375	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))
1376	{	1354	{
1377	/* We insert above top, so we want this object below this */	1355	/* We insert above top, so we want this object below this */
1378	top = top->below;	1356	top = tmp->below;
1379	break;	1357	break;
1380	}	1358	}
1381		1359
1382	last = top;	1360	top = tmp;
1383	}	1361	}
1384
1385	/* Don't want top to be NULL, so set it to the last valid object */
1386	top = last;
1387		1362
1388	/* We let update_position deal with figuring out what the space	1363	/* We let update_position deal with figuring out what the space
1389	* looks like instead of lots of conditions here.	1364	* looks like instead of lots of conditions here.
1390	* makes things faster, and effectively the same result.	1365	* makes things faster, and effectively the same result.
1391	*/	1366	*/
…		…
1398	*/	1373	*/
1399	if (!(flag & INS_ON_TOP)	1374	if (!(flag & INS_ON_TOP)
1400	&& ms.flags () & P_BLOCKSVIEW	1375	&& ms.flags () & P_BLOCKSVIEW
1401	&& (op->face && !faces [op->face].visibility))	1376	&& (op->face && !faces [op->face].visibility))
1402	{	1377	{
		1378	object *last;
		1379
1403	for (last = top; last != floor; last = last->below)	1380	for (last = top; last != floor; last = last->below)
1404	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1381	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1405	break;	1382	break;
1406		1383
1407	/* Check to see if we found the object that blocks view,	1384	/* Check to see if we found the object that blocks view,
…		…
1415	} /* If objects on this space */	1392	} /* If objects on this space */
1416		1393
1417	if (flag & INS_ABOVE_FLOOR_ONLY)	1394	if (flag & INS_ABOVE_FLOOR_ONLY)
1418	top = floor;	1395	top = floor;
1419		1396
1420	/* 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
1421	*/
1422
1423	/* First object on this space */
1424	if (!top)	1398	if (!top)
1425	{	1399	{
		1400	op->below = 0;
1426	op->above = ms.bot;	1401	op->above = ms.bot;
1427
1428	if (op->above)
1429	op->above->below = op;
1430
1431	op->below = 0;
1432	ms.bot = op;	1402	ms.bot = op;
		1403
		1404	*(op->above ? &op->above->below : &ms.top) = op;
1433	}	1405	}
1434	else	1406	else
1435	{ /* get inserted into the stack above top */	1407	{
1436	op->above = top->above;	1408	op->above = top->above;
1437
1438	if (op->above)
1439	op->above->below = op;	1409	top->above = op;
1440		1410
1441	op->below = top;	1411	op->below = top;
1442	top->above = op;	1412	*(op->above ? &op->above->below : &ms.top) = op;
1443	}	1413	}
		1414	}
1444		1415
1445	if (!op->above)	1416	if (op->is_player ())
1446	ms.top = op;
1447	} /* else not INS_BELOW_ORIGINATOR */
1448
1449	if (op->type == PLAYER)
1450	{	1417	{
1451	op->contr->do_los = 1;	1418	op->contr->do_los = 1;
1452	++op->map->players;	1419	++op->map->players;
1453	op->map->touch ();	1420	op->map->touch ();
1454	}	1421	}
1455		1422
1456	op->map->dirty = true;	1423	op->map->dirty = true;
1457		1424
1458	if (object *pl = ms.player ())	1425	if (object *pl = ms.player ())
		1426	//TODO: the floorbox prev/next might need updating
		1427	//esrv_send_item (pl, op);
		1428	//TODO: update floorbox to preserve ordering
		1429	if (pl->contr->ns)
1459	pl->contr->ns->floorbox_update ();	1430	pl->contr->ns->floorbox_update ();
1460		1431
1461	/* If this object glows, it may affect lighting conditions that are	1432	/* If this object glows, it may affect lighting conditions that are
1462	* visible to others on this map. But update_all_los is really	1433	* visible to others on this map. But update_all_los is really
1463	* an inefficient way to do this, as it means los for all players	1434	* an inefficient way to do this, as it means los for all players
1464	* on the map will get recalculated. The players could very well	1435	* on the map will get recalculated. The players could very well
1465	* 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 -
1466	* this should get redone to only look for players within range,	1437	* this should get redone to only look for players within range,
1467	* or just updating the P_UPTODATE for spaces within this area	1438	* or just updating the P_UPTODATE for spaces within this area
1468	* of effect may be sufficient.	1439	* of effect may be sufficient.
1469	*/	1440	*/
1470	if (op->map->darkness && (op->glow_radius != 0))	1441	if (op->affects_los ())
		1442	{
		1443	op->ms ().invalidate ();
1471	update_all_los (op->map, op->x, op->y);	1444	update_all_los (op->map, op->x, op->y);
		1445	}
1472		1446
1473	/* updates flags (blocked, alive, no magic, etc) for this map space */	1447	/* updates flags (blocked, alive, no magic, etc) for this map space */
1474	update_object (op, UP_OBJ_INSERT);	1448	update_object (op, UP_OBJ_INSERT);
1475		1449
1476	INVOKE_OBJECT (INSERT, op);	1450	INVOKE_OBJECT (INSERT, op);
…		…
1483	* blocked() and wall() work properly), and these flags are updated by	1457	* blocked() and wall() work properly), and these flags are updated by
1484	* update_object().	1458	* update_object().
1485	*/	1459	*/
1486		1460
1487	/* 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 */
1488	if (!(flag & INS_NO_WALK_ON) && op->head_ () == op)	1462	if (!(flag & INS_NO_WALK_ON) && op->is_head ())
1489	{	1463	{
1490	if (check_move_on (op, originator))	1464	if (check_move_on (op, originator))
1491	return 0;	1465	return 0;
1492		1466
1493	/* 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
…		…
1504	/* this function inserts an object in the map, but if it	1478	/* this function inserts an object in the map, but if it
1505	* 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.
1506	* 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.
1507	*/	1481	*/
1508	void	1482	void
1509	replace_insert_ob_in_map (const char *arch_string, object *op)	1483	replace_insert_ob_in_map (shstr_tmp archname, object *op)
1510	{	1484	{
1511	/* first search for itself and remove any old instances */	1485	/* first search for itself and remove any old instances */
1512		1486
1513	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)	1487	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1514	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */	1488	if (tmp->arch->archname == archname) /* same archetype */
1515	tmp->destroy (1);	1489	tmp->destroy ();
1516		1490
1517	object *tmp = arch_to_object (archetype::find (arch_string));	1491	object *tmp = arch_to_object (archetype::find (archname));
1518		1492
1519	tmp->x = op->x;	1493	tmp->x = op->x;
1520	tmp->y = op->y;	1494	tmp->y = op->y;
1521		1495
1522	insert_ob_in_map (tmp, op->map, op, 0);	1496	insert_ob_in_map (tmp, op->map, op, 0);
…		…
1544	if (!nr)	1518	if (!nr)
1545	return true;	1519	return true;
1546		1520
1547	nr = min (nr, nrof);	1521	nr = min (nr, nrof);
1548		1522
		1523	if (nrof > nr)
		1524	{
1549	nrof -= nr;	1525	nrof -= nr;
1550
1551	if (nrof)
1552	{
1553	adjust_weight (env, -weight * nr); // carrying == 0	1526	adjust_weight (env, -weight * max (1, nr)); // carrying == 0
1554		1527
1555	if (object *pl = visible_to ())	1528	if (object *pl = visible_to ())
1556	esrv_update_item (UPD_NROF, pl, this);	1529	esrv_update_item (UPD_NROF, pl, this);
1557		1530
1558	return true;	1531	return true;
1559	}	1532	}
1560	else	1533	else
1561	{	1534	{
1562	destroy (1);	1535	destroy ();
1563	return false;	1536	return false;
1564	}	1537	}
1565	}	1538	}
1566		1539
1567	/*	1540	/*
…		…
1584	}	1557	}
1585	else	1558	else
1586	{	1559	{
1587	decrease (nr);	1560	decrease (nr);
1588		1561
1589	object *op = object_create_clone (this);	1562	object *op = deep_clone ();
1590	op->nrof = nr;	1563	op->nrof = nr;
1591	return op;	1564	return op;
1592	}	1565	}
1593	}	1566	}
1594		1567
…		…
1644	if (object *pl = tmp->visible_to ())	1617	if (object *pl = tmp->visible_to ())
1645	esrv_update_item (UPD_NROF, pl, tmp);	1618	esrv_update_item (UPD_NROF, pl, tmp);
1646		1619
1647	adjust_weight (this, op->total_weight ());	1620	adjust_weight (this, op->total_weight ());
1648		1621
1649	op->destroy (1);	1622	op->destroy ();
1650	op = tmp;	1623	op = tmp;
1651	goto inserted;	1624	goto inserted;
1652	}	1625	}
1653		1626
1654	op->owner = 0; // it's his/hers now. period.	1627	op->owner = 0; // it's his/hers now. period.
…		…
1672		1645
1673	adjust_weight (this, op->total_weight ());	1646	adjust_weight (this, op->total_weight ());
1674		1647
1675	inserted:	1648	inserted:
1676	/* 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 */
1677	if (op->glow_radius && map && map->darkness)	1650	if (op->glow_radius && is_on_map ())
		1651	{
		1652	update_stats ();
1678	update_all_los (map, x, y);	1653	update_all_los (map, x, y);
1679		1654	}
		1655	else if (is_player () && !flag [FLAG_NO_FIX_PLAYER])
1680	// if this is a player's inventory, update stats	1656	// if this is a player's inventory, update stats
1681	if (type == PLAYER && !flag [FLAG_NO_FIX_PLAYER])
1682	update_stats ();	1657	update_stats ();
1683		1658
1684	INVOKE_OBJECT (INSERT, this);	1659	INVOKE_OBJECT (INSERT, this);
1685		1660
1686	return op;	1661	return op;
…		…
1707	* on top.	1682	* on top.
1708	*/	1683	*/
1709	int	1684	int
1710	check_move_on (object *op, object *originator)	1685	check_move_on (object *op, object *originator)
1711	{	1686	{
		1687	if (QUERY_FLAG (op, FLAG_NO_APPLY))
		1688	return 0;
		1689
1712	object *tmp;	1690	object *tmp;
1713	maptile *m = op->map;	1691	maptile *m = op->map;
1714	int x = op->x, y = op->y;	1692	int x = op->x, y = op->y;
1715		1693
1716	MoveType move_on, move_slow, move_block;	1694	mapspace &ms = m->at (x, y);
1717		1695
1718	if (QUERY_FLAG (op, FLAG_NO_APPLY))	1696	ms.update ();
1719	return 0;
1720		1697
1721	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);	1698	MoveType move_on = ms.move_on;
1722	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);	1699	MoveType move_slow = ms.move_slow;
1723	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);	1700	MoveType move_block = ms.move_block;
1724		1701
1725	/* 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,
1726	* 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
1727	* 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
1728	* as walking.	1705	* as walking.
…		…
1739	return 0;	1716	return 0;
1740		1717
1741	/* The objects have to be checked from top to bottom.	1718	/* The objects have to be checked from top to bottom.
1742	* Hence, we first go to the top:	1719	* Hence, we first go to the top:
1743	*/	1720	*/
1744		1721	for (object *next, *tmp = ms.top; tmp; tmp = next)
1745	for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above)
1746	{
1747	/* Trim the search when we find the first other spell effect
1748	* this helps performance so that if a space has 50 spell objects,
1749	* we don't need to check all of them.
1750	*/
1751	if ((tmp->move_type & MOVE_FLY_LOW) && QUERY_FLAG (tmp, FLAG_NO_PICK))
1752	break;
1753	}	1722	{
		1723	next = tmp->below;
1754		1724
1755	for (; tmp; tmp = tmp->below)
1756	{
1757	if (tmp == op)	1725	if (tmp == op)
1758	continue; /* Can't apply yourself */	1726	continue; /* Can't apply yourself */
1759		1727
1760	/* 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.
1761	* Second check makes sure that the movement types not being slowed	1729	* Second check makes sure that the movement types not being slowed
…		…
1766	if (!QUERY_FLAG (op, FLAG_WIZPASS))	1734	if (!QUERY_FLAG (op, FLAG_WIZPASS))
1767	{	1735	{
1768	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||	1736	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
1769	((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))
1770	{	1738	{
1771
1772	float
1773	diff = tmp->move_slow_penalty * fabs (op->speed);	1739	float diff = tmp->move_slow_penalty * fabs (op->speed);
1774		1740
1775	if (op->type == PLAYER)	1741	if (op->is_player ())
1776	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)) ||
1777	(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)))
1778	diff /= 4.0;	1744	diff /= 4.0;
1779		1745
1780	op->speed_left -= diff;	1746	op->speed_left -= diff;
1781	}	1747	}
1782	}	1748	}
…		…
1815	LOG (llevError, "Present_arch called outside map.\n");	1781	LOG (llevError, "Present_arch called outside map.\n");
1816	return NULL;	1782	return NULL;
1817	}	1783	}
1818		1784
1819	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)
1820	if (tmp->arch == at)	1786	if (tmp->arch->archname == at->archname)
1821	return tmp;	1787	return tmp;
1822		1788
1823	return NULL;	1789	return NULL;
1824	}	1790	}
1825		1791
…		…
1889	* The first matching object is returned, or NULL if none.	1855	* The first matching object is returned, or NULL if none.
1890	*/	1856	*/
1891	object *	1857	object *
1892	present_arch_in_ob (const archetype *at, const object *op)	1858	present_arch_in_ob (const archetype *at, const object *op)
1893	{	1859	{
1894	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)	1860	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1895	if (tmp->arch == at)	1861	if (tmp->arch->archname == at->archname)
1896	return tmp;	1862	return tmp;
1897		1863
1898	return NULL;	1864	return NULL;
1899	}	1865	}
1900		1866
…		…
1988	* head of the object should correspond for the entire object.	1954	* head of the object should correspond for the entire object.
1989	*/	1955	*/
1990	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))	1956	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
1991	continue;	1957	continue;
1992		1958
1993	if (ob->blocked (m, pos.x, pos.y))	1959	if (ob->blocked (pos.m, pos.x, pos.y))
1994	continue;	1960	continue;
1995		1961
1996	altern [index++] = i;	1962	altern [index++] = i;
1997	}	1963	}
1998		1964
…		…
2066	* there is capable of.	2032	* there is capable of.
2067	*/	2033	*/
2068	int	2034	int
2069	find_dir (maptile *m, int x, int y, object *exclude)	2035	find_dir (maptile *m, int x, int y, object *exclude)
2070	{	2036	{
2071	int i, max = SIZEOFFREE, mflags;	2037	int max = SIZEOFFREE, mflags;
2072
2073	sint16 nx, ny;
2074	object *tmp;
2075	maptile *mp;
2076
2077	MoveType blocked, move_type;	2038	MoveType move_type;
2078		2039
2079	if (exclude && exclude->head_ () != exclude)	2040	if (exclude && exclude->head_ () != exclude)
2080	{	2041	{
2081	exclude = exclude->head;	2042	exclude = exclude->head;
2082	move_type = exclude->move_type;	2043	move_type = exclude->move_type;
…		…
2085	{	2046	{
2086	/* 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. */
2087	move_type = MOVE_ALL;	2048	move_type = MOVE_ALL;
2088	}	2049	}
2089		2050
2090	for (i = 1; i < max; i++)	2051	for (int i = 1; i < max; i++)
2091	{	2052	{
2092	mp = m;	2053	mapxy pos (m, x, y);
2093	nx = x + freearr_x[i];	2054	pos.move (i);
2094	ny = y + freearr_y[i];
2095		2055
2096	mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);	2056	if (!pos.normalise ())
2097
2098	if (mflags & P_OUT_OF_MAP)
2099	max = maxfree[i];	2057	max = maxfree[i];
2100	else	2058	else
2101	{	2059	{
2102	mapspace &ms = mp->at (nx, ny);	2060	mapspace &ms = *pos;
2103		2061
2104	blocked = ms.move_block;
2105
2106	if ((move_type & blocked) == move_type)	2062	if ((move_type & ms.move_block) == move_type)
2107	max = maxfree[i];	2063	max = maxfree [i];
2108	else if (mflags & P_IS_ALIVE)	2064	else if (ms.flags () & P_IS_ALIVE)
2109	{	2065	{
2110	for (tmp = ms.bot; tmp; tmp = tmp->above)	2066	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
2111	if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)	2067	if ((tmp->flag [FLAG_MONSTER] || tmp->is_player ())
2112	&& (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))	2068	&& (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2113	break;
2114
2115	if (tmp)
2116	return freedir[i];	2069	return freedir [i];
2117	}	2070	}
2118	}	2071	}
2119	}	2072	}
2120		2073
2121	return 0;	2074	return 0;
…		…
2196	* 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
2197	* 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.
2198	* 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
2199	* functions.	2152	* functions.
2200	*/	2153	*/
2201	int reduction_dir[SIZEOFFREE][3] = {	2154	static const int reduction_dir[SIZEOFFREE][3] = {
2202	{0, 0, 0}, /* 0 */	2155	{0, 0, 0}, /* 0 */
2203	{0, 0, 0}, /* 1 */	2156	{0, 0, 0}, /* 1 */
2204	{0, 0, 0}, /* 2 */	2157	{0, 0, 0}, /* 2 */
2205	{0, 0, 0}, /* 3 */	2158	{0, 0, 0}, /* 3 */
2206	{0, 0, 0}, /* 4 */	2159	{0, 0, 0}, /* 4 */
…		…
2302	int	2255	int
2303	can_pick (const object *who, const object *item)	2256	can_pick (const object *who, const object *item)
2304	{	2257	{
2305	return /*QUERY_FLAG(who,FLAG_WIZ)|| */	2258	return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2306	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&	2259	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
2307	!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));
2308	}	2261	}
2309		2262
2310	/*	2263	/*
2311	* create clone from object to another	2264	* create clone from object to another
2312	*/	2265	*/
2313	object *	2266	object *
2314	object_create_clone (object *asrc)	2267	object::deep_clone ()
2315	{	2268	{
2316	object *dst = 0, *tmp, *src, *prev, *item;	2269	assert (("deep_clone called on non-head object", is_head ()));
2317		2270
2318	if (!asrc)	2271	object *dst = clone ();
2319	return 0;
2320		2272
2321	src = asrc->head_ ();	2273	object *prev = dst;
2322
2323	prev = 0;
2324	for (object *part = src; part; part = part->more)	2274	for (object *part = this->more; part; part = part->more)
2325	{	2275	{
2326	tmp = part->clone ();	2276	object *tmp = part->clone ();
2327	tmp->x -= src->x;
2328	tmp->y -= src->y;
2329
2330	if (!part->head)
2331	{
2332	dst = tmp;
2333	tmp->head = 0;
2334	}
2335	else
2336	tmp->head = dst;	2277	tmp->head = dst;
2337
2338	tmp->more = 0;
2339
2340	if (prev)
2341	prev->more = tmp;	2278	prev->more = tmp;
2342
2343	prev = tmp;	2279	prev = tmp;
2344	}	2280	}
2345		2281
2346	for (item = src->inv; item; item = item->below)	2282	for (object *item = inv; item; item = item->below)
2347	insert_ob_in_ob (object_create_clone (item), dst);	2283	insert_ob_in_ob (item->deep_clone (), dst);
2348		2284
2349	return dst;	2285	return dst;
2350	}	2286	}
2351		2287
2352	/* This returns the first object in who's inventory that	2288	/* This returns the first object in who's inventory that
…		…
2361	return tmp;	2297	return tmp;
2362		2298
2363	return 0;	2299	return 0;
2364	}	2300	}
2365		2301
2366	/* If ob has a field named key, return the link from the list,	2302	shstr_tmp
2367	* otherwise return NULL.	2303	object::kv_get (shstr_tmp key) const
2368	*
2369	* key must be a passed in shared string - otherwise, this won't
2370	* do the desired thing.
2371	*/
2372	key_value *
2373	get_ob_key_link (const object *ob, const char *key)
2374	{	2304	{
2375	for (key_value *link = ob->key_values; link; link = link->next)	2305	for (key_value *kv = key_values; kv; kv = kv->next)
2376	if (link->key == key)	2306	if (kv->key == key)
2377	return link;
2378
2379	return 0;
2380	}
2381
2382	/*
2383	* Returns the value of op has an extra_field for key, or NULL.
2384	*
2385	* The argument doesn't need to be a shared string.
2386	*
2387	* The returned string is shared.
2388	*/
2389	const char *
2390	get_ob_key_value (const object *op, const char *const key)
2391	{
2392	key_value *link;
2393	shstr_cmp canonical_key (key);
2394
2395	if (!canonical_key)
2396	{
2397	/* 1. There being a field named key on any object
2398	* implies there'd be a shared string to find.
2399	* 2. Since there isn't, no object has this field.
2400	* 3. Therefore, *this* object doesn't have this field.
2401	*/
2402	return 0;
2403	}
2404
2405	/* This is copied from get_ob_key_link() above -
2406	* only 4 lines, and saves the function call overhead.
2407	*/
2408	for (link = op->key_values; link; link = link->next)
2409	if (link->key == canonical_key)
2410	return link->value;	2307	return kv->value;
2411		2308
2412	return 0;	2309	return shstr ();
2413	}	2310	}
2414		2311
2415	/*	2312	void
2416	* Updates the canonical_key in op to value.	2313	object::kv_set (shstr_tmp key, shstr_tmp value)
2417	*
2418	* canonical_key is a shared string (value doesn't have to be).
2419	*
2420	* Unless add_key is TRUE, it won't add fields, only change the value of existing
2421	* keys.
2422	*
2423	* Returns TRUE on success.
2424	*/
2425	int
2426	set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key)
2427	{	2314	{
2428	key_value *field = NULL, *last = NULL;	2315	for (key_value *kv = key_values; kv; kv = kv->next)
2429		2316	if (kv->key == key)
2430	for (field = op->key_values; field != NULL; field = field->next)
2431	{
2432	if (field->key != canonical_key)
2433	{	2317	{
2434	last = field;	2318	kv->value = value;
2435	continue;	2319	return;
2436	}	2320	}
2437		2321
2438	if (value)	2322	key_value *kv = new key_value;
2439	field->value = value;	2323
2440	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)
2441	{	2336	{
2442	/* Basically, if the archetype has this key set,	2337	key_value *kv = *kvp;
2443	* we need to store the null value so when we save	2338	*kvp = (*kvp)->next;
2444	* it, we save the empty value so that when we load,	2339	delete kv;
2445	* we get this value back again.	2340	return;
2446	*/
2447	if (get_ob_key_link (op->arch, canonical_key))
2448	field->value = 0;
2449	else
2450	{
2451	if (last)
2452	last->next = field->next;
2453	else
2454	op->key_values = field->next;
2455
2456	delete field;
2457	}
2458	}	2341	}
2459	return TRUE;
2460	}
2461	/* IF we get here, key doesn't exist */
2462
2463	/* No field, we'll have to add it. */
2464
2465	if (!add_key)
2466	return FALSE;
2467
2468	/* There isn't any good reason to store a null
2469	* value in the key/value list. If the archetype has
2470	* this key, then we should also have it, so shouldn't
2471	* be here. If user wants to store empty strings,
2472	* should pass in ""
2473	*/
2474	if (value == NULL)
2475	return TRUE;
2476
2477	field = new key_value;
2478
2479	field->key = canonical_key;
2480	field->value = value;
2481	/* Usual prepend-addition. */
2482	field->next = op->key_values;
2483	op->key_values = field;
2484
2485	return TRUE;
2486	}
2487
2488	/*
2489	* Updates the key in op to value.
2490	*
2491	* If add_key is FALSE, this will only update existing keys,
2492	* and not add new ones.
2493	* In general, should be little reason FALSE is ever passed in for add_key
2494	*
2495	* Returns TRUE on success.
2496	*/
2497	int
2498	set_ob_key_value (object *op, const char *key, const char *value, int add_key)
2499	{
2500	shstr key_ (key);
2501
2502	return set_ob_key_value_s (op, key_, value, add_key);
2503	}	2342	}
2504		2343
2505	object::depth_iterator::depth_iterator (object *container)	2344	object::depth_iterator::depth_iterator (object *container)
2506	: iterator_base (container)	2345	: iterator_base (container)
2507	{	2346	{
…		…
2557	{	2396	{
2558	char flagdesc[512];	2397	char flagdesc[512];
2559	char info2[256 * 4];	2398	char info2[256 * 4];
2560	char *p = info;	2399	char *p = info;
2561		2400
2562	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}",
2563	count,	2402	count,
2564	uuid.c_str (),	2403	uuid.c_str (),
2565	&name,	2404	&name,
2566	title ? "\",title:\"" : "",	2405	title ? ",title:\"" : "",
2567	title ? (const char *)title : "",	2406	title ? (const char *)title : "",
		2407	title ? "\"" : "",
2568	flag_desc (flagdesc, 512), type);	2408	flag_desc (flagdesc, 512), type);
2569		2409
2570	if (!this->flag[FLAG_REMOVED] && env)	2410	if (!flag[FLAG_REMOVED] && env)
2571	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2411	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2572		2412
2573	if (map)	2413	if (map)
2574	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);	2414	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2575		2415
…		…
2605	object::open_container (object *new_container)	2445	object::open_container (object *new_container)
2606	{	2446	{
2607	if (container == new_container)	2447	if (container == new_container)
2608	return;	2448	return;
2609		2449
2610	if (object *old_container = container)	2450	object *old_container = container;
		2451
		2452	if (old_container)
2611	{	2453	{
2612	if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))	2454	if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
2613	return;	2455	return;
2614		2456
2615	#if 0	2457	#if 0
…		…
2617	if (object *closer = old_container->inv)	2459	if (object *closer = old_container->inv)
2618	if (closer->type == CLOSE_CON)	2460	if (closer->type == CLOSE_CON)
2619	closer->destroy ();	2461	closer->destroy ();
2620	#endif	2462	#endif
2621		2463
		2464	// make sure the container is available
		2465	esrv_send_item (this, old_container);
		2466
2622	old_container->flag [FLAG_APPLIED] = 0;	2467	old_container->flag [FLAG_APPLIED] = false;
2623	container = 0;	2468	container = 0;
2624		2469
		2470	// client needs item update to make it work, client bug requires this to be separate
2625	esrv_update_item (UPD_FLAGS, this, old_container);	2471	esrv_update_item (UPD_FLAGS, this, old_container);
		2472
2626	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 ());
2627	play_sound (sound_find ("chest_close"));	2474	play_sound (sound_find ("chest_close"));
2628	}	2475	}
2629		2476
2630	if (new_container)	2477	if (new_container)
2631	{	2478	{
…		…
2641	closer->flag [FLAG_NO_MAP_SAVE] = 1;	2488	closer->flag [FLAG_NO_MAP_SAVE] = 1;
2642	new_container->insert (closer);	2489	new_container->insert (closer);
2643	}	2490	}
2644	#endif	2491	#endif
2645		2492
2646	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 ());
2647		2494
		2495	// make sure the container is available, client bug requires this to be separate
		2496	esrv_send_item (this, new_container);
		2497
2648	new_container->flag [FLAG_APPLIED] = 1;	2498	new_container->flag [FLAG_APPLIED] = true;
2649	container = new_container;	2499	container = new_container;
2650		2500
		2501	// client needs flag change
2651	esrv_update_item (UPD_FLAGS, this, new_container);	2502	esrv_update_item (UPD_FLAGS, this, new_container);
2652	esrv_send_inventory (this, new_container);	2503	esrv_send_inventory (this, new_container);
2653	play_sound (sound_find ("chest_open"));	2504	play_sound (sound_find ("chest_open"));
2654	}	2505	}
		2506	// else if (!old_container->env && contr && contr->ns)
		2507	// contr->ns->floorbox_reset ();
2655	}	2508	}
2656		2509
2657	object *	2510	object *
2658	object::force_find (const shstr name)	2511	object::force_find (shstr_tmp name)
2659	{	2512	{
2660	/* 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
2661	* place	2514	* place
2662	*/	2515	*/
2663	for (object *tmp = inv; tmp; tmp = tmp->below)	2516	for (object *tmp = inv; tmp; tmp = tmp->below)
…		…
2665	return splay (tmp);	2518	return splay (tmp);
2666		2519
2667	return 0;	2520	return 0;
2668	}	2521	}
2669		2522
		2523	//-GPL
		2524
2670	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 *
2671	object::force_add (const shstr name, int duration)	2535	object::force_add (shstr_tmp name, int duration)
2672	{	2536	{
2673	if (object *force = force_find (name))	2537	if (object *force = force_find (name))
2674	force->destroy ();	2538	force->destroy ();
2675		2539
2676	object *force = get_archetype (FORCE_NAME);	2540	object *force = get_archetype (FORCE_NAME);
2677		2541
2678	force->slaying = name;	2542	force->slaying = name;
2679	force->stats.food = 1;	2543	force->force_set_timer (duration);
2680	force->speed_left = -1.f;
2681
2682	force->set_speed (duration ? 1.f / duration : 0.f);
2683	force->flag [FLAG_IS_USED_UP] = true;
2684	force->flag [FLAG_APPLIED] = true;	2544	force->flag [FLAG_APPLIED] = true;
2685		2545
2686	insert (force);	2546	return insert (force);
2687	}	2547	}
2688		2548
2689	void	2549	void
2690	object::play_sound (faceidx sound)	2550	object::play_sound (faceidx sound) const
2691	{	2551	{
2692	if (!sound)	2552	if (!sound)
2693	return;	2553	return;
2694		2554
2695	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 ())
2696	return;	2580	return;
2697		2581
2698	if (env)	2582	// find old force, or create new one
2699	{	2583	object *force = force_find (shstr_noise_force);
2700	if (object *pl = in_player ())	2584
2701	pl->contr->play_sound (sound);	2585	if (force)
2702	}	2586	force->speed_left = -1.f; // patch old speed up
2703	else	2587	else
2704	map->play_sound (sound, x, y);	2588	{
2705	}	2589	force = archetype::get (shstr_noise_force);
2706		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