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.92 by root, Tue Dec 26 17:39:29 2006 UTC vs.
Revision 1.143 by root, Tue May 1 05:48:20 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>
…		…
36		37
37	int nrofallocobjects = 0;	38	int nrofallocobjects = 0;
38	static UUID uuid;	39	static UUID uuid;
39	const uint64 UUID_SKIP = 1<<19;	40	const uint64 UUID_SKIP = 1<<19;
40		41
41	object *active_objects; /* List of active objects that need to be processed */	42	objectvec objects;
		43	activevec actives;
42		44
43	short freearr_x[SIZEOFFREE] = { 0, 0, 1, 1, 1, 0, -1, -1, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,	45	short freearr_x[SIZEOFFREE] = { 0, 0, 1, 1, 1, 0, -1, -1, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,
44	0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1	46	0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1
45	};	47	};
46	short freearr_y[SIZEOFFREE] = { 0, -1, -1, 0, 1, 1, 1, 0, -1, -2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2,	48	short freearr_y[SIZEOFFREE] = { 0, -1, -1, 0, 1, 1, 1, 0, -1, -2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2,
…		…
190	* Check nrof variable *before* calling can_merge()	192	* Check nrof variable *before* calling can_merge()
191	*	193	*
192	* Improvements made with merge: Better checking on potion, and also	194	* Improvements made with merge: Better checking on potion, and also
193	* check weight	195	* check weight
194	*/	196	*/
195
196	bool object::can_merge_slow (object *ob1, object *ob2)	197	bool object::can_merge_slow (object *ob1, object *ob2)
197	{	198	{
198	/* A couple quicksanity checks */	199	/* A couple quicksanity checks */
199	if (ob1 == ob2	200	if (ob1 == ob2
200	|| ob1->type != ob2->type	201	|| ob1->type != ob2->type
…		…
277		278
278	/* Note sure why the following is the case - either the object has to	279	/* Note sure why the following is the case - either the object has to
279	* be animated or have a very low speed. Is this an attempted monster	280	* be animated or have a very low speed. Is this an attempted monster
280	* check?	281	* check?
281	*/	282	*/
282	if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && FABS ((ob1)->speed) > MIN_ACTIVE_SPEED)	283	if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && ob1->has_active_speed ())
283	return 0;	284	return 0;
284		285
285	switch (ob1->type)	286	switch (ob1->type)
286	{	287	{
287	case SCROLL:	288	case SCROLL:
…		…
323	sum_weight (object *op)	324	sum_weight (object *op)
324	{	325	{
325	long sum;	326	long sum;
326	object *inv;	327	object *inv;
327		328
328	for (sum = 0, inv = op->inv; inv != NULL; inv = inv->below)	329	for (sum = 0, inv = op->inv; inv; inv = inv->below)
329	{	330	{
330	if (inv->inv)	331	if (inv->inv)
331	sum_weight (inv);	332	sum_weight (inv);
		333
332	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);	334	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);
333	}	335	}
334		336
335	if (op->type == CONTAINER && op->stats.Str)	337	if (op->type == CONTAINER && op->stats.Str)
336	sum = (sum * (100 - op->stats.Str)) / 100;	338	sum = (sum * (100 - op->stats.Str)) / 100;
…		…
356	/*	358	/*
357	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.	359	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
358	* Some error messages.	360	* Some error messages.
359	* The result of the dump is stored in the static global errmsg array.	361	* The result of the dump is stored in the static global errmsg array.
360	*/	362	*/
361
362	char *	363	char *
363	dump_object (object *op)	364	dump_object (object *op)
364	{	365	{
365	if (!op)	366	if (!op)
366	return strdup ("[NULLOBJ]");	367	return strdup ("[NULLOBJ]");
367		368
368	object_freezer freezer;	369	object_freezer freezer;
369	save_object (freezer, op, 1);	370	op->write (freezer);
370	return freezer.as_string ();	371	return freezer.as_string ();
371	}	372	}
372		373
373	/*	374	/*
374	* get_nearest_part(multi-object, object 2) returns the part of the	375	* get_nearest_part(multi-object, object 2) returns the part of the
…		…
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	}
…		…
456	* refcounts and freeing the links.	455	* refcounts and freeing the links.
457	*/	456	*/
458	static void	457	static void
459	free_key_values (object *op)	458	free_key_values (object *op)
460	{	459	{
461	for (key_value *i = op->key_values; i != 0;)	460	for (key_value *i = op->key_values; i; )
462	{	461	{
463	key_value *next = i->next;	462	key_value *next = i->next;
464	delete i;	463	delete i;
465		464
466	i = next;	465	i = next;
467	}	466	}
468		467
469	op->key_values = 0;	468	op->key_values = 0;
470	}	469	}
471		470
472	/*	471	object &
473	* copy_to first frees everything allocated by the dst object,	472	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	{	473	{
483	bool is_freed = QUERY_FLAG (dst, FLAG_FREED);	474	bool is_freed = flag [FLAG_FREED];
484	bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED);	475	bool is_removed = flag [FLAG_REMOVED];
485		476
486	*(object_copy *)dst = *this;	477	*(object_copy *)this = src;
487		478
488	if (is_freed)	479	flag [FLAG_FREED] = is_freed;
489	SET_FLAG (dst, FLAG_FREED);	480	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		481
497	/* Copy over key_values, if any. */	482	/* Copy over key_values, if any. */
498	if (key_values)	483	if (src.key_values)
499	{	484	{
500	key_value *tail = 0;	485	key_value *tail = 0;
501	key_value *i;
502
503	dst->key_values = 0;	486	key_values = 0;
504		487
505	for (i = key_values; i; i = i->next)	488	for (key_value *i = src.key_values; i; i = i->next)
506	{	489	{
507	key_value *new_link = new key_value;	490	key_value *new_link = new key_value;
508		491
509	new_link->next = 0;	492	new_link->next = 0;
510	new_link->key = i->key;	493	new_link->key = i->key;
511	new_link->value = i->value;	494	new_link->value = i->value;
512		495
513	/* Try and be clever here, too. */	496	/* Try and be clever here, too. */
514	if (!dst->key_values)	497	if (!key_values)
515	{	498	{
516	dst->key_values = new_link;	499	key_values = new_link;
517	tail = new_link;	500	tail = new_link;
518	}	501	}
519	else	502	else
520	{	503	{
521	tail->next = new_link;	504	tail->next = new_link;
522	tail = new_link;	505	tail = new_link;
523	}	506	}
524	}	507	}
525	}	508	}
		509	}
		510
		511	/*
		512	* copy_to first frees everything allocated by the dst object,
		513	* and then copies the contents of itself into the second
		514	* object, allocating what needs to be allocated. Basically, any
		515	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
		516	* if the first object is freed, the pointers in the new object
		517	* will point at garbage.
		518	*/
		519	void
		520	object::copy_to (object *dst)
		521	{
		522	*dst = *this;
		523
		524	if (speed < 0)
		525	dst->speed_left = speed_left - rndm ();
526		526
527	dst->set_speed (dst->speed);	527	dst->set_speed (dst->speed);
		528	}
		529
		530	void
		531	object::instantiate ()
		532	{
		533	if (!uuid.seq) // HACK
		534	uuid = gen_uuid ();
		535
		536	speed_left = -0.1f;
		537	/* copy the body_info to the body_used - this is only really
		538	* need for monsters, but doesn't hurt to do it for everything.
		539	* by doing so, when a monster is created, it has good starting
		540	* values for the body_used info, so when items are created
		541	* for it, they can be properly equipped.
		542	*/
		543	memcpy (body_used, body_info, sizeof (body_used));
		544
		545	attachable::instantiate ();
528	}	546	}
529		547
530	object *	548	object *
531	object::clone ()	549	object::clone ()
532	{	550	{
…		…
538	/*	556	/*
539	* If an object with the IS_TURNABLE() flag needs to be turned due	557	* 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	558	* 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.	559	* be called to update the face variable, _and_ how it looks on the map.
542	*/	560	*/
543
544	void	561	void
545	update_turn_face (object *op)	562	update_turn_face (object *op)
546	{	563	{
547	if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || op->arch == NULL)	564	if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || !op->arch)
548	return;	565	return;
		566
549	SET_ANIMATION (op, op->direction);	567	SET_ANIMATION (op, op->direction);
550	update_object (op, UP_OBJ_FACE);	568	update_object (op, UP_OBJ_FACE);
551	}	569	}
552		570
553	/*	571	/*
…		…
556	* This function needs to be called whenever the speed of an object changes.	574	* This function needs to be called whenever the speed of an object changes.
557	*/	575	*/
558	void	576	void
559	object::set_speed (float speed)	577	object::set_speed (float speed)
560	{	578	{
561	extern int arch_init;
562
563	/* No reason putting the archetypes objects on the speed list,
564	* since they never really need to be updated.
565	*/
566	if (flag [FLAG_FREED] && speed)	579	if (flag [FLAG_FREED] && speed)
567	{	580	{
568	LOG (llevError, "Object %s is freed but has speed.\n", &name);	581	LOG (llevError, "Object %s is freed but has speed.\n", &name);
569	speed = 0;	582	speed = 0;
570	}	583	}
571		584
572	this->speed = speed;	585	this->speed = speed;
573		586
574	if (arch_init)	587	if (has_active_speed ())
575	return;	588	activate ();
576
577	if (FABS (speed) > MIN_ACTIVE_SPEED)
578	{
579	/* If already on active list, don't do anything */
580	if (active_next || active_prev || this == active_objects)
581	return;
582
583	/* process_events() expects us to insert the object at the beginning
584	* of the list. */
585	active_next = active_objects;
586
587	if (active_next)
588	active_next->active_prev = this;
589
590	active_objects = this;
591	}
592	else	589	else
593	{	590	deactivate ();
594	/* If not on the active list, nothing needs to be done */
595	if (!active_next && !active_prev && this != active_objects)
596	return;
597
598	if (!active_prev)
599	{
600	active_objects = active_next;
601
602	if (active_next)
603	active_next->active_prev = 0;
604	}
605	else
606	{
607	active_prev->active_next = active_next;
608
609	if (active_next)
610	active_next->active_prev = active_prev;
611	}
612
613	active_next = 0;
614	active_prev = 0;
615	}
616	}
617
618	/* This function removes object 'op' from the list of active
619	* objects.
620	* This should only be used for style maps or other such
621	* reference maps where you don't want an object that isn't
622	* in play chewing up cpu time getting processed.
623	* The reverse of this is to call update_ob_speed, which
624	* will do the right thing based on the speed of the object.
625	*/
626	void
627	remove_from_active_list (object *op)
628	{
629	/* If not on the active list, nothing needs to be done */
630	if (!op->active_next && !op->active_prev && op != active_objects)
631	return;
632
633	if (op->active_prev == NULL)
634	{
635	active_objects = op->active_next;
636	if (op->active_next != NULL)
637	op->active_next->active_prev = NULL;
638	}
639	else
640	{
641	op->active_prev->active_next = op->active_next;
642	if (op->active_next)
643	op->active_next->active_prev = op->active_prev;
644	}
645	op->active_next = NULL;
646	op->active_prev = NULL;
647	}	591	}
648		592
649	/*	593	/*
650	* update_object() updates the the map.	594	* update_object() updates the the map.
651	* It takes into account invisible objects (and represent squares covered	595	* It takes into account invisible objects (and represent squares covered
…		…
664	* UP_OBJ_FACE: only the objects face has changed.	608	* UP_OBJ_FACE: only the objects face has changed.
665	*/	609	*/
666	void	610	void
667	update_object (object *op, int action)	611	update_object (object *op, int action)
668	{	612	{
669	MoveType move_on, move_off, move_block, move_slow;
670
671	if (op == NULL)	613	if (op == NULL)
672	{	614	{
673	/* this should never happen */	615	/* this should never happen */
674	LOG (llevDebug, "update_object() called for NULL object.\n");	616	LOG (llevDebug, "update_object() called for NULL object.\n");
675	return;	617	return;
…		…
699	return;	641	return;
700	}	642	}
701		643
702	mapspace &m = op->ms ();	644	mapspace &m = op->ms ();
703		645
704	if (m.flags_ & P_NEED_UPDATE)	646	if (!(m.flags_ & P_UPTODATE))
705	/* nop */;	647	/* nop */;
706	else if (action == UP_OBJ_INSERT)	648	else if (action == UP_OBJ_INSERT)
707	{	649	{
708	// this is likely overkill, TODO: revisit (schmorp)	650	// this is likely overkill, TODO: revisit (schmorp)
709	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))	651	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
…		…
718	/* This isn't perfect, but I don't expect a lot of objects to	660	/* This isn't perfect, but I don't expect a lot of objects to
719	* to have move_allow right now.	661	* to have move_allow right now.
720	*/	662	*/
721	|| ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block	663	|| ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block
722	|| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)	664	|| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)
723	m.flags_ = P_NEED_UPDATE;	665	m.flags_ = 0;
724	}	666	}
725	/* if the object is being removed, we can't make intelligent	667	/* if the object is being removed, we can't make intelligent
726	* decisions, because remove_ob can't really pass the object	668	* decisions, because remove_ob can't really pass the object
727	* that is being removed.	669	* that is being removed.
728	*/	670	*/
729	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)	671	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
730	m.flags_ = P_NEED_UPDATE;	672	m.flags_ = 0;
731	else if (action == UP_OBJ_FACE)	673	else if (action == UP_OBJ_FACE)
732	/* Nothing to do for that case */ ;	674	/* Nothing to do for that case */ ;
733	else	675	else
734	LOG (llevError, "update_object called with invalid action: %d\n", action);	676	LOG (llevError, "update_object called with invalid action: %d\n", action);
735		677
736	if (op->more)	678	if (op->more)
737	update_object (op->more, action);	679	update_object (op->more, action);
738	}	680	}
739		681
740	object::vector object::objects; // not yet used
741	object *object::first;
742
743	object::object ()	682	object::object ()
744	{	683	{
745	SET_FLAG (this, FLAG_REMOVED);	684	SET_FLAG (this, FLAG_REMOVED);
746		685
747	expmul = 1.0;	686	expmul = 1.0;
748	face = blank_face;	687	face = blank_face;
749	}	688	}
750		689
751	object::~object ()	690	object::~object ()
752	{	691	{
		692	unlink ();
		693
753	free_key_values (this);	694	free_key_values (this);
754	}	695	}
755		696
		697	static int object_count;
		698
