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.67 by root, Thu Dec 14 04:30:32 2006 UTC vs.
Revision 1.116 by pippijn, Mon Jan 15 21:06:18 2007 UTC

1	/*	1	/*
2	CrossFire, A Multiplayer game for X-windows	2	* CrossFire, A Multiplayer game for X-windows
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>
…		…
30	#include <sys/uio.h>	31	#include <sys/uio.h>
31	#include <object.h>	32	#include <object.h>
32	#include <funcpoint.h>	33	#include <funcpoint.h>
33	#include <loader.h>	34	#include <loader.h>
34		35
		36	#include <bitset>
		37
35	int nrofallocobjects = 0;	38	int nrofallocobjects = 0;
36	static UUID uuid;	39	static UUID uuid;
37	const uint64 UUID_SKIP = 1<<19;	40	const uint64 UUID_SKIP = 1<<19;
38		41
39	object *active_objects; /* List of active objects that need to be processed */	42	objectvec objects;
		43	activevec actives;
40		44
41	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,
42	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
43	};	47	};
44	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,
…		…
139	* 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
140	* different structure or at least keep the lists sorted...	144	* different structure or at least keep the lists sorted...
141	*/	145	*/
142		146
143	/* For each field in wants, */	147	/* For each field in wants, */
144	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)
145	{	149	{
146	key_value *has_field;	150	key_value *has_field;
147		151
148	/* Look for a field in has with the same key. */	152	/* Look for a field in has with the same key. */
149	has_field = get_ob_key_link (has, wants_field->key);	153	has_field = get_ob_key_link (has, wants_field->key);
…		…
188	* Check nrof variable *before* calling can_merge()	192	* Check nrof variable *before* calling can_merge()
189	*	193	*
190	* Improvements made with merge: Better checking on potion, and also	194	* Improvements made with merge: Better checking on potion, and also
191	* check weight	195	* check weight
192	*/	196	*/
193
194	bool object::can_merge_slow (object *ob1, object *ob2)	197	bool object::can_merge_slow (object *ob1, object *ob2)
195	{	198	{
196	/* A couple quicksanity checks */	199	/* A couple quicksanity checks */
197	if (ob1 == ob2	200	if (ob1 == ob2
198	|| ob1->type != ob2->type	201	|| ob1->type != ob2->type
…		…
219	SET_FLAG (ob1, FLAG_BEEN_APPLIED);	222	SET_FLAG (ob1, FLAG_BEEN_APPLIED);
220		223
221	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))	224	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))
222	SET_FLAG (ob2, FLAG_BEEN_APPLIED);	225	SET_FLAG (ob2, FLAG_BEEN_APPLIED);
223		226
224		227	if ((ob1->flag ^ ob2->flag).reset (FLAG_INV_LOCKED).reset (FLAG_CLIENT_SENT).any ()
225	/* the 0x400000 on flags2 is FLAG_INV_LOCK. I don't think something	228	|| ob1->arch != ob2->arch
226	* being locked in inventory should prevent merging.
227	* 0x4 in flags3 is CLIENT_SENT
228	*/
229	if ((ob1->arch != ob2->arch) ||
230	(ob1->flags[0] != ob2->flags[0]) ||
231	(ob1->flags[1] != ob2->flags[1]) ||
232	((ob1->flags[2] & ~0x400000) != (ob2->flags[2] & ~0x400000)) ||
233	((ob1->flags[3] & ~0x4) != (ob2->flags[3] & ~0x4)) ||
234	(ob1->name != ob2->name) ||	229	|| ob1->name != ob2->name
235	(ob1->title != ob2->title) ||	230	|| ob1->title != ob2->title
236	(ob1->msg != ob2->msg) ||	231	|| ob1->msg != ob2->msg
237	(ob1->weight != ob2->weight) ||	232	|| ob1->weight != ob2->weight
238	(memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist)) != 0) ||	233	|| memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
239	(memcmp (&ob1->stats, &ob2->stats, sizeof (ob1->stats)) != 0) ||	234	|| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats) )
240	(ob1->attacktype != ob2->attacktype) ||	235	|| ob1->attacktype != ob2->attacktype
241	(ob1->magic != ob2->magic) ||	236	|| ob1->magic != ob2->magic
242	(ob1->slaying != ob2->slaying) ||	237	|| ob1->slaying != ob2->slaying
243	(ob1->skill != ob2->skill) ||	238	|| ob1->skill != ob2->skill
244	(ob1->value != ob2->value) ||	239	|| ob1->value != ob2->value
245	(ob1->animation_id != ob2->animation_id) ||	240	|| ob1->animation_id != ob2->animation_id
246	(ob1->client_type != ob2->client_type) ||	241	|| ob1->client_type != ob2->client_type
247	(ob1->materialname != ob2->materialname) ||	242	|| ob1->materialname != ob2->materialname
248	(ob1->lore != ob2->lore) ||	243	|| ob1->lore != ob2->lore
249	(ob1->subtype != ob2->subtype) ||	244	|| ob1->subtype != ob2->subtype
250	(ob1->move_type != ob2->move_type) ||	245	|| ob1->move_type != ob2->move_type
251	(ob1->move_block != ob2->move_block) ||	246	|| ob1->move_block != ob2->move_block
252	(ob1->move_allow != ob2->move_allow) ||	247	|| ob1->move_allow != ob2->move_allow
253	(ob1->move_on != ob2->move_on) ||	248	|| ob1->move_on != ob2->move_on
254	(ob1->move_off != ob2->move_off) || (ob1->move_slow != ob2->move_slow) || (ob1->move_slow_penalty != ob2->move_slow_penalty))	249	|| ob1->move_off != ob2->move_off
		250	|| ob1->move_slow != ob2->move_slow
		251	|| ob1->move_slow_penalty != ob2->move_slow_penalty)
255	return 0;	252	return 0;
256		253
257	/* This is really a spellbook check - really, we should	254	/* This is really a spellbook check - really, we should
258	* check all objects in the inventory.	255	* check all objects in the inventory.
259	*/	256	*/
…		…
281		278
282	/* 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
283	* 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
284	* check?	281	* check?
285	*/	282	*/
286	if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && FABS ((ob1)->speed) > MIN_ACTIVE_SPEED)	283	if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && ob1->has_active_speed ())
287	return 0;	284	return 0;
288		285
289	switch (ob1->type)	286	switch (ob1->type)
290	{	287	{
291	case SCROLL:	288	case SCROLL:
…		…
356	op = op->env;	353	op = op->env;
357	return op;	354	return op;
358	}	355	}
359		356
360	/*	357	/*
361	* Eneq(@csd.uu.se): Since we can have items buried in a character we need
362	* a better check. We basically keeping traversing up until we can't
363	* or find a player.
364	*/
365
366	object *
367	is_player_inv (object *op)
368	{
369	for (; op != NULL && op->type != PLAYER; op = op->env)
370	if (op->env == op)
371	op->env = NULL;
372	return op;
373	}
374
375	/*
376	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.	358	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
377	* Some error messages.	359	* Some error messages.
378	* 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.
379	*/	361	*/
380		362
…		…
383	{	365	{
384	if (!op)	366	if (!op)
385	return strdup ("[NULLOBJ]");	367	return strdup ("[NULLOBJ]");
386		368
387	object_freezer freezer;	369	object_freezer freezer;
388	save_object (freezer, op, 3);	370	save_object (freezer, op, 1);
389	return freezer.as_string ();	371	return freezer.as_string ();
390	}	372	}
391		373
392	/*	374	/*
393	* get_nearest_part(multi-object, object 2) returns the part of the	375	* get_nearest_part(multi-object, object 2) returns the part of the
…		…
410	}	392	}
411		393
412	/*	394	/*
413	* Returns the object which has the count-variable equal to the argument.	395	* Returns the object which has the count-variable equal to the argument.
414	*/	396	*/
415
416	object *	397	object *
417	find_object (tag_t i)	398	find_object (tag_t i)
418	{	399	{
419	for (object *op = object::first; op; op = op->next)	400	for_all_objects (op)
420	if (op->count == i)	401	if (op->count == i)
421	return op;	402	return op;
422		403
423	return 0;	404	return 0;
424	}	405	}
425		406
426	/*	407	/*
427	* Returns the first object which has a name equal to the argument.	408	* Returns the first object which has a name equal to the argument.
428	* Used only by the patch command, but not all that useful.	409	* Used only by the patch command, but not all that useful.
429	* Enables features like "patch <name-of-other-player> food 999"	410	* Enables features like "patch <name-of-other-player> food 999"
430	*/	411	*/
431
432	object *	412	object *
433	find_object_name (const char *str)	413	find_object_name (const char *str)
434	{	414	{
435	shstr_cmp str_ (str);	415	shstr_cmp str_ (str);
436	object *op;	416	object *op;
437		417
438	for (op = object::first; op != NULL; op = op->next)	418	for_all_objects (op)
439	if (op->name == str_)	419	if (op->name == str_)
440	break;	420	break;
441		421
442	return op;	422	return op;
443	}	423	}
…		…
486	}	466	}
487		467
488	op->key_values = 0;	468	op->key_values = 0;
489	}	469	}
490		470
491	void object::clear ()
492	{
493	attachable_base::clear ();
494
495	free_key_values (this);
496
497	owner = 0;
498	name = 0;
499	name_pl = 0;
500	title = 0;
501	race = 0;
502	slaying = 0;
503	skill = 0;
504	msg = 0;
505	lore = 0;
506	custom_name = 0;
507	materialname = 0;
508	contr = 0;
509	below = 0;
510	above = 0;
511	inv = 0;
512	container = 0;
513	env = 0;
514	more = 0;
515	head = 0;
516	map = 0;
517	active_next = 0;
518	active_prev = 0;
519
520	memset (static_cast<object_pod *>(this), 0, sizeof (object_pod));
521
522	SET_FLAG (this, FLAG_REMOVED);
523
524	/* What is not cleared is next, prev, and count */
525
526	expmul = 1.0;
527	face = blank_face;
528
529	if (settings.casting_time)
530	casting_time = -1;
531	}
532
533	/*	471	/*
534	* copy_to first frees everything allocated by the dst object,	472	* copy_to first frees everything allocated by the dst object,
535	* and then copies the contents of itself into the second	473	* and then copies the contents of itself into the second
536	* object, allocating what needs to be allocated. Basically, any	474	* object, allocating what needs to be allocated. Basically, any
537	* data that is malloc'd needs to be re-malloc/copied. Otherwise,	475	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
…		…
543	{	481	{
544	bool is_freed = QUERY_FLAG (dst, FLAG_FREED);	482	bool is_freed = QUERY_FLAG (dst, FLAG_FREED);
545	bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED);	483	bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED);
546		484
547	*(object_copy *)dst = *this;	485	*(object_copy *)dst = *this;
548	*(object_pod *)dst = *this;
549
550	if (self || cb)
551	INVOKE_OBJECT (CLONE, this, ARG_OBJECT (dst));
552		486
553	if (is_freed)	487	if (is_freed)
554	SET_FLAG (dst, FLAG_FREED);	488	SET_FLAG (dst, FLAG_FREED);
555		489
556	if (is_removed)	490	if (is_removed)
…		…
587	tail = new_link;	521	tail = new_link;
588	}	522	}
589	}	523	}
590	}	524	}
591		525
592	update_ob_speed (dst);	526	dst->set_speed (dst->speed);
593	}	527	}
594		528
595	object *	529	object *
596	object::clone ()	530	object::clone ()
597	{	531	{
…		…
603	/*	537	/*
604	* If an object with the IS_TURNABLE() flag needs to be turned due	538	* If an object with the IS_TURNABLE() flag needs to be turned due
605	* to the closest player being on the other side, this function can	539	* to the closest player being on the other side, this function can
606	* be called to update the face variable, _and_ how it looks on the map.	540	* be called to update the face variable, _and_ how it looks on the map.
607	*/	541	*/
608
609	void	542	void
610	update_turn_face (object *op)	543	update_turn_face (object *op)
611	{	544	{
612	if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || op->arch == NULL)	545	if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || !op->arch)
613	return;	546	return;
		547
