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.60 by pippijn, Mon Dec 11 21:06:58 2006 UTC vs.
Revision 1.96 by root, Sat Dec 30 10:16:10 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: %" I64_PFd "\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 ()
…		…
139	* objects with lists are rare, and lists stay short. If not, use a	141	* objects with lists are rare, and lists stay short. If not, use a
140	* different structure or at least keep the lists sorted...	142	* different structure or at least keep the lists sorted...
141	*/	143	*/
142		144
143	/* For each field in wants, */	145	/* For each field in wants, */
144	for (wants_field = wants->key_values; wants_field != NULL; wants_field = wants_field->next)	146	for (wants_field = wants->key_values; wants_field; wants_field = wants_field->next)
145	{	147	{
146	key_value *has_field;	148	key_value *has_field;
147		149
148	/* Look for a field in has with the same key. */	150	/* Look for a field in has with the same key. */
149	has_field = get_ob_key_link (has, wants_field->key);	151	has_field = get_ob_key_link (has, wants_field->key);
…		…
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
194	bool object::can_merge (object *ob1, object *ob2)	195	bool object::can_merge_slow (object *ob1, object *ob2)
195	{	196	{
196	/* A couple quicksanity checks */	197	/* A couple quicksanity checks */
197	if ((ob1 == ob2) || (ob1->type != ob2->type))	198	if (ob1 == ob2
		199	|| ob1->type != ob2->type
		200	|| ob1->speed != ob2->speed
		201	|| ob1->value != ob2->value
		202	|| ob1->name != ob2->name)
198	return 0;	203	return 0;
199		204
200	if (ob1->speed != ob2->speed)	205	//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	206	/* 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	207	* value could not be stored in a sint32 (which unfortunately sometimes is
205	* used to store nrof).	208	* used to store nrof).
206	*/	209	*/
207	if (ob1->nrof + ob2->nrof >= 1UL << 31)	210	if (ob1->nrof + ob2->nrof >= 1UL << 31)
…		…
217	SET_FLAG (ob1, FLAG_BEEN_APPLIED);	220	SET_FLAG (ob1, FLAG_BEEN_APPLIED);
218		221
219	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))	222	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))
220	SET_FLAG (ob2, FLAG_BEEN_APPLIED);	223	SET_FLAG (ob2, FLAG_BEEN_APPLIED);
221		224
222		225	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	226	|| 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) ||	227	|| ob1->name != ob2->name
233	(ob1->title != ob2->title) ||	228	|| ob1->title != ob2->title
234	(ob1->msg != ob2->msg) ||	229	|| ob1->msg != ob2->msg
235	(ob1->weight != ob2->weight) ||	230	|| ob1->weight != ob2->weight
236	(memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist)) != 0) ||	231	|| memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
237	(memcmp (&ob1->stats, &ob2->stats, sizeof (ob1->stats)) != 0) ||	232	|| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats) )
238	(ob1->attacktype != ob2->attacktype) ||	233	|| ob1->attacktype != ob2->attacktype
239	(ob1->magic != ob2->magic) ||	234	|| ob1->magic != ob2->magic
240	(ob1->slaying != ob2->slaying) ||	235	|| ob1->slaying != ob2->slaying
241	(ob1->skill != ob2->skill) ||	236	|| ob1->skill != ob2->skill
242	(ob1->value != ob2->value) ||	237	|| ob1->value != ob2->value
243	(ob1->animation_id != ob2->animation_id) ||	238	|| ob1->animation_id != ob2->animation_id
244	(ob1->client_type != ob2->client_type) ||	239	|| ob1->client_type != ob2->client_type
245	(ob1->materialname != ob2->materialname) ||	240	|| ob1->materialname != ob2->materialname
246	(ob1->lore != ob2->lore) ||	241	|| ob1->lore != ob2->lore
247	(ob1->subtype != ob2->subtype) ||	242	|| ob1->subtype != ob2->subtype
248	(ob1->move_type != ob2->move_type) ||	243	|| ob1->move_type != ob2->move_type
249	(ob1->move_block != ob2->move_block) ||	244	|| ob1->move_block != ob2->move_block
250	(ob1->move_allow != ob2->move_allow) ||	245	|| ob1->move_allow != ob2->move_allow
251	(ob1->move_on != ob2->move_on) ||	246	|| 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))	247	|| ob1->move_off != ob2->move_off
		248	|| ob1->move_slow != ob2->move_slow
		249	|| ob1->move_slow_penalty != ob2->move_slow_penalty)
253	return 0;	250	return 0;
254		251
255	/* This is really a spellbook check - really, we should	252	/* This is really a spellbook check - really, we should
256	* check all objects in the inventory.	253	* check all objects in the inventory.
257	*/	254	*/
…		…
260	/* if one object has inventory but the other doesn't, not equiv */	257	/* if one object has inventory but the other doesn't, not equiv */
261	if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv))	258	if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv))
262	return 0;	259	return 0;
263		260
264	/* Now check to see if the two inventory objects could merge */	261	/* Now check to see if the two inventory objects could merge */
265	if (!CAN_MERGE (ob1->inv, ob2->inv))	262	if (!object::can_merge (ob1->inv, ob2->inv))
266	return 0;	263	return 0;
267		264
268	/* inventory ok - still need to check rest of this object to see	265	/* inventory ok - still need to check rest of this object to see
269	* if it is valid.	266	* if it is valid.
270	*/	267	*/
…		…
354	op = op->env;	351	op = op->env;
355	return op;	352	return op;
356	}	353	}
357		354
358	/*	355	/*
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.	356	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
375	* Some error messages.	357	* Some error messages.
376	* The result of the dump is stored in the static global errmsg array.	358	* The result of the dump is stored in the static global errmsg array.
377	*/	359	*/
378		360
…		…
381	{	363	{
382	if (!op)	364	if (!op)
383	return strdup ("[NULLOBJ]");	365	return strdup ("[NULLOBJ]");
384		366
385	object_freezer freezer;	367	object_freezer freezer;
386	save_object (freezer, op, 3);	368	save_object (freezer, op, 1);
387	return freezer.as_string ();	369	return freezer.as_string ();
388	}	370	}
389		371
390	/*	372	/*
391	* get_nearest_part(multi-object, object 2) returns the part of the	373	* get_nearest_part(multi-object, object 2) returns the part of the
…		…
484	}	466	}
485		467
486	op->key_values = 0;	468	op->key_values = 0;
487	}	469	}
488		470
489	void object::clear ()
490	{
491	attachable_base::clear ();
492
493	free_key_values (this);
494
495	owner = 0;
496	name = 0;
497	name_pl = 0;
498	title = 0;
499	race = 0;
500	slaying = 0;
501	skill = 0;
502	msg = 0;
503	lore = 0;
504	custom_name = 0;
505	materialname = 0;
506	contr = 0;
507	below = 0;
508	above = 0;
509	inv = 0;
510	container = 0;
511	env = 0;
512	more = 0;
513	head = 0;
514	map = 0;
515	active_next = 0;
516	active_prev = 0;
517
518	memset (static_cast<object_pod *>(this), 0, sizeof (object_pod));
519
520	SET_FLAG (this, FLAG_REMOVED);
521
522	/* What is not cleared is next, prev, and count */
523
524	expmul = 1.0;
525	face = blank_face;
526
527	if (settings.casting_time)
528	casting_time = -1;
529	}
530
531	void object::clone (object *destination)
532	{
533	*(object_copy *)destination = *this;
534	*(object_pod *)destination = *this;
535
536	if (self || cb)
537	INVOKE_OBJECT (CLONE, this, ARG_OBJECT (destination));
538	}
539
540	/*	471	/*
541	* copy object first frees everything allocated by the second object,	472	* copy_to first frees everything allocated by the dst object,
542	* and then copies the contends of the first object into the second	473	* and then copies the contents of itself into the second
543	* object, allocating what needs to be allocated. Basically, any	474	* object, allocating what needs to be allocated. Basically, any
544	* data that is malloc'd needs to be re-malloc/copied. Otherwise,	475	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
545	* if the first object is freed, the pointers in the new object	476	* if the first object is freed, the pointers in the new object
546	* will point at garbage.	477	* will point at garbage.
547	*/	478	*/
548	void	479	void
549	copy_object (object *op2, object *op)	480	object::copy_to (object *dst)
550	{	481	{
551	bool is_freed = QUERY_FLAG (op, FLAG_FREED);	482	bool is_freed = QUERY_FLAG (dst, FLAG_FREED);
552	bool is_removed = QUERY_FLAG (op, FLAG_REMOVED);	483	bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED);
553		484
554	op2->clone (op);	485	*(object_copy *)dst = *this;
555		486
556	if (is_freed)	487	if (is_freed)
557	SET_FLAG (op, FLAG_FREED);	488	SET_FLAG (dst, FLAG_FREED);
558		489
559	if (is_removed)	490	if (is_removed)
560	SET_FLAG (op, FLAG_REMOVED);	491	SET_FLAG (dst, FLAG_REMOVED);
561		492
562	if (op2->speed < 0)	493	if (speed < 0)
563	op->speed_left = op2->speed_left - RANDOM () % 200 / 100.0;	494	dst->speed_left = speed_left - RANDOM () % 200 / 100.0;
564		495
565	/* Copy over key_values, if any. */	496	/* Copy over key_values, if any. */
566	if (op2->key_values)	497	if (key_values)
567	{	498	{
568	key_value *tail = 0;	499	key_value *tail = 0;
569	key_value *i;	500	key_value *i;
570		501
571	op->key_values = 0;	502	dst->key_values = 0;
572		503
573	for (i = op2->key_values; i; i = i->next)	504	for (i = key_values; i; i = i->next)
574	{	505	{
575	key_value *new_link = new key_value;	506	key_value *new_link = new key_value;
576		507
577	new_link->next = 0;	508	new_link->next = 0;
578	new_link->key = i->key;	509	new_link->key = i->key;
579	new_link->value = i->value;	510	new_link->value = i->value;
580		511
581	/* Try and be clever here, too. */	512	/* Try and be clever here, too. */
582	if (!op->key_values)	513	if (!dst->key_values)
583	{	514	{
584	op->key_values = new_link;	515	dst->key_values = new_link;
585	tail = new_link;	516	tail = new_link;
586	}	517	}
587	else	518	else
588	{	519	{
589	tail->next = new_link;	520	tail->next = new_link;
590	tail = new_link;	521	tail = new_link;
591	}	522	}
592	}	523	}
593	}	524	}
594		525
595	update_ob_speed (op);	526	dst->set_speed (dst->speed);
		527	}
		528
		529	object *
		530	object::clone ()
		531	{
		532	object *neu = create ();
		533	copy_to (neu);
		534	return neu;
596	}	535	}
597		536
598	/*	537	/*
599	* If an object with the IS_TURNABLE() flag needs to be turned due	538	* If an object with the IS_TURNABLE() flag needs to be turned due
600	* to the closest player being on the other side, this function can	539	* to the closest player being on the other side, this function can
601	* be called to update the face variable, _and_ how it looks on the map.	540	* be called to update the face variable, _and_ how it looks on the map.
602	*/	541	*/
603
604	void	542	void
605	update_turn_face (object *op)	543	update_turn_face (object *op)
606	{	544	{
607	if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || op->arch == NULL)	545	if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || !op->arch)
608	return;	546	return;
		547