756	void object::link ()	699	void object::link ()
757	{	700	{
758	count = ++ob_count;	701	assert (!index);//D
759	uuid = gen_uuid ();	702	uuid = gen_uuid ();
		703	count = ++object_count;
760		704
761	prev = 0;	705	refcnt_inc ();
762	next = object::first;	706	objects.insert (this);
763
764	if (object::first)
765	object::first->prev = this;
766
767	object::first = this;
768	}	707	}
769		708
770	void object::unlink ()	709	void object::unlink ()
771	{	710	{
772	if (this == object::first)	711	if (!index)
773	object::first = next;	712	return;
774		713
775	/* Remove this object from the list of used objects */	714	objects.erase (this);
776	if (prev) prev->next = next;	715	refcnt_dec ();
777	if (next) next->prev = prev;	716	}
778		717
779	prev = 0;	718	void
780	next = 0;	719	object::activate ()
		720	{
		721	/* If already on active list, don't do anything */
		722	if (active)
		723	return;
		724
		725	if (has_active_speed ())
		726	actives.insert (this);
		727	}
		728
		729	void
		730	object::activate_recursive ()
		731	{
		732	activate ();
		733
		734	for (object *op = inv; op; op = op->below)
		735	op->activate_recursive ();
		736	}
		737
		738	/* This function removes object 'op' from the list of active
		739	* objects.
		740	* This should only be used for style maps or other such
		741	* reference maps where you don't want an object that isn't
		742	* in play chewing up cpu time getting processed.
		743	* The reverse of this is to call update_ob_speed, which
		744	* will do the right thing based on the speed of the object.
		745	*/
		746	void
		747	object::deactivate ()
		748	{
		749	/* If not on the active list, nothing needs to be done */
		750	if (!active)
		751	return;
		752
		753	actives.erase (this);
		754	}
		755
		756	void
		757	object::deactivate_recursive ()
		758	{
		759	for (object *op = inv; op; op = op->below)
		760	op->deactivate_recursive ();
		761
		762	deactivate ();
		763	}
		764
		765	void
		766	object::set_flag_inv (int flag, int value)
		767	{
		768	for (object *op = inv; op; op = op->below)
		769	{
		770	op->flag [flag] = value;
		771	op->set_flag_inv (flag, value);
		772	}
781	}	773	}
782		774
783	/*	775	/*
784	* Remove and free all objects in the inventory of the given object.	776	* Remove and free all objects in the inventory of the given object.
785	* object.c ?	777	* object.c ?
786	*/	778	*/
787	void	779	void
788	object::destroy_inv (bool drop_to_ground)	780	object::destroy_inv (bool drop_to_ground)
789	{	781	{
		782	// need to check first, because the checks below might segfault
		783	// as we might be on an invalid mapspace and crossfire code
		784	// is too buggy to ensure that the inventory is empty.
		785	// corollary: if you create arrows etc. with stuff in tis inventory,
		786	// cf will crash below with off-map x and y
		787	if (!inv)
		788	return;
		789
790	/* Only if the space blocks everything do we not process -	790	/* Only if the space blocks everything do we not process -
791	* if some form of movement is allowed, let objects	791	* if some form of movement is allowed, let objects
792	* drop on that space.	792	* drop on that space.
793	*/	793	*/
794	if (!drop_to_ground	794	if (!drop_to_ground
795	|| !map	795	|| !map
796	|| map->in_memory != MAP_IN_MEMORY	796	|| map->in_memory != MAP_IN_MEMORY
		797	|| map->nodrop
797	|| map->at (x, y).move_block == MOVE_ALL)	798	|| ms ().move_block == MOVE_ALL)
798	{	799	{
799	while (inv)	800	while (inv)
800	{	801	{
801	inv->destroy_inv (drop_to_ground);	802	inv->destroy_inv (drop_to_ground);
802	inv->destroy ();	803	inv->destroy ();
…		…
810		811
811	if (op->flag [FLAG_STARTEQUIP]	812	if (op->flag [FLAG_STARTEQUIP]
812	|| op->flag [FLAG_NO_DROP]	813	|| op->flag [FLAG_NO_DROP]
813	|| op->type == RUNE	814	|| op->type == RUNE
814	|| op->type == TRAP	815	|| op->type == TRAP
815	|| op->flag [FLAG_IS_A_TEMPLATE])	816	|| op->flag [FLAG_IS_A_TEMPLATE]
		817	|| op->flag [FLAG_DESTROY_ON_DEATH])
816	op->destroy ();	818	op->destroy ();
817	else	819	else
818	{	820	map->insert (op, x, y);
819	op->remove ();
820	op->x = x;
821	op->y = y;
822	insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */
823	}
824	}	821	}
825	}	822	}
826	}	823	}
827		824
828	object *object::create ()	825	object *object::create ()
…		…
833	}	830	}
834		831
835	void	832	void
836	object::do_destroy ()	833	object::do_destroy ()
837	{	834	{
		835	attachable::do_destroy ();
		836
838	if (flag [FLAG_IS_LINKED])	837	if (flag [FLAG_IS_LINKED])
839	remove_button_link (this);	838	remove_button_link (this);
840		839
841	if (flag [FLAG_FRIENDLY])	840	if (flag [FLAG_FRIENDLY])
842	remove_friendly_object (this);	841	remove_friendly_object (this);
843		842
844	if (!flag [FLAG_REMOVED])	843	if (!flag [FLAG_REMOVED])
845	remove ();	844	remove ();
846		845
847	if (flag [FLAG_FREED])	846	destroy_inv (true);
848	return;
849		847
850	set_speed (0);	848	deactivate ();
		849	unlink ();
851		850
852	flag [FLAG_FREED] = 1;	851	flag [FLAG_FREED] = 1;
853
854	attachable::do_destroy ();
855
856	destroy_inv (true);
857	unlink ();
858		852
859	// hack to ensure that freed objects still have a valid map	853	// hack to ensure that freed objects still have a valid map
860	{	854	{
861	static maptile *freed_map; // freed objects are moved here to avoid crashes	855	static maptile *freed_map; // freed objects are moved here to avoid crashes
862		856
…		…
866		860
867	freed_map->name = "/internal/freed_objects_map";	861	freed_map->name = "/internal/freed_objects_map";
868	freed_map->width = 3;	862	freed_map->width = 3;
869	freed_map->height = 3;	863	freed_map->height = 3;
870		864
871	freed_map->allocate ();	865	freed_map->alloc ();
		866	freed_map->in_memory = MAP_IN_MEMORY;
872	}	867	}
873		868
874	map = freed_map;	869	map = freed_map;
875	x = 1;	870	x = 1;
876	y = 1;	871	y = 1;
…		…
886		881
887	// clear those pointers that likely might have circular references to us	882	// clear those pointers that likely might have circular references to us
888	owner = 0;	883	owner = 0;
889	enemy = 0;	884	enemy = 0;
890	attacked_by = 0;	885	attacked_by = 0;
891
892	// only relevant for players(?), but make sure of it anyways
893	contr = 0;
894	}	886	}
895		887
896	void	888	void
897	object::destroy (bool destroy_inventory)	889	object::destroy (bool destroy_inventory)
898	{	890	{
…		…
926	* This function removes the object op from the linked list of objects	918	* This function removes the object op from the linked list of objects
927	* which it is currently tied to. When this function is done, the	919	* which it is currently tied to. When this function is done, the
928	* object will have no environment. If the object previously had an	920	* object will have no environment. If the object previously had an
929	* environment, the x and y coordinates will be updated to	921	* environment, the x and y coordinates will be updated to
930	* the previous environment.	922	* the previous environment.
931	* Beware: This function is called from the editor as well!
932	*/	923	*/
933	void	924	void
934	object::remove ()	925	object::do_remove ()
935	{	926	{
936	object *tmp, *last = 0;	927	object *tmp, *last = 0;
937	object *otmp;	928	object *otmp;
938		929
939	if (QUERY_FLAG (this, FLAG_REMOVED))	930	if (QUERY_FLAG (this, FLAG_REMOVED))
…		…
961	* to save cpu time.	952	* to save cpu time.
962	*/	953	*/
963	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	954	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
964	otmp->update_stats ();	955	otmp->update_stats ();
965		956
966	if (above != NULL)	957	if (above)
967	above->below = below;	958	above->below = below;
968	else	959	else
969	env->inv = below;	960	env->inv = below;
970		961
971	if (below != NULL)	962	if (below)
972	below->above = above;	963	below->above = above;
973		964
974	/* we set up values so that it could be inserted into	965	/* we set up values so that it could be inserted into
975	* the map, but we don't actually do that - it is up	966	* the map, but we don't actually do that - it is up
976	* to the caller to decide what we want to do.	967	* to the caller to decide what we want to do.
…		…
980	above = 0, below = 0;	971	above = 0, below = 0;
981	env = 0;	972	env = 0;
982	}	973	}
983	else if (map)	974	else if (map)
984	{	975	{
985	/* Re did the following section of code - it looks like it had	976	if (type == PLAYER)
986	* lots of logic for things we no longer care about
987	*/	977	{
		978	// leaving a spot always closes any open container on the ground
		979	if (container && !container->env)
		980	// this causes spurious floorbox updates, but it ensures
		981	// that the CLOSE event is being sent.
		982	close_container ();
		983
		984	--map->players;
		985	map->touch ();
		986	}
		987
		988	map->dirty = true;
		989	mapspace &ms = this->ms ();
988		990
989	/* link the object above us */	991	/* link the object above us */
990	if (above)	992	if (above)
991	above->below = below;	993	above->below = below;
992	else	994	else
993	map->at (x, y).top = below; /* we were top, set new top */	995	ms.top = below; /* we were top, set new top */
994		996
995	/* Relink the object below us, if there is one */	997	/* Relink the object below us, if there is one */
996	if (below)	998	if (below)
997	below->above = above;	999	below->above = above;
998	else	1000	else
…		…
1000	/* Nothing below, which means we need to relink map object for this space	1002	/* Nothing below, which means we need to relink map object for this space
1001	* use translated coordinates in case some oddness with map tiling is	1003	* use translated coordinates in case some oddness with map tiling is
1002	* evident	1004	* evident
1003	*/	1005	*/
1004	if (GET_MAP_OB (map, x, y) != this)	1006	if (GET_MAP_OB (map, x, y) != this)
1005	{
1006	char *dump = dump_object (this);
1007	LOG (llevError,
1008	"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);	1007	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 ());
1009	free (dump);
1010	dump = dump_object (GET_MAP_OB (map, x, y));
1011	LOG (llevError, "%s\n", dump);
1012	free (dump);
1013	}
1014		1008
1015	map->at (x, y).bot = above; /* goes on above it. */	1009	ms.bot = above; /* goes on above it. */
1016	}	1010	}
1017		1011
1018	above = 0;	1012	above = 0;
1019	below = 0;	1013	below = 0;
1020		1014
1021	if (map->in_memory == MAP_SAVING)	1015	if (map->in_memory == MAP_SAVING)
1022	return;	1016	return;
1023		1017
1024	int check_walk_off = !flag [FLAG_NO_APPLY];	1018	int check_walk_off = !flag [FLAG_NO_APPLY];
1025		1019
1026	for (tmp = map->at (x, y).bot; tmp; tmp = tmp->above)	1020	for (tmp = ms.bot; tmp; tmp = tmp->above)
1027	{	1021	{
1028	/* No point updating the players look faces if he is the object	1022	/* No point updating the players look faces if he is the object
1029	* being removed.	1023	* being removed.
1030	*/	1024	*/
1031		1025
…		…
1043		1037
1044	if (tmp->contr->ns)	1038	if (tmp->contr->ns)
1045	tmp->contr->ns->floorbox_update ();	1039	tmp->contr->ns->floorbox_update ();
1046	}	1040	}
1047		1041
1048	/* See if player moving off should effect something */	1042	/* See if object moving off should effect something */
1049	if (check_walk_off	1043	if (check_walk_off
1050	&& ((move_type & tmp->move_off)	1044	&& ((move_type & tmp->move_off)
1051	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))	1045	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1052	{	1046	{
1053	move_apply (tmp, this, 0);	1047	move_apply (tmp, this, 0);
…		…
1055	if (destroyed ())	1049	if (destroyed ())
1056	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());	1050	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1057	}	1051	}
1058		1052
1059	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */	1053	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1060		1054	//TODO: why is this horrible hacka fix? get rid of this code=bug! (schmorp)
1061	if (tmp->above == tmp)	1055	if (tmp->above == tmp)
1062	tmp->above = 0;	1056	tmp->above = 0;
1063		1057
1064	last = tmp;	1058	last = tmp;
1065	}	1059	}
1066		1060
1067	/* last == NULL of there are no objects on this space */	1061	/* last == NULL if there are no objects on this space */
		1062	//TODO: this makes little sense, why only update the topmost object?
1068	if (!last)	1063	if (!last)
1069	map->at (x, y).flags_ = P_NEED_UPDATE;	1064	map->at (x, y).flags_ = 0;
1070	else	1065	else
1071	update_object (last, UP_OBJ_REMOVE);	1066	update_object (last, UP_OBJ_REMOVE);
1072		1067
1073	if (flag [FLAG_BLOCKSVIEW] || glow_radius)	1068	if (flag [FLAG_BLOCKSVIEW] || glow_radius)
1074	update_all_los (map, x, y);	1069	update_all_los (map, x, y);
…		…
1110	}	1105	}
1111		1106
1112	return 0;	1107	return 0;
1113	}	1108	}
1114		1109
		1110	void
		1111	object::expand_tail ()
		1112	{
		1113	if (more)
		1114	return;
		1115
		1116	object *prev = this;
		1117
		1118	for (archetype *at = arch->more; at; at = at->more)
		1119	{
		1120	object *op = arch_to_object (at);
		1121
		1122	op->name = name;
		1123	op->name_pl = name_pl;
		1124	op->title = title;
		1125
		1126	op->head = this;
		1127	prev->more = op;
		1128
		1129	prev = op;
		1130	}
		1131	}
		1132