614	SET_ANIMATION (op, op->direction);	548	SET_ANIMATION (op, op->direction);
615	update_object (op, UP_OBJ_FACE);	549	update_object (op, UP_OBJ_FACE);
616	}	550	}
617		551
618	/*	552	/*
619	* Updates the speed of an object. If the speed changes from 0 to another	553	* Updates the speed of an object. If the speed changes from 0 to another
620	* value, or vice versa, then add/remove the object from the active list.	554	* value, or vice versa, then add/remove the object from the active list.
621	* This function needs to be called whenever the speed of an object changes.	555	* This function needs to be called whenever the speed of an object changes.
622	*/	556	*/
623	void	557	void
624	update_ob_speed (object *op)	558	object::set_speed (float speed)
625	{	559	{
626	extern int arch_init;	560	if (flag [FLAG_FREED] && speed)
627
628	/* No reason putting the archetypes objects on the speed list,
629	* since they never really need to be updated.
630	*/
631
632	if (QUERY_FLAG (op, FLAG_FREED) && op->speed)
633	{	561	{
634	LOG (llevError, "Object %s is freed but has speed.\n", &op->name);	562	LOG (llevError, "Object %s is freed but has speed.\n", &name);
635	#ifdef MANY_CORES
636	abort ();
637	#else
638	op->speed = 0;	563	speed = 0;
639	#endif
640	}
641
642	if (arch_init)
643	return;
644
645	if (FABS (op->speed) > MIN_ACTIVE_SPEED)
646	{	564	}
647	/* If already on active list, don't do anything */
648	if (op->active_next || op->active_prev || op == active_objects)
649	return;
650		565
651	/* process_events() expects us to insert the object at the beginning	566	this->speed = speed;
652	* of the list. */
653	op->active_next = active_objects;
654		567
655	if (op->active_next != NULL)	568	if (has_active_speed ())
656	op->active_next->active_prev = op;	569	activate ();
657
658	active_objects = op;
659	}
660	else	570	else
661	{	571	deactivate ();
662	/* If not on the active list, nothing needs to be done */
663	if (!op->active_next && !op->active_prev && op != active_objects)
664	return;
665
666	if (op->active_prev == NULL)
667	{
668	active_objects = op->active_next;
669
670	if (op->active_next != NULL)
671	op->active_next->active_prev = NULL;
672	}
673	else
674	{
675	op->active_prev->active_next = op->active_next;
676
677	if (op->active_next)
678	op->active_next->active_prev = op->active_prev;
679	}
680
681	op->active_next = NULL;
682	op->active_prev = NULL;
683	}
684	}	572	}
685		573
686	/* This function removes object 'op' from the list of active
687	* objects.
688	* This should only be used for style maps or other such
689	* reference maps where you don't want an object that isn't
690	* in play chewing up cpu time getting processed.
691	* The reverse of this is to call update_ob_speed, which
692	* will do the right thing based on the speed of the object.
693	*/
694	void
695	remove_from_active_list (object *op)
696	{
697	/* If not on the active list, nothing needs to be done */
698	if (!op->active_next && !op->active_prev && op != active_objects)
699	return;
700
701	if (op->active_prev == NULL)
702	{
703	active_objects = op->active_next;
704	if (op->active_next != NULL)
705	op->active_next->active_prev = NULL;
706	}
707	else
708	{
709	op->active_prev->active_next = op->active_next;
710	if (op->active_next)
711	op->active_next->active_prev = op->active_prev;
712	}
713	op->active_next = NULL;
714	op->active_prev = NULL;
715	}
716
717	/*	574	/*
718	* update_object() updates the array which represents the map.	575	* update_object() updates the the map.
719	* It takes into account invisible objects (and represent squares covered	576	* It takes into account invisible objects (and represent squares covered
720	* by invisible objects by whatever is below them (unless it's another	577	* by invisible objects by whatever is below them (unless it's another
721	* invisible object, etc...)	578	* invisible object, etc...)
722	* If the object being updated is beneath a player, the look-window	579	* If the object being updated is beneath a player, the look-window
723	* of that player is updated (this might be a suboptimal way of	580	* of that player is updated (this might be a suboptimal way of
724	* updating that window, though, since update_object() is called _often_)	581	* updating that window, though, since update_object() is called _often_)
725	*	582	*
726	* action is a hint of what the caller believes need to be done.	583	* action is a hint of what the caller believes need to be done.
727	* For example, if the only thing that has changed is the face (due to
728	* an animation), we don't need to call update_position until that actually
729	* comes into view of a player. OTOH, many other things, like addition/removal
730	* of walls or living creatures may need us to update the flags now.
731	* current action are:	584	* current action are:
732	* UP_OBJ_INSERT: op was inserted	585	* UP_OBJ_INSERT: op was inserted
733	* UP_OBJ_REMOVE: op was removed	586	* UP_OBJ_REMOVE: op was removed
734	* UP_OBJ_CHANGE: object has somehow changed. In this case, we always update	587	* UP_OBJ_CHANGE: object has somehow changed. In this case, we always update
735	* as that is easier than trying to look at what may have changed.	588	* as that is easier than trying to look at what may have changed.
736	* UP_OBJ_FACE: only the objects face has changed.	589	* UP_OBJ_FACE: only the objects face has changed.
737	*/	590	*/
738
739	void	591	void
740	update_object (object *op, int action)	592	update_object (object *op, int action)
741	{	593	{
742	int update_now = 0, flags;
743	MoveType move_on, move_off, move_block, move_slow;	594	MoveType move_on, move_off, move_block, move_slow;
744		595
745	if (op == NULL)	596	if (op == NULL)
746	{	597	{
747	/* this should never happen */	598	/* this should never happen */
748	LOG (llevDebug, "update_object() called for NULL object.\n");	599	LOG (llevDebug, "update_object() called for NULL object.\n");
749	return;	600	return;
750	}	601	}
751		602
752	if (op->env != NULL)	603	if (op->env)
753	{	604	{
754	/* Animation is currently handled by client, so nothing	605	/* Animation is currently handled by client, so nothing
755	* to do in this case.	606	* to do in this case.
756	*/	607	*/
757	return;	608	return;
…		…
762	*/	613	*/
763	if (!op->map || op->map->in_memory == MAP_SAVING)	614	if (!op->map || op->map->in_memory == MAP_SAVING)
764	return;	615	return;
765		616
766	/* make sure the object is within map boundaries */	617	/* make sure the object is within map boundaries */
767	if (op->x < 0 || op->x >= MAP_WIDTH (op->map) || op->y < 0 || op->y >= MAP_HEIGHT (op->map))	618	if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height)
768	{	619	{
769	LOG (llevError, "update_object() called for object out of map!\n");	620	LOG (llevError, "update_object() called for object out of map!\n");
770	#ifdef MANY_CORES	621	#ifdef MANY_CORES
771	abort ();	622	abort ();
772	#endif	623	#endif
773	return;	624	return;
774	}	625	}
775		626
776	flags = GET_MAP_FLAGS (op->map, op->x, op->y);	627	mapspace &m = op->ms ();
777	SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NEED_UPDATE);
778	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);
779	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);
780	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);
781	move_off = GET_MAP_MOVE_OFF (op->map, op->x, op->y);
782		628
		629	if (!(m.flags_ & P_UPTODATE))
		630	/* nop */;
783	if (action == UP_OBJ_INSERT)	631	else if (action == UP_OBJ_INSERT)
784	{	632	{
		633	// this is likely overkill, TODO: revisit (schmorp)
785	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(flags & P_BLOCKSVIEW))	634	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
786	update_now = 1;
787
788	if (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(flags & P_NO_MAGIC))	635	|| (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))
789	update_now = 1;	636	|| (op->type == PLAYER && !(m.flags_ & P_PLAYER))
790		637	|| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
		638	|| (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))
