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.75 by root, Wed Dec 20 11:36:38 2006 UTC vs.
Revision 1.189 by root, Thu Sep 13 16:23:01 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
…		…
221	SET_FLAG (ob1, FLAG_BEEN_APPLIED);	222	SET_FLAG (ob1, FLAG_BEEN_APPLIED);
222		223
223	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))	224	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))
224	SET_FLAG (ob2, FLAG_BEEN_APPLIED);	225	SET_FLAG (ob2, FLAG_BEEN_APPLIED);
225		226
226	if ((ob1->flags ^ ob2->flags).reset (FLAG_INV_LOCKED).reset (FLAG_CLIENT_SENT).any ()	227	if ((ob1->flag ^ ob2->flag).reset (FLAG_INV_LOCKED).reset (FLAG_CLIENT_SENT).any ()
227	|| ob1->arch != ob2->arch	228	|| ob1->arch != ob2->arch
228	|| ob1->name != ob2->name	229	|| ob1->name != ob2->name
229	|| ob1->title != ob2->title	230	|| ob1->title != ob2->title
230	|| ob1->msg != ob2->msg	231	|| ob1->msg != ob2->msg
231	|| ob1->weight != ob2->weight	232	|| ob1->weight != ob2->weight
…		…
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	void object::clear ()	529	object &
		530	object::operator =(const object &src)
473	{	531	{
474	attachable_base::clear ();	532	bool is_freed = flag [FLAG_FREED];
		533	bool is_removed = flag [FLAG_REMOVED];
475		534
476	free_key_values (this);
477
478	owner = 0;
479	name = 0;
480	name_pl = 0;
481	title = 0;
482	race = 0;
483	slaying = 0;
484	skill = 0;
485	msg = 0;
486	lore = 0;
487	custom_name = 0;
488	materialname = 0;
489	contr = 0;
490	below = 0;
491	above = 0;
492	inv = 0;
493	container = 0;
494	env = 0;
495	more = 0;
496	head = 0;
497	map = 0;
498	active_next = 0;
499	active_prev = 0;
500
501	memset (static_cast<object_pod *>(this), 0, sizeof (object_pod));
502
503	SET_FLAG (this, FLAG_REMOVED);
504
505	/* What is not cleared is next, prev, and count */
506
507	expmul = 1.0;
508	face = blank_face;
509
510	if (settings.casting_time)
511	casting_time = -1;
512	}
513
514	/*
515	* copy_to first frees everything allocated by the dst object,
516	* and then copies the contents of itself into the second
517	* object, allocating what needs to be allocated. Basically, any
518	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
519	* if the first object is freed, the pointers in the new object
520	* will point at garbage.
521	*/
522	void
523	object::copy_to (object *dst)
524	{
525	bool is_freed = QUERY_FLAG (dst, FLAG_FREED);
526	bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED);
527
528	*(object_copy *)dst = *this;	535	*(object_copy *)this = src;
529	*(object_pod *)dst = *this;
530		536
531	if (self || cb)	537	flag [FLAG_FREED] = is_freed;
532	INVOKE_OBJECT (CLONE, this, ARG_OBJECT (dst));	538	flag [FLAG_REMOVED] = is_removed;
533
534	if (is_freed)
535	SET_FLAG (dst, FLAG_FREED);
536
537	if (is_removed)
538	SET_FLAG (dst, FLAG_REMOVED);
539
540	if (speed < 0)
541	dst->speed_left = speed_left - RANDOM () % 200 / 100.0;
542		539
543	/* Copy over key_values, if any. */	540	/* Copy over key_values, if any. */
544	if (key_values)	541	if (src.key_values)
545	{	542	{
546	key_value *tail = 0;	543	key_value *tail = 0;
547	key_value *i;
548
549	dst->key_values = 0;	544	key_values = 0;
550		545
551	for (i = key_values; i; i = i->next)	546	for (key_value *i = src.key_values; i; i = i->next)
552	{	547	{
553	key_value *new_link = new key_value;	548	key_value *new_link = new key_value;
554		549
555	new_link->next = 0;	550	new_link->next = 0;
556	new_link->key = i->key;	551	new_link->key = i->key;
557	new_link->value = i->value;	552	new_link->value = i->value;
558		553
559	/* Try and be clever here, too. */	554	/* Try and be clever here, too. */
560	if (!dst->key_values)	555	if (!key_values)
561	{	556	{
562	dst->key_values = new_link;	557	key_values = new_link;
563	tail = new_link;	558	tail = new_link;
564	}	559	}
565	else	560	else
566	{	561	{
567	tail->next = new_link;	562	tail->next = new_link;
568	tail = new_link;	563	tail = new_link;
569	}	564	}
570	}	565	}
571	}	566	}
		567	}
572		568
573	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 ();
574	}	605	}
575		606
576	object *	607	object *
577	object::clone ()	608	object::clone ()
578	{	609	{
…		…
584	/*	615	/*
585	* 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
586	* 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
587	* 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.
588	*/	619	*/
589
590	void	620	void
591	update_turn_face (object *op)	621	update_turn_face (object *op)
592	{	622	{
593	if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || op->arch == NULL)	623	if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || !op->arch)
594	return;	624	return;
		625
595	SET_ANIMATION (op, op->direction);	626	SET_ANIMATION (op, op->direction);
596	update_object (op, UP_OBJ_FACE);	627	update_object (op, UP_OBJ_FACE);
597	}	628	}
598		629
599	/*	630	/*
600	* 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
601	* 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.
602	* 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.
603	*/	634	*/
604	void	635	void
605	update_ob_speed (object *op)	636	object::set_speed (float speed)
606	{	637	{
607	extern int arch_init;	638	if (flag [FLAG_FREED] && speed)
608
609	/* No reason putting the archetypes objects on the speed list,
610	* since they never really need to be updated.
611	*/
612
613	if (QUERY_FLAG (op, FLAG_FREED) && op->speed)
614	{	639	{
615	LOG (llevError, "Object %s is freed but has speed.\n", &op->name);	640	LOG (llevError, "Object %s is freed but has speed.\n", &name);
616	#ifdef MANY_CORES
617	abort ();
618	#else
619	op->speed = 0;	641	speed = 0;
620	#endif
621	}
622
623	if (arch_init)
624	return;
625
626	if (FABS (op->speed) > MIN_ACTIVE_SPEED)
627	{	642	}
628	/* If already on active list, don't do anything */
629	if (op->active_next || op->active_prev || op == active_objects)
630	return;
631		643
632	/* process_events() expects us to insert the object at the beginning	644	this->speed = speed;
633	* of the list. */
634	op->active_next = active_objects;
635		645
636	if (op->active_next != NULL)	646	if (has_active_speed ())
637	op->active_next->active_prev = op;	647	activate ();
638
639	active_objects = op;
640	}
641	else	648	else
642	{	649	deactivate ();
643	/* If not on the active list, nothing needs to be done */
644	if (!op->active_next && !op->active_prev && op != active_objects)
645	return;
646
647	if (op->active_prev == NULL)
648	{
649	active_objects = op->active_next;
650
651	if (op->active_next != NULL)
652	op->active_next->active_prev = NULL;
653	}
654	else
655	{
656	op->active_prev->active_next = op->active_next;
657
658	if (op->active_next)
659	op->active_next->active_prev = op->active_prev;
660	}
661
662	op->active_next = NULL;
663	op->active_prev = NULL;
664	}
665	}
666
667	/* This function removes object 'op' from the list of active
668	* objects.
669	* This should only be used for style maps or other such
670	* reference maps where you don't want an object that isn't
671	* in play chewing up cpu time getting processed.
672	* The reverse of this is to call update_ob_speed, which
673	* will do the right thing based on the speed of the object.
674	*/
675	void
676	remove_from_active_list (object *op)
677	{
678	/* If not on the active list, nothing needs to be done */
679	if (!op->active_next && !op->active_prev && op != active_objects)
680	return;
681
682	if (op->active_prev == NULL)
683	{
684	active_objects = op->active_next;
685	if (op->active_next != NULL)
686	op->active_next->active_prev = NULL;
687	}
688	else
689	{
690	op->active_prev->active_next = op->active_next;
691	if (op->active_next)
692	op->active_next->active_prev = op->active_prev;
693	}
694	op->active_next = NULL;
695	op->active_prev = NULL;
696	}	650	}
697		651
698	/*	652	/*
699	* update_object() updates the the map.	653	* update_object() updates the the map.
700	* It takes into account invisible objects (and represent squares covered	654	* It takes into account invisible objects (and represent squares covered
…		…
713	* UP_OBJ_FACE: only the objects face has changed.	667	* UP_OBJ_FACE: only the objects face has changed.
714	*/	668	*/
715	void	669	void
716	update_object (object *op, int action)	670	update_object (object *op, int action)
717	{	671	{
718	MoveType move_on, move_off, move_block, move_slow;
719
720	if (op == NULL)	672	if (op == NULL)
721	{	673	{
722	/* this should never happen */	674	/* this should never happen */
723	LOG (llevDebug, "update_object() called for NULL object.\n");	675	LOG (llevDebug, "update_object() called for NULL object.\n");
724	return;	676	return;
…		…
737	*/	689	*/
738	if (!op->map || op->map->in_memory == MAP_SAVING)	690	if (!op->map || op->map->in_memory == MAP_SAVING)
739	return;	691	return;
740		692
741	/* make sure the object is within map boundaries */	693	/* make sure the object is within map boundaries */
742	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)
743	{	695	{
744	LOG (llevError, "update_object() called for object out of map!\n");	696	LOG (llevError, "update_object() called for object out of map!\n");
745	#ifdef MANY_CORES	697	#ifdef MANY_CORES
746	abort ();	698	abort ();
747	#endif	699	#endif
748	return;	700	return;
749	}	701	}
750		702
751	mapspace &m = op->map->at (op->x, op->y);	703	mapspace &m = op->ms ();
752		704
753	if (m.flags_ & P_NEED_UPDATE)	705	if (!(m.flags_ & P_UPTODATE))
754	/* nop */;	706	/* nop */;
755	else if (action == UP_OBJ_INSERT)	707	else if (action == UP_OBJ_INSERT)
756	{	708	{
757	// this is likely overkill, TODO: revisit (schmorp)	709	// this is likely overkill, TODO: revisit (schmorp)
758	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))	710	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
…		…
767	/* 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
768	* to have move_allow right now.	720	* to have move_allow right now.
769	*/	721	*/
770	|| ((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
771	|| 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)
772	m.flags_ = P_NEED_UPDATE;	724	m.flags_ = 0;
773	}	725	}
774	/* if the object is being removed, we can't make intelligent	726	/* if the object is being removed, we can't make intelligent
775	* decisions, because remove_ob can't really pass the object	727	* decisions, because remove_ob can't really pass the object
776	* that is being removed.	728	* that is being removed.
777	*/	729	*/
778	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)	730	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
779	m.flags_ = P_NEED_UPDATE;	731	m.flags_ = 0;
780	else if (action == UP_OBJ_FACE)	732	else if (action == UP_OBJ_FACE)
781	/* Nothing to do for that case */ ;	733	/* Nothing to do for that case */ ;
782	else	734	else
783	LOG (llevError, "update_object called with invalid action: %d\n", action);	735	LOG (llevError, "update_object called with invalid action: %d\n", action);
784		736
785	if (op->more)	737	if (op->more)
786	update_object (op->more, action);	738	update_object (op->more, action);
787	}	739	}
788		740
789	object::vector object::mortals;
790	object::vector object::objects; // not yet used
791	object *object::first;
792
793	void object::free_mortals ()
794	{
795	for (AUTODECL (i, mortals.begin ()); i != mortals.end ();)
796	if ((*i)->refcnt)
797	++i; // further delay freeing
798	else
799	{
800	delete *i;
801	mortals.erase (i);
802	}
803	}
804
805	object::object ()	741	object::object ()
806	{	742	{
807	SET_FLAG (this, FLAG_REMOVED);	743	SET_FLAG (this, FLAG_REMOVED);
808		744
809	expmul = 1.0;	745	expmul = 1.0;
810	face = blank_face;	746	face = blank_face;
811	}	747	}
812		748
813	object::~object ()	749	object::~object ()
814	{	750	{
		751	unlink ();
		752
815	free_key_values (this);	753	free_key_values (this);
816	}	754	}
817		755
		756	static int object_count;
		757
