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.82 by root, Mon Dec 25 11:25:49 2006 UTC vs.
Revision 1.148 by root, Mon May 14 19:08:25 2007 UTC

1	/*	1	/*
2	CrossFire, A Multiplayer game for X-windows	2	* CrossFire, A Multiplayer game
3		3	*
		4	* Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
4	Copyright (C) 2001 Mark Wedel & Crossfire Development Team	5	* Copyright (C) 2001 Mark Wedel & Crossfire Development Team
5	Copyright (C) 1992 Frank Tore Johansen	6	* Copyright (C) 1992 Frank Tore Johansen
6		7	*
7	This program is free software; you can redistribute it and/or modify	8	* This program 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 2 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, write to the Free Software
19	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	20	* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
20		21	*
21	The authors can be reached via e-mail at <crossfire@schmorp.de>	22	* The authors can be reached via e-mail at <crossfire@schmorp.de>
22	*/	23	*/
23		24
24	/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.	25	/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
25	sub/add_weight will transcend the environment updating the carrying	26	sub/add_weight will transcend the environment updating the carrying
26	variable. */	27	variable. */
27	#include <global.h>	28	#include <global.h>
28	#include <stdio.h>	29	#include <stdio.h>
29	#include <sys/types.h>	30	#include <sys/types.h>
30	#include <sys/uio.h>	31	#include <sys/uio.h>
31	#include <object.h>	32	#include <object.h>
32	#include <funcpoint.h>	33	#include <funcpoint.h>
		34	#include <sproto.h>
33	#include <loader.h>	35	#include <loader.h>
34		36
35	#include <bitset>	37	#include <bitset>
36		38
37	int nrofallocobjects = 0;	39	int nrofallocobjects = 0;
38	static UUID uuid;	40	static UUID uuid;
39	const uint64 UUID_SKIP = 1<<19;	41	const uint64 UUID_SKIP = 1<<19;
40		42
41	object *active_objects; /* List of active objects that need to be processed */	43	objectvec objects;
		44	activevec actives;
