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.55 by root, Sun Dec 3 00:41:33 2006 UTC vs.
Revision 1.107 by pippijn, Sat Jan 6 14:42:29 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
…		…
29	#include <sys/types.h>	30	#include <sys/types.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>
		35
		36	#include <bitset>
34		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
…		…
104	_exit (1);	107	_exit (1);
105	}	108	}
106		109
107	uuid.seq = uid;	110	uuid.seq = uid;
108	write_uuid ();	111	write_uuid ();
109	LOG (llevDebug, "read UID: %lld\n", uid);	112	LOG (llevDebug, "read UID: %" PRId64 "\n", uid);
110	fclose (fp);	113	fclose (fp);
111	}	114	}
112		115
113	UUID	116	UUID
114	gen_uuid ()	117	gen_uuid ()
…		…
139	* objects with lists are rare, and lists stay short. If not, use a	142	* objects with lists are rare, and lists stay short. If not, use a
140	* different structure or at least keep the lists sorted...	143	* different structure or at least keep the lists sorted...
141	*/	144	*/
142		145
143	/* For each field in wants, */	146	/* For each field in wants, */
144	for (wants_field = wants->key_values; wants_field != NULL; wants_field = wants_field->next)	147	for (wants_field = wants->key_values; wants_field; wants_field = wants_field->next)
145	{	148	{
146	key_value *has_field;	149	key_value *has_field;
147		150
148	/* Look for a field in has with the same key. */	151	/* Look for a field in has with the same key. */
149	has_field = get_ob_key_link (has, wants_field->key);	152	has_field = get_ob_key_link (has, wants_field->key);
…		…
183	*	186	*
184	* Note that this function appears a lot longer than the macro it	187	* Note that this function appears a lot longer than the macro it
185	* replaces - this is mostly for clarity - a decent compiler should hopefully	188	* replaces - this is mostly for clarity - a decent compiler should hopefully
186	* reduce this to the same efficiency.	189	* reduce this to the same efficiency.
187	*	190	*
188	* Check nrof variable *before* calling CAN_MERGE()	191	* Check nrof variable *before* calling can_merge()
189	*	192	*
190	* Improvements made with merge: Better checking on potion, and also	193	* Improvements made with merge: Better checking on potion, and also
191	* check weight	194	* check weight
192	*/	195	*/
193
194	bool object::can_merge (object *ob1, object *ob2)	196	bool object::can_merge_slow (object *ob1, object *ob2)
195	{	197	{
196	/* A couple quicksanity checks */	198	/* A couple quicksanity checks */
197	if ((ob1 == ob2) || (ob1->type != ob2->type))	199	if (ob1 == ob2
		200	|| ob1->type != ob2->type
		201	|| ob1->speed != ob2->speed
		202	|| ob1->value != ob2->value
		203	|| ob1->name != ob2->name)
198	return 0;	204	return 0;
199		205
200	if (ob1->speed != ob2->speed)	206	//TODO: this ain't working well, use nicer and correct overflow check
201	return 0;
202
203	/* Do not merge objects if nrof would overflow. We use 1UL<<31 since that	207	/* Do not merge objects if nrof would overflow. We use 1UL<<31 since that
204	* value could not be stored in a sint32 (which unfortunately sometimes is	208	* value could not be stored in a sint32 (which unfortunately sometimes is
205	* used to store nrof).	209	* used to store nrof).
206	*/	210	*/
207	if (ob1->nrof + ob2->nrof >= 1UL << 31)	211	if (ob1->nrof + ob2->nrof >= 1UL << 31)
…		…
217	SET_FLAG (ob1, FLAG_BEEN_APPLIED);	221	SET_FLAG (ob1, FLAG_BEEN_APPLIED);
218		222
219	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))	223	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))
220	SET_FLAG (ob2, FLAG_BEEN_APPLIED);	224	SET_FLAG (ob2, FLAG_BEEN_APPLIED);
221		225
222		226	if ((ob1->flag ^ ob2->flag).reset (FLAG_INV_LOCKED).reset (FLAG_CLIENT_SENT).any ()
223	/* the 0x400000 on flags2 is FLAG_INV_LOCK. I don't think something	227	|| ob1->arch != ob2->arch
224	* being locked in inventory should prevent merging.
225	* 0x4 in flags3 is CLIENT_SENT
226	*/
227	if ((ob1->arch != ob2->arch) ||
228	(ob1->flags[0] != ob2->flags[0]) ||
229	(ob1->flags[1] != ob2->flags[1]) ||
230	((ob1->flags[2] & ~0x400000) != (ob2->flags[2] & ~0x400000)) ||
231	((ob1->flags[3] & ~0x4) != (ob2->flags[3] & ~0x4)) ||
232	(ob1->name != ob2->name) ||	228	|| ob1->name != ob2->name
233	(ob1->title != ob2->title) ||	229	|| ob1->title != ob2->title
234	(ob1->msg != ob2->msg) ||	230	|| ob1->msg != ob2->msg
235	(ob1->weight != ob2->weight) ||	231	|| ob1->weight != ob2->weight
236	(memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist)) != 0) ||	232	|| memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
237	(memcmp (&ob1->stats, &ob2->stats, sizeof (ob1->stats)) != 0) ||	233	|| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats) )
238	(ob1->attacktype != ob2->attacktype) ||	234	|| ob1->attacktype != ob2->attacktype
239	(ob1->magic != ob2->magic) ||	235	|| ob1->magic != ob2->magic
240	(ob1->slaying != ob2->slaying) ||	236	|| ob1->slaying != ob2->slaying
241	(ob1->skill != ob2->skill) ||	237	|| ob1->skill != ob2->skill
242	(ob1->value != ob2->value) ||	238	|| ob1->value != ob2->value
243	(ob1->animation_id != ob2->animation_id) ||	239	|| ob1->animation_id != ob2->animation_id
244	(ob1->client_type != ob2->client_type) ||	240	|| ob1->client_type != ob2->client_type
245	(ob1->materialname != ob2->materialname) ||	241	|| ob1->materialname != ob2->materialname
246	(ob1->lore != ob2->lore) ||	242	|| ob1->lore != ob2->lore
247	(ob1->subtype != ob2->subtype) ||	243	|| ob1->subtype != ob2->subtype
248	(ob1->move_type != ob2->move_type) ||	244	|| ob1->move_type != ob2->move_type
249	(ob1->move_block != ob2->move_block) ||	245	|| ob1->move_block != ob2->move_block
250	(ob1->move_allow != ob2->move_allow) ||	246	|| ob1->move_allow != ob2->move_allow
251	(ob1->move_on != ob2->move_on) ||	247	|| ob1->move_on != ob2->move_on
252	(ob1->move_off != ob2->move_off) || (ob1->move_slow != ob2->move_slow) || (ob1->move_slow_penalty != ob2->move_slow_penalty))	248	|| ob1->move_off != ob2->move_off
		249	|| ob1->move_slow != ob2->move_slow
		250	|| ob1->move_slow_penalty != ob2->move_slow_penalty)
253	return 0;	251	return 0;
254		252
255	/* This is really a spellbook check - really, we should	253	/* This is really a spellbook check - really, we should
256	* check all objects in the inventory.	254	* check all objects in the inventory.
257	*/	255	*/
…		…
260	/* if one object has inventory but the other doesn't, not equiv */	258	/* if one object has inventory but the other doesn't, not equiv */
261	if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv))	259	if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv))
262	return 0;	260	return 0;
263		261
264	/* Now check to see if the two inventory objects could merge */	262	/* Now check to see if the two inventory objects could merge */
265	if (!CAN_MERGE (ob1->inv, ob2->inv))	263	if (!object::can_merge (ob1->inv, ob2->inv))
266	return 0;	264	return 0;
267		265
268	/* inventory ok - still need to check rest of this object to see	266	/* inventory ok - still need to check rest of this object to see
269	* if it is valid.	267	* if it is valid.
270	*/	268	*/
…		…
279		277
280	/* Note sure why the following is the case - either the object has to	278	/* Note sure why the following is the case - either the object has to
281	* be animated or have a very low speed. Is this an attempted monster	279	* be animated or have a very low speed. Is this an attempted monster
282	* check?	280	* check?
283	*/	281	*/
284	if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && FABS ((ob1)->speed) > MIN_ACTIVE_SPEED)	282	if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && ob1->has_active_speed ())
285	return 0;	283	return 0;
286		284
287	switch (ob1->type)	285	switch (ob1->type)
288	{	286	{
289	case SCROLL:	287	case SCROLL:
…		…
354	op = op->env;	352	op = op->env;
355	return op;	353	return op;
356	}	354	}
357		355
358	/*	356	/*
359	* Eneq(@csd.uu.se): Since we can have items buried in a character we need
360	* a better check. We basically keeping traversing up until we can't
361	* or find a player.
362	*/
363
364	object *
365	is_player_inv (object *op)
366	{
367	for (; op != NULL && op->type != PLAYER; op = op->env)
368	if (op->env == op)
369	op->env = NULL;
370	return op;
371	}
372
373	/*
374	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.	357	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
375	* Some error messages.	358	* Some error messages.
376	* The result of the dump is stored in the static global errmsg array.	359	* The result of the dump is stored in the static global errmsg array.
377	*/	360	*/
378		361
…		…
381	{	364	{
382	if (!op)	365	if (!op)
383	return strdup ("[NULLOBJ]");	366	return strdup ("[NULLOBJ]");
384		367
385	object_freezer freezer;	368	object_freezer freezer;
386	save_object (freezer, op, 3);	369	save_object (freezer, op, 1);
387	return freezer.as_string ();	370	return freezer.as_string ();
388	}	371	}
389		372
390	/*	373	/*
391	* 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
…		…
484	}	467	}
485		468
486	op->key_values = 0;	469	op->key_values = 0;
487	}	470	}
488		471
489	void object::clear ()
490	{
491	attachable_base::clear ();
492
493	free_key_values (this);
494
495	owner = 0;
496	name = 0;
497	name_pl = 0;
498	title = 0;
499	race = 0;
500	slaying = 0;
501	skill = 0;
502	msg = 0;
503	lore = 0;
504	custom_name = 0;
505	materialname = 0;
506	contr = 0;
507	below = 0;
508	above = 0;
509	inv = 0;
510	container = 0;
511	env = 0;
512	more = 0;
513	head = 0;
514	map = 0;
515	active_next = 0;
516	active_prev = 0;
517
518	memset (static_cast<object_pod *>(this), 0, sizeof (object_pod));
519
520	SET_FLAG (this, FLAG_REMOVED);
521
522	/* What is not cleared is next, prev, and count */
523
524	expmul = 1.0;
525	face = blank_face;
526
527	if (settings.casting_time)
528	casting_time = -1;
529	}
530
531	void object::clone (object *destination)
532	{
533	*(object_copy *)destination = *this;
534	*(object_pod *)destination = *this;
535
536	if (self || cb)
537	INVOKE_OBJECT (CLONE, this, ARG_OBJECT (destination));
538	}
539
540	/*	472	/*
541	* copy object first frees everything allocated by the second object,	473	* copy_to first frees everything allocated by the dst object,
542	* and then copies the contends of the first object into the second	474	* and then copies the contents of itself into the second
543	* object, allocating what needs to be allocated. Basically, any	475	* object, allocating what needs to be allocated. Basically, any
544	* data that is malloc'd needs to be re-malloc/copied. Otherwise,	476	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
545	* if the first object is freed, the pointers in the new object	477	* if the first object is freed, the pointers in the new object
546	* will point at garbage.	478	* will point at garbage.
547	*/	479	*/
548	void	480	void
549	copy_object (object *op2, object *op)	481	object::copy_to (object *dst)
550	{	482	{
551	bool is_freed = QUERY_FLAG (op, FLAG_FREED);	483	bool is_freed = QUERY_FLAG (dst, FLAG_FREED);
552	bool is_removed = QUERY_FLAG (op, FLAG_REMOVED);	484	bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED);
553		485
554	op2->clone (op);	486	*(object_copy *)dst = *this;
555		487
556	if (is_freed)	488	if (is_freed)
557	SET_FLAG (op, FLAG_FREED);	489	SET_FLAG (dst, FLAG_FREED);
		490
558	if (is_removed)	491	if (is_removed)
559	SET_FLAG (op, FLAG_REMOVED);	492	SET_FLAG (dst, FLAG_REMOVED);
560		493
561	if (op2->speed < 0)	494	if (speed < 0)
562	op->speed_left = op2->speed_left - RANDOM () % 200 / 100.0;	495	dst->speed_left = speed_left - RANDOM () % 200 / 100.0;
563		496
564	/* Copy over key_values, if any. */	497	/* Copy over key_values, if any. */
565	if (op2->key_values)	498	if (key_values)
566	{	499	{
567	key_value *tail = 0;	500	key_value *tail = 0;
568	key_value *i;	501	key_value *i;
569		502
570	op->key_values = 0;	503	dst->key_values = 0;
571		504
572	for (i = op2->key_values; i; i = i->next)	505	for (i = key_values; i; i = i->next)
573	{	506	{
574	key_value *new_link = new key_value;	507	key_value *new_link = new key_value;
575		508
576	new_link->next = 0;	509	new_link->next = 0;
577	new_link->key = i->key;	510	new_link->key = i->key;
578	new_link->value = i->value;	511	new_link->value = i->value;
579		512
580	/* Try and be clever here, too. */	513	/* Try and be clever here, too. */
581	if (!op->key_values)	514	if (!dst->key_values)
582	{	515	{
583	op->key_values = new_link;	516	dst->key_values = new_link;
584	tail = new_link;	517	tail = new_link;
585	}	518	}
586	else	519	else
587	{	520	{
588	tail->next = new_link;	521	tail->next = new_link;
589	tail = new_link;	522	tail = new_link;
590	}	523	}
591	}	524	}
592	}	525	}
593		526
594	update_ob_speed (op);	527	dst->set_speed (dst->speed);
		528	}
		529
		530	object *
		531	object::clone ()
		532	{
		533	object *neu = create ();
		534	copy_to (neu);
		535	return neu;
595	}	536	}
596		537
597	/*	538	/*
598	* If an object with the IS_TURNABLE() flag needs to be turned due	539	* If an object with the IS_TURNABLE() flag needs to be turned due
599	* to the closest player being on the other side, this function can	540	* to the closest player being on the other side, this function can
600	* be called to update the face variable, _and_ how it looks on the map.	541	* be called to update the face variable, _and_ how it looks on the map.
601	*/	542	*/
602
603	void	543	void
604	update_turn_face (object *op)	544	update_turn_face (object *op)
605	{	545	{
606	if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || op->arch == NULL)	546	if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || !op->arch)
607	return;	547	return;
		548
