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.108 by root, Sun Jan 7 02:39:13 2007 UTC vs.
Revision 1.204 by root, Fri Apr 11 17:01:52 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 (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team	4	* Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5	Copyright (C) 2001 Mark Wedel & Crossfire Development Team	5	* Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team
6	Copyright (C) 1992 Frank Tore Johansen	6	* Copyright (©) 1992,2007 Frank Tore Johansen
7		7	*
8	This program is free software; you can redistribute it and/or modify	8	* Deliantra is free software: you can redistribute it and/or modify
9	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
10	the Free Software Foundation; either version 2 of the License, or	10	* the Free Software Foundation, either version 3 of the License, or
11	(at your option) any later version.	11	* (at your option) any later version.
12		12	*
13	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,
14	but WITHOUT ANY WARRANTY; without even the implied warranty of	14	* but WITHOUT ANY WARRANTY; without even the implied warranty of
15	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16	GNU General Public License for more details.	16	* GNU General Public License for more details.
17		17	*
18	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
19	along with this program; if not, write to the Free Software	19	* along with this program. If not, see <http://www.gnu.org/licenses/>.
20	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	20	*
21		21	* The authors can be reached via e-mail to <support@deliantra.net>
22	The authors can be reached via e-mail at <crossfire@schmorp.de>
23	*/	22	*/
24		23
25	/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.	24	/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
26	sub/add_weight will transcend the environment updating the carrying	25	sub/add_weight will transcend the environment updating the carrying
27	variable. */	26	variable. */
28	#include <global.h>	27	#include <global.h>
29	#include <stdio.h>	28	#include <stdio.h>
30	#include <sys/types.h>	29	#include <sys/types.h>
31	#include <sys/uio.h>	30	#include <sys/uio.h>
32	#include <object.h>	31	#include <object.h>
33	#include <funcpoint.h>	32	#include <funcpoint.h>
		33	#include <sproto.h>
34	#include <loader.h>	34	#include <loader.h>
35		35
36	#include <bitset>	36	#include <bitset>
37		37
38	int nrofallocobjects = 0;	38	UUID UUID::cur;
39	static UUID uuid;	39	static uint64_t seq_next_save;
40	const uint64 UUID_SKIP = 1<<19;	40	static const uint64 UUID_GAP = 1<<19;
41		41
42	objectvec objects;	42	objectvec objects;
43	activevec actives;	43	activevec actives;
44		44
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,	45	short freearr_x[SIZEOFFREE] = {
		46	0,
		47	0, 1, 1, 1, 0, -1, -1, -1,
		48	0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -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	49	0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1
47	};	50	};
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,	51	short freearr_y[SIZEOFFREE] = {
		52	0,
		53	-1, -1, 0, 1, 1, 1, 0, -1,
		54	-2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2,
49	-3, -3, -3, -3, -2, -1, 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3	55	-3, -3, -3, -3, -2, -1, 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3
50	};	56	};
51	int maxfree[SIZEOFFREE] = { 0, 9, 10, 13, 14, 17, 18, 21, 22, 25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45,	57	int maxfree[SIZEOFFREE] = {
		58	0,
		59	9, 10, 13, 14, 17, 18, 21, 22,
		60	25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45, 48,
52	48, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49	61	49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49
53	};	62	};
54	int freedir[SIZEOFFREE] = {	63	int freedir[SIZEOFFREE] = {
55	0, 1, 2, 3, 4, 5, 6, 7, 8, 1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8,	64	0,
		65	1, 2, 3, 4, 5, 6, 7, 8,
		66	1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8,
56	1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8	67	1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8
57	};	68	};
58		69
59	static void	70	static void
60	write_uuid (void)	71	write_uuid (uval64 skip, bool sync)
61	{	72	{
62	char filename1[MAX_BUF], filename2[MAX_BUF];	73	CALL_BEGIN (2);
63		74	CALL_ARG_SV (newSVval64 (skip));
64	sprintf (filename1, "%s/uuid", settings.localdir);	75	CALL_ARG_SV (boolSV (sync));
65	sprintf (filename2, "%s/uuid~", settings.localdir);	76	CALL_CALL ("cf::write_uuid", G_DISCARD);
66		77	CALL_END;
67	FILE *fp;
68
69	if (!(fp = fopen (filename2, "w")))
70	{
71	LOG (llevError, "ERROR: cannot open %s for writing, unable to write UUID!\n", filename2);
72	return;
73	}
74
75	fprintf (fp, "<1,%llx>\n", (unsigned long long)uuid.seq + UUID_SKIP * 2);
76	fclose (fp);
77	rename (filename2, filename1);
78	}	78	}
79		79
80	static void	80	static void
81	read_uuid (void)	81	read_uuid (void)
82	{	82	{
83	char filename[MAX_BUF];	83	char filename[MAX_BUF];
84		84
85	sprintf (filename, "%s/uuid", settings.localdir);	85	sprintf (filename, "%s/uuid", settings.localdir);
86		86
		87	seq_next_save = 0;
		88
87	FILE *fp;	89	FILE *fp;
88		90
89	if (!(fp = fopen (filename, "r")))	91	if (!(fp = fopen (filename, "r")))
90	{	92	{
91	if (errno == ENOENT)	93	if (errno == ENOENT)
92	{	94	{
93	LOG (llevInfo, "RESET uid to 1\n");	95	LOG (llevInfo, "RESET uid to 1\n");
94	uuid.seq = 0;	96	UUID::cur.seq = 0;
95	write_uuid ();	97	write_uuid (UUID_GAP, true);
96	return;	98	return;
97	}	99	}
98		100
99	LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);	101	LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);
100	_exit (1);	102	_exit (1);
101	}	103	}
102		104
103	int version;	105	UUID::BUF buf;
104	unsigned long long uid;	106	buf[0] = 0;
105	if (2 != fscanf (fp, "<%d,%llx>\n", &version, &uid) || version != 1)	107	fgets (buf, sizeof (buf), fp);
		108
		109	if (!UUID::cur.parse (buf))
106	{	110	{
107	LOG (llevError, "FATAL: error reading uid from %s!\n", filename);	111	LOG (llevError, "FATAL: error reading uid from %s (%s)!\n", filename, buf);
108	_exit (1);	112	_exit (1);
109	}	113	}
110		114
111	uuid.seq = uid;	115	LOG (llevDebug, "read UUID: %s\n", UUID::cur.c_str ());
112	write_uuid ();	116
113	LOG (llevDebug, "read UID: %" PRId64 "\n", uid);	117	write_uuid (UUID_GAP, true);
114	fclose (fp);	118	fclose (fp);
115	}	119	}
116		120
117	UUID	121	UUID
118	gen_uuid ()	122	UUID::gen ()
119	{	123	{
120	UUID uid;	124	UUID uid;
121		125
122	uid.seq = ++uuid.seq;	126	uid.seq = ++cur.seq;
123		127
124	if (!(uuid.seq & (UUID_SKIP - 1)))	128	if (expect_false (cur.seq >= seq_next_save))
125	write_uuid ();	129	{
		130	seq_next_save = UUID::cur.seq + (UUID_GAP >> 1);
		131	write_uuid (UUID_GAP, false);
		132	}
		133
126		134
127	return uid;	135	return uid;
128	}	136	}
129		137
130	void	138	void
131	init_uuid ()	139	UUID::init ()
132	{	140	{
133	read_uuid ();	141	read_uuid ();
134	}	142	}
135		143
136	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */	144	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */
…		…
254	/* This is really a spellbook check - really, we should	262	/* This is really a spellbook check - really, we should
255	* check all objects in the inventory.	263	* check all objects in the inventory.
256	*/	264	*/
257	if (ob1->inv || ob2->inv)	265	if (ob1->inv || ob2->inv)
258	{	266	{
259	/* if one object has inventory but the other doesn't, not equiv */	267	if (!(ob1->inv && ob2->inv))
260	if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv))	268	return 0; /* inventories differ in length */
261	return 0;
262		269
263	/* Now check to see if the two inventory objects could merge */	270	if (ob1->inv->below || ob2->inv->below)
		271	return 0; /* more than one object in inv */
		272
