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.210 by root, Mon Apr 21 07:01:40 2008 UTC vs.
Revision 1.294 by root, Thu Nov 5 15:43:21 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>
25	#include <stdio.h>	26	#include <stdio.h>
26	#include <sys/types.h>	27	#include <sys/types.h>
27	#include <sys/uio.h>	28	#include <sys/uio.h>
28	#include <object.h>	29	#include <object.h>
29	#include <funcpoint.h>
30	#include <sproto.h>	30	#include <sproto.h>
31	#include <loader.h>	31	#include <loader.h>
32		32
33	#include <bitset>	33	#include <bitset>
34		34
35	UUID UUID::cur;	35	UUID UUID::cur;
36	static uint64_t seq_next_save;	36	static uint64_t seq_next_save;
37	static const uint64 UUID_GAP = 1<<19;	37	static const uint64 UUID_GAP = 1<<19;
		38	uint32_t mapspace::smellcount = 10000;
38		39
39	objectvec objects;	40	objectvec objects;
40	activevec actives;	41	activevec actives;
		42
		43	//+GPL
41		44
42	short freearr_x[SIZEOFFREE] = {	45	short freearr_x[SIZEOFFREE] = {
43	0,	46	0,
44	0, 1, 1, 1, 0, -1, -1, -1,	47	0, 1, 1, 1, 0, -1, -1, -1,
45	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,
…		…
140		143
141	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */	144	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */
142	static bool	145	static bool
143	compare_ob_value_lists_one (const object *wants, const object *has)	146	compare_ob_value_lists_one (const object *wants, const object *has)
144	{	147	{
145	key_value *wants_field;
146
147	/* n-squared behaviour (see get_ob_key_link()), but I'm hoping both	148	/* n-squared behaviour (see kv_get), but I'm hoping both
148	* objects with lists are rare, and lists stay short. If not, use a	149	* objects with lists are rare, and lists stay short. If not, use a
149	* different structure or at least keep the lists sorted...	150	* different structure or at least keep the lists sorted...
150	*/	151	*/
151		152
152	/* For each field in wants, */	153	/* For each field in wants, */
153	for (wants_field = wants->key_values; wants_field; wants_field = wants_field->next)	154	for (key_value *kv = wants->key_values; kv; kv = kv->next)
154	{	155	if (has->kv_get (kv->key) != kv->value)
155	key_value *has_field;	156	return false;
156
157	/* Look for a field in has with the same key. */
158	has_field = get_ob_key_link (has, wants_field->key);
159
160	if (!has_field)
161	return 0; /* No field with that name. */
162
163	/* Found the matching field. */
164	if (has_field->value != wants_field->value)
165	return 0; /* Values don't match, so this half of the comparison is false. */
166
167	/* If we get here, we found a match. Now for the next field in wants. */
168	}
169		157
170	/* If we get here, every field in wants has a matching field in has. */	158	/* If we get here, every field in wants has a matching field in has. */
171	return 1;	159	return true;
172	}	160	}
173		161
174	/* Returns TRUE if ob1 has the same key_values as ob2. */	162	/* Returns TRUE if ob1 has the same key_values as ob2. */
175	static bool	163	static bool
176	compare_ob_value_lists (const object *ob1, const object *ob2)	164	compare_ob_value_lists (const object *ob1, const object *ob2)
177	{	165	{
178	/* However, there may be fields in has which aren't partnered in wants,	166	/* However, there may be fields in has which aren't partnered in wants,
179	* so we need to run the comparison *twice*. :(	167	* so we need to run the comparison *twice*. :(
180	*/	168	*/
181	return compare_ob_value_lists_one (ob1, ob2) && compare_ob_value_lists_one (ob2, ob1);	169	return compare_ob_value_lists_one (ob1, ob2)
		170	&& compare_ob_value_lists_one (ob2, ob1);
182	}	171	}
183		172
184	/* Function examines the 2 objects given to it, and returns true if	173	/* Function examines the 2 objects given to it, and returns true if
185	* they can be merged together.	174	* they can be merged together.
186	*	175	*
…		…
201	|| ob1->speed != ob2->speed	190	|| ob1->speed != ob2->speed
202	|| ob1->value != ob2->value	191	|| ob1->value != ob2->value
203	|| ob1->name != ob2->name)	192	|| ob1->name != ob2->name)
204	return 0;	193	return 0;
205		194
206	/* Do not merge objects if nrof would overflow. First part checks	195	/* Do not merge objects if nrof would overflow, assume nrof
207	* for unsigned overflow (2c), second part checks whether the result	196	* is always 0 .. 2**31-1 */
208	* would fit into a 32 bit signed int, which is often used to hold	197	if (ob1->nrof > 0x7fffffff - ob2->nrof)
209	* nrof values.
210	*/
211	if (~ob1->nrof < ob2->nrof || ob1->nrof + ob2->nrof > (1UL << 31))
212	return 0;	198	return 0;
213		199
214	/* If the objects have been identified, set the BEEN_APPLIED flag.	200	/* If the objects have been identified, set the BEEN_APPLIED flag.
215	* This is to the comparison of the flags below will be OK. We	201	* This is to the comparison of the flags below will be OK. We
216	* just can't ignore the been applied or identified flags, as they	202	* just can't ignore the been applied or identified flags, as they
…		…
221	SET_FLAG (ob1, FLAG_BEEN_APPLIED);	207	SET_FLAG (ob1, FLAG_BEEN_APPLIED);
222		208
223	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))	209	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))
224	SET_FLAG (ob2, FLAG_BEEN_APPLIED);	210	SET_FLAG (ob2, FLAG_BEEN_APPLIED);
225		211
226	if (ob1->arch->name != ob2->arch->name	212	if (ob1->arch->archname != ob2->arch->archname
227	|| ob1->name != ob2->name	213	|| ob1->name != ob2->name
228	|| ob1->title != ob2->title	214	|| ob1->title != ob2->title
229	|| ob1->msg != ob2->msg	215	|| ob1->msg != ob2->msg
230	|| ob1->weight != ob2->weight	216	|| ob1->weight != ob2->weight
231	|| ob1->attacktype != ob2->attacktype	217	|| ob1->attacktype != ob2->attacktype
232	|| ob1->magic != ob2->magic	218	|| ob1->magic != ob2->magic
233	|| ob1->slaying != ob2->slaying	219	|| ob1->slaying != ob2->slaying
234	|| ob1->skill != ob2->skill	220	|| ob1->skill != ob2->skill
235	|| ob1->value != ob2->value	221	|| ob1->value != ob2->value
236	|| ob1->animation_id != ob2->animation_id	222	|| ob1->animation_id != ob2->animation_id
		223	|| (ob1->face != ob2->face && !ob1->animation_id) // face and animation are dependent on each other
237	|| ob1->client_type != ob2->client_type	224	|| ob1->client_type != ob2->client_type
238	|| ob1->materialname != ob2->materialname	225	|| ob1->materialname != ob2->materialname
239	|| ob1->lore != ob2->lore	226	|| ob1->lore != ob2->lore
240	|| ob1->subtype != ob2->subtype	227	|| ob1->subtype != ob2->subtype
241	|| ob1->move_type != ob2->move_type	228	|| ob1->move_type != ob2->move_type
…		…
249	|| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats)))	236	|| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats)))
250	return 0;	237	return 0;
251		238
252	if ((ob1->flag ^ ob2->flag)	239	if ((ob1->flag ^ ob2->flag)
253	.reset (FLAG_INV_LOCKED)	240	.reset (FLAG_INV_LOCKED)
254	.reset (FLAG_CLIENT_SENT)
255	.reset (FLAG_REMOVED)	241	.reset (FLAG_REMOVED)
256	.any ())	242	.any ())
257	return 0;	243	return 0;
258		244
259	/* This is really a spellbook check - we should in general	245	/* This is really a spellbook check - we should in general
…		…
331		317
332	/* Everything passes, must be OK. */	318	/* Everything passes, must be OK. */
333	return 1;	319	return 1;
334	}	320	}
335		321
		322	// find player who can see this object
		323	object *
		324	object::visible_to () const
		325	{
		326	if (client_visible () && !flag [FLAG_REMOVED])
		327	{
		328	// see if we are in a container of sorts
		329	if (env)
		330	{
		331	// the player inventory itself is always visible
		332	if (env->is_player ())
		333	return env;
		334
		335	// else a player could have our env open
		336	object *envest = env->outer_env_or_self ();
		337
		338	// the player itself is always on a map, so we will find him here
		339	// even if our inv is in a player.
		340	if (envest->is_on_map ())
		341	if (object *pl = envest->ms ().player ())
		342	if (pl->container_ () == env)
		343	return pl;
		344	}
		345	else
		346	{
		347	// maybe there is a player standing on the same mapspace
		348	// this will catch the case where "this" is a player
		349	if (object *pl = ms ().player ())
		350	if ((pl->contr->ns && !pl->container_ () && !pl->contr->ns->update_look)
		351	|| pl->container_ () == this)
		352	return pl;
		353	}
		354	}
		355
		356	return 0;
		357	}
		358