608	SET_ANIMATION (op, op->direction);	549	SET_ANIMATION (op, op->direction);
609	update_object (op, UP_OBJ_FACE);	550	update_object (op, UP_OBJ_FACE);
610	}	551	}
611		552
612	/*	553	/*
613	* Updates the speed of an object. If the speed changes from 0 to another	554	* Updates the speed of an object. If the speed changes from 0 to another
614	* value, or vice versa, then add/remove the object from the active list.	555	* value, or vice versa, then add/remove the object from the active list.
615	* This function needs to be called whenever the speed of an object changes.	556	* This function needs to be called whenever the speed of an object changes.
616	*/	557	*/
617	void	558	void
618	update_ob_speed (object *op)	559	object::set_speed (float speed)
619	{	560	{
620	extern int arch_init;	561	if (flag [FLAG_FREED] && speed)
621
622	/* No reason putting the archetypes objects on the speed list,
623	* since they never really need to be updated.
624	*/
625
626	if (QUERY_FLAG (op, FLAG_FREED) && op->speed)
627	{	562	{
628	LOG (llevError, "Object %s is freed but has speed.\n", &op->name);	563	LOG (llevError, "Object %s is freed but has speed.\n", &name);
629	#ifdef MANY_CORES
630	abort ();
631	#else
632	op->speed = 0;	564	speed = 0;
633	#endif
634	}
635
636	if (arch_init)
637	return;
638
639	if (FABS (op->speed) > MIN_ACTIVE_SPEED)
640	{	565	}
641	/* If already on active list, don't do anything */
642	if (op->active_next || op->active_prev || op == active_objects)
643	return;
644		566
645	/* process_events() expects us to insert the object at the beginning	567	this->speed = speed;
646	* of the list. */
647	op->active_next = active_objects;
648		568
649	if (op->active_next != NULL)	569	if (has_active_speed ())
650	op->active_next->active_prev = op;	570	activate ();
651
652	active_objects = op;
653	}
654	else	571	else
655	{	572	deactivate ();
656	/* If not on the active list, nothing needs to be done */
657	if (!op->active_next && !op->active_prev && op != active_objects)
658	return;
659
660	if (op->active_prev == NULL)
661	{
662	active_objects = op->active_next;
663
664	if (op->active_next != NULL)
665	op->active_next->active_prev = NULL;
666	}
667	else
668	{
669	op->active_prev->active_next = op->active_next;
670
671	if (op->active_next)
672	op->active_next->active_prev = op->active_prev;
673	}
674
675	op->active_next = NULL;
676	op->active_prev = NULL;
677	}
678	}	573	}
679		574
680	/* This function removes object 'op' from the list of active
681	* objects.
682	* This should only be used for style maps or other such
683	* reference maps where you don't want an object that isn't
684	* in play chewing up cpu time getting processed.
685	* The reverse of this is to call update_ob_speed, which
686	* will do the right thing based on the speed of the object.
687	*/
688	void
689	remove_from_active_list (object *op)
690	{
691	/* If not on the active list, nothing needs to be done */
692	if (!op->active_next && !op->active_prev && op != active_objects)
693	return;
694
695	if (op->active_prev == NULL)
696	{
697	active_objects = op->active_next;
698	if (op->active_next != NULL)
699	op->active_next->active_prev = NULL;
700	}
701	else
702	{
703	op->active_prev->active_next = op->active_next;
704	if (op->active_next)
705	op->active_next->active_prev = op->active_prev;
706	}
707	op->active_next = NULL;
708	op->active_prev = NULL;
709	}
710
711	/*	575	/*
712	* update_object() updates the array which represents the map.	576	* update_object() updates the the map.
713	* It takes into account invisible objects (and represent squares covered	577	* It takes into account invisible objects (and represent squares covered
714	* by invisible objects by whatever is below them (unless it's another	578	* by invisible objects by whatever is below them (unless it's another
715	* invisible object, etc...)	579	* invisible object, etc...)
716	* If the object being updated is beneath a player, the look-window	580	* If the object being updated is beneath a player, the look-window
717	* of that player is updated (this might be a suboptimal way of	581	* of that player is updated (this might be a suboptimal way of
718	* updating that window, though, since update_object() is called _often_)	582	* updating that window, though, since update_object() is called _often_)
719	*	583	*
720	* action is a hint of what the caller believes need to be done.	584	* action is a hint of what the caller believes need to be done.
721	* For example, if the only thing that has changed is the face (due to
722	* an animation), we don't need to call update_position until that actually
723	* comes into view of a player. OTOH, many other things, like addition/removal
724	* of walls or living creatures may need us to update the flags now.
725	* current action are:	585	* current action are:
726	* UP_OBJ_INSERT: op was inserted	586	* UP_OBJ_INSERT: op was inserted
727	* UP_OBJ_REMOVE: op was removed	587	* UP_OBJ_REMOVE: op was removed
728	* UP_OBJ_CHANGE: object has somehow changed. In this case, we always update	588	* UP_OBJ_CHANGE: object has somehow changed. In this case, we always update
729	* as that is easier than trying to look at what may have changed.	589	* as that is easier than trying to look at what may have changed.
730	* UP_OBJ_FACE: only the objects face has changed.	590	* UP_OBJ_FACE: only the objects face has changed.
731	*/	591	*/
732
733	void	592	void
734	update_object (object *op, int action)	593	update_object (object *op, int action)
735	{	594	{
736	int update_now = 0, flags;
737	MoveType move_on, move_off, move_block, move_slow;	595	MoveType move_on, move_off, move_block, move_slow;
738		596
739	if (op == NULL)	597	if (op == NULL)
740	{	598	{
741	/* this should never happen */	599	/* this should never happen */
742	LOG (llevDebug, "update_object() called for NULL object.\n");	600	LOG (llevDebug, "update_object() called for NULL object.\n");
743	return;	601	return;
744	}	602	}
745		603
746	if (op->env != NULL)	604	if (op->env)
747	{	605	{
748	/* Animation is currently handled by client, so nothing	606	/* Animation is currently handled by client, so nothing
749	* to do in this case.	607	* to do in this case.
750	*/	608	*/
751	return;	609	return;
…		…
756	*/	614	*/
757	if (!op->map || op->map->in_memory == MAP_SAVING)	615	if (!op->map || op->map->in_memory == MAP_SAVING)
758	return;	616	return;
759		617
760	/* make sure the object is within map boundaries */	618	/* make sure the object is within map boundaries */
761	if (op->x < 0 || op->x >= MAP_WIDTH (op->map) || op->y < 0 || op->y >= MAP_HEIGHT (op->map))	619	if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height)
762	{	620	{
763	LOG (llevError, "update_object() called for object out of map!\n");	621	LOG (llevError, "update_object() called for object out of map!\n");
764	#ifdef MANY_CORES	622	#ifdef MANY_CORES
765	abort ();	623	abort ();
766	#endif	624	#endif
767	return;	625	return;
768	}	626	}
769		627
770	flags = GET_MAP_FLAGS (op->map, op->x, op->y);	628	mapspace &m = op->ms ();
771	SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NEED_UPDATE);
772	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);
773	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);
774	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);
775	move_off = GET_MAP_MOVE_OFF (op->map, op->x, op->y);
776		629
		630	if (!(m.flags_ & P_UPTODATE))
		631	/* nop */;
777	if (action == UP_OBJ_INSERT)	632	else if (action == UP_OBJ_INSERT)
778	{	633	{
		634	// this is likely overkill, TODO: revisit (schmorp)
779	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(flags & P_BLOCKSVIEW))	635	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
780	update_now = 1;
781
782	if (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(flags & P_NO_MAGIC))	636	|| (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))
783	update_now = 1;	637	|| (op->type == PLAYER && !(m.flags_ & P_PLAYER))
784		638	|| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
		639	|| (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))
785	if (QUERY_FLAG (op, FLAG_DAMNED) && !(flags & P_NO_CLERIC))	640	|| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))
786	update_now = 1;
787
788	if (QUERY_FLAG (op, FLAG_ALIVE) && !(flags & P_IS_ALIVE))
789	update_now = 1;
790
791	if (op->type == SAFE_GROUND && !(flags & P_SAFE))
792	update_now = 1;
793
794	if ((move_on | op->move_on) != move_on)	641	|| (m.move_on | op->move_on ) != m.move_on
795	update_now = 1;
796
797	if ((move_off | op->move_off) != move_off)	642	|| (m.move_off | op->move_off ) != m.move_off
798	update_now = 1;	643	|| (m.move_slow | op->move_slow) != m.move_slow
799
800	/* This isn't perfect, but I don't expect a lot of objects to	644	/* This isn't perfect, but I don't expect a lot of objects to
801	* to have move_allow right now.	645	* to have move_allow right now.
802	*/	646	*/
803	if (((move_block | op->move_block) & ~op->move_allow) != move_block)	647	|| ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block
804	update_now = 1;	648	|| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)
805		649	m.flags_ = 0;
806	if ((move_slow | op->move_slow) != move_slow)
807	update_now = 1;
808	}	650	}
809	/* if the object is being removed, we can't make intelligent	651	/* if the object is being removed, we can't make intelligent
810	* decisions, because remove_ob can't really pass the object	652	* decisions, because remove_ob can't really pass the object
811	* that is being removed.	653	* that is being removed.
812	*/	654	*/
813	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)	655	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
814	update_now = 1;	656	m.flags_ = 0;
815	else if (action == UP_OBJ_FACE)	657	else if (action == UP_OBJ_FACE)
816	/* Nothing to do for that case */ ;	658	/* Nothing to do for that case */ ;
817	else	659	else
818	LOG (llevError, "update_object called with invalid action: %d\n", action);	660	LOG (llevError, "update_object called with invalid action: %d\n", action);
819		661
820	if (update_now)
821	{
822	SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NO_ERROR | P_NEED_UPDATE);
823	update_position (op->map, op->x, op->y);
824	}
825
826	if (op->more != NULL)	662	if (op->more)
827	update_object (op->more, action);	663	update_object (op->more, action);
828	}	664	}
829		665
830	object::vector object::mortals;
831	object::vector object::objects; // not yet used
832	object *object::first;	666	object *object::first;
833
834	void object::free_mortals ()
835	{
836	for (AUTODECL (i, mortals.begin ()); i != mortals.end ();)
837	if ((*i)->refcnt)
838	++i; // further delay freeing
839	else
840	{
841	delete *i;
842	mortals.erase (i);
843	}
844
845	static int lastmortals = 0;//D
846
847	if (mortals.size() != lastmortals && lastmortals > 100)//D
848	{
849	lastmortals = mortals.size ();//D
850	LOG (llevDebug, "%d objects in mortal queue\n", lastmortals);//D
851	}
852	}
853		667
854	object::object ()	668	object::object ()
855	{	669	{
856	SET_FLAG (this, FLAG_REMOVED);	670	SET_FLAG (this, FLAG_REMOVED);
857		671
…		…
889		703
890	prev = 0;	704	prev = 0;
891	next = 0;	705	next = 0;
892	}	706	}
893		707
		708	bool
		709	object::active () const
		710	{
		711	return active_next || active_prev || this == active_objects;
		712	}
		713
		714	void
		715	object::activate ()
		716	{
		717	/* If already on active list, don't do anything */
		718	if (active ())
		719	return;
		720
		721	if (has_active_speed ())
		722	{
		723	/* process_events() expects us to insert the object at the beginning
		724	* of the list. */
		725	active_next = active_objects;
		726
		727	if (active_next)
		728	active_next->active_prev = this;
		729
		730	active_objects = this;
		731	}
		732	}
		733
		734	void
		735	object::activate_recursive ()
		736	{
		737	activate ();
		738
		739	for (object *op = inv; op; op = op->below)
		740	op->activate_recursive ();
		741	}
		742
		743	/* This function removes object 'op' from the list of active
		744	* objects.
		745	* This should only be used for style maps or other such
		746	* reference maps where you don't want an object that isn't
		747	* in play chewing up cpu time getting processed.
		748	* The reverse of this is to call update_ob_speed, which
		749	* will do the right thing based on the speed of the object.
		750	*/
		751	void
		752	object::deactivate ()
		753	{
		754	/* If not on the active list, nothing needs to be done */
		755	if (!active ())
		756	return;
		757
		758	if (active_prev == 0)
		759	{
		760	active_objects = active_next;
		761	if (active_next)
		762	active_next->active_prev = 0;
		763	}
		764	else
		765	{
		766	active_prev->active_next = active_next;
		767	if (active_next)
		768	active_next->active_prev = active_prev;
		769	}
		770
		771	active_next = 0;
		772	active_prev = 0;
		773	}
		774
		775	void
		776	object::deactivate_recursive ()
		777	{
		778	for (object *op = inv; op; op = op->below)
		779	op->deactivate_recursive ();
		780
		781	deactivate ();
		782	}
		783
		784	void
		785	object::set_flag_inv (int flag, int value)
		786	{
		787	for (object *op = inv; op; op = op->below)
		788	{
		789	op->flag [flag] = value;
		790	op->set_flag_inv (flag, value);
		791	}
		792	}
		793
		794	/*
		795	* Remove and free all objects in the inventory of the given object.
		796	* object.c ?
		797	*/
		798	void
		799	object::destroy_inv (bool drop_to_ground)
		800	{
		801	// need to check first, because the checks below might segfault
		802	// as we might be on an invalid mapspace and crossfire code
		803	// is too buggy to ensure that the inventory is empty.
		804	// corollary: if you create arrows etc. with stuff in tis inventory,
		805	// cf will crash below with off-map x and y
		806	if (!inv)
		807	return;
		808
		809	/* Only if the space blocks everything do we not process -
		810	* if some form of movement is allowed, let objects
		811	* drop on that space.
		812	*/
		813	if (!drop_to_ground
		814	|| !map
		815	|| map->in_memory != MAP_IN_MEMORY
		816	|| ms ().move_block == MOVE_ALL)
		817	{
		818	while (inv)
		819	{
		820	inv->destroy_inv (drop_to_ground);
		821	inv->destroy ();
		822	}
		823	}
		824	else
		825	{ /* Put objects in inventory onto this space */
		826	while (inv)
		827	{
		828	object *op = inv;
		829
		830	if (op->flag [FLAG_STARTEQUIP]
		831	|| op->flag [FLAG_NO_DROP]
		832	|| op->type == RUNE
		833	|| op->type == TRAP
		834	|| op->flag [FLAG_IS_A_TEMPLATE])
		835	op->destroy ();
		836	else
		837	map->insert (op, x, y);
		838	}
		839	}
		840	}
		841
