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.70 by root, Tue Dec 19 05:12:52 2006 UTC vs.
Revision 1.159 by root, Mon Jun 4 13:04:00 2007 UTC

1	/*	1	/*
2	CrossFire, A Multiplayer game for X-windows	2	* This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game.
3		3	*
		4	* Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
4	Copyright (C) 2001 Mark Wedel & Crossfire Development Team	5	* Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team
5	Copyright (C) 1992 Frank Tore Johansen	6	* Copyright (©) 1992,2007 Frank Tore Johansen
6		7	*
7	This program is free software; you can redistribute it and/or modify	8	* Crossfire TRT is free software; you can redistribute it and/or modify it
8	it under the terms of the GNU General Public License as published by	9	* under the terms of the GNU General Public License as published by the Free
9	the Free Software Foundation; either version 2 of the License, or	10	* Software Foundation; either version 2 of the License, or (at your option)
10	(at your option) any later version.	11	* any later version.
11		12	*
12	This program is distributed in the hope that it will be useful,	13	* This program is distributed in the hope that it will be useful, but
13	but WITHOUT ANY WARRANTY; without even the implied warranty of	14	* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
14	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	15	* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
15	GNU General Public License for more details.	16	* for more details.
16		17	*
17	You should have received a copy of the GNU General Public License	18	* You should have received a copy of the GNU General Public License along
18	along with this program; if not, write to the Free Software	19	* with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51
19	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	20	* Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
20		21	*
21	The authors can be reached via e-mail at <crossfire@schmorp.de>	22	* The authors can be reached via e-mail to <crossfire@schmorp.de>
22	*/	23	*/
23		24
24	/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.	25	/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
25	sub/add_weight will transcend the environment updating the carrying	26	sub/add_weight will transcend the environment updating the carrying
26	variable. */	27	variable. */
27	#include <global.h>	28	#include <global.h>
28	#include <stdio.h>	29	#include <stdio.h>
29	#include <sys/types.h>	30	#include <sys/types.h>
30	#include <sys/uio.h>	31	#include <sys/uio.h>
31	#include <object.h>	32	#include <object.h>
32	#include <funcpoint.h>	33	#include <funcpoint.h>
		34	#include <sproto.h>
33	#include <loader.h>	35	#include <loader.h>
34		36
35	#include <bitset>	37	#include <bitset>
36		38
37	int nrofallocobjects = 0;	39	int nrofallocobjects = 0;
38	static UUID uuid;	40	static UUID uuid;
39	const uint64 UUID_SKIP = 1<<19;	41	const uint64 UUID_SKIP = 1<<19;
40		42
41	object *active_objects; /* List of active objects that need to be processed */	43	objectvec objects;
		44	activevec actives;
