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.81 by root, Sat Dec 23 13:56:25 2006 UTC vs.
Revision 1.179 by root, Wed Aug 15 04:57:48 2007 UTC

1	/*	1	/*
2	CrossFire, A Multiplayer game for X-windows	2	* This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
3		3	*
		4	* Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
4	Copyright (C) 2001 Mark Wedel & Crossfire Development Team	5	* Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team
5	Copyright (C) 1992 Frank Tore Johansen	6	* Copyright (©) 1992,2007 Frank Tore Johansen
6		7	*
7	This program is free software; you can redistribute it and/or modify	8	* Crossfire TRT is free software: you can redistribute it and/or modify
8	it under the terms of the GNU General Public License as published by	9	* it under the terms of the GNU General Public License as published by
9	the Free Software Foundation; either version 2 of the License, or	10	* the Free Software Foundation, either version 3 of the License, or
10	(at your option) any later version.	11	* (at your option) any later version.
11		12	*
12	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,
13	but WITHOUT ANY WARRANTY; without even the implied warranty of	14	* but WITHOUT ANY WARRANTY; without even the implied warranty of
14	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15	GNU General Public License for more details.	16	* GNU General Public License for more details.
16		17	*
17	You should have received a copy of the GNU General Public License	18	* You should have received a copy of the GNU General Public License
18	along with this program; if not, write to the Free Software	19	* along with this program. If not, see <http://www.gnu.org/licenses/>.
19	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	20	*
20
21	The authors can be reached via e-mail at <crossfire@schmorp.de>	21	* The authors can be reached via e-mail to <crossfire@schmorp.de>
22	*/	22	*/
23		23
24	/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.	24	/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
25	sub/add_weight will transcend the environment updating the carrying	25	sub/add_weight will transcend the environment updating the carrying
26	variable. */	26	variable. */
27	#include <global.h>	27	#include <global.h>
28	#include <stdio.h>	28	#include <stdio.h>
29	#include <sys/types.h>	29	#include <sys/types.h>
30	#include <sys/uio.h>	30	#include <sys/uio.h>
31	#include <object.h>	31	#include <object.h>
32	#include <funcpoint.h>	32	#include <funcpoint.h>
		33	#include <sproto.h>
33	#include <loader.h>	34	#include <loader.h>
34		35
35	#include <bitset>	36	#include <bitset>
36		37
37	int nrofallocobjects = 0;	38	int nrofallocobjects = 0;
38	static UUID uuid;	39	static UUID uuid;
39	const uint64 UUID_SKIP = 1<<19;	40	const uint64 UUID_SKIP = 1<<19;
40		41
41	object *active_objects; /* List of active objects that need to be processed */	42	objectvec objects;
		43	activevec actives;
