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.106 by root, Wed Jan 3 20:08:04 2007 UTC vs.
Revision 1.202 by root, Thu Apr 10 15:35:15 2008 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	UUID UUID::cur;
38	static UUID uuid;
39	const uint64 UUID_SKIP = 1<<19;	39	static const uint64 UUID_SKIP = 1<<19;
40		40
41	object *active_objects; /* List of active objects that need to be processed */	41	objectvec objects;
		42	activevec actives;
42		43
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,	44	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	45	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	};	46	};
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,	47	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,
…		…
68	{	69	{
69	LOG (llevError, "ERROR: cannot open %s for writing, unable to write UUID!\n", filename2);	70	LOG (llevError, "ERROR: cannot open %s for writing, unable to write UUID!\n", filename2);
70	return;	71	return;
71	}	72	}
72		73
73	fprintf (fp, "<1,%llx>\n", (unsigned long long)uuid.seq + UUID_SKIP * 2);	74	fprintf (fp, "<1,%llx>\n", (unsigned long long)UUID::cur.seq + UUID_SKIP * 2);
74	fclose (fp);	75	fclose (fp);
75	rename (filename2, filename1);	76	rename (filename2, filename1);
76	}	77	}
77		78
78	static void	79	static void
…		…
87	if (!(fp = fopen (filename, "r")))	88	if (!(fp = fopen (filename, "r")))
88	{	89	{
89	if (errno == ENOENT)	90	if (errno == ENOENT)
90	{	91	{
91	LOG (llevInfo, "RESET uid to 1\n");	92	LOG (llevInfo, "RESET uid to 1\n");
92	uuid.seq = 0;	93	UUID::cur.seq = 0;
93	write_uuid ();	94	write_uuid ();
94	return;	95	return;
95	}	96	}
96		97
97	LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);	98	LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);
…		…
104	{	105	{
105	LOG (llevError, "FATAL: error reading uid from %s!\n", filename);	106	LOG (llevError, "FATAL: error reading uid from %s!\n", filename);
106	_exit (1);	107	_exit (1);
107	}	108	}
108		109
109	uuid.seq = uid;	110	UUID::cur.seq = uid;
110	write_uuid ();	111	write_uuid ();
111	LOG (llevDebug, "read UID: %" PRId64 "\n", uid);	112	LOG (llevDebug, "read UID: %" PRId64 "\n", uid);
112	fclose (fp);	113	fclose (fp);
113	}	114	}
114		115
115	UUID	116	UUID
116	gen_uuid ()	117	UUID::gen ()
117	{	118	{
118	UUID uid;	119	UUID uid;
119		120
120	uid.seq = ++uuid.seq;	121	uid.seq = ++cur.seq;
121		122
122	if (!(uuid.seq & (UUID_SKIP - 1)))	123	if (!(cur.seq & (UUID_SKIP - 1)))
123	write_uuid ();	124	write_uuid ();
124		125
125	return uid;	126	return uid;
126	}	127	}
127		128
128	void	129	void
129	init_uuid ()	130	UUID::init ()
130	{	131	{
131	read_uuid ();	132	read_uuid ();
132	}	133	}
133		134
134	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */	135	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */
…		…
252	/* This is really a spellbook check - really, we should	253	/* This is really a spellbook check - really, we should
253	* check all objects in the inventory.	254	* check all objects in the inventory.
254	*/	255	*/
255	if (ob1->inv || ob2->inv)	256	if (ob1->inv || ob2->inv)
256	{	257	{
257	/* if one object has inventory but the other doesn't, not equiv */	258	if (!(ob1->inv && ob2->inv))
258	if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv))	259	return 0; /* inventories differ in length */
259	return 0;
260		260
261	/* Now check to see if the two inventory objects could merge */	261	if (ob1->inv->below || ob2->inv->below)
		262	return 0; /* more than one object in inv */
		263