818	void object::link ()	758	void object::link ()
819	{	759	{
820	count = ++ob_count;	760	assert (!index);//D
821	uuid = gen_uuid ();	761	uuid = gen_uuid ();
		762	count = ++object_count;
822		763
823	prev = 0;	764	refcnt_inc ();
824	next = object::first;	765	objects.insert (this);
825
826	if (object::first)
827	object::first->prev = this;
828
829	object::first = this;
830	}	766	}
831		767
832	void object::unlink ()	768	void object::unlink ()
833	{	769	{
834	if (this == object::first)	770	if (!index)
835	object::first = next;	771	return;
836		772
837	/* Remove this object from the list of used objects */	773	objects.erase (this);
838	if (prev) prev->next = next;	774	refcnt_dec ();
839	if (next) next->prev = prev;	775	}
840		776
841	prev = 0;	777	void
842	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	}
843	}	882	}
844		883
845	object *object::create ()	884	object *object::create ()
846	{	885	{
847	object *op = new object;	886	object *op = new object;
848	op->link ();	887	op->link ();
849	return op;	888	return op;
850	}	889	}
851		890
852	/*	891	void
853	* free_object() frees everything allocated by an object, removes	892	object::do_destroy ()
854	* it from the list of used objects, and puts it on the list of
855	* free objects. The IS_FREED() flag is set in the object.
856	* The object must have been removed by remove_ob() first for
857	* this function to succeed.
858	*
859	* If destroy_inventory is set, free inventory as well. Else drop items in
860	* inventory to the ground.
861	*/
862	void object::destroy (bool destroy_inventory)
863	{	893	{
864	if (QUERY_FLAG (this, FLAG_FREED))	894	attachable::do_destroy ();
865	return;
866		895
867	if (QUERY_FLAG (this, FLAG_FRIENDLY))	896	if (flag [FLAG_IS_LINKED])
		897	remove_button_link (this);
		898
		899	if (flag [FLAG_FRIENDLY])
868	remove_friendly_object (this);	900	remove_friendly_object (this);
869		901
870	if (!QUERY_FLAG (this, FLAG_REMOVED))	902	if (!flag [FLAG_REMOVED])
871	remove ();	903	remove ();
872		904
873	SET_FLAG (this, FLAG_FREED);	905	destroy_inv (true);
874		906
875	if (more)	907	deactivate ();
876	{	908	unlink ();
877	more->destroy (destroy_inventory);
878	more = 0;
879	}
880		909
881	if (inv)	910	flag [FLAG_FREED] = 1;
882	{
883	/* Only if the space blocks everything do we not process -
884	* if some form of movement is allowed, let objects
885	* drop on that space.
886	*/
887	if (destroy_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
888	{
889	object *op = inv;
890
891	while (op)
892	{
893	object *tmp = op->below;
894	op->destroy (destroy_inventory);
895	op = tmp;
896	}
897	}
898	else
899	{ /* Put objects in inventory onto this space */
900	object *op = inv;
901
902	while (op)
903	{
904	object *tmp = op->below;
905
906	op->remove ();
907
908	if (QUERY_FLAG (op, FLAG_STARTEQUIP)
909	|| QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
910	op->destroy ();
911	else
912	{
913	op->x = x;
914	op->y = y;
915	insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */
916	}
917
918	op = tmp;
919	}
920	}
921	}
922		911
923	// hack to ensure that freed objects still have a valid map	912	// hack to ensure that freed objects still have a valid map
924	{	913	{
925	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
926		915
927	if (!freed_map)	916	if (!freed_map)
928	{	917	{
929	freed_map = new maptile;	918	freed_map = new maptile;
930		919
		920	freed_map->path = "<freed objects map>";
931	freed_map->name = "/internal/freed_objects_map";	921	freed_map->name = "/internal/freed_objects_map";
932	freed_map->width = 3;	922	freed_map->width = 3;
933	freed_map->height = 3;	923	freed_map->height = 3;
934		924
935	freed_map->allocate ();	925	freed_map->alloc ();
		926	freed_map->in_memory = MAP_IN_MEMORY;
936	}	927	}
937		928
938	map = freed_map;	929	map = freed_map;
939	x = 1;	930	x = 1;
940	y = 1;	931	y = 1;
941	}	932	}
942		933
		934	if (more)
		935	{
		936	more->destroy ();
		937	more = 0;
		938	}
		939
		940	head = 0;
		941
943	// clear those pointers that likely might have circular references to us	942	// clear those pointers that likely might cause circular references
944	owner = 0;	943	owner = 0;
945	enemy = 0;	944	enemy = 0;
946	attacked_by = 0;	945	attacked_by = 0;
		946	current_weapon = 0;
		947	}
947		948
948	// only relevant for players(?), but make sure of it anyways	949	void
949	contr = 0;	950	object::destroy (bool destroy_inventory)
		951	{
		952	if (destroyed ())
		953	return;
950		954
951	/* Remove object from the active list */	955	if (destroy_inventory)
952	speed = 0;	956	destroy_inv (false);
953	update_ob_speed (this);
954		957
955	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
956		963
957	mortals.push_back (this);	964	attachable::destroy ();
958	}	965	}
959		966
960	/*	967	/*
961	* sub_weight() recursively (outwards) subtracts a number from the	968	* sub_weight() recursively (outwards) subtracts a number from the
962	* 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)).
…		…
978	* 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
979	* 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
980	* object will have no environment. If the object previously had an	987	* object will have no environment. If the object previously had an
981	* environment, the x and y coordinates will be updated to	988	* environment, the x and y coordinates will be updated to
982	* the previous environment.	989	* the previous environment.
983	* Beware: This function is called from the editor as well!
984	*/	990	*/
985	void	991	void
986	object::remove ()	992	object::do_remove ()
987	{	993	{
988	object *tmp, *last = 0;	994	object *tmp, *last = 0;
989	object *otmp;	995	object *otmp;
990		996
991	int check_walk_off;
992
993	if (QUERY_FLAG (this, FLAG_REMOVED))	997	if (QUERY_FLAG (this, FLAG_REMOVED))
994	return;	998	return;
995		999
996	SET_FLAG (this, FLAG_REMOVED);	1000	SET_FLAG (this, FLAG_REMOVED);
		1001	INVOKE_OBJECT (REMOVE, this);
997		1002
998	if (more)	1003	if (more)
999	more->remove ();	1004	more->remove ();
1000		1005
1001	/*	1006	/*
…		…
1012	/* NO_FIX_PLAYER is set when a great many changes are being	1017	/* NO_FIX_PLAYER is set when a great many changes are being
1013	* made to players inventory. If set, avoiding the call	1018	* made to players inventory. If set, avoiding the call
1014	* to save cpu time.	1019	* to save cpu time.
1015	*/	1020	*/
1016	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))
1017	fix_player (otmp);	1022	otmp->update_stats ();
1018		1023
1019	if (above != NULL)	1024	if (above)
1020	above->below = below;	1025	above->below = below;
1021	else	1026	else
1022	env->inv = below;	1027	env->inv = below;
1023		1028
1024	if (below != NULL)	1029	if (below)
1025	below->above = above;	1030	below->above = above;
1026		1031
1027	/* we set up values so that it could be inserted into	1032	/* we set up values so that it could be inserted into
1028	* 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
1029	* to the caller to decide what we want to do.	1034	* to the caller to decide what we want to do.
…		…
1033	above = 0, below = 0;	1038	above = 0, below = 0;
1034	env = 0;	1039	env = 0;
1035	}	1040	}
1036	else if (map)	1041	else if (map)
1037	{	1042	{
1038	/* Re did the following section of code - it looks like it had	1043	if (type == PLAYER)
1039	* lots of logic for things we no longer care about
1040	*/	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 ();
1041		1057
1042	/* link the object above us */	1058	/* link the object above us */
1043	if (above)	1059	if (above)
1044	above->below = below;	1060	above->below = below;
1045	else	1061	else
1046	map->at (x, y).top = below; /* we were top, set new top */	1062	ms.top = below; /* we were top, set new top */
1047		1063
1048	/* Relink the object below us, if there is one */	1064	/* Relink the object below us, if there is one */
1049	if (below)	1065	if (below)
1050	below->above = above;	1066	below->above = above;
1051	else	1067	else
…		…
1053	/* 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
1054	* use translated coordinates in case some oddness with map tiling is	1070	* use translated coordinates in case some oddness with map tiling is
1055	* evident	1071	* evident
1056	*/	1072	*/
1057	if (GET_MAP_OB (map, x, y) != this)	1073	if (GET_MAP_OB (map, x, y) != this)
1058	{
1059	char *dump = dump_object (this);
1060	LOG (llevError,
1061	"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 ());
1062	free (dump);
1063	dump = dump_object (GET_MAP_OB (map, x, y));
1064	LOG (llevError, "%s\n", dump);
1065	free (dump);
1066	}
1067		1075
1068	map->at (x, y).bottom = above; /* goes on above it. */	1076	ms.bot = above; /* goes on above it. */
1069	}	1077	}
1070		1078
1071	above = 0;	1079	above = 0;
1072	below = 0;	1080	below = 0;
1073		1081
1074	if (map->in_memory == MAP_SAVING)	1082	if (map->in_memory == MAP_SAVING)
1075	return;	1083	return;
1076		1084
1077	check_walk_off = !QUERY_FLAG (this, FLAG_NO_APPLY);	1085	int check_walk_off = !flag [FLAG_NO_APPLY];
1078		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
1079	for (tmp = GET_MAP_OB (map, x, y); tmp; tmp = tmp->above)	1099	for (tmp = ms.bot; tmp; tmp = tmp->above)
1080	{	1100	{
1081	/* 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
1082	* being removed.	1102	* being removed.
1083	*/	1103	*/
1084		1104
1085	if (tmp->type == PLAYER && tmp != this)
1086	{
1087	/* If a container that the player is currently using somehow gets
1088	* removed (most likely destroyed), update the player view
1089	* appropriately.
1090	*/
1091	if (tmp->container == this)
1092	{
1093	CLEAR_FLAG (this, FLAG_APPLIED);
1094	tmp->container = 0;
1095	}
1096
1097	tmp->contr->socket->floorbox_update ();
1098	}
1099
1100	/* See if player moving off should effect something */	1105	/* See if object moving off should effect something */
1101	if (check_walk_off	1106	if (check_walk_off
1102	&& ((move_type & tmp->move_off)	1107	&& ((move_type & tmp->move_off)
1103	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))	1108	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1104	{	1109	{
1105	move_apply (tmp, this, 0);	1110	move_apply (tmp, this, 0);
1106		1111
1107	if (destroyed ())	1112	if (destroyed ())
1108	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 ());
1109	}	1114	}
1110		1115
1111	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1112
1113	if (tmp->above == tmp)
1114	tmp->above = 0;
1115
1116	last = tmp;	1116	last = tmp;
1117	}	1117	}
1118		1118
1119	/* 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?
1120	if (!last)	1121	if (!last)
1121	map->at (x, y).flags_ = P_NEED_UPDATE;	1122	map->at (x, y).flags_ = 0;
1122	else	1123	else
1123	update_object (last, UP_OBJ_REMOVE);	1124	update_object (last, UP_OBJ_REMOVE);
1124		1125
1125	if (QUERY_FLAG (this, FLAG_BLOCKSVIEW) || glow_radius)	1126	if (flag [FLAG_BLOCKSVIEW] || glow_radius)
1126	update_all_los (map, x, y);	1127	update_all_los (map, x, y);
1127	}	1128	}
1128	}	1129	}
1129		1130
1130	/*	1131	/*
…		…
1139	merge_ob (object *op, object *top)	1140	merge_ob (object *op, object *top)
1140	{	1141	{
1141	if (!op->nrof)	1142	if (!op->nrof)
1142	return 0;	1143	return 0;
1143		1144
1144	if (top == NULL)	1145	if (top)
1145	for (top = op; top != NULL && top->above != NULL; top = top->above);	1146	for (top = op; top && top->above; top = top->above)
		1147	;
1146		1148
1147	for (; top != NULL; top = top->below)	1149	for (; top; top = top->below)
1148	{	1150	{
1149	if (top == op)	1151	if (top == op)
1150	continue;	1152	continue;
1151		1153
1152	if (object::can_merge (op, top))	1154	if (object::can_merge (op, top))
…		…
1161	}	1163	}
1162		1164
1163	return 0;	1165	return 0;
1164	}	1166	}
1165		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
1166	/*	1191	/*
1167	* 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
1168	* job preparing multi-part monsters	1193	* job preparing multi-part monsters.
1169	*/	1194	*/
1170	object *	1195	object *
1171	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)
1172	{	1197	{
1173	object *tmp;
1174
1175	if (op->head)
1176	op = op->head;
1177
1178	for (tmp = op; tmp; tmp = tmp->more)	1198	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1179	{	1199	{
1180	tmp->x = x + tmp->arch->clone.x;	1200	tmp->x = x + tmp->arch->x;
1181	tmp->y = y + tmp->arch->clone.y;	1201	tmp->y = y + tmp->arch->y;
1182	}	1202	}
1183		1203
1184	return insert_ob_in_map (op, m, originator, flag);	1204	return insert_ob_in_map (op, m, originator, flag);
1185	}	1205	}
1186		1206
…		…
1202	* Return value:	1222	* Return value:
1203	* new object if 'op' was merged with other object	1223	* new object if 'op' was merged with other object
1204	* NULL if 'op' was destroyed	1224	* NULL if 'op' was destroyed
1205	* just 'op' otherwise	1225	* just 'op' otherwise
1206	*/	1226	*/
1207
1208	object *	1227	object *
1209	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)
1210	{	1229	{
		1230	assert (!op->flag [FLAG_FREED]);
		1231
1211	object *tmp, *top, *floor = NULL;	1232	object *top, *floor = NULL;
1212	sint16 x, y;
1213		1233
1214	if (QUERY_FLAG (op, FLAG_FREED))	1234	op->remove ();
1215	{
1216	LOG (llevError, "Trying to insert freed object!\n");
1217	return NULL;
1218	}
1219
1220	if (m == NULL)
1221	{
1222	char *dump = dump_object (op);
1223	LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
1224	free (dump);
1225	return op;
1226	}
1227
1228	if (out_of_map (m, op->x, op->y))
1229	{
1230	char *dump = dump_object (op);
1231	LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump);
1232	#ifdef MANY_CORES
1233	/* Better to catch this here, as otherwise the next use of this object
1234	* is likely to cause a crash. Better to find out where it is getting
1235	* improperly inserted.
1236	*/
1237	abort ();
1238	#endif
1239	free (dump);
1240	return op;
1241	}
1242
1243	if (!QUERY_FLAG (op, FLAG_REMOVED))
1244	{
1245	char *dump = dump_object (op);
1246	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
1247	free (dump);
1248	return op;
1249	}
1250
1251	if (op->more != NULL)
1252	{
1253	/* The part may be on a different map. */
1254
1255	object *more = op->more;
1256
1257	/* We really need the caller to normalize coordinates - if
1258	* we set the map, that doesn't work if the location is within
1259	* a map and this is straddling an edge. So only if coordinate
1260	* is clear wrong do we normalize it.
1261	*/
1262	if (OUT_OF_REAL_MAP (more->map, more->x, more->y))
1263	more->map = get_map_from_coord (m, &more->x, &more->y);
1264	else if (!more->map)
1265	{
1266	/* For backwards compatibility - when not dealing with tiled maps,
1267	* more->map should always point to the parent.
1268	*/
1269	more->map = m;
1270	}
1271
1272	if (insert_ob_in_map (more, more->map, originator, flag) == NULL)
1273	{
1274	if (!op->head)
1275	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1276
1277	return NULL;
1278	}
1279	}
1280
1281	CLEAR_FLAG (op, FLAG_REMOVED);
1282		1235
1283	/* Ideally, the caller figures this out. However, it complicates a lot	1236	/* Ideally, the caller figures this out. However, it complicates a lot
1284	* of areas of callers (eg, anything that uses find_free_spot would now	1237	* of areas of callers (eg, anything that uses find_free_spot would now
1285	* need extra work	1238	* need extra work
1286	*/	1239	*/
1287	op->map = get_map_from_coord (m, &op->x, &op->y);	1240	if (!xy_normalise (m, op->x, op->y))
1288	x = op->x;	1241	{
1289	y = op->y;	1242	op->destroy ();
		1243	return 0;
		1244	}
		1245
		1246	if (object *more = op->more)
		1247	if (!insert_ob_in_map (more, m, originator, flag))
		1248	return 0;
		1249
		1250	CLEAR_FLAG (op, FLAG_REMOVED);
		1251
		1252	op->map = m;
		1253	mapspace &ms = op->ms ();
1290		1254
1291	/* this has to be done after we translate the coordinates.	1255	/* this has to be done after we translate the coordinates.
1292	*/	1256	*/
1293	if (op->nrof && !(flag & INS_NO_MERGE))	1257	if (op->nrof && !(flag & INS_NO_MERGE))
1294	for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)	1258	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1295	if (object::can_merge (op, tmp))	1259	if (object::can_merge (op, tmp))
1296	{	1260	{
1297	op->nrof += tmp->nrof;	1261	op->nrof += tmp->nrof;
1298	tmp->destroy ();	1262	tmp->destroy ();
1299	}	1263	}
…		…
1316	op->below = originator->below;	1280	op->below = originator->below;
1317		1281
1318	if (op->below)	1282	if (op->below)
1319	op->below->above = op;	1283	op->below->above = op;
1320	else	1284	else
1321	op->map->at (op->x, op->y).bottom = op;	1285	ms.bot = op;
1322		1286
1323	/* since *below* originator, no need to update top */	1287	/* since *below* originator, no need to update top */
1324	originator->below = op;	1288	originator->below = op;
1325	}	1289	}
1326	else	1290	else
1327	{	1291	{
		1292	top = ms.bot;
		1293
1328	/* If there are other objects, then */	1294	/* If there are other objects, then */
1329	if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL))	1295	if ((!(flag & INS_MAP_LOAD)) && top)
1330	{	1296	{
1331	object *last = NULL;	1297	object *last = 0;
1332		1298
1333	/*	1299	/*
1334	* If there are multiple objects on this space, we do some trickier handling.	1300	* If there are multiple objects on this space, we do some trickier handling.
1335	* We've already dealt with merging if appropriate.	1301	* We've already dealt with merging if appropriate.
1336	* Generally, we want to put the new object on top. But if	1302	* Generally, we want to put the new object on top. But if
…		…
1340	* once we get to them. This reduces the need to traverse over all of	1306	* once we get to them. This reduces the need to traverse over all of
1341	* them when adding another one - this saves quite a bit of cpu time	1307	* them when adding another one - this saves quite a bit of cpu time
1342	* when lots of spells are cast in one area. Currently, it is presumed	1308	* when lots of spells are cast in one area. Currently, it is presumed
1343	* that flying non pickable objects are spell objects.	1309	* that flying non pickable objects are spell objects.
1344	*/	1310	*/
1345		1311	for (top = ms.bot; top; top = top->above)
1346	while (top != NULL)
1347	{	1312	{
1348	if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))	1313	if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))
1349	floor = top;	1314	floor = top;
1350		1315
1351	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))	1316	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))
…		…
1354	top = top->below;	1319	top = top->below;
1355	break;	1320	break;
1356	}	1321	}
1357		1322
1358	last = top;	1323	last = top;
1359	top = top->above;
1360	}	1324	}
1361		1325
1362	/* Don't want top to be NULL, so set it to the last valid object */	1326	/* Don't want top to be NULL, so set it to the last valid object */
1363	top = last;	1327	top = last;
1364		1328
…		…
1366	* looks like instead of lots of conditions here.	1330	* looks like instead of lots of conditions here.
1367	* makes things faster, and effectively the same result.	1331	* makes things faster, and effectively the same result.
1368	*/	1332	*/
1369		1333
1370	/* Have object 'fall below' other objects that block view.	1334	/* Have object 'fall below' other objects that block view.
1371	* Unless those objects are exits, type 66	1335	* Unless those objects are exits.
1372	* If INS_ON_TOP is used, don't do this processing	1336	* If INS_ON_TOP is used, don't do this processing
1373	* Need to find the object that in fact blocks view, otherwise	1337	* Need to find the object that in fact blocks view, otherwise
1374	* stacking is a bit odd.	1338	* stacking is a bit odd.
1375	*/	1339	*/
1376	if (!(flag & INS_ON_TOP) &&	1340	if (!(flag & INS_ON_TOP)
1377	(get_map_flags (op->map, 0, op->x, op->y, 0, 0) & P_BLOCKSVIEW) && (op->face && !op->face->visibility))	1341	&& ms.flags () & P_BLOCKSVIEW
		1342	&& (op->face && !faces [op->face].visibility))