42		44
43	short freearr_x[SIZEOFFREE] = { 0, 0, 1, 1, 1, 0, -1, -1, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,	45	short freearr_x[SIZEOFFREE] = { 0, 0, 1, 1, 1, 0, -1, -1, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,
44	0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1	46	0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1
45	};	47	};
46	short freearr_y[SIZEOFFREE] = { 0, -1, -1, 0, 1, 1, 1, 0, -1, -2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2,	48	short freearr_y[SIZEOFFREE] = { 0, -1, -1, 0, 1, 1, 1, 0, -1, -2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2,
…		…
141	* objects with lists are rare, and lists stay short. If not, use a	143	* objects with lists are rare, and lists stay short. If not, use a
142	* different structure or at least keep the lists sorted...	144	* different structure or at least keep the lists sorted...
143	*/	145	*/
144		146
145	/* For each field in wants, */	147	/* For each field in wants, */
146	for (wants_field = wants->key_values; wants_field != NULL; wants_field = wants_field->next)	148	for (wants_field = wants->key_values; wants_field; wants_field = wants_field->next)
147	{	149	{
148	key_value *has_field;	150	key_value *has_field;
149		151
150	/* Look for a field in has with the same key. */	152	/* Look for a field in has with the same key. */
151	has_field = get_ob_key_link (has, wants_field->key);	153	has_field = get_ob_key_link (has, wants_field->key);
…		…
190	* Check nrof variable *before* calling can_merge()	192	* Check nrof variable *before* calling can_merge()
191	*	193	*
192	* Improvements made with merge: Better checking on potion, and also	194	* Improvements made with merge: Better checking on potion, and also
193	* check weight	195	* check weight
194	*/	196	*/
195
196	bool object::can_merge_slow (object *ob1, object *ob2)	197	bool object::can_merge_slow (object *ob1, object *ob2)
197	{	198	{
198	/* A couple quicksanity checks */	199	/* A couple quicksanity checks */
199	if (ob1 == ob2	200	if (ob1 == ob2
200	|| ob1->type != ob2->type	201	|| ob1->type != ob2->type
…		…
277		278
278	/* Note sure why the following is the case - either the object has to	279	/* Note sure why the following is the case - either the object has to
279	* be animated or have a very low speed. Is this an attempted monster	280	* be animated or have a very low speed. Is this an attempted monster
280	* check?	281	* check?
281	*/	282	*/
282	if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && FABS ((ob1)->speed) > MIN_ACTIVE_SPEED)	283	if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && ob1->has_active_speed ())
283	return 0;	284	return 0;
284		285
285	switch (ob1->type)	286	switch (ob1->type)
286	{	287	{
287	case SCROLL:	288	case SCROLL:
…		…
298	return 0;	299	return 0;
299	else if (!compare_ob_value_lists (ob1, ob2))	300	else if (!compare_ob_value_lists (ob1, ob2))
300	return 0;	301	return 0;
301	}	302	}
302		303
303	//TODO: generate an event or call into perl for additional checks
304	if (ob1->self || ob2->self)	304	if (ob1->self || ob2->self)
305	{	305	{
306	ob1->optimise ();	306	ob1->optimise ();
307	ob2->optimise ();	307	ob2->optimise ();
308		308
309	if (ob1->self || ob2->self)	309	if (ob1->self || ob2->self)
		310	if (!cfperl_can_merge (ob1, ob2))
310	return 0;	311	return 0;
311	}	312	}
312		313
313	/* Everything passes, must be OK. */	314	/* Everything passes, must be OK. */
314	return 1;	315	return 1;
315	}	316	}
…		…
323	sum_weight (object *op)	324	sum_weight (object *op)
324	{	325	{
325	long sum;	326	long sum;
326	object *inv;	327	object *inv;
327		328
328	for (sum = 0, inv = op->inv; inv != NULL; inv = inv->below)	329	for (sum = 0, inv = op->inv; inv; inv = inv->below)
329	{	330	{
330	if (inv->inv)	331	if (inv->inv)
331	sum_weight (inv);	332	sum_weight (inv);
		333
332	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);	334	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);
333	}	335	}
334		336
335	if (op->type == CONTAINER && op->stats.Str)	337	if (op->type == CONTAINER && op->stats.Str)
336	sum = (sum * (100 - op->stats.Str)) / 100;	338	sum = (sum * (100 - op->stats.Str)) / 100;
…		…
356	/*	358	/*
357	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.	359	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
358	* Some error messages.	360	* Some error messages.
359	* The result of the dump is stored in the static global errmsg array.	361	* The result of the dump is stored in the static global errmsg array.
360	*/	362	*/
361
362	char *	363	char *
363	dump_object (object *op)	364	dump_object (object *op)
364	{	365	{
365	if (!op)	366	if (!op)
366	return strdup ("[NULLOBJ]");	367	return strdup ("[NULLOBJ]");
367		368
368	object_freezer freezer;	369	object_freezer freezer;
369	save_object (freezer, op, 3);	370	op->write (freezer);
370	return freezer.as_string ();	371	return freezer.as_string ();
371	}	372	}
372		373
373	/*	374	/*
374	* get_nearest_part(multi-object, object 2) returns the part of the	375	* get_nearest_part(multi-object, object 2) returns the part of the
…		…
391	}	392	}
392		393
393	/*	394	/*
394	* Returns the object which has the count-variable equal to the argument.	395	* Returns the object which has the count-variable equal to the argument.
395	*/	396	*/
396
397	object *	397	object *
398	find_object (tag_t i)	398	find_object (tag_t i)
399	{	399	{
400	for (object *op = object::first; op; op = op->next)	400	for_all_objects (op)
401	if (op->count == i)	401	if (op->count == i)
402	return op;	402	return op;
403		403
404	return 0;	404	return 0;
405	}	405	}
406		406
407	/*	407	/*
408	* Returns the first object which has a name equal to the argument.	408	* Returns the first object which has a name equal to the argument.
409	* Used only by the patch command, but not all that useful.	409	* Used only by the patch command, but not all that useful.
410	* Enables features like "patch <name-of-other-player> food 999"	410	* Enables features like "patch <name-of-other-player> food 999"
411	*/	411	*/
412
413	object *	412	object *
414	find_object_name (const char *str)	413	find_object_name (const char *str)
415	{	414	{
416	shstr_cmp str_ (str);	415	shstr_cmp str_ (str);
417	object *op;	416	object *op;
418		417
419	for (op = object::first; op != NULL; op = op->next)	418	for_all_objects (op)
420	if (op->name == str_)	419	if (op->name == str_)
421	break;	420	break;
422		421
423	return op;	422	return op;
424	}	423	}
…		…
450	owner = owner->owner;	449	owner = owner->owner;
451		450
452	this->owner = owner;	451	this->owner = owner;
453	}	452	}
454		453
		454	int
		455	object::slottype () const
		456	{
		457	if (type == SKILL)
		458	{
		459	if (IS_COMBAT_SKILL (subtype)) return slot_combat;
		460	if (IS_RANGED_SKILL (subtype)) return slot_ranged;
		461	}
		462	else
		463	{
		464	if (slot [body_combat].info) return slot_combat;
		465	if (slot [body_range ].info) return slot_ranged;
		466	}
		467
		468	return slot_none;
		469	}
		470
		471	bool
		472	object::change_weapon (object *ob)
		473	{
		474	if (current_weapon == ob)
		475	return true;
		476
		477	if (chosen_skill)
		478	chosen_skill->flag [FLAG_APPLIED] = false;
		479
		480	current_weapon = ob;
		481	chosen_skill = !ob || ob->type == SKILL ? ob : find_skill_by_name (this, ob->skill);
		482
		483	if (chosen_skill)
		484	chosen_skill->flag [FLAG_APPLIED] = true;
		485
		486	update_stats ();
		487
		488	if (ob)
		489	{
		490	// now check wether any body locations became invalid, in which case
		491	// we cannot apply the weapon at the moment.
		492	for (int i = 0; i < NUM_BODY_LOCATIONS; ++i)
		493	if (slot[i].used < 0)
		494	{
		495	current_weapon = chosen_skill = 0;
		496	update_stats ();
		497
		498	new_draw_info_format (NDI_UNIQUE, 0, this,
		499	"You try to balance all your items at once, "
		500	"but the %s is just too much for your body. "
		501	"[You need to unapply some items first.]", &ob->name);
		502	return false;
		503	}
		504
		505	//new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);
		506	}
		507	else
		508	;//new_draw_info_format (NDI_UNIQUE, 0, this, "You unwield your weapons.");
		509
		510	if (ob && !ob->flag [FLAG_APPLIED] && ob->type != SPELL)
		511	{
		512	LOG (llevError | logBacktrace, "%s changed to unapplied weapon %s",
		513	&name, ob->debug_desc ());
		514	return false;
		515	}
		516
		517	return true;
		518	}
		519
455	/* Zero the key_values on op, decrementing the shared-string	520	/* Zero the key_values on op, decrementing the shared-string
456	* refcounts and freeing the links.	521	* refcounts and freeing the links.
457	*/	522	*/
458	static void	523	static void
459	free_key_values (object *op)	524	free_key_values (object *op)
460	{	525	{
461	for (key_value *i = op->key_values; i != 0;)	526	for (key_value *i = op->key_values; i; )
462	{	527	{
463	key_value *next = i->next;	528	key_value *next = i->next;
464	delete i;	529	delete i;
465		530
466	i = next;	531	i = next;
467	}	532	}
468		533
469	op->key_values = 0;	534	op->key_values = 0;
470	}	535	}
471		536
472	/*	537	object &
473	* copy_to first frees everything allocated by the dst object,	538	object::operator =(const object &src)
474	* and then copies the contents of itself into the second
475	* object, allocating what needs to be allocated. Basically, any
476	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
477	* if the first object is freed, the pointers in the new object
478	* will point at garbage.
479	*/
480	void
481	object::copy_to (object *dst)
482	{	539	{
483	bool is_freed = QUERY_FLAG (dst, FLAG_FREED);	540	bool is_freed = flag [FLAG_FREED];
484	bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED);	541	bool is_removed = flag [FLAG_REMOVED];
485		542
486	*(object_copy *)dst = *this;	543	*(object_copy *)this = src;
487		544
488	if (self || cb)	545	flag [FLAG_FREED] = is_freed;
489	INVOKE_OBJECT (CLONE, this, ARG_OBJECT (dst));	546	flag [FLAG_REMOVED] = is_removed;
490
491	if (is_freed)
492	SET_FLAG (dst, FLAG_FREED);
493
494	if (is_removed)
495	SET_FLAG (dst, FLAG_REMOVED);
496
497	if (speed < 0)
498	dst->speed_left = speed_left - RANDOM () % 200 / 100.0;
499		547
500	/* Copy over key_values, if any. */	548	/* Copy over key_values, if any. */
501	if (key_values)	549	if (src.key_values)
502	{	550	{
503	key_value *tail = 0;	551	key_value *tail = 0;
504	key_value *i;
505
506	dst->key_values = 0;	552	key_values = 0;
507		553
508	for (i = key_values; i; i = i->next)	554	for (key_value *i = src.key_values; i; i = i->next)
509	{	555	{
510	key_value *new_link = new key_value;	556	key_value *new_link = new key_value;
511		557
512	new_link->next = 0;	558	new_link->next = 0;
513	new_link->key = i->key;	559	new_link->key = i->key;
514	new_link->value = i->value;	560	new_link->value = i->value;
515		561
516	/* Try and be clever here, too. */	562	/* Try and be clever here, too. */
517	if (!dst->key_values)	563	if (!key_values)
518	{	564	{
519	dst->key_values = new_link;	565	key_values = new_link;
520	tail = new_link;	566	tail = new_link;
521	}	567	}
522	else	568	else
523	{	569	{
524	tail->next = new_link;	570	tail->next = new_link;
525	tail = new_link;	571	tail = new_link;
526	}	572	}
527	}	573	}
528	}	574	}
		575	}
529		576
530	update_ob_speed (dst);	577	/*
		578	* copy_to first frees everything allocated by the dst object,
		579	* and then copies the contents of itself into the second
		580	* object, allocating what needs to be allocated. Basically, any
		581	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
		582	* if the first object is freed, the pointers in the new object
		583	* will point at garbage.
		584	*/
		585	void
		586	object::copy_to (object *dst)
		587	{
		588	*dst = *this;
		589
		590	if (speed < 0)
		591	dst->speed_left = speed_left - rndm ();
		592
		593	dst->set_speed (dst->speed);
		594	}
		595
		596	void
		597	object::instantiate ()
		598	{
		599	if (!uuid.seq) // HACK
		600	uuid = gen_uuid ();
		601
		602	speed_left = -0.1f;
		603	/* copy the body_info to the body_used - this is only really
		604	* need for monsters, but doesn't hurt to do it for everything.
		605	* by doing so, when a monster is created, it has good starting
		606	* values for the body_used info, so when items are created
		607	* for it, they can be properly equipped.
		608	*/
		609	for (int i = NUM_BODY_LOCATIONS; i--; )
		610	slot[i].used = slot[i].info;
		611
		612	attachable::instantiate ();
531	}	613	}
532		614
533	object *	615	object *
534	object::clone ()	616	object::clone ()
535	{	617	{
…		…
541	/*	623	/*
542	* If an object with the IS_TURNABLE() flag needs to be turned due	624	* If an object with the IS_TURNABLE() flag needs to be turned due
543	* to the closest player being on the other side, this function can	625	* to the closest player being on the other side, this function can
544	* be called to update the face variable, _and_ how it looks on the map.	626	* be called to update the face variable, _and_ how it looks on the map.
545	*/	627	*/
546
547	void	628	void
548	update_turn_face (object *op)	629	update_turn_face (object *op)
549	{	630	{
550	if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || op->arch == NULL)	631	if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || !op->arch)
551	return;	632	return;
		633
552	SET_ANIMATION (op, op->direction);	634	SET_ANIMATION (op, op->direction);
553	update_object (op, UP_OBJ_FACE);	635	update_object (op, UP_OBJ_FACE);
554	}	636	}
555		637
556	/*	638	/*
557	* Updates the speed of an object. If the speed changes from 0 to another	639	* Updates the speed of an object. If the speed changes from 0 to another
558	* value, or vice versa, then add/remove the object from the active list.	640	* value, or vice versa, then add/remove the object from the active list.
559	* This function needs to be called whenever the speed of an object changes.	641	* This function needs to be called whenever the speed of an object changes.
560	*/	642	*/
561	void	643	void
562	update_ob_speed (object *op)	644	object::set_speed (float speed)
563	{	645	{
564	extern int arch_init;	646	if (flag [FLAG_FREED] && speed)
565
566	/* No reason putting the archetypes objects on the speed list,
567	* since they never really need to be updated.
568	*/
569
570	if (QUERY_FLAG (op, FLAG_FREED) && op->speed)
571	{	647	{
572	LOG (llevError, "Object %s is freed but has speed.\n", &op->name);	648	LOG (llevError, "Object %s is freed but has speed.\n", &name);
573	#ifdef MANY_CORES
574	abort ();
575	#else
576	op->speed = 0;	649	speed = 0;
577	#endif
578	}
579
580	if (arch_init)
581	return;
582
583	if (FABS (op->speed) > MIN_ACTIVE_SPEED)
584	{	650	}
585	/* If already on active list, don't do anything */
586	if (op->active_next || op->active_prev || op == active_objects)
587	return;
588		651
589	/* process_events() expects us to insert the object at the beginning	652	this->speed = speed;
590	* of the list. */
591	op->active_next = active_objects;
592		653
593	if (op->active_next != NULL)	654	if (has_active_speed ())
594	op->active_next->active_prev = op;	655	activate ();
595
596	active_objects = op;
597	}
598	else	656	else
599	{	657	deactivate ();
600	/* If not on the active list, nothing needs to be done */
601	if (!op->active_next && !op->active_prev && op != active_objects)
602	return;
603
604	if (op->active_prev == NULL)
605	{
606	active_objects = op->active_next;
607
608	if (op->active_next != NULL)
609	op->active_next->active_prev = NULL;
610	}
611	else
612	{
613	op->active_prev->active_next = op->active_next;
614
615	if (op->active_next)
616	op->active_next->active_prev = op->active_prev;
617	}
618
619	op->active_next = NULL;
620	op->active_prev = NULL;
621	}
622	}
623
624	/* This function removes object 'op' from the list of active
625	* objects.
626	* This should only be used for style maps or other such
627	* reference maps where you don't want an object that isn't
628	* in play chewing up cpu time getting processed.
629	* The reverse of this is to call update_ob_speed, which
630	* will do the right thing based on the speed of the object.
631	*/
632	void
633	remove_from_active_list (object *op)
634	{
635	/* If not on the active list, nothing needs to be done */
636	if (!op->active_next && !op->active_prev && op != active_objects)
637	return;
638
639	if (op->active_prev == NULL)
640	{
641	active_objects = op->active_next;
642	if (op->active_next != NULL)
643	op->active_next->active_prev = NULL;
644	}
645	else
646	{
647	op->active_prev->active_next = op->active_next;
648	if (op->active_next)
649	op->active_next->active_prev = op->active_prev;
650	}
651	op->active_next = NULL;
652	op->active_prev = NULL;
653	}	658	}
654		659
655	/*	660	/*
656	* update_object() updates the the map.	661	* update_object() updates the the map.
657	* It takes into account invisible objects (and represent squares covered	662	* It takes into account invisible objects (and represent squares covered
…		…
670	* UP_OBJ_FACE: only the objects face has changed.	675	* UP_OBJ_FACE: only the objects face has changed.
671	*/	676	*/
672	void	677	void
673	update_object (object *op, int action)	678	update_object (object *op, int action)
674	{	679	{
675	MoveType move_on, move_off, move_block, move_slow;
676
677	if (op == NULL)	680	if (op == NULL)
678	{	681	{
679	/* this should never happen */	682	/* this should never happen */
680	LOG (llevDebug, "update_object() called for NULL object.\n");	683	LOG (llevDebug, "update_object() called for NULL object.\n");
681	return;	684	return;
…		…
694	*/	697	*/
695	if (!op->map || op->map->in_memory == MAP_SAVING)	698	if (!op->map || op->map->in_memory == MAP_SAVING)
696	return;	699	return;
697		700
698	/* make sure the object is within map boundaries */	701	/* make sure the object is within map boundaries */
699	if (op->x < 0 || op->x >= MAP_WIDTH (op->map) || op->y < 0 || op->y >= MAP_HEIGHT (op->map))	702	if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height)
700	{	703	{
701	LOG (llevError, "update_object() called for object out of map!\n");	704	LOG (llevError, "update_object() called for object out of map!\n");
702	#ifdef MANY_CORES	705	#ifdef MANY_CORES
703	abort ();	706	abort ();
704	#endif	707	#endif
705	return;	708	return;
706	}	709	}
707		710
708	mapspace &m = op->ms ();	711	mapspace &m = op->ms ();
709		712
710	if (m.flags_ & P_NEED_UPDATE)	713	if (!(m.flags_ & P_UPTODATE))
711	/* nop */;	714	/* nop */;
712	else if (action == UP_OBJ_INSERT)	715	else if (action == UP_OBJ_INSERT)
713	{	716	{
714	// this is likely overkill, TODO: revisit (schmorp)	717	// this is likely overkill, TODO: revisit (schmorp)
715	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))	718	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
…		…
724	/* This isn't perfect, but I don't expect a lot of objects to	727	/* This isn't perfect, but I don't expect a lot of objects to
725	* to have move_allow right now.	728	* to have move_allow right now.
726	*/	729	*/
727	|| ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block	730	|| ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block
728	|| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)	731	|| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)
729	m.flags_ = P_NEED_UPDATE;	732	m.flags_ = 0;
730	}	733	}
731	/* if the object is being removed, we can't make intelligent	734	/* if the object is being removed, we can't make intelligent
732	* decisions, because remove_ob can't really pass the object	735	* decisions, because remove_ob can't really pass the object
733	* that is being removed.	736	* that is being removed.
734	*/	737	*/
735	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)	738	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
736	m.flags_ = P_NEED_UPDATE;	739	m.flags_ = 0;
737	else if (action == UP_OBJ_FACE)	740	else if (action == UP_OBJ_FACE)
738	/* Nothing to do for that case */ ;	741	/* Nothing to do for that case */ ;
739	else	742	else
740	LOG (llevError, "update_object called with invalid action: %d\n", action);	743	LOG (llevError, "update_object called with invalid action: %d\n", action);
741		744
742	if (op->more)	745	if (op->more)
743	update_object (op->more, action);	746	update_object (op->more, action);
744	}	747	}
745		748
746	object::vector object::mortals;
747	object::vector object::objects; // not yet used
748	object *object::first;
749
750	void object::free_mortals ()
751	{
752	for (AUTODECL (i, mortals.begin ()); i != mortals.end ();)
753	if ((*i)->refcnt)
754	++i; // further delay freeing
755	else
756	{
757	delete *i;
758	mortals.erase (i);
759	}
760	}
761
762	object::object ()	749	object::object ()
763	{	750	{
764	SET_FLAG (this, FLAG_REMOVED);	751	SET_FLAG (this, FLAG_REMOVED);
765		752
766	expmul = 1.0;	753	expmul = 1.0;
767	face = blank_face;	754	face = blank_face;
768	}	755	}
769		756
770	object::~object ()	757	object::~object ()
771	{	758	{
		759	unlink ();
		760
772	free_key_values (this);	761	free_key_values (this);
773	}	762	}
774		763
		764	static int object_count;
		765
