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.83 by root, Mon Dec 25 14:43:22 2006 UTC vs.
Revision 1.172 by root, Wed Aug 1 20:44:11 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,
…		…
141	* objects with lists are rare, and lists stay short. If not, use a	143	* objects with lists are rare, and lists stay short. If not, use a
142	* different structure or at least keep the lists sorted...	144	* different structure or at least keep the lists sorted...
143	*/	145	*/
144		146
145	/* For each field in wants, */	147	/* For each field in wants, */
146	for (wants_field = wants->key_values; wants_field != NULL; wants_field = wants_field->next)	148	for (wants_field = wants->key_values; wants_field; wants_field = wants_field->next)
147	{	149	{
148	key_value *has_field;	150	key_value *has_field;
149		151
150	/* Look for a field in has with the same key. */	152	/* Look for a field in has with the same key. */
151	has_field = get_ob_key_link (has, wants_field->key);	153	has_field = get_ob_key_link (has, wants_field->key);
…		…
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, 3);	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
…		…
391	}	392	}
392		393
393	/*	394	/*
394	* Returns the object which has the count-variable equal to the argument.	395	* Returns the object which has the count-variable equal to the argument.
395	*/	396	*/
396
397	object *	397	object *
398	find_object (tag_t i)	398	find_object (tag_t i)
399	{	399	{
400	for (object *op = object::first; op; op = op->next)	400	for_all_objects (op)
401	if (op->count == i)	401	if (op->count == i)
402	return op;	402	return op;
403		403
404	return 0;	404	return 0;
405	}	405	}
406		406
407	/*	407	/*
408	* Returns the first object which has a name equal to the argument.	408	* Returns the first object which has a name equal to the argument.
409	* Used only by the patch command, but not all that useful.	409	* Used only by the patch command, but not all that useful.
410	* Enables features like "patch <name-of-other-player> food 999"	410	* Enables features like "patch <name-of-other-player> food 999"
411	*/	411	*/
412
413	object *	412	object *
414	find_object_name (const char *str)	413	find_object_name (const char *str)
415	{	414	{
416	shstr_cmp str_ (str);	415	shstr_cmp str_ (str);
417	object *op;	416	object *op;
418		417
419	for (op = object::first; op != NULL; op = op->next)	418	for_all_objects (op)
420	if (op->name == str_)	419	if (op->name == str_)
421	break;	420	break;
422		421
423	return op;	422	return op;
424	}	423	}
…		…
450	owner = owner->owner;	449	owner = owner->owner;
451		450
452	this->owner = owner;	451	this->owner = owner;
453	}	452	}
454		453
		454	int
		455	object::slottype () const
		456	{
		457	if (type == SKILL)
		458	{
		459	if (IS_COMBAT_SKILL (subtype)) return slot_combat;
		460	if (IS_RANGED_SKILL (subtype)) return slot_ranged;
		461	}
		462	else
		463	{
		464	if (slot [body_combat].info) return slot_combat;
		465	if (slot [body_range ].info) return slot_ranged;
		466	}
		467
		468	return slot_none;
		469	}
		470
		471	bool
		472	object::change_weapon (object *ob)
		473	{
		474	if (current_weapon == ob)
		475	return true;
		476
		477	if (chosen_skill)
		478	chosen_skill->flag [FLAG_APPLIED] = false;
		479
		480	current_weapon = ob;
		481	chosen_skill = !ob || ob->type == SKILL ? ob : find_skill_by_name (this, ob->skill);
		482
		483	if (chosen_skill)
		484	chosen_skill->flag [FLAG_APPLIED] = true;
		485
		486	update_stats ();
		487
		488	if (ob)
		489	{
		490	// now check wether any body locations became invalid, in which case
		491	// we cannot apply the weapon at the moment.
		492	for (int i = 0; i < NUM_BODY_LOCATIONS; ++i)
		493	if (slot[i].used < 0)
		494	{
		495	current_weapon = chosen_skill = 0;
		496	update_stats ();
		497
		498	new_draw_info_format (NDI_UNIQUE, 0, this,
		499	"You try to balance all your items at once, "
		500	"but the %s is just too much for your body. "
		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	if (ob && !ob->flag [FLAG_APPLIED] && ob->type != SPELL)
		511	{
		512	LOG (llevError | logBacktrace, "%s changed to unapplied weapon %s",
		513	&name, ob->debug_desc ());
		514	return false;
		515	}
		516
		517	return true;
		518	}
		519
455	/* Zero the key_values on op, decrementing the shared-string	520	/* Zero the key_values on op, decrementing the shared-string
456	* refcounts and freeing the links.	521	* refcounts and freeing the links.
457	*/	522	*/
458	static void	523	static void
459	free_key_values (object *op)	524	free_key_values (object *op)
460	{	525	{
461	for (key_value *i = op->key_values; i != 0;)	526	for (key_value *i = op->key_values; i; )
462	{	527	{
463	key_value *next = i->next;	528	key_value *next = i->next;
464	delete i;	529	delete i;
465		530
466	i = next;	531	i = next;
467	}	532	}
468		533
469	op->key_values = 0;	534	op->key_values = 0;
470	}	535	}
471		536
472	/*	537	object &
473	* copy_to first frees everything allocated by the dst object,	538	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	{	539	{
483	bool is_freed = QUERY_FLAG (dst, FLAG_FREED);	540	bool is_freed = flag [FLAG_FREED];
484	bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED);	541	bool is_removed = flag [FLAG_REMOVED];
485		542
486	*(object_copy *)dst = *this;	543	*(object_copy *)this = src;
487		544
488	if (is_freed)	545	flag [FLAG_FREED] = is_freed;
489	SET_FLAG (dst, FLAG_FREED);	546	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		547
497	/* Copy over key_values, if any. */	548	/* Copy over key_values, if any. */
498	if (key_values)	549	if (src.key_values)
499	{	550	{
500	key_value *tail = 0;	551	key_value *tail = 0;
501	key_value *i;
502
503	dst->key_values = 0;	552	key_values = 0;
504		553
505	for (i = key_values; i; i = i->next)	554	for (key_value *i = src.key_values; i; i = i->next)
506	{	555	{
507	key_value *new_link = new key_value;	556	key_value *new_link = new key_value;
508		557
509	new_link->next = 0;	558	new_link->next = 0;
510	new_link->key = i->key;	559	new_link->key = i->key;
511	new_link->value = i->value;	560	new_link->value = i->value;
512		561
513	/* Try and be clever here, too. */	562	/* Try and be clever here, too. */
514	if (!dst->key_values)	563	if (!key_values)
515	{	564	{
516	dst->key_values = new_link;	565	key_values = new_link;
517	tail = new_link;	566	tail = new_link;
518	}	567	}
519	else	568	else
520	{	569	{
521	tail->next = new_link;	570	tail->next = new_link;
522	tail = new_link;	571	tail = new_link;
523	}	572	}
524	}	573	}
525	}	574	}
		575	}
526		576
527	update_ob_speed (dst);	577	/*
		578	* copy_to first frees everything allocated by the dst object,
		579	* and then copies the contents of itself into the second
		580	* object, allocating what needs to be allocated. Basically, any
		581	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
		582	* if the first object is freed, the pointers in the new object
		583	* will point at garbage.
		584	*/
		585	void
		586	object::copy_to (object *dst)
		587	{
		588	*dst = *this;
		589
		590	if (speed < 0)
		591	dst->speed_left = speed_left - rndm ();
		592
		593	dst->set_speed (dst->speed);
		594	}
		595
		596	void
		597	object::instantiate ()
		598	{
		599	if (!uuid.seq) // HACK
		600	uuid = gen_uuid ();
		601
		602	speed_left = -0.1f;
		603	/* copy the body_info to the body_used - this is only really
		604	* need for monsters, but doesn't hurt to do it for everything.
		605	* by doing so, when a monster is created, it has good starting
		606	* values for the body_used info, so when items are created
		607	* for it, they can be properly equipped.
		608	*/
		609	for (int i = NUM_BODY_LOCATIONS; i--; )
		610	slot[i].used = slot[i].info;
		611
		612	attachable::instantiate ();
528	}	613	}
529		614
530	object *	615	object *
531	object::clone ()	616	object::clone ()
532	{	617	{
…		…
538	/*	623	/*
539	* If an object with the IS_TURNABLE() flag needs to be turned due	624	* 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	625	* 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.	626	* be called to update the face variable, _and_ how it looks on the map.
542	*/	627	*/
543
544	void	628	void
545	update_turn_face (object *op)	629	update_turn_face (object *op)
546	{	630	{
547	if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || op->arch == NULL)	631	if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || !op->arch)
548	return;	632	return;
		633
549	SET_ANIMATION (op, op->direction);	634	SET_ANIMATION (op, op->direction);
550	update_object (op, UP_OBJ_FACE);	635	update_object (op, UP_OBJ_FACE);
551	}	636	}
552		637
553	/*	638	/*
554	* Updates the speed of an object. If the speed changes from 0 to another	639	* 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.	640	* 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.	641	* This function needs to be called whenever the speed of an object changes.
557	*/	642	*/
558	void	643	void
559	update_ob_speed (object *op)	644	object::set_speed (float speed)
560	{	645	{
561	extern int arch_init;	646	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	{	647	{
569	LOG (llevError, "Object %s is freed but has speed.\n", &op->name);	648	LOG (llevError, "Object %s is freed but has speed.\n", &name);
570	#ifdef MANY_CORES
571	abort ();
572	#else
573	op->speed = 0;	649	speed = 0;
574	#endif
575	}
576
577	if (arch_init)
578	return;
579
580	if (FABS (op->speed) > MIN_ACTIVE_SPEED)
581	{	650	}
582	/* If already on active list, don't do anything */
583	if (op->active_next || op->active_prev || op == active_objects)
584	return;
585		651
586	/* process_events() expects us to insert the object at the beginning	652	this->speed = speed;
587	* of the list. */
588	op->active_next = active_objects;
589		653
590	if (op->active_next != NULL)	654	if (has_active_speed ())
591	op->active_next->active_prev = op;	655	activate ();
592
593	active_objects = op;
594	}
595	else	656	else
596	{	657	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	}	658	}
651		659
652	/*	660	/*
653	* update_object() updates the the map.	661	* update_object() updates the the map.
654	* It takes into account invisible objects (and represent squares covered	662	* It takes into account invisible objects (and represent squares covered
…		…
667	* UP_OBJ_FACE: only the objects face has changed.	675	* UP_OBJ_FACE: only the objects face has changed.
668	*/	676	*/
669	void	677	void
670	update_object (object *op, int action)	678	update_object (object *op, int action)
671	{	679	{
672	MoveType move_on, move_off, move_block, move_slow;
673
674	if (op == NULL)	680	if (op == NULL)
675	{	681	{
676	/* this should never happen */	682	/* this should never happen */
677	LOG (llevDebug, "update_object() called for NULL object.\n");	683	LOG (llevDebug, "update_object() called for NULL object.\n");
678	return;	684	return;
…		…
702	return;	708	return;
703	}	709	}
704		710
705	mapspace &m = op->ms ();	711	mapspace &m = op->ms ();
706		712
707	if (m.flags_ & P_NEED_UPDATE)	713	if (!(m.flags_ & P_UPTODATE))
708	/* nop */;	714	/* nop */;
709	else if (action == UP_OBJ_INSERT)	715	else if (action == UP_OBJ_INSERT)
710	{	716	{
711	// this is likely overkill, TODO: revisit (schmorp)	717	// this is likely overkill, TODO: revisit (schmorp)
712	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))	718	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	727	/* This isn't perfect, but I don't expect a lot of objects to
722	* to have move_allow right now.	728	* to have move_allow right now.
723	*/	729	*/
724	|| ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block	730	|| ((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)	731	|| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)
726	m.flags_ = P_NEED_UPDATE;	732	m.flags_ = 0;
727	}	733	}
728	/* if the object is being removed, we can't make intelligent	734	/* if the object is being removed, we can't make intelligent
729	* decisions, because remove_ob can't really pass the object	735	* decisions, because remove_ob can't really pass the object
730	* that is being removed.	736	* that is being removed.
731	*/	737	*/
732	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)	738	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
733	m.flags_ = P_NEED_UPDATE;	739	m.flags_ = 0;
734	else if (action == UP_OBJ_FACE)	740	else if (action == UP_OBJ_FACE)
735	/* Nothing to do for that case */ ;	741	/* Nothing to do for that case */ ;
736	else	742	else
737	LOG (llevError, "update_object called with invalid action: %d\n", action);	743	LOG (llevError, "update_object called with invalid action: %d\n", action);
738		744
739	if (op->more)	745	if (op->more)
740	update_object (op->more, action);	746	update_object (op->more, action);
741	}	747	}
742		748
743	object::vector object::objects; // not yet used
744	object *object::first;
745
746	object::object ()	749	object::object ()
747	{	750	{
748	SET_FLAG (this, FLAG_REMOVED);	751	SET_FLAG (this, FLAG_REMOVED);
749		752
750	expmul = 1.0;	753	expmul = 1.0;
751	face = blank_face;	754	face = blank_face;
752	}	755	}
753		756
754	object::~object ()	757	object::~object ()
755	{	758	{
		759	unlink ();
		760
756	free_key_values (this);	761	free_key_values (this);
757	}	762	}
758		763
		764	static int object_count;
		765