42		45
43	short freearr_x[SIZEOFFREE] = { 0, 0, 1, 1, 1, 0, -1, -1, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,	46	short freearr_x[SIZEOFFREE] = { 0, 0, 1, 1, 1, 0, -1, -1, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,
44	0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1	47	0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1
45	};	48	};
46	short freearr_y[SIZEOFFREE] = { 0, -1, -1, 0, 1, 1, 1, 0, -1, -2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2,	49	short freearr_y[SIZEOFFREE] = { 0, -1, -1, 0, 1, 1, 1, 0, -1, -2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2,
…		…
141	* objects with lists are rare, and lists stay short. If not, use a	144	* objects with lists are rare, and lists stay short. If not, use a
142	* different structure or at least keep the lists sorted...	145	* different structure or at least keep the lists sorted...
143	*/	146	*/
144		147
145	/* For each field in wants, */	148	/* For each field in wants, */
146	for (wants_field = wants->key_values; wants_field != NULL; wants_field = wants_field->next)	149	for (wants_field = wants->key_values; wants_field; wants_field = wants_field->next)
147	{	150	{
148	key_value *has_field;	151	key_value *has_field;
149		152
150	/* Look for a field in has with the same key. */	153	/* Look for a field in has with the same key. */
151	has_field = get_ob_key_link (has, wants_field->key);	154	has_field = get_ob_key_link (has, wants_field->key);
…		…
190	* Check nrof variable *before* calling can_merge()	193	* Check nrof variable *before* calling can_merge()
191	*	194	*
192	* Improvements made with merge: Better checking on potion, and also	195	* Improvements made with merge: Better checking on potion, and also
193	* check weight	196	* check weight
194	*/	197	*/
195
196	bool object::can_merge_slow (object *ob1, object *ob2)	198	bool object::can_merge_slow (object *ob1, object *ob2)
197	{	199	{
198	/* A couple quicksanity checks */	200	/* A couple quicksanity checks */
199	if (ob1 == ob2	201	if (ob1 == ob2
200	|| ob1->type != ob2->type	202	|| ob1->type != ob2->type
…		…
277		279
278	/* Note sure why the following is the case - either the object has to	280	/* Note sure why the following is the case - either the object has to
279	* be animated or have a very low speed. Is this an attempted monster	281	* be animated or have a very low speed. Is this an attempted monster
280	* check?	282	* check?
281	*/	283	*/
282	if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && FABS ((ob1)->speed) > MIN_ACTIVE_SPEED)	284	if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && ob1->has_active_speed ())
283	return 0;	285	return 0;
284		286
285	switch (ob1->type)	287	switch (ob1->type)
286	{	288	{
287	case SCROLL:	289	case SCROLL:
…		…
323	sum_weight (object *op)	325	sum_weight (object *op)
324	{	326	{
325	long sum;	327	long sum;
326	object *inv;	328	object *inv;
327		329
328	for (sum = 0, inv = op->inv; inv != NULL; inv = inv->below)	330	for (sum = 0, inv = op->inv; inv; inv = inv->below)
329	{	331	{
330	if (inv->inv)	332	if (inv->inv)
331	sum_weight (inv);	333	sum_weight (inv);
		334
332	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);	335	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);
333	}	336	}
334		337
335	if (op->type == CONTAINER && op->stats.Str)	338	if (op->type == CONTAINER && op->stats.Str)
336	sum = (sum * (100 - op->stats.Str)) / 100;	339	sum = (sum * (100 - op->stats.Str)) / 100;
…		…
356	/*	359	/*
357	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.	360	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
358	* Some error messages.	361	* Some error messages.
359	* The result of the dump is stored in the static global errmsg array.	362	* The result of the dump is stored in the static global errmsg array.
360	*/	363	*/
361
362	char *	364	char *
363	dump_object (object *op)	365	dump_object (object *op)
364	{	366	{
365	if (!op)	367	if (!op)
366	return strdup ("[NULLOBJ]");	368	return strdup ("[NULLOBJ]");
367		369
368	object_freezer freezer;	370	object_freezer freezer;
369	save_object (freezer, op, 3);	371	op->write (freezer);
370	return freezer.as_string ();	372	return freezer.as_string ();
371	}	373	}
372		374
373	/*	375	/*
374	* get_nearest_part(multi-object, object 2) returns the part of the	376	* get_nearest_part(multi-object, object 2) returns the part of the
…		…
391	}	393	}
392		394
393	/*	395	/*
394	* Returns the object which has the count-variable equal to the argument.	396	* Returns the object which has the count-variable equal to the argument.
395	*/	397	*/
396
397	object *	398	object *
398	find_object (tag_t i)	399	find_object (tag_t i)
399	{	400	{
400	for (object *op = object::first; op; op = op->next)	401	for_all_objects (op)
401	if (op->count == i)	402	if (op->count == i)
402	return op;	403	return op;
403		404
404	return 0;	405	return 0;
405	}	406	}
406		407
407	/*	408	/*
408	* Returns the first object which has a name equal to the argument.	409	* Returns the first object which has a name equal to the argument.
409	* Used only by the patch command, but not all that useful.	410	* Used only by the patch command, but not all that useful.
410	* Enables features like "patch <name-of-other-player> food 999"	411	* Enables features like "patch <name-of-other-player> food 999"
411	*/	412	*/
412
413	object *	413	object *
414	find_object_name (const char *str)	414	find_object_name (const char *str)
415	{	415	{
416	shstr_cmp str_ (str);	416	shstr_cmp str_ (str);
417	object *op;	417	object *op;
418		418
419	for (op = object::first; op != NULL; op = op->next)	419	for_all_objects (op)
420	if (op->name == str_)	420	if (op->name == str_)
421	break;	421	break;
422		422
423	return op;	423	return op;
424	}	424	}
…		…
450	owner = owner->owner;	450	owner = owner->owner;
451		451
452	this->owner = owner;	452	this->owner = owner;
453	}	453	}
454		454
		455	int
		456	object::slottype () const
		457	{
		458	if (type == SKILL)
		459	{
		460	if (IS_COMBAT_SKILL (subtype)) return slot_combat;
		461	if (IS_RANGED_SKILL (subtype)) return slot_ranged;
		462	}
		463	else
		464	{
		465	if (slot [body_combat].info) return slot_combat;
		466	if (slot [body_range ].info) return slot_ranged;
		467	}
		468
		469	return slot_none;
		470	}
		471
		472	bool
		473	object::change_weapon (object *ob)
		474	{
		475	if (current_weapon == ob)
		476	return true;
		477
		478	if (chosen_skill)
		479	chosen_skill->flag [FLAG_APPLIED] = false;
		480
		481	current_weapon = ob;
		482	chosen_skill = !ob || ob->type == SKILL ? ob : find_skill_by_name (this, ob->skill);
		483
		484	if (chosen_skill)
		485	chosen_skill->flag [FLAG_APPLIED] = true;
		486
		487	update_stats ();
		488
		489	if (ob)
		490	{
		491	// now check wether any body locations became invalid, in which case
		492	// we cannot apply the weapon at the moment.
		493	for (int i = 0; i < NUM_BODY_LOCATIONS; ++i)
		494	if (slot[i].used < 0)
		495	{
		496	current_weapon = chosen_skill = 0;
		497	update_stats ();
		498
		499	new_draw_info_format (NDI_UNIQUE, 0, this,
		500	"You try to balance your applied items all at once, but the %s is too much. "
		501	"You need to unapply some items first.", &ob->name);
		502	return false;
		503	}
		504
		505	//new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);
		506	}
		507	else
		508	;//new_draw_info_format (NDI_UNIQUE, 0, this, "You unwield your weapons.");
		509
		510	return true;
		511	}
		512
455	/* Zero the key_values on op, decrementing the shared-string	513	/* Zero the key_values on op, decrementing the shared-string
456	* refcounts and freeing the links.	514	* refcounts and freeing the links.
457	*/	515	*/
458	static void	516	static void
459	free_key_values (object *op)	517	free_key_values (object *op)
460	{	518	{
461	for (key_value *i = op->key_values; i != 0;)	519	for (key_value *i = op->key_values; i; )
462	{	520	{
463	key_value *next = i->next;	521	key_value *next = i->next;
464	delete i;	522	delete i;
465		523
466	i = next;	524	i = next;
467	}	525	}
468		526
469	op->key_values = 0;	527	op->key_values = 0;
470	}	528	}
471		529
472	/*	530	object &
473	* copy_to first frees everything allocated by the dst object,	531	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	{	532	{
483	bool is_freed = QUERY_FLAG (dst, FLAG_FREED);	533	bool is_freed = flag [FLAG_FREED];
484	bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED);	534	bool is_removed = flag [FLAG_REMOVED];
485		535
486	*(object_copy *)dst = *this;	536	*(object_copy *)this = src;
487		537
488	if (is_freed)	538	flag [FLAG_FREED] = is_freed;
489	SET_FLAG (dst, FLAG_FREED);	539	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		540
497	/* Copy over key_values, if any. */	541	/* Copy over key_values, if any. */
498	if (key_values)	542	if (src.key_values)
499	{	543	{
500	key_value *tail = 0;	544	key_value *tail = 0;
501	key_value *i;
502
503	dst->key_values = 0;	545	key_values = 0;
504		546
505	for (i = key_values; i; i = i->next)	547	for (key_value *i = src.key_values; i; i = i->next)
506	{	548	{
507	key_value *new_link = new key_value;	549	key_value *new_link = new key_value;
508		550
509	new_link->next = 0;	551	new_link->next = 0;
510	new_link->key = i->key;	552	new_link->key = i->key;
511	new_link->value = i->value;	553	new_link->value = i->value;
512		554
513	/* Try and be clever here, too. */	555	/* Try and be clever here, too. */
514	if (!dst->key_values)	556	if (!key_values)
515	{	557	{
516	dst->key_values = new_link;	558	key_values = new_link;
517	tail = new_link;	559	tail = new_link;
518	}	560	}
519	else	561	else
520	{	562	{
521	tail->next = new_link;	563	tail->next = new_link;
522	tail = new_link;	564	tail = new_link;
523	}	565	}
524	}	566	}
525	}	567	}
		568	}
526		569
527	update_ob_speed (dst);	570	/*
		571	* copy_to first frees everything allocated by the dst object,
		572	* and then copies the contents of itself into the second
		573	* object, allocating what needs to be allocated. Basically, any
		574	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
		575	* if the first object is freed, the pointers in the new object
		576	* will point at garbage.
		577	*/
		578	void
		579	object::copy_to (object *dst)
		580	{
		581	*dst = *this;
		582
		583	if (speed < 0)
		584	dst->speed_left = speed_left - rndm ();
		585
		586	dst->set_speed (dst->speed);
		587	}
		588
		589	void
		590	object::instantiate ()
		591	{
		592	if (!uuid.seq) // HACK
		593	uuid = gen_uuid ();
		594
		595	speed_left = -0.1f;
		596	/* copy the body_info to the body_used - this is only really
		597	* need for monsters, but doesn't hurt to do it for everything.
		598	* by doing so, when a monster is created, it has good starting
		599	* values for the body_used info, so when items are created
		600	* for it, they can be properly equipped.
		601	*/
		602	for (int i = NUM_BODY_LOCATIONS; i--; )
		603	slot[i].used = slot[i].info;
		604
		605	attachable::instantiate ();
528	}	606	}
529		607
530	object *	608	object *
531	object::clone ()	609	object::clone ()
532	{	610	{
…		…
538	/*	616	/*
539	* If an object with the IS_TURNABLE() flag needs to be turned due	617	* 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	618	* 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.	619	* be called to update the face variable, _and_ how it looks on the map.
542	*/	620	*/
543
544	void	621	void
545	update_turn_face (object *op)	622	update_turn_face (object *op)
546	{	623	{
547	if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || op->arch == NULL)	624	if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || !op->arch)
548	return;	625	return;
		626
549	SET_ANIMATION (op, op->direction);	627	SET_ANIMATION (op, op->direction);
550	update_object (op, UP_OBJ_FACE);	628	update_object (op, UP_OBJ_FACE);
551	}	629	}
552		630
553	/*	631	/*
554	* Updates the speed of an object. If the speed changes from 0 to another	632	* Updates the speed of an object. If the speed changes from 0 to another
555	* value, or vice versa, then add/remove the object from the active list.	633	* value, or vice versa, then add/remove the object from the active list.
556	* This function needs to be called whenever the speed of an object changes.	634	* This function needs to be called whenever the speed of an object changes.
557	*/	635	*/
558	void	636	void
559	update_ob_speed (object *op)	637	object::set_speed (float speed)
560	{	638	{
561	extern int arch_init;	639	if (flag [FLAG_FREED] && speed)
562
563	/* No reason putting the archetypes objects on the speed list,
564	* since they never really need to be updated.
565	*/
566
567	if (QUERY_FLAG (op, FLAG_FREED) && op->speed)
568	{	640	{
569	LOG (llevError, "Object %s is freed but has speed.\n", &op->name);	641	LOG (llevError, "Object %s is freed but has speed.\n", &name);
570	#ifdef MANY_CORES
571	abort ();
572	#else
573	op->speed = 0;	642	speed = 0;
574	#endif
575	}
576
577	if (arch_init)
578	return;
579
580	if (FABS (op->speed) > MIN_ACTIVE_SPEED)
581	{	643	}
582	/* If already on active list, don't do anything */
583	if (op->active_next || op->active_prev || op == active_objects)
584	return;
585		644
586	/* process_events() expects us to insert the object at the beginning	645	this->speed = speed;
587	* of the list. */
588	op->active_next = active_objects;
589		646
590	if (op->active_next != NULL)	647	if (has_active_speed ())
591	op->active_next->active_prev = op;	648	activate ();
592
593	active_objects = op;
594	}
595	else	649	else
596	{	650	deactivate ();
597	/* If not on the active list, nothing needs to be done */
598	if (!op->active_next && !op->active_prev && op != active_objects)
599	return;
600
601	if (op->active_prev == NULL)
602	{
603	active_objects = op->active_next;
604
605	if (op->active_next != NULL)
606	op->active_next->active_prev = NULL;
607	}
608	else
609	{
610	op->active_prev->active_next = op->active_next;
611
612	if (op->active_next)
613	op->active_next->active_prev = op->active_prev;
614	}
615
616	op->active_next = NULL;
617	op->active_prev = NULL;
618	}
619	}
620
621	/* This function removes object 'op' from the list of active
622	* objects.
623	* This should only be used for style maps or other such
624	* reference maps where you don't want an object that isn't
625	* in play chewing up cpu time getting processed.
626	* The reverse of this is to call update_ob_speed, which
627	* will do the right thing based on the speed of the object.
628	*/
629	void
630	remove_from_active_list (object *op)
631	{
632	/* If not on the active list, nothing needs to be done */
633	if (!op->active_next && !op->active_prev && op != active_objects)
634	return;
635
636	if (op->active_prev == NULL)
637	{
638	active_objects = op->active_next;
639	if (op->active_next != NULL)
640	op->active_next->active_prev = NULL;
641	}
642	else
643	{
644	op->active_prev->active_next = op->active_next;
645	if (op->active_next)
646	op->active_next->active_prev = op->active_prev;
647	}
648	op->active_next = NULL;
649	op->active_prev = NULL;
650	}	651	}
651		652
652	/*	653	/*
653	* update_object() updates the the map.	654	* update_object() updates the the map.
654	* It takes into account invisible objects (and represent squares covered	655	* It takes into account invisible objects (and represent squares covered
…		…
667	* UP_OBJ_FACE: only the objects face has changed.	668	* UP_OBJ_FACE: only the objects face has changed.
668	*/	669	*/
669	void	670	void
670	update_object (object *op, int action)	671	update_object (object *op, int action)
671	{	672	{
672	MoveType move_on, move_off, move_block, move_slow;
673
674	if (op == NULL)	673	if (op == NULL)
675	{	674	{
676	/* this should never happen */	675	/* this should never happen */
677	LOG (llevDebug, "update_object() called for NULL object.\n");	676	LOG (llevDebug, "update_object() called for NULL object.\n");
678	return;	677	return;
…		…
691	*/	690	*/
692	if (!op->map || op->map->in_memory == MAP_SAVING)	691	if (!op->map || op->map->in_memory == MAP_SAVING)
693	return;	692	return;
694		693
695	/* make sure the object is within map boundaries */	694	/* make sure the object is within map boundaries */
696	if (op->x < 0 || op->x >= MAP_WIDTH (op->map) || op->y < 0 || op->y >= MAP_HEIGHT (op->map))	695	if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height)
697	{	696	{
698	LOG (llevError, "update_object() called for object out of map!\n");	697	LOG (llevError, "update_object() called for object out of map!\n");
699	#ifdef MANY_CORES	698	#ifdef MANY_CORES
700	abort ();	699	abort ();
701	#endif	700	#endif
702	return;	701	return;
703	}	702	}
704		703
705	mapspace &m = op->ms ();	704	mapspace &m = op->ms ();
706		705
707	if (m.flags_ & P_NEED_UPDATE)	706	if (!(m.flags_ & P_UPTODATE))
708	/* nop */;	707	/* nop */;
709	else if (action == UP_OBJ_INSERT)	708	else if (action == UP_OBJ_INSERT)
710	{	709	{
711	// this is likely overkill, TODO: revisit (schmorp)	710	// this is likely overkill, TODO: revisit (schmorp)
712	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))	711	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
…		…
721	/* This isn't perfect, but I don't expect a lot of objects to	720	/* This isn't perfect, but I don't expect a lot of objects to
722	* to have move_allow right now.	721	* to have move_allow right now.
723	*/	722	*/
724	|| ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block	723	|| ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block
725	|| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)	724	|| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)
726	m.flags_ = P_NEED_UPDATE;	725	m.flags_ = 0;
727	}	726	}
728	/* if the object is being removed, we can't make intelligent	727	/* if the object is being removed, we can't make intelligent
729	* decisions, because remove_ob can't really pass the object	728	* decisions, because remove_ob can't really pass the object
730	* that is being removed.	729	* that is being removed.
731	*/	730	*/
732	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)	731	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
733	m.flags_ = P_NEED_UPDATE;	732	m.flags_ = 0;
734	else if (action == UP_OBJ_FACE)	733	else if (action == UP_OBJ_FACE)
735	/* Nothing to do for that case */ ;	734	/* Nothing to do for that case */ ;
736	else	735	else
737	LOG (llevError, "update_object called with invalid action: %d\n", action);	736	LOG (llevError, "update_object called with invalid action: %d\n", action);
738		737
739	if (op->more)	738	if (op->more)
740	update_object (op->more, action);	739	update_object (op->more, action);
741	}	740	}
742		741
743	object::vector object::objects; // not yet used
744	object *object::first;
745
746	object::object ()	742	object::object ()
747	{	743	{
748	SET_FLAG (this, FLAG_REMOVED);	744	SET_FLAG (this, FLAG_REMOVED);
749		745
750	expmul = 1.0;	746	expmul = 1.0;
751	face = blank_face;	747	face = blank_face;
752	}	748	}
753		749
754	object::~object ()	750	object::~object ()
755	{	751	{
		752	unlink ();
		753
756	free_key_values (this);	754	free_key_values (this);
757	}	755	}
758		756
		757	static int object_count;
		758
