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.50 by root, Sat Sep 16 22:40:22 2006 UTC vs.
Revision 1.78 by root, Fri Dec 22 16:34:00 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.
…		…
553	}	467	}
554		468
555	op->key_values = 0;	469	op->key_values = 0;
556	}	470	}
557		471
558	void object::clear ()
559	{
560	attachable_base::clear ();
561
562	free_key_values (this);
563
564	owner = 0;
565	name = 0;
566	name_pl = 0;
567	title = 0;
568	race = 0;
569	slaying = 0;
570	skill = 0;
571	msg = 0;
572	lore = 0;
573	custom_name = 0;
574	materialname = 0;
575	contr = 0;
576	below = 0;
577	above = 0;
578	inv = 0;
579	container = 0;
580	env = 0;
581	more = 0;
582	head = 0;
583	map = 0;
584	active_next = 0;
585	active_prev = 0;
586
587	memset (static_cast<object_pod *>(this), 0, sizeof (object_pod));
588
589	SET_FLAG (this, FLAG_REMOVED);
590
591	/* What is not cleared is next, prev, and count */
592
593	expmul = 1.0;
594	face = blank_face;
595
596	if (settings.casting_time)
597	casting_time = -1;
598	}
599
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	/*	472	/*
610	* copy object first frees everything allocated by the second object,	473	* copy_to first frees everything allocated by the dst object,
611	* and then copies the contends of the first object into the second	474	* and then copies the contents of itself into the second
612	* object, allocating what needs to be allocated. Basically, any	475	* object, allocating what needs to be allocated. Basically, any
613	* 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,
614	* 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
615	* will point at garbage.	478	* will point at garbage.
616	*/	479	*/
617	void	480	void
618	copy_object (object *op2, object *op)	481	object::copy_to (object *dst)
619	{	482	{
620	bool is_freed = QUERY_FLAG (op, FLAG_FREED);	483	bool is_freed = QUERY_FLAG (dst, FLAG_FREED);
621	bool is_removed = QUERY_FLAG (op, FLAG_REMOVED);	484	bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED);
622		485
623	op2->clone (op);	486	*(object_copy *)dst = *this;
		487	*(object_pod *)dst = *this;
		488
		489	if (self || cb)
		490	INVOKE_OBJECT (CLONE, this, ARG_OBJECT (dst));
624		491
625	if (is_freed)	492	if (is_freed)
626	SET_FLAG (op, FLAG_FREED);	493	SET_FLAG (dst, FLAG_FREED);
		494
627	if (is_removed)	495	if (is_removed)
628	SET_FLAG (op, FLAG_REMOVED);	496	SET_FLAG (dst, FLAG_REMOVED);
629		497
630	if (op2->speed < 0)	498	if (speed < 0)
631	op->speed_left = op2->speed_left - RANDOM () % 200 / 100.0;	499	dst->speed_left = speed_left - RANDOM () % 200 / 100.0;
632		500
633	/* Copy over key_values, if any. */	501	/* Copy over key_values, if any. */
634	if (op2->key_values)	502	if (key_values)
635	{	503	{
636	key_value *tail = 0;	504	key_value *tail = 0;
637	key_value *i;	505	key_value *i;
638		506
639	op->key_values = 0;	507	dst->key_values = 0;
640		508
641	for (i = op2->key_values; i; i = i->next)	509	for (i = key_values; i; i = i->next)
642	{	510	{
643	key_value *new_link = new key_value;	511	key_value *new_link = new key_value;
644		512
645	new_link->next = 0;	513	new_link->next = 0;
646	new_link->key = i->key;	514	new_link->key = i->key;
647	new_link->value = i->value;	515	new_link->value = i->value;
648		516
649	/* Try and be clever here, too. */	517	/* Try and be clever here, too. */
650	if (!op->key_values)	518	if (!dst->key_values)
651	{	519	{
652	op->key_values = new_link;	520	dst->key_values = new_link;
653	tail = new_link;	521	tail = new_link;
654	}	522	}
655	else	523	else
656	{	524	{
657	tail->next = new_link;	525	tail->next = new_link;
658	tail = new_link;	526	tail = new_link;
659	}	527	}
660	}	528	}
661	}	529	}
662		530
663	update_ob_speed (op);	531	update_ob_speed (dst);
		532	}
		533
		534	object *
		535	object::clone ()
		536	{
		537	object *neu = create ();
		538	copy_to (neu);
		539	return neu;
664	}	540	}
665		541
666	/*	542	/*
667	* If an object with the IS_TURNABLE() flag needs to be turned due	543	* 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	544	* to the closest player being on the other side, this function can
…		…
776	op->active_next = NULL;	652	op->active_next = NULL;
777	op->active_prev = NULL;	653	op->active_prev = NULL;
778	}	654	}
779		655
780	/*	656	/*
781	* update_object() updates the array which represents the map.	657	* update_object() updates the the map.
782	* It takes into account invisible objects (and represent squares covered	658	* It takes into account invisible objects (and represent squares covered
783	* by invisible objects by whatever is below them (unless it's another	659	* by invisible objects by whatever is below them (unless it's another
784	* invisible object, etc...)	660	* invisible object, etc...)
785	* If the object being updated is beneath a player, the look-window	661	* 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	662	* of that player is updated (this might be a suboptimal way of
787	* updating that window, though, since update_object() is called _often_)	663	* updating that window, though, since update_object() is called _often_)
788	*	664	*
789	* action is a hint of what the caller believes need to be done.	665	* 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:	666	* current action are:
795	* UP_OBJ_INSERT: op was inserted	667	* UP_OBJ_INSERT: op was inserted
796	* UP_OBJ_REMOVE: op was removed	668	* UP_OBJ_REMOVE: op was removed
797	* UP_OBJ_CHANGE: object has somehow changed. In this case, we always update	669	* 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.	670	* as that is easier than trying to look at what may have changed.
799	* UP_OBJ_FACE: only the objects face has changed.	671	* UP_OBJ_FACE: only the objects face has changed.
800	*/	672	*/
801
802	void	673	void
803	update_object (object *op, int action)	674	update_object (object *op, int action)
804	{	675	{
805	int update_now = 0, flags;
806	MoveType move_on, move_off, move_block, move_slow;	676	MoveType move_on, move_off, move_block, move_slow;
807		677
808	if (op == NULL)	678	if (op == NULL)
809	{	679	{
810	/* this should never happen */	680	/* this should never happen */
811	LOG (llevDebug, "update_object() called for NULL object.\n");	681	LOG (llevDebug, "update_object() called for NULL object.\n");
812	return;	682	return;
813	}	683	}
814		684
815	if (op->env != NULL)	685	if (op->env)
816	{	686	{
817	/* Animation is currently handled by client, so nothing	687	/* Animation is currently handled by client, so nothing
818	* to do in this case.	688	* to do in this case.
819	*/	689	*/
820	return;	690	return;
…		…
834	abort ();	704	abort ();
835	#endif	705	#endif
836	return;	706	return;
837	}	707	}
838		708
839	flags = GET_MAP_FLAGS (op->map, op->x, op->y);	709	mapspace &m = op->ms ();
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		710
		711	if (m.flags_ & P_NEED_UPDATE)
		712	/* nop */;
846	if (action == UP_OBJ_INSERT)	713	else if (action == UP_OBJ_INSERT)
847	{	714	{
		715	// this is likely overkill, TODO: revisit (schmorp)
848	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(flags & P_BLOCKSVIEW))	716	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))	717	|| (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))
852	update_now = 1;	718	|| (op->type == PLAYER && !(m.flags_ & P_PLAYER))
853		719	|| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
		720	|| (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))
