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.73 by root, Wed Dec 20 01:19:11 2006 UTC vs.
Revision 1.140 by root, Tue Apr 24 12:32:14 2007 UTC

1	/*	1	/*
2	CrossFire, A Multiplayer game for X-windows	2	* CrossFire, A Multiplayer game
3		3	*
		4	* Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
4	Copyright (C) 2001 Mark Wedel & Crossfire Development Team	5	* Copyright (C) 2001 Mark Wedel & Crossfire Development Team
5	Copyright (C) 1992 Frank Tore Johansen	6	* Copyright (C) 1992 Frank Tore Johansen
6		7	*
7	This program is free software; you can redistribute it and/or modify	8	* This program 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 2 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, write to the Free Software
19	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	20	* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
20		21	*
21	The authors can be reached via e-mail at <crossfire@schmorp.de>	22	* The authors can be reached via e-mail at <crossfire@schmorp.de>
22	*/	23	*/
23		24
24	/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.	25	/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
25	sub/add_weight will transcend the environment updating the carrying	26	sub/add_weight will transcend the environment updating the carrying
26	variable. */	27	variable. */
27	#include <global.h>	28	#include <global.h>
…		…
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
…		…
221	SET_FLAG (ob1, FLAG_BEEN_APPLIED);	222	SET_FLAG (ob1, FLAG_BEEN_APPLIED);
222		223
223	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))	224	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))
224	SET_FLAG (ob2, FLAG_BEEN_APPLIED);	225	SET_FLAG (ob2, FLAG_BEEN_APPLIED);
225		226
226	if ((ob1->flags ^ ob2->flags).reset (FLAG_INV_LOCKED).reset (FLAG_CLIENT_SENT).any ()	227	if ((ob1->flag ^ ob2->flag).reset (FLAG_INV_LOCKED).reset (FLAG_CLIENT_SENT).any ()
227	|| ob1->arch != ob2->arch	228	|| ob1->arch != ob2->arch
228	|| ob1->name != ob2->name	229	|| ob1->name != ob2->name
229	|| ob1->title != ob2->title	230	|| ob1->title != ob2->title
230	|| ob1->msg != ob2->msg	231	|| ob1->msg != ob2->msg
231	|| ob1->weight != ob2->weight	232	|| ob1->weight != ob2->weight
…		…
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:
…		…
352	op = op->env;	353	op = op->env;
353	return op;	354	return op;
354	}	355	}
355		356
356	/*	357	/*
357	* Eneq(@csd.uu.se): Since we can have items buried in a character we need
358	* a better check. We basically keeping traversing up until we can't
359	* or find a player.
360	*/
361
362	object *
363	is_player_inv (object *op)
364	{
365	for (; op != NULL && op->type != PLAYER; op = op->env)
366	if (op->env == op)
367	op->env = NULL;
368	return op;
369	}
370
371	/*
372	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.	358	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
373	* Some error messages.	359	* Some error messages.
374	* The result of the dump is stored in the static global errmsg array.	360	* The result of the dump is stored in the static global errmsg array.
375	*/	361	*/
376
377	char *	362	char *
378	dump_object (object *op)	363	dump_object (object *op)
379	{	364	{
380	if (!op)	365	if (!op)
381	return strdup ("[NULLOBJ]");	366	return strdup ("[NULLOBJ]");
382		367
383	object_freezer freezer;	368	object_freezer freezer;
384	save_object (freezer, op, 3);	369	op->write (freezer);
385	return freezer.as_string ();	370	return freezer.as_string ();
386	}	371	}
387		372
388	/*	373	/*
389	* get_nearest_part(multi-object, object 2) returns the part of the	374	* get_nearest_part(multi-object, object 2) returns the part of the
…		…
406	}	391	}
407		392
408	/*	393	/*
409	* Returns the object which has the count-variable equal to the argument.	394	* Returns the object which has the count-variable equal to the argument.
410	*/	395	*/
411
412	object *	396	object *
413	find_object (tag_t i)	397	find_object (tag_t i)
414	{	398	{
415	for (object *op = object::first; op; op = op->next)	399	for_all_objects (op)
416	if (op->count == i)	400	if (op->count == i)
417	return op;	401	return op;
418		402
419	return 0;	403	return 0;
420	}	404	}
421		405
422	/*	406	/*
423	* Returns the first object which has a name equal to the argument.	407	* Returns the first object which has a name equal to the argument.
424	* Used only by the patch command, but not all that useful.	408	* Used only by the patch command, but not all that useful.
425	* Enables features like "patch <name-of-other-player> food 999"	409	* Enables features like "patch <name-of-other-player> food 999"
426	*/	410	*/
427
428	object *	411	object *
429	find_object_name (const char *str)	412	find_object_name (const char *str)
430	{	413	{
431	shstr_cmp str_ (str);	414	shstr_cmp str_ (str);
432	object *op;	415	object *op;
433		416
434	for (op = object::first; op != NULL; op = op->next)	417	for_all_objects (op)
435	if (op->name == str_)	418	if (op->name == str_)
436	break;	419	break;
437		420
438	return op;	421	return op;
439	}	422	}
…		…
471	* refcounts and freeing the links.	454	* refcounts and freeing the links.
472	*/	455	*/
473	static void	456	static void
474	free_key_values (object *op)	457	free_key_values (object *op)
475	{	458	{
476	for (key_value *i = op->key_values; i != 0;)	459	for (key_value *i = op->key_values; i; )
477	{	460	{
478	key_value *next = i->next;	461	key_value *next = i->next;
479	delete i;	462	delete i;
480		463
481	i = next;	464	i = next;
482	}	465	}
483		466
484	op->key_values = 0;	467	op->key_values = 0;
485	}	468	}
486		469
487	void object::clear ()	470	object &
		471	object::operator =(const object &src)
488	{	472	{
489	attachable_base::clear ();	473	bool is_freed = flag [FLAG_FREED];
		474	bool is_removed = flag [FLAG_REMOVED];
490		475
491	free_key_values (this);
492
493	owner = 0;
494	name = 0;
495	name_pl = 0;
496	title = 0;
497	race = 0;
498	slaying = 0;
499	skill = 0;
500	msg = 0;
501	lore = 0;
502	custom_name = 0;
503	materialname = 0;
504	contr = 0;
505	below = 0;
506	above = 0;
507	inv = 0;
508	container = 0;
509	env = 0;
510	more = 0;
511	head = 0;
512	map = 0;
513	active_next = 0;
514	active_prev = 0;
515
516	memset (static_cast<object_pod *>(this), 0, sizeof (object_pod));
517
518	SET_FLAG (this, FLAG_REMOVED);
519
520	/* What is not cleared is next, prev, and count */
521
522	expmul = 1.0;
523	face = blank_face;
524
525	if (settings.casting_time)
526	casting_time = -1;
527	}
528
529	/*
530	* copy_to first frees everything allocated by the dst object,
531	* and then copies the contents of itself into the second
532	* object, allocating what needs to be allocated. Basically, any
533	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
534	* if the first object is freed, the pointers in the new object
535	* will point at garbage.
536	*/
537	void
538	object::copy_to (object *dst)
539	{
540	bool is_freed = QUERY_FLAG (dst, FLAG_FREED);
541	bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED);
542
543	*(object_copy *)dst = *this;	476	*(object_copy *)this = src;
544	*(object_pod *)dst = *this;
545		477
546	if (self || cb)	478	flag [FLAG_FREED] = is_freed;
547	INVOKE_OBJECT (CLONE, this, ARG_OBJECT (dst));	479	flag [FLAG_REMOVED] = is_removed;
548
549	if (is_freed)
550	SET_FLAG (dst, FLAG_FREED);
551
552	if (is_removed)
553	SET_FLAG (dst, FLAG_REMOVED);
554
555	if (speed < 0)
556	dst->speed_left = speed_left - RANDOM () % 200 / 100.0;
557		480
558	/* Copy over key_values, if any. */	481	/* Copy over key_values, if any. */
559	if (key_values)	482	if (src.key_values)
560	{	483	{
561	key_value *tail = 0;	484	key_value *tail = 0;
562	key_value *i;
563
564	dst->key_values = 0;	485	key_values = 0;
565		486
566	for (i = key_values; i; i = i->next)	487	for (key_value *i = src.key_values; i; i = i->next)
567	{	488	{
568	key_value *new_link = new key_value;	489	key_value *new_link = new key_value;
569		490
570	new_link->next = 0;	491	new_link->next = 0;
571	new_link->key = i->key;	492	new_link->key = i->key;
572	new_link->value = i->value;	493	new_link->value = i->value;
573		494
574	/* Try and be clever here, too. */	495	/* Try and be clever here, too. */
575	if (!dst->key_values)	496	if (!key_values)
576	{	497	{
577	dst->key_values = new_link;	498	key_values = new_link;
578	tail = new_link;	499	tail = new_link;
579	}	500	}
580	else	501	else
581	{	502	{
582	tail->next = new_link;	503	tail->next = new_link;
583	tail = new_link;	504	tail = new_link;
584	}	505	}
585	}	506	}
586	}	507	}
		508	}