775	void object::link ()	766	void object::link ()
776	{	767	{
777	count = ++ob_count;	768	assert (!index);//D
778	uuid = gen_uuid ();	769	uuid = gen_uuid ();
		770	count = ++object_count;
779		771
780	prev = 0;	772	refcnt_inc ();
781	next = object::first;	773	objects.insert (this);
782
783	if (object::first)
784	object::first->prev = this;
785
786	object::first = this;
787	}	774	}
788		775
789	void object::unlink ()	776	void object::unlink ()
790	{	777	{
791	if (this == object::first)	778	if (!index)
792	object::first = next;	779	return;
793		780
794	/* Remove this object from the list of used objects */	781	objects.erase (this);
795	if (prev) prev->next = next;	782	refcnt_dec ();
796	if (next) next->prev = prev;	783	}
797		784
798	prev = 0;	785	void
799	next = 0;	786	object::activate ()
		787	{
		788	/* If already on active list, don't do anything */
		789	if (active)
		790	return;
		791
		792	if (has_active_speed ())
		793	actives.insert (this);
		794	}
		795
		796	void
		797	object::activate_recursive ()
		798	{
		799	activate ();
		800
		801	for (object *op = inv; op; op = op->below)
		802	op->activate_recursive ();
		803	}
		804
		805	/* This function removes object 'op' from the list of active
		806	* objects.
		807	* This should only be used for style maps or other such
		808	* reference maps where you don't want an object that isn't
		809	* in play chewing up cpu time getting processed.
		810	* The reverse of this is to call update_ob_speed, which
		811	* will do the right thing based on the speed of the object.
		812	*/
		813	void
		814	object::deactivate ()
		815	{
		816	/* If not on the active list, nothing needs to be done */
		817	if (!active)
		818	return;
		819
		820	actives.erase (this);
		821	}
		822
		823	void
		824	object::deactivate_recursive ()
		825	{
		826	for (object *op = inv; op; op = op->below)
		827	op->deactivate_recursive ();
		828
		829	deactivate ();
		830	}
		831
		832	void
		833	object::set_flag_inv (int flag, int value)
		834	{
		835	for (object *op = inv; op; op = op->below)
		836	{
		837	op->flag [flag] = value;
		838	op->set_flag_inv (flag, value);
		839	}
		840	}
		841
		842	/*
		843	* Remove and free all objects in the inventory of the given object.
		844	* object.c ?
		845	*/
		846	void
		847	object::destroy_inv (bool drop_to_ground)
		848	{
		849	// need to check first, because the checks below might segfault
		850	// as we might be on an invalid mapspace and crossfire code
		851	// is too buggy to ensure that the inventory is empty.
		852	// corollary: if you create arrows etc. with stuff in tis inventory,
		853	// cf will crash below with off-map x and y
		854	if (!inv)
		855	return;
		856
		857	/* Only if the space blocks everything do we not process -
		858	* if some form of movement is allowed, let objects
		859	* drop on that space.
		860	*/
		861	if (!drop_to_ground
		862	|| !map
		863	|| map->in_memory != MAP_IN_MEMORY
		864	|| map->nodrop
		865	|| ms ().move_block == MOVE_ALL)
		866	{
		867	while (inv)
		868	{
		869	inv->destroy_inv (drop_to_ground);
		870	inv->destroy ();
		871	}
		872	}
		873	else
		874	{ /* Put objects in inventory onto this space */
		875	while (inv)
		876	{
		877	object *op = inv;
		878
		879	if (op->flag [FLAG_STARTEQUIP]
		880	|| op->flag [FLAG_NO_DROP]
		881	|| op->type == RUNE
		882	|| op->type == TRAP
		883	|| op->flag [FLAG_IS_A_TEMPLATE]
		884	|| op->flag [FLAG_DESTROY_ON_DEATH])
		885	op->destroy ();
		886	else
		887	map->insert (op, x, y);
		888	}
		889	}
800	}	890	}
801		891
802	object *object::create ()	892	object *object::create ()
803	{	893	{
804	object *op = new object;	894	object *op = new object;
805	op->link ();	895	op->link ();
806	return op;	896	return op;
807	}	897	}
808		898
809	/*	899	void
810	* free_object() frees everything allocated by an object, removes	900	object::do_destroy ()
811	* it from the list of used objects, and puts it on the list of
812	* free objects. The IS_FREED() flag is set in the object.
813	* The object must have been removed by remove_ob() first for
814	* this function to succeed.
815	*
816	* If destroy_inventory is set, free inventory as well. Else drop items in
817	* inventory to the ground.
818	*/
819	void object::destroy (bool destroy_inventory)
820	{	901	{
821	if (QUERY_FLAG (this, FLAG_FREED))	902	attachable::do_destroy ();
822	return;
823		903
824	if (QUERY_FLAG (this, FLAG_FRIENDLY))	904	if (flag [FLAG_IS_LINKED])
		905	remove_button_link (this);
		906
		907	if (flag [FLAG_FRIENDLY])
825	remove_friendly_object (this);	908	remove_friendly_object (this);
826		909
827	if (!QUERY_FLAG (this, FLAG_REMOVED))	910	if (!flag [FLAG_REMOVED])
828	remove ();	911	remove ();
829		912
830	SET_FLAG (this, FLAG_FREED);	913	destroy_inv (true);
831		914
832	if (more)	915	deactivate ();
833	{	916	unlink ();
834	more->destroy (destroy_inventory);
835	more = 0;
836	}
837		917
838	if (inv)	918	flag [FLAG_FREED] = 1;
839	{
840	/* Only if the space blocks everything do we not process -
841	* if some form of movement is allowed, let objects
842	* drop on that space.
843	*/
844	if (destroy_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
845	{
846	object *op = inv;
847
848	while (op)
849	{
850	object *tmp = op->below;
851	op->destroy (destroy_inventory);
852	op = tmp;
853	}
854	}
855	else
856	{ /* Put objects in inventory onto this space */
857	object *op = inv;
858
859	while (op)
860	{
861	object *tmp = op->below;
862
863	op->remove ();
864
865	if (QUERY_FLAG (op, FLAG_STARTEQUIP)
866	|| QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
867	op->destroy ();
868	else
869	{
870	op->x = x;
871	op->y = y;
872	insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */
873	}
874
875	op = tmp;
876	}
877	}
878	}
879		919
880	// hack to ensure that freed objects still have a valid map	920	// hack to ensure that freed objects still have a valid map
881	{	921	{
882	static maptile *freed_map; // freed objects are moved here to avoid crashes	922	static maptile *freed_map; // freed objects are moved here to avoid crashes
883		923
…		…
887		927
888	freed_map->name = "/internal/freed_objects_map";	928	freed_map->name = "/internal/freed_objects_map";
889	freed_map->width = 3;	929	freed_map->width = 3;
890	freed_map->height = 3;	930	freed_map->height = 3;
891		931
892	freed_map->allocate ();	932	freed_map->alloc ();
		933	freed_map->in_memory = MAP_IN_MEMORY;
893	}	934	}
894		935
895	map = freed_map;	936	map = freed_map;
896	x = 1;	937	x = 1;
897	y = 1;	938	y = 1;
898	}	939	}
899		940
		941	if (more)
		942	{
		943	more->destroy ();
		944	more = 0;
		945	}
		946
		947	head = 0;
		948
900	// clear those pointers that likely might have circular references to us	949	// clear those pointers that likely might cause circular references
901	owner = 0;	950	owner = 0;
902	enemy = 0;	951	enemy = 0;
903	attacked_by = 0;	952	attacked_by = 0;
		953	current_weapon = 0;
		954	}
904		955
905	// only relevant for players(?), but make sure of it anyways	956	void
906	contr = 0;	957	object::destroy (bool destroy_inventory)
		958	{
		959	if (destroyed ())
		960	return;
907		961
908	/* Remove object from the active list */	962	if (destroy_inventory)
909	speed = 0;	963	destroy_inv (false);
910	update_ob_speed (this);
911		964
912	unlink ();	965	if (is_head ())
		966	if (sound_destroy)
		967	play_sound (sound_destroy);
		968	else if (flag [FLAG_MONSTER])
		969	play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism
913		970
914	mortals.push_back (this);	971	attachable::destroy ();
915	}	972	}
916		973
917	/*	974	/*
918	* sub_weight() recursively (outwards) subtracts a number from the	975	* sub_weight() recursively (outwards) subtracts a number from the
919	* weight of an object (and what is carried by it's environment(s)).	976	* weight of an object (and what is carried by it's environment(s)).
…		…
935	* This function removes the object op from the linked list of objects	992	* This function removes the object op from the linked list of objects
936	* which it is currently tied to. When this function is done, the	993	* which it is currently tied to. When this function is done, the
937	* object will have no environment. If the object previously had an	994	* object will have no environment. If the object previously had an
938	* environment, the x and y coordinates will be updated to	995	* environment, the x and y coordinates will be updated to
939	* the previous environment.	996	* the previous environment.
940	* Beware: This function is called from the editor as well!
941	*/	997	*/
942	void	998	void
943	object::remove ()	999	object::do_remove ()
944	{	1000	{
945	object *tmp, *last = 0;	1001	object *tmp, *last = 0;
946	object *otmp;	1002	object *otmp;
947		1003
948	int check_walk_off;
949
950	if (QUERY_FLAG (this, FLAG_REMOVED))	1004	if (QUERY_FLAG (this, FLAG_REMOVED))
951	return;	1005	return;
952		1006
953	SET_FLAG (this, FLAG_REMOVED);	1007	SET_FLAG (this, FLAG_REMOVED);
		1008	INVOKE_OBJECT (REMOVE, this);
954		1009
955	if (more)	1010	if (more)
956	more->remove ();	1011	more->remove ();
957		1012
958	/*	1013	/*
…		…
971	* to save cpu time.	1026	* to save cpu time.
972	*/	1027	*/
973	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1028	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
974	otmp->update_stats ();	1029	otmp->update_stats ();
975		1030
976	if (above != NULL)	1031	if (above)
977	above->below = below;	1032	above->below = below;
978	else	1033	else
979	env->inv = below;	1034	env->inv = below;
980		1035
981	if (below != NULL)	1036	if (below)
982	below->above = above;	1037	below->above = above;
983		1038
984	/* we set up values so that it could be inserted into	1039	/* we set up values so that it could be inserted into
985	* the map, but we don't actually do that - it is up	1040	* the map, but we don't actually do that - it is up
986	* to the caller to decide what we want to do.	1041	* to the caller to decide what we want to do.
…		…
990	above = 0, below = 0;	1045	above = 0, below = 0;
991	env = 0;	1046	env = 0;
992	}	1047	}
993	else if (map)	1048	else if (map)
994	{	1049	{
995	/* Re did the following section of code - it looks like it had	1050	if (type == PLAYER)
996	* lots of logic for things we no longer care about
997	*/	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;
		1063	mapspace &ms = this->ms ();
998		1064
999	/* link the object above us */	1065	/* link the object above us */
1000	if (above)	1066	if (above)
1001	above->below = below;	1067	above->below = below;
1002	else	1068	else
1003	map->at (x, y).top = below; /* we were top, set new top */	1069	ms.top = below; /* we were top, set new top */
1004		1070
1005	/* Relink the object below us, if there is one */	1071	/* Relink the object below us, if there is one */
1006	if (below)	1072	if (below)
1007	below->above = above;	1073	below->above = above;
1008	else	1074	else
…		…
1010	/* Nothing below, which means we need to relink map object for this space	1076	/* Nothing below, which means we need to relink map object for this space
1011	* use translated coordinates in case some oddness with map tiling is	1077	* use translated coordinates in case some oddness with map tiling is
1012	* evident	1078	* evident
1013	*/	1079	*/
1014	if (GET_MAP_OB (map, x, y) != this)	1080	if (GET_MAP_OB (map, x, y) != this)
1015	{
1016	char *dump = dump_object (this);
1017	LOG (llevError,
1018	"remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom?\n%s\n", dump);	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 ());
1019	free (dump);
1020	dump = dump_object (GET_MAP_OB (map, x, y));
1021	LOG (llevError, "%s\n", dump);
1022	free (dump);
1023	}
1024		1082
1025	map->at (x, y).bottom = above; /* goes on above it. */	1083	ms.bot = above; /* goes on above it. */
1026	}	1084	}
1027		1085
1028	above = 0;	1086	above = 0;
1029	below = 0;	1087	below = 0;
1030		1088
1031	if (map->in_memory == MAP_SAVING)	1089	if (map->in_memory == MAP_SAVING)
1032	return;	1090	return;
1033		1091
1034	check_walk_off = !QUERY_FLAG (this, FLAG_NO_APPLY);	1092	int check_walk_off = !flag [FLAG_NO_APPLY];
1035		1093
		1094	if (object *pl = ms.player ())
		1095	{
		1096	if (pl->container == this)
		1097	/* If a container that the player is currently using somehow gets
		1098	* removed (most likely destroyed), update the player view
		1099	* appropriately.
		1100	*/
		1101	pl->close_container ();
		1102
		1103	pl->contr->ns->floorbox_update ();
		1104	}
		1105