759	void object::link ()	759	void object::link ()
760	{	760	{
761	count = ++ob_count;	761	assert (!index);//D
762	uuid = gen_uuid ();	762	uuid = gen_uuid ();
		763	count = ++object_count;
763		764
764	prev = 0;	765	refcnt_inc ();
765	next = object::first;	766	objects.insert (this);
766
767	if (object::first)
768	object::first->prev = this;
769
770	object::first = this;
771	}	767	}
772		768
773	void object::unlink ()	769	void object::unlink ()
774	{	770	{
775	if (this == object::first)	771	if (!index)
776	object::first = next;
777
778	/* Remove this object from the list of used objects */
779	if (prev) prev->next = next;
780	if (next) next->prev = prev;
781
782	prev = 0;
783	next = 0;
784	}
785
786	object *object::create ()
787	{
788	object *op = new object;
789	op->link ();
790	return op;	772	return;
791	}
792		773
793	/*	774	objects.erase (this);
794	* free_object() frees everything allocated by an object, removes	775	refcnt_dec ();
795	* it from the list of used objects, and puts it on the list of	776	}
796	* free objects. The IS_FREED() flag is set in the object.	777
797	* The object must have been removed by remove_ob() first for
798	* this function to succeed.
799	*
800	* If destroy_inventory is set, free inventory as well. Else drop items in
801	* inventory to the ground.
802	*/
803	void	778	void
804	object::do_destroy ()	779	object::activate ()
805	{	780	{
806	attachable::do_destroy ();	781	/* If already on active list, don't do anything */
807		782	if (active)
808	if (flag [FLAG_IS_LINKED])
809	remove_button_link (this);
810
811	if (flag [FLAG_FRIENDLY])
812	remove_friendly_object (this);
813
814	if (!flag [FLAG_REMOVED])
815	remove ();
816
817	if (flag [FLAG_FREED])
818	return;	783	return;
819		784
820	flag [FLAG_FREED] = 1;	785	if (has_active_speed ())
		786	actives.insert (this);
		787	}
821		788
822	// hack to ensure that freed objects still have a valid map	789	void
823	{	790	object::activate_recursive ()
824	static maptile *freed_map; // freed objects are moved here to avoid crashes	791	{
		792	activate ();
825		793
826	if (!freed_map)	794	for (object *op = inv; op; op = op->below)
		795	op->activate_recursive ();
		796	}
		797
		798	/* This function removes object 'op' from the list of active
		799	* objects.
		800	* This should only be used for style maps or other such
		801	* reference maps where you don't want an object that isn't
		802	* in play chewing up cpu time getting processed.
		803	* The reverse of this is to call update_ob_speed, which
		804	* will do the right thing based on the speed of the object.
		805	*/
		806	void
		807	object::deactivate ()
		808	{
		809	/* If not on the active list, nothing needs to be done */
		810	if (!active)
		811	return;
		812
		813	actives.erase (this);
		814	}
		815
		816	void
		817	object::deactivate_recursive ()
		818	{
		819	for (object *op = inv; op; op = op->below)
		820	op->deactivate_recursive ();
		821
		822	deactivate ();
		823	}
		824
		825	void
		826	object::set_flag_inv (int flag, int value)
		827	{
		828	for (object *op = inv; op; op = op->below)
827	{	829	{
828	freed_map = new maptile;	830	op->flag [flag] = value;
829		831	op->set_flag_inv (flag, value);
830	freed_map->name = "/internal/freed_objects_map";
831	freed_map->width = 3;
832	freed_map->height = 3;
833
834	freed_map->allocate ();
835	}	832	}
836
837	map = freed_map;
838	x = 1;
839	y = 1;
840	}
841
842	more = 0;
843	head = 0;
844	inv = 0;
845
846	// clear those pointers that likely might have circular references to us
847	owner = 0;
848	enemy = 0;
849	attacked_by = 0;
850
851	// only relevant for players(?), but make sure of it anyways
852	contr = 0;
853
854	/* Remove object from the active list */
855	speed = 0;
856	update_ob_speed (this);
857
858	unlink ();
859	}	833	}
860		834
861	/*	835	/*
862	* Remove and free all objects in the inventory of the given object.	836	* Remove and free all objects in the inventory of the given object.
863	* object.c ?	837	* object.c ?
864	*/	838	*/
865	void	839	void
866	object::destroy_inv (bool drop_to_ground)	840	object::destroy_inv (bool drop_to_ground)
867	{	841	{
		842	// need to check first, because the checks below might segfault
		843	// as we might be on an invalid mapspace and crossfire code
		844	// is too buggy to ensure that the inventory is empty.
		845	// corollary: if you create arrows etc. with stuff in tis inventory,
		846	// cf will crash below with off-map x and y
868	if (!inv)	847	if (!inv)
869	return;	848	return;
870		849
871	/* Only if the space blocks everything do we not process -	850	/* Only if the space blocks everything do we not process -
872	* if some form of movement is allowed, let objects	851	* if some form of movement is allowed, let objects
873	* drop on that space.	852	* drop on that space.
874	*/	853	*/
875	if (!drop_to_ground || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)	854	if (!drop_to_ground
		855	|| !map
		856	|| map->in_memory != MAP_IN_MEMORY
		857	|| map->nodrop
		858	|| ms ().move_block == MOVE_ALL)
876	{	859	{
877	while (inv)	860	while (inv)
878	{	861	{
879	inv->destroy_inv (drop_to_ground);	862	inv->destroy_inv (drop_to_ground);
880	inv->destroy ();	863	inv->destroy ();
…		…
888		871
889	if (op->flag [FLAG_STARTEQUIP]	872	if (op->flag [FLAG_STARTEQUIP]
890	|| op->flag [FLAG_NO_DROP]	873	|| op->flag [FLAG_NO_DROP]
891	|| op->type == RUNE	874	|| op->type == RUNE
892	|| op->type == TRAP	875	|| op->type == TRAP
893	|| op->flag [FLAG_IS_A_TEMPLATE])	876	|| op->flag [FLAG_IS_A_TEMPLATE]
		877	|| op->flag [FLAG_DESTROY_ON_DEATH])
894	op->destroy ();	878	op->destroy ();
895	else	879	else
896	{	880	map->insert (op, x, y);
897	op->remove ();
898	op->x = x;
899	op->y = y;
900	insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */
901	}
902	}	881	}
903	}	882	}
		883	}
		884
		885	object *object::create ()
		886	{
		887	object *op = new object;
		888	op->link ();
		889	return op;
		890	}
		891
		892	void
		893	object::do_destroy ()
		894	{
		895	attachable::do_destroy ();
		896
		897	if (flag [FLAG_IS_LINKED])
		898	remove_button_link (this);
		899
		900	if (flag [FLAG_FRIENDLY])
		901	remove_friendly_object (this);
		902
		903	if (!flag [FLAG_REMOVED])
		904	remove ();
		905
		906	destroy_inv (true);
		907
		908	deactivate ();
		909	unlink ();
		910
		911	flag [FLAG_FREED] = 1;
		912
		913	// hack to ensure that freed objects still have a valid map
		914	{
		915	static maptile *freed_map; // freed objects are moved here to avoid crashes
		916
		917	if (!freed_map)
		918	{
		919	freed_map = new maptile;
		920
		921	freed_map->name = "/internal/freed_objects_map";
		922	freed_map->width = 3;
		923	freed_map->height = 3;
		924
		925	freed_map->alloc ();
		926	freed_map->in_memory = MAP_IN_MEMORY;
		927	}
		928
		929	map = freed_map;
		930	x = 1;
		931	y = 1;
		932	}
		933
		934	head = 0;
		935
		936	if (more)
		937	{
		938	more->destroy ();
		939	more = 0;
		940	}
		941
		942	// clear those pointers that likely might have circular references to us
		943	owner = 0;
		944	enemy = 0;
		945	attacked_by = 0;
904	}	946	}
905		947
906	void	948	void
907	object::destroy (bool destroy_inventory)	949	object::destroy (bool destroy_inventory)
908	{	950	{
909	if (destroyed ())	951	if (destroyed ())
910	return;	952	return;
911		953
912	if (more)
913	{
914	//TODO: non-head objects must not have inventory
915	more->destroy (destroy_inventory);
916	more = 0;
917	}
918
919	if (destroy_inventory)	954	if (destroy_inventory)
920	destroy_inv (true);	955	destroy_inv (false);
921		956
922	attachable::destroy ();	957	attachable::destroy ();
923	}	958	}
924		959
925	/*	960	/*
…		…
943	* This function removes the object op from the linked list of objects	978	* This function removes the object op from the linked list of objects
944	* which it is currently tied to. When this function is done, the	979	* which it is currently tied to. When this function is done, the
945	* object will have no environment. If the object previously had an	980	* object will have no environment. If the object previously had an
946	* environment, the x and y coordinates will be updated to	981	* environment, the x and y coordinates will be updated to
947	* the previous environment.	982	* the previous environment.
948	* Beware: This function is called from the editor as well!
949	*/	983	*/
950	void	984	void
951	object::remove ()	985	object::do_remove ()
952	{	986	{
953	object *tmp, *last = 0;	987	object *tmp, *last = 0;
954	object *otmp;	988	object *otmp;
955		989
956	if (QUERY_FLAG (this, FLAG_REMOVED))	990	if (QUERY_FLAG (this, FLAG_REMOVED))
…		…
978	* to save cpu time.	1012	* to save cpu time.
979	*/	1013	*/
980	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1014	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
981	otmp->update_stats ();	1015	otmp->update_stats ();
982		1016
983	if (above != NULL)	1017	if (above)
984	above->below = below;	1018	above->below = below;
985	else	1019	else
986	env->inv = below;	1020	env->inv = below;
987		1021
988	if (below != NULL)	1022	if (below)
989	below->above = above;	1023	below->above = above;
990		1024
991	/* we set up values so that it could be inserted into	1025	/* we set up values so that it could be inserted into
992	* the map, but we don't actually do that - it is up	1026	* the map, but we don't actually do that - it is up
993	* to the caller to decide what we want to do.	1027	* to the caller to decide what we want to do.
…		…
997	above = 0, below = 0;	1031	above = 0, below = 0;
998	env = 0;	1032	env = 0;
999	}	1033	}
1000	else if (map)	1034	else if (map)
1001	{	1035	{
1002	/* Re did the following section of code - it looks like it had	1036	if (type == PLAYER)
1003	* lots of logic for things we no longer care about
1004	*/	1037	{
		1038	// leaving a spot always closes any open container on the ground
		1039	if (container && !container->env)
		1040	// this causes spurious floorbox updates, but it ensures
		1041	// that the CLOSE event is being sent.
		1042	close_container ();
		1043
		1044	--map->players;
		1045	map->touch ();
		1046	}
		1047
		1048	map->dirty = true;
		1049	mapspace &ms = this->ms ();
1005		1050
1006	/* link the object above us */	1051	/* link the object above us */
1007	if (above)	1052	if (above)
1008	above->below = below;	1053	above->below = below;
1009	else	1054	else
1010	map->at (x, y).top = below; /* we were top, set new top */	1055	ms.top = below; /* we were top, set new top */
1011		1056
1012	/* Relink the object below us, if there is one */	1057	/* Relink the object below us, if there is one */
1013	if (below)	1058	if (below)
1014	below->above = above;	1059	below->above = above;
1015	else	1060	else
…		…
1017	/* Nothing below, which means we need to relink map object for this space	1062	/* Nothing below, which means we need to relink map object for this space
1018	* use translated coordinates in case some oddness with map tiling is	1063	* use translated coordinates in case some oddness with map tiling is
1019	* evident	1064	* evident
1020	*/	1065	*/
1021	if (GET_MAP_OB (map, x, y) != this)	1066	if (GET_MAP_OB (map, x, y) != this)
1022	{
1023	char *dump = dump_object (this);
1024	LOG (llevError,
1025	"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);	1067	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 ());
1026	free (dump);
1027	dump = dump_object (GET_MAP_OB (map, x, y));
1028	LOG (llevError, "%s\n", dump);
1029	free (dump);
1030	}
1031		1068
1032	map->at (x, y).bottom = above; /* goes on above it. */	1069	ms.bot = above; /* goes on above it. */
1033	}	1070	}
1034		1071
1035	above = 0;	1072	above = 0;
1036	below = 0;	1073	below = 0;
1037		1074
1038	if (map->in_memory == MAP_SAVING)	1075	if (map->in_memory == MAP_SAVING)
1039	return;	1076	return;
1040		1077
1041	int check_walk_off = !flag [FLAG_NO_APPLY];	1078	int check_walk_off = !flag [FLAG_NO_APPLY];
1042		1079
1043	for (tmp = GET_MAP_OB (map, x, y); tmp; tmp = tmp->above)	1080	for (tmp = ms.bot; tmp; tmp = tmp->above)
1044	{	1081	{
1045	/* No point updating the players look faces if he is the object	1082	/* No point updating the players look faces if he is the object
1046	* being removed.	1083	* being removed.
1047	*/	1084	*/
1048		1085
…		…
1060		1097
1061	if (tmp->contr->ns)	1098	if (tmp->contr->ns)
1062	tmp->contr->ns->floorbox_update ();	1099	tmp->contr->ns->floorbox_update ();
1063	}	1100	}
1064		1101
1065	/* See if player moving off should effect something */	1102	/* See if object moving off should effect something */
1066	if (check_walk_off	1103	if (check_walk_off
1067	&& ((move_type & tmp->move_off)	1104	&& ((move_type & tmp->move_off)
1068	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))	1105	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1069	{	1106	{
1070	move_apply (tmp, this, 0);	1107	move_apply (tmp, this, 0);
…		…
1072	if (destroyed ())	1109	if (destroyed ())
1073	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());	1110	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1074	}	1111	}
1075		1112
1076	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */	1113	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1077		1114	//TODO: why is this horrible hacka fix? get rid of this code=bug! (schmorp)
1078	if (tmp->above == tmp)	1115	if (tmp->above == tmp)
1079	tmp->above = 0;	1116	tmp->above = 0;
1080		1117
1081	last = tmp;	1118	last = tmp;
1082	}	1119	}
1083		1120
1084	/* last == NULL of there are no objects on this space */	1121	/* last == NULL if there are no objects on this space */
		1122	//TODO: this makes little sense, why only update the topmost object?