587		509
588	update_ob_speed (dst);	510	/*
		511	* copy_to first frees everything allocated by the dst object,
		512	* and then copies the contents of itself into the second
		513	* object, allocating what needs to be allocated. Basically, any
		514	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
		515	* if the first object is freed, the pointers in the new object
		516	* will point at garbage.
		517	*/
		518	void
		519	object::copy_to (object *dst)
		520	{
		521	*dst = *this;
		522
		523	if (speed < 0)
		524	dst->speed_left = speed_left - rndm ();
		525
		526	dst->set_speed (dst->speed);
		527	}
		528
		529	void
		530	object::instantiate ()
		531	{
		532	if (!uuid.seq) // HACK
		533	uuid = gen_uuid ();
		534
		535	speed_left = -0.1f;
		536	/* copy the body_info to the body_used - this is only really
		537	* need for monsters, but doesn't hurt to do it for everything.
		538	* by doing so, when a monster is created, it has good starting
		539	* values for the body_used info, so when items are created
		540	* for it, they can be properly equipped.
		541	*/
		542	memcpy (body_used, body_info, sizeof (body_used));
		543
		544	attachable::instantiate ();
589	}	545	}
590		546
591	object *	547	object *
592	object::clone ()	548	object::clone ()
593	{	549	{
…		…
599	/*	555	/*
600	* If an object with the IS_TURNABLE() flag needs to be turned due	556	* If an object with the IS_TURNABLE() flag needs to be turned due
601	* to the closest player being on the other side, this function can	557	* to the closest player being on the other side, this function can
602	* be called to update the face variable, _and_ how it looks on the map.	558	* be called to update the face variable, _and_ how it looks on the map.
603	*/	559	*/
604
605	void	560	void
606	update_turn_face (object *op)	561	update_turn_face (object *op)
607	{	562	{
608	if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || op->arch == NULL)	563	if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || !op->arch)
609	return;	564	return;
		565
610	SET_ANIMATION (op, op->direction);	566	SET_ANIMATION (op, op->direction);
611	update_object (op, UP_OBJ_FACE);	567	update_object (op, UP_OBJ_FACE);
612	}	568	}
613		569
614	/*	570	/*
615	* Updates the speed of an object. If the speed changes from 0 to another	571	* Updates the speed of an object. If the speed changes from 0 to another
616	* value, or vice versa, then add/remove the object from the active list.	572	* value, or vice versa, then add/remove the object from the active list.
617	* This function needs to be called whenever the speed of an object changes.	573	* This function needs to be called whenever the speed of an object changes.
618	*/	574	*/
619	void	575	void
620	update_ob_speed (object *op)	576	object::set_speed (float speed)
621	{	577	{
622	extern int arch_init;	578	if (flag [FLAG_FREED] && speed)
623
624	/* No reason putting the archetypes objects on the speed list,
625	* since they never really need to be updated.
626	*/
627
628	if (QUERY_FLAG (op, FLAG_FREED) && op->speed)
629	{	579	{
630	LOG (llevError, "Object %s is freed but has speed.\n", &op->name);	580	LOG (llevError, "Object %s is freed but has speed.\n", &name);
631	#ifdef MANY_CORES
632	abort ();
633	#else
634	op->speed = 0;	581	speed = 0;
635	#endif
636	}
637
638	if (arch_init)
639	return;
640
641	if (FABS (op->speed) > MIN_ACTIVE_SPEED)
642	{	582	}
643	/* If already on active list, don't do anything */
644	if (op->active_next || op->active_prev || op == active_objects)
645	return;
646		583
647	/* process_events() expects us to insert the object at the beginning	584	this->speed = speed;
648	* of the list. */
649	op->active_next = active_objects;
650		585
651	if (op->active_next != NULL)	586	if (has_active_speed ())
652	op->active_next->active_prev = op;	587	activate ();
653
654	active_objects = op;
655	}
656	else	588	else
657	{	589	deactivate ();
658	/* If not on the active list, nothing needs to be done */
659	if (!op->active_next && !op->active_prev && op != active_objects)
660	return;
661
662	if (op->active_prev == NULL)
663	{
664	active_objects = op->active_next;
665
666	if (op->active_next != NULL)
667	op->active_next->active_prev = NULL;
668	}
669	else
670	{
671	op->active_prev->active_next = op->active_next;
672
673	if (op->active_next)
674	op->active_next->active_prev = op->active_prev;
675	}
676
677	op->active_next = NULL;
678	op->active_prev = NULL;
679	}
680	}	590	}
681		591
682	/* This function removes object 'op' from the list of active
683	* objects.
684	* This should only be used for style maps or other such
685	* reference maps where you don't want an object that isn't
686	* in play chewing up cpu time getting processed.
687	* The reverse of this is to call update_ob_speed, which
688	* will do the right thing based on the speed of the object.
689	*/
690	void
691	remove_from_active_list (object *op)
692	{
693	/* If not on the active list, nothing needs to be done */
694	if (!op->active_next && !op->active_prev && op != active_objects)
695	return;
696
697	if (op->active_prev == NULL)
698	{
699	active_objects = op->active_next;
700	if (op->active_next != NULL)
701	op->active_next->active_prev = NULL;
702	}
703	else
704	{
705	op->active_prev->active_next = op->active_next;
706	if (op->active_next)
707	op->active_next->active_prev = op->active_prev;
708	}
709	op->active_next = NULL;
710	op->active_prev = NULL;
711	}
712
713	/*	592	/*
714	* update_object() updates the array which represents the map.	593	* update_object() updates the the map.
715	* It takes into account invisible objects (and represent squares covered	594	* It takes into account invisible objects (and represent squares covered
716	* by invisible objects by whatever is below them (unless it's another	595	* by invisible objects by whatever is below them (unless it's another
717	* invisible object, etc...)	596	* invisible object, etc...)
718	* If the object being updated is beneath a player, the look-window	597	* If the object being updated is beneath a player, the look-window
719	* of that player is updated (this might be a suboptimal way of	598	* of that player is updated (this might be a suboptimal way of
720	* updating that window, though, since update_object() is called _often_)	599	* updating that window, though, since update_object() is called _often_)
721	*	600	*
722	* action is a hint of what the caller believes need to be done.	601	* action is a hint of what the caller believes need to be done.
723	* For example, if the only thing that has changed is the face (due to
724	* an animation), we don't need to call update_position until that actually
725	* comes into view of a player. OTOH, many other things, like addition/removal
726	* of walls or living creatures may need us to update the flags now.
727	* current action are:	602	* current action are:
728	* UP_OBJ_INSERT: op was inserted	603	* UP_OBJ_INSERT: op was inserted
729	* UP_OBJ_REMOVE: op was removed	604	* UP_OBJ_REMOVE: op was removed
730	* UP_OBJ_CHANGE: object has somehow changed. In this case, we always update	605	* UP_OBJ_CHANGE: object has somehow changed. In this case, we always update
731	* as that is easier than trying to look at what may have changed.	606	* as that is easier than trying to look at what may have changed.
732	* UP_OBJ_FACE: only the objects face has changed.	607	* UP_OBJ_FACE: only the objects face has changed.
733	*/	608	*/
734
735	void	609	void
736	update_object (object *op, int action)	610	update_object (object *op, int action)
737	{	611	{
738	int update_now = 0, flags;
739	MoveType move_on, move_off, move_block, move_slow;
740
741	if (op == NULL)	612	if (op == NULL)
742	{	613	{
743	/* this should never happen */	614	/* this should never happen */
744	LOG (llevDebug, "update_object() called for NULL object.\n");	615	LOG (llevDebug, "update_object() called for NULL object.\n");
745	return;	616	return;
746	}	617	}
747		618
748	if (op->env != NULL)	619	if (op->env)
749	{	620	{
750	/* Animation is currently handled by client, so nothing	621	/* Animation is currently handled by client, so nothing
751	* to do in this case.	622	* to do in this case.
752	*/	623	*/
753	return;	624	return;
…		…
758	*/	629	*/
759	if (!op->map || op->map->in_memory == MAP_SAVING)	630	if (!op->map || op->map->in_memory == MAP_SAVING)
760	return;	631	return;
761		632
762	/* make sure the object is within map boundaries */	633	/* make sure the object is within map boundaries */
763	if (op->x < 0 || op->x >= MAP_WIDTH (op->map) || op->y < 0 || op->y >= MAP_HEIGHT (op->map))	634	if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height)
764	{	635	{
765	LOG (llevError, "update_object() called for object out of map!\n");	636	LOG (llevError, "update_object() called for object out of map!\n");
766	#ifdef MANY_CORES	637	#ifdef MANY_CORES
767	abort ();	638	abort ();
768	#endif	639	#endif
769	return;	640	return;
770	}	641	}
771		642
772	flags = GET_MAP_FLAGS (op->map, op->x, op->y);	643	mapspace &m = op->ms ();
773	SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NEED_UPDATE);
774	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);
775	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);
776	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);
777	move_off = GET_MAP_MOVE_OFF (op->map, op->x, op->y);
778		644
		645	if (!(m.flags_ & P_UPTODATE))
		646	/* nop */;
779	if (action == UP_OBJ_INSERT)	647	else if (action == UP_OBJ_INSERT)
780	{	648	{
		649	// this is likely overkill, TODO: revisit (schmorp)
781	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(flags & P_BLOCKSVIEW))	650	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
782	update_now = 1;
783
784	if (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(flags & P_NO_MAGIC))	651	|| (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))
785	update_now = 1;	652	|| (op->type == PLAYER && !(m.flags_ & P_PLAYER))
786		653	|| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
		654	|| (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))
787	if (QUERY_FLAG (op, FLAG_DAMNED) && !(flags & P_NO_CLERIC))	655	|| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))
788	update_now = 1;
789
790	if (QUERY_FLAG (op, FLAG_ALIVE) && !(flags & P_IS_ALIVE))
791	update_now = 1;
792
793	if (op->type == SAFE_GROUND && !(flags & P_SAFE))
794	update_now = 1;
795
796	if ((move_on | op->move_on) != move_on)	656	|| (m.move_on | op->move_on ) != m.move_on
797	update_now = 1;
798
799	if ((move_off | op->move_off) != move_off)	657	|| (m.move_off | op->move_off ) != m.move_off
800	update_now = 1;	658	|| (m.move_slow | op->move_slow) != m.move_slow
801
802	/* This isn't perfect, but I don't expect a lot of objects to	659	/* This isn't perfect, but I don't expect a lot of objects to
803	* to have move_allow right now.	660	* to have move_allow right now.
804	*/	661	*/
805	if (((move_block | op->move_block) & ~op->move_allow) != move_block)	662	|| ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block
806	update_now = 1;	663	|| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)
807		664	m.flags_ = 0;
808	if ((move_slow | op->move_slow) != move_slow)
809	update_now = 1;
810	}	665	}
811
812	/* if the object is being removed, we can't make intelligent	666	/* if the object is being removed, we can't make intelligent
813	* decisions, because remove_ob can't really pass the object	667	* decisions, because remove_ob can't really pass the object
814	* that is being removed.	668	* that is being removed.
815	*/	669	*/
816	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)	670	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
817	update_now = 1;	671	m.flags_ = 0;
818	else if (action == UP_OBJ_FACE)	672	else if (action == UP_OBJ_FACE)
819	/* Nothing to do for that case */ ;	673	/* Nothing to do for that case */ ;
820	else	674	else
821	LOG (llevError, "update_object called with invalid action: %d\n", action);	675	LOG (llevError, "update_object called with invalid action: %d\n", action);
822		676
823	if (update_now)
824	{
825	SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NO_ERROR | P_NEED_UPDATE);
826	update_position (op->map, op->x, op->y);
827	}
828
829	if (op->more != NULL)	677	if (op->more)
830	update_object (op->more, action);	678	update_object (op->more, action);
831	}
832
833	object::vector object::mortals;
834	object::vector object::objects; // not yet used
835	object *object::first;
836
837	void object::free_mortals ()
838	{
839	for (AUTODECL (i, mortals.begin ()); i != mortals.end ();)
840	if ((*i)->refcnt)
841	++i; // further delay freeing
842	else
843	{
844	delete *i;
845	mortals.erase (i);
846	}
847	}	679	}
848		680
849	object::object ()	681	object::object ()
850	{	682	{
851	SET_FLAG (this, FLAG_REMOVED);	683	SET_FLAG (this, FLAG_REMOVED);
…		…
854	face = blank_face;	686	face = blank_face;
855	}	687	}
856		688
857	object::~object ()	689	object::~object ()
858	{	690	{
		691	unlink ();
		692
859	free_key_values (this);	693	free_key_values (this);
860	}	694	}
861		695
		696	static int object_count;
		697