42		45
43	short freearr_x[SIZEOFFREE] = { 0, 0, 1, 1, 1, 0, -1, -1, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,	46	short freearr_x[SIZEOFFREE] = { 0, 0, 1, 1, 1, 0, -1, -1, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,
44	0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1	47	0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1
45	};	48	};
46	short freearr_y[SIZEOFFREE] = { 0, -1, -1, 0, 1, 1, 1, 0, -1, -2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2,	49	short freearr_y[SIZEOFFREE] = { 0, -1, -1, 0, 1, 1, 1, 0, -1, -2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2,
…		…
141	* objects with lists are rare, and lists stay short. If not, use a	144	* objects with lists are rare, and lists stay short. If not, use a
142	* different structure or at least keep the lists sorted...	145	* different structure or at least keep the lists sorted...
143	*/	146	*/
144		147
145	/* For each field in wants, */	148	/* For each field in wants, */
146	for (wants_field = wants->key_values; wants_field != NULL; wants_field = wants_field->next)	149	for (wants_field = wants->key_values; wants_field; wants_field = wants_field->next)
147	{	150	{
148	key_value *has_field;	151	key_value *has_field;
149		152
150	/* Look for a field in has with the same key. */	153	/* Look for a field in has with the same key. */
151	has_field = get_ob_key_link (has, wants_field->key);	154	has_field = get_ob_key_link (has, wants_field->key);
…		…
190	* Check nrof variable *before* calling can_merge()	193	* Check nrof variable *before* calling can_merge()
191	*	194	*
192	* Improvements made with merge: Better checking on potion, and also	195	* Improvements made with merge: Better checking on potion, and also
193	* check weight	196	* check weight
194	*/	197	*/
195
196	bool object::can_merge_slow (object *ob1, object *ob2)	198	bool object::can_merge_slow (object *ob1, object *ob2)
197	{	199	{
198	/* A couple quicksanity checks */	200	/* A couple quicksanity checks */
199	if (ob1 == ob2	201	if (ob1 == ob2
200	|| ob1->type != ob2->type	202	|| ob1->type != ob2->type
…		…
221	SET_FLAG (ob1, FLAG_BEEN_APPLIED);	223	SET_FLAG (ob1, FLAG_BEEN_APPLIED);
222		224
223	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))	225	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))
224	SET_FLAG (ob2, FLAG_BEEN_APPLIED);	226	SET_FLAG (ob2, FLAG_BEEN_APPLIED);
225		227
226	if ((ob1->flags ^ ob2->flags).reset (FLAG_INV_LOCKED).reset (FLAG_CLIENT_SENT).any ()	228	if ((ob1->flag ^ ob2->flag).reset (FLAG_INV_LOCKED).reset (FLAG_CLIENT_SENT).any ()
227	|| ob1->arch != ob2->arch	229	|| ob1->arch != ob2->arch
228	|| ob1->name != ob2->name	230	|| ob1->name != ob2->name
229	|| ob1->title != ob2->title	231	|| ob1->title != ob2->title
230	|| ob1->msg != ob2->msg	232	|| ob1->msg != ob2->msg
231	|| ob1->weight != ob2->weight	233	|| ob1->weight != ob2->weight
…		…
277		279
278	/* Note sure why the following is the case - either the object has to	280	/* Note sure why the following is the case - either the object has to
279	* be animated or have a very low speed. Is this an attempted monster	281	* be animated or have a very low speed. Is this an attempted monster
280	* check?	282	* check?
281	*/	283	*/
282	if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && FABS ((ob1)->speed) > MIN_ACTIVE_SPEED)	284	if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && ob1->has_active_speed ())
283	return 0;	285	return 0;
284		286
285	switch (ob1->type)	287	switch (ob1->type)
286	{	288	{
287	case SCROLL:	289	case SCROLL:
…		…
323	sum_weight (object *op)	325	sum_weight (object *op)
324	{	326	{
325	long sum;	327	long sum;
326	object *inv;	328	object *inv;
327		329
328	for (sum = 0, inv = op->inv; inv != NULL; inv = inv->below)	330	for (sum = 0, inv = op->inv; inv; inv = inv->below)
329	{	331	{
330	if (inv->inv)	332	if (inv->inv)
331	sum_weight (inv);	333	sum_weight (inv);
		334
332	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);	335	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);
333	}	336	}
334		337
335	if (op->type == CONTAINER && op->stats.Str)	338	if (op->type == CONTAINER && op->stats.Str)
336	sum = (sum * (100 - op->stats.Str)) / 100;	339	sum = (sum * (100 - op->stats.Str)) / 100;
…		…
352	op = op->env;	355	op = op->env;
353	return op;	356	return op;
354	}	357	}
355		358
356	/*	359	/*
357	* Eneq(@csd.uu.se): Since we can have items buried in a character we need
358	* a better check. We basically keeping traversing up until we can't
359	* or find a player.
360	*/
361
362	object *
363	is_player_inv (object *op)
364	{
365	for (; op != NULL && op->type != PLAYER; op = op->env)
366	if (op->env == op)
367	op->env = NULL;
368	return op;
369	}
370
371	/*
372	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.	360	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
373	* Some error messages.	361	* Some error messages.
374	* The result of the dump is stored in the static global errmsg array.	362	* The result of the dump is stored in the static global errmsg array.
375	*/	363	*/
376
377	char *	364	char *
378	dump_object (object *op)	365	dump_object (object *op)
379	{	366	{
380	if (!op)	367	if (!op)
381	return strdup ("[NULLOBJ]");	368	return strdup ("[NULLOBJ]");
382		369
383	object_freezer freezer;	370	object_freezer freezer;
384	save_object (freezer, op, 3);	371	op->write (freezer);
385	return freezer.as_string ();	372	return freezer.as_string ();
386	}	373	}
387		374
388	/*	375	/*
389	* get_nearest_part(multi-object, object 2) returns the part of the	376	* get_nearest_part(multi-object, object 2) returns the part of the
…		…
406	}	393	}
407		394
408	/*	395	/*
409	* Returns the object which has the count-variable equal to the argument.	396	* Returns the object which has the count-variable equal to the argument.
410	*/	397	*/
411
412	object *	398	object *
413	find_object (tag_t i)	399	find_object (tag_t i)
414	{	400	{
415	for (object *op = object::first; op; op = op->next)	401	for_all_objects (op)
416	if (op->count == i)	402	if (op->count == i)
417	return op;	403	return op;
418		404
419	return 0;	405	return 0;
420	}	406	}
421		407
422	/*	408	/*
423	* Returns the first object which has a name equal to the argument.	409	* Returns the first object which has a name equal to the argument.
424	* Used only by the patch command, but not all that useful.	410	* Used only by the patch command, but not all that useful.
425	* Enables features like "patch <name-of-other-player> food 999"	411	* Enables features like "patch <name-of-other-player> food 999"
426	*/	412	*/
427
428	object *	413	object *
429	find_object_name (const char *str)	414	find_object_name (const char *str)
430	{	415	{
431	shstr_cmp str_ (str);	416	shstr_cmp str_ (str);
432	object *op;	417	object *op;
433		418
434	for (op = object::first; op != NULL; op = op->next)	419	for_all_objects (op)
435	if (op->name == str_)	420	if (op->name == str_)
436	break;	421	break;
437		422
438	return op;	423	return op;
439	}	424	}
…		…
465	owner = owner->owner;	450	owner = owner->owner;
466		451
467	this->owner = owner;	452	this->owner = owner;
468	}	453	}
469		454
		455	int
		456	object::slottype () const
		457	{
		458	if (type == SKILL)
		459	{
		460	if (IS_COMBAT_SKILL (subtype)) return slot_combat;
		461	if (IS_RANGED_SKILL (subtype)) return slot_ranged;
		462	}
		463	else
		464	{
		465	if (slot [body_combat].info) return slot_combat;
		466	if (slot [body_range ].info) return slot_ranged;
		467	}
		468
		469	return slot_none;
		470	}
		471
		472	bool
		473	object::change_weapon (object *ob)
		474	{
		475	if (current_weapon == ob)
		476	return true;
		477
		478	if (chosen_skill)
		479	chosen_skill->flag [FLAG_APPLIED] = false;
		480
		481	current_weapon = ob;
		482	chosen_skill = !ob || ob->type == SKILL ? ob : find_skill_by_name (this, ob->skill);
		483
		484	if (chosen_skill)
		485	chosen_skill->flag [FLAG_APPLIED] = true;
		486
		487	update_stats ();
		488
		489	if (ob)
		490	{
		491	// now check wether any body locations became invalid, in which case
		492	// we cannot apply the weapon at the moment.
		493	for (int i = 0; i < NUM_BODY_LOCATIONS; ++i)
		494	if (slot[i].used < 0)
		495	{
		496	current_weapon = chosen_skill = 0;
		497	update_stats ();
		498
		499	new_draw_info_format (NDI_UNIQUE, 0, this,
		500	"You try to balance all your items at once, "
		501	"but the %s is just too much for your body. "
		502	"[You need to unapply some items first.]", &ob->name);
		503	return false;
		504	}
		505
		506	//new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);
		507	}
		508	else
		509	;//new_draw_info_format (NDI_UNIQUE, 0, this, "You unwield your weapons.");
		510
		511	if (ob && !ob->flag [FLAG_APPLIED] && ob->type != SPELL)
		512	{
		513	LOG (llevError | logBacktrace, "%s changed to unapplied weapon %s",
		514	&name, ob->debug_desc ());
		515	return false;
		516	}
		517
		518	return true;
		519	}
		520
470	/* Zero the key_values on op, decrementing the shared-string	521	/* Zero the key_values on op, decrementing the shared-string
471	* refcounts and freeing the links.	522	* refcounts and freeing the links.
472	*/	523	*/
473	static void	524	static void
474	free_key_values (object *op)	525	free_key_values (object *op)
475	{	526	{
476	for (key_value *i = op->key_values; i != 0;)	527	for (key_value *i = op->key_values; i; )
477	{	528	{
478	key_value *next = i->next;	529	key_value *next = i->next;
479	delete i;	530	delete i;
480		531
481	i = next;	532	i = next;
482	}	533	}
483		534
484	op->key_values = 0;	535	op->key_values = 0;
485	}	536	}
486		537
487	void object::clear ()	538	object &
		539	object::operator =(const object &src)
488	{	540	{
489	attachable_base::clear ();	541	bool is_freed = flag [FLAG_FREED];
		542	bool is_removed = flag [FLAG_REMOVED];
490		543
491	free_key_values (this);
492
493	owner = 0;
494	name = 0;
495	name_pl = 0;
496	title = 0;
497	race = 0;
498	slaying = 0;
499	skill = 0;
500	msg = 0;
501	lore = 0;
502	custom_name = 0;
503	materialname = 0;
504	contr = 0;
505	below = 0;
506	above = 0;
507	inv = 0;
508	container = 0;
509	env = 0;
510	more = 0;
511	head = 0;
512	map = 0;
513	active_next = 0;
514	active_prev = 0;
515
516	memset (static_cast<object_pod *>(this), 0, sizeof (object_pod));
517
518	SET_FLAG (this, FLAG_REMOVED);
519
520	/* What is not cleared is next, prev, and count */
521
522	expmul = 1.0;
523	face = blank_face;
524
525	if (settings.casting_time)
526	casting_time = -1;
527	}
528
529	/*
530	* copy_to first frees everything allocated by the dst object,
531	* and then copies the contents of itself into the second
532	* object, allocating what needs to be allocated. Basically, any
533	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
534	* if the first object is freed, the pointers in the new object
535	* will point at garbage.
536	*/
537	void
538	object::copy_to (object *dst)
539	{
540	bool is_freed = QUERY_FLAG (dst, FLAG_FREED);
541	bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED);
542
543	*(object_copy *)dst = *this;	544	*(object_copy *)this = src;
544	*(object_pod *)dst = *this;
545		545
546	if (self || cb)	546	flag [FLAG_FREED] = is_freed;
547	INVOKE_OBJECT (CLONE, this, ARG_OBJECT (dst));	547	flag [FLAG_REMOVED] = is_removed;
548
549	if (is_freed)
550	SET_FLAG (dst, FLAG_FREED);
551
552	if (is_removed)
553	SET_FLAG (dst, FLAG_REMOVED);
554
555	if (speed < 0)
556	dst->speed_left = speed_left - RANDOM () % 200 / 100.0;
557		548
558	/* Copy over key_values, if any. */	549	/* Copy over key_values, if any. */
559	if (key_values)	550	if (src.key_values)
560	{	551	{
561	key_value *tail = 0;	552	key_value *tail = 0;
562	key_value *i;
563
564	dst->key_values = 0;	553	key_values = 0;
565		554
566	for (i = key_values; i; i = i->next)	555	for (key_value *i = src.key_values; i; i = i->next)
567	{	556	{
568	key_value *new_link = new key_value;	557	key_value *new_link = new key_value;
569		558
570	new_link->next = 0;	559	new_link->next = 0;
571	new_link->key = i->key;	560	new_link->key = i->key;
572	new_link->value = i->value;	561	new_link->value = i->value;
573		562
574	/* Try and be clever here, too. */	563	/* Try and be clever here, too. */
575	if (!dst->key_values)	564	if (!key_values)
576	{	565	{
577	dst->key_values = new_link;	566	key_values = new_link;
578	tail = new_link;	567	tail = new_link;
579	}	568	}
580	else	569	else
581	{	570	{
582	tail->next = new_link;	571	tail->next = new_link;
583	tail = new_link;	572	tail = new_link;
584	}	573	}
585	}	574	}
586	}	575	}
		576	}
587		577
588	update_ob_speed (dst);	578	/*
		579	* copy_to first frees everything allocated by the dst object,
		580	* and then copies the contents of itself into the second
		581	* object, allocating what needs to be allocated. Basically, any
		582	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
		583	* if the first object is freed, the pointers in the new object
		584	* will point at garbage.
		585	*/
		586	void
		587	object::copy_to (object *dst)
		588	{
		589	*dst = *this;
		590
		591	if (speed < 0)
		592	dst->speed_left = speed_left - rndm ();
		593
		594	dst->set_speed (dst->speed);
		595	}
		596
		597	void
		598	object::instantiate ()
		599	{
		600	if (!uuid.seq) // HACK
		601	uuid = gen_uuid ();
		602
		603	speed_left = -0.1f;
		604	/* copy the body_info to the body_used - this is only really
		605	* need for monsters, but doesn't hurt to do it for everything.
		606	* by doing so, when a monster is created, it has good starting
		607	* values for the body_used info, so when items are created
		608	* for it, they can be properly equipped.
		609	*/
		610	for (int i = NUM_BODY_LOCATIONS; i--; )
		611	slot[i].used = slot[i].info;
		612
		613	attachable::instantiate ();
589	}	614	}
590		615
591	object *	616	object *
592	object::clone ()	617	object::clone ()
593	{	618	{
…		…
599	/*	624	/*
600	* If an object with the IS_TURNABLE() flag needs to be turned due	625	* If an object with the IS_TURNABLE() flag needs to be turned due
601	* to the closest player being on the other side, this function can	626	* to the closest player being on the other side, this function can
602	* be called to update the face variable, _and_ how it looks on the map.	627	* be called to update the face variable, _and_ how it looks on the map.
603	*/	628	*/
604
605	void	629	void
606	update_turn_face (object *op)	630	update_turn_face (object *op)
607	{	631	{
608	if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || op->arch == NULL)	632	if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || !op->arch)
609	return;	633	return;
		634
610	SET_ANIMATION (op, op->direction);	635	SET_ANIMATION (op, op->direction);
611	update_object (op, UP_OBJ_FACE);	636	update_object (op, UP_OBJ_FACE);
612	}	637	}
613		638
614	/*	639	/*
615	* Updates the speed of an object. If the speed changes from 0 to another	640	* Updates the speed of an object. If the speed changes from 0 to another
616	* value, or vice versa, then add/remove the object from the active list.	641	* value, or vice versa, then add/remove the object from the active list.
617	* This function needs to be called whenever the speed of an object changes.	642	* This function needs to be called whenever the speed of an object changes.
618	*/	643	*/
619	void	644	void
620	update_ob_speed (object *op)	645	object::set_speed (float speed)
621	{	646	{
622	extern int arch_init;	647	if (flag [FLAG_FREED] && speed)
623
624	/* No reason putting the archetypes objects on the speed list,
625	* since they never really need to be updated.
626	*/
627
628	if (QUERY_FLAG (op, FLAG_FREED) && op->speed)
629	{	648	{
630	LOG (llevError, "Object %s is freed but has speed.\n", &op->name);	649	LOG (llevError, "Object %s is freed but has speed.\n", &name);
631	#ifdef MANY_CORES
632	abort ();
633	#else
634	op->speed = 0;	650	speed = 0;
635	#endif
636	}
637
638	if (arch_init)
639	return;
640
641	if (FABS (op->speed) > MIN_ACTIVE_SPEED)
642	{	651	}
643	/* If already on active list, don't do anything */
644	if (op->active_next || op->active_prev || op == active_objects)
645	return;
646		652
647	/* process_events() expects us to insert the object at the beginning	653	this->speed = speed;
648	* of the list. */
649	op->active_next = active_objects;
650		654
651	if (op->active_next != NULL)	655	if (has_active_speed ())
652	op->active_next->active_prev = op;	656	activate ();
653
654	active_objects = op;
655	}
656	else	657	else
657	{	658	deactivate ();
658	/* If not on the active list, nothing needs to be done */
659	if (!op->active_next && !op->active_prev && op != active_objects)
660	return;
661
662	if (op->active_prev == NULL)
663	{
664	active_objects = op->active_next;
665
666	if (op->active_next != NULL)
667	op->active_next->active_prev = NULL;
668	}
669	else
670	{
671	op->active_prev->active_next = op->active_next;
672
673	if (op->active_next)
674	op->active_next->active_prev = op->active_prev;
675	}
676
677	op->active_next = NULL;
678	op->active_prev = NULL;
679	}
680	}	659	}
681		660
682	/* This function removes object 'op' from the list of active
683	* objects.
684	* This should only be used for style maps or other such
685	* reference maps where you don't want an object that isn't
686	* in play chewing up cpu time getting processed.
687	* The reverse of this is to call update_ob_speed, which
688	* will do the right thing based on the speed of the object.
689	*/
690	void
691	remove_from_active_list (object *op)
692	{
693	/* If not on the active list, nothing needs to be done */
694	if (!op->active_next && !op->active_prev && op != active_objects)
695	return;
696
697	if (op->active_prev == NULL)
698	{
699	active_objects = op->active_next;
700	if (op->active_next != NULL)
701	op->active_next->active_prev = NULL;
702	}
703	else
704	{
705	op->active_prev->active_next = op->active_next;
706	if (op->active_next)
707	op->active_next->active_prev = op->active_prev;
708	}
709	op->active_next = NULL;
710	op->active_prev = NULL;
711	}
712
713	/*	661	/*
714	* update_object() updates the array which represents the map.	662	* update_object() updates the the map.
715	* It takes into account invisible objects (and represent squares covered	663	* It takes into account invisible objects (and represent squares covered
716	* by invisible objects by whatever is below them (unless it's another	664	* by invisible objects by whatever is below them (unless it's another
717	* invisible object, etc...)	665	* invisible object, etc...)
718	* If the object being updated is beneath a player, the look-window	666	* If the object being updated is beneath a player, the look-window
719	* of that player is updated (this might be a suboptimal way of	667	* of that player is updated (this might be a suboptimal way of
720	* updating that window, though, since update_object() is called _often_)	668	* updating that window, though, since update_object() is called _often_)
721	*	669	*
722	* action is a hint of what the caller believes need to be done.	670	* action is a hint of what the caller believes need to be done.
723	* For example, if the only thing that has changed is the face (due to
724	* an animation), we don't need to call update_position until that actually
725	* comes into view of a player. OTOH, many other things, like addition/removal
726	* of walls or living creatures may need us to update the flags now.
727	* current action are:	671	* current action are:
728	* UP_OBJ_INSERT: op was inserted	672	* UP_OBJ_INSERT: op was inserted
729	* UP_OBJ_REMOVE: op was removed	673	* UP_OBJ_REMOVE: op was removed
730	* UP_OBJ_CHANGE: object has somehow changed. In this case, we always update	674	* UP_OBJ_CHANGE: object has somehow changed. In this case, we always update
731	* as that is easier than trying to look at what may have changed.	675	* as that is easier than trying to look at what may have changed.
732	* UP_OBJ_FACE: only the objects face has changed.	676	* UP_OBJ_FACE: only the objects face has changed.
733	*/	677	*/
734
735	void	678	void
736	update_object (object *op, int action)	679	update_object (object *op, int action)
737	{	680	{
738	int update_now = 0, flags;
739	MoveType move_on, move_off, move_block, move_slow;
740
741	if (op == NULL)	681	if (op == NULL)
742	{	682	{
743	/* this should never happen */	683	/* this should never happen */
744	LOG (llevDebug, "update_object() called for NULL object.\n");	684	LOG (llevDebug, "update_object() called for NULL object.\n");
745	return;	685	return;
746	}	686	}
747		687
748	if (op->env != NULL)	688	if (op->env)
749	{	689	{
750	/* Animation is currently handled by client, so nothing	690	/* Animation is currently handled by client, so nothing
751	* to do in this case.	691	* to do in this case.
752	*/	692	*/
753	return;	693	return;
…		…
758	*/	698	*/
759	if (!op->map || op->map->in_memory == MAP_SAVING)	699	if (!op->map || op->map->in_memory == MAP_SAVING)
760	return;	700	return;
761		701
762	/* make sure the object is within map boundaries */	702	/* make sure the object is within map boundaries */
763	if (op->x < 0 || op->x >= MAP_WIDTH (op->map) || op->y < 0 || op->y >= MAP_HEIGHT (op->map))	703	if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height)
764	{	704	{
765	LOG (llevError, "update_object() called for object out of map!\n");	705	LOG (llevError, "update_object() called for object out of map!\n");
766	#ifdef MANY_CORES	706	#ifdef MANY_CORES
767	abort ();	707	abort ();
768	#endif	708	#endif
769	return;	709	return;
770	}	710	}
771		711
772	flags = GET_MAP_FLAGS (op->map, op->x, op->y);	712	mapspace &m = op->ms ();
773	SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NEED_UPDATE);
774	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);
775	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);
776	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);
777	move_off = GET_MAP_MOVE_OFF (op->map, op->x, op->y);
778		713
		714	if (!(m.flags_ & P_UPTODATE))
		715	/* nop */;
779	if (action == UP_OBJ_INSERT)	716	else if (action == UP_OBJ_INSERT)
780	{	717	{
		718	// this is likely overkill, TODO: revisit (schmorp)
781	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(flags & P_BLOCKSVIEW))	719	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
782	update_now = 1;
783
784	if (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(flags & P_NO_MAGIC))	720	|| (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))
785	update_now = 1;	721	|| (op->type == PLAYER && !(m.flags_ & P_PLAYER))
786		722	|| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
		723	|| (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))