264	if (!object::can_merge (ob1->inv, ob2->inv))	273	if (!object::can_merge (ob1->inv, ob2->inv))
265	return 0;	274	return 0; /* inventory objexts differ */
266		275
267	/* inventory ok - still need to check rest of this object to see	276	/* inventory ok - still need to check rest of this object to see
268	* if it is valid.	277	* if it is valid.
269	*/	278	*/
270	}	279	}
…		…
299	return 0;	308	return 0;
300	else if (!compare_ob_value_lists (ob1, ob2))	309	else if (!compare_ob_value_lists (ob1, ob2))
301	return 0;	310	return 0;
302	}	311	}
303		312
304	//TODO: generate an event or call into perl for additional checks
305	if (ob1->self || ob2->self)	313	if (ob1->self || ob2->self)
306	{	314	{
307	ob1->optimise ();	315	ob1->optimise ();
308	ob2->optimise ();	316	ob2->optimise ();
309		317
310	if (ob1->self || ob2->self)	318	if (ob1->self || ob2->self)
		319	{
		320	int k1 = ob1->self ? HvTOTALKEYS (ob1->self) : 0;
		321	int k2 = ob2->self ? HvTOTALKEYS (ob2->self) : 0;
		322
		323	if (k1 != k2)
311	return 0;	324	return 0;
		325	else if (k1 == 0)
		326	return 1;
		327	else if (!cfperl_can_merge (ob1, ob2))
		328	return 0;
		329	}
312	}	330	}
313		331
314	/* Everything passes, must be OK. */	332	/* Everything passes, must be OK. */
315	return 1;	333	return 1;
316	}	334	}
…		…
324	sum_weight (object *op)	342	sum_weight (object *op)
325	{	343	{
326	long sum;	344	long sum;
327	object *inv;	345	object *inv;
328		346
329	for (sum = 0, inv = op->inv; inv != NULL; inv = inv->below)	347	for (sum = 0, inv = op->inv; inv; inv = inv->below)
330	{	348	{
331	if (inv->inv)	349	if (inv->inv)
332	sum_weight (inv);	350	sum_weight (inv);
		351
333	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);	352	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);
334	}	353	}
335		354
336	if (op->type == CONTAINER && op->stats.Str)	355	if (op->type == CONTAINER && op->stats.Str)
337	sum = (sum * (100 - op->stats.Str)) / 100;	356	sum = (sum * (100 - op->stats.Str)) / 100;
…		…
357	/*	376	/*
358	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.	377	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
359	* Some error messages.	378	* Some error messages.
360	* The result of the dump is stored in the static global errmsg array.	379	* The result of the dump is stored in the static global errmsg array.
361	*/	380	*/
362
363	char *	381	char *
364	dump_object (object *op)	382	dump_object (object *op)
365	{	383	{
366	if (!op)	384	if (!op)
367	return strdup ("[NULLOBJ]");	385	return strdup ("[NULLOBJ]");
368		386
369	object_freezer freezer;	387	object_freezer freezer;
370	save_object (freezer, op, 1);	388	op->write (freezer);
371	return freezer.as_string ();	389	return freezer.as_string ();
372	}	390	}
373		391
374	/*	392	/*
375	* get_nearest_part(multi-object, object 2) returns the part of the	393	* get_nearest_part(multi-object, object 2) returns the part of the
376	* multi-object 1 which is closest to the second object.	394	* multi-object 1 which is closest to the second object.
377	* If it's not a multi-object, it is returned.	395	* If it's not a multi-object, it is returned.
378	*/	396	*/
379
380	object *	397	object *
381	get_nearest_part (object *op, const object *pl)	398	get_nearest_part (object *op, const object *pl)
382	{	399	{
383	object *tmp, *closest;	400	object *tmp, *closest;
384	int last_dist, i;	401	int last_dist, i;
…		…
395	* Returns the object which has the count-variable equal to the argument.	412	* Returns the object which has the count-variable equal to the argument.
396	*/	413	*/
397	object *	414	object *
398	find_object (tag_t i)	415	find_object (tag_t i)
399	{	416	{
400	return ((unsigned int)i) < objects.size ()	417	for_all_objects (op)
401	? objects [i]	418	if (op->count == i)
402	: 0;	419	return op;
		420
		421	return 0;
403	}	422	}
404		423
405	/*	424	/*
406	* Returns the first object which has a name equal to the argument.	425	* Returns the first object which has a name equal to the argument.
407	* Used only by the patch command, but not all that useful.	426	* Used only by the patch command, but not all that useful.
…		…
418	break;	437	break;
419		438
420	return op;	439	return op;
421	}	440	}
422		441
423	void
424	free_all_object_data ()
425	{
426	LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);
427	}
428
429	/*	442	/*
430	* Sets the owner and sets the skill and exp pointers to owner's current	443	* Sets the owner and sets the skill and exp pointers to owner's current
431	* skill and experience objects.	444	* skill and experience objects.
		445	* ACTUALLY NO! investigate! TODO
432	*/	446	*/
433	void	447	void
434	object::set_owner (object *owner)	448	object::set_owner (object *owner)
435	{	449	{
		450	// allow objects which own objects
436	if (!owner)	451	if (owner)
437	return;
438
439	/* next line added to allow objects which own objects */
440	/* Add a check for ownercounts in here, as I got into an endless loop
441	* with the fireball owning a poison cloud which then owned the
442	* fireball. I believe that was caused by one of the objects getting
443	* freed and then another object replacing it. Since the ownercounts
444	* didn't match, this check is valid and I believe that cause is valid.
445	*/
446	while (owner->owner)	452	while (owner->owner)
447	owner = owner->owner;	453	owner = owner->owner;
		454
		455	if (flag [FLAG_FREED])
		456	{
		457	LOG (llevError | logBacktrace, "tried to set owner of %s to %s\n", debug_desc (), owner->debug_desc ());
		458	return;
		459	}
448		460
449	this->owner = owner;	461	this->owner = owner;
		462	}
		463
		464	int
		465	object::slottype () const
		466	{
		467	if (type == SKILL)
		468	{
		469	if (IS_COMBAT_SKILL (subtype)) return slot_combat;
		470	if (IS_RANGED_SKILL (subtype)) return slot_ranged;
		471	}
		472	else
		473	{
		474	if (slot [body_combat].info) return slot_combat;
		475	if (slot [body_range ].info) return slot_ranged;
		476	}
		477
		478	return slot_none;
		479	}
		480
		481	bool
		482	object::change_weapon (object *ob)
		483	{
		484	if (current_weapon == ob)
		485	return true;
		486
		487	if (chosen_skill)
		488	chosen_skill->flag [FLAG_APPLIED] = false;
		489
		490	current_weapon = ob;
		491	chosen_skill = !ob || ob->type == SKILL ? ob : find_skill_by_name (this, ob->skill);
		492
		493	if (chosen_skill)
		494	chosen_skill->flag [FLAG_APPLIED] = true;
		495
		496	update_stats ();
		497
		498	if (ob)
		499	{
		500	// now check wether any body locations became invalid, in which case
		501	// we cannot apply the weapon at the moment.
		502	for (int i = 0; i < NUM_BODY_LOCATIONS; ++i)
		503	if (slot[i].used < 0)
		504	{
		505	current_weapon = chosen_skill = 0;
		506	update_stats ();
		507
		508	new_draw_info_format (NDI_UNIQUE, 0, this,
		509	"You try to balance all your items at once, "
		510	"but the %s is just too much for your body. "
		511	"[You need to unapply some items first.]", &ob->name);
		512	return false;
		513	}
		514
		515	//new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);
		516	}
		517	else
		518	;//new_draw_info_format (NDI_UNIQUE, 0, this, "You unwield your weapons.");
		519
		520	if (ob && !ob->flag [FLAG_APPLIED] && ob->type != SPELL)
		521	{
		522	LOG (llevError | logBacktrace, "%s changed to unapplied weapon %s",
		523	&name, ob->debug_desc ());
		524	return false;
		525	}
		526
		527	return true;
450	}	528	}
451		529
452	/* Zero the key_values on op, decrementing the shared-string	530	/* Zero the key_values on op, decrementing the shared-string
453	* refcounts and freeing the links.	531	* refcounts and freeing the links.
454	*/	532	*/
455	static void	533	static void
456	free_key_values (object *op)	534	free_key_values (object *op)
457	{	535	{
458	for (key_value *i = op->key_values; i != 0;)	536	for (key_value *i = op->key_values; i; )
459	{	537	{
460	key_value *next = i->next;	538	key_value *next = i->next;
461	delete i;	539	delete i;
462		540
463	i = next;	541	i = next;
464	}	542	}
465		543
466	op->key_values = 0;	544	op->key_values = 0;
467	}	545	}
468		546
469	/*	547	object &
470	* copy_to first frees everything allocated by the dst object,	548	object::operator =(const object &src)
471	* and then copies the contents of itself into the second
472	* object, allocating what needs to be allocated. Basically, any
473	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
474	* if the first object is freed, the pointers in the new object
475	* will point at garbage.
476	*/
477	void
478	object::copy_to (object *dst)
479	{	549	{
480	bool is_freed = QUERY_FLAG (dst, FLAG_FREED);	550	bool is_freed = flag [FLAG_FREED];
481	bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED);	551	bool is_removed = flag [FLAG_REMOVED];
482		552
483	*(object_copy *)dst = *this;	553	*(object_copy *)this = src;
484		554
485	if (is_freed)	555	flag [FLAG_FREED] = is_freed;
486	SET_FLAG (dst, FLAG_FREED);	556	flag [FLAG_REMOVED] = is_removed;
487
488	if (is_removed)
489	SET_FLAG (dst, FLAG_REMOVED);
490
491	if (speed < 0)
492	dst->speed_left = speed_left - RANDOM () % 200 / 100.0;
493		557
494	/* Copy over key_values, if any. */	558	/* Copy over key_values, if any. */
495	if (key_values)	559	if (src.key_values)
496	{	560	{
497	key_value *tail = 0;	561	key_value *tail = 0;
498	key_value *i;
499
500	dst->key_values = 0;	562	key_values = 0;
501		563
502	for (i = key_values; i; i = i->next)	564	for (key_value *i = src.key_values; i; i = i->next)
503	{	565	{
504	key_value *new_link = new key_value;	566	key_value *new_link = new key_value;
505		567
506	new_link->next = 0;	568	new_link->next = 0;
507	new_link->key = i->key;	569	new_link->key = i->key;
508	new_link->value = i->value;	570	new_link->value = i->value;
509		571
510	/* Try and be clever here, too. */	572	/* Try and be clever here, too. */
511	if (!dst->key_values)	573	if (!key_values)
512	{	574	{
513	dst->key_values = new_link;	575	key_values = new_link;
514	tail = new_link;	576	tail = new_link;
515	}	577	}
516	else	578	else
517	{	579	{
518	tail->next = new_link;	580	tail->next = new_link;
519	tail = new_link;	581	tail = new_link;
520	}	582	}
521	}	583	}
522	}	584	}
		585	}
		586
		587	/*
		588	* copy_to first frees everything allocated by the dst object,
		589	* and then copies the contents of itself into the second
		590	* object, allocating what needs to be allocated. Basically, any
		591	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
		592	* if the first object is freed, the pointers in the new object
		593	* will point at garbage.
		594	*/
		595	void
		596	object::copy_to (object *dst)
		597	{
		598	*dst = *this;
		599
		600	if (speed < 0)
		601	dst->speed_left -= rndm ();
523		602
524	dst->set_speed (dst->speed);	603	dst->set_speed (dst->speed);
		604	}
		605
		606	void
		607	object::instantiate ()
		608	{
		609	if (!uuid.seq) // HACK
		610	uuid = UUID::gen ();
		611
		612	speed_left = -0.1f;
		613	/* copy the body_info to the body_used - this is only really
		614	* need for monsters, but doesn't hurt to do it for everything.
		615	* by doing so, when a monster is created, it has good starting
		616	* values for the body_used info, so when items are created
		617	* for it, they can be properly equipped.
		618	*/
		619	for (int i = NUM_BODY_LOCATIONS; i--; )
		620	slot[i].used = slot[i].info;
		621
		622	attachable::instantiate ();
525	}	623	}
526		624
527	object *	625	object *
528	object::clone ()	626	object::clone ()
529	{	627	{
…		…
587	* UP_OBJ_FACE: only the objects face has changed.	685	* UP_OBJ_FACE: only the objects face has changed.
588	*/	686	*/
589	void	687	void
590	update_object (object *op, int action)	688	update_object (object *op, int action)
591	{	689	{
592	MoveType move_on, move_off, move_block, move_slow;
593
594	if (op == NULL)	690	if (op == NULL)
595	{	691	{
596	/* this should never happen */	692	/* this should never happen */
597	LOG (llevDebug, "update_object() called for NULL object.\n");	693	LOG (llevDebug, "update_object() called for NULL object.\n");
598	return;	694	return;
…		…
658		754
659	if (op->more)	755	if (op->more)
660	update_object (op->more, action);	756	update_object (op->more, action);
661	}	757	}
662		758
663	object *object::first;
664
665	object::object ()	759	object::object ()
666	{	760	{
667	SET_FLAG (this, FLAG_REMOVED);	761	SET_FLAG (this, FLAG_REMOVED);
668		762
669	expmul = 1.0;	763	expmul = 1.0;
670	face = blank_face;	764	face = blank_face;
671	}	765	}
672		766
673	object::~object ()	767	object::~object ()
674	{	768	{
		769	unlink ();
		770
675	free_key_values (this);	771	free_key_values (this);
676	}	772	}
677		773
		774	static int object_count;
		775
678	void object::link ()	776	void object::link ()
679	{	777	{
680	uuid = gen_uuid ();	778	assert (!index);//D
		779	uuid = UUID::gen ();
		780	count = ++object_count;
681		781
		782	refcnt_inc ();
682	objects.insert (this);	783	objects.insert (this);
683	}	784	}
684		785
685	void object::unlink ()	786	void object::unlink ()
686	{	787	{
		788	if (!index)
		789	return;
		790
687	objects.erase (this);	791	objects.erase (this);
		792	refcnt_dec ();
688	}	793	}
689		794
690	void	795	void
691	object::activate ()	796	object::activate ()
692	{	797	{
…		…
764	* drop on that space.	869	* drop on that space.
765	*/	870	*/
766	if (!drop_to_ground	871	if (!drop_to_ground
767	|| !map	872	|| !map
768	|| map->in_memory != MAP_IN_MEMORY	873	|| map->in_memory != MAP_IN_MEMORY
		874	|| map->nodrop
769	|| ms ().move_block == MOVE_ALL)	875	|| ms ().move_block == MOVE_ALL)
770	{	876	{
771	while (inv)	877	while (inv)
772	{	878	{
773	inv->destroy_inv (drop_to_ground);	879	inv->destroy_inv (drop_to_ground);
…		…
782		888
783	if (op->flag [FLAG_STARTEQUIP]	889	if (op->flag [FLAG_STARTEQUIP]
784	|| op->flag [FLAG_NO_DROP]	890	|| op->flag [FLAG_NO_DROP]
785	|| op->type == RUNE	891	|| op->type == RUNE
786	|| op->type == TRAP	892	|| op->type == TRAP
787	|| op->flag [FLAG_IS_A_TEMPLATE])	893	|| op->flag [FLAG_IS_A_TEMPLATE]
		894	|| op->flag [FLAG_DESTROY_ON_DEATH])
788	op->destroy ();	895	op->destroy ();
789	else	896	else
790	map->insert (op, x, y);	897	map->insert (op, x, y);
791	}	898	}
792	}	899	}
…		…
800	}	907	}
801		908
802	void	909	void
803	object::do_destroy ()	910	object::do_destroy ()
804	{	911	{
		912	attachable::do_destroy ();
		913
805	if (flag [FLAG_IS_LINKED])	914	if (flag [FLAG_IS_LINKED])
806	remove_button_link (this);	915	remove_button_link (this);
807		916
808	if (flag [FLAG_FRIENDLY])	917	if (flag [FLAG_FRIENDLY])
809	remove_friendly_object (this);	918	remove_friendly_object (this);
810		919
811	if (!flag [FLAG_REMOVED])	920	if (!flag [FLAG_REMOVED])
812	remove ();	921	remove ();
813		922
814	if (flag [FLAG_FREED])	923	destroy_inv (true);
815	return;
816		924
817	set_speed (0);	925	deactivate ();
		926	unlink ();
818		927
819	flag [FLAG_FREED] = 1;	928	flag [FLAG_FREED] = 1;
820
821	attachable::do_destroy ();
822
823	destroy_inv (true);
824	unlink ();
825		929
826	// hack to ensure that freed objects still have a valid map	930	// hack to ensure that freed objects still have a valid map
827	{	931	{
828	static maptile *freed_map; // freed objects are moved here to avoid crashes	932	static maptile *freed_map; // freed objects are moved here to avoid crashes
829		933
830	if (!freed_map)	934	if (!freed_map)
831	{	935	{
832	freed_map = new maptile;	936	freed_map = new maptile;
833		937
		938	freed_map->path = "<freed objects map>";
834	freed_map->name = "/internal/freed_objects_map";	939	freed_map->name = "/internal/freed_objects_map";
835	freed_map->width = 3;	940	freed_map->width = 3;
836	freed_map->height = 3;	941	freed_map->height = 3;
		942	freed_map->nodrop = 1;
837		943
838	freed_map->alloc ();	944	freed_map->alloc ();
839	freed_map->in_memory = MAP_IN_MEMORY;	945	freed_map->in_memory = MAP_IN_MEMORY;
840	}	946	}
841		947
842	map = freed_map;	948	map = freed_map;
843	x = 1;	949	x = 1;
844	y = 1;	950	y = 1;
845	}	951	}
846		952
847	head = 0;
848
849	if (more)	953	if (more)
850	{	954	{
851	more->destroy ();	955	more->destroy ();
852	more = 0;	956	more = 0;
853	}	957	}
854		958
		959	head = 0;
		960
855	// clear those pointers that likely might have circular references to us	961	// clear those pointers that likely might cause circular references
856	owner = 0;	962	owner = 0;
857	enemy = 0;	963	enemy = 0;
858	attacked_by = 0;	964	attacked_by = 0;
		965	current_weapon = 0;
859	}	966	}
860		967
861	void	968	void
862	object::destroy (bool destroy_inventory)	969	object::destroy (bool destroy_inventory)
863	{	970	{
864	if (destroyed ())	971	if (destroyed ())
865	return;	972	return;
866		973
867	if (destroy_inventory)	974	if (destroy_inventory)
868	destroy_inv (false);	975	destroy_inv (false);
		976
		977	if (is_head ())
		978	if (sound_destroy)
		979	play_sound (sound_destroy);
		980	else if (flag [FLAG_MONSTER])
		981	play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism
869		982
870	attachable::destroy ();	983	attachable::destroy ();
871	}	984	}
872		985
873	/*	986	/*
…		…
891	* This function removes the object op from the linked list of objects	1004	* This function removes the object op from the linked list of objects
892	* which it is currently tied to. When this function is done, the	1005	* which it is currently tied to. When this function is done, the
893	* object will have no environment. If the object previously had an	1006	* object will have no environment. If the object previously had an
894	* environment, the x and y coordinates will be updated to	1007	* environment, the x and y coordinates will be updated to
895	* the previous environment.	1008	* the previous environment.
896	* Beware: This function is called from the editor as well!
897	*/	1009	*/
898	void	1010	void
899	object::remove ()	1011	object::do_remove ()
900	{	1012	{
901	object *tmp, *last = 0;	1013	object *tmp, *last = 0;
902	object *otmp;	1014	object *otmp;
903		1015
904	if (QUERY_FLAG (this, FLAG_REMOVED))	1016	if (QUERY_FLAG (this, FLAG_REMOVED))
…		…
947	}	1059	}
948	else if (map)	1060	else if (map)
949	{	1061	{
950	if (type == PLAYER)	1062	if (type == PLAYER)
951	{	1063	{
		1064	// leaving a spot always closes any open container on the ground
		1065	if (container && !container->env)
		1066	// this causes spurious floorbox updates, but it ensures
		1067	// that the CLOSE event is being sent.
		1068	close_container ();
		1069
952	--map->players;	1070	--map->players;
953	map->touch ();	1071	map->touch ();
954	}	1072	}
955		1073
956	map->dirty = true;	1074	map->dirty = true;
		1075	mapspace &ms = this->ms ();
957		1076
958	/* link the object above us */	1077	/* link the object above us */
959	if (above)	1078	if (above)
960	above->below = below;	1079	above->below = below;
961	else	1080	else
962	map->at (x, y).top = below; /* we were top, set new top */	1081	ms.top = below; /* we were top, set new top */
963		1082
964	/* Relink the object below us, if there is one */	1083	/* Relink the object below us, if there is one */
965	if (below)	1084	if (below)
966	below->above = above;	1085	below->above = above;
967	else	1086	else
…		…
969	/* Nothing below, which means we need to relink map object for this space	1088	/* Nothing below, which means we need to relink map object for this space
970	* use translated coordinates in case some oddness with map tiling is	1089	* use translated coordinates in case some oddness with map tiling is
971	* evident	1090	* evident
972	*/	1091	*/
973	if (GET_MAP_OB (map, x, y) != this)	1092	if (GET_MAP_OB (map, x, y) != this)
974	{
975	char *dump = dump_object (this);
976	LOG (llevError,
977	"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);	1093	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 ());
978	free (dump);
979	dump = dump_object (GET_MAP_OB (map, x, y));
980	LOG (llevError, "%s\n", dump);
981	free (dump);
982	}
983		1094
984	map->at (x, y).bot = above; /* goes on above it. */	1095	ms.bot = above; /* goes on above it. */
985	}	1096	}
986		1097
987	above = 0;	1098	above = 0;
988	below = 0;	1099	below = 0;
989		1100
990	if (map->in_memory == MAP_SAVING)	1101	if (map->in_memory == MAP_SAVING)
991	return;	1102	return;
992		1103
993	int check_walk_off = !flag [FLAG_NO_APPLY];	1104	int check_walk_off = !flag [FLAG_NO_APPLY];
994		1105
		1106	if (object *pl = ms.player ())
		1107	{
		1108	if (pl->container == this)
		1109	/* If a container that the player is currently using somehow gets
		1110	* removed (most likely destroyed), update the player view
		1111	* appropriately.
		1112	*/
		1113	pl->close_container ();
		1114
		1115	pl->contr->ns->floorbox_update ();
		1116	}
		1117
995	for (tmp = map->at (x, y).bot; tmp; tmp = tmp->above)	1118	for (tmp = ms.bot; tmp; tmp = tmp->above)
996	{	1119	{
997	/* No point updating the players look faces if he is the object	1120	/* No point updating the players look faces if he is the object
998	* being removed.	1121	* being removed.
999	*/	1122	*/
1000
1001	if (tmp->type == PLAYER && tmp != this)
1002	{
1003	/* If a container that the player is currently using somehow gets
1004	* removed (most likely destroyed), update the player view
1005	* appropriately.
1006	*/
1007	if (tmp->container == this)
1008	{
1009	flag [FLAG_APPLIED] = 0;
1010	tmp->container = 0;
1011	}
1012
1013	if (tmp->contr->ns)
1014	tmp->contr->ns->floorbox_update ();
1015	}
1016		1123
1017	/* See if object moving off should effect something */	1124	/* See if object moving off should effect something */
1018	if (check_walk_off	1125	if (check_walk_off
1019	&& ((move_type & tmp->move_off)	1126	&& ((move_type & tmp->move_off)
1020	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))	1127	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
…		…
1023		1130
1024	if (destroyed ())	1131	if (destroyed ())
1025	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());	1132	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1026	}	1133	}
1027		1134
1028	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1029	//TODO: why is this horrible hacka fix? get rid of this code=bug! (schmorp)
1030	if (tmp->above == tmp)
1031	tmp->above = 0;
1032
1033	last = tmp;	1135	last = tmp;
1034	}	1136	}
1035		1137
1036	/* last == NULL if there are no objects on this space */	1138	/* last == NULL if there are no objects on this space */
1037	//TODO: this makes little sense, why only update the topmost object?	1139	//TODO: this makes little sense, why only update the topmost object?
…		…
1057	merge_ob (object *op, object *top)	1159	merge_ob (object *op, object *top)
1058	{	1160	{
1059	if (!op->nrof)	1161	if (!op->nrof)
1060	return 0;	1162	return 0;
1061		1163
1062	if (top)	1164	if (!top)
1063	for (top = op; top && top->above; top = top->above)	1165	for (top = op; top && top->above; top = top->above)
1064	;	1166	;
1065		1167
1066	for (; top; top = top->below)	1168	for (; top; top = top->below)
1067	{	1169	{
…		…
1080	}	1182	}
1081		1183
1082	return 0;	1184	return 0;
1083	}	1185	}
1084		1186
		1187	void
		1188	object::expand_tail ()
		1189	{
		1190	if (more)
		1191	return;
		1192
		1193	object *prev = this;
		1194
		1195	for (archetype *at = (archetype *)arch->more; at; at = (archetype *)at->more)
		1196	{
		1197	object *op = arch_to_object (at);
		1198
		1199	op->name = name;
		1200	op->name_pl = name_pl;
		1201	op->title = title;
		1202
		1203	op->head = this;
		1204	prev->more = op;
		1205
		1206	prev = op;
		1207	}
		1208	}
		1209
1085	/*	1210	/*
1086	* same as insert_ob_in_map except it handle separate coordinates and do a clean	1211	* same as insert_ob_in_map except it handles separate coordinates and does a clean
1087	* job preparing multi-part monsters	1212	* job preparing multi-part monsters.
1088	*/	1213	*/
1089	object *	1214	object *
1090	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)	1215	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1091	{	1216	{
1092	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)	1217	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1093	{	1218	{
1094	tmp->x = x + tmp->arch->clone.x;	1219	tmp->x = x + tmp->arch->x;
1095	tmp->y = y + tmp->arch->clone.y;	1220	tmp->y = y + tmp->arch->y;
1096	}	1221	}
1097		1222
1098	return insert_ob_in_map (op, m, originator, flag);	1223	return insert_ob_in_map (op, m, originator, flag);
1099	}	1224	}
1100		1225
…		…
1119	* just 'op' otherwise	1244	* just 'op' otherwise
1120	*/	1245	*/
1121	object *	1246	object *
1122	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)	1247	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1123	{	1248	{
		1249	assert (!op->flag [FLAG_FREED]);
		1250
1124	object *tmp, *top, *floor = NULL;	1251	object *top, *floor = NULL;
1125	sint16 x, y;
1126		1252
1127	if (QUERY_FLAG (op, FLAG_FREED))	1253	op->remove ();
1128	{
1129	LOG (llevError, "Trying to insert freed object!\n");
1130	return NULL;
1131	}
1132
1133	if (!m)
1134	{
1135	char *dump = dump_object (op);
1136	LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
1137	free (dump);
1138	return op;
1139	}
1140
1141	if (out_of_map (m, op->x, op->y))
1142	{
1143	char *dump = dump_object (op);
1144	LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump);
1145	#ifdef MANY_CORES
1146	/* Better to catch this here, as otherwise the next use of this object
1147	* is likely to cause a crash. Better to find out where it is getting
1148	* improperly inserted.
1149	*/
1150	abort ();
1151	#endif
1152	free (dump);
1153	return op;
1154	}
1155
1156	if (!QUERY_FLAG (op, FLAG_REMOVED))
1157	{
1158	char *dump = dump_object (op);
1159	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
1160	free (dump);
1161	return op;
1162	}
1163
1164	if (op->more)
1165	{
1166	/* The part may be on a different map. */
1167
1168	object *more = op->more;
1169
1170	/* We really need the caller to normalise coordinates - if
1171	* we set the map, that doesn't work if the location is within
1172	* a map and this is straddling an edge. So only if coordinate
1173	* is clear wrong do we normalise it.
1174	*/
1175	if (OUT_OF_REAL_MAP (more->map, more->x, more->y))
1176	more->map = get_map_from_coord (m, &more->x, &more->y);
1177	else if (!more->map)
1178	{
1179	/* For backwards compatibility - when not dealing with tiled maps,
1180	* more->map should always point to the parent.
1181	*/
1182	more->map = m;
1183	}
1184
1185	if (insert_ob_in_map (more, more->map, originator, flag) == NULL)
1186	{
1187	if (!op->head)
1188	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1189
1190	return 0;
1191	}
1192	}
1193
1194	CLEAR_FLAG (op, FLAG_REMOVED);
1195		1254
1196	/* Ideally, the caller figures this out. However, it complicates a lot	1255	/* Ideally, the caller figures this out. However, it complicates a lot
1197	* of areas of callers (eg, anything that uses find_free_spot would now	1256	* of areas of callers (eg, anything that uses find_free_spot would now
1198	* need extra work	1257	* need extra work
1199	*/	1258	*/
1200	op->map = get_map_from_coord (m, &op->x, &op->y);	1259	if (!xy_normalise (m, op->x, op->y))
1201	x = op->x;	1260	{
1202	y = op->y;	1261	op->destroy ();
		1262	return 0;
		1263	}
		1264
		1265	if (object *more = op->more)
		1266	if (!insert_ob_in_map (more, m, originator, flag))
		1267	return 0;
		1268
		1269	CLEAR_FLAG (op, FLAG_REMOVED);
		1270
		1271	op->map = m;
		1272	mapspace &ms = op->ms ();
1203		1273
1204	/* this has to be done after we translate the coordinates.	1274	/* this has to be done after we translate the coordinates.
1205	*/	1275	*/
1206	if (op->nrof && !(flag & INS_NO_MERGE))	1276	if (op->nrof && !(flag & INS_NO_MERGE))
1207	for (tmp = GET_MAP_OB (op->map, x, y); tmp; tmp = tmp->above)	1277	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1208	if (object::can_merge (op, tmp))	1278	if (object::can_merge (op, tmp))
1209	{	1279	{
1210	op->nrof += tmp->nrof;	1280	op->nrof += tmp->nrof;
1211	tmp->destroy ();	1281	tmp->destroy ();
1212	}	1282	}
…		…
1229	op->below = originator->below;	1299	op->below = originator->below;
1230		1300
1231	if (op->below)	1301	if (op->below)
1232	op->below->above = op;	1302	op->below->above = op;
1233	else	1303	else
1234	op->ms ().bot = op;	1304	ms.bot = op;
1235		1305
1236	/* since *below* originator, no need to update top */	1306	/* since *below* originator, no need to update top */
1237	originator->below = op;	1307	originator->below = op;
1238	}	1308	}
1239	else	1309	else
1240	{	1310	{
		1311	top = ms.bot;
		1312
1241	/* If there are other objects, then */	1313	/* If there are other objects, then */
1242	if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL))	1314	if (top)
1243	{	1315	{
1244	object *last = 0;	1316	object *last = 0;
1245		1317
1246	/*	1318	/*
1247	* If there are multiple objects on this space, we do some trickier handling.	1319	* If there are multiple objects on this space, we do some trickier handling.
…		…
1253	* once we get to them. This reduces the need to traverse over all of	1325	* once we get to them. This reduces the need to traverse over all of
1254	* them when adding another one - this saves quite a bit of cpu time	1326	* them when adding another one - this saves quite a bit of cpu time
1255	* when lots of spells are cast in one area. Currently, it is presumed	1327	* when lots of spells are cast in one area. Currently, it is presumed
1256	* that flying non pickable objects are spell objects.	1328	* that flying non pickable objects are spell objects.
1257	*/	1329	*/
1258	while (top)	1330	for (top = ms.bot; top; top = top->above)
1259	{	1331	{
1260	if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))	1332	if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))
1261	floor = top;	1333	floor = top;
1262		1334
1263	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))	1335	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))
…		…
1266	top = top->below;	1338	top = top->below;
1267	break;	1339	break;
1268	}	1340	}
1269		1341
1270	last = top;	1342	last = top;
1271	top = top->above;
1272	}	1343	}
1273		1344
1274	/* Don't want top to be NULL, so set it to the last valid object */	1345	/* Don't want top to be NULL, so set it to the last valid object */
1275	top = last;	1346	top = last;
1276		1347
…		…
1278	* looks like instead of lots of conditions here.	1349	* looks like instead of lots of conditions here.
1279	* makes things faster, and effectively the same result.	1350	* makes things faster, and effectively the same result.
1280	*/	1351	*/
1281		1352
1282	/* Have object 'fall below' other objects that block view.	1353	/* Have object 'fall below' other objects that block view.
1283	* Unless those objects are exits, type 66	1354	* Unless those objects are exits.
1284	* If INS_ON_TOP is used, don't do this processing	1355	* If INS_ON_TOP is used, don't do this processing
1285	* Need to find the object that in fact blocks view, otherwise	1356	* Need to find the object that in fact blocks view, otherwise
1286	* stacking is a bit odd.	1357	* stacking is a bit odd.
1287	*/	1358	*/
1288	if (!(flag & INS_ON_TOP) &&	1359	if (!(flag & INS_ON_TOP)
1289	(get_map_flags (op->map, 0, op->x, op->y, 0, 0) & P_BLOCKSVIEW) && (op->face && !op->face->visibility))	1360	&& ms.flags () & P_BLOCKSVIEW
		1361	&& (op->face && !faces [op->face].visibility))
