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.90 by root, Tue Dec 26 10:14:24 2006 UTC vs.
Revision 1.190 by root, Sat Sep 15 15:58:06 2007 UTC

1	/*	1	/*
2	CrossFire, A Multiplayer game for X-windows	2	* This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
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
8	it under the terms of the GNU General Public License as published by	9	* it under the terms of the GNU General Public License as published by
9	the Free Software Foundation; either version 2 of the License, or	10	* the Free Software Foundation, either version 3 of the License, or
10	(at your option) any later version.	11	* (at your option) 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,
13	but WITHOUT ANY WARRANTY; without even the implied warranty of	14	* but WITHOUT ANY WARRANTY; without even the implied warranty of
14	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15	GNU General Public License for more details.	16	* GNU General Public License 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
18	along with this program; if not, write to the Free Software	19	* along with this program. If not, see <http://www.gnu.org/licenses/>.
19	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	20	*
20
21	The authors can be reached via e-mail at <crossfire@schmorp.de>	21	* The authors can be reached via e-mail to <crossfire@schmorp.de>
22	*/	22	*/
23		23
24	/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.	24	/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
25	sub/add_weight will transcend the environment updating the carrying	25	sub/add_weight will transcend the environment updating the carrying
26	variable. */	26	variable. */
27	#include <global.h>	27	#include <global.h>
28	#include <stdio.h>	28	#include <stdio.h>
29	#include <sys/types.h>	29	#include <sys/types.h>
30	#include <sys/uio.h>	30	#include <sys/uio.h>
31	#include <object.h>	31	#include <object.h>
32	#include <funcpoint.h>	32	#include <funcpoint.h>
		33	#include <sproto.h>
33	#include <loader.h>	34	#include <loader.h>
34		35
35	#include <bitset>	36	#include <bitset>
36		37
37	int nrofallocobjects = 0;	38	int nrofallocobjects = 0;
38	static UUID uuid;	39	static UUID uuid;
39	const uint64 UUID_SKIP = 1<<19;	40	const uint64 UUID_SKIP = 1<<19;
40		41
41	object *active_objects; /* List of active objects that need to be processed */	42	objectvec objects;
		43	activevec actives;