1378	{	1343	{
1379	for (last = top; last != floor; last = last->below)	1344	for (last = top; last != floor; last = last->below)
1380	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1345	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1381	break;	1346	break;
		1347
1382	/* Check to see if we found the object that blocks view,	1348	/* Check to see if we found the object that blocks view,
1383	* and make sure we have a below pointer for it so that	1349	* and make sure we have a below pointer for it so that
1384	* we can get inserted below this one, which requires we	1350	* we can get inserted below this one, which requires we
1385	* set top to the object below us.	1351	* set top to the object below us.
1386	*/	1352	*/
1387	if (last && last->below && last != floor)	1353	if (last && last->below && last != floor)
1388	top = last->below;	1354	top = last->below;
1389	}	1355	}
1390	} /* If objects on this space */	1356	} /* If objects on this space */
1391
1392	if (flag & INS_MAP_LOAD)	1357	if (flag & INS_MAP_LOAD)
1393	top = GET_MAP_TOP (op->map, op->x, op->y);	1358	top = ms.top;
1394		1359
1395	if (flag & INS_ABOVE_FLOOR_ONLY)	1360	if (flag & INS_ABOVE_FLOOR_ONLY)
1396	top = floor;	1361	top = floor;
1397		1362
1398	/* Top is the object that our object (op) is going to get inserted above.	1363	/* Top is the object that our object (op) is going to get inserted above.
1399	*/	1364	*/
1400		1365
1401	/* First object on this space */	1366	/* First object on this space */
1402	if (!top)	1367	if (!top)
1403	{	1368	{
1404	op->above = GET_MAP_OB (op->map, op->x, op->y);	1369	op->above = ms.bot;
1405		1370
1406	if (op->above)	1371	if (op->above)
1407	op->above->below = op;	1372	op->above->below = op;
1408		1373
1409	op->below = NULL;	1374	op->below = 0;
1410	op->map->at (op->x, op->y).bottom = op;	1375	ms.bot = op;
1411	}	1376	}
1412	else	1377	else
1413	{ /* get inserted into the stack above top */	1378	{ /* get inserted into the stack above top */
1414	op->above = top->above;	1379	op->above = top->above;
1415		1380
…		…
1418		1383
1419	op->below = top;	1384	op->below = top;
1420	top->above = op;	1385	top->above = op;
1421	}	1386	}
1422		1387
1423	if (op->above == NULL)	1388	if (!op->above)
1424	op->map->at (op->x, op->y).top = op;	1389	ms.top = op;
1425	} /* else not INS_BELOW_ORIGINATOR */	1390	} /* else not INS_BELOW_ORIGINATOR */
1426		1391
1427	if (op->type == PLAYER)	1392	if (op->type == PLAYER)
		1393	{
1428	op->contr->do_los = 1;	1394	op->contr->do_los = 1;
		1395	++op->map->players;
		1396	op->map->touch ();
		1397	}