262	if (!object::can_merge (ob1->inv, ob2->inv))	264	if (!object::can_merge (ob1->inv, ob2->inv))
263	return 0;	265	return 0; /* inventory objexts differ */
264		266
265	/* inventory ok - still need to check rest of this object to see	267	/* inventory ok - still need to check rest of this object to see
266	* if it is valid.	268	* if it is valid.
267	*/	269	*/
268	}	270	}
…		…
297	return 0;	299	return 0;
298	else if (!compare_ob_value_lists (ob1, ob2))	300	else if (!compare_ob_value_lists (ob1, ob2))
299	return 0;	301	return 0;
300	}	302	}
301		303
302	//TODO: generate an event or call into perl for additional checks
303	if (ob1->self || ob2->self)	304	if (ob1->self || ob2->self)
304	{	305	{
305	ob1->optimise ();	306	ob1->optimise ();
306	ob2->optimise ();	307	ob2->optimise ();
307		308
308	if (ob1->self || ob2->self)	309	if (ob1->self || ob2->self)
		310	{
		311	int k1 = ob1->self ? HvTOTALKEYS (ob1->self) : 0;
		312	int k2 = ob2->self ? HvTOTALKEYS (ob2->self) : 0;
		313
		314	if (k1 != k2)
309	return 0;	315	return 0;
		316	else if (k1 == 0)
		317	return 1;
		318	else if (!cfperl_can_merge (ob1, ob2))
		319	return 0;
		320	}
310	}	321	}
311		322
312	/* Everything passes, must be OK. */	323	/* Everything passes, must be OK. */
313	return 1;	324	return 1;
314	}	325	}
…		…
322	sum_weight (object *op)	333	sum_weight (object *op)
323	{	334	{
324	long sum;	335	long sum;
325	object *inv;	336	object *inv;
326		337
327	for (sum = 0, inv = op->inv; inv != NULL; inv = inv->below)	338	for (sum = 0, inv = op->inv; inv; inv = inv->below)
328	{	339	{
329	if (inv->inv)	340	if (inv->inv)
330	sum_weight (inv);	341	sum_weight (inv);
		342
331	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);	343	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);
332	}	344	}
333		345
334	if (op->type == CONTAINER && op->stats.Str)	346	if (op->type == CONTAINER && op->stats.Str)
335	sum = (sum * (100 - op->stats.Str)) / 100;	347	sum = (sum * (100 - op->stats.Str)) / 100;
…		…
355	/*	367	/*
356	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.	368	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
357	* Some error messages.	369	* Some error messages.
358	* The result of the dump is stored in the static global errmsg array.	370	* The result of the dump is stored in the static global errmsg array.
359	*/	371	*/
360
361	char *	372	char *
362	dump_object (object *op)	373	dump_object (object *op)
363	{	374	{
364	if (!op)	375	if (!op)
365	return strdup ("[NULLOBJ]");	376	return strdup ("[NULLOBJ]");
366		377
367	object_freezer freezer;	378	object_freezer freezer;
368	save_object (freezer, op, 1);	379	op->write (freezer);
369	return freezer.as_string ();	380	return freezer.as_string ();
370	}	381	}
371		382
372	/*	383	/*
373	* get_nearest_part(multi-object, object 2) returns the part of the	384	* get_nearest_part(multi-object, object 2) returns the part of the
374	* multi-object 1 which is closest to the second object.	385	* multi-object 1 which is closest to the second object.
375	* If it's not a multi-object, it is returned.	386	* If it's not a multi-object, it is returned.
376	*/	387	*/
377
378	object *	388	object *
379	get_nearest_part (object *op, const object *pl)	389	get_nearest_part (object *op, const object *pl)
380	{	390	{
381	object *tmp, *closest;	391	object *tmp, *closest;
382	int last_dist, i;	392	int last_dist, i;
…		…
390	}	400	}
391		401
392	/*	402	/*
393	* Returns the object which has the count-variable equal to the argument.	403	* Returns the object which has the count-variable equal to the argument.
394	*/	404	*/
395
396	object *	405	object *
397	find_object (tag_t i)	406	find_object (tag_t i)
398	{	407	{
399	for (object *op = object::first; op; op = op->next)	408	for_all_objects (op)
400	if (op->count == i)	409	if (op->count == i)
401	return op;	410	return op;
402		411
403	return 0;	412	return 0;
404	}	413	}
405		414
406	/*	415	/*
407	* Returns the first object which has a name equal to the argument.	416	* Returns the first object which has a name equal to the argument.
408	* Used only by the patch command, but not all that useful.	417	* Used only by the patch command, but not all that useful.
409	* Enables features like "patch <name-of-other-player> food 999"	418	* Enables features like "patch <name-of-other-player> food 999"
410	*/	419	*/
411
412	object *	420	object *
413	find_object_name (const char *str)	421	find_object_name (const char *str)
414	{	422	{
415	shstr_cmp str_ (str);	423	shstr_cmp str_ (str);
416	object *op;	424	object *op;
417		425
418	for (op = object::first; op != NULL; op = op->next)	426	for_all_objects (op)
419	if (op->name == str_)	427	if (op->name == str_)
420	break;	428	break;
421		429
422	return op;	430	return op;
423	}	431	}
424		432
425	void
426	free_all_object_data ()
427	{
428	LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);
429	}
430
431	/*	433	/*
432	* Sets the owner and sets the skill and exp pointers to owner's current	434	* Sets the owner and sets the skill and exp pointers to owner's current
433	* skill and experience objects.	435	* skill and experience objects.
		436	* ACTUALLY NO! investigate! TODO
434	*/	437	*/
435	void	438	void
436	object::set_owner (object *owner)	439	object::set_owner (object *owner)
437	{	440	{
		441	// allow objects which own objects
438	if (!owner)	442	if (owner)
439	return;
440
441	/* next line added to allow objects which own objects */
442	/* Add a check for ownercounts in here, as I got into an endless loop
443	* with the fireball owning a poison cloud which then owned the
444	* fireball. I believe that was caused by one of the objects getting
445	* freed and then another object replacing it. Since the ownercounts
446	* didn't match, this check is valid and I believe that cause is valid.
447	*/
448	while (owner->owner)	443	while (owner->owner)
449	owner = owner->owner;	444	owner = owner->owner;
		445
		446	if (flag [FLAG_FREED])
		447	{
		448	LOG (llevError | logBacktrace, "tried to set owner of %s to %s\n", debug_desc (), owner->debug_desc ());
		449	return;
		450	}
450		451
451	this->owner = owner;	452	this->owner = owner;
		453	}
		454
		455	int
		456	object::slottype () const
		457	{
		458	if (type == SKILL)
		459	{
		460	if (IS_COMBAT_SKILL (subtype)) return slot_combat;
		461	if (IS_RANGED_SKILL (subtype)) return slot_ranged;
		462	}
		463	else
		464	{
		465	if (slot [body_combat].info) return slot_combat;
		466	if (slot [body_range ].info) return slot_ranged;
		467	}
		468
		469	return slot_none;
		470	}
		471
		472	bool
		473	object::change_weapon (object *ob)
		474	{
		475	if (current_weapon == ob)
		476	return true;
		477
		478	if (chosen_skill)
		479	chosen_skill->flag [FLAG_APPLIED] = false;
		480
		481	current_weapon = ob;
		482	chosen_skill = !ob || ob->type == SKILL ? ob : find_skill_by_name (this, ob->skill);
		483
		484	if (chosen_skill)
		485	chosen_skill->flag [FLAG_APPLIED] = true;
		486
		487	update_stats ();
		488
		489	if (ob)
		490	{
		491	// now check wether any body locations became invalid, in which case
		492	// we cannot apply the weapon at the moment.
		493	for (int i = 0; i < NUM_BODY_LOCATIONS; ++i)
		494	if (slot[i].used < 0)
		495	{
		496	current_weapon = chosen_skill = 0;
		497	update_stats ();
		498
		499	new_draw_info_format (NDI_UNIQUE, 0, this,
		500	"You try to balance all your items at once, "
		501	"but the %s is just too much for your body. "
		502	"[You need to unapply some items first.]", &ob->name);
		503	return false;
		504	}
		505
		506	//new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);
		507	}
		508	else
		509	;//new_draw_info_format (NDI_UNIQUE, 0, this, "You unwield your weapons.");
		510
		511	if (ob && !ob->flag [FLAG_APPLIED] && ob->type != SPELL)
		512	{
		513	LOG (llevError | logBacktrace, "%s changed to unapplied weapon %s",
		514	&name, ob->debug_desc ());
		515	return false;
		516	}
		517
		518	return true;
452	}	519	}
453		520
454	/* Zero the key_values on op, decrementing the shared-string	521	/* Zero the key_values on op, decrementing the shared-string
455	* refcounts and freeing the links.	522	* refcounts and freeing the links.
456	*/	523	*/
457	static void	524	static void
458	free_key_values (object *op)	525	free_key_values (object *op)
459	{	526	{
460	for (key_value *i = op->key_values; i != 0;)	527	for (key_value *i = op->key_values; i; )
461	{	528	{
462	key_value *next = i->next;	529	key_value *next = i->next;
463	delete i;	530	delete i;
464		531
465	i = next;	532	i = next;
466	}	533	}
467		534
468	op->key_values = 0;	535	op->key_values = 0;
469	}	536	}
470		537
471	/*	538	object &
472	* copy_to first frees everything allocated by the dst object,	539	object::operator =(const object &src)
473	* and then copies the contents of itself into the second
474	* object, allocating what needs to be allocated. Basically, any
475	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
476	* if the first object is freed, the pointers in the new object
477	* will point at garbage.
478	*/
479	void
480	object::copy_to (object *dst)
481	{	540	{
482	bool is_freed = QUERY_FLAG (dst, FLAG_FREED);	541	bool is_freed = flag [FLAG_FREED];
483	bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED);	542	bool is_removed = flag [FLAG_REMOVED];
484		543
485	*(object_copy *)dst = *this;	544	*(object_copy *)this = src;
486		545
487	if (is_freed)	546	flag [FLAG_FREED] = is_freed;
488	SET_FLAG (dst, FLAG_FREED);	547	flag [FLAG_REMOVED] = is_removed;
489
490	if (is_removed)
491	SET_FLAG (dst, FLAG_REMOVED);
492
493	if (speed < 0)
494	dst->speed_left = speed_left - RANDOM () % 200 / 100.0;
495		548
496	/* Copy over key_values, if any. */	549	/* Copy over key_values, if any. */
497	if (key_values)	550	if (src.key_values)
498	{	551	{
499	key_value *tail = 0;	552	key_value *tail = 0;
500	key_value *i;
501
502	dst->key_values = 0;	553	key_values = 0;
503		554
504	for (i = key_values; i; i = i->next)	555	for (key_value *i = src.key_values; i; i = i->next)
505	{	556	{
506	key_value *new_link = new key_value;	557	key_value *new_link = new key_value;
507		558
508	new_link->next = 0;	559	new_link->next = 0;
509	new_link->key = i->key;	560	new_link->key = i->key;
510	new_link->value = i->value;	561	new_link->value = i->value;
511		562
512	/* Try and be clever here, too. */	563	/* Try and be clever here, too. */
513	if (!dst->key_values)	564	if (!key_values)
514	{	565	{
515	dst->key_values = new_link;	566	key_values = new_link;
516	tail = new_link;	567	tail = new_link;
517	}	568	}
518	else	569	else
519	{	570	{
520	tail->next = new_link;	571	tail->next = new_link;
521	tail = new_link;	572	tail = new_link;
522	}	573	}
523	}	574	}
524	}	575	}
		576	}
		577
		578	/*
		579	* copy_to first frees everything allocated by the dst object,
		580	* and then copies the contents of itself into the second
		581	* object, allocating what needs to be allocated. Basically, any
		582	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
		583	* if the first object is freed, the pointers in the new object
		584	* will point at garbage.
		585	*/
		586	void
		587	object::copy_to (object *dst)
		588	{
		589	*dst = *this;
		590
		591	if (speed < 0)
		592	dst->speed_left -= rndm ();
525		593
526	dst->set_speed (dst->speed);	594	dst->set_speed (dst->speed);
		595	}
		596
		597	void
		598	object::instantiate ()
		599	{
		600	if (!uuid.seq) // HACK
		601	uuid = UUID::gen ();
		602
		603	speed_left = -0.1f;
		604	/* copy the body_info to the body_used - this is only really
		605	* need for monsters, but doesn't hurt to do it for everything.
		606	* by doing so, when a monster is created, it has good starting
		607	* values for the body_used info, so when items are created
		608	* for it, they can be properly equipped.
		609	*/
		610	for (int i = NUM_BODY_LOCATIONS; i--; )
		611	slot[i].used = slot[i].info;
		612
		613	attachable::instantiate ();
527	}	614	}
528		615
529	object *	616	object *
530	object::clone ()	617	object::clone ()
531	{	618	{
…		…
589	* UP_OBJ_FACE: only the objects face has changed.	676	* UP_OBJ_FACE: only the objects face has changed.
590	*/	677	*/
591	void	678	void
592	update_object (object *op, int action)	679	update_object (object *op, int action)
593	{	680	{
594	MoveType move_on, move_off, move_block, move_slow;
595
596	if (op == NULL)	681	if (op == NULL)
597	{	682	{
598	/* this should never happen */	683	/* this should never happen */
599	LOG (llevDebug, "update_object() called for NULL object.\n");	684	LOG (llevDebug, "update_object() called for NULL object.\n");
600	return;	685	return;
…		…
660		745
661	if (op->more)	746	if (op->more)
662	update_object (op->more, action);	747	update_object (op->more, action);
663	}	748	}
664		749
665	object *object::first;
666
667	object::object ()	750	object::object ()
668	{	751	{
669	SET_FLAG (this, FLAG_REMOVED);	752	SET_FLAG (this, FLAG_REMOVED);
670		753
671	expmul = 1.0;	754	expmul = 1.0;
672	face = blank_face;	755	face = blank_face;
673	}	756	}
674		757
675	object::~object ()	758	object::~object ()
676	{	759	{
		760	unlink ();
		761
677	free_key_values (this);	762	free_key_values (this);
678	}	763	}
679		764
		765	static int object_count;
		766
680	void object::link ()	767	void object::link ()
681	{	768	{
		769	assert (!index);//D
		770	uuid = UUID::gen ();
682	count = ++ob_count;	771	count = ++object_count;
683	uuid = gen_uuid ();
684		772
685	prev = 0;	773	refcnt_inc ();
686	next = object::first;	774	objects.insert (this);
687
688	if (object::first)
689	object::first->prev = this;
690
691	object::first = this;
692	}	775	}
693		776
694	void object::unlink ()	777	void object::unlink ()
695	{	778	{
696	if (this == object::first)	779	if (!index)
697	object::first = next;	780	return;
698		781
699	/* Remove this object from the list of used objects */	782	objects.erase (this);
700	if (prev) prev->next = next;	783	refcnt_dec ();
701	if (next) next->prev = prev;
702
703	prev = 0;
704	next = 0;
705	}
706
707	bool
708	object::active () const
709	{
710	return active_next || active_prev || this == active_objects;
711	}	784	}
712		785
713	void	786	void
714	object::activate ()	787	object::activate ()
715	{	788	{
716	/* If already on active list, don't do anything */	789	/* If already on active list, don't do anything */
717	if (active ())	790	if (active)
718	return;	791	return;
719		792
720	if (has_active_speed ())	793	if (has_active_speed ())
721	{	794	actives.insert (this);
722	/* process_events() expects us to insert the object at the beginning
723	* of the list. */
724	active_next = active_objects;
725
726	if (active_next)
727	active_next->active_prev = this;
728
729	active_objects = this;
730	}
731	}	795	}
732		796
733	void	797	void
734	object::activate_recursive ()	798	object::activate_recursive ()
735	{	799	{
…		…
749	*/	813	*/
750	void	814	void
751	object::deactivate ()	815	object::deactivate ()
752	{	816	{
753	/* If not on the active list, nothing needs to be done */	817	/* If not on the active list, nothing needs to be done */
754	if (!active ())	818	if (!active)
755	return;	819	return;
756		820
757	if (active_prev == 0)	821	actives.erase (this);
758	{
759	active_objects = active_next;
760	if (active_next)
761	active_next->active_prev = 0;
762	}
763	else
764	{
765	active_prev->active_next = active_next;
766	if (active_next)
767	active_next->active_prev = active_prev;
768	}
769
770	active_next = 0;
771	active_prev = 0;
772	}	822	}
773		823
774	void	824	void
775	object::deactivate_recursive ()	825	object::deactivate_recursive ()
776	{	826	{
…		…
810	* drop on that space.	860	* drop on that space.
811	*/	861	*/
812	if (!drop_to_ground	862	if (!drop_to_ground
813	|| !map	863	|| !map
814	|| map->in_memory != MAP_IN_MEMORY	864	|| map->in_memory != MAP_IN_MEMORY
		865	|| map->nodrop
815	|| ms ().move_block == MOVE_ALL)	866	|| ms ().move_block == MOVE_ALL)
816	{	867	{
817	while (inv)	868	while (inv)
818	{	869	{
819	inv->destroy_inv (drop_to_ground);	870	inv->destroy_inv (drop_to_ground);
…		…
828		879
829	if (op->flag [FLAG_STARTEQUIP]	880	if (op->flag [FLAG_STARTEQUIP]
830	|| op->flag [FLAG_NO_DROP]	881	|| op->flag [FLAG_NO_DROP]
831	|| op->type == RUNE	882	|| op->type == RUNE
832	|| op->type == TRAP	883	|| op->type == TRAP
833	|| op->flag [FLAG_IS_A_TEMPLATE])	884	|| op->flag [FLAG_IS_A_TEMPLATE]
		885	|| op->flag [FLAG_DESTROY_ON_DEATH])
834	op->destroy ();	886	op->destroy ();
835	else	887	else
836	map->insert (op, x, y);	888	map->insert (op, x, y);
837	}	889	}
838	}	890	}
…		…
846	}	898	}
847		899
848	void	900	void
849	object::do_destroy ()	901	object::do_destroy ()
850	{	902	{
		903	attachable::do_destroy ();
		904
851	if (flag [FLAG_IS_LINKED])	905	if (flag [FLAG_IS_LINKED])
852	remove_button_link (this);	906	remove_button_link (this);
853		907
854	if (flag [FLAG_FRIENDLY])	908	if (flag [FLAG_FRIENDLY])
855	remove_friendly_object (this);	909	remove_friendly_object (this);
856		910
857	if (!flag [FLAG_REMOVED])	911	if (!flag [FLAG_REMOVED])
858	remove ();	912	remove ();
859		913
860	if (flag [FLAG_FREED])	914	destroy_inv (true);
861	return;
862		915
863	set_speed (0);	916	deactivate ();
		917	unlink ();
864		918
865	flag [FLAG_FREED] = 1;	919	flag [FLAG_FREED] = 1;
866
867	attachable::do_destroy ();
868
869	destroy_inv (true);
870	unlink ();
871		920
872	// hack to ensure that freed objects still have a valid map	921	// hack to ensure that freed objects still have a valid map
873	{	922	{
874	static maptile *freed_map; // freed objects are moved here to avoid crashes	923	static maptile *freed_map; // freed objects are moved here to avoid crashes
875		924
876	if (!freed_map)	925	if (!freed_map)
877	{	926	{
878	freed_map = new maptile;	927	freed_map = new maptile;
879		928
		929	freed_map->path = "<freed objects map>";
880	freed_map->name = "/internal/freed_objects_map";	930	freed_map->name = "/internal/freed_objects_map";
881	freed_map->width = 3;	931	freed_map->width = 3;
882	freed_map->height = 3;	932	freed_map->height = 3;
		933	freed_map->nodrop = 1;
883		934
884	freed_map->alloc ();	935	freed_map->alloc ();
885	freed_map->in_memory = MAP_IN_MEMORY;	936	freed_map->in_memory = MAP_IN_MEMORY;
886	}	937	}
887		938
888	map = freed_map;	939	map = freed_map;
889	x = 1;	940	x = 1;
890	y = 1;	941	y = 1;
891	}	942	}
892		943
893	head = 0;
894
895	if (more)	944	if (more)
896	{	945	{
897	more->destroy ();	946	more->destroy ();
898	more = 0;	947	more = 0;
899	}	948	}
900		949
		950	head = 0;
		951
901	// clear those pointers that likely might have circular references to us	952	// clear those pointers that likely might cause circular references
902	owner = 0;	953	owner = 0;
903	enemy = 0;	954	enemy = 0;
904	attacked_by = 0;	955	attacked_by = 0;
905		956	current_weapon = 0;
906	// only relevant for players(?), but make sure of it anyways
907	contr = 0;
908	}	957	}
909		958
910	void	959	void
911	object::destroy (bool destroy_inventory)	960	object::destroy (bool destroy_inventory)
912	{	961	{
913	if (destroyed ())	962	if (destroyed ())
914	return;	963	return;
915		964
916	if (destroy_inventory)	965	if (destroy_inventory)
917	destroy_inv (false);	966	destroy_inv (false);
		967
		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
918		973
919	attachable::destroy ();	974	attachable::destroy ();
920	}	975	}
921		976
922	/*	977	/*
…		…
940	* 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
941	* 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
942	* object will have no environment. If the object previously had an	997	* object will have no environment. If the object previously had an
943	* environment, the x and y coordinates will be updated to	998	* environment, the x and y coordinates will be updated to
944	* the previous environment.	999	* the previous environment.
945	* Beware: This function is called from the editor as well!
946	*/	1000	*/
947	void	1001	void
948	object::remove ()	1002	object::do_remove ()
949	{	1003	{
950	object *tmp, *last = 0;	1004	object *tmp, *last = 0;
951	object *otmp;	1005	object *otmp;
952		1006
953	if (QUERY_FLAG (this, FLAG_REMOVED))	1007	if (QUERY_FLAG (this, FLAG_REMOVED))
…		…
996	}	1050	}
997	else if (map)	1051	else if (map)
998	{	1052	{
999	if (type == PLAYER)	1053	if (type == PLAYER)
1000	{	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
1001	--map->players;	1061	--map->players;
1002	map->touch ();	1062	map->touch ();
1003	}	1063	}
1004		1064
1005	map->dirty = true;	1065	map->dirty = true;
		1066	mapspace &ms = this->ms ();
1006		1067
1007	/* link the object above us */	1068	/* link the object above us */
1008	if (above)	1069	if (above)
1009	above->below = below;	1070	above->below = below;
1010	else	1071	else
1011	map->at (x, y).top = below; /* we were top, set new top */	1072	ms.top = below; /* we were top, set new top */
1012		1073
1013	/* Relink the object below us, if there is one */	1074	/* Relink the object below us, if there is one */
1014	if (below)	1075	if (below)
1015	below->above = above;	1076	below->above = above;
1016	else	1077	else
…		…
1018	/* 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
1019	* use translated coordinates in case some oddness with map tiling is	1080	* use translated coordinates in case some oddness with map tiling is
1020	* evident	1081	* evident
1021	*/	1082	*/
1022	if (GET_MAP_OB (map, x, y) != this)	1083	if (GET_MAP_OB (map, x, y) != this)
1023	{
1024	char *dump = dump_object (this);
1025	LOG (llevError,
1026	"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 ());
1027	free (dump);
1028	dump = dump_object (GET_MAP_OB (map, x, y));
1029	LOG (llevError, "%s\n", dump);
1030	free (dump);
1031	}
1032		1085
1033	map->at (x, y).bot = above; /* goes on above it. */	1086	ms.bot = above; /* goes on above it. */
1034	}	1087	}
1035		1088
1036	above = 0;	1089	above = 0;
1037	below = 0;	1090	below = 0;
1038		1091
1039	if (map->in_memory == MAP_SAVING)	1092	if (map->in_memory == MAP_SAVING)
1040	return;	1093	return;
1041		1094
1042	int check_walk_off = !flag [FLAG_NO_APPLY];	1095	int check_walk_off = !flag [FLAG_NO_APPLY];
1043		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
1044	for (tmp = map->at (x, y).bot; tmp; tmp = tmp->above)	1109	for (tmp = ms.bot; tmp; tmp = tmp->above)
1045	{	1110	{
1046	/* 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
1047	* being removed.	1112	* being removed.
1048	*/	1113	*/
1049
1050	if (tmp->type == PLAYER && tmp != this)
1051	{
1052	/* If a container that the player is currently using somehow gets
1053	* removed (most likely destroyed), update the player view
1054	* appropriately.
1055	*/
1056	if (tmp->container == this)
1057	{
1058	flag [FLAG_APPLIED] = 0;
1059	tmp->container = 0;
1060	}
1061
1062	if (tmp->contr->ns)
1063	tmp->contr->ns->floorbox_update ();
1064	}
1065		1114
1066	/* See if object moving off should effect something */	1115	/* See if object moving off should effect something */
1067	if (check_walk_off	1116	if (check_walk_off
1068	&& ((move_type & tmp->move_off)	1117	&& ((move_type & tmp->move_off)
1069	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))	1118	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
…		…
1072		1121
1073	if (destroyed ())	1122	if (destroyed ())
1074	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 ());
1075	}	1124	}
1076		1125
1077	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1078	//TODO: why is this horrible hacka fix? get rid of this code=bug! (schmorp)
1079	if (tmp->above == tmp)
1080	tmp->above = 0;
1081
1082	last = tmp;	1126	last = tmp;
1083	}	1127	}
1084		1128
1085	/* last == NULL if there are no objects on this space */	1129	/* last == NULL if there are no objects on this space */
1086	//TODO: this makes little sense, why only update the topmost object?	1130	//TODO: this makes little sense, why only update the topmost object?
…		…
1106	merge_ob (object *op, object *top)	1150	merge_ob (object *op, object *top)
1107	{	1151	{
1108	if (!op->nrof)	1152	if (!op->nrof)
1109	return 0;	1153	return 0;
1110		1154
1111	if (top)	1155	if (!top)
1112	for (top = op; top && top->above; top = top->above)	1156	for (top = op; top && top->above; top = top->above)
1113	;	1157	;
1114		1158
1115	for (; top; top = top->below)	1159	for (; top; top = top->below)
1116	{	1160	{
…		…
1129	}	1173	}
1130		1174
1131	return 0;	1175	return 0;
1132	}	1176	}
1133		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
1134	/*	1201	/*
1135	* 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
1136	* job preparing multi-part monsters	1203	* job preparing multi-part monsters.
1137	*/	1204	*/
1138	object *	1205	object *
1139	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)
1140	{	1207	{
1141	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)	1208	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1142	{	1209	{
1143	tmp->x = x + tmp->arch->clone.x;	1210	tmp->x = x + tmp->arch->x;
1144	tmp->y = y + tmp->arch->clone.y;	1211	tmp->y = y + tmp->arch->y;
1145	}	1212	}
1146		1213
1147	return insert_ob_in_map (op, m, originator, flag);	1214	return insert_ob_in_map (op, m, originator, flag);
1148	}	1215	}
1149		1216
…		…
1168	* just 'op' otherwise	1235	* just 'op' otherwise
1169	*/	1236	*/
1170	object *	1237	object *
1171	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)
1172	{	1239	{
		1240	assert (!op->flag [FLAG_FREED]);
		1241
1173	object *tmp, *top, *floor = NULL;	1242	object *top, *floor = NULL;
1174	sint16 x, y;
1175		1243
1176	if (QUERY_FLAG (op, FLAG_FREED))	1244	op->remove ();
1177	{
1178	LOG (llevError, "Trying to insert freed object!\n");
1179	return NULL;
1180	}
1181
1182	if (!m)
1183	{
1184	char *dump = dump_object (op);
1185	LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
1186	free (dump);
1187	return op;
1188	}
1189
1190	if (out_of_map (m, op->x, op->y))
1191	{
1192	char *dump = dump_object (op);
1193	LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump);
1194	#ifdef MANY_CORES
1195	/* Better to catch this here, as otherwise the next use of this object
1196	* is likely to cause a crash. Better to find out where it is getting
1197	* improperly inserted.
1198	*/
1199	abort ();
1200	#endif
1201	free (dump);
1202	return op;
1203	}
1204
1205	if (!QUERY_FLAG (op, FLAG_REMOVED))
1206	{
1207	char *dump = dump_object (op);
1208	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
1209	free (dump);
1210	return op;
1211	}
1212
1213	if (op->more)
1214	{
1215	/* The part may be on a different map. */
1216
1217	object *more = op->more;
1218
1219	/* We really need the caller to normalise coordinates - if
1220	* we set the map, that doesn't work if the location is within
1221	* a map and this is straddling an edge. So only if coordinate
1222	* is clear wrong do we normalise it.
1223	*/
1224	if (OUT_OF_REAL_MAP (more->map, more->x, more->y))
1225	more->map = get_map_from_coord (m, &more->x, &more->y);
1226	else if (!more->map)
1227	{
1228	/* For backwards compatibility - when not dealing with tiled maps,
1229	* more->map should always point to the parent.
1230	*/
1231	more->map = m;
1232	}
1233
1234	if (insert_ob_in_map (more, more->map, originator, flag) == NULL)
1235	{
1236	if (!op->head)
1237	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1238
1239	return 0;
1240	}
1241	}
1242
1243	CLEAR_FLAG (op, FLAG_REMOVED);
1244		1245
1245	/* Ideally, the caller figures this out. However, it complicates a lot	1246	/* Ideally, the caller figures this out. However, it complicates a lot
1246	* 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
1247	* need extra work	1248	* need extra work
1248	*/	1249	*/
1249	op->map = get_map_from_coord (m, &op->x, &op->y);	1250	if (!xy_normalise (m, op->x, op->y))
1250	x = op->x;	1251	{
1251	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 ();
1252		1264
1253	/* this has to be done after we translate the coordinates.	1265	/* this has to be done after we translate the coordinates.
1254	*/	1266	*/
1255	if (op->nrof && !(flag & INS_NO_MERGE))	1267	if (op->nrof && !(flag & INS_NO_MERGE))
1256	for (tmp = GET_MAP_OB (op->map, x, y); tmp; tmp = tmp->above)	1268	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1257	if (object::can_merge (op, tmp))	1269	if (object::can_merge (op, tmp))
1258	{	1270	{
1259	op->nrof += tmp->nrof;	1271	op->nrof += tmp->nrof;
1260	tmp->destroy ();	1272	tmp->destroy ();
1261	}	1273	}
…		…
1278	op->below = originator->below;	1290	op->below = originator->below;
1279		1291
1280	if (op->below)	1292	if (op->below)
1281	op->below->above = op;	1293	op->below->above = op;
1282	else	1294	else
1283	op->ms ().bot = op;	1295	ms.bot = op;
1284		1296
1285	/* since *below* originator, no need to update top */	1297	/* since *below* originator, no need to update top */
1286	originator->below = op;	1298	originator->below = op;
1287	}	1299	}
1288	else	1300	else
1289	{	1301	{
		1302	top = ms.bot;
		1303
1290	/* If there are other objects, then */	1304	/* If there are other objects, then */
1291	if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL))	1305	if (top)
1292	{	1306	{
1293	object *last = 0;	1307	object *last = 0;
1294		1308
1295	/*	1309	/*
1296	* 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.
…		…
1302	* 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
1303	* 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
1304	* 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
1305	* that flying non pickable objects are spell objects.	1319	* that flying non pickable objects are spell objects.
1306	*/	1320	*/
1307	while (top)	1321	for (top = ms.bot; top; top = top->above)
1308	{	1322	{
1309	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))
1310	floor = top;	1324	floor = top;
1311		1325
1312	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))
…		…
1315	top = top->below;	1329	top = top->below;
1316	break;	1330	break;
1317	}	1331	}
1318		1332
1319	last = top;	1333	last = top;
1320	top = top->above;
1321	}	1334	}
1322		1335
1323	/* 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 */
1324	top = last;	1337	top = last;
1325		1338
…		…
1327	* looks like instead of lots of conditions here.	1340	* looks like instead of lots of conditions here.
1328	* makes things faster, and effectively the same result.	1341	* makes things faster, and effectively the same result.
1329	*/	1342	*/
1330		1343
1331	/* Have object 'fall below' other objects that block view.	1344	/* Have object 'fall below' other objects that block view.
1332	* Unless those objects are exits, type 66	1345	* Unless those objects are exits.
1333	* If INS_ON_TOP is used, don't do this processing	1346	* If INS_ON_TOP is used, don't do this processing
1334	* Need to find the object that in fact blocks view, otherwise	1347	* Need to find the object that in fact blocks view, otherwise
1335	* stacking is a bit odd.	1348	* stacking is a bit odd.
1336	*/	1349	*/
1337	if (!(flag & INS_ON_TOP) &&	1350	if (!(flag & INS_ON_TOP)
1338	(get_map_flags (op->map, 0, op->x, op->y, 0, 0) & P_BLOCKSVIEW) && (op->face && !op->face->visibility))	1351	&& ms.flags () & P_BLOCKSVIEW
		1352	&& (op->face && !faces [op->face].visibility))