787	if (QUERY_FLAG (op, FLAG_DAMNED) && !(flags & P_NO_CLERIC))	724	|| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))
788	update_now = 1;
789
790	if (QUERY_FLAG (op, FLAG_ALIVE) && !(flags & P_IS_ALIVE))
791	update_now = 1;
792
793	if (op->type == SAFE_GROUND && !(flags & P_SAFE))
794	update_now = 1;
795
796	if ((move_on | op->move_on) != move_on)	725	|| (m.move_on | op->move_on ) != m.move_on
797	update_now = 1;
798
799	if ((move_off | op->move_off) != move_off)	726	|| (m.move_off | op->move_off ) != m.move_off
800	update_now = 1;	727	|| (m.move_slow | op->move_slow) != m.move_slow
801
802	/* This isn't perfect, but I don't expect a lot of objects to	728	/* This isn't perfect, but I don't expect a lot of objects to
803	* to have move_allow right now.	729	* to have move_allow right now.
804	*/	730	*/
805	if (((move_block | op->move_block) & ~op->move_allow) != move_block)	731	|| ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block
806	update_now = 1;	732	|| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)
807		733	m.flags_ = 0;
808	if ((move_slow | op->move_slow) != move_slow)
809	update_now = 1;
810	}	734	}
811
812	/* if the object is being removed, we can't make intelligent	735	/* if the object is being removed, we can't make intelligent
813	* decisions, because remove_ob can't really pass the object	736	* decisions, because remove_ob can't really pass the object
814	* that is being removed.	737	* that is being removed.
815	*/	738	*/
816	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)	739	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
817	update_now = 1;	740	m.flags_ = 0;
818	else if (action == UP_OBJ_FACE)	741	else if (action == UP_OBJ_FACE)
819	/* Nothing to do for that case */ ;	742	/* Nothing to do for that case */ ;
820	else	743	else
821	LOG (llevError, "update_object called with invalid action: %d\n", action);	744	LOG (llevError, "update_object called with invalid action: %d\n", action);
822		745
823	if (update_now)
824	{
825	SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NO_ERROR | P_NEED_UPDATE);
826	update_position (op->map, op->x, op->y);
827	}
828
829	if (op->more != NULL)	746	if (op->more)
830	update_object (op->more, action);	747	update_object (op->more, action);
831	}
832
833	object::vector object::mortals;
834	object::vector object::objects; // not yet used
835	object *object::first;
836
837	void object::free_mortals ()
838	{
839	for (AUTODECL (i, mortals.begin ()); i != mortals.end ();)
840	if ((*i)->refcnt)
841	++i; // further delay freeing
842	else
843	{
844	delete *i;
845	mortals.erase (i);
846	}
847	}	748	}
848		749
849	object::object ()	750	object::object ()
850	{	751	{
851	SET_FLAG (this, FLAG_REMOVED);	752	SET_FLAG (this, FLAG_REMOVED);
…		…
854	face = blank_face;	755	face = blank_face;
855	}	756	}
856		757
857	object::~object ()	758	object::~object ()
858	{	759	{
		760	unlink ();
		761
859	free_key_values (this);	762	free_key_values (this);
860	}	763	}
861		764
		765	static int object_count;
		766
862	void object::link ()	767	void object::link ()
863	{	768	{
864	count = ++ob_count;	769	assert (!index);//D
865	uuid = gen_uuid ();	770	uuid = gen_uuid ();
		771	count = ++object_count;
866		772
867	prev = 0;	773	refcnt_inc ();
868	next = object::first;	774	objects.insert (this);
869
870	if (object::first)
871	object::first->prev = this;
872
873	object::first = this;
874	}	775	}
875		776
876	void object::unlink ()	777	void object::unlink ()
877	{	778	{
878	if (this == object::first)	779	if (!index)
879	object::first = next;	780	return;
880		781
881	/* Remove this object from the list of used objects */	782	objects.erase (this);
882	if (prev) prev->next = next;	783	refcnt_dec ();
883	if (next) next->prev = prev;	784	}
884		785
885	prev = 0;	786	void
886	next = 0;	787	object::activate ()
		788	{
		789	/* If already on active list, don't do anything */
		790	if (active)
		791	return;
		792
		793	if (has_active_speed ())
		794	actives.insert (this);
		795	}
		796
		797	void
		798	object::activate_recursive ()
		799	{
		800	activate ();
		801
		802	for (object *op = inv; op; op = op->below)
		803	op->activate_recursive ();
		804	}
		805
		806	/* This function removes object 'op' from the list of active
		807	* objects.
		808	* This should only be used for style maps or other such
		809	* reference maps where you don't want an object that isn't
		810	* in play chewing up cpu time getting processed.
		811	* The reverse of this is to call update_ob_speed, which
		812	* will do the right thing based on the speed of the object.
		813	*/
		814	void
		815	object::deactivate ()
		816	{
		817	/* If not on the active list, nothing needs to be done */
		818	if (!active)
		819	return;
		820
		821	actives.erase (this);
		822	}
		823
		824	void
		825	object::deactivate_recursive ()
		826	{
		827	for (object *op = inv; op; op = op->below)
		828	op->deactivate_recursive ();
		829
		830	deactivate ();
		831	}
		832
		833	void
		834	object::set_flag_inv (int flag, int value)
		835	{
		836	for (object *op = inv; op; op = op->below)
		837	{
		838	op->flag [flag] = value;
		839	op->set_flag_inv (flag, value);
		840	}
		841	}
		842
		843	/*
		844	* Remove and free all objects in the inventory of the given object.
		845	* object.c ?
		846	*/
		847	void
		848	object::destroy_inv (bool drop_to_ground)
		849	{
		850	// need to check first, because the checks below might segfault
		851	// as we might be on an invalid mapspace and crossfire code
		852	// is too buggy to ensure that the inventory is empty.
		853	// corollary: if you create arrows etc. with stuff in tis inventory,
		854	// cf will crash below with off-map x and y
		855	if (!inv)
		856	return;
		857
		858	/* Only if the space blocks everything do we not process -
		859	* if some form of movement is allowed, let objects
		860	* drop on that space.
		861	*/
		862	if (!drop_to_ground
		863	|| !map
		864	|| map->in_memory != MAP_IN_MEMORY
		865	|| map->nodrop
		866	|| ms ().move_block == MOVE_ALL)
		867	{
		868	while (inv)
		869	{
		870	inv->destroy_inv (drop_to_ground);
		871	inv->destroy ();
		872	}
		873	}
		874	else
		875	{ /* Put objects in inventory onto this space */
		876	while (inv)
		877	{
		878	object *op = inv;
		879
		880	if (op->flag [FLAG_STARTEQUIP]
		881	|| op->flag [FLAG_NO_DROP]
		882	|| op->type == RUNE
		883	|| op->type == TRAP
		884	|| op->flag [FLAG_IS_A_TEMPLATE]
		885	|| op->flag [FLAG_DESTROY_ON_DEATH])
		886	op->destroy ();
		887	else
		888	map->insert (op, x, y);
		889	}
		890	}
887	}	891	}
888		892
889	object *object::create ()	893	object *object::create ()
890	{	894	{
891	object *op = new object;	895	object *op = new object;
892	op->link ();	896	op->link ();
893	return op;	897	return op;
894	}	898	}
895		899
896	/*	900	void
897	* free_object() frees everything allocated by an object, removes	901	object::do_destroy ()
898	* it from the list of used objects, and puts it on the list of
899	* free objects. The IS_FREED() flag is set in the object.
900	* The object must have been removed by remove_ob() first for
901	* this function to succeed.
902	*
903	* If destroy_inventory is set, free inventory as well. Else drop items in
904	* inventory to the ground.
905	*/
906	void object::destroy (bool destroy_inventory)
907	{	902	{
908	if (QUERY_FLAG (this, FLAG_FREED))	903	attachable::do_destroy ();
909	return;
910		904
911	if (QUERY_FLAG (this, FLAG_FRIENDLY))	905	if (flag [FLAG_IS_LINKED])
		906	remove_button_link (this);
		907
		908	if (flag [FLAG_FRIENDLY])
912	remove_friendly_object (this);	909	remove_friendly_object (this);
913		910
914	if (!QUERY_FLAG (this, FLAG_REMOVED))	911	if (!flag [FLAG_REMOVED])
915	remove ();	912	remove ();
916		913
917	SET_FLAG (this, FLAG_FREED);	914	destroy_inv (true);
918		915
919	if (more)	916	deactivate ();
920	{	917	unlink ();
921	more->destroy (destroy_inventory);
922	more = 0;
923	}
924		918
925	if (inv)	919	flag [FLAG_FREED] = 1;
926	{
927	/* Only if the space blocks everything do we not process -
928	* if some form of movement is allowed, let objects
929	* drop on that space.
930	*/
931	if (destroy_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
932	{
933	object *op = inv;
934
935	while (op)
936	{
937	object *tmp = op->below;
938	op->destroy (destroy_inventory);
939	op = tmp;
940	}
941	}
942	else
943	{ /* Put objects in inventory onto this space */
944	object *op = inv;
945
946	while (op)
947	{
948	object *tmp = op->below;
949
950	op->remove ();
951
952	if (QUERY_FLAG (op, FLAG_STARTEQUIP)
953	|| QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
954	op->destroy ();
955	else
956	{
957	op->x = x;
958	op->y = y;
959	insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */
960	}
961
962	op = tmp;
963	}
964	}
965	}
966		920
967	// hack to ensure that freed objects still have a valid map	921	// hack to ensure that freed objects still have a valid map
968	{	922	{
969	static maptile *freed_map; // freed objects are moved here to avoid crashes	923	static maptile *freed_map; // freed objects are moved here to avoid crashes
970		924
…		…
974		928
975	freed_map->name = "/internal/freed_objects_map";	929	freed_map->name = "/internal/freed_objects_map";
976	freed_map->width = 3;	930	freed_map->width = 3;
977	freed_map->height = 3;	931	freed_map->height = 3;
978		932
979	freed_map->allocate ();	933	freed_map->alloc ();
		934	freed_map->in_memory = MAP_IN_MEMORY;
980	}	935	}
981		936
982	map = freed_map;	937	map = freed_map;
983	x = 1;	938	x = 1;
984	y = 1;	939	y = 1;
985	}	940	}
986		941
		942	head = 0;
		943
		944	if (more)
		945	{
		946	more->destroy ();
		947	more = 0;
		948	}
		949
987	// clear those pointers that likely might have circular references to us	950	// clear those pointers that likely might have circular references to us
988	owner = 0;	951	owner = 0;
989	enemy = 0;	952	enemy = 0;
990	attacked_by = 0;	953	attacked_by = 0;
		954	}
991		955
992	// only relevant for players(?), but make sure of it anyways	956	void
993	contr = 0;	957	object::destroy (bool destroy_inventory)
		958	{
		959	if (destroyed ())
		960	return;
994		961
995	/* Remove object from the active list */	962	if (destroy_inventory)
996	speed = 0;	963	destroy_inv (false);
997	update_ob_speed (this);
998		964
999	unlink ();	965	attachable::destroy ();
1000
1001	mortals.push_back (this);
1002	}	966	}
1003		967
1004	/*	968	/*
1005	* sub_weight() recursively (outwards) subtracts a number from the	969	* sub_weight() recursively (outwards) subtracts a number from the
1006	* weight of an object (and what is carried by it's environment(s)).	970	* weight of an object (and what is carried by it's environment(s)).
…		…
1022	* This function removes the object op from the linked list of objects	986	* This function removes the object op from the linked list of objects
1023	* which it is currently tied to. When this function is done, the	987	* which it is currently tied to. When this function is done, the
1024	* object will have no environment. If the object previously had an	988	* object will have no environment. If the object previously had an
1025	* environment, the x and y coordinates will be updated to	989	* environment, the x and y coordinates will be updated to
1026	* the previous environment.	990	* the previous environment.
1027	* Beware: This function is called from the editor as well!
1028	*/	991	*/
1029	void	992	void
1030	object::remove ()	993	object::do_remove ()
1031	{	994	{
1032	object *tmp, *last = 0;	995	object *tmp, *last = 0;
1033	object *otmp;	996	object *otmp;
1034		997
1035	int check_walk_off;
1036
1037	if (QUERY_FLAG (this, FLAG_REMOVED))	998	if (QUERY_FLAG (this, FLAG_REMOVED))
1038	return;	999	return;
1039		1000
1040	SET_FLAG (this, FLAG_REMOVED);	1001	SET_FLAG (this, FLAG_REMOVED);
		1002	INVOKE_OBJECT (REMOVE, this);
1041		1003
1042	if (more)	1004	if (more)
1043	more->remove ();	1005	more->remove ();
1044		1006
1045	/*	1007	/*
…		…
1055		1017
1056	/* NO_FIX_PLAYER is set when a great many changes are being	1018	/* NO_FIX_PLAYER is set when a great many changes are being
1057	* made to players inventory. If set, avoiding the call	1019	* made to players inventory. If set, avoiding the call
1058	* to save cpu time.	1020	* to save cpu time.
1059	*/	1021	*/
1060	if ((otmp = is_player_inv (env)) != NULL && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1022	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1061	fix_player (otmp);	1023	otmp->update_stats ();
1062		1024
1063	if (above != NULL)	1025	if (above)
1064	above->below = below;	1026	above->below = below;
1065	else	1027	else
1066	env->inv = below;	1028	env->inv = below;
1067		1029
1068	if (below != NULL)	1030	if (below)
1069	below->above = above;	1031	below->above = above;
1070		1032
1071	/* we set up values so that it could be inserted into	1033	/* we set up values so that it could be inserted into
1072	* the map, but we don't actually do that - it is up	1034	* the map, but we don't actually do that - it is up
1073	* to the caller to decide what we want to do.	1035	* to the caller to decide what we want to do.
…		…
1077	above = 0, below = 0;	1039	above = 0, below = 0;
1078	env = 0;	1040	env = 0;
1079	}	1041	}
1080	else if (map)	1042	else if (map)
1081	{	1043	{
1082	/* Re did the following section of code - it looks like it had	1044	if (type == PLAYER)
1083	* lots of logic for things we no longer care about
1084	*/	1045	{
		1046	// leaving a spot always closes any open container on the ground
		1047	if (container && !container->env)
		1048	// this causes spurious floorbox updates, but it ensures
		1049	// that the CLOSE event is being sent.
		1050	close_container ();
		1051
		1052	--map->players;
		1053	map->touch ();
		1054	}
		1055
		1056	map->dirty = true;
		1057	mapspace &ms = this->ms ();
1085		1058
1086	/* link the object above us */	1059	/* link the object above us */
1087	if (above)	1060	if (above)
1088	above->below = below;	1061	above->below = below;
1089	else	1062	else
1090	SET_MAP_TOP (map, x, y, below); /* we were top, set new top */	1063	ms.top = below; /* we were top, set new top */
1091		1064
1092	/* Relink the object below us, if there is one */	1065	/* Relink the object below us, if there is one */
1093	if (below)	1066	if (below)
1094	below->above = above;	1067	below->above = above;
1095	else	1068	else
…		…
1097	/* Nothing below, which means we need to relink map object for this space	1070	/* Nothing below, which means we need to relink map object for this space
1098	* use translated coordinates in case some oddness with map tiling is	1071	* use translated coordinates in case some oddness with map tiling is
1099	* evident	1072	* evident
1100	*/	1073	*/
1101	if (GET_MAP_OB (map, x, y) != this)	1074	if (GET_MAP_OB (map, x, y) != this)
1102	{
1103	char *dump = dump_object (this);
1104	LOG (llevError,
1105	"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);	1075	LOG (llevError, "remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom? %s\n", debug_desc ());
1106	free (dump);
1107	dump = dump_object (GET_MAP_OB (map, x, y));
1108	LOG (llevError, "%s\n", dump);
1109	free (dump);
1110	}
1111		1076
1112	SET_MAP_OB (map, x, y, above); /* goes on above it. */	1077	ms.bot = above; /* goes on above it. */
1113	}	1078	}
1114		1079
1115	above = 0;	1080	above = 0;
1116	below = 0;	1081	below = 0;
1117		1082
1118	if (map->in_memory == MAP_SAVING)	1083	if (map->in_memory == MAP_SAVING)
1119	return;	1084	return;
1120		1085
1121	check_walk_off = !QUERY_FLAG (this, FLAG_NO_APPLY);	1086	int check_walk_off = !flag [FLAG_NO_APPLY];
1122		1087
1123	for (tmp = GET_MAP_OB (map, x, y); tmp; tmp = tmp->above)	1088	for (tmp = ms.bot; tmp; tmp = tmp->above)
1124	{	1089	{
1125	/* No point updating the players look faces if he is the object	1090	/* No point updating the players look faces if he is the object
1126	* being removed.	1091	* being removed.
1127	*/	1092	*/
1128		1093
…		…
1132	* removed (most likely destroyed), update the player view	1097	* removed (most likely destroyed), update the player view
1133	* appropriately.	1098	* appropriately.
1134	*/	1099	*/
1135	if (tmp->container == this)	1100	if (tmp->container == this)
1136	{	1101	{
1137	CLEAR_FLAG (this, FLAG_APPLIED);	1102	flag [FLAG_APPLIED] = 0;
1138	tmp->container = 0;	1103	tmp->container = 0;
1139	}	1104	}
1140		1105
		1106	if (tmp->contr->ns)
1141	tmp->contr->socket->floorbox_update ();	1107	tmp->contr->ns->floorbox_update ();
1142	}	1108	}
1143		1109
1144	/* See if player moving off should effect something */	1110	/* See if object moving off should effect something */
1145	if (check_walk_off	1111	if (check_walk_off
1146	&& ((move_type & tmp->move_off)	1112	&& ((move_type & tmp->move_off)
1147	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))	1113	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1148	{	1114	{
1149	move_apply (tmp, this, 0);	1115	move_apply (tmp, this, 0);
…		…
1151	if (destroyed ())	1117	if (destroyed ())
1152	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());	1118	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1153	}	1119	}
1154		1120
1155	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */	1121	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1156		1122	//TODO: why is this horrible hacka fix? get rid of this code=bug! (schmorp)
1157	if (tmp->above == tmp)	1123	if (tmp->above == tmp)
1158	tmp->above = 0;	1124	tmp->above = 0;
1159		1125
1160	last = tmp;	1126	last = tmp;
1161	}	1127	}
1162		1128
1163	/* last == NULL of there are no objects on this space */	1129	/* last == NULL if there are no objects on this space */
		1130	//TODO: this makes little sense, why only update the topmost object?
1164	if (!last)	1131	if (!last)
1165	{	1132	map->at (x, y).flags_ = 0;
1166	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1167	* we could preserve the flags (GET_MAP_FLAGS), but update_position figures
1168	* those out anyways, and if there are any flags set right now, they won't
1169	* be correct anyways.
1170	*/
1171	SET_MAP_FLAGS (map, x, y, P_NEED_UPDATE);
1172	update_position (map, x, y);
1173	}
1174	else	1133	else
1175	update_object (last, UP_OBJ_REMOVE);	1134	update_object (last, UP_OBJ_REMOVE);
1176		1135
1177	if (QUERY_FLAG (this, FLAG_BLOCKSVIEW) || glow_radius)	1136	if (flag [FLAG_BLOCKSVIEW] || glow_radius)
1178	update_all_los (map, x, y);	1137	update_all_los (map, x, y);
1179	}	1138	}
1180	}	1139	}
1181		1140
1182	/*	1141	/*
…		…
1191	merge_ob (object *op, object *top)	1150	merge_ob (object *op, object *top)
1192	{	1151	{
1193	if (!op->nrof)	1152	if (!op->nrof)
1194	return 0;	1153	return 0;
1195		1154
1196	if (top == NULL)	1155	if (top)
1197	for (top = op; top != NULL && top->above != NULL; top = top->above);	1156	for (top = op; top && top->above; top = top->above)
		1157	;
1198		1158
1199	for (; top != NULL; top = top->below)	1159	for (; top; top = top->below)
1200	{	1160	{
1201	if (top == op)	1161	if (top == op)
1202	continue;	1162	continue;
1203		1163
1204	if (object::can_merge (op, top))	1164	if (object::can_merge (op, top))
…		…
1213	}	1173	}
1214		1174
1215	return 0;	1175	return 0;
1216	}	1176	}
1217		1177
		1178	void
		1179	object::expand_tail ()
		1180	{
		1181	if (more)
		1182	return;
		1183
		1184	object *prev = this;
		1185
		1186	for (archetype *at = arch->more; at; at = at->more)
		1187	{
		1188	object *op = arch_to_object (at);
		1189
		1190	op->name = name;
		1191	op->name_pl = name_pl;
		1192	op->title = title;
		1193
		1194	op->head = this;
		1195	prev->more = op;
		1196
		1197	prev = op;
		1198	}
		1199	}
		1200
1218	/*	1201	/*
1219	* same as insert_ob_in_map except it handle separate coordinates and do a clean	1202	* same as insert_ob_in_map except it handles separate coordinates and does a clean
1220	* job preparing multi-part monsters	1203	* job preparing multi-part monsters.
1221	*/	1204	*/
1222	object *	1205	object *
1223	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)	1206	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1224	{	1207	{
1225	object *tmp;
1226
1227	if (op->head)
1228	op = op->head;
1229
1230	for (tmp = op; tmp; tmp = tmp->more)	1208	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1231	{	1209	{
1232	tmp->x = x + tmp->arch->clone.x;	1210	tmp->x = x + tmp->arch->x;
1233	tmp->y = y + tmp->arch->clone.y;	1211	tmp->y = y + tmp->arch->y;
1234	}	1212	}
1235		1213
1236	return insert_ob_in_map (op, m, originator, flag);	1214	return insert_ob_in_map (op, m, originator, flag);
1237	}	1215	}
1238		1216
…		…
1254	* Return value:	1232	* Return value:
1255	* new object if 'op' was merged with other object	1233	* new object if 'op' was merged with other object
1256	* NULL if 'op' was destroyed	1234	* NULL if 'op' was destroyed
1257	* just 'op' otherwise	1235	* just 'op' otherwise
1258	*/	1236	*/
1259
1260	object *	1237	object *
1261	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)	1238	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1262	{	1239	{
		1240	assert (!op->flag [FLAG_FREED]);
		1241
1263	object *tmp, *top, *floor = NULL;	1242	object *top, *floor = NULL;
1264	sint16 x, y;
1265		1243
1266	if (QUERY_FLAG (op, FLAG_FREED))	1244	op->remove ();
1267	{
1268	LOG (llevError, "Trying to insert freed object!\n");
1269	return NULL;
1270	}
1271		1245
1272	if (m == NULL)	1246	#if 0
1273	{	1247	if (!m->active != !op->active)
1274	char *dump = dump_object (op);	1248	if (m->active)
1275	LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);	1249	op->activate_recursive ();
1276	free (dump);	1250	else
1277	return op;	1251	op->deactivate_recursive ();
1278	}	1252	#endif
1279		1253
1280	if (out_of_map (m, op->x, op->y))	1254	if (out_of_map (m, op->x, op->y))
1281	{	1255	{
1282	char *dump = dump_object (op);
1283	LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump);	1256	LOG (llevError, "Trying to insert object outside the map.\n%s\n", op->debug_desc ());
1284	#ifdef MANY_CORES	1257	#ifdef MANY_CORES
1285	/* Better to catch this here, as otherwise the next use of this object	1258	/* Better to catch this here, as otherwise the next use of this object
1286	* is likely to cause a crash. Better to find out where it is getting	1259	* is likely to cause a crash. Better to find out where it is getting
1287	* improperly inserted.	1260	* improperly inserted.
1288	*/	1261	*/
1289	abort ();	1262	abort ();
1290	#endif	1263	#endif
1291	free (dump);
1292	return op;	1264	return op;
1293	}	1265	}
1294		1266
1295	if (!QUERY_FLAG (op, FLAG_REMOVED))	1267	if (object *more = op->more)
1296	{	1268	if (!insert_ob_in_map (more, m, originator, flag))
1297	char *dump = dump_object (op);
1298	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
1299	free (dump);
1300	return op;	1269	return 0;
1301	}
1302
1303	if (op->more != NULL)
1304	{
1305	/* The part may be on a different map. */
1306
1307	object *more = op->more;
1308
1309	/* We really need the caller to normalize coordinates - if
1310	* we set the map, that doesn't work if the location is within
1311	* a map and this is straddling an edge. So only if coordinate
1312	* is clear wrong do we normalize it.
1313	*/
1314	if (OUT_OF_REAL_MAP (more->map, more->x, more->y))
1315	more->map = get_map_from_coord (m, &more->x, &more->y);
1316	else if (!more->map)
1317	{
1318	/* For backwards compatibility - when not dealing with tiled maps,
1319	* more->map should always point to the parent.
1320	*/
1321	more->map = m;
1322	}
1323
1324	if (insert_ob_in_map (more, more->map, originator, flag) == NULL)
1325	{
1326	if (!op->head)
1327	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1328
1329	return NULL;
1330	}
1331	}
1332		1270
1333	CLEAR_FLAG (op, FLAG_REMOVED);	1271	CLEAR_FLAG (op, FLAG_REMOVED);
1334		1272
1335	/* Ideally, the caller figures this out. However, it complicates a lot	1273	/* Ideally, the caller figures this out. However, it complicates a lot
1336	* of areas of callers (eg, anything that uses find_free_spot would now	1274	* of areas of callers (eg, anything that uses find_free_spot would now
1337	* need extra work	1275	* need extra work
1338	*/	1276	*/
1339	op->map = get_map_from_coord (m, &op->x, &op->y);	1277	if (!xy_normalise (m, op->x, op->y))
1340	x = op->x;	1278	return 0;
1341	y = op->y;	1279
		1280	op->map = m;
		1281	mapspace &ms = op->ms ();