791	if (QUERY_FLAG (op, FLAG_DAMNED) && !(flags & P_NO_CLERIC))	639	|| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))
792	update_now = 1;
793
794	if (QUERY_FLAG (op, FLAG_ALIVE) && !(flags & P_IS_ALIVE))
795	update_now = 1;
796
797	if (op->type == SAFE_GROUND && !(flags & P_SAFE))
798	update_now = 1;
799
800	if ((move_on | op->move_on) != move_on)	640	|| (m.move_on | op->move_on ) != m.move_on
801	update_now = 1;
802
803	if ((move_off | op->move_off) != move_off)	641	|| (m.move_off | op->move_off ) != m.move_off
804	update_now = 1;	642	|| (m.move_slow | op->move_slow) != m.move_slow
805
806	/* This isn't perfect, but I don't expect a lot of objects to	643	/* This isn't perfect, but I don't expect a lot of objects to
807	* to have move_allow right now.	644	* to have move_allow right now.
808	*/	645	*/
809	if (((move_block | op->move_block) & ~op->move_allow) != move_block)	646	|| ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block
810	update_now = 1;	647	|| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)
811		648	m.flags_ = 0;
812	if ((move_slow | op->move_slow) != move_slow)
813	update_now = 1;
814	}	649	}
815
816	/* if the object is being removed, we can't make intelligent	650	/* if the object is being removed, we can't make intelligent
817	* decisions, because remove_ob can't really pass the object	651	* decisions, because remove_ob can't really pass the object
818	* that is being removed.	652	* that is being removed.
819	*/	653	*/
820	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)	654	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
821	update_now = 1;	655	m.flags_ = 0;
822	else if (action == UP_OBJ_FACE)	656	else if (action == UP_OBJ_FACE)
823	/* Nothing to do for that case */ ;	657	/* Nothing to do for that case */ ;
824	else	658	else
825	LOG (llevError, "update_object called with invalid action: %d\n", action);	659	LOG (llevError, "update_object called with invalid action: %d\n", action);
826		660
827	if (update_now)
828	{
829	SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NO_ERROR | P_NEED_UPDATE);
830	update_position (op->map, op->x, op->y);
831	}
832
833	if (op->more != NULL)	661	if (op->more)
834	update_object (op->more, action);	662	update_object (op->more, action);
835	}
836
837	object::vector object::mortals;
838	object::vector object::objects; // not yet used
839	object *object::first;
840
841	void object::free_mortals ()
842	{
843	for (AUTODECL (i, mortals.begin ()); i != mortals.end ();)
844	if ((*i)->refcnt)
845	++i; // further delay freeing
846	else
847	{
848	delete *i;
849	mortals.erase (i);
850	}
851	}	663	}
852		664
853	object::object ()	665	object::object ()
854	{	666	{
855	SET_FLAG (this, FLAG_REMOVED);	667	SET_FLAG (this, FLAG_REMOVED);
…		…
861	object::~object ()	673	object::~object ()
862	{	674	{
863	free_key_values (this);	675	free_key_values (this);
864	}	676	}
865		677
		678	static int object_count;
		679
866	void object::link ()	680	void object::link ()
867	{	681	{
868	count = ++ob_count;	682	assert (!index);//D
869	uuid = gen_uuid ();	683	uuid = gen_uuid ();
		684	count = ++object_count;
870		685
871	prev = 0;	686	refcnt_inc ();
872	next = object::first;	687	objects.insert (this);
873
874	if (object::first)
875	object::first->prev = this;
876
877	object::first = this;
878	}	688	}
879		689
880	void object::unlink ()	690	void object::unlink ()
881	{	691	{
882	if (this == object::first)	692	assert (index);//D
883	object::first = next;	693	objects.erase (this);
		694	refcnt_dec ();
		695	}
884		696
885	/* Remove this object from the list of used objects */	697	void
886	if (prev) prev->next = next;	698	object::activate ()
887	if (next) next->prev = prev;	699	{
		700	/* If already on active list, don't do anything */
		701	if (active)
		702	return;
888		703
889	prev = 0;	704	if (has_active_speed ())
890	next = 0;	705	actives.insert (this);
		706	}
		707
		708	void
		709	object::activate_recursive ()
		710	{
		711	activate ();
		712
		713	for (object *op = inv; op; op = op->below)
		714	op->activate_recursive ();
		715	}
		716
		717	/* This function removes object 'op' from the list of active
		718	* objects.
		719	* This should only be used for style maps or other such
		720	* reference maps where you don't want an object that isn't
		721	* in play chewing up cpu time getting processed.
		722	* The reverse of this is to call update_ob_speed, which
		723	* will do the right thing based on the speed of the object.
		724	*/
		725	void
		726	object::deactivate ()
		727	{
		728	/* If not on the active list, nothing needs to be done */
		729	if (!active)
		730	return;
		731
		732	actives.erase (this);
		733	}
		734
		735	void
		736	object::deactivate_recursive ()
		737	{
		738	for (object *op = inv; op; op = op->below)
		739	op->deactivate_recursive ();
		740
		741	deactivate ();
		742	}
		743
		744	void
		745	object::set_flag_inv (int flag, int value)
		746	{
		747	for (object *op = inv; op; op = op->below)
		748	{
		749	op->flag [flag] = value;
		750	op->set_flag_inv (flag, value);
		751	}
		752	}
		753
		754	/*
		755	* Remove and free all objects in the inventory of the given object.
		756	* object.c ?
		757	*/
		758	void
		759	object::destroy_inv (bool drop_to_ground)
		760	{
		761	// need to check first, because the checks below might segfault
		762	// as we might be on an invalid mapspace and crossfire code
		763	// is too buggy to ensure that the inventory is empty.
		764	// corollary: if you create arrows etc. with stuff in tis inventory,
		765	// cf will crash below with off-map x and y
		766	if (!inv)
		767	return;
		768
		769	/* Only if the space blocks everything do we not process -
		770	* if some form of movement is allowed, let objects
		771	* drop on that space.
		772	*/
		773	if (!drop_to_ground
		774	|| !map
		775	|| map->in_memory != MAP_IN_MEMORY
		776	|| ms ().move_block == MOVE_ALL)
		777	{
		778	while (inv)
		779	{
		780	inv->destroy_inv (drop_to_ground);
		781	inv->destroy ();
		782	}
		783	}
		784	else
		785	{ /* Put objects in inventory onto this space */
		786	while (inv)
		787	{
		788	object *op = inv;
		789
		790	if (op->flag [FLAG_STARTEQUIP]
		791	|| op->flag [FLAG_NO_DROP]
		792	|| op->type == RUNE
		793	|| op->type == TRAP
		794	|| op->flag [FLAG_IS_A_TEMPLATE]
		795	|| op->flag [FLAG_DESTROY_ON_DEATH])
		796	op->destroy ();
		797	else
		798	map->insert (op, x, y);
		799	}
		800	}
891	}	801	}
892		802
893	object *object::create ()	803	object *object::create ()
894	{	804	{
895	object *op = new object;	805	object *op = new object;
896	op->link ();	806	op->link ();
897	return op;	807	return op;
898	}	808	}
899		809
900	/*	810	void
901	* free_object() frees everything allocated by an object, removes	811	object::do_destroy ()
902	* it from the list of used objects, and puts it on the list of
903	* free objects. The IS_FREED() flag is set in the object.
904	* The object must have been removed by remove_ob() first for
905	* this function to succeed.
906	*
907	* If destroy_inventory is set, free inventory as well. Else drop items in
908	* inventory to the ground.
909	*/
910	void object::destroy (bool destroy_inventory)
911	{	812	{
912	if (QUERY_FLAG (this, FLAG_FREED))	813	attachable::do_destroy ();
913	return;
914		814
915	if (QUERY_FLAG (this, FLAG_FRIENDLY))	815	if (flag [FLAG_IS_LINKED])
		816	remove_button_link (this);
		817
		818	if (flag [FLAG_FRIENDLY])
916	remove_friendly_object (this);	819	remove_friendly_object (this);
917		820
918	if (!QUERY_FLAG (this, FLAG_REMOVED))	821	if (!flag [FLAG_REMOVED])
919	remove ();	822	remove ();
920		823
921	SET_FLAG (this, FLAG_FREED);	824	destroy_inv (true);
922		825
923	if (more)	826	deactivate ();
924	{	827	unlink ();
925	more->destroy (destroy_inventory);
926	more = 0;
927	}
928		828
929	if (inv)	829	flag [FLAG_FREED] = 1;
930	{
931	/* Only if the space blocks everything do we not process -
932	* if some form of movement is allowed, let objects
933	* drop on that space.
934	*/
935	if (destroy_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
936	{
937	object *op = inv;
938
939	while (op)
940	{
941	object *tmp = op->below;
942	op->destroy (destroy_inventory);
943	op = tmp;
944	}
945	}
946	else
947	{ /* Put objects in inventory onto this space */
948	object *op = inv;
949
950	while (op)
951	{
952	object *tmp = op->below;
953
954	op->remove ();
955
956	if (QUERY_FLAG (op, FLAG_STARTEQUIP)
957	|| QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
958	op->destroy ();
959	else
960	{
961	op->x = x;
962	op->y = y;
963	insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */
964	}
965
966	op = tmp;
967	}
968	}
969	}
970		830
971	// hack to ensure that freed objects still have a valid map	831	// hack to ensure that freed objects still have a valid map
972	{	832	{
973	static maptile *freed_map; // freed objects are moved here to avoid crashes	833	static maptile *freed_map; // freed objects are moved here to avoid crashes
974		834
…		…
978		838
979	freed_map->name = "/internal/freed_objects_map";	839	freed_map->name = "/internal/freed_objects_map";
980	freed_map->width = 3;	840	freed_map->width = 3;
981	freed_map->height = 3;	841	freed_map->height = 3;
982		842
983	freed_map->allocate ();	843	freed_map->alloc ();
		844	freed_map->in_memory = MAP_IN_MEMORY;
984	}	845	}
985		846
986	map = freed_map;	847	map = freed_map;
987	x = 1;	848	x = 1;
988	y = 1;	849	y = 1;
989	}	850	}
990		851
		852	head = 0;
		853
		854	if (more)
		855	{
		856	more->destroy ();
		857	more = 0;
		858	}
		859
991	// clear those pointers that likely might have circular references to us	860	// clear those pointers that likely might have circular references to us
992	owner = 0;	861	owner = 0;
993	enemy = 0;	862	enemy = 0;
994	attacked_by = 0;	863	attacked_by = 0;
		864	}
995		865
996	// only relevant for players(?), but make sure of it anyways	866	void
997	contr = 0;	867	object::destroy (bool destroy_inventory)
		868	{
		869	if (destroyed ())
		870	return;
998		871
999	/* Remove object from the active list */	872	if (destroy_inventory)
1000	speed = 0;	873	destroy_inv (false);
1001	update_ob_speed (this);
1002		874
1003	unlink ();	875	attachable::destroy ();
1004
1005	mortals.push_back (this);
1006	}	876	}
1007		877
1008	/*	878	/*
1009	* sub_weight() recursively (outwards) subtracts a number from the	879	* sub_weight() recursively (outwards) subtracts a number from the
1010	* weight of an object (and what is carried by it's environment(s)).	880	* weight of an object (and what is carried by it's environment(s)).
…		…
1034	object::remove ()	904	object::remove ()
1035	{	905	{
1036	object *tmp, *last = 0;	906	object *tmp, *last = 0;
1037	object *otmp;	907	object *otmp;
1038		908
1039	int check_walk_off;
1040
1041	if (QUERY_FLAG (this, FLAG_REMOVED))	909	if (QUERY_FLAG (this, FLAG_REMOVED))
1042	return;	910	return;
1043		911
1044	SET_FLAG (this, FLAG_REMOVED);	912	SET_FLAG (this, FLAG_REMOVED);
		913	INVOKE_OBJECT (REMOVE, this);
1045		914
1046	if (more)	915	if (more)
1047	more->remove ();	916	more->remove ();
1048		917
1049	/*	918	/*
…		…
1059		928
1060	/* NO_FIX_PLAYER is set when a great many changes are being	929	/* NO_FIX_PLAYER is set when a great many changes are being
1061	* made to players inventory. If set, avoiding the call	930	* made to players inventory. If set, avoiding the call
1062	* to save cpu time.	931	* to save cpu time.
1063	*/	932	*/
1064	if ((otmp = is_player_inv (env)) != NULL && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	933	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1065	fix_player (otmp);	934	otmp->update_stats ();
1066		935
1067	if (above != NULL)	936	if (above)
1068	above->below = below;	937	above->below = below;
1069	else	938	else
1070	env->inv = below;	939	env->inv = below;
1071		940
1072	if (below != NULL)	941	if (below)
1073	below->above = above;	942	below->above = above;
1074		943
1075	/* we set up values so that it could be inserted into	944	/* we set up values so that it could be inserted into
1076	* the map, but we don't actually do that - it is up	945	* the map, but we don't actually do that - it is up
1077	* to the caller to decide what we want to do.	946	* to the caller to decide what we want to do.
…		…
1081	above = 0, below = 0;	950	above = 0, below = 0;
1082	env = 0;	951	env = 0;
1083	}	952	}
1084	else if (map)	953	else if (map)
1085	{	954	{
1086	/* Re did the following section of code - it looks like it had	955	if (type == PLAYER)
1087	* lots of logic for things we no longer care about
1088	*/	956	{
		957	--map->players;
		958	map->touch ();
		959	}
		960
		961	map->dirty = true;
1089		962
1090	/* link the object above us */	963	/* link the object above us */
1091	if (above)	964	if (above)
1092	above->below = below;	965	above->below = below;
1093	else	966	else
1094	SET_MAP_TOP (map, x, y, below); /* we were top, set new top */	967	map->at (x, y).top = below; /* we were top, set new top */
1095		968
1096	/* Relink the object below us, if there is one */	969	/* Relink the object below us, if there is one */
1097	if (below)	970	if (below)
1098	below->above = above;	971	below->above = above;
1099	else	972	else
…		…
1111	dump = dump_object (GET_MAP_OB (map, x, y));	984	dump = dump_object (GET_MAP_OB (map, x, y));
1112	LOG (llevError, "%s\n", dump);	985	LOG (llevError, "%s\n", dump);
1113	free (dump);	986	free (dump);
1114	}	987	}
1115		988
1116	SET_MAP_OB (map, x, y, above); /* goes on above it. */	989	map->at (x, y).bot = above; /* goes on above it. */
1117	}	990	}
1118		991
1119	above = 0;	992	above = 0;
1120	below = 0;	993	below = 0;
1121		994
1122	if (map->in_memory == MAP_SAVING)	995	if (map->in_memory == MAP_SAVING)
1123	return;	996	return;
1124		997
1125	check_walk_off = !QUERY_FLAG (this, FLAG_NO_APPLY);	998	int check_walk_off = !flag [FLAG_NO_APPLY];
1126		999
1127	for (tmp = GET_MAP_OB (map, x, y); tmp; tmp = tmp->above)	1000	for (tmp = map->at (x, y).bot; tmp; tmp = tmp->above)
1128	{	1001	{
1129	/* No point updating the players look faces if he is the object	1002	/* No point updating the players look faces if he is the object
1130	* being removed.	1003	* being removed.
1131	*/	1004	*/
1132		1005
…		…
1136	* removed (most likely destroyed), update the player view	1009	* removed (most likely destroyed), update the player view
1137	* appropriately.	1010	* appropriately.
1138	*/	1011	*/
1139	if (tmp->container == this)	1012	if (tmp->container == this)
1140	{	1013	{
1141	CLEAR_FLAG (this, FLAG_APPLIED);	1014	flag [FLAG_APPLIED] = 0;
1142	tmp->container = 0;	1015	tmp->container = 0;
1143	}	1016	}
1144		1017
1145	tmp->contr->socket->update_look = 1;	1018	if (tmp->contr->ns)
		1019	tmp->contr->ns->floorbox_update ();
1146	}	1020	}
1147		1021
1148	/* See if player moving off should effect something */	1022	/* See if object moving off should effect something */
1149	if (check_walk_off	1023	if (check_walk_off
1150	&& ((move_type & tmp->move_off)	1024	&& ((move_type & tmp->move_off)
1151	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))	1025	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1152	{	1026	{
1153	move_apply (tmp, this, 0);	1027	move_apply (tmp, this, 0);
…		…
1155	if (destroyed ())	1029	if (destroyed ())
1156	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());	1030	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1157	}	1031	}
1158		1032
1159	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */	1033	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1160		1034	//TODO: why is this horrible hacka fix? get rid of this code=bug! (schmorp)
1161	if (tmp->above == tmp)	1035	if (tmp->above == tmp)
1162	tmp->above = 0;	1036	tmp->above = 0;
1163		1037
1164	last = tmp;	1038	last = tmp;
1165	}	1039	}
1166		1040
1167	/* last == NULL of there are no objects on this space */	1041	/* last == NULL if there are no objects on this space */
		1042	//TODO: this makes little sense, why only update the topmost object?
