ViewVC Help

View File | Revision Log | Show Annotations | Download File

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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.46 by root, Thu Sep 14 21:16:11 2006 UTC vs.
Revision 1.80 by root, Sat Dec 23 06:41:39 2006 UTC

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

Diff Legend

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