894	object *object::create ()	842	object *object::create ()
895	{	843	{
896	object *op = new object;	844	object *op = new object;
897	op->link ();	845	op->link ();
898	return op;	846	return op;
899	}	847	}
900		848
901	/*	849	void
902	* free_object() frees everything allocated by an object, removes	850	object::do_destroy ()
903	* it from the list of used objects, and puts it on the list of
904	* free objects. The IS_FREED() flag is set in the object.
905	* The object must have been removed by remove_ob() first for
906	* this function to succeed.
907	*
908	* If destroy_inventory is set, free inventory as well. Else drop items in
909	* inventory to the ground.
910	*/
911	void object::destroy (bool destroy_inventory)
912	{	851	{
913	if (QUERY_FLAG (this, FLAG_FREED))	852	if (flag [FLAG_IS_LINKED])
		853	remove_button_link (this);
		854
		855	if (flag [FLAG_FRIENDLY])
		856	remove_friendly_object (this);
		857
		858	if (!flag [FLAG_REMOVED])
		859	remove ();
		860
		861	if (flag [FLAG_FREED])
914	return;	862	return;
915		863
916	if (QUERY_FLAG (this, FLAG_FRIENDLY))	864	set_speed (0);
917	remove_friendly_object (this);
918		865
919	if (!QUERY_FLAG (this, FLAG_REMOVED))	866	flag [FLAG_FREED] = 1;
920	remove_ob (this);
921		867
922	SET_FLAG (this, FLAG_FREED);	868	attachable::do_destroy ();
		869
		870	destroy_inv (true);
		871	unlink ();
923		872
924	// hack to ensure that freed objects still have a valid map	873	// hack to ensure that freed objects still have a valid map
925	{	874	{
926	static maptile *freed_map; // freed objects are moved here to avoid crashes	875	static maptile *freed_map; // freed objects are moved here to avoid crashes
927		876
928	if (!freed_map)	877	if (!freed_map)
929	{	878	{
930	freed_map = get_empty_map (3, 3);	879	freed_map = new maptile;
		880
931	freed_map->name = "freed objects map";	881	freed_map->name = "/internal/freed_objects_map";
932	allocate_map (freed_map);	882	freed_map->width = 3;
		883	freed_map->height = 3;
		884
		885	freed_map->alloc ();
		886	freed_map->in_memory = MAP_IN_MEMORY;
933	}	887	}
934		888
935	map = freed_map;	889	map = freed_map;
936	x = 1;	890	x = 1;
937	y = 1;	891	y = 1;
938	}	892	}
939		893
		894	head = 0;
		895
940	if (more)	896	if (more)
941	{	897	{
942	more->destroy (destroy_inventory);	898	more->destroy ();
943	more = 0;	899	more = 0;
944	}
945
946	if (inv)
947	{
948	/* Only if the space blocks everything do we not process -
949	* if some form of movement is allowed, let objects
950	* drop on that space.
951	*/
952	if (destroy_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
953	{
954	object *op = inv;
955
956	while (op)
957	{
958	object *tmp = op->below;
959	op->destroy (destroy_inventory);
960	op = tmp;
961	}
962	}
963	else
964	{ /* Put objects in inventory onto this space */
965	object *op = inv;
966
967	while (op)
968	{
969	object *tmp = op->below;
970
971	remove_ob (op);
972
973	if (QUERY_FLAG (op, FLAG_STARTEQUIP)
974	|| QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
975	free_object (op);
976	else
977	{
978	op->x = x;
979	op->y = y;
980	insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */
981	}
982
983	op = tmp;
984	}
985	}
986	}	900	}
987		901
988	// clear those pointers that likely might have circular references to us	902	// clear those pointers that likely might have circular references to us
989	owner = 0;	903	owner = 0;
990	enemy = 0;	904	enemy = 0;
991	attacked_by = 0;	905	attacked_by = 0;
992		906
993	// only relevant for players(?), but make sure of it anyways	907	// only relevant for players(?), but make sure of it anyways
994	contr = 0;	908	contr = 0;
		909	}
995		910
996	/* Remove object from the active list */	911	void
997	speed = 0;	912	object::destroy (bool destroy_inventory)
998	update_ob_speed (this);	913	{
		914	if (destroyed ())
		915	return;
999		916
1000	unlink ();	917	if (destroy_inventory)
		918	destroy_inv (false);
1001		919
1002	mortals.push_back (this);	920	attachable::destroy ();
1003	}	921	}
1004		922
1005	/*	923	/*
1006	* sub_weight() recursively (outwards) subtracts a number from the	924	* sub_weight() recursively (outwards) subtracts a number from the
1007	* weight of an object (and what is carried by it's environment(s)).	925	* weight of an object (and what is carried by it's environment(s)).
1008	*/	926	*/
1009
1010	void	927	void
1011	sub_weight (object *op, signed long weight)	928	sub_weight (object *op, signed long weight)
1012	{	929	{
1013	while (op != NULL)	930	while (op != NULL)
1014	{	931	{
…		…
1018	op->carrying -= weight;	935	op->carrying -= weight;
1019	op = op->env;	936	op = op->env;
1020	}	937	}
1021	}	938	}
1022		939
1023	/* remove_ob(op):	940	/* op->remove ():
1024	* This function removes the object op from the linked list of objects	941	* This function removes the object op from the linked list of objects
1025	* which it is currently tied to. When this function is done, the	942	* which it is currently tied to. When this function is done, the
1026	* object will have no environment. If the object previously had an	943	* object will have no environment. If the object previously had an
1027	* environment, the x and y coordinates will be updated to	944	* environment, the x and y coordinates will be updated to
1028	* the previous environment.	945	* the previous environment.
1029	* Beware: This function is called from the editor as well!	946	* Beware: This function is called from the editor as well!
1030	*/	947	*/
1031
1032	void	948	void
1033	remove_ob (object *op)	949	object::remove ()
1034	{	950	{
1035	object *tmp, *last = 0;	951	object *tmp, *last = 0;
1036	object *otmp;	952	object *otmp;
1037		953
1038	int check_walk_off;
1039	maptile *m;
1040
1041	sint16 x, y;
1042
1043	if (QUERY_FLAG (op, FLAG_REMOVED))	954	if (QUERY_FLAG (this, FLAG_REMOVED))
1044	return;	955	return;
1045		956
1046	SET_FLAG (op, FLAG_REMOVED);	957	SET_FLAG (this, FLAG_REMOVED);
		958	INVOKE_OBJECT (REMOVE, this);
1047		959
1048	if (op->more != NULL)	960	if (more)
1049	remove_ob (op->more);	961	more->remove ();
1050		962
1051	/*	963	/*
1052	* In this case, the object to be removed is in someones	964	* In this case, the object to be removed is in someones
1053	* inventory.	965	* inventory.
1054	*/	966	*/
1055	if (op->env != NULL)	967	if (env)
1056	{	968	{
1057	if (op->nrof)	969	if (nrof)
1058	sub_weight (op->env, op->weight * op->nrof);	970	sub_weight (env, weight * nrof);
1059	else	971	else
1060	sub_weight (op->env, op->weight + op->carrying);	972	sub_weight (env, weight + carrying);
1061		973
1062	/* NO_FIX_PLAYER is set when a great many changes are being	974	/* NO_FIX_PLAYER is set when a great many changes are being
1063	* made to players inventory. If set, avoiding the call	975	* made to players inventory. If set, avoiding the call
1064	* to save cpu time.	976	* to save cpu time.
1065	*/	977	*/
1066	if ((otmp = is_player_inv (op->env)) != NULL && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	978	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1067	fix_player (otmp);	979	otmp->update_stats ();
1068		980
1069	if (op->above != NULL)	981	if (above)
1070	op->above->below = op->below;	982	above->below = below;
1071	else	983	else
1072	op->env->inv = op->below;	984	env->inv = below;
1073		985
1074	if (op->below != NULL)	986	if (below)
1075	op->below->above = op->above;	987	below->above = above;
1076		988
1077	/* we set up values so that it could be inserted into	989	/* we set up values so that it could be inserted into
1078	* the map, but we don't actually do that - it is up	990	* the map, but we don't actually do that - it is up
1079	* to the caller to decide what we want to do.	991	* to the caller to decide what we want to do.
1080	*/	992	*/
1081	op->x = op->env->x, op->y = op->env->y;	993	x = env->x, y = env->y;
1082	op->map = op->env->map;	994	map = env->map;
1083	op->above = NULL, op->below = NULL;	995	above = 0, below = 0;
1084	op->env = NULL;	996	env = 0;
1085	}	997	}
1086	else if (op->map)	998	else if (map)
1087	{	999	{
1088	x = op->x;	1000	if (type == PLAYER)
1089	y = op->y;
1090	m = get_map_from_coord (op->map, &x, &y);
1091
1092	if (!m)
1093	{
1094	LOG (llevError, "remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n",
1095	op->map->path, op->x, op->y);
1096	/* in old days, we used to set x and y to 0 and continue.
1097	* it seems if we get into this case, something is probablye
1098	* screwed up and should be fixed.
1099	*/
1100	abort ();
1101	}	1001	{
1102		1002	--map->players;
1103	if (op->map != m)	1003	map->touch ();
1104	LOG (llevDebug, "remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n",
1105	op->map->path, m->path, op->x, op->y, x, y);
1106
1107	/* Re did the following section of code - it looks like it had
1108	* lots of logic for things we no longer care about
1109	*/	1004	}
		1005
		1006	map->dirty = true;
1110		1007
1111	/* link the object above us */	1008	/* link the object above us */
1112	if (op->above)	1009	if (above)
1113	op->above->below = op->below;	1010	above->below = below;
1114	else	1011	else
1115	SET_MAP_TOP (m, x, y, op->below); /* we were top, set new top */	1012	map->at (x, y).top = below; /* we were top, set new top */
1116		1013
1117	/* Relink the object below us, if there is one */	1014	/* Relink the object below us, if there is one */
1118	if (op->below)	1015	if (below)
1119	op->below->above = op->above;	1016	below->above = above;
1120	else	1017	else
1121	{	1018	{
1122	/* Nothing below, which means we need to relink map object for this space	1019	/* Nothing below, which means we need to relink map object for this space
1123	* use translated coordinates in case some oddness with map tiling is	1020	* use translated coordinates in case some oddness with map tiling is
1124	* evident	1021	* evident
1125	*/	1022	*/
1126	if (GET_MAP_OB (m, x, y) != op)	1023	if (GET_MAP_OB (map, x, y) != this)
1127	{	1024	{
1128	char *dump = dump_object (op);	1025	char *dump = dump_object (this);
1129	LOG (llevError,	1026	LOG (llevError,
1130	"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);	1027	"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);
1131	free (dump);	1028	free (dump);
1132	dump = dump_object (GET_MAP_OB (m, x, y));	1029	dump = dump_object (GET_MAP_OB (map, x, y));
1133	LOG (llevError, "%s\n", dump);	1030	LOG (llevError, "%s\n", dump);
1134	free (dump);	1031	free (dump);
1135	}	1032	}
1136		1033
1137	SET_MAP_OB (m, x, y, op->above); /* goes on above it. */	1034	map->at (x, y).bot = above; /* goes on above it. */
1138	}	1035	}
1139		1036
1140	op->above = 0;	1037	above = 0;
1141	op->below = 0;	1038	below = 0;
1142		1039
1143	if (op->map->in_memory == MAP_SAVING)	1040	if (map->in_memory == MAP_SAVING)
1144	return;	1041	return;
1145		1042
1146	check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY);	1043	int check_walk_off = !flag [FLAG_NO_APPLY];
1147		1044
1148	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1045	for (tmp = map->at (x, y).bot; tmp; tmp = tmp->above)
1149	{	1046	{
1150	/* No point updating the players look faces if he is the object	1047	/* No point updating the players look faces if he is the object
1151	* being removed.	1048	* being removed.
1152	*/	1049	*/
1153		1050
1154	if (tmp->type == PLAYER && tmp != op)	1051	if (tmp->type == PLAYER && tmp != this)
1155	{	1052	{
1156	/* If a container that the player is currently using somehow gets	1053	/* If a container that the player is currently using somehow gets
1157	* removed (most likely destroyed), update the player view	1054	* removed (most likely destroyed), update the player view
1158	* appropriately.	1055	* appropriately.
1159	*/	1056	*/
1160	if (tmp->container == op)	1057	if (tmp->container == this)
1161	{	1058	{
1162	CLEAR_FLAG (op, FLAG_APPLIED);	1059	flag [FLAG_APPLIED] = 0;
1163	tmp->container = NULL;	1060	tmp->container = 0;
1164	}	1061	}
1165		1062
1166	tmp->contr->socket.update_look = 1;	1063	if (tmp->contr->ns)
		1064	tmp->contr->ns->floorbox_update ();
1167	}	1065	}
1168		1066
1169	/* See if player moving off should effect something */	1067	/* See if object moving off should effect something */
1170	if (check_walk_off	1068	if (check_walk_off
1171	&& ((op->move_type & tmp->move_off)	1069	&& ((move_type & tmp->move_off)
1172	&& (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0))	1070	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1173	{	1071	{
1174	move_apply (tmp, op, NULL);	1072	move_apply (tmp, this, 0);
1175		1073
1176	if (op->destroyed ())	1074	if (destroyed ())
1177	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());	1075	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1178	}	1076	}
1179		1077
1180	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */	1078	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1181		1079	//TODO: why is this horrible hacka fix? get rid of this code=bug! (schmorp)
1182	if (tmp->above == tmp)	1080	if (tmp->above == tmp)
1183	tmp->above = NULL;	1081	tmp->above = 0;
1184		1082
1185	last = tmp;	1083	last = tmp;
1186	}	1084	}
1187		1085
1188	/* last == NULL of there are no objects on this space */	1086	/* last == NULL if there are no objects on this space */
		1087	//TODO: this makes little sense, why only update the topmost object?
1189	if (last == NULL)	1088	if (!last)
1190	{	1089	map->at (x, y).flags_ = 0;
1191	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1192	* we could preserve the flags (GET_MAP_FLAGS), but update_position figures
1193	* those out anyways, and if there are any flags set right now, they won't
1194	* be correct anyways.
1195	*/
1196	SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE);
1197	update_position (op->map, op->x, op->y);
1198	}
1199	else	1090	else
1200	update_object (last, UP_OBJ_REMOVE);	1091	update_object (last, UP_OBJ_REMOVE);
1201		1092
1202	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0))	1093	if (flag [FLAG_BLOCKSVIEW] || glow_radius)
1203	update_all_los (op->map, op->x, op->y);	1094	update_all_los (map, x, y);
1204	}	1095	}
1205	}	1096	}
1206		1097
1207	/*	1098	/*
1208	* merge_ob(op,top):	1099	* merge_ob(op,top):
…		…
1216	merge_ob (object *op, object *top)	1107	merge_ob (object *op, object *top)
1217	{	1108	{
1218	if (!op->nrof)	1109	if (!op->nrof)
1219	return 0;	1110	return 0;
1220		1111
1221	if (top == NULL)	1112	if (top)
1222	for (top = op; top != NULL && top->above != NULL; top = top->above);	1113	for (top = op; top && top->above; top = top->above)
		1114	;
1223		1115
1224	for (; top != NULL; top = top->below)	1116	for (; top; top = top->below)
1225	{	1117	{
1226	if (top == op)	1118	if (top == op)
1227	continue;	1119	continue;
1228	if (CAN_MERGE (op, top))	1120
		1121	if (object::can_merge (op, top))
1229	{	1122	{
1230	top->nrof += op->nrof;	1123	top->nrof += op->nrof;
1231		1124
1232	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/	1125	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/
1233	op->weight = 0; /* Don't want any adjustements now */	1126	op->weight = 0; /* Don't want any adjustements now */
1234	remove_ob (op);	1127	op->destroy ();
1235	free_object (op);
1236	return top;	1128	return top;
1237	}	1129	}
1238	}	1130	}
1239		1131
1240	return 0;	1132	return 0;
…		…
1245	* job preparing multi-part monsters	1137	* job preparing multi-part monsters
1246	*/	1138	*/
1247	object *	1139	object *
1248	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)	1140	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1249	{	1141	{
1250	object *tmp;
1251
1252	if (op->head)
1253	op = op->head;
1254
1255	for (tmp = op; tmp; tmp = tmp->more)	1142	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1256	{	1143	{
1257	tmp->x = x + tmp->arch->clone.x;	1144	tmp->x = x + tmp->arch->clone.x;
1258	tmp->y = y + tmp->arch->clone.y;	1145	tmp->y = y + tmp->arch->clone.y;
1259	}	1146	}
1260		1147
…		…
1279	* Return value:	1166	* Return value:
1280	* new object if 'op' was merged with other object	1167	* new object if 'op' was merged with other object
1281	* NULL if 'op' was destroyed	1168	* NULL if 'op' was destroyed
1282	* just 'op' otherwise	1169	* just 'op' otherwise
1283	*/	1170	*/
1284
1285	object *	1171	object *
1286	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)	1172	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1287	{	1173	{
1288	object *tmp, *top, *floor = NULL;	1174	object *tmp, *top, *floor = NULL;
1289	sint16 x, y;	1175	sint16 x, y;
…		…
1292	{	1178	{
1293	LOG (llevError, "Trying to insert freed object!\n");	1179	LOG (llevError, "Trying to insert freed object!\n");
1294	return NULL;	1180	return NULL;
1295	}	1181	}
1296		1182
1297	if (m == NULL)	1183	if (!m)
1298	{	1184	{
1299	char *dump = dump_object (op);	1185	char *dump = dump_object (op);
1300	LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);	1186	LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
1301	free (dump);	1187	free (dump);
1302	return op;	1188	return op;
…		…
1323	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);	1209	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
1324	free (dump);	1210	free (dump);
1325	return op;	1211	return op;
1326	}	1212	}
1327		1213
1328	if (op->more != NULL)	1214	if (op->more)
1329	{	1215	{
1330	/* The part may be on a different map. */	1216	/* The part may be on a different map. */
1331		1217
1332	object *more = op->more;	1218	object *more = op->more;
1333		1219
1334	/* We really need the caller to normalize coordinates - if	1220	/* We really need the caller to normalise coordinates - if
1335	* we set the map, that doesn't work if the location is within	1221	* we set the map, that doesn't work if the location is within
1336	* a map and this is straddling an edge. So only if coordinate	1222	* a map and this is straddling an edge. So only if coordinate
1337	* is clear wrong do we normalize it.	1223	* is clear wrong do we normalise it.
1338	*/	1224	*/
1339	if (OUT_OF_REAL_MAP (more->map, more->x, more->y))	1225	if (OUT_OF_REAL_MAP (more->map, more->x, more->y))
1340	more->map = get_map_from_coord (m, &more->x, &more->y);	1226	more->map = get_map_from_coord (m, &more->x, &more->y);
1341	else if (!more->map)	1227	else if (!more->map)
1342	{	1228	{
…		…
1349	if (insert_ob_in_map (more, more->map, originator, flag) == NULL)	1235	if (insert_ob_in_map (more, more->map, originator, flag) == NULL)
1350	{	1236	{
1351	if (!op->head)	1237	if (!op->head)
1352	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");	1238	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1353		1239
1354	return NULL;	1240	return 0;
1355	}	1241	}
1356	}	1242	}
1357		1243
1358	CLEAR_FLAG (op, FLAG_REMOVED);	1244	CLEAR_FLAG (op, FLAG_REMOVED);
1359		1245
…		…
1366	y = op->y;	1252	y = op->y;
1367		1253
1368	/* this has to be done after we translate the coordinates.	1254	/* this has to be done after we translate the coordinates.
1369	*/	1255	*/
1370	if (op->nrof && !(flag & INS_NO_MERGE))	1256	if (op->nrof && !(flag & INS_NO_MERGE))
1371	for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)	1257	for (tmp = GET_MAP_OB (op->map, x, y); tmp; tmp = tmp->above)
1372	if (CAN_MERGE (op, tmp))	1258	if (object::can_merge (op, tmp))
1373	{	1259	{
1374	op->nrof += tmp->nrof;	1260	op->nrof += tmp->nrof;
1375	remove_ob (tmp);	1261	tmp->destroy ();
1376	free_object (tmp);
1377	}	1262	}
1378		1263
1379	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1264	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1380	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1265	CLEAR_FLAG (op, FLAG_INV_LOCKED);
1381		1266
…		…
1394	op->below = originator->below;	1279	op->below = originator->below;
1395		1280
1396	if (op->below)	1281	if (op->below)
1397	op->below->above = op;	1282	op->below->above = op;
1398	else	1283	else
1399	SET_MAP_OB (op->map, op->x, op->y, op);	1284	op->ms ().bot = op;
1400		1285
1401	/* since *below* originator, no need to update top */	1286	/* since *below* originator, no need to update top */
1402	originator->below = op;	1287	originator->below = op;
1403	}	1288	}
1404	else	1289	else
1405	{	1290	{
1406	/* If there are other objects, then */	1291	/* If there are other objects, then */
1407	if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL))	1292	if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL))
1408	{	1293	{
1409	object *last = NULL;	1294	object *last = 0;
1410		1295
1411	/*	1296	/*
1412	* If there are multiple objects on this space, we do some trickier handling.	1297	* If there are multiple objects on this space, we do some trickier handling.
1413	* We've already dealt with merging if appropriate.	1298	* We've already dealt with merging if appropriate.
1414	* Generally, we want to put the new object on top. But if	1299	* Generally, we want to put the new object on top. But if
…		…
1418	* once we get to them. This reduces the need to traverse over all of	1303	* once we get to them. This reduces the need to traverse over all of
1419	* them when adding another one - this saves quite a bit of cpu time	1304	* them when adding another one - this saves quite a bit of cpu time
1420	* when lots of spells are cast in one area. Currently, it is presumed	1305	* when lots of spells are cast in one area. Currently, it is presumed
1421	* that flying non pickable objects are spell objects.	1306	* that flying non pickable objects are spell objects.
1422	*/	1307	*/
1423
1424	while (top != NULL)	1308	while (top)
1425	{	1309	{
1426	if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))	1310	if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))
1427	floor = top;	1311	floor = top;
1428		1312
1429	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))	1313	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))
…		…
1450	* If INS_ON_TOP is used, don't do this processing	1334	* If INS_ON_TOP is used, don't do this processing
1451	* Need to find the object that in fact blocks view, otherwise	1335	* Need to find the object that in fact blocks view, otherwise
1452	* stacking is a bit odd.	1336	* stacking is a bit odd.
1453	*/	1337	*/
1454	if (!(flag & INS_ON_TOP) &&	1338	if (!(flag & INS_ON_TOP) &&
1455	(get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_BLOCKSVIEW) && (op->face && !op->face->visibility))	1339	(get_map_flags (op->map, 0, op->x, op->y, 0, 0) & P_BLOCKSVIEW) && (op->face && !op->face->visibility))
1456	{	1340	{
1457	for (last = top; last != floor; last = last->below)	1341	for (last = top; last != floor; last = last->below)
1458	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1342	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1459	break;	1343	break;
1460	/* Check to see if we found the object that blocks view,	1344	/* Check to see if we found the object that blocks view,
…		…
1482	op->above = GET_MAP_OB (op->map, op->x, op->y);	1366	op->above = GET_MAP_OB (op->map, op->x, op->y);
1483		1367
1484	if (op->above)	1368	if (op->above)
1485	op->above->below = op;	1369	op->above->below = op;
1486		1370
1487	op->below = NULL;	1371	op->below = 0;
1488	SET_MAP_OB (op->map, op->x, op->y, op);	1372	op->ms ().bot = op;
1489	}	1373	}
1490	else	1374	else
1491	{ /* get inserted into the stack above top */	1375	{ /* get inserted into the stack above top */
1492	op->above = top->above;	1376	op->above = top->above;
1493		1377
…		…
1496		1380
1497	op->below = top;	1381	op->below = top;
1498	top->above = op;	1382	top->above = op;
1499	}	1383	}
1500		1384
1501	if (op->above == NULL)	1385	if (!op->above)
1502	SET_MAP_TOP (op->map, op->x, op->y, op);	1386	op->ms ().top = op;
1503	} /* else not INS_BELOW_ORIGINATOR */	1387	} /* else not INS_BELOW_ORIGINATOR */
1504		1388
1505	if (op->type == PLAYER)	1389	if (op->type == PLAYER)
		1390	{
1506	op->contr->do_los = 1;	1391	op->contr->do_los = 1;
		1392	++op->map->players;
		1393	op->map->touch ();
		1394	}
		1395
		1396	op->map->dirty = true;