1085	if (!last)	1123	if (!last)
1086	map->at (x, y).flags_ = P_NEED_UPDATE;	1124	map->at (x, y).flags_ = 0;
1087	else	1125	else
1088	update_object (last, UP_OBJ_REMOVE);	1126	update_object (last, UP_OBJ_REMOVE);
1089		1127
1090	if (flag [FLAG_BLOCKSVIEW] || glow_radius)	1128	if (flag [FLAG_BLOCKSVIEW] || glow_radius)
1091	update_all_los (map, x, y);	1129	update_all_los (map, x, y);
…		…
1127	}	1165	}
1128		1166
1129	return 0;	1167	return 0;
1130	}	1168	}
1131		1169
		1170	void
		1171	object::expand_tail ()
		1172	{
		1173	if (more)
		1174	return;
		1175
		1176	object *prev = this;
		1177
		1178	for (archetype *at = arch->more; at; at = at->more)
		1179	{
		1180	object *op = arch_to_object (at);
		1181
		1182	op->name = name;
		1183	op->name_pl = name_pl;
		1184	op->title = title;
		1185
		1186	op->head = this;
		1187	prev->more = op;
		1188
		1189	prev = op;
		1190	}
		1191	}
		1192
1132	/*	1193	/*
1133	* same as insert_ob_in_map except it handle separate coordinates and do a clean	1194	* same as insert_ob_in_map except it handles separate coordinates and does a clean
1134	* job preparing multi-part monsters	1195	* job preparing multi-part monsters.
1135	*/	1196	*/
1136	object *	1197	object *
1137	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)	1198	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1138	{	1199	{
1139	object *tmp;
1140
1141	if (op->head)
1142	op = op->head;
1143
1144	for (tmp = op; tmp; tmp = tmp->more)	1200	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1145	{	1201	{
1146	tmp->x = x + tmp->arch->clone.x;	1202	tmp->x = x + tmp->arch->clone.x;
1147	tmp->y = y + tmp->arch->clone.y;	1203	tmp->y = y + tmp->arch->clone.y;
1148	}	1204	}
1149		1205
…		…
1171	* just 'op' otherwise	1227	* just 'op' otherwise
1172	*/	1228	*/
1173	object *	1229	object *
1174	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)	1230	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1175	{	1231	{
		1232	assert (!op->flag [FLAG_FREED]);
		1233
1176	object *tmp, *top, *floor = NULL;	1234	object *tmp, *top, *floor = NULL;
1177	sint16 x, y;
1178		1235
1179	if (QUERY_FLAG (op, FLAG_FREED))	1236	op->remove ();
1180	{
1181	LOG (llevError, "Trying to insert freed object!\n");
1182	return NULL;
1183	}
1184		1237
1185	if (m == NULL)	1238	#if 0
1186	{	1239	if (!m->active != !op->active)
1187	char *dump = dump_object (op);	1240	if (m->active)
1188	LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);	1241	op->activate_recursive ();
1189	free (dump);	1242	else
1190	return op;	1243	op->deactivate_recursive ();
1191	}	1244	#endif
1192		1245
1193	if (out_of_map (m, op->x, op->y))	1246	if (out_of_map (m, op->x, op->y))
1194	{	1247	{
1195	char *dump = dump_object (op);
1196	LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump);	1248	LOG (llevError, "Trying to insert object outside the map.\n%s\n", op->debug_desc ());
1197	#ifdef MANY_CORES	1249	#ifdef MANY_CORES
1198	/* Better to catch this here, as otherwise the next use of this object	1250	/* Better to catch this here, as otherwise the next use of this object
1199	* is likely to cause a crash. Better to find out where it is getting	1251	* is likely to cause a crash. Better to find out where it is getting
1200	* improperly inserted.	1252	* improperly inserted.
1201	*/	1253	*/
1202	abort ();	1254	abort ();
1203	#endif	1255	#endif
1204	free (dump);
1205	return op;	1256	return op;
1206	}	1257	}
1207		1258
1208	if (!QUERY_FLAG (op, FLAG_REMOVED))
1209	{
1210	char *dump = dump_object (op);
1211	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
1212	free (dump);
1213	return op;
1214	}
1215
1216	if (op->more)
1217	{
1218	/* The part may be on a different map. */
1219
1220	object *more = op->more;	1259	if (object *more = op->more)
1221		1260	{
1222	/* We really need the caller to normalize coordinates - if
1223	* we set the map, that doesn't work if the location is within
1224	* a map and this is straddling an edge. So only if coordinate
1225	* is clear wrong do we normalize it.
1226	*/
1227	if (OUT_OF_REAL_MAP (more->map, more->x, more->y))
1228	more->map = get_map_from_coord (m, &more->x, &more->y);
1229	else if (!more->map)
1230	{
1231	/* For backwards compatibility - when not dealing with tiled maps,
1232	* more->map should always point to the parent.
1233	*/
1234	more->map = m;
1235	}
1236
1237	if (insert_ob_in_map (more, more->map, originator, flag) == NULL)	1261	if (!insert_ob_in_map (more, m, originator, flag))
1238	{	1262	{
1239	if (!op->head)	1263	if (!op->head)
1240	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");	1264	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1241		1265
1242	return 0;	1266	return 0;
…		…
1247		1271
1248	/* Ideally, the caller figures this out. However, it complicates a lot	1272	/* Ideally, the caller figures this out. However, it complicates a lot
1249	* of areas of callers (eg, anything that uses find_free_spot would now	1273	* of areas of callers (eg, anything that uses find_free_spot would now
1250	* need extra work	1274	* need extra work
1251	*/	1275	*/
1252	op->map = get_map_from_coord (m, &op->x, &op->y);	1276	if (!xy_normalise (m, op->x, op->y))
1253	x = op->x;	1277	return 0;
1254	y = op->y;	1278
		1279	op->map = m;
		1280	mapspace &ms = op->ms ();
1255		1281
1256	/* this has to be done after we translate the coordinates.	1282	/* this has to be done after we translate the coordinates.
1257	*/	1283	*/
1258	if (op->nrof && !(flag & INS_NO_MERGE))	1284	if (op->nrof && !(flag & INS_NO_MERGE))
1259	for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)	1285	for (tmp = ms.bot; tmp; tmp = tmp->above)
1260	if (object::can_merge (op, tmp))	1286	if (object::can_merge (op, tmp))
1261	{	1287	{
1262	op->nrof += tmp->nrof;	1288	op->nrof += tmp->nrof;
1263	tmp->destroy ();	1289	tmp->destroy ();
1264	}	1290	}
…		…
1281	op->below = originator->below;	1307	op->below = originator->below;
1282		1308
1283	if (op->below)	1309	if (op->below)
1284	op->below->above = op;	1310	op->below->above = op;
1285	else	1311	else
1286	op->ms ().bottom = op;	1312	ms.bot = op;
1287		1313
1288	/* since *below* originator, no need to update top */	1314	/* since *below* originator, no need to update top */
1289	originator->below = op;	1315	originator->below = op;
1290	}	1316	}
1291	else	1317	else
1292	{	1318	{
		1319	top = ms.bot;
		1320
1293	/* If there are other objects, then */	1321	/* If there are other objects, then */
1294	if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL))	1322	if ((!(flag & INS_MAP_LOAD)) && top)
1295	{	1323	{
1296	object *last = NULL;	1324	object *last = 0;
1297		1325
1298	/*	1326	/*
1299	* If there are multiple objects on this space, we do some trickier handling.	1327	* If there are multiple objects on this space, we do some trickier handling.
1300	* We've already dealt with merging if appropriate.	1328	* We've already dealt with merging if appropriate.
1301	* Generally, we want to put the new object on top. But if	1329	* Generally, we want to put the new object on top. But if
…		…
1305	* once we get to them. This reduces the need to traverse over all of	1333	* once we get to them. This reduces the need to traverse over all of
1306	* them when adding another one - this saves quite a bit of cpu time	1334	* them when adding another one - this saves quite a bit of cpu time
1307	* when lots of spells are cast in one area. Currently, it is presumed	1335	* when lots of spells are cast in one area. Currently, it is presumed
1308	* that flying non pickable objects are spell objects.	1336	* that flying non pickable objects are spell objects.
1309	*/	1337	*/
1310		1338	for (top = ms.bot; top; top = top->above)
1311	while (top != NULL)
1312	{	1339	{
1313	if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))	1340	if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))
1314	floor = top;	1341	floor = top;
1315		1342
1316	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))	1343	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))
…		…
1319	top = top->below;	1346	top = top->below;
1320	break;	1347	break;
1321	}	1348	}
1322		1349
1323	last = top;	1350	last = top;
1324	top = top->above;
1325	}	1351	}
1326		1352
1327	/* Don't want top to be NULL, so set it to the last valid object */	1353	/* Don't want top to be NULL, so set it to the last valid object */
1328	top = last;	1354	top = last;
1329		1355
…		…
1331	* looks like instead of lots of conditions here.	1357	* looks like instead of lots of conditions here.
1332	* makes things faster, and effectively the same result.	1358	* makes things faster, and effectively the same result.
1333	*/	1359	*/
1334		1360
1335	/* Have object 'fall below' other objects that block view.	1361	/* Have object 'fall below' other objects that block view.
1336	* Unless those objects are exits, type 66	1362	* Unless those objects are exits.
1337	* If INS_ON_TOP is used, don't do this processing	1363	* If INS_ON_TOP is used, don't do this processing
1338	* Need to find the object that in fact blocks view, otherwise	1364	* Need to find the object that in fact blocks view, otherwise
1339	* stacking is a bit odd.	1365	* stacking is a bit odd.
1340	*/	1366	*/
1341	if (!(flag & INS_ON_TOP) &&	1367	if (!(flag & INS_ON_TOP)
1342	(get_map_flags (op->map, 0, op->x, op->y, 0, 0) & P_BLOCKSVIEW) && (op->face && !op->face->visibility))	1368	&& ms.flags () & P_BLOCKSVIEW
		1369	&& (op->face && !faces [op->face].visibility))