1036	for (tmp = GET_MAP_OB (map, x, y); tmp; tmp = tmp->above)	1106	for (tmp = ms.bot; tmp; tmp = tmp->above)
1037	{	1107	{
1038	/* No point updating the players look faces if he is the object	1108	/* No point updating the players look faces if he is the object
1039	* being removed.	1109	* being removed.
1040	*/	1110	*/
1041		1111
1042	if (tmp->type == PLAYER && tmp != this)
1043	{
1044	/* If a container that the player is currently using somehow gets
1045	* removed (most likely destroyed), update the player view
1046	* appropriately.
1047	*/
1048	if (tmp->container == this)
1049	{
1050	CLEAR_FLAG (this, FLAG_APPLIED);
1051	tmp->container = 0;
1052	}
1053
1054	tmp->contr->ns->floorbox_update ();
1055	}
1056
1057	/* See if player moving off should effect something */	1112	/* See if object moving off should effect something */
1058	if (check_walk_off	1113	if (check_walk_off
1059	&& ((move_type & tmp->move_off)	1114	&& ((move_type & tmp->move_off)
1060	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))	1115	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1061	{	1116	{
1062	move_apply (tmp, this, 0);	1117	move_apply (tmp, this, 0);
1063		1118
1064	if (destroyed ())	1119	if (destroyed ())
1065	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());	1120	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1066	}	1121	}
1067		1122
1068	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1069
1070	if (tmp->above == tmp)
1071	tmp->above = 0;
1072
1073	last = tmp;	1123	last = tmp;
1074	}	1124	}
1075		1125
1076	/* last == NULL of there are no objects on this space */	1126	/* last == NULL if there are no objects on this space */
		1127	//TODO: this makes little sense, why only update the topmost object?
1077	if (!last)	1128	if (!last)
1078	map->at (x, y).flags_ = P_NEED_UPDATE;	1129	map->at (x, y).flags_ = 0;
1079	else	1130	else
1080	update_object (last, UP_OBJ_REMOVE);	1131	update_object (last, UP_OBJ_REMOVE);
1081		1132
1082	if (QUERY_FLAG (this, FLAG_BLOCKSVIEW) || glow_radius)	1133	if (flag [FLAG_BLOCKSVIEW] || glow_radius)
1083	update_all_los (map, x, y);	1134	update_all_los (map, x, y);
1084	}	1135	}
1085	}	1136	}
1086		1137
1087	/*	1138	/*
…		…
1096	merge_ob (object *op, object *top)	1147	merge_ob (object *op, object *top)
1097	{	1148	{
1098	if (!op->nrof)	1149	if (!op->nrof)
1099	return 0;	1150	return 0;
1100		1151
1101	if (top == NULL)	1152	if (top)
1102	for (top = op; top != NULL && top->above != NULL; top = top->above);	1153	for (top = op; top && top->above; top = top->above)
		1154	;
1103		1155
1104	for (; top != NULL; top = top->below)	1156	for (; top; top = top->below)
1105	{	1157	{
1106	if (top == op)	1158	if (top == op)
1107	continue;	1159	continue;
1108		1160
1109	if (object::can_merge (op, top))	1161	if (object::can_merge (op, top))
…		…
1118	}	1170	}
1119		1171
1120	return 0;	1172	return 0;
1121	}	1173	}
1122		1174
		1175	void
		1176	object::expand_tail ()
		1177	{
		1178	if (more)
		1179	return;
		1180
		1181	object *prev = this;
		1182
		1183	for (archetype *at = (archetype *)arch->more; at; at = (archetype *)at->more)
		1184	{
		1185	object *op = arch_to_object (at);
		1186
		1187	op->name = name;
		1188	op->name_pl = name_pl;
		1189	op->title = title;
		1190
		1191	op->head = this;
		1192	prev->more = op;
		1193
		1194	prev = op;
		1195	}
		1196	}
		1197
1123	/*	1198	/*
1124	* same as insert_ob_in_map except it handle separate coordinates and do a clean	1199	* same as insert_ob_in_map except it handles separate coordinates and does a clean
1125	* job preparing multi-part monsters	1200	* job preparing multi-part monsters.
1126	*/	1201	*/
1127	object *	1202	object *
1128	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)	1203	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1129	{	1204	{
1130	object *tmp;
1131
1132	if (op->head)
1133	op = op->head;
1134
1135	for (tmp = op; tmp; tmp = tmp->more)	1205	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1136	{	1206	{
1137	tmp->x = x + tmp->arch->clone.x;	1207	tmp->x = x + tmp->arch->x;
1138	tmp->y = y + tmp->arch->clone.y;	1208	tmp->y = y + tmp->arch->y;
1139	}	1209	}
1140		1210
1141	return insert_ob_in_map (op, m, originator, flag);	1211	return insert_ob_in_map (op, m, originator, flag);
1142	}	1212	}
1143		1213
…		…
1159	* Return value:	1229	* Return value:
1160	* new object if 'op' was merged with other object	1230	* new object if 'op' was merged with other object
1161	* NULL if 'op' was destroyed	1231	* NULL if 'op' was destroyed
1162	* just 'op' otherwise	1232	* just 'op' otherwise
1163	*/	1233	*/
1164
1165	object *	1234	object *
1166	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)	1235	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1167	{	1236	{
		1237	assert (!op->flag [FLAG_FREED]);
		1238
1168	object *tmp, *top, *floor = NULL;	1239	object *top, *floor = NULL;
1169	sint16 x, y;
1170		1240
1171	if (QUERY_FLAG (op, FLAG_FREED))	1241	op->remove ();
1172	{
1173	LOG (llevError, "Trying to insert freed object!\n");
1174	return NULL;
1175	}
1176
1177	if (m == NULL)
1178	{
1179	char *dump = dump_object (op);
1180	LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
1181	free (dump);
1182	return op;
1183	}
1184		1242
1185	if (out_of_map (m, op->x, op->y))	1243	if (out_of_map (m, op->x, op->y))
1186	{	1244	{
1187	char *dump = dump_object (op);
1188	LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump);	1245	LOG (llevError, "Trying to insert object outside the map.\n%s\n", op->debug_desc ());
1189	#ifdef MANY_CORES	1246	#ifdef MANY_CORES
1190	/* Better to catch this here, as otherwise the next use of this object	1247	/* Better to catch this here, as otherwise the next use of this object
1191	* is likely to cause a crash. Better to find out where it is getting	1248	* is likely to cause a crash. Better to find out where it is getting
1192	* improperly inserted.	1249	* improperly inserted.
1193	*/	1250	*/
1194	abort ();	1251	abort ();
1195	#endif	1252	#endif
1196	free (dump);
1197	return op;	1253	return op;
1198	}	1254	}
1199		1255
1200	if (!QUERY_FLAG (op, FLAG_REMOVED))	1256	if (object *more = op->more)
1201	{	1257	if (!insert_ob_in_map (more, m, originator, flag))
1202	char *dump = dump_object (op);
1203	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
1204	free (dump);
1205	return op;	1258	return 0;
1206	}
1207
1208	if (op->more != NULL)
1209	{
1210	/* The part may be on a different map. */
1211
1212	object *more = op->more;
1213
1214	/* We really need the caller to normalize coordinates - if
1215	* we set the map, that doesn't work if the location is within
1216	* a map and this is straddling an edge. So only if coordinate
1217	* is clear wrong do we normalize it.
1218	*/
1219	if (OUT_OF_REAL_MAP (more->map, more->x, more->y))
1220	more->map = get_map_from_coord (m, &more->x, &more->y);
1221	else if (!more->map)
1222	{
1223	/* For backwards compatibility - when not dealing with tiled maps,
1224	* more->map should always point to the parent.
1225	*/
1226	more->map = m;
1227	}
1228
1229	if (insert_ob_in_map (more, more->map, originator, flag) == NULL)
1230	{
1231	if (!op->head)
1232	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1233
1234	return NULL;
1235	}
1236	}
1237		1259
1238	CLEAR_FLAG (op, FLAG_REMOVED);	1260	CLEAR_FLAG (op, FLAG_REMOVED);
1239		1261
1240	/* Ideally, the caller figures this out. However, it complicates a lot	1262	/* Ideally, the caller figures this out. However, it complicates a lot
1241	* of areas of callers (eg, anything that uses find_free_spot would now	1263	* of areas of callers (eg, anything that uses find_free_spot would now
1242	* need extra work	1264	* need extra work
1243	*/	1265	*/
1244	op->map = get_map_from_coord (m, &op->x, &op->y);	1266	if (!xy_normalise (m, op->x, op->y))
1245	x = op->x;	1267	return 0;
1246	y = op->y;	1268
		1269	op->map = m;
		1270	mapspace &ms = op->ms ();
1247		1271
1248	/* this has to be done after we translate the coordinates.	1272	/* this has to be done after we translate the coordinates.
1249	*/	1273	*/
1250	if (op->nrof && !(flag & INS_NO_MERGE))	1274	if (op->nrof && !(flag & INS_NO_MERGE))
1251	for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)	1275	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1252	if (object::can_merge (op, tmp))	1276	if (object::can_merge (op, tmp))
1253	{	1277	{
1254	op->nrof += tmp->nrof;	1278	op->nrof += tmp->nrof;
1255	tmp->destroy ();	1279	tmp->destroy ();
1256	}	1280	}
…		…
1273	op->below = originator->below;	1297	op->below = originator->below;
1274		1298
1275	if (op->below)	1299	if (op->below)
1276	op->below->above = op;	1300	op->below->above = op;
1277	else	1301	else
1278	op->ms ().bottom = op;	1302	ms.bot = op;
1279		1303
1280	/* since *below* originator, no need to update top */	1304	/* since *below* originator, no need to update top */
1281	originator->below = op;	1305	originator->below = op;
1282	}	1306	}
1283	else	1307	else
1284	{	1308	{
		1309	top = ms.bot;
		1310
1285	/* If there are other objects, then */	1311	/* If there are other objects, then */
1286	if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL))	1312	if ((!(flag & INS_MAP_LOAD)) && top)
1287	{	1313	{
1288	object *last = NULL;	1314	object *last = 0;
1289		1315
1290	/*	1316	/*
1291	* If there are multiple objects on this space, we do some trickier handling.	1317	* If there are multiple objects on this space, we do some trickier handling.
1292	* We've already dealt with merging if appropriate.	1318	* We've already dealt with merging if appropriate.
1293	* Generally, we want to put the new object on top. But if	1319	* Generally, we want to put the new object on top. But if
…		…
1297	* once we get to them. This reduces the need to traverse over all of	1323	* once we get to them. This reduces the need to traverse over all of
1298	* them when adding another one - this saves quite a bit of cpu time	1324	* them when adding another one - this saves quite a bit of cpu time
1299	* when lots of spells are cast in one area. Currently, it is presumed	1325	* when lots of spells are cast in one area. Currently, it is presumed
1300	* that flying non pickable objects are spell objects.	1326	* that flying non pickable objects are spell objects.
1301	*/	1327	*/
1302		1328	for (top = ms.bot; top; top = top->above)
1303	while (top != NULL)
1304	{	1329	{
1305	if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))	1330	if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))
1306	floor = top;	1331	floor = top;
1307		1332
1308	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))	1333	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))
…		…
1311	top = top->below;	1336	top = top->below;
1312	break;	1337	break;
1313	}	1338	}
1314		1339
1315	last = top;	1340	last = top;
1316	top = top->above;
1317	}	1341	}
1318		1342
1319	/* Don't want top to be NULL, so set it to the last valid object */	1343	/* Don't want top to be NULL, so set it to the last valid object */
1320	top = last;	1344	top = last;
1321		1345
…		…
1323	* looks like instead of lots of conditions here.	1347	* looks like instead of lots of conditions here.
1324	* makes things faster, and effectively the same result.	1348	* makes things faster, and effectively the same result.
1325	*/	1349	*/
1326		1350
1327	/* Have object 'fall below' other objects that block view.	1351	/* Have object 'fall below' other objects that block view.
1328	* Unless those objects are exits, type 66	1352	* Unless those objects are exits.
1329	* If INS_ON_TOP is used, don't do this processing	1353	* If INS_ON_TOP is used, don't do this processing
1330	* Need to find the object that in fact blocks view, otherwise	1354	* Need to find the object that in fact blocks view, otherwise
1331	* stacking is a bit odd.	1355	* stacking is a bit odd.
1332	*/	1356	*/
1333	if (!(flag & INS_ON_TOP) &&	1357	if (!(flag & INS_ON_TOP)
1334	(get_map_flags (op->map, 0, op->x, op->y, 0, 0) & P_BLOCKSVIEW) && (op->face && !op->face->visibility))	1358	&& ms.flags () & P_BLOCKSVIEW
		1359	&& (op->face && !faces [op->face].visibility))