609	SET_ANIMATION (op, op->direction);	548	SET_ANIMATION (op, op->direction);
610	update_object (op, UP_OBJ_FACE);	549	update_object (op, UP_OBJ_FACE);
611	}	550	}
612		551
613	/*	552	/*
614	* Updates the speed of an object. If the speed changes from 0 to another	553	* Updates the speed of an object. If the speed changes from 0 to another
615	* value, or vice versa, then add/remove the object from the active list.	554	* value, or vice versa, then add/remove the object from the active list.
616	* This function needs to be called whenever the speed of an object changes.	555	* This function needs to be called whenever the speed of an object changes.
617	*/	556	*/
618	void	557	void
619	update_ob_speed (object *op)	558	object::set_speed (float speed)
620	{	559	{
621	extern int arch_init;	560	if (flag [FLAG_FREED] && speed)
622
623	/* No reason putting the archetypes objects on the speed list,
624	* since they never really need to be updated.
625	*/
626
627	if (QUERY_FLAG (op, FLAG_FREED) && op->speed)
628	{	561	{
629	LOG (llevError, "Object %s is freed but has speed.\n", &op->name);	562	LOG (llevError, "Object %s is freed but has speed.\n", &name);
630	#ifdef MANY_CORES
631	abort ();
632	#else
633	op->speed = 0;	563	speed = 0;
634	#endif
635	}	564	}
636		565
637	if (arch_init)	566	this->speed = speed;
638	return;
639		567
640	if (FABS (op->speed) > MIN_ACTIVE_SPEED)	568	if (FABS (speed) > MIN_ACTIVE_SPEED)
641	{	569	{
642	/* If already on active list, don't do anything */	570	/* If already on active list, don't do anything */
643	if (op->active_next || op->active_prev || op == active_objects)	571	if (active_next || active_prev || this == active_objects)
644	return;	572	return;
645		573
646	/* process_events() expects us to insert the object at the beginning	574	/* process_events() expects us to insert the object at the beginning
647	* of the list. */	575	* of the list. */
648	op->active_next = active_objects;	576	active_next = active_objects;
649		577
650	if (op->active_next != NULL)	578	if (active_next)
651	op->active_next->active_prev = op;	579	active_next->active_prev = this;
652		580
653	active_objects = op;	581	active_objects = this;
654	}	582	}
655	else	583	else
656	{	584	{
657	/* If not on the active list, nothing needs to be done */	585	/* If not on the active list, nothing needs to be done */
658	if (!op->active_next && !op->active_prev && op != active_objects)	586	if (!active_next && !active_prev && this != active_objects)
659	return;	587	return;
660		588
661	if (op->active_prev == NULL)	589	if (!active_prev)
662	{	590	{
663	active_objects = op->active_next;	591	active_objects = active_next;
664		592
665	if (op->active_next != NULL)	593	if (active_next)
666	op->active_next->active_prev = NULL;	594	active_next->active_prev = 0;
667	}	595	}
668	else	596	else
669	{	597	{
670	op->active_prev->active_next = op->active_next;	598	active_prev->active_next = active_next;
671		599
672	if (op->active_next)	600	if (active_next)
673	op->active_next->active_prev = op->active_prev;	601	active_next->active_prev = active_prev;
674	}	602	}
675		603
676	op->active_next = NULL;	604	active_next = 0;
677	op->active_prev = NULL;	605	active_prev = 0;
678	}
679	}
680
681	/* This function removes object 'op' from the list of active
682	* objects.
683	* This should only be used for style maps or other such
684	* reference maps where you don't want an object that isn't
685	* in play chewing up cpu time getting processed.
686	* The reverse of this is to call update_ob_speed, which
687	* will do the right thing based on the speed of the object.
688	*/
689	void
690	remove_from_active_list (object *op)
691	{
692	/* If not on the active list, nothing needs to be done */
693	if (!op->active_next && !op->active_prev && op != active_objects)
694	return;
695
696	if (op->active_prev == NULL)
697	{	606	}
698	active_objects = op->active_next;
699	if (op->active_next != NULL)
700	op->active_next->active_prev = NULL;
701	}
702	else
703	{
704	op->active_prev->active_next = op->active_next;
705	if (op->active_next)
706	op->active_next->active_prev = op->active_prev;
707	}
708	op->active_next = NULL;
709	op->active_prev = NULL;
710	}	607	}
711		608
712	/*	609	/*
713	* update_object() updates the array which represents the map.	610	* update_object() updates the the map.
714	* It takes into account invisible objects (and represent squares covered	611	* It takes into account invisible objects (and represent squares covered
715	* by invisible objects by whatever is below them (unless it's another	612	* by invisible objects by whatever is below them (unless it's another
716	* invisible object, etc...)	613	* invisible object, etc...)
717	* If the object being updated is beneath a player, the look-window	614	* If the object being updated is beneath a player, the look-window
718	* of that player is updated (this might be a suboptimal way of	615	* of that player is updated (this might be a suboptimal way of
719	* updating that window, though, since update_object() is called _often_)	616	* updating that window, though, since update_object() is called _often_)
720	*	617	*
721	* action is a hint of what the caller believes need to be done.	618	* action is a hint of what the caller believes need to be done.
722	* For example, if the only thing that has changed is the face (due to
723	* an animation), we don't need to call update_position until that actually
724	* comes into view of a player. OTOH, many other things, like addition/removal
725	* of walls or living creatures may need us to update the flags now.
726	* current action are:	619	* current action are:
727	* UP_OBJ_INSERT: op was inserted	620	* UP_OBJ_INSERT: op was inserted
728	* UP_OBJ_REMOVE: op was removed	621	* UP_OBJ_REMOVE: op was removed
729	* UP_OBJ_CHANGE: object has somehow changed. In this case, we always update	622	* UP_OBJ_CHANGE: object has somehow changed. In this case, we always update
730	* as that is easier than trying to look at what may have changed.	623	* as that is easier than trying to look at what may have changed.
731	* UP_OBJ_FACE: only the objects face has changed.	624	* UP_OBJ_FACE: only the objects face has changed.
732	*/	625	*/
733
734	void	626	void
735	update_object (object *op, int action)	627	update_object (object *op, int action)
736	{	628	{
737	int update_now = 0, flags;
738	MoveType move_on, move_off, move_block, move_slow;	629	MoveType move_on, move_off, move_block, move_slow;
739		630
740	if (op == NULL)	631	if (op == NULL)
741	{	632	{
742	/* this should never happen */	633	/* this should never happen */
743	LOG (llevDebug, "update_object() called for NULL object.\n");	634	LOG (llevDebug, "update_object() called for NULL object.\n");
744	return;	635	return;
745	}	636	}
746		637
747	if (op->env != NULL)	638	if (op->env)
748	{	639	{
749	/* Animation is currently handled by client, so nothing	640	/* Animation is currently handled by client, so nothing
750	* to do in this case.	641	* to do in this case.
751	*/	642	*/
752	return;	643	return;
…		…
757	*/	648	*/
758	if (!op->map || op->map->in_memory == MAP_SAVING)	649	if (!op->map || op->map->in_memory == MAP_SAVING)
759	return;	650	return;
760		651
761	/* make sure the object is within map boundaries */	652	/* make sure the object is within map boundaries */
762	if (op->x < 0 || op->x >= MAP_WIDTH (op->map) || op->y < 0 || op->y >= MAP_HEIGHT (op->map))	653	if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height)
763	{	654	{
764	LOG (llevError, "update_object() called for object out of map!\n");	655	LOG (llevError, "update_object() called for object out of map!\n");
765	#ifdef MANY_CORES	656	#ifdef MANY_CORES
766	abort ();	657	abort ();
767	#endif	658	#endif
768	return;	659	return;
769	}	660	}
770		661
771	flags = GET_MAP_FLAGS (op->map, op->x, op->y);	662	mapspace &m = op->ms ();
772	SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NEED_UPDATE);
773	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);
774	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);
775	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);
776	move_off = GET_MAP_MOVE_OFF (op->map, op->x, op->y);
777		663
		664	if (m.flags_ & P_NEED_UPDATE)
		665	/* nop */;
778	if (action == UP_OBJ_INSERT)	666	else if (action == UP_OBJ_INSERT)
779	{	667	{
		668	// this is likely overkill, TODO: revisit (schmorp)
780	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(flags & P_BLOCKSVIEW))	669	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
781	update_now = 1;
782
783	if (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(flags & P_NO_MAGIC))	670	|| (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))
784	update_now = 1;	671	|| (op->type == PLAYER && !(m.flags_ & P_PLAYER))
785		672	|| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
		673	|| (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))
786	if (QUERY_FLAG (op, FLAG_DAMNED) && !(flags & P_NO_CLERIC))	674	|| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))
787	update_now = 1;
788
789	if (QUERY_FLAG (op, FLAG_ALIVE) && !(flags & P_IS_ALIVE))
790	update_now = 1;
791
792	if (op->type == SAFE_GROUND && !(flags & P_SAFE))
793	update_now = 1;
794
795	if ((move_on | op->move_on) != move_on)	675	|| (m.move_on | op->move_on ) != m.move_on
796	update_now = 1;
797
798	if ((move_off | op->move_off) != move_off)	676	|| (m.move_off | op->move_off ) != m.move_off
799	update_now = 1;	677	|| (m.move_slow | op->move_slow) != m.move_slow
800
801	/* This isn't perfect, but I don't expect a lot of objects to	678	/* This isn't perfect, but I don't expect a lot of objects to
802	* to have move_allow right now.	679	* to have move_allow right now.
803	*/	680	*/
804	if (((move_block | op->move_block) & ~op->move_allow) != move_block)	681	|| ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block
805	update_now = 1;	682	|| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)
806		683	m.flags_ = P_NEED_UPDATE;
807	if ((move_slow | op->move_slow) != move_slow)
808	update_now = 1;
809	}	684	}
810
811	/* if the object is being removed, we can't make intelligent	685	/* if the object is being removed, we can't make intelligent
812	* decisions, because remove_ob can't really pass the object	686	* decisions, because remove_ob can't really pass the object
813	* that is being removed.	687	* that is being removed.
814	*/	688	*/
815	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)	689	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
816	update_now = 1;	690	m.flags_ = P_NEED_UPDATE;
817	else if (action == UP_OBJ_FACE)	691	else if (action == UP_OBJ_FACE)
818	/* Nothing to do for that case */ ;	692	/* Nothing to do for that case */ ;
819	else	693	else
820	LOG (llevError, "update_object called with invalid action: %d\n", action);	694	LOG (llevError, "update_object called with invalid action: %d\n", action);
821		695
822	if (update_now)
823	{
824	SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NO_ERROR | P_NEED_UPDATE);
825	update_position (op->map, op->x, op->y);
826	}
827
828	if (op->more != NULL)	696	if (op->more)
829	update_object (op->more, action);	697	update_object (op->more, action);
830	}	698	}
831		699
832	object::vector object::mortals;
833	object::vector object::objects; // not yet used	700	object::vector object::objects; // not yet used
834	object *object::first;	701	object *object::first;
835
836	void object::free_mortals ()
837	{
838	for (AUTODECL (i, mortals.begin ()); i != mortals.end ();)
839	if ((*i)->refcnt)
840	++i; // further delay freeing
841	else
842	{
843	delete *i;
844	mortals.erase (i);
845	}
846	}
847		702
848	object::object ()	703	object::object ()
849	{	704	{
850	SET_FLAG (this, FLAG_REMOVED);	705	SET_FLAG (this, FLAG_REMOVED);
851		706
…		…
883		738
884	prev = 0;	739	prev = 0;
885	next = 0;	740	next = 0;
886	}	741	}
887		742
		743	void
		744	object::activate (bool recursive)
		745	{
		746	// uh, hack
		747	set_speed (speed);
		748
		749	if (recursive)
		750	for (object *op = inv; op; op = op->above)
		751	op->activate (1);
		752	}
		753
		754	/* This function removes object 'op' from the list of active
		755	* objects.
		756	* This should only be used for style maps or other such
		757	* reference maps where you don't want an object that isn't
		758	* in play chewing up cpu time getting processed.
		759	* The reverse of this is to call update_ob_speed, which
		760	* will do the right thing based on the speed of the object.
		761	*/
		762	void
		763	object::deactivate (bool recursive)
		764	{
		765	/* If not on the active list, nothing needs to be done */
		766	if (!active_next && !active_prev && this != active_objects)
		767	return;
		768
		769	if (active_prev == 0)
		770	{
		771	active_objects = active_next;
		772	if (active_next)
		773	active_next->active_prev = 0;
		774	}
		775	else
		776	{
		777	active_prev->active_next = active_next;
		778	if (active_next)
		779	active_next->active_prev = active_prev;
		780	}
		781
		782	active_next = 0;
		783	active_prev = 0;
		784
		785	if (recursive)
		786	for (object *op = inv; op; op = op->above)
		787	op->deactivate (1);
		788	}
		789
		790	/*
		791	* Remove and free all objects in the inventory of the given object.
		792	* object.c ?
		793	*/
		794	void
		795	object::destroy_inv (bool drop_to_ground)
		796	{
		797	// need to check first, because the checks below might segfault
		798	// as we might be on an invalid mapspace and crossfire code
		799	// is too buggy to ensure that the inventory is empty.
		800	// corollary: if you create arrows etc. with stuff in tis inventory,
		801	// cf will crash below with off-map x and y
		802	if (!inv)
		803	return;
		804
		805	/* Only if the space blocks everything do we not process -
		806	* if some form of movement is allowed, let objects
		807	* drop on that space.
		808	*/
		809	if (!drop_to_ground
		810	|| !map
		811	|| map->in_memory != MAP_IN_MEMORY
		812	|| ms ().move_block == MOVE_ALL)
		813	{
		814	while (inv)
		815	{
		816	inv->destroy_inv (drop_to_ground);
		817	inv->destroy ();
		818	}
		819	}
		820	else
		821	{ /* Put objects in inventory onto this space */
		822	while (inv)
		823	{
		824	object *op = inv;
		825
		826	if (op->flag [FLAG_STARTEQUIP]
		827	|| op->flag [FLAG_NO_DROP]
		828	|| op->type == RUNE
		829	|| op->type == TRAP
		830	|| op->flag [FLAG_IS_A_TEMPLATE])
		831	op->destroy ();
		832	else
		833	map->insert (op, x, y);
		834	}
		835	}
		836	}
		837