1343	{	1370	{
1344	for (last = top; last != floor; last = last->below)	1371	for (last = top; last != floor; last = last->below)
1345	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1372	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1346	break;	1373	break;
		1374
1347	/* Check to see if we found the object that blocks view,	1375	/* Check to see if we found the object that blocks view,
1348	* and make sure we have a below pointer for it so that	1376	* and make sure we have a below pointer for it so that
1349	* we can get inserted below this one, which requires we	1377	* we can get inserted below this one, which requires we
1350	* set top to the object below us.	1378	* set top to the object below us.
1351	*/	1379	*/
…		…
1353	top = last->below;	1381	top = last->below;
1354	}	1382	}
1355	} /* If objects on this space */	1383	} /* If objects on this space */
1356		1384
1357	if (flag & INS_MAP_LOAD)	1385	if (flag & INS_MAP_LOAD)
1358	top = GET_MAP_TOP (op->map, op->x, op->y);	1386	top = ms.top;
1359		1387
1360	if (flag & INS_ABOVE_FLOOR_ONLY)	1388	if (flag & INS_ABOVE_FLOOR_ONLY)
1361	top = floor;	1389	top = floor;
1362		1390
1363	/* Top is the object that our object (op) is going to get inserted above.	1391	/* Top is the object that our object (op) is going to get inserted above.
1364	*/	1392	*/
1365		1393
1366	/* First object on this space */	1394	/* First object on this space */
1367	if (!top)	1395	if (!top)
1368	{	1396	{
1369	op->above = GET_MAP_OB (op->map, op->x, op->y);	1397	op->above = ms.bot;
1370		1398
1371	if (op->above)	1399	if (op->above)
1372	op->above->below = op;	1400	op->above->below = op;
1373		1401
1374	op->below = NULL;	1402	op->below = 0;
1375	op->ms ().bottom = op;	1403	ms.bot = op;
1376	}	1404	}
1377	else	1405	else
1378	{ /* get inserted into the stack above top */	1406	{ /* get inserted into the stack above top */
1379	op->above = top->above;	1407	op->above = top->above;
1380		1408
…		…
1383		1411
1384	op->below = top;	1412	op->below = top;
1385	top->above = op;	1413	top->above = op;
1386	}	1414	}
1387		1415
1388	if (op->above == NULL)	1416	if (!op->above)
1389	op->ms ().top = op;	1417	ms.top = op;
1390	} /* else not INS_BELOW_ORIGINATOR */	1418	} /* else not INS_BELOW_ORIGINATOR */
1391		1419
1392	if (op->type == PLAYER)	1420	if (op->type == PLAYER)
		1421	{
1393	op->contr->do_los = 1;	1422	op->contr->do_los = 1;
		1423	++op->map->players;
		1424	op->map->touch ();
		1425	}
		1426
		1427	op->map->dirty = true;