1342		1282
1343	/* this has to be done after we translate the coordinates.	1283	/* this has to be done after we translate the coordinates.
1344	*/	1284	*/
1345	if (op->nrof && !(flag & INS_NO_MERGE))	1285	if (op->nrof && !(flag & INS_NO_MERGE))
1346	for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)	1286	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1347	if (object::can_merge (op, tmp))	1287	if (object::can_merge (op, tmp))
1348	{	1288	{
1349	op->nrof += tmp->nrof;	1289	op->nrof += tmp->nrof;
1350	tmp->destroy ();	1290	tmp->destroy ();
1351	}	1291	}
…		…
1368	op->below = originator->below;	1308	op->below = originator->below;
1369		1309
1370	if (op->below)	1310	if (op->below)
1371	op->below->above = op;	1311	op->below->above = op;
1372	else	1312	else
1373	SET_MAP_OB (op->map, op->x, op->y, op);	1313	ms.bot = op;
1374		1314
1375	/* since *below* originator, no need to update top */	1315	/* since *below* originator, no need to update top */
1376	originator->below = op;	1316	originator->below = op;
1377	}	1317	}
1378	else	1318	else
1379	{	1319	{
		1320	top = ms.bot;
		1321
1380	/* If there are other objects, then */	1322	/* If there are other objects, then */
1381	if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL))	1323	if ((!(flag & INS_MAP_LOAD)) && top)
1382	{	1324	{
1383	object *last = NULL;	1325	object *last = 0;
1384		1326
1385	/*	1327	/*
1386	* If there are multiple objects on this space, we do some trickier handling.	1328	* If there are multiple objects on this space, we do some trickier handling.
1387	* We've already dealt with merging if appropriate.	1329	* We've already dealt with merging if appropriate.
1388	* Generally, we want to put the new object on top. But if	1330	* Generally, we want to put the new object on top. But if
…		…
1392	* once we get to them. This reduces the need to traverse over all of	1334	* once we get to them. This reduces the need to traverse over all of
1393	* them when adding another one - this saves quite a bit of cpu time	1335	* them when adding another one - this saves quite a bit of cpu time
1394	* when lots of spells are cast in one area. Currently, it is presumed	1336	* when lots of spells are cast in one area. Currently, it is presumed
1395	* that flying non pickable objects are spell objects.	1337	* that flying non pickable objects are spell objects.
1396	*/	1338	*/
1397		1339	for (top = ms.bot; top; top = top->above)
1398	while (top != NULL)
1399	{	1340	{
1400	if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))	1341	if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))
1401	floor = top;	1342	floor = top;
1402		1343
1403	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))	1344	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))
…		…
1406	top = top->below;	1347	top = top->below;
1407	break;	1348	break;
1408	}	1349	}
1409		1350
1410	last = top;	1351	last = top;
1411	top = top->above;
1412	}	1352	}
1413		1353
1414	/* Don't want top to be NULL, so set it to the last valid object */	1354	/* Don't want top to be NULL, so set it to the last valid object */
1415	top = last;	1355	top = last;
1416		1356
…		…
1418	* looks like instead of lots of conditions here.	1358	* looks like instead of lots of conditions here.
1419	* makes things faster, and effectively the same result.	1359	* makes things faster, and effectively the same result.
1420	*/	1360	*/
1421		1361
1422	/* Have object 'fall below' other objects that block view.	1362	/* Have object 'fall below' other objects that block view.
1423	* Unless those objects are exits, type 66	1363	* Unless those objects are exits.
1424	* If INS_ON_TOP is used, don't do this processing	1364	* If INS_ON_TOP is used, don't do this processing
1425	* Need to find the object that in fact blocks view, otherwise	1365	* Need to find the object that in fact blocks view, otherwise
1426	* stacking is a bit odd.	1366	* stacking is a bit odd.
1427	*/	1367	*/
1428	if (!(flag & INS_ON_TOP) &&	1368	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))	1369	&& ms.flags () & P_BLOCKSVIEW
		1370	&& (op->face && !faces [op->face].visibility))