1507		1397
1508	/* If we have a floor, we know the player, if any, will be above	1398	/* If we have a floor, we know the player, if any, will be above
1509	* it, so save a few ticks and start from there.	1399	* it, so save a few ticks and start from there.
1510	*/	1400	*/
1511	if (!(flag & INS_MAP_LOAD))	1401	if (!(flag & INS_MAP_LOAD))
1512	for (tmp = floor ? floor : GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1402	if (object *pl = op->ms ().player ())
1513	if (tmp->type == PLAYER)	1403	if (pl->contr->ns)
1514	tmp->contr->socket.update_look = 1;	1404	pl->contr->ns->floorbox_update ();
1515		1405
1516	/* If this object glows, it may affect lighting conditions that are	1406	/* If this object glows, it may affect lighting conditions that are
1517	* visible to others on this map. But update_all_los is really	1407	* visible to others on this map. But update_all_los is really
1518	* an inefficient way to do this, as it means los for all players	1408	* an inefficient way to do this, as it means los for all players
1519	* on the map will get recalculated. The players could very well	1409	* on the map will get recalculated. The players could very well
1520	* be far away from this change and not affected in any way -	1410	* be far away from this change and not affected in any way -
1521	* this should get redone to only look for players within range,	1411	* this should get redone to only look for players within range,
1522	* or just updating the P_NEED_UPDATE for spaces within this area	1412	* or just updating the P_UPTODATE for spaces within this area
1523	* of effect may be sufficient.	1413	* of effect may be sufficient.
1524	*/	1414	*/
1525	if (MAP_DARKNESS (op->map) && (op->glow_radius != 0))	1415	if (op->map->darkness && (op->glow_radius != 0))
1526	update_all_los (op->map, op->x, op->y);	1416	update_all_los (op->map, op->x, op->y);
1527		1417
1528	/* updates flags (blocked, alive, no magic, etc) for this map space */	1418	/* updates flags (blocked, alive, no magic, etc) for this map space */
1529	update_object (op, UP_OBJ_INSERT);	1419	update_object (op, UP_OBJ_INSERT);
1530		1420
		1421	INVOKE_OBJECT (INSERT, op);
		1422
1531	/* Don't know if moving this to the end will break anything. However,	1423	/* Don't know if moving this to the end will break anything. However,
1532	* we want to have update_look set above before calling this.	1424	* we want to have floorbox_update called before calling this.
1533	*	1425	*
1534	* check_move_on() must be after this because code called from	1426	* check_move_on() must be after this because code called from
1535	* check_move_on() depends on correct map flags (so functions like	1427	* check_move_on() depends on correct map flags (so functions like
1536	* blocked() and wall() work properly), and these flags are updated by	1428	* blocked() and wall() work properly), and these flags are updated by
1537	* update_object().	1429	* update_object().
…		…
1539		1431
1540	/* if this is not the head or flag has been passed, don't check walk on status */	1432	/* if this is not the head or flag has been passed, don't check walk on status */
1541	if (!(flag & INS_NO_WALK_ON) && !op->head)	1433	if (!(flag & INS_NO_WALK_ON) && !op->head)
1542	{	1434	{
1543	if (check_move_on (op, originator))	1435	if (check_move_on (op, originator))
1544	return NULL;	1436	return 0;
1545		1437
1546	/* If we are a multi part object, lets work our way through the check	1438	/* If we are a multi part object, lets work our way through the check
1547	* walk on's.	1439	* walk on's.
1548	*/	1440	*/
1549	for (tmp = op->more; tmp != NULL; tmp = tmp->more)	1441	for (tmp = op->more; tmp != NULL; tmp = tmp->more)
1550	if (check_move_on (tmp, originator))	1442	if (check_move_on (tmp, originator))
1551	return NULL;	1443	return 0;
1552	}	1444	}
1553		1445
1554	return op;	1446	return op;
1555	}	1447	}
1556		1448
1557	/* this function inserts an object in the map, but if it	1449	/* this function inserts an object in the map, but if it
1558	* finds an object of its own type, it'll remove that one first.	1450	* finds an object of its own type, it'll remove that one first.
1559	* op is the object to insert it under: supplies x and the map.	1451	* op is the object to insert it under: supplies x and the map.
1560	*/	1452	*/
1561	void	1453	void
1562	replace_insert_ob_in_map (const char *arch_string, object *op)	1454	replace_insert_ob_in_map (const char *arch_string, object *op)
1563	{	1455	{
1564	object *	1456	object *tmp, *tmp1;
1565	tmp;
1566	object *
1567	tmp1;
1568		1457
1569	/* first search for itself and remove any old instances */	1458	/* first search for itself and remove any old instances */
1570		1459
1571	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1460	for (tmp = op->ms ().bot; tmp; tmp = tmp->above)
1572	{
1573	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */	1461	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */
1574	{	1462	tmp->destroy ();
1575	remove_ob (tmp);
1576	free_object (tmp);
1577	}
1578	}
1579		1463
1580	tmp1 = arch_to_object (archetype::find (arch_string));	1464	tmp1 = arch_to_object (archetype::find (arch_string));
1581		1465
1582	tmp1->x = op->x;	1466	tmp1->x = op->x;
1583	tmp1->y = op->y;	1467	tmp1->y = op->y;
1584	insert_ob_in_map (tmp1, op->map, op, 0);	1468	insert_ob_in_map (tmp1, op->map, op, 0);
		1469	}
		1470
		1471	object *
		1472	object::insert_at (object *where, object *originator, int flags)
		1473	{
		1474	where->map->insert (this, where->x, where->y, originator, flags);
1585	}	1475	}
1586		1476
1587	/*	1477	/*
1588	* get_split_ob(ob,nr) splits up ob into two parts. The part which	1478	* get_split_ob(ob,nr) splits up ob into two parts. The part which
1589	* is returned contains nr objects, and the remaining parts contains	1479	* is returned contains nr objects, and the remaining parts contains
1590	* the rest (or is removed and freed if that number is 0).	1480	* the rest (or is removed and freed if that number is 0).
1591	* On failure, NULL is returned, and the reason put into the	1481	* On failure, NULL is returned, and the reason put into the
1592	* global static errmsg array.	1482	* global static errmsg array.
1593	*/	1483	*/
1594
1595	object *	1484	object *
1596	get_split_ob (object *orig_ob, uint32 nr)	1485	get_split_ob (object *orig_ob, uint32 nr)
1597	{	1486	{
1598	object *	1487	object *newob;
1599	newob;
1600	int
1601	is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);	1488	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1602		1489
1603	if (orig_ob->nrof < nr)	1490	if (orig_ob->nrof < nr)
1604	{	1491	{
1605	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);	1492	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1606	return NULL;	1493	return NULL;
1607	}	1494	}
1608		1495
1609	newob = object_create_clone (orig_ob);	1496	newob = object_create_clone (orig_ob);
1610		1497
1611	if ((orig_ob->nrof -= nr) < 1)	1498	if ((orig_ob->nrof -= nr) < 1)
1612	{	1499	orig_ob->destroy (1);
1613	if (!is_removed)
1614	remove_ob (orig_ob);
1615	free_object2 (orig_ob, 1);
1616	}
1617	else if (!is_removed)	1500	else if (!is_removed)
1618	{	1501	{
1619	if (orig_ob->env != NULL)	1502	if (orig_ob->env != NULL)
1620	sub_weight (orig_ob->env, orig_ob->weight * nr);	1503	sub_weight (orig_ob->env, orig_ob->weight * nr);
1621	if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)	1504	if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)
…		…
1641		1524
1642	object *	1525	object *
1643	decrease_ob_nr (object *op, uint32 i)	1526	decrease_ob_nr (object *op, uint32 i)
1644	{	1527	{
1645	object *tmp;	1528	object *tmp;
1646	player *pl;
1647		1529
1648	if (i == 0) /* objects with op->nrof require this check */	1530	if (i == 0) /* objects with op->nrof require this check */
1649	return op;	1531	return op;
1650		1532
1651	if (i > op->nrof)	1533	if (i > op->nrof)
1652	i = op->nrof;	1534	i = op->nrof;
1653		1535
1654	if (QUERY_FLAG (op, FLAG_REMOVED))	1536	if (QUERY_FLAG (op, FLAG_REMOVED))
1655	op->nrof -= i;	1537	op->nrof -= i;
1656	else if (op->env != NULL)	1538	else if (op->env)
1657	{	1539	{
1658	/* is this object in the players inventory, or sub container	1540	/* is this object in the players inventory, or sub container
1659	* therein?	1541	* therein?
1660	*/	1542	*/
1661	tmp = is_player_inv (op->env);	1543	tmp = op->in_player ();
1662	/* nope. Is this a container the player has opened?	1544	/* nope. Is this a container the player has opened?
1663	* If so, set tmp to that player.	1545	* If so, set tmp to that player.
1664	* IMO, searching through all the players will mostly	1546	* IMO, searching through all the players will mostly
1665	* likely be quicker than following op->env to the map,	1547	* likely be quicker than following op->env to the map,
1666	* and then searching the map for a player.	1548	* and then searching the map for a player.
1667	*/	1549	*/
1668	if (!tmp)	1550	if (!tmp)
1669	{	1551	for_all_players (pl)
1670	for (pl = first_player; pl; pl = pl->next)
1671	if (pl->ob->container == op->env)	1552	if (pl->ob->container == op->env)
		1553	{
		1554	tmp = pl->ob;
1672	break;	1555	break;
1673	if (pl)
1674	tmp = pl->ob;
1675	else
1676	tmp = NULL;
1677	}	1556	}
1678		1557
1679	if (i < op->nrof)	1558	if (i < op->nrof)
1680	{	1559	{
1681	sub_weight (op->env, op->weight * i);	1560	sub_weight (op->env, op->weight * i);
1682	op->nrof -= i;	1561	op->nrof -= i;
1683	if (tmp)	1562	if (tmp)
1684	{
1685	esrv_send_item (tmp, op);	1563	esrv_send_item (tmp, op);
1686	}
1687	}	1564	}
1688	else	1565	else
1689	{	1566	{
1690	remove_ob (op);	1567	op->remove ();
1691	op->nrof = 0;	1568	op->nrof = 0;
1692	if (tmp)	1569	if (tmp)
1693	{
1694	esrv_del_item (tmp->contr, op->count);	1570	esrv_del_item (tmp->contr, op->count);
1695	}
1696	}	1571	}
1697	}	1572	}
1698	else	1573	else
1699	{	1574	{
1700	object *above = op->above;	1575	object *above = op->above;
1701		1576
1702	if (i < op->nrof)	1577	if (i < op->nrof)
1703	op->nrof -= i;	1578	op->nrof -= i;
1704	else	1579	else
1705	{	1580	{
1706	remove_ob (op);	1581	op->remove ();
1707	op->nrof = 0;	1582	op->nrof = 0;
1708	}	1583	}
1709		1584
1710	/* Since we just removed op, op->above is null */	1585	/* Since we just removed op, op->above is null */
1711	for (tmp = above; tmp != NULL; tmp = tmp->above)	1586	for (tmp = above; tmp; tmp = tmp->above)
1712	if (tmp->type == PLAYER)	1587	if (tmp->type == PLAYER)
1713	{	1588	{
1714	if (op->nrof)	1589	if (op->nrof)
1715	esrv_send_item (tmp, op);	1590	esrv_send_item (tmp, op);
1716	else	1591	else
…		…
1720		1595
1721	if (op->nrof)	1596	if (op->nrof)
1722	return op;	1597	return op;
1723	else	1598	else
1724	{	1599	{
1725	free_object (op);	1600	op->destroy ();
1726	return NULL;	1601	return 0;
1727	}	1602	}
1728	}	1603	}
1729		1604
1730	/*	1605	/*
1731	* add_weight(object, weight) adds the specified weight to an object,	1606	* add_weight(object, weight) adds the specified weight to an object,
…		…
1743	op->carrying += weight;	1618	op->carrying += weight;
1744	op = op->env;	1619	op = op->env;
1745	}	1620	}
1746	}	1621	}
1747		1622
1748	/*
1749	* insert_ob_in_ob(op,environment):
1750	* This function inserts the object op in the linked list
1751	* inside the object environment.
1752	*
1753	* Eneq(@csd.uu.se): Altered insert_ob_in_ob to make things picked up enter
1754	* the inventory at the last position or next to other objects of the same
1755	* type.
1756	* Frank: Now sorted by type, archetype and magic!
1757	*
1758	* The function returns now pointer to inserted item, and return value can
1759	* be != op, if items are merged. -Tero
1760	*/
1761
1762	object *	1623	object *
1763	insert_ob_in_ob (object *op, object *where)	1624	insert_ob_in_ob (object *op, object *where)
1764	{	1625	{
1765	object *	1626	if (!where)
1766	tmp, *
1767	otmp;
1768
1769	if (!QUERY_FLAG (op, FLAG_REMOVED))
1770	{
1771	char *dump = dump_object (op);
1772	LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", dump);
1773	free (dump);
1774	return op;
1775	}
1776
1777	if (where == NULL)
1778	{	1627	{
1779	char *dump = dump_object (op);	1628	char *dump = dump_object (op);
1780	LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);	1629	LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
1781	free (dump);	1630	free (dump);
1782	return op;	1631	return op;
1783	}	1632	}
1784		1633
1785	if (where->head)	1634	if (where->head)
1786	{	1635	{
1787	LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n");	1636	LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n");
1788	where = where->head;	1637	where = where->head;
1789	}	1638	}
		1639
		1640	return where->insert (op);
		1641	}
		1642
		1643	/*
		1644	* env->insert (op)
		1645	* This function inserts the object op in the linked list
		1646	* inside the object environment.
		1647	*
		1648	* The function returns now pointer to inserted item, and return value can
		1649	* be != op, if items are merged. -Tero
		1650	*/
		1651
		1652	object *
		1653	object::insert (object *op)
		1654	{
		1655	object *tmp, *otmp;
		1656
		1657	if (!QUERY_FLAG (op, FLAG_REMOVED))
		1658	op->remove ();
1790		1659
1791	if (op->more)	1660	if (op->more)
1792	{	1661	{
1793	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);	1662	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1794	return op;	1663	return op;
…		…
1796		1665
1797	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1666	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1798	CLEAR_FLAG (op, FLAG_REMOVED);	1667	CLEAR_FLAG (op, FLAG_REMOVED);
1799	if (op->nrof)	1668	if (op->nrof)
1800	{	1669	{
1801	for (tmp = where->inv; tmp != NULL; tmp = tmp->below)	1670	for (tmp = inv; tmp != NULL; tmp = tmp->below)
1802	if (CAN_MERGE (tmp, op))	1671	if (object::can_merge (tmp, op))
1803	{	1672	{
1804	/* return the original object and remove inserted object	1673	/* return the original object and remove inserted object
1805	(client needs the original object) */	1674	(client needs the original object) */
1806	tmp->nrof += op->nrof;	1675	tmp->nrof += op->nrof;
1807	/* Weight handling gets pretty funky. Since we are adding to	1676	/* Weight handling gets pretty funky. Since we are adding to
1808	* tmp->nrof, we need to increase the weight.	1677	* tmp->nrof, we need to increase the weight.
1809	*/	1678	*/
1810	add_weight (where, op->weight * op->nrof);	1679	add_weight (this, op->weight * op->nrof);
1811	SET_FLAG (op, FLAG_REMOVED);	1680	SET_FLAG (op, FLAG_REMOVED);
1812	free_object (op); /* free the inserted object */	1681	op->destroy (); /* free the inserted object */
1813	op = tmp;	1682	op = tmp;
1814	remove_ob (op); /* and fix old object's links */	1683	op->remove (); /* and fix old object's links */
1815	CLEAR_FLAG (op, FLAG_REMOVED);	1684	CLEAR_FLAG (op, FLAG_REMOVED);
1816	break;	1685	break;
1817	}	1686	}
1818		1687
1819	/* I assume combined objects have no inventory	1688	/* I assume combined objects have no inventory
1820	* We add the weight - this object could have just been removed	1689	* We add the weight - this object could have just been removed
1821	* (if it was possible to merge). calling remove_ob will subtract	1690	* (if it was possible to merge). calling remove_ob will subtract
1822	* the weight, so we need to add it in again, since we actually do	1691	* the weight, so we need to add it in again, since we actually do
1823	* the linking below	1692	* the linking below
1824	*/	1693	*/
1825	add_weight (where, op->weight * op->nrof);	1694	add_weight (this, op->weight * op->nrof);
1826	}	1695	}
1827	else	1696	else
1828	add_weight (where, (op->weight + op->carrying));	1697	add_weight (this, (op->weight + op->carrying));
1829		1698
1830	otmp = is_player_inv (where);	1699	otmp = this->in_player ();
1831	if (otmp && otmp->contr != NULL)	1700	if (otmp && otmp->contr)
1832	{
1833	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1701	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1834	fix_player (otmp);	1702	otmp->update_stats ();
1835	}
1836		1703
1837	op->map = NULL;	1704	op->map = 0;
1838	op->env = where;	1705	op->env = this;
1839	op->above = NULL;	1706	op->above = 0;
1840	op->below = NULL;	1707	op->below = 0;
1841	op->x = 0, op->y = 0;	1708	op->x = 0, op->y = 0;
1842		1709
1843	/* reset the light list and los of the players on the map */	1710	/* reset the light list and los of the players on the map */
1844	if ((op->glow_radius != 0) && where->map)	1711	if ((op->glow_radius != 0) && map)
1845	{	1712	{
1846	#ifdef DEBUG_LIGHTS	1713	#ifdef DEBUG_LIGHTS
1847	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);	1714	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1848	#endif /* DEBUG_LIGHTS */	1715	#endif /* DEBUG_LIGHTS */
1849	if (MAP_DARKNESS (where->map))	1716	if (map->darkness)
1850	update_all_los (where->map, where->x, where->y);	1717	update_all_los (map, x, y);
1851	}	1718	}
1852		1719
1853	/* Client has no idea of ordering so lets not bother ordering it here.	1720	/* Client has no idea of ordering so lets not bother ordering it here.
1854	* It sure simplifies this function...	1721	* It sure simplifies this function...
1855	*/	1722	*/
1856	if (where->inv == NULL)	1723	if (!inv)
1857	where->inv = op;	1724	inv = op;
1858	else	1725	else
1859	{	1726	{
1860	op->below = where->inv;	1727	op->below = inv;
1861	op->below->above = op;	1728	op->below->above = op;
1862	where->inv = op;	1729	inv = op;
1863	}	1730	}
		1731
		1732	INVOKE_OBJECT (INSERT, this);
		1733
1864	return op;	1734	return op;
1865	}	1735	}
1866		1736
1867	/*	1737	/*
1868	* Checks if any objects has a move_type that matches objects	1738	* Checks if any objects has a move_type that matches objects
…		…
1882	*	1752	*
1883	* MSW 2001-07-08: Check all objects on space, not just those below	1753	* MSW 2001-07-08: Check all objects on space, not just those below
1884	* object being inserted. insert_ob_in_map may not put new objects	1754	* object being inserted. insert_ob_in_map may not put new objects
1885	* on top.	1755	* on top.
1886	*/	1756	*/
1887
1888	int	1757	int
1889	check_move_on (object *op, object *originator)	1758	check_move_on (object *op, object *originator)
1890	{	1759	{
1891	object *tmp;	1760	object *tmp;
1892	maptile *m = op->map;	1761	maptile *m = op->map;
…		…
1919		1788
1920	/* The objects have to be checked from top to bottom.	1789	/* The objects have to be checked from top to bottom.
1921	* Hence, we first go to the top:	1790	* Hence, we first go to the top:
1922	*/	1791	*/
1923		1792
1924	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL && tmp->above != NULL; tmp = tmp->above)	1793	for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above)
1925	{	1794	{
1926	/* Trim the search when we find the first other spell effect	1795	/* Trim the search when we find the first other spell effect
1927	* this helps performance so that if a space has 50 spell objects,	1796	* this helps performance so that if a space has 50 spell objects,
1928	* we don't need to check all of them.	1797	* we don't need to check all of them.
1929	*/	1798	*/
…		…
1984	/*	1853	/*
1985	* present_arch(arch, map, x, y) searches for any objects with	1854	* present_arch(arch, map, x, y) searches for any objects with
1986	* a matching archetype at the given map and coordinates.	1855	* a matching archetype at the given map and coordinates.
1987	* The first matching object is returned, or NULL if none.	1856	* The first matching object is returned, or NULL if none.
1988	*/	1857	*/
1989
1990	object *	1858	object *
1991	present_arch (const archetype *at, maptile *m, int x, int y)	1859	present_arch (const archetype *at, maptile *m, int x, int y)
1992	{	1860	{
1993	object *
1994	tmp;
1995
1996	if (m == NULL || out_of_map (m, x, y))	1861	if (!m || out_of_map (m, x, y))
1997	{	1862	{
1998	LOG (llevError, "Present_arch called outside map.\n");	1863	LOG (llevError, "Present_arch called outside map.\n");
1999	return NULL;	1864	return NULL;
2000	}	1865	}
2001	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1866
		1867	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
2002	if (tmp->arch == at)	1868	if (tmp->arch == at)
2003	return tmp;	1869	return tmp;
		1870
2004	return NULL;	1871	return NULL;
2005	}	1872	}
2006		1873
2007	/*	1874	/*
2008	* present(type, map, x, y) searches for any objects with	1875	* present(type, map, x, y) searches for any objects with
2009	* a matching type variable at the given map and coordinates.	1876	* a matching type variable at the given map and coordinates.
2010	* The first matching object is returned, or NULL if none.	1877	* The first matching object is returned, or NULL if none.
2011	*/	1878	*/
2012
2013	object *	1879	object *
2014	present (unsigned char type, maptile *m, int x, int y)	1880	present (unsigned char type, maptile *m, int x, int y)
2015	{	1881	{
2016	object *
2017	tmp;
2018
2019	if (out_of_map (m, x, y))	1882	if (out_of_map (m, x, y))
2020	{	1883	{
2021	LOG (llevError, "Present called outside map.\n");	1884	LOG (llevError, "Present called outside map.\n");
2022	return NULL;	1885	return NULL;
2023	}	1886	}
2024	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1887
		1888	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
2025	if (tmp->type == type)	1889	if (tmp->type == type)
2026	return tmp;	1890	return tmp;
		1891
2027	return NULL;	1892	return NULL;
2028	}	1893	}
2029		1894
2030	/*	1895	/*
2031	* present_in_ob(type, object) searches for any objects with	1896	* present_in_ob(type, object) searches for any objects with
2032	* a matching type variable in the inventory of the given object.	1897	* a matching type variable in the inventory of the given object.
2033	* The first matching object is returned, or NULL if none.	1898	* The first matching object is returned, or NULL if none.
2034	*/	1899	*/
2035
2036	object *	1900	object *
2037	present_in_ob (unsigned char type, const object *op)	1901	present_in_ob (unsigned char type, const object *op)
2038	{	1902	{
2039	object *
2040	tmp;
2041
2042	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1903	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2043	if (tmp->type == type)	1904	if (tmp->type == type)
2044	return tmp;	1905	return tmp;
		1906
2045	return NULL;	1907	return NULL;
2046	}	1908	}
2047		1909
2048	/*	1910	/*
2049	* present_in_ob (type, str, object) searches for any objects with	1911	* present_in_ob (type, str, object) searches for any objects with
…		…
2057	* str is the string to match against. Note that we match against	1919	* str is the string to match against. Note that we match against
2058	* the object name, not the archetype name. this is so that the	1920	* the object name, not the archetype name. this is so that the
2059	* spell code can use one object type (force), but change it's name	1921	* spell code can use one object type (force), but change it's name
2060	* to be unique.	1922	* to be unique.
2061	*/	1923	*/
2062
2063	object *	1924	object *
2064	present_in_ob_by_name (int type, const char *str, const object *op)	1925	present_in_ob_by_name (int type, const char *str, const object *op)
2065	{	1926	{
2066	object *
2067	tmp;
2068
2069	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1927	for (object *tmp = op->inv; tmp; tmp = tmp->below)
2070	{
2071	if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name)))	1928	if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name)))
2072	return tmp;	1929	return tmp;
2073	}	1930
2074	return NULL;	1931	return 0;
2075	}	1932	}
2076		1933
2077	/*	1934	/*
2078	* present_arch_in_ob(archetype, object) searches for any objects with	1935	* present_arch_in_ob(archetype, object) searches for any objects with
2079	* a matching archetype in the inventory of the given object.	1936	* a matching archetype in the inventory of the given object.
2080	* The first matching object is returned, or NULL if none.	1937	* The first matching object is returned, or NULL if none.
2081	*/	1938	*/
2082
2083	object *	1939	object *
2084	present_arch_in_ob (const archetype *at, const object *op)	1940	present_arch_in_ob (const archetype *at, const object *op)
2085	{	1941	{
2086	object *
2087	tmp;
2088
2089	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1942	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2090	if (tmp->arch == at)	1943	if (tmp->arch == at)
2091	return tmp;	1944	return tmp;
		1945
2092	return NULL;	1946	return NULL;
2093	}	1947	}
2094		1948
2095	/*	1949	/*
2096	* activate recursively a flag on an object inventory	1950	* activate recursively a flag on an object inventory
2097	*/	1951	*/
2098	void	1952	void
2099	flag_inv (object *op, int flag)	1953	flag_inv (object *op, int flag)
2100	{	1954	{
2101	object *
2102	tmp;
2103
2104	if (op->inv)	1955	if (op->inv)
2105	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1956	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2106	{	1957	{
2107	SET_FLAG (tmp, flag);	1958	SET_FLAG (tmp, flag);
2108	flag_inv (tmp, flag);	1959	flag_inv (tmp, flag);
2109	}	1960	}
2110	} /*	1961	}
		1962
		1963	/*
2111	* desactivate recursively a flag on an object inventory	1964	* deactivate recursively a flag on an object inventory
2112	*/	1965	*/
2113	void	1966	void
2114	unflag_inv (object *op, int flag)	1967	unflag_inv (object *op, int flag)
2115	{	1968	{
2116	object *
2117	tmp;
2118
2119	if (op->inv)	1969	if (op->inv)
2120	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1970	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2121	{	1971	{
2122	CLEAR_FLAG (tmp, flag);	1972	CLEAR_FLAG (tmp, flag);
2123	unflag_inv (tmp, flag);	1973	unflag_inv (tmp, flag);
2124	}	1974	}
2125	}	1975	}
…		…
2128	* set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in	1978	* set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in
2129	* all it's inventory (recursively).	1979	* all it's inventory (recursively).
2130	* If checksums are used, a player will get set_cheat called for	1980	* If checksums are used, a player will get set_cheat called for
2131	* him/her-self and all object carried by a call to this function.	1981	* him/her-self and all object carried by a call to this function.
2132	*/	1982	*/
2133
2134	void	1983	void
2135	set_cheat (object *op)	1984	set_cheat (object *op)
2136	{	1985	{
2137	SET_FLAG (op, FLAG_WAS_WIZ);	1986	SET_FLAG (op, FLAG_WAS_WIZ);
2138	flag_inv (op, FLAG_WAS_WIZ);	1987	flag_inv (op, FLAG_WAS_WIZ);
…		…
2157	* because arch_blocked (now ob_blocked) needs to know the movement type	2006	* because arch_blocked (now ob_blocked) needs to know the movement type
2158	* to know if the space in question will block the object. We can't use	2007	* to know if the space in question will block the object. We can't use
2159	* the archetype because that isn't correct if the monster has been	2008	* the archetype because that isn't correct if the monster has been
2160	* customized, changed states, etc.	2009	* customized, changed states, etc.
2161	*/	2010	*/
2162
2163	int	2011	int
2164	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)	2012	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2165	{	2013	{
2166	int
2167	i,
2168	index = 0, flag;	2014	int index = 0, flag;
2169	static int
2170	altern[SIZEOFFREE];	2015	int altern[SIZEOFFREE];
2171		2016
2172	for (i = start; i < stop; i++)	2017	for (int i = start; i < stop; i++)
2173	{	2018	{
2174	flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]);	2019	flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]);
2175	if (!flag)	2020	if (!flag)
2176	altern[index++] = i;	2021	altern [index++] = i;
2177		2022
2178	/* Basically, if we find a wall on a space, we cut down the search size.	2023	/* Basically, if we find a wall on a space, we cut down the search size.
2179	* In this way, we won't return spaces that are on another side of a wall.	2024	* In this way, we won't return spaces that are on another side of a wall.
2180	* This mostly work, but it cuts down the search size in all directions -	2025	* This mostly work, but it cuts down the search size in all directions -
2181	* if the space being examined only has a wall to the north and empty	2026	* if the space being examined only has a wall to the north and empty
2182	* spaces in all the other directions, this will reduce the search space	2027	* spaces in all the other directions, this will reduce the search space
2183	* to only the spaces immediately surrounding the target area, and	2028	* to only the spaces immediately surrounding the target area, and
2184	* won't look 2 spaces south of the target space.	2029	* won't look 2 spaces south of the target space.
2185	*/	2030	*/
2186	else if ((flag & AB_NO_PASS) && maxfree[i] < stop)	2031	else if ((flag & P_NO_PASS) && maxfree[i] < stop)
2187	stop = maxfree[i];	2032	stop = maxfree[i];
2188	}	2033	}
		2034
