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.48 by root, Thu Sep 14 23:13:48 2006 UTC vs.
Revision 1.75 by root, Wed Dec 20 11:36:38 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->flags ^ ob2->flags).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 %s\n", 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;
489		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);
…		…
972	* 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
973	* free objects. The IS_FREED() flag is set in the object.	855	* free objects. The IS_FREED() flag is set in the object.
974	* The object must have been removed by remove_ob() first for	856	* The object must have been removed by remove_ob() first for
975	* this function to succeed.	857	* this function to succeed.
976	*	858	*
977	* 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
978	* inventory to the ground.	860	* inventory to the ground.
979	*/	861	*/
980	void object::free (bool free_inventory)	862	void object::destroy (bool destroy_inventory)
981	{	863	{
982	if (QUERY_FLAG (this, FLAG_FREED))	864	if (QUERY_FLAG (this, FLAG_FREED))
983	return;	865	return;
984		866
985	if (QUERY_FLAG (this, FLAG_FRIENDLY))	867	if (QUERY_FLAG (this, FLAG_FRIENDLY))
986	remove_friendly_object (this);	868	remove_friendly_object (this);
987		869
988	if (!QUERY_FLAG (this, FLAG_REMOVED))	870	if (!QUERY_FLAG (this, FLAG_REMOVED))
989	remove_ob (this);	871	remove ();
990		872
991	SET_FLAG (this, FLAG_FREED);	873	SET_FLAG (this, FLAG_FREED);
992		874
993	if (more)	875	if (more)
994	{	876	{
995	more->free (free_inventory);	877	more->destroy (destroy_inventory);
996	more = 0;	878	more = 0;
997	}	879	}
998		880
999	if (inv)	881	if (inv)
1000	{	882	{
1001	/* Only if the space blocks everything do we not process -	883	/* Only if the space blocks everything do we not process -
1002	* if some form of movement is allowed, let objects	884	* if some form of movement is allowed, let objects
1003	* drop on that space.	885	* drop on that space.
1004	*/	886	*/
1005	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)
1006	{	888	{
1007	object *op = inv;	889	object *op = inv;
1008		890
1009	while (op)	891	while (op)
1010	{	892	{
1011	object *tmp = op->below;	893	object *tmp = op->below;
1012	op->free (free_inventory);	894	op->destroy (destroy_inventory);
1013	op = tmp;	895	op = tmp;
1014	}	896	}
1015	}	897	}
1016	else	898	else
1017	{ /* Put objects in inventory onto this space */	899	{ /* Put objects in inventory onto this space */
…		…
1019		901
1020	while (op)	902	while (op)
1021	{	903	{
1022	object *tmp = op->below;	904	object *tmp = op->below;
1023		905
1024	remove_ob (op);	906	op->remove ();
1025		907
1026	if (QUERY_FLAG (op, FLAG_STARTEQUIP)	908	if (QUERY_FLAG (op, FLAG_STARTEQUIP)
1027	|| 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))
1028	free_object (op);	910	op->destroy ();
1029	else	911	else
1030	{	912	{
1031	op->x = x;	913	op->x = x;
1032	op->y = y;	914	op->y = y;
1033	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 */
…		…
1036	op = tmp;	918	op = tmp;
1037	}	919	}
1038	}	920	}
1039	}	921	}
1040		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
1041	// clear those pointers that likely might have circular references to us	943	// clear those pointers that likely might have circular references to us
1042	owner = 0;	944	owner = 0;
1043	enemy = 0;	945	enemy = 0;
1044	attacked_by = 0;	946	attacked_by = 0;
1045		947
		948	// only relevant for players(?), but make sure of it anyways
		949	contr = 0;
		950
1046	/* Remove object from the active list */	951	/* Remove object from the active list */
1047	speed = 0;	952	speed = 0;
1048	update_ob_speed (this);	953	update_ob_speed (this);
1049		954
1050	unlink ();	955	unlink ();
…		…
1054		959
1055	/*	960	/*
1056	* sub_weight() recursively (outwards) subtracts a number from the	961	* sub_weight() recursively (outwards) subtracts a number from the
1057	* 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)).
1058	*/	963	*/
1059
1060	void	964	void
1061	sub_weight (object *op, signed long weight)	965	sub_weight (object *op, signed long weight)
1062	{	966	{
1063	while (op != NULL)	967	while (op != NULL)
1064	{	968	{
…		…
1068	op->carrying -= weight;	972	op->carrying -= weight;
1069	op = op->env;	973	op = op->env;
1070	}	974	}
1071	}	975	}
1072		976
1073	/* remove_ob(op):	977	/* op->remove ():
1074	* 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
1075	* 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
1076	* object will have no environment. If the object previously had an	980	* object will have no environment. If the object previously had an
1077	* environment, the x and y coordinates will be updated to	981	* environment, the x and y coordinates will be updated to
1078	* the previous environment.	982	* the previous environment.
1079	* Beware: This function is called from the editor as well!	983	* Beware: This function is called from the editor as well!
1080	*/	984	*/
1081
1082	void	985	void
1083	remove_ob (object *op)	986	object::remove ()
1084	{	987	{
1085	object *tmp, *last = 0;	988	object *tmp, *last = 0;
1086	object *otmp;	989	object *otmp;
1087		990
1088	int check_walk_off;	991	int check_walk_off;
1089	mapstruct *m;
1090		992
1091	sint16 x, y;
1092
1093	if (QUERY_FLAG (op, FLAG_REMOVED))	993	if (QUERY_FLAG (this, FLAG_REMOVED))
1094	return;	994	return;
1095		995
1096	SET_FLAG (op, FLAG_REMOVED);	996	SET_FLAG (this, FLAG_REMOVED);
1097		997
1098	if (op->more != NULL)	998	if (more)
1099	remove_ob (op->more);	999	more->remove ();
1100		1000
1101	/*	1001	/*
1102	* In this case, the object to be removed is in someones	1002	* In this case, the object to be removed is in someones
1103	* inventory.	1003	* inventory.
1104	*/	1004	*/
1105	if (op->env != NULL)	1005	if (env)
1106	{	1006	{
1107	if (op->nrof)	1007	if (nrof)
1108	sub_weight (op->env, op->weight * op->nrof);	1008	sub_weight (env, weight * nrof);
1109	else	1009	else
1110	sub_weight (op->env, op->weight + op->carrying);	1010	sub_weight (env, weight + carrying);
1111		1011
1112	/* 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
1113	* made to players inventory. If set, avoiding the call	1013	* made to players inventory. If set, avoiding the call
1114	* to save cpu time.	1014	* to save cpu time.
1115	*/	1015	*/
1116	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))
1117	fix_player (otmp);	1017	fix_player (otmp);
1118		1018
1119	if (op->above != NULL)	1019	if (above != NULL)
1120	op->above->below = op->below;	1020	above->below = below;
1121	else	1021	else
1122	op->env->inv = op->below;	1022	env->inv = below;
1123		1023
1124	if (op->below != NULL)	1024	if (below != NULL)
1125	op->below->above = op->above;	1025	below->above = above;
1126		1026
1127	/* we set up values so that it could be inserted into	1027	/* we set up values so that it could be inserted into
1128	* 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
1129	* to the caller to decide what we want to do.	1029	* to the caller to decide what we want to do.
1130	*/	1030	*/
1131	op->x = op->env->x, op->y = op->env->y;	1031	x = env->x, y = env->y;
1132	op->map = op->env->map;	1032	map = env->map;
1133	op->above = NULL, op->below = NULL;	1033	above = 0, below = 0;
1134	op->env = NULL;	1034	env = 0;
1135	}	1035	}
1136	else if (op->map)	1036	else if (map)
1137	{	1037	{
1138	x = op->x;
1139	y = op->y;
1140	m = get_map_from_coord (op->map, &x, &y);
1141
1142	if (!m)
1143	{
1144	LOG (llevError, "remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n",
1145	op->map->path, op->x, op->y);
1146	/* in old days, we used to set x and y to 0 and continue.
1147	* it seems if we get into this case, something is probablye
1148	* screwed up and should be fixed.
1149	*/
1150	abort ();
1151	}
1152
1153	if (op->map != m)
1154	LOG (llevDebug, "remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n",
1155	op->map->path, m->path, op->x, op->y, x, y);
1156
1157	/* 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
1158	* lots of logic for things we no longer care about	1039	* lots of logic for things we no longer care about
1159	*/	1040	*/
1160		1041
1161	/* link the object above us */	1042	/* link the object above us */
1162	if (op->above)	1043	if (above)
1163	op->above->below = op->below;	1044	above->below = below;
1164	else	1045	else
1165	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 */
1166		1047
1167	/* Relink the object below us, if there is one */	1048	/* Relink the object below us, if there is one */
1168	if (op->below)	1049	if (below)
1169	op->below->above = op->above;	1050	below->above = above;
1170	else	1051	else
1171	{	1052	{
1172	/* 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
1173	* use translated coordinates in case some oddness with map tiling is	1054	* use translated coordinates in case some oddness with map tiling is
1174	* evident	1055	* evident
1175	*/	1056	*/
1176	if (GET_MAP_OB (m, x, y) != op)	1057	if (GET_MAP_OB (map, x, y) != this)
1177	{	1058	{
1178	dump_object (op);	1059	char *dump = dump_object (this);
1179	LOG (llevError,	1060	LOG (llevError,
1180	"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);
1181	dump_object (GET_MAP_OB (m, x, y));	1063	dump = dump_object (GET_MAP_OB (map, x, y));
1182	LOG (llevError, "%s\n", errmsg);	1064	LOG (llevError, "%s\n", dump);
		1065	free (dump);
1183	}	1066	}
1184		1067
1185	SET_MAP_OB (m, x, y, op->above); /* goes on above it. */	1068	map->at (x, y).bottom = above; /* goes on above it. */
1186	}	1069	}
1187		1070
1188	op->above = 0;	1071	above = 0;
1189	op->below = 0;	1072	below = 0;
1190		1073
1191	if (op->map->in_memory == MAP_SAVING)	1074	if (map->in_memory == MAP_SAVING)
1192	return;	1075	return;
1193		1076
1194	check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY);	1077	check_walk_off = !QUERY_FLAG (this, FLAG_NO_APPLY);
1195		1078
1196	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)
1197	{	1080	{
1198	/* 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
1199	* being removed.	1082	* being removed.
1200	*/	1083	*/
1201		1084
1202	if (tmp->type == PLAYER && tmp != op)	1085	if (tmp->type == PLAYER && tmp != this)
1203	{	1086	{
1204	/* If a container that the player is currently using somehow gets	1087	/* If a container that the player is currently using somehow gets
1205	* removed (most likely destroyed), update the player view	1088	* removed (most likely destroyed), update the player view
1206	* appropriately.	1089	* appropriately.
1207	*/	1090	*/
1208	if (tmp->container == op)	1091	if (tmp->container == this)
1209	{	1092	{
1210	CLEAR_FLAG (op, FLAG_APPLIED);	1093	CLEAR_FLAG (this, FLAG_APPLIED);
1211	tmp->container = NULL;	1094	tmp->container = 0;
1212	}	1095	}
1213		1096
1214	tmp->contr->socket.update_look = 1;	1097	tmp->contr->socket->floorbox_update ();
1215	}	1098	}
1216		1099
1217	/* See if player moving off should effect something */	1100	/* See if player moving off should effect something */
1218	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))
1219	{	1104	{
1220	move_apply (tmp, op, NULL);	1105	move_apply (tmp, this, 0);
1221		1106
1222	if (op->destroyed ());	1107	if (destroyed ())
1223	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 ());
1224	}	1109	}
1225		1110
1226	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */	1111	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1227		1112
1228	if (tmp->above == tmp)	1113	if (tmp->above == tmp)
1229	tmp->above = NULL;	1114	tmp->above = 0;
1230		1115
1231	last = tmp;	1116	last = tmp;
1232	}	1117	}
1233		1118
1234	/* last == NULL of there are no objects on this space */	1119	/* last == NULL of there are no objects on this space */
1235	if (last == NULL)	1120	if (!last)
1236	{	1121	map->at (x, y).flags_ = P_NEED_UPDATE;
1237	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1238	* we could preserve the flags (GET_MAP_FLAGS), but update_position figures
1239	* those out anyways, and if there are any flags set right now, they won't
1240	* be correct anyways.
1241	*/
1242	SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE);
1243	update_position (op->map, op->x, op->y);
1244	}
1245	else	1122	else
1246	update_object (last, UP_OBJ_REMOVE);	1123	update_object (last, UP_OBJ_REMOVE);
1247		1124
1248	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0))	1125	if (QUERY_FLAG (this, FLAG_BLOCKSVIEW) || glow_radius)
1249	update_all_los (op->map, op->x, op->y);	1126	update_all_los (map, x, y);
1250	}	1127	}
1251	}	1128	}
1252		1129
1253	/*	1130	/*
1254	* merge_ob(op,top):	1131	* merge_ob(op,top):
…		…
1269		1146
1270	for (; top != NULL; top = top->below)	1147	for (; top != NULL; top = top->below)
1271	{	1148	{
1272	if (top == op)	1149	if (top == op)
1273	continue;	1150	continue;
1274	if (CAN_MERGE (op, top))	1151
		1152	if (object::can_merge (op, top))
1275	{	1153	{
1276	top->nrof += op->nrof;	1154	top->nrof += op->nrof;
1277		1155
1278	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/	1156	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/
1279	op->weight = 0; /* Don't want any adjustements now */	1157	op->weight = 0; /* Don't want any adjustements now */
1280	remove_ob (op);	1158	op->destroy ();
1281	free_object (op);
1282	return top;	1159	return top;
1283	}	1160	}
1284	}	1161	}
1285		1162
1286	return 0;	1163	return 0;
…		…
1289	/*	1166	/*
1290	* 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
1291	* job preparing multi-part monsters	1168	* job preparing multi-part monsters
1292	*/	1169	*/
1293	object *	1170	object *
1294	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)
1295	{	1172	{
1296	object *tmp;	1173	object *tmp;
1297		1174
1298	if (op->head)	1175	if (op->head)
1299	op = op->head;	1176	op = op->head;
…		…
1327	* NULL if 'op' was destroyed	1204	* NULL if 'op' was destroyed
1328	* just 'op' otherwise	1205	* just 'op' otherwise
1329	*/	1206	*/
1330		1207
1331	object *	1208	object *
1332	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)
1333	{	1210	{
1334	object *tmp, *top, *floor = NULL;	1211	object *tmp, *top, *floor = NULL;
1335	sint16 x, y;	1212	sint16 x, y;
1336		1213
1337	if (QUERY_FLAG (op, FLAG_FREED))	1214	if (QUERY_FLAG (op, FLAG_FREED))
…		…
1340	return NULL;	1217	return NULL;
1341	}	1218	}
1342		1219
1343	if (m == NULL)	1220	if (m == NULL)
1344	{	1221	{
1345	dump_object (op);	1222	char *dump = dump_object (op);
1346	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);
1347	return op;	1225	return op;
1348	}	1226	}
1349		1227
1350	if (out_of_map (m, op->x, op->y))	1228	if (out_of_map (m, op->x, op->y))
1351	{	1229	{
1352	dump_object (op);	1230	char *dump = dump_object (op);
1353	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);
1354	#ifdef MANY_CORES	1232	#ifdef MANY_CORES
1355	/* 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
1356	* 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
1357	* improperly inserted.	1235	* improperly inserted.
1358	*/	1236	*/
1359	abort ();	1237	abort ();
1360	#endif	1238	#endif
		1239	free (dump);
1361	return op;	1240	return op;
1362	}	1241	}
1363		1242
1364	if (!QUERY_FLAG (op, FLAG_REMOVED))	1243	if (!QUERY_FLAG (op, FLAG_REMOVED))
1365	{	1244	{
1366	dump_object (op);	1245	char *dump = dump_object (op);
1367	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);
1368	return op;	1248	return op;
1369	}	1249	}
1370		1250
1371	if (op->more != NULL)	1251	if (op->more != NULL)
1372	{	1252	{
…		…
1410		1290
1411	/* this has to be done after we translate the coordinates.	1291	/* this has to be done after we translate the coordinates.
1412	*/	1292	*/
1413	if (op->nrof && !(flag & INS_NO_MERGE))	1293	if (op->nrof && !(flag & INS_NO_MERGE))
1414	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)
1415	if (CAN_MERGE (op, tmp))	1295	if (object::can_merge (op, tmp))
1416	{	1296	{
1417	op->nrof += tmp->nrof;	1297	op->nrof += tmp->nrof;
1418	remove_ob (tmp);	1298	tmp->destroy ();
1419	free_object (tmp);
1420	}	1299	}
1421		1300
1422	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 */
1423	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1302	CLEAR_FLAG (op, FLAG_INV_LOCKED);
1424		1303
…		…
1437	op->below = originator->below;	1316	op->below = originator->below;
1438		1317
1439	if (op->below)	1318	if (op->below)
1440	op->below->above = op;	1319	op->below->above = op;
1441	else	1320	else
1442	SET_MAP_OB (op->map, op->x, op->y, op);	1321	op->map->at (op->x, op->y).bottom = op;
1443		1322
1444	/* since *below* originator, no need to update top */	1323	/* since *below* originator, no need to update top */
1445	originator->below = op;	1324	originator->below = op;
1446	}	1325	}
1447	else	1326	else
…		…
1493	* If INS_ON_TOP is used, don't do this processing	1372	* If INS_ON_TOP is used, don't do this processing
1494	* Need to find the object that in fact blocks view, otherwise	1373	* Need to find the object that in fact blocks view, otherwise
1495	* stacking is a bit odd.	1374	* stacking is a bit odd.
1496	*/	1375	*/
1497	if (!(flag & INS_ON_TOP) &&	1376	if (!(flag & INS_ON_TOP) &&
1498	(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))
1499	{	1378	{
1500	for (last = top; last != floor; last = last->below)	1379	for (last = top; last != floor; last = last->below)
1501	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1380	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1502	break;	1381	break;
1503	/* Check to see if we found the object that blocks view,	1382	/* Check to see if we found the object that blocks view,
…		…
1526		1405
1527	if (op->above)	1406	if (op->above)
1528	op->above->below = op;	1407	op->above->below = op;
1529		1408
1530	op->below = NULL;	1409	op->below = NULL;
1531	SET_MAP_OB (op->map, op->x, op->y, op);	1410	op->map->at (op->x, op->y).bottom = op;
1532	}	1411	}
1533	else	1412	else
1534	{ /* get inserted into the stack above top */	1413	{ /* get inserted into the stack above top */
1535	op->above = top->above;	1414	op->above = top->above;
1536		1415
…		…
1540	op->below = top;	1419	op->below = top;
1541	top->above = op;	1420	top->above = op;
1542	}	1421	}
1543		1422
1544	if (op->above == NULL)	1423	if (op->above == NULL)
1545	SET_MAP_TOP (op->map, op->x, op->y, op);	1424	op->map->at (op->x, op->y).top = op;
1546	} /* else not INS_BELOW_ORIGINATOR */	1425	} /* else not INS_BELOW_ORIGINATOR */
1547		1426
1548	if (op->type == PLAYER)	1427	if (op->type == PLAYER)
1549	op->contr->do_los = 1;	1428	op->contr->do_los = 1;
1550		1429
1551	/* 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
1552	* it, so save a few ticks and start from there.	1431	* it, so save a few ticks and start from there.
1553	*/	1432	*/
1554	if (!(flag & INS_MAP_LOAD))	1433	if (!(flag & INS_MAP_LOAD))
1555	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 ())
1556	if (tmp->type == PLAYER)	1435	pl->contr->socket->floorbox_update ();
1557	tmp->contr->socket.update_look = 1;
1558		1436
1559	/* If this object glows, it may affect lighting conditions that are	1437	/* If this object glows, it may affect lighting conditions that are
1560	* 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
1561	* 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
1562	* on the map will get recalculated. The players could very well	1440	* on the map will get recalculated. The players could very well
…		…
1570		1448
1571	/* updates flags (blocked, alive, no magic, etc) for this map space */	1449	/* updates flags (blocked, alive, no magic, etc) for this map space */
1572	update_object (op, UP_OBJ_INSERT);	1450	update_object (op, UP_OBJ_INSERT);
1573		1451
1574	/* 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,
1575	* we want to have update_look set above before calling this.	1453	* we want to have floorbox_update called before calling this.
1576	*	1454	*
1577	* check_move_on() must be after this because code called from	1455	* check_move_on() must be after this because code called from
1578	* check_move_on() depends on correct map flags (so functions like	1456	* check_move_on() depends on correct map flags (so functions like
1579	* blocked() and wall() work properly), and these flags are updated by	1457	* blocked() and wall() work properly), and these flags are updated by
1580	* update_object().	1458	* update_object().
…		…
1596		1474
1597	return op;	1475	return op;
1598	}	1476	}
1599		1477
1600	/* this function inserts an object in the map, but if it	1478	/* this function inserts an object in the map, but if it
1601	* 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.
1602	* 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.
1603	*/	1481	*/
1604	void	1482	void
1605	replace_insert_ob_in_map (const char *arch_string, object *op)	1483	replace_insert_ob_in_map (const char *arch_string, object *op)
1606	{	1484	{
1607	object *	1485	object *tmp, *tmp1;
1608	tmp;
1609	object *
1610	tmp1;
1611		1486
1612	/* first search for itself and remove any old instances */	1487	/* first search for itself and remove any old instances */
1613		1488
1614	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)
1615	{
1616	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */	1490	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */
1617	{	1491	tmp->destroy ();
1618	remove_ob (tmp);
1619	free_object (tmp);
1620	}
1621	}
1622		1492
1623	tmp1 = arch_to_object (archetype::find (arch_string));	1493	tmp1 = arch_to_object (archetype::find (arch_string));
1624		1494
1625	tmp1->x = op->x;	1495	tmp1->x = op->x;
1626	tmp1->y = op->y;	1496	tmp1->y = op->y;
…		…
1636	*/	1506	*/
1637		1507
1638	object *	1508	object *
1639	get_split_ob (object *orig_ob, uint32 nr)	1509	get_split_ob (object *orig_ob, uint32 nr)
1640	{	1510	{
1641	object *	1511	object *newob;
1642	newob;
1643	int
1644	is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);	1512	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1645		1513
1646	if (orig_ob->nrof < nr)	1514	if (orig_ob->nrof < nr)
1647	{	1515	{
1648	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);
1649	return NULL;	1517	return NULL;
1650	}	1518	}
1651		1519
1652	newob = object_create_clone (orig_ob);	1520	newob = object_create_clone (orig_ob);
1653		1521
1654	if ((orig_ob->nrof -= nr) < 1)	1522	if ((orig_ob->nrof -= nr) < 1)
1655	{	1523	orig_ob->destroy (1);
1656	if (!is_removed)
1657	remove_ob (orig_ob);
1658	free_object2 (orig_ob, 1);
1659	}
1660	else if (!is_removed)	1524	else if (!is_removed)
1661	{	1525	{
1662	if (orig_ob->env != NULL)	1526	if (orig_ob->env != NULL)
1663	sub_weight (orig_ob->env, orig_ob->weight * nr);	1527	sub_weight (orig_ob->env, orig_ob->weight * nr);
1664	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)
…		…
1694	if (i > op->nrof)	1558	if (i > op->nrof)
1695	i = op->nrof;	1559	i = op->nrof;
1696		1560
1697	if (QUERY_FLAG (op, FLAG_REMOVED))	1561	if (QUERY_FLAG (op, FLAG_REMOVED))
1698	op->nrof -= i;	1562	op->nrof -= i;
1699	else if (op->env != NULL)	1563	else if (op->env)
1700	{	1564	{
1701	/* is this object in the players inventory, or sub container	1565	/* is this object in the players inventory, or sub container
1702	* therein?	1566	* therein?
1703	*/	1567	*/
1704	tmp = is_player_inv (op->env);	1568	tmp = op->in_player ();
1705	/* nope. Is this a container the player has opened?	1569	/* nope. Is this a container the player has opened?
1706	* If so, set tmp to that player.	1570	* If so, set tmp to that player.
1707	* IMO, searching through all the players will mostly	1571	* IMO, searching through all the players will mostly
1708	* likely be quicker than following op->env to the map,	1572	* likely be quicker than following op->env to the map,
1709	* and then searching the map for a player.	1573	* and then searching the map for a player.
1710	*/	1574	*/
1711	if (!tmp)	1575	if (!tmp)
1712	{	1576	{
1713	for (pl = first_player; pl; pl = pl->next)	1577	for (pl = first_player; pl; pl = pl->next)
1714	if (pl->ob->container == op->env)	1578	if (pl->ob->container == op->env)
		1579	{
		1580	tmp = pl->ob;
1715	break;	1581	break;
1716	if (pl)	1582	}
1717	tmp = pl->ob;
1718	else
1719	tmp = NULL;
1720	}	1583	}
1721		1584
1722	if (i < op->nrof)	1585	if (i < op->nrof)
1723	{	1586	{
1724	sub_weight (op->env, op->weight * i);	1587	sub_weight (op->env, op->weight * i);
1725	op->nrof -= i;	1588	op->nrof -= i;
1726	if (tmp)	1589	if (tmp)
1727	{
1728	esrv_send_item (tmp, op);	1590	esrv_send_item (tmp, op);
1729	}
1730	}	1591	}
1731	else	1592	else
1732	{	1593	{
1733	remove_ob (op);	1594	op->remove ();
1734	op->nrof = 0;	1595	op->nrof = 0;
1735	if (tmp)	1596	if (tmp)
1736	{
1737	esrv_del_item (tmp->contr, op->count);	1597	esrv_del_item (tmp->contr, op->count);
1738	}
1739	}	1598	}
1740	}	1599	}
1741	else	1600	else
1742	{	1601	{
1743	object *above = op->above;	1602	object *above = op->above;
1744		1603
1745	if (i < op->nrof)	1604	if (i < op->nrof)
1746	op->nrof -= i;	1605	op->nrof -= i;
1747	else	1606	else
1748	{	1607	{
1749	remove_ob (op);	1608	op->remove ();
1750	op->nrof = 0;	1609	op->nrof = 0;
1751	}	1610	}
1752		1611
1753	/* Since we just removed op, op->above is null */	1612	/* Since we just removed op, op->above is null */
1754	for (tmp = above; tmp != NULL; tmp = tmp->above)	1613	for (tmp = above; tmp; tmp = tmp->above)
1755	if (tmp->type == PLAYER)	1614	if (tmp->type == PLAYER)
1756	{	1615	{
1757	if (op->nrof)	1616	if (op->nrof)
1758	esrv_send_item (tmp, op);	1617	esrv_send_item (tmp, op);
1759	else	1618	else
…		…
1763		1622
1764	if (op->nrof)	1623	if (op->nrof)
1765	return op;	1624	return op;
1766	else	1625	else
1767	{	1626	{
1768	free_object (op);	1627	op->destroy ();
1769	return NULL;	1628	return 0;
1770	}	1629	}
1771	}	1630	}
1772		1631
1773	/*	1632	/*
1774	* add_weight(object, weight) adds the specified weight to an object,	1633	* add_weight(object, weight) adds the specified weight to an object,
…		…
1786	op->carrying += weight;	1645	op->carrying += weight;
1787	op = op->env;	1646	op = op->env;
1788	}	1647	}
1789	}	1648	}
1790		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
1791	/*	1670	/*
1792	* insert_ob_in_ob(op,environment):	1671	* env->insert (op)
1793	* This function inserts the object op in the linked list	1672	* This function inserts the object op in the linked list
1794	* inside the object environment.	1673	* inside the object environment.
1795	*	1674	*
1796	* Eneq(@csd.uu.se): Altered insert_ob_in_ob to make things picked up enter
1797	* the inventory at the last position or next to other objects of the same
1798	* type.
1799	* Frank: Now sorted by type, archetype and magic!
1800	*
1801	* 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
1802	* be != op, if items are merged. -Tero	1676	* be != op, if items are merged. -Tero
1803	*/	1677	*/
1804		1678
1805	object *	1679	object *
1806	insert_ob_in_ob (object *op, object *where)	1680	object::insert (object *op)
1807	{	1681	{
1808	object *	1682	object *tmp, *otmp;
1809	tmp, *
1810	otmp;
1811		1683
1812	if (!QUERY_FLAG (op, FLAG_REMOVED))	1684	if (!QUERY_FLAG (op, FLAG_REMOVED))
1813	{	1685	op->remove ();
1814	dump_object (op);
1815	LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", errmsg);
1816	return op;
1817	}
1818
1819	if (where == NULL)
1820	{
1821	dump_object (op);
1822	LOG (llevError, "Trying to put object in NULL.\n%s\n", errmsg);
1823	return op;
1824	}
1825
1826	if (where->head)
1827	{
1828	LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n");
1829	where = where->head;
1830	}
1831		1686
1832	if (op->more)	1687	if (op->more)
1833	{	1688	{
1834	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);
1835	return op;	1690	return op;
…		…
1837		1692
1838	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1693	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1839	CLEAR_FLAG (op, FLAG_REMOVED);	1694	CLEAR_FLAG (op, FLAG_REMOVED);
1840	if (op->nrof)	1695	if (op->nrof)
1841	{	1696	{
1842	for (tmp = where->inv; tmp != NULL; tmp = tmp->below)	1697	for (tmp = inv; tmp != NULL; tmp = tmp->below)
1843	if (CAN_MERGE (tmp, op))	1698	if (object::can_merge (tmp, op))
1844	{	1699	{
1845	/* return the original object and remove inserted object	1700	/* return the original object and remove inserted object
1846	(client needs the original object) */	1701	(client needs the original object) */
1847	tmp->nrof += op->nrof;	1702	tmp->nrof += op->nrof;
1848	/* Weight handling gets pretty funky. Since we are adding to	1703	/* Weight handling gets pretty funky. Since we are adding to
1849	* tmp->nrof, we need to increase the weight.	1704	* tmp->nrof, we need to increase the weight.
1850	*/	1705	*/
1851	add_weight (where, op->weight * op->nrof);	1706	add_weight (this, op->weight * op->nrof);
1852	SET_FLAG (op, FLAG_REMOVED);	1707	SET_FLAG (op, FLAG_REMOVED);
1853	free_object (op); /* free the inserted object */	1708	op->destroy (); /* free the inserted object */
1854	op = tmp;	1709	op = tmp;
1855	remove_ob (op); /* and fix old object's links */	1710	op->remove (); /* and fix old object's links */
1856	CLEAR_FLAG (op, FLAG_REMOVED);	1711	CLEAR_FLAG (op, FLAG_REMOVED);
1857	break;	1712	break;
1858	}	1713	}
1859		1714
1860	/* I assume combined objects have no inventory	1715	/* I assume combined objects have no inventory
1861	* We add the weight - this object could have just been removed	1716	* We add the weight - this object could have just been removed
1862	* (if it was possible to merge). calling remove_ob will subtract	1717	* (if it was possible to merge). calling remove_ob will subtract
1863	* 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
1864	* the linking below	1719	* the linking below
1865	*/	1720	*/
1866	add_weight (where, op->weight * op->nrof);	1721	add_weight (this, op->weight * op->nrof);
1867	}	1722	}
1868	else	1723	else
1869	add_weight (where, (op->weight + op->carrying));	1724	add_weight (this, (op->weight + op->carrying));
1870		1725
1871	otmp = is_player_inv (where);	1726	otmp = this->in_player ();
1872	if (otmp && otmp->contr != NULL)	1727	if (otmp && otmp->contr)
1873	{
1874	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1728	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1875	fix_player (otmp);	1729	fix_player (otmp);
1876	}
1877		1730
1878	op->map = NULL;	1731	op->map = 0;
1879	op->env = where;	1732	op->env = this;
1880	op->above = NULL;	1733	op->above = 0;
1881	op->below = NULL;	1734	op->below = 0;
1882	op->x = 0, op->y = 0;	1735	op->x = 0, op->y = 0;
1883		1736
1884	/* 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 */
1885	if ((op->glow_radius != 0) && where->map)	1738	if ((op->glow_radius != 0) && map)
1886	{	1739	{
1887	#ifdef DEBUG_LIGHTS	1740	#ifdef DEBUG_LIGHTS
1888	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);
1889	#endif /* DEBUG_LIGHTS */	1742	#endif /* DEBUG_LIGHTS */
1890	if (MAP_DARKNESS (where->map))	1743	if (MAP_DARKNESS (map))
1891	update_all_los (where->map, where->x, where->y);	1744	update_all_los (map, x, y);
1892	}	1745	}
1893		1746
1894	/* 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.
1895	* It sure simplifies this function...	1748	* It sure simplifies this function...
1896	*/	1749	*/
1897	if (where->inv == NULL)	1750	if (!inv)
1898	where->inv = op;	1751	inv = op;
1899	else	1752	else
1900	{	1753	{
1901	op->below = where->inv;	1754	op->below = inv;
1902	op->below->above = op;	1755	op->below->above = op;
1903	where->inv = op;	1756	inv = op;
1904	}	1757	}
		1758
1905	return op;	1759	return op;
1906	}	1760	}
1907		1761
1908	/*	1762	/*
1909	* Checks if any objects has a move_type that matches objects	1763	* Checks if any objects has a move_type that matches objects
…		…
1928		1782
1929	int	1783	int
1930	check_move_on (object *op, object *originator)	1784	check_move_on (object *op, object *originator)
1931	{	1785	{
1932	object *tmp;	1786	object *tmp;
1933	mapstruct *m = op->map;	1787	maptile *m = op->map;
1934	int x = op->x, y = op->y;	1788	int x = op->x, y = op->y;
1935		1789
1936	MoveType move_on, move_slow, move_block;	1790	MoveType move_on, move_slow, move_block;
1937		1791
1938	if (QUERY_FLAG (op, FLAG_NO_APPLY))	1792	if (QUERY_FLAG (op, FLAG_NO_APPLY))
…		…
2027	* a matching archetype at the given map and coordinates.	1881	* a matching archetype at the given map and coordinates.
2028	* The first matching object is returned, or NULL if none.	1882	* The first matching object is returned, or NULL if none.
2029	*/	1883	*/
2030		1884
2031	object *	1885	object *
2032	present_arch (const archetype *at, mapstruct *m, int x, int y)	1886	present_arch (const archetype *at, maptile *m, int x, int y)
2033	{	1887	{
2034	object *	1888	object *
2035	tmp;	1889	tmp;
2036		1890
2037	if (m == NULL || out_of_map (m, x, y))	1891	if (m == NULL || out_of_map (m, x, y))
…		…
2050	* a matching type variable at the given map and coordinates.	1904	* a matching type variable at the given map and coordinates.
2051	* The first matching object is returned, or NULL if none.	1905	* The first matching object is returned, or NULL if none.
2052	*/	1906	*/
2053		1907
2054	object *	1908	object *
2055	present (unsigned char type, mapstruct *m, int x, int y)	1909	present (unsigned char type, maptile *m, int x, int y)
2056	{	1910	{
2057	object *	1911	object *
2058	tmp;	1912	tmp;
2059		1913
2060	if (out_of_map (m, x, y))	1914	if (out_of_map (m, x, y))
…		…
2200	* 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
2201	* customized, changed states, etc.	2055	* customized, changed states, etc.
2202	*/	2056	*/
2203		2057
2204	int	2058	int
2205	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)
2206	{	2060	{
2207	int	2061	int
2208	i,	2062	i,
2209	index = 0, flag;	2063	index = 0, flag;
2210	static int	2064	static int
…		…
2222	* 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
2223	* 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
2224	* to only the spaces immediately surrounding the target area, and	2078	* to only the spaces immediately surrounding the target area, and
2225	* won't look 2 spaces south of the target space.	2079	* won't look 2 spaces south of the target space.
2226	*/	2080	*/
2227	else if ((flag & AB_NO_PASS) && maxfree[i] < stop)	2081	else if ((flag & P_NO_PASS) && maxfree[i] < stop)
2228	stop = maxfree[i];	2082	stop = maxfree[i];
2229	}	2083	}
		2084
2230	if (!index)	2085	if (!index)
2231	return -1;	2086	return -1;
		2087
2232	return altern[RANDOM () % index];	2088	return altern[RANDOM () % index];
2233	}	2089	}
2234		2090
2235	/*	2091	/*
2236	* find_first_free_spot(archetype, mapstruct, x, y) works like	2092	* find_first_free_spot(archetype, maptile, x, y) works like
2237	* find_free_spot(), but it will search max number of squares.	2093	* find_free_spot(), but it will search max number of squares.
2238	* 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.
2239	* 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.
2240	*/	2096	*/
2241		2097
2242	int	2098	int
2243	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)
2244	{	2100	{
2245	int	2101	int
2246	i;	2102	i;
2247		2103
2248	for (i = 0; i < SIZEOFFREE; i++)	2104	for (i = 0; i < SIZEOFFREE; i++)
…		…
2312	* 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
2313	* there is capable of.	2169	* there is capable of.
2314	*/	2170	*/
2315		2171
2316	int	2172	int
2317	find_dir (mapstruct *m, int x, int y, object *exclude)	2173	find_dir (maptile *m, int x, int y, object *exclude)
2318	{	2174	{
2319	int	2175	int
2320	i,	2176	i,
2321	max = SIZEOFFREE, mflags;	2177	max = SIZEOFFREE, mflags;
2322		2178
2323	sint16 nx, ny;	2179	sint16 nx, ny;
2324	object *	2180	object *
2325	tmp;	2181	tmp;
2326	mapstruct *	2182	maptile *
2327	mp;	2183	mp;
2328		2184
2329	MoveType blocked, move_type;	2185	MoveType blocked, move_type;
2330		2186
2331	if (exclude && exclude->head)	2187	if (exclude && exclude->head)
…		…
2344	mp = m;	2200	mp = m;
2345	nx = x + freearr_x[i];	2201	nx = x + freearr_x[i];
2346	ny = y + freearr_y[i];	2202	ny = y + freearr_y[i];
2347		2203
2348	mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);	2204	mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);
		2205
2349	if (mflags & P_OUT_OF_MAP)	2206	if (mflags & P_OUT_OF_MAP)
2350	{
2351	max = maxfree[i];	2207	max = maxfree[i];
2352	}
2353	else	2208	else
2354	{	2209	{
2355	blocked = GET_MAP_MOVE_BLOCK (mp, nx, ny);	2210	blocked = GET_MAP_MOVE_BLOCK (mp, nx, ny);
2356		2211
2357	if ((move_type & blocked) == move_type)	2212	if ((move_type & blocked) == move_type)
2358	{
2359	max = maxfree[i];	2213	max = maxfree[i];
2360	}
2361	else if (mflags & P_IS_ALIVE)	2214	else if (mflags & P_IS_ALIVE)
2362	{	2215	{
2363	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)
2364	{
2365	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)))
2366	{
2367	break;	2218	break;
2368	}	2219
2369	}
2370	if (tmp)	2220	if (tmp)
2371	{
2372	return freedir[i];	2221	return freedir[i];
2373	}
2374	}	2222	}
2375	}	2223	}
2376	}	2224	}
		2225