336	// adjust weight per container type ("of holding")	359	// adjust weight per container type ("of holding")
337	static sint32	360	static sint32
338	weight_adjust (object *op, sint32 weight)	361	weight_adjust_for (object *op, sint32 weight)
339	{	362	{
340	return op->type == CONTAINER	363	return op->type == CONTAINER
341	? lerp (weight, 0, 100, 0, 100 - op->stats.Str)	364	? lerp (weight, 0, 100, 0, 100 - op->stats.Str)
342	: weight;	365	: weight;
343	}	366	}
…		…
349	static void	372	static void
350	adjust_weight (object *op, sint32 weight)	373	adjust_weight (object *op, sint32 weight)
351	{	374	{
352	while (op)	375	while (op)
353	{	376	{
		377	// adjust by actual difference to account for rounding errors
		378	// i.e. (w2 - w1) / f != w2 / f - w1 / f and the latter is correct
354	weight = weight_adjust (op, weight);	379	weight = weight_adjust_for (op, op->carrying)
		380	- weight_adjust_for (op, op->carrying - weight);
		381
		382	if (!weight)
		383	return;
355		384
356	op->carrying += weight;	385	op->carrying += weight;
		386
		387	if (object *pl = op->visible_to ())
		388	if (pl != op) // player is handled lazily
		389	esrv_update_item (UPD_WEIGHT, pl, op);
		390
357	op = op->env;	391	op = op->env;
358	}	392	}
359	}	393	}
360		394
361	/*	395	/*
…		…
374	op->update_weight ();	408	op->update_weight ();
375		409
376	sum += op->total_weight ();	410	sum += op->total_weight ();
377	}	411	}
378		412
379	carrying = weight_adjust (this, sum);	413	sum = weight_adjust_for (this, sum);
		414
		415	if (sum != carrying)
		416	{
		417	carrying = sum;
		418
		419	if (object *pl = visible_to ())
		420	if (pl != this) // player is handled lazily
		421	esrv_update_item (UPD_WEIGHT, pl, this);
		422	}
380	}	423	}
381		424
382	/*	425	/*
383	* Used by: Server DM commands: dumpbelow, dump. Some error messages.	426	* Used by: Server DM commands: dumpbelow, dump. Some error messages.
384	*/	427	*/
…		…
389	return strdup ("[NULLOBJ]");	432	return strdup ("[NULLOBJ]");
390		433
391	object_freezer freezer;	434	object_freezer freezer;
392	op->write (freezer);	435	op->write (freezer);
393	return freezer.as_string ();	436	return freezer.as_string ();
		437	}
		438
		439	char *
		440	object::as_string ()
		441	{
		442	return dump_object (this);
394	}	443	}
395		444
396	/*	445	/*
397	* get_nearest_part(multi-object, object 2) returns the part of the	446	* get_nearest_part(multi-object, object 2) returns the part of the
398	* multi-object 1 which is closest to the second object.	447	* multi-object 1 which is closest to the second object.
…		…
437	*/	486	*/
438	object *	487	object *
439	find_object_name (const char *str)	488	find_object_name (const char *str)
440	{	489	{
441	shstr_cmp str_ (str);	490	shstr_cmp str_ (str);
442	object *op;
443		491
		492	if (str_)
444	for_all_objects (op)	493	for_all_objects (op)
445	if (op->name == str_)	494	if (op->name == str_)
446	break;	495	return op;
447		496
448	return op;	497	return 0;
449	}	498	}
450		499
451	/*	500	/*
452	* Sets the owner and sets the skill and exp pointers to owner's current	501	* Sets the owner and sets the skill and exp pointers to owner's current
453	* skill and experience objects.	502	* skill and experience objects.
…		…
515	update_stats ();	564	update_stats ();
516		565
517	new_draw_info_format (NDI_UNIQUE, 0, this,	566	new_draw_info_format (NDI_UNIQUE, 0, this,
518	"You try to balance all your items at once, "	567	"You try to balance all your items at once, "
519	"but the %s is just too much for your body. "	568	"but the %s is just too much for your body. "
520	"[You need to unapply some items first.]", &ob->name);	569	"[You need to unapply some items first - use the 'body' command to see "
		570	"how many items you cna wera on a specific body part.]", &ob->name);
521	return false;	571	return false;
522	}	572	}
523		573
524	//new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);	574	//new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);
525	}	575	}
…		…
551	}	601	}
552		602
553	op->key_values = 0;	603	op->key_values = 0;
554	}	604	}
555		605
556	object &	606	/*
557	object::operator =(const object &src)	607	* copy_to first frees everything allocated by the dst object,
		608	* and then copies the contents of itself into the second
		609	* object, allocating what needs to be allocated. Basically, any
		610	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
		611	* if the first object is freed, the pointers in the new object
		612	* will point at garbage.
		613	*/
		614	void
		615	object::copy_to (object *dst)