854	if (QUERY_FLAG (op, FLAG_DAMNED) && !(flags & P_NO_CLERIC))	721	|| (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)	722	|| (m.move_on | op->move_on ) != m.move_on
864	update_now = 1;
865
866	if ((move_off | op->move_off) != move_off)	723	|| (m.move_off | op->move_off ) != m.move_off
867	update_now = 1;	724	|| (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	725	/* This isn't perfect, but I don't expect a lot of objects to
870	* to have move_allow right now.	726	* to have move_allow right now.
871	*/	727	*/
872	if (((move_block | op->move_block) & ~op->move_allow) != move_block)	728	|| ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block
873	update_now = 1;	729	|| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)
874		730	m.flags_ = P_NEED_UPDATE;
875	if ((move_slow | op->move_slow) != move_slow)
876	update_now = 1;
877	}	731	}
878	/* if the object is being removed, we can't make intelligent	732	/* if the object is being removed, we can't make intelligent
879	* decisions, because remove_ob can't really pass the object	733	* decisions, because remove_ob can't really pass the object
880	* that is being removed.	734	* that is being removed.
881	*/	735	*/
882	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)	736	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
883	update_now = 1;	737	m.flags_ = P_NEED_UPDATE;
884	else if (action == UP_OBJ_FACE)	738	else if (action == UP_OBJ_FACE)
885	/* Nothing to do for that case */ ;	739	/* Nothing to do for that case */ ;
886	else	740	else
887	LOG (llevError, "update_object called with invalid action: %d\n", action);	741	LOG (llevError, "update_object called with invalid action: %d\n", action);
888		742
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)	743	if (op->more)
896	update_object (op->more, action);	744	update_object (op->more, action);
897	}	745	}
898		746
899	object::vector object::mortals;	747	object::vector object::mortals;
900	object::vector object::objects; // not yet used	748	object::vector object::objects; // not yet used
…		…
908	else	756	else
909	{	757	{
910	delete *i;	758	delete *i;
911	mortals.erase (i);	759	mortals.erase (i);
912	}	760	}
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	}	761	}
922		762
923	object::object ()	763	object::object ()
924	{	764	{
925	SET_FLAG (this, FLAG_REMOVED);	765	SET_FLAG (this, FLAG_REMOVED);
…		…
972	* it from the list of used objects, and puts it on the list of	812	* 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.	813	* free objects. The IS_FREED() flag is set in the object.
974	* The object must have been removed by remove_ob() first for	814	* The object must have been removed by remove_ob() first for
975	* this function to succeed.	815	* this function to succeed.
976	*	816	*
977	* If free_inventory is set, free inventory as well. Else drop items in	817	* If destroy_inventory is set, free inventory as well. Else drop items in
978	* inventory to the ground.	818	* inventory to the ground.
979	*/	819	*/
980	void object::free (bool free_inventory)	820	void object::destroy (bool destroy_inventory)
981	{	821	{
982	if (QUERY_FLAG (this, FLAG_FREED))	822	if (QUERY_FLAG (this, FLAG_FREED))
983	return;	823	return;
984		824
985	if (QUERY_FLAG (this, FLAG_FRIENDLY))	825	if (QUERY_FLAG (this, FLAG_FRIENDLY))
986	remove_friendly_object (this);	826	remove_friendly_object (this);
987		827
988	if (!QUERY_FLAG (this, FLAG_REMOVED))	828	if (!QUERY_FLAG (this, FLAG_REMOVED))
989	remove_ob (this);	829	remove ();
990		830
991	SET_FLAG (this, FLAG_FREED);	831	SET_FLAG (this, FLAG_FREED);
992		832
993	if (more)	833	if (more)
994	{	834	{
995	more->free (free_inventory);	835	more->destroy (destroy_inventory);
996	more = 0;	836	more = 0;
997	}	837	}
998		838
999	if (inv)	839	if (inv)
1000	{	840	{
1001	/* Only if the space blocks everything do we not process -	841	/* Only if the space blocks everything do we not process -
1002	* if some form of movement is allowed, let objects	842	* if some form of movement is allowed, let objects
1003	* drop on that space.	843	* drop on that space.
1004	*/	844	*/
1005	if (free_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)	845	if (destroy_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
1006	{	846	{
1007	object *op = inv;	847	object *op = inv;
1008		848
1009	while (op)	849	while (op)
1010	{	850	{
1011	object *tmp = op->below;	851	object *tmp = op->below;
1012	op->free (free_inventory);	852	op->destroy (destroy_inventory);
1013	op = tmp;	853	op = tmp;
1014	}	854	}
1015	}	855	}
1016	else	856	else
1017	{ /* Put objects in inventory onto this space */	857	{ /* Put objects in inventory onto this space */
…		…
1019		859
1020	while (op)	860	while (op)
1021	{	861	{
1022	object *tmp = op->below;	862	object *tmp = op->below;
1023		863
1024	remove_ob (op);	864	op->remove ();
1025		865
1026	if (QUERY_FLAG (op, FLAG_STARTEQUIP)	866	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))	867	|| QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
1028	free_object (op);	868	op->destroy ();
1029	else	869	else
1030	{	870	{
1031	op->x = x;	871	op->x = x;
1032	op->y = y;	872	op->y = y;
1033	insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */	873	insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */
…		…
1036	op = tmp;	876	op = tmp;
1037	}	877	}
1038	}	878	}
1039	}	879	}
1040		880
		881	// hack to ensure that freed objects still have a valid map
		882	{
		883	static maptile *freed_map; // freed objects are moved here to avoid crashes
		884
		885	if (!freed_map)
		886	{
		887	freed_map = new maptile;
		888
		889	freed_map->name = "/internal/freed_objects_map";
		890	freed_map->width = 3;
		891	freed_map->height = 3;
		892
		893	freed_map->allocate ();
		894	}
		895
		896	map = freed_map;
		897	x = 1;
		898	y = 1;
		899	}
		900
1041	// clear those pointers that likely might have circular references to us	901	// clear those pointers that likely might have circular references to us
1042	owner = 0;	902	owner = 0;
1043	enemy = 0;	903	enemy = 0;
1044	attacked_by = 0;	904	attacked_by = 0;
1045		905
		906	// only relevant for players(?), but make sure of it anyways
		907	contr = 0;
		908
1046	/* Remove object from the active list */	909	/* Remove object from the active list */
1047	speed = 0;	910	speed = 0;
1048	update_ob_speed (this);	911	update_ob_speed (this);
1049		912
1050	unlink ();	913	unlink ();
…		…
1054		917
1055	/*	918	/*
1056	* sub_weight() recursively (outwards) subtracts a number from the	919	* sub_weight() recursively (outwards) subtracts a number from the
1057	* weight of an object (and what is carried by it's environment(s)).	920	* weight of an object (and what is carried by it's environment(s)).
1058	*/	921	*/
1059
1060	void	922	void
1061	sub_weight (object *op, signed long weight)	923	sub_weight (object *op, signed long weight)
1062	{	924	{
1063	while (op != NULL)	925	while (op != NULL)
1064	{	926	{
…		…
1068	op->carrying -= weight;	930	op->carrying -= weight;
1069	op = op->env;	931	op = op->env;
1070	}	932	}
1071	}	933	}
1072		934
1073	/* remove_ob(op):	935	/* op->remove ():
1074	* This function removes the object op from the linked list of objects	936	* 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	937	* which it is currently tied to. When this function is done, the
1076	* object will have no environment. If the object previously had an	938	* object will have no environment. If the object previously had an
1077	* environment, the x and y coordinates will be updated to	939	* environment, the x and y coordinates will be updated to
1078	* the previous environment.	940	* the previous environment.
1079	* Beware: This function is called from the editor as well!	941	* Beware: This function is called from the editor as well!
1080	*/	942	*/
1081
1082	void	943	void
1083	remove_ob (object *op)	944	object::remove ()
1084	{	945	{
1085	object *tmp, *last = 0;	946	object *tmp, *last = 0;
1086	object *otmp;	947	object *otmp;
1087		948
1088	int check_walk_off;	949	int check_walk_off;
1089	maptile *m;
1090		950
1091	sint16 x, y;
1092
1093	if (QUERY_FLAG (op, FLAG_REMOVED))	951	if (QUERY_FLAG (this, FLAG_REMOVED))
1094	return;	952	return;
1095		953
1096	SET_FLAG (op, FLAG_REMOVED);	954	SET_FLAG (this, FLAG_REMOVED);
1097		955
1098	if (op->more != NULL)	956	if (more)
1099	remove_ob (op->more);	957	more->remove ();
1100		958
1101	/*	959	/*
1102	* In this case, the object to be removed is in someones	960	* In this case, the object to be removed is in someones
1103	* inventory.	961	* inventory.
1104	*/	962	*/
1105	if (op->env != NULL)	963	if (env)
1106	{	964	{
1107	if (op->nrof)	965	if (nrof)
1108	sub_weight (op->env, op->weight * op->nrof);	966	sub_weight (env, weight * nrof);
1109	else	967	else
1110	sub_weight (op->env, op->weight + op->carrying);	968	sub_weight (env, weight + carrying);
1111		969
1112	/* NO_FIX_PLAYER is set when a great many changes are being	970	/* NO_FIX_PLAYER is set when a great many changes are being
1113	* made to players inventory. If set, avoiding the call	971	* made to players inventory. If set, avoiding the call
1114	* to save cpu time.	972	* to save cpu time.
1115	*/	973	*/
1116	if ((otmp = is_player_inv (op->env)) != NULL && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	974	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1117	fix_player (otmp);	975	otmp->update_stats ();
1118		976
1119	if (op->above != NULL)	977	if (above != NULL)
1120	op->above->below = op->below;	978	above->below = below;
1121	else	979	else
1122	op->env->inv = op->below;	980	env->inv = below;
1123		981
1124	if (op->below != NULL)	982	if (below != NULL)
1125	op->below->above = op->above;	983	below->above = above;
1126		984
1127	/* we set up values so that it could be inserted into	985	/* we set up values so that it could be inserted into
1128	* the map, but we don't actually do that - it is up	986	* the map, but we don't actually do that - it is up
1129	* to the caller to decide what we want to do.	987	* to the caller to decide what we want to do.
1130	*/	988	*/
1131	op->x = op->env->x, op->y = op->env->y;	989	x = env->x, y = env->y;
1132	op->map = op->env->map;	990	map = env->map;
1133	op->above = NULL, op->below = NULL;	991	above = 0, below = 0;
1134	op->env = NULL;	992	env = 0;
1135	}	993	}
1136	else if (op->map)	994	else if (map)
1137	{	995	{
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	996	/* Re did the following section of code - it looks like it had
1158	* lots of logic for things we no longer care about	997	* lots of logic for things we no longer care about
1159	*/	998	*/
1160		999
1161	/* link the object above us */	1000	/* link the object above us */
1162	if (op->above)	1001	if (above)
1163	op->above->below = op->below;	1002	above->below = below;
1164	else	1003	else
1165	SET_MAP_TOP (m, x, y, op->below); /* we were top, set new top */	1004	map->at (x, y).top = below; /* we were top, set new top */
1166		1005
1167	/* Relink the object below us, if there is one */	1006	/* Relink the object below us, if there is one */
1168	if (op->below)	1007	if (below)
1169	op->below->above = op->above;	1008	below->above = above;
1170	else	1009	else
1171	{	1010	{
1172	/* Nothing below, which means we need to relink map object for this space	1011	/* 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	1012	* use translated coordinates in case some oddness with map tiling is
1174	* evident	1013	* evident
1175	*/	1014	*/
1176	if (GET_MAP_OB (m, x, y) != op)	1015	if (GET_MAP_OB (map, x, y) != this)
1177	{	1016	{
1178	dump_object (op);	1017	char *dump = dump_object (this);
1179	LOG (llevError,	1018	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);	1019	"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);
		1020	free (dump);
1181	dump_object (GET_MAP_OB (m, x, y));	1021	dump = dump_object (GET_MAP_OB (map, x, y));
1182	LOG (llevError, "%s\n", errmsg);	1022	LOG (llevError, "%s\n", dump);
		1023	free (dump);
1183	}	1024	}
1184		1025
1185	SET_MAP_OB (m, x, y, op->above); /* goes on above it. */	1026	map->at (x, y).bottom = above; /* goes on above it. */
1186	}	1027	}
1187		1028
1188	op->above = 0;	1029	above = 0;
1189	op->below = 0;	1030	below = 0;
1190		1031
1191	if (op->map->in_memory == MAP_SAVING)	1032	if (map->in_memory == MAP_SAVING)
1192	return;	1033	return;
1193		1034
1194	check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY);	1035	check_walk_off = !QUERY_FLAG (this, FLAG_NO_APPLY);
1195		1036
1196	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1037	for (tmp = GET_MAP_OB (map, x, y); tmp; tmp = tmp->above)
1197	{	1038	{
1198	/* No point updating the players look faces if he is the object	1039	/* No point updating the players look faces if he is the object
1199	* being removed.	1040	* being removed.
1200	*/	1041	*/
1201		1042
1202	if (tmp->type == PLAYER && tmp != op)	1043	if (tmp->type == PLAYER && tmp != this)
1203	{	1044	{
1204	/* If a container that the player is currently using somehow gets	1045	/* If a container that the player is currently using somehow gets
1205	* removed (most likely destroyed), update the player view	1046	* removed (most likely destroyed), update the player view
1206	* appropriately.	1047	* appropriately.
1207	*/	1048	*/
1208	if (tmp->container == op)	1049	if (tmp->container == this)
1209	{	1050	{
1210	CLEAR_FLAG (op, FLAG_APPLIED);	1051	CLEAR_FLAG (this, FLAG_APPLIED);
1211	tmp->container = NULL;	1052	tmp->container = 0;
1212	}	1053	}
1213		1054
1214	tmp->contr->socket.update_look = 1;	1055	tmp->contr->ns->floorbox_update ();
1215	}	1056	}
1216		1057
1217	/* See if player moving off should effect something */	1058	/* See if player moving off should effect something */
1218	if (check_walk_off	1059	if (check_walk_off
1219	&& ((op->move_type & tmp->move_off)	1060	&& ((move_type & tmp->move_off)
1220	&& (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0))	1061	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1221	{	1062	{
1222	move_apply (tmp, op, NULL);	1063	move_apply (tmp, this, 0);
1223		1064
1224	if (op->destroyed ())	1065	if (destroyed ())
1225	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());	1066	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1226	}	1067	}
1227		1068
1228	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */	1069	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1229		1070
1230	if (tmp->above == tmp)	1071	if (tmp->above == tmp)
1231	tmp->above = NULL;	1072	tmp->above = 0;
1232		1073
1233	last = tmp;	1074	last = tmp;
1234	}	1075	}
1235		1076
1236	/* last == NULL of there are no objects on this space */	1077	/* last == NULL of there are no objects on this space */
1237	if (last == NULL)	1078	if (!last)
1238	{	1079	map->at (x, y).flags_ = P_NEED_UPDATE;
1239	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1240	* we could preserve the flags (GET_MAP_FLAGS), but update_position figures
1241	* those out anyways, and if there are any flags set right now, they won't
1242	* be correct anyways.
1243	*/
1244	SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE);
1245	update_position (op->map, op->x, op->y);
1246	}
1247	else	1080	else
1248	update_object (last, UP_OBJ_REMOVE);	1081	update_object (last, UP_OBJ_REMOVE);
1249		1082
1250	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0))	1083	if (QUERY_FLAG (this, FLAG_BLOCKSVIEW) || glow_radius)
1251	update_all_los (op->map, op->x, op->y);	1084	update_all_los (map, x, y);
1252	}	1085	}
1253	}	1086	}
1254		1087
1255	/*	1088	/*
1256	* merge_ob(op,top):	1089	* merge_ob(op,top):
…		…
1271		1104
1272	for (; top != NULL; top = top->below)	1105	for (; top != NULL; top = top->below)
1273	{	1106	{
1274	if (top == op)	1107	if (top == op)
1275	continue;	1108	continue;
1276	if (CAN_MERGE (op, top))	1109
		1110	if (object::can_merge (op, top))
1277	{	1111	{
1278	top->nrof += op->nrof;	1112	top->nrof += op->nrof;
1279		1113
1280	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/	1114	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/
1281	op->weight = 0; /* Don't want any adjustements now */	1115	op->weight = 0; /* Don't want any adjustements now */
1282	remove_ob (op);	1116	op->destroy ();
1283	free_object (op);
1284	return top;	1117	return top;
1285	}	1118	}
1286	}	1119	}
1287		1120
1288	return 0;	1121	return 0;
…		…
1342	return NULL;	1175	return NULL;
1343	}	1176	}
1344		1177
1345	if (m == NULL)	1178	if (m == NULL)
1346	{	1179	{
1347	dump_object (op);	1180	char *dump = dump_object (op);
1348	LOG (llevError, "Trying to insert in null-map!\n%s\n", errmsg);	1181	LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
		1182	free (dump);
1349	return op;	1183	return op;
1350	}	1184	}
1351		1185
1352	if (out_of_map (m, op->x, op->y))	1186	if (out_of_map (m, op->x, op->y))
1353	{	1187	{
1354	dump_object (op);	1188	char *dump = dump_object (op);
1355	LOG (llevError, "Trying to insert object outside the map.\n%s\n", errmsg);	1189	LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump);
1356	#ifdef MANY_CORES	1190	#ifdef MANY_CORES
1357	/* Better to catch this here, as otherwise the next use of this object	1191	/* Better to catch this here, as otherwise the next use of this object
1358	* is likely to cause a crash. Better to find out where it is getting	1192	* is likely to cause a crash. Better to find out where it is getting
1359	* improperly inserted.	1193	* improperly inserted.
1360	*/	1194	*/
1361	abort ();	1195	abort ();
1362	#endif	1196	#endif
		1197	free (dump);
1363	return op;	1198	return op;
1364	}	1199	}
1365		1200
1366	if (!QUERY_FLAG (op, FLAG_REMOVED))	1201	if (!QUERY_FLAG (op, FLAG_REMOVED))
1367	{	1202	{
1368	dump_object (op);	1203	char *dump = dump_object (op);
1369	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", errmsg);	1204	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
		1205	free (dump);
1370	return op;	1206	return op;
1371	}	1207	}
1372		1208
1373	if (op->more != NULL)	1209	if (op->more != NULL)
1374	{	1210	{
…		…
1412		1248
1413	/* this has to be done after we translate the coordinates.	1249	/* this has to be done after we translate the coordinates.
1414	*/	1250	*/
1415	if (op->nrof && !(flag & INS_NO_MERGE))	1251	if (op->nrof && !(flag & INS_NO_MERGE))
1416	for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)	1252	for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)
1417	if (CAN_MERGE (op, tmp))	1253	if (object::can_merge (op, tmp))
1418	{	1254	{
1419	op->nrof += tmp->nrof;	1255	op->nrof += tmp->nrof;
1420	remove_ob (tmp);	1256	tmp->destroy ();
1421	free_object (tmp);
1422	}	1257	}
1423		1258
1424	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1259	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1425	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1260	CLEAR_FLAG (op, FLAG_INV_LOCKED);
1426		1261
…		…
1439	op->below = originator->below;	1274	op->below = originator->below;
1440		1275
1441	if (op->below)	1276	if (op->below)
1442	op->below->above = op;	1277	op->below->above = op;
1443	else	1278	else
1444	SET_MAP_OB (op->map, op->x, op->y, op);	1279	op->ms ().bottom = op;
1445		1280
1446	/* since *below* originator, no need to update top */	1281	/* since *below* originator, no need to update top */
1447	originator->below = op;	1282	originator->below = op;
1448	}	1283	}
1449	else	1284	else
…		…
1495	* If INS_ON_TOP is used, don't do this processing	1330	* If INS_ON_TOP is used, don't do this processing
1496	* Need to find the object that in fact blocks view, otherwise	1331	* Need to find the object that in fact blocks view, otherwise
1497	* stacking is a bit odd.	1332	* stacking is a bit odd.
1498	*/	1333	*/
1499	if (!(flag & INS_ON_TOP) &&	1334	if (!(flag & INS_ON_TOP) &&
1500	(get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_BLOCKSVIEW) && (op->face && !op->face->visibility))	1335	(get_map_flags (op->map, 0, op->x, op->y, 0, 0) & P_BLOCKSVIEW) && (op->face && !op->face->visibility))
1501	{	1336	{
1502	for (last = top; last != floor; last = last->below)	1337	for (last = top; last != floor; last = last->below)
1503	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1338	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1504	break;	1339	break;
1505	/* Check to see if we found the object that blocks view,	1340	/* Check to see if we found the object that blocks view,
…		…
1528		1363
1529	if (op->above)	1364	if (op->above)
1530	op->above->below = op;	1365	op->above->below = op;
1531		1366
1532	op->below = NULL;	1367	op->below = NULL;
1533	SET_MAP_OB (op->map, op->x, op->y, op);	1368	op->ms ().bottom = op;
1534	}	1369	}
1535	else	1370	else
1536	{ /* get inserted into the stack above top */	1371	{ /* get inserted into the stack above top */
1537	op->above = top->above;	1372	op->above = top->above;
1538		1373
…		…
1542	op->below = top;	1377	op->below = top;
1543	top->above = op;	1378	top->above = op;
1544	}	1379	}
1545		1380
1546	if (op->above == NULL)	1381	if (op->above == NULL)
1547	SET_MAP_TOP (op->map, op->x, op->y, op);	1382	op->ms ().top = op;
1548	} /* else not INS_BELOW_ORIGINATOR */	1383	} /* else not INS_BELOW_ORIGINATOR */
1549		1384
1550	if (op->type == PLAYER)	1385	if (op->type == PLAYER)
1551	op->contr->do_los = 1;	1386	op->contr->do_los = 1;
1552		1387
1553	/* If we have a floor, we know the player, if any, will be above	1388	/* If we have a floor, we know the player, if any, will be above
1554	* it, so save a few ticks and start from there.	1389	* it, so save a few ticks and start from there.
1555	*/	1390	*/
1556	if (!(flag & INS_MAP_LOAD))	1391	if (!(flag & INS_MAP_LOAD))
1557	for (tmp = floor ? floor : GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1392	if (object *pl = op->ms ().player ())
1558	if (tmp->type == PLAYER)	1393	pl->contr->ns->floorbox_update ();
1559	tmp->contr->socket.update_look = 1;
1560		1394
1561	/* If this object glows, it may affect lighting conditions that are	1395	/* If this object glows, it may affect lighting conditions that are
1562	* visible to others on this map. But update_all_los is really	1396	* visible to others on this map. But update_all_los is really
1563	* an inefficient way to do this, as it means los for all players	1397	* an inefficient way to do this, as it means los for all players
1564	* on the map will get recalculated. The players could very well	1398	* on the map will get recalculated. The players could very well
…		…
1572		1406
1573	/* updates flags (blocked, alive, no magic, etc) for this map space */	1407	/* updates flags (blocked, alive, no magic, etc) for this map space */
1574	update_object (op, UP_OBJ_INSERT);	1408	update_object (op, UP_OBJ_INSERT);
1575		1409
1576	/* Don't know if moving this to the end will break anything. However,	1410	/* Don't know if moving this to the end will break anything. However,
1577	* we want to have update_look set above before calling this.	1411	* we want to have floorbox_update called before calling this.
1578	*	1412	*
1579	* check_move_on() must be after this because code called from	1413	* check_move_on() must be after this because code called from
1580	* check_move_on() depends on correct map flags (so functions like	1414	* check_move_on() depends on correct map flags (so functions like
1581	* blocked() and wall() work properly), and these flags are updated by	1415	* blocked() and wall() work properly), and these flags are updated by
1582	* update_object().	1416	* update_object().
…		…
1598		1432
1599	return op;	1433	return op;
1600	}	1434	}
1601		1435
1602	/* this function inserts an object in the map, but if it	1436	/* this function inserts an object in the map, but if it
1603	* finds an object of its own type, it'll remove that one first.	1437	* finds an object of its own type, it'll remove that one first.
1604	* op is the object to insert it under: supplies x and the map.	1438	* op is the object to insert it under: supplies x and the map.
1605	*/	1439	*/
1606	void	1440	void
1607	replace_insert_ob_in_map (const char *arch_string, object *op)	1441	replace_insert_ob_in_map (const char *arch_string, object *op)
1608	{	1442	{
1609	object *	1443	object *tmp, *tmp1;
1610	tmp;
1611	object *
1612	tmp1;
1613		1444
1614	/* first search for itself and remove any old instances */	1445	/* first search for itself and remove any old instances */
1615		1446
1616	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1447	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
1617	{
1618	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */	1448	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */
1619	{	1449	tmp->destroy ();
1620	remove_ob (tmp);
1621	free_object (tmp);
1622	}
1623	}
1624		1450
1625	tmp1 = arch_to_object (archetype::find (arch_string));	1451	tmp1 = arch_to_object (archetype::find (arch_string));
1626		1452
1627	tmp1->x = op->x;	1453	tmp1->x = op->x;
1628	tmp1->y = op->y;	1454	tmp1->y = op->y;
…		…
1638	*/	1464	*/
1639		1465
1640	object *	1466	object *
1641	get_split_ob (object *orig_ob, uint32 nr)	1467	get_split_ob (object *orig_ob, uint32 nr)
1642	{	1468	{
1643	object *	1469	object *newob;
1644	newob;
1645	int
1646	is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);	1470	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1647		1471
1648	if (orig_ob->nrof < nr)	1472	if (orig_ob->nrof < nr)
1649	{	1473	{
1650	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);	1474	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1651	return NULL;	1475	return NULL;
1652	}	1476	}
1653		1477
1654	newob = object_create_clone (orig_ob);	1478	newob = object_create_clone (orig_ob);
1655		1479
1656	if ((orig_ob->nrof -= nr) < 1)	1480	if ((orig_ob->nrof -= nr) < 1)
1657	{	1481	orig_ob->destroy (1);
1658	if (!is_removed)
1659	remove_ob (orig_ob);
1660	free_object2 (orig_ob, 1);
1661	}
1662	else if (!is_removed)	1482	else if (!is_removed)
1663	{	1483	{
1664	if (orig_ob->env != NULL)	1484	if (orig_ob->env != NULL)
1665	sub_weight (orig_ob->env, orig_ob->weight * nr);	1485	sub_weight (orig_ob->env, orig_ob->weight * nr);
1666	if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)	1486	if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)
…		…
1696	if (i > op->nrof)	1516	if (i > op->nrof)
1697	i = op->nrof;	1517	i = op->nrof;
1698		1518
1699	if (QUERY_FLAG (op, FLAG_REMOVED))	1519	if (QUERY_FLAG (op, FLAG_REMOVED))
1700	op->nrof -= i;	1520	op->nrof -= i;
1701	else if (op->env != NULL)	1521	else if (op->env)
1702	{	1522	{
1703	/* is this object in the players inventory, or sub container	1523	/* is this object in the players inventory, or sub container
1704	* therein?	1524	* therein?
1705	*/	1525	*/
1706	tmp = is_player_inv (op->env);	1526	tmp = op->in_player ();
1707	/* nope. Is this a container the player has opened?	1527	/* nope. Is this a container the player has opened?
1708	* If so, set tmp to that player.	1528	* If so, set tmp to that player.
1709	* IMO, searching through all the players will mostly	1529	* IMO, searching through all the players will mostly
1710	* likely be quicker than following op->env to the map,	1530	* likely be quicker than following op->env to the map,
1711	* and then searching the map for a player.	1531	* and then searching the map for a player.
1712	*/	1532	*/
1713	if (!tmp)	1533	if (!tmp)
1714	{	1534	{
1715	for (pl = first_player; pl; pl = pl->next)	1535	for (pl = first_player; pl; pl = pl->next)
1716	if (pl->ob->container == op->env)	1536	if (pl->ob->container == op->env)
		1537	{
		1538	tmp = pl->ob;
1717	break;	1539	break;
1718	if (pl)	1540	}
1719	tmp = pl->ob;
1720	else
1721	tmp = NULL;
1722	}	1541	}
1723		1542
1724	if (i < op->nrof)	1543	if (i < op->nrof)
1725	{	1544	{
1726	sub_weight (op->env, op->weight * i);	1545	sub_weight (op->env, op->weight * i);
1727	op->nrof -= i;	1546	op->nrof -= i;
1728	if (tmp)	1547	if (tmp)
1729	{
1730	esrv_send_item (tmp, op);	1548	esrv_send_item (tmp, op);
1731	}
1732	}	1549	}
1733	else	1550	else
1734	{	1551	{
1735	remove_ob (op);	1552	op->remove ();
1736	op->nrof = 0;	1553	op->nrof = 0;
1737	if (tmp)	1554	if (tmp)
1738	{
1739	esrv_del_item (tmp->contr, op->count);	1555	esrv_del_item (tmp->contr, op->count);
1740	}
1741	}	1556	}
1742	}	1557	}
1743	else	1558	else
1744	{	1559	{
1745	object *above = op->above;	1560	object *above = op->above;
1746		1561
1747	if (i < op->nrof)	1562	if (i < op->nrof)
1748	op->nrof -= i;	1563	op->nrof -= i;
1749	else	1564	else
1750	{	1565	{
1751	remove_ob (op);	1566	op->remove ();
1752	op->nrof = 0;	1567	op->nrof = 0;
1753	}	1568	}
1754		1569
1755	/* Since we just removed op, op->above is null */	1570	/* Since we just removed op, op->above is null */
1756	for (tmp = above; tmp != NULL; tmp = tmp->above)	1571	for (tmp = above; tmp; tmp = tmp->above)
1757	if (tmp->type == PLAYER)	1572	if (tmp->type == PLAYER)
1758	{	1573	{
1759	if (op->nrof)	1574	if (op->nrof)
1760	esrv_send_item (tmp, op);	1575	esrv_send_item (tmp, op);
1761	else	1576	else
…		…
1765		1580
1766	if (op->nrof)	1581	if (op->nrof)
1767	return op;	1582	return op;
1768	else	1583	else
1769	{	1584	{
1770	free_object (op);	1585	op->destroy ();
1771	return NULL;	1586	return 0;
1772	}	1587	}
1773	}	1588	}
1774		1589
1775	/*	1590	/*
1776	* add_weight(object, weight) adds the specified weight to an object,	1591	* add_weight(object, weight) adds the specified weight to an object,
…		…
1788	op->carrying += weight;	1603	op->carrying += weight;
1789	op = op->env;	1604	op = op->env;
1790	}	1605	}
1791	}	1606	}
1792		1607
		1608	object *
		1609	insert_ob_in_ob (object *op, object *where)
		1610	{
		1611	if (!where)
		1612	{
		1613	char *dump = dump_object (op);
		1614	LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
		1615	free (dump);
		1616	return op;
		1617	}
		1618
		1619	if (where->head)
		1620	{
		1621	LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n");
		1622	where = where->head;
		1623	}
		1624
		1625	return where->insert (op);
		1626	}
		1627
1793	/*	1628	/*
1794	* insert_ob_in_ob(op,environment):	1629	* env->insert (op)
1795	* This function inserts the object op in the linked list	1630	* This function inserts the object op in the linked list
1796	* inside the object environment.	1631	* inside the object environment.
1797	*	1632	*
1798	* Eneq(@csd.uu.se): Altered insert_ob_in_ob to make things picked up enter
1799	* the inventory at the last position or next to other objects of the same
1800	* type.
1801	* Frank: Now sorted by type, archetype and magic!
1802	*
1803	* The function returns now pointer to inserted item, and return value can	1633	* The function returns now pointer to inserted item, and return value can
1804	* be != op, if items are merged. -Tero	1634	* be != op, if items are merged. -Tero
1805	*/	1635	*/
1806		1636
1807	object *	1637	object *
1808	insert_ob_in_ob (object *op, object *where)	1638	object::insert (object *op)
1809	{	1639	{
1810	object *	1640	object *tmp, *otmp;
1811	tmp, *
1812	otmp;
1813		1641
1814	if (!QUERY_FLAG (op, FLAG_REMOVED))	1642	if (!QUERY_FLAG (op, FLAG_REMOVED))
1815	{	1643	op->remove ();
1816	dump_object (op);
1817	LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", errmsg);
1818	return op;
1819	}
1820
1821	if (where == NULL)
1822	{
1823	dump_object (op);
1824	LOG (llevError, "Trying to put object in NULL.\n%s\n", errmsg);
1825	return op;
1826	}
1827
1828	if (where->head)
1829	{
1830	LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n");
1831	where = where->head;
1832	}
1833		1644
1834	if (op->more)	1645	if (op->more)
1835	{	1646	{
1836	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);	1647	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1837	return op;	1648	return op;
…		…
1839		1650
1840	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1651	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1841	CLEAR_FLAG (op, FLAG_REMOVED);	1652	CLEAR_FLAG (op, FLAG_REMOVED);
1842	if (op->nrof)	1653	if (op->nrof)
1843	{	1654	{
1844	for (tmp = where->inv; tmp != NULL; tmp = tmp->below)	1655	for (tmp = inv; tmp != NULL; tmp = tmp->below)
1845	if (CAN_MERGE (tmp, op))	1656	if (object::can_merge (tmp, op))
1846	{	1657	{
1847	/* return the original object and remove inserted object	1658	/* return the original object and remove inserted object
1848	(client needs the original object) */	1659	(client needs the original object) */
1849	tmp->nrof += op->nrof;	1660	tmp->nrof += op->nrof;
1850	/* Weight handling gets pretty funky. Since we are adding to	1661	/* Weight handling gets pretty funky. Since we are adding to
1851	* tmp->nrof, we need to increase the weight.	1662	* tmp->nrof, we need to increase the weight.
1852	*/	1663	*/
1853	add_weight (where, op->weight * op->nrof);	1664	add_weight (this, op->weight * op->nrof);
1854	SET_FLAG (op, FLAG_REMOVED);	1665	SET_FLAG (op, FLAG_REMOVED);
1855	free_object (op); /* free the inserted object */	1666	op->destroy (); /* free the inserted object */
1856	op = tmp;	1667	op = tmp;
1857	remove_ob (op); /* and fix old object's links */	1668	op->remove (); /* and fix old object's links */
1858	CLEAR_FLAG (op, FLAG_REMOVED);	1669	CLEAR_FLAG (op, FLAG_REMOVED);
1859	break;	1670	break;
1860	}	1671	}
1861		1672
1862	/* I assume combined objects have no inventory	1673	/* I assume combined objects have no inventory
1863	* We add the weight - this object could have just been removed	1674	* We add the weight - this object could have just been removed
1864	* (if it was possible to merge). calling remove_ob will subtract	1675	* (if it was possible to merge). calling remove_ob will subtract
1865	* the weight, so we need to add it in again, since we actually do	1676	* the weight, so we need to add it in again, since we actually do
1866	* the linking below	1677	* the linking below
1867	*/	1678	*/
1868	add_weight (where, op->weight * op->nrof);	1679	add_weight (this, op->weight * op->nrof);
1869	}	1680	}
1870	else	1681	else
1871	add_weight (where, (op->weight + op->carrying));	1682	add_weight (this, (op->weight + op->carrying));
1872		1683
1873	otmp = is_player_inv (where);	1684	otmp = this->in_player ();
1874	if (otmp && otmp->contr != NULL)	1685	if (otmp && otmp->contr)
1875	{
1876	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1686	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1877	fix_player (otmp);	1687	otmp->update_stats ();
1878	}
1879		1688
1880	op->map = NULL;	1689	op->map = 0;
1881	op->env = where;	1690	op->env = this;
1882	op->above = NULL;	1691	op->above = 0;
1883	op->below = NULL;	1692	op->below = 0;
1884	op->x = 0, op->y = 0;	1693	op->x = 0, op->y = 0;
1885		1694
1886	/* reset the light list and los of the players on the map */	1695	/* reset the light list and los of the players on the map */
1887	if ((op->glow_radius != 0) && where->map)	1696	if ((op->glow_radius != 0) && map)
1888	{	1697	{
1889	#ifdef DEBUG_LIGHTS	1698	#ifdef DEBUG_LIGHTS
1890	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);	1699	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1891	#endif /* DEBUG_LIGHTS */	1700	#endif /* DEBUG_LIGHTS */
1892	if (MAP_DARKNESS (where->map))	1701	if (MAP_DARKNESS (map))
1893	update_all_los (where->map, where->x, where->y);	1702	update_all_los (map, x, y);
1894	}	1703	}
1895		1704
1896	/* Client has no idea of ordering so lets not bother ordering it here.	1705	/* Client has no idea of ordering so lets not bother ordering it here.
1897	* It sure simplifies this function...	1706	* It sure simplifies this function...
1898	*/	1707	*/
1899	if (where->inv == NULL)	1708	if (!inv)
1900	where->inv = op;	1709	inv = op;
1901	else	1710	else
1902	{	1711	{
1903	op->below = where->inv;	1712	op->below = inv;
1904	op->below->above = op;	1713	op->below->above = op;
1905	where->inv = op;	1714	inv = op;
1906	}	1715	}
		1716
1907	return op;	1717	return op;
1908	}	1718	}
1909		1719
1910	/*	1720	/*
1911	* Checks if any objects has a move_type that matches objects	1721	* Checks if any objects has a move_type that matches objects
…		…
2224	* if the space being examined only has a wall to the north and empty	2034	* if the space being examined only has a wall to the north and empty
2225	* spaces in all the other directions, this will reduce the search space	2035	* spaces in all the other directions, this will reduce the search space
2226	* to only the spaces immediately surrounding the target area, and	2036	* to only the spaces immediately surrounding the target area, and
2227	* won't look 2 spaces south of the target space.	2037	* won't look 2 spaces south of the target space.
2228	*/	2038	*/
2229	else if ((flag & AB_NO_PASS) && maxfree[i] < stop)	2039	else if ((flag & P_NO_PASS) && maxfree[i] < stop)
2230	stop = maxfree[i];	2040	stop = maxfree[i];
2231	}	2041	}
		2042
2232	if (!index)	2043	if (!index)
2233	return -1;	2044	return -1;
		2045
2234	return altern[RANDOM () % index];	2046	return altern[RANDOM () % index];
2235	}	2047	}
2236		2048
2237	/*	2049	/*
2238	* find_first_free_spot(archetype, maptile, x, y) works like	2050	* find_first_free_spot(archetype, maptile, x, y) works like
…		…
2346	mp = m;	2158	mp = m;
2347	nx = x + freearr_x[i];	2159	nx = x + freearr_x[i];
2348	ny = y + freearr_y[i];	2160	ny = y + freearr_y[i];
2349		2161
2350	mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);	2162	mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);
		2163
2351	if (mflags & P_OUT_OF_MAP)	2164	if (mflags & P_OUT_OF_MAP)
2352	{
2353	max = maxfree[i];	2165	max = maxfree[i];
2354	}
2355	else	2166	else
2356	{	2167	{
2357	blocked = GET_MAP_MOVE_BLOCK (mp, nx, ny);	2168	blocked = GET_MAP_MOVE_BLOCK (mp, nx, ny);
2358		2169
2359	if ((move_type & blocked) == move_type)	2170	if ((move_type & blocked) == move_type)
2360	{
2361	max = maxfree[i];	2171	max = maxfree[i];
2362	}
2363	else if (mflags & P_IS_ALIVE)	2172	else if (mflags & P_IS_ALIVE)
2364	{	2173	{
2365	for (tmp = GET_MAP_OB (mp, nx, ny); tmp != NULL; tmp = tmp->above)	2174	for (tmp = GET_MAP_OB (mp, nx, ny); tmp; tmp = tmp->above)
2366	{
2367	if ((QUERY_FLAG (tmp, FLAG_MONSTER) || tmp->type == PLAYER) && (tmp != exclude || (tmp->head && tmp->head != exclude)))	2175	if ((QUERY_FLAG (tmp, FLAG_MONSTER) || tmp->type == PLAYER) && (tmp != exclude || (tmp->head && tmp->head != exclude)))
2368	{
2369	break;	2176	break;
2370	}	2177
2371	}
2372	if (tmp)	2178	if (tmp)
2373	{
2374	return freedir[i];	2179	return freedir[i];
2375	}
2376	}	2180	}
2377	}	2181	}
2378	}	2182	}
		2183
2379	return 0;	2184	return 0;
2380	}	2185	}
2381		2186
2382	/*	2187	/*
2383	* distance(object 1, object 2) will return the square of the	2188	* distance(object 1, object 2) will return the square of the
…		…
2385	*/	2190	*/
2386		2191
2387	int	2192	int
2388	distance (const object *ob1, const object *ob2)	2193	distance (const object *ob1, const object *ob2)
2389	{	2194	{
2390	int	2195	int i;
2391	i;
2392		2196
2393	i = (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);	2197	i = (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);
2394	return i;	2198	return i;
2395	}	2199	}
2396		2200
…		…
2401	*/	2205	*/
2402		2206
2403	int	2207	int
2404	find_dir_2 (int x, int y)	2208	find_dir_2 (int x, int y)
2405	{	2209	{
2406	int	2210	int q;
2407	q;
2408		2211
2409	if (y)	2212	if (y)
2410	q = x * 100 / y;	2213	q = x * 100 / y;
2411	else if (x)	2214	else if (x)
2412	q = -300 * x;	2215	q = -300 * x;
…		…
2538	* find a path to that monster that we found. If not,	2341	* find a path to that monster that we found. If not,
2539	* we don't bother going toward it. Returns 1 if we	2342	* we don't bother going toward it. Returns 1 if we
2540	* can see a direct way to get it	2343	* can see a direct way to get it
2541	* Modified to be map tile aware -.MSW	2344	* Modified to be map tile aware -.MSW
2542	*/	2345	*/
2543
2544
2545	int	2346	int
2546	can_see_monsterP (maptile *m, int x, int y, int dir)	2347	can_see_monsterP (maptile *m, int x, int y, int dir)
2547	{	2348	{
2548	sint16 dx, dy;	2349	sint16 dx, dy;
2549	int
2550	mflags;	2350	int mflags;
2551		2351
2552	if (dir < 0)	2352	if (dir < 0)
2553	return 0; /* exit condition: invalid direction */	2353	return 0; /* exit condition: invalid direction */
2554		2354
2555	dx = x + freearr_x[dir];	2355	dx = x + freearr_x[dir];
…		…
2568	return 0;	2368	return 0;
2569		2369
2570	/* yes, can see. */	2370	/* yes, can see. */
2571	if (dir < 9)	2371	if (dir < 9)
2572	return 1;	2372	return 1;
		2373
2573	return can_see_monsterP (m, x, y, reduction_dir[dir][0]) |	2374	return can_see_monsterP (m, x, y, reduction_dir[dir][0])
2574	can_see_monsterP (m, x, y, reduction_dir[dir][1]) | can_see_monsterP (m, x, y, reduction_dir[dir][2]);	2375	| can_see_monsterP (m, x, y, reduction_dir[dir][1])
		2376	| can_see_monsterP (m, x, y, reduction_dir[dir][2]);
2575	}	2377	}
2576
2577
2578		2378
2579	/*	2379	/*
2580	* can_pick(picker, item): finds out if an object is possible to be	2380	* can_pick(picker, item): finds out if an object is possible to be
2581	* picked up by the picker. Returnes 1 if it can be	2381	* picked up by the picker. Returnes 1 if it can be
2582	* picked up, otherwise 0.	2382	* picked up, otherwise 0.
…		…
2593	return /*QUERY_FLAG(who,FLAG_WIZ)|| */	2393	return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2594	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&	2394	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
2595	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3));	2395	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3));
2596	}	2396	}
2597		2397
2598
2599	/*	2398	/*
2600	* create clone from object to another	2399	* create clone from object to another
2601	*/	2400	*/
2602	object *	2401	object *
2603	object_create_clone (object *asrc)	2402	object_create_clone (object *asrc)
2604	{	2403	{
2605	object *
2606	dst = NULL, *tmp, *src, *part, *prev, *item;	2404	object *dst = 0, *tmp, *src, *part, *prev, *item;
2607		2405
2608	if (!asrc)	2406	if (!asrc)
2609	return NULL;	2407	return 0;
		2408
2610	src = asrc;	2409	src = asrc;
2611	if (src->head)	2410	if (src->head)
2612	src = src->head;	2411	src = src->head;
2613		2412
2614	prev = NULL;	2413	prev = 0;
2615	for (part = src; part; part = part->more)	2414	for (part = src; part; part = part->more)
2616	{	2415	{
2617	tmp = get_object ();	2416	tmp = part->clone ();
2618	copy_object (part, tmp);
2619	tmp->x -= src->x;	2417	tmp->x -= src->x;
2620	tmp->y -= src->y;	2418	tmp->y -= src->y;
		2419
2621	if (!part->head)	2420	if (!part->head)
2622	{	2421	{
2623	dst = tmp;	2422	dst = tmp;
2624	tmp->head = NULL;	2423	tmp->head = 0;
2625	}	2424	}
2626	else	2425	else
2627	{
2628	tmp->head = dst;	2426	tmp->head = dst;
2629	}	2427
2630	tmp->more = NULL;	2428	tmp->more = 0;
		2429
2631	if (prev)	2430	if (prev)
2632	prev->more = tmp;	2431	prev->more = tmp;
		2432
2633	prev = tmp;	2433	prev = tmp;
2634	}	2434	}
2635		2435
2636	for (item = src->inv; item; item = item->below)	2436	for (item = src->inv; item; item = item->below)
2637	insert_ob_in_ob (object_create_clone (item), dst);	2437	insert_ob_in_ob (object_create_clone (item), dst);
…		…
2663	}	2463	}
2664		2464
2665	fprintf (tempfile, obstr);	2465	fprintf (tempfile, obstr);
2666	fclose (tempfile);	2466	fclose (tempfile);
2667		2467
2668	op = get_object ();	2468	op = object::create ();
2669		2469
2670	object_thawer thawer (filename);	2470	object_thawer thawer (filename);
2671		2471
2672	if (thawer)	2472	if (thawer)
2673	load_object (thawer, op, 0);	2473	load_object (thawer, op, 0);

Diff Legend

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