759	void object::link ()	766	void object::link ()
760	{	767	{
761	count = ++ob_count;	768	assert (!index);//D
762	uuid = gen_uuid ();	769	uuid = gen_uuid ();
		770	count = ++object_count;
763		771
764	prev = 0;	772	refcnt_inc ();
765	next = object::first;	773	objects.insert (this);
766
767	if (object::first)
768	object::first->prev = this;
769
770	object::first = this;
771	}	774	}
772		775
773	void object::unlink ()	776	void object::unlink ()
774	{	777	{
775	if (this == object::first)	778	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;	779	return;
791	}
792		780
793	/*	781	objects.erase (this);
794	* free_object() frees everything allocated by an object, removes	782	refcnt_dec ();
795	* it from the list of used objects, and puts it on the list of	783	}
796	* free objects. The IS_FREED() flag is set in the object.	784
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	785	void
804	object::do_destroy ()	786	object::activate ()
805	{	787	{
806	attachable::do_destroy ();	788	/* If already on active list, don't do anything */
807		789	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;	790	return;
819		791
820	flag [FLAG_FREED] = 1;	792	if (has_active_speed ())
		793	actives.insert (this);
		794	}
821		795
822	// hack to ensure that freed objects still have a valid map	796	void
823	{	797	object::activate_recursive ()
824	static maptile *freed_map; // freed objects are moved here to avoid crashes	798	{
		799	activate ();
825		800
826	if (!freed_map)	801	for (object *op = inv; op; op = op->below)
		802	op->activate_recursive ();
		803	}
		804
		805	/* This function removes object 'op' from the list of active
		806	* objects.
		807	* This should only be used for style maps or other such
		808	* reference maps where you don't want an object that isn't
		809	* in play chewing up cpu time getting processed.
		810	* The reverse of this is to call update_ob_speed, which
		811	* will do the right thing based on the speed of the object.
		812	*/
		813	void
		814	object::deactivate ()
		815	{
		816	/* If not on the active list, nothing needs to be done */
		817	if (!active)
		818	return;
		819
		820	actives.erase (this);
		821	}
		822
		823	void
		824	object::deactivate_recursive ()
		825	{
		826	for (object *op = inv; op; op = op->below)
		827	op->deactivate_recursive ();
		828
		829	deactivate ();
		830	}
		831
		832	void
		833	object::set_flag_inv (int flag, int value)
		834	{
		835	for (object *op = inv; op; op = op->below)
827	{	836	{
828	freed_map = new maptile;	837	op->flag [flag] = value;
829		838	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	}	839	}
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	}	840	}
860		841
861	/*	842	/*
862	* Remove and free all objects in the inventory of the given object.	843	* Remove and free all objects in the inventory of the given object.
863	* object.c ?	844	* object.c ?
864	*/	845	*/
865	void	846	void
866	object::destroy_inv (bool drop_to_ground)	847	object::destroy_inv (bool drop_to_ground)
867	{	848	{
		849	// need to check first, because the checks below might segfault
		850	// as we might be on an invalid mapspace and crossfire code
		851	// is too buggy to ensure that the inventory is empty.
		852	// corollary: if you create arrows etc. with stuff in tis inventory,
		853	// cf will crash below with off-map x and y
868	if (!inv)	854	if (!inv)
869	return;	855	return;
870		856
871	/* Only if the space blocks everything do we not process -	857	/* Only if the space blocks everything do we not process -
872	* if some form of movement is allowed, let objects	858	* if some form of movement is allowed, let objects
873	* drop on that space.	859	* drop on that space.
874	*/	860	*/
875	if (!drop_to_ground || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)	861	if (!drop_to_ground
		862	|| !map
		863	|| map->in_memory != MAP_IN_MEMORY
		864	|| map->nodrop
		865	|| ms ().move_block == MOVE_ALL)
876	{	866	{
877	while (inv)	867	while (inv)
878	{	868	{
879	inv->destroy_inv (drop_to_ground);	869	inv->destroy_inv (drop_to_ground);
880	inv->destroy ();	870	inv->destroy ();
…		…
888		878
889	if (op->flag [FLAG_STARTEQUIP]	879	if (op->flag [FLAG_STARTEQUIP]
890	|| op->flag [FLAG_NO_DROP]	880	|| op->flag [FLAG_NO_DROP]
891	|| op->type == RUNE	881	|| op->type == RUNE
892	|| op->type == TRAP	882	|| op->type == TRAP
893	|| op->flag [FLAG_IS_A_TEMPLATE])	883	|| op->flag [FLAG_IS_A_TEMPLATE]
		884	|| op->flag [FLAG_DESTROY_ON_DEATH])
894	op->destroy ();	885	op->destroy ();
895	else	886	else
896	{	887	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	}	888	}
903	}	889	}
		890	}
		891
		892	object *object::create ()
		893	{
		894	object *op = new object;
		895	op->link ();
		896	return op;
		897	}
		898
		899	void
		900	object::do_destroy ()
		901	{
		902	attachable::do_destroy ();
		903
		904	if (flag [FLAG_IS_LINKED])
		905	remove_button_link (this);
		906
		907	if (flag [FLAG_FRIENDLY])
		908	remove_friendly_object (this);
		909
		910	if (!flag [FLAG_REMOVED])
		911	remove ();
		912
		913	destroy_inv (true);
		914
		915	deactivate ();
		916	unlink ();
		917
		918	flag [FLAG_FREED] = 1;
		919
		920	// hack to ensure that freed objects still have a valid map
		921	{
		922	static maptile *freed_map; // freed objects are moved here to avoid crashes
		923
		924	if (!freed_map)
		925	{
		926	freed_map = new maptile;
		927
		928	freed_map->name = "/internal/freed_objects_map";
		929	freed_map->width = 3;
		930	freed_map->height = 3;
		931
		932	freed_map->alloc ();
		933	freed_map->in_memory = MAP_IN_MEMORY;
		934	}
		935
		936	map = freed_map;
		937	x = 1;
		938	y = 1;
		939	}
		940
		941	if (more)
		942	{
		943	more->destroy ();
		944	more = 0;
		945	}
		946
		947	head = 0;
		948
		949	// clear those pointers that likely might cause circular references
		950	owner = 0;
		951	enemy = 0;
		952	attacked_by = 0;
		953	current_weapon = 0;
904	}	954	}
905		955
906	void	956	void
907	object::destroy (bool destroy_inventory)	957	object::destroy (bool destroy_inventory)
908	{	958	{
909	if (destroyed ())	959	if (destroyed ())
910	return;	960	return;
911		961
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)	962	if (destroy_inventory)
920	destroy_inv (true);	963	destroy_inv (false);
		964
		965	if (sound_destroy)
		966	play_sound (sound_destroy);
		967	else if (flag [FLAG_MONSTER])
		968	play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism
921		969
922	attachable::destroy ();	970	attachable::destroy ();
923	}	971	}
924		972
925	/*	973	/*
…		…
943	* This function removes the object op from the linked list of objects	991	* 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	992	* which it is currently tied to. When this function is done, the
945	* object will have no environment. If the object previously had an	993	* object will have no environment. If the object previously had an
946	* environment, the x and y coordinates will be updated to	994	* environment, the x and y coordinates will be updated to
947	* the previous environment.	995	* the previous environment.
948	* Beware: This function is called from the editor as well!
949	*/	996	*/
950	void	997	void
951	object::remove ()	998	object::do_remove ()
952	{	999	{
953	object *tmp, *last = 0;	1000	object *tmp, *last = 0;
954	object *otmp;	1001	object *otmp;
955		1002
956	if (QUERY_FLAG (this, FLAG_REMOVED))	1003	if (QUERY_FLAG (this, FLAG_REMOVED))
…		…
978	* to save cpu time.	1025	* to save cpu time.
979	*/	1026	*/
980	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1027	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
981	otmp->update_stats ();	1028	otmp->update_stats ();
982		1029
983	if (above != NULL)	1030	if (above)
984	above->below = below;	1031	above->below = below;
985	else	1032	else
986	env->inv = below;	1033	env->inv = below;
987		1034
988	if (below != NULL)	1035	if (below)
989	below->above = above;	1036	below->above = above;
990		1037
991	/* we set up values so that it could be inserted into	1038	/* we set up values so that it could be inserted into
992	* the map, but we don't actually do that - it is up	1039	* the map, but we don't actually do that - it is up
993	* to the caller to decide what we want to do.	1040	* to the caller to decide what we want to do.
…		…
997	above = 0, below = 0;	1044	above = 0, below = 0;
998	env = 0;	1045	env = 0;
999	}	1046	}
1000	else if (map)	1047	else if (map)
1001	{	1048	{
1002	/* Re did the following section of code - it looks like it had	1049	if (type == PLAYER)
1003	* lots of logic for things we no longer care about
1004	*/	1050	{
		1051	// leaving a spot always closes any open container on the ground
		1052	if (container && !container->env)
		1053	// this causes spurious floorbox updates, but it ensures
		1054	// that the CLOSE event is being sent.
		1055	close_container ();
		1056
		1057	--map->players;
		1058	map->touch ();
		1059	}
		1060
		1061	map->dirty = true;
		1062	mapspace &ms = this->ms ();
1005		1063
1006	/* link the object above us */	1064	/* link the object above us */
1007	if (above)	1065	if (above)
1008	above->below = below;	1066	above->below = below;
1009	else	1067	else
1010	map->at (x, y).top = below; /* we were top, set new top */	1068	ms.top = below; /* we were top, set new top */
1011		1069
1012	/* Relink the object below us, if there is one */	1070	/* Relink the object below us, if there is one */
1013	if (below)	1071	if (below)
1014	below->above = above;	1072	below->above = above;
1015	else	1073	else
…		…
1017	/* Nothing below, which means we need to relink map object for this space	1075	/* 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	1076	* use translated coordinates in case some oddness with map tiling is
1019	* evident	1077	* evident
1020	*/	1078	*/
1021	if (GET_MAP_OB (map, x, y) != this)	1079	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);	1080	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		1081
1032	map->at (x, y).bottom = above; /* goes on above it. */	1082	ms.bot = above; /* goes on above it. */
1033	}	1083	}
1034		1084
1035	above = 0;	1085	above = 0;
1036	below = 0;	1086	below = 0;
1037		1087
1038	if (map->in_memory == MAP_SAVING)	1088	if (map->in_memory == MAP_SAVING)
1039	return;	1089	return;
1040		1090
1041	int check_walk_off = !flag [FLAG_NO_APPLY];	1091	int check_walk_off = !flag [FLAG_NO_APPLY];
1042		1092
1043	for (tmp = GET_MAP_OB (map, x, y); tmp; tmp = tmp->above)	1093	for (tmp = ms.bot; tmp; tmp = tmp->above)
1044	{	1094	{
1045	/* No point updating the players look faces if he is the object	1095	/* No point updating the players look faces if he is the object
1046	* being removed.	1096	* being removed.
1047	*/	1097	*/
1048		1098
…		…
1060		1110
1061	if (tmp->contr->ns)	1111	if (tmp->contr->ns)
1062	tmp->contr->ns->floorbox_update ();	1112	tmp->contr->ns->floorbox_update ();
1063	}	1113	}
1064		1114
1065	/* See if player moving off should effect something */	1115	/* See if object moving off should effect something */
1066	if (check_walk_off	1116	if (check_walk_off
1067	&& ((move_type & tmp->move_off)	1117	&& ((move_type & tmp->move_off)
1068	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))	1118	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1069	{	1119	{
1070	move_apply (tmp, this, 0);	1120	move_apply (tmp, this, 0);
1071		1121
1072	if (destroyed ())	1122	if (destroyed ())
1073	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());	1123	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1074	}	1124	}
1075		1125
1076	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1077
1078	if (tmp->above == tmp)
1079	tmp->above = 0;
1080
1081	last = tmp;	1126	last = tmp;
1082	}	1127	}
1083		1128
1084	/* last == NULL of there are no objects on this space */	1129	/* last == NULL if there are no objects on this space */
		1130	//TODO: this makes little sense, why only update the topmost object?