2189	if (!index)	2035	if (!index)
2190	return -1;	2036	return -1;
		2037
2191	return altern[RANDOM () % index];	2038	return altern[RANDOM () % index];
2192	}	2039	}
2193		2040
2194	/*	2041	/*
2195	* find_first_free_spot(archetype, maptile, x, y) works like	2042	* find_first_free_spot(archetype, maptile, x, y) works like
2196	* find_free_spot(), but it will search max number of squares.	2043	* find_free_spot(), but it will search max number of squares.
2197	* But it will return the first available spot, not a random choice.	2044	* But it will return the first available spot, not a random choice.
2198	* Changed 0.93.2: Have it return -1 if there is no free spot available.	2045	* Changed 0.93.2: Have it return -1 if there is no free spot available.
2199	*/	2046	*/
2200
2201	int	2047	int
2202	find_first_free_spot (const object *ob, maptile *m, int x, int y)	2048	find_first_free_spot (const object *ob, maptile *m, int x, int y)
2203	{	2049	{
2204	int
2205	i;
2206
2207	for (i = 0; i < SIZEOFFREE; i++)	2050	for (int i = 0; i < SIZEOFFREE; i++)
2208	{
2209	if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]))	2051	if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]))
2210	return i;	2052	return i;
2211	}	2053
2212	return -1;	2054	return -1;
2213	}	2055	}
2214		2056
2215	/*	2057	/*
2216	* The function permute(arr, begin, end) randomly reorders the array	2058	* The function permute(arr, begin, end) randomly reorders the array
2217	* arr[begin..end-1].	2059	* arr[begin..end-1].
		2060	* now uses a fisher-yates shuffle, old permute was broken
2218	*/	2061	*/
2219	static void	2062	static void
2220	permute (int *arr, int begin, int end)	2063	permute (int *arr, int begin, int end)
2221	{	2064	{
2222	int	2065	arr += begin;
2223	i,
2224	j,
2225	tmp,
2226	len;
2227
2228	len = end - begin;	2066	end -= begin;
2229	for (i = begin; i < end; i++)
2230	{
2231	j = begin + RANDOM () % len;
2232		2067
2233	tmp = arr[i];	2068	while (--end)
2234	arr[i] = arr[j];	2069	swap (arr [end], arr [RANDOM () % (end + 1)]);
2235	arr[j] = tmp;
2236	}
2237	}	2070	}
2238		2071
2239	/* new function to make monster searching more efficient, and effective!	2072	/* new function to make monster searching more efficient, and effective!
2240	* This basically returns a randomized array (in the passed pointer) of	2073	* This basically returns a randomized array (in the passed pointer) of
2241	* the spaces to find monsters. In this way, it won't always look for	2074	* the spaces to find monsters. In this way, it won't always look for
…		…
2244	* the 3x3 area will be searched, just not in a predictable order.	2077	* the 3x3 area will be searched, just not in a predictable order.
2245	*/	2078	*/
2246	void	2079	void
2247	get_search_arr (int *search_arr)	2080	get_search_arr (int *search_arr)
2248	{	2081	{
2249	int	2082	int i;
2250	i;
2251		2083
2252	for (i = 0; i < SIZEOFFREE; i++)	2084	for (i = 0; i < SIZEOFFREE; i++)
2253	{
2254	search_arr[i] = i;	2085	search_arr[i] = i;
2255	}
2256		2086
2257	permute (search_arr, 1, SIZEOFFREE1 + 1);	2087	permute (search_arr, 1, SIZEOFFREE1 + 1);
2258	permute (search_arr, SIZEOFFREE1 + 1, SIZEOFFREE2 + 1);	2088	permute (search_arr, SIZEOFFREE1 + 1, SIZEOFFREE2 + 1);
2259	permute (search_arr, SIZEOFFREE2 + 1, SIZEOFFREE);	2089	permute (search_arr, SIZEOFFREE2 + 1, SIZEOFFREE);
2260	}	2090	}
…		…
2269	* Perhaps incorrectly, but I'm making the assumption that exclude	2099	* Perhaps incorrectly, but I'm making the assumption that exclude
2270	* is actually want is going to try and move there. We need this info	2100	* is actually want is going to try and move there. We need this info
2271	* because we have to know what movement the thing looking to move	2101	* because we have to know what movement the thing looking to move
2272	* there is capable of.	2102	* there is capable of.
2273	*/	2103	*/
2274
2275	int	2104	int
2276	find_dir (maptile *m, int x, int y, object *exclude)	2105	find_dir (maptile *m, int x, int y, object *exclude)
2277	{	2106	{
2278	int
2279	i,
2280	max = SIZEOFFREE, mflags;	2107	int i, max = SIZEOFFREE, mflags;
2281		2108
2282	sint16 nx, ny;	2109	sint16 nx, ny;
2283	object *	2110	object *tmp;
2284	tmp;
2285	maptile *	2111	maptile *mp;
2286	mp;
2287		2112
2288	MoveType blocked, move_type;	2113	MoveType blocked, move_type;
2289		2114
2290	if (exclude && exclude->head)	2115	if (exclude && exclude->head)
2291	{	2116	{
…		…
2303	mp = m;	2128	mp = m;
2304	nx = x + freearr_x[i];	2129	nx = x + freearr_x[i];
2305	ny = y + freearr_y[i];	2130	ny = y + freearr_y[i];
2306		2131
2307	mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);	2132	mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);
		2133
2308	if (mflags & P_OUT_OF_MAP)	2134	if (mflags & P_OUT_OF_MAP)
2309	{
2310	max = maxfree[i];	2135	max = maxfree[i];
2311	}
2312	else	2136	else
2313	{	2137	{
2314	blocked = GET_MAP_MOVE_BLOCK (mp, nx, ny);	2138	mapspace &ms = mp->at (nx, ny);
		2139
		2140	blocked = ms.move_block;
2315		2141
2316	if ((move_type & blocked) == move_type)	2142	if ((move_type & blocked) == move_type)
2317	{
2318	max = maxfree[i];	2143	max = maxfree[i];
2319	}
2320	else if (mflags & P_IS_ALIVE)	2144	else if (mflags & P_IS_ALIVE)
2321	{	2145	{
2322	for (tmp = GET_MAP_OB (mp, nx, ny); tmp != NULL; tmp = tmp->above)	2146	for (tmp = ms.bot; tmp; tmp = tmp->above)
2323	{	2147	if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)
2324	if ((QUERY_FLAG (tmp, FLAG_MONSTER) || tmp->type == PLAYER) && (tmp != exclude || (tmp->head && tmp->head != exclude)))	2148	&& (tmp != exclude || (tmp->head && tmp->head != exclude)))
2325	{
2326	break;	2149	break;
2327	}	2150
2328	}
2329	if (tmp)	2151	if (tmp)
2330	{
2331	return freedir[i];	2152	return freedir[i];
2332	}
2333	}	2153	}
2334	}	2154	}
2335	}	2155	}
		2156