1394		1428
1395	/* If we have a floor, we know the player, if any, will be above	1429	/* If we have a floor, we know the player, if any, will be above
1396	* it, so save a few ticks and start from there.	1430	* it, so save a few ticks and start from there.
1397	*/	1431	*/
1398	if (!(flag & INS_MAP_LOAD))	1432	if (!(flag & INS_MAP_LOAD))
1399	if (object *pl = op->ms ().player ())	1433	if (object *pl = ms.player ())
1400	if (pl->contr->ns)	1434	if (pl->contr->ns)
1401	pl->contr->ns->floorbox_update ();	1435	pl->contr->ns->floorbox_update ();
1402		1436
1403	/* If this object glows, it may affect lighting conditions that are	1437	/* If this object glows, it may affect lighting conditions that are
1404	* visible to others on this map. But update_all_los is really	1438	* visible to others on this map. But update_all_los is really
1405	* an inefficient way to do this, as it means los for all players	1439	* an inefficient way to do this, as it means los for all players
1406	* on the map will get recalculated. The players could very well	1440	* on the map will get recalculated. The players could very well
1407	* be far away from this change and not affected in any way -	1441	* be far away from this change and not affected in any way -
1408	* this should get redone to only look for players within range,	1442	* this should get redone to only look for players within range,
1409	* or just updating the P_NEED_UPDATE for spaces within this area	1443	* or just updating the P_UPTODATE for spaces within this area
1410	* of effect may be sufficient.	1444	* of effect may be sufficient.
1411	*/	1445	*/
1412	if (MAP_DARKNESS (op->map) && (op->glow_radius != 0))	1446	if (op->map->darkness && (op->glow_radius != 0))
1413	update_all_los (op->map, op->x, op->y);	1447	update_all_los (op->map, op->x, op->y);
1414		1448
1415	/* updates flags (blocked, alive, no magic, etc) for this map space */	1449	/* updates flags (blocked, alive, no magic, etc) for this map space */
1416	update_object (op, UP_OBJ_INSERT);	1450	update_object (op, UP_OBJ_INSERT);
1417		1451
…		…
1452	{	1486	{
1453	object *tmp, *tmp1;	1487	object *tmp, *tmp1;
1454		1488
1455	/* first search for itself and remove any old instances */	1489	/* first search for itself and remove any old instances */
1456		1490
1457	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1491	for (tmp = op->ms ().bot; tmp; tmp = tmp->above)
1458	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */	1492	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */
1459	tmp->destroy ();	1493	tmp->destroy ();
1460		1494
1461	tmp1 = arch_to_object (archetype::find (arch_string));	1495	tmp1 = arch_to_object (archetype::find (arch_string));
1462		1496
1463	tmp1->x = op->x;	1497	tmp1->x = op->x;
1464	tmp1->y = op->y;	1498	tmp1->y = op->y;
1465	insert_ob_in_map (tmp1, op->map, op, 0);	1499	insert_ob_in_map (tmp1, op->map, op, 0);
		1500	}
		1501
		1502	object *
		1503	object::insert_at (object *where, object *originator, int flags)
		1504	{
		1505	return where->map->insert (this, where->x, where->y, originator, flags);
1466	}	1506	}
1467		1507
1468	/*	1508	/*
1469	* get_split_ob(ob,nr) splits up ob into two parts. The part which	1509	* get_split_ob(ob,nr) splits up ob into two parts. The part which
1470	* is returned contains nr objects, and the remaining parts contains	1510	* is returned contains nr objects, and the remaining parts contains
1471	* the rest (or is removed and freed if that number is 0).	1511	* the rest (or is removed and freed if that number is 0).
1472	* On failure, NULL is returned, and the reason put into the	1512	* On failure, NULL is returned, and the reason put into the
1473	* global static errmsg array.	1513	* global static errmsg array.
1474	*/	1514	*/
1475
1476	object *	1515	object *
1477	get_split_ob (object *orig_ob, uint32 nr)	1516	get_split_ob (object *orig_ob, uint32 nr)
1478	{	1517	{
1479	object *newob;	1518	object *newob;
1480	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);	1519	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
…		…
1511	* the amount of an object. If the amount reaches 0, the object	1550	* the amount of an object. If the amount reaches 0, the object
1512	* is subsequently removed and freed.	1551	* is subsequently removed and freed.
1513	*	1552	*
1514	* Return value: 'op' if something is left, NULL if the amount reached 0	1553	* Return value: 'op' if something is left, NULL if the amount reached 0
1515	*/	1554	*/
1516
1517	object *	1555	object *
1518	decrease_ob_nr (object *op, uint32 i)	1556	decrease_ob_nr (object *op, uint32 i)
1519	{	1557	{
1520	object *tmp;	1558	object *tmp;
1521		1559
…		…
1596		1634
1597	/*	1635	/*
1598	* add_weight(object, weight) adds the specified weight to an object,	1636	* add_weight(object, weight) adds the specified weight to an object,
1599	* and also updates how much the environment(s) is/are carrying.	1637	* and also updates how much the environment(s) is/are carrying.
1600	*/	1638	*/
1601
1602	void	1639	void
1603	add_weight (object *op, signed long weight)	1640	add_weight (object *op, signed long weight)
1604	{	1641	{
1605	while (op != NULL)	1642	while (op != NULL)
1606	{	1643	{
…		…
1638	* inside the object environment.	1675	* inside the object environment.
1639	*	1676	*
1640	* The function returns now pointer to inserted item, and return value can	1677	* The function returns now pointer to inserted item, and return value can
1641	* be != op, if items are merged. -Tero	1678	* be != op, if items are merged. -Tero
1642	*/	1679	*/
1643
1644	object *	1680	object *
1645	object::insert (object *op)	1681	object::insert (object *op)
1646	{	1682	{
1647	object *tmp, *otmp;	1683	object *tmp, *otmp;
1648		1684
…		…
1703	if ((op->glow_radius != 0) && map)	1739	if ((op->glow_radius != 0) && map)
1704	{	1740	{
1705	#ifdef DEBUG_LIGHTS	1741	#ifdef DEBUG_LIGHTS
1706	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);	1742	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1707	#endif /* DEBUG_LIGHTS */	1743	#endif /* DEBUG_LIGHTS */
1708	if (MAP_DARKNESS (map))	1744	if (map->darkness)
1709	update_all_los (map, x, y);	1745	update_all_los (map, x, y);
1710	}	1746	}
1711		1747
1712	/* Client has no idea of ordering so lets not bother ordering it here.	1748	/* Client has no idea of ordering so lets not bother ordering it here.
1713	* It sure simplifies this function...	1749	* It sure simplifies this function...
…		…
1744	*	1780	*
1745	* MSW 2001-07-08: Check all objects on space, not just those below	1781	* MSW 2001-07-08: Check all objects on space, not just those below
1746	* object being inserted. insert_ob_in_map may not put new objects	1782	* object being inserted. insert_ob_in_map may not put new objects
1747	* on top.	1783	* on top.
1748	*/	1784	*/
1749
1750	int	1785	int
1751	check_move_on (object *op, object *originator)	1786	check_move_on (object *op, object *originator)
1752	{	1787	{
1753	object *tmp;	1788	object *tmp;
1754	maptile *m = op->map;	1789	maptile *m = op->map;
…		…
1781		1816
1782	/* The objects have to be checked from top to bottom.	1817	/* The objects have to be checked from top to bottom.
1783	* Hence, we first go to the top:	1818	* Hence, we first go to the top:
1784	*/	1819	*/
1785		1820
1786	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL && tmp->above != NULL; tmp = tmp->above)	1821	for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above)
1787	{	1822	{
1788	/* Trim the search when we find the first other spell effect	1823	/* Trim the search when we find the first other spell effect
1789	* this helps performance so that if a space has 50 spell objects,	1824	* this helps performance so that if a space has 50 spell objects,
1790	* we don't need to check all of them.	1825	* we don't need to check all of them.
1791	*/	1826	*/
…		…
1809	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||	1844	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
1810	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))	1845	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1811	{	1846	{
1812		1847
1813	float	1848	float
1814	diff = tmp->move_slow_penalty * FABS (op->speed);	1849	diff = tmp->move_slow_penalty * fabs (op->speed);
1815		1850
1816	if (op->type == PLAYER)	1851	if (op->type == PLAYER)
1817	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||	1852	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||
1818	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))	1853	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))
1819	diff /= 4.0;	1854	diff /= 4.0;
…		…
1846	/*	1881	/*
1847	* present_arch(arch, map, x, y) searches for any objects with	1882	* present_arch(arch, map, x, y) searches for any objects with
1848	* a matching archetype at the given map and coordinates.	1883	* a matching archetype at the given map and coordinates.
1849	* The first matching object is returned, or NULL if none.	1884	* The first matching object is returned, or NULL if none.
1850	*/	1885	*/
1851
1852	object *	1886	object *
1853	present_arch (const archetype *at, maptile *m, int x, int y)	1887	present_arch (const archetype *at, maptile *m, int x, int y)
1854	{	1888	{
1855	object *
1856	tmp;
1857
1858	if (m == NULL || out_of_map (m, x, y))	1889	if (!m || out_of_map (m, x, y))
1859	{	1890	{
1860	LOG (llevError, "Present_arch called outside map.\n");	1891	LOG (llevError, "Present_arch called outside map.\n");
1861	return NULL;	1892	return NULL;
1862	}	1893	}
1863	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1894
		1895	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1864	if (tmp->arch == at)	1896	if (tmp->arch == at)
1865	return tmp;	1897	return tmp;
		1898
1866	return NULL;	1899	return NULL;
1867	}	1900	}
1868		1901
1869	/*	1902	/*
1870	* present(type, map, x, y) searches for any objects with	1903	* present(type, map, x, y) searches for any objects with
1871	* a matching type variable at the given map and coordinates.	1904	* a matching type variable at the given map and coordinates.
1872	* The first matching object is returned, or NULL if none.	1905	* The first matching object is returned, or NULL if none.
1873	*/	1906	*/
1874
1875	object *	1907	object *
1876	present (unsigned char type, maptile *m, int x, int y)	1908	present (unsigned char type, maptile *m, int x, int y)
1877	{	1909	{
1878	object *
1879	tmp;
1880
1881	if (out_of_map (m, x, y))	1910	if (out_of_map (m, x, y))
1882	{	1911	{
1883	LOG (llevError, "Present called outside map.\n");	1912	LOG (llevError, "Present called outside map.\n");
1884	return NULL;	1913	return NULL;
1885	}	1914	}
1886	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1915
		1916	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1887	if (tmp->type == type)	1917	if (tmp->type == type)
1888	return tmp;	1918	return tmp;
		1919
1889	return NULL;	1920	return NULL;
1890	}	1921	}
1891		1922
1892	/*	1923	/*
1893	* present_in_ob(type, object) searches for any objects with	1924	* present_in_ob(type, object) searches for any objects with
1894	* a matching type variable in the inventory of the given object.	1925	* a matching type variable in the inventory of the given object.
1895	* The first matching object is returned, or NULL if none.	1926	* The first matching object is returned, or NULL if none.
1896	*/	1927	*/
1897
1898	object *	1928	object *
1899	present_in_ob (unsigned char type, const object *op)	1929	present_in_ob (unsigned char type, const object *op)
1900	{	1930	{
1901	object *
1902	tmp;
1903
1904	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1931	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
1905	if (tmp->type == type)	1932	if (tmp->type == type)
1906	return tmp;	1933	return tmp;
		1934
1907	return NULL;	1935	return NULL;
1908	}	1936	}
1909		1937
1910	/*	1938	/*
1911	* present_in_ob (type, str, object) searches for any objects with	1939	* present_in_ob (type, str, object) searches for any objects with
…		…
1922	* to be unique.	1950	* to be unique.
1923	*/	1951	*/
1924	object *	1952	object *
1925	present_in_ob_by_name (int type, const char *str, const object *op)	1953	present_in_ob_by_name (int type, const char *str, const object *op)
1926	{	1954	{
1927	object *tmp;
1928
1929	for (tmp = op->inv; tmp; tmp = tmp->below)	1955	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1930	if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name)))	1956	if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name)))
1931	return tmp;	1957	return tmp;
1932		1958
1933	return 0;	1959	return 0;
1934	}	1960	}
…		…
2035	}	2061	}
2036		2062
2037	if (!index)	2063	if (!index)
2038	return -1;	2064	return -1;
2039		2065
2040	return altern[RANDOM () % index];	2066	return altern [rndm (index)];
2041	}	2067	}
2042		2068
2043	/*	2069	/*
2044	* find_first_free_spot(archetype, maptile, x, y) works like	2070	* find_first_free_spot(archetype, maptile, x, y) works like
2045	* find_free_spot(), but it will search max number of squares.	2071	* find_free_spot(), but it will search max number of squares.
…		…
2066	{	2092	{
2067	arr += begin;	2093	arr += begin;
2068	end -= begin;	2094	end -= begin;
2069		2095
2070	while (--end)	2096	while (--end)
2071	swap (arr [end], arr [RANDOM () % (end + 1)]);	2097	swap (arr [end], arr [rndm (end + 1)]);
2072	}	2098	}
2073		2099
2074	/* new function to make monster searching more efficient, and effective!	2100	/* new function to make monster searching more efficient, and effective!
2075	* This basically returns a randomized array (in the passed pointer) of	2101	* This basically returns a randomized array (in the passed pointer) of
2076	* the spaces to find monsters. In this way, it won't always look for	2102	* the spaces to find monsters. In this way, it won't always look for
…		…
2143		2169
2144	if ((move_type & blocked) == move_type)	2170	if ((move_type & blocked) == move_type)
2145	max = maxfree[i];	2171	max = maxfree[i];
2146	else if (mflags & P_IS_ALIVE)	2172	else if (mflags & P_IS_ALIVE)
2147	{	2173	{
2148	for (tmp = ms.bottom; tmp; tmp = tmp->above)	2174	for (tmp = ms.bot; tmp; tmp = tmp->above)
2149	if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)	2175	if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)
2150	&& (tmp != exclude || (tmp->head && tmp->head != exclude)))	2176	&& (tmp != exclude || (tmp->head && tmp->head != exclude)))
2151	break;	2177	break;
2152		2178
2153	if (tmp)	2179	if (tmp)
…		…
2210		2236
2211	return 3;	2237	return 3;
2212	}	2238	}
2213		2239
2214	/*	2240	/*
2215	* absdir(int): Returns a number between 1 and 8, which represent
2216	* the "absolute" direction of a number (it actually takes care of
2217	* "overflow" in previous calculations of a direction).
2218	*/
2219
2220	int
2221	absdir (int d)
2222	{
2223	while (d < 1)
2224	d += 8;
2225
2226	while (d > 8)
2227	d -= 8;
2228
2229	return d;
2230	}
2231
2232	/*
2233	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is	2241	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is
2234	* between two directions (which are expected to be absolute (see absdir())	2242	* between two directions (which are expected to be absolute (see absdir())
2235	*/	2243	*/
2236
2237	int	2244	int
2238	dirdiff (int dir1, int dir2)	2245	dirdiff (int dir1, int dir2)
2239	{	2246	{
2240	int d;	2247	int d;
2241		2248
…		…
2407	insert_ob_in_ob (object_create_clone (item), dst);	2414	insert_ob_in_ob (object_create_clone (item), dst);
2408		2415
2409	return dst;	2416	return dst;
2410	}	2417	}
2411		2418
2412	/* GROS - Creates an object using a string representing its content. */
2413	/* Basically, we save the content of the string to a temp file, then call */
2414	/* load_object on it. I admit it is a highly inefficient way to make things, */
2415	/* but it was simple to make and allows reusing the load_object function. */
2416	/* Remember not to use load_object_str in a time-critical situation. */
2417	/* Also remember that multiparts objects are not supported for now. */
2418	object *
2419	load_object_str (const char *obstr)
2420	{
2421	object *op;
2422	char filename[MAX_BUF];
2423
2424	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2425
2426	FILE *tempfile = fopen (filename, "w");
2427
2428	if (tempfile == NULL)
2429	{
2430	LOG (llevError, "Error - Unable to access load object temp file\n");
2431	return NULL;
2432	}
2433
2434	fprintf (tempfile, obstr);
2435	fclose (tempfile);
2436
2437	op = object::create ();
2438
2439	object_thawer thawer (filename);
2440
2441	if (thawer)
2442	load_object (thawer, op, 0);
2443
2444	LOG (llevDebug, " load str completed, object=%s\n", &op->name);
2445	CLEAR_FLAG (op, FLAG_REMOVED);
2446
2447	return op;
2448	}
2449
2450	/* This returns the first object in who's inventory that	2419	/* This returns the first object in who's inventory that
2451	* has the same type and subtype match.	2420	* has the same type and subtype match.
2452	* returns NULL if no match.	2421	* returns NULL if no match.
2453	*/	2422	*/
2454	object *	2423	object *
…		…
2507	if (link->key == canonical_key)	2476	if (link->key == canonical_key)
2508	return link->value;	2477	return link->value;
2509		2478
2510	return 0;	2479	return 0;
2511	}	2480	}
2512
2513		2481
2514	/*	2482	/*
2515	* Updates the canonical_key in op to value.	2483	* Updates the canonical_key in op to value.
2516	*	2484	*
2517	* canonical_key is a shared string (value doesn't have to be).	2485	* canonical_key is a shared string (value doesn't have to be).
…		…
2620	}	2588	}
2621	else	2589	else
2622	item = item->env;	2590	item = item->env;
2623	}	2591	}
2624		2592
		2593
		2594	const char *
		2595	object::flag_desc (char *desc, int len) const
		2596	{
		2597	char *p = desc;
		2598	bool first = true;
		2599
		2600	*p = 0;
		2601
		2602	for (int i = 0; i < NUM_FLAGS; i++)
		2603	{
		2604	if (len <= 10) // magic constant!
		2605	{
		2606	snprintf (p, len, ",...");
		2607	break;
		2608	}
		2609
		2610	if (flag [i])
		2611	{
		2612	int cnt = snprintf (p, len, "%s%d", first ? "" : ",", i);
		2613	len -= cnt;
		2614	p += cnt;
		2615	first = false;
		2616	}
		2617	}
		2618
		2619	return desc;
		2620	}
		2621
2625	// return a suitable string describing an objetc in enough detail to find it	2622	// return a suitable string describing an object in enough detail to find it
2626	const char *	2623	const char *
2627	object::debug_desc (char *info) const	2624	object::debug_desc (char *info) const
2628	{	2625	{
		2626	char flagdesc[512];
2629	char info2[256 * 3];	2627	char info2[256 * 4];
2630	char *p = info;	2628	char *p = info;
2631		2629
2632	p += snprintf (p, 256, "%d=\"%s%s%s\"",	2630	p += snprintf (p, 512, "{cnt:%d,uuid:<1.%" PRIx64 ">,name:\"%s\"%s%s,flags:[%s],type:%d}",
2633	count,	2631	count, uuid.seq,
2634	&name,	2632	&name,
2635	title ? " " : "",	2633	title ? "\",title:\"" : "",
2636	title ? (const char *)title : "");	2634	title ? (const char *)title : "",
		2635	flag_desc (flagdesc, 512), type);
2637		2636
2638	if (env)	2637	if (env)
2639	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2638	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2640		2639
2641	if (map)	2640	if (map)
2642	p += snprintf (p, 256, "(on %s@%d+%d)", map->path, x, y);	2641	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2643		2642
2644	return info;	2643	return info;
2645	}	2644	}
2646		2645
2647	const char *	2646	const char *
2648	object::debug_desc () const	2647	object::debug_desc () const
2649	{	2648	{
2650	static char info[256 * 3];	2649	static char info[3][256 * 4];
		2650	static int info_idx;
		2651
2651	return debug_desc (info);	2652	return debug_desc (info [++info_idx % 3]);
2652	}	2653	}
2653		2654
		2655	struct region *
		2656	object::region () const
		2657	{
		2658	return map ? map->region (x, y)
		2659	: region::default_region ();
		2660	}
		2661
		2662	const materialtype_t *
		2663	object::dominant_material () const
		2664	{
		2665	if (materialtype_t *mat = name_to_material (materialname))
		2666	return mat;
		2667
		2668	// omfg this is slow, this has to be temporary :)
		2669	shstr unknown ("unknown");
		2670
		2671	return name_to_material (unknown);
		2672	}
		2673
		2674	void
		2675	object::open_container (object *new_container)
		2676	{
		2677	if (container == new_container)
		2678	return;
		2679
		2680	if (object *old_container = container)
		2681	{
		2682	if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
		2683	return;
		2684
		2685	#if 0
		2686	// remove the "Close old_container" object.
		2687	if (object *closer = old_container->inv)
		2688	if (closer->type == CLOSE_CON)
		2689	closer->destroy ();
		2690	#endif
		2691
		2692	old_container->flag [FLAG_APPLIED] = 0;
		2693	container = 0;
		2694
		2695	esrv_update_item (UPD_FLAGS, this, old_container);
		2696	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
		2697	}
		2698
		2699	if (new_container)
		2700	{
		2701	if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))
		2702	return;
		2703
		2704	// TODO: this does not seem to serve any purpose anymore?
		2705	#if 0
		2706	// insert the "Close Container" object.
		2707	if (archetype *closer = new_container->other_arch)
		2708	{
		2709	object *closer = arch_to_object (new_container->other_arch);
		2710	closer->flag [FLAG_NO_MAP_SAVE] = 1;
		2711	new_container->insert (closer);
		2712	}
		2713	#endif
		2714
		2715	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));
		2716
		2717	new_container->flag [FLAG_APPLIED] = 1;
		2718	container = new_container;
		2719
		2720	esrv_update_item (UPD_FLAGS, this, new_container);
		2721	esrv_send_inventory (this, new_container);
		2722	}
		2723	}
		2724
		2725

Diff Legend

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