1115	/*	1133	/*
1116	* same as insert_ob_in_map except it handle separate coordinates and do a clean	1134	* same as insert_ob_in_map except it handles separate coordinates and does a clean
1117	* job preparing multi-part monsters	1135	* job preparing multi-part monsters.
1118	*/	1136	*/
1119	object *	1137	object *
1120	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)	1138	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1121	{	1139	{
1122	object *tmp;
1123
1124	if (op->head)
1125	op = op->head;
1126
1127	for (tmp = op; tmp; tmp = tmp->more)	1140	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1128	{	1141	{
1129	tmp->x = x + tmp->arch->clone.x;	1142	tmp->x = x + tmp->arch->clone.x;
1130	tmp->y = y + tmp->arch->clone.y;	1143	tmp->y = y + tmp->arch->clone.y;
1131	}	1144	}
1132		1145
…		…
1154	* just 'op' otherwise	1167	* just 'op' otherwise
1155	*/	1168	*/
1156	object *	1169	object *
1157	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)	1170	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1158	{	1171	{
		1172	assert (!op->flag [FLAG_FREED]);
		1173
1159	object *tmp, *top, *floor = NULL;	1174	object *tmp, *top, *floor = NULL;
1160	sint16 x, y;
1161		1175
1162	if (QUERY_FLAG (op, FLAG_FREED))	1176	op->remove ();
1163	{
1164	LOG (llevError, "Trying to insert freed object!\n");
1165	return NULL;
1166	}
1167		1177
1168	if (m == NULL)	1178	#if 0
1169	{	1179	if (!m->active != !op->active)
1170	char *dump = dump_object (op);	1180	if (m->active)
1171	LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);	1181	op->activate_recursive ();
1172	free (dump);	1182	else
1173	return op;	1183	op->deactivate_recursive ();
1174	}	1184	#endif
1175		1185
1176	if (out_of_map (m, op->x, op->y))	1186	if (out_of_map (m, op->x, op->y))
1177	{	1187	{
1178	char *dump = dump_object (op);
1179	LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump);	1188	LOG (llevError, "Trying to insert object outside the map.\n%s\n", op->debug_desc ());
1180	#ifdef MANY_CORES	1189	#ifdef MANY_CORES
1181	/* Better to catch this here, as otherwise the next use of this object	1190	/* Better to catch this here, as otherwise the next use of this object
1182	* is likely to cause a crash. Better to find out where it is getting	1191	* is likely to cause a crash. Better to find out where it is getting
1183	* improperly inserted.	1192	* improperly inserted.
1184	*/	1193	*/
1185	abort ();	1194	abort ();
1186	#endif	1195	#endif
1187	free (dump);
1188	return op;	1196	return op;
1189	}	1197	}
1190		1198
1191	if (!QUERY_FLAG (op, FLAG_REMOVED))
1192	{
1193	char *dump = dump_object (op);
1194	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
1195	free (dump);
1196	return op;
1197	}
1198
1199	if (op->more)
1200	{
1201	/* The part may be on a different map. */
1202
1203	object *more = op->more;	1199	if (object *more = op->more)
1204		1200	{
1205	/* We really need the caller to normalize coordinates - if
1206	* we set the map, that doesn't work if the location is within
1207	* a map and this is straddling an edge. So only if coordinate
1208	* is clear wrong do we normalize it.
1209	*/
1210	if (OUT_OF_REAL_MAP (more->map, more->x, more->y))
1211	more->map = get_map_from_coord (m, &more->x, &more->y);
1212	else if (!more->map)
1213	{
1214	/* For backwards compatibility - when not dealing with tiled maps,
1215	* more->map should always point to the parent.
1216	*/
1217	more->map = m;
1218	}
1219
1220	if (insert_ob_in_map (more, more->map, originator, flag) == NULL)	1201	if (!insert_ob_in_map (more, m, originator, flag))
1221	{	1202	{
1222	if (!op->head)	1203	if (!op->head)
1223	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");	1204	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1224		1205
1225	return 0;	1206	return 0;
…		…
1230		1211
1231	/* Ideally, the caller figures this out. However, it complicates a lot	1212	/* Ideally, the caller figures this out. However, it complicates a lot
1232	* of areas of callers (eg, anything that uses find_free_spot would now	1213	* of areas of callers (eg, anything that uses find_free_spot would now
1233	* need extra work	1214	* need extra work
1234	*/	1215	*/
1235	op->map = get_map_from_coord (m, &op->x, &op->y);	1216	if (!xy_normalise (m, op->x, op->y))
1236	x = op->x;	1217	return 0;
1237	y = op->y;	1218
		1219	op->map = m;
		1220	mapspace &ms = op->ms ();
1238		1221
1239	/* this has to be done after we translate the coordinates.	1222	/* this has to be done after we translate the coordinates.
1240	*/	1223	*/
1241	if (op->nrof && !(flag & INS_NO_MERGE))	1224	if (op->nrof && !(flag & INS_NO_MERGE))
1242	for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)	1225	for (tmp = ms.bot; tmp; tmp = tmp->above)
1243	if (object::can_merge (op, tmp))	1226	if (object::can_merge (op, tmp))
1244	{	1227	{
1245	op->nrof += tmp->nrof;	1228	op->nrof += tmp->nrof;
1246	tmp->destroy ();	1229	tmp->destroy ();
1247	}	1230	}
…		…
1264	op->below = originator->below;	1247	op->below = originator->below;
1265		1248
1266	if (op->below)	1249	if (op->below)
1267	op->below->above = op;	1250	op->below->above = op;
1268	else	1251	else
1269	op->ms ().bot = op;	1252	ms.bot = op;
1270		1253
1271	/* since *below* originator, no need to update top */	1254	/* since *below* originator, no need to update top */
1272	originator->below = op;	1255	originator->below = op;
1273	}	1256	}
1274	else	1257	else
1275	{	1258	{
		1259	top = ms.bot;
		1260
1276	/* If there are other objects, then */	1261	/* If there are other objects, then */
1277	if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL))	1262	if ((!(flag & INS_MAP_LOAD)) && top)
1278	{	1263	{
1279	object *last = NULL;	1264	object *last = 0;
1280		1265
1281	/*	1266	/*
1282	* If there are multiple objects on this space, we do some trickier handling.	1267	* If there are multiple objects on this space, we do some trickier handling.
1283	* We've already dealt with merging if appropriate.	1268	* We've already dealt with merging if appropriate.
1284	* Generally, we want to put the new object on top. But if	1269	* Generally, we want to put the new object on top. But if
…		…
1288	* once we get to them. This reduces the need to traverse over all of	1273	* once we get to them. This reduces the need to traverse over all of
1289	* them when adding another one - this saves quite a bit of cpu time	1274	* them when adding another one - this saves quite a bit of cpu time
1290	* when lots of spells are cast in one area. Currently, it is presumed	1275	* when lots of spells are cast in one area. Currently, it is presumed
1291	* that flying non pickable objects are spell objects.	1276	* that flying non pickable objects are spell objects.
1292	*/	1277	*/
1293		1278	for (top = ms.bot; top; top = top->above)
1294	while (top != NULL)
1295	{	1279	{
1296	if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))	1280	if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))
1297	floor = top;	1281	floor = top;
1298		1282
1299	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))	1283	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))
…		…
1302	top = top->below;	1286	top = top->below;
1303	break;	1287	break;
1304	}	1288	}
1305		1289
1306	last = top;	1290	last = top;
1307	top = top->above;
1308	}	1291	}
1309		1292
1310	/* Don't want top to be NULL, so set it to the last valid object */	1293	/* Don't want top to be NULL, so set it to the last valid object */
1311	top = last;	1294	top = last;
1312		1295
…		…
1314	* looks like instead of lots of conditions here.	1297	* looks like instead of lots of conditions here.
1315	* makes things faster, and effectively the same result.	1298	* makes things faster, and effectively the same result.
1316	*/	1299	*/
1317		1300
1318	/* Have object 'fall below' other objects that block view.	1301	/* Have object 'fall below' other objects that block view.
1319	* Unless those objects are exits, type 66	1302	* Unless those objects are exits.
1320	* If INS_ON_TOP is used, don't do this processing	1303	* If INS_ON_TOP is used, don't do this processing
1321	* Need to find the object that in fact blocks view, otherwise	1304	* Need to find the object that in fact blocks view, otherwise
1322	* stacking is a bit odd.	1305	* stacking is a bit odd.
1323	*/	1306	*/
1324	if (!(flag & INS_ON_TOP) &&	1307	if (!(flag & INS_ON_TOP)
1325	(get_map_flags (op->map, 0, op->x, op->y, 0, 0) & P_BLOCKSVIEW) && (op->face && !op->face->visibility))	1308	&& ms.flags () & P_BLOCKSVIEW
		1309	&& (op->face && !faces [op->face].visibility))