1085	if (!last)	1131	if (!last)
1086	map->at (x, y).flags_ = P_NEED_UPDATE;	1132	map->at (x, y).flags_ = 0;
1087	else	1133	else
1088	update_object (last, UP_OBJ_REMOVE);	1134	update_object (last, UP_OBJ_REMOVE);
1089		1135
1090	if (flag [FLAG_BLOCKSVIEW] || glow_radius)	1136	if (flag [FLAG_BLOCKSVIEW] || glow_radius)
1091	update_all_los (map, x, y);	1137	update_all_los (map, x, y);
…		…
1127	}	1173	}
1128		1174
1129	return 0;	1175	return 0;
1130	}	1176	}
1131		1177
		1178	void
		1179	object::expand_tail ()
		1180	{
		1181	if (more)
		1182	return;
		1183
		1184	object *prev = this;
		1185
		1186	for (archetype *at = (archetype *)arch->more; at; at = (archetype *)at->more)
		1187	{
		1188	object *op = arch_to_object (at);
		1189
		1190	op->name = name;
		1191	op->name_pl = name_pl;
		1192	op->title = title;
		1193
		1194	op->head = this;
		1195	prev->more = op;
		1196
		1197	prev = op;
		1198	}
		1199	}
		1200
1132	/*	1201	/*
1133	* same as insert_ob_in_map except it handle separate coordinates and do a clean	1202	* same as insert_ob_in_map except it handles separate coordinates and does a clean
1134	* job preparing multi-part monsters	1203	* job preparing multi-part monsters.
1135	*/	1204	*/
1136	object *	1205	object *
1137	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)	1206	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1138	{	1207	{
1139	object *tmp;
1140
1141	if (op->head)
1142	op = op->head;
1143
1144	for (tmp = op; tmp; tmp = tmp->more)	1208	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1145	{	1209	{
1146	tmp->x = x + tmp->arch->clone.x;	1210	tmp->x = x + tmp->arch->x;
1147	tmp->y = y + tmp->arch->clone.y;	1211	tmp->y = y + tmp->arch->y;
1148	}	1212	}
1149		1213
1150	return insert_ob_in_map (op, m, originator, flag);	1214	return insert_ob_in_map (op, m, originator, flag);
1151	}	1215	}
1152		1216
…		…
1171	* just 'op' otherwise	1235	* just 'op' otherwise
1172	*/	1236	*/
1173	object *	1237	object *
1174	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)	1238	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1175	{	1239	{
		1240	assert (!op->flag [FLAG_FREED]);
		1241
1176	object *tmp, *top, *floor = NULL;	1242	object *top, *floor = NULL;
1177	sint16 x, y;
1178		1243
1179	if (QUERY_FLAG (op, FLAG_FREED))	1244	op->remove ();
1180	{
1181	LOG (llevError, "Trying to insert freed object!\n");
1182	return NULL;
1183	}
1184		1245
1185	if (m == NULL)	1246	#if 0
1186	{	1247	if (!m->active != !op->active)
1187	char *dump = dump_object (op);	1248	if (m->active)
1188	LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);	1249	op->activate_recursive ();
1189	free (dump);	1250	else
1190	return op;	1251	op->deactivate_recursive ();
1191	}	1252	#endif
1192		1253
1193	if (out_of_map (m, op->x, op->y))	1254	if (out_of_map (m, op->x, op->y))
1194	{	1255	{
1195	char *dump = dump_object (op);
1196	LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump);	1256	LOG (llevError, "Trying to insert object outside the map.\n%s\n", op->debug_desc ());
1197	#ifdef MANY_CORES	1257	#ifdef MANY_CORES
1198	/* Better to catch this here, as otherwise the next use of this object	1258	/* Better to catch this here, as otherwise the next use of this object
1199	* is likely to cause a crash. Better to find out where it is getting	1259	* is likely to cause a crash. Better to find out where it is getting
1200	* improperly inserted.	1260	* improperly inserted.
1201	*/	1261	*/
1202	abort ();	1262	abort ();
1203	#endif	1263	#endif
1204	free (dump);
1205	return op;	1264	return op;
1206	}	1265	}
1207		1266
1208	if (!QUERY_FLAG (op, FLAG_REMOVED))	1267	if (object *more = op->more)
1209	{	1268	if (!insert_ob_in_map (more, m, originator, flag))
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;	1269	return 0;
1214	}
1215
1216	if (op->more)
1217	{
1218	/* The part may be on a different map. */
1219
1220	object *more = op->more;
1221
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)
1238	{
1239	if (!op->head)
1240	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1241
1242	return 0;
1243	}
1244	}
1245		1270
1246	CLEAR_FLAG (op, FLAG_REMOVED);	1271	CLEAR_FLAG (op, FLAG_REMOVED);
1247		1272
1248	/* Ideally, the caller figures this out. However, it complicates a lot	1273	/* 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	1274	* of areas of callers (eg, anything that uses find_free_spot would now
1250	* need extra work	1275	* need extra work
1251	*/	1276	*/
1252	op->map = get_map_from_coord (m, &op->x, &op->y);	1277	if (!xy_normalise (m, op->x, op->y))
1253	x = op->x;	1278	return 0;
1254	y = op->y;	1279
		1280	op->map = m;
		1281	mapspace &ms = op->ms ();
