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.80 by root, Sat Dec 23 06:41:39 2006 UTC vs.
Revision 1.186 by root, Thu Aug 30 05:18:37 2007 UTC

1	/*	1	/*
2	CrossFire, A Multiplayer game for X-windows	2	* This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
3		3	*
		4	* Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
4	Copyright (C) 2001 Mark Wedel & Crossfire Development Team	5	* Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team
5	Copyright (C) 1992 Frank Tore Johansen	6	* Copyright (©) 1992,2007 Frank Tore Johansen
6		7	*
7	This program is free software; you can redistribute it and/or modify	8	* Crossfire TRT is free software: you can redistribute it and/or modify
8	it under the terms of the GNU General Public License as published by	9	* it under the terms of the GNU General Public License as published by
9	the Free Software Foundation; either version 2 of the License, or	10	* the Free Software Foundation, either version 3 of the License, or
10	(at your option) any later version.	11	* (at your option) any later version.
11		12	*
12	This program is distributed in the hope that it will be useful,	13	* This program is distributed in the hope that it will be useful,
13	but WITHOUT ANY WARRANTY; without even the implied warranty of	14	* but WITHOUT ANY WARRANTY; without even the implied warranty of
14	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15	GNU General Public License for more details.	16	* GNU General Public License for more details.
16		17	*
17	You should have received a copy of the GNU General Public License	18	* You should have received a copy of the GNU General Public License
18	along with this program; if not, write to the Free Software	19	* along with this program. If not, see <http://www.gnu.org/licenses/>.
19	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	20	*
20
21	The authors can be reached via e-mail at <crossfire@schmorp.de>	21	* The authors can be reached via e-mail to <crossfire@schmorp.de>
22	*/	22	*/
23		23
24	/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.	24	/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
25	sub/add_weight will transcend the environment updating the carrying	25	sub/add_weight will transcend the environment updating the carrying
26	variable. */	26	variable. */
27	#include <global.h>	27	#include <global.h>
28	#include <stdio.h>	28	#include <stdio.h>
29	#include <sys/types.h>	29	#include <sys/types.h>
30	#include <sys/uio.h>	30	#include <sys/uio.h>
31	#include <object.h>	31	#include <object.h>
32	#include <funcpoint.h>	32	#include <funcpoint.h>
		33	#include <sproto.h>
33	#include <loader.h>	34	#include <loader.h>
34		35
35	#include <bitset>	36	#include <bitset>
36		37
37	int nrofallocobjects = 0;	38	int nrofallocobjects = 0;
38	static UUID uuid;	39	static UUID uuid;
39	const uint64 UUID_SKIP = 1<<19;	40	const uint64 UUID_SKIP = 1<<19;
40		41
41	object *active_objects; /* List of active objects that need to be processed */	42	objectvec objects;
		43	activevec actives;
42		44
43	short freearr_x[SIZEOFFREE] = { 0, 0, 1, 1, 1, 0, -1, -1, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,	45	short freearr_x[SIZEOFFREE] = { 0, 0, 1, 1, 1, 0, -1, -1, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,
44	0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1	46	0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1
45	};	47	};
46	short freearr_y[SIZEOFFREE] = { 0, -1, -1, 0, 1, 1, 1, 0, -1, -2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2,	48	short freearr_y[SIZEOFFREE] = { 0, -1, -1, 0, 1, 1, 1, 0, -1, -2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2,
…		…
141	* objects with lists are rare, and lists stay short. If not, use a	143	* objects with lists are rare, and lists stay short. If not, use a
142	* different structure or at least keep the lists sorted...	144	* different structure or at least keep the lists sorted...
143	*/	145	*/
144		146
145	/* For each field in wants, */	147	/* For each field in wants, */
146	for (wants_field = wants->key_values; wants_field != NULL; wants_field = wants_field->next)	148	for (wants_field = wants->key_values; wants_field; wants_field = wants_field->next)
147	{	149	{
148	key_value *has_field;	150	key_value *has_field;
149		151
150	/* Look for a field in has with the same key. */	152	/* Look for a field in has with the same key. */
151	has_field = get_ob_key_link (has, wants_field->key);	153	has_field = get_ob_key_link (has, wants_field->key);
…		…
190	* Check nrof variable *before* calling can_merge()	192	* Check nrof variable *before* calling can_merge()
191	*	193	*
192	* Improvements made with merge: Better checking on potion, and also	194	* Improvements made with merge: Better checking on potion, and also
193	* check weight	195	* check weight
194	*/	196	*/
195
196	bool object::can_merge_slow (object *ob1, object *ob2)	197	bool object::can_merge_slow (object *ob1, object *ob2)
197	{	198	{
198	/* A couple quicksanity checks */	199	/* A couple quicksanity checks */
199	if (ob1 == ob2	200	if (ob1 == ob2
200	|| ob1->type != ob2->type	201	|| ob1->type != ob2->type
…		…
277		278
278	/* Note sure why the following is the case - either the object has to	279	/* Note sure why the following is the case - either the object has to
279	* be animated or have a very low speed. Is this an attempted monster	280	* be animated or have a very low speed. Is this an attempted monster
280	* check?	281	* check?
281	*/	282	*/
282	if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && FABS ((ob1)->speed) > MIN_ACTIVE_SPEED)	283	if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && ob1->has_active_speed ())
283	return 0;	284	return 0;
284		285
285	switch (ob1->type)	286	switch (ob1->type)
286	{	287	{
287	case SCROLL:	288	case SCROLL:
…		…
298	return 0;	299	return 0;
299	else if (!compare_ob_value_lists (ob1, ob2))	300	else if (!compare_ob_value_lists (ob1, ob2))
300	return 0;	301	return 0;
301	}	302	}
302		303
303	//TODO: generate an event or call into perl for additional checks
304	if (ob1->self || ob2->self)	304	if (ob1->self || ob2->self)
305	{	305	{
306	ob1->optimise ();	306	ob1->optimise ();
307	ob2->optimise ();	307	ob2->optimise ();
308		308
309	if (ob1->self || ob2->self)	309	if (ob1->self || ob2->self)
		310	if (!cfperl_can_merge (ob1, ob2))
310	return 0;	311	return 0;
311	}	312	}
312		313
313	/* Everything passes, must be OK. */	314	/* Everything passes, must be OK. */
314	return 1;	315	return 1;
315	}	316	}
…		…
323	sum_weight (object *op)	324	sum_weight (object *op)
324	{	325	{
325	long sum;	326	long sum;
326	object *inv;	327	object *inv;
327		328
328	for (sum = 0, inv = op->inv; inv != NULL; inv = inv->below)	329	for (sum = 0, inv = op->inv; inv; inv = inv->below)
329	{	330	{
330	if (inv->inv)	331	if (inv->inv)
331	sum_weight (inv);	332	sum_weight (inv);
		333
332	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);	334	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);
333	}	335	}
334		336
335	if (op->type == CONTAINER && op->stats.Str)	337	if (op->type == CONTAINER && op->stats.Str)
336	sum = (sum * (100 - op->stats.Str)) / 100;	338	sum = (sum * (100 - op->stats.Str)) / 100;
…		…
356	/*	358	/*
357	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.	359	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
358	* Some error messages.	360	* Some error messages.
359	* The result of the dump is stored in the static global errmsg array.	361	* The result of the dump is stored in the static global errmsg array.
360	*/	362	*/
361
362	char *	363	char *
363	dump_object (object *op)	364	dump_object (object *op)
364	{	365	{
365	if (!op)	366	if (!op)
366	return strdup ("[NULLOBJ]");	367	return strdup ("[NULLOBJ]");
367		368
368	object_freezer freezer;	369	object_freezer freezer;
369	save_object (freezer, op, 3);	370	op->write (freezer);
370	return freezer.as_string ();	371	return freezer.as_string ();
371	}	372	}
372		373
373	/*	374	/*
374	* get_nearest_part(multi-object, object 2) returns the part of the	375	* get_nearest_part(multi-object, object 2) returns the part of the
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 (self || cb)	537	flag [FLAG_FREED] = is_freed;
489	INVOKE_OBJECT (CLONE, this, ARG_OBJECT (dst));	538	flag [FLAG_REMOVED] = is_removed;
490
491	if (is_freed)
492	SET_FLAG (dst, FLAG_FREED);
493
494	if (is_removed)
495	SET_FLAG (dst, FLAG_REMOVED);
496
497	if (speed < 0)
498	dst->speed_left = speed_left - RANDOM () % 200 / 100.0;
499		539
500	/* Copy over key_values, if any. */	540	/* Copy over key_values, if any. */
501	if (key_values)	541	if (src.key_values)
502	{	542	{
503	key_value *tail = 0;	543	key_value *tail = 0;
504	key_value *i;
505
506	dst->key_values = 0;	544	key_values = 0;
507		545
508	for (i = key_values; i; i = i->next)	546	for (key_value *i = src.key_values; i; i = i->next)
509	{	547	{
510	key_value *new_link = new key_value;	548	key_value *new_link = new key_value;
511		549
512	new_link->next = 0;	550	new_link->next = 0;
513	new_link->key = i->key;	551	new_link->key = i->key;
514	new_link->value = i->value;	552	new_link->value = i->value;
515		553
516	/* Try and be clever here, too. */	554	/* Try and be clever here, too. */
517	if (!dst->key_values)	555	if (!key_values)
518	{	556	{
519	dst->key_values = new_link;	557	key_values = new_link;
520	tail = new_link;	558	tail = new_link;
521	}	559	}
522	else	560	else
523	{	561	{
524	tail->next = new_link;	562	tail->next = new_link;
525	tail = new_link;	563	tail = new_link;
526	}	564	}
527	}	565	}
528	}	566	}
		567	}
529		568
530	update_ob_speed (dst);	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 ();
		584
		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 ();
531	}	605	}
532		606
533	object *	607	object *
534	object::clone ()	608	object::clone ()
535	{	609	{
…		…
541	/*	615	/*
542	* 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
543	* 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
544	* 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.
545	*/	619	*/
546
547	void	620	void
548	update_turn_face (object *op)	621	update_turn_face (object *op)
549	{	622	{
550	if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || op->arch == NULL)	623	if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || !op->arch)
551	return;	624	return;
		625
552	SET_ANIMATION (op, op->direction);	626	SET_ANIMATION (op, op->direction);
553	update_object (op, UP_OBJ_FACE);	627	update_object (op, UP_OBJ_FACE);
554	}	628	}
555		629
556	/*	630	/*
557	* Updates the speed of an object. If the speed changes from 0 to another	631	* Updates the speed of an object. If the speed changes from 0 to another
558	* value, or vice versa, then add/remove the object from the active list.	632	* value, or vice versa, then add/remove the object from the active list.
559	* 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.
560	*/	634	*/
561	void	635	void
562	update_ob_speed (object *op)	636	object::set_speed (float speed)
563	{	637	{
564	extern int arch_init;	638	if (flag [FLAG_FREED] && speed)
565
566	/* No reason putting the archetypes objects on the speed list,
567	* since they never really need to be updated.
568	*/
569
570	if (QUERY_FLAG (op, FLAG_FREED) && op->speed)
571	{	639	{
572	LOG (llevError, "Object %s is freed but has speed.\n", &op->name);	640	LOG (llevError, "Object %s is freed but has speed.\n", &name);
573	#ifdef MANY_CORES
574	abort ();
575	#else
576	op->speed = 0;	641	speed = 0;
577	#endif
578	}
579
580	if (arch_init)
581	return;
582
583	if (FABS (op->speed) > MIN_ACTIVE_SPEED)
584	{	642	}
585	/* If already on active list, don't do anything */
586	if (op->active_next || op->active_prev || op == active_objects)
587	return;
588		643
589	/* process_events() expects us to insert the object at the beginning	644	this->speed = speed;
590	* of the list. */
591	op->active_next = active_objects;
592		645
593	if (op->active_next != NULL)	646	if (has_active_speed ())
594	op->active_next->active_prev = op;	647	activate ();
595
596	active_objects = op;
597	}
598	else	648	else
599	{	649	deactivate ();
600	/* If not on the active list, nothing needs to be done */
601	if (!op->active_next && !op->active_prev && op != active_objects)
602	return;
603
604	if (op->active_prev == NULL)
605	{
606	active_objects = op->active_next;
607
608	if (op->active_next != NULL)
609	op->active_next->active_prev = NULL;
610	}
611	else
612	{
613	op->active_prev->active_next = op->active_next;
614
615	if (op->active_next)
616	op->active_next->active_prev = op->active_prev;
617	}
618
619	op->active_next = NULL;
620	op->active_prev = NULL;
621	}
622	}
623
624	/* This function removes object 'op' from the list of active
625	* objects.
626	* This should only be used for style maps or other such
627	* reference maps where you don't want an object that isn't
628	* in play chewing up cpu time getting processed.
629	* The reverse of this is to call update_ob_speed, which
630	* will do the right thing based on the speed of the object.
631	*/
632	void
633	remove_from_active_list (object *op)
634	{
635	/* If not on the active list, nothing needs to be done */
636	if (!op->active_next && !op->active_prev && op != active_objects)
637	return;
638
639	if (op->active_prev == NULL)
640	{
641	active_objects = op->active_next;
642	if (op->active_next != NULL)
643	op->active_next->active_prev = NULL;
644	}
645	else
646	{
647	op->active_prev->active_next = op->active_next;
648	if (op->active_next)
649	op->active_next->active_prev = op->active_prev;
650	}
651	op->active_next = NULL;
652	op->active_prev = NULL;
653	}	650	}
654		651
655	/*	652	/*
656	* update_object() updates the the map.	653	* update_object() updates the the map.
657	* It takes into account invisible objects (and represent squares covered	654	* It takes into account invisible objects (and represent squares covered
…		…
670	* UP_OBJ_FACE: only the objects face has changed.	667	* UP_OBJ_FACE: only the objects face has changed.
671	*/	668	*/
672	void	669	void
673	update_object (object *op, int action)	670	update_object (object *op, int action)
674	{	671	{
675	MoveType move_on, move_off, move_block, move_slow;
676
677	if (op == NULL)	672	if (op == NULL)
678	{	673	{
679	/* this should never happen */	674	/* this should never happen */
680	LOG (llevDebug, "update_object() called for NULL object.\n");	675	LOG (llevDebug, "update_object() called for NULL object.\n");
681	return;	676	return;
…		…
694	*/	689	*/
695	if (!op->map || op->map->in_memory == MAP_SAVING)	690	if (!op->map || op->map->in_memory == MAP_SAVING)
696	return;	691	return;
697		692
698	/* make sure the object is within map boundaries */	693	/* make sure the object is within map boundaries */
699	if (op->x < 0 || op->x >= MAP_WIDTH (op->map) || op->y < 0 || op->y >= MAP_HEIGHT (op->map))	694	if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height)
700	{	695	{
701	LOG (llevError, "update_object() called for object out of map!\n");	696	LOG (llevError, "update_object() called for object out of map!\n");
702	#ifdef MANY_CORES	697	#ifdef MANY_CORES
703	abort ();	698	abort ();
704	#endif	699	#endif
705	return;	700	return;
706	}	701	}
707		702
708	mapspace &m = op->ms ();	703	mapspace &m = op->ms ();
709		704
710	if (m.flags_ & P_NEED_UPDATE)	705	if (!(m.flags_ & P_UPTODATE))
711	/* nop */;	706	/* nop */;
712	else if (action == UP_OBJ_INSERT)	707	else if (action == UP_OBJ_INSERT)
713	{	708	{
714	// this is likely overkill, TODO: revisit (schmorp)	709	// this is likely overkill, TODO: revisit (schmorp)
715	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))	710	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
…		…
724	/* 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
725	* to have move_allow right now.	720	* to have move_allow right now.
726	*/	721	*/
727	|| ((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
728	|| 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)
729	m.flags_ = P_NEED_UPDATE;	724	m.flags_ = 0;
730	}	725	}
731	/* if the object is being removed, we can't make intelligent	726	/* if the object is being removed, we can't make intelligent
732	* decisions, because remove_ob can't really pass the object	727	* decisions, because remove_ob can't really pass the object
733	* that is being removed.	728	* that is being removed.
734	*/	729	*/
735	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)	730	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
736	m.flags_ = P_NEED_UPDATE;	731	m.flags_ = 0;
737	else if (action == UP_OBJ_FACE)	732	else if (action == UP_OBJ_FACE)
738	/* Nothing to do for that case */ ;	733	/* Nothing to do for that case */ ;
739	else	734	else
740	LOG (llevError, "update_object called with invalid action: %d\n", action);	735	LOG (llevError, "update_object called with invalid action: %d\n", action);
741		736
742	if (op->more)	737	if (op->more)
743	update_object (op->more, action);	738	update_object (op->more, action);
744	}	739	}
745		740
746	object::vector object::mortals;
747	object::vector object::objects; // not yet used
748	object *object::first;
749
750	void object::free_mortals ()
751	{
752	for (AUTODECL (i, mortals.begin ()); i != mortals.end ();)
753	if ((*i)->refcnt)
754	++i; // further delay freeing
755	else
756	{
757	delete *i;
758	mortals.erase (i);
759	}
760	}
761
762	object::object ()	741	object::object ()
763	{	742	{
764	SET_FLAG (this, FLAG_REMOVED);	743	SET_FLAG (this, FLAG_REMOVED);
765		744
766	expmul = 1.0;	745	expmul = 1.0;
767	face = blank_face;	746	face = blank_face;
768	}	747	}
769		748
770	object::~object ()	749	object::~object ()
771	{	750	{
		751	unlink ();
		752
772	free_key_values (this);	753	free_key_values (this);
773	}	754	}
774		755
		756	static int object_count;
		757