862	void object::link ()	698	void object::link ()
863	{	699	{
864	count = ++ob_count;	700	assert (!index);//D
865	uuid = gen_uuid ();	701	uuid = gen_uuid ();
		702	count = ++object_count;
866		703
867	prev = 0;	704	refcnt_inc ();
868	next = object::first;	705	objects.insert (this);
869
870	if (object::first)
871	object::first->prev = this;
872
873	object::first = this;
874	}	706	}
875		707
876	void object::unlink ()	708	void object::unlink ()
877	{	709	{
878	if (this == object::first)	710	if (!index)
879	object::first = next;	711	return;
880		712
881	/* Remove this object from the list of used objects */	713	objects.erase (this);
882	if (prev) prev->next = next;	714	refcnt_dec ();
883	if (next) next->prev = prev;	715	}
884		716
885	prev = 0;	717	void
886	next = 0;	718	object::activate ()
		719	{
		720	/* If already on active list, don't do anything */
		721	if (active)
		722	return;
		723
		724	if (has_active_speed ())
		725	actives.insert (this);
		726	}
		727
		728	void
		729	object::activate_recursive ()
		730	{
		731	activate ();
		732
		733	for (object *op = inv; op; op = op->below)
		734	op->activate_recursive ();
		735	}
		736
		737	/* This function removes object 'op' from the list of active
		738	* objects.
		739	* This should only be used for style maps or other such
		740	* reference maps where you don't want an object that isn't
		741	* in play chewing up cpu time getting processed.
		742	* The reverse of this is to call update_ob_speed, which
		743	* will do the right thing based on the speed of the object.
		744	*/
		745	void
		746	object::deactivate ()
		747	{
		748	/* If not on the active list, nothing needs to be done */
		749	if (!active)
		750	return;
		751
		752	actives.erase (this);
		753	}
		754
		755	void
		756	object::deactivate_recursive ()
		757	{
		758	for (object *op = inv; op; op = op->below)
		759	op->deactivate_recursive ();
		760
		761	deactivate ();
		762	}
		763
		764	void
		765	object::set_flag_inv (int flag, int value)
		766	{
		767	for (object *op = inv; op; op = op->below)
		768	{
		769	op->flag [flag] = value;
		770	op->set_flag_inv (flag, value);
		771	}
		772	}
		773
		774	/*
		775	* Remove and free all objects in the inventory of the given object.
		776	* object.c ?
		777	*/
		778	void
		779	object::destroy_inv (bool drop_to_ground)
		780	{
		781	// need to check first, because the checks below might segfault
		782	// as we might be on an invalid mapspace and crossfire code
		783	// is too buggy to ensure that the inventory is empty.
		784	// corollary: if you create arrows etc. with stuff in tis inventory,
		785	// cf will crash below with off-map x and y
		786	if (!inv)
		787	return;
		788
		789	/* Only if the space blocks everything do we not process -
		790	* if some form of movement is allowed, let objects
		791	* drop on that space.
		792	*/
		793	if (!drop_to_ground
		794	|| !map
		795	|| map->in_memory != MAP_IN_MEMORY
		796	|| map->nodrop
		797	|| ms ().move_block == MOVE_ALL)
		798	{
		799	while (inv)
		800	{
		801	inv->destroy_inv (drop_to_ground);
		802	inv->destroy ();
		803	}
		804	}
		805	else
		806	{ /* Put objects in inventory onto this space */
		807	while (inv)
		808	{
		809	object *op = inv;
		810
		811	if (op->flag [FLAG_STARTEQUIP]
		812	|| op->flag [FLAG_NO_DROP]
		813	|| op->type == RUNE
		814	|| op->type == TRAP
		815	|| op->flag [FLAG_IS_A_TEMPLATE]
		816	|| op->flag [FLAG_DESTROY_ON_DEATH])
		817	op->destroy ();
		818	else
		819	map->insert (op, x, y);
		820	}
		821	}
887	}	822	}
888		823
889	object *object::create ()	824	object *object::create ()
890	{	825	{
891	object *op = new object;	826	object *op = new object;
892	op->link ();	827	op->link ();
893	return op;	828	return op;
894	}	829	}
895		830
896	/*	831	void
897	* free_object() frees everything allocated by an object, removes	832	object::do_destroy ()
898	* it from the list of used objects, and puts it on the list of
899	* free objects. The IS_FREED() flag is set in the object.
900	* The object must have been removed by remove_ob() first for
901	* this function to succeed.
902	*
903	* If destroy_inventory is set, free inventory as well. Else drop items in
904	* inventory to the ground.
905	*/
906	void object::destroy (bool destroy_inventory)
907	{	833	{
908	if (QUERY_FLAG (this, FLAG_FREED))	834	attachable::do_destroy ();
909	return;
910		835
911	if (QUERY_FLAG (this, FLAG_FRIENDLY))	836	if (flag [FLAG_IS_LINKED])
		837	remove_button_link (this);
		838
		839	if (flag [FLAG_FRIENDLY])
912	remove_friendly_object (this);	840	remove_friendly_object (this);
913		841
914	if (!QUERY_FLAG (this, FLAG_REMOVED))	842	if (!flag [FLAG_REMOVED])
915	remove ();	843	remove ();
916		844
917	SET_FLAG (this, FLAG_FREED);	845	destroy_inv (true);
918		846
919	if (more)	847	deactivate ();
920	{	848	unlink ();
921	more->destroy (destroy_inventory);
922	more = 0;
923	}
924		849
925	if (inv)	850	flag [FLAG_FREED] = 1;
926	{
927	/* Only if the space blocks everything do we not process -
928	* if some form of movement is allowed, let objects
929	* drop on that space.
930	*/
931	if (destroy_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
932	{
933	object *op = inv;
934
935	while (op)
936	{
937	object *tmp = op->below;
938	op->destroy (destroy_inventory);
939	op = tmp;
940	}
941	}
942	else
943	{ /* Put objects in inventory onto this space */
944	object *op = inv;
945
946	while (op)
947	{
948	object *tmp = op->below;
949
950	op->remove ();
951
952	if (QUERY_FLAG (op, FLAG_STARTEQUIP)
953	|| QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
954	op->destroy ();
955	else
956	{
957	op->x = x;
958	op->y = y;
959	insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */
960	}
961
962	op = tmp;
963	}
964	}
965	}
966		851
967	// hack to ensure that freed objects still have a valid map	852	// hack to ensure that freed objects still have a valid map
968	{	853	{
969	static maptile *freed_map; // freed objects are moved here to avoid crashes	854	static maptile *freed_map; // freed objects are moved here to avoid crashes
970		855
…		…
974		859
975	freed_map->name = "/internal/freed_objects_map";	860	freed_map->name = "/internal/freed_objects_map";
976	freed_map->width = 3;	861	freed_map->width = 3;
977	freed_map->height = 3;	862	freed_map->height = 3;
978		863
979	freed_map->allocate ();	864	freed_map->alloc ();
		865	freed_map->in_memory = MAP_IN_MEMORY;
980	}	866	}
981		867
982	map = freed_map;	868	map = freed_map;
983	x = 1;	869	x = 1;
984	y = 1;	870	y = 1;
985	}	871	}
986		872
		873	head = 0;
		874
		875	if (more)
		876	{
		877	more->destroy ();
		878	more = 0;
		879	}
		880
987	// clear those pointers that likely might have circular references to us	881	// clear those pointers that likely might have circular references to us
988	owner = 0;	882	owner = 0;
989	enemy = 0;	883	enemy = 0;
990	attacked_by = 0;	884	attacked_by = 0;
		885	}
991		886
992	// only relevant for players(?), but make sure of it anyways	887	void
993	contr = 0;	888	object::destroy (bool destroy_inventory)
		889	{
		890	if (destroyed ())
		891	return;
994		892
995	/* Remove object from the active list */	893	if (destroy_inventory)
996	speed = 0;	894	destroy_inv (false);
997	update_ob_speed (this);
998		895
999	unlink ();	896	attachable::destroy ();
1000
1001	mortals.push_back (this);
1002	}	897	}
1003		898
1004	/*	899	/*
1005	* sub_weight() recursively (outwards) subtracts a number from the	900	* sub_weight() recursively (outwards) subtracts a number from the
1006	* weight of an object (and what is carried by it's environment(s)).	901	* weight of an object (and what is carried by it's environment(s)).
…		…
1022	* This function removes the object op from the linked list of objects	917	* This function removes the object op from the linked list of objects
1023	* which it is currently tied to. When this function is done, the	918	* which it is currently tied to. When this function is done, the
1024	* object will have no environment. If the object previously had an	919	* object will have no environment. If the object previously had an
1025	* environment, the x and y coordinates will be updated to	920	* environment, the x and y coordinates will be updated to
1026	* the previous environment.	921	* the previous environment.
1027	* Beware: This function is called from the editor as well!
1028	*/	922	*/
1029	void	923	void
1030	object::remove ()	924	object::do_remove ()
1031	{	925	{
1032	object *tmp, *last = 0;	926	object *tmp, *last = 0;
1033	object *otmp;	927	object *otmp;
1034		928
1035	int check_walk_off;
1036
1037	if (QUERY_FLAG (this, FLAG_REMOVED))	929	if (QUERY_FLAG (this, FLAG_REMOVED))
1038	return;	930	return;
1039		931
1040	SET_FLAG (this, FLAG_REMOVED);	932	SET_FLAG (this, FLAG_REMOVED);
		933	INVOKE_OBJECT (REMOVE, this);
1041		934
1042	if (more)	935	if (more)
1043	more->remove ();	936	more->remove ();
1044		937
1045	/*	938	/*
…		…
1055		948
1056	/* NO_FIX_PLAYER is set when a great many changes are being	949	/* NO_FIX_PLAYER is set when a great many changes are being
1057	* made to players inventory. If set, avoiding the call	950	* made to players inventory. If set, avoiding the call
1058	* to save cpu time.	951	* to save cpu time.
1059	*/	952	*/
1060	if ((otmp = is_player_inv (env)) != NULL && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	953	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1061	fix_player (otmp);	954	otmp->update_stats ();
1062		955
1063	if (above != NULL)	956	if (above)
1064	above->below = below;	957	above->below = below;
1065	else	958	else
1066	env->inv = below;	959	env->inv = below;
1067		960
1068	if (below != NULL)	961	if (below)
1069	below->above = above;	962	below->above = above;
1070		963
1071	/* we set up values so that it could be inserted into	964	/* we set up values so that it could be inserted into
1072	* the map, but we don't actually do that - it is up	965	* the map, but we don't actually do that - it is up
1073	* to the caller to decide what we want to do.	966	* to the caller to decide what we want to do.
…		…
1077	above = 0, below = 0;	970	above = 0, below = 0;
1078	env = 0;	971	env = 0;
1079	}	972	}
1080	else if (map)	973	else if (map)
1081	{	974	{
1082	/* Re did the following section of code - it looks like it had	975	if (type == PLAYER)
1083	* lots of logic for things we no longer care about
1084	*/	976	{
		977	// leaving a spot always closes any open container on the ground
		978	if (container && !container->env)
		979	// this causes spurious floorbox updates, but it ensures
		980	// that the CLOSE event is being sent.
		981	close_container ();
		982
		983	--map->players;
		984	map->touch ();
		985	}
		986
		987	map->dirty = true;
		988	mapspace &ms = this->ms ();
1085		989
1086	/* link the object above us */	990	/* link the object above us */
1087	if (above)	991	if (above)
1088	above->below = below;	992	above->below = below;
1089	else	993	else
1090	SET_MAP_TOP (map, x, y, below); /* we were top, set new top */	994	ms.top = below; /* we were top, set new top */
1091		995
1092	/* Relink the object below us, if there is one */	996	/* Relink the object below us, if there is one */
1093	if (below)	997	if (below)
1094	below->above = above;	998	below->above = above;
1095	else	999	else
…		…
1097	/* Nothing below, which means we need to relink map object for this space	1001	/* Nothing below, which means we need to relink map object for this space
1098	* use translated coordinates in case some oddness with map tiling is	1002	* use translated coordinates in case some oddness with map tiling is
1099	* evident	1003	* evident
1100	*/	1004	*/
1101	if (GET_MAP_OB (map, x, y) != this)	1005	if (GET_MAP_OB (map, x, y) != this)
1102	{
1103	char *dump = dump_object (this);
1104	LOG (llevError,
1105	"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);	1006	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 ());
1106	free (dump);
1107	dump = dump_object (GET_MAP_OB (map, x, y));
1108	LOG (llevError, "%s\n", dump);
1109	free (dump);
1110	}
1111		1007
1112	SET_MAP_OB (map, x, y, above); /* goes on above it. */	1008	ms.bot = above; /* goes on above it. */
1113	}	1009	}
1114		1010
1115	above = 0;	1011	above = 0;
1116	below = 0;	1012	below = 0;
1117		1013
1118	if (map->in_memory == MAP_SAVING)	1014	if (map->in_memory == MAP_SAVING)
1119	return;	1015	return;
1120		1016
1121	check_walk_off = !QUERY_FLAG (this, FLAG_NO_APPLY);	1017	int check_walk_off = !flag [FLAG_NO_APPLY];
1122		1018
1123	for (tmp = GET_MAP_OB (map, x, y); tmp; tmp = tmp->above)	1019	for (tmp = ms.bot; tmp; tmp = tmp->above)
1124	{	1020	{
1125	/* No point updating the players look faces if he is the object	1021	/* No point updating the players look faces if he is the object
1126	* being removed.	1022	* being removed.
1127	*/	1023	*/
1128		1024
…		…
1132	* removed (most likely destroyed), update the player view	1028	* removed (most likely destroyed), update the player view
1133	* appropriately.	1029	* appropriately.
1134	*/	1030	*/
1135	if (tmp->container == this)	1031	if (tmp->container == this)
1136	{	1032	{
1137	CLEAR_FLAG (this, FLAG_APPLIED);	1033	flag [FLAG_APPLIED] = 0;
1138	tmp->container = 0;	1034	tmp->container = 0;
1139	}	1035	}
1140		1036
		1037	if (tmp->contr->ns)
1141	tmp->contr->socket->floorbox_update ();	1038	tmp->contr->ns->floorbox_update ();
1142	}	1039	}
1143		1040
1144	/* See if player moving off should effect something */	1041	/* See if object moving off should effect something */
1145	if (check_walk_off	1042	if (check_walk_off
1146	&& ((move_type & tmp->move_off)	1043	&& ((move_type & tmp->move_off)
1147	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))	1044	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1148	{	1045	{
1149	move_apply (tmp, this, 0);	1046	move_apply (tmp, this, 0);
…		…
1151	if (destroyed ())	1048	if (destroyed ())
1152	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());	1049	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1153	}	1050	}
1154		1051
1155	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */	1052	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1156		1053	//TODO: why is this horrible hacka fix? get rid of this code=bug! (schmorp)
1157	if (tmp->above == tmp)	1054	if (tmp->above == tmp)
1158	tmp->above = 0;	1055	tmp->above = 0;
1159		1056
1160	last = tmp;	1057	last = tmp;
1161	}	1058	}
1162		1059
1163	/* last == NULL of there are no objects on this space */	1060	/* last == NULL if there are no objects on this space */
		1061	//TODO: this makes little sense, why only update the topmost object?
1164	if (!last)	1062	if (!last)
1165	{	1063	map->at (x, y).flags_ = 0;
1166	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1167	* we could preserve the flags (GET_MAP_FLAGS), but update_position figures
1168	* those out anyways, and if there are any flags set right now, they won't
1169	* be correct anyways.
1170	*/
1171	SET_MAP_FLAGS (map, x, y, P_NEED_UPDATE);
1172	update_position (map, x, y);
1173	}
1174	else	1064	else
1175	update_object (last, UP_OBJ_REMOVE);	1065	update_object (last, UP_OBJ_REMOVE);
1176		1066
1177	if (QUERY_FLAG (this, FLAG_BLOCKSVIEW) || glow_radius)	1067	if (flag [FLAG_BLOCKSVIEW] || glow_radius)
1178	update_all_los (map, x, y);	1068	update_all_los (map, x, y);
1179	}	1069	}
1180	}	1070	}
1181		1071
1182	/*	1072	/*
…		…
1191	merge_ob (object *op, object *top)	1081	merge_ob (object *op, object *top)
1192	{	1082	{
1193	if (!op->nrof)	1083	if (!op->nrof)
1194	return 0;	1084	return 0;
1195		1085
1196	if (top == NULL)	1086	if (top)
1197	for (top = op; top != NULL && top->above != NULL; top = top->above);	1087	for (top = op; top && top->above; top = top->above)
		1088	;
1198		1089
1199	for (; top != NULL; top = top->below)	1090	for (; top; top = top->below)
1200	{	1091	{
1201	if (top == op)	1092	if (top == op)
1202	continue;	1093	continue;
1203		1094
1204	if (object::can_merge (op, top))	1095	if (object::can_merge (op, top))
…		…
1213	}	1104	}
1214		1105
1215	return 0;	1106	return 0;
1216	}	1107	}
1217		1108
		1109	void
		1110	object::expand_tail ()
		1111	{
		1112	if (more)
		1113	return;
		1114
		1115	object *prev = this;
		1116
		1117	for (archetype *at = arch->more; at; at = at->more)
		1118	{
		1119	object *op = arch_to_object (at);
		1120
		1121	op->name = name;
		1122	op->name_pl = name_pl;
		1123	op->title = title;
		1124
		1125	op->head = this;
		1126	prev->more = op;
		1127
		1128	prev = op;
		1129	}
		1130	}
		1131
1218	/*	1132	/*
1219	* same as insert_ob_in_map except it handle separate coordinates and do a clean	1133	* same as insert_ob_in_map except it handles separate coordinates and does a clean
1220	* job preparing multi-part monsters	1134	* job preparing multi-part monsters.
1221	*/	1135	*/
1222	object *	1136	object *
1223	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)	1137	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1224	{	1138	{
1225	object *tmp;
1226
1227	if (op->head)
1228	op = op->head;
1229
1230	for (tmp = op; tmp; tmp = tmp->more)	1139	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1231	{	1140	{
1232	tmp->x = x + tmp->arch->clone.x;	1141	tmp->x = x + tmp->arch->clone.x;
1233	tmp->y = y + tmp->arch->clone.y;	1142	tmp->y = y + tmp->arch->clone.y;
1234	}	1143	}
1235		1144
…		…
1254	* Return value:	1163	* Return value:
1255	* new object if 'op' was merged with other object	1164	* new object if 'op' was merged with other object
1256	* NULL if 'op' was destroyed	1165	* NULL if 'op' was destroyed
1257	* just 'op' otherwise	1166	* just 'op' otherwise
1258	*/	1167	*/
1259
1260	object *	1168	object *
1261	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)	1169	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1262	{	1170	{
		1171	assert (!op->flag [FLAG_FREED]);
		1172
1263	object *tmp, *top, *floor = NULL;	1173	object *tmp, *top, *floor = NULL;
1264	sint16 x, y;
1265		1174
1266	if (QUERY_FLAG (op, FLAG_FREED))	1175	op->remove ();
1267	{
1268	LOG (llevError, "Trying to insert freed object!\n");
1269	return NULL;
1270	}
1271		1176
1272	if (m == NULL)	1177	#if 0
1273	{	1178	if (!m->active != !op->active)
1274	char *dump = dump_object (op);	1179	if (m->active)
1275	LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);	1180	op->activate_recursive ();
1276	free (dump);	1181	else
1277	return op;	1182	op->deactivate_recursive ();
1278	}	1183	#endif
1279		1184
1280	if (out_of_map (m, op->x, op->y))	1185	if (out_of_map (m, op->x, op->y))
1281	{	1186	{
1282	char *dump = dump_object (op);
1283	LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump);	1187	LOG (llevError, "Trying to insert object outside the map.\n%s\n", op->debug_desc ());
1284	#ifdef MANY_CORES	1188	#ifdef MANY_CORES
1285	/* Better to catch this here, as otherwise the next use of this object	1189	/* Better to catch this here, as otherwise the next use of this object
1286	* is likely to cause a crash. Better to find out where it is getting	1190	* is likely to cause a crash. Better to find out where it is getting
1287	* improperly inserted.	1191	* improperly inserted.
1288	*/	1192	*/
1289	abort ();	1193	abort ();
1290	#endif	1194	#endif
1291	free (dump);
1292	return op;	1195	return op;
1293	}	1196	}
1294		1197
1295	if (!QUERY_FLAG (op, FLAG_REMOVED))
1296	{
1297	char *dump = dump_object (op);
1298	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
1299	free (dump);
1300	return op;
1301	}
1302
1303	if (op->more != NULL)
1304	{
1305	/* The part may be on a different map. */
1306
1307	object *more = op->more;	1198	if (object *more = op->more)
1308		1199	{
1309	/* We really need the caller to normalize coordinates - if
1310	* we set the map, that doesn't work if the location is within
1311	* a map and this is straddling an edge. So only if coordinate
1312	* is clear wrong do we normalize it.
1313	*/
1314	if (OUT_OF_REAL_MAP (more->map, more->x, more->y))
1315	more->map = get_map_from_coord (m, &more->x, &more->y);
1316	else if (!more->map)
1317	{
1318	/* For backwards compatibility - when not dealing with tiled maps,
1319	* more->map should always point to the parent.
1320	*/
1321	more->map = m;
1322	}
1323
1324	if (insert_ob_in_map (more, more->map, originator, flag) == NULL)	1200	if (!insert_ob_in_map (more, m, originator, flag))
1325	{	1201	{
1326	if (!op->head)	1202	if (!op->head)
1327	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");	1203	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1328		1204
1329	return NULL;	1205	return 0;
1330	}	1206	}
1331	}	1207	}
1332		1208
1333	CLEAR_FLAG (op, FLAG_REMOVED);	1209	CLEAR_FLAG (op, FLAG_REMOVED);
1334		1210
1335	/* Ideally, the caller figures this out. However, it complicates a lot	1211	/* Ideally, the caller figures this out. However, it complicates a lot
1336	* of areas of callers (eg, anything that uses find_free_spot would now	1212	* of areas of callers (eg, anything that uses find_free_spot would now
1337	* need extra work	1213	* need extra work
1338	*/	1214	*/
1339	op->map = get_map_from_coord (m, &op->x, &op->y);	1215	if (!xy_normalise (m, op->x, op->y))
1340	x = op->x;	1216	return 0;
1341	y = op->y;	1217
		1218	op->map = m;
		1219	mapspace &ms = op->ms ();
1342		1220
1343	/* this has to be done after we translate the coordinates.	1221	/* this has to be done after we translate the coordinates.
1344	*/	1222	*/
1345	if (op->nrof && !(flag & INS_NO_MERGE))	1223	if (op->nrof && !(flag & INS_NO_MERGE))
1346	for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)	1224	for (tmp = ms.bot; tmp; tmp = tmp->above)
1347	if (object::can_merge (op, tmp))	1225	if (object::can_merge (op, tmp))
1348	{	1226	{
1349	op->nrof += tmp->nrof;	1227	op->nrof += tmp->nrof;
1350	tmp->destroy ();	1228	tmp->destroy ();
1351	}	1229	}
…		…
1368	op->below = originator->below;	1246	op->below = originator->below;
1369		1247
1370	if (op->below)	1248	if (op->below)
1371	op->below->above = op;	1249	op->below->above = op;
1372	else	1250	else
1373	SET_MAP_OB (op->map, op->x, op->y, op);	1251	ms.bot = op;
1374		1252
1375	/* since *below* originator, no need to update top */	1253	/* since *below* originator, no need to update top */
1376	originator->below = op;	1254	originator->below = op;
1377	}	1255	}
1378	else	1256	else
1379	{	1257	{
		1258	top = ms.bot;
		1259
1380	/* If there are other objects, then */	1260	/* If there are other objects, then */
1381	if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL))	1261	if ((!(flag & INS_MAP_LOAD)) && top)
1382	{	1262	{
1383	object *last = NULL;	1263	object *last = 0;
1384		1264
1385	/*	1265	/*
1386	* If there are multiple objects on this space, we do some trickier handling.	1266	* If there are multiple objects on this space, we do some trickier handling.
1387	* We've already dealt with merging if appropriate.	1267	* We've already dealt with merging if appropriate.
1388	* Generally, we want to put the new object on top. But if	1268	* Generally, we want to put the new object on top. But if
…		…
1392	* once we get to them. This reduces the need to traverse over all of	1272	* once we get to them. This reduces the need to traverse over all of
1393	* them when adding another one - this saves quite a bit of cpu time	1273	* them when adding another one - this saves quite a bit of cpu time
1394	* when lots of spells are cast in one area. Currently, it is presumed	1274	* when lots of spells are cast in one area. Currently, it is presumed
1395	* that flying non pickable objects are spell objects.	1275	* that flying non pickable objects are spell objects.
1396	*/	1276	*/
1397		1277	for (top = ms.bot; top; top = top->above)
1398	while (top != NULL)
1399	{	1278	{
1400	if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))	1279	if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))
1401	floor = top;	1280	floor = top;
1402		1281
1403	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))	1282	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))
…		…
1406	top = top->below;	1285	top = top->below;
1407	break;	1286	break;
1408	}	1287	}
1409		1288
1410	last = top;	1289	last = top;
1411	top = top->above;
1412	}	1290	}
1413		1291
1414	/* Don't want top to be NULL, so set it to the last valid object */	1292	/* Don't want top to be NULL, so set it to the last valid object */
1415	top = last;	1293	top = last;
1416		1294
…		…
1418	* looks like instead of lots of conditions here.	1296	* looks like instead of lots of conditions here.
1419	* makes things faster, and effectively the same result.	1297	* makes things faster, and effectively the same result.
1420	*/	1298	*/
1421		1299
1422	/* Have object 'fall below' other objects that block view.	1300	/* Have object 'fall below' other objects that block view.
1423	* Unless those objects are exits, type 66	1301	* Unless those objects are exits.
1424	* If INS_ON_TOP is used, don't do this processing	1302	* If INS_ON_TOP is used, don't do this processing
1425	* Need to find the object that in fact blocks view, otherwise	1303	* Need to find the object that in fact blocks view, otherwise
1426	* stacking is a bit odd.	1304	* stacking is a bit odd.
1427	*/	1305	*/
1428	if (!(flag & INS_ON_TOP) &&	1306	if (!(flag & INS_ON_TOP)
1429	(get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_BLOCKSVIEW) && (op->face && !op->face->visibility))	1307	&& ms.flags () & P_BLOCKSVIEW
		1308	&& (op->face && !faces [op->face].visibility))
