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.74 by root, Wed Dec 20 09:14:21 2006 UTC vs.
Revision 1.194 by root, Tue Oct 16 00:30:24 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
…		…
253	/* This is really a spellbook check - really, we should	254	/* This is really a spellbook check - really, we should
254	* check all objects in the inventory.	255	* check all objects in the inventory.
255	*/	256	*/
256	if (ob1->inv || ob2->inv)	257	if (ob1->inv || ob2->inv)
257	{	258	{
258	/* if one object has inventory but the other doesn't, not equiv */	259	if (!(ob1->inv && ob2->inv))
259	if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv))	260	return 0; /* inventories differ in length */
260	return 0;
261		261
262	/* Now check to see if the two inventory objects could merge */	262	if (ob1->inv->below || ob2->inv->below)
		263	return 0; /* more than one object in inv */
		264
263	if (!object::can_merge (ob1->inv, ob2->inv))	265	if (!object::can_merge (ob1->inv, ob2->inv))
264	return 0;	266	return 0; /* inventory objexts differ */
265		267
266	/* inventory ok - still need to check rest of this object to see	268	/* inventory ok - still need to check rest of this object to see
267	* if it is valid.	269	* if it is valid.
268	*/	270	*/
269	}	271	}
…		…
277		279
278	/* Note sure why the following is the case - either the object has to	280	/* 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	281	* be animated or have a very low speed. Is this an attempted monster
280	* check?	282	* check?
281	*/	283	*/
282	if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && FABS ((ob1)->speed) > MIN_ACTIVE_SPEED)	284	if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && ob1->has_active_speed ())
283	return 0;	285	return 0;
284		286
285	switch (ob1->type)	287	switch (ob1->type)
286	{	288	{
287	case SCROLL:	289	case SCROLL:
…		…
298	return 0;	300	return 0;
299	else if (!compare_ob_value_lists (ob1, ob2))	301	else if (!compare_ob_value_lists (ob1, ob2))
300	return 0;	302	return 0;
301	}	303	}
302		304
303	//TODO: generate an event or call into perl for additional checks
304	if (ob1->self || ob2->self)	305	if (ob1->self || ob2->self)
305	{	306	{
306	ob1->optimise ();	307	ob1->optimise ();
307	ob2->optimise ();	308	ob2->optimise ();
308		309
309	if (ob1->self || ob2->self)	310	if (ob1->self || ob2->self)
		311	{
		312	int k1 = ob1->self ? HvTOTALKEYS (SvRV (ob1->self)) : 0;
		313	int k2 = ob2->self ? HvTOTALKEYS (SvRV (ob2->self)) : 0;
		314
		315	if (k1 != k2)
310	return 0;	316	return 0;
		317	else if (k1 == 0)
		318	return 1;
		319	else if (!cfperl_can_merge (ob1, ob2))
		320	return 0;
		321	}
311	}	322	}
312		323
313	/* Everything passes, must be OK. */	324	/* Everything passes, must be OK. */
314	return 1;	325	return 1;
315	}	326	}
…		…
323	sum_weight (object *op)	334	sum_weight (object *op)
324	{	335	{
325	long sum;	336	long sum;
326	object *inv;	337	object *inv;
327		338
328	for (sum = 0, inv = op->inv; inv != NULL; inv = inv->below)	339	for (sum = 0, inv = op->inv; inv; inv = inv->below)
329	{	340	{
330	if (inv->inv)	341	if (inv->inv)
331	sum_weight (inv);	342	sum_weight (inv);
		343
332	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);	344	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);
333	}	345	}
334		346
335	if (op->type == CONTAINER && op->stats.Str)	347	if (op->type == CONTAINER && op->stats.Str)
336	sum = (sum * (100 - op->stats.Str)) / 100;	348	sum = (sum * (100 - op->stats.Str)) / 100;
…		…
356	/*	368	/*
357	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.	369	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
358	* Some error messages.	370	* Some error messages.
359	* The result of the dump is stored in the static global errmsg array.	371	* The result of the dump is stored in the static global errmsg array.
360	*/	372	*/
361
362	char *	373	char *
363	dump_object (object *op)	374	dump_object (object *op)
364	{	375	{
365	if (!op)	376	if (!op)
366	return strdup ("[NULLOBJ]");	377	return strdup ("[NULLOBJ]");
367		378
368	object_freezer freezer;	379	object_freezer freezer;
369	save_object (freezer, op, 3);	380	op->write (freezer);
370	return freezer.as_string ();	381	return freezer.as_string ();
371	}	382	}
372		383
373	/*	384	/*
374	* get_nearest_part(multi-object, object 2) returns the part of the	385	* get_nearest_part(multi-object, object 2) returns the part of the
375	* multi-object 1 which is closest to the second object.	386	* multi-object 1 which is closest to the second object.
376	* If it's not a multi-object, it is returned.	387	* If it's not a multi-object, it is returned.
377	*/	388	*/
378
379	object *	389	object *
380	get_nearest_part (object *op, const object *pl)	390	get_nearest_part (object *op, const object *pl)
381	{	391	{
382	object *tmp, *closest;	392	object *tmp, *closest;
383	int last_dist, i;	393	int last_dist, i;
…		…
391	}	401	}
392		402
393	/*	403	/*
394	* Returns the object which has the count-variable equal to the argument.	404	* Returns the object which has the count-variable equal to the argument.
395	*/	405	*/
396
397	object *	406	object *
398	find_object (tag_t i)	407	find_object (tag_t i)
399	{	408	{
400	for (object *op = object::first; op; op = op->next)	409	for_all_objects (op)
401	if (op->count == i)	410	if (op->count == i)
402	return op;	411	return op;
403		412
404	return 0;	413	return 0;
405	}	414	}
406		415
407	/*	416	/*
408	* Returns the first object which has a name equal to the argument.	417	* Returns the first object which has a name equal to the argument.
409	* Used only by the patch command, but not all that useful.	418	* Used only by the patch command, but not all that useful.
410	* Enables features like "patch <name-of-other-player> food 999"	419	* Enables features like "patch <name-of-other-player> food 999"
411	*/	420	*/
412
413	object *	421	object *
414	find_object_name (const char *str)	422	find_object_name (const char *str)
415	{	423	{
416	shstr_cmp str_ (str);	424	shstr_cmp str_ (str);
417	object *op;	425	object *op;
418		426
419	for (op = object::first; op != NULL; op = op->next)	427	for_all_objects (op)
420	if (op->name == str_)	428	if (op->name == str_)
421	break;	429	break;
422		430
423	return op;	431	return op;
424	}	432	}
…		…
430	}	438	}
431		439
432	/*	440	/*
433	* Sets the owner and sets the skill and exp pointers to owner's current	441	* Sets the owner and sets the skill and exp pointers to owner's current
434	* skill and experience objects.	442	* skill and experience objects.
		443	* ACTUALLY NO! investigate! TODO
435	*/	444	*/
436	void	445	void
437	object::set_owner (object *owner)	446	object::set_owner (object *owner)
438	{	447	{
		448	// allow objects which own objects
439	if (!owner)	449	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)	450	while (owner->owner)
450	owner = owner->owner;	451	owner = owner->owner;
451		452
452	this->owner = owner;	453	this->owner = owner;
		454	}
		455
		456	int
		457	object::slottype () const
		458	{
		459	if (type == SKILL)
		460	{
		461	if (IS_COMBAT_SKILL (subtype)) return slot_combat;
		462	if (IS_RANGED_SKILL (subtype)) return slot_ranged;
		463	}
		464	else
		465	{
		466	if (slot [body_combat].info) return slot_combat;
		467	if (slot [body_range ].info) return slot_ranged;
		468	}
		469
		470	return slot_none;
		471	}
		472
		473	bool
		474	object::change_weapon (object *ob)
		475	{
		476	if (current_weapon == ob)
		477	return true;
		478
		479	if (chosen_skill)
		480	chosen_skill->flag [FLAG_APPLIED] = false;
		481
		482	current_weapon = ob;
		483	chosen_skill = !ob || ob->type == SKILL ? ob : find_skill_by_name (this, ob->skill);
		484
		485	if (chosen_skill)
		486	chosen_skill->flag [FLAG_APPLIED] = true;
		487
		488	update_stats ();
		489
		490	if (ob)
		491	{
		492	// now check wether any body locations became invalid, in which case
		493	// we cannot apply the weapon at the moment.
		494	for (int i = 0; i < NUM_BODY_LOCATIONS; ++i)
		495	if (slot[i].used < 0)
		496	{
		497	current_weapon = chosen_skill = 0;
		498	update_stats ();
		499
		500	new_draw_info_format (NDI_UNIQUE, 0, this,
		501	"You try to balance all your items at once, "
		502	"but the %s is just too much for your body. "
		503	"[You need to unapply some items first.]", &ob->name);
		504	return false;
		505	}
		506
		507	//new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);
		508	}
		509	else
		510	;//new_draw_info_format (NDI_UNIQUE, 0, this, "You unwield your weapons.");
		511
		512	if (ob && !ob->flag [FLAG_APPLIED] && ob->type != SPELL)
		513	{
		514	LOG (llevError | logBacktrace, "%s changed to unapplied weapon %s",
		515	&name, ob->debug_desc ());
		516	return false;
		517	}
		518
		519	return true;
453	}	520	}
454		521
455	/* Zero the key_values on op, decrementing the shared-string	522	/* Zero the key_values on op, decrementing the shared-string
456	* refcounts and freeing the links.	523	* refcounts and freeing the links.
457	*/	524	*/
458	static void	525	static void
459	free_key_values (object *op)	526	free_key_values (object *op)
460	{	527	{
461	for (key_value *i = op->key_values; i != 0;)	528	for (key_value *i = op->key_values; i; )
462	{	529	{
463	key_value *next = i->next;	530	key_value *next = i->next;
464	delete i;	531	delete i;
465		532
466	i = next;	533	i = next;
467	}	534	}
468		535
469	op->key_values = 0;	536	op->key_values = 0;
470	}	537	}
471		538
472	void object::clear ()	539	object &
		540	object::operator =(const object &src)