1430	{	1371	{
1431	for (last = top; last != floor; last = last->below)	1372	for (last = top; last != floor; last = last->below)
1432	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1373	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1433	break;	1374	break;
		1375
1434	/* Check to see if we found the object that blocks view,	1376	/* Check to see if we found the object that blocks view,
1435	* and make sure we have a below pointer for it so that	1377	* and make sure we have a below pointer for it so that
1436	* we can get inserted below this one, which requires we	1378	* we can get inserted below this one, which requires we
1437	* set top to the object below us.	1379	* set top to the object below us.
1438	*/	1380	*/
…		…
1440	top = last->below;	1382	top = last->below;
1441	}	1383	}
1442	} /* If objects on this space */	1384	} /* If objects on this space */
1443		1385
1444	if (flag & INS_MAP_LOAD)	1386	if (flag & INS_MAP_LOAD)
1445	top = GET_MAP_TOP (op->map, op->x, op->y);	1387	top = ms.top;
1446		1388
1447	if (flag & INS_ABOVE_FLOOR_ONLY)	1389	if (flag & INS_ABOVE_FLOOR_ONLY)
1448	top = floor;	1390	top = floor;
1449		1391
1450	/* Top is the object that our object (op) is going to get inserted above.	1392	/* Top is the object that our object (op) is going to get inserted above.
1451	*/	1393	*/
1452		1394
1453	/* First object on this space */	1395	/* First object on this space */
1454	if (!top)	1396	if (!top)
1455	{	1397	{
1456	op->above = GET_MAP_OB (op->map, op->x, op->y);	1398	op->above = ms.bot;
1457		1399
1458	if (op->above)	1400	if (op->above)
1459	op->above->below = op;	1401	op->above->below = op;
1460		1402
1461	op->below = NULL;	1403	op->below = 0;
1462	SET_MAP_OB (op->map, op->x, op->y, op);	1404	ms.bot = op;
1463	}	1405	}
1464	else	1406	else
1465	{ /* get inserted into the stack above top */	1407	{ /* get inserted into the stack above top */
1466	op->above = top->above;	1408	op->above = top->above;
1467		1409
…		…
1470		1412
1471	op->below = top;	1413	op->below = top;
1472	top->above = op;	1414	top->above = op;
1473	}	1415	}
1474		1416
1475	if (op->above == NULL)	1417	if (!op->above)
1476	SET_MAP_TOP (op->map, op->x, op->y, op);	1418	ms.top = op;
1477	} /* else not INS_BELOW_ORIGINATOR */	1419	} /* else not INS_BELOW_ORIGINATOR */
1478		1420
1479	if (op->type == PLAYER)	1421	if (op->type == PLAYER)
		1422	{
1480	op->contr->do_los = 1;	1423	op->contr->do_los = 1;
		1424	++op->map->players;
		1425	op->map->touch ();
		1426	}
		1427
		1428	op->map->dirty = true;
