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.47 by root, Thu Sep 14 22:33:59 2006 UTC vs.
Revision 1.80 by root, Sat Dec 23 06:41:39 2006 UTC

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

Diff Legend

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