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

Diff Legend

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