775	void object::link ()	758	void object::link ()
776	{	759	{
777	count = ++ob_count;	760	assert (!index);//D
778	uuid = gen_uuid ();	761	uuid = gen_uuid ();
		762	count = ++object_count;
779		763
780	prev = 0;	764	refcnt_inc ();
781	next = object::first;	765	objects.insert (this);
782
783	if (object::first)
784	object::first->prev = this;
785
786	object::first = this;
787	}	766	}
788		767
789	void object::unlink ()	768	void object::unlink ()
790	{	769	{
791	if (this == object::first)	770	if (!index)
792	object::first = next;	771	return;
793		772
794	/* Remove this object from the list of used objects */	773	objects.erase (this);
795	if (prev) prev->next = next;	774	refcnt_dec ();
796	if (next) next->prev = prev;	775	}
797		776
798	prev = 0;	777	void
799	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	}
		832	}
		833
		834	/*
		835	* Remove and free all objects in the inventory of the given object.
		836	* object.c ?
		837	*/
		838	void
		839	object::destroy_inv (bool drop_to_ground)
		840	{
		841	// need to check first, because the checks below might segfault
		842	// as we might be on an invalid mapspace and crossfire code
		843	// is too buggy to ensure that the inventory is empty.
		844	// corollary: if you create arrows etc. with stuff in tis inventory,
		845	// cf will crash below with off-map x and y
		846	if (!inv)
		847	return;
		848
		849	/* Only if the space blocks everything do we not process -
		850	* if some form of movement is allowed, let objects
		851	* drop on that space.
		852	*/
		853	if (!drop_to_ground
		854	|| !map
		855	|| map->in_memory != MAP_IN_MEMORY
		856	|| map->nodrop
		857	|| ms ().move_block == MOVE_ALL)
		858	{
		859	while (inv)
		860	{
		861	inv->destroy_inv (drop_to_ground);
		862	inv->destroy ();
		863	}
		864	}
		865	else
		866	{ /* Put objects in inventory onto this space */
		867	while (inv)
		868	{
		869	object *op = inv;
		870
		871	if (op->flag [FLAG_STARTEQUIP]
		872	|| op->flag [FLAG_NO_DROP]
		873	|| op->type == RUNE
		874	|| op->type == TRAP
		875	|| op->flag [FLAG_IS_A_TEMPLATE]
		876	|| op->flag [FLAG_DESTROY_ON_DEATH])
		877	op->destroy ();
		878	else
		879	map->insert (op, x, y);
		880	}
		881	}
800	}	882	}
801		883
802	object *object::create ()	884	object *object::create ()
803	{	885	{
804	object *op = new object;	886	object *op = new object;
805	op->link ();	887	op->link ();
806	return op;	888	return op;
807	}	889	}
808		890
809	/*	891	void
810	* free_object() frees everything allocated by an object, removes	892	object::do_destroy ()
811	* it from the list of used objects, and puts it on the list of
812	* free objects. The IS_FREED() flag is set in the object.
813	* The object must have been removed by remove_ob() first for
814	* this function to succeed.
815	*
816	* If destroy_inventory is set, free inventory as well. Else drop items in
817	* inventory to the ground.
818	*/
819	void object::destroy (bool destroy_inventory)
820	{	893	{
821	if (QUERY_FLAG (this, FLAG_FREED))	894	attachable::do_destroy ();
822	return;
823		895
824	if (QUERY_FLAG (this, FLAG_FRIENDLY))	896	if (flag [FLAG_IS_LINKED])
		897	remove_button_link (this);
		898
		899	if (flag [FLAG_FRIENDLY])
825	remove_friendly_object (this);	900	remove_friendly_object (this);
826		901
827	if (!QUERY_FLAG (this, FLAG_REMOVED))	902	if (!flag [FLAG_REMOVED])
828	remove ();	903	remove ();
829		904
830	SET_FLAG (this, FLAG_FREED);	905	destroy_inv (true);
831		906
832	if (more)	907	deactivate ();
833	{	908	unlink ();
834	more->destroy (destroy_inventory);
835	more = 0;
836	}
837		909
838	if (inv)	910	flag [FLAG_FREED] = 1;
839	{
840	/* Only if the space blocks everything do we not process -
841	* if some form of movement is allowed, let objects
842	* drop on that space.
843	*/
844	if (destroy_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
845	{
846	object *op = inv;
847
848	while (op)
849	{
850	object *tmp = op->below;
851	op->destroy (destroy_inventory);
852	op = tmp;
853	}
854	}
855	else
856	{ /* Put objects in inventory onto this space */
857	object *op = inv;
858
859	while (op)
860	{
861	object *tmp = op->below;
862
863	op->remove ();
864
865	if (QUERY_FLAG (op, FLAG_STARTEQUIP)
866	|| QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
867	op->destroy ();
868	else
869	{
870	op->x = x;
871	op->y = y;
872	insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */
873	}
874
875	op = tmp;
876	}
877	}
878	}
879		911
880	// hack to ensure that freed objects still have a valid map	912	// hack to ensure that freed objects still have a valid map
881	{	913	{
882	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
883		915
884	if (!freed_map)	916	if (!freed_map)
885	{	917	{
886	freed_map = new maptile;	918	freed_map = new maptile;
887		919
		920	freed_map->path = "<freed objects map>";
888	freed_map->name = "/internal/freed_objects_map";	921	freed_map->name = "/internal/freed_objects_map";
889	freed_map->width = 3;	922	freed_map->width = 3;
890	freed_map->height = 3;	923	freed_map->height = 3;
891		924
892	freed_map->allocate ();	925	freed_map->alloc ();
		926	freed_map->in_memory = MAP_IN_MEMORY;
893	}	927	}
894		928
895	map = freed_map;	929	map = freed_map;
896	x = 1;	930	x = 1;
897	y = 1;	931	y = 1;
898	}	932	}
899		933
		934	if (more)
		935	{
		936	more->destroy ();
		937	more = 0;
		938	}
		939
		940	head = 0;
		941
900	// clear those pointers that likely might have circular references to us	942	// clear those pointers that likely might cause circular references
901	owner = 0;	943	owner = 0;
902	enemy = 0;	944	enemy = 0;
903	attacked_by = 0;	945	attacked_by = 0;
		946	current_weapon = 0;
		947	}
904		948
905	// only relevant for players(?), but make sure of it anyways	949	void
906	contr = 0;	950	object::destroy (bool destroy_inventory)
		951	{
		952	if (destroyed ())
		953	return;
907		954
908	/* Remove object from the active list */	955	if (destroy_inventory)
909	speed = 0;	956	destroy_inv (false);
910	update_ob_speed (this);
911		957
912	unlink ();	958	if (is_head ())
		959	if (sound_destroy)
		960	play_sound (sound_destroy);
		961	else if (flag [FLAG_MONSTER])
		962	play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism
913		963
914	mortals.push_back (this);	964	attachable::destroy ();
915	}	965	}
916		966
917	/*	967	/*
918	* sub_weight() recursively (outwards) subtracts a number from the	968	* sub_weight() recursively (outwards) subtracts a number from the
919	* weight of an object (and what is carried by it's environment(s)).	969	* weight of an object (and what is carried by it's environment(s)).
…		…
935	* This function removes the object op from the linked list of objects	985	* This function removes the object op from the linked list of objects
936	* which it is currently tied to. When this function is done, the	986	* which it is currently tied to. When this function is done, the
937	* object will have no environment. If the object previously had an	987	* object will have no environment. If the object previously had an
938	* environment, the x and y coordinates will be updated to	988	* environment, the x and y coordinates will be updated to
939	* the previous environment.	989	* the previous environment.
940	* Beware: This function is called from the editor as well!
941	*/	990	*/
942	void	991	void
943	object::remove ()	992	object::do_remove ()
944	{	993	{
945	object *tmp, *last = 0;	994	object *tmp, *last = 0;
946	object *otmp;	995	object *otmp;
947		996
948	int check_walk_off;
949
950	if (QUERY_FLAG (this, FLAG_REMOVED))	997	if (QUERY_FLAG (this, FLAG_REMOVED))
951	return;	998	return;
952		999
953	SET_FLAG (this, FLAG_REMOVED);	1000	SET_FLAG (this, FLAG_REMOVED);
		1001	INVOKE_OBJECT (REMOVE, this);
954		1002
955	if (more)	1003	if (more)
956	more->remove ();	1004	more->remove ();
957		1005
958	/*	1006	/*
…		…
971	* to save cpu time.	1019	* to save cpu time.
972	*/	1020	*/
973	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1021	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
974	otmp->update_stats ();	1022	otmp->update_stats ();
975		1023
976	if (above != NULL)	1024	if (above)
977	above->below = below;	1025	above->below = below;
978	else	1026	else
979	env->inv = below;	1027	env->inv = below;
980		1028
981	if (below != NULL)	1029	if (below)
982	below->above = above;	1030	below->above = above;
983		1031
984	/* we set up values so that it could be inserted into	1032	/* we set up values so that it could be inserted into
985	* the map, but we don't actually do that - it is up	1033	* the map, but we don't actually do that - it is up
986	* to the caller to decide what we want to do.	1034	* to the caller to decide what we want to do.
…		…
990	above = 0, below = 0;	1038	above = 0, below = 0;
991	env = 0;	1039	env = 0;
992	}	1040	}
993	else if (map)	1041	else if (map)
994	{	1042	{
995	/* Re did the following section of code - it looks like it had	1043	if (type == PLAYER)
996	* lots of logic for things we no longer care about
997	*/	1044	{
		1045	// leaving a spot always closes any open container on the ground
		1046	if (container && !container->env)
		1047	// this causes spurious floorbox updates, but it ensures
		1048	// that the CLOSE event is being sent.
		1049	close_container ();
		1050
		1051	--map->players;
		1052	map->touch ();
		1053	}
		1054
		1055	map->dirty = true;
		1056	mapspace &ms = this->ms ();
998		1057
999	/* link the object above us */	1058	/* link the object above us */
1000	if (above)	1059	if (above)
1001	above->below = below;	1060	above->below = below;
1002	else	1061	else
1003	map->at (x, y).top = below; /* we were top, set new top */	1062	ms.top = below; /* we were top, set new top */
1004		1063
1005	/* Relink the object below us, if there is one */	1064	/* Relink the object below us, if there is one */
1006	if (below)	1065	if (below)
1007	below->above = above;	1066	below->above = above;
1008	else	1067	else
…		…
1010	/* Nothing below, which means we need to relink map object for this space	1069	/* Nothing below, which means we need to relink map object for this space
1011	* use translated coordinates in case some oddness with map tiling is	1070	* use translated coordinates in case some oddness with map tiling is
1012	* evident	1071	* evident
1013	*/	1072	*/
1014	if (GET_MAP_OB (map, x, y) != this)	1073	if (GET_MAP_OB (map, x, y) != this)
1015	{
1016	char *dump = dump_object (this);
1017	LOG (llevError,
1018	"remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom?\n%s\n", dump);	1074	LOG (llevError, "remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom? %s\n", debug_desc ());
1019	free (dump);
1020	dump = dump_object (GET_MAP_OB (map, x, y));
1021	LOG (llevError, "%s\n", dump);
1022	free (dump);
1023	}
1024		1075
1025	map->at (x, y).bottom = above; /* goes on above it. */	1076	ms.bot = above; /* goes on above it. */
1026	}	1077	}
1027		1078
1028	above = 0;	1079	above = 0;
1029	below = 0;	1080	below = 0;
1030		1081
1031	if (map->in_memory == MAP_SAVING)	1082	if (map->in_memory == MAP_SAVING)
1032	return;	1083	return;
1033		1084
1034	check_walk_off = !QUERY_FLAG (this, FLAG_NO_APPLY);	1085	int check_walk_off = !flag [FLAG_NO_APPLY];
1035		1086
		1087	if (object *pl = ms.player ())
		1088	{
		1089	if (pl->container == this)
		1090	/* If a container that the player is currently using somehow gets
		1091	* removed (most likely destroyed), update the player view
		1092	* appropriately.
		1093	*/
		1094	pl->close_container ();
		1095
		1096	pl->contr->ns->floorbox_update ();
		1097	}
		1098
1036	for (tmp = GET_MAP_OB (map, x, y); tmp; tmp = tmp->above)	1099	for (tmp = ms.bot; tmp; tmp = tmp->above)
1037	{	1100	{
1038	/* No point updating the players look faces if he is the object	1101	/* No point updating the players look faces if he is the object
1039	* being removed.	1102	* being removed.
1040	*/	1103	*/
1041		1104
1042	if (tmp->type == PLAYER && tmp != this)
1043	{
1044	/* If a container that the player is currently using somehow gets
1045	* removed (most likely destroyed), update the player view
1046	* appropriately.
1047	*/
1048	if (tmp->container == this)
1049	{
1050	CLEAR_FLAG (this, FLAG_APPLIED);
1051	tmp->container = 0;
1052	}
1053
1054	tmp->contr->ns->floorbox_update ();
1055	}
1056
1057	/* See if player moving off should effect something */	1105	/* See if object moving off should effect something */
1058	if (check_walk_off	1106	if (check_walk_off
1059	&& ((move_type & tmp->move_off)	1107	&& ((move_type & tmp->move_off)
1060	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))	1108	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1061	{	1109	{
1062	move_apply (tmp, this, 0);	1110	move_apply (tmp, this, 0);
1063		1111
1064	if (destroyed ())	1112	if (destroyed ())
1065	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());	1113	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1066	}	1114	}
1067		1115
1068	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1069
1070	if (tmp->above == tmp)
1071	tmp->above = 0;
1072
1073	last = tmp;	1116	last = tmp;
1074	}	1117	}
1075		1118
1076	/* last == NULL of there are no objects on this space */	1119	/* last == NULL if there are no objects on this space */
		1120	//TODO: this makes little sense, why only update the topmost object?
1077	if (!last)	1121	if (!last)
1078	map->at (x, y).flags_ = P_NEED_UPDATE;	1122	map->at (x, y).flags_ = 0;
1079	else	1123	else
1080	update_object (last, UP_OBJ_REMOVE);	1124	update_object (last, UP_OBJ_REMOVE);
1081		1125
1082	if (QUERY_FLAG (this, FLAG_BLOCKSVIEW) || glow_radius)	1126	if (flag [FLAG_BLOCKSVIEW] || glow_radius)
1083	update_all_los (map, x, y);	1127	update_all_los (map, x, y);
1084	}	1128	}
1085	}	1129	}
1086		1130
1087	/*	1131	/*
…		…
1096	merge_ob (object *op, object *top)	1140	merge_ob (object *op, object *top)
1097	{	1141	{
1098	if (!op->nrof)	1142	if (!op->nrof)
1099	return 0;	1143	return 0;
1100		1144
1101	if (top == NULL)	1145	if (top)
1102	for (top = op; top != NULL && top->above != NULL; top = top->above);	1146	for (top = op; top && top->above; top = top->above)
		1147	;
1103		1148
1104	for (; top != NULL; top = top->below)	1149	for (; top; top = top->below)
1105	{	1150	{
1106	if (top == op)	1151	if (top == op)
1107	continue;	1152	continue;
1108		1153
1109	if (object::can_merge (op, top))	1154	if (object::can_merge (op, top))
…		…
1118	}	1163	}
1119		1164
1120	return 0;	1165	return 0;
1121	}	1166	}
1122		1167
		1168	void
		1169	object::expand_tail ()
		1170	{
		1171	if (more)
		1172	return;
		1173
		1174	object *prev = this;
		1175
		1176	for (archetype *at = (archetype *)arch->more; at; at = (archetype *)at->more)
		1177	{
		1178	object *op = arch_to_object (at);
		1179
		1180	op->name = name;
		1181	op->name_pl = name_pl;
		1182	op->title = title;
		1183
		1184	op->head = this;
		1185	prev->more = op;
		1186
		1187	prev = op;
		1188	}
		1189	}
		1190
1123	/*	1191	/*
1124	* same as insert_ob_in_map except it handle separate coordinates and do a clean	1192	* same as insert_ob_in_map except it handles separate coordinates and does a clean
1125	* job preparing multi-part monsters	1193	* job preparing multi-part monsters.
1126	*/	1194	*/
1127	object *	1195	object *
1128	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)	1196	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1129	{	1197	{
1130	object *tmp;
1131
1132	if (op->head)
1133	op = op->head;
1134
1135	for (tmp = op; tmp; tmp = tmp->more)	1198	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1136	{	1199	{
1137	tmp->x = x + tmp->arch->clone.x;	1200	tmp->x = x + tmp->arch->x;
1138	tmp->y = y + tmp->arch->clone.y;	1201	tmp->y = y + tmp->arch->y;
1139	}	1202	}
1140		1203
1141	return insert_ob_in_map (op, m, originator, flag);	1204	return insert_ob_in_map (op, m, originator, flag);
1142	}	1205	}
1143		1206
…		…
1159	* Return value:	1222	* Return value:
1160	* new object if 'op' was merged with other object	1223	* new object if 'op' was merged with other object
1161	* NULL if 'op' was destroyed	1224	* NULL if 'op' was destroyed
1162	* just 'op' otherwise	1225	* just 'op' otherwise
1163	*/	1226	*/
1164
1165	object *	1227	object *
1166	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)	1228	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1167	{	1229	{
		1230	assert (!op->flag [FLAG_FREED]);
		1231
1168	object *tmp, *top, *floor = NULL;	1232	object *top, *floor = NULL;
1169	sint16 x, y;
1170		1233
1171	if (QUERY_FLAG (op, FLAG_FREED))	1234	op->remove ();
1172	{
1173	LOG (llevError, "Trying to insert freed object!\n");
1174	return NULL;
1175	}
1176
1177	if (m == NULL)
1178	{
1179	char *dump = dump_object (op);
1180	LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
1181	free (dump);
1182	return op;
1183	}
1184		1235
1185	if (out_of_map (m, op->x, op->y))	1236	if (out_of_map (m, op->x, op->y))
1186	{	1237	{
1187	char *dump = dump_object (op);
1188	LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump);	1238	LOG (llevError, "Trying to insert object outside the map.\n%s\n", op->debug_desc ());
1189	#ifdef MANY_CORES	1239	#ifdef MANY_CORES
1190	/* Better to catch this here, as otherwise the next use of this object	1240	/* Better to catch this here, as otherwise the next use of this object
1191	* is likely to cause a crash. Better to find out where it is getting	1241	* is likely to cause a crash. Better to find out where it is getting
1192	* improperly inserted.	1242	* improperly inserted.
1193	*/	1243	*/
1194	abort ();	1244	abort ();
1195	#endif	1245	#endif
1196	free (dump);
1197	return op;	1246	return op;
1198	}	1247	}
1199		1248
1200	if (!QUERY_FLAG (op, FLAG_REMOVED))	1249	if (object *more = op->more)
1201	{	1250	if (!insert_ob_in_map (more, m, originator, flag))
1202	char *dump = dump_object (op);
1203	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
1204	free (dump);
1205	return op;	1251	return 0;
1206	}
1207
1208	if (op->more != NULL)
1209	{
1210	/* The part may be on a different map. */
1211
1212	object *more = op->more;
1213
1214	/* We really need the caller to normalize coordinates - if
1215	* we set the map, that doesn't work if the location is within
1216	* a map and this is straddling an edge. So only if coordinate
1217	* is clear wrong do we normalize it.
1218	*/
1219	if (OUT_OF_REAL_MAP (more->map, more->x, more->y))
1220	more->map = get_map_from_coord (m, &more->x, &more->y);
1221	else if (!more->map)
1222	{
1223	/* For backwards compatibility - when not dealing with tiled maps,
1224	* more->map should always point to the parent.
1225	*/
1226	more->map = m;
1227	}
1228
1229	if (insert_ob_in_map (more, more->map, originator, flag) == NULL)
1230	{
1231	if (!op->head)
1232	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1233
1234	return NULL;
1235	}
1236	}
1237		1252
1238	CLEAR_FLAG (op, FLAG_REMOVED);	1253	CLEAR_FLAG (op, FLAG_REMOVED);
1239		1254
1240	/* Ideally, the caller figures this out. However, it complicates a lot	1255	/* Ideally, the caller figures this out. However, it complicates a lot
1241	* of areas of callers (eg, anything that uses find_free_spot would now	1256	* of areas of callers (eg, anything that uses find_free_spot would now
1242	* need extra work	1257	* need extra work
1243	*/	1258	*/
1244	op->map = get_map_from_coord (m, &op->x, &op->y);	1259	if (!xy_normalise (m, op->x, op->y))
1245	x = op->x;	1260	return 0;
1246	y = op->y;	1261
		1262	op->map = m;
		1263	mapspace &ms = op->ms ();
1247		1264
1248	/* this has to be done after we translate the coordinates.	1265	/* this has to be done after we translate the coordinates.
1249	*/	1266	*/
1250	if (op->nrof && !(flag & INS_NO_MERGE))	1267	if (op->nrof && !(flag & INS_NO_MERGE))
1251	for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)	1268	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1252	if (object::can_merge (op, tmp))	1269	if (object::can_merge (op, tmp))
1253	{	1270	{
1254	op->nrof += tmp->nrof;	1271	op->nrof += tmp->nrof;
1255	tmp->destroy ();	1272	tmp->destroy ();
1256	}	1273	}
…		…
1273	op->below = originator->below;	1290	op->below = originator->below;
1274		1291
1275	if (op->below)	1292	if (op->below)
1276	op->below->above = op;	1293	op->below->above = op;
1277	else	1294	else
1278	op->ms ().bottom = op;	1295	ms.bot = op;
1279		1296
1280	/* since *below* originator, no need to update top */	1297	/* since *below* originator, no need to update top */
1281	originator->below = op;	1298	originator->below = op;
1282	}	1299	}
1283	else	1300	else
1284	{	1301	{
		1302	top = ms.bot;
		1303
1285	/* If there are other objects, then */	1304	/* If there are other objects, then */
1286	if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL))	1305	if ((!(flag & INS_MAP_LOAD)) && top)
1287	{	1306	{
1288	object *last = NULL;	1307	object *last = 0;
1289		1308
1290	/*	1309	/*
1291	* If there are multiple objects on this space, we do some trickier handling.	1310	* If there are multiple objects on this space, we do some trickier handling.
1292	* We've already dealt with merging if appropriate.	1311	* We've already dealt with merging if appropriate.
1293	* Generally, we want to put the new object on top. But if	1312	* Generally, we want to put the new object on top. But if
…		…
1297	* once we get to them. This reduces the need to traverse over all of	1316	* once we get to them. This reduces the need to traverse over all of
1298	* them when adding another one - this saves quite a bit of cpu time	1317	* them when adding another one - this saves quite a bit of cpu time
1299	* when lots of spells are cast in one area. Currently, it is presumed	1318	* when lots of spells are cast in one area. Currently, it is presumed
1300	* that flying non pickable objects are spell objects.	1319	* that flying non pickable objects are spell objects.
1301	*/	1320	*/
1302		1321	for (top = ms.bot; top; top = top->above)
1303	while (top != NULL)
1304	{	1322	{
1305	if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))	1323	if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))
1306	floor = top;	1324	floor = top;
1307		1325
1308	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))	1326	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))
…		…
1311	top = top->below;	1329	top = top->below;
1312	break;	1330	break;
1313	}	1331	}
1314		1332
1315	last = top;	1333	last = top;
1316	top = top->above;
1317	}	1334	}
1318		1335
1319	/* Don't want top to be NULL, so set it to the last valid object */	1336	/* Don't want top to be NULL, so set it to the last valid object */
1320	top = last;	1337	top = last;
1321		1338
…		…
1323	* looks like instead of lots of conditions here.	1340	* looks like instead of lots of conditions here.
1324	* makes things faster, and effectively the same result.	1341	* makes things faster, and effectively the same result.
1325	*/	1342	*/
1326		1343
1327	/* Have object 'fall below' other objects that block view.	1344	/* Have object 'fall below' other objects that block view.
1328	* Unless those objects are exits, type 66	1345	* Unless those objects are exits.
1329	* If INS_ON_TOP is used, don't do this processing	1346	* If INS_ON_TOP is used, don't do this processing
1330	* Need to find the object that in fact blocks view, otherwise	1347	* Need to find the object that in fact blocks view, otherwise
1331	* stacking is a bit odd.	1348	* stacking is a bit odd.
1332	*/	1349	*/
1333	if (!(flag & INS_ON_TOP) &&	1350	if (!(flag & INS_ON_TOP)
1334	(get_map_flags (op->map, 0, op->x, op->y, 0, 0) & P_BLOCKSVIEW) && (op->face && !op->face->visibility))	1351	&& ms.flags () & P_BLOCKSVIEW
		1352	&& (op->face && !faces [op->face].visibility))
