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.93 by root, Tue Dec 26 20:04:09 2006 UTC vs.
Revision 1.189 by root, Thu Sep 13 16:23:01 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	853	if (!drop_to_ground
795	|| !map	854	|| !map
796	|| map->in_memory != MAP_IN_MEMORY	855	|| map->in_memory != MAP_IN_MEMORY
		856	|| map->nodrop
797	|| map->at (x, y).move_block == MOVE_ALL)	857	|| ms ().move_block == MOVE_ALL)
798	{	858	{
799	while (inv)	859	while (inv)
800	{	860	{
801	inv->destroy_inv (drop_to_ground);	861	inv->destroy_inv (drop_to_ground);
802	inv->destroy ();	862	inv->destroy ();
…		…
810		870
811	if (op->flag [FLAG_STARTEQUIP]	871	if (op->flag [FLAG_STARTEQUIP]
812	|| op->flag [FLAG_NO_DROP]	872	|| op->flag [FLAG_NO_DROP]
813	|| op->type == RUNE	873	|| op->type == RUNE
814	|| op->type == TRAP	874	|| op->type == TRAP
815	|| op->flag [FLAG_IS_A_TEMPLATE])	875	|| op->flag [FLAG_IS_A_TEMPLATE]
		876	|| op->flag [FLAG_DESTROY_ON_DEATH])
816	op->destroy ();	877	op->destroy ();
817	else	878	else
818	map->insert (op, x, y);	879	map->insert (op, x, y);
819	}	880	}
820	}	881	}
…		…
828	}	889	}
829		890
830	void	891	void
831	object::do_destroy ()	892	object::do_destroy ()
832	{	893	{
		894	attachable::do_destroy ();
		895
833	if (flag [FLAG_IS_LINKED])	896	if (flag [FLAG_IS_LINKED])
834	remove_button_link (this);	897	remove_button_link (this);
835		898
836	if (flag [FLAG_FRIENDLY])	899	if (flag [FLAG_FRIENDLY])
837	remove_friendly_object (this);	900	remove_friendly_object (this);
838		901
839	if (!flag [FLAG_REMOVED])	902	if (!flag [FLAG_REMOVED])
840	remove ();	903	remove ();
841		904
842	if (flag [FLAG_FREED])	905	destroy_inv (true);
843	return;
844		906
845	set_speed (0);	907	deactivate ();
		908	unlink ();
846		909
847	flag [FLAG_FREED] = 1;	910	flag [FLAG_FREED] = 1;
848
849	attachable::do_destroy ();
850
851	destroy_inv (true);
852	unlink ();
853		911
854	// hack to ensure that freed objects still have a valid map	912	// hack to ensure that freed objects still have a valid map
855	{	913	{
856	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
857		915
858	if (!freed_map)	916	if (!freed_map)
859	{	917	{
860	freed_map = new maptile;	918	freed_map = new maptile;
861		919
		920	freed_map->path = "<freed objects map>";
862	freed_map->name = "/internal/freed_objects_map";	921	freed_map->name = "/internal/freed_objects_map";
863	freed_map->width = 3;	922	freed_map->width = 3;
864	freed_map->height = 3;	923	freed_map->height = 3;
865		924
866	freed_map->allocate ();	925	freed_map->alloc ();
		926	freed_map->in_memory = MAP_IN_MEMORY;
867	}	927	}
868		928
869	map = freed_map;	929	map = freed_map;
870	x = 1;	930	x = 1;
871	y = 1;	931	y = 1;
872	}	932	}
873		933
874	head = 0;
875
876	if (more)	934	if (more)
877	{	935	{
878	more->destroy ();	936	more->destroy ();
879	more = 0;	937	more = 0;
880	}	938	}
881		939
		940	head = 0;
		941
882	// clear those pointers that likely might have circular references to us	942	// clear those pointers that likely might cause circular references
883	owner = 0;	943	owner = 0;
884	enemy = 0;	944	enemy = 0;
885	attacked_by = 0;	945	attacked_by = 0;
886		946	current_weapon = 0;
887	// only relevant for players(?), but make sure of it anyways
888	contr = 0;
889	}	947	}
890		948
891	void	949	void
892	object::destroy (bool destroy_inventory)	950	object::destroy (bool destroy_inventory)
893	{	951	{
894	if (destroyed ())	952	if (destroyed ())
895	return;	953	return;
896		954
897	if (destroy_inventory)	955	if (destroy_inventory)
898	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
899		963
900	attachable::destroy ();	964	attachable::destroy ();
901	}	965	}
902		966
903	/*	967	/*
…		…
921	* 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
922	* 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
923	* object will have no environment. If the object previously had an	987	* object will have no environment. If the object previously had an
924	* environment, the x and y coordinates will be updated to	988	* environment, the x and y coordinates will be updated to
925	* the previous environment.	989	* the previous environment.
926	* Beware: This function is called from the editor as well!
927	*/	990	*/
928	void	991	void
929	object::remove ()	992	object::do_remove ()
930	{	993	{
931	object *tmp, *last = 0;	994	object *tmp, *last = 0;
932	object *otmp;	995	object *otmp;
933		996
934	if (QUERY_FLAG (this, FLAG_REMOVED))	997	if (QUERY_FLAG (this, FLAG_REMOVED))
…		…
956	* to save cpu time.	1019	* to save cpu time.
957	*/	1020	*/
958	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))
959	otmp->update_stats ();	1022	otmp->update_stats ();
960		1023
961	if (above != NULL)	1024	if (above)
962	above->below = below;	1025	above->below = below;
963	else	1026	else
964	env->inv = below;	1027	env->inv = below;
965		1028
966	if (below != NULL)	1029	if (below)
967	below->above = above;	1030	below->above = above;
968		1031
969	/* we set up values so that it could be inserted into	1032	/* we set up values so that it could be inserted into
970	* 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
971	* to the caller to decide what we want to do.	1034	* to the caller to decide what we want to do.
…		…
975	above = 0, below = 0;	1038	above = 0, below = 0;
976	env = 0;	1039	env = 0;
977	}	1040	}
978	else if (map)	1041	else if (map)
979	{	1042	{
980	/* Re did the following section of code - it looks like it had	1043	if (type == PLAYER)
981	* lots of logic for things we no longer care about
982	*/	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 ();
983		1057
984	/* link the object above us */	1058	/* link the object above us */
985	if (above)	1059	if (above)
986	above->below = below;	1060	above->below = below;
987	else	1061	else
988	map->at (x, y).top = below; /* we were top, set new top */	1062	ms.top = below; /* we were top, set new top */
989		1063
990	/* Relink the object below us, if there is one */	1064	/* Relink the object below us, if there is one */
991	if (below)	1065	if (below)
992	below->above = above;	1066	below->above = above;
993	else	1067	else
…		…
995	/* 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
996	* use translated coordinates in case some oddness with map tiling is	1070	* use translated coordinates in case some oddness with map tiling is
997	* evident	1071	* evident
998	*/	1072	*/
999	if (GET_MAP_OB (map, x, y) != this)	1073	if (GET_MAP_OB (map, x, y) != this)
1000	{
1001	char *dump = dump_object (this);
1002	LOG (llevError,
1003	"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 ());
1004	free (dump);
1005	dump = dump_object (GET_MAP_OB (map, x, y));
1006	LOG (llevError, "%s\n", dump);
1007	free (dump);
1008	}
1009		1075
1010	map->at (x, y).bot = above; /* goes on above it. */	1076	ms.bot = above; /* goes on above it. */
1011	}	1077	}
1012		1078
1013	above = 0;	1079	above = 0;
1014	below = 0;	1080	below = 0;
1015		1081
1016	if (map->in_memory == MAP_SAVING)	1082	if (map->in_memory == MAP_SAVING)
1017	return;	1083	return;
1018		1084
1019	int check_walk_off = !flag [FLAG_NO_APPLY];	1085	int check_walk_off = !flag [FLAG_NO_APPLY];
1020		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
1021	for (tmp = map->at (x, y).bot; tmp; tmp = tmp->above)	1099	for (tmp = ms.bot; tmp; tmp = tmp->above)
1022	{	1100	{
1023	/* 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
1024	* being removed.	1102	* being removed.
1025	*/	1103	*/
1026		1104
1027	if (tmp->type == PLAYER && tmp != this)
1028	{
1029	/* If a container that the player is currently using somehow gets
1030	* removed (most likely destroyed), update the player view
1031	* appropriately.
1032	*/
1033	if (tmp->container == this)
1034	{
1035	flag [FLAG_APPLIED] = 0;
1036	tmp->container = 0;
1037	}
1038
1039	if (tmp->contr->ns)
1040	tmp->contr->ns->floorbox_update ();
1041	}
1042
1043	/* See if player moving off should effect something */	1105	/* See if object moving off should effect something */
1044	if (check_walk_off	1106	if (check_walk_off
1045	&& ((move_type & tmp->move_off)	1107	&& ((move_type & tmp->move_off)
1046	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))	1108	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1047	{	1109	{
1048	move_apply (tmp, this, 0);	1110	move_apply (tmp, this, 0);
1049		1111
1050	if (destroyed ())	1112	if (destroyed ())
1051	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 ());
1052	}	1114	}
1053		1115
1054	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1055
1056	if (tmp->above == tmp)
1057	tmp->above = 0;
1058
1059	last = tmp;	1116	last = tmp;
1060	}	1117	}
1061		1118
1062	/* 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?
1063	if (!last)	1121	if (!last)
1064	map->at (x, y).flags_ = P_NEED_UPDATE;	1122	map->at (x, y).flags_ = 0;
1065	else	1123	else
1066	update_object (last, UP_OBJ_REMOVE);	1124	update_object (last, UP_OBJ_REMOVE);
1067		1125
1068	if (flag [FLAG_BLOCKSVIEW] || glow_radius)	1126	if (flag [FLAG_BLOCKSVIEW] || glow_radius)
1069	update_all_los (map, x, y);	1127	update_all_los (map, x, y);
…		…
1105	}	1163	}
1106		1164
1107	return 0;	1165	return 0;
1108	}	1166	}
1109		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
1110	/*	1191	/*
1111	* 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
1112	* job preparing multi-part monsters	1193	* job preparing multi-part monsters.
1113	*/	1194	*/
1114	object *	1195	object *
1115	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)
1116	{	1197	{
1117	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)	1198	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1118	{	1199	{
1119	tmp->x = x + tmp->arch->clone.x;	1200	tmp->x = x + tmp->arch->x;
1120	tmp->y = y + tmp->arch->clone.y;	1201	tmp->y = y + tmp->arch->y;
1121	}	1202	}
1122		1203
1123	return insert_ob_in_map (op, m, originator, flag);	1204	return insert_ob_in_map (op, m, originator, flag);
1124	}	1205	}
1125		1206
…		…
1144	* just 'op' otherwise	1225	* just 'op' otherwise
1145	*/	1226	*/
1146	object *	1227	object *
1147	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)
1148	{	1229	{
		1230	assert (!op->flag [FLAG_FREED]);
		1231
1149	object *tmp, *top, *floor = NULL;	1232	object *top, *floor = NULL;
1150	sint16 x, y;
1151		1233
1152	if (QUERY_FLAG (op, FLAG_FREED))	1234	op->remove ();
1153	{
1154	LOG (llevError, "Trying to insert freed object!\n");
1155	return NULL;
1156	}
1157
1158	if (m == NULL)
1159	{
1160	char *dump = dump_object (op);
1161	LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
1162	free (dump);
1163	return op;
1164	}
1165
1166	if (out_of_map (m, op->x, op->y))
1167	{
1168	char *dump = dump_object (op);
1169	LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump);
1170	#ifdef MANY_CORES
1171	/* Better to catch this here, as otherwise the next use of this object
1172	* is likely to cause a crash. Better to find out where it is getting
1173	* improperly inserted.
1174	*/
1175	abort ();
1176	#endif
1177	free (dump);
1178	return op;
1179	}
1180
1181	if (!QUERY_FLAG (op, FLAG_REMOVED))
1182	{
1183	char *dump = dump_object (op);
1184	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
1185	free (dump);
1186	return op;
1187	}
1188
1189	if (op->more)
1190	{
1191	/* The part may be on a different map. */
1192
1193	object *more = op->more;
1194
1195	/* We really need the caller to normalize coordinates - if
1196	* we set the map, that doesn't work if the location is within
1197	* a map and this is straddling an edge. So only if coordinate
1198	* is clear wrong do we normalize it.
1199	*/
1200	if (OUT_OF_REAL_MAP (more->map, more->x, more->y))
1201	more->map = get_map_from_coord (m, &more->x, &more->y);
1202	else if (!more->map)
1203	{
1204	/* For backwards compatibility - when not dealing with tiled maps,
1205	* more->map should always point to the parent.
1206	*/
1207	more->map = m;
1208	}
1209
1210	if (insert_ob_in_map (more, more->map, originator, flag) == NULL)
1211	{
1212	if (!op->head)
1213	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1214
1215	return 0;
1216	}
1217	}
1218
1219	CLEAR_FLAG (op, FLAG_REMOVED);
1220		1235
1221	/* Ideally, the caller figures this out. However, it complicates a lot	1236	/* Ideally, the caller figures this out. However, it complicates a lot
1222	* 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
1223	* need extra work	1238	* need extra work
1224	*/	1239	*/
1225	op->map = get_map_from_coord (m, &op->x, &op->y);	1240	if (!xy_normalise (m, op->x, op->y))
1226	x = op->x;	1241	{
1227	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 ();
1228		1254
1229	/* this has to be done after we translate the coordinates.	1255	/* this has to be done after we translate the coordinates.
1230	*/	1256	*/
1231	if (op->nrof && !(flag & INS_NO_MERGE))	1257	if (op->nrof && !(flag & INS_NO_MERGE))
1232	for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)	1258	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1233	if (object::can_merge (op, tmp))	1259	if (object::can_merge (op, tmp))
1234	{	1260	{
1235	op->nrof += tmp->nrof;	1261	op->nrof += tmp->nrof;
1236	tmp->destroy ();	1262	tmp->destroy ();
1237	}	1263	}
…		…
1254	op->below = originator->below;	1280	op->below = originator->below;
1255		1281
1256	if (op->below)	1282	if (op->below)
1257	op->below->above = op;	1283	op->below->above = op;
1258	else	1284	else
1259	op->ms ().bot = op;	1285	ms.bot = op;
1260		1286
1261	/* since *below* originator, no need to update top */	1287	/* since *below* originator, no need to update top */
1262	originator->below = op;	1288	originator->below = op;
1263	}	1289	}
1264	else	1290	else
1265	{	1291	{
		1292	top = ms.bot;
		1293
1266	/* If there are other objects, then */	1294	/* If there are other objects, then */
1267	if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL))	1295	if ((!(flag & INS_MAP_LOAD)) && top)
1268	{	1296	{
1269	object *last = NULL;	1297	object *last = 0;
1270		1298
1271	/*	1299	/*
1272	* 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.
1273	* We've already dealt with merging if appropriate.	1301	* We've already dealt with merging if appropriate.
1274	* 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
…		…
1278	* 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
1279	* 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
1280	* 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
1281	* that flying non pickable objects are spell objects.	1309	* that flying non pickable objects are spell objects.
1282	*/	1310	*/
1283		1311	for (top = ms.bot; top; top = top->above)
1284	while (top != NULL)
1285	{	1312	{
1286	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))
1287	floor = top;	1314	floor = top;
1288		1315
1289	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))
…		…
1292	top = top->below;	1319	top = top->below;
1293	break;	1320	break;
1294	}	1321	}
1295		1322
1296	last = top;	1323	last = top;
1297	top = top->above;
1298	}	1324	}
1299		1325
1300	/* 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 */
1301	top = last;	1327	top = last;
1302		1328
…		…
1304	* looks like instead of lots of conditions here.	1330	* looks like instead of lots of conditions here.
1305	* makes things faster, and effectively the same result.	1331	* makes things faster, and effectively the same result.
1306	*/	1332	*/
1307		1333
1308	/* Have object 'fall below' other objects that block view.	1334	/* Have object 'fall below' other objects that block view.
1309	* Unless those objects are exits, type 66	1335	* Unless those objects are exits.
1310	* If INS_ON_TOP is used, don't do this processing	1336	* If INS_ON_TOP is used, don't do this processing
1311	* Need to find the object that in fact blocks view, otherwise	1337	* Need to find the object that in fact blocks view, otherwise
1312	* stacking is a bit odd.	1338	* stacking is a bit odd.
1313	*/	1339	*/
1314	if (!(flag & INS_ON_TOP) &&	1340	if (!(flag & INS_ON_TOP)
1315	(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))
1316	{	1343	{
1317	for (last = top; last != floor; last = last->below)	1344	for (last = top; last != floor; last = last->below)
1318	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1345	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1319	break;	1346	break;
		1347
1320	/* Check to see if we found the object that blocks view,	1348	/* Check to see if we found the object that blocks view,
1321	* 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
1322	* we can get inserted below this one, which requires we	1350	* we can get inserted below this one, which requires we
1323	* set top to the object below us.	1351	* set top to the object below us.
1324	*/	1352	*/
1325	if (last && last->below && last != floor)	1353	if (last && last->below && last != floor)
1326	top = last->below;	1354	top = last->below;
1327	}	1355	}
1328	} /* If objects on this space */	1356	} /* If objects on this space */
1329
1330	if (flag & INS_MAP_LOAD)	1357	if (flag & INS_MAP_LOAD)
1331	top = GET_MAP_TOP (op->map, op->x, op->y);	1358	top = ms.top;
1332		1359
1333	if (flag & INS_ABOVE_FLOOR_ONLY)	1360	if (flag & INS_ABOVE_FLOOR_ONLY)
1334	top = floor;	1361	top = floor;
1335		1362
1336	/* 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.
1337	*/	1364	*/
1338		1365
1339	/* First object on this space */	1366	/* First object on this space */
1340	if (!top)	1367	if (!top)
1341	{	1368	{
1342	op->above = GET_MAP_OB (op->map, op->x, op->y);	1369	op->above = ms.bot;
1343		1370
1344	if (op->above)	1371	if (op->above)
1345	op->above->below = op;	1372	op->above->below = op;
1346		1373
1347	op->below = NULL;	1374	op->below = 0;
1348	op->ms ().bot = op;	1375	ms.bot = op;
1349	}	1376	}
1350	else	1377	else
1351	{ /* get inserted into the stack above top */	1378	{ /* get inserted into the stack above top */
1352	op->above = top->above;	1379	op->above = top->above;
1353		1380
…		…
1356		1383
1357	op->below = top;	1384	op->below = top;
1358	top->above = op;	1385	top->above = op;
1359	}	1386	}
1360		1387
1361	if (op->above == NULL)	1388	if (!op->above)
1362	op->ms ().top = op;	1389	ms.top = op;
1363	} /* else not INS_BELOW_ORIGINATOR */	1390	} /* else not INS_BELOW_ORIGINATOR */
1364		1391
1365	if (op->type == PLAYER)	1392	if (op->type == PLAYER)
		1393	{
1366	op->contr->do_los = 1;	1394	op->contr->do_los = 1;
		1395	++op->map->players;
		1396	op->map->touch ();
		1397	}