1326	{	1310	{
1327	for (last = top; last != floor; last = last->below)	1311	for (last = top; last != floor; last = last->below)
1328	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1312	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1329	break;	1313	break;
		1314
1330	/* Check to see if we found the object that blocks view,	1315	/* Check to see if we found the object that blocks view,
1331	* and make sure we have a below pointer for it so that	1316	* and make sure we have a below pointer for it so that
1332	* we can get inserted below this one, which requires we	1317	* we can get inserted below this one, which requires we
1333	* set top to the object below us.	1318	* set top to the object below us.
1334	*/	1319	*/
…		…
1336	top = last->below;	1321	top = last->below;
1337	}	1322	}
1338	} /* If objects on this space */	1323	} /* If objects on this space */
1339		1324
1340	if (flag & INS_MAP_LOAD)	1325	if (flag & INS_MAP_LOAD)
1341	top = GET_MAP_TOP (op->map, op->x, op->y);	1326	top = ms.top;
1342		1327
1343	if (flag & INS_ABOVE_FLOOR_ONLY)	1328	if (flag & INS_ABOVE_FLOOR_ONLY)
1344	top = floor;	1329	top = floor;
1345		1330
1346	/* Top is the object that our object (op) is going to get inserted above.	1331	/* Top is the object that our object (op) is going to get inserted above.
1347	*/	1332	*/
1348		1333
1349	/* First object on this space */	1334	/* First object on this space */
1350	if (!top)	1335	if (!top)
1351	{	1336	{
1352	op->above = GET_MAP_OB (op->map, op->x, op->y);	1337	op->above = ms.bot;
1353		1338
1354	if (op->above)	1339	if (op->above)
1355	op->above->below = op;	1340	op->above->below = op;
1356		1341
1357	op->below = NULL;	1342	op->below = 0;
1358	op->ms ().bot = op;	1343	ms.bot = op;
1359	}	1344	}
1360	else	1345	else
1361	{ /* get inserted into the stack above top */	1346	{ /* get inserted into the stack above top */
1362	op->above = top->above;	1347	op->above = top->above;
1363		1348
…		…
1366		1351
1367	op->below = top;	1352	op->below = top;
1368	top->above = op;	1353	top->above = op;
1369	}	1354	}
1370		1355
1371	if (op->above == NULL)	1356	if (!op->above)
1372	op->ms ().top = op;	1357	ms.top = op;
1373	} /* else not INS_BELOW_ORIGINATOR */	1358	} /* else not INS_BELOW_ORIGINATOR */
1374		1359
1375	if (op->type == PLAYER)	1360	if (op->type == PLAYER)
		1361	{
1376	op->contr->do_los = 1;	1362	op->contr->do_los = 1;
		1363	++op->map->players;
		1364	op->map->touch ();
		1365	}
		1366
		1367	op->map->dirty = true;
