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.83 by root, Mon Dec 25 14:43:22 2006 UTC vs.
Revision 1.199 by root, Thu Nov 8 19:43:23 2007 UTC

1	/*	1	/*
2	CrossFire, A Multiplayer game for X-windows	2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.
3		3	*
		4	* Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra 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	* Deliantra 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 to <support@deliantra.net>
21	The authors can be reached via e-mail at <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
…		…
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 (ob1->self) : 0;
		313	int k2 = ob2->self ? HvTOTALKEYS (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;
		452
		453	if (flag [FLAG_FREED])
		454	{
		455	LOG (llevError | logBacktrace, "tried to set owner of %s to %s\n", debug_desc (), owner->debug_desc ());
		456	return;
		457	}
451		458
452	this->owner = owner;	459	this->owner = owner;
		460	}
		461
		462	int
		463	object::slottype () const
		464	{
		465	if (type == SKILL)
		466	{
		467	if (IS_COMBAT_SKILL (subtype)) return slot_combat;
		468	if (IS_RANGED_SKILL (subtype)) return slot_ranged;
		469	}
		470	else
		471	{
		472	if (slot [body_combat].info) return slot_combat;
		473	if (slot [body_range ].info) return slot_ranged;
		474	}
		475
		476	return slot_none;
		477	}
		478
		479	bool
		480	object::change_weapon (object *ob)
		481	{
		482	if (current_weapon == ob)
		483	return true;
		484
		485	if (chosen_skill)
		486	chosen_skill->flag [FLAG_APPLIED] = false;
		487
		488	current_weapon = ob;
		489	chosen_skill = !ob || ob->type == SKILL ? ob : find_skill_by_name (this, ob->skill);
		490
		491	if (chosen_skill)
		492	chosen_skill->flag [FLAG_APPLIED] = true;
		493
		494	update_stats ();
		495
		496	if (ob)
		497	{
		498	// now check wether any body locations became invalid, in which case
		499	// we cannot apply the weapon at the moment.
		500	for (int i = 0; i < NUM_BODY_LOCATIONS; ++i)
		501	if (slot[i].used < 0)
		502	{
		503	current_weapon = chosen_skill = 0;
		504	update_stats ();
		505
		506	new_draw_info_format (NDI_UNIQUE, 0, this,
		507	"You try to balance all your items at once, "
		508	"but the %s is just too much for your body. "
		509	"[You need to unapply some items first.]", &ob->name);
		510	return false;
		511	}
		512
		513	//new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);
		514	}
		515	else
		516	;//new_draw_info_format (NDI_UNIQUE, 0, this, "You unwield your weapons.");
		517
		518	if (ob && !ob->flag [FLAG_APPLIED] && ob->type != SPELL)
		519	{
		520	LOG (llevError | logBacktrace, "%s changed to unapplied weapon %s",
		521	&name, ob->debug_desc ());
		522	return false;
		523	}
		524
		525	return true;
453	}	526	}
454		527
455	/* Zero the key_values on op, decrementing the shared-string	528	/* Zero the key_values on op, decrementing the shared-string
456	* refcounts and freeing the links.	529	* refcounts and freeing the links.
457	*/	530	*/
458	static void	531	static void
459	free_key_values (object *op)	532	free_key_values (object *op)
460	{	533	{
461	for (key_value *i = op->key_values; i != 0;)	534	for (key_value *i = op->key_values; i; )
462	{	535	{
463	key_value *next = i->next;	536	key_value *next = i->next;
464	delete i;	537	delete i;
465		538
466	i = next;	539	i = next;
467	}	540	}
468		541
469	op->key_values = 0;	542	op->key_values = 0;
470	}	543	}
471		544
472	/*	545	object &
473	* copy_to first frees everything allocated by the dst object,	546	object::operator =(const object &src)
474	* and then copies the contents of itself into the second
475	* object, allocating what needs to be allocated. Basically, any
476	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
477	* if the first object is freed, the pointers in the new object
478	* will point at garbage.
479	*/
480	void
481	object::copy_to (object *dst)
482	{	547	{
483	bool is_freed = QUERY_FLAG (dst, FLAG_FREED);	548	bool is_freed = flag [FLAG_FREED];
484	bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED);	549	bool is_removed = flag [FLAG_REMOVED];
485		550
486	*(object_copy *)dst = *this;	551	*(object_copy *)this = src;
487		552
488	if (is_freed)	553	flag [FLAG_FREED] = is_freed;
489	SET_FLAG (dst, FLAG_FREED);	554	flag [FLAG_REMOVED] = is_removed;
490
491	if (is_removed)
492	SET_FLAG (dst, FLAG_REMOVED);
493
494	if (speed < 0)
495	dst->speed_left = speed_left - RANDOM () % 200 / 100.0;
496		555
497	/* Copy over key_values, if any. */	556	/* Copy over key_values, if any. */
498	if (key_values)	557	if (src.key_values)
499	{	558	{
500	key_value *tail = 0;	559	key_value *tail = 0;
501	key_value *i;
502
503	dst->key_values = 0;	560	key_values = 0;
504		561
505	for (i = key_values; i; i = i->next)	562	for (key_value *i = src.key_values; i; i = i->next)
506	{	563	{
507	key_value *new_link = new key_value;	564	key_value *new_link = new key_value;
508		565
509	new_link->next = 0;	566	new_link->next = 0;
510	new_link->key = i->key;	567	new_link->key = i->key;
511	new_link->value = i->value;	568	new_link->value = i->value;
512		569
513	/* Try and be clever here, too. */	570	/* Try and be clever here, too. */
514	if (!dst->key_values)	571	if (!key_values)
515	{	572	{
516	dst->key_values = new_link;	573	key_values = new_link;
517	tail = new_link;	574	tail = new_link;
518	}	575	}
519	else	576	else
520	{	577	{
521	tail->next = new_link;	578	tail->next = new_link;
522	tail = new_link;	579	tail = new_link;
523	}	580	}
524	}	581	}
525	}	582	}
		583	}
