ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/server/common/object.C

Comparing deliantra/server/common/object.C (file contents):
Revision 1.47 by root, Thu Sep 14 22:33:59 2006 UTC vs.
Revision 1.82 by root, Mon Dec 25 11:25:49 2006 UTC

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

Diff Legend

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