42		44
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,	45	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	46	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	};	47	};
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,	48	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,
…		…
190	* Check nrof variable *before* calling can_merge()	192	* Check nrof variable *before* calling can_merge()
191	*	193	*
192	* Improvements made with merge: Better checking on potion, and also	194	* Improvements made with merge: Better checking on potion, and also
193	* check weight	195	* check weight
194	*/	196	*/
195
196	bool object::can_merge_slow (object *ob1, object *ob2)	197	bool object::can_merge_slow (object *ob1, object *ob2)
197	{	198	{
198	/* A couple quicksanity checks */	199	/* A couple quicksanity checks */
199	if (ob1 == ob2	200	if (ob1 == ob2
200	|| ob1->type != ob2->type	201	|| ob1->type != ob2->type
…		…
277		278
278	/* Note sure why the following is the case - either the object has to	279	/* 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	280	* be animated or have a very low speed. Is this an attempted monster
280	* check?	281	* check?
281	*/	282	*/
282	if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && FABS ((ob1)->speed) > MIN_ACTIVE_SPEED)	283	if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && ob1->has_active_speed ())
283	return 0;	284	return 0;
284		285
285	switch (ob1->type)	286	switch (ob1->type)
286	{	287	{
287	case SCROLL:	288	case SCROLL:
…		…
298	return 0;	299	return 0;
299	else if (!compare_ob_value_lists (ob1, ob2))	300	else if (!compare_ob_value_lists (ob1, ob2))
300	return 0;	301	return 0;
301	}	302	}
302		303
303	//TODO: generate an event or call into perl for additional checks
304	if (ob1->self || ob2->self)	304	if (ob1->self || ob2->self)
305	{	305	{
306	ob1->optimise ();	306	ob1->optimise ();
307	ob2->optimise ();	307	ob2->optimise ();
308		308
309	if (ob1->self || ob2->self)	309	if (ob1->self || ob2->self)
		310	if (!cfperl_can_merge (ob1, ob2))
310	return 0;	311	return 0;
311	}	312	}
312		313
313	/* Everything passes, must be OK. */	314	/* Everything passes, must be OK. */
314	return 1;	315	return 1;
315	}	316	}
…		…
323	sum_weight (object *op)	324	sum_weight (object *op)
324	{	325	{
325	long sum;	326	long sum;
326	object *inv;	327	object *inv;
327		328
328	for (sum = 0, inv = op->inv; inv != NULL; inv = inv->below)	329	for (sum = 0, inv = op->inv; inv; inv = inv->below)
329	{	330	{
330	if (inv->inv)	331	if (inv->inv)
331	sum_weight (inv);	332	sum_weight (inv);
		333
332	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);	334	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);
333	}	335	}
334		336
335	if (op->type == CONTAINER && op->stats.Str)	337	if (op->type == CONTAINER && op->stats.Str)
336	sum = (sum * (100 - op->stats.Str)) / 100;	338	sum = (sum * (100 - op->stats.Str)) / 100;
…		…
356	/*	358	/*
357	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.	359	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
358	* Some error messages.	360	* Some error messages.
359	* The result of the dump is stored in the static global errmsg array.	361	* The result of the dump is stored in the static global errmsg array.
360	*/	362	*/
361
362	char *	363	char *
363	dump_object (object *op)	364	dump_object (object *op)
364	{	365	{
365	if (!op)	366	if (!op)
366	return strdup ("[NULLOBJ]");	367	return strdup ("[NULLOBJ]");
367		368
368	object_freezer freezer;	369	object_freezer freezer;
369	save_object (freezer, op, 1);	370	op->write (freezer);
370	return freezer.as_string ();	371	return freezer.as_string ();
371	}	372	}
372		373
373	/*	374	/*
374	* get_nearest_part(multi-object, object 2) returns the part of the	375	* get_nearest_part(multi-object, object 2) returns the part of the
375	* multi-object 1 which is closest to the second object.	376	* multi-object 1 which is closest to the second object.
376	* If it's not a multi-object, it is returned.	377	* If it's not a multi-object, it is returned.
377	*/	378	*/
378
379	object *	379	object *
380	get_nearest_part (object *op, const object *pl)	380	get_nearest_part (object *op, const object *pl)
381	{	381	{
382	object *tmp, *closest;	382	object *tmp, *closest;
383	int last_dist, i;	383	int last_dist, i;
…		…
391	}	391	}
392		392
393	/*	393	/*
394	* Returns the object which has the count-variable equal to the argument.	394	* Returns the object which has the count-variable equal to the argument.
395	*/	395	*/
396
397	object *	396	object *
398	find_object (tag_t i)	397	find_object (tag_t i)
399	{	398	{
400	for (object *op = object::first; op; op = op->next)	399	for_all_objects (op)
401	if (op->count == i)	400	if (op->count == i)
402	return op;	401	return op;
403		402
404	return 0;	403	return 0;
405	}	404	}
406		405
407	/*	406	/*
408	* Returns the first object which has a name equal to the argument.	407	* Returns the first object which has a name equal to the argument.
409	* Used only by the patch command, but not all that useful.	408	* Used only by the patch command, but not all that useful.
410	* Enables features like "patch <name-of-other-player> food 999"	409	* Enables features like "patch <name-of-other-player> food 999"
411	*/	410	*/
412
413	object *	411	object *
414	find_object_name (const char *str)	412	find_object_name (const char *str)
415	{	413	{
416	shstr_cmp str_ (str);	414	shstr_cmp str_ (str);
417	object *op;	415	object *op;
418		416
419	for (op = object::first; op != NULL; op = op->next)	417	for_all_objects (op)
420	if (op->name == str_)	418	if (op->name == str_)
421	break;	419	break;
422		420
423	return op;	421	return op;
424	}	422	}
…		…
430	}	428	}
431		429
432	/*	430	/*
433	* Sets the owner and sets the skill and exp pointers to owner's current	431	* Sets the owner and sets the skill and exp pointers to owner's current
434	* skill and experience objects.	432	* skill and experience objects.
		433	* ACTUALLY NO! investigate! TODO
435	*/	434	*/
436	void	435	void
437	object::set_owner (object *owner)	436	object::set_owner (object *owner)
438	{	437	{
		438	// allow objects which own objects
439	if (!owner)	439	if (owner)
440	return;
441
442	/* next line added to allow objects which own objects */
443	/* Add a check for ownercounts in here, as I got into an endless loop
444	* with the fireball owning a poison cloud which then owned the
445	* fireball. I believe that was caused by one of the objects getting
446	* freed and then another object replacing it. Since the ownercounts
447	* didn't match, this check is valid and I believe that cause is valid.
448	*/
449	while (owner->owner)	440	while (owner->owner)
450	owner = owner->owner;	441	owner = owner->owner;
451		442
452	this->owner = owner;	443	this->owner = owner;
		444	}
		445
		446	int
		447	object::slottype () const
		448	{
		449	if (type == SKILL)
		450	{
		451	if (IS_COMBAT_SKILL (subtype)) return slot_combat;
		452	if (IS_RANGED_SKILL (subtype)) return slot_ranged;
		453	}
		454	else
		455	{
		456	if (slot [body_combat].info) return slot_combat;
		457	if (slot [body_range ].info) return slot_ranged;
		458	}
		459
		460	return slot_none;
		461	}
		462
		463	bool
		464	object::change_weapon (object *ob)
		465	{
		466	if (current_weapon == ob)
		467	return true;
		468
		469	if (chosen_skill)
		470	chosen_skill->flag [FLAG_APPLIED] = false;
		471
		472	current_weapon = ob;
		473	chosen_skill = !ob || ob->type == SKILL ? ob : find_skill_by_name (this, ob->skill);
		474
		475	if (chosen_skill)
		476	chosen_skill->flag [FLAG_APPLIED] = true;
		477
		478	update_stats ();
		479
		480	if (ob)
		481	{
		482	// now check wether any body locations became invalid, in which case
		483	// we cannot apply the weapon at the moment.
		484	for (int i = 0; i < NUM_BODY_LOCATIONS; ++i)
		485	if (slot[i].used < 0)
		486	{
		487	current_weapon = chosen_skill = 0;
		488	update_stats ();
		489
		490	new_draw_info_format (NDI_UNIQUE, 0, this,
		491	"You try to balance all your items at once, "
		492	"but the %s is just too much for your body. "
		493	"[You need to unapply some items first.]", &ob->name);
		494	return false;
		495	}
		496
		497	//new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);
		498	}
		499	else
		500	;//new_draw_info_format (NDI_UNIQUE, 0, this, "You unwield your weapons.");
		501
		502	if (ob && !ob->flag [FLAG_APPLIED] && ob->type != SPELL)
		503	{
		504	LOG (llevError | logBacktrace, "%s changed to unapplied weapon %s",
		505	&name, ob->debug_desc ());
		506	return false;
		507	}
		508
		509	return true;
453	}	510	}
454		511
455	/* Zero the key_values on op, decrementing the shared-string	512	/* Zero the key_values on op, decrementing the shared-string
456	* refcounts and freeing the links.	513	* refcounts and freeing the links.
457	*/	514	*/
458	static void	515	static void
459	free_key_values (object *op)	516	free_key_values (object *op)
460	{	517	{
461	for (key_value *i = op->key_values; i != 0;)	518	for (key_value *i = op->key_values; i; )
462	{	519	{
463	key_value *next = i->next;	520	key_value *next = i->next;
464	delete i;	521	delete i;
465		522
466	i = next;	523	i = next;
467	}	524	}
468		525
469	op->key_values = 0;	526	op->key_values = 0;
470	}	527	}
471		528
472	/*	529	object &
473	* copy_to first frees everything allocated by the dst object,	530	object::operator =(const object &src)
474	* and then copies the contents of itself into the second
475	* object, allocating what needs to be allocated. Basically, any
476	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
477	* if the first object is freed, the pointers in the new object
478	* will point at garbage.
479	*/
480	void
481	object::copy_to (object *dst)
482	{	531	{
483	bool is_freed = QUERY_FLAG (dst, FLAG_FREED);	532	bool is_freed = flag [FLAG_FREED];
484	bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED);	533	bool is_removed = flag [FLAG_REMOVED];
485		534
486	*(object_copy *)dst = *this;	535	*(object_copy *)this = src;
487		536
488	if (is_freed)	537	flag [FLAG_FREED] = is_freed;
489	SET_FLAG (dst, FLAG_FREED);	538	flag [FLAG_REMOVED] = is_removed;
490
491	if (is_removed)
492	SET_FLAG (dst, FLAG_REMOVED);
493
494	if (speed < 0)
495	dst->speed_left = speed_left - RANDOM () % 200 / 100.0;
496		539
497	/* Copy over key_values, if any. */	540	/* Copy over key_values, if any. */
498	if (key_values)	541	if (src.key_values)
499	{	542	{
500	key_value *tail = 0;	543	key_value *tail = 0;
501	key_value *i;
502
503	dst->key_values = 0;	544	key_values = 0;
504		545
505	for (i = key_values; i; i = i->next)	546	for (key_value *i = src.key_values; i; i = i->next)
506	{	547	{
507	key_value *new_link = new key_value;	548	key_value *new_link = new key_value;
508		549
509	new_link->next = 0;	550	new_link->next = 0;
510	new_link->key = i->key;	551	new_link->key = i->key;
511	new_link->value = i->value;	552	new_link->value = i->value;
512		553
513	/* Try and be clever here, too. */	554	/* Try and be clever here, too. */
514	if (!dst->key_values)	555	if (!key_values)
515	{	556	{
516	dst->key_values = new_link;	557	key_values = new_link;
517	tail = new_link;	558	tail = new_link;
518	}	559	}
519	else	560	else
520	{	561	{
521	tail->next = new_link;	562	tail->next = new_link;
522	tail = new_link;	563	tail = new_link;
523	}	564	}
524	}	565	}
525	}	566	}
		567	}
		568
		569	/*
		570	* copy_to first frees everything allocated by the dst object,
		571	* and then copies the contents of itself into the second
		572	* object, allocating what needs to be allocated. Basically, any
		573	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
		574	* if the first object is freed, the pointers in the new object
		575	* will point at garbage.
		576	*/
		577	void
		578	object::copy_to (object *dst)
		579	{
		580	*dst = *this;
		581
		582	if (speed < 0)
		583	dst->speed_left -= rndm ();
526		584
527	dst->set_speed (dst->speed);	585	dst->set_speed (dst->speed);
		586	}
		587
		588	void
		589	object::instantiate ()
		590	{
		591	if (!uuid.seq) // HACK
		592	uuid = gen_uuid ();
		593
		594	speed_left = -0.1f;
		595	/* copy the body_info to the body_used - this is only really
		596	* need for monsters, but doesn't hurt to do it for everything.
		597	* by doing so, when a monster is created, it has good starting
		598	* values for the body_used info, so when items are created
		599	* for it, they can be properly equipped.
		600	*/
		601	for (int i = NUM_BODY_LOCATIONS; i--; )
		602	slot[i].used = slot[i].info;
		603
		604	attachable::instantiate ();
528	}	605	}
529		606
530	object *	607	object *
531	object::clone ()	608	object::clone ()
532	{	609	{
…		…
538	/*	615	/*
539	* If an object with the IS_TURNABLE() flag needs to be turned due	616	* If an object with the IS_TURNABLE() flag needs to be turned due
540	* to the closest player being on the other side, this function can	617	* to the closest player being on the other side, this function can
541	* be called to update the face variable, _and_ how it looks on the map.	618	* be called to update the face variable, _and_ how it looks on the map.
542	*/	619	*/
543
544	void	620	void
545	update_turn_face (object *op)	621	update_turn_face (object *op)
546	{	622	{
547	if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || op->arch == NULL)	623	if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || !op->arch)
548	return;	624	return;
		625
549	SET_ANIMATION (op, op->direction);	626	SET_ANIMATION (op, op->direction);
550	update_object (op, UP_OBJ_FACE);	627	update_object (op, UP_OBJ_FACE);
551	}	628	}
552		629
553	/*	630	/*
…		…
556	* This function needs to be called whenever the speed of an object changes.	633	* This function needs to be called whenever the speed of an object changes.
557	*/	634	*/
558	void	635	void
559	object::set_speed (float speed)	636	object::set_speed (float speed)
560	{	637	{
561	extern int arch_init;
562
563	/* No reason putting the archetypes objects on the speed list,
564	* since they never really need to be updated.
565	*/
566	if (flag [FLAG_FREED] && speed)	638	if (flag [FLAG_FREED] && speed)
567	{	639	{
568	LOG (llevError, "Object %s is freed but has speed.\n", &name);	640	LOG (llevError, "Object %s is freed but has speed.\n", &name);
569	speed = 0;	641	speed = 0;
570	}	642	}
571		643
572	this->speed = speed;	644	this->speed = speed;
573		645
574	if (arch_init)	646	if (has_active_speed ())
575	return;	647	activate ();
576
577	if (FABS (speed) > MIN_ACTIVE_SPEED)
578	{
579	/* If already on active list, don't do anything */
580	if (active_next || active_prev || this == active_objects)
581	return;
582
583	/* process_events() expects us to insert the object at the beginning
584	* of the list. */
585	active_next = active_objects;
586
587	if (active_next)
588	active_next->active_prev = this;
589
590	active_objects = this;
591	}
592	else	648	else
593	{	649	deactivate ();
594	/* If not on the active list, nothing needs to be done */
595	if (!active_next && !active_prev && this != active_objects)
596	return;
597
598	if (!active_prev)
599	{
600	active_objects = active_next;
601
602	if (active_next)
603	active_next->active_prev = 0;
604	}
605	else
606	{
607	active_prev->active_next = active_next;
608
609	if (active_next)
610	active_next->active_prev = active_prev;
611	}
612
613	active_next = 0;
614	active_prev = 0;
615	}
616	}
617
618	/* This function removes object 'op' from the list of active
619	* objects.
620	* This should only be used for style maps or other such
621	* reference maps where you don't want an object that isn't
622	* in play chewing up cpu time getting processed.
623	* The reverse of this is to call update_ob_speed, which
624	* will do the right thing based on the speed of the object.
625	*/
626	void
627	remove_from_active_list (object *op)
628	{
629	/* If not on the active list, nothing needs to be done */
630	if (!op->active_next && !op->active_prev && op != active_objects)
631	return;
632
633	if (op->active_prev == NULL)
634	{
635	active_objects = op->active_next;
636	if (op->active_next != NULL)
637	op->active_next->active_prev = NULL;
638	}
639	else
640	{
641	op->active_prev->active_next = op->active_next;
642	if (op->active_next)
643	op->active_next->active_prev = op->active_prev;
644	}
645	op->active_next = NULL;
646	op->active_prev = NULL;
647	}	650	}
648		651
649	/*	652	/*
650	* update_object() updates the the map.	653	* update_object() updates the the map.
651	* It takes into account invisible objects (and represent squares covered	654	* It takes into account invisible objects (and represent squares covered
…		…
664	* UP_OBJ_FACE: only the objects face has changed.	667	* UP_OBJ_FACE: only the objects face has changed.
665	*/	668	*/
666	void	669	void
667	update_object (object *op, int action)	670	update_object (object *op, int action)
668	{	671	{
669	MoveType move_on, move_off, move_block, move_slow;
670
671	if (op == NULL)	672	if (op == NULL)
672	{	673	{
673	/* this should never happen */	674	/* this should never happen */
674	LOG (llevDebug, "update_object() called for NULL object.\n");	675	LOG (llevDebug, "update_object() called for NULL object.\n");
675	return;	676	return;
…		…
699	return;	700	return;
700	}	701	}
701		702
702	mapspace &m = op->ms ();	703	mapspace &m = op->ms ();
703		704
704	if (m.flags_ & P_NEED_UPDATE)	705	if (!(m.flags_ & P_UPTODATE))
705	/* nop */;	706	/* nop */;
706	else if (action == UP_OBJ_INSERT)	707	else if (action == UP_OBJ_INSERT)
707	{	708	{
708	// this is likely overkill, TODO: revisit (schmorp)	709	// this is likely overkill, TODO: revisit (schmorp)
709	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))	710	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
…		…
718	/* This isn't perfect, but I don't expect a lot of objects to	719	/* This isn't perfect, but I don't expect a lot of objects to
719	* to have move_allow right now.	720	* to have move_allow right now.
720	*/	721	*/
721	|| ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block	722	|| ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block
722	|| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)	723	|| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)
723	m.flags_ = P_NEED_UPDATE;	724	m.flags_ = 0;
724	}	725	}
725	/* if the object is being removed, we can't make intelligent	726	/* if the object is being removed, we can't make intelligent
726	* decisions, because remove_ob can't really pass the object	727	* decisions, because remove_ob can't really pass the object
727	* that is being removed.	728	* that is being removed.
728	*/	729	*/
729	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)	730	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
730	m.flags_ = P_NEED_UPDATE;	731	m.flags_ = 0;
731	else if (action == UP_OBJ_FACE)	732	else if (action == UP_OBJ_FACE)
732	/* Nothing to do for that case */ ;	733	/* Nothing to do for that case */ ;
733	else	734	else
734	LOG (llevError, "update_object called with invalid action: %d\n", action);	735	LOG (llevError, "update_object called with invalid action: %d\n", action);
735		736
736	if (op->more)	737	if (op->more)
737	update_object (op->more, action);	738	update_object (op->more, action);
738	}	739	}
739		740
740	object::vector object::objects; // not yet used
741	object *object::first;
742
743	object::object ()	741	object::object ()
744	{	742	{
745	SET_FLAG (this, FLAG_REMOVED);	743	SET_FLAG (this, FLAG_REMOVED);
746		744
747	expmul = 1.0;	745	expmul = 1.0;
748	face = blank_face;	746	face = blank_face;
749	}	747	}
750		748
751	object::~object ()	749	object::~object ()
752	{	750	{
		751	unlink ();
		752
753	free_key_values (this);	753	free_key_values (this);
754	}	754	}
755		755
		756	static int object_count;
		757