1255		1282
1256	/* this has to be done after we translate the coordinates.	1283	/* this has to be done after we translate the coordinates.
1257	*/	1284	*/
1258	if (op->nrof && !(flag & INS_NO_MERGE))	1285	if (op->nrof && !(flag & INS_NO_MERGE))
1259	for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)	1286	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1260	if (object::can_merge (op, tmp))	1287	if (object::can_merge (op, tmp))
1261	{	1288	{
1262	op->nrof += tmp->nrof;	1289	op->nrof += tmp->nrof;
1263	tmp->destroy ();	1290	tmp->destroy ();
1264	}	1291	}
…		…
1281	op->below = originator->below;	1308	op->below = originator->below;
1282		1309
1283	if (op->below)	1310	if (op->below)
1284	op->below->above = op;	1311	op->below->above = op;
1285	else	1312	else
1286	op->ms ().bottom = op;	1313	ms.bot = op;
1287		1314
1288	/* since *below* originator, no need to update top */	1315	/* since *below* originator, no need to update top */
1289	originator->below = op;	1316	originator->below = op;
1290	}	1317	}
1291	else	1318	else
1292	{	1319	{
		1320	top = ms.bot;
		1321
1293	/* If there are other objects, then */	1322	/* If there are other objects, then */
1294	if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL))	1323	if ((!(flag & INS_MAP_LOAD)) && top)
1295	{	1324	{
1296	object *last = NULL;	1325	object *last = 0;
1297		1326
1298	/*	1327	/*
1299	* If there are multiple objects on this space, we do some trickier handling.	1328	* If there are multiple objects on this space, we do some trickier handling.
1300	* We've already dealt with merging if appropriate.	1329	* We've already dealt with merging if appropriate.
1301	* Generally, we want to put the new object on top. But if	1330	* Generally, we want to put the new object on top. But if
…		…
1305	* once we get to them. This reduces the need to traverse over all of	1334	* once we get to them. This reduces the need to traverse over all of
1306	* them when adding another one - this saves quite a bit of cpu time	1335	* them when adding another one - this saves quite a bit of cpu time
1307	* when lots of spells are cast in one area. Currently, it is presumed	1336	* when lots of spells are cast in one area. Currently, it is presumed
1308	* that flying non pickable objects are spell objects.	1337	* that flying non pickable objects are spell objects.
1309	*/	1338	*/
1310		1339	for (top = ms.bot; top; top = top->above)
1311	while (top != NULL)
1312	{	1340	{
1313	if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))	1341	if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))
1314	floor = top;	1342	floor = top;
1315		1343
1316	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))	1344	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))
…		…
1319	top = top->below;	1347	top = top->below;
1320	break;	1348	break;
1321	}	1349	}
1322		1350
1323	last = top;	1351	last = top;
1324	top = top->above;
1325	}	1352	}
1326		1353
1327	/* Don't want top to be NULL, so set it to the last valid object */	1354	/* Don't want top to be NULL, so set it to the last valid object */
1328	top = last;	1355	top = last;
1329		1356
…		…
1331	* looks like instead of lots of conditions here.	1358	* looks like instead of lots of conditions here.
1332	* makes things faster, and effectively the same result.	1359	* makes things faster, and effectively the same result.
1333	*/	1360	*/
1334		1361
1335	/* Have object 'fall below' other objects that block view.	1362	/* Have object 'fall below' other objects that block view.
1336	* Unless those objects are exits, type 66	1363	* Unless those objects are exits.
1337	* If INS_ON_TOP is used, don't do this processing	1364	* If INS_ON_TOP is used, don't do this processing
1338	* Need to find the object that in fact blocks view, otherwise	1365	* Need to find the object that in fact blocks view, otherwise
1339	* stacking is a bit odd.	1366	* stacking is a bit odd.
1340	*/	1367	*/
1341	if (!(flag & INS_ON_TOP) &&	1368	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))	1369	&& ms.flags () & P_BLOCKSVIEW
		1370	&& (op->face && !faces [op->face].visibility))
