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.104 by root, Tue Jan 2 21:13:21 2007 UTC vs.
Revision 1.203 by root, Fri Apr 11 13:59:05 2008 UTC

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

Diff Legend

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