756	void object::link ()	758	void object::link ()
757	{	759	{
758	count = ++ob_count;	760	assert (!index);//D
759	uuid = gen_uuid ();	761	uuid = gen_uuid ();
		762	count = ++object_count;
760		763
761	prev = 0;	764	refcnt_inc ();
762	next = object::first;	765	objects.insert (this);
763
764	if (object::first)
765	object::first->prev = this;
766
767	object::first = this;
768	}	766	}
769		767
770	void object::unlink ()	768	void object::unlink ()
771	{	769	{
772	if (this == object::first)	770	if (!index)
773	object::first = next;	771	return;
774		772
775	/* Remove this object from the list of used objects */	773	objects.erase (this);
776	if (prev) prev->next = next;	774	refcnt_dec ();
777	if (next) next->prev = prev;	775	}
778		776
779	prev = 0;	777	void
780	next = 0;	778	object::activate ()
		779	{
		780	/* If already on active list, don't do anything */
		781	if (active)
		782	return;
		783
		784	if (has_active_speed ())
		785	actives.insert (this);
		786	}
		787
		788	void
		789	object::activate_recursive ()
		790	{
		791	activate ();
		792
		793	for (object *op = inv; op; op = op->below)
		794	op->activate_recursive ();
		795	}
		796
		797	/* This function removes object 'op' from the list of active
		798	* objects.
		799	* This should only be used for style maps or other such
		800	* reference maps where you don't want an object that isn't
		801	* in play chewing up cpu time getting processed.
		802	* The reverse of this is to call update_ob_speed, which
		803	* will do the right thing based on the speed of the object.
		804	*/
		805	void
		806	object::deactivate ()
		807	{
		808	/* If not on the active list, nothing needs to be done */
		809	if (!active)
		810	return;
		811
		812	actives.erase (this);
		813	}
		814
		815	void
		816	object::deactivate_recursive ()
		817	{
		818	for (object *op = inv; op; op = op->below)
		819	op->deactivate_recursive ();
		820
		821	deactivate ();
		822	}
		823
		824	void
		825	object::set_flag_inv (int flag, int value)
		826	{
		827	for (object *op = inv; op; op = op->below)
		828	{
		829	op->flag [flag] = value;
		830	op->set_flag_inv (flag, value);
		831	}
781	}	832	}
782		833
783	/*	834	/*
784	* Remove and free all objects in the inventory of the given object.	835	* Remove and free all objects in the inventory of the given object.
785	* object.c ?	836	* object.c ?
786	*/	837	*/
787	void	838	void
788	object::destroy_inv (bool drop_to_ground)	839	object::destroy_inv (bool drop_to_ground)
789	{	840	{
		841	// need to check first, because the checks below might segfault
		842	// as we might be on an invalid mapspace and crossfire code
		843	// is too buggy to ensure that the inventory is empty.
		844	// corollary: if you create arrows etc. with stuff in tis inventory,
		845	// cf will crash below with off-map x and y
		846	if (!inv)
		847	return;
		848
790	/* Only if the space blocks everything do we not process -	849	/* Only if the space blocks everything do we not process -
791	* if some form of movement is allowed, let objects	850	* if some form of movement is allowed, let objects
792	* drop on that space.	851	* drop on that space.
793	*/	852	*/
794	if (!drop_to_ground || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)	853	if (!drop_to_ground
		854	|| !map
		855	|| map->in_memory != MAP_IN_MEMORY
		856	|| map->nodrop
		857	|| ms ().move_block == MOVE_ALL)
795	{	858	{
796	while (inv)	859	while (inv)
		860	{
		861	inv->destroy_inv (drop_to_ground);
797	inv->destroy ();	862	inv->destroy ();
		863	}
798	}	864	}
799	else	865	else
800	{ /* Put objects in inventory onto this space */	866	{ /* Put objects in inventory onto this space */
801	while (inv)	867	while (inv)
802	{	868	{
…		…
804		870
805	if (op->flag [FLAG_STARTEQUIP]	871	if (op->flag [FLAG_STARTEQUIP]
806	|| op->flag [FLAG_NO_DROP]	872	|| op->flag [FLAG_NO_DROP]
807	|| op->type == RUNE	873	|| op->type == RUNE
808	|| op->type == TRAP	874	|| op->type == TRAP
809	|| op->flag [FLAG_IS_A_TEMPLATE])	875	|| op->flag [FLAG_IS_A_TEMPLATE]
		876	|| op->flag [FLAG_DESTROY_ON_DEATH])
810	op->destroy ();	877	op->destroy ();
811	else	878	else
812	{	879	map->insert (op, x, y);
813	op->remove ();
814	op->x = x;
815	op->y = y;
816	insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */
817	}
818	}	880	}
819	}	881	}
820	}	882	}
821		883
822	object *object::create ()	884	object *object::create ()
…		…
827	}	889	}
828		890
829	void	891	void
830	object::do_destroy ()	892	object::do_destroy ()
831	{	893	{
		894	attachable::do_destroy ();
		895
832	if (flag [FLAG_IS_LINKED])	896	if (flag [FLAG_IS_LINKED])
833	remove_button_link (this);	897	remove_button_link (this);
834		898
835	if (flag [FLAG_FRIENDLY])	899	if (flag [FLAG_FRIENDLY])
836	remove_friendly_object (this);	900	remove_friendly_object (this);
837		901
838	if (!flag [FLAG_REMOVED])	902	if (!flag [FLAG_REMOVED])
839	remove ();	903	remove ();
840		904
841	if (flag [FLAG_FREED])	905	destroy_inv (true);
842	return;	906
		907	deactivate ();
		908	unlink ();
843		909
844	flag [FLAG_FREED] = 1;	910	flag [FLAG_FREED] = 1;
845
846	attachable::do_destroy ();
847
848	destroy_inv (true);
849	set_speed (0);
850	unlink ();
851		911
852	// hack to ensure that freed objects still have a valid map	912	// hack to ensure that freed objects still have a valid map
853	{	913	{
854	static maptile *freed_map; // freed objects are moved here to avoid crashes	914	static maptile *freed_map; // freed objects are moved here to avoid crashes
855		915
856	if (!freed_map)	916	if (!freed_map)
857	{	917	{
858	freed_map = new maptile;	918	freed_map = new maptile;
859		919
		920	freed_map->path = "<freed objects map>";
860	freed_map->name = "/internal/freed_objects_map";	921	freed_map->name = "/internal/freed_objects_map";
861	freed_map->width = 3;	922	freed_map->width = 3;
862	freed_map->height = 3;	923	freed_map->height = 3;
863		924
864	freed_map->allocate ();	925	freed_map->alloc ();
		926	freed_map->in_memory = MAP_IN_MEMORY;
865	}	927	}
866		928
867	map = freed_map;	929	map = freed_map;
868	x = 1;	930	x = 1;
869	y = 1;	931	y = 1;
870	}	932	}
871		933
872	head = 0;
873
874	if (more)	934	if (more)
875	{	935	{
876	more->destroy ();	936	more->destroy ();
877	more = 0;	937	more = 0;
878	}	938	}
879		939
		940	head = 0;
		941
880	// clear those pointers that likely might have circular references to us	942	// clear those pointers that likely might cause circular references
881	owner = 0;	943	owner = 0;
882	enemy = 0;	944	enemy = 0;
883	attacked_by = 0;	945	attacked_by = 0;
884		946	current_weapon = 0;
885	// only relevant for players(?), but make sure of it anyways
886	contr = 0;
887	}	947	}
888		948
889	void	949	void
890	object::destroy (bool destroy_inventory)	950	object::destroy (bool destroy_inventory)
891	{	951	{
892	if (destroyed ())	952	if (destroyed ())
893	return;	953	return;
894		954
895	if (destroy_inventory)	955	if (destroy_inventory)
896	destroy_inv (false);	956	destroy_inv (false);
		957
		958	if (is_head ())
		959	if (sound_destroy)
		960	play_sound (sound_destroy);
		961	else if (flag [FLAG_MONSTER])
		962	play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism
897		963
898	attachable::destroy ();	964	attachable::destroy ();
899	}	965	}
900		966
901	/*	967	/*
…		…
919	* This function removes the object op from the linked list of objects	985	* This function removes the object op from the linked list of objects
920	* which it is currently tied to. When this function is done, the	986	* which it is currently tied to. When this function is done, the
921	* object will have no environment. If the object previously had an	987	* object will have no environment. If the object previously had an
922	* environment, the x and y coordinates will be updated to	988	* environment, the x and y coordinates will be updated to
923	* the previous environment.	989	* the previous environment.
924	* Beware: This function is called from the editor as well!
925	*/	990	*/
926	void	991	void
927	object::remove ()	992	object::do_remove ()
928	{	993	{
929	object *tmp, *last = 0;	994	object *tmp, *last = 0;
930	object *otmp;	995	object *otmp;
931		996
932	if (QUERY_FLAG (this, FLAG_REMOVED))	997	if (QUERY_FLAG (this, FLAG_REMOVED))
…		…
954	* to save cpu time.	1019	* to save cpu time.
955	*/	1020	*/
956	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1021	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
957	otmp->update_stats ();	1022	otmp->update_stats ();
958		1023
959	if (above != NULL)	1024	if (above)
960	above->below = below;	1025	above->below = below;
961	else	1026	else
962	env->inv = below;	1027	env->inv = below;
963		1028
964	if (below != NULL)	1029	if (below)
965	below->above = above;	1030	below->above = above;
966		1031
967	/* we set up values so that it could be inserted into	1032	/* we set up values so that it could be inserted into
968	* the map, but we don't actually do that - it is up	1033	* the map, but we don't actually do that - it is up
969	* to the caller to decide what we want to do.	1034	* to the caller to decide what we want to do.
…		…
973	above = 0, below = 0;	1038	above = 0, below = 0;
974	env = 0;	1039	env = 0;
975	}	1040	}
976	else if (map)	1041	else if (map)
977	{	1042	{
978	/* Re did the following section of code - it looks like it had	1043	if (type == PLAYER)
979	* lots of logic for things we no longer care about
980	*/	1044	{
		1045	// leaving a spot always closes any open container on the ground
		1046	if (container && !container->env)
		1047	// this causes spurious floorbox updates, but it ensures
		1048	// that the CLOSE event is being sent.
		1049	close_container ();
		1050
		1051	--map->players;
		1052	map->touch ();
		1053	}
		1054
		1055	map->dirty = true;
		1056	mapspace &ms = this->ms ();
981		1057
982	/* link the object above us */	1058	/* link the object above us */
983	if (above)	1059	if (above)
984	above->below = below;	1060	above->below = below;
985	else	1061	else
986	map->at (x, y).top = below; /* we were top, set new top */	1062	ms.top = below; /* we were top, set new top */
987		1063
988	/* Relink the object below us, if there is one */	1064	/* Relink the object below us, if there is one */
989	if (below)	1065	if (below)
990	below->above = above;	1066	below->above = above;
991	else	1067	else
…		…
993	/* Nothing below, which means we need to relink map object for this space	1069	/* Nothing below, which means we need to relink map object for this space
994	* use translated coordinates in case some oddness with map tiling is	1070	* use translated coordinates in case some oddness with map tiling is
995	* evident	1071	* evident
996	*/	1072	*/
997	if (GET_MAP_OB (map, x, y) != this)	1073	if (GET_MAP_OB (map, x, y) != this)
998	{
999	char *dump = dump_object (this);
1000	LOG (llevError,
1001	"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);	1074	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 ());
1002	free (dump);
1003	dump = dump_object (GET_MAP_OB (map, x, y));
1004	LOG (llevError, "%s\n", dump);
1005	free (dump);
1006	}
1007		1075
1008	map->at (x, y).bot = above; /* goes on above it. */	1076	ms.bot = above; /* goes on above it. */
1009	}	1077	}
1010		1078
1011	above = 0;	1079	above = 0;
1012	below = 0;	1080	below = 0;
1013		1081
1014	if (map->in_memory == MAP_SAVING)	1082	if (map->in_memory == MAP_SAVING)
1015	return;	1083	return;
1016		1084
1017	int check_walk_off = !flag [FLAG_NO_APPLY];	1085	int check_walk_off = !flag [FLAG_NO_APPLY];
1018		1086
		1087	if (object *pl = ms.player ())
		1088	{
		1089	if (pl->container == this)
		1090	/* If a container that the player is currently using somehow gets
		1091	* removed (most likely destroyed), update the player view
		1092	* appropriately.
		1093	*/
		1094	pl->close_container ();
		1095
		1096	pl->contr->ns->floorbox_update ();
		1097	}
		1098
1019	for (tmp = map->at (x, y).bot; tmp; tmp = tmp->above)	1099	for (tmp = ms.bot; tmp; tmp = tmp->above)
1020	{	1100	{
1021	/* No point updating the players look faces if he is the object	1101	/* No point updating the players look faces if he is the object
1022	* being removed.	1102	* being removed.
1023	*/	1103	*/
1024		1104
1025	if (tmp->type == PLAYER && tmp != this)
1026	{
1027	/* If a container that the player is currently using somehow gets
1028	* removed (most likely destroyed), update the player view
1029	* appropriately.
1030	*/
1031	if (tmp->container == this)
1032	{
1033	flag [FLAG_APPLIED] = 0;
1034	tmp->container = 0;
1035	}
1036
1037	if (tmp->contr->ns)
1038	tmp->contr->ns->floorbox_update ();
1039	}
1040
1041	/* See if player moving off should effect something */	1105	/* See if object moving off should effect something */
1042	if (check_walk_off	1106	if (check_walk_off
1043	&& ((move_type & tmp->move_off)	1107	&& ((move_type & tmp->move_off)
1044	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))	1108	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1045	{	1109	{
1046	move_apply (tmp, this, 0);	1110	move_apply (tmp, this, 0);
1047		1111
1048	if (destroyed ())	1112	if (destroyed ())
1049	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());	1113	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1050	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1051	}	1114	}
1052		1115
1053	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1054
1055	if (tmp->above == tmp)
1056	tmp->above = 0;
1057
1058	last = tmp;	1116	last = tmp;
1059	}	1117	}
1060		1118
1061	/* last == NULL of there are no objects on this space */	1119	/* last == NULL if there are no objects on this space */
		1120	//TODO: this makes little sense, why only update the topmost object?
1062	if (!last)	1121	if (!last)
1063	map->at (x, y).flags_ = P_NEED_UPDATE;	1122	map->at (x, y).flags_ = 0;
1064	else	1123	else
1065	update_object (last, UP_OBJ_REMOVE);	1124	update_object (last, UP_OBJ_REMOVE);
1066		1125
1067	if (flag [FLAG_BLOCKSVIEW] || glow_radius)	1126	if (flag [FLAG_BLOCKSVIEW] || glow_radius)
1068	update_all_los (map, x, y);	1127	update_all_los (map, x, y);
…		…
1104	}	1163	}
1105		1164
1106	return 0;	1165	return 0;
1107	}	1166	}
1108		1167
		1168	void
		1169	object::expand_tail ()
		1170	{
		1171	if (more)
		1172	return;
		1173
		1174	object *prev = this;
		1175
		1176	for (archetype *at = (archetype *)arch->more; at; at = (archetype *)at->more)
		1177	{
		1178	object *op = arch_to_object (at);
		1179
		1180	op->name = name;
		1181	op->name_pl = name_pl;
		1182	op->title = title;
		1183
		1184	op->head = this;
		1185	prev->more = op;
		1186
		1187	prev = op;
		1188	}
		1189	}
		1190