1335	{	1353	{
1336	for (last = top; last != floor; last = last->below)	1354	for (last = top; last != floor; last = last->below)
1337	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1355	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1338	break;	1356	break;
		1357
1339	/* Check to see if we found the object that blocks view,	1358	/* Check to see if we found the object that blocks view,
1340	* and make sure we have a below pointer for it so that	1359	* and make sure we have a below pointer for it so that
1341	* we can get inserted below this one, which requires we	1360	* we can get inserted below this one, which requires we
1342	* set top to the object below us.	1361	* set top to the object below us.
1343	*/	1362	*/
1344	if (last && last->below && last != floor)	1363	if (last && last->below && last != floor)
1345	top = last->below;	1364	top = last->below;
1346	}	1365	}
1347	} /* If objects on this space */	1366	} /* If objects on this space */
1348
1349	if (flag & INS_MAP_LOAD)	1367	if (flag & INS_MAP_LOAD)
1350	top = GET_MAP_TOP (op->map, op->x, op->y);	1368	top = ms.top;
1351		1369
1352	if (flag & INS_ABOVE_FLOOR_ONLY)	1370	if (flag & INS_ABOVE_FLOOR_ONLY)
1353	top = floor;	1371	top = floor;
1354		1372
1355	/* Top is the object that our object (op) is going to get inserted above.	1373	/* Top is the object that our object (op) is going to get inserted above.
1356	*/	1374	*/
1357		1375
1358	/* First object on this space */	1376	/* First object on this space */
1359	if (!top)	1377	if (!top)
1360	{	1378	{
1361	op->above = GET_MAP_OB (op->map, op->x, op->y);	1379	op->above = ms.bot;
1362		1380
1363	if (op->above)	1381	if (op->above)
1364	op->above->below = op;	1382	op->above->below = op;
1365		1383
1366	op->below = NULL;	1384	op->below = 0;
1367	op->ms ().bottom = op;	1385	ms.bot = op;
1368	}	1386	}
1369	else	1387	else
1370	{ /* get inserted into the stack above top */	1388	{ /* get inserted into the stack above top */
1371	op->above = top->above;	1389	op->above = top->above;
1372		1390
…		…
1375		1393
1376	op->below = top;	1394	op->below = top;
1377	top->above = op;	1395	top->above = op;
1378	}	1396	}
1379		1397
1380	if (op->above == NULL)	1398	if (!op->above)
1381	op->ms ().top = op;	1399	ms.top = op;
1382	} /* else not INS_BELOW_ORIGINATOR */	1400	} /* else not INS_BELOW_ORIGINATOR */
1383		1401
1384	if (op->type == PLAYER)	1402	if (op->type == PLAYER)
		1403	{
1385	op->contr->do_los = 1;	1404	op->contr->do_los = 1;
		1405	++op->map->players;
		1406	op->map->touch ();
		1407	}