1335	{	1360	{
1336	for (last = top; last != floor; last = last->below)	1361	for (last = top; last != floor; last = last->below)
1337	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1362	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1338	break;	1363	break;
		1364
1339	/* Check to see if we found the object that blocks view,	1365	/* Check to see if we found the object that blocks view,
1340	* and make sure we have a below pointer for it so that	1366	* and make sure we have a below pointer for it so that
1341	* we can get inserted below this one, which requires we	1367	* we can get inserted below this one, which requires we
1342	* set top to the object below us.	1368	* set top to the object below us.
1343	*/	1369	*/
1344	if (last && last->below && last != floor)	1370	if (last && last->below && last != floor)
1345	top = last->below;	1371	top = last->below;
1346	}	1372	}
1347	} /* If objects on this space */	1373	} /* If objects on this space */
1348
1349	if (flag & INS_MAP_LOAD)	1374	if (flag & INS_MAP_LOAD)
1350	top = GET_MAP_TOP (op->map, op->x, op->y);	1375	top = ms.top;
1351		1376
1352	if (flag & INS_ABOVE_FLOOR_ONLY)	1377	if (flag & INS_ABOVE_FLOOR_ONLY)
1353	top = floor;	1378	top = floor;
1354		1379
1355	/* Top is the object that our object (op) is going to get inserted above.	1380	/* Top is the object that our object (op) is going to get inserted above.
1356	*/	1381	*/
1357		1382
1358	/* First object on this space */	1383	/* First object on this space */
1359	if (!top)	1384	if (!top)
1360	{	1385	{
1361	op->above = GET_MAP_OB (op->map, op->x, op->y);	1386	op->above = ms.bot;
1362		1387
1363	if (op->above)	1388	if (op->above)
1364	op->above->below = op;	1389	op->above->below = op;
1365		1390
1366	op->below = NULL;	1391	op->below = 0;
1367	op->ms ().bottom = op;	1392	ms.bot = op;
1368	}	1393	}
1369	else	1394	else
1370	{ /* get inserted into the stack above top */	1395	{ /* get inserted into the stack above top */
1371	op->above = top->above;	1396	op->above = top->above;
1372		1397
…		…
1375		1400
1376	op->below = top;	1401	op->below = top;
1377	top->above = op;	1402	top->above = op;
1378	}	1403	}
1379		1404
1380	if (op->above == NULL)	1405	if (!op->above)
1381	op->ms ().top = op;	1406	ms.top = op;
1382	} /* else not INS_BELOW_ORIGINATOR */	1407	} /* else not INS_BELOW_ORIGINATOR */
1383		1408
1384	if (op->type == PLAYER)	1409	if (op->type == PLAYER)
		1410	{
1385	op->contr->do_los = 1;	1411	op->contr->do_los = 1;
		1412	++op->map->players;
		1413	op->map->touch ();
		1414	}
		1415
		1416	op->map->dirty = true;
1386		1417
1387	/* If we have a floor, we know the player, if any, will be above	1418	/* If we have a floor, we know the player, if any, will be above
1388	* it, so save a few ticks and start from there.	1419	* it, so save a few ticks and start from there.
1389	*/	1420	*/
1390	if (!(flag & INS_MAP_LOAD))	1421	if (!(flag & INS_MAP_LOAD))
1391	if (object *pl = op->ms ().player ())	1422	if (object *pl = ms.player ())
1392	pl->contr->ns->floorbox_update ();	1423	pl->contr->ns->floorbox_update ();
1393		1424
1394	/* If this object glows, it may affect lighting conditions that are	1425	/* If this object glows, it may affect lighting conditions that are
1395	* visible to others on this map. But update_all_los is really	1426	* visible to others on this map. But update_all_los is really
1396	* an inefficient way to do this, as it means los for all players	1427	* an inefficient way to do this, as it means los for all players
1397	* on the map will get recalculated. The players could very well	1428	* on the map will get recalculated. The players could very well
1398	* be far away from this change and not affected in any way -	1429	* be far away from this change and not affected in any way -
1399	* this should get redone to only look for players within range,	1430	* this should get redone to only look for players within range,
1400	* or just updating the P_NEED_UPDATE for spaces within this area	1431	* or just updating the P_UPTODATE for spaces within this area
1401	* of effect may be sufficient.	1432	* of effect may be sufficient.
1402	*/	1433	*/
1403	if (MAP_DARKNESS (op->map) && (op->glow_radius != 0))	1434	if (op->map->darkness && (op->glow_radius != 0))
1404	update_all_los (op->map, op->x, op->y);	1435	update_all_los (op->map, op->x, op->y);
1405		1436
1406	/* updates flags (blocked, alive, no magic, etc) for this map space */	1437	/* updates flags (blocked, alive, no magic, etc) for this map space */
1407	update_object (op, UP_OBJ_INSERT);	1438	update_object (op, UP_OBJ_INSERT);
		1439
		1440	INVOKE_OBJECT (INSERT, op);