1109	/*	1191	/*
1110	* same as insert_ob_in_map except it handle separate coordinates and do a clean	1192	* same as insert_ob_in_map except it handles separate coordinates and does a clean
1111	* job preparing multi-part monsters	1193	* job preparing multi-part monsters.
1112	*/	1194	*/
1113	object *	1195	object *
1114	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)	1196	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1115	{	1197	{
1116	object *tmp;
1117
1118	if (op->head)
1119	op = op->head;
1120
1121	for (tmp = op; tmp; tmp = tmp->more)	1198	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1122	{	1199	{
1123	tmp->x = x + tmp->arch->clone.x;	1200	tmp->x = x + tmp->arch->x;
1124	tmp->y = y + tmp->arch->clone.y;	1201	tmp->y = y + tmp->arch->y;
1125	}	1202	}
1126		1203
1127	return insert_ob_in_map (op, m, originator, flag);	1204	return insert_ob_in_map (op, m, originator, flag);
1128	}	1205	}
1129		1206
…		…
1148	* just 'op' otherwise	1225	* just 'op' otherwise
1149	*/	1226	*/
1150	object *	1227	object *
1151	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)	1228	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1152	{	1229	{
		1230	assert (!op->flag [FLAG_FREED]);
		1231
1153	object *tmp, *top, *floor = NULL;	1232	object *top, *floor = NULL;
1154	sint16 x, y;
1155		1233
1156	if (QUERY_FLAG (op, FLAG_FREED))	1234	op->remove ();
1157	{
1158	LOG (llevError, "Trying to insert freed object!\n");
1159	return NULL;
1160	}
1161
1162	if (m == NULL)
1163	{
1164	char *dump = dump_object (op);
1165	LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
1166	free (dump);
1167	return op;
1168	}
1169
1170	if (out_of_map (m, op->x, op->y))
1171	{
1172	char *dump = dump_object (op);
1173	LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump);
1174	#ifdef MANY_CORES
1175	/* Better to catch this here, as otherwise the next use of this object
1176	* is likely to cause a crash. Better to find out where it is getting
1177	* improperly inserted.
1178	*/
1179	abort ();
1180	#endif
1181	free (dump);
1182	return op;
1183	}
1184
1185	if (!QUERY_FLAG (op, FLAG_REMOVED))
1186	{
1187	char *dump = dump_object (op);
1188	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
1189	free (dump);
1190	return op;
1191	}
1192
1193	if (op->more)
1194	{
1195	/* The part may be on a different map. */
1196
1197	object *more = op->more;
1198
1199	/* We really need the caller to normalize coordinates - if
1200	* we set the map, that doesn't work if the location is within
1201	* a map and this is straddling an edge. So only if coordinate
1202	* is clear wrong do we normalize it.
1203	*/
1204	if (OUT_OF_REAL_MAP (more->map, more->x, more->y))
1205	more->map = get_map_from_coord (m, &more->x, &more->y);
1206	else if (!more->map)
1207	{
1208	/* For backwards compatibility - when not dealing with tiled maps,
1209	* more->map should always point to the parent.
1210	*/
1211	more->map = m;
1212	}
1213
1214	if (insert_ob_in_map (more, more->map, originator, flag) == NULL)
1215	{
1216	if (!op->head)
1217	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1218
1219	return 0;
1220	}
1221	}
1222
1223	CLEAR_FLAG (op, FLAG_REMOVED);
1224		1235
1225	/* Ideally, the caller figures this out. However, it complicates a lot	1236	/* Ideally, the caller figures this out. However, it complicates a lot
1226	* of areas of callers (eg, anything that uses find_free_spot would now	1237	* of areas of callers (eg, anything that uses find_free_spot would now
1227	* need extra work	1238	* need extra work
1228	*/	1239	*/
1229	op->map = get_map_from_coord (m, &op->x, &op->y);	1240	if (!xy_normalise (m, op->x, op->y))
1230	x = op->x;	1241	{
1231	y = op->y;	1242	op->destroy ();
		1243	return 0;
		1244	}
		1245
		1246	if (object *more = op->more)
		1247	if (!insert_ob_in_map (more, m, originator, flag))
		1248	return 0;
		1249
		1250	CLEAR_FLAG (op, FLAG_REMOVED);
		1251
		1252	op->map = m;
		1253	mapspace &ms = op->ms ();
1232		1254
1233	/* this has to be done after we translate the coordinates.	1255	/* this has to be done after we translate the coordinates.
1234	*/	1256	*/
1235	if (op->nrof && !(flag & INS_NO_MERGE))	1257	if (op->nrof && !(flag & INS_NO_MERGE))
1236	for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)	1258	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1237	if (object::can_merge (op, tmp))	1259	if (object::can_merge (op, tmp))
1238	{	1260	{
1239	op->nrof += tmp->nrof;	1261	op->nrof += tmp->nrof;
1240	tmp->destroy ();	1262	tmp->destroy ();
1241	}	1263	}
…		…
1258	op->below = originator->below;	1280	op->below = originator->below;
1259		1281
1260	if (op->below)	1282	if (op->below)
1261	op->below->above = op;	1283	op->below->above = op;
1262	else	1284	else
1263	op->ms ().bot = op;	1285	ms.bot = op;
1264		1286
1265	/* since *below* originator, no need to update top */	1287	/* since *below* originator, no need to update top */
1266	originator->below = op;	1288	originator->below = op;
1267	}	1289	}
1268	else	1290	else
1269	{	1291	{
		1292	top = ms.bot;
		1293
1270	/* If there are other objects, then */	1294	/* If there are other objects, then */
1271	if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL))	1295	if ((!(flag & INS_MAP_LOAD)) && top)
1272	{	1296	{
1273	object *last = NULL;	1297	object *last = 0;
1274		1298
1275	/*	1299	/*
1276	* If there are multiple objects on this space, we do some trickier handling.	1300	* If there are multiple objects on this space, we do some trickier handling.
1277	* We've already dealt with merging if appropriate.	1301	* We've already dealt with merging if appropriate.
1278	* Generally, we want to put the new object on top. But if	1302	* Generally, we want to put the new object on top. But if
…		…
1282	* once we get to them. This reduces the need to traverse over all of	1306	* once we get to them. This reduces the need to traverse over all of
1283	* them when adding another one - this saves quite a bit of cpu time	1307	* them when adding another one - this saves quite a bit of cpu time
1284	* when lots of spells are cast in one area. Currently, it is presumed	1308	* when lots of spells are cast in one area. Currently, it is presumed
1285	* that flying non pickable objects are spell objects.	1309	* that flying non pickable objects are spell objects.
1286	*/	1310	*/
1287		1311	for (top = ms.bot; top; top = top->above)
1288	while (top != NULL)
1289	{	1312	{
1290	if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))	1313	if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))
1291	floor = top;	1314	floor = top;
1292		1315
1293	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))	1316	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))
…		…
1296	top = top->below;	1319	top = top->below;
1297	break;	1320	break;
1298	}	1321	}
1299		1322
1300	last = top;	1323	last = top;
1301	top = top->above;
1302	}	1324	}
1303		1325
1304	/* Don't want top to be NULL, so set it to the last valid object */	1326	/* Don't want top to be NULL, so set it to the last valid object */
1305	top = last;	1327	top = last;
1306		1328
…		…
1308	* looks like instead of lots of conditions here.	1330	* looks like instead of lots of conditions here.
1309	* makes things faster, and effectively the same result.	1331	* makes things faster, and effectively the same result.
1310	*/	1332	*/
1311		1333
1312	/* Have object 'fall below' other objects that block view.	1334	/* Have object 'fall below' other objects that block view.
1313	* Unless those objects are exits, type 66	1335	* Unless those objects are exits.
1314	* If INS_ON_TOP is used, don't do this processing	1336	* If INS_ON_TOP is used, don't do this processing
1315	* Need to find the object that in fact blocks view, otherwise	1337	* Need to find the object that in fact blocks view, otherwise
1316	* stacking is a bit odd.	1338	* stacking is a bit odd.
1317	*/	1339	*/
1318	if (!(flag & INS_ON_TOP) &&	1340	if (!(flag & INS_ON_TOP)
1319	(get_map_flags (op->map, 0, op->x, op->y, 0, 0) & P_BLOCKSVIEW) && (op->face && !op->face->visibility))	1341	&& ms.flags () & P_BLOCKSVIEW
		1342	&& (op->face && !faces [op->face].visibility))
