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.46 by root, Thu Sep 14 21:16:11 2006 UTC vs.
Revision 1.75 by root, Wed Dec 20 11:36:38 2006 UTC

1
2	/*	1	/*
3	CrossFire, A Multiplayer game for X-windows	2	CrossFire, A Multiplayer game for X-windows
4		3
5	Copyright (C) 2001 Mark Wedel & Crossfire Development Team	4	Copyright (C) 2001 Mark Wedel & Crossfire Development Team
6	Copyright (C) 1992 Frank Tore Johansen	5	Copyright (C) 1992 Frank Tore Johansen
…		…
17		16
18	You should have received a copy of the GNU General Public License	17	You should have received a copy of the GNU General Public License
19	along with this program; if not, write to the Free Software	18	along with this program; if not, write to the Free Software
20	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	19	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21		20
22	The authors can be reached via e-mail at crossfire-devel@real-time.com	21	The authors can be reached via e-mail at <crossfire@schmorp.de>
23	*/	22	*/
24		23
25	/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.	24	/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
26	sub/add_weight will transcend the environment updating the carrying	25	sub/add_weight will transcend the environment updating the carrying
27	variable. */	26	variable. */
…		…
30	#include <sys/types.h>	29	#include <sys/types.h>
31	#include <sys/uio.h>	30	#include <sys/uio.h>
32	#include <object.h>	31	#include <object.h>
33	#include <funcpoint.h>	32	#include <funcpoint.h>
34	#include <loader.h>	33	#include <loader.h>
		34
		35	#include <bitset>