526		584
527	update_ob_speed (dst);	585	/*
		586	* copy_to first frees everything allocated by the dst object,
		587	* and then copies the contents of itself into the second
		588	* object, allocating what needs to be allocated. Basically, any
		589	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
		590	* if the first object is freed, the pointers in the new object
		591	* will point at garbage.
		592	*/
		593	void
		594	object::copy_to (object *dst)
		595	{
		596	*dst = *this;
		597
		598	if (speed < 0)
		599	dst->speed_left -= rndm ();
		600
		601	dst->set_speed (dst->speed);
		602	}
		603
		604	void
		605	object::instantiate ()
		606	{
		607	if (!uuid.seq) // HACK
		608	uuid = gen_uuid ();
		609
		610	speed_left = -0.1f;
		611	/* copy the body_info to the body_used - this is only really
		612	* need for monsters, but doesn't hurt to do it for everything.
		613	* by doing so, when a monster is created, it has good starting
		614	* values for the body_used info, so when items are created
		615	* for it, they can be properly equipped.
		616	*/
		617	for (int i = NUM_BODY_LOCATIONS; i--; )
		618	slot[i].used = slot[i].info;
		619
		620	attachable::instantiate ();
528	}	621	}
529		622
530	object *	623	object *
531	object::clone ()	624	object::clone ()
532	{	625	{
…		…
538	/*	631	/*
539	* If an object with the IS_TURNABLE() flag needs to be turned due	632	* If an object with the IS_TURNABLE() flag needs to be turned due
540	* to the closest player being on the other side, this function can	633	* to the closest player being on the other side, this function can
541	* be called to update the face variable, _and_ how it looks on the map.	634	* be called to update the face variable, _and_ how it looks on the map.
542	*/	635	*/
543
544	void	636	void
545	update_turn_face (object *op)	637	update_turn_face (object *op)
546	{	638	{
547	if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || op->arch == NULL)	639	if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || !op->arch)
548	return;	640	return;
		641
549	SET_ANIMATION (op, op->direction);	642	SET_ANIMATION (op, op->direction);
550	update_object (op, UP_OBJ_FACE);	643	update_object (op, UP_OBJ_FACE);
551	}	644	}
552		645
553	/*	646	/*
554	* Updates the speed of an object. If the speed changes from 0 to another	647	* Updates the speed of an object. If the speed changes from 0 to another
555	* value, or vice versa, then add/remove the object from the active list.	648	* value, or vice versa, then add/remove the object from the active list.
556	* This function needs to be called whenever the speed of an object changes.	649	* This function needs to be called whenever the speed of an object changes.
557	*/	650	*/
558	void	651	void
559	update_ob_speed (object *op)	652	object::set_speed (float speed)
560	{	653	{
561	extern int arch_init;	654	if (flag [FLAG_FREED] && speed)
562
563	/* No reason putting the archetypes objects on the speed list,
564	* since they never really need to be updated.
565	*/
566
567	if (QUERY_FLAG (op, FLAG_FREED) && op->speed)
568	{	655	{
569	LOG (llevError, "Object %s is freed but has speed.\n", &op->name);	656	LOG (llevError, "Object %s is freed but has speed.\n", &name);
570	#ifdef MANY_CORES
571	abort ();
572	#else
573	op->speed = 0;	657	speed = 0;
574	#endif
575	}
576
577	if (arch_init)
578	return;
579
580	if (FABS (op->speed) > MIN_ACTIVE_SPEED)
581	{	658	}
582	/* If already on active list, don't do anything */
583	if (op->active_next || op->active_prev || op == active_objects)
584	return;
585		659
586	/* process_events() expects us to insert the object at the beginning	660	this->speed = speed;
587	* of the list. */
588	op->active_next = active_objects;
589		661
590	if (op->active_next != NULL)	662	if (has_active_speed ())
591	op->active_next->active_prev = op;	663	activate ();
592
593	active_objects = op;
594	}
595	else	664	else
596	{	665	deactivate ();
597	/* If not on the active list, nothing needs to be done */
598	if (!op->active_next && !op->active_prev && op != active_objects)
599	return;
600
601	if (op->active_prev == NULL)
602	{
603	active_objects = op->active_next;
604
605	if (op->active_next != NULL)
606	op->active_next->active_prev = NULL;
607	}
608	else
609	{
610	op->active_prev->active_next = op->active_next;
611
612	if (op->active_next)
613	op->active_next->active_prev = op->active_prev;
614	}
615
616	op->active_next = NULL;
617	op->active_prev = NULL;
618	}
619	}
620
621	/* This function removes object 'op' from the list of active
622	* objects.
623	* This should only be used for style maps or other such
624	* reference maps where you don't want an object that isn't
625	* in play chewing up cpu time getting processed.
626	* The reverse of this is to call update_ob_speed, which
627	* will do the right thing based on the speed of the object.
628	*/
629	void
630	remove_from_active_list (object *op)
631	{
632	/* If not on the active list, nothing needs to be done */
633	if (!op->active_next && !op->active_prev && op != active_objects)
634	return;
635
636	if (op->active_prev == NULL)
637	{
638	active_objects = op->active_next;
639	if (op->active_next != NULL)
640	op->active_next->active_prev = NULL;
641	}
642	else
643	{
644	op->active_prev->active_next = op->active_next;
645	if (op->active_next)
646	op->active_next->active_prev = op->active_prev;
647	}
648	op->active_next = NULL;
649	op->active_prev = NULL;
650	}	666	}
651		667
652	/*	668	/*
653	* update_object() updates the the map.	669	* update_object() updates the the map.
654	* It takes into account invisible objects (and represent squares covered	670	* It takes into account invisible objects (and represent squares covered
…		…
667	* UP_OBJ_FACE: only the objects face has changed.	683	* UP_OBJ_FACE: only the objects face has changed.
668	*/	684	*/
669	void	685	void
670	update_object (object *op, int action)	686	update_object (object *op, int action)
671	{	687	{
672	MoveType move_on, move_off, move_block, move_slow;
673
674	if (op == NULL)	688	if (op == NULL)
675	{	689	{
676	/* this should never happen */	690	/* this should never happen */
677	LOG (llevDebug, "update_object() called for NULL object.\n");	691	LOG (llevDebug, "update_object() called for NULL object.\n");
678	return;	692	return;
…		…
702	return;	716	return;
703	}	717	}
704		718
705	mapspace &m = op->ms ();	719	mapspace &m = op->ms ();
706		720
707	if (m.flags_ & P_NEED_UPDATE)	721	if (!(m.flags_ & P_UPTODATE))
708	/* nop */;	722	/* nop */;
709	else if (action == UP_OBJ_INSERT)	723	else if (action == UP_OBJ_INSERT)
710	{	724	{
711	// this is likely overkill, TODO: revisit (schmorp)	725	// this is likely overkill, TODO: revisit (schmorp)
712	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))	726	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
…		…
721	/* This isn't perfect, but I don't expect a lot of objects to	735	/* This isn't perfect, but I don't expect a lot of objects to
722	* to have move_allow right now.	736	* to have move_allow right now.
723	*/	737	*/
724	|| ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block	738	|| ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block
725	|| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)	739	|| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)
726	m.flags_ = P_NEED_UPDATE;	740	m.flags_ = 0;
727	}	741	}
728	/* if the object is being removed, we can't make intelligent	742	/* if the object is being removed, we can't make intelligent
729	* decisions, because remove_ob can't really pass the object	743	* decisions, because remove_ob can't really pass the object
730	* that is being removed.	744	* that is being removed.
731	*/	745	*/
732	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)	746	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
733	m.flags_ = P_NEED_UPDATE;	747	m.flags_ = 0;
734	else if (action == UP_OBJ_FACE)	748	else if (action == UP_OBJ_FACE)
735	/* Nothing to do for that case */ ;	749	/* Nothing to do for that case */ ;
736	else	750	else
737	LOG (llevError, "update_object called with invalid action: %d\n", action);	751	LOG (llevError, "update_object called with invalid action: %d\n", action);
738		752
739	if (op->more)	753	if (op->more)
740	update_object (op->more, action);	754	update_object (op->more, action);
741	}	755	}
742		756
743	object::vector object::objects; // not yet used
744	object *object::first;
745
746	object::object ()	757	object::object ()
747	{	758	{
748	SET_FLAG (this, FLAG_REMOVED);	759	SET_FLAG (this, FLAG_REMOVED);
749		760
750	expmul = 1.0;	761	expmul = 1.0;
751	face = blank_face;	762	face = blank_face;
752	}	763	}
753		764
754	object::~object ()	765	object::~object ()
755	{	766	{
		767	unlink ();
		768
756	free_key_values (this);	769	free_key_values (this);
757	}	770	}
758		771
		772	static int object_count;
		773
