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