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.109 by root, Sun Jan 7 21:54:59 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
682	refcnt_inc ();	782	refcnt_inc ();
683	objects.insert (this);	783	objects.insert (this);
684	}	784	}
685		785
686	void object::unlink ()	786	void object::unlink ()
687	{	787	{
		788	if (!index)
		789	return;
		790
688	objects.erase (this);	791	objects.erase (this);
689	refcnt_dec ();	792	refcnt_dec ();
690	}	793	}
691		794
692	void	795	void
…		…
766	* drop on that space.	869	* drop on that space.
767	*/	870	*/
768	if (!drop_to_ground	871	if (!drop_to_ground
769	|| !map	872	|| !map
770	|| map->in_memory != MAP_IN_MEMORY	873	|| map->in_memory != MAP_IN_MEMORY
		874	|| map->nodrop
771	|| ms ().move_block == MOVE_ALL)	875	|| ms ().move_block == MOVE_ALL)
772	{	876	{
773	while (inv)	877	while (inv)
774	{	878	{
775	inv->destroy_inv (drop_to_ground);	879	inv->destroy_inv (drop_to_ground);
…		…
784		888
785	if (op->flag [FLAG_STARTEQUIP]	889	if (op->flag [FLAG_STARTEQUIP]
786	|| op->flag [FLAG_NO_DROP]	890	|| op->flag [FLAG_NO_DROP]
787	|| op->type == RUNE	891	|| op->type == RUNE
788	|| op->type == TRAP	892	|| op->type == TRAP
789	|| op->flag [FLAG_IS_A_TEMPLATE])	893	|| op->flag [FLAG_IS_A_TEMPLATE]
		894	|| op->flag [FLAG_DESTROY_ON_DEATH])
790	op->destroy ();	895	op->destroy ();
791	else	896	else
792	map->insert (op, x, y);	897	map->insert (op, x, y);
793	}	898	}
794	}	899	}
…		…
802	}	907	}
803		908
804	void	909	void
805	object::do_destroy ()	910	object::do_destroy ()
806	{	911	{
		912	attachable::do_destroy ();
		913
807	if (flag [FLAG_IS_LINKED])	914	if (flag [FLAG_IS_LINKED])
808	remove_button_link (this);	915	remove_button_link (this);
809		916
810	if (flag [FLAG_FRIENDLY])	917	if (flag [FLAG_FRIENDLY])
811	remove_friendly_object (this);	918	remove_friendly_object (this);
812		919
813	if (!flag [FLAG_REMOVED])	920	if (!flag [FLAG_REMOVED])
814	remove ();	921	remove ();
815		922
816	if (flag [FLAG_FREED])	923	destroy_inv (true);
817	return;
818		924
819	set_speed (0);	925	deactivate ();
		926	unlink ();
820		927
821	flag [FLAG_FREED] = 1;	928	flag [FLAG_FREED] = 1;
822
823	attachable::do_destroy ();
824
825	destroy_inv (true);
826	unlink ();
827		929
828	// hack to ensure that freed objects still have a valid map	930	// hack to ensure that freed objects still have a valid map
829	{	931	{
830	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
831		933
832	if (!freed_map)	934	if (!freed_map)
833	{	935	{
834	freed_map = new maptile;	936	freed_map = new maptile;
835		937
		938	freed_map->path = "<freed objects map>";
836	freed_map->name = "/internal/freed_objects_map";	939	freed_map->name = "/internal/freed_objects_map";
837	freed_map->width = 3;	940	freed_map->width = 3;
838	freed_map->height = 3;	941	freed_map->height = 3;
		942	freed_map->nodrop = 1;
839		943
840	freed_map->alloc ();	944	freed_map->alloc ();
841	freed_map->in_memory = MAP_IN_MEMORY;	945	freed_map->in_memory = MAP_IN_MEMORY;
842	}	946	}
843		947
844	map = freed_map;	948	map = freed_map;
845	x = 1;	949	x = 1;
846	y = 1;	950	y = 1;
847	}	951	}
848		952
849	head = 0;
850
851	if (more)	953	if (more)
852	{	954	{
853	more->destroy ();	955	more->destroy ();
854	more = 0;	956	more = 0;
855	}	957	}
856		958
		959	head = 0;
		960
857	// clear those pointers that likely might have circular references to us	961	// clear those pointers that likely might cause circular references
858	owner = 0;	962	owner = 0;
859	enemy = 0;	963	enemy = 0;
860	attacked_by = 0;	964	attacked_by = 0;
		965	current_weapon = 0;
861	}	966	}
862		967
863	void	968	void
864	object::destroy (bool destroy_inventory)	969	object::destroy (bool destroy_inventory)
865	{	970	{
866	if (destroyed ())	971	if (destroyed ())
867	return;	972	return;
868		973
869	if (destroy_inventory)	974	if (destroy_inventory)
870	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
871		982
872	attachable::destroy ();	983	attachable::destroy ();
873	}	984	}
874		985
875	/*	986	/*
…		…
893	* 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
894	* 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
895	* object will have no environment. If the object previously had an	1006	* object will have no environment. If the object previously had an
896	* environment, the x and y coordinates will be updated to	1007	* environment, the x and y coordinates will be updated to
897	* the previous environment.	1008	* the previous environment.
898	* Beware: This function is called from the editor as well!
899	*/	1009	*/
900	void	1010	void
901	object::remove ()	1011	object::do_remove ()
902	{	1012	{
903	object *tmp, *last = 0;	1013	object *tmp, *last = 0;
904	object *otmp;	1014	object *otmp;
905		1015
906	if (QUERY_FLAG (this, FLAG_REMOVED))	1016	if (QUERY_FLAG (this, FLAG_REMOVED))
…		…
949	}	1059	}
950	else if (map)	1060	else if (map)
951	{	1061	{
952	if (type == PLAYER)	1062	if (type == PLAYER)
953	{	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
954	--map->players;	1070	--map->players;
955	map->touch ();	1071	map->touch ();
956	}	1072	}
957		1073
958	map->dirty = true;	1074	map->dirty = true;
		1075	mapspace &ms = this->ms ();
959		1076
960	/* link the object above us */	1077	/* link the object above us */
961	if (above)	1078	if (above)
962	above->below = below;	1079	above->below = below;
963	else	1080	else
964	map->at (x, y).top = below; /* we were top, set new top */	1081	ms.top = below; /* we were top, set new top */
965		1082
966	/* Relink the object below us, if there is one */	1083	/* Relink the object below us, if there is one */
967	if (below)	1084	if (below)
968	below->above = above;	1085	below->above = above;
969	else	1086	else
…		…
971	/* 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
972	* use translated coordinates in case some oddness with map tiling is	1089	* use translated coordinates in case some oddness with map tiling is
973	* evident	1090	* evident
974	*/	1091	*/
975	if (GET_MAP_OB (map, x, y) != this)	1092	if (GET_MAP_OB (map, x, y) != this)
976	{
977	char *dump = dump_object (this);
978	LOG (llevError,
979	"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 ());
980	free (dump);
981	dump = dump_object (GET_MAP_OB (map, x, y));
982	LOG (llevError, "%s\n", dump);
983	free (dump);
984	}
985		1094
986	map->at (x, y).bot = above; /* goes on above it. */	1095	ms.bot = above; /* goes on above it. */
987	}	1096	}
988		1097
989	above = 0;	1098	above = 0;
990	below = 0;	1099	below = 0;
991		1100
992	if (map->in_memory == MAP_SAVING)	1101	if (map->in_memory == MAP_SAVING)
993	return;	1102	return;
994		1103
995	int check_walk_off = !flag [FLAG_NO_APPLY];	1104	int check_walk_off = !flag [FLAG_NO_APPLY];
996		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
997	for (tmp = map->at (x, y).bot; tmp; tmp = tmp->above)	1118	for (tmp = ms.bot; tmp; tmp = tmp->above)
998	{	1119	{
999	/* 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
1000	* being removed.	1121	* being removed.
1001	*/	1122	*/
1002
1003	if (tmp->type == PLAYER && tmp != this)
1004	{
1005	/* If a container that the player is currently using somehow gets
1006	* removed (most likely destroyed), update the player view
1007	* appropriately.
1008	*/
1009	if (tmp->container == this)
1010	{
1011	flag [FLAG_APPLIED] = 0;
1012	tmp->container = 0;
1013	}
1014
1015	if (tmp->contr->ns)
1016	tmp->contr->ns->floorbox_update ();
1017	}
1018		1123
1019	/* See if object moving off should effect something */	1124	/* See if object moving off should effect something */
1020	if (check_walk_off	1125	if (check_walk_off
1021	&& ((move_type & tmp->move_off)	1126	&& ((move_type & tmp->move_off)
1022	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))	1127	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
…		…
1025		1130
1026	if (destroyed ())	1131	if (destroyed ())
1027	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 ());
1028	}	1133	}
1029		1134
1030	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1031	//TODO: why is this horrible hacka fix? get rid of this code=bug! (schmorp)
1032	if (tmp->above == tmp)
1033	tmp->above = 0;
1034
1035	last = tmp;	1135	last = tmp;
1036	}	1136	}
1037		1137
1038	/* last == NULL if there are no objects on this space */	1138	/* last == NULL if there are no objects on this space */
1039	//TODO: this makes little sense, why only update the topmost object?	1139	//TODO: this makes little sense, why only update the topmost object?
…		…
1059	merge_ob (object *op, object *top)	1159	merge_ob (object *op, object *top)
1060	{	1160	{
1061	if (!op->nrof)	1161	if (!op->nrof)
1062	return 0;	1162	return 0;
1063		1163
1064	if (top)	1164	if (!top)
1065	for (top = op; top && top->above; top = top->above)	1165	for (top = op; top && top->above; top = top->above)
1066	;	1166	;
1067		1167
1068	for (; top; top = top->below)	1168	for (; top; top = top->below)
1069	{	1169	{
…		…
1082	}	1182	}
1083		1183
1084	return 0;	1184	return 0;
1085	}	1185	}
1086		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
1087	/*	1210	/*
1088	* 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
1089	* job preparing multi-part monsters	1212	* job preparing multi-part monsters.
1090	*/	1213	*/
1091	object *	1214	object *
1092	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)
1093	{	1216	{
1094	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)	1217	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1095	{	1218	{
1096	tmp->x = x + tmp->arch->clone.x;	1219	tmp->x = x + tmp->arch->x;
1097	tmp->y = y + tmp->arch->clone.y;	1220	tmp->y = y + tmp->arch->y;
1098	}	1221	}
1099		1222
1100	return insert_ob_in_map (op, m, originator, flag);	1223	return insert_ob_in_map (op, m, originator, flag);
1101	}	1224	}
1102		1225
…		…
1121	* just 'op' otherwise	1244	* just 'op' otherwise
1122	*/	1245	*/
1123	object *	1246	object *
1124	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)
1125	{	1248	{
		1249	assert (!op->flag [FLAG_FREED]);
		1250
1126	object *tmp, *top, *floor = NULL;	1251	object *top, *floor = NULL;
1127	sint16 x, y;
1128		1252
1129	if (QUERY_FLAG (op, FLAG_FREED))	1253	op->remove ();
1130	{
1131	LOG (llevError, "Trying to insert freed object!\n");
1132	return NULL;
1133	}
1134
1135	if (!m)
1136	{
1137	char *dump = dump_object (op);
1138	LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
1139	free (dump);
1140	return op;
1141	}
1142
1143	if (out_of_map (m, op->x, op->y))
1144	{
1145	char *dump = dump_object (op);
1146	LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump);
1147	#ifdef MANY_CORES
1148	/* Better to catch this here, as otherwise the next use of this object
1149	* is likely to cause a crash. Better to find out where it is getting
1150	* improperly inserted.
1151	*/
1152	abort ();
1153	#endif
1154	free (dump);
1155	return op;
1156	}
1157
1158	if (!QUERY_FLAG (op, FLAG_REMOVED))
1159	{
1160	char *dump = dump_object (op);
1161	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
1162	free (dump);
1163	return op;
1164	}
1165
1166	if (op->more)
1167	{
1168	/* The part may be on a different map. */
1169
1170	object *more = op->more;
1171
1172	/* We really need the caller to normalise coordinates - if
1173	* we set the map, that doesn't work if the location is within
1174	* a map and this is straddling an edge. So only if coordinate
1175	* is clear wrong do we normalise it.
1176	*/
1177	if (OUT_OF_REAL_MAP (more->map, more->x, more->y))
1178	more->map = get_map_from_coord (m, &more->x, &more->y);
1179	else if (!more->map)
1180	{
1181	/* For backwards compatibility - when not dealing with tiled maps,
1182	* more->map should always point to the parent.
1183	*/
1184	more->map = m;
1185	}
1186
1187	if (insert_ob_in_map (more, more->map, originator, flag) == NULL)
1188	{
1189	if (!op->head)
1190	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1191
1192	return 0;
1193	}
1194	}
1195
1196	CLEAR_FLAG (op, FLAG_REMOVED);
1197		1254
1198	/* Ideally, the caller figures this out. However, it complicates a lot	1255	/* Ideally, the caller figures this out. However, it complicates a lot
1199	* 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
1200	* need extra work	1257	* need extra work
1201	*/	1258	*/
1202	op->map = get_map_from_coord (m, &op->x, &op->y);	1259	if (!xy_normalise (m, op->x, op->y))
1203	x = op->x;	1260	{
1204	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 ();
1205		1273
1206	/* this has to be done after we translate the coordinates.	1274	/* this has to be done after we translate the coordinates.
1207	*/	1275	*/
1208	if (op->nrof && !(flag & INS_NO_MERGE))	1276	if (op->nrof && !(flag & INS_NO_MERGE))
1209	for (tmp = GET_MAP_OB (op->map, x, y); tmp; tmp = tmp->above)	1277	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1210	if (object::can_merge (op, tmp))	1278	if (object::can_merge (op, tmp))
1211	{	1279	{
1212	op->nrof += tmp->nrof;	1280	op->nrof += tmp->nrof;
1213	tmp->destroy ();	1281	tmp->destroy ();
1214	}	1282	}
…		…
1231	op->below = originator->below;	1299	op->below = originator->below;
1232		1300
1233	if (op->below)	1301	if (op->below)
1234	op->below->above = op;	1302	op->below->above = op;
1235	else	1303	else
1236	op->ms ().bot = op;	1304	ms.bot = op;
1237		1305
1238	/* since *below* originator, no need to update top */	1306	/* since *below* originator, no need to update top */
1239	originator->below = op;	1307	originator->below = op;
1240	}	1308	}
1241	else	1309	else
1242	{	1310	{
		1311	top = ms.bot;
		1312
1243	/* If there are other objects, then */	1313	/* If there are other objects, then */
1244	if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL))	1314	if (top)
1245	{	1315	{
1246	object *last = 0;	1316	object *last = 0;
1247		1317
1248	/*	1318	/*
1249	* 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.
…		…
1255	* 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
1256	* 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
1257	* 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
1258	* that flying non pickable objects are spell objects.	1328	* that flying non pickable objects are spell objects.
1259	*/	1329	*/
1260	while (top)	1330	for (top = ms.bot; top; top = top->above)
1261	{	1331	{
1262	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))
1263	floor = top;	1333	floor = top;
1264		1334
1265	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))
…		…
1268	top = top->below;	1338	top = top->below;
1269	break;	1339	break;
1270	}	1340	}
1271		1341
1272	last = top;	1342	last = top;
1273	top = top->above;
1274	}	1343	}
1275		1344
1276	/* 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 */
1277	top = last;	1346	top = last;
1278		1347
…		…
1280	* looks like instead of lots of conditions here.	1349	* looks like instead of lots of conditions here.
1281	* makes things faster, and effectively the same result.	1350	* makes things faster, and effectively the same result.
1282	*/	1351	*/
1283		1352
1284	/* Have object 'fall below' other objects that block view.	1353	/* Have object 'fall below' other objects that block view.
1285	* Unless those objects are exits, type 66	1354	* Unless those objects are exits.
1286	* If INS_ON_TOP is used, don't do this processing	1355	* If INS_ON_TOP is used, don't do this processing
1287	* Need to find the object that in fact blocks view, otherwise	1356	* Need to find the object that in fact blocks view, otherwise
1288	* stacking is a bit odd.	1357	* stacking is a bit odd.
1289	*/	1358	*/
1290	if (!(flag & INS_ON_TOP) &&	1359	if (!(flag & INS_ON_TOP)
1291	(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))
1292	{	1362	{
1293	for (last = top; last != floor; last = last->below)	1363	for (last = top; last != floor; last = last->below)
1294	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1364	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1295	break;	1365	break;
		1366
1296	/* Check to see if we found the object that blocks view,	1367	/* Check to see if we found the object that blocks view,
1297	* 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
1298	* we can get inserted below this one, which requires we	1369	* we can get inserted below this one, which requires we
1299	* set top to the object below us.	1370	* set top to the object below us.
1300	*/	1371	*/
1301	if (last && last->below && last != floor)	1372	if (last && last->below && last != floor)
1302	top = last->below;	1373	top = last->below;
1303	}	1374	}
1304	} /* If objects on this space */	1375	} /* If objects on this space */
1305		1376
1306	if (flag & INS_MAP_LOAD)
1307	top = GET_MAP_TOP (op->map, op->x, op->y);
1308
1309	if (flag & INS_ABOVE_FLOOR_ONLY)	1377	if (flag & INS_ABOVE_FLOOR_ONLY)
1310	top = floor;	1378	top = floor;
1311		1379
1312	/* 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.
1313	*/	1381	*/
1314		1382
1315	/* First object on this space */	1383	/* First object on this space */
1316	if (!top)	1384	if (!top)
1317	{	1385	{
1318	op->above = GET_MAP_OB (op->map, op->x, op->y);	1386	op->above = ms.bot;
1319		1387
1320	if (op->above)	1388	if (op->above)
1321	op->above->below = op;	1389	op->above->below = op;
1322		1390
1323	op->below = 0;	1391	op->below = 0;
1324	op->ms ().bot = op;	1392	ms.bot = op;
1325	}	1393	}
1326	else	1394	else
1327	{ /* get inserted into the stack above top */	1395	{ /* get inserted into the stack above top */
1328	op->above = top->above;	1396	op->above = top->above;
1329		1397
…		…
1333	op->below = top;	1401	op->below = top;
1334	top->above = op;	1402	top->above = op;
1335	}	1403	}
1336		1404
1337	if (!op->above)	1405	if (!op->above)
1338	op->ms ().top = op;	1406	ms.top = op;
1339	} /* else not INS_BELOW_ORIGINATOR */	1407	} /* else not INS_BELOW_ORIGINATOR */
1340		1408
1341	if (op->type == PLAYER)	1409	if (op->type == PLAYER)
1342	{	1410	{
1343	op->contr->do_los = 1;	1411	op->contr->do_los = 1;
…		…
1345	op->map->touch ();	1413	op->map->touch ();
1346	}	1414	}
1347		1415
1348	op->map->dirty = true;	1416	op->map->dirty = true;
1349		1417
1350	/* If we have a floor, we know the player, if any, will be above
1351	* it, so save a few ticks and start from there.
1352	*/
1353	if (!(flag & INS_MAP_LOAD))
1354	if (object *pl = op->ms ().player ())	1418	if (object *pl = ms.player ())
1355	if (pl->contr->ns)
1356	pl->contr->ns->floorbox_update ();	1419	pl->contr->ns->floorbox_update ();
1357		1420
1358	/* If this object glows, it may affect lighting conditions that are	1421	/* If this object glows, it may affect lighting conditions that are
1359	* 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
1360	* 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
1361	* on the map will get recalculated. The players could very well	1424	* on the map will get recalculated. The players could very well
…		…
1380	* blocked() and wall() work properly), and these flags are updated by	1443	* blocked() and wall() work properly), and these flags are updated by
1381	* update_object().	1444	* update_object().
1382	*/	1445	*/
1383		1446
1384	/* 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 */
1385	if (!(flag & INS_NO_WALK_ON) && !op->head)	1448	if (!(flag & INS_NO_WALK_ON) && op->head_ () == op)
1386	{	1449	{
1387	if (check_move_on (op, originator))	1450	if (check_move_on (op, originator))
1388	return 0;	1451	return 0;
1389		1452
1390	/* 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
1391	* walk on's.	1454	* walk on's.
1392	*/	1455	*/
1393	for (tmp = op->more; tmp != NULL; tmp = tmp->more)	1456	for (object *tmp = op->more; tmp; tmp = tmp->more)
1394	if (check_move_on (tmp, originator))	1457	if (check_move_on (tmp, originator))
1395	return 0;	1458	return 0;
1396	}	1459	}
1397		1460
1398	return op;	1461	return op;
…		…
1408	object *tmp, *tmp1;	1471	object *tmp, *tmp1;
1409		1472
1410	/* first search for itself and remove any old instances */	1473	/* first search for itself and remove any old instances */
1411		1474
1412	for (tmp = op->ms ().bot; tmp; tmp = tmp->above)	1475	for (tmp = op->ms ().bot; tmp; tmp = tmp->above)
1413	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */	1476	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */
1414	tmp->destroy ();	1477	tmp->destroy ();
1415		1478
1416	tmp1 = arch_to_object (archetype::find (arch_string));	1479	tmp1 = arch_to_object (archetype::find (arch_string));
1417		1480
1418	tmp1->x = op->x;	1481	tmp1->x = op->x;
…		…
1421	}	1484	}
1422		1485
1423	object *	1486	object *
1424	object::insert_at (object *where, object *originator, int flags)	1487	object::insert_at (object *where, object *originator, int flags)
1425	{	1488	{
1426	where->map->insert (this, where->x, where->y, originator, flags);	1489	return where->map->insert (this, where->x, where->y, originator, flags);
1427	}	1490	}
1428		1491
1429	/*	1492	/*
1430	* 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
1431	* is returned contains nr objects, and the remaining parts contains	1494	* is returned contains nr objects, and the remaining parts contains
…		…
1471	* 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
1472	* is subsequently removed and freed.	1535	* is subsequently removed and freed.
1473	*	1536	*
1474	* 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
1475	*/	1538	*/
1476
1477	object *	1539	object *
1478	decrease_ob_nr (object *op, uint32 i)	1540	decrease_ob_nr (object *op, uint32 i)
1479	{	1541	{
1480	object *tmp;	1542	object *tmp;
1481		1543
…		…
1556		1618
1557	/*	1619	/*
1558	* add_weight(object, weight) adds the specified weight to an object,	1620	* add_weight(object, weight) adds the specified weight to an object,
1559	* and also updates how much the environment(s) is/are carrying.	1621	* and also updates how much the environment(s) is/are carrying.
1560	*/	1622	*/
1561
1562	void	1623	void
1563	add_weight (object *op, signed long weight)	1624	add_weight (object *op, signed long weight)
1564	{	1625	{
1565	while (op != NULL)	1626	while (op != NULL)
1566	{	1627	{
…		…
1581	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);
1582	free (dump);	1643	free (dump);
1583	return op;	1644	return op;
1584	}	1645	}
1585		1646
1586	if (where->head)	1647	if (where->head_ () != where)
1587	{	1648	{
1588	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");
1589	where = where->head;	1650	where = where->head;
1590	}	1651	}
1591		1652
1592	return where->insert (op);	1653	return where->insert (op);
1593	}	1654	}
…		…
1598	* inside the object environment.	1659	* inside the object environment.
1599	*	1660	*
1600	* 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
1601	* be != op, if items are merged. -Tero	1662	* be != op, if items are merged. -Tero
1602	*/	1663	*/
1603
1604	object *	1664	object *
1605	object::insert (object *op)	1665	object::insert (object *op)
1606	{	1666	{
1607	object *tmp, *otmp;
1608
1609	if (!QUERY_FLAG (op, FLAG_REMOVED))	1667	if (!QUERY_FLAG (op, FLAG_REMOVED))
1610	op->remove ();	1668	op->remove ();
1611		1669
1612	if (op->more)	1670	if (op->more)
1613	{	1671	{
…		…
1615	return op;	1673	return op;
1616	}	1674	}
1617		1675
1618	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1676	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1619	CLEAR_FLAG (op, FLAG_REMOVED);	1677	CLEAR_FLAG (op, FLAG_REMOVED);
		1678
1620	if (op->nrof)	1679	if (op->nrof)
1621	{	1680	{
1622	for (tmp = inv; tmp != NULL; tmp = tmp->below)	1681	for (object *tmp = inv; tmp; tmp = tmp->below)
1623	if (object::can_merge (tmp, op))	1682	if (object::can_merge (tmp, op))
1624	{	1683	{
1625	/* return the original object and remove inserted object	1684	/* return the original object and remove inserted object
1626	(client needs the original object) */	1685	(client needs the original object) */
1627	tmp->nrof += op->nrof;	1686	tmp->nrof += op->nrof;
…		…
1646	add_weight (this, op->weight * op->nrof);	1705	add_weight (this, op->weight * op->nrof);
1647	}	1706	}
1648	else	1707	else
1649	add_weight (this, (op->weight + op->carrying));	1708	add_weight (this, (op->weight + op->carrying));
1650		1709
1651	otmp = this->in_player ();	1710	if (object *otmp = this->in_player ())
1652	if (otmp && otmp->contr)
1653	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1711	if (otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1654	otmp->update_stats ();	1712	otmp->update_stats ();
1655		1713
		1714	op->owner = 0; // its his/hers now. period.
1656	op->map = 0;	1715	op->map = 0;
1657	op->env = this;	1716	op->env = this;
1658	op->above = 0;	1717	op->above = 0;
1659	op->below = 0;	1718	op->below = 0;
1660	op->x = 0, op->y = 0;	1719	op->x = op->y = 0;
1661		1720
1662	/* 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 */
1663	if ((op->glow_radius != 0) && map)	1722	if (op->glow_radius && map)
1664	{	1723	{
1665	#ifdef DEBUG_LIGHTS	1724	#ifdef DEBUG_LIGHTS
1666	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);
1667	#endif /* DEBUG_LIGHTS */	1726	#endif /* DEBUG_LIGHTS */
1668	if (map->darkness)	1727	if (map->darkness)
…		…
1768	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||	1827	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
1769	((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))
1770	{	1829	{
1771		1830
1772	float	1831	float
1773	diff = tmp->move_slow_penalty * FABS (op->speed);	1832	diff = tmp->move_slow_penalty * fabs (op->speed);
1774		1833
1775	if (op->type == PLAYER)	1834	if (op->type == PLAYER)
1776	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)) ||
1777	(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)))
1778	diff /= 4.0;	1837	diff /= 4.0;
…		…
1902	* activate recursively a flag on an object inventory	1961	* activate recursively a flag on an object inventory
1903	*/	1962	*/
1904	void	1963	void
1905	flag_inv (object *op, int flag)	1964	flag_inv (object *op, int flag)
1906	{	1965	{
1907	if (op->inv)
1908	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)	1966	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1909	{	1967	{
1910	SET_FLAG (tmp, flag);	1968	SET_FLAG (tmp, flag);
1911	flag_inv (tmp, flag);	1969	flag_inv (tmp, flag);
1912	}	1970	}
1913	}	1971	}
1914		1972
1915	/*	1973	/*
1916	* deactivate recursively a flag on an object inventory	1974	* deactivate recursively a flag on an object inventory
1917	*/	1975	*/
1918	void	1976	void
1919	unflag_inv (object *op, int flag)	1977	unflag_inv (object *op, int flag)
1920	{	1978	{
1921	if (op->inv)
1922	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)	1979	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1923	{	1980	{
1924	CLEAR_FLAG (tmp, flag);	1981	CLEAR_FLAG (tmp, flag);
1925	unflag_inv (tmp, flag);	1982	unflag_inv (tmp, flag);
1926	}	1983	}
1927	}
1928
1929	/*
1930	* set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in
1931	* all it's inventory (recursively).
1932	* If checksums are used, a player will get set_cheat called for
1933	* him/her-self and all object carried by a call to this function.
1934	*/
1935	void
1936	set_cheat (object *op)
1937	{
1938	SET_FLAG (op, FLAG_WAS_WIZ);
1939	flag_inv (op, FLAG_WAS_WIZ);
1940	}	1984	}
1941		1985
1942	/*	1986	/*
1943	* 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
1944	* 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
…		…
1946	* to search (see the freearr_x/y[] definition).	1990	* to search (see the freearr_x/y[] definition).
1947	* It returns a random choice among the alternatives found.	1991	* It returns a random choice among the alternatives found.
1948	* 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
1949	* does all 4 immediate directions). This returns the index into the	1993	* does all 4 immediate directions). This returns the index into the
1950	* 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)
1951	* Note - this only checks to see if there is space for the head of the
1952	* object - if it is a multispace object, this should be called for all
1953	* pieces.
1954	* Note2: This function does correctly handle tiled maps, but does not	1995	* Note: This function does correctly handle tiled maps, but does not
1955	* inform the caller. However, insert_ob_in_map will update as	1996	* inform the caller. However, insert_ob_in_map will update as
1956	* 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.
1957	* 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
1958	* 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
1959	* 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
…		…
1961	* customized, changed states, etc.	2002	* customized, changed states, etc.
1962	*/	2003	*/
1963	int	2004	int
1964	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)
1965	{	2006	{
		2007	int altern[SIZEOFFREE];
1966	int index = 0, flag;	2008	int index = 0, flag;
1967	int altern[SIZEOFFREE];
1968		2009
1969	for (int i = start; i < stop; i++)	2010	for (int i = start; i < stop; i++)
1970	{	2011	{
1971	flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]);	2012	mapxy pos (m, x, y); pos.move (i);
1972	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	{
1973	altern [index++] = i;	2028	altern [index++] = i;
		2029	continue;
		2030	}
1974		2031
1975	/* 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.
1976	* 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.
1977	* 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 -
1978	* 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
1979	* 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
1980	* to only the spaces immediately surrounding the target area, and	2037	* to only the spaces immediately surrounding the target area, and
1981	* won't look 2 spaces south of the target space.	2038	* won't look 2 spaces south of the target space.
1982	*/	2039	*/
1983	else if ((flag & P_NO_PASS) && maxfree[i] < stop)	2040	if (ms.move_block == MOVE_ALL && maxfree[i] < stop)
		2041	{
1984	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;
1985	}	2056	}
1986		2057
1987	if (!index)	2058	if (!index)
1988	return -1;	2059	return -1;
1989		2060
1990	return altern[RANDOM () % index];	2061	return altern [rndm (index)];
1991	}	2062	}
1992		2063
1993	/*	2064	/*
1994	* find_first_free_spot(archetype, maptile, x, y) works like	2065	* find_first_free_spot(archetype, maptile, x, y) works like
1995	* find_free_spot(), but it will search max number of squares.	2066	* find_free_spot(), but it will search max number of squares.
…		…
1998	*/	2069	*/
1999	int	2070	int
2000	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)
2001	{	2072	{
2002	for (int i = 0; i < SIZEOFFREE; i++)	2073	for (int i = 0; i < SIZEOFFREE; i++)
2003	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]))
2004	return i;	2075	return i;
2005		2076
2006	return -1;	2077	return -1;
2007	}	2078	}
2008		2079
…		…
2016	{	2087	{
2017	arr += begin;	2088	arr += begin;
2018	end -= begin;	2089	end -= begin;
2019		2090
2020	while (--end)	2091	while (--end)
2021	swap (arr [end], arr [RANDOM () % (end + 1)]);	2092	swap (arr [end], arr [rndm (end + 1)]);
2022	}	2093	}
2023		2094
2024	/* new function to make monster searching more efficient, and effective!	2095	/* new function to make monster searching more efficient, and effective!
2025	* This basically returns a randomized array (in the passed pointer) of	2096	* This basically returns a randomized array (in the passed pointer) of
2026	* 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
…		…
2062	object *tmp;	2133	object *tmp;
2063	maptile *mp;	2134	maptile *mp;
2064		2135
2065	MoveType blocked, move_type;	2136	MoveType blocked, move_type;
2066		2137
2067	if (exclude && exclude->head)	2138	if (exclude && exclude->head_ () != exclude)
2068	{	2139	{
2069	exclude = exclude->head;	2140	exclude = exclude->head;
2070	move_type = exclude->move_type;	2141	move_type = exclude->move_type;
2071	}	2142	}
2072	else	2143	else
…		…
2095	max = maxfree[i];	2166	max = maxfree[i];
2096	else if (mflags & P_IS_ALIVE)	2167	else if (mflags & P_IS_ALIVE)
2097	{	2168	{
2098	for (tmp = ms.bot; tmp; tmp = tmp->above)	2169	for (tmp = ms.bot; tmp; tmp = tmp->above)
2099	if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)	2170	if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)
2100	&& (tmp != exclude || (tmp->head && tmp->head != exclude)))	2171	&& (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2101	break;	2172	break;
2102		2173
2103	if (tmp)	2174	if (tmp)
2104	return freedir[i];	2175	return freedir[i];
2105	}	2176	}
…		…
2160		2231
2161	return 3;	2232	return 3;
2162	}	2233	}
2163		2234
2164	/*	2235	/*
2165	* absdir(int): Returns a number between 1 and 8, which represent
2166	* the "absolute" direction of a number (it actually takes care of
2167	* "overflow" in previous calculations of a direction).
2168	*/
2169
2170	int
2171	absdir (int d)
2172	{
2173	while (d < 1)
2174	d += 8;
2175
2176	while (d > 8)
2177	d -= 8;
2178
2179	return d;
2180	}
2181
2182	/*
2183	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is	2236	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is
2184	* between two directions (which are expected to be absolute (see absdir())	2237	* between two directions (which are expected to be absolute (see absdir())
2185	*/	2238	*/
2186
2187	int	2239	int
2188	dirdiff (int dir1, int dir2)	2240	dirdiff (int dir1, int dir2)
2189	{	2241	{
2190	int d;	2242	int d;
2191		2243
…		…
2304	* 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
2305	* core dumps if they do.	2357	* core dumps if they do.
2306	*	2358	*
2307	* 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)
2308	*/	2360	*/
2309
2310	int	2361	int
2311	can_pick (const object *who, const object *item)	2362	can_pick (const object *who, const object *item)
2312	{	2363	{
2313	return /*QUERY_FLAG(who,FLAG_WIZ)|| */	2364	return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2314	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&	2365	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
…		…
2319	* create clone from object to another	2370	* create clone from object to another
2320	*/	2371	*/
2321	object *	2372	object *
2322	object_create_clone (object *asrc)	2373	object_create_clone (object *asrc)
2323	{	2374	{
2324	object *dst = 0, *tmp, *src, *part, *prev, *item;	2375	object *dst = 0, *tmp, *src, *prev, *item;
2325		2376
2326	if (!asrc)	2377	if (!asrc)
2327	return 0;	2378	return 0;
2328		2379
2329	src = asrc;
2330	if (src->head)
2331	src = src->head;	2380	src = asrc->head_ ();
2332		2381
2333	prev = 0;	2382	prev = 0;
2334	for (part = src; part; part = part->more)	2383	for (object *part = src; part; part = part->more)
2335	{	2384	{
2336	tmp = part->clone ();	2385	tmp = part->clone ();
2337	tmp->x -= src->x;	2386	tmp->x -= src->x;
2338	tmp->y -= src->y;	2387	tmp->y -= src->y;
2339		2388
…		…
2355		2404
2356	for (item = src->inv; item; item = item->below)	2405	for (item = src->inv; item; item = item->below)
2357	insert_ob_in_ob (object_create_clone (item), dst);	2406	insert_ob_in_ob (object_create_clone (item), dst);
2358		2407
2359	return dst;	2408	return dst;
2360	}
2361
2362	/* GROS - Creates an object using a string representing its content. */
2363	/* Basically, we save the content of the string to a temp file, then call */
2364	/* load_object on it. I admit it is a highly inefficient way to make things, */
2365	/* but it was simple to make and allows reusing the load_object function. */
2366	/* Remember not to use load_object_str in a time-critical situation. */
2367	/* Also remember that multiparts objects are not supported for now. */
2368	object *
2369	load_object_str (const char *obstr)
2370	{
2371	object *op;
2372	char filename[MAX_BUF];
2373
2374	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2375
2376	FILE *tempfile = fopen (filename, "w");
2377
2378	if (tempfile == NULL)
2379	{
2380	LOG (llevError, "Error - Unable to access load object temp file\n");
2381	return NULL;
2382	}
2383
2384	fprintf (tempfile, obstr);
2385	fclose (tempfile);
2386
2387	op = object::create ();
2388
2389	object_thawer thawer (filename);
2390
2391	if (thawer)
2392	load_object (thawer, op, 0);
2393
2394	LOG (llevDebug, " load str completed, object=%s\n", &op->name);
2395	CLEAR_FLAG (op, FLAG_REMOVED);
2396
2397	return op;
2398	}	2409	}
2399		2410
2400	/* This returns the first object in who's inventory that	2411	/* This returns the first object in who's inventory that
2401	* has the same type and subtype match.	2412	* has the same type and subtype match.
2402	* returns NULL if no match.	2413	* returns NULL if no match.
…		…
2457	if (link->key == canonical_key)	2468	if (link->key == canonical_key)
2458	return link->value;	2469	return link->value;
2459		2470
2460	return 0;	2471	return 0;
2461	}	2472	}
2462
2463		2473
2464	/*	2474	/*
2465	* Updates the canonical_key in op to value.	2475	* Updates the canonical_key in op to value.
2466	*	2476	*
2467	* 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).
…		…
2491	/* Basically, if the archetype has this key set,	2501	/* Basically, if the archetype has this key set,
2492	* we need to store the null value so when we save	2502	* we need to store the null value so when we save
2493	* it, we save the empty value so that when we load,	2503	* it, we save the empty value so that when we load,
2494	* we get this value back again.	2504	* we get this value back again.
2495	*/	2505	*/
2496	if (get_ob_key_link (&op->arch->clone, canonical_key))	2506	if (get_ob_key_link (op->arch, canonical_key))
2497	field->value = 0;	2507	field->value = 0;
2498	else	2508	else
2499	{	2509	{
2500	if (last)	2510	if (last)
2501	last->next = field->next;	2511	last->next = field->next;
…		…
2570	}	2580	}
2571	else	2581	else
2572	item = item->env;	2582	item = item->env;
2573	}	2583	}
2574		2584
2575
2576	const char *	2585	const char *
2577	object::flag_desc (char *desc, int len) const	2586	object::flag_desc (char *desc, int len) const
2578	{	2587	{
2579	char *p = desc;	2588	char *p = desc;
2580	bool first = true;	2589	bool first = true;
…		…
2607	{	2616	{
2608	char flagdesc[512];	2617	char flagdesc[512];
2609	char info2[256 * 4];	2618	char info2[256 * 4];
2610	char *p = info;	2619	char *p = info;
2611		2620
2612	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}",
2613	count, uuid.seq,	2622	count,
		2623	uuid.c_str (),
2614	&name,	2624	&name,
2615	title ? "\",title:" : "",	2625	title ? "\",title:\"" : "",
2616	title ? (const char *)title : "",	2626	title ? (const char *)title : "",
2617	flag_desc (flagdesc, 512), type);	2627	flag_desc (flagdesc, 512), type);
2618		2628
2619	if (env)	2629	if (!this->flag[FLAG_REMOVED] && env)
2620	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2630	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2621		2631
2622	if (map)	2632	if (map)
2623	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);
2624		2634
…		…
2626	}	2636	}
2627		2637
2628	const char *	2638	const char *
2629	object::debug_desc () const	2639	object::debug_desc () const
2630	{	2640	{
2631	static char info[256 * 4];	2641	static char info[3][256 * 4];
		2642	static int info_idx;
		2643
2632	return debug_desc (info);	2644	return debug_desc (info [++info_idx % 3]);
2633	}	2645	}
2634		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