759	void object::link ()	774	void object::link ()
760	{	775	{
761	count = ++ob_count;	776	assert (!index);//D
762	uuid = gen_uuid ();	777	uuid = gen_uuid ();
		778	count = ++object_count;
763		779
764	prev = 0;	780	refcnt_inc ();
765	next = object::first;	781	objects.insert (this);
766
767	if (object::first)
768	object::first->prev = this;
769
770	object::first = this;
771	}	782	}
772		783
773	void object::unlink ()	784	void object::unlink ()
774	{	785	{
775	if (this == object::first)	786	if (!index)
776	object::first = next;	787	return;
777		788
778	/* Remove this object from the list of used objects */	789	objects.erase (this);
779	if (prev) prev->next = next;	790	refcnt_dec ();
780	if (next) next->prev = prev;	791	}
781		792
782	prev = 0;	793	void
783	next = 0;	794	object::activate ()
		795	{
		796	/* If already on active list, don't do anything */
		797	if (active)
		798	return;
		799
		800	if (has_active_speed ())
		801	actives.insert (this);
		802	}
		803
		804	void
		805	object::activate_recursive ()
		806	{
		807	activate ();
		808
		809	for (object *op = inv; op; op = op->below)
		810	op->activate_recursive ();
		811	}
		812
		813	/* This function removes object 'op' from the list of active
		814	* objects.
		815	* This should only be used for style maps or other such
		816	* reference maps where you don't want an object that isn't
		817	* in play chewing up cpu time getting processed.
		818	* The reverse of this is to call update_ob_speed, which
		819	* will do the right thing based on the speed of the object.
		820	*/
		821	void
		822	object::deactivate ()
		823	{
		824	/* If not on the active list, nothing needs to be done */
		825	if (!active)
		826	return;
		827
		828	actives.erase (this);
		829	}
		830
		831	void
		832	object::deactivate_recursive ()
		833	{
		834	for (object *op = inv; op; op = op->below)
		835	op->deactivate_recursive ();
		836
		837	deactivate ();
		838	}
		839
		840	void
		841	object::set_flag_inv (int flag, int value)
		842	{
		843	for (object *op = inv; op; op = op->below)
		844	{
		845	op->flag [flag] = value;
		846	op->set_flag_inv (flag, value);
		847	}
		848	}
		849
		850	/*
		851	* Remove and free all objects in the inventory of the given object.
		852	* object.c ?
		853	*/
		854	void
		855	object::destroy_inv (bool drop_to_ground)
		856	{
		857	// need to check first, because the checks below might segfault
		858	// as we might be on an invalid mapspace and crossfire code
		859	// is too buggy to ensure that the inventory is empty.
		860	// corollary: if you create arrows etc. with stuff in tis inventory,
		861	// cf will crash below with off-map x and y
		862	if (!inv)
		863	return;
		864
		865	/* Only if the space blocks everything do we not process -
		866	* if some form of movement is allowed, let objects
		867	* drop on that space.
		868	*/
		869	if (!drop_to_ground
		870	|| !map
		871	|| map->in_memory != MAP_IN_MEMORY
		872	|| map->nodrop
		873	|| ms ().move_block == MOVE_ALL)
		874	{
		875	while (inv)
		876	{
		877	inv->destroy_inv (drop_to_ground);
		878	inv->destroy ();
		879	}
		880	}
		881	else
		882	{ /* Put objects in inventory onto this space */
		883	while (inv)
		884	{
		885	object *op = inv;
		886
		887	if (op->flag [FLAG_STARTEQUIP]
		888	|| op->flag [FLAG_NO_DROP]
		889	|| op->type == RUNE
		890	|| op->type == TRAP
		891	|| op->flag [FLAG_IS_A_TEMPLATE]
		892	|| op->flag [FLAG_DESTROY_ON_DEATH])
		893	op->destroy ();
		894	else
		895	map->insert (op, x, y);
		896	}
		897	}
784	}	898	}
785		899
786	object *object::create ()	900	object *object::create ()
787	{	901	{
788	object *op = new object;	902	object *op = new object;
789	op->link ();	903	op->link ();
790	return op;	904	return op;
791	}	905	}
792		906
793	/*
794	* free_object() frees everything allocated by an object, removes
795	* it from the list of used objects, and puts it on the list of
796	* free objects. The IS_FREED() flag is set in the object.
797	* The object must have been removed by remove_ob() first for
798	* this function to succeed.
799	*
800	* If destroy_inventory is set, free inventory as well. Else drop items in
801	* inventory to the ground.
802	*/
803	void	907	void
804	object::do_destroy ()	908	object::do_destroy ()
805	{	909	{
806	attachable::do_destroy ();	910	attachable::do_destroy ();
807		911
…		…
812	remove_friendly_object (this);	916	remove_friendly_object (this);
813		917
814	if (!flag [FLAG_REMOVED])	918	if (!flag [FLAG_REMOVED])
815	remove ();	919	remove ();
816		920
817	if (flag [FLAG_FREED])	921	destroy_inv (true);
818	return;	922
		923	deactivate ();
		924	unlink ();
819		925
820	flag [FLAG_FREED] = 1;	926	flag [FLAG_FREED] = 1;
821		927
822	// hack to ensure that freed objects still have a valid map	928	// hack to ensure that freed objects still have a valid map
823	{	929	{
…		…
825		931
826	if (!freed_map)	932	if (!freed_map)
827	{	933	{
828	freed_map = new maptile;	934	freed_map = new maptile;
829		935
		936	freed_map->path = "<freed objects map>";
830	freed_map->name = "/internal/freed_objects_map";	937	freed_map->name = "/internal/freed_objects_map";
831	freed_map->width = 3;	938	freed_map->width = 3;
832	freed_map->height = 3;	939	freed_map->height = 3;
833		940
834	freed_map->allocate ();	941	freed_map->alloc ();
		942	freed_map->in_memory = MAP_IN_MEMORY;
835	}	943	}
836		944
837	map = freed_map;	945	map = freed_map;
838	x = 1;	946	x = 1;
839	y = 1;	947	y = 1;
840	}	948	}
841		949
		950	if (more)
		951	{
		952	more->destroy ();
842	more = 0;	953	more = 0;
		954	}
		955
843	head = 0;	956	head = 0;
844	inv = 0;
845		957
846	// clear those pointers that likely might have circular references to us	958	// clear those pointers that likely might cause circular references
847	owner = 0;	959	owner = 0;
848	enemy = 0;	960	enemy = 0;
849	attacked_by = 0;	961	attacked_by = 0;
850		962	current_weapon = 0;
851	// only relevant for players(?), but make sure of it anyways
852	contr = 0;
853
854	/* Remove object from the active list */
855	speed = 0;
856	update_ob_speed (this);
857
858	unlink ();
859	}
860
861	/*
862	* Remove and free all objects in the inventory of the given object.
863	* object.c ?
864	*/
865	void
866	object::destroy_inv (bool drop_to_ground)
867	{
868	if (!inv)
869	return;
870
871	/* Only if the space blocks everything do we not process -
872	* if some form of movement is allowed, let objects
873	* drop on that space.
874	*/
875	if (!drop_to_ground || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
876	{
877	while (inv)
878	{
879	inv->destroy_inv (drop_to_ground);
880	inv->destroy ();
881	}
882	}
883	else
884	{ /* Put objects in inventory onto this space */
885	while (inv)
886	{
887	object *op = inv;
888
889	if (op->flag [FLAG_STARTEQUIP]
890	|| op->flag [FLAG_NO_DROP]
891	|| op->type == RUNE
892	|| op->type == TRAP
893	|| op->flag [FLAG_IS_A_TEMPLATE])
894	op->destroy ();
895	else
896	{
897	op->remove ();
898	op->x = x;
899	op->y = y;
900	insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */
901	}
902	}
903	}
904	}	963	}
905		964
906	void	965	void
907	object::destroy (bool destroy_inventory)	966	object::destroy (bool destroy_inventory)
908	{	967	{
909	if (destroyed ())	968	if (destroyed ())
910	return;	969	return;
911		970
912	if (more)
913	{
914	//TODO: non-head objects must not have inventory
915	more->destroy (destroy_inventory);
916	more = 0;
917	}
918
919	if (destroy_inventory)	971	if (destroy_inventory)
920	destroy_inv (true);	972	destroy_inv (false);
		973
		974	if (is_head ())
		975	if (sound_destroy)
		976	play_sound (sound_destroy);
		977	else if (flag [FLAG_MONSTER])
		978	play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism
921		979
922	attachable::destroy ();	980	attachable::destroy ();
923	}	981	}
924		982
925	/*	983	/*
…		…
943	* This function removes the object op from the linked list of objects	1001	* This function removes the object op from the linked list of objects
944	* which it is currently tied to. When this function is done, the	1002	* which it is currently tied to. When this function is done, the
945	* object will have no environment. If the object previously had an	1003	* object will have no environment. If the object previously had an
946	* environment, the x and y coordinates will be updated to	1004	* environment, the x and y coordinates will be updated to
947	* the previous environment.	1005	* the previous environment.
948	* Beware: This function is called from the editor as well!
949	*/	1006	*/
950	void	1007	void
951	object::remove ()	1008	object::do_remove ()
952	{	1009	{
953	object *tmp, *last = 0;	1010	object *tmp, *last = 0;
954	object *otmp;	1011	object *otmp;
955		1012
956	if (QUERY_FLAG (this, FLAG_REMOVED))	1013	if (QUERY_FLAG (this, FLAG_REMOVED))
…		…
978	* to save cpu time.	1035	* to save cpu time.
979	*/	1036	*/
980	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1037	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
981	otmp->update_stats ();	1038	otmp->update_stats ();
982		1039
983	if (above != NULL)	1040	if (above)
984	above->below = below;	1041	above->below = below;
985	else	1042	else
986	env->inv = below;	1043	env->inv = below;
987		1044
988	if (below != NULL)	1045	if (below)
989	below->above = above;	1046	below->above = above;
990		1047
991	/* we set up values so that it could be inserted into	1048	/* we set up values so that it could be inserted into
992	* the map, but we don't actually do that - it is up	1049	* the map, but we don't actually do that - it is up
993	* to the caller to decide what we want to do.	1050	* to the caller to decide what we want to do.
…		…
997	above = 0, below = 0;	1054	above = 0, below = 0;
998	env = 0;	1055	env = 0;
999	}	1056	}
1000	else if (map)	1057	else if (map)
1001	{	1058	{
1002	/* Re did the following section of code - it looks like it had	1059	if (type == PLAYER)
1003	* lots of logic for things we no longer care about
1004	*/	1060	{
		1061	// leaving a spot always closes any open container on the ground
		1062	if (container && !container->env)
		1063	// this causes spurious floorbox updates, but it ensures
		1064	// that the CLOSE event is being sent.
		1065	close_container ();
		1066
		1067	--map->players;
		1068	map->touch ();
		1069	}
		1070
		1071	map->dirty = true;
		1072	mapspace &ms = this->ms ();
1005		1073
1006	/* link the object above us */	1074	/* link the object above us */
1007	if (above)	1075	if (above)
1008	above->below = below;	1076	above->below = below;
1009	else	1077	else
1010	map->at (x, y).top = below; /* we were top, set new top */	1078	ms.top = below; /* we were top, set new top */
1011		1079
1012	/* Relink the object below us, if there is one */	1080	/* Relink the object below us, if there is one */
1013	if (below)	1081	if (below)
1014	below->above = above;	1082	below->above = above;
1015	else	1083	else
…		…
1017	/* Nothing below, which means we need to relink map object for this space	1085	/* Nothing below, which means we need to relink map object for this space
1018	* use translated coordinates in case some oddness with map tiling is	1086	* use translated coordinates in case some oddness with map tiling is
1019	* evident	1087	* evident
1020	*/	1088	*/
1021	if (GET_MAP_OB (map, x, y) != this)	1089	if (GET_MAP_OB (map, x, y) != this)
1022	{
1023	char *dump = dump_object (this);
1024	LOG (llevError,
1025	"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);	1090	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 ());
1026	free (dump);
1027	dump = dump_object (GET_MAP_OB (map, x, y));
1028	LOG (llevError, "%s\n", dump);
1029	free (dump);
1030	}
1031		1091
1032	map->at (x, y).bottom = above; /* goes on above it. */	1092	ms.bot = above; /* goes on above it. */
1033	}	1093	}
1034		1094
1035	above = 0;	1095	above = 0;
1036	below = 0;	1096	below = 0;
1037		1097
1038	if (map->in_memory == MAP_SAVING)	1098	if (map->in_memory == MAP_SAVING)
1039	return;	1099	return;
1040		1100
1041	int check_walk_off = !flag [FLAG_NO_APPLY];	1101	int check_walk_off = !flag [FLAG_NO_APPLY];
1042		1102
		1103	if (object *pl = ms.player ())
		1104	{
		1105	if (pl->container == this)
		1106	/* If a container that the player is currently using somehow gets
		1107	* removed (most likely destroyed), update the player view
		1108	* appropriately.
		1109	*/
		1110	pl->close_container ();
		1111
		1112	pl->contr->ns->floorbox_update ();
		1113	}
		1114
1043	for (tmp = GET_MAP_OB (map, x, y); tmp; tmp = tmp->above)	1115	for (tmp = ms.bot; tmp; tmp = tmp->above)
1044	{	1116	{
1045	/* No point updating the players look faces if he is the object	1117	/* No point updating the players look faces if he is the object
1046	* being removed.	1118	* being removed.
1047	*/	1119	*/
1048		1120
1049	if (tmp->type == PLAYER && tmp != this)
1050	{
1051	/* If a container that the player is currently using somehow gets
1052	* removed (most likely destroyed), update the player view
1053	* appropriately.
1054	*/
1055	if (tmp->container == this)
1056	{
1057	flag [FLAG_APPLIED] = 0;
1058	tmp->container = 0;
1059	}
1060
1061	if (tmp->contr->ns)
1062	tmp->contr->ns->floorbox_update ();
1063	}
1064
1065	/* See if player moving off should effect something */	1121	/* See if object moving off should effect something */
1066	if (check_walk_off	1122	if (check_walk_off
1067	&& ((move_type & tmp->move_off)	1123	&& ((move_type & tmp->move_off)
1068	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))	1124	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1069	{	1125	{
1070	move_apply (tmp, this, 0);	1126	move_apply (tmp, this, 0);
1071		1127
1072	if (destroyed ())	1128	if (destroyed ())
1073	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());	1129	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1074	}	1130	}
1075		1131
1076	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1077
1078	if (tmp->above == tmp)
1079	tmp->above = 0;
1080
1081	last = tmp;	1132	last = tmp;
1082	}	1133	}
1083		1134
1084	/* last == NULL of there are no objects on this space */	1135	/* last == NULL if there are no objects on this space */
		1136	//TODO: this makes little sense, why only update the topmost object?
1085	if (!last)	1137	if (!last)
1086	map->at (x, y).flags_ = P_NEED_UPDATE;	1138	map->at (x, y).flags_ = 0;
1087	else	1139	else
1088	update_object (last, UP_OBJ_REMOVE);	1140	update_object (last, UP_OBJ_REMOVE);
1089		1141
1090	if (flag [FLAG_BLOCKSVIEW] || glow_radius)	1142	if (flag [FLAG_BLOCKSVIEW] || glow_radius)
1091	update_all_los (map, x, y);	1143	update_all_los (map, x, y);
…		…
1104	merge_ob (object *op, object *top)	1156	merge_ob (object *op, object *top)
1105	{	1157	{
1106	if (!op->nrof)	1158	if (!op->nrof)
1107	return 0;	1159	return 0;
1108		1160
1109	if (top)	1161	if (!top)
1110	for (top = op; top && top->above; top = top->above)	1162	for (top = op; top && top->above; top = top->above)
1111	;	1163	;
1112		1164
1113	for (; top; top = top->below)	1165	for (; top; top = top->below)
1114	{	1166	{
…		…
1127	}	1179	}
1128		1180
1129	return 0;	1181	return 0;
1130	}	1182	}
1131		1183
		1184	void
		1185	object::expand_tail ()
		1186	{
		1187	if (more)
		1188	return;
		1189
		1190	object *prev = this;
		1191
		1192	for (archetype *at = (archetype *)arch->more; at; at = (archetype *)at->more)
		1193	{
		1194	object *op = arch_to_object (at);
		1195
		1196	op->name = name;
		1197	op->name_pl = name_pl;
		1198	op->title = title;
		1199
		1200	op->head = this;
		1201	prev->more = op;
		1202
		1203	prev = op;
		1204	}
		1205	}
		1206
1132	/*	1207	/*
1133	* same as insert_ob_in_map except it handle separate coordinates and do a clean	1208	* same as insert_ob_in_map except it handles separate coordinates and does a clean
1134	* job preparing multi-part monsters	1209	* job preparing multi-part monsters.
1135	*/	1210	*/
1136	object *	1211	object *
1137	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)	1212	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1138	{	1213	{
1139	object *tmp;
1140
1141	if (op->head)
1142	op = op->head;
1143
1144	for (tmp = op; tmp; tmp = tmp->more)	1214	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1145	{	1215	{
1146	tmp->x = x + tmp->arch->clone.x;	1216	tmp->x = x + tmp->arch->x;
1147	tmp->y = y + tmp->arch->clone.y;	1217	tmp->y = y + tmp->arch->y;
1148	}	1218	}
1149		1219
1150	return insert_ob_in_map (op, m, originator, flag);	1220	return insert_ob_in_map (op, m, originator, flag);
1151	}	1221	}
1152		1222
…		…
1171	* just 'op' otherwise	1241	* just 'op' otherwise
1172	*/	1242	*/
1173	object *	1243	object *
1174	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)	1244	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1175	{	1245	{
		1246	assert (!op->flag [FLAG_FREED]);
		1247
1176	object *tmp, *top, *floor = NULL;	1248	object *top, *floor = NULL;
1177	sint16 x, y;
1178		1249
1179	if (QUERY_FLAG (op, FLAG_FREED))	1250	op->remove ();
1180	{
1181	LOG (llevError, "Trying to insert freed object!\n");
1182	return NULL;
1183	}
1184
1185	if (m == NULL)
1186	{
1187	char *dump = dump_object (op);
1188	LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
1189	free (dump);
1190	return op;
1191	}
1192
1193	if (out_of_map (m, op->x, op->y))
1194	{
1195	char *dump = dump_object (op);
1196	LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump);
1197	#ifdef MANY_CORES
1198	/* Better to catch this here, as otherwise the next use of this object
1199	* is likely to cause a crash. Better to find out where it is getting
1200	* improperly inserted.
1201	*/
1202	abort ();
1203	#endif
1204	free (dump);
1205	return op;
1206	}
1207
1208	if (!QUERY_FLAG (op, FLAG_REMOVED))
1209	{
1210	char *dump = dump_object (op);
1211	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
1212	free (dump);
1213	return op;
1214	}
1215
1216	if (op->more)
1217	{
1218	/* The part may be on a different map. */
1219
1220	object *more = op->more;
1221
1222	/* We really need the caller to normalize coordinates - if
1223	* we set the map, that doesn't work if the location is within
1224	* a map and this is straddling an edge. So only if coordinate
1225	* is clear wrong do we normalize it.
1226	*/
1227	if (OUT_OF_REAL_MAP (more->map, more->x, more->y))
1228	more->map = get_map_from_coord (m, &more->x, &more->y);
1229	else if (!more->map)
1230	{
1231	/* For backwards compatibility - when not dealing with tiled maps,
1232	* more->map should always point to the parent.
1233	*/
1234	more->map = m;
1235	}
1236
1237	if (insert_ob_in_map (more, more->map, originator, flag) == NULL)
1238	{
1239	if (!op->head)
1240	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1241
1242	return 0;
1243	}
1244	}
1245
1246	CLEAR_FLAG (op, FLAG_REMOVED);
1247		1251
1248	/* Ideally, the caller figures this out. However, it complicates a lot	1252	/* Ideally, the caller figures this out. However, it complicates a lot
1249	* of areas of callers (eg, anything that uses find_free_spot would now	1253	* of areas of callers (eg, anything that uses find_free_spot would now
1250	* need extra work	1254	* need extra work
1251	*/	1255	*/
1252	op->map = get_map_from_coord (m, &op->x, &op->y);	1256	if (!xy_normalise (m, op->x, op->y))
1253	x = op->x;	1257	{
1254	y = op->y;	1258	op->destroy ();
		1259	return 0;
		1260	}
		1261
		1262	if (object *more = op->more)
		1263	if (!insert_ob_in_map (more, m, originator, flag))
		1264	return 0;
		1265
		1266	CLEAR_FLAG (op, FLAG_REMOVED);
		1267
		1268	op->map = m;
		1269	mapspace &ms = op->ms ();
1255		1270
1256	/* this has to be done after we translate the coordinates.	1271	/* this has to be done after we translate the coordinates.
1257	*/	1272	*/
1258	if (op->nrof && !(flag & INS_NO_MERGE))	1273	if (op->nrof && !(flag & INS_NO_MERGE))
1259	for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)	1274	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1260	if (object::can_merge (op, tmp))	1275	if (object::can_merge (op, tmp))
1261	{	1276	{
1262	op->nrof += tmp->nrof;	1277	op->nrof += tmp->nrof;
1263	tmp->destroy ();	1278	tmp->destroy ();
1264	}	1279	}
…		…
1281	op->below = originator->below;	1296	op->below = originator->below;
1282		1297
1283	if (op->below)	1298	if (op->below)
1284	op->below->above = op;	1299	op->below->above = op;
1285	else	1300	else
1286	op->ms ().bottom = op;	1301	ms.bot = op;
1287		1302
1288	/* since *below* originator, no need to update top */	1303	/* since *below* originator, no need to update top */
1289	originator->below = op;	1304	originator->below = op;
1290	}	1305	}
1291	else	1306	else
1292	{	1307	{
		1308	top = ms.bot;
		1309
1293	/* If there are other objects, then */	1310	/* If there are other objects, then */
1294	if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL))	1311	if (top)
1295	{	1312	{
1296	object *last = NULL;	1313	object *last = 0;
1297		1314
1298	/*	1315	/*
1299	* If there are multiple objects on this space, we do some trickier handling.	1316	* If there are multiple objects on this space, we do some trickier handling.
1300	* We've already dealt with merging if appropriate.	1317	* We've already dealt with merging if appropriate.
1301	* Generally, we want to put the new object on top. But if	1318	* Generally, we want to put the new object on top. But if
…		…
1305	* once we get to them. This reduces the need to traverse over all of	1322	* once we get to them. This reduces the need to traverse over all of
1306	* them when adding another one - this saves quite a bit of cpu time	1323	* them when adding another one - this saves quite a bit of cpu time
1307	* when lots of spells are cast in one area. Currently, it is presumed	1324	* when lots of spells are cast in one area. Currently, it is presumed
1308	* that flying non pickable objects are spell objects.	1325	* that flying non pickable objects are spell objects.
1309	*/	1326	*/
1310		1327	for (top = ms.bot; top; top = top->above)
1311	while (top != NULL)
1312	{	1328	{
1313	if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))	1329	if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))
1314	floor = top;	1330	floor = top;
1315		1331
1316	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))	1332	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))
…		…
1319	top = top->below;	1335	top = top->below;
1320	break;	1336	break;
1321	}	1337	}
1322		1338
1323	last = top;	1339	last = top;
1324	top = top->above;
1325	}	1340	}
1326		1341
1327	/* Don't want top to be NULL, so set it to the last valid object */	1342	/* Don't want top to be NULL, so set it to the last valid object */
1328	top = last;	1343	top = last;
1329		1344
…		…
1331	* looks like instead of lots of conditions here.	1346	* looks like instead of lots of conditions here.
1332	* makes things faster, and effectively the same result.	1347	* makes things faster, and effectively the same result.
1333	*/	1348	*/
1334		1349
1335	/* Have object 'fall below' other objects that block view.	1350	/* Have object 'fall below' other objects that block view.
1336	* Unless those objects are exits, type 66	1351	* Unless those objects are exits.
1337	* If INS_ON_TOP is used, don't do this processing	1352	* If INS_ON_TOP is used, don't do this processing
1338	* Need to find the object that in fact blocks view, otherwise	1353	* Need to find the object that in fact blocks view, otherwise
1339	* stacking is a bit odd.	1354	* stacking is a bit odd.
1340	*/	1355	*/
1341	if (!(flag & INS_ON_TOP) &&	1356	if (!(flag & INS_ON_TOP)
1342	(get_map_flags (op->map, 0, op->x, op->y, 0, 0) & P_BLOCKSVIEW) && (op->face && !op->face->visibility))	1357	&& ms.flags () & P_BLOCKSVIEW
		1358	&& (op->face && !faces [op->face].visibility))