1430	{	1309	{
1431	for (last = top; last != floor; last = last->below)	1310	for (last = top; last != floor; last = last->below)
1432	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1311	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1433	break;	1312	break;
		1313
1434	/* Check to see if we found the object that blocks view,	1314	/* Check to see if we found the object that blocks view,
1435	* and make sure we have a below pointer for it so that	1315	* and make sure we have a below pointer for it so that
1436	* we can get inserted below this one, which requires we	1316	* we can get inserted below this one, which requires we
1437	* set top to the object below us.	1317	* set top to the object below us.
1438	*/	1318	*/
…		…
1440	top = last->below;	1320	top = last->below;
1441	}	1321	}
1442	} /* If objects on this space */	1322	} /* If objects on this space */
1443		1323
1444	if (flag & INS_MAP_LOAD)	1324	if (flag & INS_MAP_LOAD)
1445	top = GET_MAP_TOP (op->map, op->x, op->y);	1325	top = ms.top;
1446		1326
1447	if (flag & INS_ABOVE_FLOOR_ONLY)	1327	if (flag & INS_ABOVE_FLOOR_ONLY)
1448	top = floor;	1328	top = floor;
1449		1329
1450	/* Top is the object that our object (op) is going to get inserted above.	1330	/* Top is the object that our object (op) is going to get inserted above.
1451	*/	1331	*/
1452		1332
1453	/* First object on this space */	1333	/* First object on this space */
1454	if (!top)	1334	if (!top)
1455	{	1335	{
1456	op->above = GET_MAP_OB (op->map, op->x, op->y);	1336	op->above = ms.bot;
1457		1337
1458	if (op->above)	1338	if (op->above)
1459	op->above->below = op;	1339	op->above->below = op;
1460		1340
1461	op->below = NULL;	1341	op->below = 0;
1462	SET_MAP_OB (op->map, op->x, op->y, op);	1342	ms.bot = op;
1463	}	1343	}
1464	else	1344	else
1465	{ /* get inserted into the stack above top */	1345	{ /* get inserted into the stack above top */
1466	op->above = top->above;	1346	op->above = top->above;
1467		1347
…		…
1470		1350
1471	op->below = top;	1351	op->below = top;
1472	top->above = op;	1352	top->above = op;
1473	}	1353	}
1474		1354
1475	if (op->above == NULL)	1355	if (!op->above)
1476	SET_MAP_TOP (op->map, op->x, op->y, op);	1356	ms.top = op;
1477	} /* else not INS_BELOW_ORIGINATOR */	1357	} /* else not INS_BELOW_ORIGINATOR */
1478		1358
1479	if (op->type == PLAYER)	1359	if (op->type == PLAYER)
		1360	{
1480	op->contr->do_los = 1;	1361	op->contr->do_los = 1;
		1362	++op->map->players;
		1363	op->map->touch ();
		1364	}
		1365
		1366	op->map->dirty = true;