1429		1398
1430	/* If we have a floor, we know the player, if any, will be above	1399	op->map->dirty = true;
1431	* it, so save a few ticks and start from there.	1400
1432	*/
1433	if (!(flag & INS_MAP_LOAD))	1401	if (!(flag & INS_MAP_LOAD))
1434	if (object *pl = op->map->at (op->x, op->y).player ())	1402	if (object *pl = ms.player ())
1435	pl->contr->socket->floorbox_update ();	1403	pl->contr->ns->floorbox_update ();
1436		1404
1437	/* If this object glows, it may affect lighting conditions that are	1405	/* If this object glows, it may affect lighting conditions that are
1438	* visible to others on this map. But update_all_los is really	1406	* visible to others on this map. But update_all_los is really
1439	* an inefficient way to do this, as it means los for all players	1407	* an inefficient way to do this, as it means los for all players
1440	* on the map will get recalculated. The players could very well	1408	* on the map will get recalculated. The players could very well
1441	* be far away from this change and not affected in any way -	1409	* be far away from this change and not affected in any way -
1442	* this should get redone to only look for players within range,	1410	* this should get redone to only look for players within range,
1443	* or just updating the P_NEED_UPDATE for spaces within this area	1411	* or just updating the P_UPTODATE for spaces within this area
1444	* of effect may be sufficient.	1412	* of effect may be sufficient.
1445	*/	1413	*/
1446	if (MAP_DARKNESS (op->map) && (op->glow_radius != 0))	1414	if (op->map->darkness && (op->glow_radius != 0))
1447	update_all_los (op->map, op->x, op->y);	1415	update_all_los (op->map, op->x, op->y);
1448		1416
1449	/* updates flags (blocked, alive, no magic, etc) for this map space */	1417	/* updates flags (blocked, alive, no magic, etc) for this map space */
1450	update_object (op, UP_OBJ_INSERT);	1418	update_object (op, UP_OBJ_INSERT);
		1419
		1420	INVOKE_OBJECT (INSERT, op);