1386		1408
1387	/* If we have a floor, we know the player, if any, will be above	1409	op->map->dirty = true;
1388	* it, so save a few ticks and start from there.	1410
1389	*/
1390	if (!(flag & INS_MAP_LOAD))	1411	if (!(flag & INS_MAP_LOAD))
1391	if (object *pl = op->ms ().player ())	1412	if (object *pl = ms.player ())
1392	pl->contr->ns->floorbox_update ();	1413	pl->contr->ns->floorbox_update ();
1393		1414
1394	/* If this object glows, it may affect lighting conditions that are	1415	/* If this object glows, it may affect lighting conditions that are
1395	* visible to others on this map. But update_all_los is really	1416	* visible to others on this map. But update_all_los is really
1396	* an inefficient way to do this, as it means los for all players	1417	* an inefficient way to do this, as it means los for all players
1397	* on the map will get recalculated. The players could very well	1418	* on the map will get recalculated. The players could very well
1398	* be far away from this change and not affected in any way -	1419	* be far away from this change and not affected in any way -
1399	* this should get redone to only look for players within range,	1420	* this should get redone to only look for players within range,
1400	* or just updating the P_NEED_UPDATE for spaces within this area	1421	* or just updating the P_UPTODATE for spaces within this area
1401	* of effect may be sufficient.	1422	* of effect may be sufficient.
1402	*/	1423	*/
1403	if (MAP_DARKNESS (op->map) && (op->glow_radius != 0))	1424	if (op->map->darkness && (op->glow_radius != 0))
1404	update_all_los (op->map, op->x, op->y);	1425	update_all_los (op->map, op->x, op->y);
1405		1426
1406	/* updates flags (blocked, alive, no magic, etc) for this map space */	1427	/* updates flags (blocked, alive, no magic, etc) for this map space */
1407	update_object (op, UP_OBJ_INSERT);	1428	update_object (op, UP_OBJ_INSERT);
		1429
		1430	INVOKE_OBJECT (INSERT, op);