473	{	541	{
474	attachable_base::clear ();	542	bool is_freed = flag [FLAG_FREED];
		543	bool is_removed = flag [FLAG_REMOVED];
475		544
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;	545	*(object_copy *)this = src;
529	*(object_pod *)dst = *this;
530		546
531	if (self || cb)	547	flag [FLAG_FREED] = is_freed;
532	INVOKE_OBJECT (CLONE, this, ARG_OBJECT (dst));	548	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		549
543	/* Copy over key_values, if any. */	550	/* Copy over key_values, if any. */
544	if (key_values)	551	if (src.key_values)
545	{	552	{
546	key_value *tail = 0;	553	key_value *tail = 0;
547	key_value *i;
548
549	dst->key_values = 0;	554	key_values = 0;
550		555
551	for (i = key_values; i; i = i->next)	556	for (key_value *i = src.key_values; i; i = i->next)
552	{	557	{
553	key_value *new_link = new key_value;	558	key_value *new_link = new key_value;
554		559
555	new_link->next = 0;	560	new_link->next = 0;
556	new_link->key = i->key;	561	new_link->key = i->key;
557	new_link->value = i->value;	562	new_link->value = i->value;
558		563
559	/* Try and be clever here, too. */	564	/* Try and be clever here, too. */
560	if (!dst->key_values)	565	if (!key_values)
561	{	566	{
562	dst->key_values = new_link;	567	key_values = new_link;
563	tail = new_link;	568	tail = new_link;
564	}	569	}
565	else	570	else
566	{	571	{
567	tail->next = new_link;	572	tail->next = new_link;
568	tail = new_link;	573	tail = new_link;
569	}	574	}
570	}	575	}
571	}	576	}
		577	}
572		578
573	update_ob_speed (dst);	579	/*
		580	* copy_to first frees everything allocated by the dst object,
		581	* and then copies the contents of itself into the second
		582	* object, allocating what needs to be allocated. Basically, any
		583	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
		584	* if the first object is freed, the pointers in the new object
		585	* will point at garbage.
		586	*/
		587	void
		588	object::copy_to (object *dst)
		589	{
		590	*dst = *this;
		591
		592	if (speed < 0)
		593	dst->speed_left -= rndm ();
		594
		595	dst->set_speed (dst->speed);
		596	}
		597
		598	void
		599	object::instantiate ()
		600	{
		601	if (!uuid.seq) // HACK
		602	uuid = gen_uuid ();
		603
		604	speed_left = -0.1f;
		605	/* copy the body_info to the body_used - this is only really
		606	* need for monsters, but doesn't hurt to do it for everything.
		607	* by doing so, when a monster is created, it has good starting
		608	* values for the body_used info, so when items are created
		609	* for it, they can be properly equipped.
		610	*/
		611	for (int i = NUM_BODY_LOCATIONS; i--; )
		612	slot[i].used = slot[i].info;
		613
		614	attachable::instantiate ();
574	}	615	}
575		616
576	object *	617	object *
577	object::clone ()	618	object::clone ()
578	{	619	{
…		…
584	/*	625	/*
585	* If an object with the IS_TURNABLE() flag needs to be turned due	626	* 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	627	* 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.	628	* be called to update the face variable, _and_ how it looks on the map.
588	*/	629	*/
589
590	void	630	void
591	update_turn_face (object *op)	631	update_turn_face (object *op)
592	{	632	{
593	if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || op->arch == NULL)	633	if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || !op->arch)
594	return;	634	return;
		635
595	SET_ANIMATION (op, op->direction);	636	SET_ANIMATION (op, op->direction);
596	update_object (op, UP_OBJ_FACE);	637	update_object (op, UP_OBJ_FACE);
597	}	638	}
598		639
599	/*	640	/*
600	* Updates the speed of an object. If the speed changes from 0 to another	641	* 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.	642	* 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.	643	* This function needs to be called whenever the speed of an object changes.
603	*/	644	*/
604	void	645	void
605	update_ob_speed (object *op)	646	object::set_speed (float speed)
606	{	647	{
607	extern int arch_init;	648	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	{	649	{
615	LOG (llevError, "Object %s is freed but has speed.\n", &op->name);	650	LOG (llevError, "Object %s is freed but has speed.\n", &name);
616	#ifdef MANY_CORES
617	abort ();
618	#else
619	op->speed = 0;	651	speed = 0;
620	#endif
621	}
622
623	if (arch_init)
624	return;
625
626	if (FABS (op->speed) > MIN_ACTIVE_SPEED)
627	{	652	}
628	/* If already on active list, don't do anything */
629	if (op->active_next || op->active_prev || op == active_objects)
630	return;
631		653
632	/* process_events() expects us to insert the object at the beginning	654	this->speed = speed;
633	* of the list. */
634	op->active_next = active_objects;
635		655
636	if (op->active_next != NULL)	656	if (has_active_speed ())
637	op->active_next->active_prev = op;	657	activate ();
638
639	active_objects = op;
640	}
641	else	658	else
642	{	659	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	}	660	}
666		661
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	}
697
698	/*	662	/*
699	* update_object() updates the array which represents the map.	663	* update_object() updates the the map.
700	* It takes into account invisible objects (and represent squares covered	664	* It takes into account invisible objects (and represent squares covered
701	* by invisible objects by whatever is below them (unless it's another	665	* by invisible objects by whatever is below them (unless it's another
702	* invisible object, etc...)	666	* invisible object, etc...)
703	* If the object being updated is beneath a player, the look-window	667	* If the object being updated is beneath a player, the look-window
704	* of that player is updated (this might be a suboptimal way of	668	* of that player is updated (this might be a suboptimal way of
705	* updating that window, though, since update_object() is called _often_)	669	* updating that window, though, since update_object() is called _often_)
706	*	670	*
707	* action is a hint of what the caller believes need to be done.	671	* action is a hint of what the caller believes need to be done.
708	* For example, if the only thing that has changed is the face (due to
709	* an animation), we don't need to call update_position until that actually
710	* comes into view of a player. OTOH, many other things, like addition/removal
711	* of walls or living creatures may need us to update the flags now.
712	* current action are:	672	* current action are:
713	* UP_OBJ_INSERT: op was inserted	673	* UP_OBJ_INSERT: op was inserted
714	* UP_OBJ_REMOVE: op was removed	674	* UP_OBJ_REMOVE: op was removed
715	* UP_OBJ_CHANGE: object has somehow changed. In this case, we always update	675	* UP_OBJ_CHANGE: object has somehow changed. In this case, we always update
716	* as that is easier than trying to look at what may have changed.	676	* as that is easier than trying to look at what may have changed.
717	* UP_OBJ_FACE: only the objects face has changed.	677	* UP_OBJ_FACE: only the objects face has changed.
718	*/	678	*/
719
720	void	679	void
721	update_object (object *op, int action)	680	update_object (object *op, int action)
722	{	681	{
723	int update_now = 0, flags;
724	MoveType move_on, move_off, move_block, move_slow;
725
726	if (op == NULL)	682	if (op == NULL)
727	{	683	{
728	/* this should never happen */	684	/* this should never happen */
729	LOG (llevDebug, "update_object() called for NULL object.\n");	685	LOG (llevDebug, "update_object() called for NULL object.\n");
730	return;	686	return;
731	}	687	}
732		688
733	if (op->env != NULL)	689	if (op->env)
734	{	690	{
735	/* Animation is currently handled by client, so nothing	691	/* Animation is currently handled by client, so nothing
736	* to do in this case.	692	* to do in this case.
737	*/	693	*/
738	return;	694	return;
…		…
743	*/	699	*/
744	if (!op->map || op->map->in_memory == MAP_SAVING)	700	if (!op->map || op->map->in_memory == MAP_SAVING)
745	return;	701	return;
746		702
747	/* make sure the object is within map boundaries */	703	/* make sure the object is within map boundaries */
748	if (op->x < 0 || op->x >= MAP_WIDTH (op->map) || op->y < 0 || op->y >= MAP_HEIGHT (op->map))	704	if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height)
749	{	705	{
750	LOG (llevError, "update_object() called for object out of map!\n");	706	LOG (llevError, "update_object() called for object out of map!\n");
751	#ifdef MANY_CORES	707	#ifdef MANY_CORES
752	abort ();	708	abort ();
753	#endif	709	#endif
754	return;	710	return;
755	}	711	}
756		712
757	flags = GET_MAP_FLAGS (op->map, op->x, op->y);	713	mapspace &m = op->ms ();
758	SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NEED_UPDATE);
759	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);
760	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);
761	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);
762	move_off = GET_MAP_MOVE_OFF (op->map, op->x, op->y);
763		714
		715	if (!(m.flags_ & P_UPTODATE))
		716	/* nop */;
764	if (action == UP_OBJ_INSERT)	717	else if (action == UP_OBJ_INSERT)
765	{	718	{
		719	// this is likely overkill, TODO: revisit (schmorp)
766	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(flags & P_BLOCKSVIEW))	720	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
767	update_now = 1;
768
769	if (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(flags & P_NO_MAGIC))	721	|| (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))
770	update_now = 1;	722	|| (op->type == PLAYER && !(m.flags_ & P_PLAYER))
771		723	|| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
		724	|| (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))
772	if (QUERY_FLAG (op, FLAG_DAMNED) && !(flags & P_NO_CLERIC))	725	|| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))
773	update_now = 1;
774
775	if (QUERY_FLAG (op, FLAG_ALIVE) && !(flags & P_IS_ALIVE))
776	update_now = 1;
777
778	if (op->type == SAFE_GROUND && !(flags & P_SAFE))
779	update_now = 1;
780
781	if ((move_on | op->move_on) != move_on)	726	|| (m.move_on | op->move_on ) != m.move_on
782	update_now = 1;
783
784	if ((move_off | op->move_off) != move_off)	727	|| (m.move_off | op->move_off ) != m.move_off
785	update_now = 1;	728	|| (m.move_slow | op->move_slow) != m.move_slow
786
787	/* This isn't perfect, but I don't expect a lot of objects to	729	/* This isn't perfect, but I don't expect a lot of objects to
788	* to have move_allow right now.	730	* to have move_allow right now.
789	*/	731	*/
790	if (((move_block | op->move_block) & ~op->move_allow) != move_block)	732	|| ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block
791	update_now = 1;	733	|| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)
792		734	m.flags_ = 0;
793	if ((move_slow | op->move_slow) != move_slow)
794	update_now = 1;
795	}	735	}
796
797	/* if the object is being removed, we can't make intelligent	736	/* if the object is being removed, we can't make intelligent
798	* decisions, because remove_ob can't really pass the object	737	* decisions, because remove_ob can't really pass the object
799	* that is being removed.	738	* that is being removed.
800	*/	739	*/
801	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)	740	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
802	update_now = 1;	741	m.flags_ = 0;
803	else if (action == UP_OBJ_FACE)	742	else if (action == UP_OBJ_FACE)
804	/* Nothing to do for that case */ ;	743	/* Nothing to do for that case */ ;
805	else	744	else
806	LOG (llevError, "update_object called with invalid action: %d\n", action);	745	LOG (llevError, "update_object called with invalid action: %d\n", action);
807		746
808	if (update_now)
809	{
810	SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NO_ERROR | P_NEED_UPDATE);
811	update_position (op->map, op->x, op->y);
812	}
813
814	if (op->more != NULL)	747	if (op->more)
815	update_object (op->more, action);	748	update_object (op->more, action);
816	}
817
818	object::vector object::mortals;
819	object::vector object::objects; // not yet used
820	object *object::first;
821
822	void object::free_mortals ()
823	{
824	for (AUTODECL (i, mortals.begin ()); i != mortals.end ();)
825	if ((*i)->refcnt)
826	++i; // further delay freeing
827	else
828	{
829	delete *i;
830	mortals.erase (i);
831	}
832	}	749	}
833		750
834	object::object ()	751	object::object ()
835	{	752	{
836	SET_FLAG (this, FLAG_REMOVED);	753	SET_FLAG (this, FLAG_REMOVED);
…		…
839	face = blank_face;	756	face = blank_face;
840	}	757	}
841		758
842	object::~object ()	759	object::~object ()
843	{	760	{
		761	unlink ();
		762
844	free_key_values (this);	763	free_key_values (this);
845	}	764	}
846		765
		766	static int object_count;
		767
