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.95 by root, Wed Dec 27 05:42:08 2006 UTC vs.
Revision 1.185 by root, Fri Aug 24 01:23:29 2007 UTC

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

Diff Legend

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