ViewVC Help

View File | Revision Log | Show Annotations | Download File

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

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

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

Diff Legend

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