1290	{	1362	{
1291	for (last = top; last != floor; last = last->below)	1363	for (last = top; last != floor; last = last->below)
1292	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1364	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1293	break;	1365	break;
		1366
1294	/* Check to see if we found the object that blocks view,	1367	/* Check to see if we found the object that blocks view,
1295	* and make sure we have a below pointer for it so that	1368	* and make sure we have a below pointer for it so that
1296	* we can get inserted below this one, which requires we	1369	* we can get inserted below this one, which requires we
1297	* set top to the object below us.	1370	* set top to the object below us.
1298	*/	1371	*/
1299	if (last && last->below && last != floor)	1372	if (last && last->below && last != floor)
1300	top = last->below;	1373	top = last->below;
1301	}	1374	}
1302	} /* If objects on this space */	1375	} /* If objects on this space */
1303		1376
1304	if (flag & INS_MAP_LOAD)
1305	top = GET_MAP_TOP (op->map, op->x, op->y);
1306
1307	if (flag & INS_ABOVE_FLOOR_ONLY)	1377	if (flag & INS_ABOVE_FLOOR_ONLY)
1308	top = floor;	1378	top = floor;
1309		1379
1310	/* Top is the object that our object (op) is going to get inserted above.	1380	/* Top is the object that our object (op) is going to get inserted above.
1311	*/	1381	*/
1312		1382
1313	/* First object on this space */	1383	/* First object on this space */
1314	if (!top)	1384	if (!top)
1315	{	1385	{
1316	op->above = GET_MAP_OB (op->map, op->x, op->y);	1386	op->above = ms.bot;
1317		1387
1318	if (op->above)	1388	if (op->above)
1319	op->above->below = op;	1389	op->above->below = op;
1320		1390
1321	op->below = 0;	1391	op->below = 0;
1322	op->ms ().bot = op;	1392	ms.bot = op;
1323	}	1393	}
1324	else	1394	else
1325	{ /* get inserted into the stack above top */	1395	{ /* get inserted into the stack above top */
1326	op->above = top->above;	1396	op->above = top->above;
1327		1397
…		…
1331	op->below = top;	1401	op->below = top;
1332	top->above = op;	1402	top->above = op;
1333	}	1403	}
1334		1404
1335	if (!op->above)	1405	if (!op->above)
1336	op->ms ().top = op;	1406	ms.top = op;
1337	} /* else not INS_BELOW_ORIGINATOR */	1407	} /* else not INS_BELOW_ORIGINATOR */
1338		1408
1339	if (op->type == PLAYER)	1409	if (op->type == PLAYER)
1340	{	1410	{
1341	op->contr->do_los = 1;	1411	op->contr->do_los = 1;
…		…
1343	op->map->touch ();	1413	op->map->touch ();
1344	}	1414	}
1345		1415
1346	op->map->dirty = true;	1416	op->map->dirty = true;
1347		1417
1348	/* If we have a floor, we know the player, if any, will be above
1349	* it, so save a few ticks and start from there.
1350	*/
1351	if (!(flag & INS_MAP_LOAD))
1352	if (object *pl = op->ms ().player ())	1418	if (object *pl = ms.player ())
1353	if (pl->contr->ns)
1354	pl->contr->ns->floorbox_update ();	1419	pl->contr->ns->floorbox_update ();
1355		1420
1356	/* If this object glows, it may affect lighting conditions that are	1421	/* If this object glows, it may affect lighting conditions that are
1357	* visible to others on this map. But update_all_los is really	1422	* visible to others on this map. But update_all_los is really
1358	* an inefficient way to do this, as it means los for all players	1423	* an inefficient way to do this, as it means los for all players
1359	* on the map will get recalculated. The players could very well	1424	* on the map will get recalculated. The players could very well
…		…
1378	* blocked() and wall() work properly), and these flags are updated by	1443	* blocked() and wall() work properly), and these flags are updated by
1379	* update_object().	1444	* update_object().
1380	*/	1445	*/
1381		1446
1382	/* if this is not the head or flag has been passed, don't check walk on status */	1447	/* if this is not the head or flag has been passed, don't check walk on status */
1383	if (!(flag & INS_NO_WALK_ON) && !op->head)	1448	if (!(flag & INS_NO_WALK_ON) && op->head_ () == op)
1384	{	1449	{
1385	if (check_move_on (op, originator))	1450	if (check_move_on (op, originator))
1386	return 0;	1451	return 0;
1387		1452
1388	/* If we are a multi part object, lets work our way through the check	1453	/* If we are a multi part object, lets work our way through the check
1389	* walk on's.	1454	* walk on's.
1390	*/	1455	*/
1391	for (tmp = op->more; tmp != NULL; tmp = tmp->more)	1456	for (object *tmp = op->more; tmp; tmp = tmp->more)
1392	if (check_move_on (tmp, originator))	1457	if (check_move_on (tmp, originator))
1393	return 0;	1458	return 0;
1394	}	1459	}
1395		1460
1396	return op;	1461	return op;
…		…
1406	object *tmp, *tmp1;	1471	object *tmp, *tmp1;
1407		1472
1408	/* first search for itself and remove any old instances */	1473	/* first search for itself and remove any old instances */
1409		1474
1410	for (tmp = op->ms ().bot; tmp; tmp = tmp->above)	1475	for (tmp = op->ms ().bot; tmp; tmp = tmp->above)
1411	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */	1476	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */
1412	tmp->destroy ();	1477	tmp->destroy ();
1413		1478
1414	tmp1 = arch_to_object (archetype::find (arch_string));	1479	tmp1 = arch_to_object (archetype::find (arch_string));
1415		1480
1416	tmp1->x = op->x;	1481	tmp1->x = op->x;
…		…
1419	}	1484	}
1420		1485
1421	object *	1486	object *
1422	object::insert_at (object *where, object *originator, int flags)	1487	object::insert_at (object *where, object *originator, int flags)
1423	{	1488	{
1424	where->map->insert (this, where->x, where->y, originator, flags);	1489	return where->map->insert (this, where->x, where->y, originator, flags);
1425	}	1490	}
1426		1491
1427	/*	1492	/*
1428	* get_split_ob(ob,nr) splits up ob into two parts. The part which	1493	* get_split_ob(ob,nr) splits up ob into two parts. The part which
1429	* is returned contains nr objects, and the remaining parts contains	1494	* is returned contains nr objects, and the remaining parts contains
…		…
1469	* the amount of an object. If the amount reaches 0, the object	1534	* the amount of an object. If the amount reaches 0, the object
1470	* is subsequently removed and freed.	1535	* is subsequently removed and freed.
1471	*	1536	*
1472	* Return value: 'op' if something is left, NULL if the amount reached 0	1537	* Return value: 'op' if something is left, NULL if the amount reached 0
1473	*/	1538	*/
1474
1475	object *	1539	object *
1476	decrease_ob_nr (object *op, uint32 i)	1540	decrease_ob_nr (object *op, uint32 i)
1477	{	1541	{
1478	object *tmp;	1542	object *tmp;
1479		1543
…		…
1554		1618
1555	/*	1619	/*
1556	* add_weight(object, weight) adds the specified weight to an object,	1620	* add_weight(object, weight) adds the specified weight to an object,
1557	* and also updates how much the environment(s) is/are carrying.	1621	* and also updates how much the environment(s) is/are carrying.
1558	*/	1622	*/
1559
1560	void	1623	void
1561	add_weight (object *op, signed long weight)	1624	add_weight (object *op, signed long weight)
1562	{	1625	{
1563	while (op != NULL)	1626	while (op != NULL)
1564	{	1627	{
…		…
1579	LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);	1642	LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
1580	free (dump);	1643	free (dump);
1581	return op;	1644	return op;
1582	}	1645	}
1583		1646
1584	if (where->head)	1647	if (where->head_ () != where)
1585	{	1648	{
1586	LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n");	1649	LOG (llevError | logBacktrace, "Warning: Tried to insert object into wrong part of multipart object.\n");
1587	where = where->head;	1650	where = where->head;
1588	}	1651	}
1589		1652
1590	return where->insert (op);	1653	return where->insert (op);
1591	}	1654	}
…		…
1596	* inside the object environment.	1659	* inside the object environment.
1597	*	1660	*
1598	* The function returns now pointer to inserted item, and return value can	1661	* The function returns now pointer to inserted item, and return value can
1599	* be != op, if items are merged. -Tero	1662	* be != op, if items are merged. -Tero
1600	*/	1663	*/
1601
1602	object *	1664	object *
1603	object::insert (object *op)	1665	object::insert (object *op)
1604	{	1666	{
1605	object *tmp, *otmp;
1606
1607	if (!QUERY_FLAG (op, FLAG_REMOVED))	1667	if (!QUERY_FLAG (op, FLAG_REMOVED))
1608	op->remove ();	1668	op->remove ();
1609		1669
1610	if (op->more)	1670	if (op->more)
1611	{	1671	{
…		…
1613	return op;	1673	return op;
1614	}	1674	}
1615		1675
1616	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1676	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1617	CLEAR_FLAG (op, FLAG_REMOVED);	1677	CLEAR_FLAG (op, FLAG_REMOVED);
		1678
1618	if (op->nrof)	1679	if (op->nrof)
1619	{	1680	{
1620	for (tmp = inv; tmp != NULL; tmp = tmp->below)	1681	for (object *tmp = inv; tmp; tmp = tmp->below)
1621	if (object::can_merge (tmp, op))	1682	if (object::can_merge (tmp, op))
1622	{	1683	{
1623	/* return the original object and remove inserted object	1684	/* return the original object and remove inserted object
1624	(client needs the original object) */	1685	(client needs the original object) */
1625	tmp->nrof += op->nrof;	1686	tmp->nrof += op->nrof;
…		…
1644	add_weight (this, op->weight * op->nrof);	1705	add_weight (this, op->weight * op->nrof);
1645	}	1706	}
1646	else	1707	else
1647	add_weight (this, (op->weight + op->carrying));	1708	add_weight (this, (op->weight + op->carrying));
1648		1709
1649	otmp = this->in_player ();	1710	if (object *otmp = this->in_player ())
1650	if (otmp && otmp->contr)
1651	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1711	if (otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1652	otmp->update_stats ();	1712	otmp->update_stats ();
1653		1713
		1714	op->owner = 0; // its his/hers now. period.
1654	op->map = 0;	1715	op->map = 0;
1655	op->env = this;	1716	op->env = this;
1656	op->above = 0;	1717	op->above = 0;
1657	op->below = 0;	1718	op->below = 0;
1658	op->x = 0, op->y = 0;	1719	op->x = op->y = 0;
1659		1720
1660	/* reset the light list and los of the players on the map */	1721	/* reset the light list and los of the players on the map */
1661	if ((op->glow_radius != 0) && map)	1722	if (op->glow_radius && map)
1662	{	1723	{
1663	#ifdef DEBUG_LIGHTS	1724	#ifdef DEBUG_LIGHTS
1664	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);	1725	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1665	#endif /* DEBUG_LIGHTS */	1726	#endif /* DEBUG_LIGHTS */
1666	if (map->darkness)	1727	if (map->darkness)
…		…
1766	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||	1827	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
1767	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))	1828	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1768	{	1829	{
1769		1830
1770	float	1831	float
1771	diff = tmp->move_slow_penalty * FABS (op->speed);	1832	diff = tmp->move_slow_penalty * fabs (op->speed);
1772		1833
1773	if (op->type == PLAYER)	1834	if (op->type == PLAYER)
1774	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||	1835	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||
1775	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))	1836	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))
1776	diff /= 4.0;	1837	diff /= 4.0;
…		…
1900	* activate recursively a flag on an object inventory	1961	* activate recursively a flag on an object inventory
1901	*/	1962	*/
1902	void	1963	void
1903	flag_inv (object *op, int flag)	1964	flag_inv (object *op, int flag)
1904	{	1965	{
1905	if (op->inv)
1906	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)	1966	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1907	{	1967	{
1908	SET_FLAG (tmp, flag);	1968	SET_FLAG (tmp, flag);
1909	flag_inv (tmp, flag);	1969	flag_inv (tmp, flag);
1910	}	1970	}
1911	}	1971	}
1912		1972
1913	/*	1973	/*
1914	* deactivate recursively a flag on an object inventory	1974	* deactivate recursively a flag on an object inventory
1915	*/	1975	*/
1916	void	1976	void
1917	unflag_inv (object *op, int flag)	1977	unflag_inv (object *op, int flag)
1918	{	1978	{
1919	if (op->inv)
1920	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)	1979	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1921	{	1980	{
1922	CLEAR_FLAG (tmp, flag);	1981	CLEAR_FLAG (tmp, flag);
1923	unflag_inv (tmp, flag);	1982	unflag_inv (tmp, flag);
1924	}	1983	}
1925	}
1926
1927	/*
1928	* set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in
1929	* all it's inventory (recursively).
1930	* If checksums are used, a player will get set_cheat called for
1931	* him/her-self and all object carried by a call to this function.
1932	*/
1933	void
1934	set_cheat (object *op)
1935	{
1936	SET_FLAG (op, FLAG_WAS_WIZ);
1937	flag_inv (op, FLAG_WAS_WIZ);
1938	}	1984	}
1939		1985
1940	/*	1986	/*
1941	* find_free_spot(object, map, x, y, start, stop) will search for	1987	* find_free_spot(object, map, x, y, start, stop) will search for
1942	* a spot at the given map and coordinates which will be able to contain	1988	* a spot at the given map and coordinates which will be able to contain
…		…
1944	* to search (see the freearr_x/y[] definition).	1990	* to search (see the freearr_x/y[] definition).
1945	* It returns a random choice among the alternatives found.	1991	* It returns a random choice among the alternatives found.
1946	* start and stop are where to start relative to the free_arr array (1,9	1992	* start and stop are where to start relative to the free_arr array (1,9
1947	* does all 4 immediate directions). This returns the index into the	1993	* does all 4 immediate directions). This returns the index into the
1948	* array of the free spot, -1 if no spot available (dir 0 = x,y)	1994	* array of the free spot, -1 if no spot available (dir 0 = x,y)
1949	* Note - this only checks to see if there is space for the head of the
1950	* object - if it is a multispace object, this should be called for all
1951	* pieces.
1952	* Note2: This function does correctly handle tiled maps, but does not	1995	* Note: This function does correctly handle tiled maps, but does not
1953	* inform the caller. However, insert_ob_in_map will update as	1996	* inform the caller. However, insert_ob_in_map will update as
1954	* necessary, so the caller shouldn't need to do any special work.	1997	* necessary, so the caller shouldn't need to do any special work.
1955	* Note - updated to take an object instead of archetype - this is necessary	1998	* Note - updated to take an object instead of archetype - this is necessary
1956	* because arch_blocked (now ob_blocked) needs to know the movement type	1999	* because arch_blocked (now ob_blocked) needs to know the movement type
1957	* to know if the space in question will block the object. We can't use	2000	* to know if the space in question will block the object. We can't use
…		…
1959	* customized, changed states, etc.	2002	* customized, changed states, etc.
1960	*/	2003	*/
1961	int	2004	int
1962	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)	2005	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
1963	{	2006	{
		2007	int altern[SIZEOFFREE];
1964	int index = 0, flag;	2008	int index = 0, flag;
1965	int altern[SIZEOFFREE];
1966		2009
1967	for (int i = start; i < stop; i++)	2010	for (int i = start; i < stop; i++)
1968	{	2011	{
1969	flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]);	2012	mapxy pos (m, x, y); pos.move (i);
1970	if (!flag)	2013
		2014	if (!pos.normalise ())
		2015	continue;
		2016
		2017	mapspace &ms = *pos;
		2018
		2019	if (ms.flags () & P_IS_ALIVE)
		2020	continue;
		2021
		2022	/* However, often
		2023	* ob doesn't have any move type (when used to place exits)
		2024	* so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.
		2025	*/
		2026	if (ob && ob->move_type == 0 && ms.move_block != MOVE_ALL)
		2027	{
1971	altern [index++] = i;	2028	altern [index++] = i;
		2029	continue;
		2030	}
1972		2031
1973	/* Basically, if we find a wall on a space, we cut down the search size.	2032	/* Basically, if we find a wall on a space, we cut down the search size.
1974	* In this way, we won't return spaces that are on another side of a wall.	2033	* In this way, we won't return spaces that are on another side of a wall.
1975	* This mostly work, but it cuts down the search size in all directions -	2034	* This mostly work, but it cuts down the search size in all directions -
1976	* if the space being examined only has a wall to the north and empty	2035	* if the space being examined only has a wall to the north and empty
1977	* spaces in all the other directions, this will reduce the search space	2036	* spaces in all the other directions, this will reduce the search space
1978	* to only the spaces immediately surrounding the target area, and	2037	* to only the spaces immediately surrounding the target area, and
1979	* won't look 2 spaces south of the target space.	2038	* won't look 2 spaces south of the target space.
1980	*/	2039	*/
1981	else if ((flag & P_NO_PASS) && maxfree[i] < stop)	2040	if (ms.move_block == MOVE_ALL && maxfree[i] < stop)
		2041	{
1982	stop = maxfree[i];	2042	stop = maxfree[i];
		2043	continue;
		2044	}
		2045
		2046	/* Note it is intentional that we check ob - the movement type of the
		2047	* head of the object should correspond for the entire object.
		2048	*/
		2049	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
		2050	continue;
		2051
		2052	if (ob->blocked (m, pos.x, pos.y))
		2053	continue;
		2054
		2055	altern [index++] = i;
1983	}	2056	}
1984		2057
1985	if (!index)	2058	if (!index)
1986	return -1;	2059	return -1;
1987		2060
1988	return altern[RANDOM () % index];	2061	return altern [rndm (index)];
1989	}	2062	}
1990		2063
1991	/*	2064	/*
1992	* find_first_free_spot(archetype, maptile, x, y) works like	2065	* find_first_free_spot(archetype, maptile, x, y) works like
1993	* find_free_spot(), but it will search max number of squares.	2066	* find_free_spot(), but it will search max number of squares.
…		…
1996	*/	2069	*/
1997	int	2070	int
1998	find_first_free_spot (const object *ob, maptile *m, int x, int y)	2071	find_first_free_spot (const object *ob, maptile *m, int x, int y)
1999	{	2072	{
2000	for (int i = 0; i < SIZEOFFREE; i++)	2073	for (int i = 0; i < SIZEOFFREE; i++)
2001	if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]))	2074	if (!ob->blocked (m, x + freearr_x[i], y + freearr_y[i]))
2002	return i;	2075	return i;
2003		2076
2004	return -1;	2077	return -1;
2005	}	2078	}
2006		2079
…		…
2014	{	2087	{
2015	arr += begin;	2088	arr += begin;
2016	end -= begin;	2089	end -= begin;
2017		2090
2018	while (--end)	2091	while (--end)
2019	swap (arr [end], arr [RANDOM () % (end + 1)]);	2092	swap (arr [end], arr [rndm (end + 1)]);
2020	}	2093	}
2021		2094
2022	/* new function to make monster searching more efficient, and effective!	2095	/* new function to make monster searching more efficient, and effective!
2023	* This basically returns a randomized array (in the passed pointer) of	2096	* This basically returns a randomized array (in the passed pointer) of
2024	* the spaces to find monsters. In this way, it won't always look for	2097	* the spaces to find monsters. In this way, it won't always look for
…		…
2060	object *tmp;	2133	object *tmp;
2061	maptile *mp;	2134	maptile *mp;
2062		2135
2063	MoveType blocked, move_type;	2136	MoveType blocked, move_type;
2064		2137
2065	if (exclude && exclude->head)	2138	if (exclude && exclude->head_ () != exclude)
2066	{	2139	{
2067	exclude = exclude->head;	2140	exclude = exclude->head;
2068	move_type = exclude->move_type;	2141	move_type = exclude->move_type;
2069	}	2142	}
2070	else	2143	else
…		…
2093	max = maxfree[i];	2166	max = maxfree[i];
2094	else if (mflags & P_IS_ALIVE)	2167	else if (mflags & P_IS_ALIVE)
2095	{	2168	{
2096	for (tmp = ms.bot; tmp; tmp = tmp->above)	2169	for (tmp = ms.bot; tmp; tmp = tmp->above)
2097	if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)	2170	if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)
2098	&& (tmp != exclude || (tmp->head && tmp->head != exclude)))	2171	&& (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2099	break;	2172	break;
2100		2173
2101	if (tmp)	2174	if (tmp)
2102	return freedir[i];	2175	return freedir[i];
2103	}	2176	}
…		…
2158		2231
2159	return 3;	2232	return 3;
2160	}	2233	}
2161		2234
2162	/*	2235	/*
2163	* absdir(int): Returns a number between 1 and 8, which represent
2164	* the "absolute" direction of a number (it actually takes care of
2165	* "overflow" in previous calculations of a direction).
2166	*/
2167
2168	int
2169	absdir (int d)
2170	{
2171	while (d < 1)
2172	d += 8;
2173
2174	while (d > 8)
2175	d -= 8;
2176
2177	return d;
2178	}
2179
2180	/*
2181	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is	2236	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is
2182	* between two directions (which are expected to be absolute (see absdir())	2237	* between two directions (which are expected to be absolute (see absdir())
2183	*/	2238	*/
2184
2185	int	2239	int
2186	dirdiff (int dir1, int dir2)	2240	dirdiff (int dir1, int dir2)
2187	{	2241	{
2188	int d;	2242	int d;
2189		2243
…		…
2302	* Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause	2356	* Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause
2303	* core dumps if they do.	2357	* core dumps if they do.
2304	*	2358	*
2305	* Add a check so we can't pick up invisible objects (0.93.8)	2359	* Add a check so we can't pick up invisible objects (0.93.8)
2306	*/	2360	*/
2307
2308	int	2361	int
2309	can_pick (const object *who, const object *item)	2362	can_pick (const object *who, const object *item)
2310	{	2363	{
2311	return /*QUERY_FLAG(who,FLAG_WIZ)|| */	2364	return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2312	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&	2365	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
…		…
2317	* create clone from object to another	2370	* create clone from object to another
2318	*/	2371	*/
2319	object *	2372	object *
2320	object_create_clone (object *asrc)	2373	object_create_clone (object *asrc)
2321	{	2374	{
2322	object *dst = 0, *tmp, *src, *part, *prev, *item;	2375	object *dst = 0, *tmp, *src, *prev, *item;
2323		2376
2324	if (!asrc)	2377	if (!asrc)
2325	return 0;	2378	return 0;
2326		2379
2327	src = asrc;
2328	if (src->head)
2329	src = src->head;	2380	src = asrc->head_ ();
2330		2381
2331	prev = 0;	2382	prev = 0;
2332	for (part = src; part; part = part->more)	2383	for (object *part = src; part; part = part->more)
2333	{	2384	{
2334	tmp = part->clone ();	2385	tmp = part->clone ();
2335	tmp->x -= src->x;	2386	tmp->x -= src->x;
2336	tmp->y -= src->y;	2387	tmp->y -= src->y;
2337		2388
…		…
2353		2404
2354	for (item = src->inv; item; item = item->below)	2405	for (item = src->inv; item; item = item->below)
2355	insert_ob_in_ob (object_create_clone (item), dst);	2406	insert_ob_in_ob (object_create_clone (item), dst);
2356		2407
2357	return dst;	2408	return dst;
2358	}
2359
2360	/* GROS - Creates an object using a string representing its content. */
2361	/* Basically, we save the content of the string to a temp file, then call */
2362	/* load_object on it. I admit it is a highly inefficient way to make things, */
2363	/* but it was simple to make and allows reusing the load_object function. */
2364	/* Remember not to use load_object_str in a time-critical situation. */
2365	/* Also remember that multiparts objects are not supported for now. */
2366	object *
2367	load_object_str (const char *obstr)
2368	{
2369	object *op;
2370	char filename[MAX_BUF];
2371
2372	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2373
2374	FILE *tempfile = fopen (filename, "w");
2375
2376	if (tempfile == NULL)
2377	{
2378	LOG (llevError, "Error - Unable to access load object temp file\n");
2379	return NULL;
2380	}
2381
2382	fprintf (tempfile, obstr);
2383	fclose (tempfile);
2384
2385	op = object::create ();
2386
2387	object_thawer thawer (filename);
2388
2389	if (thawer)
2390	load_object (thawer, op, 0);
2391
2392	LOG (llevDebug, " load str completed, object=%s\n", &op->name);
2393	CLEAR_FLAG (op, FLAG_REMOVED);
2394
2395	return op;
2396	}	2409	}
2397		2410
2398	/* This returns the first object in who's inventory that	2411	/* This returns the first object in who's inventory that
2399	* has the same type and subtype match.	2412	* has the same type and subtype match.
2400	* returns NULL if no match.	2413	* returns NULL if no match.
…		…
2455	if (link->key == canonical_key)	2468	if (link->key == canonical_key)
2456	return link->value;	2469	return link->value;
2457		2470
2458	return 0;	2471	return 0;
2459	}	2472	}
2460
2461		2473
2462	/*	2474	/*
2463	* Updates the canonical_key in op to value.	2475	* Updates the canonical_key in op to value.
2464	*	2476	*
2465	* canonical_key is a shared string (value doesn't have to be).	2477	* canonical_key is a shared string (value doesn't have to be).
…		…
2489	/* Basically, if the archetype has this key set,	2501	/* Basically, if the archetype has this key set,
2490	* we need to store the null value so when we save	2502	* we need to store the null value so when we save
2491	* it, we save the empty value so that when we load,	2503	* it, we save the empty value so that when we load,
2492	* we get this value back again.	2504	* we get this value back again.
2493	*/	2505	*/
2494	if (get_ob_key_link (&op->arch->clone, canonical_key))	2506	if (get_ob_key_link (op->arch, canonical_key))
2495	field->value = 0;	2507	field->value = 0;
2496	else	2508	else
2497	{	2509	{
2498	if (last)	2510	if (last)
2499	last->next = field->next;	2511	last->next = field->next;
…		…
2568	}	2580	}
2569	else	2581	else
2570	item = item->env;	2582	item = item->env;
2571	}	2583	}
2572		2584
2573
2574	const char *	2585	const char *
2575	object::flag_desc (char *desc, int len) const	2586	object::flag_desc (char *desc, int len) const
2576	{	2587	{
2577	char *p = desc;	2588	char *p = desc;
2578	bool first = true;	2589	bool first = true;
…		…
2605	{	2616	{
2606	char flagdesc[512];	2617	char flagdesc[512];
2607	char info2[256 * 4];	2618	char info2[256 * 4];
2608	char *p = info;	2619	char *p = info;
2609		2620
2610	p += snprintf (p, 512, "{cnt:%d,uuid:<1,%" PRIx64 ">,name:\"%s%s%s\",flags:[%s],type:%d}",	2621	p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s,flags:[%s],type:%d}",
2611	count, uuid.seq,	2622	count,
		2623	uuid.c_str (),
2612	&name,	2624	&name,
2613	title ? "\",title:" : "",	2625	title ? "\",title:\"" : "",
2614	title ? (const char *)title : "",	2626	title ? (const char *)title : "",
2615	flag_desc (flagdesc, 512), type);	2627	flag_desc (flagdesc, 512), type);
2616		2628
2617	if (env)	2629	if (!this->flag[FLAG_REMOVED] && env)
2618	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2630	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2619		2631
2620	if (map)	2632	if (map)
2621	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);	2633	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2622		2634
…		…
2624	}	2636	}
2625		2637
2626	const char *	2638	const char *
2627	object::debug_desc () const	2639	object::debug_desc () const
2628	{	2640	{
2629	static char info[256 * 4];	2641	static char info[3][256 * 4];
		2642	static int info_idx;
		2643
2630	return debug_desc (info);	2644	return debug_desc (info [++info_idx % 3]);
2631	}	2645	}
2632		2646
		2647	struct region *
		2648	object::region () const
		2649	{
		2650	return map ? map->region (x, y)
		2651	: region::default_region ();
		2652	}
		2653
		2654	const materialtype_t *
		2655	object::dominant_material () const
		2656	{
		2657	if (materialtype_t *mt = name_to_material (materialname))
		2658	return mt;
		2659
		2660	return name_to_material (shstr_unknown);
		2661	}
		2662
		2663	void
		2664	object::open_container (object *new_container)
		2665	{
		2666	if (container == new_container)
		2667	return;
		2668
		2669	if (object *old_container = container)
		2670	{
		2671	if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
		2672	return;
		2673
		2674	#if 0
		2675	// remove the "Close old_container" object.
		2676	if (object *closer = old_container->inv)
		2677	if (closer->type == CLOSE_CON)
		2678	closer->destroy ();
		2679	#endif
		2680
		2681	old_container->flag [FLAG_APPLIED] = 0;
		2682	container = 0;
		2683
		2684	esrv_update_item (UPD_FLAGS, this, old_container);
		2685	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
		2686	play_sound (sound_find ("chest_close"));
		2687	}
		2688
		2689	if (new_container)
		2690	{
		2691	if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))
		2692	return;
		2693
		2694	// TODO: this does not seem to serve any purpose anymore?
		2695	#if 0
		2696	// insert the "Close Container" object.
		2697	if (archetype *closer = new_container->other_arch)
		2698	{
		2699	object *closer = arch_to_object (new_container->other_arch);
		2700	closer->flag [FLAG_NO_MAP_SAVE] = 1;
		2701	new_container->insert (closer);
		2702	}
		2703	#endif
		2704
		2705	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));
		2706
		2707	new_container->flag [FLAG_APPLIED] = 1;
		2708	container = new_container;
		2709
		2710	esrv_update_item (UPD_FLAGS, this, new_container);
		2711	esrv_send_inventory (this, new_container);
		2712	play_sound (sound_find ("chest_open"));
		2713	}
		2714	}
		2715
		2716	object *
		2717	object::force_find (const shstr name)
		2718	{
		2719	/* cycle through his inventory to look for the MARK we want to
		2720	* place
		2721	*/
		2722	for (object *tmp = inv; tmp; tmp = tmp->below)
		2723	if (tmp->type == FORCE && tmp->slaying == name)
		2724	return splay (tmp);
		2725
		2726	return 0;
		2727	}
		2728
		2729	void
		2730	object::force_add (const shstr name, int duration)
		2731	{
		2732	if (object *force = force_find (name))
		2733	force->destroy ();
		2734
		2735	object *force = get_archetype (FORCE_NAME);
		2736
		2737	force->slaying = name;
		2738	force->stats.food = 1;
		2739	force->speed_left = -1.f;
		2740
		2741	force->set_speed (duration ? 1.f / duration : 0.f);
		2742	force->flag [FLAG_IS_USED_UP] = true;
		2743	force->flag [FLAG_APPLIED] = true;
		2744
		2745	insert (force);
		2746	}
		2747
		2748	void
		2749	object::play_sound (faceidx sound) const
		2750	{
		2751	if (!sound)
		2752	return;
		2753
		2754	if (flag [FLAG_REMOVED])
		2755	return;
		2756
		2757	if (env)
		2758	{
		2759	if (object *pl = in_player ())
		2760	pl->contr->play_sound (sound);
		2761	}
		2762	else
		2763	map->play_sound (sound, x, y);
		2764	}
		2765

Diff Legend

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