847	void object::link ()	768	void object::link ()
848	{	769	{
849	count = ++ob_count;	770	assert (!index);//D
850	uuid = gen_uuid ();	771	uuid = gen_uuid ();
		772	count = ++object_count;
851		773
852	prev = 0;	774	refcnt_inc ();
853	next = object::first;	775	objects.insert (this);
854
855	if (object::first)
856	object::first->prev = this;
857
858	object::first = this;
859	}	776	}
860		777
861	void object::unlink ()	778	void object::unlink ()
862	{	779	{
863	if (this == object::first)	780	if (!index)
864	object::first = next;	781	return;
865		782
866	/* Remove this object from the list of used objects */	783	objects.erase (this);
867	if (prev) prev->next = next;	784	refcnt_dec ();
868	if (next) next->prev = prev;	785	}
869		786
870	prev = 0;	787	void
871	next = 0;	788	object::activate ()
		789	{
		790	/* If already on active list, don't do anything */
		791	if (active)
		792	return;
		793
		794	if (has_active_speed ())
		795	actives.insert (this);
		796	}
		797
		798	void
		799	object::activate_recursive ()
		800	{
		801	activate ();
		802
		803	for (object *op = inv; op; op = op->below)
		804	op->activate_recursive ();
		805	}
		806
		807	/* This function removes object 'op' from the list of active
		808	* objects.
		809	* This should only be used for style maps or other such
		810	* reference maps where you don't want an object that isn't
		811	* in play chewing up cpu time getting processed.
		812	* The reverse of this is to call update_ob_speed, which
		813	* will do the right thing based on the speed of the object.
		814	*/
		815	void
		816	object::deactivate ()
		817	{
		818	/* If not on the active list, nothing needs to be done */
		819	if (!active)
		820	return;
		821
		822	actives.erase (this);
		823	}
		824
		825	void
		826	object::deactivate_recursive ()
		827	{
		828	for (object *op = inv; op; op = op->below)
		829	op->deactivate_recursive ();
		830
		831	deactivate ();
		832	}
		833
		834	void
		835	object::set_flag_inv (int flag, int value)
		836	{
		837	for (object *op = inv; op; op = op->below)
		838	{
		839	op->flag [flag] = value;
		840	op->set_flag_inv (flag, value);
		841	}
		842	}
		843
		844	/*
		845	* Remove and free all objects in the inventory of the given object.
		846	* object.c ?
		847	*/
		848	void
		849	object::destroy_inv (bool drop_to_ground)
		850	{
		851	// need to check first, because the checks below might segfault
		852	// as we might be on an invalid mapspace and crossfire code
		853	// is too buggy to ensure that the inventory is empty.
		854	// corollary: if you create arrows etc. with stuff in tis inventory,
		855	// cf will crash below with off-map x and y
		856	if (!inv)
		857	return;
		858
		859	/* Only if the space blocks everything do we not process -
		860	* if some form of movement is allowed, let objects
		861	* drop on that space.
		862	*/
		863	if (!drop_to_ground
		864	|| !map
		865	|| map->in_memory != MAP_IN_MEMORY
		866	|| map->nodrop
		867	|| ms ().move_block == MOVE_ALL)
		868	{
		869	while (inv)
		870	{
		871	inv->destroy_inv (drop_to_ground);
		872	inv->destroy ();
		873	}
		874	}
		875	else
		876	{ /* Put objects in inventory onto this space */
		877	while (inv)
		878	{
		879	object *op = inv;
		880
		881	if (op->flag [FLAG_STARTEQUIP]
		882	|| op->flag [FLAG_NO_DROP]
		883	|| op->type == RUNE
		884	|| op->type == TRAP
		885	|| op->flag [FLAG_IS_A_TEMPLATE]
		886	|| op->flag [FLAG_DESTROY_ON_DEATH])
		887	op->destroy ();
		888	else
		889	map->insert (op, x, y);
		890	}
		891	}
872	}	892	}
873		893
874	object *object::create ()	894	object *object::create ()
875	{	895	{
876	object *op = new object;	896	object *op = new object;
877	op->link ();	897	op->link ();
878	return op;	898	return op;
879	}	899	}
880		900
881	/*	901	void
882	* free_object() frees everything allocated by an object, removes	902	object::do_destroy ()
883	* it from the list of used objects, and puts it on the list of
884	* free objects. The IS_FREED() flag is set in the object.
885	* The object must have been removed by remove_ob() first for
886	* this function to succeed.
887	*
888	* If destroy_inventory is set, free inventory as well. Else drop items in
889	* inventory to the ground.
890	*/
891	void object::destroy (bool destroy_inventory)
892	{	903	{
893	if (QUERY_FLAG (this, FLAG_FREED))	904	attachable::do_destroy ();
894	return;
895		905
896	if (QUERY_FLAG (this, FLAG_FRIENDLY))	906	if (flag [FLAG_IS_LINKED])
		907	remove_button_link (this);
		908
		909	if (flag [FLAG_FRIENDLY])
897	remove_friendly_object (this);	910	remove_friendly_object (this);
898		911
899	if (!QUERY_FLAG (this, FLAG_REMOVED))	912	if (!flag [FLAG_REMOVED])
900	remove ();	913	remove ();
901		914
902	SET_FLAG (this, FLAG_FREED);	915	destroy_inv (true);
903		916
904	if (more)	917	deactivate ();
905	{	918	unlink ();
906	more->destroy (destroy_inventory);
907	more = 0;
908	}
909		919
910	if (inv)	920	flag [FLAG_FREED] = 1;
911	{
912	/* Only if the space blocks everything do we not process -
913	* if some form of movement is allowed, let objects
914	* drop on that space.
915	*/
916	if (destroy_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
917	{
918	object *op = inv;
919
920	while (op)
921	{
922	object *tmp = op->below;
923	op->destroy (destroy_inventory);
924	op = tmp;
925	}
926	}
927	else
928	{ /* Put objects in inventory onto this space */
929	object *op = inv;
930
931	while (op)
932	{
933	object *tmp = op->below;
934
935	op->remove ();
936
937	if (QUERY_FLAG (op, FLAG_STARTEQUIP)
938	|| QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
939	op->destroy ();
940	else
941	{
942	op->x = x;
943	op->y = y;
944	insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */
945	}
946
947	op = tmp;
948	}
949	}
950	}
951		921
952	// hack to ensure that freed objects still have a valid map	922	// hack to ensure that freed objects still have a valid map
953	{	923	{
954	static maptile *freed_map; // freed objects are moved here to avoid crashes	924	static maptile *freed_map; // freed objects are moved here to avoid crashes
955		925
956	if (!freed_map)	926	if (!freed_map)
957	{	927	{
958	freed_map = new maptile;	928	freed_map = new maptile;
959		929
		930	freed_map->path = "<freed objects map>";
960	freed_map->name = "/internal/freed_objects_map";	931	freed_map->name = "/internal/freed_objects_map";
961	freed_map->width = 3;	932	freed_map->width = 3;
962	freed_map->height = 3;	933	freed_map->height = 3;
963		934
964	freed_map->allocate ();	935	freed_map->alloc ();
		936	freed_map->in_memory = MAP_IN_MEMORY;
965	}	937	}
966		938
967	map = freed_map;	939	map = freed_map;
968	x = 1;	940	x = 1;
969	y = 1;	941	y = 1;
970	}	942	}
971		943
		944	if (more)
		945	{
		946	more->destroy ();
		947	more = 0;
		948	}
		949
		950	head = 0;
		951
972	// clear those pointers that likely might have circular references to us	952	// clear those pointers that likely might cause circular references
973	owner = 0;	953	owner = 0;
974	enemy = 0;	954	enemy = 0;
975	attacked_by = 0;	955	attacked_by = 0;
		956	current_weapon = 0;
		957	}
976		958
977	// only relevant for players(?), but make sure of it anyways	959	void
978	contr = 0;	960	object::destroy (bool destroy_inventory)
		961	{
		962	if (destroyed ())
		963	return;
979		964
980	/* Remove object from the active list */	965	if (destroy_inventory)
981	speed = 0;	966	destroy_inv (false);
982	update_ob_speed (this);
983		967
984	unlink ();	968	if (is_head ())
		969	if (sound_destroy)
		970	play_sound (sound_destroy);
		971	else if (flag [FLAG_MONSTER])
		972	play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism
985		973
986	mortals.push_back (this);	974	attachable::destroy ();
987	}	975	}
988		976
989	/*	977	/*
990	* sub_weight() recursively (outwards) subtracts a number from the	978	* sub_weight() recursively (outwards) subtracts a number from the
991	* weight of an object (and what is carried by it's environment(s)).	979	* weight of an object (and what is carried by it's environment(s)).
…		…
1007	* This function removes the object op from the linked list of objects	995	* This function removes the object op from the linked list of objects
1008	* which it is currently tied to. When this function is done, the	996	* which it is currently tied to. When this function is done, the
1009	* object will have no environment. If the object previously had an	997	* object will have no environment. If the object previously had an
1010	* environment, the x and y coordinates will be updated to	998	* environment, the x and y coordinates will be updated to
1011	* the previous environment.	999	* the previous environment.
1012	* Beware: This function is called from the editor as well!
1013	*/	1000	*/
1014	void	1001	void
1015	object::remove ()	1002	object::do_remove ()
1016	{	1003	{
1017	object *tmp, *last = 0;	1004	object *tmp, *last = 0;
1018	object *otmp;	1005	object *otmp;
1019		1006
1020	int check_walk_off;
1021
1022	if (QUERY_FLAG (this, FLAG_REMOVED))	1007	if (QUERY_FLAG (this, FLAG_REMOVED))
1023	return;	1008	return;
1024		1009
1025	SET_FLAG (this, FLAG_REMOVED);	1010	SET_FLAG (this, FLAG_REMOVED);
		1011	INVOKE_OBJECT (REMOVE, this);
1026		1012
1027	if (more)	1013	if (more)
1028	more->remove ();	1014	more->remove ();
1029		1015
1030	/*	1016	/*
…		…
1041	/* NO_FIX_PLAYER is set when a great many changes are being	1027	/* NO_FIX_PLAYER is set when a great many changes are being
1042	* made to players inventory. If set, avoiding the call	1028	* made to players inventory. If set, avoiding the call
1043	* to save cpu time.	1029	* to save cpu time.
1044	*/	1030	*/
1045	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1031	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1046	fix_player (otmp);	1032	otmp->update_stats ();
1047		1033
1048	if (above != NULL)	1034	if (above)
1049	above->below = below;	1035	above->below = below;
1050	else	1036	else
1051	env->inv = below;	1037	env->inv = below;
1052		1038
1053	if (below != NULL)	1039	if (below)
1054	below->above = above;	1040	below->above = above;
1055		1041
1056	/* we set up values so that it could be inserted into	1042	/* we set up values so that it could be inserted into
1057	* the map, but we don't actually do that - it is up	1043	* the map, but we don't actually do that - it is up
1058	* to the caller to decide what we want to do.	1044	* to the caller to decide what we want to do.
…		…
1062	above = 0, below = 0;	1048	above = 0, below = 0;
1063	env = 0;	1049	env = 0;
1064	}	1050	}
1065	else if (map)	1051	else if (map)
1066	{	1052	{
1067	/* Re did the following section of code - it looks like it had	1053	if (type == PLAYER)
1068	* lots of logic for things we no longer care about
1069	*/	1054	{
		1055	// leaving a spot always closes any open container on the ground
		1056	if (container && !container->env)
		1057	// this causes spurious floorbox updates, but it ensures
		1058	// that the CLOSE event is being sent.
		1059	close_container ();
		1060
		1061	--map->players;
		1062	map->touch ();
		1063	}
		1064
		1065	map->dirty = true;
		1066	mapspace &ms = this->ms ();
1070		1067
1071	/* link the object above us */	1068	/* link the object above us */
1072	if (above)	1069	if (above)
1073	above->below = below;	1070	above->below = below;
1074	else	1071	else
1075	SET_MAP_TOP (map, x, y, below); /* we were top, set new top */	1072	ms.top = below; /* we were top, set new top */
1076		1073
1077	/* Relink the object below us, if there is one */	1074	/* Relink the object below us, if there is one */
1078	if (below)	1075	if (below)
1079	below->above = above;	1076	below->above = above;
1080	else	1077	else
…		…
1082	/* Nothing below, which means we need to relink map object for this space	1079	/* Nothing below, which means we need to relink map object for this space
1083	* use translated coordinates in case some oddness with map tiling is	1080	* use translated coordinates in case some oddness with map tiling is
1084	* evident	1081	* evident
1085	*/	1082	*/
1086	if (GET_MAP_OB (map, x, y) != this)	1083	if (GET_MAP_OB (map, x, y) != this)
1087	{
1088	char *dump = dump_object (this);
1089	LOG (llevError,
1090	"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);	1084	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 ());
1091	free (dump);
1092	dump = dump_object (GET_MAP_OB (map, x, y));
1093	LOG (llevError, "%s\n", dump);
1094	free (dump);
1095	}
1096		1085
1097	SET_MAP_OB (map, x, y, above); /* goes on above it. */	1086	ms.bot = above; /* goes on above it. */
1098	}	1087	}
1099		1088
1100	above = 0;	1089	above = 0;
1101	below = 0;	1090	below = 0;
1102		1091
1103	if (map->in_memory == MAP_SAVING)	1092	if (map->in_memory == MAP_SAVING)
1104	return;	1093	return;
1105		1094
1106	check_walk_off = !QUERY_FLAG (this, FLAG_NO_APPLY);	1095	int check_walk_off = !flag [FLAG_NO_APPLY];
1107		1096
		1097	if (object *pl = ms.player ())
		1098	{
		1099	if (pl->container == this)
		1100	/* If a container that the player is currently using somehow gets
		1101	* removed (most likely destroyed), update the player view
		1102	* appropriately.
		1103	*/
		1104	pl->close_container ();
		1105
		1106	pl->contr->ns->floorbox_update ();
		1107	}
		1108
1108	for (tmp = GET_MAP_OB (map, x, y); tmp; tmp = tmp->above)	1109	for (tmp = ms.bot; tmp; tmp = tmp->above)
1109	{	1110	{
1110	/* No point updating the players look faces if he is the object	1111	/* No point updating the players look faces if he is the object
1111	* being removed.	1112	* being removed.
1112	*/	1113	*/
1113		1114
1114	if (tmp->type == PLAYER && tmp != this)
1115	{
1116	/* If a container that the player is currently using somehow gets
1117	* removed (most likely destroyed), update the player view
1118	* appropriately.
1119	*/
1120	if (tmp->container == this)
1121	{
1122	CLEAR_FLAG (this, FLAG_APPLIED);
1123	tmp->container = 0;
1124	}
1125
1126	tmp->contr->socket->floorbox_update ();
1127	}
1128
1129	/* See if player moving off should effect something */	1115	/* See if object moving off should effect something */
1130	if (check_walk_off	1116	if (check_walk_off
1131	&& ((move_type & tmp->move_off)	1117	&& ((move_type & tmp->move_off)
1132	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))	1118	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1133	{	1119	{
1134	move_apply (tmp, this, 0);	1120	move_apply (tmp, this, 0);
1135		1121
1136	if (destroyed ())	1122	if (destroyed ())
1137	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());	1123	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1138	}	1124	}
1139		1125
1140	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1141
1142	if (tmp->above == tmp)
1143	tmp->above = 0;
1144
1145	last = tmp;	1126	last = tmp;
1146	}	1127	}
1147		1128
1148	/* last == NULL of there are no objects on this space */	1129	/* last == NULL if there are no objects on this space */
		1130	//TODO: this makes little sense, why only update the topmost object?
1149	if (!last)	1131	if (!last)
1150	{	1132	map->at (x, y).flags_ = 0;
1151	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1152	* we could preserve the flags (GET_MAP_FLAGS), but update_position figures
1153	* those out anyways, and if there are any flags set right now, they won't
1154	* be correct anyways.
1155	*/
1156	SET_MAP_FLAGS (map, x, y, P_NEED_UPDATE);
1157	update_position (map, x, y);
1158	}
1159	else	1133	else
1160	update_object (last, UP_OBJ_REMOVE);	1134	update_object (last, UP_OBJ_REMOVE);
1161		1135
1162	if (QUERY_FLAG (this, FLAG_BLOCKSVIEW) || glow_radius)	1136	if (flag [FLAG_BLOCKSVIEW] || glow_radius)
1163	update_all_los (map, x, y);	1137	update_all_los (map, x, y);
1164	}	1138	}
1165	}	1139	}
1166		1140
1167	/*	1141	/*
…		…
1176	merge_ob (object *op, object *top)	1150	merge_ob (object *op, object *top)
1177	{	1151	{
1178	if (!op->nrof)	1152	if (!op->nrof)
1179	return 0;	1153	return 0;
1180		1154
1181	if (top == NULL)	1155	if (!top)
1182	for (top = op; top != NULL && top->above != NULL; top = top->above);	1156	for (top = op; top && top->above; top = top->above)
		1157	;
1183		1158
1184	for (; top != NULL; top = top->below)	1159	for (; top; top = top->below)
1185	{	1160	{
1186	if (top == op)	1161	if (top == op)
1187	continue;	1162	continue;
1188		1163
1189	if (object::can_merge (op, top))	1164	if (object::can_merge (op, top))
…		…
1198	}	1173	}
1199		1174
1200	return 0;	1175	return 0;
1201	}	1176	}
1202		1177
		1178	void
		1179	object::expand_tail ()
		1180	{
		1181	if (more)
		1182	return;
		1183
		1184	object *prev = this;
		1185
		1186	for (archetype *at = (archetype *)arch->more; at; at = (archetype *)at->more)
		1187	{
		1188	object *op = arch_to_object (at);
		1189
		1190	op->name = name;
		1191	op->name_pl = name_pl;
		1192	op->title = title;
		1193
		1194	op->head = this;
		1195	prev->more = op;
		1196
		1197	prev = op;
		1198	}
		1199	}
		1200
1203	/*	1201	/*
1204	* same as insert_ob_in_map except it handle separate coordinates and do a clean	1202	* same as insert_ob_in_map except it handles separate coordinates and does a clean
1205	* job preparing multi-part monsters	1203	* job preparing multi-part monsters.
1206	*/	1204	*/
1207	object *	1205	object *
1208	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)	1206	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1209	{	1207	{
1210	object *tmp;
1211
1212	if (op->head)
1213	op = op->head;
1214
1215	for (tmp = op; tmp; tmp = tmp->more)	1208	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1216	{	1209	{
1217	tmp->x = x + tmp->arch->clone.x;	1210	tmp->x = x + tmp->arch->x;
1218	tmp->y = y + tmp->arch->clone.y;	1211	tmp->y = y + tmp->arch->y;
1219	}	1212	}
1220		1213
1221	return insert_ob_in_map (op, m, originator, flag);	1214	return insert_ob_in_map (op, m, originator, flag);
1222	}	1215	}
1223		1216
…		…
1239	* Return value:	1232	* Return value:
1240	* new object if 'op' was merged with other object	1233	* new object if 'op' was merged with other object
1241	* NULL if 'op' was destroyed	1234	* NULL if 'op' was destroyed
1242	* just 'op' otherwise	1235	* just 'op' otherwise
1243	*/	1236	*/
1244
1245	object *	1237	object *
1246	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)	1238	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1247	{	1239	{
		1240	assert (!op->flag [FLAG_FREED]);
		1241
1248	object *tmp, *top, *floor = NULL;	1242	object *top, *floor = NULL;
1249	sint16 x, y;
1250		1243
1251	if (QUERY_FLAG (op, FLAG_FREED))	1244	op->remove ();
1252	{
1253	LOG (llevError, "Trying to insert freed object!\n");
1254	return NULL;
1255	}
1256
1257	if (m == NULL)
1258	{
1259	char *dump = dump_object (op);
1260	LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
1261	free (dump);
1262	return op;
1263	}
1264
1265	if (out_of_map (m, op->x, op->y))
1266	{
1267	char *dump = dump_object (op);
1268	LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump);
1269	#ifdef MANY_CORES
1270	/* Better to catch this here, as otherwise the next use of this object
1271	* is likely to cause a crash. Better to find out where it is getting
1272	* improperly inserted.
1273	*/
1274	abort ();
1275	#endif
1276	free (dump);
1277	return op;
1278	}
1279
1280	if (!QUERY_FLAG (op, FLAG_REMOVED))
1281	{
1282	char *dump = dump_object (op);
1283	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
1284	free (dump);
1285	return op;
1286	}
1287
1288	if (op->more != NULL)
1289	{
1290	/* The part may be on a different map. */
1291
1292	object *more = op->more;
1293
1294	/* We really need the caller to normalize coordinates - if
1295	* we set the map, that doesn't work if the location is within
1296	* a map and this is straddling an edge. So only if coordinate
1297	* is clear wrong do we normalize it.
1298	*/
1299	if (OUT_OF_REAL_MAP (more->map, more->x, more->y))
1300	more->map = get_map_from_coord (m, &more->x, &more->y);
1301	else if (!more->map)
1302	{
1303	/* For backwards compatibility - when not dealing with tiled maps,
1304	* more->map should always point to the parent.
1305	*/
1306	more->map = m;
1307	}
1308
1309	if (insert_ob_in_map (more, more->map, originator, flag) == NULL)
1310	{
1311	if (!op->head)
1312	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1313
1314	return NULL;
1315	}
1316	}
1317
1318	CLEAR_FLAG (op, FLAG_REMOVED);
1319		1245
1320	/* Ideally, the caller figures this out. However, it complicates a lot	1246	/* Ideally, the caller figures this out. However, it complicates a lot
1321	* of areas of callers (eg, anything that uses find_free_spot would now	1247	* of areas of callers (eg, anything that uses find_free_spot would now
1322	* need extra work	1248	* need extra work
1323	*/	1249	*/
1324	op->map = get_map_from_coord (m, &op->x, &op->y);	1250	if (!xy_normalise (m, op->x, op->y))
1325	x = op->x;	1251	{
1326	y = op->y;	1252	op->destroy ();
		1253	return 0;
		1254	}
		1255
		1256	if (object *more = op->more)
		1257	if (!insert_ob_in_map (more, m, originator, flag))
		1258	return 0;
		1259
		1260	CLEAR_FLAG (op, FLAG_REMOVED);
		1261
		1262	op->map = m;
		1263	mapspace &ms = op->ms ();
1327		1264
1328	/* this has to be done after we translate the coordinates.	1265	/* this has to be done after we translate the coordinates.
1329	*/	1266	*/
1330	if (op->nrof && !(flag & INS_NO_MERGE))	1267	if (op->nrof && !(flag & INS_NO_MERGE))
1331	for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)	1268	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1332	if (object::can_merge (op, tmp))	1269	if (object::can_merge (op, tmp))
1333	{	1270	{
1334	op->nrof += tmp->nrof;	1271	op->nrof += tmp->nrof;
1335	tmp->destroy ();	1272	tmp->destroy ();
1336	}	1273	}
…		…
1353	op->below = originator->below;	1290	op->below = originator->below;
1354		1291
1355	if (op->below)	1292	if (op->below)
1356	op->below->above = op;	1293	op->below->above = op;
1357	else	1294	else
1358	SET_MAP_OB (op->map, op->x, op->y, op);	1295	ms.bot = op;
1359		1296
1360	/* since *below* originator, no need to update top */	1297	/* since *below* originator, no need to update top */
1361	originator->below = op;	1298	originator->below = op;
1362	}	1299	}
1363	else	1300	else
1364	{	1301	{
		1302	top = ms.bot;
		1303
1365	/* If there are other objects, then */	1304	/* If there are other objects, then */
1366	if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL))	1305	if (top)
1367	{	1306	{
1368	object *last = NULL;	1307	object *last = 0;
1369		1308
1370	/*	1309	/*
1371	* If there are multiple objects on this space, we do some trickier handling.	1310	* If there are multiple objects on this space, we do some trickier handling.
1372	* We've already dealt with merging if appropriate.	1311	* We've already dealt with merging if appropriate.
1373	* Generally, we want to put the new object on top. But if	1312	* Generally, we want to put the new object on top. But if
…		…
1377	* once we get to them. This reduces the need to traverse over all of	1316	* once we get to them. This reduces the need to traverse over all of
1378	* them when adding another one - this saves quite a bit of cpu time	1317	* them when adding another one - this saves quite a bit of cpu time
1379	* when lots of spells are cast in one area. Currently, it is presumed	1318	* when lots of spells are cast in one area. Currently, it is presumed
1380	* that flying non pickable objects are spell objects.	1319	* that flying non pickable objects are spell objects.
1381	*/	1320	*/
1382		1321	for (top = ms.bot; top; top = top->above)
1383	while (top != NULL)
1384	{	1322	{
1385	if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))	1323	if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))
1386	floor = top;	1324	floor = top;
1387		1325
1388	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))	1326	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))
…		…
1391	top = top->below;	1329	top = top->below;
1392	break;	1330	break;
1393	}	1331	}
1394		1332
1395	last = top;	1333	last = top;
1396	top = top->above;
1397	}	1334	}
1398		1335
1399	/* Don't want top to be NULL, so set it to the last valid object */	1336	/* Don't want top to be NULL, so set it to the last valid object */
1400	top = last;	1337	top = last;
1401		1338
…		…
1403	* looks like instead of lots of conditions here.	1340	* looks like instead of lots of conditions here.
1404	* makes things faster, and effectively the same result.	1341	* makes things faster, and effectively the same result.
1405	*/	1342	*/
1406		1343
1407	/* Have object 'fall below' other objects that block view.	1344	/* Have object 'fall below' other objects that block view.
1408	* Unless those objects are exits, type 66	1345	* Unless those objects are exits.
1409	* If INS_ON_TOP is used, don't do this processing	1346	* If INS_ON_TOP is used, don't do this processing
1410	* Need to find the object that in fact blocks view, otherwise	1347	* Need to find the object that in fact blocks view, otherwise
1411	* stacking is a bit odd.	1348	* stacking is a bit odd.
1412	*/	1349	*/
1413	if (!(flag & INS_ON_TOP) &&	1350	if (!(flag & INS_ON_TOP)
1414	(get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_BLOCKSVIEW) && (op->face && !op->face->visibility))	1351	&& ms.flags () & P_BLOCKSVIEW
		1352	&& (op->face && !faces [op->face].visibility))