558	{	616	{
559	bool is_freed = flag [FLAG_FREED];	617	dst->remove ();
560	bool is_removed = flag [FLAG_REMOVED];
561
562	*(object_copy *)this = src;	618	*(object_copy *)dst = *this;
563
564	flag [FLAG_FREED] = is_freed;
565	flag [FLAG_REMOVED] = is_removed;	619	dst->flag [FLAG_REMOVED] = true;
566		620
567	/* Copy over key_values, if any. */	621	/* Copy over key_values, if any. */
568	if (src.key_values)	622	if (key_values)
569	{	623	{
570	key_value *tail = 0;	624	key_value *tail = 0;
571	key_values = 0;	625	dst->key_values = 0;
572		626
573	for (key_value *i = src.key_values; i; i = i->next)	627	for (key_value *i = key_values; i; i = i->next)
574	{	628	{
575	key_value *new_link = new key_value;	629	key_value *new_link = new key_value;
576		630
577	new_link->next = 0;	631	new_link->next = 0;
578	new_link->key = i->key;	632	new_link->key = i->key;
579	new_link->value = i->value;	633	new_link->value = i->value;
580		634
581	/* Try and be clever here, too. */	635	/* Try and be clever here, too. */
582	if (!key_values)	636	if (!dst->key_values)
583	{	637	{
584	key_values = new_link;	638	dst->key_values = new_link;
585	tail = new_link;	639	tail = new_link;
586	}	640	}
587	else	641	else
588	{	642	{
589	tail->next = new_link;	643	tail->next = new_link;
590	tail = new_link;	644	tail = new_link;
591	}	645	}
592	}	646	}
593	}	647	}
594	}
595
596	/*
597	* copy_to first frees everything allocated by the dst object,
598	* and then copies the contents of itself into the second
599	* object, allocating what needs to be allocated. Basically, any
600	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
601	* if the first object is freed, the pointers in the new object
602	* will point at garbage.
603	*/
604	void
605	object::copy_to (object *dst)
606	{
607	*dst = *this;
608		648
609	if (speed < 0)	649	if (speed < 0)
610	dst->speed_left -= rndm ();	650	dst->speed_left -= rndm ();
611		651
612	dst->set_speed (dst->speed);	652	dst->activate ();
613	}	653	}
614		654
615	void	655	void
616	object::instantiate ()	656	object::instantiate ()
617	{	657	{
…		…
634	object *	674	object *
635	object::clone ()	675	object::clone ()
636	{	676	{
637	object *neu = create ();	677	object *neu = create ();
638	copy_to (neu);	678	copy_to (neu);
		679	neu->map = map; // not copied by copy_to
639	return neu;	680	return neu;
640	}	681	}
641		682
642	/*	683	/*
643	* If an object with the IS_TURNABLE() flag needs to be turned due	684	* If an object with the IS_TURNABLE() flag needs to be turned due
…		…
694	* UP_OBJ_FACE: only the objects face has changed.	735	* UP_OBJ_FACE: only the objects face has changed.
695	*/	736	*/
696	void	737	void
697	update_object (object *op, int action)	738	update_object (object *op, int action)
698	{	739	{
699	if (op == NULL)	740	if (!op)
700	{	741	{
701	/* this should never happen */	742	/* this should never happen */
702	LOG (llevDebug, "update_object() called for NULL object.\n");	743	LOG (llevError | logBacktrace, "update_object() called for NULL object.\n");
703	return;	744	return;
704	}	745	}
705		746
706	if (op->env)	747	if (!op->is_on_map ())
707	{	748	{
708	/* Animation is currently handled by client, so nothing	749	/* Animation is currently handled by client, so nothing
709	* to do in this case.	750	* to do in this case.
710	*/	751	*/
711	return;	752	return;
712	}	753	}
713
714	/* If the map is saving, don't do anything as everything is
715	* going to get freed anyways.
716	*/
717	if (!op->map || op->map->in_memory == MAP_SAVING)
718	return;
719		754
720	/* make sure the object is within map boundaries */	755	/* make sure the object is within map boundaries */
721	if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height)	756	if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height)
722	{	757	{
723	LOG (llevError, "update_object() called for object out of map!\n");	758	LOG (llevError, "update_object() called for object out of map!\n");
…		…
734	else if (action == UP_OBJ_INSERT)	769	else if (action == UP_OBJ_INSERT)
735	{	770	{
736	// this is likely overkill, TODO: revisit (schmorp)	771	// this is likely overkill, TODO: revisit (schmorp)
737	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))	772	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
738	|| (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))	773	|| (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))
739	|| (op->type == PLAYER && !(m.flags_ & P_PLAYER))	774	|| (op->is_player () && !(m.flags_ & P_PLAYER))
740	|| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))	775	|| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
741	|| (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))	776	|| (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))
742	|| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))	777	|| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))
743	|| (m.move_on | op->move_on ) != m.move_on	778	|| (m.move_on | op->move_on ) != m.move_on
744	|| (m.move_off | op->move_off ) != m.move_off	779	|| (m.move_off | op->move_off ) != m.move_off
745	|| (m.move_slow | op->move_slow) != m.move_slow	780	|| (m.move_slow | op->move_slow) != m.move_slow
746	/* This isn't perfect, but I don't expect a lot of objects to	781	/* This isn't perfect, but I don't expect a lot of objects to
747	* to have move_allow right now.	782	* have move_allow right now.
748	*/	783	*/
749	|| ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block	784	|| ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block
750	|| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)	785	|| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)
751	m.flags_ = 0;	786	m.invalidate ();
752	}	787	}
753	/* if the object is being removed, we can't make intelligent	788	/* if the object is being removed, we can't make intelligent
754	* decisions, because remove_ob can't really pass the object	789	* decisions, because remove_ob can't really pass the object
755	* that is being removed.	790	* that is being removed.
756	*/	791	*/
757	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)	792	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
758	m.flags_ = 0;	793	m.invalidate ();
759	else if (action == UP_OBJ_FACE)	794	else if (action == UP_OBJ_FACE)
760	/* Nothing to do for that case */ ;	795	/* Nothing to do for that case */ ;
761	else	796	else
762	LOG (llevError, "update_object called with invalid action: %d\n", action);	797	LOG (llevError, "update_object called with invalid action: %d\n", action);
763		798
…		…
767		802
768	object::object ()	803	object::object ()
769	{	804	{
770	SET_FLAG (this, FLAG_REMOVED);	805	SET_FLAG (this, FLAG_REMOVED);
771		806
772	expmul = 1.0;	807	//expmul = 1.0; declared const for the time being
773	face = blank_face;	808	face = blank_face;
774	}	809	}
775		810
776	object::~object ()	811	object::~object ()
777	{	812	{
…		…
807	/* If already on active list, don't do anything */	842	/* If already on active list, don't do anything */
808	if (active)	843	if (active)
809	return;	844	return;
810		845
811	if (has_active_speed ())	846	if (has_active_speed ())
		847	{
		848	if (flag [FLAG_FREED])
		849	LOG (llevError | logBacktrace, "BUG: tried to activate freed object %s\n", debug_desc ());//D
		850
812	actives.insert (this);	851	actives.insert (this);
		852	}
813	}	853	}
814		854
815	void	855	void
816	object::activate_recursive ()	856	object::activate_recursive ()
817	{	857	{
…		…
866	object::destroy_inv (bool drop_to_ground)	906	object::destroy_inv (bool drop_to_ground)
867	{	907	{
868	// need to check first, because the checks below might segfault	908	// need to check first, because the checks below might segfault
869	// as we might be on an invalid mapspace and crossfire code	909	// as we might be on an invalid mapspace and crossfire code
870	// is too buggy to ensure that the inventory is empty.	910	// is too buggy to ensure that the inventory is empty.
871	// corollary: if you create arrows etc. with stuff in tis inventory,	911	// corollary: if you create arrows etc. with stuff in its inventory,
872	// cf will crash below with off-map x and y	912	// cf will crash below with off-map x and y
873	if (!inv)	913	if (!inv)
874	return;	914	return;
875		915
876	/* Only if the space blocks everything do we not process -	916	/* Only if the space blocks everything do we not process -
…		…
878	* drop on that space.	918	* drop on that space.
879	*/	919	*/
880	if (!drop_to_ground	920	if (!drop_to_ground
881	|| !map	921	|| !map
882	|| map->in_memory != MAP_ACTIVE	922	|| map->in_memory != MAP_ACTIVE
883	|| map->nodrop	923	|| map->no_drop
884	|| ms ().move_block == MOVE_ALL)	924	|| ms ().move_block == MOVE_ALL)
885	{	925	{
886	while (inv)	926	while (inv)
887	{
888	inv->destroy_inv (drop_to_ground);
889	inv->destroy ();	927	inv->destroy ();
890	}
891	}	928	}
892	else	929	else
893	{ /* Put objects in inventory onto this space */	930	{ /* Put objects in inventory onto this space */
894	while (inv)	931	while (inv)
895	{	932	{
…		…
913	object *op = new object;	950	object *op = new object;
914	op->link ();	951	op->link ();
915	return op;	952	return op;
916	}	953	}
917		954
		955	static struct freed_map : maptile
		956	{
		957	freed_map ()
		958	{
		959	path = "<freed objects map>";
		960	name = "/internal/freed_objects_map";
		961	width = 3;
		962	height = 3;
		963	no_drop = 1;
		964	no_reset = 1;
		965
		966	alloc ();
		967	in_memory = MAP_ACTIVE;
		968	}
		969
		970	~freed_map ()
		971	{
		972	destroy ();
		973	}
		974	} freed_map; // freed objects are moved here to avoid crashes
		975
918	void	976	void
919	object::do_destroy ()	977	object::do_destroy ()
920	{	978	{
921	attachable::do_destroy ();
922
923	if (flag [FLAG_IS_LINKED])	979	if (flag [FLAG_IS_LINKED])
924	remove_button_link (this);	980	remove_link ();
925		981
926	if (flag [FLAG_FRIENDLY])	982	if (flag [FLAG_FRIENDLY])
927	remove_friendly_object (this);	983	remove_friendly_object (this);
928		984
929	if (!flag [FLAG_REMOVED])
930	remove ();	985	remove ();
931		986
932	destroy_inv (true);	987	attachable::do_destroy ();
933		988
934	deactivate ();	989	deactivate ();
935	unlink ();	990	unlink ();
936		991
937	flag [FLAG_FREED] = 1;	992	flag [FLAG_FREED] = 1;
938		993
939	// hack to ensure that freed objects still have a valid map	994	// hack to ensure that freed objects still have a valid map
940	{
941	static maptile *freed_map; // freed objects are moved here to avoid crashes
942
943	if (!freed_map)
944	{
945	freed_map = new maptile;
946
947	freed_map->path = "<freed objects map>";
948	freed_map->name = "/internal/freed_objects_map";
949	freed_map->width = 3;
950	freed_map->height = 3;
951	freed_map->nodrop = 1;
952
953	freed_map->alloc ();
954	freed_map->in_memory = MAP_ACTIVE;
955	}
956
957	map = freed_map;	995	map = &freed_map;
958	x = 1;	996	x = 1;
959	y = 1;	997	y = 1;
960	}
961		998
962	if (more)	999	if (more)
963	{	1000	{
964	more->destroy ();	1001	more->destroy ();
965	more = 0;	1002	more = 0;
…		…
973	attacked_by = 0;	1010	attacked_by = 0;
974	current_weapon = 0;	1011	current_weapon = 0;
975	}	1012	}
976		1013
977	void	1014	void
978	object::destroy (bool destroy_inventory)	1015	object::destroy ()
979	{	1016	{
980	if (destroyed ())	1017	if (destroyed ())
981	return;	1018	return;
982		1019
983	if (destroy_inventory)	1020	if (!is_head () && !head->destroyed ())
		1021	{
		1022	LOG (llevError | logBacktrace, "tried to destroy the tail of an object");
		1023	head->destroy ();
		1024	return;
		1025	}
		1026
984	destroy_inv (false);	1027	destroy_inv (false);
985		1028
986	if (is_head ())	1029	if (is_head ())
987	if (sound_destroy)	1030	if (sound_destroy)
988	play_sound (sound_destroy);	1031	play_sound (sound_destroy);
989	else if (flag [FLAG_MONSTER])	1032	else if (flag [FLAG_MONSTER])
…		…
1000	* the previous environment.	1043	* the previous environment.
1001	*/	1044	*/
1002	void	1045	void
1003	object::do_remove ()	1046	object::do_remove ()
1004	{	1047	{
1005	object *tmp, *last = 0;	1048	if (flag [FLAG_REMOVED])
1006	object *otmp;
1007
1008	if (QUERY_FLAG (this, FLAG_REMOVED))
1009	return;	1049	return;
1010		1050
1011	SET_FLAG (this, FLAG_REMOVED);
1012	INVOKE_OBJECT (REMOVE, this);	1051	INVOKE_OBJECT (REMOVE, this);
		1052
		1053	flag [FLAG_REMOVED] = true;
1013		1054
1014	if (more)	1055	if (more)
1015	more->remove ();	1056	more->remove ();
1016		1057
1017	/*	1058	/*
1018	* In this case, the object to be removed is in someones	1059	* In this case, the object to be removed is in someones
1019	* inventory.	1060	* inventory.
1020	*/	1061	*/
1021	if (env)	1062	if (env)
1022	{	1063	{
		1064	flag [FLAG_REMOVED] = false; // hack around the issue of visible_to checking flag_removed
		1065	if (object *pl = visible_to ())
		1066	esrv_del_item (pl->contr, count);
		1067	flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed
		1068
1023	adjust_weight (env, -total_weight ());	1069	adjust_weight (env, -total_weight ());
1024		1070
1025	*(above ? &above->below : &env->inv) = below;	1071	object *pl = in_player ();
1026
1027	if (below)
1028	below->above = above;
1029		1072
1030	/* we set up values so that it could be inserted into	1073	/* we set up values so that it could be inserted into
1031	* the map, but we don't actually do that - it is up	1074	* the map, but we don't actually do that - it is up
1032	* to the caller to decide what we want to do.	1075	* to the caller to decide what we want to do.
1033	*/	1076	*/
1034	map = env->map;	1077	map = env->map;
1035	x = env->x;	1078	x = env->x;
1036	y = env->y;	1079	y = env->y;
		1080
		1081	// make sure cmov optimisation is applicable
		1082	*(above ? &above->below : &env->inv) = below;
		1083	*(below ? &below->above : &above ) = above; // &above is just a dummy
		1084
1037	above = 0;	1085	above = 0;
1038	below = 0;	1086	below = 0;
1039	env = 0;	1087	env = 0;
1040		1088
1041	/* NO_FIX_PLAYER is set when a great many changes are being	1089	/* NO_FIX_PLAYER is set when a great many changes are being
1042	* made to players inventory. If set, avoiding the call	1090	* made to players inventory. If set, avoiding the call
1043	* to save cpu time.	1091	* to save cpu time.
1044	*/	1092	*/
1045	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1093	if (pl)
		1094	if (pl->is_player () && (glow_radius || !QUERY_FLAG (pl, FLAG_NO_FIX_PLAYER)))
		1095	{
1046	otmp->update_stats ();	1096	pl->update_stats ();
		1097
		1098	if (glow_radius && pl->is_on_map ())
		1099	update_all_los (pl->map, pl->x, pl->y);
		1100	}
1047	}	1101	}
1048	else if (map)	1102	else if (map)
1049	{	1103	{
1050	if (type == PLAYER)
1051	{
1052	// leaving a spot always closes any open container on the ground
1053	if (container && !container->env)
1054	// this causes spurious floorbox updates, but it ensures
1055	// that the CLOSE event is being sent.
1056	close_container ();
1057
1058	--map->players;
1059	map->touch ();
1060	}
1061
1062	map->dirty = true;	1104	map->dirty = true;
1063	mapspace &ms = this->ms ();	1105	mapspace &ms = this->ms ();
1064		1106
		1107	if (object *pl = ms.player ())
		1108	{
		1109	if (is_player ())
		1110	{
		1111	if (!flag [FLAG_WIZPASS])
		1112	ms.smell = ++mapspace::smellcount; // remember the smell of the player
		1113
		1114	// leaving a spot always closes any open container on the ground
		1115	if (container && !container->env)
		1116	// this causes spurious floorbox updates, but it ensures
		1117	// that the CLOSE event is being sent.
		1118	close_container ();
		1119
		1120	--map->players;
		1121	map->touch ();
		1122	}
		1123	else if (pl->container_ () == this)
		1124	{
		1125	// removing a container should close it
		1126	close_container ();
		1127	}
		1128
		1129	esrv_del_item (pl->contr, count);
		1130	}
		1131
1065	/* link the object above us */	1132	/* link the object above us */
1066	if (above)	1133	// re-link, make sure compiler can easily use cmove
1067	above->below = below;	1134	*(above ? &above->below : &ms.top) = below;
1068	else	1135	*(below ? &below->above : &ms.bot) = above;
1069	ms.top = below; /* we were top, set new top */
1070
1071	/* Relink the object below us, if there is one */
1072	if (below)
1073	below->above = above;
1074	else
1075	{
1076	/* Nothing below, which means we need to relink map object for this space
1077	* use translated coordinates in case some oddness with map tiling is
1078	* evident
1079	*/
1080	if (GET_MAP_OB (map, x, y) != this)
1081	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 ());
1082
1083	ms.bot = above; /* goes on above it. */
1084	}
1085		1136
1086	above = 0;	1137	above = 0;
1087	below = 0;	1138	below = 0;
1088		1139
		1140	ms.invalidate ();
		1141
1089	if (map->in_memory == MAP_SAVING)	1142	if (map->in_memory == MAP_SAVING)
1090	return;	1143	return;
1091		1144
1092	int check_walk_off = !flag [FLAG_NO_APPLY];	1145	int check_walk_off = !flag [FLAG_NO_APPLY];
1093		1146
1094	if (object *pl = ms.player ())	1147	if (object *pl = ms.player ())
1095	{	1148	{
1096	if (pl->container == this)	1149	if (pl->container_ () == this)
1097	/* If a container that the player is currently using somehow gets	1150	/* If a container that the player is currently using somehow gets
1098	* removed (most likely destroyed), update the player view	1151	* removed (most likely destroyed), update the player view
1099	* appropriately.	1152	* appropriately.
1100	*/	1153	*/
1101	pl->close_container ();	1154	pl->close_container ();
1102		1155
		1156	//TODO: the floorbox prev/next might need updating
		1157	//esrv_del_item (pl->contr, count);
		1158	//TODO: update floorbox to preserve ordering
		1159	if (pl->contr->ns)
1103	pl->contr->ns->floorbox_update ();	1160	pl->contr->ns->floorbox_update ();
1104	}	1161	}
1105		1162
		1163	if (check_walk_off)
1106	for (tmp = ms.bot; tmp; tmp = tmp->above)	1164	for (object *above, *tmp = ms.bot; tmp; tmp = above)
1107	{	1165	{
		1166	above = tmp->above;
		1167
1108	/* No point updating the players look faces if he is the object	1168	/* No point updating the players look faces if he is the object
1109	* being removed.	1169	* being removed.
1110	*/	1170	*/
1111		1171
1112	/* See if object moving off should effect something */	1172	/* See if object moving off should effect something */
1113	if (check_walk_off
1114	&& ((move_type & tmp->move_off)	1173	if ((move_type & tmp->move_off)
1115	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))	1174	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0)
1116	{
1117	move_apply (tmp, this, 0);	1175	move_apply (tmp, this, 0);
1118
1119	if (destroyed ())
1120	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1121	}	1176	}
1122		1177
1123	last = tmp;	1178	if (affects_los ())
1124	}
1125
1126	/* last == NULL if there are no objects on this space */
1127	//TODO: this makes little sense, why only update the topmost object?
1128	if (!last)
1129	map->at (x, y).flags_ = 0;
1130	else
1131	update_object (last, UP_OBJ_REMOVE);
1132
1133	if (flag [FLAG_BLOCKSVIEW] || glow_radius)
1134	update_all_los (map, x, y);	1179	update_all_los (map, x, y);
1135	}	1180	}
1136	}	1181	}
1137		1182
1138	/*	1183	/*
…		…
1152	if (!top)	1197	if (!top)
1153	for (top = op; top && top->above; top = top->above)	1198	for (top = op; top && top->above; top = top->above)
1154	;	1199	;
1155		1200
1156	for (; top; top = top->below)	1201	for (; top; top = top->below)
1157	{
1158	if (top == op)
1159	continue;
1160
1161	if (object::can_merge (op, top))	1202	if (object::can_merge (op, top))
1162	{	1203	{
1163	top->nrof += op->nrof;	1204	top->nrof += op->nrof;
1164		1205
1165	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/	1206	if (object *pl = top->visible_to ())
1166	op->weight = 0; /* Don't want any adjustements now */	1207	esrv_update_item (UPD_NROF, pl, top);
		1208
		1209	op->weight = 0; // cancel the addition above
		1210	op->carrying = 0; // must be 0 already
		1211
1167	op->destroy ();	1212	op->destroy ();
		1213
1168	return top;	1214	return top;
1169	}	1215	}
1170	}
1171		1216
1172	return 0;	1217	return 0;
1173	}	1218	}
1174		1219
1175	void	1220	void
…		…
1200	* job preparing multi-part monsters.	1245	* job preparing multi-part monsters.
1201	*/	1246	*/
1202	object *	1247	object *
1203	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)	1248	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1204	{	1249	{
		1250	op->remove ();
		1251
1205	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)	1252	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1206	{	1253	{
1207	tmp->x = x + tmp->arch->x;	1254	tmp->x = x + tmp->arch->x;
1208	tmp->y = y + tmp->arch->y;	1255	tmp->y = y + tmp->arch->y;
1209	}	1256	}
…		…
1232	* just 'op' otherwise	1279	* just 'op' otherwise
1233	*/	1280	*/
1234	object *	1281	object *
1235	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)	1282	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1236	{	1283	{
1237	assert (!op->flag [FLAG_FREED]);
1238
1239	object *top, *floor = NULL;
1240
1241	op->remove ();	1284	op->remove ();
		1285
		1286	if (m == &freed_map)//D TODO: remove soon
		1287	{//D
		1288	LOG (llevError | logBacktrace, "tries to insret object on freed objects map: %s", op->debug_desc ());//D
		1289	}//D
1242		1290
1243	/* Ideally, the caller figures this out. However, it complicates a lot	1291	/* Ideally, the caller figures this out. However, it complicates a lot
1244	* of areas of callers (eg, anything that uses find_free_spot would now	1292	* of areas of callers (eg, anything that uses find_free_spot would now
1245	* need extra work	1293	* need extra work
1246	*/	1294	*/
		1295	maptile *newmap = m;
1247	if (!xy_normalise (m, op->x, op->y))	1296	if (!xy_normalise (newmap, op->x, op->y))
1248	{	1297	{
1249	op->destroy ();	1298	op->head_ ()->destroy ();// remove head_ once all tail object destroyers found
1250	return 0;	1299	return 0;
1251	}	1300	}
1252		1301
1253	if (object *more = op->more)	1302	if (object *more = op->more)
1254	if (!insert_ob_in_map (more, m, originator, flag))	1303	if (!insert_ob_in_map (more, m, originator, flag))
1255	return 0;	1304	return 0;
1256		1305
1257	CLEAR_FLAG (op, FLAG_REMOVED);	1306	op->flag [FLAG_REMOVED] = false;
1258		1307	op->env = 0;
1259	op->map = m;	1308	op->map = newmap;
		1309
1260	mapspace &ms = op->ms ();	1310	mapspace &ms = op->ms ();
1261		1311
1262	/* this has to be done after we translate the coordinates.	1312	/* this has to be done after we translate the coordinates.
1263	*/	1313	*/
1264	if (op->nrof && !(flag & INS_NO_MERGE))	1314	if (op->nrof && !(flag & INS_NO_MERGE))
1265	for (object *tmp = ms.bot; tmp; tmp = tmp->above)	1315	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1266	if (object::can_merge (op, tmp))	1316	if (object::can_merge (op, tmp))
1267	{	1317	{
		1318	// TODO: we actually want to update tmp, not op,
		1319	// but some caller surely breaks when we return tmp
		1320	// from here :/
1268	op->nrof += tmp->nrof;	1321	op->nrof += tmp->nrof;
1269	tmp->destroy (1);	1322	tmp->destroy ();
1270	}	1323	}
1271		1324
1272	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1325	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1273	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1326	CLEAR_FLAG (op, FLAG_INV_LOCKED);
1274		1327
…		…
1281	{	1334	{
1282	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");	1335	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");
1283	abort ();	1336	abort ();
1284	}	1337	}
1285		1338
		1339	if (!originator->is_on_map ())
		1340	{
		1341	LOG (llevError, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map",
		1342	op->debug_desc (), originator->debug_desc ());
		1343	abort ();
		1344	}
		1345
1286	op->above = originator;	1346	op->above = originator;
1287	op->below = originator->below;	1347	op->below = originator->below;
1288
1289	if (op->below)
1290	op->below->above = op;
1291	else
1292	ms.bot = op;
1293
1294	/* since *below* originator, no need to update top */
1295	originator->below = op;	1348	originator->below = op;
		1349
		1350	*(op->below ? &op->below->above : &ms.bot) = op;
1296	}	1351	}
1297	else	1352	else
1298	{	1353	{
1299	top = ms.bot;	1354	object *floor = 0;
		1355	object *top = ms.top;
1300		1356
1301	/* If there are other objects, then */	1357	/* If there are other objects, then */
1302	if (top)	1358	if (top)
1303	{	1359	{
1304	object *last = 0;
1305
1306	/*	1360	/*
1307	* If there are multiple objects on this space, we do some trickier handling.	1361	* If there are multiple objects on this space, we do some trickier handling.
1308	* We've already dealt with merging if appropriate.	1362	* We've already dealt with merging if appropriate.
1309	* Generally, we want to put the new object on top. But if	1363	* Generally, we want to put the new object on top. But if
1310	* flag contains INS_ABOVE_FLOOR_ONLY, once we find the last	1364	* flag contains INS_ABOVE_FLOOR_ONLY, once we find the last
…		…
1313	* once we get to them. This reduces the need to traverse over all of	1367	* once we get to them. This reduces the need to traverse over all of
1314	* them when adding another one - this saves quite a bit of cpu time	1368	* them when adding another one - this saves quite a bit of cpu time
1315	* when lots of spells are cast in one area. Currently, it is presumed	1369	* when lots of spells are cast in one area. Currently, it is presumed
1316	* that flying non pickable objects are spell objects.	1370	* that flying non pickable objects are spell objects.
1317	*/	1371	*/
1318	for (top = ms.bot; top; top = top->above)	1372	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1319	{	1373	{
1320	if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))	1374	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) || QUERY_FLAG (tmp, FLAG_OVERLAY_FLOOR))
1321	floor = top;	1375	floor = tmp;
1322		1376
1323	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))	1377	if (QUERY_FLAG (tmp, FLAG_NO_PICK) && (tmp->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1324	{	1378	{
1325	/* We insert above top, so we want this object below this */	1379	/* We insert above top, so we want this object below this */
1326	top = top->below;	1380	top = tmp->below;
1327	break;	1381	break;
1328	}	1382	}
1329		1383
1330	last = top;	1384	top = tmp;
1331	}	1385	}
1332
1333	/* Don't want top to be NULL, so set it to the last valid object */
1334	top = last;
1335		1386
1336	/* We let update_position deal with figuring out what the space	1387	/* We let update_position deal with figuring out what the space
1337	* looks like instead of lots of conditions here.	1388	* looks like instead of lots of conditions here.
1338	* makes things faster, and effectively the same result.	1389	* makes things faster, and effectively the same result.
1339	*/	1390	*/
…		…
1346	*/	1397	*/
1347	if (!(flag & INS_ON_TOP)	1398	if (!(flag & INS_ON_TOP)
1348	&& ms.flags () & P_BLOCKSVIEW	1399	&& ms.flags () & P_BLOCKSVIEW
1349	&& (op->face && !faces [op->face].visibility))	1400	&& (op->face && !faces [op->face].visibility))
1350	{	1401	{
		1402	object *last;
		1403
1351	for (last = top; last != floor; last = last->below)	1404	for (last = top; last != floor; last = last->below)
1352	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1405	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1353	break;	1406	break;
1354		1407
1355	/* Check to see if we found the object that blocks view,	1408	/* Check to see if we found the object that blocks view,
…		…
1363	} /* If objects on this space */	1416	} /* If objects on this space */
1364		1417
1365	if (flag & INS_ABOVE_FLOOR_ONLY)	1418	if (flag & INS_ABOVE_FLOOR_ONLY)
1366	top = floor;	1419	top = floor;
1367		1420
1368	/* Top is the object that our object (op) is going to get inserted above.	1421	// insert object above top, or bottom-most if top = 0
1369	*/
1370
1371	/* First object on this space */
1372	if (!top)	1422	if (!top)
1373	{	1423	{
		1424	op->below = 0;
1374	op->above = ms.bot;	1425	op->above = ms.bot;
1375
1376	if (op->above)
1377	op->above->below = op;
1378
1379	op->below = 0;
1380	ms.bot = op;	1426	ms.bot = op;
		1427
		1428	*(op->above ? &op->above->below : &ms.top) = op;
1381	}	1429	}
1382	else	1430	else
1383	{ /* get inserted into the stack above top */	1431	{
1384	op->above = top->above;	1432	op->above = top->above;
1385
1386	if (op->above)
1387	op->above->below = op;	1433	top->above = op;
1388		1434
1389	op->below = top;	1435	op->below = top;
1390	top->above = op;	1436	*(op->above ? &op->above->below : &ms.top) = op;
1391	}	1437	}
		1438	}
1392		1439
1393	if (!op->above)	1440	if (op->is_player ())
1394	ms.top = op;
1395	} /* else not INS_BELOW_ORIGINATOR */
1396
1397	if (op->type == PLAYER)
1398	{	1441	{
1399	op->contr->do_los = 1;	1442	op->contr->do_los = 1;
1400	++op->map->players;	1443	++op->map->players;
1401	op->map->touch ();	1444	op->map->touch ();
1402	}	1445	}
1403		1446
1404	op->map->dirty = true;	1447	op->map->dirty = true;
1405		1448
1406	if (object *pl = ms.player ())	1449	if (object *pl = ms.player ())
		1450	//TODO: the floorbox prev/next might need updating
		1451	//esrv_send_item (pl, op);
		1452	//TODO: update floorbox to preserve ordering
		1453	if (pl->contr->ns)
1407	pl->contr->ns->floorbox_update ();	1454	pl->contr->ns->floorbox_update ();
1408		1455
1409	/* If this object glows, it may affect lighting conditions that are	1456	/* If this object glows, it may affect lighting conditions that are
1410	* visible to others on this map. But update_all_los is really	1457	* visible to others on this map. But update_all_los is really
1411	* an inefficient way to do this, as it means los for all players	1458	* an inefficient way to do this, as it means los for all players
1412	* on the map will get recalculated. The players could very well	1459	* on the map will get recalculated. The players could very well
1413	* be far away from this change and not affected in any way -	1460	* be far away from this change and not affected in any way -
1414	* this should get redone to only look for players within range,	1461	* this should get redone to only look for players within range,
1415	* or just updating the P_UPTODATE for spaces within this area	1462	* or just updating the P_UPTODATE for spaces within this area
1416	* of effect may be sufficient.	1463	* of effect may be sufficient.
1417	*/	1464	*/
1418	if (op->map->darkness && (op->glow_radius != 0))	1465	if (op->affects_los ())
		1466	{
		1467	op->ms ().invalidate ();
1419	update_all_los (op->map, op->x, op->y);	1468	update_all_los (op->map, op->x, op->y);
		1469	}
1420		1470
1421	/* updates flags (blocked, alive, no magic, etc) for this map space */	1471	/* updates flags (blocked, alive, no magic, etc) for this map space */
1422	update_object (op, UP_OBJ_INSERT);	1472	update_object (op, UP_OBJ_INSERT);
1423		1473
1424	INVOKE_OBJECT (INSERT, op);	1474	INVOKE_OBJECT (INSERT, op);
…		…
1431	* blocked() and wall() work properly), and these flags are updated by	1481	* blocked() and wall() work properly), and these flags are updated by
1432	* update_object().	1482	* update_object().
1433	*/	1483	*/
1434		1484
1435	/* if this is not the head or flag has been passed, don't check walk on status */	1485	/* if this is not the head or flag has been passed, don't check walk on status */
1436	if (!(flag & INS_NO_WALK_ON) && op->head_ () == op)	1486	if (!(flag & INS_NO_WALK_ON) && op->is_head ())
1437	{	1487	{
1438	if (check_move_on (op, originator))	1488	if (check_move_on (op, originator))
1439	return 0;	1489	return 0;
1440		1490
1441	/* If we are a multi part object, lets work our way through the check	1491	/* If we are a multi part object, lets work our way through the check
…		…
1452	/* this function inserts an object in the map, but if it	1502	/* this function inserts an object in the map, but if it
1453	* finds an object of its own type, it'll remove that one first.	1503	* finds an object of its own type, it'll remove that one first.
1454	* op is the object to insert it under: supplies x and the map.	1504	* op is the object to insert it under: supplies x and the map.
1455	*/	1505	*/
1456	void	1506	void
1457	replace_insert_ob_in_map (const char *arch_string, object *op)	1507	replace_insert_ob_in_map (shstr_tmp archname, object *op)
1458	{	1508	{
1459	/* first search for itself and remove any old instances */	1509	/* first search for itself and remove any old instances */
1460		1510
1461	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)	1511	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1462	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */	1512	if (tmp->arch->archname == archname) /* same archetype */
1463	tmp->destroy (1);	1513	tmp->destroy ();
1464		1514
1465	object *tmp = arch_to_object (archetype::find (arch_string));	1515	object *tmp = arch_to_object (archetype::find (archname));
1466		1516
1467	tmp->x = op->x;	1517	tmp->x = op->x;
1468	tmp->y = op->y;	1518	tmp->y = op->y;
1469		1519
1470	insert_ob_in_map (tmp, op->map, op, 0);	1520	insert_ob_in_map (tmp, op->map, op, 0);
…		…
1475	{	1525	{
1476	if (where->env)	1526	if (where->env)
1477	return where->env->insert (this);	1527	return where->env->insert (this);
1478	else	1528	else
1479	return where->map->insert (this, where->x, where->y, originator, flags);	1529	return where->map->insert (this, where->x, where->y, originator, flags);
1480	}
1481
1482	// find player who can see this object
1483	static object *
1484	visible_to (object *op)
1485	{
1486	if (!op->flag [FLAG_REMOVED])
1487	{
1488	// see if we are in a container of sorts
1489	if (object *env = op->env)
1490	{
1491	// the player inventory itself is always visible
1492	if (env->type == PLAYER)
1493	return env;
1494
1495	// else a player could have our env open
1496	env = env->outer_env ();
1497
1498	// the player itself is always on a map, so we will find him here
1499	// even if our inv is in a player.
1500	if (env->is_on_map ())
1501	if (object *pl = env->ms ().player ())
1502	if (pl->container == op->env)
1503	return pl;
1504	}
1505	else
1506	{
1507	// maybe there is a player standing on the same mapspace
1508	if (object *pl = env->ms ().player ())
1509	return pl;
1510	}
1511	}
1512
1513	return 0;
1514	}	1530	}
1515		1531
1516	/*	1532	/*
1517	* decrease(object, number) decreases a specified number from	1533	* decrease(object, number) decreases a specified number from
1518	* the amount of an object. If the amount reaches 0, the object	1534	* the amount of an object. If the amount reaches 0, the object
…		…
1521	* Return value: 'op' if something is left, NULL if the amount reached 0	1537	* Return value: 'op' if something is left, NULL if the amount reached 0
1522	*/	1538	*/
1523	bool	1539	bool
1524	object::decrease (sint32 nr)	1540	object::decrease (sint32 nr)
1525	{	1541	{
		1542	if (!nr)
		1543	return true;
		1544
1526	nr = min (nr, nrof);	1545	nr = min (nr, nrof);
1527		1546
1528	if (!nr)	1547	if (nrof > nr)
1529	return 1;	1548	{
1530
1531	nrof -= nr;	1549	nrof -= nr;
1532
1533	object *visible = visible_to (this);
1534
1535	if (nrof)
1536	{
1537	adjust_weight (env, -weight * nr); // carrying == 0	1550	adjust_weight (env, -weight * max (1, nr)); // carrying == 0
1538		1551
1539	if (visible)	1552	if (object *pl = visible_to ())
1540	esrv_send_item (visible, this);	1553	esrv_update_item (UPD_NROF, pl, this);
1541		1554
1542	return 1;	1555	return true;
1543	}	1556	}
1544	else	1557	else
1545	{	1558	{
1546	if (visible)
1547	esrv_del_item (visible->contr, count);
1548
1549	this->destroy (1);	1559	destroy ();
1550	return 0;	1560	return false;
1551	}	1561	}
1552	}	1562	}
1553		1563
1554	/*	1564	/*
1555	* split(ob,nr) splits up ob into two parts. The part which	1565	* split(ob,nr) splits up ob into two parts. The part which
…		…
1558	* On failure, NULL is returned.	1568	* On failure, NULL is returned.
1559	*/	1569	*/
1560	object *	1570	object *
1561	object::split (sint32 nr)	1571	object::split (sint32 nr)
1562	{	1572	{
		1573	int have = number_of ();
		1574
1563	if (nrof < nr)	1575	if (have < nr)
1564	return 0;	1576	return 0;
1565	else if (nrof == nr)	1577	else if (have == nr)
1566	{	1578	{
1567	remove ();	1579	remove ();
1568	return this;	1580	return this;
1569	}	1581	}
1570	else	1582	else
1571	{	1583	{
1572	decrease (nr);	1584	decrease (nr);
1573		1585
1574	object *op = object_create_clone (this);	1586	object *op = deep_clone ();
1575	op->nrof = nr;	1587	op->nrof = nr;
1576	return op;	1588	return op;
1577	}	1589	}
1578	}	1590	}
1579		1591
…		…
1623	if (object::can_merge (tmp, op))	1635	if (object::can_merge (tmp, op))
1624	{	1636	{
1625	/* return the original object and remove inserted object	1637	/* return the original object and remove inserted object
1626	(client needs the original object) */	1638	(client needs the original object) */
1627	tmp->nrof += op->nrof;	1639	tmp->nrof += op->nrof;
		1640
		1641	if (object *pl = tmp->visible_to ())
		1642	esrv_update_item (UPD_NROF, pl, tmp);
		1643
1628	adjust_weight (this, op->total_weight ());	1644	adjust_weight (this, op->total_weight ());
1629		1645
1630	op->destroy (1);	1646	op->destroy ();
1631	op = tmp;	1647	op = tmp;
1632	goto inserted;	1648	goto inserted;
1633	}	1649	}
1634		1650
1635	op->owner = 0; // it's his/hers now. period.	1651	op->owner = 0; // it's his/hers now. period.
…		…
1646		1662
1647	inv = op;	1663	inv = op;
1648		1664
1649	op->flag [FLAG_REMOVED] = 0;	1665	op->flag [FLAG_REMOVED] = 0;
1650		1666
		1667	if (object *pl = op->visible_to ())
		1668	esrv_send_item (pl, op);
		1669
1651	adjust_weight (this, op->total_weight ());	1670	adjust_weight (this, op->total_weight ());
1652		1671
1653	inserted:	1672	inserted:
1654	/* reset the light list and los of the players on the map */	1673	/* reset the light list and los of the players on the map */
1655	if (op->glow_radius && map && map->darkness)	1674	if (op->glow_radius && is_on_map ())
		1675	{
		1676	update_stats ();
1656	update_all_los (map, x, y);	1677	update_all_los (map, x, y);
1657		1678	}
1658	if (object *otmp = in_player ())	1679	else if (is_player () && !flag [FLAG_NO_FIX_PLAYER])
1659	if (otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1680	// if this is a player's inventory, update stats
1660	otmp->update_stats ();	1681	update_stats ();
1661		1682
1662	INVOKE_OBJECT (INSERT, this);	1683	INVOKE_OBJECT (INSERT, this);
1663		1684
1664	return op;	1685	return op;
1665	}	1686	}
…		…
1685	* on top.	1706	* on top.
1686	*/	1707	*/
1687	int	1708	int
1688	check_move_on (object *op, object *originator)	1709	check_move_on (object *op, object *originator)
1689	{	1710	{
		1711	if (QUERY_FLAG (op, FLAG_NO_APPLY))
		1712	return 0;
		1713
1690	object *tmp;	1714	object *tmp;
1691	maptile *m = op->map;	1715	maptile *m = op->map;
1692	int x = op->x, y = op->y;	1716	int x = op->x, y = op->y;
1693		1717
1694	MoveType move_on, move_slow, move_block;	1718	mapspace &ms = m->at (x, y);
1695		1719
1696	if (QUERY_FLAG (op, FLAG_NO_APPLY))	1720	ms.update ();
1697	return 0;
1698		1721
1699	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);	1722	MoveType move_on = ms.move_on;
1700	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);	1723	MoveType move_slow = ms.move_slow;
1701	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);	1724	MoveType move_block = ms.move_block;
1702		1725
1703	/* if nothing on this space will slow op down or be applied,	1726	/* if nothing on this space will slow op down or be applied,
1704	* no need to do checking below. have to make sure move_type	1727	* no need to do checking below. have to make sure move_type
1705	* is set, as lots of objects don't have it set - we treat that	1728	* is set, as lots of objects don't have it set - we treat that
1706	* as walking.	1729	* as walking.
…		…
1717	return 0;	1740	return 0;
1718		1741
1719	/* The objects have to be checked from top to bottom.	1742	/* The objects have to be checked from top to bottom.
1720	* Hence, we first go to the top:	1743	* Hence, we first go to the top:
1721	*/	1744	*/
1722		1745	for (object *next, *tmp = ms.top; tmp; tmp = next)
1723	for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above)
1724	{
1725	/* Trim the search when we find the first other spell effect
1726	* this helps performance so that if a space has 50 spell objects,
1727	* we don't need to check all of them.
1728	*/
1729	if ((tmp->move_type & MOVE_FLY_LOW) && QUERY_FLAG (tmp, FLAG_NO_PICK))
1730	break;
1731	}	1746	{
		1747	next = tmp->below;
1732		1748
1733	for (; tmp; tmp = tmp->below)
1734	{
1735	if (tmp == op)	1749	if (tmp == op)
1736	continue; /* Can't apply yourself */	1750	continue; /* Can't apply yourself */
1737		1751
1738	/* Check to see if one of the movement types should be slowed down.	1752	/* Check to see if one of the movement types should be slowed down.
1739	* Second check makes sure that the movement types not being slowed	1753	* Second check makes sure that the movement types not being slowed
…		…
1744	if (!QUERY_FLAG (op, FLAG_WIZPASS))	1758	if (!QUERY_FLAG (op, FLAG_WIZPASS))
1745	{	1759	{
1746	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||	1760	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
1747	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))	1761	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1748	{	1762	{
1749
1750	float
1751	diff = tmp->move_slow_penalty * fabs (op->speed);	1763	float diff = tmp->move_slow_penalty * fabs (op->speed);
1752		1764
1753	if (op->type == PLAYER)	1765	if (op->is_player ())
1754	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||	1766	if ((tmp->flag [FLAG_IS_HILLY ] && find_skill_by_number (op, SK_CLIMBING)) ||
1755	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))	1767	(tmp->flag [FLAG_IS_WOODED] && find_skill_by_number (op, SK_WOODSMAN)))
1756	diff /= 4.0;	1768	diff /= 4.0;
1757		1769
1758	op->speed_left -= diff;	1770	op->speed_left -= diff;
1759	}	1771	}
1760	}	1772	}
…		…
1793	LOG (llevError, "Present_arch called outside map.\n");	1805	LOG (llevError, "Present_arch called outside map.\n");
1794	return NULL;	1806	return NULL;
1795	}	1807	}
1796		1808
1797	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)	1809	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1798	if (tmp->arch == at)	1810	if (tmp->arch->archname == at->archname)
1799	return tmp;	1811	return tmp;
1800		1812
1801	return NULL;	1813	return NULL;
1802	}	1814	}
1803		1815
…		…
1867	* The first matching object is returned, or NULL if none.	1879	* The first matching object is returned, or NULL if none.
1868	*/	1880	*/
1869	object *	1881	object *
1870	present_arch_in_ob (const archetype *at, const object *op)	1882	present_arch_in_ob (const archetype *at, const object *op)
1871	{	1883	{
1872	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)	1884	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1873	if (tmp->arch == at)	1885	if (tmp->arch->archname == at->archname)
1874	return tmp;	1886	return tmp;
1875		1887
1876	return NULL;	1888	return NULL;
1877	}	1889	}
1878		1890
…		…
1966	* head of the object should correspond for the entire object.	1978	* head of the object should correspond for the entire object.
1967	*/	1979	*/
1968	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))	1980	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
1969	continue;	1981	continue;
1970		1982
1971	if (ob->blocked (m, pos.x, pos.y))	1983	if (ob->blocked (pos.m, pos.x, pos.y))
1972	continue;	1984	continue;
1973		1985
1974	altern [index++] = i;	1986	altern [index++] = i;
1975	}	1987	}
1976		1988
…		…
2044	* there is capable of.	2056	* there is capable of.
2045	*/	2057	*/
2046	int	2058	int
2047	find_dir (maptile *m, int x, int y, object *exclude)	2059	find_dir (maptile *m, int x, int y, object *exclude)
2048	{	2060	{
2049	int i, max = SIZEOFFREE, mflags;	2061	int max = SIZEOFFREE, mflags;
2050
2051	sint16 nx, ny;
2052	object *tmp;
2053	maptile *mp;
2054
2055	MoveType blocked, move_type;	2062	MoveType move_type;
2056		2063
2057	if (exclude && exclude->head_ () != exclude)	2064	if (exclude && exclude->head_ () != exclude)
2058	{	2065	{
2059	exclude = exclude->head;	2066	exclude = exclude->head;
2060	move_type = exclude->move_type;	2067	move_type = exclude->move_type;
…		…
2063	{	2070	{
2064	/* If we don't have anything, presume it can use all movement types. */	2071	/* If we don't have anything, presume it can use all movement types. */
2065	move_type = MOVE_ALL;	2072	move_type = MOVE_ALL;
2066	}	2073	}
2067		2074
2068	for (i = 1; i < max; i++)	2075	for (int i = 1; i < max; i++)
2069	{	2076	{
2070	mp = m;	2077	mapxy pos (m, x, y);
2071	nx = x + freearr_x[i];	2078	pos.move (i);
2072	ny = y + freearr_y[i];
2073		2079
2074	mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);	2080	if (!pos.normalise ())
2075
2076	if (mflags & P_OUT_OF_MAP)
2077	max = maxfree[i];	2081	max = maxfree[i];
2078	else	2082	else
2079	{	2083	{
2080	mapspace &ms = mp->at (nx, ny);	2084	mapspace &ms = *pos;
2081		2085
2082	blocked = ms.move_block;
2083
2084	if ((move_type & blocked) == move_type)	2086	if ((move_type & ms.move_block) == move_type)
2085	max = maxfree[i];	2087	max = maxfree [i];
2086	else if (mflags & P_IS_ALIVE)	2088	else if (ms.flags () & P_IS_ALIVE)
2087	{	2089	{
2088	for (tmp = ms.bot; tmp; tmp = tmp->above)	2090	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
2089	if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)	2091	if ((tmp->flag [FLAG_MONSTER] || tmp->is_player ())
2090	&& (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))	2092	&& (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2091	break;
2092
2093	if (tmp)
2094	return freedir[i];	2093	return freedir [i];
2095	}	2094	}
2096	}	2095	}
2097	}	2096	}
2098		2097
2099	return 0;	2098	return 0;
…		…
2174	* This basically means that if direction is 15, then it could either go	2173	* This basically means that if direction is 15, then it could either go
2175	* direction 4, 14, or 16 to get back to where we are.	2174	* direction 4, 14, or 16 to get back to where we are.
2176	* Moved from spell_util.c to object.c with the other related direction	2175	* Moved from spell_util.c to object.c with the other related direction
2177	* functions.	2176	* functions.
2178	*/	2177	*/
2179	int reduction_dir[SIZEOFFREE][3] = {	2178	const int reduction_dir[SIZEOFFREE][3] = {
2180	{0, 0, 0}, /* 0 */	2179	{0, 0, 0}, /* 0 */
2181	{0, 0, 0}, /* 1 */	2180	{0, 0, 0}, /* 1 */
2182	{0, 0, 0}, /* 2 */	2181	{0, 0, 0}, /* 2 */
2183	{0, 0, 0}, /* 3 */	2182	{0, 0, 0}, /* 3 */
2184	{0, 0, 0}, /* 4 */	2183	{0, 0, 0}, /* 4 */
…		…
2280	int	2279	int
2281	can_pick (const object *who, const object *item)	2280	can_pick (const object *who, const object *item)
2282	{	2281	{
2283	return /*QUERY_FLAG(who,FLAG_WIZ)|| */	2282	return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2284	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&	2283	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
2285	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3));	2284	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->is_player () || item->weight < who->weight / 3));
2286	}	2285	}
2287		2286
2288	/*	2287	/*
2289	* create clone from object to another	2288	* create clone from object to another
2290	*/	2289	*/
2291	object *	2290	object *
2292	object_create_clone (object *asrc)	2291	object::deep_clone ()
2293	{	2292	{
2294	object *dst = 0, *tmp, *src, *prev, *item;	2293	assert (("deep_clone called on non-head object", is_head ()));
2295		2294
2296	if (!asrc)	2295	object *dst = clone ();
2297	return 0;
2298		2296
2299	src = asrc->head_ ();	2297	object *prev = dst;
2300
2301	prev = 0;
2302	for (object *part = src; part; part = part->more)	2298	for (object *part = this->more; part; part = part->more)
2303	{	2299	{
2304	tmp = part->clone ();	2300	object *tmp = part->clone ();
2305	tmp->x -= src->x;
2306	tmp->y -= src->y;
2307
2308	if (!part->head)
2309	{
2310	dst = tmp;
2311	tmp->head = 0;
2312	}
2313	else
2314	tmp->head = dst;	2301	tmp->head = dst;
2315
2316	tmp->more = 0;
2317
2318	if (prev)
2319	prev->more = tmp;	2302	prev->more = tmp;
2320
2321	prev = tmp;	2303	prev = tmp;
2322	}	2304	}
2323		2305
2324	for (item = src->inv; item; item = item->below)	2306	for (object *item = inv; item; item = item->below)
2325	insert_ob_in_ob (object_create_clone (item), dst);	2307	insert_ob_in_ob (item->deep_clone (), dst);
2326		2308
2327	return dst;	2309	return dst;
2328	}	2310	}
2329		2311
2330	/* This returns the first object in who's inventory that	2312	/* This returns the first object in who's inventory that
…		…
2339	return tmp;	2321	return tmp;
2340		2322
2341	return 0;	2323	return 0;
2342	}	2324	}
2343		2325
2344	/* If ob has a field named key, return the link from the list,	2326	shstr_tmp
2345	* otherwise return NULL.	2327	object::kv_get (shstr_tmp key) const
2346	*
2347	* key must be a passed in shared string - otherwise, this won't
2348	* do the desired thing.
2349	*/
2350	key_value *
2351	get_ob_key_link (const object *ob, const char *key)
2352	{	2328	{
2353	for (key_value *link = ob->key_values; link; link = link->next)	2329	for (key_value *kv = key_values; kv; kv = kv->next)
2354	if (link->key == key)	2330	if (kv->key == key)
2355	return link;
2356
2357	return 0;
2358	}
2359
2360	/*
2361	* Returns the value of op has an extra_field for key, or NULL.
2362	*
2363	* The argument doesn't need to be a shared string.
2364	*
2365	* The returned string is shared.
2366	*/
2367	const char *
2368	get_ob_key_value (const object *op, const char *const key)
2369	{
2370	key_value *link;
2371	shstr_cmp canonical_key (key);
2372
2373	if (!canonical_key)
2374	{
2375	/* 1. There being a field named key on any object
2376	* implies there'd be a shared string to find.
2377	* 2. Since there isn't, no object has this field.
2378	* 3. Therefore, *this* object doesn't have this field.
2379	*/
2380	return 0;
2381	}
2382
2383	/* This is copied from get_ob_key_link() above -
2384	* only 4 lines, and saves the function call overhead.
2385	*/
2386	for (link = op->key_values; link; link = link->next)
2387	if (link->key == canonical_key)
2388	return link->value;	2331	return kv->value;
2389		2332
2390	return 0;	2333	return shstr ();
2391	}	2334	}
2392		2335
2393	/*	2336	void
2394	* Updates the canonical_key in op to value.	2337	object::kv_set (shstr_tmp key, shstr_tmp value)
2395	*
2396	* canonical_key is a shared string (value doesn't have to be).
2397	*
2398	* Unless add_key is TRUE, it won't add fields, only change the value of existing
2399	* keys.
2400	*
2401	* Returns TRUE on success.
2402	*/
2403	int
2404	set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key)
2405	{	2338	{
2406	key_value *field = NULL, *last = NULL;	2339	for (key_value *kv = key_values; kv; kv = kv->next)
2407		2340	if (kv->key == key)
2408	for (field = op->key_values; field != NULL; field = field->next)
2409	{
2410	if (field->key != canonical_key)
2411	{	2341	{
2412	last = field;	2342	kv->value = value;
2413	continue;	2343	return;
2414	}	2344	}
2415		2345
2416	if (value)	2346	key_value *kv = new key_value;
2417	field->value = value;	2347
2418	else	2348	kv->next = key_values;
		2349	kv->key = key;
		2350	kv->value = value;
		2351
		2352	key_values = kv;
		2353	}
		2354
		2355	void
		2356	object::kv_del (shstr_tmp key)
		2357	{
		2358	for (key_value **kvp = &key_values; *kvp; kvp = &(*kvp)->next)
		2359	if ((*kvp)->key == key)
2419	{	2360	{
2420	/* Basically, if the archetype has this key set,	2361	key_value *kv = *kvp;
2421	* we need to store the null value so when we save	2362	*kvp = (*kvp)->next;
2422	* it, we save the empty value so that when we load,	2363	delete kv;
2423	* we get this value back again.	2364	return;
2424	*/
2425	if (get_ob_key_link (op->arch, canonical_key))
2426	field->value = 0;
2427	else
2428	{
2429	if (last)
2430	last->next = field->next;
2431	else
2432	op->key_values = field->next;
2433
2434	delete field;
2435	}
2436	}	2365	}
2437	return TRUE;
2438	}
2439	/* IF we get here, key doesn't exist */
2440
2441	/* No field, we'll have to add it. */
2442
2443	if (!add_key)
2444	return FALSE;
2445
2446	/* There isn't any good reason to store a null
2447	* value in the key/value list. If the archetype has
2448	* this key, then we should also have it, so shouldn't
2449	* be here. If user wants to store empty strings,
2450	* should pass in ""
2451	*/
2452	if (value == NULL)
2453	return TRUE;
2454
2455	field = new key_value;
2456
2457	field->key = canonical_key;
2458	field->value = value;
2459	/* Usual prepend-addition. */
2460	field->next = op->key_values;
2461	op->key_values = field;
2462
2463	return TRUE;
2464	}
2465
2466	/*
2467	* Updates the key in op to value.
2468	*
2469	* If add_key is FALSE, this will only update existing keys,
2470	* and not add new ones.
2471	* In general, should be little reason FALSE is ever passed in for add_key
2472	*
2473	* Returns TRUE on success.
2474	*/
2475	int
2476	set_ob_key_value (object *op, const char *key, const char *value, int add_key)
2477	{
2478	shstr key_ (key);
2479
2480	return set_ob_key_value_s (op, key_, value, add_key);
2481	}	2366	}
2482		2367
2483	object::depth_iterator::depth_iterator (object *container)	2368	object::depth_iterator::depth_iterator (object *container)
2484	: iterator_base (container)	2369	: iterator_base (container)
2485	{	2370	{
…		…
2535	{	2420	{
2536	char flagdesc[512];	2421	char flagdesc[512];
2537	char info2[256 * 4];	2422	char info2[256 * 4];
2538	char *p = info;	2423	char *p = info;
2539		2424
2540	p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s,flags:[%s],type:%d}",	2425	p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s%s,flags:[%s],type:%d}",
2541	count,	2426	count,
2542	uuid.c_str (),	2427	uuid.c_str (),
2543	&name,	2428	&name,
2544	title ? "\",title:\"" : "",	2429	title ? ",title:\"" : "",
2545	title ? (const char *)title : "",	2430	title ? (const char *)title : "",
		2431	title ? "\"" : "",
2546	flag_desc (flagdesc, 512), type);	2432	flag_desc (flagdesc, 512), type);
2547		2433
2548	if (!this->flag[FLAG_REMOVED] && env)	2434	if (!flag[FLAG_REMOVED] && env)
2549	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2435	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2550		2436
2551	if (map)	2437	if (map)
2552	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);	2438	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2553		2439
…		…
2583	object::open_container (object *new_container)	2469	object::open_container (object *new_container)
2584	{	2470	{
2585	if (container == new_container)	2471	if (container == new_container)
2586	return;	2472	return;
2587		2473
2588	if (object *old_container = container)	2474	object *old_container = container;
		2475
		2476	if (old_container)
2589	{	2477	{
2590	if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))	2478	if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
2591	return;	2479	return;
2592		2480
2593	#if 0	2481	#if 0
…		…
2595	if (object *closer = old_container->inv)	2483	if (object *closer = old_container->inv)
2596	if (closer->type == CLOSE_CON)	2484	if (closer->type == CLOSE_CON)
2597	closer->destroy ();	2485	closer->destroy ();
2598	#endif	2486	#endif
2599		2487
		2488	// make sure the container is available
		2489	esrv_send_item (this, old_container);
		2490
2600	old_container->flag [FLAG_APPLIED] = 0;	2491	old_container->flag [FLAG_APPLIED] = false;
2601	container = 0;	2492	container = 0;
2602		2493
		2494	// client needs item update to make it work, client bug requires this to be separate
2603	esrv_update_item (UPD_FLAGS, this, old_container);	2495	esrv_update_item (UPD_FLAGS, this, old_container);
		2496
2604	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));	2497	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", old_container->query_name ());
2605	play_sound (sound_find ("chest_close"));	2498	play_sound (sound_find ("chest_close"));
2606	}	2499	}
2607		2500
2608	if (new_container)	2501	if (new_container)
2609	{	2502	{
…		…
2619	closer->flag [FLAG_NO_MAP_SAVE] = 1;	2512	closer->flag [FLAG_NO_MAP_SAVE] = 1;
2620	new_container->insert (closer);	2513	new_container->insert (closer);
2621	}	2514	}
2622	#endif	2515	#endif
2623		2516
2624	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));	2517	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", new_container->query_name ());
2625		2518
		2519	// make sure the container is available, client bug requires this to be separate
		2520	esrv_send_item (this, new_container);
		2521