1168	if (!last)	1043	if (!last)
1169	{	1044	map->at (x, y).flags_ = 0;
1170	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1171	* we could preserve the flags (GET_MAP_FLAGS), but update_position figures
1172	* those out anyways, and if there are any flags set right now, they won't
1173	* be correct anyways.
1174	*/
1175	SET_MAP_FLAGS (map, x, y, P_NEED_UPDATE);
1176	update_position (map, x, y);
1177	}
1178	else	1045	else
1179	update_object (last, UP_OBJ_REMOVE);	1046	update_object (last, UP_OBJ_REMOVE);
1180		1047
1181	if (QUERY_FLAG (this, FLAG_BLOCKSVIEW) || glow_radius)	1048	if (flag [FLAG_BLOCKSVIEW] || glow_radius)
1182	update_all_los (map, x, y);	1049	update_all_los (map, x, y);
1183	}	1050	}
1184	}	1051	}
1185		1052
1186	/*	1053	/*
…		…
1195	merge_ob (object *op, object *top)	1062	merge_ob (object *op, object *top)
1196	{	1063	{
1197	if (!op->nrof)	1064	if (!op->nrof)
1198	return 0;	1065	return 0;
1199		1066
1200	if (top == NULL)	1067	if (top)
1201	for (top = op; top != NULL && top->above != NULL; top = top->above);	1068	for (top = op; top && top->above; top = top->above)
		1069	;
1202		1070
1203	for (; top != NULL; top = top->below)	1071	for (; top; top = top->below)
1204	{	1072	{
1205	if (top == op)	1073	if (top == op)
1206	continue;	1074	continue;
1207		1075
1208	if (object::can_merge (op, top))	1076	if (object::can_merge (op, top))
…		…
1224	* job preparing multi-part monsters	1092	* job preparing multi-part monsters
1225	*/	1093	*/
1226	object *	1094	object *
1227	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)	1095	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1228	{	1096	{
1229	object *tmp;
1230
1231	if (op->head)
1232	op = op->head;
1233
1234	for (tmp = op; tmp; tmp = tmp->more)	1097	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1235	{	1098	{
1236	tmp->x = x + tmp->arch->clone.x;	1099	tmp->x = x + tmp->arch->clone.x;
1237	tmp->y = y + tmp->arch->clone.y;	1100	tmp->y = y + tmp->arch->clone.y;
1238	}	1101	}
1239		1102
…		…
1258	* Return value:	1121	* Return value:
1259	* new object if 'op' was merged with other object	1122	* new object if 'op' was merged with other object
1260	* NULL if 'op' was destroyed	1123	* NULL if 'op' was destroyed
1261	* just 'op' otherwise	1124	* just 'op' otherwise
1262	*/	1125	*/
1263
1264	object *	1126	object *
1265	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)	1127	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1266	{	1128	{
1267	object *tmp, *top, *floor = NULL;	1129	object *tmp, *top, *floor = NULL;
1268	sint16 x, y;	1130	sint16 x, y;
…		…
1271	{	1133	{
1272	LOG (llevError, "Trying to insert freed object!\n");	1134	LOG (llevError, "Trying to insert freed object!\n");
1273	return NULL;	1135	return NULL;
1274	}	1136	}
1275		1137
1276	if (m == NULL)	1138	if (!m)
1277	{	1139	{
1278	char *dump = dump_object (op);	1140	char *dump = dump_object (op);
1279	LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);	1141	LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
1280	free (dump);	1142	free (dump);
1281	return op;	1143	return op;
…		…
1302	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);	1164	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
1303	free (dump);	1165	free (dump);
1304	return op;	1166	return op;
1305	}	1167	}
1306		1168
1307	if (op->more != NULL)	1169	if (op->more)
1308	{	1170	{
1309	/* The part may be on a different map. */	1171	/* The part may be on a different map. */
1310		1172
1311	object *more = op->more;	1173	object *more = op->more;
1312		1174
1313	/* We really need the caller to normalize coordinates - if	1175	/* We really need the caller to normalise coordinates - if
1314	* we set the map, that doesn't work if the location is within	1176	* we set the map, that doesn't work if the location is within
1315	* a map and this is straddling an edge. So only if coordinate	1177	* a map and this is straddling an edge. So only if coordinate
1316	* is clear wrong do we normalize it.	1178	* is clear wrong do we normalise it.
1317	*/	1179	*/
1318	if (OUT_OF_REAL_MAP (more->map, more->x, more->y))	1180	if (OUT_OF_REAL_MAP (more->map, more->x, more->y))
1319	more->map = get_map_from_coord (m, &more->x, &more->y);	1181	more->map = get_map_from_coord (m, &more->x, &more->y);
1320	else if (!more->map)	1182	else if (!more->map)
1321	{	1183	{
…		…
1328	if (insert_ob_in_map (more, more->map, originator, flag) == NULL)	1190	if (insert_ob_in_map (more, more->map, originator, flag) == NULL)
1329	{	1191	{
1330	if (!op->head)	1192	if (!op->head)
1331	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");	1193	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1332		1194
1333	return NULL;	1195	return 0;
1334	}	1196	}
1335	}	1197	}
1336		1198
1337	CLEAR_FLAG (op, FLAG_REMOVED);	1199	CLEAR_FLAG (op, FLAG_REMOVED);
1338		1200
…		…
1345	y = op->y;	1207	y = op->y;
1346		1208
1347	/* this has to be done after we translate the coordinates.	1209	/* this has to be done after we translate the coordinates.
1348	*/	1210	*/
1349	if (op->nrof && !(flag & INS_NO_MERGE))	1211	if (op->nrof && !(flag & INS_NO_MERGE))
1350	for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)	1212	for (tmp = GET_MAP_OB (op->map, x, y); tmp; tmp = tmp->above)
1351	if (object::can_merge (op, tmp))	1213	if (object::can_merge (op, tmp))
1352	{	1214	{
1353	op->nrof += tmp->nrof;	1215	op->nrof += tmp->nrof;
1354	tmp->destroy ();	1216	tmp->destroy ();
1355	}	1217	}
…		…
1372	op->below = originator->below;	1234	op->below = originator->below;
1373		1235
1374	if (op->below)	1236	if (op->below)
1375	op->below->above = op;	1237	op->below->above = op;
1376	else	1238	else
1377	SET_MAP_OB (op->map, op->x, op->y, op);	1239	op->ms ().bot = op;
1378		1240
1379	/* since *below* originator, no need to update top */	1241	/* since *below* originator, no need to update top */
1380	originator->below = op;	1242	originator->below = op;
1381	}	1243	}
1382	else	1244	else
1383	{	1245	{
1384	/* If there are other objects, then */	1246	/* If there are other objects, then */
1385	if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL))	1247	if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL))
1386	{	1248	{
1387	object *last = NULL;	1249	object *last = 0;
1388		1250
1389	/*	1251	/*
1390	* If there are multiple objects on this space, we do some trickier handling.	1252	* If there are multiple objects on this space, we do some trickier handling.
1391	* We've already dealt with merging if appropriate.	1253	* We've already dealt with merging if appropriate.
1392	* Generally, we want to put the new object on top. But if	1254	* Generally, we want to put the new object on top. But if
…		…
1396	* once we get to them. This reduces the need to traverse over all of	1258	* once we get to them. This reduces the need to traverse over all of
1397	* them when adding another one - this saves quite a bit of cpu time	1259	* them when adding another one - this saves quite a bit of cpu time
1398	* when lots of spells are cast in one area. Currently, it is presumed	1260	* when lots of spells are cast in one area. Currently, it is presumed
1399	* that flying non pickable objects are spell objects.	1261	* that flying non pickable objects are spell objects.
1400	*/	1262	*/
1401
1402	while (top != NULL)	1263	while (top)
1403	{	1264	{
1404	if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))	1265	if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))
1405	floor = top;	1266	floor = top;
1406		1267
1407	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))	1268	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))
…		…
1428	* If INS_ON_TOP is used, don't do this processing	1289	* If INS_ON_TOP is used, don't do this processing
1429	* Need to find the object that in fact blocks view, otherwise	1290	* Need to find the object that in fact blocks view, otherwise
1430	* stacking is a bit odd.	1291	* stacking is a bit odd.
1431	*/	1292	*/
1432	if (!(flag & INS_ON_TOP) &&	1293	if (!(flag & INS_ON_TOP) &&
1433	(get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_BLOCKSVIEW) && (op->face && !op->face->visibility))	1294	(get_map_flags (op->map, 0, op->x, op->y, 0, 0) & P_BLOCKSVIEW) && (op->face && !op->face->visibility))
1434	{	1295	{
1435	for (last = top; last != floor; last = last->below)	1296	for (last = top; last != floor; last = last->below)
1436	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1297	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1437	break;	1298	break;
1438	/* Check to see if we found the object that blocks view,	1299	/* Check to see if we found the object that blocks view,
…		…
1460	op->above = GET_MAP_OB (op->map, op->x, op->y);	1321	op->above = GET_MAP_OB (op->map, op->x, op->y);
1461		1322
1462	if (op->above)	1323	if (op->above)
1463	op->above->below = op;	1324	op->above->below = op;
1464		1325
1465	op->below = NULL;	1326	op->below = 0;
1466	SET_MAP_OB (op->map, op->x, op->y, op);	1327	op->ms ().bot = op;
1467	}	1328	}
1468	else	1329	else
1469	{ /* get inserted into the stack above top */	1330	{ /* get inserted into the stack above top */
1470	op->above = top->above;	1331	op->above = top->above;
1471		1332
…		…
1474		1335
1475	op->below = top;	1336	op->below = top;
1476	top->above = op;	1337	top->above = op;
1477	}	1338	}
1478		1339
1479	if (op->above == NULL)	1340	if (!op->above)
1480	SET_MAP_TOP (op->map, op->x, op->y, op);	1341	op->ms ().top = op;
1481	} /* else not INS_BELOW_ORIGINATOR */	1342	} /* else not INS_BELOW_ORIGINATOR */
1482		1343
1483	if (op->type == PLAYER)	1344	if (op->type == PLAYER)
		1345	{
1484	op->contr->do_los = 1;	1346	op->contr->do_los = 1;
		1347	++op->map->players;
		1348	op->map->touch ();
		1349	}
		1350
		1351	op->map->dirty = true;