1415	{	1353	{
1416	for (last = top; last != floor; last = last->below)	1354	for (last = top; last != floor; last = last->below)
1417	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1355	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1418	break;	1356	break;
		1357
1419	/* Check to see if we found the object that blocks view,	1358	/* Check to see if we found the object that blocks view,
1420	* and make sure we have a below pointer for it so that	1359	* and make sure we have a below pointer for it so that
1421	* we can get inserted below this one, which requires we	1360	* we can get inserted below this one, which requires we
1422	* set top to the object below us.	1361	* set top to the object below us.
1423	*/	1362	*/
1424	if (last && last->below && last != floor)	1363	if (last && last->below && last != floor)
1425	top = last->below;	1364	top = last->below;
1426	}	1365	}
1427	} /* If objects on this space */	1366	} /* If objects on this space */
1428		1367
1429	if (flag & INS_MAP_LOAD)
1430	top = GET_MAP_TOP (op->map, op->x, op->y);
1431
1432	if (flag & INS_ABOVE_FLOOR_ONLY)	1368	if (flag & INS_ABOVE_FLOOR_ONLY)
1433	top = floor;	1369	top = floor;
1434		1370
1435	/* Top is the object that our object (op) is going to get inserted above.	1371	/* Top is the object that our object (op) is going to get inserted above.
1436	*/	1372	*/
1437		1373
1438	/* First object on this space */	1374	/* First object on this space */
1439	if (!top)	1375	if (!top)
1440	{	1376	{
1441	op->above = GET_MAP_OB (op->map, op->x, op->y);	1377	op->above = ms.bot;
1442		1378
1443	if (op->above)	1379	if (op->above)
1444	op->above->below = op;	1380	op->above->below = op;
1445		1381
1446	op->below = NULL;	1382	op->below = 0;
1447	SET_MAP_OB (op->map, op->x, op->y, op);	1383	ms.bot = op;
1448	}	1384	}
1449	else	1385	else
1450	{ /* get inserted into the stack above top */	1386	{ /* get inserted into the stack above top */
1451	op->above = top->above;	1387	op->above = top->above;
1452		1388
…		…
1455		1391
1456	op->below = top;	1392	op->below = top;
1457	top->above = op;	1393	top->above = op;
1458	}	1394	}
1459		1395
1460	if (op->above == NULL)	1396	if (!op->above)
1461	SET_MAP_TOP (op->map, op->x, op->y, op);	1397	ms.top = op;
1462	} /* else not INS_BELOW_ORIGINATOR */	1398	} /* else not INS_BELOW_ORIGINATOR */
1463		1399
1464	if (op->type == PLAYER)	1400	if (op->type == PLAYER)
		1401	{
1465	op->contr->do_los = 1;	1402	op->contr->do_los = 1;
		1403	++op->map->players;
		1404	op->map->touch ();
		1405	}