1481		1429
1482	/* If we have a floor, we know the player, if any, will be above	1430	/* 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.	1431	* it, so save a few ticks and start from there.
1484	*/	1432	*/
1485	if (!(flag & INS_MAP_LOAD))	1433	if (!(flag & INS_MAP_LOAD))
1486	for (tmp = floor ? floor : GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1434	if (object *pl = ms.player ())
1487	if (tmp->type == PLAYER)	1435	if (pl->contr->ns)
1488	tmp->contr->socket->floorbox_update ();	1436	pl->contr->ns->floorbox_update ();
1489		1437
1490	/* If this object glows, it may affect lighting conditions that are	1438	/* If this object glows, it may affect lighting conditions that are
1491	* visible to others on this map. But update_all_los is really	1439	* 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	1440	* 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	1441	* on the map will get recalculated. The players could very well
1494	* be far away from this change and not affected in any way -	1442	* be far away from this change and not affected in any way -
1495	* this should get redone to only look for players within range,	1443	* this should get redone to only look for players within range,
1496	* or just updating the P_NEED_UPDATE for spaces within this area	1444	* or just updating the P_UPTODATE for spaces within this area
1497	* of effect may be sufficient.	1445	* of effect may be sufficient.
1498	*/	1446	*/
1499	if (MAP_DARKNESS (op->map) && (op->glow_radius != 0))	1447	if (op->map->darkness && (op->glow_radius != 0))
1500	update_all_los (op->map, op->x, op->y);	1448	update_all_los (op->map, op->x, op->y);
1501		1449
1502	/* updates flags (blocked, alive, no magic, etc) for this map space */	1450	/* updates flags (blocked, alive, no magic, etc) for this map space */
1503	update_object (op, UP_OBJ_INSERT);	1451	update_object (op, UP_OBJ_INSERT);
		1452
		1453	INVOKE_OBJECT (INSERT, op);
1504		1454
1505	/* Don't know if moving this to the end will break anything. However,	1455	/* Don't know if moving this to the end will break anything. However,
1506	* we want to have floorbox_update called before calling this.	1456	* we want to have floorbox_update called before calling this.
1507	*	1457	*
1508	* check_move_on() must be after this because code called from	1458	* check_move_on() must be after this because code called from
…		…
1510	* blocked() and wall() work properly), and these flags are updated by	1460	* blocked() and wall() work properly), and these flags are updated by
1511	* update_object().	1461	* update_object().
1512	*/	1462	*/
1513		1463
1514	/* if this is not the head or flag has been passed, don't check walk on status */	1464	/* 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)	1465	if (!(flag & INS_NO_WALK_ON) && op->head_ () == op)
1516	{	1466	{
1517	if (check_move_on (op, originator))	1467	if (check_move_on (op, originator))
1518	return NULL;	1468	return 0;
1519		1469
1520	/* If we are a multi part object, lets work our way through the check	1470	/* If we are a multi part object, lets work our way through the check
1521	* walk on's.	1471	* walk on's.
1522	*/	1472	*/
1523	for (tmp = op->more; tmp != NULL; tmp = tmp->more)	1473	for (object *tmp = op->more; tmp; tmp = tmp->more)
1524	if (check_move_on (tmp, originator))	1474	if (check_move_on (tmp, originator))
1525	return NULL;	1475	return 0;
1526	}	1476	}
1527		1477
1528	return op;	1478	return op;
1529	}	1479	}
1530		1480
1531	/* this function inserts an object in the map, but if it	1481	/* 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.	1482	* 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.	1483	* op is the object to insert it under: supplies x and the map.
1534	*/	1484	*/
1535	void	1485	void
1536	replace_insert_ob_in_map (const char *arch_string, object *op)	1486	replace_insert_ob_in_map (const char *arch_string, object *op)
1537	{	1487	{
1538	object *	1488	object *tmp, *tmp1;
1539	tmp;
1540	object *
1541	tmp1;
1542		1489
1543	/* first search for itself and remove any old instances */	1490	/* first search for itself and remove any old instances */
1544		1491
1545	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1492	for (tmp = op->ms ().bot; tmp; tmp = tmp->above)
1546	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */	1493	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */
1547	tmp->destroy ();	1494	tmp->destroy ();
1548		1495
1549	tmp1 = arch_to_object (archetype::find (arch_string));	1496	tmp1 = arch_to_object (archetype::find (arch_string));
1550		1497
1551	tmp1->x = op->x;	1498	tmp1->x = op->x;
1552	tmp1->y = op->y;	1499	tmp1->y = op->y;
1553	insert_ob_in_map (tmp1, op->map, op, 0);	1500	insert_ob_in_map (tmp1, op->map, op, 0);
		1501	}
		1502
		1503	object *
		1504	object::insert_at (object *where, object *originator, int flags)
		1505	{
		1506	return where->map->insert (this, where->x, where->y, originator, flags);
1554	}	1507	}
1555		1508
1556	/*	1509	/*
1557	* get_split_ob(ob,nr) splits up ob into two parts. The part which	1510	* get_split_ob(ob,nr) splits up ob into two parts. The part which
1558	* is returned contains nr objects, and the remaining parts contains	1511	* is returned contains nr objects, and the remaining parts contains
1559	* the rest (or is removed and freed if that number is 0).	1512	* the rest (or is removed and freed if that number is 0).
1560	* On failure, NULL is returned, and the reason put into the	1513	* On failure, NULL is returned, and the reason put into the
1561	* global static errmsg array.	1514	* global static errmsg array.
1562	*/	1515	*/
1563
1564	object *	1516	object *
1565	get_split_ob (object *orig_ob, uint32 nr)	1517	get_split_ob (object *orig_ob, uint32 nr)
1566	{	1518	{
1567	object *newob;	1519	object *newob;
1568	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);	1520	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
…		…
1599	* the amount of an object. If the amount reaches 0, the object	1551	* the amount of an object. If the amount reaches 0, the object
1600	* is subsequently removed and freed.	1552	* is subsequently removed and freed.
1601	*	1553	*
1602	* Return value: 'op' if something is left, NULL if the amount reached 0	1554	* Return value: 'op' if something is left, NULL if the amount reached 0
1603	*/	1555	*/
1604
1605	object *	1556	object *
1606	decrease_ob_nr (object *op, uint32 i)	1557	decrease_ob_nr (object *op, uint32 i)
1607	{	1558	{
1608	object *tmp;	1559	object *tmp;
1609	player *pl;
1610		1560
1611	if (i == 0) /* objects with op->nrof require this check */	1561	if (i == 0) /* objects with op->nrof require this check */
1612	return op;	1562	return op;
1613		1563
1614	if (i > op->nrof)	1564	if (i > op->nrof)
1615	i = op->nrof;	1565	i = op->nrof;
1616		1566
1617	if (QUERY_FLAG (op, FLAG_REMOVED))	1567	if (QUERY_FLAG (op, FLAG_REMOVED))
1618	op->nrof -= i;	1568	op->nrof -= i;
1619	else if (op->env != NULL)	1569	else if (op->env)
1620	{	1570	{
1621	/* is this object in the players inventory, or sub container	1571	/* is this object in the players inventory, or sub container
1622	* therein?	1572	* therein?
1623	*/	1573	*/
1624	tmp = is_player_inv (op->env);	1574	tmp = op->in_player ();
1625	/* nope. Is this a container the player has opened?	1575	/* nope. Is this a container the player has opened?
1626	* If so, set tmp to that player.	1576	* If so, set tmp to that player.
1627	* IMO, searching through all the players will mostly	1577	* IMO, searching through all the players will mostly
1628	* likely be quicker than following op->env to the map,	1578	* likely be quicker than following op->env to the map,
1629	* and then searching the map for a player.	1579	* and then searching the map for a player.
1630	*/	1580	*/
1631	if (!tmp)	1581	if (!tmp)
1632	{	1582	for_all_players (pl)
1633	for (pl = first_player; pl; pl = pl->next)
1634	if (pl->ob->container == op->env)	1583	if (pl->ob->container == op->env)
		1584	{
		1585	tmp = pl->ob;
1635	break;	1586	break;
1636	if (pl)
1637	tmp = pl->ob;
1638	else
1639	tmp = NULL;
1640	}	1587	}
1641		1588
1642	if (i < op->nrof)	1589	if (i < op->nrof)
1643	{	1590	{
1644	sub_weight (op->env, op->weight * i);	1591	sub_weight (op->env, op->weight * i);
1645	op->nrof -= i;	1592	op->nrof -= i;
1646	if (tmp)	1593	if (tmp)
1647	{
1648	esrv_send_item (tmp, op);	1594	esrv_send_item (tmp, op);
1649	}
1650	}	1595	}
1651	else	1596	else
1652	{	1597	{
1653	op->remove ();	1598	op->remove ();
1654	op->nrof = 0;	1599	op->nrof = 0;
1655	if (tmp)	1600	if (tmp)
1656	{
1657	esrv_del_item (tmp->contr, op->count);	1601	esrv_del_item (tmp->contr, op->count);
1658	}
1659	}	1602	}
1660	}	1603	}
1661	else	1604	else
1662	{	1605	{
1663	object *above = op->above;	1606	object *above = op->above;
…		…
1669	op->remove ();	1612	op->remove ();
1670	op->nrof = 0;	1613	op->nrof = 0;
1671	}	1614	}
1672		1615
1673	/* Since we just removed op, op->above is null */	1616	/* Since we just removed op, op->above is null */
1674	for (tmp = above; tmp != NULL; tmp = tmp->above)	1617	for (tmp = above; tmp; tmp = tmp->above)
1675	if (tmp->type == PLAYER)	1618	if (tmp->type == PLAYER)
1676	{	1619	{
1677	if (op->nrof)	1620	if (op->nrof)
1678	esrv_send_item (tmp, op);	1621	esrv_send_item (tmp, op);
1679	else	1622	else
…		…
1684	if (op->nrof)	1627	if (op->nrof)
1685	return op;	1628	return op;
1686	else	1629	else
1687	{	1630	{
1688	op->destroy ();	1631	op->destroy ();
1689	return NULL;	1632	return 0;
1690	}	1633	}
1691	}	1634	}
1692		1635
1693	/*	1636	/*
1694	* add_weight(object, weight) adds the specified weight to an object,	1637	* add_weight(object, weight) adds the specified weight to an object,
1695	* and also updates how much the environment(s) is/are carrying.	1638	* and also updates how much the environment(s) is/are carrying.
1696	*/	1639	*/
1697
1698	void	1640	void
1699	add_weight (object *op, signed long weight)	1641	add_weight (object *op, signed long weight)
1700	{	1642	{
1701	while (op != NULL)	1643	while (op != NULL)
1702	{	1644	{
…		…
1717	LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);	1659	LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
1718	free (dump);	1660	free (dump);
1719	return op;	1661	return op;
1720	}	1662	}
1721		1663
1722	if (where->head)	1664	if (where->head_ () != where)
1723	{	1665	{
1724	LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n");	1666	LOG (llevError | logBacktrace, "Warning: Tried to insert object into wrong part of multipart object.\n");
1725	where = where->head;	1667	where = where->head;
1726	}	1668	}
1727		1669
1728	return where->insert (op);	1670	return where->insert (op);
1729	}	1671	}
…		…
1734	* inside the object environment.	1676	* inside the object environment.
1735	*	1677	*
1736	* The function returns now pointer to inserted item, and return value can	1678	* The function returns now pointer to inserted item, and return value can
1737	* be != op, if items are merged. -Tero	1679	* be != op, if items are merged. -Tero
1738	*/	1680	*/
1739
1740	object *	1681	object *
1741	object::insert (object *op)	1682	object::insert (object *op)
1742	{	1683	{
1743	object *tmp, *otmp;	1684	object *tmp, *otmp;
1744		1685
…		…
1782	add_weight (this, op->weight * op->nrof);	1723	add_weight (this, op->weight * op->nrof);
1783	}	1724	}
1784	else	1725	else
1785	add_weight (this, (op->weight + op->carrying));	1726	add_weight (this, (op->weight + op->carrying));
1786		1727
1787	otmp = is_player_inv (this);	1728	otmp = this->in_player ();
1788	if (otmp && otmp->contr)	1729	if (otmp && otmp->contr)
1789	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1730	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1790	fix_player (otmp);	1731	otmp->update_stats ();
1791		1732
1792	op->map = NULL;	1733	op->map = 0;
1793	op->env = this;	1734	op->env = this;
1794	op->above = NULL;	1735	op->above = 0;
1795	op->below = NULL;	1736	op->below = 0;
1796	op->x = 0, op->y = 0;	1737	op->x = 0, op->y = 0;
1797		1738
1798	/* reset the light list and los of the players on the map */	1739	/* reset the light list and los of the players on the map */
1799	if ((op->glow_radius != 0) && map)	1740	if ((op->glow_radius != 0) && map)
1800	{	1741	{
1801	#ifdef DEBUG_LIGHTS	1742	#ifdef DEBUG_LIGHTS
1802	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);	1743	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1803	#endif /* DEBUG_LIGHTS */	1744	#endif /* DEBUG_LIGHTS */
1804	if (MAP_DARKNESS (map))	1745	if (map->darkness)
1805	update_all_los (map, x, y);	1746	update_all_los (map, x, y);
1806	}	1747	}
1807		1748
1808	/* Client has no idea of ordering so lets not bother ordering it here.	1749	/* Client has no idea of ordering so lets not bother ordering it here.
1809	* It sure simplifies this function...	1750	* It sure simplifies this function...
…		…
1814	{	1755	{
1815	op->below = inv;	1756	op->below = inv;
1816	op->below->above = op;	1757	op->below->above = op;
1817	inv = op;	1758	inv = op;
1818	}	1759	}
		1760
		1761	INVOKE_OBJECT (INSERT, this);
1819		1762
1820	return op;	1763	return op;
1821	}	1764	}
1822		1765
1823	/*	1766	/*
…		…
1838	*	1781	*
1839	* MSW 2001-07-08: Check all objects on space, not just those below	1782	* MSW 2001-07-08: Check all objects on space, not just those below
1840	* object being inserted. insert_ob_in_map may not put new objects	1783	* object being inserted. insert_ob_in_map may not put new objects
1841	* on top.	1784	* on top.
1842	*/	1785	*/
1843
1844	int	1786	int
1845	check_move_on (object *op, object *originator)	1787	check_move_on (object *op, object *originator)
1846	{	1788	{
1847	object *tmp;	1789	object *tmp;
1848	maptile *m = op->map;	1790	maptile *m = op->map;
…		…
1875		1817
1876	/* The objects have to be checked from top to bottom.	1818	/* The objects have to be checked from top to bottom.
1877	* Hence, we first go to the top:	1819	* Hence, we first go to the top:
1878	*/	1820	*/
1879		1821
1880	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL && tmp->above != NULL; tmp = tmp->above)	1822	for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above)
1881	{	1823	{
1882	/* Trim the search when we find the first other spell effect	1824	/* Trim the search when we find the first other spell effect
1883	* this helps performance so that if a space has 50 spell objects,	1825	* this helps performance so that if a space has 50 spell objects,
1884	* we don't need to check all of them.	1826	* we don't need to check all of them.
1885	*/	1827	*/
…		…
1903	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||	1845	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
1904	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))	1846	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1905	{	1847	{
1906		1848
1907	float	1849	float
1908	diff = tmp->move_slow_penalty * FABS (op->speed);	1850	diff = tmp->move_slow_penalty * fabs (op->speed);
1909		1851
1910	if (op->type == PLAYER)	1852	if (op->type == PLAYER)
1911	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||	1853	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||
1912	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))	1854	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))
1913	diff /= 4.0;	1855	diff /= 4.0;
…		…
1940	/*	1882	/*
1941	* present_arch(arch, map, x, y) searches for any objects with	1883	* present_arch(arch, map, x, y) searches for any objects with
1942	* a matching archetype at the given map and coordinates.	1884	* a matching archetype at the given map and coordinates.
1943	* The first matching object is returned, or NULL if none.	1885	* The first matching object is returned, or NULL if none.
1944	*/	1886	*/
1945
1946	object *	1887	object *
1947	present_arch (const archetype *at, maptile *m, int x, int y)	1888	present_arch (const archetype *at, maptile *m, int x, int y)
1948	{	1889	{
1949	object *
1950	tmp;
1951
1952	if (m == NULL || out_of_map (m, x, y))	1890	if (!m || out_of_map (m, x, y))
1953	{	1891	{
1954	LOG (llevError, "Present_arch called outside map.\n");	1892	LOG (llevError, "Present_arch called outside map.\n");
1955	return NULL;	1893	return NULL;
1956	}	1894	}
1957	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1895
		1896	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1958	if (tmp->arch == at)	1897	if (tmp->arch == at)
1959	return tmp;	1898	return tmp;
		1899
1960	return NULL;	1900	return NULL;
1961	}	1901	}
1962		1902
1963	/*	1903	/*
1964	* present(type, map, x, y) searches for any objects with	1904	* present(type, map, x, y) searches for any objects with
1965	* a matching type variable at the given map and coordinates.	1905	* a matching type variable at the given map and coordinates.
1966	* The first matching object is returned, or NULL if none.	1906	* The first matching object is returned, or NULL if none.
1967	*/	1907	*/
1968
1969	object *	1908	object *
1970	present (unsigned char type, maptile *m, int x, int y)	1909	present (unsigned char type, maptile *m, int x, int y)
1971	{	1910	{
1972	object *
1973	tmp;
1974
1975	if (out_of_map (m, x, y))	1911	if (out_of_map (m, x, y))
1976	{	1912	{
1977	LOG (llevError, "Present called outside map.\n");	1913	LOG (llevError, "Present called outside map.\n");
1978	return NULL;	1914	return NULL;
1979	}	1915	}
1980	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1916
		1917	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1981	if (tmp->type == type)	1918	if (tmp->type == type)
1982	return tmp;	1919	return tmp;
		1920
1983	return NULL;	1921	return NULL;
1984	}	1922	}
1985		1923
1986	/*	1924	/*
1987	* present_in_ob(type, object) searches for any objects with	1925	* present_in_ob(type, object) searches for any objects with
1988	* a matching type variable in the inventory of the given object.	1926	* a matching type variable in the inventory of the given object.
1989	* The first matching object is returned, or NULL if none.	1927	* The first matching object is returned, or NULL if none.
1990	*/	1928	*/
1991
1992	object *	1929	object *
1993	present_in_ob (unsigned char type, const object *op)	1930	present_in_ob (unsigned char type, const object *op)
1994	{	1931	{
1995	object *
1996	tmp;
1997
1998	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1932	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
1999	if (tmp->type == type)	1933	if (tmp->type == type)
2000	return tmp;	1934	return tmp;
		1935
2001	return NULL;	1936	return NULL;
2002	}	1937	}
2003		1938
2004	/*	1939	/*
2005	* present_in_ob (type, str, object) searches for any objects with	1940	* present_in_ob (type, str, object) searches for any objects with
…		…
2013	* str is the string to match against. Note that we match against	1948	* str is the string to match against. Note that we match against
2014	* the object name, not the archetype name. this is so that the	1949	* the object name, not the archetype name. this is so that the
2015	* spell code can use one object type (force), but change it's name	1950	* spell code can use one object type (force), but change it's name
2016	* to be unique.	1951	* to be unique.
2017	*/	1952	*/
2018
2019	object *	1953	object *
2020	present_in_ob_by_name (int type, const char *str, const object *op)	1954	present_in_ob_by_name (int type, const char *str, const object *op)
2021	{	1955	{
2022	object *
2023	tmp;
2024
2025	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1956	for (object *tmp = op->inv; tmp; tmp = tmp->below)
2026	{
2027	if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name)))	1957	if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name)))
2028	return tmp;	1958	return tmp;
2029	}	1959
2030	return NULL;	1960	return 0;
2031	}	1961	}
2032		1962
2033	/*	1963	/*
2034	* present_arch_in_ob(archetype, object) searches for any objects with	1964	* present_arch_in_ob(archetype, object) searches for any objects with
2035	* a matching archetype in the inventory of the given object.	1965	* a matching archetype in the inventory of the given object.
2036	* The first matching object is returned, or NULL if none.	1966	* The first matching object is returned, or NULL if none.
2037	*/	1967	*/
2038
2039	object *	1968	object *
2040	present_arch_in_ob (const archetype *at, const object *op)	1969	present_arch_in_ob (const archetype *at, const object *op)
2041	{	1970	{
2042	object *
2043	tmp;
2044
2045	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1971	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2046	if (tmp->arch == at)	1972	if (tmp->arch == at)
2047	return tmp;	1973	return tmp;
		1974
2048	return NULL;	1975	return NULL;
2049	}	1976	}
2050		1977
2051	/*	1978	/*
2052	* activate recursively a flag on an object inventory	1979	* activate recursively a flag on an object inventory
2053	*/	1980	*/
2054	void	1981	void
2055	flag_inv (object *op, int flag)	1982	flag_inv (object *op, int flag)
2056	{	1983	{
2057	object *
2058	tmp;
2059
2060	if (op->inv)	1984	if (op->inv)
2061	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1985	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2062	{	1986	{
2063	SET_FLAG (tmp, flag);	1987	SET_FLAG (tmp, flag);
2064	flag_inv (tmp, flag);	1988	flag_inv (tmp, flag);
2065	}	1989	}
2066	} /*	1990	}
		1991
		1992	/*
2067	* desactivate recursively a flag on an object inventory	1993	* deactivate recursively a flag on an object inventory
2068	*/	1994	*/
2069	void	1995	void
2070	unflag_inv (object *op, int flag)	1996	unflag_inv (object *op, int flag)
2071	{	1997	{
2072	object *
2073	tmp;
2074
2075	if (op->inv)	1998	if (op->inv)
2076	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1999	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2077	{	2000	{
2078	CLEAR_FLAG (tmp, flag);	2001	CLEAR_FLAG (tmp, flag);
2079	unflag_inv (tmp, flag);	2002	unflag_inv (tmp, flag);
2080	}	2003	}
2081	}
2082
2083	/*
2084	* set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in
2085	* all it's inventory (recursively).
2086	* If checksums are used, a player will get set_cheat called for
2087	* him/her-self and all object carried by a call to this function.
2088	*/
2089
2090	void
2091	set_cheat (object *op)
2092	{
2093	SET_FLAG (op, FLAG_WAS_WIZ);
2094	flag_inv (op, FLAG_WAS_WIZ);
2095	}	2004	}
2096		2005
2097	/*	2006	/*
2098	* find_free_spot(object, map, x, y, start, stop) will search for	2007	* find_free_spot(object, map, x, y, start, stop) will search for
2099	* a spot at the given map and coordinates which will be able to contain	2008	* a spot at the given map and coordinates which will be able to contain
…		…
2113	* because arch_blocked (now ob_blocked) needs to know the movement type	2022	* because arch_blocked (now ob_blocked) needs to know the movement type
2114	* to know if the space in question will block the object. We can't use	2023	* to know if the space in question will block the object. We can't use
2115	* the archetype because that isn't correct if the monster has been	2024	* the archetype because that isn't correct if the monster has been
2116	* customized, changed states, etc.	2025	* customized, changed states, etc.
2117	*/	2026	*/
2118
2119	int	2027	int
2120	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)	2028	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2121	{	2029	{
2122	int
2123	i,
2124	index = 0, flag;	2030	int index = 0, flag;
2125	static int
2126	altern[SIZEOFFREE];	2031	int altern[SIZEOFFREE];
2127		2032
2128	for (i = start; i < stop; i++)	2033	for (int i = start; i < stop; i++)
2129	{	2034	{
2130	flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]);	2035	flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]);
2131	if (!flag)	2036	if (!flag)
2132	altern[index++] = i;	2037	altern [index++] = i;
2133		2038
2134	/* Basically, if we find a wall on a space, we cut down the search size.	2039	/* Basically, if we find a wall on a space, we cut down the search size.
2135	* In this way, we won't return spaces that are on another side of a wall.	2040	* In this way, we won't return spaces that are on another side of a wall.
2136	* This mostly work, but it cuts down the search size in all directions -	2041	* This mostly work, but it cuts down the search size in all directions -
2137	* if the space being examined only has a wall to the north and empty	2042	* if the space being examined only has a wall to the north and empty
2138	* spaces in all the other directions, this will reduce the search space	2043	* spaces in all the other directions, this will reduce the search space
2139	* to only the spaces immediately surrounding the target area, and	2044	* to only the spaces immediately surrounding the target area, and
2140	* won't look 2 spaces south of the target space.	2045	* won't look 2 spaces south of the target space.
2141	*/	2046	*/
2142	else if ((flag & AB_NO_PASS) && maxfree[i] < stop)	2047	else if ((flag & P_NO_PASS) && maxfree[i] < stop)
2143	stop = maxfree[i];	2048	stop = maxfree[i];
2144	}	2049	}
		2050