2626	new_container->flag [FLAG_APPLIED] = 1;	2522	new_container->flag [FLAG_APPLIED] = true;
2627	container = new_container;	2523	container = new_container;
2628		2524
		2525	// client needs flag change
2629	esrv_update_item (UPD_FLAGS, this, new_container);	2526	esrv_update_item (UPD_FLAGS, this, new_container);
2630	esrv_send_inventory (this, new_container);	2527	esrv_send_inventory (this, new_container);
2631	play_sound (sound_find ("chest_open"));	2528	play_sound (sound_find ("chest_open"));
2632	}	2529	}
		2530	// else if (!old_container->env && contr && contr->ns)
		2531	// contr->ns->floorbox_reset ();
2633	}	2532	}
2634		2533
2635	object *	2534	object *
2636	object::force_find (const shstr name)	2535	object::force_find (shstr_tmp name)
2637	{	2536	{
2638	/* cycle through his inventory to look for the MARK we want to	2537	/* cycle through his inventory to look for the MARK we want to
2639	* place	2538	* place
2640	*/	2539	*/
2641	for (object *tmp = inv; tmp; tmp = tmp->below)	2540	for (object *tmp = inv; tmp; tmp = tmp->below)
…		…
2643	return splay (tmp);	2542	return splay (tmp);
2644		2543
2645	return 0;	2544	return 0;
2646	}	2545	}
2647		2546
		2547	//-GPL
		2548