1339	{	1353	{
1340	for (last = top; last != floor; last = last->below)	1354	for (last = top; last != floor; last = last->below)
1341	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1355	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1342	break;	1356	break;
		1357
1343	/* Check to see if we found the object that blocks view,	1358	/* Check to see if we found the object that blocks view,
1344	* 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
1345	* we can get inserted below this one, which requires we	1360	* we can get inserted below this one, which requires we
1346	* set top to the object below us.	1361	* set top to the object below us.
1347	*/	1362	*/
1348	if (last && last->below && last != floor)	1363	if (last && last->below && last != floor)
1349	top = last->below;	1364	top = last->below;
1350	}	1365	}
1351	} /* If objects on this space */	1366	} /* If objects on this space */
1352		1367
1353	if (flag & INS_MAP_LOAD)
1354	top = GET_MAP_TOP (op->map, op->x, op->y);
1355
1356	if (flag & INS_ABOVE_FLOOR_ONLY)	1368	if (flag & INS_ABOVE_FLOOR_ONLY)
1357	top = floor;	1369	top = floor;
1358		1370
1359	/* 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.
1360	*/	1372	*/
1361		1373
1362	/* First object on this space */	1374	/* First object on this space */
1363	if (!top)	1375	if (!top)
1364	{	1376	{
1365	op->above = GET_MAP_OB (op->map, op->x, op->y);	1377	op->above = ms.bot;
1366		1378
1367	if (op->above)	1379	if (op->above)
1368	op->above->below = op;	1380	op->above->below = op;
1369		1381
1370	op->below = 0;	1382	op->below = 0;
1371	op->ms ().bot = op;	1383	ms.bot = op;
1372	}	1384	}
1373	else	1385	else
1374	{ /* get inserted into the stack above top */	1386	{ /* get inserted into the stack above top */
1375	op->above = top->above;	1387	op->above = top->above;
1376		1388
…		…
1380	op->below = top;	1392	op->below = top;
1381	top->above = op;	1393	top->above = op;
1382	}	1394	}
1383		1395
1384	if (!op->above)	1396	if (!op->above)
1385	op->ms ().top = op;	1397	ms.top = op;
1386	} /* else not INS_BELOW_ORIGINATOR */	1398	} /* else not INS_BELOW_ORIGINATOR */
1387		1399
1388	if (op->type == PLAYER)	1400	if (op->type == PLAYER)
1389	{	1401	{
1390	op->contr->do_los = 1;	1402	op->contr->do_los = 1;
…		…
1392	op->map->touch ();	1404	op->map->touch ();
1393	}	1405	}
1394		1406
1395	op->map->dirty = true;	1407	op->map->dirty = true;
1396		1408
1397	/* If we have a floor, we know the player, if any, will be above
1398	* it, so save a few ticks and start from there.
1399	*/
1400	if (!(flag & INS_MAP_LOAD))
1401	if (object *pl = op->ms ().player ())	1409	if (object *pl = ms.player ())
1402	if (pl->contr->ns)
1403	pl->contr->ns->floorbox_update ();	1410	pl->contr->ns->floorbox_update ();
1404		1411
1405	/* If this object glows, it may affect lighting conditions that are	1412	/* If this object glows, it may affect lighting conditions that are
1406	* 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
1407	* 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
1408	* on the map will get recalculated. The players could very well	1415	* on the map will get recalculated. The players could very well
…		…
1427	* blocked() and wall() work properly), and these flags are updated by	1434	* blocked() and wall() work properly), and these flags are updated by
1428	* update_object().	1435	* update_object().
1429	*/	1436	*/
1430		1437
1431	/* 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 */
1432	if (!(flag & INS_NO_WALK_ON) && !op->head)	1439	if (!(flag & INS_NO_WALK_ON) && op->head_ () == op)
1433	{	1440	{
1434	if (check_move_on (op, originator))	1441	if (check_move_on (op, originator))
1435	return 0;	1442	return 0;
1436		1443
1437	/* 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
1438	* walk on's.	1445	* walk on's.
1439	*/	1446	*/
1440	for (tmp = op->more; tmp != NULL; tmp = tmp->more)	1447	for (object *tmp = op->more; tmp; tmp = tmp->more)
1441	if (check_move_on (tmp, originator))	1448	if (check_move_on (tmp, originator))
1442	return 0;	1449	return 0;
1443	}	1450	}
1444		1451
1445	return op;	1452	return op;
…		…
1455	object *tmp, *tmp1;	1462	object *tmp, *tmp1;
1456		1463
1457	/* first search for itself and remove any old instances */	1464	/* first search for itself and remove any old instances */
1458		1465
1459	for (tmp = op->ms ().bot; tmp; tmp = tmp->above)	1466	for (tmp = op->ms ().bot; tmp; tmp = tmp->above)
1460	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */	1467	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */
1461	tmp->destroy ();	1468	tmp->destroy ();
1462		1469
1463	tmp1 = arch_to_object (archetype::find (arch_string));	1470	tmp1 = arch_to_object (archetype::find (arch_string));
1464		1471
1465	tmp1->x = op->x;	1472	tmp1->x = op->x;
…		…
1468	}	1475	}
1469		1476
1470	object *	1477	object *
1471	object::insert_at (object *where, object *originator, int flags)	1478	object::insert_at (object *where, object *originator, int flags)
1472	{	1479	{
1473	where->map->insert (this, where->x, where->y, originator, flags);	1480	return where->map->insert (this, where->x, where->y, originator, flags);
1474	}	1481	}
1475		1482
1476	/*	1483	/*
1477	* 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
1478	* is returned contains nr objects, and the remaining parts contains	1485	* is returned contains nr objects, and the remaining parts contains
…		…
1518	* 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
1519	* is subsequently removed and freed.	1526	* is subsequently removed and freed.
1520	*	1527	*
1521	* 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
1522	*/	1529	*/
1523
1524	object *	1530	object *
1525	decrease_ob_nr (object *op, uint32 i)	1531	decrease_ob_nr (object *op, uint32 i)
1526	{	1532	{
1527	object *tmp;	1533	object *tmp;
1528		1534
…		…
1603		1609
1604	/*	1610	/*
1605	* add_weight(object, weight) adds the specified weight to an object,	1611	* add_weight(object, weight) adds the specified weight to an object,
1606	* and also updates how much the environment(s) is/are carrying.	1612	* and also updates how much the environment(s) is/are carrying.
1607	*/	1613	*/
1608
1609	void	1614	void
1610	add_weight (object *op, signed long weight)	1615	add_weight (object *op, signed long weight)
1611	{	1616	{
1612	while (op != NULL)	1617	while (op != NULL)
1613	{	1618	{
…		…
1628	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);
1629	free (dump);	1634	free (dump);
1630	return op;	1635	return op;
1631	}	1636	}
1632		1637
1633	if (where->head)	1638	if (where->head_ () != where)
1634	{	1639	{
1635	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");
1636	where = where->head;	1641	where = where->head;
1637	}	1642	}
1638		1643
1639	return where->insert (op);	1644	return where->insert (op);
1640	}	1645	}
…		…
1645	* inside the object environment.	1650	* inside the object environment.
1646	*	1651	*
1647	* 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
1648	* be != op, if items are merged. -Tero	1653	* be != op, if items are merged. -Tero
1649	*/	1654	*/
1650
1651	object *	1655	object *
1652	object::insert (object *op)	1656	object::insert (object *op)
1653	{	1657	{
1654	object *tmp, *otmp;
1655
1656	if (!QUERY_FLAG (op, FLAG_REMOVED))	1658	if (!QUERY_FLAG (op, FLAG_REMOVED))
1657	op->remove ();	1659	op->remove ();
1658		1660
1659	if (op->more)	1661	if (op->more)
1660	{	1662	{
…		…
1662	return op;	1664	return op;
1663	}	1665	}
1664		1666
1665	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1667	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1666	CLEAR_FLAG (op, FLAG_REMOVED);	1668	CLEAR_FLAG (op, FLAG_REMOVED);
		1669
1667	if (op->nrof)	1670	if (op->nrof)
1668	{	1671	{
1669	for (tmp = inv; tmp != NULL; tmp = tmp->below)	1672	for (object *tmp = inv; tmp; tmp = tmp->below)
1670	if (object::can_merge (tmp, op))	1673	if (object::can_merge (tmp, op))
1671	{	1674	{
1672	/* return the original object and remove inserted object	1675	/* return the original object and remove inserted object
1673	(client needs the original object) */	1676	(client needs the original object) */
1674	tmp->nrof += op->nrof;	1677	tmp->nrof += op->nrof;
…		…
1693	add_weight (this, op->weight * op->nrof);	1696	add_weight (this, op->weight * op->nrof);
1694	}	1697	}
1695	else	1698	else
1696	add_weight (this, (op->weight + op->carrying));	1699	add_weight (this, (op->weight + op->carrying));
1697		1700
1698	otmp = this->in_player ();	1701	if (object *otmp = this->in_player ())
1699	if (otmp && otmp->contr)
1700	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1702	if (otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1701	otmp->update_stats ();	1703	otmp->update_stats ();
1702		1704
		1705	op->owner = 0; // its his/hers now. period.
1703	op->map = 0;	1706	op->map = 0;
1704	op->env = this;	1707	op->env = this;
1705	op->above = 0;	1708	op->above = 0;
1706	op->below = 0;	1709	op->below = 0;
1707	op->x = 0, op->y = 0;	1710	op->x = op->y = 0;
1708		1711
1709	/* 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 */
1710	if ((op->glow_radius != 0) && map)	1713	if (op->glow_radius && map)
1711	{	1714	{
1712	#ifdef DEBUG_LIGHTS	1715	#ifdef DEBUG_LIGHTS
1713	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);
1714	#endif /* DEBUG_LIGHTS */	1717	#endif /* DEBUG_LIGHTS */
1715	if (map->darkness)	1718	if (map->darkness)
…		…
1815	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||	1818	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
1816	((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))
1817	{	1820	{
1818		1821
1819	float	1822	float
1820	diff = tmp->move_slow_penalty * FABS (op->speed);	1823	diff = tmp->move_slow_penalty * fabs (op->speed);
1821		1824
1822	if (op->type == PLAYER)	1825	if (op->type == PLAYER)
1823	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)) ||
1824	(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)))
1825	diff /= 4.0;	1828	diff /= 4.0;
…		…
1949	* activate recursively a flag on an object inventory	1952	* activate recursively a flag on an object inventory
1950	*/	1953	*/
1951	void	1954	void
1952	flag_inv (object *op, int flag)	1955	flag_inv (object *op, int flag)
1953	{	1956	{
1954	if (op->inv)
1955	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)	1957	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1956	{	1958	{
1957	SET_FLAG (tmp, flag);	1959	SET_FLAG (tmp, flag);
1958	flag_inv (tmp, flag);	1960	flag_inv (tmp, flag);
1959	}	1961	}
1960	}	1962	}
1961		1963
1962	/*	1964	/*
1963	* deactivate recursively a flag on an object inventory	1965	* deactivate recursively a flag on an object inventory
1964	*/	1966	*/
1965	void	1967	void
1966	unflag_inv (object *op, int flag)	1968	unflag_inv (object *op, int flag)
1967	{	1969	{
1968	if (op->inv)
1969	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)	1970	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1970	{	1971	{
1971	CLEAR_FLAG (tmp, flag);	1972	CLEAR_FLAG (tmp, flag);
1972	unflag_inv (tmp, flag);	1973	unflag_inv (tmp, flag);
1973	}	1974	}
1974	}
1975
1976	/*
1977	* set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in
1978	* all it's inventory (recursively).
1979	* If checksums are used, a player will get set_cheat called for
1980	* him/her-self and all object carried by a call to this function.
1981	*/
1982	void
1983	set_cheat (object *op)
1984	{
1985	SET_FLAG (op, FLAG_WAS_WIZ);
1986	flag_inv (op, FLAG_WAS_WIZ);
1987	}	1975	}
1988		1976
1989	/*	1977	/*
1990	* find_free_spot(object, map, x, y, start, stop) will search for	1978	* find_free_spot(object, map, x, y, start, stop) will search for
1991	* a spot at the given map and coordinates which will be able to contain	1979	* a spot at the given map and coordinates which will be able to contain
…		…
1993	* to search (see the freearr_x/y[] definition).	1981	* to search (see the freearr_x/y[] definition).
1994	* It returns a random choice among the alternatives found.	1982	* It returns a random choice among the alternatives found.
1995	* start and stop are where to start relative to the free_arr array (1,9	1983	* start and stop are where to start relative to the free_arr array (1,9
1996	* does all 4 immediate directions). This returns the index into the	1984	* does all 4 immediate directions). This returns the index into the
1997	* array of the free spot, -1 if no spot available (dir 0 = x,y)	1985	* array of the free spot, -1 if no spot available (dir 0 = x,y)
1998	* Note - this only checks to see if there is space for the head of the
1999	* object - if it is a multispace object, this should be called for all
2000	* pieces.
2001	* Note2: This function does correctly handle tiled maps, but does not	1986	* Note: This function does correctly handle tiled maps, but does not
2002	* inform the caller. However, insert_ob_in_map will update as	1987	* inform the caller. However, insert_ob_in_map will update as
2003	* necessary, so the caller shouldn't need to do any special work.	1988	* necessary, so the caller shouldn't need to do any special work.
2004	* Note - updated to take an object instead of archetype - this is necessary	1989	* Note - updated to take an object instead of archetype - this is necessary
2005	* because arch_blocked (now ob_blocked) needs to know the movement type	1990	* because arch_blocked (now ob_blocked) needs to know the movement type
2006	* to know if the space in question will block the object. We can't use	1991	* to know if the space in question will block the object. We can't use
…		…
2008	* customized, changed states, etc.	1993	* customized, changed states, etc.
2009	*/	1994	*/
2010	int	1995	int
2011	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)	1996	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2012	{	1997	{
		1998	int altern[SIZEOFFREE];
2013	int index = 0, flag;	1999	int index = 0, flag;
2014	int altern[SIZEOFFREE];
2015		2000
2016	for (int i = start; i < stop; i++)	2001	for (int i = start; i < stop; i++)
2017	{	2002	{
2018	flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]);	2003	mapxy pos (m, x, y); pos.move (i);
2019	if (!flag)	2004
		2005	if (!pos.normalise ())
		2006	continue;
		2007
		2008	mapspace &ms = *pos;
		2009
		2010	if (ms.flags () & P_IS_ALIVE)
		2011	continue;
		2012
		2013	/* However, often
		2014	* ob doesn't have any move type (when used to place exits)
		2015	* so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.
		2016	*/
		2017	if (ob && ob->move_type == 0 && ms.move_block != MOVE_ALL)
		2018	{
2020	altern [index++] = i;	2019	altern [index++] = i;
		2020	continue;
		2021	}
2021		2022
2022	/* Basically, if we find a wall on a space, we cut down the search size.	2023	/* Basically, if we find a wall on a space, we cut down the search size.
2023	* In this way, we won't return spaces that are on another side of a wall.	2024	* In this way, we won't return spaces that are on another side of a wall.
2024	* This mostly work, but it cuts down the search size in all directions -	2025	* This mostly work, but it cuts down the search size in all directions -
2025	* if the space being examined only has a wall to the north and empty	2026	* if the space being examined only has a wall to the north and empty
2026	* spaces in all the other directions, this will reduce the search space	2027	* spaces in all the other directions, this will reduce the search space
2027	* to only the spaces immediately surrounding the target area, and	2028	* to only the spaces immediately surrounding the target area, and
2028	* won't look 2 spaces south of the target space.	2029	* won't look 2 spaces south of the target space.
2029	*/	2030	*/
2030	else if ((flag & P_NO_PASS) && maxfree[i] < stop)	2031	if (ms.move_block == MOVE_ALL && maxfree[i] < stop)
		2032	{
2031	stop = maxfree[i];	2033	stop = maxfree[i];
		2034	continue;
		2035	}
		2036
		2037	/* Note it is intentional that we check ob - the movement type of the
		2038	* head of the object should correspond for the entire object.
		2039	*/
		2040	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
		2041	continue;
		2042
		2043	if (ob->blocked (m, pos.x, pos.y))
		2044	continue;
		2045
		2046	altern [index++] = i;
2032	}	2047	}
2033		2048
2034	if (!index)	2049	if (!index)
2035	return -1;	2050	return -1;
2036		2051
2037	return altern[RANDOM () % index];	2052	return altern [rndm (index)];
2038	}	2053	}
2039		2054
2040	/*	2055	/*
2041	* find_first_free_spot(archetype, maptile, x, y) works like	2056	* find_first_free_spot(archetype, maptile, x, y) works like
2042	* find_free_spot(), but it will search max number of squares.	2057	* find_free_spot(), but it will search max number of squares.
…		…
2045	*/	2060	*/
2046	int	2061	int
2047	find_first_free_spot (const object *ob, maptile *m, int x, int y)	2062	find_first_free_spot (const object *ob, maptile *m, int x, int y)
2048	{	2063	{
2049	for (int i = 0; i < SIZEOFFREE; i++)	2064	for (int i = 0; i < SIZEOFFREE; i++)
2050	if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]))	2065	if (!ob->blocked (m, x + freearr_x[i], y + freearr_y[i]))
2051	return i;	2066	return i;
2052		2067
2053	return -1;	2068	return -1;
2054	}	2069	}
2055		2070
…		…
2063	{	2078	{
2064	arr += begin;	2079	arr += begin;
2065	end -= begin;	2080	end -= begin;
2066		2081
2067	while (--end)	2082	while (--end)
2068	swap (arr [end], arr [RANDOM () % (end + 1)]);	2083	swap (arr [end], arr [rndm (end + 1)]);
2069	}	2084	}
2070		2085
2071	/* new function to make monster searching more efficient, and effective!	2086	/* new function to make monster searching more efficient, and effective!
2072	* This basically returns a randomized array (in the passed pointer) of	2087	* This basically returns a randomized array (in the passed pointer) of
2073	* the spaces to find monsters. In this way, it won't always look for	2088	* the spaces to find monsters. In this way, it won't always look for
…		…
2109	object *tmp;	2124	object *tmp;
2110	maptile *mp;	2125	maptile *mp;
2111		2126
2112	MoveType blocked, move_type;	2127	MoveType blocked, move_type;
2113		2128
2114	if (exclude && exclude->head)	2129	if (exclude && exclude->head_ () != exclude)
2115	{	2130	{
2116	exclude = exclude->head;	2131	exclude = exclude->head;
2117	move_type = exclude->move_type;	2132	move_type = exclude->move_type;
2118	}	2133	}
2119	else	2134	else
…		…
2142	max = maxfree[i];	2157	max = maxfree[i];
2143	else if (mflags & P_IS_ALIVE)	2158	else if (mflags & P_IS_ALIVE)
2144	{	2159	{
2145	for (tmp = ms.bot; tmp; tmp = tmp->above)	2160	for (tmp = ms.bot; tmp; tmp = tmp->above)
2146	if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)	2161	if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)
2147	&& (tmp != exclude || (tmp->head && tmp->head != exclude)))	2162	&& (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2148	break;	2163	break;
2149		2164
2150	if (tmp)	2165	if (tmp)
2151	return freedir[i];	2166	return freedir[i];
2152	}	2167	}
…		…
2207		2222
2208	return 3;	2223	return 3;
2209	}	2224	}
2210		2225
2211	/*	2226	/*
2212	* absdir(int): Returns a number between 1 and 8, which represent
2213	* the "absolute" direction of a number (it actually takes care of
2214	* "overflow" in previous calculations of a direction).
2215	*/
2216
2217	int
2218	absdir (int d)
2219	{
2220	while (d < 1)
2221	d += 8;
2222
2223	while (d > 8)
2224	d -= 8;
2225
2226	return d;
2227	}
2228
2229	/*
2230	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is	2227	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is
2231	* between two directions (which are expected to be absolute (see absdir())	2228	* between two directions (which are expected to be absolute (see absdir())
2232	*/	2229	*/
2233
2234	int	2230	int
2235	dirdiff (int dir1, int dir2)	2231	dirdiff (int dir1, int dir2)
2236	{	2232	{
2237	int d;	2233	int d;
2238		2234
…		…
2351	* Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause	2347	* Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause
2352	* core dumps if they do.	2348	* core dumps if they do.
2353	*	2349	*
2354	* Add a check so we can't pick up invisible objects (0.93.8)	2350	* Add a check so we can't pick up invisible objects (0.93.8)
2355	*/	2351	*/
2356
2357	int	2352	int
2358	can_pick (const object *who, const object *item)	2353	can_pick (const object *who, const object *item)
2359	{	2354	{
2360	return /*QUERY_FLAG(who,FLAG_WIZ)|| */	2355	return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2361	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&	2356	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
…		…
2366	* create clone from object to another	2361	* create clone from object to another
2367	*/	2362	*/
2368	object *	2363	object *
2369	object_create_clone (object *asrc)	2364	object_create_clone (object *asrc)
2370	{	2365	{
2371	object *dst = 0, *tmp, *src, *part, *prev, *item;	2366	object *dst = 0, *tmp, *src, *prev, *item;
2372		2367
2373	if (!asrc)	2368	if (!asrc)
2374	return 0;	2369	return 0;
2375		2370
2376	src = asrc;
2377	if (src->head)
2378	src = src->head;	2371	src = asrc->head_ ();
2379		2372
2380	prev = 0;	2373	prev = 0;
2381	for (part = src; part; part = part->more)	2374	for (object *part = src; part; part = part->more)
2382	{	2375	{
2383	tmp = part->clone ();	2376	tmp = part->clone ();
2384	tmp->x -= src->x;	2377	tmp->x -= src->x;
2385	tmp->y -= src->y;	2378	tmp->y -= src->y;
2386		2379
…		…
2402		2395
2403	for (item = src->inv; item; item = item->below)	2396	for (item = src->inv; item; item = item->below)
2404	insert_ob_in_ob (object_create_clone (item), dst);	2397	insert_ob_in_ob (object_create_clone (item), dst);
2405		2398
2406	return dst;	2399	return dst;
2407	}
2408
2409	/* GROS - Creates an object using a string representing its content. */
2410	/* Basically, we save the content of the string to a temp file, then call */
2411	/* load_object on it. I admit it is a highly inefficient way to make things, */
2412	/* but it was simple to make and allows reusing the load_object function. */
2413	/* Remember not to use load_object_str in a time-critical situation. */
2414	/* Also remember that multiparts objects are not supported for now. */
2415	object *
2416	load_object_str (const char *obstr)
2417	{
2418	object *op;
2419	char filename[MAX_BUF];
2420
2421	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2422
2423	FILE *tempfile = fopen (filename, "w");
2424
2425	if (tempfile == NULL)
2426	{
2427	LOG (llevError, "Error - Unable to access load object temp file\n");
2428	return NULL;
2429	}
2430
2431	fprintf (tempfile, obstr);
2432	fclose (tempfile);
2433
2434	op = object::create ();
2435
2436	object_thawer thawer (filename);
2437
2438	if (thawer)
2439	load_object (thawer, op, 0);
2440
2441	LOG (llevDebug, " load str completed, object=%s\n", &op->name);
2442	CLEAR_FLAG (op, FLAG_REMOVED);
2443
2444	return op;
2445	}	2400	}
2446		2401
2447	/* This returns the first object in who's inventory that	2402	/* This returns the first object in who's inventory that
2448	* has the same type and subtype match.	2403	* has the same type and subtype match.
2449	* returns NULL if no match.	2404	* returns NULL if no match.
…		…
2504	if (link->key == canonical_key)	2459	if (link->key == canonical_key)
2505	return link->value;	2460	return link->value;
2506		2461
2507	return 0;	2462	return 0;
2508	}	2463	}
2509
2510		2464
2511	/*	2465	/*
2512	* Updates the canonical_key in op to value.	2466	* Updates the canonical_key in op to value.
2513	*	2467	*
2514	* canonical_key is a shared string (value doesn't have to be).	2468	* canonical_key is a shared string (value doesn't have to be).
…		…
2538	/* Basically, if the archetype has this key set,	2492	/* Basically, if the archetype has this key set,
2539	* we need to store the null value so when we save	2493	* we need to store the null value so when we save
2540	* it, we save the empty value so that when we load,	2494	* it, we save the empty value so that when we load,
2541	* we get this value back again.	2495	* we get this value back again.
2542	*/	2496	*/
2543	if (get_ob_key_link (&op->arch->clone, canonical_key))	2497	if (get_ob_key_link (op->arch, canonical_key))
2544	field->value = 0;	2498	field->value = 0;
2545	else	2499	else
2546	{	2500	{
2547	if (last)	2501	if (last)
2548	last->next = field->next;	2502	last->next = field->next;
…		…
2617	}	2571	}
2618	else	2572	else
2619	item = item->env;	2573	item = item->env;
2620	}	2574	}
2621		2575
2622
2623	const char *	2576	const char *
2624	object::flag_desc (char *desc, int len) const	2577	object::flag_desc (char *desc, int len) const
2625	{	2578	{
2626	char *p = desc;	2579	char *p = desc;
2627	bool first = true;	2580	bool first = true;
…		…
2654	{	2607	{
2655	char flagdesc[512];	2608	char flagdesc[512];
2656	char info2[256 * 4];	2609	char info2[256 * 4];
2657	char *p = info;	2610	char *p = info;
2658		2611
2659	p += snprintf (p, 512, "{cnt:%d,uuid:<1,%" PRIx64 ">,name:\"%s%s%s\",flags:[%s],type:%d}",	2612	p += snprintf (p, 512, "{cnt:%d,uuid:<1.%" PRIx64 ">,name:\"%s\"%s%s,flags:[%s],type:%d}",
2660	count, uuid.seq,	2613	count, uuid.seq,
2661	&name,	2614	&name,
2662	title ? "\",title:" : "",	2615	title ? "\",title:\"" : "",
2663	title ? (const char *)title : "",	2616	title ? (const char *)title : "",
2664	flag_desc (flagdesc, 512), type);	2617	flag_desc (flagdesc, 512), type);
2665		2618
2666	if (env)	2619	if (!this->flag[FLAG_REMOVED] && env)
2667	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2620	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2668		2621
2669	if (map)	2622	if (map)
2670	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);	2623	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2671		2624
…		…
2673	}	2626	}
2674		2627
2675	const char *	2628	const char *
2676	object::debug_desc () const	2629	object::debug_desc () const
2677	{	2630	{
2678	static char info[256 * 4];	2631	static char info[3][256 * 4];
		2632	static int info_idx;
		2633
2679	return debug_desc (info);	2634	return debug_desc (info [++info_idx % 3]);
2680	}	2635	}
2681		2636
		2637	struct region *
		2638	object::region () const
		2639	{
		2640	return map ? map->region (x, y)
		2641	: region::default_region ();
		2642	}
		2643
		2644	const materialtype_t *
		2645	object::dominant_material () const
		2646	{
		2647	if (materialtype_t *mt = name_to_material (materialname))
		2648	return mt;
		2649
		2650	return name_to_material (shstr_unknown);
		2651	}
		2652
		2653	void
		2654	object::open_container (object *new_container)
		2655	{
		2656	if (container == new_container)
		2657	return;
		2658
		2659	if (object *old_container = container)
		2660	{
		2661	if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
		2662	return;
		2663
		2664	#if 0
		2665	// remove the "Close old_container" object.
		2666	if (object *closer = old_container->inv)
		2667	if (closer->type == CLOSE_CON)
		2668	closer->destroy ();
		2669	#endif
		2670
		2671	old_container->flag [FLAG_APPLIED] = 0;
		2672	container = 0;
		2673
		2674	esrv_update_item (UPD_FLAGS, this, old_container);
		2675	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
		2676	play_sound (sound_find ("chest_close"));
		2677	}
		2678
		2679	if (new_container)
		2680	{
		2681	if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))
		2682	return;
		2683
		2684	// TODO: this does not seem to serve any purpose anymore?
		2685	#if 0
		2686	// insert the "Close Container" object.
		2687	if (archetype *closer = new_container->other_arch)
		2688	{
		2689	object *closer = arch_to_object (new_container->other_arch);
		2690	closer->flag [FLAG_NO_MAP_SAVE] = 1;
		2691	new_container->insert (closer);
		2692	}
		2693	#endif
		2694
		2695	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));
		2696
		2697	new_container->flag [FLAG_APPLIED] = 1;
		2698	container = new_container;
		2699
		2700	esrv_update_item (UPD_FLAGS, this, new_container);
		2701	esrv_send_inventory (this, new_container);
		2702	play_sound (sound_find ("chest_open"));
		2703	}
		2704	}
		2705
		2706	object *
		2707	object::force_find (const shstr name)
		2708	{
		2709	/* cycle through his inventory to look for the MARK we want to
		2710	* place
		2711	*/
		2712	for (object *tmp = inv; tmp; tmp = tmp->below)
		2713	if (tmp->type == FORCE && tmp->slaying == name)
		2714	return splay (tmp);
		2715
		2716	return 0;
		2717	}
		2718
		2719	void
		2720	object::force_add (const shstr name, int duration)
		2721	{
		2722	if (object *force = force_find (name))
		2723	force->destroy ();
		2724
		2725	object *force = get_archetype (FORCE_NAME);
		2726
		2727	force->slaying = name;
		2728	force->stats.food = 1;
		2729	force->speed_left = -1.f;
		2730
		2731	force->set_speed (duration ? 1.f / duration : 0.f);
		2732	force->flag [FLAG_IS_USED_UP] = true;
		2733	force->flag [FLAG_APPLIED] = true;
		2734
		2735	insert (force);
		2736	}
		2737
		2738	void
		2739	object::play_sound (faceidx sound) const
		2740	{
		2741	if (!sound)
		2742	return;
		2743
		2744	if (flag [FLAG_REMOVED])
		2745	return;
		2746
		2747	if (env)
		2748	{
		2749	if (object *pl = in_player ())
		2750	pl->contr->play_sound (sound);
		2751	}
		2752	else
		2753	map->play_sound (sound, x, y);
		2754	}
		2755

Diff Legend

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