1451		1421
1452	/* Don't know if moving this to the end will break anything. However,	1422	/* Don't know if moving this to the end will break anything. However,
1453	* we want to have floorbox_update called before calling this.	1423	* we want to have floorbox_update called before calling this.
1454	*	1424	*
1455	* check_move_on() must be after this because code called from	1425	* check_move_on() must be after this because code called from
…		…
1457	* blocked() and wall() work properly), and these flags are updated by	1427	* blocked() and wall() work properly), and these flags are updated by
1458	* update_object().	1428	* update_object().
1459	*/	1429	*/
1460		1430
1461	/* if this is not the head or flag has been passed, don't check walk on status */	1431	/* if this is not the head or flag has been passed, don't check walk on status */
1462	if (!(flag & INS_NO_WALK_ON) && !op->head)	1432	if (!(flag & INS_NO_WALK_ON) && op->head_ () == op)
1463	{	1433	{
1464	if (check_move_on (op, originator))	1434	if (check_move_on (op, originator))
1465	return NULL;	1435	return 0;
1466		1436
1467	/* If we are a multi part object, lets work our way through the check	1437	/* If we are a multi part object, lets work our way through the check
1468	* walk on's.	1438	* walk on's.
1469	*/	1439	*/
1470	for (tmp = op->more; tmp != NULL; tmp = tmp->more)	1440	for (object *tmp = op->more; tmp; tmp = tmp->more)
1471	if (check_move_on (tmp, originator))	1441	if (check_move_on (tmp, originator))
1472	return NULL;	1442	return 0;
1473	}	1443	}
1474		1444
1475	return op;	1445	return op;
1476	}	1446	}
1477		1447
…		…
1484	{	1454	{
1485	object *tmp, *tmp1;	1455	object *tmp, *tmp1;
1486		1456
1487	/* first search for itself and remove any old instances */	1457	/* first search for itself and remove any old instances */
1488		1458
1489	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1459	for (tmp = op->ms ().bot; tmp; tmp = tmp->above)
1490	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */	1460	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */
1491	tmp->destroy ();	1461	tmp->destroy ();
1492		1462
1493	tmp1 = arch_to_object (archetype::find (arch_string));	1463	tmp1 = arch_to_object (archetype::find (arch_string));
1494		1464
1495	tmp1->x = op->x;	1465	tmp1->x = op->x;
1496	tmp1->y = op->y;	1466	tmp1->y = op->y;
1497	insert_ob_in_map (tmp1, op->map, op, 0);	1467	insert_ob_in_map (tmp1, op->map, op, 0);
		1468	}
		1469
		1470	object *
		1471	object::insert_at (object *where, object *originator, int flags)
		1472	{
		1473	return where->map->insert (this, where->x, where->y, originator, flags);
1498	}	1474	}
1499		1475
1500	/*	1476	/*
1501	* get_split_ob(ob,nr) splits up ob into two parts. The part which	1477	* get_split_ob(ob,nr) splits up ob into two parts. The part which
1502	* is returned contains nr objects, and the remaining parts contains	1478	* is returned contains nr objects, and the remaining parts contains
1503	* the rest (or is removed and freed if that number is 0).	1479	* the rest (or is removed and freed if that number is 0).
1504	* On failure, NULL is returned, and the reason put into the	1480	* On failure, NULL is returned, and the reason put into the
1505	* global static errmsg array.	1481	* global static errmsg array.
1506	*/	1482	*/
1507
1508	object *	1483	object *
1509	get_split_ob (object *orig_ob, uint32 nr)	1484	get_split_ob (object *orig_ob, uint32 nr)
1510	{	1485	{
1511	object *newob;	1486	object *newob;
1512	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);	1487	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
…		…
1543	* the amount of an object. If the amount reaches 0, the object	1518	* the amount of an object. If the amount reaches 0, the object
1544	* is subsequently removed and freed.	1519	* is subsequently removed and freed.
1545	*	1520	*
1546	* Return value: 'op' if something is left, NULL if the amount reached 0	1521	* Return value: 'op' if something is left, NULL if the amount reached 0
1547	*/	1522	*/
1548
1549	object *	1523	object *
1550	decrease_ob_nr (object *op, uint32 i)	1524	decrease_ob_nr (object *op, uint32 i)
1551	{	1525	{
1552	object *tmp;	1526	object *tmp;
1553	player *pl;
1554		1527
1555	if (i == 0) /* objects with op->nrof require this check */	1528	if (i == 0) /* objects with op->nrof require this check */
1556	return op;	1529	return op;
1557		1530
1558	if (i > op->nrof)	1531	if (i > op->nrof)
…		…
1571	* IMO, searching through all the players will mostly	1544	* IMO, searching through all the players will mostly
1572	* likely be quicker than following op->env to the map,	1545	* likely be quicker than following op->env to the map,
1573	* and then searching the map for a player.	1546	* and then searching the map for a player.
1574	*/	1547	*/
1575	if (!tmp)	1548	if (!tmp)
1576	{	1549	for_all_players (pl)
1577	for (pl = first_player; pl; pl = pl->next)
1578	if (pl->ob->container == op->env)	1550	if (pl->ob->container == op->env)
1579	{	1551	{
1580	tmp = pl->ob;	1552	tmp = pl->ob;
1581	break;	1553	break;
1582	}	1554	}
1583	}
1584		1555
1585	if (i < op->nrof)	1556	if (i < op->nrof)
1586	{	1557	{
1587	sub_weight (op->env, op->weight * i);	1558	sub_weight (op->env, op->weight * i);
1588	op->nrof -= i;	1559	op->nrof -= i;
…		…
1631		1602
1632	/*	1603	/*
1633	* add_weight(object, weight) adds the specified weight to an object,	1604	* add_weight(object, weight) adds the specified weight to an object,
1634	* and also updates how much the environment(s) is/are carrying.	1605	* and also updates how much the environment(s) is/are carrying.
1635	*/	1606	*/
1636
1637	void	1607	void
1638	add_weight (object *op, signed long weight)	1608	add_weight (object *op, signed long weight)
1639	{	1609	{
1640	while (op != NULL)	1610	while (op != NULL)
1641	{	1611	{
…		…
1656	LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);	1626	LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
1657	free (dump);	1627	free (dump);
1658	return op;	1628	return op;
1659	}	1629	}
1660		1630
1661	if (where->head)	1631	if (where->head_ () != where)
1662	{	1632	{
1663	LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n");	1633	LOG (llevError | logBacktrace, "Warning: Tried to insert object into wrong part of multipart object.\n");
1664	where = where->head;	1634	where = where->head;
1665	}	1635	}
1666		1636
1667	return where->insert (op);	1637	return where->insert (op);
1668	}	1638	}
…		…
1673	* inside the object environment.	1643	* inside the object environment.
1674	*	1644	*
1675	* The function returns now pointer to inserted item, and return value can	1645	* The function returns now pointer to inserted item, and return value can
1676	* be != op, if items are merged. -Tero	1646	* be != op, if items are merged. -Tero
1677	*/	1647	*/
1678
1679	object *	1648	object *
1680	object::insert (object *op)	1649	object::insert (object *op)
1681	{	1650	{
1682	object *tmp, *otmp;
1683
1684	if (!QUERY_FLAG (op, FLAG_REMOVED))	1651	if (!QUERY_FLAG (op, FLAG_REMOVED))
1685	op->remove ();	1652	op->remove ();
1686		1653
1687	if (op->more)	1654	if (op->more)
1688	{	1655	{
…		…
1690	return op;	1657	return op;
1691	}	1658	}
1692		1659
1693	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1660	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1694	CLEAR_FLAG (op, FLAG_REMOVED);	1661	CLEAR_FLAG (op, FLAG_REMOVED);
		1662
1695	if (op->nrof)	1663	if (op->nrof)
1696	{	1664	{
1697	for (tmp = inv; tmp != NULL; tmp = tmp->below)	1665	for (object *tmp = inv; tmp; tmp = tmp->below)
1698	if (object::can_merge (tmp, op))	1666	if (object::can_merge (tmp, op))
1699	{	1667	{
1700	/* return the original object and remove inserted object	1668	/* return the original object and remove inserted object
1701	(client needs the original object) */	1669	(client needs the original object) */
1702	tmp->nrof += op->nrof;	1670	tmp->nrof += op->nrof;
…		…
1721	add_weight (this, op->weight * op->nrof);	1689	add_weight (this, op->weight * op->nrof);
1722	}	1690	}
1723	else	1691	else
1724	add_weight (this, (op->weight + op->carrying));	1692	add_weight (this, (op->weight + op->carrying));
1725		1693
1726	otmp = this->in_player ();	1694	if (object *otmp = this->in_player ())
1727	if (otmp && otmp->contr)
1728	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1695	if (otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1729	fix_player (otmp);	1696	otmp->update_stats ();
1730		1697
		1698	op->owner = 0; // its his/hers now. period.
1731	op->map = 0;	1699	op->map = 0;
1732	op->env = this;	1700	op->env = this;
1733	op->above = 0;	1701	op->above = 0;
1734	op->below = 0;	1702	op->below = 0;
1735	op->x = 0, op->y = 0;	1703	op->x = op->y = 0;
1736		1704
1737	/* reset the light list and los of the players on the map */	1705	/* reset the light list and los of the players on the map */
1738	if ((op->glow_radius != 0) && map)	1706	if (op->glow_radius && map)
1739	{	1707	{
1740	#ifdef DEBUG_LIGHTS	1708	#ifdef DEBUG_LIGHTS
1741	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);	1709	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1742	#endif /* DEBUG_LIGHTS */	1710	#endif /* DEBUG_LIGHTS */
1743	if (MAP_DARKNESS (map))	1711	if (map->darkness)
1744	update_all_los (map, x, y);	1712	update_all_los (map, x, y);
1745	}	1713	}
1746		1714
1747	/* Client has no idea of ordering so lets not bother ordering it here.	1715	/* Client has no idea of ordering so lets not bother ordering it here.
1748	* It sure simplifies this function...	1716	* It sure simplifies this function...
…		…
1753	{	1721	{
1754	op->below = inv;	1722	op->below = inv;
1755	op->below->above = op;	1723	op->below->above = op;
1756	inv = op;	1724	inv = op;
1757	}	1725	}
		1726
		1727	INVOKE_OBJECT (INSERT, this);
1758		1728
1759	return op;	1729	return op;
1760	}	1730	}
1761		1731
1762	/*	1732	/*
…		…
1777	*	1747	*
1778	* MSW 2001-07-08: Check all objects on space, not just those below	1748	* MSW 2001-07-08: Check all objects on space, not just those below
1779	* object being inserted. insert_ob_in_map may not put new objects	1749	* object being inserted. insert_ob_in_map may not put new objects
1780	* on top.	1750	* on top.
1781	*/	1751	*/
1782
1783	int	1752	int
1784	check_move_on (object *op, object *originator)	1753	check_move_on (object *op, object *originator)
1785	{	1754	{
1786	object *tmp;	1755	object *tmp;
1787	maptile *m = op->map;	1756	maptile *m = op->map;
…		…
1814		1783
1815	/* The objects have to be checked from top to bottom.	1784	/* The objects have to be checked from top to bottom.
1816	* Hence, we first go to the top:	1785	* Hence, we first go to the top:
1817	*/	1786	*/
1818		1787
1819	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL && tmp->above != NULL; tmp = tmp->above)	1788	for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above)
1820	{	1789	{
1821	/* Trim the search when we find the first other spell effect	1790	/* Trim the search when we find the first other spell effect
1822	* this helps performance so that if a space has 50 spell objects,	1791	* this helps performance so that if a space has 50 spell objects,
1823	* we don't need to check all of them.	1792	* we don't need to check all of them.
1824	*/	1793	*/
…		…
1842	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||	1811	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
1843	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))	1812	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1844	{	1813	{
1845		1814
1846	float	1815	float
1847	diff = tmp->move_slow_penalty * FABS (op->speed);	1816	diff = tmp->move_slow_penalty * fabs (op->speed);
1848		1817
1849	if (op->type == PLAYER)	1818	if (op->type == PLAYER)
1850	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||	1819	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||
1851	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))	1820	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))
1852	diff /= 4.0;	1821	diff /= 4.0;
…		…
1879	/*	1848	/*
1880	* present_arch(arch, map, x, y) searches for any objects with	1849	* present_arch(arch, map, x, y) searches for any objects with
1881	* a matching archetype at the given map and coordinates.	1850	* a matching archetype at the given map and coordinates.
1882	* The first matching object is returned, or NULL if none.	1851	* The first matching object is returned, or NULL if none.
1883	*/	1852	*/
1884
1885	object *	1853	object *
1886	present_arch (const archetype *at, maptile *m, int x, int y)	1854	present_arch (const archetype *at, maptile *m, int x, int y)
1887	{	1855	{
1888	object *
1889	tmp;
1890
1891	if (m == NULL || out_of_map (m, x, y))	1856	if (!m || out_of_map (m, x, y))
1892	{	1857	{
1893	LOG (llevError, "Present_arch called outside map.\n");	1858	LOG (llevError, "Present_arch called outside map.\n");
1894	return NULL;	1859	return NULL;
1895	}	1860	}
1896	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1861
		1862	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1897	if (tmp->arch == at)	1863	if (tmp->arch == at)
1898	return tmp;	1864	return tmp;
		1865
1899	return NULL;	1866	return NULL;
1900	}	1867	}
1901		1868
1902	/*	1869	/*
1903	* present(type, map, x, y) searches for any objects with	1870	* present(type, map, x, y) searches for any objects with
1904	* a matching type variable at the given map and coordinates.	1871	* a matching type variable at the given map and coordinates.
1905	* The first matching object is returned, or NULL if none.	1872	* The first matching object is returned, or NULL if none.
1906	*/	1873	*/
1907
1908	object *	1874	object *
1909	present (unsigned char type, maptile *m, int x, int y)	1875	present (unsigned char type, maptile *m, int x, int y)
1910	{	1876	{
1911	object *
1912	tmp;
1913
1914	if (out_of_map (m, x, y))	1877	if (out_of_map (m, x, y))
1915	{	1878	{
1916	LOG (llevError, "Present called outside map.\n");	1879	LOG (llevError, "Present called outside map.\n");
1917	return NULL;	1880	return NULL;
1918	}	1881	}
1919	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1882
		1883	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1920	if (tmp->type == type)	1884	if (tmp->type == type)
1921	return tmp;	1885	return tmp;
		1886
1922	return NULL;	1887	return NULL;
1923	}	1888	}
1924		1889
1925	/*	1890	/*
1926	* present_in_ob(type, object) searches for any objects with	1891	* present_in_ob(type, object) searches for any objects with
1927	* a matching type variable in the inventory of the given object.	1892	* a matching type variable in the inventory of the given object.
1928	* The first matching object is returned, or NULL if none.	1893	* The first matching object is returned, or NULL if none.
1929	*/	1894	*/
1930
1931	object *	1895	object *
1932	present_in_ob (unsigned char type, const object *op)	1896	present_in_ob (unsigned char type, const object *op)
1933	{	1897	{
1934	object *
1935	tmp;
1936
1937	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1898	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
1938	if (tmp->type == type)	1899	if (tmp->type == type)
1939	return tmp;	1900	return tmp;
		1901
1940	return NULL;	1902	return NULL;
1941	}	1903	}
1942		1904
1943	/*	1905	/*
1944	* present_in_ob (type, str, object) searches for any objects with	1906	* present_in_ob (type, str, object) searches for any objects with
…		…
1952	* str is the string to match against. Note that we match against	1914	* str is the string to match against. Note that we match against
1953	* the object name, not the archetype name. this is so that the	1915	* the object name, not the archetype name. this is so that the
1954	* spell code can use one object type (force), but change it's name	1916	* spell code can use one object type (force), but change it's name
1955	* to be unique.	1917	* to be unique.
1956	*/	1918	*/
1957
1958	object *	1919	object *
1959	present_in_ob_by_name (int type, const char *str, const object *op)	1920	present_in_ob_by_name (int type, const char *str, const object *op)
1960	{	1921	{
1961	object *
1962	tmp;
1963
1964	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1922	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1965	{
1966	if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name)))	1923	if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name)))
1967	return tmp;	1924	return tmp;
1968	}	1925
1969	return NULL;	1926	return 0;
1970	}	1927	}
1971		1928
1972	/*	1929	/*
1973	* present_arch_in_ob(archetype, object) searches for any objects with	1930	* present_arch_in_ob(archetype, object) searches for any objects with
1974	* a matching archetype in the inventory of the given object.	1931	* a matching archetype in the inventory of the given object.
1975	* The first matching object is returned, or NULL if none.	1932	* The first matching object is returned, or NULL if none.
1976	*/	1933	*/
1977
1978	object *	1934	object *
1979	present_arch_in_ob (const archetype *at, const object *op)	1935	present_arch_in_ob (const archetype *at, const object *op)
1980	{	1936	{
1981	object *
1982	tmp;
1983
1984	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1937	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
1985	if (tmp->arch == at)	1938	if (tmp->arch == at)
1986	return tmp;	1939	return tmp;
		1940
1987	return NULL;	1941	return NULL;
1988	}	1942	}
1989		1943
1990	/*	1944	/*
1991	* activate recursively a flag on an object inventory	1945	* activate recursively a flag on an object inventory
1992	*/	1946	*/
1993	void	1947	void
1994	flag_inv (object *op, int flag)	1948	flag_inv (object *op, int flag)
1995	{	1949	{
1996	object *
1997	tmp;
1998
1999	if (op->inv)	1950	if (op->inv)
2000	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1951	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2001	{	1952	{
2002	SET_FLAG (tmp, flag);	1953	SET_FLAG (tmp, flag);
2003	flag_inv (tmp, flag);	1954	flag_inv (tmp, flag);
2004	}	1955	}
2005	} /*	1956	}
		1957
		1958	/*
2006	* desactivate recursively a flag on an object inventory	1959	* deactivate recursively a flag on an object inventory
2007	*/	1960	*/
2008	void	1961	void
2009	unflag_inv (object *op, int flag)	1962	unflag_inv (object *op, int flag)
2010	{	1963	{
2011	object *
2012	tmp;
2013
2014	if (op->inv)	1964	if (op->inv)
2015	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1965	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2016	{	1966	{
2017	CLEAR_FLAG (tmp, flag);	1967	CLEAR_FLAG (tmp, flag);
2018	unflag_inv (tmp, flag);	1968	unflag_inv (tmp, flag);
2019	}	1969	}
2020	}
2021
2022	/*
2023	* set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in
2024	* all it's inventory (recursively).
2025	* If checksums are used, a player will get set_cheat called for
2026	* him/her-self and all object carried by a call to this function.
2027	*/
2028
2029	void
2030	set_cheat (object *op)
2031	{
2032	SET_FLAG (op, FLAG_WAS_WIZ);
2033	flag_inv (op, FLAG_WAS_WIZ);
2034	}	1970	}
2035		1971
2036	/*	1972	/*
2037	* find_free_spot(object, map, x, y, start, stop) will search for	1973	* find_free_spot(object, map, x, y, start, stop) will search for
2038	* a spot at the given map and coordinates which will be able to contain	1974	* a spot at the given map and coordinates which will be able to contain
…		…
2052	* because arch_blocked (now ob_blocked) needs to know the movement type	1988	* because arch_blocked (now ob_blocked) needs to know the movement type
2053	* to know if the space in question will block the object. We can't use	1989	* to know if the space in question will block the object. We can't use
2054	* the archetype because that isn't correct if the monster has been	1990	* the archetype because that isn't correct if the monster has been
2055	* customized, changed states, etc.	1991	* customized, changed states, etc.
2056	*/	1992	*/
2057
2058	int	1993	int
2059	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)	1994	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2060	{	1995	{
2061	int
2062	i,
2063	index = 0, flag;	1996	int index = 0, flag;
2064	static int
2065	altern[SIZEOFFREE];	1997	int altern[SIZEOFFREE];
2066		1998
2067	for (i = start; i < stop; i++)	1999	for (int i = start; i < stop; i++)
2068	{	2000	{
2069	flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]);	2001	mapxy pos (m, x, y); pos.move (i);
2070	if (!flag)	2002
2071	altern[index++] = i;	2003	if (!pos.normalise ())
		2004	continue;
		2005
		2006	mapspace &ms = *pos;
		2007
		2008	if (ms.flags () & P_IS_ALIVE)
		2009	continue;
		2010
		2011	/* However, often
		2012	* ob doesn't have any move type (when used to place exits)
		2013	* so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.
		2014	*/
		2015	if (ob->move_type == 0 && ms.move_block != MOVE_ALL)
		2016	continue;
2072		2017
2073	/* Basically, if we find a wall on a space, we cut down the search size.	2018	/* Basically, if we find a wall on a space, we cut down the search size.
2074	* In this way, we won't return spaces that are on another side of a wall.	2019	* In this way, we won't return spaces that are on another side of a wall.
2075	* This mostly work, but it cuts down the search size in all directions -	2020	* This mostly work, but it cuts down the search size in all directions -
2076	* if the space being examined only has a wall to the north and empty	2021	* if the space being examined only has a wall to the north and empty
2077	* spaces in all the other directions, this will reduce the search space	2022	* spaces in all the other directions, this will reduce the search space
2078	* to only the spaces immediately surrounding the target area, and	2023	* to only the spaces immediately surrounding the target area, and
2079	* won't look 2 spaces south of the target space.	2024	* won't look 2 spaces south of the target space.
2080	*/	2025	*/
2081	else if ((flag & P_NO_PASS) && maxfree[i] < stop)	2026	if (ms.move_block == MOVE_ALL && maxfree[i] < stop)
		2027	{
2082	stop = maxfree[i];	2028	stop = maxfree[i];
		2029	continue;
		2030	}
		2031
		2032	/* Note it is intentional that we check ob - the movement type of the
		2033	* head of the object should correspond for the entire object.
		2034	*/
		2035	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
		2036	continue;
		2037
		2038	altern [index++] = i;
2083	}	2039	}
2084		2040
2085	if (!index)	2041	if (!index)
2086	return -1;	2042	return -1;
2087		2043
2088	return altern[RANDOM () % index];	2044	return altern [rndm (index)];
2089	}	2045	}
2090		2046
2091	/*	2047	/*
2092	* find_first_free_spot(archetype, maptile, x, y) works like	2048	* find_first_free_spot(archetype, maptile, x, y) works like
2093	* find_free_spot(), but it will search max number of squares.	2049	* find_free_spot(), but it will search max number of squares.
2094	* But it will return the first available spot, not a random choice.	2050	* But it will return the first available spot, not a random choice.
2095	* Changed 0.93.2: Have it return -1 if there is no free spot available.	2051	* Changed 0.93.2: Have it return -1 if there is no free spot available.
2096	*/	2052	*/
2097
2098	int	2053	int
2099	find_first_free_spot (const object *ob, maptile *m, int x, int y)	2054	find_first_free_spot (const object *ob, maptile *m, int x, int y)
2100	{	2055	{
2101	int
2102	i;
2103
2104	for (i = 0; i < SIZEOFFREE; i++)	2056	for (int i = 0; i < SIZEOFFREE; i++)
2105	{
2106	if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]))	2057	if (!ob->blocked (m, x + freearr_x[i], y + freearr_y[i]))
2107	return i;	2058	return i;
2108	}	2059
2109	return -1;	2060	return -1;
2110	}	2061	}
2111		2062
2112	/*	2063	/*
2113	* The function permute(arr, begin, end) randomly reorders the array	2064	* The function permute(arr, begin, end) randomly reorders the array
2114	* arr[begin..end-1].	2065	* arr[begin..end-1].
		2066	* now uses a fisher-yates shuffle, old permute was broken
2115	*/	2067	*/
2116	static void	2068	static void
2117	permute (int *arr, int begin, int end)	2069	permute (int *arr, int begin, int end)
2118	{	2070	{
2119	int	2071	arr += begin;
2120	i,
2121	j,
2122	tmp,
2123	len;
2124
2125	len = end - begin;	2072	end -= begin;
2126	for (i = begin; i < end; i++)
2127	{
2128	j = begin + RANDOM () % len;
2129		2073
2130	tmp = arr[i];	2074	while (--end)
2131	arr[i] = arr[j];	2075	swap (arr [end], arr [rndm (end + 1)]);
2132	arr[j] = tmp;
2133	}
2134	}	2076	}
2135		2077
2136	/* new function to make monster searching more efficient, and effective!	2078	/* new function to make monster searching more efficient, and effective!
2137	* This basically returns a randomized array (in the passed pointer) of	2079	* This basically returns a randomized array (in the passed pointer) of
2138	* the spaces to find monsters. In this way, it won't always look for	2080	* the spaces to find monsters. In this way, it won't always look for
…		…
2141	* the 3x3 area will be searched, just not in a predictable order.	2083	* the 3x3 area will be searched, just not in a predictable order.
2142	*/	2084	*/
2143	void	2085	void
2144	get_search_arr (int *search_arr)	2086	get_search_arr (int *search_arr)
2145	{	2087	{
2146	int	2088	int i;
2147	i;
2148		2089
2149	for (i = 0; i < SIZEOFFREE; i++)	2090	for (i = 0; i < SIZEOFFREE; i++)
2150	{
2151	search_arr[i] = i;	2091	search_arr[i] = i;
2152	}
2153		2092
2154	permute (search_arr, 1, SIZEOFFREE1 + 1);	2093	permute (search_arr, 1, SIZEOFFREE1 + 1);
2155	permute (search_arr, SIZEOFFREE1 + 1, SIZEOFFREE2 + 1);	2094	permute (search_arr, SIZEOFFREE1 + 1, SIZEOFFREE2 + 1);
2156	permute (search_arr, SIZEOFFREE2 + 1, SIZEOFFREE);	2095	permute (search_arr, SIZEOFFREE2 + 1, SIZEOFFREE);
2157	}	2096	}
…		…
2166	* Perhaps incorrectly, but I'm making the assumption that exclude	2105	* Perhaps incorrectly, but I'm making the assumption that exclude
2167	* is actually want is going to try and move there. We need this info	2106	* is actually want is going to try and move there. We need this info
2168	* because we have to know what movement the thing looking to move	2107	* because we have to know what movement the thing looking to move
2169	* there is capable of.	2108	* there is capable of.
2170	*/	2109	*/
2171
2172	int	2110	int
2173	find_dir (maptile *m, int x, int y, object *exclude)	2111	find_dir (maptile *m, int x, int y, object *exclude)
2174	{	2112	{
2175	int
2176	i,
2177	max = SIZEOFFREE, mflags;	2113	int i, max = SIZEOFFREE, mflags;
2178		2114
2179	sint16 nx, ny;	2115	sint16 nx, ny;
2180	object *	2116	object *tmp;
2181	tmp;
2182	maptile *	2117	maptile *mp;
2183	mp;
2184		2118
2185	MoveType blocked, move_type;	2119	MoveType blocked, move_type;
2186		2120
2187	if (exclude && exclude->head)	2121	if (exclude && exclude->head_ () != exclude)
2188	{	2122	{
2189	exclude = exclude->head;	2123	exclude = exclude->head;
2190	move_type = exclude->move_type;	2124	move_type = exclude->move_type;
2191	}	2125	}
2192	else	2126	else
…		…
2205		2139
2206	if (mflags & P_OUT_OF_MAP)	2140	if (mflags & P_OUT_OF_MAP)
2207	max = maxfree[i];	2141	max = maxfree[i];
2208	else	2142	else
2209	{	2143	{
2210	blocked = GET_MAP_MOVE_BLOCK (mp, nx, ny);	2144	mapspace &ms = mp->at (nx, ny);
		2145
		2146	blocked = ms.move_block;
2211		2147
2212	if ((move_type & blocked) == move_type)	2148	if ((move_type & blocked) == move_type)
2213	max = maxfree[i];	2149	max = maxfree[i];
2214	else if (mflags & P_IS_ALIVE)	2150	else if (mflags & P_IS_ALIVE)
2215	{	2151	{
2216	for (tmp = GET_MAP_OB (mp, nx, ny); tmp; tmp = tmp->above)	2152	for (tmp = ms.bot; tmp; tmp = tmp->above)
2217	if ((QUERY_FLAG (tmp, FLAG_MONSTER) || tmp->type == PLAYER) && (tmp != exclude || (tmp->head && tmp->head != exclude)))	2153	if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)
		2154	&& (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2218	break;	2155	break;
2219		2156
2220	if (tmp)	2157	if (tmp)
2221	return freedir[i];	2158	return freedir[i];
2222	}	2159	}
…		…
2228		2165
2229	/*	2166	/*
2230	* distance(object 1, object 2) will return the square of the	2167	* distance(object 1, object 2) will return the square of the
2231	* distance between the two given objects.	2168	* distance between the two given objects.
2232	*/	2169	*/
2233
2234	int	2170	int
2235	distance (const object *ob1, const object *ob2)	2171	distance (const object *ob1, const object *ob2)
2236	{	2172	{
2237	int i;
2238
2239	i = (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);	2173	return (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);
2240	return i;
2241	}	2174	}
2242		2175
2243	/*	2176	/*
2244	* find_dir_2(delta-x,delta-y) will return a direction in which	2177	* find_dir_2(delta-x,delta-y) will return a direction in which
2245	* an object which has subtracted the x and y coordinates of another	2178	* an object which has subtracted the x and y coordinates of another
2246	* object, needs to travel toward it.	2179	* object, needs to travel toward it.
2247	*/	2180	*/
2248
2249	int	2181	int
2250	find_dir_2 (int x, int y)	2182	find_dir_2 (int x, int y)
2251	{	2183	{
2252	int q;	2184	int q;
2253		2185
…		…
2282		2214
2283	return 3;	2215	return 3;
2284	}	2216	}
2285		2217
2286	/*	2218	/*
2287	* absdir(int): Returns a number between 1 and 8, which represent
2288	* the "absolute" direction of a number (it actually takes care of
2289	* "overflow" in previous calculations of a direction).
2290	*/
2291
2292	int
2293	absdir (int d)
2294	{
2295	while (d < 1)
2296	d += 8;
2297	while (d > 8)
2298	d -= 8;
2299	return d;
2300	}
2301
2302	/*
2303	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is	2219	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is
2304	* between two directions (which are expected to be absolute (see absdir())	2220	* between two directions (which are expected to be absolute (see absdir())
2305	*/	2221	*/
2306
2307	int	2222	int
2308	dirdiff (int dir1, int dir2)	2223	dirdiff (int dir1, int dir2)
2309	{	2224	{
2310	int	2225	int d;
2311	d;
2312		2226
2313	d = abs (dir1 - dir2);	2227	d = abs (dir1 - dir2);
2314	if (d > 4)	2228	if (d > 4)
2315	d = 8 - d;	2229	d = 8 - d;
		2230
2316	return d;	2231	return d;
2317	}	2232	}
2318		2233
2319	/* peterm:	2234	/* peterm:
2320	* do LOS stuff for ball lightning. Go after the closest VISIBLE monster.	2235	* do LOS stuff for ball lightning. Go after the closest VISIBLE monster.
…		…
2323	* This basically means that if direction is 15, then it could either go	2238	* This basically means that if direction is 15, then it could either go
2324	* direction 4, 14, or 16 to get back to where we are.	2239	* direction 4, 14, or 16 to get back to where we are.
2325	* Moved from spell_util.c to object.c with the other related direction	2240	* Moved from spell_util.c to object.c with the other related direction
2326	* functions.	2241	* functions.
2327	*/	2242	*/
2328
2329	int
2330	reduction_dir[SIZEOFFREE][3] = {	2243	int reduction_dir[SIZEOFFREE][3] = {
2331	{0, 0, 0}, /* 0 */	2244	{0, 0, 0}, /* 0 */
2332	{0, 0, 0}, /* 1 */	2245	{0, 0, 0}, /* 1 */
2333	{0, 0, 0}, /* 2 */	2246	{0, 0, 0}, /* 2 */
2334	{0, 0, 0}, /* 3 */	2247	{0, 0, 0}, /* 3 */
2335	{0, 0, 0}, /* 4 */	2248	{0, 0, 0}, /* 4 */
…		…
2426	* Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause	2339	* Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause
2427	* core dumps if they do.	2340	* core dumps if they do.
2428	*	2341	*
2429	* Add a check so we can't pick up invisible objects (0.93.8)	2342	* Add a check so we can't pick up invisible objects (0.93.8)
2430	*/	2343	*/
2431
2432	int	2344	int
2433	can_pick (const object *who, const object *item)	2345	can_pick (const object *who, const object *item)
2434	{	2346	{
2435	return /*QUERY_FLAG(who,FLAG_WIZ)|| */	2347	return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2436	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&	2348	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
…		…
2441	* create clone from object to another	2353	* create clone from object to another
2442	*/	2354	*/
2443	object *	2355	object *
2444	object_create_clone (object *asrc)	2356	object_create_clone (object *asrc)
2445	{	2357	{
2446	object *dst = 0, *tmp, *src, *part, *prev, *item;	2358	object *dst = 0, *tmp, *src, *prev, *item;
2447		2359
2448	if (!asrc)	2360	if (!asrc)
2449	return 0;	2361	return 0;
2450		2362
2451	src = asrc;
2452	if (src->head)
2453	src = src->head;	2363	src = asrc->head_ ();
2454		2364
2455	prev = 0;	2365	prev = 0;
2456	for (part = src; part; part = part->more)	2366	for (object *part = src; part; part = part->more)
2457	{	2367	{
2458	tmp = part->clone ();	2368	tmp = part->clone ();
2459	tmp->x -= src->x;	2369	tmp->x -= src->x;
2460	tmp->y -= src->y;	2370	tmp->y -= src->y;
2461		2371
…		…
2479	insert_ob_in_ob (object_create_clone (item), dst);	2389	insert_ob_in_ob (object_create_clone (item), dst);
2480		2390
2481	return dst;	2391	return dst;
2482	}	2392	}
2483		2393
2484	/* GROS - Creates an object using a string representing its content. */
2485	/* Basically, we save the content of the string to a temp file, then call */
2486	/* load_object on it. I admit it is a highly inefficient way to make things, */
2487	/* but it was simple to make and allows reusing the load_object function. */
2488	/* Remember not to use load_object_str in a time-critical situation. */
2489	/* Also remember that multiparts objects are not supported for now. */
2490
2491	object *
2492	load_object_str (const char *obstr)
2493	{
2494	object *op;
2495	char filename[MAX_BUF];
2496
2497	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2498
2499	FILE *tempfile = fopen (filename, "w");
2500
2501	if (tempfile == NULL)
2502	{
2503	LOG (llevError, "Error - Unable to access load object temp file\n");
2504	return NULL;
2505	}
2506
2507	fprintf (tempfile, obstr);
2508	fclose (tempfile);
2509
2510	op = object::create ();
2511
2512	object_thawer thawer (filename);
2513
2514	if (thawer)
2515	load_object (thawer, op, 0);
2516
2517	LOG (llevDebug, " load str completed, object=%s\n", &op->name);
2518	CLEAR_FLAG (op, FLAG_REMOVED);
2519
2520	return op;
2521	}
2522
2523	/* This returns the first object in who's inventory that	2394	/* This returns the first object in who's inventory that
2524	* has the same type and subtype match.	2395	* has the same type and subtype match.
2525	* returns NULL if no match.	2396	* returns NULL if no match.
2526	*/	2397	*/
2527	object *	2398	object *
2528	find_obj_by_type_subtype (const object *who, int type, int subtype)	2399	find_obj_by_type_subtype (const object *who, int type, int subtype)
2529	{	2400	{
2530	object *tmp;
2531
2532	for (tmp = who->inv; tmp; tmp = tmp->below)	2401	for (object *tmp = who->inv; tmp; tmp = tmp->below)
2533	if (tmp->type == type && tmp->subtype == subtype)	2402	if (tmp->type == type && tmp->subtype == subtype)
2534	return tmp;	2403	return tmp;
2535		2404
2536	return NULL;	2405	return 0;
2537	}	2406	}
2538		2407
2539	/* If ob has a field named key, return the link from the list,	2408	/* If ob has a field named key, return the link from the list,
2540	* otherwise return NULL.	2409	* otherwise return NULL.
2541	*	2410	*
…		…
2543	* do the desired thing.	2412	* do the desired thing.
2544	*/	2413	*/
2545	key_value *	2414	key_value *
2546	get_ob_key_link (const object *ob, const char *key)	2415	get_ob_key_link (const object *ob, const char *key)
2547	{	2416	{
2548	key_value *link;
2549
2550	for (link = ob->key_values; link != NULL; link = link->next)	2417	for (key_value *link = ob->key_values; link; link = link->next)
2551	if (link->key == key)	2418	if (link->key == key)
2552	return link;	2419	return link;
2553		2420
2554	return NULL;	2421	return 0;
2555	}	2422	}
2556		2423
2557	/*	2424	/*
2558	* Returns the value of op has an extra_field for key, or NULL.	2425	* Returns the value of op has an extra_field for key, or NULL.
2559	*	2426	*
…		…
2584	if (link->key == canonical_key)	2451	if (link->key == canonical_key)
2585	return link->value;	2452	return link->value;
2586		2453
2587	return 0;	2454	return 0;
2588	}	2455	}
2589
2590		2456
2591	/*	2457	/*
2592	* Updates the canonical_key in op to value.	2458	* Updates the canonical_key in op to value.
2593	*	2459	*
2594	* canonical_key is a shared string (value doesn't have to be).	2460	* canonical_key is a shared string (value doesn't have to be).
…		…
2599	* Returns TRUE on success.	2465	* Returns TRUE on success.
2600	*/	2466	*/
2601	int	2467	int
2602	set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key)	2468	set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key)
2603	{	2469	{
2604	key_value *
2605	field = NULL, *last = NULL;	2470	key_value *field = NULL, *last = NULL;
2606		2471
2607	for (field = op->key_values; field != NULL; field = field->next)	2472	for (field = op->key_values; field != NULL; field = field->next)
2608	{	2473	{
2609	if (field->key != canonical_key)	2474	if (field->key != canonical_key)
2610	{	2475	{
…		…
2619	/* Basically, if the archetype has this key set,	2484	/* Basically, if the archetype has this key set,
2620	* we need to store the null value so when we save	2485	* we need to store the null value so when we save
2621	* it, we save the empty value so that when we load,	2486	* it, we save the empty value so that when we load,
2622	* we get this value back again.	2487	* we get this value back again.
2623	*/	2488	*/
2624	if (get_ob_key_link (&op->arch->clone, canonical_key))	2489	if (get_ob_key_link (op->arch, canonical_key))
2625	field->value = 0;	2490	field->value = 0;
2626	else	2491	else
2627	{	2492	{
2628	if (last)	2493	if (last)
2629	last->next = field->next;	2494	last->next = field->next;
…		…
2638	/* IF we get here, key doesn't exist */	2503	/* IF we get here, key doesn't exist */
2639		2504
2640	/* No field, we'll have to add it. */	2505	/* No field, we'll have to add it. */
2641		2506
2642	if (!add_key)	2507	if (!add_key)
2643	{
2644	return FALSE;	2508	return FALSE;
2645	}	2509
2646	/* There isn't any good reason to store a null	2510	/* There isn't any good reason to store a null
2647	* value in the key/value list. If the archetype has	2511	* value in the key/value list. If the archetype has
2648	* this key, then we should also have it, so shouldn't	2512	* this key, then we should also have it, so shouldn't
2649	* be here. If user wants to store empty strings,	2513	* be here. If user wants to store empty strings,
2650	* should pass in ""	2514	* should pass in ""
…		…
2699	}	2563	}
2700	else	2564	else
2701	item = item->env;	2565	item = item->env;
2702	}	2566	}
2703		2567
		2568	const char *
		2569	object::flag_desc (char *desc, int len) const
		2570	{
		2571	char *p = desc;
		2572	bool first = true;
		2573
		2574	*p = 0;
		2575
		2576	for (int i = 0; i < NUM_FLAGS; i++)
		2577	{
		2578	if (len <= 10) // magic constant!
		2579	{
		2580	snprintf (p, len, ",...");
		2581	break;
		2582	}
		2583
		2584	if (flag [i])
		2585	{
		2586	int cnt = snprintf (p, len, "%s%d", first ? "" : ",", i);
		2587	len -= cnt;
		2588	p += cnt;
		2589	first = false;
		2590	}
		2591	}
		2592
		2593	return desc;
		2594	}
		2595
2704	// return a suitable string describing an objetc in enough detail to find it	2596	// return a suitable string describing an object in enough detail to find it
2705	const char *	2597	const char *
2706	object::debug_desc (char *info) const	2598	object::debug_desc (char *info) const
2707	{	2599	{
		2600	char flagdesc[512];
2708	char info2[256 * 3];	2601	char info2[256 * 4];
2709	char *p = info;	2602	char *p = info;
2710		2603
2711	p += snprintf (p, 256, "%d=\"%s%s%s\"",	2604	p += snprintf (p, 512, "{cnt:%d,uuid:<1.%" PRIx64 ">,name:\"%s\"%s%s,flags:[%s],type:%d}",
2712	count,	2605	count, uuid.seq,
2713	&name,	2606	&name,
2714	title ? " " : "",	2607	title ? "\",title:\"" : "",
2715	title ? (const char *)title : "");	2608	title ? (const char *)title : "",
		2609	flag_desc (flagdesc, 512), type);
2716		2610
2717	if (env)	2611	if (!this->flag[FLAG_REMOVED] && env)
2718	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2612	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2719		2613
2720	if (map)	2614	if (map)
2721	p += snprintf (p, 256, "(on %s@%d+%d)", map->path, x, y);	2615	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2722		2616
2723	return info;	2617	return info;
2724	}	2618	}
2725		2619
2726	const char *	2620	const char *
2727	object::debug_desc () const	2621	object::debug_desc () const
2728	{	2622	{
2729	static char info[256 * 3];	2623	static char info[3][256 * 4];
		2624	static int info_idx;
		2625
2730	return debug_desc (info);	2626	return debug_desc (info [++info_idx % 3]);
2731	}	2627	}
2732		2628
		2629	struct region *
		2630	object::region () const
		2631	{
		2632	return map ? map->region (x, y)
		2633	: region::default_region ();
		2634	}
		2635
		2636	const materialtype_t *
		2637	object::dominant_material () const
		2638	{
		2639	if (materialtype_t *mt = name_to_material (materialname))
		2640	return mt;
		2641
		2642	return name_to_material (shstr_unknown);
		2643	}
		2644
		2645	void
		2646	object::open_container (object *new_container)
		2647	{
		2648	if (container == new_container)
		2649	return;
		2650
		2651	if (object *old_container = container)
		2652	{
		2653	if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
		2654	return;
		2655
		2656	#if 0
		2657	// remove the "Close old_container" object.
		2658	if (object *closer = old_container->inv)
		2659	if (closer->type == CLOSE_CON)
		2660	closer->destroy ();
		2661	#endif
		2662
		2663	old_container->flag [FLAG_APPLIED] = 0;
		2664	container = 0;
		2665
		2666	esrv_update_item (UPD_FLAGS, this, old_container);
		2667	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
		2668	play_sound (sound_find ("chest_close"));
		2669	}
		2670
		2671	if (new_container)
		2672	{
		2673	if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))
		2674	return;
		2675
		2676	// TODO: this does not seem to serve any purpose anymore?
		2677	#if 0
		2678	// insert the "Close Container" object.
		2679	if (archetype *closer = new_container->other_arch)
		2680	{
		2681	object *closer = arch_to_object (new_container->other_arch);
		2682	closer->flag [FLAG_NO_MAP_SAVE] = 1;
		2683	new_container->insert (closer);
		2684	}
		2685	#endif
		2686
		2687	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));
		2688
		2689	new_container->flag [FLAG_APPLIED] = 1;
		2690	container = new_container;
		2691
		2692	esrv_update_item (UPD_FLAGS, this, new_container);
		2693	esrv_send_inventory (this, new_container);
		2694	play_sound (sound_find ("chest_open"));
		2695	}
		2696	}
		2697
		2698	object *
		2699	object::force_find (const shstr name)
		2700	{
		2701	/* cycle through his inventory to look for the MARK we want to
		2702	* place
		2703	*/
		2704	for (object *tmp = inv; tmp; tmp = tmp->below)
		2705	if (tmp->type == FORCE && tmp->slaying == name)
		2706	return splay (tmp);
		2707
		2708	return 0;
		2709	}
		2710
		2711	void
		2712	object::force_add (const shstr name, int duration)
		2713	{
		2714	if (object *force = force_find (name))
		2715	force->destroy ();
		2716
		2717	object *force = get_archetype (FORCE_NAME);
		2718
		2719	force->slaying = name;
		2720	force->stats.food = 1;
		2721	force->speed_left = -1.f;
		2722
		2723	force->set_speed (duration ? 1.f / duration : 0.f);
		2724	force->flag [FLAG_IS_USED_UP] = true;
		2725	force->flag [FLAG_APPLIED] = true;
		2726
		2727	insert (force);
		2728	}
		2729
		2730	void
		2731	object::play_sound (faceidx sound) const
		2732	{
		2733	if (!sound)
		2734	return;
		2735
		2736	if (flag [FLAG_REMOVED])
		2737	return;
		2738
		2739	if (env)
		2740	{
		2741	if (object *pl = in_player ())
		2742	pl->contr->play_sound (sound);
		2743	}
		2744	else
		2745	map->play_sound (sound, x, y);
		2746	}
		2747

Diff Legend

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