2336	return 0;	2157	return 0;
2337	}	2158	}
2338		2159
2339	/*	2160	/*
2340	* distance(object 1, object 2) will return the square of the	2161	* distance(object 1, object 2) will return the square of the
2341	* distance between the two given objects.	2162	* distance between the two given objects.
2342	*/	2163	*/
2343
2344	int	2164	int
2345	distance (const object *ob1, const object *ob2)	2165	distance (const object *ob1, const object *ob2)
2346	{	2166	{
2347	int
2348	i;
2349
2350	i = (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);	2167	return (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);
2351	return i;
2352	}	2168	}
2353		2169
2354	/*	2170	/*
2355	* find_dir_2(delta-x,delta-y) will return a direction in which	2171	* find_dir_2(delta-x,delta-y) will return a direction in which
2356	* an object which has subtracted the x and y coordinates of another	2172	* an object which has subtracted the x and y coordinates of another
2357	* object, needs to travel toward it.	2173	* object, needs to travel toward it.
2358	*/	2174	*/
2359
2360	int	2175	int
2361	find_dir_2 (int x, int y)	2176	find_dir_2 (int x, int y)
2362	{	2177	{
2363	int	2178	int q;
2364	q;
2365		2179
2366	if (y)	2180	if (y)
2367	q = x * 100 / y;	2181	q = x * 100 / y;
2368	else if (x)	2182	else if (x)
2369	q = -300 * x;	2183	q = -300 * x;
…		…
2404	int	2218	int
2405	absdir (int d)	2219	absdir (int d)
2406	{	2220	{
2407	while (d < 1)	2221	while (d < 1)
2408	d += 8;	2222	d += 8;
		2223
2409	while (d > 8)	2224	while (d > 8)
2410	d -= 8;	2225	d -= 8;
		2226
2411	return d;	2227	return d;
2412	}	2228	}
2413		2229
2414	/*	2230	/*
2415	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is	2231	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is
…		…
2417	*/	2233	*/
2418		2234
2419	int	2235	int
2420	dirdiff (int dir1, int dir2)	2236	dirdiff (int dir1, int dir2)
2421	{	2237	{
2422	int	2238	int d;
2423	d;
2424		2239
2425	d = abs (dir1 - dir2);	2240	d = abs (dir1 - dir2);
2426	if (d > 4)	2241	if (d > 4)
2427	d = 8 - d;	2242	d = 8 - d;
		2243
2428	return d;	2244	return d;
2429	}	2245	}
2430		2246
2431	/* peterm:	2247	/* peterm:
2432	* do LOS stuff for ball lightning. Go after the closest VISIBLE monster.	2248	* do LOS stuff for ball lightning. Go after the closest VISIBLE monster.
…		…
2435	* This basically means that if direction is 15, then it could either go	2251	* This basically means that if direction is 15, then it could either go
2436	* direction 4, 14, or 16 to get back to where we are.	2252	* direction 4, 14, or 16 to get back to where we are.
2437	* Moved from spell_util.c to object.c with the other related direction	2253	* Moved from spell_util.c to object.c with the other related direction
2438	* functions.	2254	* functions.
2439	*/	2255	*/
2440
2441	int
2442	reduction_dir[SIZEOFFREE][3] = {	2256	int reduction_dir[SIZEOFFREE][3] = {
2443	{0, 0, 0}, /* 0 */	2257	{0, 0, 0}, /* 0 */
2444	{0, 0, 0}, /* 1 */	2258	{0, 0, 0}, /* 1 */
2445	{0, 0, 0}, /* 2 */	2259	{0, 0, 0}, /* 2 */
2446	{0, 0, 0}, /* 3 */	2260	{0, 0, 0}, /* 3 */
2447	{0, 0, 0}, /* 4 */	2261	{0, 0, 0}, /* 4 */
…		…
2495	* find a path to that monster that we found. If not,	2309	* find a path to that monster that we found. If not,
2496	* we don't bother going toward it. Returns 1 if we	2310	* we don't bother going toward it. Returns 1 if we
2497	* can see a direct way to get it	2311	* can see a direct way to get it
2498	* Modified to be map tile aware -.MSW	2312	* Modified to be map tile aware -.MSW
2499	*/	2313	*/
2500
2501
2502	int	2314	int
2503	can_see_monsterP (maptile *m, int x, int y, int dir)	2315	can_see_monsterP (maptile *m, int x, int y, int dir)
2504	{	2316	{
2505	sint16 dx, dy;	2317	sint16 dx, dy;
2506	int
2507	mflags;	2318	int mflags;
2508		2319
2509	if (dir < 0)	2320	if (dir < 0)
2510	return 0; /* exit condition: invalid direction */	2321	return 0; /* exit condition: invalid direction */
2511		2322
2512	dx = x + freearr_x[dir];	2323	dx = x + freearr_x[dir];
…		…
2525	return 0;	2336	return 0;
2526		2337
2527	/* yes, can see. */	2338	/* yes, can see. */
2528	if (dir < 9)	2339	if (dir < 9)
2529	return 1;	2340	return 1;
		2341
2530	return can_see_monsterP (m, x, y, reduction_dir[dir][0]) |	2342	return can_see_monsterP (m, x, y, reduction_dir[dir][0])
2531	can_see_monsterP (m, x, y, reduction_dir[dir][1]) | can_see_monsterP (m, x, y, reduction_dir[dir][2]);	2343	| can_see_monsterP (m, x, y, reduction_dir[dir][1])
		2344	| can_see_monsterP (m, x, y, reduction_dir[dir][2]);
2532	}	2345	}
2533
2534
2535		2346
2536	/*	2347	/*
2537	* can_pick(picker, item): finds out if an object is possible to be	2348	* can_pick(picker, item): finds out if an object is possible to be
2538	* picked up by the picker. Returnes 1 if it can be	2349	* picked up by the picker. Returnes 1 if it can be
2539	* picked up, otherwise 0.	2350	* picked up, otherwise 0.
…		…
2550	return /*QUERY_FLAG(who,FLAG_WIZ)|| */	2361	return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2551	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&	2362	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
2552	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3));	2363	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3));
2553	}	2364	}
2554		2365
2555
2556	/*	2366	/*
2557	* create clone from object to another	2367	* create clone from object to another
2558	*/	2368	*/
2559	object *	2369	object *
2560	object_create_clone (object *asrc)	2370	object_create_clone (object *asrc)
2561	{	2371	{
2562	object *
2563	dst = NULL, *tmp, *src, *part, *prev, *item;	2372	object *dst = 0, *tmp, *src, *part, *prev, *item;
2564		2373
2565	if (!asrc)	2374	if (!asrc)
2566	return NULL;	2375	return 0;
		2376
2567	src = asrc;	2377	src = asrc;
2568	if (src->head)	2378	if (src->head)
2569	src = src->head;	2379	src = src->head;
2570		2380
2571	prev = NULL;	2381	prev = 0;
2572	for (part = src; part; part = part->more)	2382	for (part = src; part; part = part->more)
2573	{	2383	{
2574	tmp = get_object ();	2384	tmp = part->clone ();
2575	copy_object (part, tmp);
2576	tmp->x -= src->x;	2385	tmp->x -= src->x;
2577	tmp->y -= src->y;	2386	tmp->y -= src->y;
		2387
2578	if (!part->head)	2388	if (!part->head)
2579	{	2389	{
2580	dst = tmp;	2390	dst = tmp;
2581	tmp->head = NULL;	2391	tmp->head = 0;
2582	}	2392	}
2583	else	2393	else
2584	{
2585	tmp->head = dst;	2394	tmp->head = dst;
2586	}	2395
2587	tmp->more = NULL;	2396	tmp->more = 0;
		2397
2588	if (prev)	2398	if (prev)
2589	prev->more = tmp;	2399	prev->more = tmp;
		2400
2590	prev = tmp;	2401	prev = tmp;
2591	}	2402	}
2592		2403
2593	for (item = src->inv; item; item = item->below)	2404	for (item = src->inv; item; item = item->below)
2594	insert_ob_in_ob (object_create_clone (item), dst);	2405	insert_ob_in_ob (object_create_clone (item), dst);
…		…
2600	/* Basically, we save the content of the string to a temp file, then call */	2411	/* Basically, we save the content of the string to a temp file, then call */
2601	/* load_object on it. I admit it is a highly inefficient way to make things, */	2412	/* load_object on it. I admit it is a highly inefficient way to make things, */
2602	/* but it was simple to make and allows reusing the load_object function. */	2413	/* but it was simple to make and allows reusing the load_object function. */
2603	/* Remember not to use load_object_str in a time-critical situation. */	2414	/* Remember not to use load_object_str in a time-critical situation. */
2604	/* Also remember that multiparts objects are not supported for now. */	2415	/* Also remember that multiparts objects are not supported for now. */
2605
2606	object *	2416	object *
2607	load_object_str (const char *obstr)	2417	load_object_str (const char *obstr)
2608	{	2418	{
2609	object *op;	2419	object *op;
2610	char filename[MAX_BUF];	2420	char filename[MAX_BUF];
…		…
2620	}	2430	}
2621		2431
2622	fprintf (tempfile, obstr);	2432	fprintf (tempfile, obstr);
2623	fclose (tempfile);	2433	fclose (tempfile);
2624		2434
2625	op = get_object ();	2435	op = object::create ();
2626		2436
2627	object_thawer thawer (filename);	2437	object_thawer thawer (filename);
2628		2438
2629	if (thawer)	2439	if (thawer)
2630	load_object (thawer, op, 0);	2440	load_object (thawer, op, 0);
…		…
2640	* returns NULL if no match.	2450	* returns NULL if no match.
2641	*/	2451	*/
2642	object *	2452	object *
2643	find_obj_by_type_subtype (const object *who, int type, int subtype)	2453	find_obj_by_type_subtype (const object *who, int type, int subtype)
2644	{	2454	{
2645	object *tmp;
2646
2647	for (tmp = who->inv; tmp; tmp = tmp->below)	2455	for (object *tmp = who->inv; tmp; tmp = tmp->below)
2648	if (tmp->type == type && tmp->subtype == subtype)	2456	if (tmp->type == type && tmp->subtype == subtype)
2649	return tmp;	2457	return tmp;
2650		2458
2651	return NULL;	2459	return 0;
2652	}	2460	}
2653		2461
2654	/* If ob has a field named key, return the link from the list,	2462	/* If ob has a field named key, return the link from the list,
2655	* otherwise return NULL.	2463	* otherwise return NULL.
2656	*	2464	*
…		…
2658	* do the desired thing.	2466	* do the desired thing.
2659	*/	2467	*/
2660	key_value *	2468	key_value *
2661	get_ob_key_link (const object *ob, const char *key)	2469	get_ob_key_link (const object *ob, const char *key)
2662	{	2470	{
2663	key_value *link;
2664
2665	for (link = ob->key_values; link != NULL; link = link->next)	2471	for (key_value *link = ob->key_values; link; link = link->next)
2666	if (link->key == key)	2472	if (link->key == key)
2667	return link;	2473	return link;
2668		2474
2669	return NULL;	2475	return 0;
2670	}	2476	}
2671		2477
2672	/*	2478	/*
2673	* Returns the value of op has an extra_field for key, or NULL.	2479	* Returns the value of op has an extra_field for key, or NULL.
2674	*	2480	*
…		…
2714	* Returns TRUE on success.	2520	* Returns TRUE on success.
2715	*/	2521	*/
2716	int	2522	int
2717	set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key)	2523	set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key)
2718	{	2524	{
2719	key_value *
2720	field = NULL, *last = NULL;	2525	key_value *field = NULL, *last = NULL;
2721		2526
2722	for (field = op->key_values; field != NULL; field = field->next)	2527	for (field = op->key_values; field != NULL; field = field->next)
2723	{	2528	{
2724	if (field->key != canonical_key)	2529	if (field->key != canonical_key)
2725	{	2530	{
…		…
2753	/* IF we get here, key doesn't exist */	2558	/* IF we get here, key doesn't exist */
2754		2559
2755	/* No field, we'll have to add it. */	2560	/* No field, we'll have to add it. */
2756		2561
2757	if (!add_key)	2562	if (!add_key)
2758	{
2759	return FALSE;	2563	return FALSE;
2760	}	2564
2761	/* There isn't any good reason to store a null	2565	/* There isn't any good reason to store a null
2762	* value in the key/value list. If the archetype has	2566	* value in the key/value list. If the archetype has
2763	* this key, then we should also have it, so shouldn't	2567	* this key, then we should also have it, so shouldn't
2764	* be here. If user wants to store empty strings,	2568	* be here. If user wants to store empty strings,
2765	* should pass in ""	2569	* should pass in ""
…		…
2814	}	2618	}
2815	else	2619	else
2816	item = item->env;	2620	item = item->env;
2817	}	2621	}
2818		2622
		2623
		2624	const char *
		2625	object::flag_desc (char *desc, int len) const
		2626	{
		2627	char *p = desc;
		2628	bool first = true;
		2629
		2630	*p = 0;
		2631
		2632	for (int i = 0; i < NUM_FLAGS; i++)
		2633	{
		2634	if (len <= 10) // magic constant!
		2635	{
		2636	snprintf (p, len, ",...");
		2637	break;
		2638	}
		2639
		2640	if (flag [i])
		2641	{
		2642	int cnt = snprintf (p, len, "%s%d", first ? "" : ",", i);
		2643	len -= cnt;
		2644	p += cnt;
		2645	first = false;
		2646	}
		2647	}
		2648
		2649	return desc;
		2650	}
		2651
2819	// return a suitable string describing an objetc in enough detail to find it	2652	// return a suitable string describing an object in enough detail to find it
2820	const char *	2653	const char *
2821	object::debug_desc (char *info) const	2654	object::debug_desc (char *info) const
2822	{	2655	{
		2656	char flagdesc[512];
2823	char info2[256 * 3];	2657	char info2[256 * 4];
2824	char *p = info;	2658	char *p = info;
2825		2659
2826	p += snprintf (p, 256, "%d=\"%s%s%s\"",	2660	p += snprintf (p, 512, "{cnt:%d,uuid:<1,%" PRIx64 ">,name:\"%s%s%s\",flags:[%s],type:%d}",
2827	count,	2661	count, uuid.seq,
2828	&name,	2662	&name,
2829	title ? " " : "",	2663	title ? "\",title:" : "",
2830	title ? (const char *)title : "");	2664	title ? (const char *)title : "",
		2665	flag_desc (flagdesc, 512), type);
2831		2666
2832	if (env)	2667	if (env)
2833	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2668	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2834		2669
2835	if (map)	2670	if (map)
2836	p += snprintf (p, 256, "(on %s@%d+%d)", map->path, x, y);	2671	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2837		2672
2838	return info;	2673	return info;
2839	}	2674	}
2840		2675
2841	const char *	2676	const char *
2842	object::debug_desc () const	2677	object::debug_desc () const
2843	{	2678	{
2844	static char info[256 * 3];	2679	static char info[256 * 4];
2845	return debug_desc (info);	2680	return debug_desc (info);
2846	}	2681	}
2847		2682

Diff Legend

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