888	object *object::create ()	838	object *object::create ()
889	{	839	{
890	object *op = new object;	840	object *op = new object;
891	op->link ();	841	op->link ();
892	return op;	842	return op;
893	}	843	}
894		844
895	/*	845	void
896	* free_object() frees everything allocated by an object, removes	846	object::do_destroy ()
897	* it from the list of used objects, and puts it on the list of
898	* free objects. The IS_FREED() flag is set in the object.
899	* The object must have been removed by remove_ob() first for
900	* this function to succeed.
901	*
902	* If destroy_inventory is set, free inventory as well. Else drop items in
903	* inventory to the ground.
904	*/
905	void object::destroy (bool destroy_inventory)
906	{	847	{
907	if (QUERY_FLAG (this, FLAG_FREED))	848	if (flag [FLAG_IS_LINKED])
		849	remove_button_link (this);
		850
		851	if (flag [FLAG_FRIENDLY])
		852	remove_friendly_object (this);
		853
		854	if (!flag [FLAG_REMOVED])
		855	remove ();
		856
		857	if (flag [FLAG_FREED])
908	return;	858	return;
909		859
910	if (QUERY_FLAG (this, FLAG_FRIENDLY))	860	set_speed (0);
911	remove_friendly_object (this);
912		861
913	if (!QUERY_FLAG (this, FLAG_REMOVED))	862	flag [FLAG_FREED] = 1;
914	remove_ob (this);
915		863
916	SET_FLAG (this, FLAG_FREED);	864	attachable::do_destroy ();
917		865
918	if (more)	866	destroy_inv (true);
919	{	867	unlink ();
920	more->destroy (destroy_inventory);
921	more = 0;
922	}
923
924	if (inv)
925	{
926	/* Only if the space blocks everything do we not process -
927	* if some form of movement is allowed, let objects
928	* drop on that space.
929	*/
930	if (destroy_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
931	{
932	object *op = inv;
933
934	while (op)
935	{
936	object *tmp = op->below;
937	op->destroy (destroy_inventory);
938	op = tmp;
939	}
940	}
941	else
942	{ /* Put objects in inventory onto this space */
943	object *op = inv;
944
945	while (op)
946	{
947	object *tmp = op->below;
948
949	remove_ob (op);
950
951	if (QUERY_FLAG (op, FLAG_STARTEQUIP)
952	|| QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
953	free_object (op);
954	else
955	{
956	op->x = x;
957	op->y = y;
958	insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */
959	}
960
961	op = tmp;
962	}
963	}
964	}
965		868
966	// hack to ensure that freed objects still have a valid map	869	// hack to ensure that freed objects still have a valid map
967	{	870	{
968	static maptile *freed_map; // freed objects are moved here to avoid crashes	871	static maptile *freed_map; // freed objects are moved here to avoid crashes
969		872
…		…
973		876
974	freed_map->name = "/internal/freed_objects_map";	877	freed_map->name = "/internal/freed_objects_map";
975	freed_map->width = 3;	878	freed_map->width = 3;
976	freed_map->height = 3;	879	freed_map->height = 3;
977		880
978	freed_map->allocate ();	881	freed_map->alloc ();
979	}	882	}
980		883
981	map = freed_map;	884	map = freed_map;
982	x = 1;	885	x = 1;
983	y = 1;	886	y = 1;
984	}	887	}
985		888
		889	head = 0;
		890
		891	if (more)
		892	{
		893	more->destroy ();
		894	more = 0;
		895	}
		896
986	// clear those pointers that likely might have circular references to us	897	// clear those pointers that likely might have circular references to us
987	owner = 0;	898	owner = 0;
988	enemy = 0;	899	enemy = 0;
989	attacked_by = 0;	900	attacked_by = 0;
990		901
991	// only relevant for players(?), but make sure of it anyways	902	// only relevant for players(?), but make sure of it anyways
992	contr = 0;	903	contr = 0;
		904	}
993		905
994	/* Remove object from the active list */	906	void
995	speed = 0;	907	object::destroy (bool destroy_inventory)
996	update_ob_speed (this);	908	{
		909	if (destroyed ())
		910	return;
997		911
998	unlink ();	912	if (destroy_inventory)
		913	destroy_inv (false);
999		914
1000	mortals.push_back (this);	915	attachable::destroy ();
1001	}	916	}
1002		917
1003	/*	918	/*
1004	* sub_weight() recursively (outwards) subtracts a number from the	919	* sub_weight() recursively (outwards) subtracts a number from the
1005	* weight of an object (and what is carried by it's environment(s)).	920	* weight of an object (and what is carried by it's environment(s)).
…		…
1015	op->carrying -= weight;	930	op->carrying -= weight;
1016	op = op->env;	931	op = op->env;
1017	}	932	}
1018	}	933	}
1019		934
1020	/* remove_ob(op):	935	/* op->remove ():
1021	* This function removes the object op from the linked list of objects	936	* This function removes the object op from the linked list of objects
1022	* which it is currently tied to. When this function is done, the	937	* which it is currently tied to. When this function is done, the
1023	* object will have no environment. If the object previously had an	938	* object will have no environment. If the object previously had an
1024	* environment, the x and y coordinates will be updated to	939	* environment, the x and y coordinates will be updated to
1025	* the previous environment.	940	* the previous environment.
…		…
1029	object::remove ()	944	object::remove ()
1030	{	945	{
1031	object *tmp, *last = 0;	946	object *tmp, *last = 0;
1032	object *otmp;	947	object *otmp;
1033		948
1034	int check_walk_off;
1035
1036	if (QUERY_FLAG (this, FLAG_REMOVED))	949	if (QUERY_FLAG (this, FLAG_REMOVED))
1037	return;	950	return;
1038		951
1039	SET_FLAG (this, FLAG_REMOVED);	952	SET_FLAG (this, FLAG_REMOVED);
		953	INVOKE_OBJECT (REMOVE, this);
1040		954
1041	if (more)	955	if (more)
1042	more->remove ();	956	more->remove ();
1043		957
1044	/*	958	/*
…		…
1054		968
1055	/* NO_FIX_PLAYER is set when a great many changes are being	969	/* NO_FIX_PLAYER is set when a great many changes are being
1056	* made to players inventory. If set, avoiding the call	970	* made to players inventory. If set, avoiding the call
1057	* to save cpu time.	971	* to save cpu time.
1058	*/	972	*/
1059	if ((otmp = is_player_inv (env)) != NULL && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	973	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1060	fix_player (otmp);	974	otmp->update_stats ();
1061		975
1062	if (above != NULL)	976	if (above)
1063	above->below = below;	977	above->below = below;
1064	else	978	else
1065	env->inv = below;	979	env->inv = below;
1066		980
1067	if (below != NULL)	981	if (below)
1068	below->above = above;	982	below->above = above;
1069		983
1070	/* we set up values so that it could be inserted into	984	/* we set up values so that it could be inserted into
1071	* the map, but we don't actually do that - it is up	985	* the map, but we don't actually do that - it is up
1072	* to the caller to decide what we want to do.	986	* to the caller to decide what we want to do.
…		…
1076	above = 0, below = 0;	990	above = 0, below = 0;
1077	env = 0;	991	env = 0;
1078	}	992	}
1079	else if (map)	993	else if (map)
1080	{	994	{
1081	/* Re did the following section of code - it looks like it had	995	if (type == PLAYER)
1082	* lots of logic for things we no longer care about
1083	*/	996	{
		997	--map->players;
		998	map->last_access = runtime;
		999	}
		1000
1084		1001
1085	/* link the object above us */	1002	/* link the object above us */
1086	if (above)	1003	if (above)
1087	above->below = below;	1004	above->below = below;
1088	else	1005	else
1089	SET_MAP_TOP (map, x, y, below); /* we were top, set new top */	1006	map->at (x, y).top = below; /* we were top, set new top */
1090		1007
1091	/* Relink the object below us, if there is one */	1008	/* Relink the object below us, if there is one */
1092	if (below)	1009	if (below)
1093	below->above = above;	1010	below->above = above;
1094	else	1011	else
…		…
1106	dump = dump_object (GET_MAP_OB (map, x, y));	1023	dump = dump_object (GET_MAP_OB (map, x, y));
1107	LOG (llevError, "%s\n", dump);	1024	LOG (llevError, "%s\n", dump);
1108	free (dump);	1025	free (dump);
1109	}	1026	}
1110		1027
1111	SET_MAP_OB (map, x, y, above); /* goes on above it. */	1028	map->at (x, y).bot = above; /* goes on above it. */
1112	}	1029	}
1113		1030
1114	above = 0;	1031	above = 0;
1115	below = 0;	1032	below = 0;
1116		1033
1117	if (map->in_memory == MAP_SAVING)	1034	if (map->in_memory == MAP_SAVING)
1118	return;	1035	return;
1119		1036
1120	check_walk_off = !QUERY_FLAG (this, FLAG_NO_APPLY);	1037	int check_walk_off = !flag [FLAG_NO_APPLY];
1121		1038
1122	for (tmp = GET_MAP_OB (map, x, y); tmp; tmp = tmp->above)	1039	for (tmp = map->at (x, y).bot; tmp; tmp = tmp->above)
1123	{	1040	{
1124	/* No point updating the players look faces if he is the object	1041	/* No point updating the players look faces if he is the object
1125	* being removed.	1042	* being removed.
1126	*/	1043	*/
1127		1044
…		…
1131	* removed (most likely destroyed), update the player view	1048	* removed (most likely destroyed), update the player view
1132	* appropriately.	1049	* appropriately.
1133	*/	1050	*/
1134	if (tmp->container == this)	1051	if (tmp->container == this)
1135	{	1052	{
1136	CLEAR_FLAG (this, FLAG_APPLIED);	1053	flag [FLAG_APPLIED] = 0;
1137	tmp->container = 0;	1054	tmp->container = 0;
1138	}	1055	}
1139		1056
1140	tmp->contr->socket.update_look = 1;	1057	if (tmp->contr->ns)
		1058	tmp->contr->ns->floorbox_update ();
1141	}	1059	}
1142		1060
1143	/* See if player moving off should effect something */	1061	/* See if object moving off should effect something */
1144	if (check_walk_off	1062	if (check_walk_off
1145	&& ((move_type & tmp->move_off)	1063	&& ((move_type & tmp->move_off)
1146	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))	1064	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1147	{	1065	{
1148	move_apply (tmp, this, 0);	1066	move_apply (tmp, this, 0);
…		…
1150	if (destroyed ())	1068	if (destroyed ())
1151	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());	1069	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1152	}	1070	}
1153		1071
1154	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */	1072	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1155		1073	//TODO: why is this horrible hacka fix? get rid of this code=bug! (schmorp)
1156	if (tmp->above == tmp)	1074	if (tmp->above == tmp)
1157	tmp->above = 0;	1075	tmp->above = 0;
1158		1076
1159	last = tmp;	1077	last = tmp;
1160	}	1078	}
1161		1079
1162	/* last == NULL of there are no objects on this space */	1080	/* last == NULL if there are no objects on this space */
		1081	//TODO: this makes little sense, why only update the topmost object?