1367		1398
1368	/* If we have a floor, we know the player, if any, will be above	1399	op->map->dirty = true;
1369	* it, so save a few ticks and start from there.	1400
1370	*/
1371	if (!(flag & INS_MAP_LOAD))	1401	if (!(flag & INS_MAP_LOAD))
1372	if (object *pl = op->ms ().player ())	1402	if (object *pl = ms.player ())
1373	if (pl->contr->ns)
1374	pl->contr->ns->floorbox_update ();	1403	pl->contr->ns->floorbox_update ();
1375		1404
1376	/* If this object glows, it may affect lighting conditions that are	1405	/* If this object glows, it may affect lighting conditions that are
1377	* 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
1378	* 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
1379	* on the map will get recalculated. The players could very well	1408	* on the map will get recalculated. The players could very well
1380	* 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 -
1381	* this should get redone to only look for players within range,	1410	* this should get redone to only look for players within range,
1382	* or just updating the P_NEED_UPDATE for spaces within this area	1411	* or just updating the P_UPTODATE for spaces within this area
1383	* of effect may be sufficient.	1412	* of effect may be sufficient.
1384	*/	1413	*/
1385	if (op->map->darkness && (op->glow_radius != 0))	1414	if (op->map->darkness && (op->glow_radius != 0))
1386	update_all_los (op->map, op->x, op->y);	1415	update_all_los (op->map, op->x, op->y);
1387		1416
…		…
1398	* blocked() and wall() work properly), and these flags are updated by	1427	* blocked() and wall() work properly), and these flags are updated by
1399	* update_object().	1428	* update_object().
1400	*/	1429	*/
1401		1430
1402	/* 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 */
1403	if (!(flag & INS_NO_WALK_ON) && !op->head)	1432	if (!(flag & INS_NO_WALK_ON) && op->head_ () == op)
1404	{	1433	{
1405	if (check_move_on (op, originator))	1434	if (check_move_on (op, originator))
1406	return 0;	1435	return 0;
1407		1436
1408	/* 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
1409	* walk on's.	1438	* walk on's.
1410	*/	1439	*/
1411	for (tmp = op->more; tmp != NULL; tmp = tmp->more)	1440	for (object *tmp = op->more; tmp; tmp = tmp->more)
1412	if (check_move_on (tmp, originator))	1441	if (check_move_on (tmp, originator))
1413	return 0;	1442	return 0;
1414	}	1443	}
1415		1444
1416	return op;	1445	return op;
…		…
1425	{	1454	{
1426	object *tmp, *tmp1;	1455	object *tmp, *tmp1;
1427		1456
1428	/* first search for itself and remove any old instances */	1457	/* first search for itself and remove any old instances */
1429		1458
1430	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)
1431	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */	1460	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */
1432	tmp->destroy ();	1461	tmp->destroy ();
1433		1462
1434	tmp1 = arch_to_object (archetype::find (arch_string));	1463	tmp1 = arch_to_object (archetype::find (arch_string));
1435		1464
1436	tmp1->x = op->x;	1465	tmp1->x = op->x;
…		…
1439	}	1468	}
1440		1469
1441	object *	1470	object *
1442	object::insert_at (object *where, object *originator, int flags)	1471	object::insert_at (object *where, object *originator, int flags)
1443	{	1472	{
1444	where->map->insert (this, where->x, where->y, originator, flags);	1473	return where->map->insert (this, where->x, where->y, originator, flags);
1445	}	1474	}
1446		1475
1447	/*	1476	/*
1448	* 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
1449	* is returned contains nr objects, and the remaining parts contains	1478	* is returned contains nr objects, and the remaining parts contains
…		…
1489	* 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
1490	* is subsequently removed and freed.	1519	* is subsequently removed and freed.
1491	*	1520	*
1492	* 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
1493	*/	1522	*/
1494
1495	object *	1523	object *
1496	decrease_ob_nr (object *op, uint32 i)	1524	decrease_ob_nr (object *op, uint32 i)
1497	{	1525	{
1498	object *tmp;	1526	object *tmp;
1499		1527
…		…
1574		1602
1575	/*	1603	/*
1576	* add_weight(object, weight) adds the specified weight to an object,	1604	* add_weight(object, weight) adds the specified weight to an object,
1577	* and also updates how much the environment(s) is/are carrying.	1605	* and also updates how much the environment(s) is/are carrying.
1578	*/	1606	*/
1579
1580	void	1607	void
1581	add_weight (object *op, signed long weight)	1608	add_weight (object *op, signed long weight)
1582	{	1609	{
1583	while (op != NULL)	1610	while (op != NULL)
1584	{	1611	{
…		…
1599	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);
1600	free (dump);	1627	free (dump);
1601	return op;	1628	return op;
1602	}	1629	}
1603		1630
1604	if (where->head)	1631	if (where->head_ () != where)
1605	{	1632	{
1606	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");
1607	where = where->head;	1634	where = where->head;
1608	}	1635	}
1609		1636
1610	return where->insert (op);	1637	return where->insert (op);
1611	}	1638	}
…		…
1616	* inside the object environment.	1643	* inside the object environment.
1617	*	1644	*
1618	* 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
1619	* be != op, if items are merged. -Tero	1646	* be != op, if items are merged. -Tero
1620	*/	1647	*/
1621
1622	object *	1648	object *
1623	object::insert (object *op)	1649	object::insert (object *op)
1624	{	1650	{
1625	object *tmp, *otmp;
1626
1627	if (!QUERY_FLAG (op, FLAG_REMOVED))	1651	if (!QUERY_FLAG (op, FLAG_REMOVED))
1628	op->remove ();	1652	op->remove ();
1629		1653
1630	if (op->more)	1654	if (op->more)
1631	{	1655	{
…		…
1633	return op;	1657	return op;
1634	}	1658	}
1635		1659
1636	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1660	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1637	CLEAR_FLAG (op, FLAG_REMOVED);	1661	CLEAR_FLAG (op, FLAG_REMOVED);
		1662
1638	if (op->nrof)	1663	if (op->nrof)
1639	{	1664	{
1640	for (tmp = inv; tmp != NULL; tmp = tmp->below)	1665	for (object *tmp = inv; tmp; tmp = tmp->below)
1641	if (object::can_merge (tmp, op))	1666	if (object::can_merge (tmp, op))
1642	{	1667	{
1643	/* return the original object and remove inserted object	1668	/* return the original object and remove inserted object
1644	(client needs the original object) */	1669	(client needs the original object) */
1645	tmp->nrof += op->nrof;	1670	tmp->nrof += op->nrof;
…		…
1664	add_weight (this, op->weight * op->nrof);	1689	add_weight (this, op->weight * op->nrof);
1665	}	1690	}
1666	else	1691	else
1667	add_weight (this, (op->weight + op->carrying));	1692	add_weight (this, (op->weight + op->carrying));
1668		1693
1669	otmp = this->in_player ();	1694	if (object *otmp = this->in_player ())
1670	if (otmp && otmp->contr)
1671	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1695	if (otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1672	otmp->update_stats ();	1696	otmp->update_stats ();
1673		1697
		1698	op->owner = 0; // its his/hers now. period.
1674	op->map = 0;	1699	op->map = 0;
1675	op->env = this;	1700	op->env = this;
1676	op->above = 0;	1701	op->above = 0;
1677	op->below = 0;	1702	op->below = 0;
1678	op->x = 0, op->y = 0;	1703	op->x = op->y = 0;
1679		1704
1680	/* 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 */
1681	if ((op->glow_radius != 0) && map)	1706	if (op->glow_radius && map)
1682	{	1707	{
1683	#ifdef DEBUG_LIGHTS	1708	#ifdef DEBUG_LIGHTS
1684	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);
1685	#endif /* DEBUG_LIGHTS */	1710	#endif /* DEBUG_LIGHTS */
1686	if (map->darkness)	1711	if (map->darkness)
…		…
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
…		…
1984	int index = 0, flag;	1996	int index = 0, flag;
1985	int altern[SIZEOFFREE];	1997	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
1991	altern [index++] = i;	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	continue;
1992		2017
1993	/* Basically, if we find a wall on a space, we cut down the search size.	2018	/* 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.	2019	* 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 -	2020	* 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	2021	* 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	2022	* spaces in all the other directions, this will reduce the search space
1998	* to only the spaces immediately surrounding the target area, and	2023	* to only the spaces immediately surrounding the target area, and
1999	* won't look 2 spaces south of the target space.	2024	* won't look 2 spaces south of the target space.
2000	*/	2025	*/
2001	else if ((flag & P_NO_PASS) && maxfree[i] < stop)	2026	if (ms.move_block == MOVE_ALL && maxfree[i] < stop)
		2027	{
2002	stop = maxfree[i];	2028	stop = maxfree[i];
		2029	continue;
		2030	}
		2031
		2032	/* Note it is intentional that we check ob - the movement type of the
		2033	* head of the object should correspond for the entire object.
		2034	*/
		2035	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
		2036	continue;
		2037
		2038	altern [index++] = i;
2003	}	2039	}
2004		2040
2005	if (!index)	2041	if (!index)
2006	return -1;	2042	return -1;
2007		2043
2008	return altern[RANDOM () % index];	2044	return altern [rndm (index)];
2009	}	2045	}
2010		2046
2011	/*	2047	/*
2012	* find_first_free_spot(archetype, maptile, x, y) works like	2048	* find_first_free_spot(archetype, maptile, x, y) works like
2013	* find_free_spot(), but it will search max number of squares.	2049	* find_free_spot(), but it will search max number of squares.
…		…
2016	*/	2052	*/
2017	int	2053	int
2018	find_first_free_spot (const object *ob, maptile *m, int x, int y)	2054	find_first_free_spot (const object *ob, maptile *m, int x, int y)
2019	{	2055	{
2020	for (int i = 0; i < SIZEOFFREE; i++)	2056	for (int i = 0; i < SIZEOFFREE; i++)
2021	if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]))	2057	if (!ob->blocked (m, x + freearr_x[i], y + freearr_y[i]))
2022	return i;	2058	return i;
2023		2059
2024	return -1;	2060	return -1;
2025	}	2061	}
2026		2062
…		…
2034	{	2070	{
2035	arr += begin;	2071	arr += begin;
2036	end -= begin;	2072	end -= begin;
2037		2073
2038	while (--end)	2074	while (--end)
2039	swap (arr [end], arr [RANDOM () % (end + 1)]);	2075	swap (arr [end], arr [rndm (end + 1)]);
2040	}	2076	}
2041		2077
2042	/* new function to make monster searching more efficient, and effective!	2078	/* new function to make monster searching more efficient, and effective!
2043	* This basically returns a randomized array (in the passed pointer) of	2079	* 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	2080	* the spaces to find monsters. In this way, it won't always look for
…		…
2080	object *tmp;	2116	object *tmp;
2081	maptile *mp;	2117	maptile *mp;
2082		2118
2083	MoveType blocked, move_type;	2119	MoveType blocked, move_type;
2084		2120
2085	if (exclude && exclude->head)	2121	if (exclude && exclude->head_ () != exclude)
2086	{	2122	{
2087	exclude = exclude->head;	2123	exclude = exclude->head;
2088	move_type = exclude->move_type;	2124	move_type = exclude->move_type;
2089	}	2125	}
2090	else	2126	else
…		…
2113	max = maxfree[i];	2149	max = maxfree[i];
2114	else if (mflags & P_IS_ALIVE)	2150	else if (mflags & P_IS_ALIVE)
2115	{	2151	{
2116	for (tmp = ms.bot; tmp; tmp = tmp->above)	2152	for (tmp = ms.bot; tmp; tmp = tmp->above)
2117	if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)	2153	if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)
2118	&& (tmp != exclude || (tmp->head && tmp->head != exclude)))	2154	&& (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2119	break;	2155	break;
2120		2156
2121	if (tmp)	2157	if (tmp)
2122	return freedir[i];	2158	return freedir[i];
2123	}	2159	}
…		…
2178		2214
2179	return 3;	2215	return 3;
2180	}	2216	}
2181		2217
2182	/*	2218	/*
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	2219	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is
2202	* between two directions (which are expected to be absolute (see absdir())	2220	* between two directions (which are expected to be absolute (see absdir())
2203	*/	2221	*/
2204
2205	int	2222	int
2206	dirdiff (int dir1, int dir2)	2223	dirdiff (int dir1, int dir2)
2207	{	2224	{
2208	int d;	2225	int d;
2209		2226
…		…
2322	* Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause	2339	* Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause
2323	* core dumps if they do.	2340	* core dumps if they do.
2324	*	2341	*
2325	* Add a check so we can't pick up invisible objects (0.93.8)	2342	* Add a check so we can't pick up invisible objects (0.93.8)
2326	*/	2343	*/
2327
2328	int	2344	int
2329	can_pick (const object *who, const object *item)	2345	can_pick (const object *who, const object *item)
2330	{	2346	{
2331	return /*QUERY_FLAG(who,FLAG_WIZ)|| */	2347	return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2332	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&	2348	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
…		…
2337	* create clone from object to another	2353	* create clone from object to another
2338	*/	2354	*/
2339	object *	2355	object *
2340	object_create_clone (object *asrc)	2356	object_create_clone (object *asrc)
2341	{	2357	{
2342	object *dst = 0, *tmp, *src, *part, *prev, *item;	2358	object *dst = 0, *tmp, *src, *prev, *item;
2343		2359
2344	if (!asrc)	2360	if (!asrc)
2345	return 0;	2361	return 0;
2346		2362
2347	src = asrc;
2348	if (src->head)
2349	src = src->head;	2363	src = asrc->head_ ();
2350		2364
2351	prev = 0;	2365	prev = 0;
2352	for (part = src; part; part = part->more)	2366	for (object *part = src; part; part = part->more)
2353	{	2367	{
2354	tmp = part->clone ();	2368	tmp = part->clone ();
2355	tmp->x -= src->x;	2369	tmp->x -= src->x;
2356	tmp->y -= src->y;	2370	tmp->y -= src->y;
2357		2371
…		…
2373		2387
2374	for (item = src->inv; item; item = item->below)	2388	for (item = src->inv; item; item = item->below)
2375	insert_ob_in_ob (object_create_clone (item), dst);	2389	insert_ob_in_ob (object_create_clone (item), dst);
2376		2390
2377	return dst;	2391	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	}	2392	}
2417		2393
2418	/* This returns the first object in who's inventory that	2394	/* This returns the first object in who's inventory that
2419	* has the same type and subtype match.	2395	* has the same type and subtype match.
2420	* returns NULL if no match.	2396	* returns NULL if no match.
…		…
2475	if (link->key == canonical_key)	2451	if (link->key == canonical_key)
2476	return link->value;	2452	return link->value;
2477		2453
2478	return 0;	2454	return 0;
2479	}	2455	}
2480
2481		2456
2482	/*	2457	/*
2483	* Updates the canonical_key in op to value.	2458	* Updates the canonical_key in op to value.
2484	*	2459	*
2485	* canonical_key is a shared string (value doesn't have to be).	2460	* canonical_key is a shared string (value doesn't have to be).
…		…
2509	/* Basically, if the archetype has this key set,	2484	/* Basically, if the archetype has this key set,
2510	* we need to store the null value so when we save	2485	* we need to store the null value so when we save
2511	* it, we save the empty value so that when we load,	2486	* it, we save the empty value so that when we load,
2512	* we get this value back again.	2487	* we get this value back again.
2513	*/	2488	*/
2514	if (get_ob_key_link (&op->arch->clone, canonical_key))	2489	if (get_ob_key_link (op->arch, canonical_key))
2515	field->value = 0;	2490	field->value = 0;
2516	else	2491	else
2517	{	2492	{
2518	if (last)	2493	if (last)
2519	last->next = field->next;	2494	last->next = field->next;
…		…
2588	}	2563	}
2589	else	2564	else
2590	item = item->env;	2565	item = item->env;
2591	}	2566	}
2592		2567
		2568	const char *
		2569	object::flag_desc (char *desc, int len) const
		2570	{
		2571	char *p = desc;
		2572	bool first = true;
		2573
		2574	*p = 0;
		2575
		2576	for (int i = 0; i < NUM_FLAGS; i++)
		2577	{
		2578	if (len <= 10) // magic constant!
		2579	{
		2580	snprintf (p, len, ",...");
		2581	break;
		2582	}
		2583
		2584	if (flag [i])
		2585	{
		2586	int cnt = snprintf (p, len, "%s%d", first ? "" : ",", i);
		2587	len -= cnt;
		2588	p += cnt;
		2589	first = false;
		2590	}
		2591	}
		2592
		2593	return desc;
		2594	}
		2595
2593	// return a suitable string describing an objetc in enough detail to find it	2596	// return a suitable string describing an object in enough detail to find it
2594	const char *	2597	const char *
2595	object::debug_desc (char *info) const	2598	object::debug_desc (char *info) const
2596	{	2599	{
		2600	char flagdesc[512];
2597	char info2[256 * 3];	2601	char info2[256 * 4];
2598	char *p = info;	2602	char *p = info;
2599		2603
2600	p += snprintf (p, 256, "%d=\"%s%s%s\"",	2604	p += snprintf (p, 512, "{cnt:%d,uuid:<1.%" PRIx64 ">,name:\"%s\"%s%s,flags:[%s],type:%d}",
2601	count,	2605	count, uuid.seq,
2602	&name,	2606	&name,
2603	title ? " " : "",	2607	title ? "\",title:\"" : "",
2604	title ? (const char *)title : "");	2608	title ? (const char *)title : "",
		2609	flag_desc (flagdesc, 512), type);
2605		2610
2606	if (env)	2611	if (!this->flag[FLAG_REMOVED] && env)
2607	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2612	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2608		2613
2609	if (map)	2614	if (map)
2610	p += snprintf (p, 256, "(on %s@%d+%d)", map->path, x, y);	2615	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2611		2616
2612	return info;	2617	return info;
2613	}	2618	}
2614		2619
2615	const char *	2620	const char *
2616	object::debug_desc () const	2621	object::debug_desc () const
2617	{	2622	{
2618	static char info[256 * 3];	2623	static char info[3][256 * 4];
		2624	static int info_idx;
		2625
2619	return debug_desc (info);	2626	return debug_desc (info [++info_idx % 3]);
2620	}	2627	}
2621		2628
		2629	struct region *
		2630	object::region () const
		2631	{
		2632	return map ? map->region (x, y)
		2633	: region::default_region ();
		2634	}
		2635
		2636	const materialtype_t *
		2637	object::dominant_material () const
		2638	{
		2639	if (materialtype_t *mt = name_to_material (materialname))
		2640	return mt;
		2641
		2642	return name_to_material (shstr_unknown);
		2643	}
		2644
		2645	void
		2646	object::open_container (object *new_container)
		2647	{
		2648	if (container == new_container)
		2649	return;
		2650
		2651	if (object *old_container = container)
		2652	{
		2653	if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
		2654	return;
		2655
		2656	#if 0
		2657	// remove the "Close old_container" object.
		2658	if (object *closer = old_container->inv)
		2659	if (closer->type == CLOSE_CON)
		2660	closer->destroy ();
		2661	#endif
		2662
		2663	old_container->flag [FLAG_APPLIED] = 0;
		2664	container = 0;
		2665
		2666	esrv_update_item (UPD_FLAGS, this, old_container);
		2667	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
		2668	play_sound (sound_find ("chest_close"));
		2669	}
		2670
		2671	if (new_container)
		2672	{
		2673	if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))
		2674	return;
		2675
		2676	// TODO: this does not seem to serve any purpose anymore?
		2677	#if 0
		2678	// insert the "Close Container" object.
		2679	if (archetype *closer = new_container->other_arch)
		2680	{
		2681	object *closer = arch_to_object (new_container->other_arch);
		2682	closer->flag [FLAG_NO_MAP_SAVE] = 1;
		2683	new_container->insert (closer);
		2684	}
		2685	#endif
		2686
		2687	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));
		2688
		2689	new_container->flag [FLAG_APPLIED] = 1;
		2690	container = new_container;
		2691
		2692	esrv_update_item (UPD_FLAGS, this, new_container);
		2693	esrv_send_inventory (this, new_container);
		2694	play_sound (sound_find ("chest_open"));
		2695	}
		2696	}
		2697
		2698	object *
		2699	object::force_find (const shstr name)
		2700	{
		2701	/* cycle through his inventory to look for the MARK we want to
		2702	* place
		2703	*/
		2704	for (object *tmp = inv; tmp; tmp = tmp->below)
		2705	if (tmp->type == FORCE && tmp->slaying == name)
		2706	return splay (tmp);
		2707
		2708	return 0;
		2709	}
		2710
		2711	void
		2712	object::force_add (const shstr name, int duration)
		2713	{
		2714	if (object *force = force_find (name))
		2715	force->destroy ();
		2716
		2717	object *force = get_archetype (FORCE_NAME);
		2718
		2719	force->slaying = name;
		2720	force->stats.food = 1;
		2721	force->speed_left = -1.f;
		2722
		2723	force->set_speed (duration ? 1.f / duration : 0.f);
		2724	force->flag [FLAG_IS_USED_UP] = true;
		2725	force->flag [FLAG_APPLIED] = true;
		2726
		2727	insert (force);
		2728	}
		2729
		2730	void
		2731	object::play_sound (faceidx sound) const
		2732	{
		2733	if (!sound)
		2734	return;
		2735
		2736	if (flag [FLAG_REMOVED])
		2737	return;
		2738
		2739	if (env)
		2740	{
		2741	if (object *pl = in_player ())
		2742	pl->contr->play_sound (sound);
		2743	}
		2744	else
		2745	map->play_sound (sound, x, y);
		2746	}
		2747

Diff Legend

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