1466		1406
1467	/* If we have a floor, we know the player, if any, will be above	1407	op->map->dirty = true;
1468	* it, so save a few ticks and start from there.	1408
1469	*/	1409	if (object *pl = ms.player ())
1470	if (!(flag & INS_MAP_LOAD))
1471	for (tmp = floor ? floor : GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
1472	if (tmp->type == PLAYER)
1473	tmp->contr->socket->floorbox_update ();	1410	pl->contr->ns->floorbox_update ();
1474		1411
1475	/* If this object glows, it may affect lighting conditions that are	1412	/* If this object glows, it may affect lighting conditions that are
1476	* visible to others on this map. But update_all_los is really	1413	* visible to others on this map. But update_all_los is really
1477	* an inefficient way to do this, as it means los for all players	1414	* an inefficient way to do this, as it means los for all players
1478	* on the map will get recalculated. The players could very well	1415	* on the map will get recalculated. The players could very well
1479	* be far away from this change and not affected in any way -	1416	* be far away from this change and not affected in any way -
1480	* this should get redone to only look for players within range,	1417	* this should get redone to only look for players within range,
1481	* or just updating the P_NEED_UPDATE for spaces within this area	1418	* or just updating the P_UPTODATE for spaces within this area
1482	* of effect may be sufficient.	1419	* of effect may be sufficient.
1483	*/	1420	*/
1484	if (MAP_DARKNESS (op->map) && (op->glow_radius != 0))	1421	if (op->map->darkness && (op->glow_radius != 0))
1485	update_all_los (op->map, op->x, op->y);	1422	update_all_los (op->map, op->x, op->y);
1486		1423
1487	/* updates flags (blocked, alive, no magic, etc) for this map space */	1424	/* updates flags (blocked, alive, no magic, etc) for this map space */
1488	update_object (op, UP_OBJ_INSERT);	1425	update_object (op, UP_OBJ_INSERT);
		1426
		1427	INVOKE_OBJECT (INSERT, op);
1489		1428
1490	/* Don't know if moving this to the end will break anything. However,	1429	/* Don't know if moving this to the end will break anything. However,
1491	* we want to have floorbox_update called before calling this.	1430	* we want to have floorbox_update called before calling this.
1492	*	1431	*
1493	* check_move_on() must be after this because code called from	1432	* check_move_on() must be after this because code called from
…		…
1495	* blocked() and wall() work properly), and these flags are updated by	1434	* blocked() and wall() work properly), and these flags are updated by
1496	* update_object().	1435	* update_object().
1497	*/	1436	*/
1498		1437
1499	/* if this is not the head or flag has been passed, don't check walk on status */	1438	/* if this is not the head or flag has been passed, don't check walk on status */
1500	if (!(flag & INS_NO_WALK_ON) && !op->head)	1439	if (!(flag & INS_NO_WALK_ON) && op->head_ () == op)
1501	{	1440	{
1502	if (check_move_on (op, originator))	1441	if (check_move_on (op, originator))
1503	return NULL;	1442	return 0;
1504		1443
1505	/* If we are a multi part object, lets work our way through the check	1444	/* If we are a multi part object, lets work our way through the check
1506	* walk on's.	1445	* walk on's.
1507	*/	1446	*/
1508	for (tmp = op->more; tmp != NULL; tmp = tmp->more)	1447	for (object *tmp = op->more; tmp; tmp = tmp->more)
1509	if (check_move_on (tmp, originator))	1448	if (check_move_on (tmp, originator))
1510	return NULL;	1449	return 0;
1511	}	1450	}
1512		1451
1513	return op;	1452	return op;
1514	}	1453	}
1515		1454
1516	/* this function inserts an object in the map, but if it	1455	/* this function inserts an object in the map, but if it
1517	* finds an object of its own type, it'll remove that one first.	1456	* finds an object of its own type, it'll remove that one first.
1518	* op is the object to insert it under: supplies x and the map.	1457	* op is the object to insert it under: supplies x and the map.
1519	*/	1458	*/
1520	void	1459	void
1521	replace_insert_ob_in_map (const char *arch_string, object *op)	1460	replace_insert_ob_in_map (const char *arch_string, object *op)
1522	{	1461	{
1523	object *	1462	object *tmp, *tmp1;
1524	tmp;
1525	object *
1526	tmp1;
1527		1463
1528	/* first search for itself and remove any old instances */	1464	/* first search for itself and remove any old instances */
1529		1465
1530	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1466	for (tmp = op->ms ().bot; tmp; tmp = tmp->above)
1531	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */	1467	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */
1532	tmp->destroy ();	1468	tmp->destroy ();
1533		1469
1534	tmp1 = arch_to_object (archetype::find (arch_string));	1470	tmp1 = arch_to_object (archetype::find (arch_string));
1535		1471
1536	tmp1->x = op->x;	1472	tmp1->x = op->x;
1537	tmp1->y = op->y;	1473	tmp1->y = op->y;
1538	insert_ob_in_map (tmp1, op->map, op, 0);	1474	insert_ob_in_map (tmp1, op->map, op, 0);
		1475	}
		1476
		1477	object *
		1478	object::insert_at (object *where, object *originator, int flags)
		1479	{
		1480	return where->map->insert (this, where->x, where->y, originator, flags);
1539	}	1481	}
1540		1482
1541	/*	1483	/*
1542	* get_split_ob(ob,nr) splits up ob into two parts. The part which	1484	* get_split_ob(ob,nr) splits up ob into two parts. The part which
1543	* is returned contains nr objects, and the remaining parts contains	1485	* is returned contains nr objects, and the remaining parts contains
1544	* the rest (or is removed and freed if that number is 0).	1486	* the rest (or is removed and freed if that number is 0).
1545	* On failure, NULL is returned, and the reason put into the	1487	* On failure, NULL is returned, and the reason put into the
1546	* global static errmsg array.	1488	* global static errmsg array.
1547	*/	1489	*/
1548
1549	object *	1490	object *
1550	get_split_ob (object *orig_ob, uint32 nr)	1491	get_split_ob (object *orig_ob, uint32 nr)
1551	{	1492	{
1552	object *newob;	1493	object *newob;
1553	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);	1494	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
…		…
1584	* the amount of an object. If the amount reaches 0, the object	1525	* the amount of an object. If the amount reaches 0, the object
1585	* is subsequently removed and freed.	1526	* is subsequently removed and freed.
1586	*	1527	*
1587	* Return value: 'op' if something is left, NULL if the amount reached 0	1528	* Return value: 'op' if something is left, NULL if the amount reached 0
1588	*/	1529	*/
1589
1590	object *	1530	object *
1591	decrease_ob_nr (object *op, uint32 i)	1531	decrease_ob_nr (object *op, uint32 i)
1592	{	1532	{
1593	object *tmp;	1533	object *tmp;
1594	player *pl;
1595		1534
1596	if (i == 0) /* objects with op->nrof require this check */	1535	if (i == 0) /* objects with op->nrof require this check */
1597	return op;	1536	return op;
1598		1537
1599	if (i > op->nrof)	1538	if (i > op->nrof)
…		…
1612	* IMO, searching through all the players will mostly	1551	* IMO, searching through all the players will mostly
1613	* likely be quicker than following op->env to the map,	1552	* likely be quicker than following op->env to the map,
1614	* and then searching the map for a player.	1553	* and then searching the map for a player.
1615	*/	1554	*/
1616	if (!tmp)	1555	if (!tmp)
1617	{	1556	for_all_players (pl)
1618	for (pl = first_player; pl; pl = pl->next)
1619	if (pl->ob->container == op->env)	1557	if (pl->ob->container == op->env)
1620	{	1558	{
1621	tmp = pl->ob;	1559	tmp = pl->ob;
1622	break;	1560	break;
1623	}	1561	}
1624	}
1625		1562
1626	if (i < op->nrof)	1563	if (i < op->nrof)
1627	{	1564	{
1628	sub_weight (op->env, op->weight * i);	1565	sub_weight (op->env, op->weight * i);
1629	op->nrof -= i;	1566	op->nrof -= i;
…		…
1672		1609
1673	/*	1610	/*
1674	* add_weight(object, weight) adds the specified weight to an object,	1611	* add_weight(object, weight) adds the specified weight to an object,
1675	* and also updates how much the environment(s) is/are carrying.	1612	* and also updates how much the environment(s) is/are carrying.
1676	*/	1613	*/
1677
1678	void	1614	void
1679	add_weight (object *op, signed long weight)	1615	add_weight (object *op, signed long weight)
1680	{	1616	{
1681	while (op != NULL)	1617	while (op != NULL)
1682	{	1618	{
…		…
1697	LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);	1633	LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
1698	free (dump);	1634	free (dump);
1699	return op;	1635	return op;
1700	}	1636	}
1701		1637
1702	if (where->head)	1638	if (where->head_ () != where)
1703	{	1639	{
1704	LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n");	1640	LOG (llevError | logBacktrace, "Warning: Tried to insert object into wrong part of multipart object.\n");
1705	where = where->head;	1641	where = where->head;
1706	}	1642	}
1707		1643
1708	return where->insert (op);	1644	return where->insert (op);
1709	}	1645	}
…		…
1714	* inside the object environment.	1650	* inside the object environment.
1715	*	1651	*
1716	* The function returns now pointer to inserted item, and return value can	1652	* The function returns now pointer to inserted item, and return value can
1717	* be != op, if items are merged. -Tero	1653	* be != op, if items are merged. -Tero
1718	*/	1654	*/
1719
1720	object *	1655	object *
1721	object::insert (object *op)	1656	object::insert (object *op)
1722	{	1657	{
1723	object *tmp, *otmp;
1724
1725	if (!QUERY_FLAG (op, FLAG_REMOVED))	1658	if (!QUERY_FLAG (op, FLAG_REMOVED))
1726	op->remove ();	1659	op->remove ();
1727		1660
1728	if (op->more)	1661	if (op->more)
1729	{	1662	{
…		…
1731	return op;	1664	return op;
1732	}	1665	}
1733		1666
1734	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1667	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1735	CLEAR_FLAG (op, FLAG_REMOVED);	1668	CLEAR_FLAG (op, FLAG_REMOVED);
		1669
1736	if (op->nrof)	1670	if (op->nrof)
1737	{	1671	{
1738	for (tmp = inv; tmp != NULL; tmp = tmp->below)	1672	for (object *tmp = inv; tmp; tmp = tmp->below)
1739	if (object::can_merge (tmp, op))	1673	if (object::can_merge (tmp, op))
1740	{	1674	{
1741	/* return the original object and remove inserted object	1675	/* return the original object and remove inserted object
1742	(client needs the original object) */	1676	(client needs the original object) */
1743	tmp->nrof += op->nrof;	1677	tmp->nrof += op->nrof;
…		…
1762	add_weight (this, op->weight * op->nrof);	1696	add_weight (this, op->weight * op->nrof);
1763	}	1697	}
1764	else	1698	else
1765	add_weight (this, (op->weight + op->carrying));	1699	add_weight (this, (op->weight + op->carrying));
1766		1700
1767	otmp = this->in_player ();	1701	if (object *otmp = this->in_player ())
1768	if (otmp && otmp->contr)
1769	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1702	if (otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1770	fix_player (otmp);	1703	otmp->update_stats ();
1771		1704
		1705	op->owner = 0; // its his/hers now. period.
1772	op->map = 0;	1706	op->map = 0;
1773	op->env = this;	1707	op->env = this;
1774	op->above = 0;	1708	op->above = 0;
1775	op->below = 0;	1709	op->below = 0;
1776	op->x = 0, op->y = 0;	1710	op->x = op->y = 0;
1777		1711
1778	/* reset the light list and los of the players on the map */	1712	/* reset the light list and los of the players on the map */
1779	if ((op->glow_radius != 0) && map)	1713	if (op->glow_radius && map)
1780	{	1714	{
1781	#ifdef DEBUG_LIGHTS	1715	#ifdef DEBUG_LIGHTS
1782	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);	1716	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1783	#endif /* DEBUG_LIGHTS */	1717	#endif /* DEBUG_LIGHTS */
1784	if (MAP_DARKNESS (map))	1718	if (map->darkness)
1785	update_all_los (map, x, y);	1719	update_all_los (map, x, y);
1786	}	1720	}
1787		1721
1788	/* Client has no idea of ordering so lets not bother ordering it here.	1722	/* Client has no idea of ordering so lets not bother ordering it here.
1789	* It sure simplifies this function...	1723	* It sure simplifies this function...
…		…
1794	{	1728	{
1795	op->below = inv;	1729	op->below = inv;
1796	op->below->above = op;	1730	op->below->above = op;
1797	inv = op;	1731	inv = op;
1798	}	1732	}
		1733
		1734	INVOKE_OBJECT (INSERT, this);
1799		1735
1800	return op;	1736	return op;
1801	}	1737	}
1802		1738
1803	/*	1739	/*
…		…
1818	*	1754	*
1819	* MSW 2001-07-08: Check all objects on space, not just those below	1755	* MSW 2001-07-08: Check all objects on space, not just those below
1820	* object being inserted. insert_ob_in_map may not put new objects	1756	* object being inserted. insert_ob_in_map may not put new objects
1821	* on top.	1757	* on top.
1822	*/	1758	*/
1823
1824	int	1759	int
1825	check_move_on (object *op, object *originator)	1760	check_move_on (object *op, object *originator)
1826	{	1761	{
1827	object *tmp;	1762	object *tmp;
1828	maptile *m = op->map;	1763	maptile *m = op->map;
…		…
1855		1790
1856	/* The objects have to be checked from top to bottom.	1791	/* The objects have to be checked from top to bottom.
1857	* Hence, we first go to the top:	1792	* Hence, we first go to the top:
1858	*/	1793	*/
1859		1794
1860	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL && tmp->above != NULL; tmp = tmp->above)	1795	for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above)
1861	{	1796	{
1862	/* Trim the search when we find the first other spell effect	1797	/* Trim the search when we find the first other spell effect
1863	* this helps performance so that if a space has 50 spell objects,	1798	* this helps performance so that if a space has 50 spell objects,
1864	* we don't need to check all of them.	1799	* we don't need to check all of them.
1865	*/	1800	*/
…		…
1883	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||	1818	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
1884	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))	1819	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1885	{	1820	{
1886		1821
1887	float	1822	float
1888	diff = tmp->move_slow_penalty * FABS (op->speed);	1823	diff = tmp->move_slow_penalty * fabs (op->speed);
1889		1824
1890	if (op->type == PLAYER)	1825	if (op->type == PLAYER)
1891	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||	1826	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||
1892	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))	1827	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))
1893	diff /= 4.0;	1828	diff /= 4.0;
…		…
1920	/*	1855	/*
1921	* present_arch(arch, map, x, y) searches for any objects with	1856	* present_arch(arch, map, x, y) searches for any objects with
1922	* a matching archetype at the given map and coordinates.	1857	* a matching archetype at the given map and coordinates.
1923	* The first matching object is returned, or NULL if none.	1858	* The first matching object is returned, or NULL if none.
1924	*/	1859	*/
1925
1926	object *	1860	object *
1927	present_arch (const archetype *at, maptile *m, int x, int y)	1861	present_arch (const archetype *at, maptile *m, int x, int y)
1928	{	1862	{
1929	object *
1930	tmp;
1931
1932	if (m == NULL || out_of_map (m, x, y))	1863	if (!m || out_of_map (m, x, y))
1933	{	1864	{
1934	LOG (llevError, "Present_arch called outside map.\n");	1865	LOG (llevError, "Present_arch called outside map.\n");
1935	return NULL;	1866	return NULL;
1936	}	1867	}
1937	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1868
		1869	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1938	if (tmp->arch == at)	1870	if (tmp->arch == at)
1939	return tmp;	1871	return tmp;
		1872
1940	return NULL;	1873	return NULL;
1941	}	1874	}
1942		1875
1943	/*	1876	/*
1944	* present(type, map, x, y) searches for any objects with	1877	* present(type, map, x, y) searches for any objects with
1945	* a matching type variable at the given map and coordinates.	1878	* a matching type variable at the given map and coordinates.
1946	* The first matching object is returned, or NULL if none.	1879	* The first matching object is returned, or NULL if none.
1947	*/	1880	*/
1948
1949	object *	1881	object *
1950	present (unsigned char type, maptile *m, int x, int y)	1882	present (unsigned char type, maptile *m, int x, int y)
1951	{	1883	{
1952	object *
1953	tmp;
1954
1955	if (out_of_map (m, x, y))	1884	if (out_of_map (m, x, y))
1956	{	1885	{
1957	LOG (llevError, "Present called outside map.\n");	1886	LOG (llevError, "Present called outside map.\n");
1958	return NULL;	1887	return NULL;
1959	}	1888	}
1960	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1889
		1890	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1961	if (tmp->type == type)	1891	if (tmp->type == type)
1962	return tmp;	1892	return tmp;
		1893
1963	return NULL;	1894	return NULL;
1964	}	1895	}
1965		1896
1966	/*	1897	/*
1967	* present_in_ob(type, object) searches for any objects with	1898	* present_in_ob(type, object) searches for any objects with
1968	* a matching type variable in the inventory of the given object.	1899	* a matching type variable in the inventory of the given object.
1969	* The first matching object is returned, or NULL if none.	1900	* The first matching object is returned, or NULL if none.
1970	*/	1901	*/
1971
1972	object *	1902	object *
1973	present_in_ob (unsigned char type, const object *op)	1903	present_in_ob (unsigned char type, const object *op)
1974	{	1904	{
1975	object *
1976	tmp;
1977
1978	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1905	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
1979	if (tmp->type == type)	1906	if (tmp->type == type)
1980	return tmp;	1907	return tmp;
		1908
1981	return NULL;	1909	return NULL;
1982	}	1910	}
1983		1911
1984	/*	1912	/*
1985	* present_in_ob (type, str, object) searches for any objects with	1913	* present_in_ob (type, str, object) searches for any objects with
…		…
1993	* str is the string to match against. Note that we match against	1921	* str is the string to match against. Note that we match against
1994	* the object name, not the archetype name. this is so that the	1922	* the object name, not the archetype name. this is so that the
1995	* spell code can use one object type (force), but change it's name	1923	* spell code can use one object type (force), but change it's name
1996	* to be unique.	1924	* to be unique.
1997	*/	1925	*/
1998
1999	object *	1926	object *
2000	present_in_ob_by_name (int type, const char *str, const object *op)	1927	present_in_ob_by_name (int type, const char *str, const object *op)
2001	{	1928	{
2002	object *
2003	tmp;
2004
2005	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1929	for (object *tmp = op->inv; tmp; tmp = tmp->below)
2006	{
2007	if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name)))	1930	if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name)))
2008	return tmp;	1931	return tmp;
2009	}	1932
2010	return NULL;	1933	return 0;
2011	}	1934	}
2012		1935
2013	/*	1936	/*
2014	* present_arch_in_ob(archetype, object) searches for any objects with	1937	* present_arch_in_ob(archetype, object) searches for any objects with
2015	* a matching archetype in the inventory of the given object.	1938	* a matching archetype in the inventory of the given object.
2016	* The first matching object is returned, or NULL if none.	1939	* The first matching object is returned, or NULL if none.
2017	*/	1940	*/
2018
2019	object *	1941	object *
2020	present_arch_in_ob (const archetype *at, const object *op)	1942	present_arch_in_ob (const archetype *at, const object *op)
2021	{	1943	{
2022	object *
2023	tmp;
2024
2025	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1944	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2026	if (tmp->arch == at)	1945	if (tmp->arch == at)
2027	return tmp;	1946	return tmp;
		1947
2028	return NULL;	1948	return NULL;
2029	}	1949	}
2030		1950
2031	/*	1951	/*
2032	* activate recursively a flag on an object inventory	1952	* activate recursively a flag on an object inventory
2033	*/	1953	*/
2034	void	1954	void
2035	flag_inv (object *op, int flag)	1955	flag_inv (object *op, int flag)
2036	{	1956	{
2037	object *
2038	tmp;
2039
2040	if (op->inv)	1957	if (op->inv)
2041	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1958	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2042	{	1959	{
2043	SET_FLAG (tmp, flag);	1960	SET_FLAG (tmp, flag);
2044	flag_inv (tmp, flag);	1961	flag_inv (tmp, flag);
2045	}	1962	}
2046	} /*	1963	}
		1964
		1965	/*
2047	* desactivate recursively a flag on an object inventory	1966	* deactivate recursively a flag on an object inventory
2048	*/	1967	*/
2049	void	1968	void
2050	unflag_inv (object *op, int flag)	1969	unflag_inv (object *op, int flag)
2051	{	1970	{
2052	object *
2053	tmp;
2054
2055	if (op->inv)	1971	if (op->inv)
2056	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1972	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2057	{	1973	{
2058	CLEAR_FLAG (tmp, flag);	1974	CLEAR_FLAG (tmp, flag);
2059	unflag_inv (tmp, flag);	1975	unflag_inv (tmp, flag);
2060	}	1976	}
2061	}
2062
2063	/*
2064	* set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in
2065	* all it's inventory (recursively).
2066	* If checksums are used, a player will get set_cheat called for
2067	* him/her-self and all object carried by a call to this function.
2068	*/
2069
2070	void
2071	set_cheat (object *op)
2072	{
2073	SET_FLAG (op, FLAG_WAS_WIZ);
2074	flag_inv (op, FLAG_WAS_WIZ);
2075	}	1977	}
2076		1978
2077	/*	1979	/*
2078	* find_free_spot(object, map, x, y, start, stop) will search for	1980	* find_free_spot(object, map, x, y, start, stop) will search for
2079	* a spot at the given map and coordinates which will be able to contain	1981	* a spot at the given map and coordinates which will be able to contain
…		…
2093	* because arch_blocked (now ob_blocked) needs to know the movement type	1995	* because arch_blocked (now ob_blocked) needs to know the movement type
2094	* to know if the space in question will block the object. We can't use	1996	* to know if the space in question will block the object. We can't use
2095	* the archetype because that isn't correct if the monster has been	1997	* the archetype because that isn't correct if the monster has been
2096	* customized, changed states, etc.	1998	* customized, changed states, etc.
2097	*/	1999	*/
2098
2099	int	2000	int
2100	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)	2001	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2101	{	2002	{
2102	int
2103	i,
2104	index = 0, flag;
2105	static int
2106	altern[SIZEOFFREE];	2003	int altern[SIZEOFFREE];
		2004	int index = 0, flag;
2107		2005
2108	for (i = start; i < stop; i++)	2006	for (int i = start; i < stop; i++)
2109	{	2007	{
2110	flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]);	2008	mapxy pos (m, x, y); pos.move (i);
2111	if (!flag)	2009
		2010	if (!pos.normalise ())
		2011	continue;
		2012
		2013	mapspace &ms = *pos;
		2014
		2015	if (ms.flags () & P_IS_ALIVE)
		2016	continue;
		2017
		2018	/* However, often
		2019	* ob doesn't have any move type (when used to place exits)
		2020	* so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.
		2021	*/
		2022	if (ob->move_type == 0 && ms.move_block != MOVE_ALL)
		2023	{
2112	altern[index++] = i;	2024	altern [index++] = i;
		2025	continue;
		2026	}
2113		2027
2114	/* Basically, if we find a wall on a space, we cut down the search size.	2028	/* Basically, if we find a wall on a space, we cut down the search size.
2115	* In this way, we won't return spaces that are on another side of a wall.	2029	* In this way, we won't return spaces that are on another side of a wall.
2116	* This mostly work, but it cuts down the search size in all directions -	2030	* This mostly work, but it cuts down the search size in all directions -
2117	* if the space being examined only has a wall to the north and empty	2031	* if the space being examined only has a wall to the north and empty
2118	* spaces in all the other directions, this will reduce the search space	2032	* spaces in all the other directions, this will reduce the search space
2119	* to only the spaces immediately surrounding the target area, and	2033	* to only the spaces immediately surrounding the target area, and
2120	* won't look 2 spaces south of the target space.	2034	* won't look 2 spaces south of the target space.
2121	*/	2035	*/
2122	else if ((flag & P_NO_PASS) && maxfree[i] < stop)	2036	if (ms.move_block == MOVE_ALL && maxfree[i] < stop)
		2037	{
2123	stop = maxfree[i];	2038	stop = maxfree[i];
		2039	continue;
		2040	}
		2041
		2042	/* Note it is intentional that we check ob - the movement type of the
		2043	* head of the object should correspond for the entire object.
		2044	*/
		2045	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
		2046	continue;
		2047
		2048	altern [index++] = i;
2124	}	2049	}
2125		2050
2126	if (!index)	2051	if (!index)
2127	return -1;	2052	return -1;
2128		2053
2129	return altern[RANDOM () % index];	2054	return altern [rndm (index)];
2130	}	2055	}
2131		2056
2132	/*	2057	/*
2133	* find_first_free_spot(archetype, maptile, x, y) works like	2058	* find_first_free_spot(archetype, maptile, x, y) works like
2134	* find_free_spot(), but it will search max number of squares.	2059	* find_free_spot(), but it will search max number of squares.
2135	* But it will return the first available spot, not a random choice.	2060	* But it will return the first available spot, not a random choice.
2136	* Changed 0.93.2: Have it return -1 if there is no free spot available.	2061	* Changed 0.93.2: Have it return -1 if there is no free spot available.
2137	*/	2062	*/
2138
2139	int	2063	int
2140	find_first_free_spot (const object *ob, maptile *m, int x, int y)	2064	find_first_free_spot (const object *ob, maptile *m, int x, int y)
2141	{	2065	{
2142	int
2143	i;
2144
2145	for (i = 0; i < SIZEOFFREE; i++)	2066	for (int i = 0; i < SIZEOFFREE; i++)
2146	{
2147	if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]))	2067	if (!ob->blocked (m, x + freearr_x[i], y + freearr_y[i]))
2148	return i;	2068	return i;
2149	}	2069
2150	return -1;	2070	return -1;
2151	}	2071	}
2152		2072
2153	/*	2073	/*
2154	* The function permute(arr, begin, end) randomly reorders the array	2074	* The function permute(arr, begin, end) randomly reorders the array
2155	* arr[begin..end-1].	2075	* arr[begin..end-1].
		2076	* now uses a fisher-yates shuffle, old permute was broken
2156	*/	2077	*/
2157	static void	2078	static void
2158	permute (int *arr, int begin, int end)	2079	permute (int *arr, int begin, int end)
2159	{	2080	{
2160	int	2081	arr += begin;
2161	i,
2162	j,
2163	tmp,
2164	len;
2165
2166	len = end - begin;	2082	end -= begin;
2167	for (i = begin; i < end; i++)
2168	{
2169	j = begin + RANDOM () % len;
2170		2083
2171	tmp = arr[i];	2084	while (--end)
2172	arr[i] = arr[j];	2085	swap (arr [end], arr [rndm (end + 1)]);
2173	arr[j] = tmp;
2174	}
2175	}	2086	}
2176		2087
2177	/* new function to make monster searching more efficient, and effective!	2088	/* new function to make monster searching more efficient, and effective!
2178	* This basically returns a randomized array (in the passed pointer) of	2089	* This basically returns a randomized array (in the passed pointer) of
2179	* the spaces to find monsters. In this way, it won't always look for	2090	* the spaces to find monsters. In this way, it won't always look for
…		…
2182	* the 3x3 area will be searched, just not in a predictable order.	2093	* the 3x3 area will be searched, just not in a predictable order.
2183	*/	2094	*/
2184	void	2095	void
2185	get_search_arr (int *search_arr)	2096	get_search_arr (int *search_arr)
2186	{	2097	{
2187	int	2098	int i;
2188	i;
2189		2099
2190	for (i = 0; i < SIZEOFFREE; i++)	2100	for (i = 0; i < SIZEOFFREE; i++)
2191	{
2192	search_arr[i] = i;	2101	search_arr[i] = i;
2193	}
2194		2102
2195	permute (search_arr, 1, SIZEOFFREE1 + 1);	2103	permute (search_arr, 1, SIZEOFFREE1 + 1);
2196	permute (search_arr, SIZEOFFREE1 + 1, SIZEOFFREE2 + 1);	2104	permute (search_arr, SIZEOFFREE1 + 1, SIZEOFFREE2 + 1);
2197	permute (search_arr, SIZEOFFREE2 + 1, SIZEOFFREE);	2105	permute (search_arr, SIZEOFFREE2 + 1, SIZEOFFREE);
2198	}	2106	}
…		…
2207	* Perhaps incorrectly, but I'm making the assumption that exclude	2115	* Perhaps incorrectly, but I'm making the assumption that exclude
2208	* is actually want is going to try and move there. We need this info	2116	* is actually want is going to try and move there. We need this info
2209	* because we have to know what movement the thing looking to move	2117	* because we have to know what movement the thing looking to move
2210	* there is capable of.	2118	* there is capable of.
2211	*/	2119	*/
2212
2213	int	2120	int
2214	find_dir (maptile *m, int x, int y, object *exclude)	2121	find_dir (maptile *m, int x, int y, object *exclude)
2215	{	2122	{
2216	int
2217	i,
2218	max = SIZEOFFREE, mflags;	2123	int i, max = SIZEOFFREE, mflags;
2219		2124
2220	sint16 nx, ny;	2125	sint16 nx, ny;
2221	object *	2126	object *tmp;
2222	tmp;
2223	maptile *	2127	maptile *mp;
2224	mp;
2225		2128
2226	MoveType blocked, move_type;	2129	MoveType blocked, move_type;
2227		2130
2228	if (exclude && exclude->head)	2131	if (exclude && exclude->head_ () != exclude)
2229	{	2132	{
2230	exclude = exclude->head;	2133	exclude = exclude->head;
2231	move_type = exclude->move_type;	2134	move_type = exclude->move_type;
2232	}	2135	}
2233	else	2136	else
…		…
2241	mp = m;	2144	mp = m;
2242	nx = x + freearr_x[i];	2145	nx = x + freearr_x[i];
2243	ny = y + freearr_y[i];	2146	ny = y + freearr_y[i];
2244		2147
2245	mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);	2148	mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);
		2149