1163	if (!last)	1082	if (!last)
1164	{	1083	map->at (x, y).flags_ = P_NEED_UPDATE;
1165	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1166	* we could preserve the flags (GET_MAP_FLAGS), but update_position figures
1167	* those out anyways, and if there are any flags set right now, they won't
1168	* be correct anyways.
1169	*/
1170	SET_MAP_FLAGS (map, x, y, P_NEED_UPDATE);
1171	update_position (map, x, y);
1172	}
1173	else	1084	else
1174	update_object (last, UP_OBJ_REMOVE);	1085	update_object (last, UP_OBJ_REMOVE);
1175		1086
1176	if (QUERY_FLAG (this, FLAG_BLOCKSVIEW) || glow_radius)	1087	if (flag [FLAG_BLOCKSVIEW] || glow_radius)
1177	update_all_los (map, x, y);	1088	update_all_los (map, x, y);
1178	}	1089	}
1179	}	1090	}
1180		1091
1181	/*	1092	/*
…		…
1190	merge_ob (object *op, object *top)	1101	merge_ob (object *op, object *top)
1191	{	1102	{
1192	if (!op->nrof)	1103	if (!op->nrof)
1193	return 0;	1104	return 0;
1194		1105
1195	if (top == NULL)	1106	if (top)
1196	for (top = op; top != NULL && top->above != NULL; top = top->above);	1107	for (top = op; top && top->above; top = top->above)
		1108	;
1197		1109
1198	for (; top != NULL; top = top->below)	1110	for (; top; top = top->below)
1199	{	1111	{
1200	if (top == op)	1112	if (top == op)
1201	continue;	1113	continue;
1202	if (CAN_MERGE (op, top))	1114
		1115	if (object::can_merge (op, top))
1203	{	1116	{
1204	top->nrof += op->nrof;	1117	top->nrof += op->nrof;
1205		1118
1206	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/	1119	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/
1207	op->weight = 0; /* Don't want any adjustements now */	1120	op->weight = 0; /* Don't want any adjustements now */
1208	remove_ob (op);	1121	op->destroy ();
1209	free_object (op);
1210	return top;	1122	return top;
1211	}	1123	}
1212	}	1124	}
1213		1125
1214	return 0;	1126	return 0;
…		…
1219	* job preparing multi-part monsters	1131	* job preparing multi-part monsters
1220	*/	1132	*/
1221	object *	1133	object *
1222	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)	1134	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1223	{	1135	{
1224	object *tmp;
1225
1226	if (op->head)
1227	op = op->head;
1228
1229	for (tmp = op; tmp; tmp = tmp->more)	1136	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1230	{	1137	{
1231	tmp->x = x + tmp->arch->clone.x;	1138	tmp->x = x + tmp->arch->clone.x;
1232	tmp->y = y + tmp->arch->clone.y;	1139	tmp->y = y + tmp->arch->clone.y;
1233	}	1140	}
1234		1141
…		…
1253	* Return value:	1160	* Return value:
1254	* new object if 'op' was merged with other object	1161	* new object if 'op' was merged with other object
1255	* NULL if 'op' was destroyed	1162	* NULL if 'op' was destroyed
1256	* just 'op' otherwise	1163	* just 'op' otherwise
1257	*/	1164	*/
1258
1259	object *	1165	object *
1260	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)	1166	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1261	{	1167	{
1262	object *tmp, *top, *floor = NULL;	1168	object *tmp, *top, *floor = NULL;
1263	sint16 x, y;	1169	sint16 x, y;
…		…
1266	{	1172	{
1267	LOG (llevError, "Trying to insert freed object!\n");	1173	LOG (llevError, "Trying to insert freed object!\n");
1268	return NULL;	1174	return NULL;
1269	}	1175	}
1270		1176
1271	if (m == NULL)	1177	if (!m)
1272	{	1178	{
1273	char *dump = dump_object (op);	1179	char *dump = dump_object (op);
1274	LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);	1180	LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
1275	free (dump);	1181	free (dump);
1276	return op;	1182	return op;
…		…
1297	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);	1203	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
1298	free (dump);	1204	free (dump);
1299	return op;	1205	return op;
1300	}	1206	}
1301		1207
1302	if (op->more != NULL)	1208	if (op->more)
1303	{	1209	{
1304	/* The part may be on a different map. */	1210	/* The part may be on a different map. */
1305		1211
1306	object *more = op->more;	1212	object *more = op->more;
1307		1213
…		…
1323	if (insert_ob_in_map (more, more->map, originator, flag) == NULL)	1229	if (insert_ob_in_map (more, more->map, originator, flag) == NULL)
1324	{	1230	{
1325	if (!op->head)	1231	if (!op->head)
1326	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");	1232	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1327		1233
1328	return NULL;	1234	return 0;
1329	}	1235	}
1330	}	1236	}
1331		1237
1332	CLEAR_FLAG (op, FLAG_REMOVED);	1238	CLEAR_FLAG (op, FLAG_REMOVED);
1333		1239
…		…
1340	y = op->y;	1246	y = op->y;
1341		1247
1342	/* this has to be done after we translate the coordinates.	1248	/* this has to be done after we translate the coordinates.
1343	*/	1249	*/
1344	if (op->nrof && !(flag & INS_NO_MERGE))	1250	if (op->nrof && !(flag & INS_NO_MERGE))
1345	for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)	1251	for (tmp = GET_MAP_OB (op->map, x, y); tmp; tmp = tmp->above)
1346	if (CAN_MERGE (op, tmp))	1252	if (object::can_merge (op, tmp))
1347	{	1253	{
1348	op->nrof += tmp->nrof;	1254	op->nrof += tmp->nrof;
1349	remove_ob (tmp);	1255	tmp->destroy ();
1350	free_object (tmp);
1351	}	1256	}
1352		1257
1353	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1258	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1354	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1259	CLEAR_FLAG (op, FLAG_INV_LOCKED);
1355		1260
…		…
1368	op->below = originator->below;	1273	op->below = originator->below;
1369		1274
1370	if (op->below)	1275	if (op->below)
1371	op->below->above = op;	1276	op->below->above = op;
1372	else	1277	else
1373	SET_MAP_OB (op->map, op->x, op->y, op);	1278	op->ms ().bot = op;
1374		1279
1375	/* since *below* originator, no need to update top */	1280	/* since *below* originator, no need to update top */
1376	originator->below = op;	1281	originator->below = op;
1377	}	1282	}
1378	else	1283	else
1379	{	1284	{
1380	/* If there are other objects, then */	1285	/* If there are other objects, then */
1381	if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL))	1286	if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL))
1382	{	1287	{
1383	object *last = NULL;	1288	object *last = 0;
1384		1289
1385	/*	1290	/*
1386	* If there are multiple objects on this space, we do some trickier handling.	1291	* If there are multiple objects on this space, we do some trickier handling.
1387	* We've already dealt with merging if appropriate.	1292	* We've already dealt with merging if appropriate.
1388	* Generally, we want to put the new object on top. But if	1293	* Generally, we want to put the new object on top. But if
…		…
1392	* once we get to them. This reduces the need to traverse over all of	1297	* once we get to them. This reduces the need to traverse over all of
1393	* them when adding another one - this saves quite a bit of cpu time	1298	* them when adding another one - this saves quite a bit of cpu time
1394	* when lots of spells are cast in one area. Currently, it is presumed	1299	* when lots of spells are cast in one area. Currently, it is presumed
1395	* that flying non pickable objects are spell objects.	1300	* that flying non pickable objects are spell objects.
1396	*/	1301	*/
1397
1398	while (top != NULL)	1302	while (top)
1399	{	1303	{
1400	if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))	1304	if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))
1401	floor = top;	1305	floor = top;
1402		1306
1403	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))	1307	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))
…		…
1424	* If INS_ON_TOP is used, don't do this processing	1328	* If INS_ON_TOP is used, don't do this processing
1425	* Need to find the object that in fact blocks view, otherwise	1329	* Need to find the object that in fact blocks view, otherwise
1426	* stacking is a bit odd.	1330	* stacking is a bit odd.
1427	*/	1331	*/
1428	if (!(flag & INS_ON_TOP) &&	1332	if (!(flag & INS_ON_TOP) &&
1429	(get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_BLOCKSVIEW) && (op->face && !op->face->visibility))	1333	(get_map_flags (op->map, 0, op->x, op->y, 0, 0) & P_BLOCKSVIEW) && (op->face && !op->face->visibility))
1430	{	1334	{
1431	for (last = top; last != floor; last = last->below)	1335	for (last = top; last != floor; last = last->below)
1432	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1336	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1433	break;	1337	break;
1434	/* Check to see if we found the object that blocks view,	1338	/* Check to see if we found the object that blocks view,
…		…
1456	op->above = GET_MAP_OB (op->map, op->x, op->y);	1360	op->above = GET_MAP_OB (op->map, op->x, op->y);
1457		1361
1458	if (op->above)	1362	if (op->above)
1459	op->above->below = op;	1363	op->above->below = op;
1460		1364
1461	op->below = NULL;	1365	op->below = 0;
1462	SET_MAP_OB (op->map, op->x, op->y, op);	1366	op->ms ().bot = op;
1463	}	1367	}
1464	else	1368	else
1465	{ /* get inserted into the stack above top */	1369	{ /* get inserted into the stack above top */
1466	op->above = top->above;	1370	op->above = top->above;
1467		1371
…		…
1470		1374
1471	op->below = top;	1375	op->below = top;
1472	top->above = op;	1376	top->above = op;
1473	}	1377	}
1474		1378
1475	if (op->above == NULL)	1379	if (!op->above)
1476	SET_MAP_TOP (op->map, op->x, op->y, op);	1380	op->ms ().top = op;
1477	} /* else not INS_BELOW_ORIGINATOR */	1381	} /* else not INS_BELOW_ORIGINATOR */
1478		1382
1479	if (op->type == PLAYER)	1383	if (op->type == PLAYER)
		1384	{
1480	op->contr->do_los = 1;	1385	op->contr->do_los = 1;
		1386	++op->map->players;
		1387	op->map->last_access = runtime;
		1388	}