1343	{	1359	{
1344	for (last = top; last != floor; last = last->below)	1360	for (last = top; last != floor; last = last->below)
1345	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1361	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1346	break;	1362	break;
		1363
1347	/* Check to see if we found the object that blocks view,	1364	/* Check to see if we found the object that blocks view,
1348	* and make sure we have a below pointer for it so that	1365	* and make sure we have a below pointer for it so that
1349	* we can get inserted below this one, which requires we	1366	* we can get inserted below this one, which requires we
1350	* set top to the object below us.	1367	* set top to the object below us.
1351	*/	1368	*/
1352	if (last && last->below && last != floor)	1369	if (last && last->below && last != floor)
1353	top = last->below;	1370	top = last->below;
1354	}	1371	}
1355	} /* If objects on this space */	1372	} /* If objects on this space */
1356		1373
1357	if (flag & INS_MAP_LOAD)
1358	top = GET_MAP_TOP (op->map, op->x, op->y);
1359
1360	if (flag & INS_ABOVE_FLOOR_ONLY)	1374	if (flag & INS_ABOVE_FLOOR_ONLY)
1361	top = floor;	1375	top = floor;
1362		1376
1363	/* Top is the object that our object (op) is going to get inserted above.	1377	/* Top is the object that our object (op) is going to get inserted above.
1364	*/	1378	*/
1365		1379
1366	/* First object on this space */	1380	/* First object on this space */
1367	if (!top)	1381	if (!top)
1368	{	1382	{
1369	op->above = GET_MAP_OB (op->map, op->x, op->y);	1383	op->above = ms.bot;
1370		1384
1371	if (op->above)	1385	if (op->above)
1372	op->above->below = op;	1386	op->above->below = op;
1373		1387
1374	op->below = NULL;	1388	op->below = 0;
1375	op->ms ().bottom = op;	1389	ms.bot = op;
1376	}	1390	}
1377	else	1391	else
1378	{ /* get inserted into the stack above top */	1392	{ /* get inserted into the stack above top */
1379	op->above = top->above;	1393	op->above = top->above;
1380		1394
…		…
1383		1397
1384	op->below = top;	1398	op->below = top;
1385	top->above = op;	1399	top->above = op;
1386	}	1400	}
1387		1401
1388	if (op->above == NULL)	1402	if (!op->above)
1389	op->ms ().top = op;	1403	ms.top = op;
1390	} /* else not INS_BELOW_ORIGINATOR */	1404	} /* else not INS_BELOW_ORIGINATOR */
1391		1405
1392	if (op->type == PLAYER)	1406	if (op->type == PLAYER)
		1407	{
1393	op->contr->do_los = 1;	1408	op->contr->do_los = 1;
		1409	++op->map->players;
		1410	op->map->touch ();
		1411	}