35		36
36	int nrofallocobjects = 0;	37	int nrofallocobjects = 0;
37	static UUID uuid;	38	static UUID uuid;
38	const uint64 UUID_SKIP = 1<<19;	39	const uint64 UUID_SKIP = 1<<19;
39		40
…		…
105	_exit (1);	106	_exit (1);
106	}	107	}
107		108
108	uuid.seq = uid;	109	uuid.seq = uid;
109	write_uuid ();	110	write_uuid ();
110	LOG (llevDebug, "read UID: %lld\n", uid);	111	LOG (llevDebug, "read UID: %" PRId64 "\n", uid);
111	fclose (fp);	112	fclose (fp);
112	}	113	}
113		114
114	UUID	115	UUID
115	gen_uuid ()	116	gen_uuid ()
…		…
184	*	185	*
185	* Note that this function appears a lot longer than the macro it	186	* Note that this function appears a lot longer than the macro it
186	* replaces - this is mostly for clarity - a decent compiler should hopefully	187	* replaces - this is mostly for clarity - a decent compiler should hopefully
187	* reduce this to the same efficiency.	188	* reduce this to the same efficiency.
188	*	189	*
189	* Check nrof variable *before* calling CAN_MERGE()	190	* Check nrof variable *before* calling can_merge()
190	*	191	*
191	* Improvements made with merge: Better checking on potion, and also	192	* Improvements made with merge: Better checking on potion, and also
192	* check weight	193	* check weight
193	*/	194	*/
194		195
195	bool object::can_merge (object *ob1, object *ob2)	196	bool object::can_merge_slow (object *ob1, object *ob2)
196	{	197	{
197	/* A couple quicksanity checks */	198	/* A couple quicksanity checks */
198	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)
199	return 0;	204	return 0;
200		205
201	if (ob1->speed != ob2->speed)	206	//TODO: this ain't working well, use nicer and correct overflow check
202	return 0;
203
204	/* 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
205	* 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
206	* used to store nrof).	209	* used to store nrof).
207	*/	210	*/
208	if (ob1->nrof + ob2->nrof >= 1UL << 31)	211	if (ob1->nrof + ob2->nrof >= 1UL << 31)
…		…
218	SET_FLAG (ob1, FLAG_BEEN_APPLIED);	221	SET_FLAG (ob1, FLAG_BEEN_APPLIED);
219		222
220	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))	223	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))
221	SET_FLAG (ob2, FLAG_BEEN_APPLIED);	224	SET_FLAG (ob2, FLAG_BEEN_APPLIED);
222		225
223		226	if ((ob1->flags ^ ob2->flags).reset (FLAG_INV_LOCKED).reset (FLAG_CLIENT_SENT).any ()
224	/* the 0x400000 on flags2 is FLAG_INV_LOCK. I don't think something	227	|| ob1->arch != ob2->arch
225	* being locked in inventory should prevent merging.
226	* 0x4 in flags3 is CLIENT_SENT
227	*/
228	if ((ob1->arch != ob2->arch) ||
229	(ob1->flags[0] != ob2->flags[0]) ||
230	(ob1->flags[1] != ob2->flags[1]) ||
231	((ob1->flags[2] & ~0x400000) != (ob2->flags[2] & ~0x400000)) ||
232	((ob1->flags[3] & ~0x4) != (ob2->flags[3] & ~0x4)) ||
233	(ob1->name != ob2->name) ||	228	|| ob1->name != ob2->name
234	(ob1->title != ob2->title) ||	229	|| ob1->title != ob2->title
235	(ob1->msg != ob2->msg) ||	230	|| ob1->msg != ob2->msg
236	(ob1->weight != ob2->weight) ||	231	|| ob1->weight != ob2->weight
237	(memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist)) != 0) ||	232	|| memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
238	(memcmp (&ob1->stats, &ob2->stats, sizeof (ob1->stats)) != 0) ||	233	|| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats) )
239	(ob1->attacktype != ob2->attacktype) ||	234	|| ob1->attacktype != ob2->attacktype
240	(ob1->magic != ob2->magic) ||	235	|| ob1->magic != ob2->magic
241	(ob1->slaying != ob2->slaying) ||	236	|| ob1->slaying != ob2->slaying
242	(ob1->skill != ob2->skill) ||	237	|| ob1->skill != ob2->skill
243	(ob1->value != ob2->value) ||	238	|| ob1->value != ob2->value
244	(ob1->animation_id != ob2->animation_id) ||	239	|| ob1->animation_id != ob2->animation_id
245	(ob1->client_type != ob2->client_type) ||	240	|| ob1->client_type != ob2->client_type
246	(ob1->materialname != ob2->materialname) ||	241	|| ob1->materialname != ob2->materialname
247	(ob1->lore != ob2->lore) ||	242	|| ob1->lore != ob2->lore
248	(ob1->subtype != ob2->subtype) ||	243	|| ob1->subtype != ob2->subtype
249	(ob1->move_type != ob2->move_type) ||	244	|| ob1->move_type != ob2->move_type
250	(ob1->move_block != ob2->move_block) ||	245	|| ob1->move_block != ob2->move_block
251	(ob1->move_allow != ob2->move_allow) ||	246	|| ob1->move_allow != ob2->move_allow
252	(ob1->move_on != ob2->move_on) ||	247	|| ob1->move_on != ob2->move_on
253	(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)
254	return 0;	251	return 0;
255		252
256	/* This is really a spellbook check - really, we should	253	/* This is really a spellbook check - really, we should
257	* check all objects in the inventory.	254	* check all objects in the inventory.
258	*/	255	*/
…		…
261	/* 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 */
262	if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv))	259	if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv))
263	return 0;	260	return 0;
264		261
265	/* Now check to see if the two inventory objects could merge */	262	/* Now check to see if the two inventory objects could merge */
266	if (!CAN_MERGE (ob1->inv, ob2->inv))	263	if (!object::can_merge (ob1->inv, ob2->inv))
267	return 0;	264	return 0;
268		265
269	/* 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
270	* if it is valid.	267	* if it is valid.
271	*/	268	*/
…		…
355	op = op->env;	352	op = op->env;
356	return op;	353	return op;
357	}	354	}
358		355
359	/*	356	/*
360	* Eneq(@csd.uu.se): Since we can have items buried in a character we need
361	* a better check. We basically keeping traversing up until we can't
362	* or find a player.
363	*/
364
365	object *
366	is_player_inv (object *op)
367	{
368	for (; op != NULL && op->type != PLAYER; op = op->env)
369	if (op->env == op)
370	op->env = NULL;
371	return op;
372	}
373
374	/*
375	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.	357	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
376	* Some error messages.	358	* Some error messages.
377	* 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.
378	*/	360	*/
379		361
380	void	362	char *
381	dump_object2 (object *op)
382	{
383	errmsg[0] = 0;
384	return;
385	//TODO//D#d#
386	#if 0
387	char *cp;
388
389	/* object *tmp;*/
390
391	if (op->arch != NULL)
392	{
393	strcat (errmsg, "arch ");
394	strcat (errmsg, op->arch->name ? op->arch->name : "(null)");
395	strcat (errmsg, "\n");
396	if ((cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
397	strcat (errmsg, cp);
398	# if 0
399	/* Don't dump player diffs - they are too long, mostly meaningless, and
400	* will overflow the buffer.
401	* Changed so that we don't dump inventory either. This may
402	* also overflow the buffer.
403	*/
404	if (op->type != PLAYER && (cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
405	strcat (errmsg, cp);
406	for (tmp = op->inv; tmp; tmp = tmp->below)
407	dump_object2 (tmp);
408	# endif
409	strcat (errmsg, "end\n");
410	}
411	else
412	{
413	strcat (errmsg, "Object ");
414	if (op->name == NULL)
415	strcat (errmsg, "(null)");
416	else
417	strcat (errmsg, op->name);
418	strcat (errmsg, "\n");
419	# if 0
420	if ((cp = get_ob_diff (op, &empty_archetype->clone)) != NULL)
421	strcat (errmsg, cp);
422	for (tmp = op->inv; tmp; tmp = tmp->below)
423	dump_object2 (tmp);
424	# endif
425	strcat (errmsg, "end\n");
426	}
427	#endif
428	}
429
430	/*
431	* Dumps an object. Returns output in the static global errmsg array.
432	*/
433
434	void
435	dump_object (object *op)	363	dump_object (object *op)
436	{	364	{
437	if (op == NULL)	365	if (!op)
438	{	366	return strdup ("[NULLOBJ]");
439	strcpy (errmsg, "[NULL pointer]");
440	return;
441	}
442	errmsg[0] = '\0';
443	dump_object2 (op);
444	}
445		367
446	void	368	object_freezer freezer;
447	dump_all_objects (void)	369	save_object (freezer, op, 3);
448	{	370	return freezer.as_string ();
449	object *op;
450
451	for (op = object::first; op != NULL; op = op->next)
452	{
453	dump_object (op);
454	fprintf (logfile, "Object %d\n:%s\n", op->count, errmsg);
455	}
456	}	371	}
457		372
458	/*	373	/*
459	* 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
460	* multi-object 1 which is closest to the second object.	375	* multi-object 1 which is closest to the second object.
…		…
480	*/	395	*/
481		396
482	object *	397	object *
483	find_object (tag_t i)	398	find_object (tag_t i)
484	{	399	{
485	object *op;
486
487	for (op = object::first; op != NULL; op = op->next)	400	for (object *op = object::first; op; op = op->next)
488	if (op->count == i)	401	if (op->count == i)
489	break;	402	return op;
		403
490	return op;	404	return 0;
491	}	405	}
492		406
493	/*	407	/*
494	* Returns the first object which has a name equal to the argument.	408	* Returns the first object which has a name equal to the argument.
495	* Used only by the patch command, but not all that useful.	409	* Used only by the patch command, but not all that useful.
…		…
595		509
596	if (settings.casting_time)	510	if (settings.casting_time)
597	casting_time = -1;	511	casting_time = -1;
598	}	512	}
599		513
600	void object::clone (object *destination)
601	{
602	*(object_copy *)destination = *this;
603	*(object_pod *)destination = *this;
604
605	if (self || cb)
606	INVOKE_OBJECT (CLONE, this, ARG_OBJECT (destination));
607	}
608
609	/*	514	/*
610	* copy object first frees everything allocated by the second object,	515	* copy_to first frees everything allocated by the dst object,
611	* and then copies the contends of the first object into the second	516	* and then copies the contents of itself into the second
612	* object, allocating what needs to be allocated. Basically, any	517	* object, allocating what needs to be allocated. Basically, any
613	* data that is malloc'd needs to be re-malloc/copied. Otherwise,	518	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
614	* if the first object is freed, the pointers in the new object	519	* if the first object is freed, the pointers in the new object
615	* will point at garbage.	520	* will point at garbage.
616	*/	521	*/
617	void	522	void
618	copy_object (object *op2, object *op)	523	object::copy_to (object *dst)
619	{	524	{
620	bool is_freed = QUERY_FLAG (op, FLAG_FREED);	525	bool is_freed = QUERY_FLAG (dst, FLAG_FREED);
621	bool is_removed = QUERY_FLAG (op, FLAG_REMOVED);	526	bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED);
622		527
623	op2->clone (op);	528	*(object_copy *)dst = *this;
		529	*(object_pod *)dst = *this;
		530
		531	if (self || cb)
		532	INVOKE_OBJECT (CLONE, this, ARG_OBJECT (dst));
624		533
625	if (is_freed)	534	if (is_freed)
626	SET_FLAG (op, FLAG_FREED);	535	SET_FLAG (dst, FLAG_FREED);
		536
627	if (is_removed)	537	if (is_removed)
628	SET_FLAG (op, FLAG_REMOVED);	538	SET_FLAG (dst, FLAG_REMOVED);
629		539
630	if (op2->speed < 0)	540	if (speed < 0)
631	op->speed_left = op2->speed_left - RANDOM () % 200 / 100.0;	541	dst->speed_left = speed_left - RANDOM () % 200 / 100.0;
632		542
633	/* Copy over key_values, if any. */	543	/* Copy over key_values, if any. */
634	if (op2->key_values)	544	if (key_values)
635	{	545	{
636	key_value *tail = 0;	546	key_value *tail = 0;
637	key_value *i;	547	key_value *i;
638		548
639	op->key_values = 0;	549	dst->key_values = 0;
640		550
641	for (i = op2->key_values; i; i = i->next)	551	for (i = key_values; i; i = i->next)
642	{	552	{
643	key_value *new_link = new key_value;	553	key_value *new_link = new key_value;
644		554
645	new_link->next = 0;	555	new_link->next = 0;
646	new_link->key = i->key;	556	new_link->key = i->key;
647	new_link->value = i->value;	557	new_link->value = i->value;
648		558
649	/* Try and be clever here, too. */	559	/* Try and be clever here, too. */
650	if (!op->key_values)	560	if (!dst->key_values)
651	{	561	{
652	op->key_values = new_link;	562	dst->key_values = new_link;
653	tail = new_link;	563	tail = new_link;
654	}	564	}
655	else	565	else
656	{	566	{
657	tail->next = new_link;	567	tail->next = new_link;
658	tail = new_link;	568	tail = new_link;
659	}	569	}
660	}	570	}
661	}	571	}
662		572
663	update_ob_speed (op);	573	update_ob_speed (dst);
		574	}
		575
		576	object *
		577	object::clone ()
		578	{
		579	object *neu = create ();
		580	copy_to (neu);
		581	return neu;
664	}	582	}
665		583
666	/*	584	/*
667	* If an object with the IS_TURNABLE() flag needs to be turned due	585	* If an object with the IS_TURNABLE() flag needs to be turned due
668	* to the closest player being on the other side, this function can	586	* to the closest player being on the other side, this function can
…		…
776	op->active_next = NULL;	694	op->active_next = NULL;
777	op->active_prev = NULL;	695	op->active_prev = NULL;
778	}	696	}
779		697
780	/*	698	/*
781	* update_object() updates the array which represents the map.	699	* update_object() updates the the map.
782	* It takes into account invisible objects (and represent squares covered	700	* It takes into account invisible objects (and represent squares covered
783	* by invisible objects by whatever is below them (unless it's another	701	* by invisible objects by whatever is below them (unless it's another
784	* invisible object, etc...)	702	* invisible object, etc...)
785	* If the object being updated is beneath a player, the look-window	703	* If the object being updated is beneath a player, the look-window
786	* of that player is updated (this might be a suboptimal way of	704	* of that player is updated (this might be a suboptimal way of
787	* updating that window, though, since update_object() is called _often_)	705	* updating that window, though, since update_object() is called _often_)
788	*	706	*
789	* action is a hint of what the caller believes need to be done.	707	* action is a hint of what the caller believes need to be done.
790	* For example, if the only thing that has changed is the face (due to
791	* an animation), we don't need to call update_position until that actually
792	* comes into view of a player. OTOH, many other things, like addition/removal
793	* of walls or living creatures may need us to update the flags now.
794	* current action are:	708	* current action are:
795	* UP_OBJ_INSERT: op was inserted	709	* UP_OBJ_INSERT: op was inserted
796	* UP_OBJ_REMOVE: op was removed	710	* UP_OBJ_REMOVE: op was removed
797	* UP_OBJ_CHANGE: object has somehow changed. In this case, we always update	711	* UP_OBJ_CHANGE: object has somehow changed. In this case, we always update
798	* as that is easier than trying to look at what may have changed.	712	* as that is easier than trying to look at what may have changed.
799	* UP_OBJ_FACE: only the objects face has changed.	713	* UP_OBJ_FACE: only the objects face has changed.
800	*/	714	*/
801
802	void	715	void
803	update_object (object *op, int action)	716	update_object (object *op, int action)
804	{	717	{
805	int update_now = 0, flags;
806	MoveType move_on, move_off, move_block, move_slow;	718	MoveType move_on, move_off, move_block, move_slow;
807		719
808	if (op == NULL)	720	if (op == NULL)
809	{	721	{
810	/* this should never happen */	722	/* this should never happen */
811	LOG (llevDebug, "update_object() called for NULL object.\n");	723	LOG (llevDebug, "update_object() called for NULL object.\n");
812	return;	724	return;
813	}	725	}
814		726
815	if (op->env != NULL)	727	if (op->env)
816	{	728	{
817	/* Animation is currently handled by client, so nothing	729	/* Animation is currently handled by client, so nothing
818	* to do in this case.	730	* to do in this case.
819	*/	731	*/
820	return;	732	return;
…		…
834	abort ();	746	abort ();
835	#endif	747	#endif
836	return;	748	return;
837	}	749	}
838		750
839	flags = GET_MAP_FLAGS (op->map, op->x, op->y);	751	mapspace &m = op->map->at (op->x, op->y);
840	SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NEED_UPDATE);
841	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);
842	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);
843	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);
844	move_off = GET_MAP_MOVE_OFF (op->map, op->x, op->y);
845		752
		753	if (m.flags_ & P_NEED_UPDATE)
		754	/* nop */;
846	if (action == UP_OBJ_INSERT)	755	else if (action == UP_OBJ_INSERT)
847	{	756	{
		757	// this is likely overkill, TODO: revisit (schmorp)
848	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(flags & P_BLOCKSVIEW))	758	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
849	update_now = 1;
850
851	if (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(flags & P_NO_MAGIC))	759	|| (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))
852	update_now = 1;	760	|| (op->type == PLAYER && !(m.flags_ & P_PLAYER))
853		761	|| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
		762	|| (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))