2246	if (mflags & P_OUT_OF_MAP)	2150	if (mflags & P_OUT_OF_MAP)
2247	{
2248	max = maxfree[i];	2151	max = maxfree[i];
2249	}
2250	else	2152	else
2251	{	2153	{
2252	blocked = GET_MAP_MOVE_BLOCK (mp, nx, ny);	2154	mapspace &ms = mp->at (nx, ny);
		2155
		2156	blocked = ms.move_block;
2253		2157
2254	if ((move_type & blocked) == move_type)	2158	if ((move_type & blocked) == move_type)
2255	{
2256	max = maxfree[i];	2159	max = maxfree[i];
2257	}
2258	else if (mflags & P_IS_ALIVE)	2160	else if (mflags & P_IS_ALIVE)
2259	{	2161	{
2260	for (tmp = GET_MAP_OB (mp, nx, ny); tmp != NULL; tmp = tmp->above)	2162	for (tmp = ms.bot; tmp; tmp = tmp->above)
2261	{	2163	if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)
2262	if ((QUERY_FLAG (tmp, FLAG_MONSTER) || tmp->type == PLAYER) && (tmp != exclude || (tmp->head && tmp->head != exclude)))	2164	&& (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2263	{
2264	break;	2165	break;
2265	}	2166
2266	}
2267	if (tmp)	2167	if (tmp)
2268	{
2269	return freedir[i];	2168	return freedir[i];
2270	}
2271	}	2169	}
2272	}	2170	}
2273	}	2171	}
		2172