1320	{	1343	{
1321	for (last = top; last != floor; last = last->below)	1344	for (last = top; last != floor; last = last->below)
1322	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1345	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1323	break;	1346	break;
		1347
1324	/* Check to see if we found the object that blocks view,	1348	/* Check to see if we found the object that blocks view,
1325	* and make sure we have a below pointer for it so that	1349	* and make sure we have a below pointer for it so that
1326	* we can get inserted below this one, which requires we	1350	* we can get inserted below this one, which requires we
1327	* set top to the object below us.	1351	* set top to the object below us.
1328	*/	1352	*/
1329	if (last && last->below && last != floor)	1353	if (last && last->below && last != floor)
1330	top = last->below;	1354	top = last->below;
1331	}	1355	}
1332	} /* If objects on this space */	1356	} /* If objects on this space */
1333
1334	if (flag & INS_MAP_LOAD)	1357	if (flag & INS_MAP_LOAD)
1335	top = GET_MAP_TOP (op->map, op->x, op->y);	1358	top = ms.top;
1336		1359
1337	if (flag & INS_ABOVE_FLOOR_ONLY)	1360	if (flag & INS_ABOVE_FLOOR_ONLY)
1338	top = floor;	1361	top = floor;
1339		1362
1340	/* Top is the object that our object (op) is going to get inserted above.	1363	/* Top is the object that our object (op) is going to get inserted above.
1341	*/	1364	*/
1342		1365
1343	/* First object on this space */	1366	/* First object on this space */
1344	if (!top)	1367	if (!top)
1345	{	1368	{
1346	op->above = GET_MAP_OB (op->map, op->x, op->y);	1369	op->above = ms.bot;
1347		1370
1348	if (op->above)	1371	if (op->above)
1349	op->above->below = op;	1372	op->above->below = op;
1350		1373
1351	op->below = NULL;	1374	op->below = 0;
1352	op->ms ().bot = op;	1375	ms.bot = op;
1353	}	1376	}
1354	else	1377	else
1355	{ /* get inserted into the stack above top */	1378	{ /* get inserted into the stack above top */
1356	op->above = top->above;	1379	op->above = top->above;
1357		1380
…		…
1360		1383
1361	op->below = top;	1384	op->below = top;
1362	top->above = op;	1385	top->above = op;
1363	}	1386	}
1364		1387
1365	if (op->above == NULL)	1388	if (!op->above)
1366	op->ms ().top = op;	1389	ms.top = op;
1367	} /* else not INS_BELOW_ORIGINATOR */	1390	} /* else not INS_BELOW_ORIGINATOR */
1368		1391
1369	if (op->type == PLAYER)	1392	if (op->type == PLAYER)
		1393	{
1370	op->contr->do_los = 1;	1394	op->contr->do_los = 1;
		1395	++op->map->players;
		1396	op->map->touch ();
		1397	}