1481		1389
1482	/* If we have a floor, we know the player, if any, will be above	1390	/* If we have a floor, we know the player, if any, will be above
1483	* it, so save a few ticks and start from there.	1391	* it, so save a few ticks and start from there.
1484	*/	1392	*/
1485	if (!(flag & INS_MAP_LOAD))	1393	if (!(flag & INS_MAP_LOAD))
1486	for (tmp = floor ? floor : GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1394	if (object *pl = op->ms ().player ())
1487	if (tmp->type == PLAYER)	1395	if (pl->contr->ns)
1488	tmp->contr->socket.update_look = 1;	1396	pl->contr->ns->floorbox_update ();
1489		1397
1490	/* If this object glows, it may affect lighting conditions that are	1398	/* If this object glows, it may affect lighting conditions that are
1491	* visible to others on this map. But update_all_los is really	1399	* visible to others on this map. But update_all_los is really
1492	* an inefficient way to do this, as it means los for all players	1400	* an inefficient way to do this, as it means los for all players
1493	* on the map will get recalculated. The players could very well	1401	* on the map will get recalculated. The players could very well
1494	* be far away from this change and not affected in any way -	1402	* be far away from this change and not affected in any way -
1495	* this should get redone to only look for players within range,	1403	* this should get redone to only look for players within range,
1496	* or just updating the P_NEED_UPDATE for spaces within this area	1404	* or just updating the P_NEED_UPDATE for spaces within this area
1497	* of effect may be sufficient.	1405	* of effect may be sufficient.
1498	*/	1406	*/
1499	if (MAP_DARKNESS (op->map) && (op->glow_radius != 0))	1407	if (op->map->darkness && (op->glow_radius != 0))
1500	update_all_los (op->map, op->x, op->y);	1408	update_all_los (op->map, op->x, op->y);
1501		1409
1502	/* updates flags (blocked, alive, no magic, etc) for this map space */	1410	/* updates flags (blocked, alive, no magic, etc) for this map space */
1503	update_object (op, UP_OBJ_INSERT);	1411	update_object (op, UP_OBJ_INSERT);
1504		1412
		1413	INVOKE_OBJECT (INSERT, op);
		1414
1505	/* Don't know if moving this to the end will break anything. However,	1415	/* Don't know if moving this to the end will break anything. However,
1506	* we want to have update_look set above before calling this.	1416	* we want to have floorbox_update called before calling this.
1507	*	1417	*
1508	* check_move_on() must be after this because code called from	1418	* check_move_on() must be after this because code called from
1509	* check_move_on() depends on correct map flags (so functions like	1419	* check_move_on() depends on correct map flags (so functions like
1510	* blocked() and wall() work properly), and these flags are updated by	1420	* blocked() and wall() work properly), and these flags are updated by
1511	* update_object().	1421	* update_object().
…		…
1513		1423
1514	/* if this is not the head or flag has been passed, don't check walk on status */	1424	/* if this is not the head or flag has been passed, don't check walk on status */
1515	if (!(flag & INS_NO_WALK_ON) && !op->head)	1425	if (!(flag & INS_NO_WALK_ON) && !op->head)
1516	{	1426	{
1517	if (check_move_on (op, originator))	1427	if (check_move_on (op, originator))
1518	return NULL;	1428	return 0;
1519		1429
1520	/* If we are a multi part object, lets work our way through the check	1430	/* If we are a multi part object, lets work our way through the check
1521	* walk on's.	1431	* walk on's.
1522	*/	1432	*/
1523	for (tmp = op->more; tmp != NULL; tmp = tmp->more)	1433	for (tmp = op->more; tmp != NULL; tmp = tmp->more)
1524	if (check_move_on (tmp, originator))	1434	if (check_move_on (tmp, originator))
1525	return NULL;	1435	return 0;
1526	}	1436	}
1527		1437
1528	return op;	1438	return op;
1529	}	1439	}
1530		1440
1531	/* this function inserts an object in the map, but if it	1441	/* this function inserts an object in the map, but if it
1532	* finds an object of its own type, it'll remove that one first.	1442	* finds an object of its own type, it'll remove that one first.
1533	* op is the object to insert it under: supplies x and the map.	1443	* op is the object to insert it under: supplies x and the map.
1534	*/	1444	*/
1535	void	1445	void
1536	replace_insert_ob_in_map (const char *arch_string, object *op)	1446	replace_insert_ob_in_map (const char *arch_string, object *op)
1537	{	1447	{
1538	object *	1448	object *tmp, *tmp1;
1539	tmp;
1540	object *
1541	tmp1;
1542		1449
1543	/* first search for itself and remove any old instances */	1450	/* first search for itself and remove any old instances */
1544		1451
1545	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1452	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
1546	{
1547	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */	1453	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */
1548	{	1454	tmp->destroy ();
1549	remove_ob (tmp);
1550	free_object (tmp);
1551	}
1552	}
1553		1455
1554	tmp1 = arch_to_object (archetype::find (arch_string));	1456	tmp1 = arch_to_object (archetype::find (arch_string));
1555		1457
1556	tmp1->x = op->x;	1458	tmp1->x = op->x;
1557	tmp1->y = op->y;	1459	tmp1->y = op->y;
1558	insert_ob_in_map (tmp1, op->map, op, 0);	1460	insert_ob_in_map (tmp1, op->map, op, 0);
		1461	}
		1462
		1463	object *
		1464	object::insert_at (object *where, object *originator, int flags)
		1465	{
		1466	where->map->insert (this, where->x, where->y, originator, flags);
1559	}	1467	}
1560		1468
1561	/*	1469	/*
1562	* get_split_ob(ob,nr) splits up ob into two parts. The part which	1470	* get_split_ob(ob,nr) splits up ob into two parts. The part which
1563	* is returned contains nr objects, and the remaining parts contains	1471	* is returned contains nr objects, and the remaining parts contains
1564	* the rest (or is removed and freed if that number is 0).	1472	* the rest (or is removed and freed if that number is 0).
1565	* On failure, NULL is returned, and the reason put into the	1473	* On failure, NULL is returned, and the reason put into the
1566	* global static errmsg array.	1474	* global static errmsg array.
1567	*/	1475	*/
1568
1569	object *	1476	object *
1570	get_split_ob (object *orig_ob, uint32 nr)	1477	get_split_ob (object *orig_ob, uint32 nr)
1571	{	1478	{
1572	object *	1479	object *newob;
1573	newob;
1574	int
1575	is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);	1480	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1576		1481
1577	if (orig_ob->nrof < nr)	1482	if (orig_ob->nrof < nr)
1578	{	1483	{
1579	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);
1580	return NULL;	1485	return NULL;
1581	}	1486	}
1582		1487
1583	newob = object_create_clone (orig_ob);	1488	newob = object_create_clone (orig_ob);
1584		1489
1585	if ((orig_ob->nrof -= nr) < 1)	1490	if ((orig_ob->nrof -= nr) < 1)
1586	{	1491	orig_ob->destroy (1);
1587	if (!is_removed)
1588	remove_ob (orig_ob);
1589	free_object2 (orig_ob, 1);
1590	}
1591	else if (!is_removed)	1492	else if (!is_removed)
1592	{	1493	{
1593	if (orig_ob->env != NULL)	1494	if (orig_ob->env != NULL)
1594	sub_weight (orig_ob->env, orig_ob->weight * nr);	1495	sub_weight (orig_ob->env, orig_ob->weight * nr);
1595	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)
…		…
1615		1516
1616	object *	1517	object *
1617	decrease_ob_nr (object *op, uint32 i)	1518	decrease_ob_nr (object *op, uint32 i)
1618	{	1519	{
1619	object *tmp;	1520	object *tmp;
1620	player *pl;
1621		1521
1622	if (i == 0) /* objects with op->nrof require this check */	1522	if (i == 0) /* objects with op->nrof require this check */
1623	return op;	1523	return op;
1624		1524
1625	if (i > op->nrof)	1525	if (i > op->nrof)
1626	i = op->nrof;	1526	i = op->nrof;
1627		1527
1628	if (QUERY_FLAG (op, FLAG_REMOVED))	1528	if (QUERY_FLAG (op, FLAG_REMOVED))
1629	op->nrof -= i;	1529	op->nrof -= i;
1630	else if (op->env != NULL)	1530	else if (op->env)
1631	{	1531	{
1632	/* is this object in the players inventory, or sub container	1532	/* is this object in the players inventory, or sub container
1633	* therein?	1533	* therein?
1634	*/	1534	*/
1635	tmp = is_player_inv (op->env);	1535	tmp = op->in_player ();
1636	/* nope. Is this a container the player has opened?	1536	/* nope. Is this a container the player has opened?
1637	* If so, set tmp to that player.	1537	* If so, set tmp to that player.
1638	* IMO, searching through all the players will mostly	1538	* IMO, searching through all the players will mostly
1639	* likely be quicker than following op->env to the map,	1539	* likely be quicker than following op->env to the map,
1640	* and then searching the map for a player.	1540	* and then searching the map for a player.
1641	*/	1541	*/
1642	if (!tmp)	1542	if (!tmp)
1643	{	1543	for_all_players (pl)
1644	for (pl = first_player; pl; pl = pl->next)
1645	if (pl->ob->container == op->env)	1544	if (pl->ob->container == op->env)
		1545	{
		1546	tmp = pl->ob;
1646	break;	1547	break;
1647	if (pl)
1648	tmp = pl->ob;
1649	else
1650	tmp = NULL;
1651	}	1548	}
1652		1549
1653	if (i < op->nrof)	1550	if (i < op->nrof)
1654	{	1551	{
1655	sub_weight (op->env, op->weight * i);	1552	sub_weight (op->env, op->weight * i);
1656	op->nrof -= i;	1553	op->nrof -= i;
1657	if (tmp)	1554	if (tmp)
1658	{
1659	esrv_send_item (tmp, op);	1555	esrv_send_item (tmp, op);
1660	}
1661	}	1556	}
1662	else	1557	else
1663	{	1558	{
1664	remove_ob (op);	1559	op->remove ();
1665	op->nrof = 0;	1560	op->nrof = 0;
1666	if (tmp)	1561	if (tmp)
1667	{
1668	esrv_del_item (tmp->contr, op->count);	1562	esrv_del_item (tmp->contr, op->count);
1669	}
1670	}	1563	}
1671	}	1564	}
1672	else	1565	else
1673	{	1566	{
1674	object *above = op->above;	1567	object *above = op->above;
1675		1568
1676	if (i < op->nrof)	1569	if (i < op->nrof)
1677	op->nrof -= i;	1570	op->nrof -= i;
1678	else	1571	else
1679	{	1572	{
1680	remove_ob (op);	1573	op->remove ();
1681	op->nrof = 0;	1574	op->nrof = 0;
1682	}	1575	}
1683		1576
1684	/* Since we just removed op, op->above is null */	1577	/* Since we just removed op, op->above is null */
1685	for (tmp = above; tmp != NULL; tmp = tmp->above)	1578	for (tmp = above; tmp; tmp = tmp->above)
1686	if (tmp->type == PLAYER)	1579	if (tmp->type == PLAYER)
1687	{	1580	{
1688	if (op->nrof)	1581	if (op->nrof)
1689	esrv_send_item (tmp, op);	1582	esrv_send_item (tmp, op);
1690	else	1583	else
…		…
1694		1587
1695	if (op->nrof)	1588	if (op->nrof)
1696	return op;	1589	return op;
1697	else	1590	else
1698	{	1591	{
1699	free_object (op);	1592	op->destroy ();
1700	return NULL;	1593	return 0;
1701	}	1594	}
1702	}	1595	}
1703		1596
1704	/*	1597	/*
1705	* add_weight(object, weight) adds the specified weight to an object,	1598	* add_weight(object, weight) adds the specified weight to an object,
…		…
1765	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1658	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1766	CLEAR_FLAG (op, FLAG_REMOVED);	1659	CLEAR_FLAG (op, FLAG_REMOVED);
1767	if (op->nrof)	1660	if (op->nrof)
1768	{	1661	{
1769	for (tmp = inv; tmp != NULL; tmp = tmp->below)	1662	for (tmp = inv; tmp != NULL; tmp = tmp->below)
1770	if (CAN_MERGE (tmp, op))	1663	if (object::can_merge (tmp, op))
1771	{	1664	{
1772	/* return the original object and remove inserted object	1665	/* return the original object and remove inserted object
1773	(client needs the original object) */	1666	(client needs the original object) */
1774	tmp->nrof += op->nrof;	1667	tmp->nrof += op->nrof;
1775	/* Weight handling gets pretty funky. Since we are adding to	1668	/* Weight handling gets pretty funky. Since we are adding to
…		…
1793	add_weight (this, op->weight * op->nrof);	1686	add_weight (this, op->weight * op->nrof);
1794	}	1687	}
1795	else	1688	else
1796	add_weight (this, (op->weight + op->carrying));	1689	add_weight (this, (op->weight + op->carrying));
1797		1690
1798	otmp = is_player_inv (this);	1691	otmp = this->in_player ();
1799	if (otmp && otmp->contr)	1692	if (otmp && otmp->contr)
1800	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1693	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1801	fix_player (otmp);	1694	otmp->update_stats ();
1802		1695
1803	op->map = NULL;	1696	op->map = 0;
1804	op->env = this;	1697	op->env = this;
1805	op->above = NULL;	1698	op->above = 0;
1806	op->below = NULL;	1699	op->below = 0;
1807	op->x = 0, op->y = 0;	1700	op->x = 0, op->y = 0;
1808		1701
1809	/* 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 */
1810	if ((op->glow_radius != 0) && map)	1703	if ((op->glow_radius != 0) && map)
1811	{	1704	{
1812	#ifdef DEBUG_LIGHTS	1705	#ifdef DEBUG_LIGHTS
1813	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);
1814	#endif /* DEBUG_LIGHTS */	1707	#endif /* DEBUG_LIGHTS */
1815	if (MAP_DARKNESS (map))	1708	if (map->darkness)
1816	update_all_los (map, x, y);	1709	update_all_los (map, x, y);
1817	}	1710	}
1818		1711
1819	/* 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.
1820	* It sure simplifies this function...	1713	* It sure simplifies this function...
…		…
1825	{	1718	{
1826	op->below = inv;	1719	op->below = inv;
1827	op->below->above = op;	1720	op->below->above = op;
1828	inv = op;	1721	inv = op;
1829	}	1722	}
		1723
		1724	INVOKE_OBJECT (INSERT, this);
1830		1725
1831	return op;	1726	return op;
1832	}	1727	}
1833		1728
1834	/*	1729	/*
…		…
1849	*	1744	*
1850	* MSW 2001-07-08: Check all objects on space, not just those below	1745	* MSW 2001-07-08: Check all objects on space, not just those below
1851	* object being inserted. insert_ob_in_map may not put new objects	1746	* object being inserted. insert_ob_in_map may not put new objects
1852	* on top.	1747	* on top.
1853	*/	1748	*/
1854
1855	int	1749	int
1856	check_move_on (object *op, object *originator)	1750	check_move_on (object *op, object *originator)
1857	{	1751	{
1858	object *tmp;	1752	object *tmp;
1859	maptile *m = op->map;	1753	maptile *m = op->map;
…		…
1886		1780
1887	/* The objects have to be checked from top to bottom.	1781	/* The objects have to be checked from top to bottom.
1888	* Hence, we first go to the top:	1782	* Hence, we first go to the top:
1889	*/	1783	*/
1890		1784
1891	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL && tmp->above != NULL; tmp = tmp->above)	1785	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp && tmp->above; tmp = tmp->above)
1892	{	1786	{
1893	/* Trim the search when we find the first other spell effect	1787	/* Trim the search when we find the first other spell effect
1894	* this helps performance so that if a space has 50 spell objects,	1788	* this helps performance so that if a space has 50 spell objects,
1895	* we don't need to check all of them.	1789	* we don't need to check all of them.
1896	*/	1790	*/
…		…
1951	/*	1845	/*
1952	* present_arch(arch, map, x, y) searches for any objects with	1846	* present_arch(arch, map, x, y) searches for any objects with
1953	* a matching archetype at the given map and coordinates.	1847	* a matching archetype at the given map and coordinates.
1954	* The first matching object is returned, or NULL if none.	1848	* The first matching object is returned, or NULL if none.
1955	*/	1849	*/
1956
1957	object *	1850	object *
1958	present_arch (const archetype *at, maptile *m, int x, int y)	1851	present_arch (const archetype *at, maptile *m, int x, int y)
1959	{	1852	{
1960	object *
1961	tmp;
1962
1963	if (m == NULL || out_of_map (m, x, y))	1853	if (m == NULL || out_of_map (m, x, y))
1964	{	1854	{
1965	LOG (llevError, "Present_arch called outside map.\n");	1855	LOG (llevError, "Present_arch called outside map.\n");
1966	return NULL;	1856	return NULL;
1967	}	1857	}
		1858
1968	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1859	for (object *tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)
1969	if (tmp->arch == at)	1860	if (tmp->arch == at)
1970	return tmp;	1861	return tmp;
		1862
1971	return NULL;	1863	return NULL;
1972	}	1864	}
1973		1865
1974	/*	1866	/*
1975	* present(type, map, x, y) searches for any objects with	1867	* present(type, map, x, y) searches for any objects with
1976	* a matching type variable at the given map and coordinates.	1868	* a matching type variable at the given map and coordinates.
1977	* The first matching object is returned, or NULL if none.	1869	* The first matching object is returned, or NULL if none.
1978	*/	1870	*/
1979
1980	object *	1871	object *
1981	present (unsigned char type, maptile *m, int x, int y)	1872	present (unsigned char type, maptile *m, int x, int y)
1982	{	1873	{
1983	object *
1984	tmp;
1985
1986	if (out_of_map (m, x, y))	1874	if (out_of_map (m, x, y))
1987	{	1875	{
1988	LOG (llevError, "Present called outside map.\n");	1876	LOG (llevError, "Present called outside map.\n");
1989	return NULL;	1877	return NULL;
1990	}	1878	}
		1879
1991	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1880	for (object *tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)
1992	if (tmp->type == type)	1881	if (tmp->type == type)
1993	return tmp;	1882	return tmp;
		1883
1994	return NULL;	1884	return NULL;
1995	}	1885	}
1996		1886
1997	/*	1887	/*
1998	* present_in_ob(type, object) searches for any objects with	1888	* present_in_ob(type, object) searches for any objects with
1999	* a matching type variable in the inventory of the given object.	1889	* a matching type variable in the inventory of the given object.
2000	* The first matching object is returned, or NULL if none.	1890	* The first matching object is returned, or NULL if none.
2001	*/	1891	*/
2002
2003	object *	1892	object *
2004	present_in_ob (unsigned char type, const object *op)	1893	present_in_ob (unsigned char type, const object *op)
2005	{	1894	{
2006	object *
2007	tmp;
2008
2009	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1895	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2010	if (tmp->type == type)	1896	if (tmp->type == type)
2011	return tmp;	1897	return tmp;
		1898
2012	return NULL;	1899	return NULL;
2013	}	1900	}
2014		1901
2015	/*	1902	/*
2016	* present_in_ob (type, str, object) searches for any objects with	1903	* present_in_ob (type, str, object) searches for any objects with
…		…
2024	* str is the string to match against. Note that we match against	1911	* str is the string to match against. Note that we match against
2025	* the object name, not the archetype name. this is so that the	1912	* the object name, not the archetype name. this is so that the
2026	* spell code can use one object type (force), but change it's name	1913	* spell code can use one object type (force), but change it's name
2027	* to be unique.	1914	* to be unique.
2028	*/	1915	*/
2029
2030	object *	1916	object *
2031	present_in_ob_by_name (int type, const char *str, const object *op)	1917	present_in_ob_by_name (int type, const char *str, const object *op)
2032	{	1918	{
2033	object *
2034	tmp;
2035
2036	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1919	for (object *tmp = op->inv; tmp; tmp = tmp->below)
2037	{
2038	if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name)))	1920	if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name)))
2039	return tmp;	1921	return tmp;
2040	}	1922
2041	return NULL;	1923	return 0;
2042	}	1924	}
2043		1925
2044	/*	1926	/*
2045	* present_arch_in_ob(archetype, object) searches for any objects with	1927	* present_arch_in_ob(archetype, object) searches for any objects with
2046	* a matching archetype in the inventory of the given object.	1928	* a matching archetype in the inventory of the given object.
2047	* The first matching object is returned, or NULL if none.	1929	* The first matching object is returned, or NULL if none.
2048	*/	1930	*/
2049
2050	object *	1931	object *
2051	present_arch_in_ob (const archetype *at, const object *op)	1932	present_arch_in_ob (const archetype *at, const object *op)
2052	{	1933	{
2053	object *
2054	tmp;
2055
2056	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1934	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2057	if (tmp->arch == at)	1935	if (tmp->arch == at)
2058	return tmp;	1936	return tmp;
		1937
2059	return NULL;	1938	return NULL;
2060	}	1939	}
2061		1940
2062	/*	1941	/*
2063	* activate recursively a flag on an object inventory	1942	* activate recursively a flag on an object inventory
2064	*/	1943	*/
2065	void	1944	void
2066	flag_inv (object *op, int flag)	1945	flag_inv (object *op, int flag)
2067	{	1946	{
2068	object *
2069	tmp;
2070
2071	if (op->inv)	1947	if (op->inv)
2072	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1948	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2073	{	1949	{
2074	SET_FLAG (tmp, flag);	1950	SET_FLAG (tmp, flag);
2075	flag_inv (tmp, flag);	1951	flag_inv (tmp, flag);
2076	}	1952	}
2077	} /*	1953	}
		1954
		1955	/*
2078	* desactivate recursively a flag on an object inventory	1956	* deactivate recursively a flag on an object inventory
2079	*/	1957	*/
2080	void	1958	void
2081	unflag_inv (object *op, int flag)	1959	unflag_inv (object *op, int flag)
2082	{	1960	{
2083	object *
2084	tmp;
2085
2086	if (op->inv)	1961	if (op->inv)
2087	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1962	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2088	{	1963	{
2089	CLEAR_FLAG (tmp, flag);	1964	CLEAR_FLAG (tmp, flag);
2090	unflag_inv (tmp, flag);	1965	unflag_inv (tmp, flag);
2091	}	1966	}
2092	}	1967	}
…		…
2095	* set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in	1970	* set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in
2096	* all it's inventory (recursively).	1971	* all it's inventory (recursively).
2097	* If checksums are used, a player will get set_cheat called for	1972	* If checksums are used, a player will get set_cheat called for
2098	* him/her-self and all object carried by a call to this function.	1973	* him/her-self and all object carried by a call to this function.
2099	*/	1974	*/
2100
2101	void	1975	void
2102	set_cheat (object *op)	1976	set_cheat (object *op)
2103	{	1977	{
2104	SET_FLAG (op, FLAG_WAS_WIZ);	1978	SET_FLAG (op, FLAG_WAS_WIZ);
2105	flag_inv (op, FLAG_WAS_WIZ);	1979	flag_inv (op, FLAG_WAS_WIZ);
…		…
2124	* because arch_blocked (now ob_blocked) needs to know the movement type	1998	* because arch_blocked (now ob_blocked) needs to know the movement type
2125	* to know if the space in question will block the object. We can't use	1999	* to know if the space in question will block the object. We can't use
2126	* the archetype because that isn't correct if the monster has been	2000	* the archetype because that isn't correct if the monster has been
2127	* customized, changed states, etc.	2001	* customized, changed states, etc.
2128	*/	2002	*/
2129
2130	int	2003	int
2131	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)	2004	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2132	{	2005	{
2133	int
2134	i,
2135	index = 0, flag;	2006	int index = 0, flag;
2136	static int
2137	altern[SIZEOFFREE];	2007	int altern[SIZEOFFREE];
2138		2008
2139	for (i = start; i < stop; i++)	2009	for (int i = start; i < stop; i++)
2140	{	2010	{
2141	flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]);	2011	flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]);
2142	if (!flag)	2012	if (!flag)
2143	altern[index++] = i;	2013	altern [index++] = i;
2144		2014
2145	/* Basically, if we find a wall on a space, we cut down the search size.	2015	/* Basically, if we find a wall on a space, we cut down the search size.
2146	* In this way, we won't return spaces that are on another side of a wall.	2016	* In this way, we won't return spaces that are on another side of a wall.
2147	* This mostly work, but it cuts down the search size in all directions -	2017	* This mostly work, but it cuts down the search size in all directions -
2148	* if the space being examined only has a wall to the north and empty	2018	* if the space being examined only has a wall to the north and empty
2149	* spaces in all the other directions, this will reduce the search space	2019	* spaces in all the other directions, this will reduce the search space
2150	* to only the spaces immediately surrounding the target area, and	2020	* to only the spaces immediately surrounding the target area, and
2151	* won't look 2 spaces south of the target space.	2021	* won't look 2 spaces south of the target space.
2152	*/	2022	*/
2153	else if ((flag & AB_NO_PASS) && maxfree[i] < stop)	2023	else if ((flag & P_NO_PASS) && maxfree[i] < stop)
2154	stop = maxfree[i];	2024	stop = maxfree[i];
2155	}	2025	}
		2026