1481		1367
1482	/* If we have a floor, we know the player, if any, will be above	1368	/* If we have a floor, we know the player, if any, will be above
1483	* it, so save a few ticks and start from there.	1369	* it, so save a few ticks and start from there.
1484	*/	1370	*/
1485	if (!(flag & INS_MAP_LOAD))	1371	if (!(flag & INS_MAP_LOAD))
1486	for (tmp = floor ? floor : GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1372	if (object *pl = ms.player ())
1487	if (tmp->type == PLAYER)	1373	if (pl->contr->ns)
1488	tmp->contr->socket->floorbox_update ();	1374	pl->contr->ns->floorbox_update ();
1489		1375
1490	/* If this object glows, it may affect lighting conditions that are	1376	/* If this object glows, it may affect lighting conditions that are
1491	* visible to others on this map. But update_all_los is really	1377	* visible to others on this map. But update_all_los is really
1492	* an inefficient way to do this, as it means los for all players	1378	* an inefficient way to do this, as it means los for all players
1493	* on the map will get recalculated. The players could very well	1379	* on the map will get recalculated. The players could very well
1494	* be far away from this change and not affected in any way -	1380	* be far away from this change and not affected in any way -
1495	* this should get redone to only look for players within range,	1381	* this should get redone to only look for players within range,
1496	* or just updating the P_NEED_UPDATE for spaces within this area	1382	* or just updating the P_UPTODATE for spaces within this area
1497	* of effect may be sufficient.	1383	* of effect may be sufficient.
1498	*/	1384	*/
1499	if (MAP_DARKNESS (op->map) && (op->glow_radius != 0))	1385	if (op->map->darkness && (op->glow_radius != 0))
1500	update_all_los (op->map, op->x, op->y);	1386	update_all_los (op->map, op->x, op->y);
1501		1387
1502	/* updates flags (blocked, alive, no magic, etc) for this map space */	1388	/* updates flags (blocked, alive, no magic, etc) for this map space */
1503	update_object (op, UP_OBJ_INSERT);	1389	update_object (op, UP_OBJ_INSERT);
		1390
		1391	INVOKE_OBJECT (INSERT, op);
1504		1392
1505	/* Don't know if moving this to the end will break anything. However,	1393	/* Don't know if moving this to the end will break anything. However,
1506	* we want to have floorbox_update called before calling this.	1394	* we want to have floorbox_update called before calling this.
1507	*	1395	*
1508	* check_move_on() must be after this because code called from	1396	* check_move_on() must be after this because code called from
…		…
1513		1401
1514	/* if this is not the head or flag has been passed, don't check walk on status */	1402	/* if this is not the head or flag has been passed, don't check walk on status */
1515	if (!(flag & INS_NO_WALK_ON) && !op->head)	1403	if (!(flag & INS_NO_WALK_ON) && !op->head)
1516	{	1404	{
1517	if (check_move_on (op, originator))	1405	if (check_move_on (op, originator))
1518	return NULL;	1406	return 0;
1519		1407
1520	/* If we are a multi part object, lets work our way through the check	1408	/* If we are a multi part object, lets work our way through the check
1521	* walk on's.	1409	* walk on's.
1522	*/	1410	*/
1523	for (tmp = op->more; tmp != NULL; tmp = tmp->more)	1411	for (tmp = op->more; tmp != NULL; tmp = tmp->more)
1524	if (check_move_on (tmp, originator))	1412	if (check_move_on (tmp, originator))
1525	return NULL;	1413	return 0;
1526	}	1414	}
1527		1415
1528	return op;	1416	return op;
1529	}	1417	}
1530		1418
1531	/* this function inserts an object in the map, but if it	1419	/* this function inserts an object in the map, but if it
1532	* finds an object of its own type, it'll remove that one first.	1420	* finds an object of its own type, it'll remove that one first.
1533	* op is the object to insert it under: supplies x and the map.	1421	* op is the object to insert it under: supplies x and the map.
1534	*/	1422	*/
1535	void	1423	void
1536	replace_insert_ob_in_map (const char *arch_string, object *op)	1424	replace_insert_ob_in_map (const char *arch_string, object *op)
1537	{	1425	{
1538	object *	1426	object *tmp, *tmp1;
1539	tmp;
1540	object *
1541	tmp1;
1542		1427
1543	/* first search for itself and remove any old instances */	1428	/* first search for itself and remove any old instances */
1544		1429
1545	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1430	for (tmp = op->ms ().bot; tmp; tmp = tmp->above)
1546	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */	1431	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */
1547	tmp->destroy ();	1432	tmp->destroy ();
1548		1433
1549	tmp1 = arch_to_object (archetype::find (arch_string));	1434	tmp1 = arch_to_object (archetype::find (arch_string));
1550		1435
1551	tmp1->x = op->x;	1436	tmp1->x = op->x;
1552	tmp1->y = op->y;	1437	tmp1->y = op->y;
1553	insert_ob_in_map (tmp1, op->map, op, 0);	1438	insert_ob_in_map (tmp1, op->map, op, 0);
		1439	}
		1440
		1441	object *
		1442	object::insert_at (object *where, object *originator, int flags)
		1443	{
		1444	return where->map->insert (this, where->x, where->y, originator, flags);
1554	}	1445	}
1555		1446
1556	/*	1447	/*
1557	* get_split_ob(ob,nr) splits up ob into two parts. The part which	1448	* get_split_ob(ob,nr) splits up ob into two parts. The part which
1558	* is returned contains nr objects, and the remaining parts contains	1449	* is returned contains nr objects, and the remaining parts contains
1559	* the rest (or is removed and freed if that number is 0).	1450	* the rest (or is removed and freed if that number is 0).
1560	* On failure, NULL is returned, and the reason put into the	1451	* On failure, NULL is returned, and the reason put into the
1561	* global static errmsg array.	1452	* global static errmsg array.
1562	*/	1453	*/
1563
1564	object *	1454	object *
1565	get_split_ob (object *orig_ob, uint32 nr)	1455	get_split_ob (object *orig_ob, uint32 nr)
1566	{	1456	{
1567	object *newob;	1457	object *newob;
1568	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);	1458	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
…		…
1599	* the amount of an object. If the amount reaches 0, the object	1489	* the amount of an object. If the amount reaches 0, the object
1600	* is subsequently removed and freed.	1490	* is subsequently removed and freed.
1601	*	1491	*
1602	* Return value: 'op' if something is left, NULL if the amount reached 0	1492	* Return value: 'op' if something is left, NULL if the amount reached 0
1603	*/	1493	*/
1604
1605	object *	1494	object *
1606	decrease_ob_nr (object *op, uint32 i)	1495	decrease_ob_nr (object *op, uint32 i)
1607	{	1496	{
1608	object *tmp;	1497	object *tmp;
1609	player *pl;
1610		1498
1611	if (i == 0) /* objects with op->nrof require this check */	1499	if (i == 0) /* objects with op->nrof require this check */
1612	return op;	1500	return op;
1613		1501
1614	if (i > op->nrof)	1502	if (i > op->nrof)
…		…
1619	else if (op->env)	1507	else if (op->env)
1620	{	1508	{
1621	/* is this object in the players inventory, or sub container	1509	/* is this object in the players inventory, or sub container
1622	* therein?	1510	* therein?
1623	*/	1511	*/
1624	tmp = is_player_inv (op->env);	1512	tmp = op->in_player ();
1625	/* nope. Is this a container the player has opened?	1513	/* nope. Is this a container the player has opened?
1626	* If so, set tmp to that player.	1514	* If so, set tmp to that player.
1627	* IMO, searching through all the players will mostly	1515	* IMO, searching through all the players will mostly
1628	* likely be quicker than following op->env to the map,	1516	* likely be quicker than following op->env to the map,
1629	* and then searching the map for a player.	1517	* and then searching the map for a player.
1630	*/	1518	*/
1631	if (!tmp)	1519	if (!tmp)
1632	{	1520	for_all_players (pl)
1633	for (pl = first_player; pl; pl = pl->next)
1634	if (pl->ob->container == op->env)	1521	if (pl->ob->container == op->env)
1635	{	1522	{
1636	tmp = pl->ob;	1523	tmp = pl->ob;
1637	break;	1524	break;
1638	}	1525	}
1639	}
1640		1526
1641	if (i < op->nrof)	1527	if (i < op->nrof)
1642	{	1528	{
1643	sub_weight (op->env, op->weight * i);	1529	sub_weight (op->env, op->weight * i);
1644	op->nrof -= i;	1530	op->nrof -= i;
…		…
1687		1573
1688	/*	1574	/*
1689	* add_weight(object, weight) adds the specified weight to an object,	1575	* add_weight(object, weight) adds the specified weight to an object,
1690	* and also updates how much the environment(s) is/are carrying.	1576	* and also updates how much the environment(s) is/are carrying.
1691	*/	1577	*/
1692
1693	void	1578	void
1694	add_weight (object *op, signed long weight)	1579	add_weight (object *op, signed long weight)
1695	{	1580	{
1696	while (op != NULL)	1581	while (op != NULL)
1697	{	1582	{
…		…
1729	* inside the object environment.	1614	* inside the object environment.
1730	*	1615	*
1731	* The function returns now pointer to inserted item, and return value can	1616	* The function returns now pointer to inserted item, and return value can
1732	* be != op, if items are merged. -Tero	1617	* be != op, if items are merged. -Tero
1733	*/	1618	*/
1734
1735	object *	1619	object *
1736	object::insert (object *op)	1620	object::insert (object *op)
1737	{	1621	{
1738	object *tmp, *otmp;	1622	object *tmp, *otmp;
1739		1623
…		…
1777	add_weight (this, op->weight * op->nrof);	1661	add_weight (this, op->weight * op->nrof);
1778	}	1662	}
1779	else	1663	else
1780	add_weight (this, (op->weight + op->carrying));	1664	add_weight (this, (op->weight + op->carrying));
1781		1665
1782	otmp = is_player_inv (this);	1666	otmp = this->in_player ();
1783	if (otmp && otmp->contr)	1667	if (otmp && otmp->contr)
1784	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1668	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1785	fix_player (otmp);	1669	otmp->update_stats ();
1786		1670
1787	op->map = NULL;	1671	op->map = 0;
1788	op->env = this;	1672	op->env = this;
1789	op->above = NULL;	1673	op->above = 0;
1790	op->below = NULL;	1674	op->below = 0;
1791	op->x = 0, op->y = 0;	1675	op->x = 0, op->y = 0;
1792		1676
1793	/* reset the light list and los of the players on the map */	1677	/* reset the light list and los of the players on the map */
1794	if ((op->glow_radius != 0) && map)	1678	if ((op->glow_radius != 0) && map)
1795	{	1679	{
1796	#ifdef DEBUG_LIGHTS	1680	#ifdef DEBUG_LIGHTS
1797	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);	1681	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1798	#endif /* DEBUG_LIGHTS */	1682	#endif /* DEBUG_LIGHTS */
1799	if (MAP_DARKNESS (map))	1683	if (map->darkness)
1800	update_all_los (map, x, y);	1684	update_all_los (map, x, y);
1801	}	1685	}
1802		1686
1803	/* Client has no idea of ordering so lets not bother ordering it here.	1687	/* Client has no idea of ordering so lets not bother ordering it here.
1804	* It sure simplifies this function...	1688	* It sure simplifies this function...
…		…
1809	{	1693	{
1810	op->below = inv;	1694	op->below = inv;
1811	op->below->above = op;	1695	op->below->above = op;
1812	inv = op;	1696	inv = op;
1813	}	1697	}
		1698
		1699	INVOKE_OBJECT (INSERT, this);
1814		1700
1815	return op;	1701	return op;
1816	}	1702	}
1817		1703
1818	/*	1704	/*
…		…
1833	*	1719	*
1834	* MSW 2001-07-08: Check all objects on space, not just those below	1720	* MSW 2001-07-08: Check all objects on space, not just those below
1835	* object being inserted. insert_ob_in_map may not put new objects	1721	* object being inserted. insert_ob_in_map may not put new objects
1836	* on top.	1722	* on top.
1837	*/	1723	*/
1838
1839	int	1724	int
1840	check_move_on (object *op, object *originator)	1725	check_move_on (object *op, object *originator)
1841	{	1726	{
1842	object *tmp;	1727	object *tmp;
1843	maptile *m = op->map;	1728	maptile *m = op->map;
…		…
1870		1755
1871	/* The objects have to be checked from top to bottom.	1756	/* The objects have to be checked from top to bottom.
1872	* Hence, we first go to the top:	1757	* Hence, we first go to the top:
1873	*/	1758	*/
1874		1759
1875	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL && tmp->above != NULL; tmp = tmp->above)	1760	for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above)
1876	{	1761	{
1877	/* Trim the search when we find the first other spell effect	1762	/* Trim the search when we find the first other spell effect
1878	* this helps performance so that if a space has 50 spell objects,	1763	* this helps performance so that if a space has 50 spell objects,
1879	* we don't need to check all of them.	1764	* we don't need to check all of them.
1880	*/	1765	*/
…		…
1898	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||	1783	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
1899	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))	1784	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1900	{	1785	{
1901		1786
1902	float	1787	float
1903	diff = tmp->move_slow_penalty * FABS (op->speed);	1788	diff = tmp->move_slow_penalty * fabs (op->speed);
1904		1789
1905	if (op->type == PLAYER)	1790	if (op->type == PLAYER)
1906	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||	1791	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||
1907	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))	1792	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))
1908	diff /= 4.0;	1793	diff /= 4.0;
…		…
1935	/*	1820	/*
1936	* present_arch(arch, map, x, y) searches for any objects with	1821	* present_arch(arch, map, x, y) searches for any objects with
1937	* a matching archetype at the given map and coordinates.	1822	* a matching archetype at the given map and coordinates.
1938	* The first matching object is returned, or NULL if none.	1823	* The first matching object is returned, or NULL if none.
1939	*/	1824	*/
1940
1941	object *	1825	object *
1942	present_arch (const archetype *at, maptile *m, int x, int y)	1826	present_arch (const archetype *at, maptile *m, int x, int y)
1943	{	1827	{
1944	object *
1945	tmp;
1946
1947	if (m == NULL || out_of_map (m, x, y))	1828	if (!m || out_of_map (m, x, y))
1948	{	1829	{
1949	LOG (llevError, "Present_arch called outside map.\n");	1830	LOG (llevError, "Present_arch called outside map.\n");
1950	return NULL;	1831	return NULL;
1951	}	1832	}
1952	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1833
		1834	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1953	if (tmp->arch == at)	1835	if (tmp->arch == at)
1954	return tmp;	1836	return tmp;
		1837
1955	return NULL;	1838	return NULL;
1956	}	1839	}
1957		1840
1958	/*	1841	/*
1959	* present(type, map, x, y) searches for any objects with	1842	* present(type, map, x, y) searches for any objects with
1960	* a matching type variable at the given map and coordinates.	1843	* a matching type variable at the given map and coordinates.
1961	* The first matching object is returned, or NULL if none.	1844	* The first matching object is returned, or NULL if none.
1962	*/	1845	*/
1963
1964	object *	1846	object *
1965	present (unsigned char type, maptile *m, int x, int y)	1847	present (unsigned char type, maptile *m, int x, int y)
1966	{	1848	{
1967	object *
1968	tmp;
1969
1970	if (out_of_map (m, x, y))	1849	if (out_of_map (m, x, y))
1971	{	1850	{
1972	LOG (llevError, "Present called outside map.\n");	1851	LOG (llevError, "Present called outside map.\n");
1973	return NULL;	1852	return NULL;
1974	}	1853	}
1975	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1854
		1855	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1976	if (tmp->type == type)	1856	if (tmp->type == type)
1977	return tmp;	1857	return tmp;
		1858
1978	return NULL;	1859	return NULL;
1979	}	1860	}
1980		1861
1981	/*	1862	/*
1982	* present_in_ob(type, object) searches for any objects with	1863	* present_in_ob(type, object) searches for any objects with
1983	* a matching type variable in the inventory of the given object.	1864	* a matching type variable in the inventory of the given object.
1984	* The first matching object is returned, or NULL if none.	1865	* The first matching object is returned, or NULL if none.
1985	*/	1866	*/
1986
1987	object *	1867	object *
1988	present_in_ob (unsigned char type, const object *op)	1868	present_in_ob (unsigned char type, const object *op)
1989	{	1869	{
1990	object *
1991	tmp;
1992
1993	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1870	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
1994	if (tmp->type == type)	1871	if (tmp->type == type)
1995	return tmp;	1872	return tmp;
		1873
1996	return NULL;	1874	return NULL;
1997	}	1875	}
1998		1876
1999	/*	1877	/*
2000	* present_in_ob (type, str, object) searches for any objects with	1878	* present_in_ob (type, str, object) searches for any objects with
…		…
2008	* str is the string to match against. Note that we match against	1886	* str is the string to match against. Note that we match against
2009	* the object name, not the archetype name. this is so that the	1887	* the object name, not the archetype name. this is so that the
2010	* spell code can use one object type (force), but change it's name	1888	* spell code can use one object type (force), but change it's name
2011	* to be unique.	1889	* to be unique.
2012	*/	1890	*/
2013
2014	object *	1891	object *
2015	present_in_ob_by_name (int type, const char *str, const object *op)	1892	present_in_ob_by_name (int type, const char *str, const object *op)
2016	{	1893	{
2017	object *
2018	tmp;
2019
2020	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1894	for (object *tmp = op->inv; tmp; tmp = tmp->below)
2021	{
2022	if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name)))	1895	if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name)))
2023	return tmp;	1896	return tmp;
2024	}	1897
2025	return NULL;	1898	return 0;
2026	}	1899	}
2027		1900
2028	/*	1901	/*
2029	* present_arch_in_ob(archetype, object) searches for any objects with	1902	* present_arch_in_ob(archetype, object) searches for any objects with
2030	* a matching archetype in the inventory of the given object.	1903	* a matching archetype in the inventory of the given object.
2031	* The first matching object is returned, or NULL if none.	1904	* The first matching object is returned, or NULL if none.
2032	*/	1905	*/
2033
2034	object *	1906	object *
2035	present_arch_in_ob (const archetype *at, const object *op)	1907	present_arch_in_ob (const archetype *at, const object *op)
2036	{	1908	{
2037	object *
2038	tmp;
2039
2040	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1909	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2041	if (tmp->arch == at)	1910	if (tmp->arch == at)
2042	return tmp;	1911	return tmp;
		1912
2043	return NULL;	1913	return NULL;
2044	}	1914	}
2045		1915
2046	/*	1916	/*
2047	* activate recursively a flag on an object inventory	1917	* activate recursively a flag on an object inventory
2048	*/	1918	*/
2049	void	1919	void
2050	flag_inv (object *op, int flag)	1920	flag_inv (object *op, int flag)
2051	{	1921	{
2052	object *
2053	tmp;
2054
2055	if (op->inv)	1922	if (op->inv)
2056	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1923	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2057	{	1924	{
2058	SET_FLAG (tmp, flag);	1925	SET_FLAG (tmp, flag);
2059	flag_inv (tmp, flag);	1926	flag_inv (tmp, flag);
2060	}	1927	}
2061	} /*	1928	}
		1929
		1930	/*
2062	* desactivate recursively a flag on an object inventory	1931	* deactivate recursively a flag on an object inventory
2063	*/	1932	*/
2064	void	1933	void
2065	unflag_inv (object *op, int flag)	1934	unflag_inv (object *op, int flag)
2066	{	1935	{
2067	object *
2068	tmp;
2069
2070	if (op->inv)	1936	if (op->inv)
2071	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1937	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2072	{	1938	{
2073	CLEAR_FLAG (tmp, flag);	1939	CLEAR_FLAG (tmp, flag);
2074	unflag_inv (tmp, flag);	1940	unflag_inv (tmp, flag);
2075	}	1941	}
2076	}	1942	}
…		…
2079	* set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in	1945	* set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in
2080	* all it's inventory (recursively).	1946	* all it's inventory (recursively).
2081	* If checksums are used, a player will get set_cheat called for	1947	* If checksums are used, a player will get set_cheat called for
2082	* him/her-self and all object carried by a call to this function.	1948	* him/her-self and all object carried by a call to this function.
2083	*/	1949	*/
2084
2085	void	1950	void
2086	set_cheat (object *op)	1951	set_cheat (object *op)
2087	{	1952	{
2088	SET_FLAG (op, FLAG_WAS_WIZ);	1953	SET_FLAG (op, FLAG_WAS_WIZ);
2089	flag_inv (op, FLAG_WAS_WIZ);	1954	flag_inv (op, FLAG_WAS_WIZ);
…		…
2108	* because arch_blocked (now ob_blocked) needs to know the movement type	1973	* because arch_blocked (now ob_blocked) needs to know the movement type
2109	* to know if the space in question will block the object. We can't use	1974	* to know if the space in question will block the object. We can't use
2110	* the archetype because that isn't correct if the monster has been	1975	* the archetype because that isn't correct if the monster has been
2111	* customized, changed states, etc.	1976	* customized, changed states, etc.
2112	*/	1977	*/
2113
2114	int	1978	int
2115	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)	1979	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2116	{	1980	{
2117	int
2118	i,
2119	index = 0, flag;	1981	int index = 0, flag;
2120	static int
2121	altern[SIZEOFFREE];	1982	int altern[SIZEOFFREE];
2122		1983
2123	for (i = start; i < stop; i++)	1984	for (int i = start; i < stop; i++)
2124	{	1985	{
2125	flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]);	1986	flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]);
2126	if (!flag)	1987	if (!flag)
2127	altern[index++] = i;	1988	altern [index++] = i;
2128		1989
2129	/* Basically, if we find a wall on a space, we cut down the search size.	1990	/* Basically, if we find a wall on a space, we cut down the search size.
2130	* In this way, we won't return spaces that are on another side of a wall.	1991	* In this way, we won't return spaces that are on another side of a wall.
2131	* This mostly work, but it cuts down the search size in all directions -	1992	* This mostly work, but it cuts down the search size in all directions -
2132	* if the space being examined only has a wall to the north and empty	1993	* if the space being examined only has a wall to the north and empty
2133	* spaces in all the other directions, this will reduce the search space	1994	* spaces in all the other directions, this will reduce the search space
2134	* to only the spaces immediately surrounding the target area, and	1995	* to only the spaces immediately surrounding the target area, and
2135	* won't look 2 spaces south of the target space.	1996	* won't look 2 spaces south of the target space.
2136	*/	1997	*/
2137	else if ((flag & AB_NO_PASS) && maxfree[i] < stop)	1998	else if ((flag & P_NO_PASS) && maxfree[i] < stop)
2138	stop = maxfree[i];	1999	stop = maxfree[i];
2139	}	2000	}
		2001
2140	if (!index)	2002	if (!index)
2141	return -1;	2003	return -1;
		2004
2142	return altern[RANDOM () % index];	2005	return altern [rndm (index)];
2143	}	2006	}
2144		2007
2145	/*	2008	/*
2146	* find_first_free_spot(archetype, maptile, x, y) works like	2009	* find_first_free_spot(archetype, maptile, x, y) works like
2147	* find_free_spot(), but it will search max number of squares.	2010	* find_free_spot(), but it will search max number of squares.
2148	* But it will return the first available spot, not a random choice.	2011	* But it will return the first available spot, not a random choice.
2149	* Changed 0.93.2: Have it return -1 if there is no free spot available.	2012	* Changed 0.93.2: Have it return -1 if there is no free spot available.
2150	*/	2013	*/
2151
2152	int	2014	int
2153	find_first_free_spot (const object *ob, maptile *m, int x, int y)	2015	find_first_free_spot (const object *ob, maptile *m, int x, int y)
2154	{	2016	{
2155	int
2156	i;
2157
2158	for (i = 0; i < SIZEOFFREE; i++)	2017	for (int i = 0; i < SIZEOFFREE; i++)
2159	{
2160	if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]))	2018	if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]))
2161	return i;	2019	return i;
2162	}	2020
2163	return -1;	2021	return -1;
2164	}	2022	}
2165		2023
2166	/*	2024	/*
2167	* The function permute(arr, begin, end) randomly reorders the array	2025	* The function permute(arr, begin, end) randomly reorders the array
2168	* arr[begin..end-1].	2026	* arr[begin..end-1].
		2027	* now uses a fisher-yates shuffle, old permute was broken
2169	*/	2028	*/
2170	static void	2029	static void
2171	permute (int *arr, int begin, int end)	2030	permute (int *arr, int begin, int end)
2172	{	2031	{
2173	int	2032	arr += begin;
2174	i,
2175	j,
2176	tmp,
2177	len;
2178
2179	len = end - begin;	2033	end -= begin;
2180	for (i = begin; i < end; i++)
2181	{
2182	j = begin + RANDOM () % len;
2183		2034
2184	tmp = arr[i];	2035	while (--end)
2185	arr[i] = arr[j];	2036	swap (arr [end], arr [rndm (end + 1)]);
2186	arr[j] = tmp;
2187	}
2188	}	2037	}
2189		2038
2190	/* new function to make monster searching more efficient, and effective!	2039	/* new function to make monster searching more efficient, and effective!
2191	* This basically returns a randomized array (in the passed pointer) of	2040	* This basically returns a randomized array (in the passed pointer) of
2192	* the spaces to find monsters. In this way, it won't always look for	2041	* the spaces to find monsters. In this way, it won't always look for
…		…
2195	* the 3x3 area will be searched, just not in a predictable order.	2044	* the 3x3 area will be searched, just not in a predictable order.
2196	*/	2045	*/
2197	void	2046	void
2198	get_search_arr (int *search_arr)	2047	get_search_arr (int *search_arr)
2199	{	2048	{
2200	int	2049	int i;
2201	i;
2202		2050
2203	for (i = 0; i < SIZEOFFREE; i++)	2051	for (i = 0; i < SIZEOFFREE; i++)
2204	{
2205	search_arr[i] = i;	2052	search_arr[i] = i;
2206	}
2207		2053
2208	permute (search_arr, 1, SIZEOFFREE1 + 1);	2054	permute (search_arr, 1, SIZEOFFREE1 + 1);
2209	permute (search_arr, SIZEOFFREE1 + 1, SIZEOFFREE2 + 1);	2055	permute (search_arr, SIZEOFFREE1 + 1, SIZEOFFREE2 + 1);
2210	permute (search_arr, SIZEOFFREE2 + 1, SIZEOFFREE);	2056	permute (search_arr, SIZEOFFREE2 + 1, SIZEOFFREE);
2211	}	2057	}
…		…
2220	* Perhaps incorrectly, but I'm making the assumption that exclude	2066	* Perhaps incorrectly, but I'm making the assumption that exclude
2221	* is actually want is going to try and move there. We need this info	2067	* is actually want is going to try and move there. We need this info
2222	* because we have to know what movement the thing looking to move	2068	* because we have to know what movement the thing looking to move
2223	* there is capable of.	2069	* there is capable of.
2224	*/	2070	*/
2225
2226	int	2071	int
2227	find_dir (maptile *m, int x, int y, object *exclude)	2072	find_dir (maptile *m, int x, int y, object *exclude)
2228	{	2073	{
2229	int
2230	i,
2231	max = SIZEOFFREE, mflags;	2074	int i, max = SIZEOFFREE, mflags;
2232		2075
2233	sint16 nx, ny;	2076	sint16 nx, ny;
2234	object *	2077	object *tmp;
2235	tmp;
2236	maptile *	2078	maptile *mp;
2237	mp;
2238		2079
2239	MoveType blocked, move_type;	2080	MoveType blocked, move_type;
2240		2081
2241	if (exclude && exclude->head)	2082	if (exclude && exclude->head)
2242	{	2083	{
…		…
2254	mp = m;	2095	mp = m;
2255	nx = x + freearr_x[i];	2096	nx = x + freearr_x[i];
2256	ny = y + freearr_y[i];	2097	ny = y + freearr_y[i];
2257		2098
2258	mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);	2099	mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);
		2100
2259	if (mflags & P_OUT_OF_MAP)	2101	if (mflags & P_OUT_OF_MAP)
2260	{
2261	max = maxfree[i];	2102	max = maxfree[i];
2262	}
2263	else	2103	else
2264	{	2104	{
2265	blocked = GET_MAP_MOVE_BLOCK (mp, nx, ny);	2105	mapspace &ms = mp->at (nx, ny);
		2106
		2107	blocked = ms.move_block;
2266		2108
2267	if ((move_type & blocked) == move_type)	2109	if ((move_type & blocked) == move_type)
2268	{
2269	max = maxfree[i];	2110	max = maxfree[i];
2270	}
2271	else if (mflags & P_IS_ALIVE)	2111	else if (mflags & P_IS_ALIVE)
2272	{	2112	{
2273	for (tmp = GET_MAP_OB (mp, nx, ny); tmp != NULL; tmp = tmp->above)	2113	for (tmp = ms.bot; tmp; tmp = tmp->above)
2274	{	2114	if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)
2275	if ((QUERY_FLAG (tmp, FLAG_MONSTER) || tmp->type == PLAYER) && (tmp != exclude || (tmp->head && tmp->head != exclude)))	2115	&& (tmp != exclude || (tmp->head && tmp->head != exclude)))
2276	{
2277	break;	2116	break;
2278	}	2117
2279	}
2280	if (tmp)	2118	if (tmp)
2281	{
2282	return freedir[i];	2119	return freedir[i];
2283	}
2284	}	2120	}
2285	}	2121	}
2286	}	2122	}
		2123