2648	void	2549	void
		2550	object::force_set_timer (int duration)
		2551	{
		2552	this->duration = 1;
		2553	this->speed_left = -1.f;
		2554
		2555	this->set_speed (duration ? 1.f / duration : 0.f);
		2556	}
		2557
		2558	object *
2649	object::force_add (const shstr name, int duration)	2559	object::force_add (shstr_tmp name, int duration)
2650	{	2560	{
2651	if (object *force = force_find (name))	2561	if (object *force = force_find (name))
2652	force->destroy ();	2562	force->destroy ();
2653		2563
2654	object *force = get_archetype (FORCE_NAME);	2564	object *force = get_archetype (FORCE_NAME);
2655		2565
2656	force->slaying = name;	2566	force->slaying = name;
2657	force->stats.food = 1;	2567	force->force_set_timer (duration);
2658	force->speed_left = -1.f;
2659
2660	force->set_speed (duration ? 1.f / duration : 0.f);
2661	force->flag [FLAG_IS_USED_UP] = true;
2662	force->flag [FLAG_APPLIED] = true;	2568	force->flag [FLAG_APPLIED] = true;
2663		2569
2664	insert (force);	2570	return insert (force);
2665	}	2571	}
2666		2572
2667	void	2573	void
2668	object::play_sound (faceidx sound)	2574	object::play_sound (faceidx sound) const
2669	{	2575	{
2670	if (!sound)	2576	if (!sound)
2671	return;	2577	return;
2672		2578
2673	if (flag [FLAG_REMOVED])	2579	if (is_on_map ())
		2580	map->play_sound (sound, x, y);
		2581	else if (object *pl = in_player ())
		2582	pl->contr->play_sound (sound);
		2583	}
		2584
		2585	void
		2586	object::say_msg (const char *msg) const
		2587	{
		2588	if (is_on_map ())
		2589	map->say_msg (msg, x, y);
		2590	else if (object *pl = in_player ())
		2591	pl->contr->play_sound (sound);
		2592	}
		2593
		2594	void
		2595	object::make_noise ()
		2596	{
		2597	// we do not model noise in the map, so instead put
		2598	// a temporary light into the noise source
		2599	// could use the map instead, but that's less reliable for our
		2600	// goal, which is to make invisibility a bit harder to exploit
		2601
		2602	// currently only works sensibly for players
		2603	if (!is_player ())
2674	return;	2604	return;
2675		2605
2676	if (env)	2606	// find old force, or create new one
2677	{	2607	object *force = force_find (shstr_noise_force);
2678	if (object *pl = in_player ())	2608
2679	pl->contr->play_sound (sound);	2609	if (force)
2680	}	2610	force->speed_left = -1.f; // patch old speed up
2681	else	2611	else
2682	map->play_sound (sound, x, y);	2612	{
2683	}	2613	force = archetype::get (shstr_noise_force);
2684		2614
		2615	force->slaying = shstr_noise_force;
		2616	force->stats.food = 1;
		2617	force->speed_left = -1.f;
		2618
		2619	force->set_speed (1.f / 4.f);
		2620	force->flag [FLAG_IS_USED_UP] = true;
		2621	force->flag [FLAG_APPLIED] = true;
		2622
		2623	insert (force);
		2624	}
		2625	}
		2626

Diff Legend

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