1343	{	1371	{
1344	for (last = top; last != floor; last = last->below)	1372	for (last = top; last != floor; last = last->below)
1345	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1373	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1346	break;	1374	break;
		1375
1347	/* Check to see if we found the object that blocks view,	1376	/* Check to see if we found the object that blocks view,
1348	* and make sure we have a below pointer for it so that	1377	* and make sure we have a below pointer for it so that
1349	* we can get inserted below this one, which requires we	1378	* we can get inserted below this one, which requires we
1350	* set top to the object below us.	1379	* set top to the object below us.
1351	*/	1380	*/
1352	if (last && last->below && last != floor)	1381	if (last && last->below && last != floor)
1353	top = last->below;	1382	top = last->below;
1354	}	1383	}
1355	} /* If objects on this space */	1384	} /* If objects on this space */
1356
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
…		…
1425	* blocked() and wall() work properly), and these flags are updated by	1459	* blocked() and wall() work properly), and these flags are updated by
1426	* update_object().	1460	* update_object().
1427	*/	1461	*/
1428		1462
1429	/* if this is not the head or flag has been passed, don't check walk on status */	1463	/* if this is not the head or flag has been passed, don't check walk on status */
1430	if (!(flag & INS_NO_WALK_ON) && !op->head)	1464	if (!(flag & INS_NO_WALK_ON) && op->head_ () == op)
1431	{	1465	{
1432	if (check_move_on (op, originator))	1466	if (check_move_on (op, originator))
1433	return 0;	1467	return 0;
1434		1468
1435	/* If we are a multi part object, lets work our way through the check	1469	/* If we are a multi part object, lets work our way through the check
1436	* walk on's.	1470	* walk on's.
1437	*/	1471	*/
1438	for (tmp = op->more; tmp != NULL; tmp = tmp->more)	1472	for (object *tmp = op->more; tmp; tmp = tmp->more)
1439	if (check_move_on (tmp, originator))	1473	if (check_move_on (tmp, originator))
1440	return 0;	1474	return 0;
1441	}	1475	}
1442		1476
1443	return op;	1477	return op;
…		…
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->archname, 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	{
…		…
1621	LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);	1658	LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
1622	free (dump);	1659	free (dump);
1623	return op;	1660	return op;
1624	}	1661	}
1625		1662
1626	if (where->head)	1663	if (where->head_ () != where)
1627	{	1664	{
1628	LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n");	1665	LOG (llevError | logBacktrace, "Warning: Tried to insert object into wrong part of multipart object.\n");
1629	where = where->head;	1666	where = where->head;
1630	}	1667	}
1631		1668
1632	return where->insert (op);	1669	return where->insert (op);
1633	}	1670	}
…		…
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	}
…		…
1972	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)	1998	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
1973	{	1999	{
1974	CLEAR_FLAG (tmp, flag);	2000	CLEAR_FLAG (tmp, flag);
1975	unflag_inv (tmp, flag);	2001	unflag_inv (tmp, flag);
1976	}	2002	}
1977	}
1978
1979	/*
1980	* set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in
1981	* all it's inventory (recursively).
1982	* If checksums are used, a player will get set_cheat called for
1983	* him/her-self and all object carried by a call to this function.
1984	*/
1985	void
1986	set_cheat (object *op)
1987	{
1988	SET_FLAG (op, FLAG_WAS_WIZ);
1989	flag_inv (op, FLAG_WAS_WIZ);
1990	}	2003	}
1991		2004
1992	/*	2005	/*
1993	* find_free_spot(object, map, x, y, start, stop) will search for	2006	* find_free_spot(object, map, x, y, start, stop) will search for
1994	* a spot at the given map and coordinates which will be able to contain	2007	* a spot at the given map and coordinates which will be able to contain
…		…
2035	}	2048	}
2036		2049
2037	if (!index)	2050	if (!index)
2038	return -1;	2051	return -1;
2039		2052
2040	return altern[RANDOM () % index];	2053	return altern [rndm (index)];
2041	}	2054	}
2042		2055
2043	/*	2056	/*
2044	* find_first_free_spot(archetype, maptile, x, y) works like	2057	* find_first_free_spot(archetype, maptile, x, y) works like
2045	* find_free_spot(), but it will search max number of squares.	2058	* find_free_spot(), but it will search max number of squares.
…		…
2066	{	2079	{
2067	arr += begin;	2080	arr += begin;
2068	end -= begin;	2081	end -= begin;
2069		2082
2070	while (--end)	2083	while (--end)
2071	swap (arr [end], arr [RANDOM () % (end + 1)]);	2084	swap (arr [end], arr [rndm (end + 1)]);
2072	}	2085	}
2073		2086
2074	/* new function to make monster searching more efficient, and effective!	2087	/* new function to make monster searching more efficient, and effective!
2075	* This basically returns a randomized array (in the passed pointer) of	2088	* 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	2089	* the spaces to find monsters. In this way, it won't always look for
…		…
2112	object *tmp;	2125	object *tmp;
2113	maptile *mp;	2126	maptile *mp;
2114		2127
2115	MoveType blocked, move_type;	2128	MoveType blocked, move_type;
2116		2129
2117	if (exclude && exclude->head)	2130	if (exclude && exclude->head_ () != exclude)
2118	{	2131	{
2119	exclude = exclude->head;	2132	exclude = exclude->head;
2120	move_type = exclude->move_type;	2133	move_type = exclude->move_type;
2121	}	2134	}
2122	else	2135	else
…		…
2143		2156
2144	if ((move_type & blocked) == move_type)	2157	if ((move_type & blocked) == move_type)
2145	max = maxfree[i];	2158	max = maxfree[i];
2146	else if (mflags & P_IS_ALIVE)	2159	else if (mflags & P_IS_ALIVE)
2147	{	2160	{
2148	for (tmp = ms.bottom; tmp; tmp = tmp->above)	2161	for (tmp = ms.bot; tmp; tmp = tmp->above)
2149	if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)	2162	if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)
2150	&& (tmp != exclude || (tmp->head && tmp->head != exclude)))	2163	&& (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2151	break;	2164	break;
2152		2165
2153	if (tmp)	2166	if (tmp)
2154	return freedir[i];	2167	return freedir[i];
2155	}	2168	}
…		…
2210		2223
2211	return 3;	2224	return 3;
2212	}	2225	}
2213		2226
2214	/*	2227	/*
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	2228	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is
2234	* between two directions (which are expected to be absolute (see absdir())	2229	* between two directions (which are expected to be absolute (see absdir())
2235	*/	2230	*/
2236
2237	int	2231	int
2238	dirdiff (int dir1, int dir2)	2232	dirdiff (int dir1, int dir2)
2239	{	2233	{
2240	int d;	2234	int d;
2241		2235
…		…
2369	* create clone from object to another	2363	* create clone from object to another
2370	*/	2364	*/
2371	object *	2365	object *
2372	object_create_clone (object *asrc)	2366	object_create_clone (object *asrc)
2373	{	2367	{
2374	object *dst = 0, *tmp, *src, *part, *prev, *item;	2368	object *dst = 0, *tmp, *src, *prev, *item;
2375		2369
2376	if (!asrc)	2370	if (!asrc)
2377	return 0;	2371	return 0;
2378		2372
2379	src = asrc;
2380	if (src->head)
2381	src = src->head;	2373	src = asrc->head_ ();
2382		2374
2383	prev = 0;	2375	prev = 0;
2384	for (part = src; part; part = part->more)	2376	for (object *part = src; part; part = part->more)
2385	{	2377	{
2386	tmp = part->clone ();	2378	tmp = part->clone ();
2387	tmp->x -= src->x;	2379	tmp->x -= src->x;
2388	tmp->y -= src->y;	2380	tmp->y -= src->y;
2389		2381
…		…
2407	insert_ob_in_ob (object_create_clone (item), dst);	2399	insert_ob_in_ob (object_create_clone (item), dst);
2408		2400
2409	return dst;	2401	return dst;
2410	}	2402	}
2411		2403
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	2404	/* This returns the first object in who's inventory that
2451	* has the same type and subtype match.	2405	* has the same type and subtype match.
2452	* returns NULL if no match.	2406	* returns NULL if no match.
2453	*/	2407	*/
2454	object *	2408	object *
…		…
2507	if (link->key == canonical_key)	2461	if (link->key == canonical_key)
2508	return link->value;	2462	return link->value;
2509		2463
2510	return 0;	2464	return 0;
2511	}	2465	}
2512
2513		2466
2514	/*	2467	/*
2515	* Updates the canonical_key in op to value.	2468	* Updates the canonical_key in op to value.
2516	*	2469	*
2517	* canonical_key is a shared string (value doesn't have to be).	2470	* canonical_key is a shared string (value doesn't have to be).
…		…
2541	/* Basically, if the archetype has this key set,	2494	/* Basically, if the archetype has this key set,
2542	* we need to store the null value so when we save	2495	* we need to store the null value so when we save
2543	* it, we save the empty value so that when we load,	2496	* it, we save the empty value so that when we load,
2544	* we get this value back again.	2497	* we get this value back again.
2545	*/	2498	*/
2546	if (get_ob_key_link (&op->arch->clone, canonical_key))	2499	if (get_ob_key_link (op->arch, canonical_key))
2547	field->value = 0;	2500	field->value = 0;
2548	else	2501	else
2549	{	2502	{
2550	if (last)	2503	if (last)
2551	last->next = field->next;	2504	last->next = field->next;
…		…
2620	}	2573	}
2621	else	2574	else
2622	item = item->env;	2575	item = item->env;
2623	}	2576	}
2624		2577
		2578	const char *
		2579	object::flag_desc (char *desc, int len) const
		2580	{
		2581	char *p = desc;
		2582	bool first = true;
		2583
		2584	*p = 0;
		2585
		2586	for (int i = 0; i < NUM_FLAGS; i++)
		2587	{
		2588	if (len <= 10) // magic constant!
		2589	{
		2590	snprintf (p, len, ",...");
		2591	break;
		2592	}
		2593
		2594	if (flag [i])
		2595	{
		2596	int cnt = snprintf (p, len, "%s%d", first ? "" : ",", i);
		2597	len -= cnt;
		2598	p += cnt;
		2599	first = false;
		2600	}
		2601	}
		2602
		2603	return desc;
		2604	}
		2605