2287	return 0;	2124	return 0;
2288	}	2125	}
2289		2126
2290	/*	2127	/*
2291	* distance(object 1, object 2) will return the square of the	2128	* distance(object 1, object 2) will return the square of the
2292	* distance between the two given objects.	2129	* distance between the two given objects.
2293	*/	2130	*/
2294
2295	int	2131	int
2296	distance (const object *ob1, const object *ob2)	2132	distance (const object *ob1, const object *ob2)
2297	{	2133	{
2298	int
2299	i;
2300
2301	i = (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);	2134	return (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);
2302	return i;
2303	}	2135	}
2304		2136
2305	/*	2137	/*
2306	* find_dir_2(delta-x,delta-y) will return a direction in which	2138	* find_dir_2(delta-x,delta-y) will return a direction in which
2307	* an object which has subtracted the x and y coordinates of another	2139	* an object which has subtracted the x and y coordinates of another
2308	* object, needs to travel toward it.	2140	* object, needs to travel toward it.
2309	*/	2141	*/
2310
2311	int	2142	int
2312	find_dir_2 (int x, int y)	2143	find_dir_2 (int x, int y)
2313	{	2144	{
2314	int	2145	int q;
2315	q;
2316		2146
2317	if (y)	2147	if (y)
2318	q = x * 100 / y;	2148	q = x * 100 / y;
2319	else if (x)	2149	else if (x)
2320	q = -300 * x;	2150	q = -300 * x;
…		…
2345		2175
2346	return 3;	2176	return 3;
2347	}	2177	}
2348		2178
2349	/*	2179	/*
2350	* absdir(int): Returns a number between 1 and 8, which represent
2351	* the "absolute" direction of a number (it actually takes care of
2352	* "overflow" in previous calculations of a direction).
2353	*/
2354
2355	int
2356	absdir (int d)
2357	{
2358	while (d < 1)
2359	d += 8;
2360	while (d > 8)
2361	d -= 8;
2362	return d;
2363	}
2364
2365	/*
2366	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is	2180	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is
2367	* between two directions (which are expected to be absolute (see absdir())	2181	* between two directions (which are expected to be absolute (see absdir())
2368	*/	2182	*/
2369
2370	int	2183	int
2371	dirdiff (int dir1, int dir2)	2184	dirdiff (int dir1, int dir2)
2372	{	2185	{
2373	int	2186	int d;
2374	d;
2375		2187
2376	d = abs (dir1 - dir2);	2188	d = abs (dir1 - dir2);
2377	if (d > 4)	2189	if (d > 4)
2378	d = 8 - d;	2190	d = 8 - d;
		2191
2379	return d;	2192	return d;
2380	}	2193	}
2381		2194
2382	/* peterm:	2195	/* peterm:
2383	* do LOS stuff for ball lightning. Go after the closest VISIBLE monster.	2196	* do LOS stuff for ball lightning. Go after the closest VISIBLE monster.
…		…
2386	* This basically means that if direction is 15, then it could either go	2199	* This basically means that if direction is 15, then it could either go
2387	* direction 4, 14, or 16 to get back to where we are.	2200	* direction 4, 14, or 16 to get back to where we are.
2388	* Moved from spell_util.c to object.c with the other related direction	2201	* Moved from spell_util.c to object.c with the other related direction
2389	* functions.	2202	* functions.
2390	*/	2203	*/
2391
2392	int
2393	reduction_dir[SIZEOFFREE][3] = {	2204	int reduction_dir[SIZEOFFREE][3] = {
2394	{0, 0, 0}, /* 0 */	2205	{0, 0, 0}, /* 0 */
2395	{0, 0, 0}, /* 1 */	2206	{0, 0, 0}, /* 1 */
2396	{0, 0, 0}, /* 2 */	2207	{0, 0, 0}, /* 2 */
2397	{0, 0, 0}, /* 3 */	2208	{0, 0, 0}, /* 3 */
2398	{0, 0, 0}, /* 4 */	2209	{0, 0, 0}, /* 4 */
…		…
2446	* find a path to that monster that we found. If not,	2257	* find a path to that monster that we found. If not,
2447	* we don't bother going toward it. Returns 1 if we	2258	* we don't bother going toward it. Returns 1 if we
2448	* can see a direct way to get it	2259	* can see a direct way to get it
2449	* Modified to be map tile aware -.MSW	2260	* Modified to be map tile aware -.MSW
2450	*/	2261	*/
2451
2452
2453	int	2262	int
2454	can_see_monsterP (maptile *m, int x, int y, int dir)	2263	can_see_monsterP (maptile *m, int x, int y, int dir)
2455	{	2264	{
2456	sint16 dx, dy;	2265	sint16 dx, dy;
2457	int
2458	mflags;	2266	int mflags;
2459		2267
2460	if (dir < 0)	2268	if (dir < 0)
2461	return 0; /* exit condition: invalid direction */	2269	return 0; /* exit condition: invalid direction */
2462		2270
2463	dx = x + freearr_x[dir];	2271	dx = x + freearr_x[dir];
…		…
2476	return 0;	2284	return 0;
2477		2285
2478	/* yes, can see. */	2286	/* yes, can see. */
2479	if (dir < 9)	2287	if (dir < 9)
2480	return 1;	2288	return 1;
		2289
2481	return can_see_monsterP (m, x, y, reduction_dir[dir][0]) |	2290	return can_see_monsterP (m, x, y, reduction_dir[dir][0])
2482	can_see_monsterP (m, x, y, reduction_dir[dir][1]) | can_see_monsterP (m, x, y, reduction_dir[dir][2]);	2291	| can_see_monsterP (m, x, y, reduction_dir[dir][1])
		2292	| can_see_monsterP (m, x, y, reduction_dir[dir][2]);
2483	}	2293	}
2484
2485
2486		2294
2487	/*	2295	/*
2488	* can_pick(picker, item): finds out if an object is possible to be	2296	* can_pick(picker, item): finds out if an object is possible to be
2489	* picked up by the picker. Returnes 1 if it can be	2297	* picked up by the picker. Returnes 1 if it can be
2490	* picked up, otherwise 0.	2298	* picked up, otherwise 0.
…		…
2501	return /*QUERY_FLAG(who,FLAG_WIZ)|| */	2309	return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2502	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&	2310	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
2503	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3));	2311	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3));
2504	}	2312	}
2505		2313
2506
2507	/*	2314	/*
2508	* create clone from object to another	2315	* create clone from object to another
2509	*/	2316	*/
2510	object *	2317	object *
2511	object_create_clone (object *asrc)	2318	object_create_clone (object *asrc)
…		…
2530	{	2337	{
2531	dst = tmp;	2338	dst = tmp;
2532	tmp->head = 0;	2339	tmp->head = 0;
2533	}	2340	}
2534	else	2341	else
2535	{
2536	tmp->head = dst;	2342	tmp->head = dst;
2537	}
2538		2343
2539	tmp->more = 0;	2344	tmp->more = 0;
2540		2345
2541	if (prev)	2346	if (prev)
2542	prev->more = tmp;	2347	prev->more = tmp;
…		…
2546		2351
2547	for (item = src->inv; item; item = item->below)	2352	for (item = src->inv; item; item = item->below)
2548	insert_ob_in_ob (object_create_clone (item), dst);	2353	insert_ob_in_ob (object_create_clone (item), dst);
2549		2354
2550	return dst;	2355	return dst;
2551	}
2552
2553	/* GROS - Creates an object using a string representing its content. */
2554	/* Basically, we save the content of the string to a temp file, then call */
2555	/* load_object on it. I admit it is a highly inefficient way to make things, */
2556	/* but it was simple to make and allows reusing the load_object function. */
2557	/* Remember not to use load_object_str in a time-critical situation. */
2558	/* Also remember that multiparts objects are not supported for now. */
2559
2560	object *
2561	load_object_str (const char *obstr)
2562	{
2563	object *op;
2564	char filename[MAX_BUF];
2565
2566	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2567
2568	FILE *tempfile = fopen (filename, "w");
2569
2570	if (tempfile == NULL)
2571	{
2572	LOG (llevError, "Error - Unable to access load object temp file\n");
2573	return NULL;
2574	}
2575
2576	fprintf (tempfile, obstr);
2577	fclose (tempfile);
2578
2579	op = object::create ();
2580
2581	object_thawer thawer (filename);
2582
2583	if (thawer)
2584	load_object (thawer, op, 0);
2585
2586	LOG (llevDebug, " load str completed, object=%s\n", &op->name);
2587	CLEAR_FLAG (op, FLAG_REMOVED);
2588
2589	return op;
2590	}	2356	}
2591		2357
2592	/* This returns the first object in who's inventory that	2358	/* This returns the first object in who's inventory that
2593	* has the same type and subtype match.	2359	* has the same type and subtype match.
2594	* returns NULL if no match.	2360	* returns NULL if no match.
2595	*/	2361	*/
2596	object *	2362	object *
2597	find_obj_by_type_subtype (const object *who, int type, int subtype)	2363	find_obj_by_type_subtype (const object *who, int type, int subtype)
2598	{	2364	{
2599	object *tmp;
2600
2601	for (tmp = who->inv; tmp; tmp = tmp->below)	2365	for (object *tmp = who->inv; tmp; tmp = tmp->below)
2602	if (tmp->type == type && tmp->subtype == subtype)	2366	if (tmp->type == type && tmp->subtype == subtype)
2603	return tmp;	2367	return tmp;
2604		2368
2605	return NULL;	2369	return 0;
2606	}	2370	}
2607		2371
2608	/* If ob has a field named key, return the link from the list,	2372	/* If ob has a field named key, return the link from the list,
2609	* otherwise return NULL.	2373	* otherwise return NULL.
2610	*	2374	*
…		…
2612	* do the desired thing.	2376	* do the desired thing.
2613	*/	2377	*/
2614	key_value *	2378	key_value *
2615	get_ob_key_link (const object *ob, const char *key)	2379	get_ob_key_link (const object *ob, const char *key)
2616	{	2380	{
2617	key_value *link;
2618
2619	for (link = ob->key_values; link != NULL; link = link->next)	2381	for (key_value *link = ob->key_values; link; link = link->next)
2620	if (link->key == key)	2382	if (link->key == key)
2621	return link;	2383	return link;
2622		2384
2623	return NULL;	2385	return 0;
2624	}	2386	}
2625		2387
2626	/*	2388	/*
2627	* Returns the value of op has an extra_field for key, or NULL.	2389	* Returns the value of op has an extra_field for key, or NULL.
2628	*	2390	*
…		…
2653	if (link->key == canonical_key)	2415	if (link->key == canonical_key)
2654	return link->value;	2416	return link->value;
2655		2417
2656	return 0;	2418	return 0;
2657	}	2419	}
2658
2659		2420
2660	/*	2421	/*
2661	* Updates the canonical_key in op to value.	2422	* Updates the canonical_key in op to value.
2662	*	2423	*
2663	* canonical_key is a shared string (value doesn't have to be).	2424	* canonical_key is a shared string (value doesn't have to be).
…		…
2668	* Returns TRUE on success.	2429	* Returns TRUE on success.
2669	*/	2430	*/
2670	int	2431	int
2671	set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key)	2432	set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key)
2672	{	2433	{
2673	key_value *
2674	field = NULL, *last = NULL;	2434	key_value *field = NULL, *last = NULL;
2675		2435
2676	for (field = op->key_values; field != NULL; field = field->next)	2436	for (field = op->key_values; field != NULL; field = field->next)
2677	{	2437	{
2678	if (field->key != canonical_key)	2438	if (field->key != canonical_key)
2679	{	2439	{
…		…
2707	/* IF we get here, key doesn't exist */	2467	/* IF we get here, key doesn't exist */
2708		2468
2709	/* No field, we'll have to add it. */	2469	/* No field, we'll have to add it. */
2710		2470
2711	if (!add_key)	2471	if (!add_key)
2712	{
2713	return FALSE;	2472	return FALSE;
2714	}	2473
2715	/* There isn't any good reason to store a null	2474	/* There isn't any good reason to store a null
2716	* value in the key/value list. If the archetype has	2475	* value in the key/value list. If the archetype has
2717	* this key, then we should also have it, so shouldn't	2476	* this key, then we should also have it, so shouldn't
2718	* be here. If user wants to store empty strings,	2477	* be here. If user wants to store empty strings,
2719	* should pass in ""	2478	* should pass in ""
…		…
2768	}	2527	}
2769	else	2528	else
2770	item = item->env;	2529	item = item->env;
2771	}	2530	}
2772		2531
		2532
		2533	const char *
		2534	object::flag_desc (char *desc, int len) const
		2535	{
		2536	char *p = desc;
		2537	bool first = true;
		2538
		2539	*p = 0;
		2540
		2541	for (int i = 0; i < NUM_FLAGS; i++)
		2542	{
		2543	if (len <= 10) // magic constant!
		2544	{
		2545	snprintf (p, len, ",...");
		2546	break;
		2547	}
		2548
		2549	if (flag [i])
		2550	{
		2551	int cnt = snprintf (p, len, "%s%d", first ? "" : ",", i);
		2552	len -= cnt;
		2553	p += cnt;
		2554	first = false;
		2555	}
		2556	}
		2557
		2558	return desc;
		2559	}
		2560
2773	// return a suitable string describing an objetc in enough detail to find it	2561	// return a suitable string describing an object in enough detail to find it
2774	const char *	2562	const char *
2775	object::debug_desc (char *info) const	2563	object::debug_desc (char *info) const
2776	{	2564	{
		2565	char flagdesc[512];
2777	char info2[256 * 3];	2566	char info2[256 * 4];
2778	char *p = info;	2567	char *p = info;
2779		2568
2780	p += snprintf (p, 256, "%d=\"%s%s%s\"",	2569	p += snprintf (p, 512, "{cnt:%d,uuid:<1.%" PRIx64 ">,name:\"%s\"%s%s,flags:[%s],type:%d}",
2781	count,	2570	count, uuid.seq,
2782	&name,	2571	&name,
2783	title ? " " : "",	2572	title ? "\",title:\"" : "",
2784	title ? (const char *)title : "");	2573	title ? (const char *)title : "",
		2574	flag_desc (flagdesc, 512), type);
2785		2575
2786	if (env)	2576	if (env)
2787	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2577	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2788		2578
2789	if (map)	2579	if (map)
2790	p += snprintf (p, 256, "(on %s@%d+%d)", map->path, x, y);	2580	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2791		2581
2792	return info;	2582	return info;
2793	}	2583	}
2794		2584
2795	const char *	2585	const char *
2796	object::debug_desc () const	2586	object::debug_desc () const
2797	{	2587	{
2798	static char info[256 * 3];	2588	static char info[256 * 4];
2799	return debug_desc (info);	2589	return debug_desc (info);
2800	}	2590	}
2801		2591
		2592	const char *
		2593	object::debug_desc2 () const
		2594	{
		2595	static char info[256 * 4];
		2596	return debug_desc (info);
		2597	}
		2598
		2599	struct region *
		2600	object::region () const
		2601	{
		2602	return map ? map->region (x, y)
		2603	: region::default_region ();
		2604	}
		2605
		2606	const materialtype_t *
		2607	object::dominant_material () const
		2608	{
		2609	if (materialtype_t *mat = name_to_material (materialname))
		2610	return mat;
		2611
		2612	// omfg this is slow, this has to be temporary :)
		2613	shstr unknown ("unknown");
		2614
		2615	return name_to_material (unknown);
		2616	}
		2617
		2618	void
		2619	object::open_container (object *new_container)
		2620	{
		2621	if (container == new_container)
		2622	return;
		2623
		2624	if (object *old_container = container)
		2625	{
		2626	if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
		2627	return;
		2628
		2629	#if 0
		2630	// remove the "Close old_container" object.
		2631	if (object *closer = old_container->inv)
		2632	if (closer->type == CLOSE_CON)
		2633	closer->destroy ();
		2634	#endif
		2635
		2636	old_container->flag [FLAG_APPLIED] = 0;
		2637	container = 0;
		2638
		2639	esrv_update_item (UPD_FLAGS, this, old_container);
		2640	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
		2641	}
		2642
		2643	if (new_container)
		2644	{
		2645	if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))
		2646	return;
		2647
		2648	// TODO: this does not seem to serve any purpose anymore?
		2649	#if 0
		2650	// insert the "Close Container" object.
		2651	if (archetype *closer = new_container->other_arch)
		2652	{
		2653	object *closer = arch_to_object (new_container->other_arch);
		2654	closer->flag [FLAG_NO_MAP_SAVE] = 1;
		2655	new_container->insert (closer);
		2656	}
		2657	#endif
		2658
		2659	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));
		2660
		2661	new_container->flag [FLAG_APPLIED] = 1;
		2662	container = new_container;
		2663
		2664	esrv_update_item (UPD_FLAGS, this, new_container);
		2665	esrv_send_inventory (this, new_container);
		2666	}
		2667	}
		2668
		2669

Diff Legend

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