1485		1352
1486	/* If we have a floor, we know the player, if any, will be above	1353	/* If we have a floor, we know the player, if any, will be above
1487	* it, so save a few ticks and start from there.	1354	* it, so save a few ticks and start from there.
1488	*/	1355	*/
1489	if (!(flag & INS_MAP_LOAD))	1356	if (!(flag & INS_MAP_LOAD))
1490	for (tmp = floor ? floor : GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1357	if (object *pl = op->ms ().player ())
1491	if (tmp->type == PLAYER)	1358	if (pl->contr->ns)
1492	tmp->contr->socket->update_look = 1;	1359	pl->contr->ns->floorbox_update ();
1493		1360
1494	/* If this object glows, it may affect lighting conditions that are	1361	/* If this object glows, it may affect lighting conditions that are
1495	* visible to others on this map. But update_all_los is really	1362	* visible to others on this map. But update_all_los is really
1496	* an inefficient way to do this, as it means los for all players	1363	* an inefficient way to do this, as it means los for all players
1497	* on the map will get recalculated. The players could very well	1364	* on the map will get recalculated. The players could very well
1498	* be far away from this change and not affected in any way -	1365	* be far away from this change and not affected in any way -
1499	* this should get redone to only look for players within range,	1366	* this should get redone to only look for players within range,
1500	* or just updating the P_NEED_UPDATE for spaces within this area	1367	* or just updating the P_UPTODATE for spaces within this area
1501	* of effect may be sufficient.	1368	* of effect may be sufficient.
1502	*/	1369	*/
1503	if (MAP_DARKNESS (op->map) && (op->glow_radius != 0))	1370	if (op->map->darkness && (op->glow_radius != 0))
1504	update_all_los (op->map, op->x, op->y);	1371	update_all_los (op->map, op->x, op->y);
1505		1372
1506	/* updates flags (blocked, alive, no magic, etc) for this map space */	1373	/* updates flags (blocked, alive, no magic, etc) for this map space */
1507	update_object (op, UP_OBJ_INSERT);	1374	update_object (op, UP_OBJ_INSERT);
1508		1375
		1376	INVOKE_OBJECT (INSERT, op);
		1377
1509	/* Don't know if moving this to the end will break anything. However,	1378	/* Don't know if moving this to the end will break anything. However,
1510	* we want to have update_look set above before calling this.	1379	* we want to have floorbox_update called before calling this.
1511	*	1380	*
1512	* check_move_on() must be after this because code called from	1381	* check_move_on() must be after this because code called from
1513	* check_move_on() depends on correct map flags (so functions like	1382	* check_move_on() depends on correct map flags (so functions like
1514	* blocked() and wall() work properly), and these flags are updated by	1383	* blocked() and wall() work properly), and these flags are updated by
1515	* update_object().	1384	* update_object().
…		…
1517		1386
1518	/* if this is not the head or flag has been passed, don't check walk on status */	1387	/* if this is not the head or flag has been passed, don't check walk on status */
1519	if (!(flag & INS_NO_WALK_ON) && !op->head)	1388	if (!(flag & INS_NO_WALK_ON) && !op->head)
1520	{	1389	{
1521	if (check_move_on (op, originator))	1390	if (check_move_on (op, originator))
1522	return NULL;	1391	return 0;
1523		1392
1524	/* If we are a multi part object, lets work our way through the check	1393	/* If we are a multi part object, lets work our way through the check
1525	* walk on's.	1394	* walk on's.
1526	*/	1395	*/
1527	for (tmp = op->more; tmp != NULL; tmp = tmp->more)	1396	for (tmp = op->more; tmp != NULL; tmp = tmp->more)
1528	if (check_move_on (tmp, originator))	1397	if (check_move_on (tmp, originator))
1529	return NULL;	1398	return 0;
1530	}	1399	}
1531		1400
1532	return op;	1401	return op;
1533	}	1402	}
1534		1403
1535	/* this function inserts an object in the map, but if it	1404	/* this function inserts an object in the map, but if it
1536	* finds an object of its own type, it'll remove that one first.	1405	* finds an object of its own type, it'll remove that one first.
1537	* op is the object to insert it under: supplies x and the map.	1406	* op is the object to insert it under: supplies x and the map.
1538	*/	1407	*/
1539	void	1408	void
1540	replace_insert_ob_in_map (const char *arch_string, object *op)	1409	replace_insert_ob_in_map (const char *arch_string, object *op)
1541	{	1410	{
1542	object *	1411	object *tmp, *tmp1;
1543	tmp;
1544	object *
1545	tmp1;
1546		1412
1547	/* first search for itself and remove any old instances */	1413	/* first search for itself and remove any old instances */
1548		1414
1549	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1415	for (tmp = op->ms ().bot; tmp; tmp = tmp->above)
1550	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */	1416	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */
1551	tmp->destroy ();	1417	tmp->destroy ();
1552		1418
1553	tmp1 = arch_to_object (archetype::find (arch_string));	1419	tmp1 = arch_to_object (archetype::find (arch_string));
1554		1420
1555	tmp1->x = op->x;	1421	tmp1->x = op->x;
1556	tmp1->y = op->y;	1422	tmp1->y = op->y;
1557	insert_ob_in_map (tmp1, op->map, op, 0);	1423	insert_ob_in_map (tmp1, op->map, op, 0);
		1424	}
		1425
		1426	object *
		1427	object::insert_at (object *where, object *originator, int flags)
		1428	{
		1429	where->map->insert (this, where->x, where->y, originator, flags);
1558	}	1430	}
1559		1431
1560	/*	1432	/*
1561	* get_split_ob(ob,nr) splits up ob into two parts. The part which	1433	* get_split_ob(ob,nr) splits up ob into two parts. The part which
1562	* is returned contains nr objects, and the remaining parts contains	1434	* is returned contains nr objects, and the remaining parts contains
1563	* the rest (or is removed and freed if that number is 0).	1435	* the rest (or is removed and freed if that number is 0).
1564	* On failure, NULL is returned, and the reason put into the	1436	* On failure, NULL is returned, and the reason put into the
1565	* global static errmsg array.	1437	* global static errmsg array.
1566	*/	1438	*/
1567
1568	object *	1439	object *
1569	get_split_ob (object *orig_ob, uint32 nr)	1440	get_split_ob (object *orig_ob, uint32 nr)
1570	{	1441	{
1571	object *newob;	1442	object *newob;
1572	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);	1443	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
…		…
1608		1479
1609	object *	1480	object *
1610	decrease_ob_nr (object *op, uint32 i)	1481	decrease_ob_nr (object *op, uint32 i)
1611	{	1482	{
1612	object *tmp;	1483	object *tmp;
1613	player *pl;
1614		1484
1615	if (i == 0) /* objects with op->nrof require this check */	1485	if (i == 0) /* objects with op->nrof require this check */
1616	return op;	1486	return op;
1617		1487
1618	if (i > op->nrof)	1488	if (i > op->nrof)
1619	i = op->nrof;	1489	i = op->nrof;
1620		1490
1621	if (QUERY_FLAG (op, FLAG_REMOVED))	1491	if (QUERY_FLAG (op, FLAG_REMOVED))
1622	op->nrof -= i;	1492	op->nrof -= i;
1623	else if (op->env != NULL)	1493	else if (op->env)
1624	{	1494	{
1625	/* is this object in the players inventory, or sub container	1495	/* is this object in the players inventory, or sub container
1626	* therein?	1496	* therein?
1627	*/	1497	*/
1628	tmp = is_player_inv (op->env);	1498	tmp = op->in_player ();
1629	/* nope. Is this a container the player has opened?	1499	/* nope. Is this a container the player has opened?
1630	* If so, set tmp to that player.	1500	* If so, set tmp to that player.
1631	* IMO, searching through all the players will mostly	1501	* IMO, searching through all the players will mostly
1632	* likely be quicker than following op->env to the map,	1502	* likely be quicker than following op->env to the map,
1633	* and then searching the map for a player.	1503	* and then searching the map for a player.
1634	*/	1504	*/
1635	if (!tmp)	1505	if (!tmp)
1636	{	1506	for_all_players (pl)
1637	for (pl = first_player; pl; pl = pl->next)
1638	if (pl->ob->container == op->env)	1507	if (pl->ob->container == op->env)
		1508	{
		1509	tmp = pl->ob;
1639	break;	1510	break;
1640	if (pl)
1641	tmp = pl->ob;
1642	else
1643	tmp = NULL;
1644	}	1511	}
1645		1512
1646	if (i < op->nrof)	1513	if (i < op->nrof)
1647	{	1514	{
1648	sub_weight (op->env, op->weight * i);	1515	sub_weight (op->env, op->weight * i);
1649	op->nrof -= i;	1516	op->nrof -= i;
1650	if (tmp)	1517	if (tmp)
1651	{
1652	esrv_send_item (tmp, op);	1518	esrv_send_item (tmp, op);
1653	}
1654	}	1519	}
1655	else	1520	else
1656	{	1521	{
1657	op->remove ();	1522	op->remove ();
1658	op->nrof = 0;	1523	op->nrof = 0;
1659	if (tmp)	1524	if (tmp)
1660	{
1661	esrv_del_item (tmp->contr, op->count);	1525	esrv_del_item (tmp->contr, op->count);
1662	}
1663	}	1526	}
1664	}	1527	}
1665	else	1528	else
1666	{	1529	{
1667	object *above = op->above;	1530	object *above = op->above;
…		…
1673	op->remove ();	1536	op->remove ();
1674	op->nrof = 0;	1537	op->nrof = 0;
1675	}	1538	}
1676		1539
1677	/* Since we just removed op, op->above is null */	1540	/* Since we just removed op, op->above is null */
1678	for (tmp = above; tmp != NULL; tmp = tmp->above)	1541	for (tmp = above; tmp; tmp = tmp->above)
1679	if (tmp->type == PLAYER)	1542	if (tmp->type == PLAYER)
1680	{	1543	{
1681	if (op->nrof)	1544	if (op->nrof)
1682	esrv_send_item (tmp, op);	1545	esrv_send_item (tmp, op);
1683	else	1546	else
…		…
1688	if (op->nrof)	1551	if (op->nrof)
1689	return op;	1552	return op;
1690	else	1553	else
1691	{	1554	{
1692	op->destroy ();	1555	op->destroy ();
1693	return NULL;	1556	return 0;
1694	}	1557	}
1695	}	1558	}
1696		1559
1697	/*	1560	/*
1698	* add_weight(object, weight) adds the specified weight to an object,	1561	* add_weight(object, weight) adds the specified weight to an object,
…		…
1786	add_weight (this, op->weight * op->nrof);	1649	add_weight (this, op->weight * op->nrof);
1787	}	1650	}
1788	else	1651	else
1789	add_weight (this, (op->weight + op->carrying));	1652	add_weight (this, (op->weight + op->carrying));
1790		1653
1791	otmp = is_player_inv (this);	1654	otmp = this->in_player ();
1792	if (otmp && otmp->contr)	1655	if (otmp && otmp->contr)
1793	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1656	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1794	fix_player (otmp);	1657	otmp->update_stats ();
1795		1658
1796	op->map = NULL;	1659	op->map = 0;
1797	op->env = this;	1660	op->env = this;
1798	op->above = NULL;	1661	op->above = 0;
1799	op->below = NULL;	1662	op->below = 0;
1800	op->x = 0, op->y = 0;	1663	op->x = 0, op->y = 0;
1801		1664
1802	/* reset the light list and los of the players on the map */	1665	/* reset the light list and los of the players on the map */
1803	if ((op->glow_radius != 0) && map)	1666	if ((op->glow_radius != 0) && map)
1804	{	1667	{
1805	#ifdef DEBUG_LIGHTS	1668	#ifdef DEBUG_LIGHTS
1806	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);	1669	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1807	#endif /* DEBUG_LIGHTS */	1670	#endif /* DEBUG_LIGHTS */
1808	if (MAP_DARKNESS (map))	1671	if (map->darkness)
1809	update_all_los (map, x, y);	1672	update_all_los (map, x, y);
1810	}	1673	}
1811		1674
1812	/* Client has no idea of ordering so lets not bother ordering it here.	1675	/* Client has no idea of ordering so lets not bother ordering it here.
1813	* It sure simplifies this function...	1676	* It sure simplifies this function...
…		…
1818	{	1681	{
1819	op->below = inv;	1682	op->below = inv;
1820	op->below->above = op;	1683	op->below->above = op;
1821	inv = op;	1684	inv = op;
1822	}	1685	}
		1686
		1687	INVOKE_OBJECT (INSERT, this);
1823		1688
1824	return op;	1689	return op;
1825	}	1690	}
1826		1691
1827	/*	1692	/*
…		…
1842	*	1707	*
1843	* MSW 2001-07-08: Check all objects on space, not just those below	1708	* MSW 2001-07-08: Check all objects on space, not just those below
1844	* object being inserted. insert_ob_in_map may not put new objects	1709	* object being inserted. insert_ob_in_map may not put new objects
1845	* on top.	1710	* on top.
1846	*/	1711	*/
1847
1848	int	1712	int
1849	check_move_on (object *op, object *originator)	1713	check_move_on (object *op, object *originator)
1850	{	1714	{
1851	object *tmp;	1715	object *tmp;
1852	maptile *m = op->map;	1716	maptile *m = op->map;
…		…
1879		1743
1880	/* The objects have to be checked from top to bottom.	1744	/* The objects have to be checked from top to bottom.
1881	* Hence, we first go to the top:	1745	* Hence, we first go to the top:
1882	*/	1746	*/
1883		1747
1884	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL && tmp->above != NULL; tmp = tmp->above)	1748	for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above)
1885	{	1749	{
1886	/* Trim the search when we find the first other spell effect	1750	/* Trim the search when we find the first other spell effect
1887	* this helps performance so that if a space has 50 spell objects,	1751	* this helps performance so that if a space has 50 spell objects,
1888	* we don't need to check all of them.	1752	* we don't need to check all of them.
1889	*/	1753	*/
…		…
1944	/*	1808	/*
1945	* present_arch(arch, map, x, y) searches for any objects with	1809	* present_arch(arch, map, x, y) searches for any objects with
1946	* a matching archetype at the given map and coordinates.	1810	* a matching archetype at the given map and coordinates.
1947	* The first matching object is returned, or NULL if none.	1811	* The first matching object is returned, or NULL if none.
1948	*/	1812	*/
1949
1950	object *	1813	object *
1951	present_arch (const archetype *at, maptile *m, int x, int y)	1814	present_arch (const archetype *at, maptile *m, int x, int y)
1952	{	1815	{
1953	object *
1954	tmp;
1955
1956	if (m == NULL || out_of_map (m, x, y))	1816	if (!m || out_of_map (m, x, y))
1957	{	1817	{
1958	LOG (llevError, "Present_arch called outside map.\n");	1818	LOG (llevError, "Present_arch called outside map.\n");
1959	return NULL;	1819	return NULL;
1960	}	1820	}
1961	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1821
		1822	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1962	if (tmp->arch == at)	1823	if (tmp->arch == at)
1963	return tmp;	1824	return tmp;
		1825
1964	return NULL;	1826	return NULL;
1965	}	1827	}
1966		1828
1967	/*	1829	/*
1968	* present(type, map, x, y) searches for any objects with	1830	* present(type, map, x, y) searches for any objects with
1969	* a matching type variable at the given map and coordinates.	1831	* a matching type variable at the given map and coordinates.
1970	* The first matching object is returned, or NULL if none.	1832	* The first matching object is returned, or NULL if none.
1971	*/	1833	*/
1972
1973	object *	1834	object *
1974	present (unsigned char type, maptile *m, int x, int y)	1835	present (unsigned char type, maptile *m, int x, int y)
1975	{	1836	{
1976	object *
1977	tmp;
1978
1979	if (out_of_map (m, x, y))	1837	if (out_of_map (m, x, y))
1980	{	1838	{
1981	LOG (llevError, "Present called outside map.\n");	1839	LOG (llevError, "Present called outside map.\n");
1982	return NULL;	1840	return NULL;
1983	}	1841	}
1984	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1842
		1843	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1985	if (tmp->type == type)	1844	if (tmp->type == type)
1986	return tmp;	1845	return tmp;
		1846
1987	return NULL;	1847	return NULL;
1988	}	1848	}
1989		1849
1990	/*	1850	/*
1991	* present_in_ob(type, object) searches for any objects with	1851	* present_in_ob(type, object) searches for any objects with
1992	* a matching type variable in the inventory of the given object.	1852	* a matching type variable in the inventory of the given object.
1993	* The first matching object is returned, or NULL if none.	1853	* The first matching object is returned, or NULL if none.
1994	*/	1854	*/
1995
1996	object *	1855	object *
1997	present_in_ob (unsigned char type, const object *op)	1856	present_in_ob (unsigned char type, const object *op)
1998	{	1857	{
1999	object *
2000	tmp;
2001
2002	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1858	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2003	if (tmp->type == type)	1859	if (tmp->type == type)
2004	return tmp;	1860	return tmp;
		1861
2005	return NULL;	1862	return NULL;
2006	}	1863	}
2007		1864
2008	/*	1865	/*
2009	* present_in_ob (type, str, object) searches for any objects with	1866	* present_in_ob (type, str, object) searches for any objects with
…		…
2017	* str is the string to match against. Note that we match against	1874	* str is the string to match against. Note that we match against
2018	* the object name, not the archetype name. this is so that the	1875	* the object name, not the archetype name. this is so that the
2019	* spell code can use one object type (force), but change it's name	1876	* spell code can use one object type (force), but change it's name
2020	* to be unique.	1877	* to be unique.
2021	*/	1878	*/
2022
2023	object *	1879	object *
2024	present_in_ob_by_name (int type, const char *str, const object *op)	1880	present_in_ob_by_name (int type, const char *str, const object *op)
2025	{	1881	{
2026	object *
2027	tmp;
2028
2029	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1882	for (object *tmp = op->inv; tmp; tmp = tmp->below)
2030	{
2031	if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name)))	1883	if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name)))
2032	return tmp;	1884	return tmp;
2033	}	1885
2034	return NULL;	1886	return 0;
2035	}	1887	}
2036		1888
2037	/*	1889	/*
2038	* present_arch_in_ob(archetype, object) searches for any objects with	1890	* present_arch_in_ob(archetype, object) searches for any objects with
2039	* a matching archetype in the inventory of the given object.	1891	* a matching archetype in the inventory of the given object.
2040	* The first matching object is returned, or NULL if none.	1892	* The first matching object is returned, or NULL if none.
2041	*/	1893	*/
2042
2043	object *	1894	object *
2044	present_arch_in_ob (const archetype *at, const object *op)	1895	present_arch_in_ob (const archetype *at, const object *op)
2045	{	1896	{
2046	object *
2047	tmp;
2048
2049	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1897	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2050	if (tmp->arch == at)	1898	if (tmp->arch == at)
2051	return tmp;	1899	return tmp;
		1900
2052	return NULL;	1901	return NULL;
2053	}	1902	}
2054		1903
2055	/*	1904	/*
2056	* activate recursively a flag on an object inventory	1905	* activate recursively a flag on an object inventory
2057	*/	1906	*/
2058	void	1907	void
2059	flag_inv (object *op, int flag)	1908	flag_inv (object *op, int flag)
2060	{	1909	{
2061	object *
2062	tmp;
2063
2064	if (op->inv)	1910	if (op->inv)
2065	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1911	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2066	{	1912	{
2067	SET_FLAG (tmp, flag);	1913	SET_FLAG (tmp, flag);
2068	flag_inv (tmp, flag);	1914	flag_inv (tmp, flag);
2069	}	1915	}
2070	} /*	1916	}
		1917
		1918	/*
2071	* desactivate recursively a flag on an object inventory	1919	* deactivate recursively a flag on an object inventory
2072	*/	1920	*/
2073	void	1921	void
2074	unflag_inv (object *op, int flag)	1922	unflag_inv (object *op, int flag)
2075	{	1923	{
2076	object *
2077	tmp;
2078
2079	if (op->inv)	1924	if (op->inv)
2080	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1925	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2081	{	1926	{
2082	CLEAR_FLAG (tmp, flag);	1927	CLEAR_FLAG (tmp, flag);
2083	unflag_inv (tmp, flag);	1928	unflag_inv (tmp, flag);
2084	}	1929	}
2085	}	1930	}
…		…
2088	* set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in	1933	* set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in
2089	* all it's inventory (recursively).	1934	* all it's inventory (recursively).
2090	* If checksums are used, a player will get set_cheat called for	1935	* If checksums are used, a player will get set_cheat called for
2091	* him/her-self and all object carried by a call to this function.	1936	* him/her-self and all object carried by a call to this function.
2092	*/	1937	*/
2093
2094	void	1938	void
2095	set_cheat (object *op)	1939	set_cheat (object *op)
2096	{	1940	{
2097	SET_FLAG (op, FLAG_WAS_WIZ);	1941	SET_FLAG (op, FLAG_WAS_WIZ);
2098	flag_inv (op, FLAG_WAS_WIZ);	1942	flag_inv (op, FLAG_WAS_WIZ);
…		…
2117	* because arch_blocked (now ob_blocked) needs to know the movement type	1961	* because arch_blocked (now ob_blocked) needs to know the movement type
2118	* to know if the space in question will block the object. We can't use	1962	* to know if the space in question will block the object. We can't use
2119	* the archetype because that isn't correct if the monster has been	1963	* the archetype because that isn't correct if the monster has been
2120	* customized, changed states, etc.	1964	* customized, changed states, etc.
2121	*/	1965	*/
2122
2123	int	1966	int
2124	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)	1967	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2125	{	1968	{
2126	int
2127	i,
2128	index = 0, flag;	1969	int index = 0, flag;
2129	static int
2130	altern[SIZEOFFREE];	1970	int altern[SIZEOFFREE];
2131		1971
2132	for (i = start; i < stop; i++)	1972	for (int i = start; i < stop; i++)
2133	{	1973	{
2134	flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]);	1974	flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]);
2135	if (!flag)	1975	if (!flag)
2136	altern[index++] = i;	1976	altern [index++] = i;
2137		1977
2138	/* Basically, if we find a wall on a space, we cut down the search size.	1978	/* Basically, if we find a wall on a space, we cut down the search size.
2139	* In this way, we won't return spaces that are on another side of a wall.	1979	* In this way, we won't return spaces that are on another side of a wall.
2140	* This mostly work, but it cuts down the search size in all directions -	1980	* This mostly work, but it cuts down the search size in all directions -
2141	* if the space being examined only has a wall to the north and empty	1981	* if the space being examined only has a wall to the north and empty
2142	* spaces in all the other directions, this will reduce the search space	1982	* spaces in all the other directions, this will reduce the search space
2143	* to only the spaces immediately surrounding the target area, and	1983	* to only the spaces immediately surrounding the target area, and
2144	* won't look 2 spaces south of the target space.	1984	* won't look 2 spaces south of the target space.
2145	*/	1985	*/
2146	else if ((flag & AB_NO_PASS) && maxfree[i] < stop)	1986	else if ((flag & P_NO_PASS) && maxfree[i] < stop)
2147	stop = maxfree[i];	1987	stop = maxfree[i];
2148	}	1988	}
		1989