1377		1368
1378	/* If we have a floor, we know the player, if any, will be above	1369	/* If we have a floor, we know the player, if any, will be above
1379	* it, so save a few ticks and start from there.	1370	* it, so save a few ticks and start from there.
1380	*/	1371	*/
1381	if (!(flag & INS_MAP_LOAD))	1372	if (!(flag & INS_MAP_LOAD))
1382	if (object *pl = op->ms ().player ())	1373	if (object *pl = ms.player ())
1383	if (pl->contr->ns)	1374	if (pl->contr->ns)
1384	pl->contr->ns->floorbox_update ();	1375	pl->contr->ns->floorbox_update ();
1385		1376
1386	/* If this object glows, it may affect lighting conditions that are	1377	/* If this object glows, it may affect lighting conditions that are
1387	* visible to others on this map. But update_all_los is really	1378	* visible to others on this map. But update_all_los is really
1388	* an inefficient way to do this, as it means los for all players	1379	* an inefficient way to do this, as it means los for all players
1389	* on the map will get recalculated. The players could very well	1380	* on the map will get recalculated. The players could very well
1390	* be far away from this change and not affected in any way -	1381	* be far away from this change and not affected in any way -
1391	* this should get redone to only look for players within range,	1382	* this should get redone to only look for players within range,
1392	* or just updating the P_NEED_UPDATE for spaces within this area	1383	* or just updating the P_UPTODATE for spaces within this area
1393	* of effect may be sufficient.	1384	* of effect may be sufficient.
1394	*/	1385	*/
1395	if (op->map->darkness && (op->glow_radius != 0))	1386	if (op->map->darkness && (op->glow_radius != 0))
1396	update_all_los (op->map, op->x, op->y);	1387	update_all_los (op->map, op->x, op->y);
1397		1388
…		…
1435	{	1426	{
1436	object *tmp, *tmp1;	1427	object *tmp, *tmp1;
1437		1428
1438	/* first search for itself and remove any old instances */	1429	/* first search for itself and remove any old instances */
1439		1430
1440	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1431	for (tmp = op->ms ().bot; tmp; tmp = tmp->above)
1441	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */	1432	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */
1442	tmp->destroy ();	1433	tmp->destroy ();
1443		1434
1444	tmp1 = arch_to_object (archetype::find (arch_string));	1435	tmp1 = arch_to_object (archetype::find (arch_string));
1445		1436
1446	tmp1->x = op->x;	1437	tmp1->x = op->x;
1447	tmp1->y = op->y;	1438	tmp1->y = op->y;
1448	insert_ob_in_map (tmp1, op->map, op, 0);	1439	insert_ob_in_map (tmp1, op->map, op, 0);
		1440	}
		1441
		1442	object *
		1443	object::insert_at (object *where, object *originator, int flags)
		1444	{
		1445	return where->map->insert (this, where->x, where->y, originator, flags);
1449	}	1446	}
1450		1447
1451	/*	1448	/*
1452	* get_split_ob(ob,nr) splits up ob into two parts. The part which	1449	* get_split_ob(ob,nr) splits up ob into two parts. The part which
1453	* is returned contains nr objects, and the remaining parts contains	1450	* is returned contains nr objects, and the remaining parts contains
1454	* the rest (or is removed and freed if that number is 0).	1451	* the rest (or is removed and freed if that number is 0).
1455	* On failure, NULL is returned, and the reason put into the	1452	* On failure, NULL is returned, and the reason put into the
1456	* global static errmsg array.	1453	* global static errmsg array.
1457	*/	1454	*/
1458
1459	object *	1455	object *
1460	get_split_ob (object *orig_ob, uint32 nr)	1456	get_split_ob (object *orig_ob, uint32 nr)
1461	{	1457	{
1462	object *newob;	1458	object *newob;
1463	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);	1459	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
…		…
1494	* the amount of an object. If the amount reaches 0, the object	1490	* the amount of an object. If the amount reaches 0, the object
1495	* is subsequently removed and freed.	1491	* is subsequently removed and freed.
1496	*	1492	*
1497	* Return value: 'op' if something is left, NULL if the amount reached 0	1493	* Return value: 'op' if something is left, NULL if the amount reached 0
1498	*/	1494	*/
1499
1500	object *	1495	object *
1501	decrease_ob_nr (object *op, uint32 i)	1496	decrease_ob_nr (object *op, uint32 i)
1502	{	1497	{
1503	object *tmp;	1498	object *tmp;
1504		1499
…		…
1579		1574
1580	/*	1575	/*
1581	* add_weight(object, weight) adds the specified weight to an object,	1576	* add_weight(object, weight) adds the specified weight to an object,
1582	* and also updates how much the environment(s) is/are carrying.	1577	* and also updates how much the environment(s) is/are carrying.
1583	*/	1578	*/
1584
1585	void	1579	void
1586	add_weight (object *op, signed long weight)	1580	add_weight (object *op, signed long weight)
1587	{	1581	{
1588	while (op != NULL)	1582	while (op != NULL)
1589	{	1583	{
…		…
1621	* inside the object environment.	1615	* inside the object environment.
1622	*	1616	*
1623	* The function returns now pointer to inserted item, and return value can	1617	* The function returns now pointer to inserted item, and return value can
1624	* be != op, if items are merged. -Tero	1618	* be != op, if items are merged. -Tero
1625	*/	1619	*/
1626
1627	object *	1620	object *
1628	object::insert (object *op)	1621	object::insert (object *op)
1629	{	1622	{
1630	object *tmp, *otmp;	1623	object *tmp, *otmp;
1631		1624
…		…
1727	*	1720	*
1728	* MSW 2001-07-08: Check all objects on space, not just those below	1721	* MSW 2001-07-08: Check all objects on space, not just those below
1729	* object being inserted. insert_ob_in_map may not put new objects	1722	* object being inserted. insert_ob_in_map may not put new objects
1730	* on top.	1723	* on top.
1731	*/	1724	*/
1732
1733	int	1725	int
1734	check_move_on (object *op, object *originator)	1726	check_move_on (object *op, object *originator)
1735	{	1727	{
1736	object *tmp;	1728	object *tmp;
1737	maptile *m = op->map;	1729	maptile *m = op->map;
…		…
1764		1756
1765	/* The objects have to be checked from top to bottom.	1757	/* The objects have to be checked from top to bottom.
1766	* Hence, we first go to the top:	1758	* Hence, we first go to the top:
1767	*/	1759	*/
1768		1760
1769	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp && tmp->above; tmp = tmp->above)	1761	for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above)
1770	{	1762	{
1771	/* Trim the search when we find the first other spell effect	1763	/* Trim the search when we find the first other spell effect
1772	* this helps performance so that if a space has 50 spell objects,	1764	* this helps performance so that if a space has 50 spell objects,
1773	* we don't need to check all of them.	1765	* we don't need to check all of them.
1774	*/	1766	*/
…		…
1792	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||	1784	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
1793	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))	1785	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1794	{	1786	{
1795		1787
1796	float	1788	float
1797	diff = tmp->move_slow_penalty * FABS (op->speed);	1789	diff = tmp->move_slow_penalty * fabs (op->speed);
1798		1790
1799	if (op->type == PLAYER)	1791	if (op->type == PLAYER)
1800	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||	1792	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||
1801	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))	1793	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))
1802	diff /= 4.0;	1794	diff /= 4.0;
…		…
1832	* The first matching object is returned, or NULL if none.	1824	* The first matching object is returned, or NULL if none.
1833	*/	1825	*/
1834	object *	1826	object *
1835	present_arch (const archetype *at, maptile *m, int x, int y)	1827	present_arch (const archetype *at, maptile *m, int x, int y)
1836	{	1828	{
1837	if (m == NULL || out_of_map (m, x, y))	1829	if (!m || out_of_map (m, x, y))
1838	{	1830	{
1839	LOG (llevError, "Present_arch called outside map.\n");	1831	LOG (llevError, "Present_arch called outside map.\n");
1840	return NULL;	1832	return NULL;
1841	}	1833	}
1842		1834
1843	for (object *tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1835	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1844	if (tmp->arch == at)	1836	if (tmp->arch == at)
1845	return tmp;	1837	return tmp;
1846		1838
1847	return NULL;	1839	return NULL;
1848	}	1840	}
…		…
1859	{	1851	{
1860	LOG (llevError, "Present called outside map.\n");	1852	LOG (llevError, "Present called outside map.\n");
1861	return NULL;	1853	return NULL;
1862	}	1854	}
1863		1855
1864	for (object *tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1856	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1865	if (tmp->type == type)	1857	if (tmp->type == type)
1866	return tmp;	1858	return tmp;
1867		1859
1868	return NULL;	1860	return NULL;
1869	}	1861	}
…		…
2009	}	2001	}
2010		2002
2011	if (!index)	2003	if (!index)
2012	return -1;	2004	return -1;
2013		2005
2014	return altern[RANDOM () % index];	2006	return altern [rndm (index)];
2015	}	2007	}
2016		2008
2017	/*	2009	/*
2018	* find_first_free_spot(archetype, maptile, x, y) works like	2010	* find_first_free_spot(archetype, maptile, x, y) works like
2019	* find_free_spot(), but it will search max number of squares.	2011	* find_free_spot(), but it will search max number of squares.
…		…
2040	{	2032	{
2041	arr += begin;	2033	arr += begin;
2042	end -= begin;	2034	end -= begin;
2043		2035
2044	while (--end)	2036	while (--end)
2045	swap (arr [end], arr [RANDOM () % (end + 1)]);	2037	swap (arr [end], arr [rndm (end + 1)]);
2046	}	2038	}
2047		2039
2048	/* new function to make monster searching more efficient, and effective!	2040	/* new function to make monster searching more efficient, and effective!
2049	* This basically returns a randomized array (in the passed pointer) of	2041	* This basically returns a randomized array (in the passed pointer) of
2050	* the spaces to find monsters. In this way, it won't always look for	2042	* the spaces to find monsters. In this way, it won't always look for
…		…
2184		2176
2185	return 3;	2177	return 3;
2186	}	2178	}
2187		2179
2188	/*	2180	/*
2189	* absdir(int): Returns a number between 1 and 8, which represent
2190	* the "absolute" direction of a number (it actually takes care of
2191	* "overflow" in previous calculations of a direction).
2192	*/
2193
2194	int
2195	absdir (int d)
2196	{
2197	while (d < 1)
2198	d += 8;
2199
2200	while (d > 8)
2201	d -= 8;
2202
2203	return d;
2204	}
2205
2206	/*
2207	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is	2181	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is
2208	* between two directions (which are expected to be absolute (see absdir())	2182	* between two directions (which are expected to be absolute (see absdir())
2209	*/	2183	*/
2210
2211	int	2184	int
2212	dirdiff (int dir1, int dir2)	2185	dirdiff (int dir1, int dir2)
2213	{	2186	{
2214	int d;	2187	int d;
2215		2188
…		…
2381	insert_ob_in_ob (object_create_clone (item), dst);	2354	insert_ob_in_ob (object_create_clone (item), dst);
2382		2355
2383	return dst;	2356	return dst;
2384	}	2357	}
2385		2358
2386	/* GROS - Creates an object using a string representing its content. */
2387	/* Basically, we save the content of the string to a temp file, then call */
2388	/* load_object on it. I admit it is a highly inefficient way to make things, */
2389	/* but it was simple to make and allows reusing the load_object function. */
2390	/* Remember not to use load_object_str in a time-critical situation. */
2391	/* Also remember that multiparts objects are not supported for now. */
2392	object *
2393	load_object_str (const char *obstr)
2394	{
2395	object *op;
2396	char filename[MAX_BUF];
2397
2398	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2399
2400	FILE *tempfile = fopen (filename, "w");
2401
2402	if (tempfile == NULL)
2403	{
2404	LOG (llevError, "Error - Unable to access load object temp file\n");
2405	return NULL;
2406	}
2407
2408	fprintf (tempfile, obstr);
2409	fclose (tempfile);
2410
2411	op = object::create ();
2412
2413	object_thawer thawer (filename);
2414
2415	if (thawer)
2416	load_object (thawer, op, 0);
2417
2418	LOG (llevDebug, " load str completed, object=%s\n", &op->name);
2419	CLEAR_FLAG (op, FLAG_REMOVED);
2420
2421	return op;
2422	}
2423
2424	/* This returns the first object in who's inventory that	2359	/* This returns the first object in who's inventory that
2425	* has the same type and subtype match.	2360	* has the same type and subtype match.
2426	* returns NULL if no match.	2361	* returns NULL if no match.
2427	*/	2362	*/
2428	object *	2363	object *
…		…
2481	if (link->key == canonical_key)	2416	if (link->key == canonical_key)
2482	return link->value;	2417	return link->value;
2483		2418
2484	return 0;	2419	return 0;
2485	}	2420	}
2486
2487		2421
2488	/*	2422	/*
2489	* Updates the canonical_key in op to value.	2423	* Updates the canonical_key in op to value.
2490	*	2424	*
2491	* canonical_key is a shared string (value doesn't have to be).	2425	* canonical_key is a shared string (value doesn't have to be).
…		…
2594	}	2528	}
2595	else	2529	else
2596	item = item->env;	2530	item = item->env;
2597	}	2531	}
2598		2532
		2533
		2534	const char *
		2535	object::flag_desc (char *desc, int len) const
		2536	{
		2537	char *p = desc;
		2538	bool first = true;
		2539
		2540	*p = 0;
		2541
		2542	for (int i = 0; i < NUM_FLAGS; i++)
		2543	{
		2544	if (len <= 10) // magic constant!
		2545	{
		2546	snprintf (p, len, ",...");
		2547	break;
		2548	}
		2549
		2550	if (flag [i])
		2551	{
		2552	int cnt = snprintf (p, len, "%s%d", first ? "" : ",", i);
		2553	len -= cnt;
		2554	p += cnt;
		2555	first = false;
		2556	}
		2557	}
		2558
		2559	return desc;
		2560	}
		2561
2599	// return a suitable string describing an objetc in enough detail to find it	2562	// return a suitable string describing an object in enough detail to find it
2600	const char *	2563	const char *
2601	object::debug_desc (char *info) const	2564	object::debug_desc (char *info) const
2602	{	2565	{
		2566	char flagdesc[512];
2603	char info2[256 * 3];	2567	char info2[256 * 4];
2604	char *p = info;	2568	char *p = info;
2605		2569
2606	p += snprintf (p, 256, "%d=\"%s%s%s\"",	2570	p += snprintf (p, 512, "{cnt:%d,uuid:<1.%" PRIx64 ">,name:\"%s\"%s%s,flags:[%s],type:%d}",
2607	count,	2571	count, uuid.seq,
2608	&name,	2572	&name,
2609	title ? " " : "",	2573	title ? "\",title:\"" : "",
2610	title ? (const char *)title : "");	2574	title ? (const char *)title : "",
		2575	flag_desc (flagdesc, 512), type);
2611		2576
2612	if (env)	2577	if (env)
2613	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2578	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2614		2579
2615	if (map)	2580	if (map)
2616	p += snprintf (p, 256, "(on %s@%d+%d)", map->path, x, y);	2581	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2617		2582
2618	return info;	2583	return info;
2619	}	2584	}
2620		2585
2621	const char *	2586	const char *
2622	object::debug_desc () const	2587	object::debug_desc () const
2623	{	2588	{
2624	static char info[256 * 3];	2589	static char info[3][256 * 4];
		2590	static int info_idx;
		2591
2625	return debug_desc (info);	2592	return debug_desc (info [++info_idx % 3]);
2626	}	2593	}
2627		2594
		2595	struct region *
		2596	object::region () const
		2597	{
		2598	return map ? map->region (x, y)
		2599	: region::default_region ();
		2600	}
		2601
		2602	const materialtype_t *
		2603	object::dominant_material () const
		2604	{
		2605	if (materialtype_t *mat = name_to_material (materialname))
		2606	return mat;
		2607
		2608	// omfg this is slow, this has to be temporary :)
		2609	shstr unknown ("unknown");
		2610
		2611	return name_to_material (unknown);
		2612	}
		2613
		2614	void
		2615	object::open_container (object *new_container)
		2616	{
		2617	if (container == new_container)
		2618	return;
		2619
		2620	if (object *old_container = container)
		2621	{
		2622	if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
		2623	return;
		2624
		2625	#if 0
		2626	// remove the "Close old_container" object.
		2627	if (object *closer = old_container->inv)
		2628	if (closer->type == CLOSE_CON)
		2629	closer->destroy ();
		2630	#endif
		2631
		2632	old_container->flag [FLAG_APPLIED] = 0;
		2633	container = 0;
		2634
		2635	esrv_update_item (UPD_FLAGS, this, old_container);
		2636	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
		2637	}
		2638
		2639	if (new_container)
		2640	{
		2641	if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))
		2642	return;
		2643
		2644	// TODO: this does not seem to serve any purpose anymore?
		2645	#if 0
		2646	// insert the "Close Container" object.
		2647	if (archetype *closer = new_container->other_arch)
		2648	{
		2649	object *closer = arch_to_object (new_container->other_arch);
		2650	closer->flag [FLAG_NO_MAP_SAVE] = 1;
		2651	new_container->insert (closer);
		2652	}
		2653	#endif
		2654
		2655	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));
		2656
		2657	new_container->flag [FLAG_APPLIED] = 1;
		2658	container = new_container;
		2659
		2660	esrv_update_item (UPD_FLAGS, this, new_container);
		2661	esrv_send_inventory (this, new_container);
		2662	}
		2663	}
		2664
		2665

Diff Legend

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