1371		1398
1372	/* If we have a floor, we know the player, if any, will be above	1399	op->map->dirty = true;
1373	* it, so save a few ticks and start from there.	1400
1374	*/
1375	if (!(flag & INS_MAP_LOAD))	1401	if (!(flag & INS_MAP_LOAD))
1376	if (object *pl = op->ms ().player ())	1402	if (object *pl = ms.player ())
1377	if (pl->contr->ns)
1378	pl->contr->ns->floorbox_update ();	1403	pl->contr->ns->floorbox_update ();
1379		1404
1380	/* If this object glows, it may affect lighting conditions that are	1405	/* If this object glows, it may affect lighting conditions that are
1381	* visible to others on this map. But update_all_los is really	1406	* visible to others on this map. But update_all_los is really
1382	* an inefficient way to do this, as it means los for all players	1407	* an inefficient way to do this, as it means los for all players
1383	* on the map will get recalculated. The players could very well	1408	* on the map will get recalculated. The players could very well
1384	* be far away from this change and not affected in any way -	1409	* be far away from this change and not affected in any way -
1385	* this should get redone to only look for players within range,	1410	* this should get redone to only look for players within range,
1386	* or just updating the P_NEED_UPDATE for spaces within this area	1411	* or just updating the P_UPTODATE for spaces within this area
1387	* of effect may be sufficient.	1412	* of effect may be sufficient.
1388	*/	1413	*/
1389	if (op->map->darkness && (op->glow_radius != 0))	1414	if (op->map->darkness && (op->glow_radius != 0))
1390	update_all_los (op->map, op->x, op->y);	1415	update_all_los (op->map, op->x, op->y);
1391		1416
…		…
1402	* blocked() and wall() work properly), and these flags are updated by	1427	* blocked() and wall() work properly), and these flags are updated by
1403	* update_object().	1428	* update_object().
1404	*/	1429	*/
1405		1430
1406	/* if this is not the head or flag has been passed, don't check walk on status */	1431	/* if this is not the head or flag has been passed, don't check walk on status */
1407	if (!(flag & INS_NO_WALK_ON) && !op->head)	1432	if (!(flag & INS_NO_WALK_ON) && op->head_ () == op)
1408	{	1433	{
1409	if (check_move_on (op, originator))	1434	if (check_move_on (op, originator))
1410	return 0;	1435	return 0;
1411		1436
1412	/* If we are a multi part object, lets work our way through the check	1437	/* If we are a multi part object, lets work our way through the check
1413	* walk on's.	1438	* walk on's.
1414	*/	1439	*/
1415	for (tmp = op->more; tmp != NULL; tmp = tmp->more)	1440	for (object *tmp = op->more; tmp; tmp = tmp->more)
1416	if (check_move_on (tmp, originator))	1441	if (check_move_on (tmp, originator))
1417	return 0;	1442	return 0;
1418	}	1443	}
1419		1444
1420	return op;	1445	return op;
…		…
1429	{	1454	{
1430	object *tmp, *tmp1;	1455	object *tmp, *tmp1;
1431		1456
1432	/* first search for itself and remove any old instances */	1457	/* first search for itself and remove any old instances */
1433		1458
1434	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1459	for (tmp = op->ms ().bot; tmp; tmp = tmp->above)
1435	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */	1460	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */
1436	tmp->destroy ();	1461	tmp->destroy ();
1437		1462
1438	tmp1 = arch_to_object (archetype::find (arch_string));	1463	tmp1 = arch_to_object (archetype::find (arch_string));
1439		1464
1440	tmp1->x = op->x;	1465	tmp1->x = op->x;
1441	tmp1->y = op->y;	1466	tmp1->y = op->y;
1442	insert_ob_in_map (tmp1, op->map, op, 0);	1467	insert_ob_in_map (tmp1, op->map, op, 0);
		1468	}
		1469
		1470	object *
		1471	object::insert_at (object *where, object *originator, int flags)
		1472	{
		1473	return where->map->insert (this, where->x, where->y, originator, flags);
1443	}	1474	}
1444		1475
1445	/*	1476	/*
1446	* get_split_ob(ob,nr) splits up ob into two parts. The part which	1477	* get_split_ob(ob,nr) splits up ob into two parts. The part which
1447	* is returned contains nr objects, and the remaining parts contains	1478	* is returned contains nr objects, and the remaining parts contains
1448	* the rest (or is removed and freed if that number is 0).	1479	* the rest (or is removed and freed if that number is 0).
1449	* On failure, NULL is returned, and the reason put into the	1480	* On failure, NULL is returned, and the reason put into the
1450	* global static errmsg array.	1481	* global static errmsg array.
1451	*/	1482	*/
1452
1453	object *	1483	object *
1454	get_split_ob (object *orig_ob, uint32 nr)	1484	get_split_ob (object *orig_ob, uint32 nr)
1455	{	1485	{
1456	object *newob;	1486	object *newob;
1457	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);	1487	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
…		…
1488	* the amount of an object. If the amount reaches 0, the object	1518	* the amount of an object. If the amount reaches 0, the object
1489	* is subsequently removed and freed.	1519	* is subsequently removed and freed.
1490	*	1520	*
1491	* Return value: 'op' if something is left, NULL if the amount reached 0	1521	* Return value: 'op' if something is left, NULL if the amount reached 0
1492	*/	1522	*/
1493
1494	object *	1523	object *
1495	decrease_ob_nr (object *op, uint32 i)	1524	decrease_ob_nr (object *op, uint32 i)
1496	{	1525	{
1497	object *tmp;	1526	object *tmp;
1498		1527
…		…
1573		1602
1574	/*	1603	/*
1575	* add_weight(object, weight) adds the specified weight to an object,	1604	* add_weight(object, weight) adds the specified weight to an object,
1576	* and also updates how much the environment(s) is/are carrying.	1605	* and also updates how much the environment(s) is/are carrying.
1577	*/	1606	*/
1578
1579	void	1607	void
1580	add_weight (object *op, signed long weight)	1608	add_weight (object *op, signed long weight)
1581	{	1609	{
1582	while (op != NULL)	1610	while (op != NULL)
1583	{	1611	{
…		…
1598	LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);	1626	LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
1599	free (dump);	1627	free (dump);
1600	return op;	1628	return op;
1601	}	1629	}
1602		1630
1603	if (where->head)	1631	if (where->head_ () != where)
1604	{	1632	{
1605	LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n");	1633	LOG (llevError | logBacktrace, "Warning: Tried to insert object into wrong part of multipart object.\n");
1606	where = where->head;	1634	where = where->head;
1607	}	1635	}
1608		1636
1609	return where->insert (op);	1637	return where->insert (op);
1610	}	1638	}
…		…
1615	* inside the object environment.	1643	* inside the object environment.
1616	*	1644	*
1617	* The function returns now pointer to inserted item, and return value can	1645	* The function returns now pointer to inserted item, and return value can
1618	* be != op, if items are merged. -Tero	1646	* be != op, if items are merged. -Tero
1619	*/	1647	*/
1620
1621	object *	1648	object *
1622	object::insert (object *op)	1649	object::insert (object *op)
1623	{	1650	{
1624	object *tmp, *otmp;
1625
1626	if (!QUERY_FLAG (op, FLAG_REMOVED))	1651	if (!QUERY_FLAG (op, FLAG_REMOVED))
1627	op->remove ();	1652	op->remove ();
1628		1653
1629	if (op->more)	1654	if (op->more)
1630	{	1655	{
…		…
1632	return op;	1657	return op;
1633	}	1658	}
1634		1659
1635	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1660	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1636	CLEAR_FLAG (op, FLAG_REMOVED);	1661	CLEAR_FLAG (op, FLAG_REMOVED);
		1662
1637	if (op->nrof)	1663	if (op->nrof)
1638	{	1664	{
1639	for (tmp = inv; tmp != NULL; tmp = tmp->below)	1665	for (object *tmp = inv; tmp; tmp = tmp->below)
1640	if (object::can_merge (tmp, op))	1666	if (object::can_merge (tmp, op))
1641	{	1667	{
1642	/* return the original object and remove inserted object	1668	/* return the original object and remove inserted object
1643	(client needs the original object) */	1669	(client needs the original object) */
1644	tmp->nrof += op->nrof;	1670	tmp->nrof += op->nrof;
…		…
1663	add_weight (this, op->weight * op->nrof);	1689	add_weight (this, op->weight * op->nrof);
1664	}	1690	}
1665	else	1691	else
1666	add_weight (this, (op->weight + op->carrying));	1692	add_weight (this, (op->weight + op->carrying));
1667		1693
1668	otmp = this->in_player ();	1694	if (object *otmp = this->in_player ())
1669	if (otmp && otmp->contr)
1670	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1695	if (otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1671	otmp->update_stats ();	1696	otmp->update_stats ();
1672		1697
		1698	op->owner = 0; // its his/hers now. period.
1673	op->map = 0;	1699	op->map = 0;
1674	op->env = this;	1700	op->env = this;
1675	op->above = 0;	1701	op->above = 0;
1676	op->below = 0;	1702	op->below = 0;
1677	op->x = 0, op->y = 0;	1703	op->x = op->y = 0;
1678		1704
1679	/* reset the light list and los of the players on the map */	1705	/* reset the light list and los of the players on the map */
1680	if ((op->glow_radius != 0) && map)	1706	if (op->glow_radius && map)
1681	{	1707	{
1682	#ifdef DEBUG_LIGHTS	1708	#ifdef DEBUG_LIGHTS
1683	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);	1709	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1684	#endif /* DEBUG_LIGHTS */	1710	#endif /* DEBUG_LIGHTS */
1685	if (map->darkness)	1711	if (map->darkness)
…		…
1721	*	1747	*
1722	* MSW 2001-07-08: Check all objects on space, not just those below	1748	* MSW 2001-07-08: Check all objects on space, not just those below
1723	* object being inserted. insert_ob_in_map may not put new objects	1749	* object being inserted. insert_ob_in_map may not put new objects
1724	* on top.	1750	* on top.
1725	*/	1751	*/
1726
1727	int	1752	int
1728	check_move_on (object *op, object *originator)	1753	check_move_on (object *op, object *originator)
1729	{	1754	{
1730	object *tmp;	1755	object *tmp;
1731	maptile *m = op->map;	1756	maptile *m = op->map;
…		…
1758		1783
1759	/* The objects have to be checked from top to bottom.	1784	/* The objects have to be checked from top to bottom.
1760	* Hence, we first go to the top:	1785	* Hence, we first go to the top:
1761	*/	1786	*/
1762		1787
1763	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp && tmp->above; tmp = tmp->above)	1788	for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above)
1764	{	1789	{
1765	/* Trim the search when we find the first other spell effect	1790	/* Trim the search when we find the first other spell effect
1766	* this helps performance so that if a space has 50 spell objects,	1791	* this helps performance so that if a space has 50 spell objects,
1767	* we don't need to check all of them.	1792	* we don't need to check all of them.
1768	*/	1793	*/
…		…
1786	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||	1811	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
1787	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))	1812	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1788	{	1813	{
1789		1814
1790	float	1815	float
1791	diff = tmp->move_slow_penalty * FABS (op->speed);	1816	diff = tmp->move_slow_penalty * fabs (op->speed);
1792		1817
1793	if (op->type == PLAYER)	1818	if (op->type == PLAYER)
1794	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||	1819	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||
1795	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))	1820	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))
1796	diff /= 4.0;	1821	diff /= 4.0;
…		…
1826	* The first matching object is returned, or NULL if none.	1851	* The first matching object is returned, or NULL if none.
1827	*/	1852	*/
1828	object *	1853	object *
1829	present_arch (const archetype *at, maptile *m, int x, int y)	1854	present_arch (const archetype *at, maptile *m, int x, int y)
1830	{	1855	{
1831	if (m == NULL || out_of_map (m, x, y))	1856	if (!m || out_of_map (m, x, y))
1832	{	1857	{
1833	LOG (llevError, "Present_arch called outside map.\n");	1858	LOG (llevError, "Present_arch called outside map.\n");
1834	return NULL;	1859	return NULL;
1835	}	1860	}
1836		1861
1837	for (object *tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1862	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1838	if (tmp->arch == at)	1863	if (tmp->arch == at)
1839	return tmp;	1864	return tmp;
1840		1865
1841	return NULL;	1866	return NULL;
1842	}	1867	}
…		…
1853	{	1878	{
1854	LOG (llevError, "Present called outside map.\n");	1879	LOG (llevError, "Present called outside map.\n");
1855	return NULL;	1880	return NULL;
1856	}	1881	}
1857		1882
1858	for (object *tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1883	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1859	if (tmp->type == type)	1884	if (tmp->type == type)
1860	return tmp;	1885	return tmp;
1861		1886
1862	return NULL;	1887	return NULL;
1863	}	1888	}
…		…
1940	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)	1965	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
1941	{	1966	{
1942	CLEAR_FLAG (tmp, flag);	1967	CLEAR_FLAG (tmp, flag);
1943	unflag_inv (tmp, flag);	1968	unflag_inv (tmp, flag);
1944	}	1969	}
1945	}
1946
1947	/*
1948	* set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in
1949	* all it's inventory (recursively).
1950	* If checksums are used, a player will get set_cheat called for
1951	* him/her-self and all object carried by a call to this function.
1952	*/
1953	void
1954	set_cheat (object *op)
1955	{
1956	SET_FLAG (op, FLAG_WAS_WIZ);
1957	flag_inv (op, FLAG_WAS_WIZ);
1958	}	1970	}
1959		1971
1960	/*	1972	/*
1961	* find_free_spot(object, map, x, y, start, stop) will search for	1973	* find_free_spot(object, map, x, y, start, stop) will search for
1962	* a spot at the given map and coordinates which will be able to contain	1974	* a spot at the given map and coordinates which will be able to contain
…		…
1979	* customized, changed states, etc.	1991	* customized, changed states, etc.
1980	*/	1992	*/
1981	int	1993	int
1982	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)	1994	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
1983	{	1995	{
		1996	int altern[SIZEOFFREE];
1984	int index = 0, flag;	1997	int index = 0, flag;
1985	int altern[SIZEOFFREE];
1986		1998
1987	for (int i = start; i < stop; i++)	1999	for (int i = start; i < stop; i++)
1988	{	2000	{
1989	flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]);	2001	mapxy pos (m, x, y); pos.move (i);
1990	if (!flag)	2002
		2003	if (!pos.normalise ())
		2004	continue;
		2005
		2006	mapspace &ms = *pos;
		2007
		2008	if (ms.flags () & P_IS_ALIVE)
		2009	continue;
		2010
		2011	/* However, often
		2012	* ob doesn't have any move type (when used to place exits)
		2013	* so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.
		2014	*/
		2015	if (ob->move_type == 0 && ms.move_block != MOVE_ALL)
		2016	{
1991	altern [index++] = i;	2017	altern [index++] = i;
		2018	continue;
		2019	}
1992		2020
1993	/* Basically, if we find a wall on a space, we cut down the search size.	2021	/* Basically, if we find a wall on a space, we cut down the search size.
1994	* In this way, we won't return spaces that are on another side of a wall.	2022	* In this way, we won't return spaces that are on another side of a wall.
1995	* This mostly work, but it cuts down the search size in all directions -	2023	* This mostly work, but it cuts down the search size in all directions -
1996	* if the space being examined only has a wall to the north and empty	2024	* if the space being examined only has a wall to the north and empty
1997	* spaces in all the other directions, this will reduce the search space	2025	* spaces in all the other directions, this will reduce the search space
1998	* to only the spaces immediately surrounding the target area, and	2026	* to only the spaces immediately surrounding the target area, and
1999	* won't look 2 spaces south of the target space.	2027	* won't look 2 spaces south of the target space.
2000	*/	2028	*/
2001	else if ((flag & P_NO_PASS) && maxfree[i] < stop)	2029	if (ms.move_block == MOVE_ALL && maxfree[i] < stop)
		2030	{
2002	stop = maxfree[i];	2031	stop = maxfree[i];
		2032	continue;
		2033	}
		2034
		2035	/* Note it is intentional that we check ob - the movement type of the
		2036	* head of the object should correspond for the entire object.
		2037	*/
		2038	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
		2039	continue;
		2040
		2041	altern [index++] = i;
2003	}	2042	}
2004		2043
2005	if (!index)	2044	if (!index)
2006	return -1;	2045	return -1;
2007		2046
2008	return altern[RANDOM () % index];	2047	return altern [rndm (index)];
2009	}	2048	}
2010		2049
2011	/*	2050	/*
2012	* find_first_free_spot(archetype, maptile, x, y) works like	2051	* find_first_free_spot(archetype, maptile, x, y) works like
2013	* find_free_spot(), but it will search max number of squares.	2052	* find_free_spot(), but it will search max number of squares.
…		…
2016	*/	2055	*/
2017	int	2056	int
2018	find_first_free_spot (const object *ob, maptile *m, int x, int y)	2057	find_first_free_spot (const object *ob, maptile *m, int x, int y)
2019	{	2058	{
2020	for (int i = 0; i < SIZEOFFREE; i++)	2059	for (int i = 0; i < SIZEOFFREE; i++)
2021	if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]))	2060	if (!ob->blocked (m, x + freearr_x[i], y + freearr_y[i]))
2022	return i;	2061	return i;
2023		2062
2024	return -1;	2063	return -1;
2025	}	2064	}
2026		2065
…		…
2034	{	2073	{
2035	arr += begin;	2074	arr += begin;
2036	end -= begin;	2075	end -= begin;
2037		2076
2038	while (--end)	2077	while (--end)
2039	swap (arr [end], arr [RANDOM () % (end + 1)]);	2078	swap (arr [end], arr [rndm (end + 1)]);
2040	}	2079	}
2041		2080
2042	/* new function to make monster searching more efficient, and effective!	2081	/* new function to make monster searching more efficient, and effective!
2043	* This basically returns a randomized array (in the passed pointer) of	2082	* This basically returns a randomized array (in the passed pointer) of
2044	* the spaces to find monsters. In this way, it won't always look for	2083	* the spaces to find monsters. In this way, it won't always look for
…		…
2080	object *tmp;	2119	object *tmp;
2081	maptile *mp;	2120	maptile *mp;
2082		2121
2083	MoveType blocked, move_type;	2122	MoveType blocked, move_type;
2084		2123
2085	if (exclude && exclude->head)	2124	if (exclude && exclude->head_ () != exclude)
2086	{	2125	{
2087	exclude = exclude->head;	2126	exclude = exclude->head;
2088	move_type = exclude->move_type;	2127	move_type = exclude->move_type;
2089	}	2128	}
2090	else	2129	else
…		…
2113	max = maxfree[i];	2152	max = maxfree[i];
2114	else if (mflags & P_IS_ALIVE)	2153	else if (mflags & P_IS_ALIVE)
2115	{	2154	{
2116	for (tmp = ms.bot; tmp; tmp = tmp->above)	2155	for (tmp = ms.bot; tmp; tmp = tmp->above)
2117	if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)	2156	if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)
2118	&& (tmp != exclude || (tmp->head && tmp->head != exclude)))	2157	&& (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2119	break;	2158	break;
2120		2159
2121	if (tmp)	2160	if (tmp)
2122	return freedir[i];	2161	return freedir[i];
2123	}	2162	}
…		…
2178		2217
2179	return 3;	2218	return 3;
2180	}	2219	}
2181		2220
2182	/*	2221	/*
2183	* absdir(int): Returns a number between 1 and 8, which represent
2184	* the "absolute" direction of a number (it actually takes care of
2185	* "overflow" in previous calculations of a direction).
2186	*/
2187
2188	int
2189	absdir (int d)
2190	{
2191	while (d < 1)
2192	d += 8;
2193
2194	while (d > 8)
2195	d -= 8;
2196
2197	return d;
2198	}
2199
2200	/*
2201	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is	2222	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is
2202	* between two directions (which are expected to be absolute (see absdir())	2223	* between two directions (which are expected to be absolute (see absdir())
2203	*/	2224	*/
2204
2205	int	2225	int
2206	dirdiff (int dir1, int dir2)	2226	dirdiff (int dir1, int dir2)
2207	{	2227	{
2208	int d;	2228	int d;
2209		2229
…		…
2322	* Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause	2342	* Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause
2323	* core dumps if they do.	2343	* core dumps if they do.
2324	*	2344	*
2325	* Add a check so we can't pick up invisible objects (0.93.8)	2345	* Add a check so we can't pick up invisible objects (0.93.8)
2326	*/	2346	*/
2327
2328	int	2347	int
2329	can_pick (const object *who, const object *item)	2348	can_pick (const object *who, const object *item)
2330	{	2349	{
2331	return /*QUERY_FLAG(who,FLAG_WIZ)|| */	2350	return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2332	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&	2351	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
…		…
2337	* create clone from object to another	2356	* create clone from object to another
2338	*/	2357	*/
2339	object *	2358	object *
2340	object_create_clone (object *asrc)	2359	object_create_clone (object *asrc)
2341	{	2360	{
2342	object *dst = 0, *tmp, *src, *part, *prev, *item;	2361	object *dst = 0, *tmp, *src, *prev, *item;
2343		2362
2344	if (!asrc)	2363	if (!asrc)
2345	return 0;	2364	return 0;
2346		2365
2347	src = asrc;
2348	if (src->head)
2349	src = src->head;	2366	src = asrc->head_ ();
2350		2367
2351	prev = 0;	2368	prev = 0;
2352	for (part = src; part; part = part->more)	2369	for (object *part = src; part; part = part->more)
2353	{	2370	{
2354	tmp = part->clone ();	2371	tmp = part->clone ();
2355	tmp->x -= src->x;	2372	tmp->x -= src->x;
2356	tmp->y -= src->y;	2373	tmp->y -= src->y;
2357		2374
…		…
2373		2390
2374	for (item = src->inv; item; item = item->below)	2391	for (item = src->inv; item; item = item->below)
2375	insert_ob_in_ob (object_create_clone (item), dst);	2392	insert_ob_in_ob (object_create_clone (item), dst);
2376		2393
2377	return dst;	2394	return dst;
2378	}
2379
2380	/* GROS - Creates an object using a string representing its content. */
2381	/* Basically, we save the content of the string to a temp file, then call */
2382	/* load_object on it. I admit it is a highly inefficient way to make things, */
2383	/* but it was simple to make and allows reusing the load_object function. */
2384	/* Remember not to use load_object_str in a time-critical situation. */
2385	/* Also remember that multiparts objects are not supported for now. */
2386	object *
2387	load_object_str (const char *obstr)
2388	{
2389	object *op;
2390	char filename[MAX_BUF];
2391
2392	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2393
2394	FILE *tempfile = fopen (filename, "w");
2395
2396	if (tempfile == NULL)
2397	{
2398	LOG (llevError, "Error - Unable to access load object temp file\n");
2399	return NULL;
2400	}
2401
2402	fprintf (tempfile, obstr);
2403	fclose (tempfile);
2404
2405	op = object::create ();
2406
2407	object_thawer thawer (filename);
2408
2409	if (thawer)
2410	load_object (thawer, op, 0);
2411
2412	LOG (llevDebug, " load str completed, object=%s\n", &op->name);
2413	CLEAR_FLAG (op, FLAG_REMOVED);
2414
2415	return op;
2416	}	2395	}
2417		2396
2418	/* This returns the first object in who's inventory that	2397	/* This returns the first object in who's inventory that
2419	* has the same type and subtype match.	2398	* has the same type and subtype match.
2420	* returns NULL if no match.	2399	* returns NULL if no match.
…		…
2475	if (link->key == canonical_key)	2454	if (link->key == canonical_key)
2476	return link->value;	2455	return link->value;
2477		2456
2478	return 0;	2457	return 0;
2479	}	2458	}
2480
2481		2459
2482	/*	2460	/*
2483	* Updates the canonical_key in op to value.	2461	* Updates the canonical_key in op to value.
2484	*	2462	*
2485	* canonical_key is a shared string (value doesn't have to be).	2463	* canonical_key is a shared string (value doesn't have to be).
…		…
2509	/* Basically, if the archetype has this key set,	2487	/* Basically, if the archetype has this key set,
2510	* we need to store the null value so when we save	2488	* we need to store the null value so when we save
2511	* it, we save the empty value so that when we load,	2489	* it, we save the empty value so that when we load,
2512	* we get this value back again.	2490	* we get this value back again.
2513	*/	2491	*/
2514	if (get_ob_key_link (&op->arch->clone, canonical_key))	2492	if (get_ob_key_link (op->arch, canonical_key))
2515	field->value = 0;	2493	field->value = 0;
2516	else	2494	else
2517	{	2495	{
2518	if (last)	2496	if (last)
2519	last->next = field->next;	2497	last->next = field->next;
…		…
2588	}	2566	}
2589	else	2567	else
2590	item = item->env;	2568	item = item->env;
2591	}	2569	}
2592		2570
		2571	const char *
		2572	object::flag_desc (char *desc, int len) const
		2573	{
		2574	char *p = desc;
		2575	bool first = true;
		2576
		2577	*p = 0;
		2578
		2579	for (int i = 0; i < NUM_FLAGS; i++)
		2580	{
		2581	if (len <= 10) // magic constant!
		2582	{
		2583	snprintf (p, len, ",...");
		2584	break;
		2585	}
		2586
		2587	if (flag [i])
		2588	{
		2589	int cnt = snprintf (p, len, "%s%d", first ? "" : ",", i);
		2590	len -= cnt;
		2591	p += cnt;
		2592	first = false;
		2593	}
		2594	}
		2595
		2596	return desc;
		2597	}
		2598
2593	// return a suitable string describing an objetc in enough detail to find it	2599	// return a suitable string describing an object in enough detail to find it
2594	const char *	2600	const char *
2595	object::debug_desc (char *info) const	2601	object::debug_desc (char *info) const
2596	{	2602	{
		2603	char flagdesc[512];
2597	char info2[256 * 3];	2604	char info2[256 * 4];
2598	char *p = info;	2605	char *p = info;
2599		2606
2600	p += snprintf (p, 256, "%d=\"%s%s%s\"",	2607	p += snprintf (p, 512, "{cnt:%d,uuid:<1.%" PRIx64 ">,name:\"%s\"%s%s,flags:[%s],type:%d}",
2601	count,	2608	count, uuid.seq,
2602	&name,	2609	&name,
2603	title ? " " : "",	2610	title ? "\",title:\"" : "",
2604	title ? (const char *)title : "");	2611	title ? (const char *)title : "",
		2612	flag_desc (flagdesc, 512), type);
2605		2613
2606	if (env)	2614	if (!this->flag[FLAG_REMOVED] && env)
2607	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2615	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2608		2616
2609	if (map)	2617	if (map)
2610	p += snprintf (p, 256, "(on %s@%d+%d)", map->path, x, y);	2618	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2611		2619
2612	return info;	2620	return info;
2613	}	2621	}
2614		2622
2615	const char *	2623	const char *
2616	object::debug_desc () const	2624	object::debug_desc () const
2617	{	2625	{
2618	static char info[256 * 3];	2626	static char info[3][256 * 4];
		2627	static int info_idx;
		2628
2619	return debug_desc (info);	2629	return debug_desc (info [++info_idx % 3]);
2620	}	2630	}
2621		2631
		2632	struct region *
		2633	object::region () const
		2634	{
		2635	return map ? map->region (x, y)
		2636	: region::default_region ();
		2637	}
		2638
		2639	const materialtype_t *
		2640	object::dominant_material () const
		2641	{
		2642	if (materialtype_t *mt = name_to_material (materialname))
		2643	return mt;
		2644
		2645	return name_to_material (shstr_unknown);
		2646	}
		2647
		2648	void
		2649	object::open_container (object *new_container)
		2650	{
		2651	if (container == new_container)
		2652	return;
		2653
		2654	if (object *old_container = container)
		2655	{
		2656	if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
		2657	return;
		2658
		2659	#if 0
		2660	// remove the "Close old_container" object.
		2661	if (object *closer = old_container->inv)
		2662	if (closer->type == CLOSE_CON)
		2663	closer->destroy ();
		2664	#endif
		2665
		2666	old_container->flag [FLAG_APPLIED] = 0;
		2667	container = 0;
		2668
		2669	esrv_update_item (UPD_FLAGS, this, old_container);
		2670	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
		2671	play_sound (sound_find ("chest_close"));
		2672	}
		2673
		2674	if (new_container)
		2675	{
		2676	if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))
		2677	return;
		2678
		2679	// TODO: this does not seem to serve any purpose anymore?
		2680	#if 0
		2681	// insert the "Close Container" object.
		2682	if (archetype *closer = new_container->other_arch)
		2683	{
		2684	object *closer = arch_to_object (new_container->other_arch);
		2685	closer->flag [FLAG_NO_MAP_SAVE] = 1;
		2686	new_container->insert (closer);
		2687	}
		2688	#endif
		2689
		2690	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));
		2691
		2692	new_container->flag [FLAG_APPLIED] = 1;
		2693	container = new_container;
		2694
		2695	esrv_update_item (UPD_FLAGS, this, new_container);
		2696	esrv_send_inventory (this, new_container);
		2697	play_sound (sound_find ("chest_open"));
		2698	}
		2699	}
		2700
		2701	object *
		2702	object::force_find (const shstr name)
		2703	{
		2704	/* cycle through his inventory to look for the MARK we want to
		2705	* place
		2706	*/
		2707	for (object *tmp = inv; tmp; tmp = tmp->below)
		2708	if (tmp->type == FORCE && tmp->slaying == name)
		2709	return splay (tmp);
		2710
		2711	return 0;
		2712	}
		2713
		2714	void
		2715	object::force_add (const shstr name, int duration)
		2716	{
		2717	if (object *force = force_find (name))
		2718	force->destroy ();
		2719
		2720	object *force = get_archetype (FORCE_NAME);
		2721
		2722	force->slaying = name;
		2723	force->stats.food = 1;
		2724	force->speed_left = -1.f;
		2725
		2726	force->set_speed (duration ? 1.f / duration : 0.f);
		2727	force->flag [FLAG_IS_USED_UP] = true;
		2728	force->flag [FLAG_APPLIED] = true;
		2729
		2730	insert (force);
		2731	}
		2732
		2733	void
		2734	object::play_sound (faceidx sound) const
		2735	{
		2736	if (!sound)
		2737	return;
		2738
		2739	if (flag [FLAG_REMOVED])
		2740	return;
		2741
		2742	if (env)
		2743	{
		2744	if (object *pl = in_player ())
		2745	pl->contr->play_sound (sound);
		2746	}
		2747	else
		2748	map->play_sound (sound, x, y);
		2749	}
		2750

Diff Legend

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