2149	if (!index)	1990	if (!index)
2150	return -1;	1991	return -1;
		1992
2151	return altern[RANDOM () % index];	1993	return altern[RANDOM () % index];
2152	}	1994	}
2153		1995
2154	/*	1996	/*
2155	* find_first_free_spot(archetype, maptile, x, y) works like	1997	* find_first_free_spot(archetype, maptile, x, y) works like
2156	* find_free_spot(), but it will search max number of squares.	1998	* find_free_spot(), but it will search max number of squares.
2157	* But it will return the first available spot, not a random choice.	1999	* But it will return the first available spot, not a random choice.
2158	* Changed 0.93.2: Have it return -1 if there is no free spot available.	2000	* Changed 0.93.2: Have it return -1 if there is no free spot available.
2159	*/	2001	*/
2160
2161	int	2002	int
2162	find_first_free_spot (const object *ob, maptile *m, int x, int y)	2003	find_first_free_spot (const object *ob, maptile *m, int x, int y)
2163	{	2004	{
2164	int
2165	i;
2166
2167	for (i = 0; i < SIZEOFFREE; i++)	2005	for (int i = 0; i < SIZEOFFREE; i++)
2168	{
2169	if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]))	2006	if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]))
2170	return i;	2007	return i;
2171	}	2008
2172	return -1;	2009	return -1;
2173	}	2010	}
2174		2011
2175	/*	2012	/*
2176	* The function permute(arr, begin, end) randomly reorders the array	2013	* The function permute(arr, begin, end) randomly reorders the array
2177	* arr[begin..end-1].	2014	* arr[begin..end-1].
		2015	* now uses a fisher-yates shuffle, old permute was broken
2178	*/	2016	*/
2179	static void	2017	static void
2180	permute (int *arr, int begin, int end)	2018	permute (int *arr, int begin, int end)
2181	{	2019	{
2182	int	2020	arr += begin;
2183	i,
2184	j,
2185	tmp,
2186	len;
2187
2188	len = end - begin;	2021	end -= begin;
2189	for (i = begin; i < end; i++)
2190	{
2191	j = begin + RANDOM () % len;
2192		2022
2193	tmp = arr[i];	2023	while (--end)
2194	arr[i] = arr[j];	2024	swap (arr [end], arr [RANDOM () % (end + 1)]);
2195	arr[j] = tmp;
2196	}
2197	}	2025	}
2198		2026
2199	/* new function to make monster searching more efficient, and effective!	2027	/* new function to make monster searching more efficient, and effective!
2200	* This basically returns a randomized array (in the passed pointer) of	2028	* This basically returns a randomized array (in the passed pointer) of
2201	* the spaces to find monsters. In this way, it won't always look for	2029	* the spaces to find monsters. In this way, it won't always look for
…		…
2204	* the 3x3 area will be searched, just not in a predictable order.	2032	* the 3x3 area will be searched, just not in a predictable order.
2205	*/	2033	*/
2206	void	2034	void
2207	get_search_arr (int *search_arr)	2035	get_search_arr (int *search_arr)
2208	{	2036	{
2209	int	2037	int i;
2210	i;
2211		2038
2212	for (i = 0; i < SIZEOFFREE; i++)	2039	for (i = 0; i < SIZEOFFREE; i++)
2213	{
2214	search_arr[i] = i;	2040	search_arr[i] = i;
2215	}
2216		2041
2217	permute (search_arr, 1, SIZEOFFREE1 + 1);	2042	permute (search_arr, 1, SIZEOFFREE1 + 1);
2218	permute (search_arr, SIZEOFFREE1 + 1, SIZEOFFREE2 + 1);	2043	permute (search_arr, SIZEOFFREE1 + 1, SIZEOFFREE2 + 1);
2219	permute (search_arr, SIZEOFFREE2 + 1, SIZEOFFREE);	2044	permute (search_arr, SIZEOFFREE2 + 1, SIZEOFFREE);
2220	}	2045	}
…		…
2229	* Perhaps incorrectly, but I'm making the assumption that exclude	2054	* Perhaps incorrectly, but I'm making the assumption that exclude
2230	* is actually want is going to try and move there. We need this info	2055	* is actually want is going to try and move there. We need this info
2231	* because we have to know what movement the thing looking to move	2056	* because we have to know what movement the thing looking to move
2232	* there is capable of.	2057	* there is capable of.
2233	*/	2058	*/
2234
2235	int	2059	int
2236	find_dir (maptile *m, int x, int y, object *exclude)	2060	find_dir (maptile *m, int x, int y, object *exclude)
2237	{	2061	{
2238	int
2239	i,
2240	max = SIZEOFFREE, mflags;	2062	int i, max = SIZEOFFREE, mflags;
2241		2063
2242	sint16 nx, ny;	2064	sint16 nx, ny;
2243	object *	2065	object *tmp;
2244	tmp;
2245	maptile *	2066	maptile *mp;
2246	mp;
2247		2067
2248	MoveType blocked, move_type;	2068	MoveType blocked, move_type;
2249		2069
2250	if (exclude && exclude->head)	2070	if (exclude && exclude->head)
2251	{	2071	{
…		…
2263	mp = m;	2083	mp = m;
2264	nx = x + freearr_x[i];	2084	nx = x + freearr_x[i];
2265	ny = y + freearr_y[i];	2085	ny = y + freearr_y[i];
2266		2086
2267	mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);	2087	mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);
		2088
2268	if (mflags & P_OUT_OF_MAP)	2089	if (mflags & P_OUT_OF_MAP)
2269	{
2270	max = maxfree[i];	2090	max = maxfree[i];
2271	}
2272	else	2091	else
2273	{	2092	{
2274	blocked = GET_MAP_MOVE_BLOCK (mp, nx, ny);	2093	mapspace &ms = mp->at (nx, ny);
		2094
		2095	blocked = ms.move_block;
2275		2096
2276	if ((move_type & blocked) == move_type)	2097	if ((move_type & blocked) == move_type)
2277	{
2278	max = maxfree[i];	2098	max = maxfree[i];
2279	}
2280	else if (mflags & P_IS_ALIVE)	2099	else if (mflags & P_IS_ALIVE)
2281	{	2100	{
2282	for (tmp = GET_MAP_OB (mp, nx, ny); tmp != NULL; tmp = tmp->above)	2101	for (tmp = ms.bot; tmp; tmp = tmp->above)
2283	{	2102	if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)
2284	if ((QUERY_FLAG (tmp, FLAG_MONSTER) || tmp->type == PLAYER) && (tmp != exclude || (tmp->head && tmp->head != exclude)))	2103	&& (tmp != exclude || (tmp->head && tmp->head != exclude)))
2285	{
2286	break;	2104	break;
2287	}	2105
2288	}
2289	if (tmp)	2106	if (tmp)
2290	{
2291	return freedir[i];	2107	return freedir[i];
2292	}
2293	}	2108	}
2294	}	2109	}
2295	}	2110	}
		2111