2145	if (!index)	2051	if (!index)
2146	return -1;	2052	return -1;
		2053
2147	return altern[RANDOM () % index];	2054	return altern [rndm (index)];
2148	}	2055	}
2149		2056
2150	/*	2057	/*
2151	* find_first_free_spot(archetype, maptile, x, y) works like	2058	* find_first_free_spot(archetype, maptile, x, y) works like
2152	* find_free_spot(), but it will search max number of squares.	2059	* find_free_spot(), but it will search max number of squares.
2153	* But it will return the first available spot, not a random choice.	2060	* But it will return the first available spot, not a random choice.
2154	* Changed 0.93.2: Have it return -1 if there is no free spot available.	2061	* Changed 0.93.2: Have it return -1 if there is no free spot available.
2155	*/	2062	*/
2156
2157	int	2063	int
2158	find_first_free_spot (const object *ob, maptile *m, int x, int y)	2064	find_first_free_spot (const object *ob, maptile *m, int x, int y)
2159	{	2065	{
2160	int
2161	i;
2162
2163	for (i = 0; i < SIZEOFFREE; i++)	2066	for (int i = 0; i < SIZEOFFREE; i++)
2164	{
2165	if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]))	2067	if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]))
2166	return i;	2068	return i;
2167	}	2069
2168	return -1;	2070	return -1;
2169	}	2071	}
2170		2072
2171	/*	2073	/*
2172	* The function permute(arr, begin, end) randomly reorders the array	2074	* The function permute(arr, begin, end) randomly reorders the array
2173	* arr[begin..end-1].	2075	* arr[begin..end-1].
		2076	* now uses a fisher-yates shuffle, old permute was broken
2174	*/	2077	*/
2175	static void	2078	static void
2176	permute (int *arr, int begin, int end)	2079	permute (int *arr, int begin, int end)
2177	{	2080	{
2178	int	2081	arr += begin;
2179	i,
2180	j,
2181	tmp,
2182	len;
2183
2184	len = end - begin;	2082	end -= begin;
2185	for (i = begin; i < end; i++)
2186	{
2187	j = begin + RANDOM () % len;
2188		2083
2189	tmp = arr[i];	2084	while (--end)
2190	arr[i] = arr[j];	2085	swap (arr [end], arr [rndm (end + 1)]);
2191	arr[j] = tmp;
2192	}
2193	}	2086	}
2194		2087
2195	/* new function to make monster searching more efficient, and effective!	2088	/* new function to make monster searching more efficient, and effective!
2196	* This basically returns a randomized array (in the passed pointer) of	2089	* This basically returns a randomized array (in the passed pointer) of
2197	* the spaces to find monsters. In this way, it won't always look for	2090	* the spaces to find monsters. In this way, it won't always look for
…		…
2200	* the 3x3 area will be searched, just not in a predictable order.	2093	* the 3x3 area will be searched, just not in a predictable order.
2201	*/	2094	*/
2202	void	2095	void
2203	get_search_arr (int *search_arr)	2096	get_search_arr (int *search_arr)
2204	{	2097	{
2205	int	2098	int i;
2206	i;
2207		2099
2208	for (i = 0; i < SIZEOFFREE; i++)	2100	for (i = 0; i < SIZEOFFREE; i++)
2209	{
2210	search_arr[i] = i;	2101	search_arr[i] = i;
2211	}
2212		2102
2213	permute (search_arr, 1, SIZEOFFREE1 + 1);	2103	permute (search_arr, 1, SIZEOFFREE1 + 1);
2214	permute (search_arr, SIZEOFFREE1 + 1, SIZEOFFREE2 + 1);	2104	permute (search_arr, SIZEOFFREE1 + 1, SIZEOFFREE2 + 1);
2215	permute (search_arr, SIZEOFFREE2 + 1, SIZEOFFREE);	2105	permute (search_arr, SIZEOFFREE2 + 1, SIZEOFFREE);
2216	}	2106	}
…		…
2225	* Perhaps incorrectly, but I'm making the assumption that exclude	2115	* Perhaps incorrectly, but I'm making the assumption that exclude
2226	* is actually want is going to try and move there. We need this info	2116	* is actually want is going to try and move there. We need this info
2227	* because we have to know what movement the thing looking to move	2117	* because we have to know what movement the thing looking to move
2228	* there is capable of.	2118	* there is capable of.
2229	*/	2119	*/
2230
2231	int	2120	int
2232	find_dir (maptile *m, int x, int y, object *exclude)	2121	find_dir (maptile *m, int x, int y, object *exclude)
2233	{	2122	{
2234	int
2235	i,
2236	max = SIZEOFFREE, mflags;	2123	int i, max = SIZEOFFREE, mflags;
2237		2124
2238	sint16 nx, ny;	2125	sint16 nx, ny;
2239	object *	2126	object *tmp;
2240	tmp;
2241	maptile *	2127	maptile *mp;
2242	mp;
2243		2128
2244	MoveType blocked, move_type;	2129	MoveType blocked, move_type;
2245		2130
2246	if (exclude && exclude->head)	2131	if (exclude && exclude->head_ () != exclude)
2247	{	2132	{
2248	exclude = exclude->head;	2133	exclude = exclude->head;
2249	move_type = exclude->move_type;	2134	move_type = exclude->move_type;
2250	}	2135	}
2251	else	2136	else
…		…
2259	mp = m;	2144	mp = m;
2260	nx = x + freearr_x[i];	2145	nx = x + freearr_x[i];
2261	ny = y + freearr_y[i];	2146	ny = y + freearr_y[i];
2262		2147
2263	mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);	2148	mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);
		2149
2264	if (mflags & P_OUT_OF_MAP)	2150	if (mflags & P_OUT_OF_MAP)
2265	{
2266	max = maxfree[i];	2151	max = maxfree[i];
2267	}
2268	else	2152	else
2269	{	2153	{
2270	blocked = GET_MAP_MOVE_BLOCK (mp, nx, ny);	2154	mapspace &ms = mp->at (nx, ny);
		2155
		2156	blocked = ms.move_block;
2271		2157
2272	if ((move_type & blocked) == move_type)	2158	if ((move_type & blocked) == move_type)
2273	{
2274	max = maxfree[i];	2159	max = maxfree[i];
2275	}
2276	else if (mflags & P_IS_ALIVE)	2160	else if (mflags & P_IS_ALIVE)
2277	{	2161	{
2278	for (tmp = GET_MAP_OB (mp, nx, ny); tmp != NULL; tmp = tmp->above)	2162	for (tmp = ms.bot; tmp; tmp = tmp->above)
2279	{	2163	if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)
2280	if ((QUERY_FLAG (tmp, FLAG_MONSTER) || tmp->type == PLAYER) && (tmp != exclude || (tmp->head && tmp->head != exclude)))	2164	&& (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2281	{
2282	break;	2165	break;
2283	}	2166
2284	}
2285	if (tmp)	2167	if (tmp)
2286	{
2287	return freedir[i];	2168	return freedir[i];
2288	}
2289	}	2169	}
2290	}	2170	}
2291	}	2171	}
		2172