2625	// return a suitable string describing an objetc in enough detail to find it	2606	// return a suitable string describing an object in enough detail to find it
2626	const char *	2607	const char *
2627	object::debug_desc (char *info) const	2608	object::debug_desc (char *info) const
2628	{	2609	{
		2610	char flagdesc[512];
2629	char info2[256 * 3];	2611	char info2[256 * 4];
2630	char *p = info;	2612	char *p = info;
2631		2613
2632	p += snprintf (p, 256, "%d=\"%s%s%s\"",	2614	p += snprintf (p, 512, "{cnt:%d,uuid:<1.%" PRIx64 ">,name:\"%s\"%s%s,flags:[%s],type:%d}",
2633	count,	2615	count, uuid.seq,
2634	&name,	2616	&name,
2635	title ? " " : "",	2617	title ? "\",title:\"" : "",
2636	title ? (const char *)title : "");	2618	title ? (const char *)title : "",
		2619	flag_desc (flagdesc, 512), type);
2637		2620
2638	if (env)	2621	if (env)
2639	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2622	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2640		2623
2641	if (map)	2624	if (map)
2642	p += snprintf (p, 256, "(on %s@%d+%d)", map->path, x, y);	2625	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2643		2626
2644	return info;	2627	return info;
2645	}	2628	}
2646		2629
2647	const char *	2630	const char *
2648	object::debug_desc () const	2631	object::debug_desc () const
2649	{	2632	{
2650	static char info[256 * 3];	2633	static char info[3][256 * 4];
		2634	static int info_idx;
		2635
2651	return debug_desc (info);	2636	return debug_desc (info [++info_idx % 3]);
2652	}	2637	}
2653		2638
		2639	struct region *
		2640	object::region () const
		2641	{
		2642	return map ? map->region (x, y)
		2643	: region::default_region ();
		2644	}
		2645
		2646	const materialtype_t *
		2647	object::dominant_material () const
		2648	{
		2649	if (materialtype_t *mt = name_to_material (materialname))
		2650	return mt;
		2651
		2652	return name_to_material (shstr_unknown);
		2653	}
		2654
		2655	void
		2656	object::open_container (object *new_container)
		2657	{
		2658	if (container == new_container)
		2659	return;
		2660
		2661	if (object *old_container = container)
		2662	{
		2663	if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
		2664	return;
		2665
		2666	#if 0
		2667	// remove the "Close old_container" object.
		2668	if (object *closer = old_container->inv)
		2669	if (closer->type == CLOSE_CON)
		2670	closer->destroy ();
		2671	#endif
		2672
		2673	old_container->flag [FLAG_APPLIED] = 0;
		2674	container = 0;
		2675
		2676	esrv_update_item (UPD_FLAGS, this, old_container);
		2677	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
		2678	}
		2679
		2680	if (new_container)
		2681	{
		2682	if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))
		2683	return;
		2684
		2685	// TODO: this does not seem to serve any purpose anymore?
		2686	#if 0
		2687	// insert the "Close Container" object.
		2688	if (archetype *closer = new_container->other_arch)
		2689	{
		2690	object *closer = arch_to_object (new_container->other_arch);
		2691	closer->flag [FLAG_NO_MAP_SAVE] = 1;
		2692	new_container->insert (closer);
		2693	}
		2694	#endif
		2695
		2696	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));
		2697
		2698	new_container->flag [FLAG_APPLIED] = 1;
		2699	container = new_container;
		2700
		2701	esrv_update_item (UPD_FLAGS, this, new_container);
		2702	esrv_send_inventory (this, new_container);
		2703	}
		2704	}
		2705
		2706	object *
		2707	object::force_find (const shstr name)
		2708	{
		2709	/* cycle through his inventory to look for the MARK we want to
		2710	* place
		2711	*/
		2712	for (object *tmp = inv; tmp; tmp = tmp->below)
		2713	if (tmp->type == FORCE && tmp->slaying == name)
		2714	return splay (tmp);
		2715
		2716	return 0;
		2717	}
		2718
		2719	void
		2720	object::force_add (const shstr name, int duration)
		2721	{
		2722	if (object *force = force_find (name))
		2723	force->destroy ();
		2724
		2725	object *force = get_archetype (FORCE_NAME);
		2726
		2727	force->slaying = name;
		2728	force->stats.food = 1;
		2729	force->speed_left = -1.f;
		2730
		2731	force->set_speed (duration ? 1.f / duration : 0.f);
		2732	force->flag [FLAG_IS_USED_UP] = true;
		2733	force->flag [FLAG_APPLIED] = true;
		2734
		2735	insert (force);
		2736	}
		2737

Diff Legend

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