2274	return 0;	2173	return 0;
2275	}	2174	}
2276		2175
2277	/*	2176	/*
2278	* distance(object 1, object 2) will return the square of the	2177	* distance(object 1, object 2) will return the square of the
2279	* distance between the two given objects.	2178	* distance between the two given objects.
2280	*/	2179	*/
2281
2282	int	2180	int
2283	distance (const object *ob1, const object *ob2)	2181	distance (const object *ob1, const object *ob2)
2284	{	2182	{
2285	int
2286	i;
2287
2288	i = (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);	2183	return (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);
2289	return i;
2290	}	2184	}
2291		2185
2292	/*	2186	/*
2293	* find_dir_2(delta-x,delta-y) will return a direction in which	2187	* find_dir_2(delta-x,delta-y) will return a direction in which
2294	* an object which has subtracted the x and y coordinates of another	2188	* an object which has subtracted the x and y coordinates of another
2295	* object, needs to travel toward it.	2189	* object, needs to travel toward it.
2296	*/	2190	*/
2297
2298	int	2191	int
2299	find_dir_2 (int x, int y)	2192	find_dir_2 (int x, int y)
2300	{	2193	{
2301	int	2194	int q;
2302	q;
2303		2195
2304	if (y)	2196	if (y)
2305	q = x * 100 / y;	2197	q = x * 100 / y;
2306	else if (x)	2198	else if (x)
2307	q = -300 * x;	2199	q = -300 * x;
…		…
2332		2224
2333	return 3;	2225	return 3;
2334	}	2226	}
2335		2227
2336	/*	2228	/*
2337	* absdir(int): Returns a number between 1 and 8, which represent
2338	* the "absolute" direction of a number (it actually takes care of
2339	* "overflow" in previous calculations of a direction).
2340	*/
2341
2342	int
2343	absdir (int d)
2344	{
2345	while (d < 1)
2346	d += 8;
2347	while (d > 8)
2348	d -= 8;
2349	return d;
2350	}
2351
2352	/*
2353	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is	2229	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is
2354	* between two directions (which are expected to be absolute (see absdir())	2230	* between two directions (which are expected to be absolute (see absdir())
2355	*/	2231	*/
2356
2357	int	2232	int
2358	dirdiff (int dir1, int dir2)	2233	dirdiff (int dir1, int dir2)
2359	{	2234	{
2360	int	2235	int d;
2361	d;
2362		2236
2363	d = abs (dir1 - dir2);	2237	d = abs (dir1 - dir2);
2364	if (d > 4)	2238	if (d > 4)
2365	d = 8 - d;	2239	d = 8 - d;
		2240
2366	return d;	2241	return d;
2367	}	2242	}
2368		2243
2369	/* peterm:	2244	/* peterm:
2370	* do LOS stuff for ball lightning. Go after the closest VISIBLE monster.	2245	* do LOS stuff for ball lightning. Go after the closest VISIBLE monster.
…		…
2373	* This basically means that if direction is 15, then it could either go	2248	* This basically means that if direction is 15, then it could either go
2374	* direction 4, 14, or 16 to get back to where we are.	2249	* direction 4, 14, or 16 to get back to where we are.
2375	* Moved from spell_util.c to object.c with the other related direction	2250	* Moved from spell_util.c to object.c with the other related direction
2376	* functions.	2251	* functions.
2377	*/	2252	*/
2378
2379	int
2380	reduction_dir[SIZEOFFREE][3] = {	2253	int reduction_dir[SIZEOFFREE][3] = {
2381	{0, 0, 0}, /* 0 */	2254	{0, 0, 0}, /* 0 */
2382	{0, 0, 0}, /* 1 */	2255	{0, 0, 0}, /* 1 */
2383	{0, 0, 0}, /* 2 */	2256	{0, 0, 0}, /* 2 */
2384	{0, 0, 0}, /* 3 */	2257	{0, 0, 0}, /* 3 */
2385	{0, 0, 0}, /* 4 */	2258	{0, 0, 0}, /* 4 */
…		…
2433	* find a path to that monster that we found. If not,	2306	* find a path to that monster that we found. If not,
2434	* we don't bother going toward it. Returns 1 if we	2307	* we don't bother going toward it. Returns 1 if we
2435	* can see a direct way to get it	2308	* can see a direct way to get it
2436	* Modified to be map tile aware -.MSW	2309	* Modified to be map tile aware -.MSW
2437	*/	2310	*/
2438
2439
2440	int	2311	int
2441	can_see_monsterP (maptile *m, int x, int y, int dir)	2312	can_see_monsterP (maptile *m, int x, int y, int dir)
2442	{	2313	{
2443	sint16 dx, dy;	2314	sint16 dx, dy;
2444	int
2445	mflags;	2315	int mflags;
2446		2316
2447	if (dir < 0)	2317	if (dir < 0)
2448	return 0; /* exit condition: invalid direction */	2318	return 0; /* exit condition: invalid direction */
2449		2319
2450	dx = x + freearr_x[dir];	2320	dx = x + freearr_x[dir];
…		…
2463	return 0;	2333	return 0;
2464		2334
2465	/* yes, can see. */	2335	/* yes, can see. */
2466	if (dir < 9)	2336	if (dir < 9)
2467	return 1;	2337	return 1;
		2338
2468	return can_see_monsterP (m, x, y, reduction_dir[dir][0]) |	2339	return can_see_monsterP (m, x, y, reduction_dir[dir][0])
2469	can_see_monsterP (m, x, y, reduction_dir[dir][1]) | can_see_monsterP (m, x, y, reduction_dir[dir][2]);	2340	| can_see_monsterP (m, x, y, reduction_dir[dir][1])
		2341	| can_see_monsterP (m, x, y, reduction_dir[dir][2]);
2470	}	2342	}
2471
2472
2473		2343
2474	/*	2344	/*
2475	* can_pick(picker, item): finds out if an object is possible to be	2345	* can_pick(picker, item): finds out if an object is possible to be
2476	* picked up by the picker. Returnes 1 if it can be	2346	* picked up by the picker. Returnes 1 if it can be
2477	* picked up, otherwise 0.	2347	* picked up, otherwise 0.
…		…
2479	* Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause	2349	* Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause
2480	* core dumps if they do.	2350	* core dumps if they do.
2481	*	2351	*
2482	* Add a check so we can't pick up invisible objects (0.93.8)	2352	* Add a check so we can't pick up invisible objects (0.93.8)
2483	*/	2353	*/
2484
2485	int	2354	int
2486	can_pick (const object *who, const object *item)	2355	can_pick (const object *who, const object *item)
2487	{	2356	{
2488	return /*QUERY_FLAG(who,FLAG_WIZ)|| */	2357	return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2489	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&	2358	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
2490	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3));	2359	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3));
2491	}	2360	}
2492		2361
2493
2494	/*	2362	/*
2495	* create clone from object to another	2363	* create clone from object to another
2496	*/	2364	*/
2497	object *	2365	object *
2498	object_create_clone (object *asrc)	2366	object_create_clone (object *asrc)
2499	{	2367	{
2500	object *dst = 0, *tmp, *src, *part, *prev, *item;	2368	object *dst = 0, *tmp, *src, *prev, *item;
2501		2369
2502	if (!asrc)	2370	if (!asrc)
2503	return 0;	2371	return 0;
2504		2372
2505	src = asrc;
2506	if (src->head)
2507	src = src->head;	2373	src = asrc->head_ ();
2508		2374
2509	prev = 0;	2375	prev = 0;
2510	for (part = src; part; part = part->more)	2376	for (object *part = src; part; part = part->more)
2511	{	2377	{
2512	tmp = part->clone ();	2378	tmp = part->clone ();
2513	tmp->x -= src->x;	2379	tmp->x -= src->x;
2514	tmp->y -= src->y;	2380	tmp->y -= src->y;
2515		2381
…		…
2517	{	2383	{
2518	dst = tmp;	2384	dst = tmp;
2519	tmp->head = 0;	2385	tmp->head = 0;
2520	}	2386	}
2521	else	2387	else
2522	{
2523	tmp->head = dst;	2388	tmp->head = dst;
2524	}
2525		2389
2526	tmp->more = 0;	2390	tmp->more = 0;
2527		2391
2528	if (prev)	2392	if (prev)
2529	prev->more = tmp;	2393	prev->more = tmp;
…		…
2533		2397
2534	for (item = src->inv; item; item = item->below)	2398	for (item = src->inv; item; item = item->below)
2535	insert_ob_in_ob (object_create_clone (item), dst);	2399	insert_ob_in_ob (object_create_clone (item), dst);
2536		2400
2537	return dst;	2401	return dst;
2538	}
2539
2540	/* GROS - Creates an object using a string representing its content. */
2541	/* Basically, we save the content of the string to a temp file, then call */
2542	/* load_object on it. I admit it is a highly inefficient way to make things, */
2543	/* but it was simple to make and allows reusing the load_object function. */
2544	/* Remember not to use load_object_str in a time-critical situation. */
2545	/* Also remember that multiparts objects are not supported for now. */
2546
2547	object *
2548	load_object_str (const char *obstr)
2549	{
2550	object *op;
2551	char filename[MAX_BUF];
2552
2553	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2554
2555	FILE *tempfile = fopen (filename, "w");
2556
2557	if (tempfile == NULL)
2558	{
2559	LOG (llevError, "Error - Unable to access load object temp file\n");
2560	return NULL;
2561	}
2562
2563	fprintf (tempfile, obstr);
2564	fclose (tempfile);
2565
2566	op = object::create ();
2567
2568	object_thawer thawer (filename);
2569
2570	if (thawer)
2571	load_object (thawer, op, 0);
2572
2573	LOG (llevDebug, " load str completed, object=%s\n", &op->name);
2574	CLEAR_FLAG (op, FLAG_REMOVED);
2575
2576	return op;
2577	}	2402	}
2578		2403
2579	/* This returns the first object in who's inventory that	2404	/* This returns the first object in who's inventory that
2580	* has the same type and subtype match.	2405	* has the same type and subtype match.
2581	* returns NULL if no match.	2406	* returns NULL if no match.
2582	*/	2407	*/
2583	object *	2408	object *
2584	find_obj_by_type_subtype (const object *who, int type, int subtype)	2409	find_obj_by_type_subtype (const object *who, int type, int subtype)
2585	{	2410	{
2586	object *tmp;
2587
2588	for (tmp = who->inv; tmp; tmp = tmp->below)	2411	for (object *tmp = who->inv; tmp; tmp = tmp->below)
2589	if (tmp->type == type && tmp->subtype == subtype)	2412	if (tmp->type == type && tmp->subtype == subtype)
2590	return tmp;	2413	return tmp;
2591		2414
2592	return NULL;	2415	return 0;
2593	}	2416	}
2594		2417
2595	/* If ob has a field named key, return the link from the list,	2418	/* If ob has a field named key, return the link from the list,
2596	* otherwise return NULL.	2419	* otherwise return NULL.
2597	*	2420	*
…		…
2599	* do the desired thing.	2422	* do the desired thing.
2600	*/	2423	*/
2601	key_value *	2424	key_value *
2602	get_ob_key_link (const object *ob, const char *key)	2425	get_ob_key_link (const object *ob, const char *key)
2603	{	2426	{
2604	key_value *link;
2605
2606	for (link = ob->key_values; link != NULL; link = link->next)	2427	for (key_value *link = ob->key_values; link; link = link->next)
2607	if (link->key == key)	2428	if (link->key == key)
2608	return link;	2429	return link;
2609		2430
2610	return NULL;	2431	return 0;
2611	}	2432	}
2612		2433
2613	/*	2434	/*
2614	* Returns the value of op has an extra_field for key, or NULL.	2435	* Returns the value of op has an extra_field for key, or NULL.
2615	*	2436	*
…		…
2640	if (link->key == canonical_key)	2461	if (link->key == canonical_key)
2641	return link->value;	2462	return link->value;
2642		2463
2643	return 0;	2464	return 0;
2644	}	2465	}
2645
2646		2466
2647	/*	2467	/*
2648	* Updates the canonical_key in op to value.	2468	* Updates the canonical_key in op to value.
2649	*	2469	*
2650	* canonical_key is a shared string (value doesn't have to be).	2470	* canonical_key is a shared string (value doesn't have to be).
…		…
2655	* Returns TRUE on success.	2475	* Returns TRUE on success.
2656	*/	2476	*/
2657	int	2477	int
2658	set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key)	2478	set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key)
2659	{	2479	{
2660	key_value *
2661	field = NULL, *last = NULL;	2480	key_value *field = NULL, *last = NULL;
2662		2481
2663	for (field = op->key_values; field != NULL; field = field->next)	2482	for (field = op->key_values; field != NULL; field = field->next)
2664	{	2483	{
2665	if (field->key != canonical_key)	2484	if (field->key != canonical_key)
2666	{	2485	{
…		…
2675	/* Basically, if the archetype has this key set,	2494	/* Basically, if the archetype has this key set,
2676	* we need to store the null value so when we save	2495	* we need to store the null value so when we save
2677	* it, we save the empty value so that when we load,	2496	* it, we save the empty value so that when we load,
2678	* we get this value back again.	2497	* we get this value back again.
2679	*/	2498	*/
2680	if (get_ob_key_link (&op->arch->clone, canonical_key))	2499	if (get_ob_key_link (op->arch, canonical_key))
2681	field->value = 0;	2500	field->value = 0;
2682	else	2501	else
2683	{	2502	{
2684	if (last)	2503	if (last)
2685	last->next = field->next;	2504	last->next = field->next;
…		…
2694	/* IF we get here, key doesn't exist */	2513	/* IF we get here, key doesn't exist */
2695		2514
2696	/* No field, we'll have to add it. */	2515	/* No field, we'll have to add it. */
2697		2516
2698	if (!add_key)	2517	if (!add_key)
2699	{
2700	return FALSE;	2518	return FALSE;
2701	}	2519
2702	/* There isn't any good reason to store a null	2520	/* There isn't any good reason to store a null
2703	* value in the key/value list. If the archetype has	2521	* value in the key/value list. If the archetype has
2704	* this key, then we should also have it, so shouldn't	2522	* this key, then we should also have it, so shouldn't
2705	* be here. If user wants to store empty strings,	2523	* be here. If user wants to store empty strings,
2706	* should pass in ""	2524	* should pass in ""
…		…
2755	}	2573	}
2756	else	2574	else
2757	item = item->env;	2575	item = item->env;
2758	}	2576	}
2759		2577
		2578	const char *
		2579	object::flag_desc (char *desc, int len) const
		2580	{
		2581	char *p = desc;
		2582	bool first = true;
		2583
		2584	*p = 0;
		2585
		2586	for (int i = 0; i < NUM_FLAGS; i++)
		2587	{
		2588	if (len <= 10) // magic constant!
		2589	{
		2590	snprintf (p, len, ",...");
		2591	break;
		2592	}
		2593
		2594	if (flag [i])
		2595	{
		2596	int cnt = snprintf (p, len, "%s%d", first ? "" : ",", i);
		2597	len -= cnt;
		2598	p += cnt;
		2599	first = false;
		2600	}
		2601	}
		2602
		2603	return desc;
		2604	}
		2605
2760	// return a suitable string describing an objetc in enough detail to find it	2606	// return a suitable string describing an object in enough detail to find it
2761	const char *	2607	const char *
2762	object::debug_desc (char *info) const	2608	object::debug_desc (char *info) const
2763	{	2609	{
		2610	char flagdesc[512];
2764	char info2[256 * 3];	2611	char info2[256 * 4];
2765	char *p = info;	2612	char *p = info;
2766		2613
2767	p += snprintf (p, 256, "%d=\"%s%s%s\"",	2614	p += snprintf (p, 512, "{cnt:%d,uuid:<1.%" PRIx64 ">,name:\"%s\"%s%s,flags:[%s],type:%d}",
2768	count,	2615	count, uuid.seq,
2769	&name,	2616	&name,
2770	title ? " " : "",	2617	title ? "\",title:\"" : "",
2771	title ? (const char *)title : "");	2618	title ? (const char *)title : "",
		2619	flag_desc (flagdesc, 512), type);
2772		2620
2773	if (env)	2621	if (!this->flag[FLAG_REMOVED] && env)
2774	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2622	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2775		2623
2776	if (map)	2624	if (map)
2777	p += snprintf (p, 256, "(on %s@%d+%d)", map->path, x, y);	2625	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2778		2626
2779	return info;	2627	return info;
2780	}	2628	}
2781		2629
2782	const char *	2630	const char *
2783	object::debug_desc () const	2631	object::debug_desc () const
2784	{	2632	{
2785	static char info[256 * 3];	2633	static char info[3][256 * 4];
		2634	static int info_idx;
		2635
2786	return debug_desc (info);	2636	return debug_desc (info [++info_idx % 3]);
2787	}	2637	}
2788		2638
		2639	struct region *
		2640	object::region () const
		2641	{
		2642	return map ? map->region (x, y)
		2643	: region::default_region ();
		2644	}
		2645
		2646	const materialtype_t *
		2647	object::dominant_material () const
		2648	{
		2649	if (materialtype_t *mt = name_to_material (materialname))
		2650	return mt;
		2651
		2652	return name_to_material (shstr_unknown);
		2653	}
		2654
		2655	void
		2656	object::open_container (object *new_container)
		2657	{
		2658	if (container == new_container)
		2659	return;
		2660
		2661	if (object *old_container = container)
		2662	{
		2663	if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
		2664	return;
		2665
		2666	#if 0
		2667	// remove the "Close old_container" object.
		2668	if (object *closer = old_container->inv)
		2669	if (closer->type == CLOSE_CON)
		2670	closer->destroy ();
		2671	#endif
		2672
		2673	old_container->flag [FLAG_APPLIED] = 0;
		2674	container = 0;
		2675
		2676	esrv_update_item (UPD_FLAGS, this, old_container);
		2677	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
		2678	play_sound (sound_find ("chest_close"));
		2679	}
		2680
		2681	if (new_container)
		2682	{
		2683	if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))
		2684	return;
		2685
		2686	// TODO: this does not seem to serve any purpose anymore?
		2687	#if 0
		2688	// insert the "Close Container" object.
		2689	if (archetype *closer = new_container->other_arch)
		2690	{
		2691	object *closer = arch_to_object (new_container->other_arch);
		2692	closer->flag [FLAG_NO_MAP_SAVE] = 1;
		2693	new_container->insert (closer);
		2694	}
		2695	#endif
		2696
		2697	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));
		2698
		2699	new_container->flag [FLAG_APPLIED] = 1;
		2700	container = new_container;
		2701
		2702	esrv_update_item (UPD_FLAGS, this, new_container);
		2703	esrv_send_inventory (this, new_container);
		2704	play_sound (sound_find ("chest_open"));
		2705	}
		2706	}
		2707
		2708	object *
		2709	object::force_find (const shstr name)
		2710	{
		2711	/* cycle through his inventory to look for the MARK we want to
		2712	* place
		2713	*/
		2714	for (object *tmp = inv; tmp; tmp = tmp->below)
		2715	if (tmp->type == FORCE && tmp->slaying == name)
		2716	return splay (tmp);
		2717
		2718	return 0;
		2719	}
		2720
		2721	void
		2722	object::force_add (const shstr name, int duration)
		2723	{
		2724	if (object *force = force_find (name))
		2725	force->destroy ();
		2726
		2727	object *force = get_archetype (FORCE_NAME);
		2728
		2729	force->slaying = name;
		2730	force->stats.food = 1;
		2731	force->speed_left = -1.f;
		2732
		2733	force->set_speed (duration ? 1.f / duration : 0.f);
		2734	force->flag [FLAG_IS_USED_UP] = true;
		2735	force->flag [FLAG_APPLIED] = true;
		2736
		2737	insert (force);
		2738	}
		2739
		2740	void
		2741	object::play_sound (faceidx sound) const
		2742	{
		2743	if (!sound)
		2744	return;
		2745
		2746	if (flag [FLAG_REMOVED])
		2747	return;
		2748
		2749	if (env)
		2750	{
		2751	if (object *pl = in_player ())
		2752	pl->contr->play_sound (sound);
		2753	}
		2754	else
		2755	map->play_sound (sound, x, y);
		2756	}
		2757

Diff Legend

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