2292	return 0;	2173	return 0;
2293	}	2174	}
2294		2175
2295	/*	2176	/*
2296	* distance(object 1, object 2) will return the square of the	2177	* distance(object 1, object 2) will return the square of the
2297	* distance between the two given objects.	2178	* distance between the two given objects.
2298	*/	2179	*/
2299
2300	int	2180	int
2301	distance (const object *ob1, const object *ob2)	2181	distance (const object *ob1, const object *ob2)
2302	{	2182	{
2303	int
2304	i;
2305
2306	i = (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);	2183	return (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);
2307	return i;
2308	}	2184	}
2309		2185
2310	/*	2186	/*
2311	* find_dir_2(delta-x,delta-y) will return a direction in which	2187	* find_dir_2(delta-x,delta-y) will return a direction in which
2312	* an object which has subtracted the x and y coordinates of another	2188	* an object which has subtracted the x and y coordinates of another
2313	* object, needs to travel toward it.	2189	* object, needs to travel toward it.
2314	*/	2190	*/
2315
2316	int	2191	int
2317	find_dir_2 (int x, int y)	2192	find_dir_2 (int x, int y)
2318	{	2193	{
2319	int	2194	int q;
2320	q;
2321		2195
2322	if (y)	2196	if (y)
2323	q = x * 100 / y;	2197	q = x * 100 / y;
2324	else if (x)	2198	else if (x)
2325	q = -300 * x;	2199	q = -300 * x;
…		…
2350		2224
2351	return 3;	2225	return 3;
2352	}	2226	}
2353		2227
2354	/*	2228	/*
2355	* absdir(int): Returns a number between 1 and 8, which represent
2356	* the "absolute" direction of a number (it actually takes care of
2357	* "overflow" in previous calculations of a direction).
2358	*/
2359
2360	int
2361	absdir (int d)
2362	{
2363	while (d < 1)
2364	d += 8;
2365	while (d > 8)
2366	d -= 8;
2367	return d;
2368	}
2369
2370	/*
2371	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is	2229	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is
2372	* between two directions (which are expected to be absolute (see absdir())	2230	* between two directions (which are expected to be absolute (see absdir())
2373	*/	2231	*/
2374
2375	int	2232	int
2376	dirdiff (int dir1, int dir2)	2233	dirdiff (int dir1, int dir2)
2377	{	2234	{
2378	int	2235	int d;
2379	d;
2380		2236
2381	d = abs (dir1 - dir2);	2237	d = abs (dir1 - dir2);
2382	if (d > 4)	2238	if (d > 4)
2383	d = 8 - d;	2239	d = 8 - d;
		2240
2384	return d;	2241	return d;
2385	}	2242	}
2386		2243
2387	/* peterm:	2244	/* peterm:
2388	* do LOS stuff for ball lightning. Go after the closest VISIBLE monster.	2245	* do LOS stuff for ball lightning. Go after the closest VISIBLE monster.
…		…
2391	* This basically means that if direction is 15, then it could either go	2248	* This basically means that if direction is 15, then it could either go
2392	* direction 4, 14, or 16 to get back to where we are.	2249	* direction 4, 14, or 16 to get back to where we are.
2393	* Moved from spell_util.c to object.c with the other related direction	2250	* Moved from spell_util.c to object.c with the other related direction
2394	* functions.	2251	* functions.
2395	*/	2252	*/
2396
2397	int
2398	reduction_dir[SIZEOFFREE][3] = {	2253	int reduction_dir[SIZEOFFREE][3] = {
2399	{0, 0, 0}, /* 0 */	2254	{0, 0, 0}, /* 0 */
2400	{0, 0, 0}, /* 1 */	2255	{0, 0, 0}, /* 1 */
2401	{0, 0, 0}, /* 2 */	2256	{0, 0, 0}, /* 2 */
2402	{0, 0, 0}, /* 3 */	2257	{0, 0, 0}, /* 3 */
2403	{0, 0, 0}, /* 4 */	2258	{0, 0, 0}, /* 4 */
…		…
2451	* find a path to that monster that we found. If not,	2306	* find a path to that monster that we found. If not,
2452	* we don't bother going toward it. Returns 1 if we	2307	* we don't bother going toward it. Returns 1 if we
2453	* can see a direct way to get it	2308	* can see a direct way to get it
2454	* Modified to be map tile aware -.MSW	2309	* Modified to be map tile aware -.MSW
2455	*/	2310	*/
2456
2457
2458	int	2311	int
2459	can_see_monsterP (maptile *m, int x, int y, int dir)	2312	can_see_monsterP (maptile *m, int x, int y, int dir)
2460	{	2313	{
2461	sint16 dx, dy;	2314	sint16 dx, dy;
2462	int
2463	mflags;	2315	int mflags;
2464		2316
2465	if (dir < 0)	2317	if (dir < 0)
2466	return 0; /* exit condition: invalid direction */	2318	return 0; /* exit condition: invalid direction */
2467		2319
2468	dx = x + freearr_x[dir];	2320	dx = x + freearr_x[dir];
…		…
2481	return 0;	2333	return 0;
2482		2334
2483	/* yes, can see. */	2335	/* yes, can see. */
2484	if (dir < 9)	2336	if (dir < 9)
2485	return 1;	2337	return 1;
		2338
2486	return can_see_monsterP (m, x, y, reduction_dir[dir][0]) |	2339	return can_see_monsterP (m, x, y, reduction_dir[dir][0])
2487	can_see_monsterP (m, x, y, reduction_dir[dir][1]) | can_see_monsterP (m, x, y, reduction_dir[dir][2]);	2340	| can_see_monsterP (m, x, y, reduction_dir[dir][1])
		2341	| can_see_monsterP (m, x, y, reduction_dir[dir][2]);
2488	}	2342	}
2489
2490
2491		2343
2492	/*	2344	/*
2493	* can_pick(picker, item): finds out if an object is possible to be	2345	* can_pick(picker, item): finds out if an object is possible to be
2494	* picked up by the picker. Returnes 1 if it can be	2346	* picked up by the picker. Returnes 1 if it can be
2495	* picked up, otherwise 0.	2347	* picked up, otherwise 0.
…		…
2506	return /*QUERY_FLAG(who,FLAG_WIZ)|| */	2358	return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2507	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&	2359	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
2508	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3));	2360	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3));
2509	}	2361	}
2510		2362
2511
2512	/*	2363	/*
2513	* create clone from object to another	2364	* create clone from object to another
2514	*/	2365	*/
2515	object *	2366	object *
2516	object_create_clone (object *asrc)	2367	object_create_clone (object *asrc)
2517	{	2368	{
2518	object *dst = 0, *tmp, *src, *part, *prev, *item;	2369	object *dst = 0, *tmp, *src, *prev, *item;
2519		2370
2520	if (!asrc)	2371	if (!asrc)
2521	return 0;	2372	return 0;
2522		2373
2523	src = asrc;
2524	if (src->head)
2525	src = src->head;	2374	src = asrc->head_ ();
2526		2375
2527	prev = 0;	2376	prev = 0;
2528	for (part = src; part; part = part->more)	2377	for (object *part = src; part; part = part->more)
2529	{	2378	{
2530	tmp = part->clone ();	2379	tmp = part->clone ();
2531	tmp->x -= src->x;	2380	tmp->x -= src->x;
2532	tmp->y -= src->y;	2381	tmp->y -= src->y;
2533		2382
…		…
2535	{	2384	{
2536	dst = tmp;	2385	dst = tmp;
2537	tmp->head = 0;	2386	tmp->head = 0;
2538	}	2387	}
2539	else	2388	else
2540	{
2541	tmp->head = dst;	2389	tmp->head = dst;
2542	}
2543		2390
2544	tmp->more = 0;	2391	tmp->more = 0;
2545		2392
2546	if (prev)	2393	if (prev)
2547	prev->more = tmp;	2394	prev->more = tmp;
…		…
2551		2398
2552	for (item = src->inv; item; item = item->below)	2399	for (item = src->inv; item; item = item->below)
2553	insert_ob_in_ob (object_create_clone (item), dst);	2400	insert_ob_in_ob (object_create_clone (item), dst);
2554		2401
2555	return dst;	2402	return dst;
2556	}
2557
2558	/* GROS - Creates an object using a string representing its content. */
2559	/* Basically, we save the content of the string to a temp file, then call */
2560	/* load_object on it. I admit it is a highly inefficient way to make things, */
2561	/* but it was simple to make and allows reusing the load_object function. */
2562	/* Remember not to use load_object_str in a time-critical situation. */
2563	/* Also remember that multiparts objects are not supported for now. */
2564
2565	object *
2566	load_object_str (const char *obstr)
2567	{
2568	object *op;
2569	char filename[MAX_BUF];
2570
2571	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2572
2573	FILE *tempfile = fopen (filename, "w");
2574
2575	if (tempfile == NULL)
2576	{
2577	LOG (llevError, "Error - Unable to access load object temp file\n");
2578	return NULL;
2579	}
2580
2581	fprintf (tempfile, obstr);
2582	fclose (tempfile);
2583
2584	op = object::create ();
2585
2586	object_thawer thawer (filename);
2587
2588	if (thawer)
2589	load_object (thawer, op, 0);
2590
2591	LOG (llevDebug, " load str completed, object=%s\n", &op->name);
2592	CLEAR_FLAG (op, FLAG_REMOVED);
2593
2594	return op;
2595	}	2403	}
2596		2404
2597	/* This returns the first object in who's inventory that	2405	/* This returns the first object in who's inventory that
2598	* has the same type and subtype match.	2406	* has the same type and subtype match.
2599	* returns NULL if no match.	2407	* returns NULL if no match.
2600	*/	2408	*/
2601	object *	2409	object *
2602	find_obj_by_type_subtype (const object *who, int type, int subtype)	2410	find_obj_by_type_subtype (const object *who, int type, int subtype)
2603	{	2411	{
2604	object *tmp;
2605
2606	for (tmp = who->inv; tmp; tmp = tmp->below)	2412	for (object *tmp = who->inv; tmp; tmp = tmp->below)
2607	if (tmp->type == type && tmp->subtype == subtype)	2413	if (tmp->type == type && tmp->subtype == subtype)
2608	return tmp;	2414	return tmp;
2609		2415
2610	return NULL;	2416	return 0;
2611	}	2417	}
2612		2418
2613	/* If ob has a field named key, return the link from the list,	2419	/* If ob has a field named key, return the link from the list,
2614	* otherwise return NULL.	2420	* otherwise return NULL.
2615	*	2421	*
…		…
2617	* do the desired thing.	2423	* do the desired thing.
2618	*/	2424	*/
2619	key_value *	2425	key_value *
2620	get_ob_key_link (const object *ob, const char *key)	2426	get_ob_key_link (const object *ob, const char *key)
2621	{	2427	{
2622	key_value *link;
2623
2624	for (link = ob->key_values; link != NULL; link = link->next)	2428	for (key_value *link = ob->key_values; link; link = link->next)
2625	if (link->key == key)	2429	if (link->key == key)
2626	return link;	2430	return link;
2627		2431
2628	return NULL;	2432	return 0;
2629	}	2433	}
2630		2434
2631	/*	2435	/*
2632	* Returns the value of op has an extra_field for key, or NULL.	2436	* Returns the value of op has an extra_field for key, or NULL.
2633	*	2437	*
…		…
2658	if (link->key == canonical_key)	2462	if (link->key == canonical_key)
2659	return link->value;	2463	return link->value;
2660		2464
2661	return 0;	2465	return 0;
2662	}	2466	}
2663
2664		2467
2665	/*	2468	/*
2666	* Updates the canonical_key in op to value.	2469	* Updates the canonical_key in op to value.
2667	*	2470	*
2668	* canonical_key is a shared string (value doesn't have to be).	2471	* canonical_key is a shared string (value doesn't have to be).
…		…
2673	* Returns TRUE on success.	2476	* Returns TRUE on success.
2674	*/	2477	*/
2675	int	2478	int
2676	set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key)	2479	set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key)
2677	{	2480	{
2678	key_value *
2679	field = NULL, *last = NULL;	2481	key_value *field = NULL, *last = NULL;
2680		2482
2681	for (field = op->key_values; field != NULL; field = field->next)	2483	for (field = op->key_values; field != NULL; field = field->next)
2682	{	2484	{
2683	if (field->key != canonical_key)	2485	if (field->key != canonical_key)
2684	{	2486	{
…		…
2693	/* Basically, if the archetype has this key set,	2495	/* Basically, if the archetype has this key set,
2694	* we need to store the null value so when we save	2496	* we need to store the null value so when we save
2695	* it, we save the empty value so that when we load,	2497	* it, we save the empty value so that when we load,
2696	* we get this value back again.	2498	* we get this value back again.
2697	*/	2499	*/
2698	if (get_ob_key_link (&op->arch->clone, canonical_key))	2500	if (get_ob_key_link (op->arch, canonical_key))
2699	field->value = 0;	2501	field->value = 0;
2700	else	2502	else
2701	{	2503	{
2702	if (last)	2504	if (last)
2703	last->next = field->next;	2505	last->next = field->next;
…		…
2712	/* IF we get here, key doesn't exist */	2514	/* IF we get here, key doesn't exist */
2713		2515
2714	/* No field, we'll have to add it. */	2516	/* No field, we'll have to add it. */
2715		2517
2716	if (!add_key)	2518	if (!add_key)
2717	{
2718	return FALSE;	2519	return FALSE;
2719	}	2520
2720	/* There isn't any good reason to store a null	2521	/* There isn't any good reason to store a null
2721	* value in the key/value list. If the archetype has	2522	* value in the key/value list. If the archetype has
2722	* this key, then we should also have it, so shouldn't	2523	* this key, then we should also have it, so shouldn't
2723	* be here. If user wants to store empty strings,	2524	* be here. If user wants to store empty strings,
2724	* should pass in ""	2525	* should pass in ""
…		…
2773	}	2574	}
2774	else	2575	else
2775	item = item->env;	2576	item = item->env;
2776	}	2577	}
2777		2578
		2579
		2580	const char *
		2581	object::flag_desc (char *desc, int len) const
		2582	{
		2583	char *p = desc;
		2584	bool first = true;
		2585
		2586	*p = 0;
		2587
		2588	for (int i = 0; i < NUM_FLAGS; i++)
		2589	{
		2590	if (len <= 10) // magic constant!
		2591	{
		2592	snprintf (p, len, ",...");
		2593	break;
		2594	}
		2595
		2596	if (flag [i])
		2597	{
		2598	int cnt = snprintf (p, len, "%s%d", first ? "" : ",", i);
		2599	len -= cnt;
		2600	p += cnt;
		2601	first = false;
		2602	}
		2603	}
		2604
		2605	return desc;
		2606	}
		2607
2778	// return a suitable string describing an objetc in enough detail to find it	2608	// return a suitable string describing an object in enough detail to find it
2779	const char *	2609	const char *
2780	object::debug_desc (char *info) const	2610	object::debug_desc (char *info) const
2781	{	2611	{
		2612	char flagdesc[512];
2782	char info2[256 * 3];	2613	char info2[256 * 4];
2783	char *p = info;	2614	char *p = info;
2784		2615
2785	p += snprintf (p, 256, "%d=\"%s%s%s\"",	2616	p += snprintf (p, 512, "{cnt:%d,uuid:<1.%" PRIx64 ">,name:\"%s\"%s%s,flags:[%s],type:%d}",
2786	count,	2617	count, uuid.seq,
2787	&name,	2618	&name,
2788	title ? " " : "",	2619	title ? "\",title:\"" : "",
2789	title ? (const char *)title : "");	2620	title ? (const char *)title : "",
		2621	flag_desc (flagdesc, 512), type);
2790		2622
2791	if (env)	2623	if (env)
2792	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2624	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2793		2625
2794	if (map)	2626	if (map)
2795	p += snprintf (p, 256, "(on %s@%d+%d)", map->path, x, y);	2627	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2796		2628
2797	return info;	2629	return info;
2798	}	2630	}
2799		2631
2800	const char *	2632	const char *
2801	object::debug_desc () const	2633	object::debug_desc () const
2802	{	2634	{
2803	static char info[256 * 3];	2635	static char info[3][256 * 4];
		2636	static int info_idx;
		2637
2804	return debug_desc (info);	2638	return debug_desc (info [++info_idx % 3]);
2805	}	2639	}
2806		2640
		2641	struct region *
		2642	object::region () const
		2643	{
		2644	return map ? map->region (x, y)
		2645	: region::default_region ();
		2646	}
		2647
		2648	const materialtype_t *
		2649	object::dominant_material () const
		2650	{
		2651	if (materialtype_t *mat = name_to_material (materialname))
		2652	return mat;
		2653
		2654	// omfg this is slow, this has to be temporary :)
		2655	shstr unknown ("unknown");
		2656
		2657	return name_to_material (unknown);
		2658	}
		2659
		2660	void
		2661	object::open_container (object *new_container)
		2662	{
		2663	if (container == new_container)
		2664	return;
		2665
		2666	if (object *old_container = container)
		2667	{
		2668	if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
		2669	return;
		2670
		2671	#if 0
		2672	// remove the "Close old_container" object.
		2673	if (object *closer = old_container->inv)
		2674	if (closer->type == CLOSE_CON)
		2675	closer->destroy ();
		2676	#endif
		2677
		2678	old_container->flag [FLAG_APPLIED] = 0;
		2679	container = 0;
		2680
		2681	esrv_update_item (UPD_FLAGS, this, old_container);
		2682	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
		2683	}
		2684
		2685	if (new_container)
		2686	{
		2687	if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))
		2688	return;
		2689
		2690	// TODO: this does not seem to serve any purpose anymore?
		2691	#if 0
		2692	// insert the "Close Container" object.
		2693	if (archetype *closer = new_container->other_arch)
		2694	{
		2695	object *closer = arch_to_object (new_container->other_arch);
		2696	closer->flag [FLAG_NO_MAP_SAVE] = 1;
		2697	new_container->insert (closer);
		2698	}
		2699	#endif
		2700
		2701	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));
		2702
		2703	new_container->flag [FLAG_APPLIED] = 1;
		2704	container = new_container;
		2705
		2706	esrv_update_item (UPD_FLAGS, this, new_container);
		2707	esrv_send_inventory (this, new_container);
		2708	}
		2709	}
		2710
		2711

Diff Legend

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