2156	if (!index)	2027	if (!index)
2157	return -1;	2028	return -1;
		2029
2158	return altern[RANDOM () % index];	2030	return altern[RANDOM () % index];
2159	}	2031	}
2160		2032
2161	/*	2033	/*
2162	* find_first_free_spot(archetype, maptile, x, y) works like	2034	* find_first_free_spot(archetype, maptile, x, y) works like
2163	* find_free_spot(), but it will search max number of squares.	2035	* find_free_spot(), but it will search max number of squares.
2164	* But it will return the first available spot, not a random choice.	2036	* But it will return the first available spot, not a random choice.
2165	* Changed 0.93.2: Have it return -1 if there is no free spot available.	2037	* Changed 0.93.2: Have it return -1 if there is no free spot available.
2166	*/	2038	*/
2167
2168	int	2039	int
2169	find_first_free_spot (const object *ob, maptile *m, int x, int y)	2040	find_first_free_spot (const object *ob, maptile *m, int x, int y)
2170	{	2041	{
2171	int
2172	i;
2173
2174	for (i = 0; i < SIZEOFFREE; i++)	2042	for (int i = 0; i < SIZEOFFREE; i++)
2175	{
2176	if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]))	2043	if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]))
2177	return i;	2044	return i;
2178	}	2045
2179	return -1;	2046	return -1;
2180	}	2047	}
2181		2048
2182	/*	2049	/*
2183	* The function permute(arr, begin, end) randomly reorders the array	2050	* The function permute(arr, begin, end) randomly reorders the array
2184	* arr[begin..end-1].	2051	* arr[begin..end-1].
		2052	* now uses a fisher-yates shuffle, old permute was broken
2185	*/	2053	*/
2186	static void	2054	static void
2187	permute (int *arr, int begin, int end)	2055	permute (int *arr, int begin, int end)
2188	{	2056	{
2189	int	2057	arr += begin;
2190	i,
2191	j,
2192	tmp,
2193	len;
2194
2195	len = end - begin;	2058	end -= begin;
2196	for (i = begin; i < end; i++)
2197	{
2198	j = begin + RANDOM () % len;
2199		2059
2200	tmp = arr[i];	2060	while (--end)
2201	arr[i] = arr[j];	2061	swap (arr [end], arr [RANDOM () % (end + 1)]);
2202	arr[j] = tmp;
2203	}
2204	}	2062	}
2205		2063
2206	/* new function to make monster searching more efficient, and effective!	2064	/* new function to make monster searching more efficient, and effective!
2207	* This basically returns a randomized array (in the passed pointer) of	2065	* This basically returns a randomized array (in the passed pointer) of
2208	* the spaces to find monsters. In this way, it won't always look for	2066	* the spaces to find monsters. In this way, it won't always look for
…		…
2211	* the 3x3 area will be searched, just not in a predictable order.	2069	* the 3x3 area will be searched, just not in a predictable order.
2212	*/	2070	*/
2213	void	2071	void
2214	get_search_arr (int *search_arr)	2072	get_search_arr (int *search_arr)
2215	{	2073	{
2216	int	2074	int i;
2217	i;
2218		2075
2219	for (i = 0; i < SIZEOFFREE; i++)	2076	for (i = 0; i < SIZEOFFREE; i++)
2220	{
2221	search_arr[i] = i;	2077	search_arr[i] = i;
2222	}
2223		2078
2224	permute (search_arr, 1, SIZEOFFREE1 + 1);	2079	permute (search_arr, 1, SIZEOFFREE1 + 1);
2225	permute (search_arr, SIZEOFFREE1 + 1, SIZEOFFREE2 + 1);	2080	permute (search_arr, SIZEOFFREE1 + 1, SIZEOFFREE2 + 1);
2226	permute (search_arr, SIZEOFFREE2 + 1, SIZEOFFREE);	2081	permute (search_arr, SIZEOFFREE2 + 1, SIZEOFFREE);
2227	}	2082	}
…		…
2236	* Perhaps incorrectly, but I'm making the assumption that exclude	2091	* Perhaps incorrectly, but I'm making the assumption that exclude
2237	* is actually want is going to try and move there. We need this info	2092	* is actually want is going to try and move there. We need this info
2238	* because we have to know what movement the thing looking to move	2093	* because we have to know what movement the thing looking to move
2239	* there is capable of.	2094	* there is capable of.
2240	*/	2095	*/
2241
2242	int	2096	int
2243	find_dir (maptile *m, int x, int y, object *exclude)	2097	find_dir (maptile *m, int x, int y, object *exclude)
2244	{	2098	{
2245	int
2246	i,
2247	max = SIZEOFFREE, mflags;	2099	int i, max = SIZEOFFREE, mflags;
2248		2100
2249	sint16 nx, ny;	2101	sint16 nx, ny;
2250	object *	2102	object *tmp;
2251	tmp;
2252	maptile *	2103	maptile *mp;
2253	mp;
2254		2104
2255	MoveType blocked, move_type;	2105	MoveType blocked, move_type;
2256		2106
2257	if (exclude && exclude->head)	2107	if (exclude && exclude->head)
2258	{	2108	{
…		…
2270	mp = m;	2120	mp = m;
2271	nx = x + freearr_x[i];	2121	nx = x + freearr_x[i];
2272	ny = y + freearr_y[i];	2122	ny = y + freearr_y[i];
2273		2123
2274	mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);	2124	mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);
		2125
2275	if (mflags & P_OUT_OF_MAP)	2126	if (mflags & P_OUT_OF_MAP)
2276	{
2277	max = maxfree[i];	2127	max = maxfree[i];
2278	}
2279	else	2128	else
2280	{	2129	{
2281	blocked = GET_MAP_MOVE_BLOCK (mp, nx, ny);	2130	mapspace &ms = mp->at (nx, ny);
		2131
		2132	blocked = ms.move_block;
2282		2133
2283	if ((move_type & blocked) == move_type)	2134	if ((move_type & blocked) == move_type)
2284	{
2285	max = maxfree[i];	2135	max = maxfree[i];
2286	}
2287	else if (mflags & P_IS_ALIVE)	2136	else if (mflags & P_IS_ALIVE)
2288	{	2137	{
2289	for (tmp = GET_MAP_OB (mp, nx, ny); tmp != NULL; tmp = tmp->above)	2138	for (tmp = ms.bot; tmp; tmp = tmp->above)
2290	{	2139	if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)
2291	if ((QUERY_FLAG (tmp, FLAG_MONSTER) || tmp->type == PLAYER) && (tmp != exclude || (tmp->head && tmp->head != exclude)))	2140	&& (tmp != exclude || (tmp->head && tmp->head != exclude)))
2292	{
2293	break;	2141	break;
2294	}	2142
2295	}
2296	if (tmp)	2143	if (tmp)
2297	{
2298	return freedir[i];	2144	return freedir[i];
2299	}
2300	}	2145	}
2301	}	2146	}
2302	}	2147	}
		2148