1394		1412
1395	/* If we have a floor, we know the player, if any, will be above	1413	op->map->dirty = true;
1396	* it, so save a few ticks and start from there.	1414
1397	*/
1398	if (!(flag & INS_MAP_LOAD))
1399	if (object *pl = op->ms ().player ())	1415	if (object *pl = ms.player ())
1400	if (pl->contr->ns)
1401	pl->contr->ns->floorbox_update ();	1416	pl->contr->ns->floorbox_update ();
1402		1417
1403	/* If this object glows, it may affect lighting conditions that are	1418	/* If this object glows, it may affect lighting conditions that are
1404	* visible to others on this map. But update_all_los is really	1419	* visible to others on this map. But update_all_los is really
1405	* an inefficient way to do this, as it means los for all players	1420	* an inefficient way to do this, as it means los for all players
1406	* on the map will get recalculated. The players could very well	1421	* on the map will get recalculated. The players could very well
1407	* be far away from this change and not affected in any way -	1422	* be far away from this change and not affected in any way -
1408	* this should get redone to only look for players within range,	1423	* this should get redone to only look for players within range,
1409	* or just updating the P_NEED_UPDATE for spaces within this area	1424	* or just updating the P_UPTODATE for spaces within this area
1410	* of effect may be sufficient.	1425	* of effect may be sufficient.
1411	*/	1426	*/
1412	if (MAP_DARKNESS (op->map) && (op->glow_radius != 0))	1427	if (op->map->darkness && (op->glow_radius != 0))
1413	update_all_los (op->map, op->x, op->y);	1428	update_all_los (op->map, op->x, op->y);
1414		1429
1415	/* updates flags (blocked, alive, no magic, etc) for this map space */	1430	/* updates flags (blocked, alive, no magic, etc) for this map space */
1416	update_object (op, UP_OBJ_INSERT);	1431	update_object (op, UP_OBJ_INSERT);
1417		1432
…		…
1425	* blocked() and wall() work properly), and these flags are updated by	1440	* blocked() and wall() work properly), and these flags are updated by
1426	* update_object().	1441	* update_object().
1427	*/	1442	*/
1428		1443
1429	/* if this is not the head or flag has been passed, don't check walk on status */	1444	/* if this is not the head or flag has been passed, don't check walk on status */
1430	if (!(flag & INS_NO_WALK_ON) && !op->head)	1445	if (!(flag & INS_NO_WALK_ON) && op->head_ () == op)
1431	{	1446	{
1432	if (check_move_on (op, originator))	1447	if (check_move_on (op, originator))
1433	return 0;	1448	return 0;
1434		1449
1435	/* If we are a multi part object, lets work our way through the check	1450	/* If we are a multi part object, lets work our way through the check
1436	* walk on's.	1451	* walk on's.
1437	*/	1452	*/
1438	for (tmp = op->more; tmp != NULL; tmp = tmp->more)	1453	for (object *tmp = op->more; tmp; tmp = tmp->more)
1439	if (check_move_on (tmp, originator))	1454	if (check_move_on (tmp, originator))
1440	return 0;	1455	return 0;
1441	}	1456	}
1442		1457
1443	return op;	1458	return op;
…		…
1452	{	1467	{
1453	object *tmp, *tmp1;	1468	object *tmp, *tmp1;
1454		1469
1455	/* first search for itself and remove any old instances */	1470	/* first search for itself and remove any old instances */
1456		1471
1457	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1472	for (tmp = op->ms ().bot; tmp; tmp = tmp->above)
1458	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */	1473	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */
1459	tmp->destroy ();	1474	tmp->destroy ();
1460		1475
1461	tmp1 = arch_to_object (archetype::find (arch_string));	1476	tmp1 = arch_to_object (archetype::find (arch_string));
1462		1477
1463	tmp1->x = op->x;	1478	tmp1->x = op->x;
1464	tmp1->y = op->y;	1479	tmp1->y = op->y;
1465	insert_ob_in_map (tmp1, op->map, op, 0);	1480	insert_ob_in_map (tmp1, op->map, op, 0);
		1481	}
		1482
		1483	object *
		1484	object::insert_at (object *where, object *originator, int flags)
		1485	{
		1486	return where->map->insert (this, where->x, where->y, originator, flags);
1466	}	1487	}
1467		1488
1468	/*	1489	/*
1469	* get_split_ob(ob,nr) splits up ob into two parts. The part which	1490	* get_split_ob(ob,nr) splits up ob into two parts. The part which
1470	* is returned contains nr objects, and the remaining parts contains	1491	* is returned contains nr objects, and the remaining parts contains
1471	* the rest (or is removed and freed if that number is 0).	1492	* the rest (or is removed and freed if that number is 0).
1472	* On failure, NULL is returned, and the reason put into the	1493	* On failure, NULL is returned, and the reason put into the
1473	* global static errmsg array.	1494	* global static errmsg array.
1474	*/	1495	*/
1475
1476	object *	1496	object *
1477	get_split_ob (object *orig_ob, uint32 nr)	1497	get_split_ob (object *orig_ob, uint32 nr)
1478	{	1498	{
1479	object *newob;	1499	object *newob;
1480	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);	1500	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
…		…
1511	* the amount of an object. If the amount reaches 0, the object	1531	* the amount of an object. If the amount reaches 0, the object
1512	* is subsequently removed and freed.	1532	* is subsequently removed and freed.
1513	*	1533	*
1514	* Return value: 'op' if something is left, NULL if the amount reached 0	1534	* Return value: 'op' if something is left, NULL if the amount reached 0
1515	*/	1535	*/
1516
1517	object *	1536	object *
1518	decrease_ob_nr (object *op, uint32 i)	1537	decrease_ob_nr (object *op, uint32 i)
1519	{	1538	{
1520	object *tmp;	1539	object *tmp;
1521		1540
…		…
1596		1615
1597	/*	1616	/*
1598	* add_weight(object, weight) adds the specified weight to an object,	1617	* add_weight(object, weight) adds the specified weight to an object,
1599	* and also updates how much the environment(s) is/are carrying.	1618	* and also updates how much the environment(s) is/are carrying.
1600	*/	1619	*/
1601
1602	void	1620	void
1603	add_weight (object *op, signed long weight)	1621	add_weight (object *op, signed long weight)
1604	{	1622	{
1605	while (op != NULL)	1623	while (op != NULL)
1606	{	1624	{
…		…
1621	LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);	1639	LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
1622	free (dump);	1640	free (dump);
1623	return op;	1641	return op;
1624	}	1642	}
1625		1643
1626	if (where->head)	1644	if (where->head_ () != where)
1627	{	1645	{
1628	LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n");	1646	LOG (llevError | logBacktrace, "Warning: Tried to insert object into wrong part of multipart object.\n");
1629	where = where->head;	1647	where = where->head;
1630	}	1648	}
1631		1649
1632	return where->insert (op);	1650	return where->insert (op);
1633	}	1651	}
…		…
1638	* inside the object environment.	1656	* inside the object environment.
1639	*	1657	*
1640	* The function returns now pointer to inserted item, and return value can	1658	* The function returns now pointer to inserted item, and return value can
1641	* be != op, if items are merged. -Tero	1659	* be != op, if items are merged. -Tero
1642	*/	1660	*/
1643
1644	object *	1661	object *
1645	object::insert (object *op)	1662	object::insert (object *op)
1646	{	1663	{
1647	object *tmp, *otmp;
1648
1649	if (!QUERY_FLAG (op, FLAG_REMOVED))	1664	if (!QUERY_FLAG (op, FLAG_REMOVED))
1650	op->remove ();	1665	op->remove ();
1651		1666
1652	if (op->more)	1667	if (op->more)
1653	{	1668	{
…		…
1655	return op;	1670	return op;
1656	}	1671	}
1657		1672
1658	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1673	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1659	CLEAR_FLAG (op, FLAG_REMOVED);	1674	CLEAR_FLAG (op, FLAG_REMOVED);
		1675
1660	if (op->nrof)	1676	if (op->nrof)
1661	{	1677	{
1662	for (tmp = inv; tmp != NULL; tmp = tmp->below)	1678	for (object *tmp = inv; tmp; tmp = tmp->below)
1663	if (object::can_merge (tmp, op))	1679	if (object::can_merge (tmp, op))
1664	{	1680	{
1665	/* return the original object and remove inserted object	1681	/* return the original object and remove inserted object
1666	(client needs the original object) */	1682	(client needs the original object) */
1667	tmp->nrof += op->nrof;	1683	tmp->nrof += op->nrof;
…		…
1686	add_weight (this, op->weight * op->nrof);	1702	add_weight (this, op->weight * op->nrof);
1687	}	1703	}
1688	else	1704	else
1689	add_weight (this, (op->weight + op->carrying));	1705	add_weight (this, (op->weight + op->carrying));
1690		1706
1691	otmp = this->in_player ();	1707	if (object *otmp = this->in_player ())
1692	if (otmp && otmp->contr)
1693	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1708	if (otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1694	otmp->update_stats ();	1709	otmp->update_stats ();
1695		1710
		1711	op->owner = 0; // its his/hers now. period.
1696	op->map = 0;	1712	op->map = 0;
1697	op->env = this;	1713	op->env = this;
1698	op->above = 0;	1714	op->above = 0;
1699	op->below = 0;	1715	op->below = 0;
1700	op->x = 0, op->y = 0;	1716	op->x = op->y = 0;
1701		1717
1702	/* reset the light list and los of the players on the map */	1718	/* reset the light list and los of the players on the map */
1703	if ((op->glow_radius != 0) && map)	1719	if (op->glow_radius && map)
1704	{	1720	{
1705	#ifdef DEBUG_LIGHTS	1721	#ifdef DEBUG_LIGHTS
1706	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);	1722	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1707	#endif /* DEBUG_LIGHTS */	1723	#endif /* DEBUG_LIGHTS */
1708	if (MAP_DARKNESS (map))	1724	if (map->darkness)
1709	update_all_los (map, x, y);	1725	update_all_los (map, x, y);
1710	}	1726	}
1711		1727
1712	/* Client has no idea of ordering so lets not bother ordering it here.	1728	/* Client has no idea of ordering so lets not bother ordering it here.
1713	* It sure simplifies this function...	1729	* It sure simplifies this function...
…		…
1744	*	1760	*
1745	* MSW 2001-07-08: Check all objects on space, not just those below	1761	* MSW 2001-07-08: Check all objects on space, not just those below
1746	* object being inserted. insert_ob_in_map may not put new objects	1762	* object being inserted. insert_ob_in_map may not put new objects
1747	* on top.	1763	* on top.
1748	*/	1764	*/
1749
1750	int	1765	int
1751	check_move_on (object *op, object *originator)	1766	check_move_on (object *op, object *originator)
1752	{	1767	{
1753	object *tmp;	1768	object *tmp;
1754	maptile *m = op->map;	1769	maptile *m = op->map;
…		…
1781		1796
1782	/* The objects have to be checked from top to bottom.	1797	/* The objects have to be checked from top to bottom.
1783	* Hence, we first go to the top:	1798	* Hence, we first go to the top:
1784	*/	1799	*/
1785		1800
1786	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL && tmp->above != NULL; tmp = tmp->above)	1801	for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above)
1787	{	1802	{
1788	/* Trim the search when we find the first other spell effect	1803	/* Trim the search when we find the first other spell effect
1789	* this helps performance so that if a space has 50 spell objects,	1804	* this helps performance so that if a space has 50 spell objects,
1790	* we don't need to check all of them.	1805	* we don't need to check all of them.
1791	*/	1806	*/
…		…
1809	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||	1824	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
1810	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))	1825	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1811	{	1826	{
1812		1827
1813	float	1828	float
1814	diff = tmp->move_slow_penalty * FABS (op->speed);	1829	diff = tmp->move_slow_penalty * fabs (op->speed);
1815		1830
1816	if (op->type == PLAYER)	1831	if (op->type == PLAYER)
1817	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||	1832	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||
1818	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))	1833	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))
1819	diff /= 4.0;	1834	diff /= 4.0;
…		…
1846	/*	1861	/*
1847	* present_arch(arch, map, x, y) searches for any objects with	1862	* present_arch(arch, map, x, y) searches for any objects with
1848	* a matching archetype at the given map and coordinates.	1863	* a matching archetype at the given map and coordinates.
1849	* The first matching object is returned, or NULL if none.	1864	* The first matching object is returned, or NULL if none.
1850	*/	1865	*/
1851
1852	object *	1866	object *
1853	present_arch (const archetype *at, maptile *m, int x, int y)	1867	present_arch (const archetype *at, maptile *m, int x, int y)
1854	{	1868	{
1855	object *
1856	tmp;
1857
1858	if (m == NULL || out_of_map (m, x, y))	1869	if (!m || out_of_map (m, x, y))
1859	{	1870	{
1860	LOG (llevError, "Present_arch called outside map.\n");	1871	LOG (llevError, "Present_arch called outside map.\n");
1861	return NULL;	1872	return NULL;
1862	}	1873	}
1863	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1874
		1875	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1864	if (tmp->arch == at)	1876	if (tmp->arch == at)
1865	return tmp;	1877	return tmp;
		1878
1866	return NULL;	1879	return NULL;
1867	}	1880	}
1868		1881
1869	/*	1882	/*
1870	* present(type, map, x, y) searches for any objects with	1883	* present(type, map, x, y) searches for any objects with
1871	* a matching type variable at the given map and coordinates.	1884	* a matching type variable at the given map and coordinates.
1872	* The first matching object is returned, or NULL if none.	1885	* The first matching object is returned, or NULL if none.
1873	*/	1886	*/
1874
1875	object *	1887	object *
1876	present (unsigned char type, maptile *m, int x, int y)	1888	present (unsigned char type, maptile *m, int x, int y)
1877	{	1889	{
1878	object *
1879	tmp;
1880
1881	if (out_of_map (m, x, y))	1890	if (out_of_map (m, x, y))
1882	{	1891	{
1883	LOG (llevError, "Present called outside map.\n");	1892	LOG (llevError, "Present called outside map.\n");
1884	return NULL;	1893	return NULL;
1885	}	1894	}
1886	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1895
		1896	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1887	if (tmp->type == type)	1897	if (tmp->type == type)
1888	return tmp;	1898	return tmp;
		1899
1889	return NULL;	1900	return NULL;
1890	}	1901	}
1891		1902
1892	/*	1903	/*
1893	* present_in_ob(type, object) searches for any objects with	1904	* present_in_ob(type, object) searches for any objects with
1894	* a matching type variable in the inventory of the given object.	1905	* a matching type variable in the inventory of the given object.
1895	* The first matching object is returned, or NULL if none.	1906	* The first matching object is returned, or NULL if none.
1896	*/	1907	*/
1897
1898	object *	1908	object *
1899	present_in_ob (unsigned char type, const object *op)	1909	present_in_ob (unsigned char type, const object *op)
1900	{	1910	{
1901	object *
1902	tmp;
1903
1904	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1911	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
1905	if (tmp->type == type)	1912	if (tmp->type == type)
1906	return tmp;	1913	return tmp;
		1914
1907	return NULL;	1915	return NULL;
1908	}	1916	}
1909		1917
1910	/*	1918	/*
1911	* present_in_ob (type, str, object) searches for any objects with	1919	* present_in_ob (type, str, object) searches for any objects with
…		…
1922	* to be unique.	1930	* to be unique.
1923	*/	1931	*/
1924	object *	1932	object *
1925	present_in_ob_by_name (int type, const char *str, const object *op)	1933	present_in_ob_by_name (int type, const char *str, const object *op)
1926	{	1934	{
1927	object *tmp;
1928
1929	for (tmp = op->inv; tmp; tmp = tmp->below)	1935	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1930	if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name)))	1936	if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name)))
1931	return tmp;	1937	return tmp;
1932		1938
1933	return 0;	1939	return 0;
1934	}	1940	}
…		…
1952	* activate recursively a flag on an object inventory	1958	* activate recursively a flag on an object inventory
1953	*/	1959	*/
1954	void	1960	void
1955	flag_inv (object *op, int flag)	1961	flag_inv (object *op, int flag)
1956	{	1962	{
1957	if (op->inv)
1958	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)	1963	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1959	{	1964	{
1960	SET_FLAG (tmp, flag);	1965	SET_FLAG (tmp, flag);
1961	flag_inv (tmp, flag);	1966	flag_inv (tmp, flag);
1962	}	1967	}
1963	}	1968	}
1964		1969
1965	/*	1970	/*
1966	* deactivate recursively a flag on an object inventory	1971	* deactivate recursively a flag on an object inventory
1967	*/	1972	*/
1968	void	1973	void
1969	unflag_inv (object *op, int flag)	1974	unflag_inv (object *op, int flag)
1970	{	1975	{
1971	if (op->inv)
1972	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)	1976	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1973	{	1977	{
1974	CLEAR_FLAG (tmp, flag);	1978	CLEAR_FLAG (tmp, flag);
1975	unflag_inv (tmp, flag);	1979	unflag_inv (tmp, flag);
1976	}	1980	}
1977	}
1978
1979	/*
1980	* set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in
1981	* all it's inventory (recursively).
1982	* If checksums are used, a player will get set_cheat called for
1983	* him/her-self and all object carried by a call to this function.
1984	*/
1985	void
1986	set_cheat (object *op)
1987	{
1988	SET_FLAG (op, FLAG_WAS_WIZ);
1989	flag_inv (op, FLAG_WAS_WIZ);
1990	}	1981	}
1991		1982
1992	/*	1983	/*
1993	* find_free_spot(object, map, x, y, start, stop) will search for	1984	* find_free_spot(object, map, x, y, start, stop) will search for
1994	* a spot at the given map and coordinates which will be able to contain	1985	* a spot at the given map and coordinates which will be able to contain
…		…
1996	* to search (see the freearr_x/y[] definition).	1987	* to search (see the freearr_x/y[] definition).
1997	* It returns a random choice among the alternatives found.	1988	* It returns a random choice among the alternatives found.
1998	* start and stop are where to start relative to the free_arr array (1,9	1989	* start and stop are where to start relative to the free_arr array (1,9
1999	* does all 4 immediate directions). This returns the index into the	1990	* does all 4 immediate directions). This returns the index into the
2000	* array of the free spot, -1 if no spot available (dir 0 = x,y)	1991	* array of the free spot, -1 if no spot available (dir 0 = x,y)
2001	* Note - this only checks to see if there is space for the head of the
2002	* object - if it is a multispace object, this should be called for all
2003	* pieces.
2004	* Note2: This function does correctly handle tiled maps, but does not	1992	* Note: This function does correctly handle tiled maps, but does not
2005	* inform the caller. However, insert_ob_in_map will update as	1993	* inform the caller. However, insert_ob_in_map will update as
2006	* necessary, so the caller shouldn't need to do any special work.	1994	* necessary, so the caller shouldn't need to do any special work.
2007	* Note - updated to take an object instead of archetype - this is necessary	1995	* Note - updated to take an object instead of archetype - this is necessary
2008	* because arch_blocked (now ob_blocked) needs to know the movement type	1996	* because arch_blocked (now ob_blocked) needs to know the movement type
2009	* to know if the space in question will block the object. We can't use	1997	* to know if the space in question will block the object. We can't use
…		…
2011	* customized, changed states, etc.	1999	* customized, changed states, etc.
2012	*/	2000	*/
2013	int	2001	int
2014	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)	2002	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2015	{	2003	{
		2004	int altern[SIZEOFFREE];
2016	int index = 0, flag;	2005	int index = 0, flag;
2017	int altern[SIZEOFFREE];
2018		2006
2019	for (int i = start; i < stop; i++)	2007	for (int i = start; i < stop; i++)
2020	{	2008	{
2021	flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]);	2009	mapxy pos (m, x, y); pos.move (i);
2022	if (!flag)	2010
		2011	if (!pos.normalise ())
		2012	continue;
		2013
		2014	mapspace &ms = *pos;
		2015
		2016	if (ms.flags () & P_IS_ALIVE)
		2017	continue;
		2018
		2019	/* However, often
		2020	* ob doesn't have any move type (when used to place exits)
		2021	* so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.
		2022	*/
		2023	if (ob->move_type == 0 && ms.move_block != MOVE_ALL)
		2024	{
2023	altern [index++] = i;	2025	altern [index++] = i;
		2026	continue;
		2027	}
2024		2028
2025	/* Basically, if we find a wall on a space, we cut down the search size.	2029	/* Basically, if we find a wall on a space, we cut down the search size.
2026	* In this way, we won't return spaces that are on another side of a wall.	2030	* In this way, we won't return spaces that are on another side of a wall.
2027	* This mostly work, but it cuts down the search size in all directions -	2031	* This mostly work, but it cuts down the search size in all directions -
2028	* if the space being examined only has a wall to the north and empty	2032	* if the space being examined only has a wall to the north and empty
2029	* spaces in all the other directions, this will reduce the search space	2033	* spaces in all the other directions, this will reduce the search space
2030	* to only the spaces immediately surrounding the target area, and	2034	* to only the spaces immediately surrounding the target area, and
2031	* won't look 2 spaces south of the target space.	2035	* won't look 2 spaces south of the target space.
2032	*/	2036	*/
2033	else if ((flag & P_NO_PASS) && maxfree[i] < stop)	2037	if (ms.move_block == MOVE_ALL && maxfree[i] < stop)
		2038	{
2034	stop = maxfree[i];	2039	stop = maxfree[i];
		2040	continue;
		2041	}
		2042
		2043	/* Note it is intentional that we check ob - the movement type of the
		2044	* head of the object should correspond for the entire object.
		2045	*/
		2046	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
		2047	continue;
		2048
		2049	if (ob->blocked (m, pos.x, pos.y))
		2050	continue;
		2051
		2052	altern [index++] = i;
2035	}	2053	}
2036		2054
2037	if (!index)	2055	if (!index)
2038	return -1;	2056	return -1;
2039		2057
2040	return altern[RANDOM () % index];	2058	return altern [rndm (index)];
2041	}	2059	}
2042		2060
2043	/*	2061	/*
2044	* find_first_free_spot(archetype, maptile, x, y) works like	2062	* find_first_free_spot(archetype, maptile, x, y) works like
2045	* find_free_spot(), but it will search max number of squares.	2063	* find_free_spot(), but it will search max number of squares.
…		…
2048	*/	2066	*/
2049	int	2067	int
2050	find_first_free_spot (const object *ob, maptile *m, int x, int y)	2068	find_first_free_spot (const object *ob, maptile *m, int x, int y)
2051	{	2069	{
2052	for (int i = 0; i < SIZEOFFREE; i++)	2070	for (int i = 0; i < SIZEOFFREE; i++)
2053	if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]))	2071	if (!ob->blocked (m, x + freearr_x[i], y + freearr_y[i]))
2054	return i;	2072	return i;
2055		2073
2056	return -1;	2074	return -1;
2057	}	2075	}
2058		2076
…		…
2066	{	2084	{
2067	arr += begin;	2085	arr += begin;
2068	end -= begin;	2086	end -= begin;
2069		2087
2070	while (--end)	2088	while (--end)
2071	swap (arr [end], arr [RANDOM () % (end + 1)]);	2089	swap (arr [end], arr [rndm (end + 1)]);
2072	}	2090	}
2073		2091
2074	/* new function to make monster searching more efficient, and effective!	2092	/* new function to make monster searching more efficient, and effective!
2075	* This basically returns a randomized array (in the passed pointer) of	2093	* This basically returns a randomized array (in the passed pointer) of
2076	* the spaces to find monsters. In this way, it won't always look for	2094	* the spaces to find monsters. In this way, it won't always look for
…		…
2112	object *tmp;	2130	object *tmp;
2113	maptile *mp;	2131	maptile *mp;
2114		2132
2115	MoveType blocked, move_type;	2133	MoveType blocked, move_type;
2116		2134
2117	if (exclude && exclude->head)	2135	if (exclude && exclude->head_ () != exclude)
2118	{	2136	{
2119	exclude = exclude->head;	2137	exclude = exclude->head;
2120	move_type = exclude->move_type;	2138	move_type = exclude->move_type;
2121	}	2139	}
2122	else	2140	else
…		…
2143		2161
2144	if ((move_type & blocked) == move_type)	2162	if ((move_type & blocked) == move_type)
2145	max = maxfree[i];	2163	max = maxfree[i];
2146	else if (mflags & P_IS_ALIVE)	2164	else if (mflags & P_IS_ALIVE)
2147	{	2165	{
2148	for (tmp = ms.bottom; tmp; tmp = tmp->above)	2166	for (tmp = ms.bot; tmp; tmp = tmp->above)
2149	if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)	2167	if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)
2150	&& (tmp != exclude || (tmp->head && tmp->head != exclude)))	2168	&& (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2151	break;	2169	break;
2152		2170
2153	if (tmp)	2171	if (tmp)
2154	return freedir[i];	2172	return freedir[i];
2155	}	2173	}
…		…
2210		2228
2211	return 3;	2229	return 3;
2212	}	2230	}
2213		2231
2214	/*	2232	/*
2215	* absdir(int): Returns a number between 1 and 8, which represent
2216	* the "absolute" direction of a number (it actually takes care of
2217	* "overflow" in previous calculations of a direction).
2218	*/
2219
2220	int
2221	absdir (int d)
2222	{
2223	while (d < 1)
2224	d += 8;
2225
2226	while (d > 8)
2227	d -= 8;
2228
2229	return d;
2230	}
2231
2232	/*
2233	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is	2233	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is
2234	* between two directions (which are expected to be absolute (see absdir())	2234	* between two directions (which are expected to be absolute (see absdir())
2235	*/	2235	*/
2236
2237	int	2236	int
2238	dirdiff (int dir1, int dir2)	2237	dirdiff (int dir1, int dir2)
2239	{	2238	{
2240	int d;	2239	int d;
2241		2240
…		…
2354	* Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause	2353	* Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause
2355	* core dumps if they do.	2354	* core dumps if they do.
2356	*	2355	*
2357	* Add a check so we can't pick up invisible objects (0.93.8)	2356	* Add a check so we can't pick up invisible objects (0.93.8)
2358	*/	2357	*/
2359
2360	int	2358	int
2361	can_pick (const object *who, const object *item)	2359	can_pick (const object *who, const object *item)
2362	{	2360	{
2363	return /*QUERY_FLAG(who,FLAG_WIZ)|| */	2361	return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2364	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&	2362	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
…		…
2369	* create clone from object to another	2367	* create clone from object to another
2370	*/	2368	*/
2371	object *	2369	object *
2372	object_create_clone (object *asrc)	2370	object_create_clone (object *asrc)
2373	{	2371	{
2374	object *dst = 0, *tmp, *src, *part, *prev, *item;	2372	object *dst = 0, *tmp, *src, *prev, *item;
2375		2373
2376	if (!asrc)	2374	if (!asrc)
2377	return 0;	2375	return 0;
2378		2376
2379	src = asrc;
2380	if (src->head)
2381	src = src->head;	2377	src = asrc->head_ ();
2382		2378
2383	prev = 0;	2379	prev = 0;
2384	for (part = src; part; part = part->more)	2380	for (object *part = src; part; part = part->more)
2385	{	2381	{
2386	tmp = part->clone ();	2382	tmp = part->clone ();
2387	tmp->x -= src->x;	2383	tmp->x -= src->x;
2388	tmp->y -= src->y;	2384	tmp->y -= src->y;
2389		2385
…		…
2405		2401
2406	for (item = src->inv; item; item = item->below)	2402	for (item = src->inv; item; item = item->below)
2407	insert_ob_in_ob (object_create_clone (item), dst);	2403	insert_ob_in_ob (object_create_clone (item), dst);
2408		2404
2409	return dst;	2405	return dst;
2410	}
2411
2412	/* GROS - Creates an object using a string representing its content. */
2413	/* Basically, we save the content of the string to a temp file, then call */
2414	/* load_object on it. I admit it is a highly inefficient way to make things, */
2415	/* but it was simple to make and allows reusing the load_object function. */
2416	/* Remember not to use load_object_str in a time-critical situation. */
2417	/* Also remember that multiparts objects are not supported for now. */
2418	object *
2419	load_object_str (const char *obstr)
2420	{
2421	object *op;
2422	char filename[MAX_BUF];
2423
2424	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2425
2426	FILE *tempfile = fopen (filename, "w");
2427
2428	if (tempfile == NULL)
2429	{
2430	LOG (llevError, "Error - Unable to access load object temp file\n");
2431	return NULL;
2432	}
2433
2434	fprintf (tempfile, obstr);
2435	fclose (tempfile);
2436
2437	op = object::create ();
2438
2439	object_thawer thawer (filename);
2440
2441	if (thawer)
2442	load_object (thawer, op, 0);
2443
2444	LOG (llevDebug, " load str completed, object=%s\n", &op->name);
2445	CLEAR_FLAG (op, FLAG_REMOVED);
2446
2447	return op;
2448	}	2406	}
2449		2407
2450	/* This returns the first object in who's inventory that	2408	/* This returns the first object in who's inventory that
2451	* has the same type and subtype match.	2409	* has the same type and subtype match.
2452	* returns NULL if no match.	2410	* returns NULL if no match.
…		…
2507	if (link->key == canonical_key)	2465	if (link->key == canonical_key)
2508	return link->value;	2466	return link->value;
2509		2467
2510	return 0;	2468	return 0;
2511	}	2469	}
2512
2513		2470
2514	/*	2471	/*
2515	* Updates the canonical_key in op to value.	2472	* Updates the canonical_key in op to value.
2516	*	2473	*
2517	* canonical_key is a shared string (value doesn't have to be).	2474	* canonical_key is a shared string (value doesn't have to be).
…		…
2541	/* Basically, if the archetype has this key set,	2498	/* Basically, if the archetype has this key set,
2542	* we need to store the null value so when we save	2499	* we need to store the null value so when we save
2543	* it, we save the empty value so that when we load,	2500	* it, we save the empty value so that when we load,
2544	* we get this value back again.	2501	* we get this value back again.
2545	*/	2502	*/
2546	if (get_ob_key_link (&op->arch->clone, canonical_key))	2503	if (get_ob_key_link (op->arch, canonical_key))
2547	field->value = 0;	2504	field->value = 0;
2548	else	2505	else
2549	{	2506	{
2550	if (last)	2507	if (last)
2551	last->next = field->next;	2508	last->next = field->next;
…		…
2620	}	2577	}
2621	else	2578	else
2622	item = item->env;	2579	item = item->env;
2623	}	2580	}
2624		2581
		2582	const char *
		2583	object::flag_desc (char *desc, int len) const
		2584	{
		2585	char *p = desc;
		2586	bool first = true;
		2587
		2588	*p = 0;
		2589
		2590	for (int i = 0; i < NUM_FLAGS; i++)
		2591	{
		2592	if (len <= 10) // magic constant!
		2593	{
		2594	snprintf (p, len, ",...");
		2595	break;
		2596	}
		2597
		2598	if (flag [i])
		2599	{
		2600	int cnt = snprintf (p, len, "%s%d", first ? "" : ",", i);
		2601	len -= cnt;
		2602	p += cnt;
		2603	first = false;
		2604	}
		2605	}
		2606
		2607	return desc;
		2608	}
		2609
2625	// return a suitable string describing an objetc in enough detail to find it	2610	// return a suitable string describing an object in enough detail to find it
2626	const char *	2611	const char *
2627	object::debug_desc (char *info) const	2612	object::debug_desc (char *info) const
2628	{	2613	{
		2614	char flagdesc[512];
2629	char info2[256 * 3];	2615	char info2[256 * 4];
2630	char *p = info;	2616	char *p = info;
2631		2617
2632	p += snprintf (p, 256, "%d=\"%s%s%s\"",	2618	p += snprintf (p, 512, "{cnt:%d,uuid:<1.%" PRIx64 ">,name:\"%s\"%s%s,flags:[%s],type:%d}",
2633	count,	2619	count, uuid.seq,
2634	&name,	2620	&name,
2635	title ? " " : "",	2621	title ? "\",title:\"" : "",
2636	title ? (const char *)title : "");	2622	title ? (const char *)title : "",
		2623	flag_desc (flagdesc, 512), type);
2637		2624
2638	if (env)	2625	if (!this->flag[FLAG_REMOVED] && env)
2639	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2626	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2640		2627
2641	if (map)	2628	if (map)
2642	p += snprintf (p, 256, "(on %s@%d+%d)", map->path, x, y);	2629	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2643		2630
2644	return info;	2631	return info;
2645	}	2632	}
2646		2633
2647	const char *	2634	const char *
2648	object::debug_desc () const	2635	object::debug_desc () const
2649	{	2636	{
2650	static char info[256 * 3];	2637	static char info[3][256 * 4];
		2638	static int info_idx;
		2639
2651	return debug_desc (info);	2640	return debug_desc (info [++info_idx % 3]);
2652	}	2641	}
2653		2642
		2643	struct region *
		2644	object::region () const
		2645	{
		2646	return map ? map->region (x, y)
		2647	: region::default_region ();
		2648	}
		2649
		2650	const materialtype_t *
		2651	object::dominant_material () const
		2652	{
		2653	if (materialtype_t *mt = name_to_material (materialname))
		2654	return mt;
		2655
		2656	return name_to_material (shstr_unknown);
		2657	}
		2658
		2659	void
		2660	object::open_container (object *new_container)
		2661	{
		2662	if (container == new_container)
		2663	return;
		2664
		2665	if (object *old_container = container)
		2666	{
		2667	if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
		2668	return;
		2669
		2670	#if 0
		2671	// remove the "Close old_container" object.
		2672	if (object *closer = old_container->inv)
		2673	if (closer->type == CLOSE_CON)
		2674	closer->destroy ();
		2675	#endif
		2676
		2677	old_container->flag [FLAG_APPLIED] = 0;
		2678	container = 0;
		2679
		2680	esrv_update_item (UPD_FLAGS, this, old_container);
		2681	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
		2682	play_sound (sound_find ("chest_close"));
		2683	}
		2684
		2685	if (new_container)
		2686	{
		2687	if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))
		2688	return;
		2689
		2690	// TODO: this does not seem to serve any purpose anymore?
		2691	#if 0
		2692	// insert the "Close Container" object.
		2693	if (archetype *closer = new_container->other_arch)
		2694	{
		2695	object *closer = arch_to_object (new_container->other_arch);
		2696	closer->flag [FLAG_NO_MAP_SAVE] = 1;
		2697	new_container->insert (closer);
		2698	}
		2699	#endif
		2700
		2701	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));
		2702
		2703	new_container->flag [FLAG_APPLIED] = 1;
		2704	container = new_container;
		2705
		2706	esrv_update_item (UPD_FLAGS, this, new_container);
		2707	esrv_send_inventory (this, new_container);
		2708	play_sound (sound_find ("chest_open"));
		2709	}
		2710	}
		2711
		2712	object *
		2713	object::force_find (const shstr name)
		2714	{
		2715	/* cycle through his inventory to look for the MARK we want to
		2716	* place
		2717	*/
		2718	for (object *tmp = inv; tmp; tmp = tmp->below)
		2719	if (tmp->type == FORCE && tmp->slaying == name)
		2720	return splay (tmp);
		2721
		2722	return 0;
		2723	}
		2724
		2725	void
		2726	object::force_add (const shstr name, int duration)
		2727	{
		2728	if (object *force = force_find (name))
		2729	force->destroy ();
		2730
		2731	object *force = get_archetype (FORCE_NAME);
		2732
		2733	force->slaying = name;
		2734	force->stats.food = 1;
		2735	force->speed_left = -1.f;
		2736
		2737	force->set_speed (duration ? 1.f / duration : 0.f);
		2738	force->flag [FLAG_IS_USED_UP] = true;
		2739	force->flag [FLAG_APPLIED] = true;
		2740
		2741	insert (force);
		2742	}
		2743
		2744	void
		2745	object::play_sound (faceidx sound) const
		2746	{
		2747	if (!sound)
		2748	return;
		2749
		2750	if (flag [FLAG_REMOVED])
		2751	return;
		2752
		2753	if (env)
		2754	{
		2755	if (object *pl = in_player ())
		2756	pl->contr->play_sound (sound);
		2757	}
		2758	else
		2759	map->play_sound (sound, x, y);
		2760	}
		2761

Diff Legend

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