854	if (QUERY_FLAG (op, FLAG_DAMNED) && !(flags & P_NO_CLERIC))	763	|| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))
855	update_now = 1;
856
857	if (QUERY_FLAG (op, FLAG_ALIVE) && !(flags & P_IS_ALIVE))
858	update_now = 1;
859
860	if (op->type == SAFE_GROUND && !(flags & P_SAFE))
861	update_now = 1;
862
863	if ((move_on | op->move_on) != move_on)	764	|| (m.move_on | op->move_on ) != m.move_on
864	update_now = 1;
865
866	if ((move_off | op->move_off) != move_off)	765	|| (m.move_off | op->move_off ) != m.move_off
867	update_now = 1;	766	|| (m.move_slow | op->move_slow) != m.move_slow
868
869	/* This isn't perfect, but I don't expect a lot of objects to	767	/* This isn't perfect, but I don't expect a lot of objects to
870	* to have move_allow right now.	768	* to have move_allow right now.
871	*/	769	*/
872	if (((move_block | op->move_block) & ~op->move_allow) != move_block)	770	|| ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block
873	update_now = 1;	771	|| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)
874		772	m.flags_ = P_NEED_UPDATE;
875	if ((move_slow | op->move_slow) != move_slow)
876	update_now = 1;
877	}	773	}
878	/* if the object is being removed, we can't make intelligent	774	/* if the object is being removed, we can't make intelligent
879	* decisions, because remove_ob can't really pass the object	775	* decisions, because remove_ob can't really pass the object
880	* that is being removed.	776	* that is being removed.
881	*/	777	*/
882	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)	778	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
883	update_now = 1;	779	m.flags_ = P_NEED_UPDATE;
884	else if (action == UP_OBJ_FACE)	780	else if (action == UP_OBJ_FACE)
885	/* Nothing to do for that case */ ;	781	/* Nothing to do for that case */ ;
886	else	782	else
887	LOG (llevError, "update_object called with invalid action: %d\n", action);	783	LOG (llevError, "update_object called with invalid action: %d\n", action);
888		784
889	if (update_now)
890	{
891	SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NO_ERROR | P_NEED_UPDATE);
892	update_position (op->map, op->x, op->y);
893	}
894
895	if (op->more != NULL)	785	if (op->more)
896	update_object (op->more, action);	786	update_object (op->more, action);
897	}	787	}
898		788
899	object::vector object::mortals;	789	object::vector object::mortals;
900	object::vector object::objects; // not yet used	790	object::vector object::objects; // not yet used
…		…
908	else	798	else
909	{	799	{
910	delete *i;	800	delete *i;
911	mortals.erase (i);	801	mortals.erase (i);
912	}	802	}
913
914	static int lastmortals = 0;//D
915
916	if (mortals.size() != lastmortals)//D
917	{
918	lastmortals = mortals.size ();//D
919	LOG (llevDebug, "%d objects in mortal queue\n", lastmortals);//D
920	}
921	}	803	}
922		804
923	object::object ()	805	object::object ()
924	{	806	{
925	SET_FLAG (this, FLAG_REMOVED);	807	SET_FLAG (this, FLAG_REMOVED);
…		…
947	object::first = this;	829	object::first = this;
948	}	830	}
949		831
950	void object::unlink ()	832	void object::unlink ()
951	{	833	{
952	//count = 0;//D
953	if (!prev && !next) return;//D
954
955	if (this == object::first)	834	if (this == object::first)
956	object::first = next;	835	object::first = next;
957		836
958	/* Remove this object from the list of used objects */	837	/* Remove this object from the list of used objects */
959	if (prev) prev->next = next;	838	if (prev) prev->next = next;
…		…
975	* it from the list of used objects, and puts it on the list of	854	* it from the list of used objects, and puts it on the list of
976	* free objects. The IS_FREED() flag is set in the object.	855	* free objects. The IS_FREED() flag is set in the object.
977	* The object must have been removed by remove_ob() first for	856	* The object must have been removed by remove_ob() first for
978	* this function to succeed.	857	* this function to succeed.
979	*	858	*
980	* If free_inventory is set, free inventory as well. Else drop items in	859	* If destroy_inventory is set, free inventory as well. Else drop items in
981	* inventory to the ground.	860	* inventory to the ground.
982	*/	861	*/
983	void object::free (bool free_inventory)	862	void object::destroy (bool destroy_inventory)
984	{	863	{
985	if (QUERY_FLAG (this, FLAG_FREED))	864	if (QUERY_FLAG (this, FLAG_FREED))
986	return;	865	return;
987		866
988	if (QUERY_FLAG (this, FLAG_FRIENDLY))	867	if (QUERY_FLAG (this, FLAG_FRIENDLY))
989	remove_friendly_object (this);	868	remove_friendly_object (this);
990		869
991	if (!QUERY_FLAG (this, FLAG_REMOVED))	870	if (!QUERY_FLAG (this, FLAG_REMOVED))
992	remove_ob (this);	871	remove ();
993		872
994	SET_FLAG (this, FLAG_FREED);	873	SET_FLAG (this, FLAG_FREED);
995		874
996	if (more)	875	if (more)
997	{	876	{
998	more->free (free_inventory);	877	more->destroy (destroy_inventory);
999	more = 0;	878	more = 0;
1000	}	879	}
1001		880
1002	if (inv)	881	if (inv)
1003	{	882	{
1004	/* Only if the space blocks everything do we not process -	883	/* Only if the space blocks everything do we not process -
1005	* if some form of movement is allowed, let objects	884	* if some form of movement is allowed, let objects
1006	* drop on that space.	885	* drop on that space.
1007	*/	886	*/
1008	if (free_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)	887	if (destroy_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
1009	{	888	{
1010	object *op = inv;	889	object *op = inv;
1011		890
1012	while (op)	891	while (op)
1013	{	892	{
1014	object *tmp = op->below;	893	object *tmp = op->below;
1015	op->free (free_inventory);	894	op->destroy (destroy_inventory);
1016	op = tmp;	895	op = tmp;
1017	}	896	}
1018	}	897	}
1019	else	898	else
1020	{ /* Put objects in inventory onto this space */	899	{ /* Put objects in inventory onto this space */
…		…
1022		901
1023	while (op)	902	while (op)
1024	{	903	{
1025	object *tmp = op->below;	904	object *tmp = op->below;
1026		905
1027	remove_ob (op);	906	op->remove ();
1028		907
1029	if (QUERY_FLAG (op, FLAG_STARTEQUIP)	908	if (QUERY_FLAG (op, FLAG_STARTEQUIP)
1030	|| QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))	909	|| QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
1031	free_object (op);	910	op->destroy ();
1032	else	911	else
1033	{	912	{
1034	op->x = x;	913	op->x = x;
1035	op->y = y;	914	op->y = y;
1036	insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */	915	insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */
…		…
1039	op = tmp;	918	op = tmp;
1040	}	919	}
1041	}	920	}
1042	}	921	}
1043		922
		923	// hack to ensure that freed objects still have a valid map
		924	{
		925	static maptile *freed_map; // freed objects are moved here to avoid crashes
		926
		927	if (!freed_map)
		928	{
		929	freed_map = new maptile;
		930
		931	freed_map->name = "/internal/freed_objects_map";
		932	freed_map->width = 3;
		933	freed_map->height = 3;
		934
		935	freed_map->allocate ();
		936	}
		937
		938	map = freed_map;
		939	x = 1;
		940	y = 1;
		941	}
		942
1044	// clear those pointers that likely might have circular references to us	943	// clear those pointers that likely might have circular references to us
1045	owner = 0;	944	owner = 0;
1046	enemy = 0;	945	enemy = 0;
1047	attacked_by = 0;	946	attacked_by = 0;
1048		947
		948	// only relevant for players(?), but make sure of it anyways
		949	contr = 0;
		950
1049	/* Remove object from the active list */	951	/* Remove object from the active list */
1050	speed = 0;	952	speed = 0;
1051	update_ob_speed (this);	953	update_ob_speed (this);
1052		954
1053	unlink ();	955	unlink ();
…		…
1057		959
1058	/*	960	/*
1059	* sub_weight() recursively (outwards) subtracts a number from the	961	* sub_weight() recursively (outwards) subtracts a number from the
1060	* weight of an object (and what is carried by it's environment(s)).	962	* weight of an object (and what is carried by it's environment(s)).
1061	*/	963	*/
1062
1063	void	964	void
1064	sub_weight (object *op, signed long weight)	965	sub_weight (object *op, signed long weight)
1065	{	966	{
1066	while (op != NULL)	967	while (op != NULL)
1067	{	968	{
…		…
1071	op->carrying -= weight;	972	op->carrying -= weight;
1072	op = op->env;	973	op = op->env;
1073	}	974	}
1074	}	975	}
1075		976
1076	/* remove_ob(op):	977	/* op->remove ():
1077	* This function removes the object op from the linked list of objects	978	* This function removes the object op from the linked list of objects
1078	* which it is currently tied to. When this function is done, the	979	* which it is currently tied to. When this function is done, the
1079	* object will have no environment. If the object previously had an	980	* object will have no environment. If the object previously had an
1080	* environment, the x and y coordinates will be updated to	981	* environment, the x and y coordinates will be updated to
1081	* the previous environment.	982	* the previous environment.
1082	* Beware: This function is called from the editor as well!	983	* Beware: This function is called from the editor as well!
1083	*/	984	*/
1084
1085	void	985	void
1086	remove_ob (object *op)	986	object::remove ()
1087	{	987	{
1088	object *tmp, *last = 0;	988	object *tmp, *last = 0;
1089	object *otmp;	989	object *otmp;
1090		990
1091	tag_t tag;
1092	int check_walk_off;	991	int check_walk_off;
1093	mapstruct *m;
1094		992
1095	sint16 x, y;
1096
1097	if (QUERY_FLAG (op, FLAG_REMOVED))	993	if (QUERY_FLAG (this, FLAG_REMOVED))
1098	return;	994	return;
1099		995
1100	SET_FLAG (op, FLAG_REMOVED);	996	SET_FLAG (this, FLAG_REMOVED);
1101		997
1102	if (op->more != NULL)	998	if (more)
1103	remove_ob (op->more);	999	more->remove ();
1104		1000
1105	/*	1001	/*
1106	* In this case, the object to be removed is in someones	1002	* In this case, the object to be removed is in someones
1107	* inventory.	1003	* inventory.
1108	*/	1004	*/
1109	if (op->env != NULL)	1005	if (env)
1110	{	1006	{
1111	if (op->nrof)	1007	if (nrof)
1112	sub_weight (op->env, op->weight * op->nrof);	1008	sub_weight (env, weight * nrof);
1113	else	1009	else
1114	sub_weight (op->env, op->weight + op->carrying);	1010	sub_weight (env, weight + carrying);
1115		1011
1116	/* NO_FIX_PLAYER is set when a great many changes are being	1012	/* NO_FIX_PLAYER is set when a great many changes are being
1117	* made to players inventory. If set, avoiding the call	1013	* made to players inventory. If set, avoiding the call
1118	* to save cpu time.	1014	* to save cpu time.
1119	*/	1015	*/
1120	if ((otmp = is_player_inv (op->env)) != NULL && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1016	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1121	fix_player (otmp);	1017	fix_player (otmp);
1122		1018
1123	if (op->above != NULL)	1019	if (above != NULL)
1124	op->above->below = op->below;	1020	above->below = below;
1125	else	1021	else
1126	op->env->inv = op->below;	1022	env->inv = below;
1127		1023
1128	if (op->below != NULL)	1024	if (below != NULL)
1129	op->below->above = op->above;	1025	below->above = above;
1130		1026
1131	/* we set up values so that it could be inserted into	1027	/* we set up values so that it could be inserted into
1132	* the map, but we don't actually do that - it is up	1028	* the map, but we don't actually do that - it is up
1133	* to the caller to decide what we want to do.	1029	* to the caller to decide what we want to do.
1134	*/	1030	*/
1135	op->x = op->env->x, op->y = op->env->y;	1031	x = env->x, y = env->y;
1136	op->map = op->env->map;	1032	map = env->map;
1137	op->above = NULL, op->below = NULL;	1033	above = 0, below = 0;
1138	op->env = NULL;	1034	env = 0;
1139	}	1035	}
1140	else if (op->map)	1036	else if (map)
1141	{	1037	{
1142	x = op->x;
1143	y = op->y;
1144	m = get_map_from_coord (op->map, &x, &y);
1145
1146	if (!m)
1147	{
1148	LOG (llevError, "remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n",
1149	op->map->path, op->x, op->y);
1150	/* in old days, we used to set x and y to 0 and continue.
1151	* it seems if we get into this case, something is probablye
1152	* screwed up and should be fixed.
1153	*/
1154	abort ();
1155	}
1156
1157	if (op->map != m)
1158	LOG (llevDebug, "remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n",
1159	op->map->path, m->path, op->x, op->y, x, y);
1160
1161	/* Re did the following section of code - it looks like it had	1038	/* Re did the following section of code - it looks like it had
1162	* lots of logic for things we no longer care about	1039	* lots of logic for things we no longer care about
1163	*/	1040	*/
1164		1041
1165	/* link the object above us */	1042	/* link the object above us */
1166	if (op->above)	1043	if (above)
1167	op->above->below = op->below;	1044	above->below = below;
1168	else	1045	else
1169	SET_MAP_TOP (m, x, y, op->below); /* we were top, set new top */	1046	map->at (x, y).top = below; /* we were top, set new top */
1170		1047
1171	/* Relink the object below us, if there is one */	1048	/* Relink the object below us, if there is one */
1172	if (op->below)	1049	if (below)
1173	op->below->above = op->above;	1050	below->above = above;
1174	else	1051	else
1175	{	1052	{
1176	/* Nothing below, which means we need to relink map object for this space	1053	/* Nothing below, which means we need to relink map object for this space
1177	* use translated coordinates in case some oddness with map tiling is	1054	* use translated coordinates in case some oddness with map tiling is
1178	* evident	1055	* evident
1179	*/	1056	*/
1180	if (GET_MAP_OB (m, x, y) != op)	1057	if (GET_MAP_OB (map, x, y) != this)
1181	{	1058	{
1182	dump_object (op);	1059	char *dump = dump_object (this);
1183	LOG (llevError,	1060	LOG (llevError,
1184	"remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom?\n%s\n", errmsg);	1061	"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);
		1062	free (dump);
1185	dump_object (GET_MAP_OB (m, x, y));	1063	dump = dump_object (GET_MAP_OB (map, x, y));
1186	LOG (llevError, "%s\n", errmsg);	1064	LOG (llevError, "%s\n", dump);
		1065	free (dump);
1187	}	1066	}
1188		1067
1189	SET_MAP_OB (m, x, y, op->above); /* goes on above it. */	1068	map->at (x, y).bottom = above; /* goes on above it. */
1190	}	1069	}
1191		1070
1192	op->above = 0;	1071	above = 0;
1193	op->below = 0;	1072	below = 0;
1194		1073
1195	if (op->map->in_memory == MAP_SAVING)	1074	if (map->in_memory == MAP_SAVING)
1196	return;	1075	return;
1197		1076
1198	tag = op->count;
1199	check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY);	1077	check_walk_off = !QUERY_FLAG (this, FLAG_NO_APPLY);
1200		1078
1201	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1079	for (tmp = GET_MAP_OB (map, x, y); tmp; tmp = tmp->above)
1202	{	1080	{
1203	/* No point updating the players look faces if he is the object	1081	/* No point updating the players look faces if he is the object
1204	* being removed.	1082	* being removed.
1205	*/	1083	*/
1206		1084
1207	if (tmp->type == PLAYER && tmp != op)	1085	if (tmp->type == PLAYER && tmp != this)
1208	{	1086	{
1209	/* If a container that the player is currently using somehow gets	1087	/* If a container that the player is currently using somehow gets
1210	* removed (most likely destroyed), update the player view	1088	* removed (most likely destroyed), update the player view
1211	* appropriately.	1089	* appropriately.
1212	*/	1090	*/
1213	if (tmp->container == op)	1091	if (tmp->container == this)
1214	{	1092	{
1215	CLEAR_FLAG (op, FLAG_APPLIED);	1093	CLEAR_FLAG (this, FLAG_APPLIED);
1216	tmp->container = NULL;	1094	tmp->container = 0;
1217	}	1095	}
1218		1096
1219	tmp->contr->socket.update_look = 1;	1097	tmp->contr->socket->floorbox_update ();
1220	}	1098	}
1221		1099
1222	/* See if player moving off should effect something */	1100	/* See if player moving off should effect something */
1223	if (check_walk_off && ((op->move_type & tmp->move_off) && (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0))	1101	if (check_walk_off
		1102	&& ((move_type & tmp->move_off)
		1103	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1224	{	1104	{
1225	move_apply (tmp, op, NULL);	1105	move_apply (tmp, this, 0);
1226		1106
1227	if (was_destroyed (op, tag))	1107	if (destroyed ())
1228	{
1229	LOG (llevError, "BUG: remove_ob(): name %s, archname %s destroyed " "leaving object\n", &tmp->name, &tmp->arch->name);	1108	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1230	}
1231	}	1109	}
1232		1110
1233	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */	1111	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1234		1112
1235	if (tmp->above == tmp)	1113	if (tmp->above == tmp)
1236	tmp->above = NULL;	1114	tmp->above = 0;
1237		1115
1238	last = tmp;	1116	last = tmp;
1239	}	1117	}
1240		1118
1241	/* last == NULL of there are no objects on this space */	1119	/* last == NULL of there are no objects on this space */
1242	if (last == NULL)	1120	if (!last)
1243	{	1121	map->at (x, y).flags_ = P_NEED_UPDATE;
1244	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1245	* we could preserve the flags (GET_MAP_FLAGS), but update_position figures
1246	* those out anyways, and if there are any flags set right now, they won't
1247	* be correct anyways.
1248	*/
1249	SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE);
1250	update_position (op->map, op->x, op->y);
1251	}
1252	else	1122	else
1253	update_object (last, UP_OBJ_REMOVE);	1123	update_object (last, UP_OBJ_REMOVE);
1254		1124
1255	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0))	1125	if (QUERY_FLAG (this, FLAG_BLOCKSVIEW) || glow_radius)
1256	update_all_los (op->map, op->x, op->y);	1126	update_all_los (map, x, y);
1257	}	1127	}
1258	}	1128	}
1259		1129
1260	/*	1130	/*
1261	* merge_ob(op,top):	1131	* merge_ob(op,top):
…		…
1276		1146
1277	for (; top != NULL; top = top->below)	1147	for (; top != NULL; top = top->below)
1278	{	1148	{
1279	if (top == op)	1149	if (top == op)
1280	continue;	1150	continue;
1281	if (CAN_MERGE (op, top))	1151
		1152	if (object::can_merge (op, top))
1282	{	1153	{
1283	top->nrof += op->nrof;	1154	top->nrof += op->nrof;
1284		1155
1285	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/	1156	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/
1286	op->weight = 0; /* Don't want any adjustements now */	1157	op->weight = 0; /* Don't want any adjustements now */
1287	remove_ob (op);	1158	op->destroy ();
1288	free_object (op);
1289	return top;	1159	return top;
1290	}	1160	}
1291	}	1161	}
1292		1162
1293	return 0;	1163	return 0;
…		…
1296	/*	1166	/*
1297	* same as insert_ob_in_map except it handle separate coordinates and do a clean	1167	* same as insert_ob_in_map except it handle separate coordinates and do a clean
1298	* job preparing multi-part monsters	1168	* job preparing multi-part monsters
1299	*/	1169	*/
1300	object *	1170	object *
1301	insert_ob_in_map_at (object *op, mapstruct *m, object *originator, int flag, int x, int y)	1171	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1302	{	1172	{
1303	object *tmp;	1173	object *tmp;
1304		1174
1305	if (op->head)	1175	if (op->head)
1306	op = op->head;	1176	op = op->head;
…		…
1334	* NULL if 'op' was destroyed	1204	* NULL if 'op' was destroyed
1335	* just 'op' otherwise	1205	* just 'op' otherwise
1336	*/	1206	*/
1337		1207
1338	object *	1208	object *
1339	insert_ob_in_map (object *op, mapstruct *m, object *originator, int flag)	1209	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1340	{	1210	{
1341	object *tmp, *top, *floor = NULL;	1211	object *tmp, *top, *floor = NULL;
1342	sint16 x, y;	1212	sint16 x, y;
1343		1213
1344	if (QUERY_FLAG (op, FLAG_FREED))	1214	if (QUERY_FLAG (op, FLAG_FREED))
…		…
1347	return NULL;	1217	return NULL;
1348	}	1218	}
1349		1219
1350	if (m == NULL)	1220	if (m == NULL)
1351	{	1221	{
1352	dump_object (op);	1222	char *dump = dump_object (op);
1353	LOG (llevError, "Trying to insert in null-map!\n%s\n", errmsg);	1223	LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
		1224	free (dump);
1354	return op;	1225	return op;
1355	}	1226	}
1356		1227
1357	if (out_of_map (m, op->x, op->y))	1228	if (out_of_map (m, op->x, op->y))
1358	{	1229	{
1359	dump_object (op);	1230	char *dump = dump_object (op);
1360	LOG (llevError, "Trying to insert object outside the map.\n%s\n", errmsg);	1231	LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump);
1361	#ifdef MANY_CORES	1232	#ifdef MANY_CORES
1362	/* Better to catch this here, as otherwise the next use of this object	1233	/* Better to catch this here, as otherwise the next use of this object
1363	* is likely to cause a crash. Better to find out where it is getting	1234	* is likely to cause a crash. Better to find out where it is getting
1364	* improperly inserted.	1235	* improperly inserted.
1365	*/	1236	*/
1366	abort ();	1237	abort ();
1367	#endif	1238	#endif
		1239	free (dump);
1368	return op;	1240	return op;
1369	}	1241	}
1370		1242
1371	if (!QUERY_FLAG (op, FLAG_REMOVED))	1243	if (!QUERY_FLAG (op, FLAG_REMOVED))
1372	{	1244	{
1373	dump_object (op);	1245	char *dump = dump_object (op);
1374	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", errmsg);	1246	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
		1247	free (dump);
1375	return op;	1248	return op;
1376	}	1249	}
1377		1250
1378	if (op->more != NULL)	1251	if (op->more != NULL)
1379	{	1252	{
…		…
1417		1290
1418	/* this has to be done after we translate the coordinates.	1291	/* this has to be done after we translate the coordinates.
1419	*/	1292	*/
1420	if (op->nrof && !(flag & INS_NO_MERGE))	1293	if (op->nrof && !(flag & INS_NO_MERGE))
1421	for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)	1294	for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)
1422	if (CAN_MERGE (op, tmp))	1295	if (object::can_merge (op, tmp))
1423	{	1296	{
1424	op->nrof += tmp->nrof;	1297	op->nrof += tmp->nrof;
1425	remove_ob (tmp);	1298	tmp->destroy ();
1426	free_object (tmp);
1427	}	1299	}
1428		1300
1429	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1301	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1430	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1302	CLEAR_FLAG (op, FLAG_INV_LOCKED);
1431		1303
…		…
1444	op->below = originator->below;	1316	op->below = originator->below;
1445		1317
1446	if (op->below)	1318	if (op->below)
1447	op->below->above = op;	1319	op->below->above = op;
1448	else	1320	else
1449	SET_MAP_OB (op->map, op->x, op->y, op);	1321	op->map->at (op->x, op->y).bottom = op;
1450		1322
1451	/* since *below* originator, no need to update top */	1323	/* since *below* originator, no need to update top */
1452	originator->below = op;	1324	originator->below = op;
1453	}	1325	}
1454	else	1326	else
…		…
1500	* If INS_ON_TOP is used, don't do this processing	1372	* If INS_ON_TOP is used, don't do this processing
1501	* Need to find the object that in fact blocks view, otherwise	1373	* Need to find the object that in fact blocks view, otherwise
1502	* stacking is a bit odd.	1374	* stacking is a bit odd.
1503	*/	1375	*/
1504	if (!(flag & INS_ON_TOP) &&	1376	if (!(flag & INS_ON_TOP) &&
1505	(get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_BLOCKSVIEW) && (op->face && !op->face->visibility))	1377	(get_map_flags (op->map, 0, op->x, op->y, 0, 0) & P_BLOCKSVIEW) && (op->face && !op->face->visibility))
1506	{	1378	{
1507	for (last = top; last != floor; last = last->below)	1379	for (last = top; last != floor; last = last->below)
1508	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1380	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1509	break;	1381	break;
1510	/* Check to see if we found the object that blocks view,	1382	/* Check to see if we found the object that blocks view,
…		…
1533		1405
1534	if (op->above)	1406	if (op->above)
1535	op->above->below = op;	1407	op->above->below = op;
1536		1408
1537	op->below = NULL;	1409	op->below = NULL;
1538	SET_MAP_OB (op->map, op->x, op->y, op);	1410	op->map->at (op->x, op->y).bottom = op;
1539	}	1411	}
1540	else	1412	else
1541	{ /* get inserted into the stack above top */	1413	{ /* get inserted into the stack above top */
1542	op->above = top->above;	1414	op->above = top->above;
1543		1415
…		…
1547	op->below = top;	1419	op->below = top;
1548	top->above = op;	1420	top->above = op;
1549	}	1421	}
1550		1422
1551	if (op->above == NULL)	1423	if (op->above == NULL)
1552	SET_MAP_TOP (op->map, op->x, op->y, op);	1424	op->map->at (op->x, op->y).top = op;
1553	} /* else not INS_BELOW_ORIGINATOR */	1425	} /* else not INS_BELOW_ORIGINATOR */
1554		1426
1555	if (op->type == PLAYER)	1427	if (op->type == PLAYER)
1556	op->contr->do_los = 1;	1428	op->contr->do_los = 1;
1557		1429
1558	/* If we have a floor, we know the player, if any, will be above	1430	/* If we have a floor, we know the player, if any, will be above
1559	* it, so save a few ticks and start from there.	1431	* it, so save a few ticks and start from there.
1560	*/	1432	*/
1561	if (!(flag & INS_MAP_LOAD))	1433	if (!(flag & INS_MAP_LOAD))
1562	for (tmp = floor ? floor : GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1434	if (object *pl = op->map->at (op->x, op->y).player ())
1563	if (tmp->type == PLAYER)	1435	pl->contr->socket->floorbox_update ();
1564	tmp->contr->socket.update_look = 1;
1565		1436
1566	/* If this object glows, it may affect lighting conditions that are	1437	/* If this object glows, it may affect lighting conditions that are
1567	* visible to others on this map. But update_all_los is really	1438	* visible to others on this map. But update_all_los is really
1568	* an inefficient way to do this, as it means los for all players	1439	* an inefficient way to do this, as it means los for all players
1569	* on the map will get recalculated. The players could very well	1440	* on the map will get recalculated. The players could very well
…		…
1577		1448
1578	/* updates flags (blocked, alive, no magic, etc) for this map space */	1449	/* updates flags (blocked, alive, no magic, etc) for this map space */
1579	update_object (op, UP_OBJ_INSERT);	1450	update_object (op, UP_OBJ_INSERT);
1580		1451
1581	/* Don't know if moving this to the end will break anything. However,	1452	/* Don't know if moving this to the end will break anything. However,
1582	* we want to have update_look set above before calling this.	1453	* we want to have floorbox_update called before calling this.
1583	*	1454	*
1584	* check_move_on() must be after this because code called from	1455	* check_move_on() must be after this because code called from
1585	* check_move_on() depends on correct map flags (so functions like	1456	* check_move_on() depends on correct map flags (so functions like
1586	* blocked() and wall() work properly), and these flags are updated by	1457	* blocked() and wall() work properly), and these flags are updated by
1587	* update_object().	1458	* update_object().
…		…
1603		1474
1604	return op;	1475	return op;
1605	}	1476	}
1606		1477
1607	/* this function inserts an object in the map, but if it	1478	/* this function inserts an object in the map, but if it
1608	* finds an object of its own type, it'll remove that one first.	1479	* finds an object of its own type, it'll remove that one first.
1609	* op is the object to insert it under: supplies x and the map.	1480	* op is the object to insert it under: supplies x and the map.
1610	*/	1481	*/
1611	void	1482	void
1612	replace_insert_ob_in_map (const char *arch_string, object *op)	1483	replace_insert_ob_in_map (const char *arch_string, object *op)
1613	{	1484	{
1614	object *	1485	object *tmp, *tmp1;
1615	tmp;
1616	object *
1617	tmp1;
1618		1486
1619	/* first search for itself and remove any old instances */	1487	/* first search for itself and remove any old instances */
1620		1488
1621	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1489	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
1622	{
1623	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */	1490	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */
1624	{	1491	tmp->destroy ();
1625	remove_ob (tmp);
1626	free_object (tmp);
1627	}
1628	}
1629		1492
1630	tmp1 = arch_to_object (archetype::find (arch_string));	1493	tmp1 = arch_to_object (archetype::find (arch_string));
1631		1494
1632	tmp1->x = op->x;	1495	tmp1->x = op->x;
1633	tmp1->y = op->y;	1496	tmp1->y = op->y;
…		…
1643	*/	1506	*/
1644		1507
1645	object *	1508	object *
1646	get_split_ob (object *orig_ob, uint32 nr)	1509	get_split_ob (object *orig_ob, uint32 nr)
1647	{	1510	{
1648	object *	1511	object *newob;
1649	newob;
1650	int
1651	is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);	1512	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1652		1513
1653	if (orig_ob->nrof < nr)	1514	if (orig_ob->nrof < nr)
1654	{	1515	{
1655	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);	1516	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1656	return NULL;	1517	return NULL;
1657	}	1518	}
1658		1519
1659	newob = object_create_clone (orig_ob);	1520	newob = object_create_clone (orig_ob);
1660		1521
1661	if ((orig_ob->nrof -= nr) < 1)	1522	if ((orig_ob->nrof -= nr) < 1)
1662	{	1523	orig_ob->destroy (1);
1663	if (!is_removed)
1664	remove_ob (orig_ob);
1665	free_object2 (orig_ob, 1);
1666	}
1667	else if (!is_removed)	1524	else if (!is_removed)
1668	{	1525	{
1669	if (orig_ob->env != NULL)	1526	if (orig_ob->env != NULL)
1670	sub_weight (orig_ob->env, orig_ob->weight * nr);	1527	sub_weight (orig_ob->env, orig_ob->weight * nr);
1671	if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)	1528	if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)
…		…
1701	if (i > op->nrof)	1558	if (i > op->nrof)
1702	i = op->nrof;	1559	i = op->nrof;
1703		1560
1704	if (QUERY_FLAG (op, FLAG_REMOVED))	1561	if (QUERY_FLAG (op, FLAG_REMOVED))
1705	op->nrof -= i;	1562	op->nrof -= i;
1706	else if (op->env != NULL)	1563	else if (op->env)
1707	{	1564	{
1708	/* is this object in the players inventory, or sub container	1565	/* is this object in the players inventory, or sub container
1709	* therein?	1566	* therein?
1710	*/	1567	*/
1711	tmp = is_player_inv (op->env);	1568	tmp = op->in_player ();
1712	/* nope. Is this a container the player has opened?	1569	/* nope. Is this a container the player has opened?
1713	* If so, set tmp to that player.	1570	* If so, set tmp to that player.
1714	* IMO, searching through all the players will mostly	1571	* IMO, searching through all the players will mostly
1715	* likely be quicker than following op->env to the map,	1572	* likely be quicker than following op->env to the map,
1716	* and then searching the map for a player.	1573	* and then searching the map for a player.
1717	*/	1574	*/
1718	if (!tmp)	1575	if (!tmp)
1719	{	1576	{
1720	for (pl = first_player; pl; pl = pl->next)	1577	for (pl = first_player; pl; pl = pl->next)
1721	if (pl->ob->container == op->env)	1578	if (pl->ob->container == op->env)
		1579	{
		1580	tmp = pl->ob;
1722	break;	1581	break;
1723	if (pl)	1582	}
1724	tmp = pl->ob;
1725	else
1726	tmp = NULL;
1727	}	1583	}
1728		1584
1729	if (i < op->nrof)	1585	if (i < op->nrof)
1730	{	1586	{
1731	sub_weight (op->env, op->weight * i);	1587	sub_weight (op->env, op->weight * i);
1732	op->nrof -= i;	1588	op->nrof -= i;
1733	if (tmp)	1589	if (tmp)
1734	{
1735	esrv_send_item (tmp, op);	1590	esrv_send_item (tmp, op);
1736	}
1737	}	1591	}
1738	else	1592	else
1739	{	1593	{
1740	remove_ob (op);	1594	op->remove ();
1741	op->nrof = 0;	1595	op->nrof = 0;
1742	if (tmp)	1596	if (tmp)
1743	{
1744	esrv_del_item (tmp->contr, op->count);	1597	esrv_del_item (tmp->contr, op->count);
1745	}
1746	}	1598	}
1747	}	1599	}
1748	else	1600	else
1749	{	1601	{
1750	object *above = op->above;	1602	object *above = op->above;
1751		1603
1752	if (i < op->nrof)	1604	if (i < op->nrof)
1753	op->nrof -= i;	1605	op->nrof -= i;
1754	else	1606	else
1755	{	1607	{
1756	remove_ob (op);	1608	op->remove ();
1757	op->nrof = 0;	1609	op->nrof = 0;
1758	}	1610	}
1759		1611
1760	/* Since we just removed op, op->above is null */	1612	/* Since we just removed op, op->above is null */
1761	for (tmp = above; tmp != NULL; tmp = tmp->above)	1613	for (tmp = above; tmp; tmp = tmp->above)
1762	if (tmp->type == PLAYER)	1614	if (tmp->type == PLAYER)
1763	{	1615	{
1764	if (op->nrof)	1616	if (op->nrof)
1765	esrv_send_item (tmp, op);	1617	esrv_send_item (tmp, op);
1766	else	1618	else
…		…
1770		1622
1771	if (op->nrof)	1623	if (op->nrof)
1772	return op;	1624	return op;
1773	else	1625	else
1774	{	1626	{
1775	free_object (op);	1627	op->destroy ();
1776	return NULL;	1628	return 0;
1777	}	1629	}
1778	}	1630	}
1779		1631
1780	/*	1632	/*
1781	* add_weight(object, weight) adds the specified weight to an object,	1633	* add_weight(object, weight) adds the specified weight to an object,
…		…
1793	op->carrying += weight;	1645	op->carrying += weight;
1794	op = op->env;	1646	op = op->env;
1795	}	1647	}
1796	}	1648	}
1797		1649
		1650	object *
		1651	insert_ob_in_ob (object *op, object *where)
		1652	{
		1653	if (!where)
		1654	{
		1655	char *dump = dump_object (op);
		1656	LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
		1657	free (dump);
		1658	return op;
		1659	}
		1660
		1661	if (where->head)
		1662	{
		1663	LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n");
		1664	where = where->head;
		1665	}
		1666
		1667	return where->insert (op);
		1668	}
		1669
1798	/*	1670	/*
1799	* insert_ob_in_ob(op,environment):	1671	* env->insert (op)
1800	* This function inserts the object op in the linked list	1672	* This function inserts the object op in the linked list
1801	* inside the object environment.	1673	* inside the object environment.
1802	*	1674	*
1803	* Eneq(@csd.uu.se): Altered insert_ob_in_ob to make things picked up enter
1804	* the inventory at the last position or next to other objects of the same
1805	* type.
1806	* Frank: Now sorted by type, archetype and magic!
1807	*
1808	* The function returns now pointer to inserted item, and return value can	1675	* The function returns now pointer to inserted item, and return value can
1809	* be != op, if items are merged. -Tero	1676	* be != op, if items are merged. -Tero
1810	*/	1677	*/
1811		1678
1812	object *	1679	object *
1813	insert_ob_in_ob (object *op, object *where)	1680	object::insert (object *op)
1814	{	1681	{
1815	object *	1682	object *tmp, *otmp;
1816	tmp, *
1817	otmp;
1818		1683
1819	if (!QUERY_FLAG (op, FLAG_REMOVED))	1684	if (!QUERY_FLAG (op, FLAG_REMOVED))
1820	{	1685	op->remove ();
1821	dump_object (op);
1822	LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", errmsg);
1823	return op;
1824	}
1825
1826	if (where == NULL)
1827	{
1828	dump_object (op);
1829	LOG (llevError, "Trying to put object in NULL.\n%s\n", errmsg);
1830	return op;
1831	}
1832
1833	if (where->head)
1834	{
1835	LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n");
1836	where = where->head;
1837	}
1838		1686
1839	if (op->more)	1687	if (op->more)
1840	{	1688	{
1841	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);	1689	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1842	return op;	1690	return op;
…		…
1844		1692
1845	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1693	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1846	CLEAR_FLAG (op, FLAG_REMOVED);	1694	CLEAR_FLAG (op, FLAG_REMOVED);
1847	if (op->nrof)	1695	if (op->nrof)
1848	{	1696	{
1849	for (tmp = where->inv; tmp != NULL; tmp = tmp->below)	1697	for (tmp = inv; tmp != NULL; tmp = tmp->below)
1850	if (CAN_MERGE (tmp, op))	1698	if (object::can_merge (tmp, op))
1851	{	1699	{
1852	/* return the original object and remove inserted object	1700	/* return the original object and remove inserted object
1853	(client needs the original object) */	1701	(client needs the original object) */
1854	tmp->nrof += op->nrof;	1702	tmp->nrof += op->nrof;
1855	/* Weight handling gets pretty funky. Since we are adding to	1703	/* Weight handling gets pretty funky. Since we are adding to
1856	* tmp->nrof, we need to increase the weight.	1704	* tmp->nrof, we need to increase the weight.
1857	*/	1705	*/
1858	add_weight (where, op->weight * op->nrof);	1706	add_weight (this, op->weight * op->nrof);
1859	SET_FLAG (op, FLAG_REMOVED);	1707	SET_FLAG (op, FLAG_REMOVED);
1860	free_object (op); /* free the inserted object */	1708	op->destroy (); /* free the inserted object */
1861	op = tmp;	1709	op = tmp;
1862	remove_ob (op); /* and fix old object's links */	1710	op->remove (); /* and fix old object's links */
1863	CLEAR_FLAG (op, FLAG_REMOVED);	1711	CLEAR_FLAG (op, FLAG_REMOVED);
1864	break;	1712	break;
1865	}	1713	}
1866		1714
1867	/* I assume combined objects have no inventory	1715	/* I assume combined objects have no inventory
1868	* We add the weight - this object could have just been removed	1716	* We add the weight - this object could have just been removed
1869	* (if it was possible to merge). calling remove_ob will subtract	1717	* (if it was possible to merge). calling remove_ob will subtract
1870	* the weight, so we need to add it in again, since we actually do	1718	* the weight, so we need to add it in again, since we actually do
1871	* the linking below	1719	* the linking below
1872	*/	1720	*/
1873	add_weight (where, op->weight * op->nrof);	1721	add_weight (this, op->weight * op->nrof);
1874	}	1722	}
1875	else	1723	else
1876	add_weight (where, (op->weight + op->carrying));	1724	add_weight (this, (op->weight + op->carrying));
1877		1725
1878	otmp = is_player_inv (where);	1726	otmp = this->in_player ();
1879	if (otmp && otmp->contr != NULL)	1727	if (otmp && otmp->contr)
1880	{
1881	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1728	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1882	fix_player (otmp);	1729	fix_player (otmp);
1883	}
1884		1730
1885	op->map = NULL;	1731	op->map = 0;
1886	op->env = where;	1732	op->env = this;
1887	op->above = NULL;	1733	op->above = 0;
1888	op->below = NULL;	1734	op->below = 0;
1889	op->x = 0, op->y = 0;	1735	op->x = 0, op->y = 0;
1890		1736
1891	/* reset the light list and los of the players on the map */	1737	/* reset the light list and los of the players on the map */
1892	if ((op->glow_radius != 0) && where->map)	1738	if ((op->glow_radius != 0) && map)
1893	{	1739	{
1894	#ifdef DEBUG_LIGHTS	1740	#ifdef DEBUG_LIGHTS
1895	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);	1741	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1896	#endif /* DEBUG_LIGHTS */	1742	#endif /* DEBUG_LIGHTS */
1897	if (MAP_DARKNESS (where->map))	1743	if (MAP_DARKNESS (map))
1898	update_all_los (where->map, where->x, where->y);	1744	update_all_los (map, x, y);
1899	}	1745	}
1900		1746
1901	/* Client has no idea of ordering so lets not bother ordering it here.	1747	/* Client has no idea of ordering so lets not bother ordering it here.
1902	* It sure simplifies this function...	1748	* It sure simplifies this function...
1903	*/	1749	*/
1904	if (where->inv == NULL)	1750	if (!inv)
1905	where->inv = op;	1751	inv = op;
1906	else	1752	else
1907	{	1753	{
1908	op->below = where->inv;	1754	op->below = inv;
1909	op->below->above = op;	1755	op->below->above = op;
1910	where->inv = op;	1756	inv = op;
1911	}	1757	}
		1758
1912	return op;	1759	return op;
1913	}	1760	}
1914		1761
1915	/*	1762	/*
1916	* Checks if any objects has a move_type that matches objects	1763	* Checks if any objects has a move_type that matches objects
…		…
1934	*/	1781	*/
1935		1782
1936	int	1783	int
1937	check_move_on (object *op, object *originator)	1784	check_move_on (object *op, object *originator)
1938	{	1785	{
1939	object *	1786	object *tmp;
1940	tmp;	1787	maptile *m = op->map;
1941	tag_t
1942	tag;
1943	mapstruct *
1944	m = op->map;
1945	int
1946	x = op->x, y = op->y;	1788	int x = op->x, y = op->y;
1947		1789
1948	MoveType	1790	MoveType move_on, move_slow, move_block;
1949	move_on,
1950	move_slow,
1951	move_block;
1952		1791
1953	if (QUERY_FLAG (op, FLAG_NO_APPLY))	1792	if (QUERY_FLAG (op, FLAG_NO_APPLY))
1954	return 0;	1793	return 0;
1955
1956	tag = op->count;
1957		1794
1958	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);	1795	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);
1959	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);	1796	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);
1960	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);	1797	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);
1961		1798
…		…
2022	if ((!op->move_type && tmp->move_on & MOVE_WALK) ||	1859	if ((!op->move_type && tmp->move_on & MOVE_WALK) ||
2023	((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))	1860	((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))
2024	{	1861	{
2025	move_apply (tmp, op, originator);	1862	move_apply (tmp, op, originator);
2026		1863
2027	if (was_destroyed (op, tag))	1864	if (op->destroyed ())
2028	return 1;	1865	return 1;
2029		1866
2030	/* what the person/creature stepped onto has moved the object	1867	/* what the person/creature stepped onto has moved the object
2031	* someplace new. Don't process any further - if we did,	1868	* someplace new. Don't process any further - if we did,
2032	* have a feeling strange problems would result.	1869	* have a feeling strange problems would result.
…		…
2044	* a matching archetype at the given map and coordinates.	1881	* a matching archetype at the given map and coordinates.
2045	* The first matching object is returned, or NULL if none.	1882	* The first matching object is returned, or NULL if none.
2046	*/	1883	*/
2047		1884
2048	object *	1885	object *
2049	present_arch (const archetype *at, mapstruct *m, int x, int y)	1886	present_arch (const archetype *at, maptile *m, int x, int y)
2050	{	1887	{
2051	object *	1888	object *
2052	tmp;	1889	tmp;
2053		1890
2054	if (m == NULL || out_of_map (m, x, y))	1891	if (m == NULL || out_of_map (m, x, y))
…		…
2067	* a matching type variable at the given map and coordinates.	1904	* a matching type variable at the given map and coordinates.
2068	* The first matching object is returned, or NULL if none.	1905	* The first matching object is returned, or NULL if none.
2069	*/	1906	*/
2070		1907
2071	object *	1908	object *
2072	present (unsigned char type, mapstruct *m, int x, int y)	1909	present (unsigned char type, maptile *m, int x, int y)
2073	{	1910	{
2074	object *	1911	object *
2075	tmp;	1912	tmp;
2076		1913
2077	if (out_of_map (m, x, y))	1914	if (out_of_map (m, x, y))
…		…
2217	* the archetype because that isn't correct if the monster has been	2054	* the archetype because that isn't correct if the monster has been
2218	* customized, changed states, etc.	2055	* customized, changed states, etc.
2219	*/	2056	*/
2220		2057
2221	int	2058	int
2222	find_free_spot (const object *ob, mapstruct *m, int x, int y, int start, int stop)	2059	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2223	{	2060	{
2224	int	2061	int
2225	i,	2062	i,
2226	index = 0, flag;	2063	index = 0, flag;
2227	static int	2064	static int
…		…
2239	* if the space being examined only has a wall to the north and empty	2076	* if the space being examined only has a wall to the north and empty
2240	* spaces in all the other directions, this will reduce the search space	2077	* spaces in all the other directions, this will reduce the search space
2241	* to only the spaces immediately surrounding the target area, and	2078	* to only the spaces immediately surrounding the target area, and
2242	* won't look 2 spaces south of the target space.	2079	* won't look 2 spaces south of the target space.
2243	*/	2080	*/
2244	else if ((flag & AB_NO_PASS) && maxfree[i] < stop)	2081	else if ((flag & P_NO_PASS) && maxfree[i] < stop)
2245	stop = maxfree[i];	2082	stop = maxfree[i];
2246	}	2083	}
		2084
2247	if (!index)	2085	if (!index)
2248	return -1;	2086	return -1;
		2087
2249	return altern[RANDOM () % index];	2088	return altern[RANDOM () % index];
2250	}	2089	}
2251		2090
2252	/*	2091	/*
2253	* find_first_free_spot(archetype, mapstruct, x, y) works like	2092	* find_first_free_spot(archetype, maptile, x, y) works like
2254	* find_free_spot(), but it will search max number of squares.	2093	* find_free_spot(), but it will search max number of squares.
2255	* But it will return the first available spot, not a random choice.	2094	* But it will return the first available spot, not a random choice.
2256	* Changed 0.93.2: Have it return -1 if there is no free spot available.	2095	* Changed 0.93.2: Have it return -1 if there is no free spot available.
2257	*/	2096	*/
2258		2097
2259	int	2098	int
2260	find_first_free_spot (const object *ob, mapstruct *m, int x, int y)	2099	find_first_free_spot (const object *ob, maptile *m, int x, int y)
2261	{	2100	{
2262	int	2101	int
2263	i;	2102	i;
2264		2103
2265	for (i = 0; i < SIZEOFFREE; i++)	2104	for (i = 0; i < SIZEOFFREE; i++)
…		…
2329	* because we have to know what movement the thing looking to move	2168	* because we have to know what movement the thing looking to move
2330	* there is capable of.	2169	* there is capable of.
2331	*/	2170	*/
2332		2171
2333	int	2172	int
2334	find_dir (mapstruct *m, int x, int y, object *exclude)	2173	find_dir (maptile *m, int x, int y, object *exclude)
2335	{	2174	{
2336	int	2175	int
2337	i,	2176	i,
2338	max = SIZEOFFREE, mflags;	2177	max = SIZEOFFREE, mflags;
2339		2178
2340	sint16 nx, ny;	2179	sint16 nx, ny;
2341	object *	2180	object *
2342	tmp;	2181	tmp;
2343	mapstruct *	2182	maptile *
2344	mp;	2183	mp;
2345		2184
2346	MoveType blocked, move_type;	2185	MoveType blocked, move_type;
2347		2186
2348	if (exclude && exclude->head)	2187	if (exclude && exclude->head)
…		…
2361	mp = m;	2200	mp = m;
2362	nx = x + freearr_x[i];	2201	nx = x + freearr_x[i];
2363	ny = y + freearr_y[i];	2202	ny = y + freearr_y[i];
2364		2203
2365	mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);	2204	mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);
		2205
2366	if (mflags & P_OUT_OF_MAP)	2206	if (mflags & P_OUT_OF_MAP)
2367	{
2368	max = maxfree[i];	2207	max = maxfree[i];
2369	}
2370	else	2208	else
2371	{	2209	{
2372	blocked = GET_MAP_MOVE_BLOCK (mp, nx, ny);	2210	blocked = GET_MAP_MOVE_BLOCK (mp, nx, ny);
2373		2211
2374	if ((move_type & blocked) == move_type)	2212	if ((move_type & blocked) == move_type)
2375	{
2376	max = maxfree[i];	2213	max = maxfree[i];
2377	}
2378	else if (mflags & P_IS_ALIVE)	2214	else if (mflags & P_IS_ALIVE)
2379	{	2215	{
2380	for (tmp = GET_MAP_OB (mp, nx, ny); tmp != NULL; tmp = tmp->above)	2216	for (tmp = GET_MAP_OB (mp, nx, ny); tmp; tmp = tmp->above)
2381	{
2382	if ((QUERY_FLAG (tmp, FLAG_MONSTER) || tmp->type == PLAYER) && (tmp != exclude || (tmp->head && tmp->head != exclude)))	2217	if ((QUERY_FLAG (tmp, FLAG_MONSTER) || tmp->type == PLAYER) && (tmp != exclude || (tmp->head && tmp->head != exclude)))
2383	{
2384	break;	2218	break;
2385	}	2219
2386	}
2387	if (tmp)	2220	if (tmp)
2388	{
2389	return freedir[i];	2221	return freedir[i];
2390	}
2391	}	2222	}
2392	}	2223	}
2393	}	2224	}
		2225
2394	return 0;	2226	return 0;
2395	}	2227	}
2396		2228
2397	/*	2229	/*
2398	* distance(object 1, object 2) will return the square of the	2230	* distance(object 1, object 2) will return the square of the
…		…
2400	*/	2232	*/
2401		2233
2402	int	2234	int
2403	distance (const object *ob1, const object *ob2)	2235	distance (const object *ob1, const object *ob2)
2404	{	2236	{
2405	int	2237	int i;
2406	i;
2407		2238
2408	i = (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);	2239	i = (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);
2409	return i;	2240	return i;
2410	}	2241	}
2411		2242
…		…
2416	*/	2247	*/
2417		2248
2418	int	2249	int
2419	find_dir_2 (int x, int y)	2250	find_dir_2 (int x, int y)
2420	{	2251	{
2421	int	2252	int q;
2422	q;
2423		2253
2424	if (y)	2254	if (y)
2425	q = x * 100 / y;	2255	q = x * 100 / y;
2426	else if (x)	2256	else if (x)
2427	q = -300 * x;	2257	q = -300 * x;
…		…
2553	* find a path to that monster that we found. If not,	2383	* find a path to that monster that we found. If not,
2554	* we don't bother going toward it. Returns 1 if we	2384	* we don't bother going toward it. Returns 1 if we
2555	* can see a direct way to get it	2385	* can see a direct way to get it
2556	* Modified to be map tile aware -.MSW	2386	* Modified to be map tile aware -.MSW
2557	*/	2387	*/
2558
2559
2560	int	2388	int
2561	can_see_monsterP (mapstruct *m, int x, int y, int dir)	2389	can_see_monsterP (maptile *m, int x, int y, int dir)
2562	{	2390	{
2563	sint16 dx, dy;	2391	sint16 dx, dy;
2564	int
2565	mflags;	2392	int mflags;
2566		2393
2567	if (dir < 0)	2394	if (dir < 0)
2568	return 0; /* exit condition: invalid direction */	2395	return 0; /* exit condition: invalid direction */
2569		2396
2570	dx = x + freearr_x[dir];	2397	dx = x + freearr_x[dir];
…		…
2583	return 0;	2410	return 0;
2584		2411
2585	/* yes, can see. */	2412	/* yes, can see. */
2586	if (dir < 9)	2413	if (dir < 9)
2587	return 1;	2414	return 1;
		2415
2588	return can_see_monsterP (m, x, y, reduction_dir[dir][0]) |	2416	return can_see_monsterP (m, x, y, reduction_dir[dir][0])
2589	can_see_monsterP (m, x, y, reduction_dir[dir][1]) | can_see_monsterP (m, x, y, reduction_dir[dir][2]);	2417	| can_see_monsterP (m, x, y, reduction_dir[dir][1])
		2418	| can_see_monsterP (m, x, y, reduction_dir[dir][2]);
2590	}	2419	}
2591
2592
2593		2420
2594	/*	2421	/*
2595	* can_pick(picker, item): finds out if an object is possible to be	2422	* can_pick(picker, item): finds out if an object is possible to be
2596	* picked up by the picker. Returnes 1 if it can be	2423	* picked up by the picker. Returnes 1 if it can be
2597	* picked up, otherwise 0.	2424	* picked up, otherwise 0.
…		…
2608	return /*QUERY_FLAG(who,FLAG_WIZ)|| */	2435	return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2609	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&	2436	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
2610	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3));	2437	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3));
2611	}	2438	}
2612		2439
2613
2614	/*	2440	/*
2615	* create clone from object to another	2441	* create clone from object to another
2616	*/	2442	*/
2617	object *	2443	object *
2618	object_create_clone (object *asrc)	2444	object_create_clone (object *asrc)
2619	{	2445	{
2620	object *
2621	dst = NULL, *tmp, *src, *part, *prev, *item;	2446	object *dst = 0, *tmp, *src, *part, *prev, *item;
2622		2447
2623	if (!asrc)	2448	if (!asrc)
2624	return NULL;	2449	return 0;
		2450
2625	src = asrc;	2451	src = asrc;
2626	if (src->head)	2452	if (src->head)
2627	src = src->head;	2453	src = src->head;
2628		2454
2629	prev = NULL;	2455	prev = 0;
2630	for (part = src; part; part = part->more)	2456	for (part = src; part; part = part->more)
2631	{	2457	{
2632	tmp = get_object ();	2458	tmp = part->clone ();
2633	copy_object (part, tmp);
2634	tmp->x -= src->x;	2459	tmp->x -= src->x;
2635	tmp->y -= src->y;	2460	tmp->y -= src->y;
		2461
2636	if (!part->head)	2462	if (!part->head)
2637	{	2463	{
2638	dst = tmp;	2464	dst = tmp;
2639	tmp->head = NULL;	2465	tmp->head = 0;
2640	}	2466	}
2641	else	2467	else
2642	{
2643	tmp->head = dst;	2468	tmp->head = dst;
2644	}	2469
2645	tmp->more = NULL;	2470	tmp->more = 0;
		2471
2646	if (prev)	2472	if (prev)
2647	prev->more = tmp;	2473	prev->more = tmp;
		2474
2648	prev = tmp;	2475	prev = tmp;
2649	}	2476	}
2650		2477
2651	/*** copy inventory ***/
2652	for (item = src->inv; item; item = item->below)	2478	for (item = src->inv; item; item = item->below)
2653	{
2654	(void) insert_ob_in_ob (object_create_clone (item), dst);	2479	insert_ob_in_ob (object_create_clone (item), dst);
2655	}
2656		2480
2657	return dst;	2481	return dst;
2658	}	2482	}
2659		2483
2660	/* return true if the object was destroyed, 0 otherwise */
2661	int
2662	was_destroyed (const object *op, tag_t old_tag)
2663	{
2664	/* checking for FLAG_FREED isn't necessary, but makes this function more
2665	* robust */
2666	return op->count != old_tag || QUERY_FLAG (op, FLAG_FREED);
2667	}
2668
2669	/* GROS - Creates an object using a string representing its content. */	2484	/* GROS - Creates an object using a string representing its content. */
2670
2671	/* Basically, we save the content of the string to a temp file, then call */	2485	/* Basically, we save the content of the string to a temp file, then call */
2672
2673	/* load_object on it. I admit it is a highly inefficient way to make things, */	2486	/* load_object on it. I admit it is a highly inefficient way to make things, */
2674
2675	/* but it was simple to make and allows reusing the load_object function. */	2487	/* but it was simple to make and allows reusing the load_object function. */
2676
2677	/* Remember not to use load_object_str in a time-critical situation. */	2488	/* Remember not to use load_object_str in a time-critical situation. */
2678
2679	/* Also remember that multiparts objects are not supported for now. */	2489	/* Also remember that multiparts objects are not supported for now. */
2680		2490
2681	object *	2491	object *
2682	load_object_str (const char *obstr)	2492	load_object_str (const char *obstr)
2683	{	2493	{
2684	object *	2494	object *op;
2685	op;
2686	char
2687	filename[MAX_BUF];	2495	char filename[MAX_BUF];
2688		2496
2689	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);	2497	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2690		2498
2691	FILE *
2692	tempfile = fopen (filename, "w");	2499	FILE *tempfile = fopen (filename, "w");
2693		2500
2694	if (tempfile == NULL)	2501	if (tempfile == NULL)
2695	{	2502	{
2696	LOG (llevError, "Error - Unable to access load object temp file\n");	2503	LOG (llevError, "Error - Unable to access load object temp file\n");
2697	return NULL;	2504	return NULL;
2698	}	2505	}
2699		2506
2700	fprintf (tempfile, obstr);	2507	fprintf (tempfile, obstr);
2701	fclose (tempfile);	2508	fclose (tempfile);
2702		2509
2703	op = get_object ();	2510	op = object::create ();
2704		2511
2705	object_thawer thawer (filename);	2512	object_thawer thawer (filename);
2706		2513
2707	if (thawer)	2514	if (thawer)
2708	load_object (thawer, op, 0);	2515	load_object (thawer, op, 0);
…		…
2718	* returns NULL if no match.	2525	* returns NULL if no match.
2719	*/	2526	*/
2720	object *	2527	object *
2721	find_obj_by_type_subtype (const object *who, int type, int subtype)	2528	find_obj_by_type_subtype (const object *who, int type, int subtype)
2722	{	2529	{
2723	object *	2530	object *tmp;
2724	tmp;
2725		2531
2726	for (tmp = who->inv; tmp; tmp = tmp->below)	2532	for (tmp = who->inv; tmp; tmp = tmp->below)
2727	if (tmp->type == type && tmp->subtype == subtype)	2533	if (tmp->type == type && tmp->subtype == subtype)
2728	return tmp;	2534	return tmp;
2729		2535
…		…
2737	* do the desired thing.	2543	* do the desired thing.
2738	*/	2544	*/
2739	key_value *	2545	key_value *
2740	get_ob_key_link (const object *ob, const char *key)	2546	get_ob_key_link (const object *ob, const char *key)
2741	{	2547	{
2742	key_value *	2548	key_value *link;
2743	link;
2744		2549
2745	for (link = ob->key_values; link != NULL; link = link->next)	2550	for (link = ob->key_values; link != NULL; link = link->next)
2746	{
2747	if (link->key == key)	2551	if (link->key == key)
2748	{
2749	return link;	2552	return link;
2750	}
2751	}
2752		2553
2753	return NULL;	2554	return NULL;
2754	}	2555	}
2755		2556
2756	/*	2557	/*

Diff Legend

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