2296	return 0;	2112	return 0;
2297	}	2113	}
2298		2114
2299	/*	2115	/*
2300	* distance(object 1, object 2) will return the square of the	2116	* distance(object 1, object 2) will return the square of the
2301	* distance between the two given objects.	2117	* distance between the two given objects.
2302	*/	2118	*/
2303
2304	int	2119	int
2305	distance (const object *ob1, const object *ob2)	2120	distance (const object *ob1, const object *ob2)
2306	{	2121	{
2307	int
2308	i;
2309
2310	i = (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);	2122	return (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);
2311	return i;
2312	}	2123	}
2313		2124
2314	/*	2125	/*
2315	* find_dir_2(delta-x,delta-y) will return a direction in which	2126	* find_dir_2(delta-x,delta-y) will return a direction in which
2316	* an object which has subtracted the x and y coordinates of another	2127	* an object which has subtracted the x and y coordinates of another
2317	* object, needs to travel toward it.	2128	* object, needs to travel toward it.
2318	*/	2129	*/
2319
2320	int	2130	int
2321	find_dir_2 (int x, int y)	2131	find_dir_2 (int x, int y)
2322	{	2132	{
2323	int	2133	int q;
2324	q;
2325		2134
2326	if (y)	2135	if (y)
2327	q = x * 100 / y;	2136	q = x * 100 / y;
2328	else if (x)	2137	else if (x)
2329	q = -300 * x;	2138	q = -300 * x;
…		…
2354		2163
2355	return 3;	2164	return 3;
2356	}	2165	}
2357		2166
2358	/*	2167	/*
2359	* absdir(int): Returns a number between 1 and 8, which represent
2360	* the "absolute" direction of a number (it actually takes care of
2361	* "overflow" in previous calculations of a direction).
2362	*/
2363
2364	int
2365	absdir (int d)
2366	{
2367	while (d < 1)
2368	d += 8;
2369	while (d > 8)
2370	d -= 8;
2371	return d;
2372	}
2373
2374	/*
2375	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is	2168	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is
2376	* between two directions (which are expected to be absolute (see absdir())	2169	* between two directions (which are expected to be absolute (see absdir())
2377	*/	2170	*/
2378
2379	int	2171	int
2380	dirdiff (int dir1, int dir2)	2172	dirdiff (int dir1, int dir2)
2381	{	2173	{
2382	int	2174	int d;
2383	d;
2384		2175
2385	d = abs (dir1 - dir2);	2176	d = abs (dir1 - dir2);
2386	if (d > 4)	2177	if (d > 4)
2387	d = 8 - d;	2178	d = 8 - d;
		2179
2388	return d;	2180	return d;
2389	}	2181	}
2390		2182
2391	/* peterm:	2183	/* peterm:
2392	* do LOS stuff for ball lightning. Go after the closest VISIBLE monster.	2184	* do LOS stuff for ball lightning. Go after the closest VISIBLE monster.
…		…
2395	* This basically means that if direction is 15, then it could either go	2187	* This basically means that if direction is 15, then it could either go
2396	* direction 4, 14, or 16 to get back to where we are.	2188	* direction 4, 14, or 16 to get back to where we are.
2397	* Moved from spell_util.c to object.c with the other related direction	2189	* Moved from spell_util.c to object.c with the other related direction
2398	* functions.	2190	* functions.
2399	*/	2191	*/
2400
2401	int
2402	reduction_dir[SIZEOFFREE][3] = {	2192	int reduction_dir[SIZEOFFREE][3] = {
2403	{0, 0, 0}, /* 0 */	2193	{0, 0, 0}, /* 0 */
2404	{0, 0, 0}, /* 1 */	2194	{0, 0, 0}, /* 1 */
2405	{0, 0, 0}, /* 2 */	2195	{0, 0, 0}, /* 2 */
2406	{0, 0, 0}, /* 3 */	2196	{0, 0, 0}, /* 3 */
2407	{0, 0, 0}, /* 4 */	2197	{0, 0, 0}, /* 4 */
…		…
2455	* find a path to that monster that we found. If not,	2245	* find a path to that monster that we found. If not,
2456	* we don't bother going toward it. Returns 1 if we	2246	* we don't bother going toward it. Returns 1 if we
2457	* can see a direct way to get it	2247	* can see a direct way to get it
2458	* Modified to be map tile aware -.MSW	2248	* Modified to be map tile aware -.MSW
2459	*/	2249	*/
2460
2461
2462	int	2250	int
2463	can_see_monsterP (maptile *m, int x, int y, int dir)	2251	can_see_monsterP (maptile *m, int x, int y, int dir)
2464	{	2252	{
2465	sint16 dx, dy;	2253	sint16 dx, dy;
2466	int
2467	mflags;	2254	int mflags;
2468		2255
2469	if (dir < 0)	2256	if (dir < 0)
2470	return 0; /* exit condition: invalid direction */	2257	return 0; /* exit condition: invalid direction */
2471		2258
2472	dx = x + freearr_x[dir];	2259	dx = x + freearr_x[dir];
…		…
2485	return 0;	2272	return 0;
2486		2273
2487	/* yes, can see. */	2274	/* yes, can see. */
2488	if (dir < 9)	2275	if (dir < 9)
2489	return 1;	2276	return 1;
		2277
2490	return can_see_monsterP (m, x, y, reduction_dir[dir][0]) |	2278	return can_see_monsterP (m, x, y, reduction_dir[dir][0])
2491	can_see_monsterP (m, x, y, reduction_dir[dir][1]) | can_see_monsterP (m, x, y, reduction_dir[dir][2]);	2279	| can_see_monsterP (m, x, y, reduction_dir[dir][1])
		2280	| can_see_monsterP (m, x, y, reduction_dir[dir][2]);
2492	}	2281	}
2493
2494
2495		2282
2496	/*	2283	/*
2497	* can_pick(picker, item): finds out if an object is possible to be	2284	* can_pick(picker, item): finds out if an object is possible to be
2498	* picked up by the picker. Returnes 1 if it can be	2285	* picked up by the picker. Returnes 1 if it can be
2499	* picked up, otherwise 0.	2286	* picked up, otherwise 0.
…		…
2510	return /*QUERY_FLAG(who,FLAG_WIZ)|| */	2297	return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2511	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&	2298	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
2512	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3));	2299	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3));
2513	}	2300	}
2514		2301
2515
2516	/*	2302	/*
2517	* create clone from object to another	2303	* create clone from object to another
2518	*/	2304	*/
2519	object *	2305	object *
2520	object_create_clone (object *asrc)	2306	object_create_clone (object *asrc)
…		…
2539	{	2325	{
2540	dst = tmp;	2326	dst = tmp;
2541	tmp->head = 0;	2327	tmp->head = 0;
2542	}	2328	}
2543	else	2329	else
2544	{
2545	tmp->head = dst;	2330	tmp->head = dst;
2546	}
2547		2331
2548	tmp->more = 0;	2332	tmp->more = 0;
2549		2333
2550	if (prev)	2334	if (prev)
2551	prev->more = tmp;	2335	prev->more = tmp;
…		…
2563	/* Basically, we save the content of the string to a temp file, then call */	2347	/* Basically, we save the content of the string to a temp file, then call */
2564	/* load_object on it. I admit it is a highly inefficient way to make things, */	2348	/* load_object on it. I admit it is a highly inefficient way to make things, */
2565	/* but it was simple to make and allows reusing the load_object function. */	2349	/* but it was simple to make and allows reusing the load_object function. */
2566	/* Remember not to use load_object_str in a time-critical situation. */	2350	/* Remember not to use load_object_str in a time-critical situation. */
2567	/* Also remember that multiparts objects are not supported for now. */	2351	/* Also remember that multiparts objects are not supported for now. */
2568
2569	object *	2352	object *
2570	load_object_str (const char *obstr)	2353	load_object_str (const char *obstr)
2571	{	2354	{
2572	object *op;	2355	object *op;
2573	char filename[MAX_BUF];	2356	char filename[MAX_BUF];
…		…
2603	* returns NULL if no match.	2386	* returns NULL if no match.
2604	*/	2387	*/
2605	object *	2388	object *
2606	find_obj_by_type_subtype (const object *who, int type, int subtype)	2389	find_obj_by_type_subtype (const object *who, int type, int subtype)
2607	{	2390	{
2608	object *tmp;
2609
2610	for (tmp = who->inv; tmp; tmp = tmp->below)	2391	for (object *tmp = who->inv; tmp; tmp = tmp->below)
2611	if (tmp->type == type && tmp->subtype == subtype)	2392	if (tmp->type == type && tmp->subtype == subtype)
2612	return tmp;	2393	return tmp;
2613		2394
2614	return NULL;	2395	return 0;
2615	}	2396	}
2616		2397
2617	/* If ob has a field named key, return the link from the list,	2398	/* If ob has a field named key, return the link from the list,
2618	* otherwise return NULL.	2399	* otherwise return NULL.
2619	*	2400	*
…		…
2621	* do the desired thing.	2402	* do the desired thing.
2622	*/	2403	*/
2623	key_value *	2404	key_value *
2624	get_ob_key_link (const object *ob, const char *key)	2405	get_ob_key_link (const object *ob, const char *key)
2625	{	2406	{
2626	key_value *link;
2627
2628	for (link = ob->key_values; link != NULL; link = link->next)	2407	for (key_value *link = ob->key_values; link; link = link->next)
2629	if (link->key == key)	2408	if (link->key == key)
2630	return link;	2409	return link;
2631		2410
2632	return NULL;	2411	return 0;
2633	}	2412	}
2634		2413
2635	/*	2414	/*
2636	* Returns the value of op has an extra_field for key, or NULL.	2415	* Returns the value of op has an extra_field for key, or NULL.
2637	*	2416	*
…		…
2677	* Returns TRUE on success.	2456	* Returns TRUE on success.
2678	*/	2457	*/
2679	int	2458	int
2680	set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key)	2459	set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key)
2681	{	2460	{
2682	key_value *
2683	field = NULL, *last = NULL;	2461	key_value *field = NULL, *last = NULL;
2684		2462
2685	for (field = op->key_values; field != NULL; field = field->next)	2463	for (field = op->key_values; field != NULL; field = field->next)
2686	{	2464	{
2687	if (field->key != canonical_key)	2465	if (field->key != canonical_key)
2688	{	2466	{
…		…
2716	/* IF we get here, key doesn't exist */	2494	/* IF we get here, key doesn't exist */
2717		2495
2718	/* No field, we'll have to add it. */	2496	/* No field, we'll have to add it. */
2719		2497
2720	if (!add_key)	2498	if (!add_key)
2721	{
2722	return FALSE;	2499	return FALSE;
2723	}	2500
2724	/* There isn't any good reason to store a null	2501	/* There isn't any good reason to store a null
2725	* value in the key/value list. If the archetype has	2502	* value in the key/value list. If the archetype has
2726	* this key, then we should also have it, so shouldn't	2503	* this key, then we should also have it, so shouldn't
2727	* be here. If user wants to store empty strings,	2504	* be here. If user wants to store empty strings,
2728	* should pass in ""	2505	* should pass in ""
…		…
2777	}	2554	}
2778	else	2555	else
2779	item = item->env;	2556	item = item->env;
2780	}	2557	}
2781		2558
		2559
		2560	const char *
		2561	object::flag_desc (char *desc, int len) const
		2562	{
		2563	char *p = desc;
		2564	bool first = true;
		2565
		2566	*p = 0;
		2567
		2568	for (int i = 0; i < NUM_FLAGS; i++)
		2569	{
		2570	if (len <= 10) // magic constant!
		2571	{
		2572	snprintf (p, len, ",...");
		2573	break;
		2574	}
		2575
		2576	if (flag [i])
		2577	{
		2578	int cnt = snprintf (p, len, "%s%d", first ? "" : ",", i);
		2579	len -= cnt;
		2580	p += cnt;
		2581	first = false;
		2582	}
		2583	}
		2584
		2585	return desc;
		2586	}
		2587
2782	// return a suitable string describing an objetc in enough detail to find it	2588	// return a suitable string describing an object in enough detail to find it
2783	const char *	2589	const char *
2784	object::debug_desc (char *info) const	2590	object::debug_desc (char *info) const
2785	{	2591	{
		2592	char flagdesc[512];
2786	char info2[256 * 3];	2593	char info2[256 * 4];
2787	char *p = info;	2594	char *p = info;
2788		2595
2789	p += snprintf (p, 256, "%d=\"%s%s%s\"",	2596	p += snprintf (p, 512, "{cnt:%d,uuid:<1,%" PRIx64 ">,name:\"%s%s%s\",flags:[%s],type:%d}",
2790	count,	2597	count, uuid.seq,
2791	&name,	2598	&name,
2792	title ? " " : "",	2599	title ? "\",title:" : "",
2793	title ? (const char *)title : "");	2600	title ? (const char *)title : "",
		2601	flag_desc (flagdesc, 512), type);
2794		2602
2795	if (env)	2603	if (env)
2796	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2604	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2797		2605
2798	if (map)	2606	if (map)
2799	p += snprintf (p, 256, "(on %s@%d+%d)", map->path, x, y);	2607	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2800		2608
2801	return info;	2609	return info;
2802	}	2610	}
2803		2611
2804	const char *	2612	const char *
2805	object::debug_desc () const	2613	object::debug_desc () const
2806	{	2614	{
2807	static char info[256 * 3];	2615	static char info[256 * 4];
2808	return debug_desc (info);	2616	return debug_desc (info);
2809	}	2617	}
2810		2618
		2619	const char *
		2620	object::debug_desc2 () const
		2621	{
		2622	static char info[256 * 4];
		2623	return debug_desc (info);
		2624	}
		2625

Diff Legend

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