1408		1431
1409	/* Don't know if moving this to the end will break anything. However,	1432	/* Don't know if moving this to the end will break anything. However,
1410	* we want to have floorbox_update called before calling this.	1433	* we want to have floorbox_update called before calling this.
1411	*	1434	*
1412	* check_move_on() must be after this because code called from	1435	* check_move_on() must be after this because code called from
…		…
1414	* blocked() and wall() work properly), and these flags are updated by	1437	* blocked() and wall() work properly), and these flags are updated by
1415	* update_object().	1438	* update_object().
1416	*/	1439	*/
1417		1440
1418	/* if this is not the head or flag has been passed, don't check walk on status */	1441	/* if this is not the head or flag has been passed, don't check walk on status */
1419	if (!(flag & INS_NO_WALK_ON) && !op->head)	1442	if (!(flag & INS_NO_WALK_ON) && op->head_ () == op)
1420	{	1443	{
1421	if (check_move_on (op, originator))	1444	if (check_move_on (op, originator))
1422	return NULL;	1445	return 0;
1423		1446
1424	/* If we are a multi part object, lets work our way through the check	1447	/* If we are a multi part object, lets work our way through the check
1425	* walk on's.	1448	* walk on's.
1426	*/	1449	*/
1427	for (tmp = op->more; tmp != NULL; tmp = tmp->more)	1450	for (object *tmp = op->more; tmp; tmp = tmp->more)
1428	if (check_move_on (tmp, originator))	1451	if (check_move_on (tmp, originator))
1429	return NULL;	1452	return 0;
1430	}	1453	}
1431		1454
1432	return op;	1455	return op;
1433	}	1456	}
1434		1457
…		…
1441	{	1464	{
1442	object *tmp, *tmp1;	1465	object *tmp, *tmp1;
1443		1466
1444	/* first search for itself and remove any old instances */	1467	/* first search for itself and remove any old instances */
1445		1468
1446	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1469	for (tmp = op->ms ().bot; tmp; tmp = tmp->above)
1447	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */	1470	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */
1448	tmp->destroy ();	1471	tmp->destroy ();
1449		1472
1450	tmp1 = arch_to_object (archetype::find (arch_string));	1473	tmp1 = arch_to_object (archetype::find (arch_string));
1451		1474
1452	tmp1->x = op->x;	1475	tmp1->x = op->x;
1453	tmp1->y = op->y;	1476	tmp1->y = op->y;
1454	insert_ob_in_map (tmp1, op->map, op, 0);	1477	insert_ob_in_map (tmp1, op->map, op, 0);
		1478	}
		1479
		1480	object *
		1481	object::insert_at (object *where, object *originator, int flags)
		1482	{
		1483	return where->map->insert (this, where->x, where->y, originator, flags);
1455	}	1484	}
1456		1485
1457	/*	1486	/*
1458	* get_split_ob(ob,nr) splits up ob into two parts. The part which	1487	* get_split_ob(ob,nr) splits up ob into two parts. The part which
1459	* is returned contains nr objects, and the remaining parts contains	1488	* is returned contains nr objects, and the remaining parts contains
1460	* the rest (or is removed and freed if that number is 0).	1489	* the rest (or is removed and freed if that number is 0).
1461	* On failure, NULL is returned, and the reason put into the	1490	* On failure, NULL is returned, and the reason put into the
1462	* global static errmsg array.	1491	* global static errmsg array.
1463	*/	1492	*/
1464
1465	object *	1493	object *
1466	get_split_ob (object *orig_ob, uint32 nr)	1494	get_split_ob (object *orig_ob, uint32 nr)
1467	{	1495	{
1468	object *newob;	1496	object *newob;
1469	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);	1497	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
…		…
1500	* the amount of an object. If the amount reaches 0, the object	1528	* the amount of an object. If the amount reaches 0, the object
1501	* is subsequently removed and freed.	1529	* is subsequently removed and freed.
1502	*	1530	*
1503	* Return value: 'op' if something is left, NULL if the amount reached 0	1531	* Return value: 'op' if something is left, NULL if the amount reached 0
1504	*/	1532	*/
1505
1506	object *	1533	object *
1507	decrease_ob_nr (object *op, uint32 i)	1534	decrease_ob_nr (object *op, uint32 i)
1508	{	1535	{
1509	object *tmp;	1536	object *tmp;
1510	player *pl;
1511		1537
1512	if (i == 0) /* objects with op->nrof require this check */	1538	if (i == 0) /* objects with op->nrof require this check */
1513	return op;	1539	return op;
1514		1540
1515	if (i > op->nrof)	1541	if (i > op->nrof)
…		…
1528	* IMO, searching through all the players will mostly	1554	* IMO, searching through all the players will mostly
1529	* likely be quicker than following op->env to the map,	1555	* likely be quicker than following op->env to the map,
1530	* and then searching the map for a player.	1556	* and then searching the map for a player.
1531	*/	1557	*/
1532	if (!tmp)	1558	if (!tmp)
1533	{	1559	for_all_players (pl)
1534	for (pl = first_player; pl; pl = pl->next)
1535	if (pl->ob->container == op->env)	1560	if (pl->ob->container == op->env)
1536	{	1561	{
1537	tmp = pl->ob;	1562	tmp = pl->ob;
1538	break;	1563	break;
1539	}	1564	}
1540	}
1541		1565
1542	if (i < op->nrof)	1566	if (i < op->nrof)
1543	{	1567	{
1544	sub_weight (op->env, op->weight * i);	1568	sub_weight (op->env, op->weight * i);
1545	op->nrof -= i;	1569	op->nrof -= i;
…		…
1588		1612
1589	/*	1613	/*
1590	* add_weight(object, weight) adds the specified weight to an object,	1614	* add_weight(object, weight) adds the specified weight to an object,
1591	* and also updates how much the environment(s) is/are carrying.	1615	* and also updates how much the environment(s) is/are carrying.
1592	*/	1616	*/
1593
1594	void	1617	void
1595	add_weight (object *op, signed long weight)	1618	add_weight (object *op, signed long weight)
1596	{	1619	{
1597	while (op != NULL)	1620	while (op != NULL)
1598	{	1621	{
…		…
1613	LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);	1636	LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
1614	free (dump);	1637	free (dump);
1615	return op;	1638	return op;
1616	}	1639	}
1617		1640
1618	if (where->head)	1641	if (where->head_ () != where)
1619	{	1642	{
1620	LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n");	1643	LOG (llevError | logBacktrace, "Warning: Tried to insert object into wrong part of multipart object.\n");
1621	where = where->head;	1644	where = where->head;
1622	}	1645	}
1623		1646
1624	return where->insert (op);	1647	return where->insert (op);
1625	}	1648	}
…		…
1630	* inside the object environment.	1653	* inside the object environment.
1631	*	1654	*
1632	* The function returns now pointer to inserted item, and return value can	1655	* The function returns now pointer to inserted item, and return value can
1633	* be != op, if items are merged. -Tero	1656	* be != op, if items are merged. -Tero
1634	*/	1657	*/
1635
1636	object *	1658	object *
1637	object::insert (object *op)	1659	object::insert (object *op)
1638	{	1660	{
1639	object *tmp, *otmp;
1640
1641	if (!QUERY_FLAG (op, FLAG_REMOVED))	1661	if (!QUERY_FLAG (op, FLAG_REMOVED))
1642	op->remove ();	1662	op->remove ();
1643		1663
1644	if (op->more)	1664	if (op->more)
1645	{	1665	{
…		…
1647	return op;	1667	return op;
1648	}	1668	}
1649		1669
1650	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1670	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1651	CLEAR_FLAG (op, FLAG_REMOVED);	1671	CLEAR_FLAG (op, FLAG_REMOVED);
		1672
1652	if (op->nrof)	1673	if (op->nrof)
1653	{	1674	{
1654	for (tmp = inv; tmp != NULL; tmp = tmp->below)	1675	for (object *tmp = inv; tmp; tmp = tmp->below)
1655	if (object::can_merge (tmp, op))	1676	if (object::can_merge (tmp, op))
1656	{	1677	{
1657	/* return the original object and remove inserted object	1678	/* return the original object and remove inserted object
1658	(client needs the original object) */	1679	(client needs the original object) */
1659	tmp->nrof += op->nrof;	1680	tmp->nrof += op->nrof;
…		…
1678	add_weight (this, op->weight * op->nrof);	1699	add_weight (this, op->weight * op->nrof);
1679	}	1700	}
1680	else	1701	else
1681	add_weight (this, (op->weight + op->carrying));	1702	add_weight (this, (op->weight + op->carrying));
1682		1703
1683	otmp = this->in_player ();	1704	if (object *otmp = this->in_player ())
1684	if (otmp && otmp->contr)
1685	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1705	if (otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1686	otmp->update_stats ();	1706	otmp->update_stats ();
1687		1707
		1708	op->owner = 0; // its his/hers now. period.
1688	op->map = 0;	1709	op->map = 0;
1689	op->env = this;	1710	op->env = this;
1690	op->above = 0;	1711	op->above = 0;
1691	op->below = 0;	1712	op->below = 0;
1692	op->x = 0, op->y = 0;	1713	op->x = op->y = 0;
1693		1714
1694	/* reset the light list and los of the players on the map */	1715	/* reset the light list and los of the players on the map */
1695	if ((op->glow_radius != 0) && map)	1716	if (op->glow_radius && map)
1696	{	1717	{
1697	#ifdef DEBUG_LIGHTS	1718	#ifdef DEBUG_LIGHTS
1698	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);	1719	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1699	#endif /* DEBUG_LIGHTS */	1720	#endif /* DEBUG_LIGHTS */
1700	if (MAP_DARKNESS (map))	1721	if (map->darkness)
1701	update_all_los (map, x, y);	1722	update_all_los (map, x, y);
1702	}	1723	}
1703		1724
1704	/* Client has no idea of ordering so lets not bother ordering it here.	1725	/* Client has no idea of ordering so lets not bother ordering it here.
1705	* It sure simplifies this function...	1726	* It sure simplifies this function...
…		…
1710	{	1731	{
1711	op->below = inv;	1732	op->below = inv;
1712	op->below->above = op;	1733	op->below->above = op;
1713	inv = op;	1734	inv = op;
1714	}	1735	}
		1736
		1737	INVOKE_OBJECT (INSERT, this);
1715		1738
1716	return op;	1739	return op;
1717	}	1740	}
1718		1741
1719	/*	1742	/*
…		…
1734	*	1757	*
1735	* MSW 2001-07-08: Check all objects on space, not just those below	1758	* MSW 2001-07-08: Check all objects on space, not just those below
1736	* object being inserted. insert_ob_in_map may not put new objects	1759	* object being inserted. insert_ob_in_map may not put new objects
1737	* on top.	1760	* on top.
1738	*/	1761	*/
1739
1740	int	1762	int
1741	check_move_on (object *op, object *originator)	1763	check_move_on (object *op, object *originator)
1742	{	1764	{
1743	object *tmp;	1765	object *tmp;
1744	maptile *m = op->map;	1766	maptile *m = op->map;
…		…
1771		1793
1772	/* The objects have to be checked from top to bottom.	1794	/* The objects have to be checked from top to bottom.
1773	* Hence, we first go to the top:	1795	* Hence, we first go to the top:
1774	*/	1796	*/
1775		1797
1776	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL && tmp->above != NULL; tmp = tmp->above)	1798	for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above)
1777	{	1799	{
1778	/* Trim the search when we find the first other spell effect	1800	/* Trim the search when we find the first other spell effect
1779	* this helps performance so that if a space has 50 spell objects,	1801	* this helps performance so that if a space has 50 spell objects,
1780	* we don't need to check all of them.	1802	* we don't need to check all of them.
1781	*/	1803	*/
…		…
1799	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||	1821	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
1800	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))	1822	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1801	{	1823	{
1802		1824
1803	float	1825	float
1804	diff = tmp->move_slow_penalty * FABS (op->speed);	1826	diff = tmp->move_slow_penalty * fabs (op->speed);
1805		1827
1806	if (op->type == PLAYER)	1828	if (op->type == PLAYER)
1807	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||	1829	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||
1808	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))	1830	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))
1809	diff /= 4.0;	1831	diff /= 4.0;
…		…
1836	/*	1858	/*
1837	* present_arch(arch, map, x, y) searches for any objects with	1859	* present_arch(arch, map, x, y) searches for any objects with
1838	* a matching archetype at the given map and coordinates.	1860	* a matching archetype at the given map and coordinates.
1839	* The first matching object is returned, or NULL if none.	1861	* The first matching object is returned, or NULL if none.
1840	*/	1862	*/
1841
1842	object *	1863	object *
1843	present_arch (const archetype *at, maptile *m, int x, int y)	1864	present_arch (const archetype *at, maptile *m, int x, int y)
1844	{	1865	{
1845	object *
1846	tmp;
1847
1848	if (m == NULL || out_of_map (m, x, y))	1866	if (!m || out_of_map (m, x, y))
1849	{	1867	{
1850	LOG (llevError, "Present_arch called outside map.\n");	1868	LOG (llevError, "Present_arch called outside map.\n");
1851	return NULL;	1869	return NULL;
1852	}	1870	}
1853	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1871
		1872	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1854	if (tmp->arch == at)	1873	if (tmp->arch == at)
1855	return tmp;	1874	return tmp;
		1875
1856	return NULL;	1876	return NULL;
1857	}	1877	}
1858		1878
1859	/*	1879	/*
1860	* present(type, map, x, y) searches for any objects with	1880	* present(type, map, x, y) searches for any objects with
1861	* a matching type variable at the given map and coordinates.	1881	* a matching type variable at the given map and coordinates.
1862	* The first matching object is returned, or NULL if none.	1882	* The first matching object is returned, or NULL if none.
1863	*/	1883	*/
1864
1865	object *	1884	object *
1866	present (unsigned char type, maptile *m, int x, int y)	1885	present (unsigned char type, maptile *m, int x, int y)
1867	{	1886	{
1868	object *
1869	tmp;
1870
1871	if (out_of_map (m, x, y))	1887	if (out_of_map (m, x, y))
1872	{	1888	{
1873	LOG (llevError, "Present called outside map.\n");	1889	LOG (llevError, "Present called outside map.\n");
1874	return NULL;	1890	return NULL;
1875	}	1891	}
1876	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1892
		1893	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1877	if (tmp->type == type)	1894	if (tmp->type == type)
1878	return tmp;	1895	return tmp;
		1896
1879	return NULL;	1897	return NULL;
1880	}	1898	}
1881		1899
1882	/*	1900	/*
1883	* present_in_ob(type, object) searches for any objects with	1901	* present_in_ob(type, object) searches for any objects with
1884	* a matching type variable in the inventory of the given object.	1902	* a matching type variable in the inventory of the given object.
1885	* The first matching object is returned, or NULL if none.	1903	* The first matching object is returned, or NULL if none.
1886	*/	1904	*/
1887
1888	object *	1905	object *
1889	present_in_ob (unsigned char type, const object *op)	1906	present_in_ob (unsigned char type, const object *op)
1890	{	1907	{
1891	object *
1892	tmp;
1893
1894	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1908	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
1895	if (tmp->type == type)	1909	if (tmp->type == type)
1896	return tmp;	1910	return tmp;
		1911
1897	return NULL;	1912	return NULL;
1898	}	1913	}
1899		1914
1900	/*	1915	/*
1901	* present_in_ob (type, str, object) searches for any objects with	1916	* present_in_ob (type, str, object) searches for any objects with
…		…
1909	* str is the string to match against. Note that we match against	1924	* str is the string to match against. Note that we match against
1910	* the object name, not the archetype name. this is so that the	1925	* the object name, not the archetype name. this is so that the
1911	* spell code can use one object type (force), but change it's name	1926	* spell code can use one object type (force), but change it's name
1912	* to be unique.	1927	* to be unique.
1913	*/	1928	*/
1914
1915	object *	1929	object *
1916	present_in_ob_by_name (int type, const char *str, const object *op)	1930	present_in_ob_by_name (int type, const char *str, const object *op)
1917	{	1931	{
1918	object *
1919	tmp;
1920
1921	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1932	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1922	{
1923	if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name)))	1933	if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name)))
1924	return tmp;	1934	return tmp;
1925	}	1935
1926	return NULL;	1936	return 0;
1927	}	1937	}
1928		1938
1929	/*	1939	/*
1930	* present_arch_in_ob(archetype, object) searches for any objects with	1940	* present_arch_in_ob(archetype, object) searches for any objects with
1931	* a matching archetype in the inventory of the given object.	1941	* a matching archetype in the inventory of the given object.
1932	* The first matching object is returned, or NULL if none.	1942	* The first matching object is returned, or NULL if none.
1933	*/	1943	*/
1934
1935	object *	1944	object *
1936	present_arch_in_ob (const archetype *at, const object *op)	1945	present_arch_in_ob (const archetype *at, const object *op)
1937	{	1946	{
1938	object *
1939	tmp;
1940
1941	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1947	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
1942	if (tmp->arch == at)	1948	if (tmp->arch == at)
1943	return tmp;	1949	return tmp;
		1950
1944	return NULL;	1951	return NULL;
1945	}	1952	}
1946		1953
1947	/*	1954	/*
1948	* activate recursively a flag on an object inventory	1955	* activate recursively a flag on an object inventory
1949	*/	1956	*/
1950	void	1957	void
1951	flag_inv (object *op, int flag)	1958	flag_inv (object *op, int flag)
1952	{	1959	{
1953	object *
1954	tmp;
1955
1956	if (op->inv)	1960	if (op->inv)
1957	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1961	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
1958	{	1962	{
1959	SET_FLAG (tmp, flag);	1963	SET_FLAG (tmp, flag);
1960	flag_inv (tmp, flag);	1964	flag_inv (tmp, flag);
1961	}	1965	}
1962	} /*	1966	}
		1967
		1968	/*
1963	* desactivate recursively a flag on an object inventory	1969	* deactivate recursively a flag on an object inventory
1964	*/	1970	*/
1965	void	1971	void
1966	unflag_inv (object *op, int flag)	1972	unflag_inv (object *op, int flag)
1967	{	1973	{
1968	object *
1969	tmp;
1970
1971	if (op->inv)	1974	if (op->inv)
1972	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1975	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
1973	{	1976	{
1974	CLEAR_FLAG (tmp, flag);	1977	CLEAR_FLAG (tmp, flag);
1975	unflag_inv (tmp, flag);	1978	unflag_inv (tmp, flag);
1976	}	1979	}
1977	}
1978
1979	/*
1980	* set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in
1981	* all it's inventory (recursively).
1982	* If checksums are used, a player will get set_cheat called for
1983	* him/her-self and all object carried by a call to this function.
1984	*/
1985
1986	void
1987	set_cheat (object *op)
1988	{
1989	SET_FLAG (op, FLAG_WAS_WIZ);
1990	flag_inv (op, FLAG_WAS_WIZ);
1991	}	1980	}
1992		1981
1993	/*	1982	/*
1994	* find_free_spot(object, map, x, y, start, stop) will search for	1983	* find_free_spot(object, map, x, y, start, stop) will search for
1995	* a spot at the given map and coordinates which will be able to contain	1984	* a spot at the given map and coordinates which will be able to contain
…		…
2009	* because arch_blocked (now ob_blocked) needs to know the movement type	1998	* because arch_blocked (now ob_blocked) needs to know the movement type
2010	* to know if the space in question will block the object. We can't use	1999	* to know if the space in question will block the object. We can't use
2011	* the archetype because that isn't correct if the monster has been	2000	* the archetype because that isn't correct if the monster has been
2012	* customized, changed states, etc.	2001	* customized, changed states, etc.
2013	*/	2002	*/
2014
2015	int	2003	int
2016	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)	2004	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2017	{	2005	{
2018	int
2019	i,
2020	index = 0, flag;	2006	int index = 0, flag;
2021	static int
2022	altern[SIZEOFFREE];	2007	int altern[SIZEOFFREE];
2023		2008
2024	for (i = start; i < stop; i++)	2009	for (int i = start; i < stop; i++)
2025	{	2010	{
2026	flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]);	2011	flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]);
2027	if (!flag)	2012	if (!flag)
2028	altern[index++] = i;	2013	altern [index++] = i;
2029		2014
2030	/* Basically, if we find a wall on a space, we cut down the search size.	2015	/* Basically, if we find a wall on a space, we cut down the search size.
2031	* In this way, we won't return spaces that are on another side of a wall.	2016	* In this way, we won't return spaces that are on another side of a wall.
2032	* This mostly work, but it cuts down the search size in all directions -	2017	* This mostly work, but it cuts down the search size in all directions -
2033	* if the space being examined only has a wall to the north and empty	2018	* if the space being examined only has a wall to the north and empty
…		…
2040	}	2025	}
2041		2026
2042	if (!index)	2027	if (!index)
2043	return -1;	2028	return -1;
2044		2029
2045	return altern[RANDOM () % index];	2030	return altern [rndm (index)];
2046	}	2031	}
2047		2032
2048	/*	2033	/*
2049	* find_first_free_spot(archetype, maptile, x, y) works like	2034	* find_first_free_spot(archetype, maptile, x, y) works like
2050	* find_free_spot(), but it will search max number of squares.	2035	* find_free_spot(), but it will search max number of squares.
2051	* But it will return the first available spot, not a random choice.	2036	* But it will return the first available spot, not a random choice.
2052	* Changed 0.93.2: Have it return -1 if there is no free spot available.	2037	* Changed 0.93.2: Have it return -1 if there is no free spot available.
2053	*/	2038	*/
2054
2055	int	2039	int
2056	find_first_free_spot (const object *ob, maptile *m, int x, int y)	2040	find_first_free_spot (const object *ob, maptile *m, int x, int y)
2057	{	2041	{
2058	int
2059	i;
2060
2061	for (i = 0; i < SIZEOFFREE; i++)	2042	for (int i = 0; i < SIZEOFFREE; i++)
2062	{
2063	if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]))	2043	if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]))
2064	return i;	2044	return i;
2065	}	2045
2066	return -1;	2046	return -1;
2067	}	2047	}
2068		2048
2069	/*	2049	/*
2070	* The function permute(arr, begin, end) randomly reorders the array	2050	* The function permute(arr, begin, end) randomly reorders the array
2071	* arr[begin..end-1].	2051	* arr[begin..end-1].
		2052	* now uses a fisher-yates shuffle, old permute was broken
2072	*/	2053	*/
2073	static void	2054	static void
2074	permute (int *arr, int begin, int end)	2055	permute (int *arr, int begin, int end)
2075	{	2056	{
2076	int	2057	arr += begin;
2077	i,
2078	j,
2079	tmp,
2080	len;
2081
2082	len = end - begin;	2058	end -= begin;
2083	for (i = begin; i < end; i++)
2084	{
2085	j = begin + RANDOM () % len;
2086		2059
2087	tmp = arr[i];	2060	while (--end)
2088	arr[i] = arr[j];	2061	swap (arr [end], arr [rndm (end + 1)]);
2089	arr[j] = tmp;
2090	}
2091	}	2062	}
2092		2063
2093	/* new function to make monster searching more efficient, and effective!	2064	/* new function to make monster searching more efficient, and effective!
2094	* This basically returns a randomized array (in the passed pointer) of	2065	* This basically returns a randomized array (in the passed pointer) of
2095	* the spaces to find monsters. In this way, it won't always look for	2066	* the spaces to find monsters. In this way, it won't always look for
…		…
2098	* the 3x3 area will be searched, just not in a predictable order.	2069	* the 3x3 area will be searched, just not in a predictable order.
2099	*/	2070	*/
2100	void	2071	void
2101	get_search_arr (int *search_arr)	2072	get_search_arr (int *search_arr)
2102	{	2073	{
2103	int	2074	int i;
2104	i;
2105		2075
2106	for (i = 0; i < SIZEOFFREE; i++)	2076	for (i = 0; i < SIZEOFFREE; i++)
2107	{
2108	search_arr[i] = i;	2077	search_arr[i] = i;
2109	}
2110		2078
2111	permute (search_arr, 1, SIZEOFFREE1 + 1);	2079	permute (search_arr, 1, SIZEOFFREE1 + 1);
2112	permute (search_arr, SIZEOFFREE1 + 1, SIZEOFFREE2 + 1);	2080	permute (search_arr, SIZEOFFREE1 + 1, SIZEOFFREE2 + 1);
2113	permute (search_arr, SIZEOFFREE2 + 1, SIZEOFFREE);	2081	permute (search_arr, SIZEOFFREE2 + 1, SIZEOFFREE);
2114	}	2082	}
…		…
2123	* Perhaps incorrectly, but I'm making the assumption that exclude	2091	* Perhaps incorrectly, but I'm making the assumption that exclude
2124	* is actually want is going to try and move there. We need this info	2092	* is actually want is going to try and move there. We need this info
2125	* because we have to know what movement the thing looking to move	2093	* because we have to know what movement the thing looking to move
2126	* there is capable of.	2094	* there is capable of.
2127	*/	2095	*/
2128
2129	int	2096	int
2130	find_dir (maptile *m, int x, int y, object *exclude)	2097	find_dir (maptile *m, int x, int y, object *exclude)
2131	{	2098	{
2132	int
2133	i,
2134	max = SIZEOFFREE, mflags;	2099	int i, max = SIZEOFFREE, mflags;
2135		2100
2136	sint16 nx, ny;	2101	sint16 nx, ny;
2137	object *	2102	object *tmp;
2138	tmp;
2139	maptile *	2103	maptile *mp;
2140	mp;
2141		2104
2142	MoveType blocked, move_type;	2105	MoveType blocked, move_type;
2143		2106
2144	if (exclude && exclude->head)	2107	if (exclude && exclude->head_ () != exclude)
2145	{	2108	{
2146	exclude = exclude->head;	2109	exclude = exclude->head;
2147	move_type = exclude->move_type;	2110	move_type = exclude->move_type;
2148	}	2111	}
2149	else	2112	else
…		…
2162		2125
2163	if (mflags & P_OUT_OF_MAP)	2126	if (mflags & P_OUT_OF_MAP)
2164	max = maxfree[i];	2127	max = maxfree[i];
2165	else	2128	else
2166	{	2129	{
2167	blocked = GET_MAP_MOVE_BLOCK (mp, nx, ny);	2130	mapspace &ms = mp->at (nx, ny);
		2131
		2132	blocked = ms.move_block;
2168		2133
2169	if ((move_type & blocked) == move_type)	2134	if ((move_type & blocked) == move_type)
2170	max = maxfree[i];	2135	max = maxfree[i];
2171	else if (mflags & P_IS_ALIVE)	2136	else if (mflags & P_IS_ALIVE)
2172	{	2137	{
2173	for (tmp = GET_MAP_OB (mp, nx, ny); tmp; tmp = tmp->above)	2138	for (tmp = ms.bot; tmp; tmp = tmp->above)
2174	if ((QUERY_FLAG (tmp, FLAG_MONSTER) || tmp->type == PLAYER) && (tmp != exclude || (tmp->head && tmp->head != exclude)))	2139	if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)
		2140	&& (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2175	break;	2141	break;
2176		2142
2177	if (tmp)	2143	if (tmp)
2178	return freedir[i];	2144	return freedir[i];
2179	}	2145	}
…		…
2185		2151
2186	/*	2152	/*
2187	* distance(object 1, object 2) will return the square of the	2153	* distance(object 1, object 2) will return the square of the
2188	* distance between the two given objects.	2154	* distance between the two given objects.
2189	*/	2155	*/
2190
2191	int	2156	int
2192	distance (const object *ob1, const object *ob2)	2157	distance (const object *ob1, const object *ob2)
2193	{	2158	{
2194	int i;
2195
2196	i = (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);	2159	return (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);
2197	return i;
2198	}	2160	}
2199		2161
2200	/*	2162	/*
2201	* find_dir_2(delta-x,delta-y) will return a direction in which	2163	* find_dir_2(delta-x,delta-y) will return a direction in which
2202	* an object which has subtracted the x and y coordinates of another	2164	* an object which has subtracted the x and y coordinates of another
2203	* object, needs to travel toward it.	2165	* object, needs to travel toward it.
2204	*/	2166	*/
2205
2206	int	2167	int
2207	find_dir_2 (int x, int y)	2168	find_dir_2 (int x, int y)
2208	{	2169	{
2209	int q;	2170	int q;
2210		2171
…		…
2239		2200
2240	return 3;	2201	return 3;
2241	}	2202	}
2242		2203
2243	/*	2204	/*
2244	* absdir(int): Returns a number between 1 and 8, which represent
2245	* the "absolute" direction of a number (it actually takes care of
2246	* "overflow" in previous calculations of a direction).
2247	*/
2248
2249	int
2250	absdir (int d)
2251	{
2252	while (d < 1)
2253	d += 8;
2254	while (d > 8)
2255	d -= 8;
2256	return d;
2257	}
2258
2259	/*
2260	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is	2205	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is
2261	* between two directions (which are expected to be absolute (see absdir())	2206	* between two directions (which are expected to be absolute (see absdir())
2262	*/	2207	*/
2263
2264	int	2208	int
2265	dirdiff (int dir1, int dir2)	2209	dirdiff (int dir1, int dir2)
2266	{	2210	{
2267	int	2211	int d;
2268	d;
2269		2212
2270	d = abs (dir1 - dir2);	2213	d = abs (dir1 - dir2);
2271	if (d > 4)	2214	if (d > 4)
2272	d = 8 - d;	2215	d = 8 - d;
		2216
2273	return d;	2217	return d;
2274	}	2218	}
2275		2219
2276	/* peterm:	2220	/* peterm:
2277	* do LOS stuff for ball lightning. Go after the closest VISIBLE monster.	2221	* do LOS stuff for ball lightning. Go after the closest VISIBLE monster.
…		…
2280	* This basically means that if direction is 15, then it could either go	2224	* This basically means that if direction is 15, then it could either go
2281	* direction 4, 14, or 16 to get back to where we are.	2225	* direction 4, 14, or 16 to get back to where we are.
2282	* Moved from spell_util.c to object.c with the other related direction	2226	* Moved from spell_util.c to object.c with the other related direction
2283	* functions.	2227	* functions.
2284	*/	2228	*/
2285
2286	int
2287	reduction_dir[SIZEOFFREE][3] = {	2229	int reduction_dir[SIZEOFFREE][3] = {
2288	{0, 0, 0}, /* 0 */	2230	{0, 0, 0}, /* 0 */
2289	{0, 0, 0}, /* 1 */	2231	{0, 0, 0}, /* 1 */
2290	{0, 0, 0}, /* 2 */	2232	{0, 0, 0}, /* 2 */
2291	{0, 0, 0}, /* 3 */	2233	{0, 0, 0}, /* 3 */
2292	{0, 0, 0}, /* 4 */	2234	{0, 0, 0}, /* 4 */
…		…
2383	* Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause	2325	* Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause
2384	* core dumps if they do.	2326	* core dumps if they do.
2385	*	2327	*
2386	* Add a check so we can't pick up invisible objects (0.93.8)	2328	* Add a check so we can't pick up invisible objects (0.93.8)
2387	*/	2329	*/
2388
2389	int	2330	int
2390	can_pick (const object *who, const object *item)	2331	can_pick (const object *who, const object *item)
2391	{	2332	{
2392	return /*QUERY_FLAG(who,FLAG_WIZ)|| */	2333	return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2393	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&	2334	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
…		…
2398	* create clone from object to another	2339	* create clone from object to another
2399	*/	2340	*/
2400	object *	2341	object *
2401	object_create_clone (object *asrc)	2342	object_create_clone (object *asrc)
2402	{	2343	{
2403	object *dst = 0, *tmp, *src, *part, *prev, *item;	2344	object *dst = 0, *tmp, *src, *prev, *item;
2404		2345
2405	if (!asrc)	2346	if (!asrc)
2406	return 0;	2347	return 0;
2407		2348
2408	src = asrc;
2409	if (src->head)
2410	src = src->head;	2349	src = asrc->head_ ();
2411		2350
2412	prev = 0;	2351	prev = 0;
2413	for (part = src; part; part = part->more)	2352	for (object *part = src; part; part = part->more)
2414	{	2353	{
2415	tmp = part->clone ();	2354	tmp = part->clone ();
2416	tmp->x -= src->x;	2355	tmp->x -= src->x;
2417	tmp->y -= src->y;	2356	tmp->y -= src->y;
2418		2357
…		…
2436	insert_ob_in_ob (object_create_clone (item), dst);	2375	insert_ob_in_ob (object_create_clone (item), dst);
2437		2376
2438	return dst;	2377	return dst;
2439	}	2378	}
2440		2379
2441	/* GROS - Creates an object using a string representing its content. */
2442	/* Basically, we save the content of the string to a temp file, then call */
2443	/* load_object on it. I admit it is a highly inefficient way to make things, */
2444	/* but it was simple to make and allows reusing the load_object function. */
2445	/* Remember not to use load_object_str in a time-critical situation. */
2446	/* Also remember that multiparts objects are not supported for now. */
2447
2448	object *
2449	load_object_str (const char *obstr)
2450	{
2451	object *op;
2452	char filename[MAX_BUF];
2453
2454	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2455
2456	FILE *tempfile = fopen (filename, "w");
2457
2458	if (tempfile == NULL)
2459	{
2460	LOG (llevError, "Error - Unable to access load object temp file\n");
2461	return NULL;
2462	}
2463
2464	fprintf (tempfile, obstr);
2465	fclose (tempfile);
2466
2467	op = object::create ();
2468
2469	object_thawer thawer (filename);
2470
2471	if (thawer)
2472	load_object (thawer, op, 0);
2473
2474	LOG (llevDebug, " load str completed, object=%s\n", &op->name);
2475	CLEAR_FLAG (op, FLAG_REMOVED);
2476
2477	return op;
2478	}
2479
2480	/* This returns the first object in who's inventory that	2380	/* This returns the first object in who's inventory that
2481	* has the same type and subtype match.	2381	* has the same type and subtype match.
2482	* returns NULL if no match.	2382	* returns NULL if no match.
2483	*/	2383	*/
2484	object *	2384	object *
2485	find_obj_by_type_subtype (const object *who, int type, int subtype)	2385	find_obj_by_type_subtype (const object *who, int type, int subtype)
2486	{	2386	{
2487	object *tmp;
2488
2489	for (tmp = who->inv; tmp; tmp = tmp->below)	2387	for (object *tmp = who->inv; tmp; tmp = tmp->below)
2490	if (tmp->type == type && tmp->subtype == subtype)	2388	if (tmp->type == type && tmp->subtype == subtype)
2491	return tmp;	2389	return tmp;
2492		2390
2493	return NULL;	2391	return 0;
2494	}	2392	}
2495		2393
2496	/* If ob has a field named key, return the link from the list,	2394	/* If ob has a field named key, return the link from the list,
2497	* otherwise return NULL.	2395	* otherwise return NULL.
2498	*	2396	*
…		…
2500	* do the desired thing.	2398	* do the desired thing.
2501	*/	2399	*/
2502	key_value *	2400	key_value *
2503	get_ob_key_link (const object *ob, const char *key)	2401	get_ob_key_link (const object *ob, const char *key)
2504	{	2402	{
2505	key_value *link;
2506
2507	for (link = ob->key_values; link != NULL; link = link->next)	2403	for (key_value *link = ob->key_values; link; link = link->next)
2508	if (link->key == key)	2404	if (link->key == key)
2509	return link;	2405	return link;
2510		2406
2511	return NULL;	2407	return 0;
2512	}	2408	}
2513		2409
2514	/*	2410	/*
2515	* Returns the value of op has an extra_field for key, or NULL.	2411	* Returns the value of op has an extra_field for key, or NULL.
2516	*	2412	*
…		…
2541	if (link->key == canonical_key)	2437	if (link->key == canonical_key)
2542	return link->value;	2438	return link->value;
2543		2439
2544	return 0;	2440	return 0;
2545	}	2441	}
2546
2547		2442
2548	/*	2443	/*
2549	* Updates the canonical_key in op to value.	2444	* Updates the canonical_key in op to value.
2550	*	2445	*
2551	* canonical_key is a shared string (value doesn't have to be).	2446	* canonical_key is a shared string (value doesn't have to be).
…		…
2556	* Returns TRUE on success.	2451	* Returns TRUE on success.
2557	*/	2452	*/
2558	int	2453	int
2559	set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key)	2454	set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key)
2560	{	2455	{
2561	key_value *
2562	field = NULL, *last = NULL;	2456	key_value *field = NULL, *last = NULL;
2563		2457
2564	for (field = op->key_values; field != NULL; field = field->next)	2458	for (field = op->key_values; field != NULL; field = field->next)
2565	{	2459	{
2566	if (field->key != canonical_key)	2460	if (field->key != canonical_key)
2567	{	2461	{
…		…
2576	/* Basically, if the archetype has this key set,	2470	/* Basically, if the archetype has this key set,
2577	* we need to store the null value so when we save	2471	* we need to store the null value so when we save
2578	* it, we save the empty value so that when we load,	2472	* it, we save the empty value so that when we load,
2579	* we get this value back again.	2473	* we get this value back again.
2580	*/	2474	*/
2581	if (get_ob_key_link (&op->arch->clone, canonical_key))	2475	if (get_ob_key_link (op->arch, canonical_key))
2582	field->value = 0;	2476	field->value = 0;
2583	else	2477	else
2584	{	2478	{
2585	if (last)	2479	if (last)
2586	last->next = field->next;	2480	last->next = field->next;
…		…
2595	/* IF we get here, key doesn't exist */	2489	/* IF we get here, key doesn't exist */
2596		2490
2597	/* No field, we'll have to add it. */	2491	/* No field, we'll have to add it. */
2598		2492
2599	if (!add_key)	2493	if (!add_key)
2600	{
2601	return FALSE;	2494	return FALSE;
2602	}	2495
2603	/* There isn't any good reason to store a null	2496	/* There isn't any good reason to store a null
2604	* value in the key/value list. If the archetype has	2497	* value in the key/value list. If the archetype has
2605	* this key, then we should also have it, so shouldn't	2498	* this key, then we should also have it, so shouldn't
2606	* be here. If user wants to store empty strings,	2499	* be here. If user wants to store empty strings,
2607	* should pass in ""	2500	* should pass in ""
…		…
2656	}	2549	}
2657	else	2550	else
2658	item = item->env;	2551	item = item->env;
2659	}	2552	}
2660		2553
		2554	const char *
		2555	object::flag_desc (char *desc, int len) const
		2556	{
		2557	char *p = desc;
		2558	bool first = true;
		2559
		2560	*p = 0;
		2561
		2562	for (int i = 0; i < NUM_FLAGS; i++)
		2563	{
		2564	if (len <= 10) // magic constant!
		2565	{
		2566	snprintf (p, len, ",...");
		2567	break;
		2568	}
		2569
		2570	if (flag [i])
		2571	{
		2572	int cnt = snprintf (p, len, "%s%d", first ? "" : ",", i);
		2573	len -= cnt;
		2574	p += cnt;
		2575	first = false;
		2576	}
		2577	}
		2578
		2579	return desc;
		2580	}
		2581
2661	// return a suitable string describing an objetc in enough detail to find it	2582	// return a suitable string describing an object in enough detail to find it
2662	const char *	2583	const char *
2663	object::debug_desc (char *info) const	2584	object::debug_desc (char *info) const
2664	{	2585	{
		2586	char flagdesc[512];
2665	char info2[256 * 3];	2587	char info2[256 * 4];
2666	char *p = info;	2588	char *p = info;
2667		2589
2668	p += snprintf (p, 256, "%d=\"%s%s%s\"",	2590	p += snprintf (p, 512, "{cnt:%d,uuid:<1.%" PRIx64 ">,name:\"%s\"%s%s,flags:[%s],type:%d}",
2669	count,	2591	count, uuid.seq,
2670	&name,	2592	&name,
2671	title ? " " : "",	2593	title ? "\",title:\"" : "",
2672	title ? (const char *)title : "");	2594	title ? (const char *)title : "",
		2595	flag_desc (flagdesc, 512), type);
2673		2596
2674	if (env)	2597	if (!this->flag[FLAG_REMOVED] && env)
2675	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2598	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2676		2599
2677	if (map)	2600	if (map)
2678	p += snprintf (p, 256, "(on %s@%d+%d)", map->path, x, y);	2601	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2679		2602
2680	return info;	2603	return info;
2681	}	2604	}
2682		2605
2683	const char *	2606	const char *
2684	object::debug_desc () const	2607	object::debug_desc () const
2685	{	2608	{
2686	static char info[256 * 3];	2609	static char info[3][256 * 4];
		2610	static int info_idx;
		2611
2687	return debug_desc (info);	2612	return debug_desc (info [++info_idx % 3]);
2688	}	2613	}
2689		2614
		2615	struct region *
		2616	object::region () const
		2617	{
		2618	return map ? map->region (x, y)
		2619	: region::default_region ();
		2620	}
		2621
		2622	const materialtype_t *
		2623	object::dominant_material () const
		2624	{
		2625	if (materialtype_t *mt = name_to_material (materialname))
		2626	return mt;
		2627
		2628	return name_to_material (shstr_unknown);
		2629	}
		2630
		2631	void
		2632	object::open_container (object *new_container)
		2633	{
		2634	if (container == new_container)
		2635	return;
		2636
		2637	if (object *old_container = container)
		2638	{
		2639	if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
		2640	return;
		2641
		2642	#if 0
		2643	// remove the "Close old_container" object.
		2644	if (object *closer = old_container->inv)
		2645	if (closer->type == CLOSE_CON)
		2646	closer->destroy ();
		2647	#endif
		2648
		2649	old_container->flag [FLAG_APPLIED] = 0;
		2650	container = 0;
		2651
		2652	esrv_update_item (UPD_FLAGS, this, old_container);
		2653	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
		2654	play_sound (sound_find ("chest_close"));
		2655	}
		2656
		2657	if (new_container)
		2658	{
		2659	if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))
		2660	return;
		2661
		2662	// TODO: this does not seem to serve any purpose anymore?
		2663	#if 0
		2664	// insert the "Close Container" object.
		2665	if (archetype *closer = new_container->other_arch)
		2666	{
		2667	object *closer = arch_to_object (new_container->other_arch);
		2668	closer->flag [FLAG_NO_MAP_SAVE] = 1;
		2669	new_container->insert (closer);
		2670	}
		2671	#endif
		2672
		2673	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));
		2674
		2675	new_container->flag [FLAG_APPLIED] = 1;
		2676	container = new_container;
		2677
		2678	esrv_update_item (UPD_FLAGS, this, new_container);
		2679	esrv_send_inventory (this, new_container);
		2680	play_sound (sound_find ("chest_open"));
		2681	}
		2682	}
		2683
		2684	object *
		2685	object::force_find (const shstr name)
		2686	{
		2687	/* cycle through his inventory to look for the MARK we want to
		2688	* place
		2689	*/
		2690	for (object *tmp = inv; tmp; tmp = tmp->below)
		2691	if (tmp->type == FORCE && tmp->slaying == name)
		2692	return splay (tmp);
		2693
		2694	return 0;
		2695	}
		2696
		2697	void
		2698	object::force_add (const shstr name, int duration)
		2699	{
		2700	if (object *force = force_find (name))
		2701	force->destroy ();
		2702
		2703	object *force = get_archetype (FORCE_NAME);
		2704
		2705	force->slaying = name;
		2706	force->stats.food = 1;
		2707	force->speed_left = -1.f;
		2708
		2709	force->set_speed (duration ? 1.f / duration : 0.f);
		2710	force->flag [FLAG_IS_USED_UP] = true;
		2711	force->flag [FLAG_APPLIED] = true;
		2712
		2713	insert (force);
		2714	}
		2715
		2716	void
		2717	object::play_sound (faceidx sound) const
		2718	{
		2719	if (!sound)
		2720	return;
		2721
		2722	if (flag [FLAG_REMOVED])
		2723	return;
		2724
		2725	if (env)
		2726	{
		2727	if (object *pl = in_player ())
		2728	pl->contr->play_sound (sound);
		2729	}
		2730	else
		2731	map->play_sound (sound, x, y);
		2732	}
		2733

Diff Legend

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