2303	return 0;	2149	return 0;
2304	}	2150	}
2305		2151
2306	/*	2152	/*
2307	* distance(object 1, object 2) will return the square of the	2153	* distance(object 1, object 2) will return the square of the
2308	* distance between the two given objects.	2154	* distance between the two given objects.
2309	*/	2155	*/
2310
2311	int	2156	int
2312	distance (const object *ob1, const object *ob2)	2157	distance (const object *ob1, const object *ob2)
2313	{	2158	{
2314	int
2315	i;
2316
2317	i = (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);	2159	return (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);
2318	return i;
2319	}	2160	}
2320		2161
2321	/*	2162	/*
2322	* find_dir_2(delta-x,delta-y) will return a direction in which	2163	* find_dir_2(delta-x,delta-y) will return a direction in which
2323	* an object which has subtracted the x and y coordinates of another	2164	* an object which has subtracted the x and y coordinates of another
2324	* object, needs to travel toward it.	2165	* object, needs to travel toward it.
2325	*/	2166	*/
2326
2327	int	2167	int
2328	find_dir_2 (int x, int y)	2168	find_dir_2 (int x, int y)
2329	{	2169	{
2330	int	2170	int q;
2331	q;
2332		2171
2333	if (y)	2172	if (y)
2334	q = x * 100 / y;	2173	q = x * 100 / y;
2335	else if (x)	2174	else if (x)
2336	q = -300 * x;	2175	q = -300 * x;
…		…
2371	int	2210	int
2372	absdir (int d)	2211	absdir (int d)
2373	{	2212	{
2374	while (d < 1)	2213	while (d < 1)
2375	d += 8;	2214	d += 8;
		2215
2376	while (d > 8)	2216	while (d > 8)
2377	d -= 8;	2217	d -= 8;
		2218
2378	return d;	2219	return d;
2379	}	2220	}
2380		2221
2381	/*	2222	/*
2382	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is	2223	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is
…		…
2384	*/	2225	*/
2385		2226
2386	int	2227	int
2387	dirdiff (int dir1, int dir2)	2228	dirdiff (int dir1, int dir2)
2388	{	2229	{
2389	int	2230	int d;
2390	d;
2391		2231
2392	d = abs (dir1 - dir2);	2232	d = abs (dir1 - dir2);
2393	if (d > 4)	2233	if (d > 4)
2394	d = 8 - d;	2234	d = 8 - d;
		2235
2395	return d;	2236	return d;
2396	}	2237	}
2397		2238
2398	/* peterm:	2239	/* peterm:
2399	* do LOS stuff for ball lightning. Go after the closest VISIBLE monster.	2240	* do LOS stuff for ball lightning. Go after the closest VISIBLE monster.
…		…
2402	* This basically means that if direction is 15, then it could either go	2243	* This basically means that if direction is 15, then it could either go
2403	* direction 4, 14, or 16 to get back to where we are.	2244	* direction 4, 14, or 16 to get back to where we are.
2404	* Moved from spell_util.c to object.c with the other related direction	2245	* Moved from spell_util.c to object.c with the other related direction
2405	* functions.	2246	* functions.
2406	*/	2247	*/
2407
2408	int
2409	reduction_dir[SIZEOFFREE][3] = {	2248	int reduction_dir[SIZEOFFREE][3] = {
2410	{0, 0, 0}, /* 0 */	2249	{0, 0, 0}, /* 0 */
2411	{0, 0, 0}, /* 1 */	2250	{0, 0, 0}, /* 1 */
2412	{0, 0, 0}, /* 2 */	2251	{0, 0, 0}, /* 2 */
2413	{0, 0, 0}, /* 3 */	2252	{0, 0, 0}, /* 3 */
2414	{0, 0, 0}, /* 4 */	2253	{0, 0, 0}, /* 4 */
…		…
2462	* find a path to that monster that we found. If not,	2301	* find a path to that monster that we found. If not,
2463	* we don't bother going toward it. Returns 1 if we	2302	* we don't bother going toward it. Returns 1 if we
2464	* can see a direct way to get it	2303	* can see a direct way to get it
2465	* Modified to be map tile aware -.MSW	2304	* Modified to be map tile aware -.MSW
2466	*/	2305	*/
2467
2468
2469	int	2306	int
2470	can_see_monsterP (maptile *m, int x, int y, int dir)	2307	can_see_monsterP (maptile *m, int x, int y, int dir)
2471	{	2308	{
2472	sint16 dx, dy;	2309	sint16 dx, dy;
2473	int
2474	mflags;	2310	int mflags;
2475		2311
2476	if (dir < 0)	2312	if (dir < 0)
2477	return 0; /* exit condition: invalid direction */	2313	return 0; /* exit condition: invalid direction */
2478		2314
2479	dx = x + freearr_x[dir];	2315	dx = x + freearr_x[dir];
…		…
2492	return 0;	2328	return 0;
2493		2329
2494	/* yes, can see. */	2330	/* yes, can see. */
2495	if (dir < 9)	2331	if (dir < 9)
2496	return 1;	2332	return 1;
		2333
2497	return can_see_monsterP (m, x, y, reduction_dir[dir][0]) |	2334	return can_see_monsterP (m, x, y, reduction_dir[dir][0])
2498	can_see_monsterP (m, x, y, reduction_dir[dir][1]) | can_see_monsterP (m, x, y, reduction_dir[dir][2]);	2335	| can_see_monsterP (m, x, y, reduction_dir[dir][1])
		2336	| can_see_monsterP (m, x, y, reduction_dir[dir][2]);
2499	}	2337	}
2500
2501
2502		2338
2503	/*	2339	/*
2504	* can_pick(picker, item): finds out if an object is possible to be	2340	* can_pick(picker, item): finds out if an object is possible to be
2505	* picked up by the picker. Returnes 1 if it can be	2341	* picked up by the picker. Returnes 1 if it can be
2506	* picked up, otherwise 0.	2342	* picked up, otherwise 0.
…		…
2517	return /*QUERY_FLAG(who,FLAG_WIZ)|| */	2353	return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2518	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&	2354	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
2519	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3));	2355	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3));
2520	}	2356	}
2521		2357
2522
2523	/*	2358	/*
2524	* create clone from object to another	2359	* create clone from object to another
2525	*/	2360	*/
2526	object *	2361	object *
2527	object_create_clone (object *asrc)	2362	object_create_clone (object *asrc)
2528	{	2363	{
2529	object *
2530	dst = NULL, *tmp, *src, *part, *prev, *item;	2364	object *dst = 0, *tmp, *src, *part, *prev, *item;
2531		2365
2532	if (!asrc)	2366	if (!asrc)
2533	return NULL;	2367	return 0;
		2368
2534	src = asrc;	2369	src = asrc;
2535	if (src->head)	2370	if (src->head)
2536	src = src->head;	2371	src = src->head;
2537		2372
2538	prev = NULL;	2373	prev = 0;
2539	for (part = src; part; part = part->more)	2374	for (part = src; part; part = part->more)
2540	{	2375	{
2541	tmp = get_object ();	2376	tmp = part->clone ();
2542	copy_object (part, tmp);
2543	tmp->x -= src->x;	2377	tmp->x -= src->x;
2544	tmp->y -= src->y;	2378	tmp->y -= src->y;
		2379
2545	if (!part->head)	2380	if (!part->head)
2546	{	2381	{
2547	dst = tmp;	2382	dst = tmp;
2548	tmp->head = NULL;	2383	tmp->head = 0;
2549	}	2384	}
2550	else	2385	else
2551	{
2552	tmp->head = dst;	2386	tmp->head = dst;
2553	}	2387
2554	tmp->more = NULL;	2388	tmp->more = 0;
		2389
2555	if (prev)	2390	if (prev)
2556	prev->more = tmp;	2391	prev->more = tmp;
		2392
2557	prev = tmp;	2393	prev = tmp;
2558	}	2394	}
2559		2395
2560	for (item = src->inv; item; item = item->below)	2396	for (item = src->inv; item; item = item->below)
2561	insert_ob_in_ob (object_create_clone (item), dst);	2397	insert_ob_in_ob (object_create_clone (item), dst);
…		…
2567	/* Basically, we save the content of the string to a temp file, then call */	2403	/* Basically, we save the content of the string to a temp file, then call */
2568	/* load_object on it. I admit it is a highly inefficient way to make things, */	2404	/* load_object on it. I admit it is a highly inefficient way to make things, */
2569	/* but it was simple to make and allows reusing the load_object function. */	2405	/* but it was simple to make and allows reusing the load_object function. */
2570	/* Remember not to use load_object_str in a time-critical situation. */	2406	/* Remember not to use load_object_str in a time-critical situation. */
2571	/* Also remember that multiparts objects are not supported for now. */	2407	/* Also remember that multiparts objects are not supported for now. */
2572
2573	object *	2408	object *
2574	load_object_str (const char *obstr)	2409	load_object_str (const char *obstr)
2575	{	2410	{
2576	object *op;	2411	object *op;
2577	char filename[MAX_BUF];	2412	char filename[MAX_BUF];
…		…
2587	}	2422	}
2588		2423
2589	fprintf (tempfile, obstr);	2424	fprintf (tempfile, obstr);
2590	fclose (tempfile);	2425	fclose (tempfile);
2591		2426
2592	op = get_object ();	2427	op = object::create ();
2593		2428
2594	object_thawer thawer (filename);	2429	object_thawer thawer (filename);
2595		2430
2596	if (thawer)	2431	if (thawer)
2597	load_object (thawer, op, 0);	2432	load_object (thawer, op, 0);
…		…
2607	* returns NULL if no match.	2442	* returns NULL if no match.
2608	*/	2443	*/
2609	object *	2444	object *
2610	find_obj_by_type_subtype (const object *who, int type, int subtype)	2445	find_obj_by_type_subtype (const object *who, int type, int subtype)
2611	{	2446	{
2612	object *tmp;
2613
2614	for (tmp = who->inv; tmp; tmp = tmp->below)	2447	for (object *tmp = who->inv; tmp; tmp = tmp->below)
2615	if (tmp->type == type && tmp->subtype == subtype)	2448	if (tmp->type == type && tmp->subtype == subtype)
2616	return tmp;	2449	return tmp;
2617		2450
2618	return NULL;	2451	return 0;
2619	}	2452	}
2620		2453
2621	/* If ob has a field named key, return the link from the list,	2454	/* If ob has a field named key, return the link from the list,
2622	* otherwise return NULL.	2455	* otherwise return NULL.
2623	*	2456	*
…		…
2625	* do the desired thing.	2458	* do the desired thing.
2626	*/	2459	*/
2627	key_value *	2460	key_value *
2628	get_ob_key_link (const object *ob, const char *key)	2461	get_ob_key_link (const object *ob, const char *key)
2629	{	2462	{
2630	key_value *link;
2631
2632	for (link = ob->key_values; link != NULL; link = link->next)	2463	for (key_value *link = ob->key_values; link; link = link->next)
2633	if (link->key == key)	2464	if (link->key == key)
2634	return link;	2465	return link;
2635		2466
2636	return NULL;	2467	return 0;
2637	}	2468	}
2638		2469
2639	/*	2470	/*
2640	* Returns the value of op has an extra_field for key, or NULL.	2471	* Returns the value of op has an extra_field for key, or NULL.
2641	*	2472	*
…		…
2681	* Returns TRUE on success.	2512	* Returns TRUE on success.
2682	*/	2513	*/
2683	int	2514	int
2684	set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key)	2515	set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key)
2685	{	2516	{
2686	key_value *
2687	field = NULL, *last = NULL;	2517	key_value *field = NULL, *last = NULL;
2688		2518
2689	for (field = op->key_values; field != NULL; field = field->next)	2519	for (field = op->key_values; field != NULL; field = field->next)
2690	{	2520	{
2691	if (field->key != canonical_key)	2521	if (field->key != canonical_key)
2692	{	2522	{
…		…
2720	/* IF we get here, key doesn't exist */	2550	/* IF we get here, key doesn't exist */
2721		2551
2722	/* No field, we'll have to add it. */	2552	/* No field, we'll have to add it. */
2723		2553
2724	if (!add_key)	2554	if (!add_key)
2725	{
2726	return FALSE;	2555	return FALSE;
2727	}	2556
2728	/* There isn't any good reason to store a null	2557	/* There isn't any good reason to store a null
2729	* value in the key/value list. If the archetype has	2558	* value in the key/value list. If the archetype has
2730	* this key, then we should also have it, so shouldn't	2559	* this key, then we should also have it, so shouldn't
2731	* be here. If user wants to store empty strings,	2560	* be here. If user wants to store empty strings,
2732	* should pass in ""	2561	* should pass in ""
…		…
2798		2627
2799	if (env)	2628	if (env)
2800	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2629	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2801		2630
2802	if (map)	2631	if (map)
2803	p += snprintf (p, 256, "(on %s@%d+%d)", map->path, x, y);	2632	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2804		2633
2805	return info;	2634	return info;
2806	}	2635	}
2807		2636
2808	const char *	2637	const char *

Diff Legend

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