2377	return 0;	2226	return 0;
2378	}	2227	}
2379		2228
2380	/*	2229	/*
2381	* distance(object 1, object 2) will return the square of the	2230	* distance(object 1, object 2) will return the square of the
…		…
2383	*/	2232	*/
2384		2233
2385	int	2234	int
2386	distance (const object *ob1, const object *ob2)	2235	distance (const object *ob1, const object *ob2)
2387	{	2236	{
2388	int	2237	int i;
2389	i;
2390		2238
2391	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);
2392	return i;	2240	return i;
2393	}	2241	}
2394		2242
…		…
2399	*/	2247	*/
2400		2248
2401	int	2249	int
2402	find_dir_2 (int x, int y)	2250	find_dir_2 (int x, int y)
2403	{	2251	{
2404	int	2252	int q;
2405	q;
2406		2253
2407	if (y)	2254	if (y)
2408	q = x * 100 / y;	2255	q = x * 100 / y;
2409	else if (x)	2256	else if (x)
2410	q = -300 * x;	2257	q = -300 * x;
…		…
2536	* find a path to that monster that we found. If not,	2383	* find a path to that monster that we found. If not,
2537	* we don't bother going toward it. Returns 1 if we	2384	* we don't bother going toward it. Returns 1 if we
2538	* can see a direct way to get it	2385	* can see a direct way to get it
2539	* Modified to be map tile aware -.MSW	2386	* Modified to be map tile aware -.MSW
2540	*/	2387	*/
2541
2542
2543	int	2388	int
2544	can_see_monsterP (mapstruct *m, int x, int y, int dir)	2389	can_see_monsterP (maptile *m, int x, int y, int dir)
2545	{	2390	{
2546	sint16 dx, dy;	2391	sint16 dx, dy;
2547	int
2548	mflags;	2392	int mflags;
2549		2393
2550	if (dir < 0)	2394	if (dir < 0)
2551	return 0; /* exit condition: invalid direction */	2395	return 0; /* exit condition: invalid direction */
2552		2396
2553	dx = x + freearr_x[dir];	2397	dx = x + freearr_x[dir];
…		…
2566	return 0;	2410	return 0;
2567		2411
2568	/* yes, can see. */	2412	/* yes, can see. */
2569	if (dir < 9)	2413	if (dir < 9)
2570	return 1;	2414	return 1;
		2415
2571	return can_see_monsterP (m, x, y, reduction_dir[dir][0]) |	2416	return can_see_monsterP (m, x, y, reduction_dir[dir][0])
2572	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]);
2573	}	2419	}
2574
2575
2576		2420
2577	/*	2421	/*
2578	* 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
2579	* picked up by the picker. Returnes 1 if it can be	2423	* picked up by the picker. Returnes 1 if it can be
2580	* picked up, otherwise 0.	2424	* picked up, otherwise 0.
…		…
2591	return /*QUERY_FLAG(who,FLAG_WIZ)|| */	2435	return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2592	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&	2436	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
2593	!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));
2594	}	2438	}
2595		2439
2596
2597	/*	2440	/*
2598	* create clone from object to another	2441	* create clone from object to another
2599	*/	2442	*/
2600	object *	2443	object *
2601	object_create_clone (object *asrc)	2444	object_create_clone (object *asrc)
2602	{	2445	{
2603	object *
2604	dst = NULL, *tmp, *src, *part, *prev, *item;	2446	object *dst = 0, *tmp, *src, *part, *prev, *item;
2605		2447
2606	if (!asrc)	2448	if (!asrc)
2607	return NULL;	2449	return 0;
		2450
2608	src = asrc;	2451	src = asrc;
2609	if (src->head)	2452	if (src->head)
2610	src = src->head;	2453	src = src->head;
2611		2454
2612	prev = NULL;	2455	prev = 0;
2613	for (part = src; part; part = part->more)	2456	for (part = src; part; part = part->more)
2614	{	2457	{
2615	tmp = get_object ();	2458	tmp = part->clone ();
2616	copy_object (part, tmp);
2617	tmp->x -= src->x;	2459	tmp->x -= src->x;
2618	tmp->y -= src->y;	2460	tmp->y -= src->y;
		2461
2619	if (!part->head)	2462	if (!part->head)
2620	{	2463	{
2621	dst = tmp;	2464	dst = tmp;
2622	tmp->head = NULL;	2465	tmp->head = 0;
2623	}	2466	}
2624	else	2467	else
2625	{
2626	tmp->head = dst;	2468	tmp->head = dst;
2627	}	2469
2628	tmp->more = NULL;	2470	tmp->more = 0;
		2471
2629	if (prev)	2472	if (prev)
2630	prev->more = tmp;	2473	prev->more = tmp;
		2474
2631	prev = tmp;	2475	prev = tmp;
2632	}	2476	}
2633		2477
2634	for (item = src->inv; item; item = item->below)	2478	for (item = src->inv; item; item = item->below)
2635	insert_ob_in_ob (object_create_clone (item), dst);	2479	insert_ob_in_ob (object_create_clone (item), dst);
…		…
2661	}	2505	}
2662		2506
2663	fprintf (tempfile, obstr);	2507	fprintf (tempfile, obstr);
2664	fclose (tempfile);	2508	fclose (tempfile);
2665		2509
2666	op = get_object ();	2510	op = object::create ();
2667		2511
2668	object_thawer thawer (filename);	2512	object_thawer thawer (filename);
2669		2513
2670	if (thawer)	2514	if (thawer)
2671	load_object (thawer, op, 0);	2515	load_object (thawer, op, 0);

Diff Legend

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