1408		1441
1409	/* Don't know if moving this to the end will break anything. However,	1442	/* Don't know if moving this to the end will break anything. However,
1410	* we want to have floorbox_update called before calling this.	1443	* we want to have floorbox_update called before calling this.
1411	*	1444	*
1412	* check_move_on() must be after this because code called from	1445	* check_move_on() must be after this because code called from
…		…
1414	* blocked() and wall() work properly), and these flags are updated by	1447	* blocked() and wall() work properly), and these flags are updated by
1415	* update_object().	1448	* update_object().
1416	*/	1449	*/
1417		1450
1418	/* if this is not the head or flag has been passed, don't check walk on status */	1451	/* if this is not the head or flag has been passed, don't check walk on status */
1419	if (!(flag & INS_NO_WALK_ON) && !op->head)	1452	if (!(flag & INS_NO_WALK_ON) && op->head_ () == op)
1420	{	1453	{
1421	if (check_move_on (op, originator))	1454	if (check_move_on (op, originator))
1422	return NULL;	1455	return 0;
1423		1456
1424	/* If we are a multi part object, lets work our way through the check	1457	/* If we are a multi part object, lets work our way through the check
1425	* walk on's.	1458	* walk on's.
1426	*/	1459	*/
1427	for (tmp = op->more; tmp != NULL; tmp = tmp->more)	1460	for (object *tmp = op->more; tmp; tmp = tmp->more)
1428	if (check_move_on (tmp, originator))	1461	if (check_move_on (tmp, originator))
1429	return NULL;	1462	return 0;
1430	}	1463	}
1431		1464
1432	return op;	1465	return op;
1433	}	1466	}
1434		1467
…		…
1441	{	1474	{
1442	object *tmp, *tmp1;	1475	object *tmp, *tmp1;
1443		1476
1444	/* first search for itself and remove any old instances */	1477	/* first search for itself and remove any old instances */
1445		1478
1446	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1479	for (tmp = op->ms ().bot; tmp; tmp = tmp->above)
1447	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */	1480	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */
1448	tmp->destroy ();	1481	tmp->destroy ();
1449		1482
1450	tmp1 = arch_to_object (archetype::find (arch_string));	1483	tmp1 = arch_to_object (archetype::find (arch_string));
1451		1484
1452	tmp1->x = op->x;	1485	tmp1->x = op->x;
1453	tmp1->y = op->y;	1486	tmp1->y = op->y;
1454	insert_ob_in_map (tmp1, op->map, op, 0);	1487	insert_ob_in_map (tmp1, op->map, op, 0);
		1488	}
		1489
		1490	object *
		1491	object::insert_at (object *where, object *originator, int flags)
		1492	{
		1493	return where->map->insert (this, where->x, where->y, originator, flags);
1455	}	1494	}
1456		1495
1457	/*	1496	/*
1458	* get_split_ob(ob,nr) splits up ob into two parts. The part which	1497	* get_split_ob(ob,nr) splits up ob into two parts. The part which
1459	* is returned contains nr objects, and the remaining parts contains	1498	* is returned contains nr objects, and the remaining parts contains
1460	* the rest (or is removed and freed if that number is 0).	1499	* the rest (or is removed and freed if that number is 0).
1461	* On failure, NULL is returned, and the reason put into the	1500	* On failure, NULL is returned, and the reason put into the
1462	* global static errmsg array.	1501	* global static errmsg array.
1463	*/	1502	*/
1464
1465	object *	1503	object *
1466	get_split_ob (object *orig_ob, uint32 nr)	1504	get_split_ob (object *orig_ob, uint32 nr)
1467	{	1505	{
1468	object *newob;	1506	object *newob;
1469	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);	1507	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
…		…
1500	* the amount of an object. If the amount reaches 0, the object	1538	* the amount of an object. If the amount reaches 0, the object
1501	* is subsequently removed and freed.	1539	* is subsequently removed and freed.
1502	*	1540	*
1503	* Return value: 'op' if something is left, NULL if the amount reached 0	1541	* Return value: 'op' if something is left, NULL if the amount reached 0
1504	*/	1542	*/
1505
1506	object *	1543	object *
1507	decrease_ob_nr (object *op, uint32 i)	1544	decrease_ob_nr (object *op, uint32 i)
1508	{	1545	{
1509	object *tmp;	1546	object *tmp;
1510		1547
…		…
1585		1622
1586	/*	1623	/*
1587	* add_weight(object, weight) adds the specified weight to an object,	1624	* add_weight(object, weight) adds the specified weight to an object,
1588	* and also updates how much the environment(s) is/are carrying.	1625	* and also updates how much the environment(s) is/are carrying.
1589	*/	1626	*/
1590
1591	void	1627	void
1592	add_weight (object *op, signed long weight)	1628	add_weight (object *op, signed long weight)
1593	{	1629	{
1594	while (op != NULL)	1630	while (op != NULL)
1595	{	1631	{
…		…
1610	LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);	1646	LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
1611	free (dump);	1647	free (dump);
1612	return op;	1648	return op;
1613	}	1649	}
1614		1650
1615	if (where->head)	1651	if (where->head_ () != where)
1616	{	1652	{
1617	LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n");	1653	LOG (llevError | logBacktrace, "Warning: Tried to insert object into wrong part of multipart object.\n");
1618	where = where->head;	1654	where = where->head;
1619	}	1655	}
1620		1656
1621	return where->insert (op);	1657	return where->insert (op);
1622	}	1658	}
…		…
1627	* inside the object environment.	1663	* inside the object environment.
1628	*	1664	*
1629	* The function returns now pointer to inserted item, and return value can	1665	* The function returns now pointer to inserted item, and return value can
1630	* be != op, if items are merged. -Tero	1666	* be != op, if items are merged. -Tero
1631	*/	1667	*/
1632
1633	object *	1668	object *
1634	object::insert (object *op)	1669	object::insert (object *op)
1635	{	1670	{
1636	object *tmp, *otmp;	1671	object *tmp, *otmp;
1637		1672
…		…
1692	if ((op->glow_radius != 0) && map)	1727	if ((op->glow_radius != 0) && map)
1693	{	1728	{
1694	#ifdef DEBUG_LIGHTS	1729	#ifdef DEBUG_LIGHTS
1695	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);	1730	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1696	#endif /* DEBUG_LIGHTS */	1731	#endif /* DEBUG_LIGHTS */
1697	if (MAP_DARKNESS (map))	1732	if (map->darkness)
1698	update_all_los (map, x, y);	1733	update_all_los (map, x, y);
1699	}	1734	}
1700		1735
1701	/* Client has no idea of ordering so lets not bother ordering it here.	1736	/* Client has no idea of ordering so lets not bother ordering it here.
1702	* It sure simplifies this function...	1737	* It sure simplifies this function...
…		…
1707	{	1742	{
1708	op->below = inv;	1743	op->below = inv;
1709	op->below->above = op;	1744	op->below->above = op;
1710	inv = op;	1745	inv = op;
1711	}	1746	}
		1747
		1748	INVOKE_OBJECT (INSERT, this);
1712		1749
1713	return op;	1750	return op;
1714	}	1751	}
1715		1752
1716	/*	1753	/*
…		…
1731	*	1768	*
1732	* MSW 2001-07-08: Check all objects on space, not just those below	1769	* MSW 2001-07-08: Check all objects on space, not just those below
1733	* object being inserted. insert_ob_in_map may not put new objects	1770	* object being inserted. insert_ob_in_map may not put new objects
1734	* on top.	1771	* on top.
1735	*/	1772	*/
1736
1737	int	1773	int
1738	check_move_on (object *op, object *originator)	1774	check_move_on (object *op, object *originator)
1739	{	1775	{
1740	object *tmp;	1776	object *tmp;
1741	maptile *m = op->map;	1777	maptile *m = op->map;
…		…
1768		1804
1769	/* The objects have to be checked from top to bottom.	1805	/* The objects have to be checked from top to bottom.
1770	* Hence, we first go to the top:	1806	* Hence, we first go to the top:
1771	*/	1807	*/
1772		1808
1773	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL && tmp->above != NULL; tmp = tmp->above)	1809	for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above)
1774	{	1810	{
1775	/* Trim the search when we find the first other spell effect	1811	/* Trim the search when we find the first other spell effect
1776	* this helps performance so that if a space has 50 spell objects,	1812	* this helps performance so that if a space has 50 spell objects,
1777	* we don't need to check all of them.	1813	* we don't need to check all of them.
1778	*/	1814	*/
…		…
1796	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||	1832	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
1797	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))	1833	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1798	{	1834	{
1799		1835
1800	float	1836	float
1801	diff = tmp->move_slow_penalty * FABS (op->speed);	1837	diff = tmp->move_slow_penalty * fabs (op->speed);
1802		1838
1803	if (op->type == PLAYER)	1839	if (op->type == PLAYER)
1804	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||	1840	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||
1805	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))	1841	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))
1806	diff /= 4.0;	1842	diff /= 4.0;
…		…
1833	/*	1869	/*
1834	* present_arch(arch, map, x, y) searches for any objects with	1870	* present_arch(arch, map, x, y) searches for any objects with
1835	* a matching archetype at the given map and coordinates.	1871	* a matching archetype at the given map and coordinates.
1836	* The first matching object is returned, or NULL if none.	1872	* The first matching object is returned, or NULL if none.
1837	*/	1873	*/
1838
1839	object *	1874	object *
1840	present_arch (const archetype *at, maptile *m, int x, int y)	1875	present_arch (const archetype *at, maptile *m, int x, int y)
1841	{	1876	{
1842	object *
1843	tmp;
1844
1845	if (m == NULL || out_of_map (m, x, y))	1877	if (!m || out_of_map (m, x, y))
1846	{	1878	{
1847	LOG (llevError, "Present_arch called outside map.\n");	1879	LOG (llevError, "Present_arch called outside map.\n");
1848	return NULL;	1880	return NULL;
1849	}	1881	}
1850	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1882
		1883	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1851	if (tmp->arch == at)	1884	if (tmp->arch == at)
1852	return tmp;	1885	return tmp;
		1886
1853	return NULL;	1887	return NULL;
1854	}	1888	}
1855		1889
1856	/*	1890	/*
1857	* present(type, map, x, y) searches for any objects with	1891	* present(type, map, x, y) searches for any objects with
1858	* a matching type variable at the given map and coordinates.	1892	* a matching type variable at the given map and coordinates.
1859	* The first matching object is returned, or NULL if none.	1893	* The first matching object is returned, or NULL if none.
1860	*/	1894	*/
1861
1862	object *	1895	object *
1863	present (unsigned char type, maptile *m, int x, int y)	1896	present (unsigned char type, maptile *m, int x, int y)
1864	{	1897	{
1865	object *
1866	tmp;
1867
1868	if (out_of_map (m, x, y))	1898	if (out_of_map (m, x, y))
1869	{	1899	{
1870	LOG (llevError, "Present called outside map.\n");	1900	LOG (llevError, "Present called outside map.\n");
1871	return NULL;	1901	return NULL;
1872	}	1902	}
1873	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1903
		1904	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1874	if (tmp->type == type)	1905	if (tmp->type == type)
1875	return tmp;	1906	return tmp;
		1907
1876	return NULL;	1908	return NULL;
1877	}	1909	}
1878		1910
1879	/*	1911	/*
1880	* present_in_ob(type, object) searches for any objects with	1912	* present_in_ob(type, object) searches for any objects with
1881	* a matching type variable in the inventory of the given object.	1913	* a matching type variable in the inventory of the given object.
1882	* The first matching object is returned, or NULL if none.	1914	* The first matching object is returned, or NULL if none.
1883	*/	1915	*/
1884
1885	object *	1916	object *
1886	present_in_ob (unsigned char type, const object *op)	1917	present_in_ob (unsigned char type, const object *op)
1887	{	1918	{
1888	object *
1889	tmp;
1890
1891	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1919	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
1892	if (tmp->type == type)	1920	if (tmp->type == type)
1893	return tmp;	1921	return tmp;
		1922
1894	return NULL;	1923	return NULL;
1895	}	1924	}
1896		1925
1897	/*	1926	/*
1898	* present_in_ob (type, str, object) searches for any objects with	1927	* present_in_ob (type, str, object) searches for any objects with
…		…
1906	* str is the string to match against. Note that we match against	1935	* str is the string to match against. Note that we match against
1907	* the object name, not the archetype name. this is so that the	1936	* the object name, not the archetype name. this is so that the
1908	* spell code can use one object type (force), but change it's name	1937	* spell code can use one object type (force), but change it's name
1909	* to be unique.	1938	* to be unique.
1910	*/	1939	*/
1911
1912	object *	1940	object *
1913	present_in_ob_by_name (int type, const char *str, const object *op)	1941	present_in_ob_by_name (int type, const char *str, const object *op)
1914	{	1942	{
1915	object *
1916	tmp;
1917
1918	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1943	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1919	{
1920	if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name)))	1944	if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name)))
1921	return tmp;	1945	return tmp;
1922	}	1946
1923	return NULL;	1947	return 0;
1924	}	1948	}
1925		1949
1926	/*	1950	/*
1927	* present_arch_in_ob(archetype, object) searches for any objects with	1951	* present_arch_in_ob(archetype, object) searches for any objects with
1928	* a matching archetype in the inventory of the given object.	1952	* a matching archetype in the inventory of the given object.
1929	* The first matching object is returned, or NULL if none.	1953	* The first matching object is returned, or NULL if none.
1930	*/	1954	*/
1931
1932	object *	1955	object *
1933	present_arch_in_ob (const archetype *at, const object *op)	1956	present_arch_in_ob (const archetype *at, const object *op)
1934	{	1957	{
1935	object *
1936	tmp;
1937
1938	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1958	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
1939	if (tmp->arch == at)	1959	if (tmp->arch == at)
1940	return tmp;	1960	return tmp;
		1961
1941	return NULL;	1962	return NULL;
1942	}	1963	}
1943		1964
1944	/*	1965	/*
1945	* activate recursively a flag on an object inventory	1966	* activate recursively a flag on an object inventory
1946	*/	1967	*/
1947	void	1968	void
1948	flag_inv (object *op, int flag)	1969	flag_inv (object *op, int flag)
1949	{	1970	{
1950	object *
1951	tmp;
1952
1953	if (op->inv)	1971	if (op->inv)
1954	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1972	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
1955	{	1973	{
1956	SET_FLAG (tmp, flag);	1974	SET_FLAG (tmp, flag);
1957	flag_inv (tmp, flag);	1975	flag_inv (tmp, flag);
1958	}	1976	}
1959	} /*	1977	}
		1978
		1979	/*
1960	* desactivate recursively a flag on an object inventory	1980	* deactivate recursively a flag on an object inventory
1961	*/	1981	*/
1962	void	1982	void
1963	unflag_inv (object *op, int flag)	1983	unflag_inv (object *op, int flag)
1964	{	1984	{
1965	object *
1966	tmp;
1967
1968	if (op->inv)	1985	if (op->inv)
1969	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1986	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
1970	{	1987	{
1971	CLEAR_FLAG (tmp, flag);	1988	CLEAR_FLAG (tmp, flag);
1972	unflag_inv (tmp, flag);	1989	unflag_inv (tmp, flag);
1973	}	1990	}
1974	}
1975
1976	/*
1977	* set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in
1978	* all it's inventory (recursively).
1979	* If checksums are used, a player will get set_cheat called for
1980	* him/her-self and all object carried by a call to this function.
1981	*/
1982
1983	void
1984	set_cheat (object *op)
1985	{
1986	SET_FLAG (op, FLAG_WAS_WIZ);
1987	flag_inv (op, FLAG_WAS_WIZ);
1988	}	1991	}
1989		1992
1990	/*	1993	/*
1991	* find_free_spot(object, map, x, y, start, stop) will search for	1994	* find_free_spot(object, map, x, y, start, stop) will search for
1992	* a spot at the given map and coordinates which will be able to contain	1995	* a spot at the given map and coordinates which will be able to contain
…		…
2006	* because arch_blocked (now ob_blocked) needs to know the movement type	2009	* because arch_blocked (now ob_blocked) needs to know the movement type
2007	* to know if the space in question will block the object. We can't use	2010	* to know if the space in question will block the object. We can't use
2008	* the archetype because that isn't correct if the monster has been	2011	* the archetype because that isn't correct if the monster has been
2009	* customized, changed states, etc.	2012	* customized, changed states, etc.
2010	*/	2013	*/
2011
2012	int	2014	int
2013	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)	2015	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2014	{	2016	{
2015	int
2016	i,
2017	index = 0, flag;	2017	int index = 0, flag;
2018	static int
2019	altern[SIZEOFFREE];	2018	int altern[SIZEOFFREE];
2020		2019
2021	for (i = start; i < stop; i++)	2020	for (int i = start; i < stop; i++)
2022	{	2021	{
2023	flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]);	2022	flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]);
2024	if (!flag)	2023	if (!flag)
2025	altern[index++] = i;	2024	altern [index++] = i;
2026		2025
2027	/* Basically, if we find a wall on a space, we cut down the search size.	2026	/* Basically, if we find a wall on a space, we cut down the search size.
2028	* In this way, we won't return spaces that are on another side of a wall.	2027	* In this way, we won't return spaces that are on another side of a wall.
2029	* This mostly work, but it cuts down the search size in all directions -	2028	* This mostly work, but it cuts down the search size in all directions -
2030	* if the space being examined only has a wall to the north and empty	2029	* if the space being examined only has a wall to the north and empty
…		…
2037	}	2036	}
2038		2037
2039	if (!index)	2038	if (!index)
2040	return -1;	2039	return -1;
2041		2040
2042	return altern[RANDOM () % index];	2041	return altern [rndm (index)];
2043	}	2042	}
2044		2043
2045	/*	2044	/*
2046	* find_first_free_spot(archetype, maptile, x, y) works like	2045	* find_first_free_spot(archetype, maptile, x, y) works like
2047	* find_free_spot(), but it will search max number of squares.	2046	* find_free_spot(), but it will search max number of squares.
2048	* But it will return the first available spot, not a random choice.	2047	* But it will return the first available spot, not a random choice.
2049	* Changed 0.93.2: Have it return -1 if there is no free spot available.	2048	* Changed 0.93.2: Have it return -1 if there is no free spot available.
2050	*/	2049	*/
2051
2052	int	2050	int
2053	find_first_free_spot (const object *ob, maptile *m, int x, int y)	2051	find_first_free_spot (const object *ob, maptile *m, int x, int y)
2054	{	2052	{
2055	int
2056	i;
2057
2058	for (i = 0; i < SIZEOFFREE; i++)	2053	for (int i = 0; i < SIZEOFFREE; i++)
2059	{
2060	if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]))	2054	if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]))
2061	return i;	2055	return i;
2062	}	2056
2063	return -1;	2057	return -1;
2064	}	2058	}
2065		2059
2066	/*	2060	/*
2067	* The function permute(arr, begin, end) randomly reorders the array	2061	* The function permute(arr, begin, end) randomly reorders the array
2068	* arr[begin..end-1].	2062	* arr[begin..end-1].
		2063	* now uses a fisher-yates shuffle, old permute was broken
2069	*/	2064	*/
2070	static void	2065	static void
2071	permute (int *arr, int begin, int end)	2066	permute (int *arr, int begin, int end)
2072	{	2067	{
2073	int	2068	arr += begin;
2074	i,
2075	j,
2076	tmp,
2077	len;
2078
2079	len = end - begin;	2069	end -= begin;
2080	for (i = begin; i < end; i++)
2081	{
2082	j = begin + RANDOM () % len;
2083		2070
2084	tmp = arr[i];	2071	while (--end)
2085	arr[i] = arr[j];	2072	swap (arr [end], arr [rndm (end + 1)]);
2086	arr[j] = tmp;
2087	}
2088	}	2073	}
2089		2074
2090	/* new function to make monster searching more efficient, and effective!	2075	/* new function to make monster searching more efficient, and effective!
2091	* This basically returns a randomized array (in the passed pointer) of	2076	* This basically returns a randomized array (in the passed pointer) of
2092	* the spaces to find monsters. In this way, it won't always look for	2077	* the spaces to find monsters. In this way, it won't always look for
…		…
2095	* the 3x3 area will be searched, just not in a predictable order.	2080	* the 3x3 area will be searched, just not in a predictable order.
2096	*/	2081	*/
2097	void	2082	void
2098	get_search_arr (int *search_arr)	2083	get_search_arr (int *search_arr)
2099	{	2084	{
2100	int	2085	int i;
2101	i;
2102		2086
2103	for (i = 0; i < SIZEOFFREE; i++)	2087	for (i = 0; i < SIZEOFFREE; i++)
2104	{
2105	search_arr[i] = i;	2088	search_arr[i] = i;
2106	}
2107		2089
2108	permute (search_arr, 1, SIZEOFFREE1 + 1);	2090	permute (search_arr, 1, SIZEOFFREE1 + 1);
2109	permute (search_arr, SIZEOFFREE1 + 1, SIZEOFFREE2 + 1);	2091	permute (search_arr, SIZEOFFREE1 + 1, SIZEOFFREE2 + 1);
2110	permute (search_arr, SIZEOFFREE2 + 1, SIZEOFFREE);	2092	permute (search_arr, SIZEOFFREE2 + 1, SIZEOFFREE);
2111	}	2093	}
…		…
2120	* Perhaps incorrectly, but I'm making the assumption that exclude	2102	* Perhaps incorrectly, but I'm making the assumption that exclude
2121	* is actually want is going to try and move there. We need this info	2103	* is actually want is going to try and move there. We need this info
2122	* because we have to know what movement the thing looking to move	2104	* because we have to know what movement the thing looking to move
2123	* there is capable of.	2105	* there is capable of.
2124	*/	2106	*/
2125
2126	int	2107	int
2127	find_dir (maptile *m, int x, int y, object *exclude)	2108	find_dir (maptile *m, int x, int y, object *exclude)
2128	{	2109	{
2129	int
2130	i,
2131	max = SIZEOFFREE, mflags;	2110	int i, max = SIZEOFFREE, mflags;
2132		2111
2133	sint16 nx, ny;	2112	sint16 nx, ny;
2134	object *	2113	object *tmp;
2135	tmp;
2136	maptile *	2114	maptile *mp;
2137	mp;
2138		2115
2139	MoveType blocked, move_type;	2116	MoveType blocked, move_type;
2140		2117
2141	if (exclude && exclude->head)	2118	if (exclude && exclude->head_ () != exclude)
2142	{	2119	{
2143	exclude = exclude->head;	2120	exclude = exclude->head;
2144	move_type = exclude->move_type;	2121	move_type = exclude->move_type;
2145	}	2122	}
2146	else	2123	else
…		…
2159		2136
2160	if (mflags & P_OUT_OF_MAP)	2137	if (mflags & P_OUT_OF_MAP)
2161	max = maxfree[i];	2138	max = maxfree[i];
2162	else	2139	else
2163	{	2140	{
2164	blocked = GET_MAP_MOVE_BLOCK (mp, nx, ny);	2141	mapspace &ms = mp->at (nx, ny);
		2142
		2143	blocked = ms.move_block;
2165		2144
2166	if ((move_type & blocked) == move_type)	2145	if ((move_type & blocked) == move_type)
2167	max = maxfree[i];	2146	max = maxfree[i];
2168	else if (mflags & P_IS_ALIVE)	2147	else if (mflags & P_IS_ALIVE)
2169	{	2148	{
2170	for (tmp = GET_MAP_OB (mp, nx, ny); tmp; tmp = tmp->above)	2149	for (tmp = ms.bot; tmp; tmp = tmp->above)
2171	if ((QUERY_FLAG (tmp, FLAG_MONSTER) || tmp->type == PLAYER) && (tmp != exclude || (tmp->head && tmp->head != exclude)))	2150	if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)
		2151	&& (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2172	break;	2152	break;
2173		2153
2174	if (tmp)	2154	if (tmp)
2175	return freedir[i];	2155	return freedir[i];
2176	}	2156	}
…		…
2182		2162
2183	/*	2163	/*
2184	* distance(object 1, object 2) will return the square of the	2164	* distance(object 1, object 2) will return the square of the
2185	* distance between the two given objects.	2165	* distance between the two given objects.
2186	*/	2166	*/
2187
2188	int	2167	int
2189	distance (const object *ob1, const object *ob2)	2168	distance (const object *ob1, const object *ob2)
2190	{	2169	{
2191	int i;
2192
2193	i = (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);	2170	return (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);
2194	return i;
2195	}	2171	}
2196		2172
2197	/*	2173	/*
2198	* find_dir_2(delta-x,delta-y) will return a direction in which	2174	* find_dir_2(delta-x,delta-y) will return a direction in which
2199	* an object which has subtracted the x and y coordinates of another	2175	* an object which has subtracted the x and y coordinates of another
2200	* object, needs to travel toward it.	2176	* object, needs to travel toward it.
2201	*/	2177	*/
2202
2203	int	2178	int
2204	find_dir_2 (int x, int y)	2179	find_dir_2 (int x, int y)
2205	{	2180	{
2206	int q;	2181	int q;
2207		2182
…		…
2236		2211
2237	return 3;	2212	return 3;
2238	}	2213	}
2239		2214
2240	/*	2215	/*
2241	* absdir(int): Returns a number between 1 and 8, which represent
2242	* the "absolute" direction of a number (it actually takes care of
2243	* "overflow" in previous calculations of a direction).
2244	*/
2245
2246	int
2247	absdir (int d)
2248	{
2249	while (d < 1)
2250	d += 8;
2251	while (d > 8)
2252	d -= 8;
2253	return d;
2254	}
2255
2256	/*
2257	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is	2216	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is
2258	* between two directions (which are expected to be absolute (see absdir())	2217	* between two directions (which are expected to be absolute (see absdir())
2259	*/	2218	*/
2260
2261	int	2219	int
2262	dirdiff (int dir1, int dir2)	2220	dirdiff (int dir1, int dir2)
2263	{	2221	{
2264	int	2222	int d;
2265	d;
2266		2223
2267	d = abs (dir1 - dir2);	2224	d = abs (dir1 - dir2);
2268	if (d > 4)	2225	if (d > 4)
2269	d = 8 - d;	2226	d = 8 - d;
		2227
2270	return d;	2228	return d;
2271	}	2229	}
2272		2230
2273	/* peterm:	2231	/* peterm:
2274	* do LOS stuff for ball lightning. Go after the closest VISIBLE monster.	2232	* do LOS stuff for ball lightning. Go after the closest VISIBLE monster.
…		…
2277	* This basically means that if direction is 15, then it could either go	2235	* This basically means that if direction is 15, then it could either go
2278	* direction 4, 14, or 16 to get back to where we are.	2236	* direction 4, 14, or 16 to get back to where we are.
2279	* Moved from spell_util.c to object.c with the other related direction	2237	* Moved from spell_util.c to object.c with the other related direction
2280	* functions.	2238	* functions.
2281	*/	2239	*/
2282
2283	int
2284	reduction_dir[SIZEOFFREE][3] = {	2240	int reduction_dir[SIZEOFFREE][3] = {
2285	{0, 0, 0}, /* 0 */	2241	{0, 0, 0}, /* 0 */
2286	{0, 0, 0}, /* 1 */	2242	{0, 0, 0}, /* 1 */
2287	{0, 0, 0}, /* 2 */	2243	{0, 0, 0}, /* 2 */
2288	{0, 0, 0}, /* 3 */	2244	{0, 0, 0}, /* 3 */
2289	{0, 0, 0}, /* 4 */	2245	{0, 0, 0}, /* 4 */
…		…
2380	* Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause	2336	* Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause
2381	* core dumps if they do.	2337	* core dumps if they do.
2382	*	2338	*
2383	* Add a check so we can't pick up invisible objects (0.93.8)	2339	* Add a check so we can't pick up invisible objects (0.93.8)
2384	*/	2340	*/
2385
2386	int	2341	int
2387	can_pick (const object *who, const object *item)	2342	can_pick (const object *who, const object *item)
2388	{	2343	{
2389	return /*QUERY_FLAG(who,FLAG_WIZ)|| */	2344	return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2390	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&	2345	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
…		…
2395	* create clone from object to another	2350	* create clone from object to another
2396	*/	2351	*/
2397	object *	2352	object *
2398	object_create_clone (object *asrc)	2353	object_create_clone (object *asrc)
2399	{	2354	{
2400	object *dst = 0, *tmp, *src, *part, *prev, *item;	2355	object *dst = 0, *tmp, *src, *prev, *item;
2401		2356
2402	if (!asrc)	2357	if (!asrc)
2403	return 0;	2358	return 0;
2404		2359
2405	src = asrc;
2406	if (src->head)
2407	src = src->head;	2360	src = asrc->head_ ();
2408		2361
2409	prev = 0;	2362	prev = 0;
2410	for (part = src; part; part = part->more)	2363	for (object *part = src; part; part = part->more)
2411	{	2364	{
2412	tmp = part->clone ();	2365	tmp = part->clone ();
2413	tmp->x -= src->x;	2366	tmp->x -= src->x;
2414	tmp->y -= src->y;	2367	tmp->y -= src->y;
2415		2368
…		…
2433	insert_ob_in_ob (object_create_clone (item), dst);	2386	insert_ob_in_ob (object_create_clone (item), dst);
2434		2387
2435	return dst;	2388	return dst;
2436	}	2389	}
2437		2390
2438	/* GROS - Creates an object using a string representing its content. */
2439	/* Basically, we save the content of the string to a temp file, then call */
2440	/* load_object on it. I admit it is a highly inefficient way to make things, */
2441	/* but it was simple to make and allows reusing the load_object function. */
2442	/* Remember not to use load_object_str in a time-critical situation. */
2443	/* Also remember that multiparts objects are not supported for now. */
2444
2445	object *
2446	load_object_str (const char *obstr)
2447	{
2448	object *op;
2449	char filename[MAX_BUF];
2450
2451	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2452
2453	FILE *tempfile = fopen (filename, "w");
2454
2455	if (tempfile == NULL)
2456	{
2457	LOG (llevError, "Error - Unable to access load object temp file\n");
2458	return NULL;
2459	}
2460
2461	fprintf (tempfile, obstr);
2462	fclose (tempfile);
2463
2464	op = object::create ();
2465
2466	object_thawer thawer (filename);
2467
2468	if (thawer)
2469	load_object (thawer, op, 0);
2470
2471	LOG (llevDebug, " load str completed, object=%s\n", &op->name);
2472	CLEAR_FLAG (op, FLAG_REMOVED);
2473
2474	return op;
2475	}
2476
2477	/* This returns the first object in who's inventory that	2391	/* This returns the first object in who's inventory that
2478	* has the same type and subtype match.	2392	* has the same type and subtype match.
2479	* returns NULL if no match.	2393	* returns NULL if no match.
2480	*/	2394	*/
2481	object *	2395	object *
2482	find_obj_by_type_subtype (const object *who, int type, int subtype)	2396	find_obj_by_type_subtype (const object *who, int type, int subtype)
2483	{	2397	{
2484	object *tmp;
2485
2486	for (tmp = who->inv; tmp; tmp = tmp->below)	2398	for (object *tmp = who->inv; tmp; tmp = tmp->below)
2487	if (tmp->type == type && tmp->subtype == subtype)	2399	if (tmp->type == type && tmp->subtype == subtype)
2488	return tmp;	2400	return tmp;
2489		2401
2490	return NULL;	2402	return 0;
2491	}	2403	}
2492		2404
2493	/* If ob has a field named key, return the link from the list,	2405	/* If ob has a field named key, return the link from the list,
2494	* otherwise return NULL.	2406	* otherwise return NULL.
2495	*	2407	*
…		…
2497	* do the desired thing.	2409	* do the desired thing.
2498	*/	2410	*/
2499	key_value *	2411	key_value *
2500	get_ob_key_link (const object *ob, const char *key)	2412	get_ob_key_link (const object *ob, const char *key)
2501	{	2413	{
2502	key_value *link;
2503
2504	for (link = ob->key_values; link != NULL; link = link->next)	2414	for (key_value *link = ob->key_values; link; link = link->next)
2505	if (link->key == key)	2415	if (link->key == key)
2506	return link;	2416	return link;
2507		2417
2508	return NULL;	2418	return 0;
2509	}	2419	}
2510		2420
2511	/*	2421	/*
2512	* Returns the value of op has an extra_field for key, or NULL.	2422	* Returns the value of op has an extra_field for key, or NULL.
2513	*	2423	*
…		…
2538	if (link->key == canonical_key)	2448	if (link->key == canonical_key)
2539	return link->value;	2449	return link->value;
2540		2450
2541	return 0;	2451	return 0;
2542	}	2452	}
2543
2544		2453
2545	/*	2454	/*
2546	* Updates the canonical_key in op to value.	2455	* Updates the canonical_key in op to value.
2547	*	2456	*
2548	* canonical_key is a shared string (value doesn't have to be).	2457	* canonical_key is a shared string (value doesn't have to be).
…		…
2553	* Returns TRUE on success.	2462	* Returns TRUE on success.
2554	*/	2463	*/
2555	int	2464	int
2556	set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key)	2465	set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key)
2557	{	2466	{
2558	key_value *
2559	field = NULL, *last = NULL;	2467	key_value *field = NULL, *last = NULL;
2560		2468
2561	for (field = op->key_values; field != NULL; field = field->next)	2469	for (field = op->key_values; field != NULL; field = field->next)
2562	{	2470	{
2563	if (field->key != canonical_key)	2471	if (field->key != canonical_key)
2564	{	2472	{
…		…
2573	/* Basically, if the archetype has this key set,	2481	/* Basically, if the archetype has this key set,
2574	* we need to store the null value so when we save	2482	* we need to store the null value so when we save
2575	* it, we save the empty value so that when we load,	2483	* it, we save the empty value so that when we load,
2576	* we get this value back again.	2484	* we get this value back again.
2577	*/	2485	*/
2578	if (get_ob_key_link (&op->arch->clone, canonical_key))	2486	if (get_ob_key_link (op->arch, canonical_key))
2579	field->value = 0;	2487	field->value = 0;
2580	else	2488	else
2581	{	2489	{
2582	if (last)	2490	if (last)
2583	last->next = field->next;	2491	last->next = field->next;
…		…
2592	/* IF we get here, key doesn't exist */	2500	/* IF we get here, key doesn't exist */
2593		2501
2594	/* No field, we'll have to add it. */	2502	/* No field, we'll have to add it. */
2595		2503
2596	if (!add_key)	2504	if (!add_key)
2597	{
2598	return FALSE;	2505	return FALSE;
2599	}	2506
2600	/* There isn't any good reason to store a null	2507	/* There isn't any good reason to store a null
2601	* value in the key/value list. If the archetype has	2508	* value in the key/value list. If the archetype has
2602	* this key, then we should also have it, so shouldn't	2509	* this key, then we should also have it, so shouldn't
2603	* be here. If user wants to store empty strings,	2510	* be here. If user wants to store empty strings,
2604	* should pass in ""	2511	* should pass in ""
…		…
2653	}	2560	}
2654	else	2561	else
2655	item = item->env;	2562	item = item->env;
2656	}	2563	}
2657		2564
		2565	const char *
		2566	object::flag_desc (char *desc, int len) const
		2567	{
		2568	char *p = desc;
		2569	bool first = true;
		2570
		2571	*p = 0;
		2572
		2573	for (int i = 0; i < NUM_FLAGS; i++)
		2574	{
		2575	if (len <= 10) // magic constant!
		2576	{
		2577	snprintf (p, len, ",...");
		2578	break;
		2579	}
		2580
		2581	if (flag [i])
		2582	{
		2583	int cnt = snprintf (p, len, "%s%d", first ? "" : ",", i);
		2584	len -= cnt;
		2585	p += cnt;
		2586	first = false;
		2587	}
		2588	}
		2589
		2590	return desc;
		2591	}
		2592
2658	// return a suitable string describing an objetc in enough detail to find it	2593	// return a suitable string describing an object in enough detail to find it
2659	const char *	2594	const char *
2660	object::debug_desc (char *info) const	2595	object::debug_desc (char *info) const
2661	{	2596	{
		2597	char flagdesc[512];
2662	char info2[256 * 3];	2598	char info2[256 * 4];
2663	char *p = info;	2599	char *p = info;
2664		2600
2665	p += snprintf (p, 256, "%d=\"%s%s%s\"",	2601	p += snprintf (p, 512, "{cnt:%d,uuid:<1.%" PRIx64 ">,name:\"%s\"%s%s,flags:[%s],type:%d}",
2666	count,	2602	count, uuid.seq,
2667	&name,	2603	&name,
2668	title ? " " : "",	2604	title ? "\",title:\"" : "",
2669	title ? (const char *)title : "");	2605	title ? (const char *)title : "",
		2606	flag_desc (flagdesc, 512), type);
2670		2607
2671	if (env)	2608	if (env)
2672	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2609	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2673		2610
2674	if (map)	2611	if (map)
2675	p += snprintf (p, 256, "(on %s@%d+%d)", map->path, x, y);	2612	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2676		2613
2677	return info;	2614	return info;
2678	}	2615	}
2679		2616
2680	const char *	2617	const char *
2681	object::debug_desc () const	2618	object::debug_desc () const
2682	{	2619	{
2683	static char info[256 * 3];	2620	static char info[3][256 * 4];
		2621	static int info_idx;
		2622
2684	return debug_desc (info);	2623	return debug_desc (info [++info_idx % 3]);
2685	}	2624	}
2686		2625
		2626	struct region *
		2627	object::region () const
		2628	{
		2629	return map ? map->region (x, y)
		2630	: region::default_region ();
		2631	}
		2632
		2633	const materialtype_t *
		2634	object::dominant_material () const
		2635	{
		2636	if (materialtype_t *mt = name_to_material (materialname))
		2637	return mt;
		2638
		2639	return name_to_material (shstr_unknown);
		2640	}
		2641
		2642	void
		2643	object::open_container (object *new_container)
		2644	{
		2645	if (container == new_container)
		2646	return;
		2647
		2648	if (object *old_container = container)
		2649	{
		2650	if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
		2651	return;
		2652
		2653	#if 0
		2654	// remove the "Close old_container" object.
		2655	if (object *closer = old_container->inv)
		2656	if (closer->type == CLOSE_CON)
		2657	closer->destroy ();
		2658	#endif
		2659
		2660	old_container->flag [FLAG_APPLIED] = 0;
		2661	container = 0;
		2662
		2663	esrv_update_item (UPD_FLAGS, this, old_container);
		2664	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
		2665	play_sound (sound_find ("chest_close"));
		2666	}
		2667
		2668	if (new_container)
		2669	{
		2670	if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))
		2671	return;
		2672
		2673	// TODO: this does not seem to serve any purpose anymore?
		2674	#if 0
		2675	// insert the "Close Container" object.
		2676	if (archetype *closer = new_container->other_arch)
		2677	{
		2678	object *closer = arch_to_object (new_container->other_arch);
		2679	closer->flag [FLAG_NO_MAP_SAVE] = 1;
		2680	new_container->insert (closer);
		2681	}
		2682	#endif
		2683
		2684	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));
		2685
		2686	new_container->flag [FLAG_APPLIED] = 1;
		2687	container = new_container;
		2688
		2689	esrv_update_item (UPD_FLAGS, this, new_container);
		2690	esrv_send_inventory (this, new_container);
		2691	play_sound (sound_find ("chest_open"));
		2692	}
		2693	}
		2694
		2695	object *
		2696	object::force_find (const shstr name)
		2697	{
		2698	/* cycle through his inventory to look for the MARK we want to
		2699	* place
		2700	*/
		2701	for (object *tmp = inv; tmp; tmp = tmp->below)
		2702	if (tmp->type == FORCE && tmp->slaying == name)
		2703	return splay (tmp);
		2704
		2705	return 0;
		2706	}
		2707
		2708	void
		2709	object::force_add (const shstr name, int duration)
		2710	{
		2711	if (object *force = force_find (name))
		2712	force->destroy ();
		2713
		2714	object *force = get_archetype (FORCE_NAME);
		2715
		2716	force->slaying = name;
		2717	force->stats.food = 1;
		2718	force->speed_left = -1.f;
		2719
		2720	force->set_speed (duration ? 1.f / duration : 0.f);
		2721	force->flag [FLAG_IS_USED_UP] = true;
		2722	force->flag [FLAG_APPLIED] = true;
		2723
		2724	insert (force);
		2725	}
		2726
		2727	void
		2728	object::play_sound (faceidx sound) const
		2729	{
		2730	if (!sound)
		2731	return;
		2732
		2733	if (flag [FLAG_REMOVED])
		2734	return;
		2735
		2736	if (env)
		2737	{
		2738	if (object *pl = in_player ())
		2739	pl->contr->play_sound (sound);
		2740	}
		2741	else
		2742	map->play_sound (sound, x, y);
		2743	}
		2744

Diff Legend

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