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.56 by root, Sun Dec 3 02:04:57 2006 UTC vs.
Revision 1.207 by root, Sun Apr 20 23:25:09 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
27	#include <global.h>	28	#include <global.h>
28	#include <stdio.h>	29	#include <stdio.h>
29	#include <sys/types.h>	30	#include <sys/types.h>
30	#include <sys/uio.h>	31	#include <sys/uio.h>
31	#include <object.h>	32	#include <object.h>
32	#include <funcpoint.h>	33	#include <funcpoint.h>
		34	#include <sproto.h>
33	#include <loader.h>	35	#include <loader.h>
34		36
35	int nrofallocobjects = 0;	37	#include <bitset>
36	static UUID uuid;	38
		39	UUID UUID::cur;
		40	static uint64_t seq_next_save;
37	const uint64 UUID_SKIP = 1<<19;	41	static const uint64 UUID_GAP = 1<<19;
38		42
39	object *active_objects; /* List of active objects that need to be processed */	43	objectvec objects;
		44	activevec actives;
40		45
41	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,	46	short freearr_x[SIZEOFFREE] = {
		47	0,
		48	0, 1, 1, 1, 0, -1, -1, -1,
		49	0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,
42	0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1	50	0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1
43	};	51	};
44	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,	52	short freearr_y[SIZEOFFREE] = {
		53	0,
		54	-1, -1, 0, 1, 1, 1, 0, -1,
		55	-2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2,
45	-3, -3, -3, -3, -2, -1, 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3	56	-3, -3, -3, -3, -2, -1, 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3
46	};	57	};
47	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,	58	int maxfree[SIZEOFFREE] = {
		59	0,
		60	9, 10, 13, 14, 17, 18, 21, 22,
		61	25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45, 48,
48	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	62	49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49
49	};	63	};
50	int freedir[SIZEOFFREE] = {	64	int freedir[SIZEOFFREE] = {
51	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,	65	0,
		66	1, 2, 3, 4, 5, 6, 7, 8,
		67	1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8,
52	1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8	68	1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8
53	};	69	};
54		70
55	static void	71	static void
56	write_uuid (void)	72	write_uuid (uval64 skip, bool sync)
57	{	73	{
58	char filename1[MAX_BUF], filename2[MAX_BUF];	74	CALL_BEGIN (2);
59		75	CALL_ARG_SV (newSVval64 (skip));
60	sprintf (filename1, "%s/uuid", settings.localdir);	76	CALL_ARG_SV (boolSV (sync));
61	sprintf (filename2, "%s/uuid~", settings.localdir);	77	CALL_CALL ("cf::write_uuid", G_DISCARD);
62		78	CALL_END;
63	FILE *fp;
64
65	if (!(fp = fopen (filename2, "w")))
66	{
67	LOG (llevError, "ERROR: cannot open %s for writing, unable to write UUID!\n", filename2);
68	return;
69	}
70
71	fprintf (fp, "<1,%llx>\n", (unsigned long long)uuid.seq + UUID_SKIP * 2);
72	fclose (fp);
73	rename (filename2, filename1);
74	}	79	}
75		80
76	static void	81	static void
77	read_uuid (void)	82	read_uuid (void)
78	{	83	{
79	char filename[MAX_BUF];	84	char filename[MAX_BUF];
80		85
81	sprintf (filename, "%s/uuid", settings.localdir);	86	sprintf (filename, "%s/uuid", settings.localdir);
82		87
		88	seq_next_save = 0;
		89
83	FILE *fp;	90	FILE *fp;
84		91
85	if (!(fp = fopen (filename, "r")))	92	if (!(fp = fopen (filename, "r")))
86	{	93	{
87	if (errno == ENOENT)	94	if (errno == ENOENT)
88	{	95	{
89	LOG (llevInfo, "RESET uid to 1\n");	96	LOG (llevInfo, "RESET uid to 1\n");
90	uuid.seq = 0;	97	UUID::cur.seq = 0;
91	write_uuid ();	98	write_uuid (UUID_GAP, true);
92	return;	99	return;
93	}	100	}
94		101
95	LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);	102	LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);
96	_exit (1);	103	_exit (1);
97	}	104	}
98		105
99	int version;	106	UUID::BUF buf;
100	unsigned long long uid;	107	buf[0] = 0;
101	if (2 != fscanf (fp, "<%d,%llx>\n", &version, &uid) || version != 1)	108	fgets (buf, sizeof (buf), fp);
		109
		110	if (!UUID::cur.parse (buf))
102	{	111	{
103	LOG (llevError, "FATAL: error reading uid from %s!\n", filename);	112	LOG (llevError, "FATAL: error reading uid from %s (%s)!\n", filename, buf);
104	_exit (1);	113	_exit (1);
105	}	114	}
106		115
107	uuid.seq = uid;
108	write_uuid ();
109	LOG (llevDebug, "read UID: %lld\n", uid);	116	LOG (llevDebug, "read UUID: %s\n", UUID::cur.c_str ());
		117
		118	write_uuid (UUID_GAP, true);
110	fclose (fp);	119	fclose (fp);
111	}	120	}
112		121
113	UUID	122	UUID
114	gen_uuid ()	123	UUID::gen ()
115	{	124	{
116	UUID uid;	125	UUID uid;
117		126
118	uid.seq = ++uuid.seq;	127	uid.seq = ++cur.seq;
119		128
120	if (!(uuid.seq & (UUID_SKIP - 1)))	129	if (expect_false (cur.seq >= seq_next_save))
121	write_uuid ();	130	{
		131	seq_next_save = UUID::cur.seq + (UUID_GAP >> 1);
		132	write_uuid (UUID_GAP, false);
		133	}
		134
122		135
123	return uid;	136	return uid;
124	}	137	}
125		138
126	void	139	void
127	init_uuid ()	140	UUID::init ()
128	{	141	{
129	read_uuid ();	142	read_uuid ();
130	}	143	}
131		144
132	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */	145	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */
133	static int	146	static bool
134	compare_ob_value_lists_one (const object *wants, const object *has)	147	compare_ob_value_lists_one (const object *wants, const object *has)
135	{	148	{
136	key_value *wants_field;	149	key_value *wants_field;
137		150
138	/* n-squared behaviour (see get_ob_key_link()), but I'm hoping both	151	/* n-squared behaviour (see get_ob_key_link()), but I'm hoping both
139	* objects with lists are rare, and lists stay short. If not, use a	152	* objects with lists are rare, and lists stay short. If not, use a
140	* different structure or at least keep the lists sorted...	153	* different structure or at least keep the lists sorted...
141	*/	154	*/
142		155
143	/* For each field in wants, */	156	/* For each field in wants, */
144	for (wants_field = wants->key_values; wants_field != NULL; wants_field = wants_field->next)	157	for (wants_field = wants->key_values; wants_field; wants_field = wants_field->next)
145	{	158	{
146	key_value *has_field;	159	key_value *has_field;
147		160
148	/* Look for a field in has with the same key. */	161	/* Look for a field in has with the same key. */
149	has_field = get_ob_key_link (has, wants_field->key);	162	has_field = get_ob_key_link (has, wants_field->key);
150		163
151	if (has_field == NULL)	164	if (!has_field)
152	{
153	/* No field with that name. */	165	return 0; /* No field with that name. */
154	return FALSE;
155	}
156		166
157	/* Found the matching field. */	167	/* Found the matching field. */
158	if (has_field->value != wants_field->value)	168	if (has_field->value != wants_field->value)
159	{
160	/* Values don't match, so this half of the comparison is false. */	169	return 0; /* Values don't match, so this half of the comparison is false. */
161	return FALSE;
162	}
163		170
164	/* If we get here, we found a match. Now for the next field in wants. */	171	/* If we get here, we found a match. Now for the next field in wants. */
165	}	172	}
166		173
167	/* If we get here, every field in wants has a matching field in has. */	174	/* If we get here, every field in wants has a matching field in has. */
168	return TRUE;	175	return 1;
169	}	176	}
170		177
171	/* Returns TRUE if ob1 has the same key_values as ob2. */	178	/* Returns TRUE if ob1 has the same key_values as ob2. */
172	static int	179	static bool
173	compare_ob_value_lists (const object *ob1, const object *ob2)	180	compare_ob_value_lists (const object *ob1, const object *ob2)
174	{	181	{
175	/* However, there may be fields in has which aren't partnered in wants,	182	/* However, there may be fields in has which aren't partnered in wants,
176	* so we need to run the comparison *twice*. :(	183	* so we need to run the comparison *twice*. :(
177	*/	184	*/
…		…
183	*	190	*
184	* Note that this function appears a lot longer than the macro it	191	* Note that this function appears a lot longer than the macro it
185	* replaces - this is mostly for clarity - a decent compiler should hopefully	192	* replaces - this is mostly for clarity - a decent compiler should hopefully
186	* reduce this to the same efficiency.	193	* reduce this to the same efficiency.
187	*	194	*
188	* Check nrof variable *before* calling CAN_MERGE()	195	* Check nrof variable *before* calling can_merge()
189	*	196	*
190	* Improvements made with merge: Better checking on potion, and also	197	* Improvements made with merge: Better checking on potion, and also
191	* check weight	198	* check weight
192	*/	199	*/
193
194	bool object::can_merge (object *ob1, object *ob2)	200	bool object::can_merge_slow (object *ob1, object *ob2)
195	{	201	{
196	/* A couple quicksanity checks */	202	/* A couple quicksanity checks */
197	if ((ob1 == ob2) || (ob1->type != ob2->type))	203	if (ob1 == ob2
		204	|| ob1->type != ob2->type
		205	|| ob1->speed != ob2->speed
		206	|| ob1->value != ob2->value
		207	|| ob1->name != ob2->name)
198	return 0;	208	return 0;
199		209
200	if (ob1->speed != ob2->speed)	210	/* Do not merge objects if nrof would overflow. First part checks
		211	* for unsigned overflow (2c), second part checks wether the result
		212	* would fit into a 32 bit signed int, which is often used to hold
		213	* nrof values.
		214	*/
		215	if (~ob1->nrof < ob2->nrof || ob1->nrof + ob2->nrof > (1UL << 31))
201	return 0;	216	return 0;
202		217
203	/* Do not merge objects if nrof would overflow. We use 1UL<<31 since that
204	* value could not be stored in a sint32 (which unfortunately sometimes is
205	* used to store nrof).
206	*/
207	if (ob1->nrof + ob2->nrof >= 1UL << 31)
208	return 0;
209
210	/* If the objects have been identified, set the BEEN_APPLIED flag.	218	/* If the objects have been identified, set the BEEN_APPLIED flag.
211	* This is to the comparison of the flags below will be OK. We	219	* This is to the comparison of the flags below will be OK. We
212	* just can't ignore the been applied or identified flags, as they	220	* just can't ignore the been applied or identified flags, as they
213	* are not equal - just if it has been identified, the been_applied	221	* are not equal - just if it has been identified, the been_applied
214	* flags lose any meaning.	222	* flags lose any meaning.
215	*/	223	*/
216	if (QUERY_FLAG (ob1, FLAG_IDENTIFIED))	224	if (QUERY_FLAG (ob1, FLAG_IDENTIFIED))
217	SET_FLAG (ob1, FLAG_BEEN_APPLIED);	225	SET_FLAG (ob1, FLAG_BEEN_APPLIED);
218		226
219	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))	227	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))
220	SET_FLAG (ob2, FLAG_BEEN_APPLIED);	228	SET_FLAG (ob2, FLAG_BEEN_APPLIED);
221		229
222		230	if ((ob1->flag ^ ob2->flag).reset (FLAG_INV_LOCKED).reset (FLAG_CLIENT_SENT).any ()
223	/* the 0x400000 on flags2 is FLAG_INV_LOCK. I don't think something	231	|| ob1->arch != ob2->arch
224	* being locked in inventory should prevent merging.
225	* 0x4 in flags3 is CLIENT_SENT
226	*/
227	if ((ob1->arch != ob2->arch) ||
228	(ob1->flags[0] != ob2->flags[0]) ||
229	(ob1->flags[1] != ob2->flags[1]) ||
230	((ob1->flags[2] & ~0x400000) != (ob2->flags[2] & ~0x400000)) ||
231	((ob1->flags[3] & ~0x4) != (ob2->flags[3] & ~0x4)) ||
232	(ob1->name != ob2->name) ||	232	|| ob1->name != ob2->name
233	(ob1->title != ob2->title) ||	233	|| ob1->title != ob2->title
234	(ob1->msg != ob2->msg) ||	234	|| ob1->msg != ob2->msg
235	(ob1->weight != ob2->weight) ||	235	|| ob1->weight != ob2->weight
236	(memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist)) != 0) ||	236	|| memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
237	(memcmp (&ob1->stats, &ob2->stats, sizeof (ob1->stats)) != 0) ||	237	|| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats) )
238	(ob1->attacktype != ob2->attacktype) ||	238	|| ob1->attacktype != ob2->attacktype
239	(ob1->magic != ob2->magic) ||	239	|| ob1->magic != ob2->magic
240	(ob1->slaying != ob2->slaying) ||	240	|| ob1->slaying != ob2->slaying
241	(ob1->skill != ob2->skill) ||	241	|| ob1->skill != ob2->skill
242	(ob1->value != ob2->value) ||	242	|| ob1->value != ob2->value
243	(ob1->animation_id != ob2->animation_id) ||	243	|| ob1->animation_id != ob2->animation_id
244	(ob1->client_type != ob2->client_type) ||	244	|| ob1->client_type != ob2->client_type
245	(ob1->materialname != ob2->materialname) ||	245	|| ob1->materialname != ob2->materialname
246	(ob1->lore != ob2->lore) ||	246	|| ob1->lore != ob2->lore
247	(ob1->subtype != ob2->subtype) ||	247	|| ob1->subtype != ob2->subtype
248	(ob1->move_type != ob2->move_type) ||	248	|| ob1->move_type != ob2->move_type
249	(ob1->move_block != ob2->move_block) ||	249	|| ob1->move_block != ob2->move_block
250	(ob1->move_allow != ob2->move_allow) ||	250	|| ob1->move_allow != ob2->move_allow
251	(ob1->move_on != ob2->move_on) ||	251	|| ob1->move_on != ob2->move_on
252	(ob1->move_off != ob2->move_off) || (ob1->move_slow != ob2->move_slow) || (ob1->move_slow_penalty != ob2->move_slow_penalty))	252	|| ob1->move_off != ob2->move_off
		253	|| ob1->move_slow != ob2->move_slow
		254	|| ob1->move_slow_penalty != ob2->move_slow_penalty)
253	return 0;	255	return 0;
254		256
255	/* This is really a spellbook check - really, we should	257	/* This is really a spellbook check - we should in general
256	* check all objects in the inventory.	258	* not merge objects with real inventories, as splitting them
		259	* is hard.
257	*/	260	*/
258	if (ob1->inv || ob2->inv)	261	if (ob1->inv || ob2->inv)
259	{	262	{
260	/* if one object has inventory but the other doesn't, not equiv */
261	if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv))
262	return 0;
263
264	/* Now check to see if the two inventory objects could merge */
265	if (!CAN_MERGE (ob1->inv, ob2->inv))	263	if (!(ob1->inv && ob2->inv))
266	return 0;	264	return 0; /* inventories differ in length */
		265
		266	if (ob1->inv->below || ob2->inv->below)
		267	return 0; /* more than one object in inv */
		268
		269	if (!object::can_merge (ob1->inv, ob2->inv))
		270	return 0; /* inventory objects differ */
267		271
268	/* inventory ok - still need to check rest of this object to see	272	/* inventory ok - still need to check rest of this object to see
269	* if it is valid.	273	* if it is valid.
270	*/	274	*/
271	}	275	}
…		…
279		283
280	/* Note sure why the following is the case - either the object has to	284	/* Note sure why the following is the case - either the object has to
281	* be animated or have a very low speed. Is this an attempted monster	285	* be animated or have a very low speed. Is this an attempted monster
282	* check?	286	* check?
283	*/	287	*/
284	if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && FABS ((ob1)->speed) > MIN_ACTIVE_SPEED)	288	if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && ob1->has_active_speed ())
285	return 0;	289	return 0;
286		290
287	switch (ob1->type)	291	switch (ob1->type)
288	{	292	{
289	case SCROLL:	293	case SCROLL:
290	if (ob1->level != ob2->level)	294	if (ob1->level != ob2->level)
291	return 0;	295	return 0;
292	break;	296	break;
293	}	297	}
294		298
295	if (ob1->key_values != NULL || ob2->key_values != NULL)	299	if (ob1->key_values || ob2->key_values)
296	{	300	{
297	/* At least one of these has key_values. */	301	/* At least one of these has key_values. */
298	if ((ob1->key_values == NULL) != (ob2->key_values == NULL))	302	if ((!ob1->key_values) != (!ob2->key_values))
299	/* One has fields, but the other one doesn't. */	303	/* One has fields, but the other one doesn't. */
300	return 0;	304	return 0;
301	else if (!compare_ob_value_lists (ob1, ob2))	305	else if (!compare_ob_value_lists (ob1, ob2))
302	return 0;	306	return 0;
303	}	307	}
304		308
305	//TODO: generate an event or call into perl for additional checks
306	if (ob1->self || ob2->self)	309	if (ob1->self || ob2->self)
307	{	310	{
308	ob1->optimise ();	311	ob1->optimise ();
309	ob2->optimise ();	312	ob2->optimise ();
310		313
311	if (ob1->self || ob2->self)	314	if (ob1->self || ob2->self)
		315	{
		316	int k1 = ob1->self ? HvTOTALKEYS (ob1->self) : 0;
		317	int k2 = ob2->self ? HvTOTALKEYS (ob2->self) : 0;
		318
		319	if (k1 != k2)
312	return 0;	320	return 0;
		321	else if (k1 == 0)
		322	return 1;
		323	else if (!cfperl_can_merge (ob1, ob2))
		324	return 0;
		325	}
313	}	326	}
314		327
315	/* Everything passes, must be OK. */	328	/* Everything passes, must be OK. */
316	return 1;	329	return 1;
317	}	330	}
318		331
		332	static sint32
		333	weight_adjust (object *op, sint32 weight)
		334	{
		335	return op->type == CONTAINER
		336	? lerp (weight, 0, 100, 0, 100 - op->stats.Str)
		337	: weight;
		338	}
		339
319	/*	340	/*
		341	* add_weight(object, weight) adds the specified weight to an object,
		342	* and also updates how much the environment(s) is/are carrying.
		343	*/
		344	static void
		345	add_weight (object *op, sint32 weight)
		346	{
		347	while (op)
		348	{
		349	weight = weight_adjust (op, weight);
		350
		351	op->carrying += weight;
		352	op = op->env;
		353	}
		354	}
		355
		356	/*
		357	* sub_weight() recursively (outwards) subtracts a number from the
		358	* weight of an object (and what is carried by it's environment(s)).
		359	*/
		360	static void
		361	sub_weight (object *op, long weight)
		362	{
		363	add_weight (op, -weight);
		364	}
		365
		366	/*
320	* sum_weight() is a recursive function which calculates the weight	367	* this is a recursive function which calculates the weight
321	* an object is carrying. It goes through in figures out how much	368	* an object is carrying. It goes through op and figures out how much
322	* containers are carrying, and sums it up.	369	* containers are carrying, and sums it up.
323	*/	370	*/
324	long	371	void
325	sum_weight (object *op)	372	object::update_weight ()
326	{	373	{
327	long sum;	374	sint32 sum = 0;
328	object *inv;
329		375
330	for (sum = 0, inv = op->inv; inv != NULL; inv = inv->below)	376	for (object *op = inv; op; op = op->below)
331	{	377	{
332	if (inv->inv)	378	if (op->inv)
333	sum_weight (inv);	379	op->update_weight ();
334	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);
335	}
336		380
337	if (op->type == CONTAINER && op->stats.Str)	381	sum += op->total_weight ();
338	sum = (sum * (100 - op->stats.Str)) / 100;	382	}
339		383
340	if (op->carrying != sum)	384	carrying = weight_adjust (this, sum);
341	op->carrying = sum;
342
343	return sum;
344	}
345
346	/**
347	* Return the outermost environment object for a given object.
348	*/
349
350	object *
351	object_get_env_recursive (object *op)
352	{
353	while (op->env != NULL)
354	op = op->env;
355	return op;
356	}
357
358	/*
359	* Eneq(@csd.uu.se): Since we can have items buried in a character we need
360	* a better check. We basically keeping traversing up until we can't
361	* or find a player.
362	*/
363
364	object *
365	is_player_inv (object *op)
366	{
367	for (; op != NULL && op->type != PLAYER; op = op->env)
368	if (op->env == op)
369	op->env = NULL;
370	return op;
371	}	385	}
372		386
373	/*	387	/*
374	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.	388	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
375	* Some error messages.	389	* Some error messages.
376	* The result of the dump is stored in the static global errmsg array.	390	* The result of the dump is stored in the static global errmsg array.
377	*/	391	*/
378
379	char *	392	char *
380	dump_object (object *op)	393	dump_object (object *op)
381	{	394	{
382	if (!op)	395	if (!op)
383	return strdup ("[NULLOBJ]");	396	return strdup ("[NULLOBJ]");
384		397
385	object_freezer freezer;	398	object_freezer freezer;
386	save_object (freezer, op, 3);	399	op->write (freezer);
387	return freezer.as_string ();	400	return freezer.as_string ();
388	}	401	}
389		402
390	/*	403	/*
391	* get_nearest_part(multi-object, object 2) returns the part of the	404	* get_nearest_part(multi-object, object 2) returns the part of the
392	* multi-object 1 which is closest to the second object.	405	* multi-object 1 which is closest to the second object.
393	* If it's not a multi-object, it is returned.	406	* If it's not a multi-object, it is returned.
394	*/	407	*/
395
396	object *	408	object *
397	get_nearest_part (object *op, const object *pl)	409	get_nearest_part (object *op, const object *pl)
398	{	410	{
399	object *tmp, *closest;	411	object *tmp, *closest;
400	int last_dist, i;	412	int last_dist, i;
…		…
408	}	420	}
409		421
410	/*	422	/*
411	* Returns the object which has the count-variable equal to the argument.	423	* Returns the object which has the count-variable equal to the argument.
412	*/	424	*/
413
414	object *	425	object *
415	find_object (tag_t i)	426	find_object (tag_t i)
416	{	427	{
417	for (object *op = object::first; op; op = op->next)	428	for_all_objects (op)
418	if (op->count == i)	429	if (op->count == i)
419	return op;	430	return op;
420		431
421	return 0;	432	return 0;
422	}	433	}
423		434
424	/*	435	/*
425	* Returns the first object which has a name equal to the argument.	436	* Returns the first object which has a name equal to the argument.
426	* Used only by the patch command, but not all that useful.	437	* Used only by the patch command, but not all that useful.
427	* Enables features like "patch <name-of-other-player> food 999"	438	* Enables features like "patch <name-of-other-player> food 999"
428	*/	439	*/
429
430	object *	440	object *
431	find_object_name (const char *str)	441	find_object_name (const char *str)
432	{	442	{
433	shstr_cmp str_ (str);	443	shstr_cmp str_ (str);
434	object *op;	444	object *op;
435		445
436	for (op = object::first; op != NULL; op = op->next)	446	for_all_objects (op)
437	if (op->name == str_)	447	if (op->name == str_)
438	break;	448	break;
439		449
440	return op;	450	return op;
441	}	451	}
442		452
443	void
444	free_all_object_data ()
445	{
446	LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);
447	}
448
449	/*	453	/*
450	* Sets the owner and sets the skill and exp pointers to owner's current	454	* Sets the owner and sets the skill and exp pointers to owner's current
451	* skill and experience objects.	455	* skill and experience objects.
		456	* ACTUALLY NO! investigate! TODO
452	*/	457	*/
453	void	458	void
454	object::set_owner (object *owner)	459	object::set_owner (object *owner)
455	{	460	{
		461	// allow objects which own objects
456	if (!owner)	462	if (owner)
457	return;
458
459	/* next line added to allow objects which own objects */
460	/* Add a check for ownercounts in here, as I got into an endless loop
461	* with the fireball owning a poison cloud which then owned the
462	* fireball. I believe that was caused by one of the objects getting
463	* freed and then another object replacing it. Since the ownercounts
464	* didn't match, this check is valid and I believe that cause is valid.
465	*/
466	while (owner->owner)	463	while (owner->owner)
467	owner = owner->owner;	464	owner = owner->owner;
		465
		466	if (flag [FLAG_FREED])
		467	{
		468	LOG (llevError | logBacktrace, "tried to set owner of %s to %s\n", debug_desc (), owner->debug_desc ());
		469	return;
		470	}
468		471
469	this->owner = owner;	472	this->owner = owner;
		473	}
		474
		475	int
		476	object::slottype () const
		477	{
		478	if (type == SKILL)
		479	{
		480	if (IS_COMBAT_SKILL (subtype)) return slot_combat;
		481	if (IS_RANGED_SKILL (subtype)) return slot_ranged;
		482	}
		483	else
		484	{
		485	if (slot [body_combat].info) return slot_combat;
		486	if (slot [body_range ].info) return slot_ranged;
		487	}
		488
		489	return slot_none;
		490	}
		491
		492	bool
		493	object::change_weapon (object *ob)
		494	{
		495	if (current_weapon == ob)
		496	return true;
		497
		498	if (chosen_skill)
		499	chosen_skill->flag [FLAG_APPLIED] = false;
		500
		501	current_weapon = ob;
		502	chosen_skill = !ob || ob->type == SKILL ? ob : find_skill_by_name (this, ob->skill);
		503
		504	if (chosen_skill)
		505	chosen_skill->flag [FLAG_APPLIED] = true;
		506
		507	update_stats ();
		508
		509	if (ob)
		510	{
		511	// now check wether any body locations became invalid, in which case
		512	// we cannot apply the weapon at the moment.
		513	for (int i = 0; i < NUM_BODY_LOCATIONS; ++i)
		514	if (slot[i].used < 0)
		515	{
		516	current_weapon = chosen_skill = 0;
		517	update_stats ();
		518
		519	new_draw_info_format (NDI_UNIQUE, 0, this,
		520	"You try to balance all your items at once, "
		521	"but the %s is just too much for your body. "
		522	"[You need to unapply some items first.]", &ob->name);
		523	return false;
		524	}
		525
		526	//new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);
		527	}
		528	else
		529	;//new_draw_info_format (NDI_UNIQUE, 0, this, "You unwield your weapons.");
		530
		531	if (ob && !ob->flag [FLAG_APPLIED] && ob->type != SPELL)
		532	{
		533	LOG (llevError | logBacktrace, "%s changed to unapplied weapon %s",
		534	&name, ob->debug_desc ());
		535	return false;
		536	}
		537
		538	return true;
470	}	539	}
471		540
472	/* Zero the key_values on op, decrementing the shared-string	541	/* Zero the key_values on op, decrementing the shared-string
473	* refcounts and freeing the links.	542	* refcounts and freeing the links.
474	*/	543	*/
475	static void	544	static void
476	free_key_values (object *op)	545	free_key_values (object *op)
477	{	546	{
478	for (key_value *i = op->key_values; i != 0;)	547	for (key_value *i = op->key_values; i; )
479	{	548	{
480	key_value *next = i->next;	549	key_value *next = i->next;
481	delete i;	550	delete i;
482		551
483	i = next;	552	i = next;
484	}	553	}
485		554
486	op->key_values = 0;	555	op->key_values = 0;
487	}	556	}
488		557
489	void object::clear ()	558	object &
		559	object::operator =(const object &src)
490	{	560	{
491	attachable_base::clear ();	561	bool is_freed = flag [FLAG_FREED];
		562	bool is_removed = flag [FLAG_REMOVED];
492		563
493	free_key_values (this);	564	*(object_copy *)this = src;
494		565
495	owner = 0;	566	flag [FLAG_FREED] = is_freed;
496	name = 0;	567	flag [FLAG_REMOVED] = is_removed;
497	name_pl = 0;
498	title = 0;
499	race = 0;
500	slaying = 0;
501	skill = 0;
502	msg = 0;
503	lore = 0;
504	custom_name = 0;
505	materialname = 0;
506	contr = 0;
507	below = 0;
508	above = 0;
509	inv = 0;
510	container = 0;
511	env = 0;
512	more = 0;
513	head = 0;
514	map = 0;
515	active_next = 0;
516	active_prev = 0;
517
518	memset (static_cast<object_pod *>(this), 0, sizeof (object_pod));
519
520	SET_FLAG (this, FLAG_REMOVED);
521
522	/* What is not cleared is next, prev, and count */
523
524	expmul = 1.0;
525	face = blank_face;
526
527	if (settings.casting_time)
528	casting_time = -1;
529	}
530
531	void object::clone (object *destination)
532	{
533	*(object_copy *)destination = *this;
534	*(object_pod *)destination = *this;
535
536	if (self || cb)
537	INVOKE_OBJECT (CLONE, this, ARG_OBJECT (destination));
538	}
539
540	/*
541	* copy object first frees everything allocated by the second object,
542	* and then copies the contends of the first object into the second
543	* object, allocating what needs to be allocated. Basically, any
544	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
545	* if the first object is freed, the pointers in the new object
546	* will point at garbage.
547	*/
548	void
549	copy_object (object *op2, object *op)
550	{
551	bool is_freed = QUERY_FLAG (op, FLAG_FREED);
552	bool is_removed = QUERY_FLAG (op, FLAG_REMOVED);
553
554	op2->clone (op);
555
556	if (is_freed)
557	SET_FLAG (op, FLAG_FREED);
558	if (is_removed)
559	SET_FLAG (op, FLAG_REMOVED);
560
561	if (op2->speed < 0)
562	op->speed_left = op2->speed_left - RANDOM () % 200 / 100.0;
563		568
564	/* Copy over key_values, if any. */	569	/* Copy over key_values, if any. */
565	if (op2->key_values)	570	if (src.key_values)
566	{	571	{
567	key_value *tail = 0;	572	key_value *tail = 0;
568	key_value *i;
569
570	op->key_values = 0;	573	key_values = 0;
571		574
572	for (i = op2->key_values; i; i = i->next)	575	for (key_value *i = src.key_values; i; i = i->next)
573	{	576	{
574	key_value *new_link = new key_value;	577	key_value *new_link = new key_value;
575		578
576	new_link->next = 0;	579	new_link->next = 0;
577	new_link->key = i->key;	580	new_link->key = i->key;
578	new_link->value = i->value;	581	new_link->value = i->value;
579		582
580	/* Try and be clever here, too. */	583	/* Try and be clever here, too. */
581	if (!op->key_values)	584	if (!key_values)
582	{	585	{
583	op->key_values = new_link;	586	key_values = new_link;
584	tail = new_link;	587	tail = new_link;
585	}	588	}
586	else	589	else
587	{	590	{
588	tail->next = new_link;	591	tail->next = new_link;
589	tail = new_link;	592	tail = new_link;
590	}	593	}
591	}	594	}
592	}	595	}
		596	}
593		597
594	update_ob_speed (op);	598	/*
		599	* copy_to first frees everything allocated by the dst object,
		600	* and then copies the contents of itself into the second
		601	* object, allocating what needs to be allocated. Basically, any
		602	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
		603	* if the first object is freed, the pointers in the new object
		604	* will point at garbage.
		605	*/
		606	void
		607	object::copy_to (object *dst)
		608	{
		609	*dst = *this;
		610
		611	if (speed < 0)
		612	dst->speed_left -= rndm ();
		613
		614	dst->set_speed (dst->speed);
		615	}
		616
		617	void
		618	object::instantiate ()
		619	{
		620	if (!uuid.seq) // HACK
		621	uuid = UUID::gen ();
		622
		623	speed_left = -0.1f;
		624	/* copy the body_info to the body_used - this is only really
		625	* need for monsters, but doesn't hurt to do it for everything.
		626	* by doing so, when a monster is created, it has good starting
		627	* values for the body_used info, so when items are created
		628	* for it, they can be properly equipped.
		629	*/
		630	for (int i = NUM_BODY_LOCATIONS; i--; )
		631	slot[i].used = slot[i].info;
		632
		633	attachable::instantiate ();
		634	}
		635
		636	object *
		637	object::clone ()
		638	{
		639	object *neu = create ();
		640	copy_to (neu);
		641	return neu;
595	}	642	}
596		643
597	/*	644	/*
598	* If an object with the IS_TURNABLE() flag needs to be turned due	645	* If an object with the IS_TURNABLE() flag needs to be turned due
599	* to the closest player being on the other side, this function can	646	* to the closest player being on the other side, this function can
600	* be called to update the face variable, _and_ how it looks on the map.	647	* be called to update the face variable, _and_ how it looks on the map.
601	*/	648	*/
602
603	void	649	void
604	update_turn_face (object *op)	650	update_turn_face (object *op)
605	{	651	{
606	if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || op->arch == NULL)	652	if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || !op->arch)
607	return;	653	return;
		654
608	SET_ANIMATION (op, op->direction);	655	SET_ANIMATION (op, op->direction);
609	update_object (op, UP_OBJ_FACE);	656	update_object (op, UP_OBJ_FACE);
610	}	657	}
611		658
612	/*	659	/*
613	* Updates the speed of an object. If the speed changes from 0 to another	660	* Updates the speed of an object. If the speed changes from 0 to another
614	* value, or vice versa, then add/remove the object from the active list.	661	* value, or vice versa, then add/remove the object from the active list.
615	* This function needs to be called whenever the speed of an object changes.	662	* This function needs to be called whenever the speed of an object changes.
616	*/	663	*/
617	void	664	void
618	update_ob_speed (object *op)	665	object::set_speed (float speed)
619	{	666	{
620	extern int arch_init;	667	if (flag [FLAG_FREED] && speed)
621
622	/* No reason putting the archetypes objects on the speed list,
623	* since they never really need to be updated.
624	*/
625
626	if (QUERY_FLAG (op, FLAG_FREED) && op->speed)
627	{	668	{
628	LOG (llevError, "Object %s is freed but has speed.\n", &op->name);	669	LOG (llevError, "Object %s is freed but has speed.\n", &name);
629	#ifdef MANY_CORES
630	abort ();
631	#else
632	op->speed = 0;	670	speed = 0;
633	#endif
634	}
635
636	if (arch_init)
637	return;
638
639	if (FABS (op->speed) > MIN_ACTIVE_SPEED)
640	{	671	}
641	/* If already on active list, don't do anything */
642	if (op->active_next || op->active_prev || op == active_objects)
643	return;
644		672
645	/* process_events() expects us to insert the object at the beginning	673	this->speed = speed;
646	* of the list. */
647	op->active_next = active_objects;
648		674
649	if (op->active_next != NULL)	675	if (has_active_speed ())
650	op->active_next->active_prev = op;	676	activate ();
651
652	active_objects = op;
653	}
654	else	677	else
655	{	678	deactivate ();
656	/* If not on the active list, nothing needs to be done */
657	if (!op->active_next && !op->active_prev && op != active_objects)
658	return;
659
660	if (op->active_prev == NULL)
661	{
662	active_objects = op->active_next;
663
664	if (op->active_next != NULL)
665	op->active_next->active_prev = NULL;
666	}
667	else
668	{
669	op->active_prev->active_next = op->active_next;
670
671	if (op->active_next)
672	op->active_next->active_prev = op->active_prev;
673	}
674
675	op->active_next = NULL;
676	op->active_prev = NULL;
677	}
678	}	679	}
679		680
680	/* This function removes object 'op' from the list of active
681	* objects.
682	* This should only be used for style maps or other such
683	* reference maps where you don't want an object that isn't
684	* in play chewing up cpu time getting processed.
685	* The reverse of this is to call update_ob_speed, which
686	* will do the right thing based on the speed of the object.
687	*/
688	void
689	remove_from_active_list (object *op)
690	{
691	/* If not on the active list, nothing needs to be done */
692	if (!op->active_next && !op->active_prev && op != active_objects)
693	return;
694
695	if (op->active_prev == NULL)
696	{
697	active_objects = op->active_next;
698	if (op->active_next != NULL)
699	op->active_next->active_prev = NULL;
700	}
701	else
702	{
703	op->active_prev->active_next = op->active_next;
704	if (op->active_next)
705	op->active_next->active_prev = op->active_prev;
706	}
707	op->active_next = NULL;
708	op->active_prev = NULL;
709	}
710
711	/*	681	/*
712	* update_object() updates the array which represents the map.	682	* update_object() updates the the map.
713	* It takes into account invisible objects (and represent squares covered	683	* It takes into account invisible objects (and represent squares covered
714	* by invisible objects by whatever is below them (unless it's another	684	* by invisible objects by whatever is below them (unless it's another
715	* invisible object, etc...)	685	* invisible object, etc...)
716	* If the object being updated is beneath a player, the look-window	686	* If the object being updated is beneath a player, the look-window
717	* of that player is updated (this might be a suboptimal way of	687	* of that player is updated (this might be a suboptimal way of
718	* updating that window, though, since update_object() is called _often_)	688	* updating that window, though, since update_object() is called _often_)
719	*	689	*
720	* action is a hint of what the caller believes need to be done.	690	* action is a hint of what the caller believes need to be done.
721	* For example, if the only thing that has changed is the face (due to
722	* an animation), we don't need to call update_position until that actually
723	* comes into view of a player. OTOH, many other things, like addition/removal
724	* of walls or living creatures may need us to update the flags now.
725	* current action are:	691	* current action are:
726	* UP_OBJ_INSERT: op was inserted	692	* UP_OBJ_INSERT: op was inserted
727	* UP_OBJ_REMOVE: op was removed	693	* UP_OBJ_REMOVE: op was removed
728	* UP_OBJ_CHANGE: object has somehow changed. In this case, we always update	694	* UP_OBJ_CHANGE: object has somehow changed. In this case, we always update
729	* as that is easier than trying to look at what may have changed.	695	* as that is easier than trying to look at what may have changed.
730	* UP_OBJ_FACE: only the objects face has changed.	696	* UP_OBJ_FACE: only the objects face has changed.
731	*/	697	*/
732
733	void	698	void
734	update_object (object *op, int action)	699	update_object (object *op, int action)
735	{	700	{
736	int update_now = 0, flags;
737	MoveType move_on, move_off, move_block, move_slow;
738
739	if (op == NULL)	701	if (op == NULL)
740	{	702	{
741	/* this should never happen */	703	/* this should never happen */
742	LOG (llevDebug, "update_object() called for NULL object.\n");	704	LOG (llevDebug, "update_object() called for NULL object.\n");
743	return;	705	return;
744	}	706	}
745		707
746	if (op->env != NULL)	708	if (op->env)
747	{	709	{
748	/* Animation is currently handled by client, so nothing	710	/* Animation is currently handled by client, so nothing
749	* to do in this case.	711	* to do in this case.
750	*/	712	*/
751	return;	713	return;
…		…
756	*/	718	*/
757	if (!op->map || op->map->in_memory == MAP_SAVING)	719	if (!op->map || op->map->in_memory == MAP_SAVING)
758	return;	720	return;
759		721
760	/* make sure the object is within map boundaries */	722	/* make sure the object is within map boundaries */
761	if (op->x < 0 || op->x >= MAP_WIDTH (op->map) || op->y < 0 || op->y >= MAP_HEIGHT (op->map))	723	if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height)
762	{	724	{
763	LOG (llevError, "update_object() called for object out of map!\n");	725	LOG (llevError, "update_object() called for object out of map!\n");
764	#ifdef MANY_CORES	726	#ifdef MANY_CORES
765	abort ();	727	abort ();
766	#endif	728	#endif
767	return;	729	return;
768	}	730	}
769		731
770	flags = GET_MAP_FLAGS (op->map, op->x, op->y);	732	mapspace &m = op->ms ();
771	SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NEED_UPDATE);
772	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);
773	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);
774	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);
775	move_off = GET_MAP_MOVE_OFF (op->map, op->x, op->y);
776		733
		734	if (!(m.flags_ & P_UPTODATE))
		735	/* nop */;
777	if (action == UP_OBJ_INSERT)	736	else if (action == UP_OBJ_INSERT)
778	{	737	{
		738	// this is likely overkill, TODO: revisit (schmorp)
779	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(flags & P_BLOCKSVIEW))	739	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
780	update_now = 1;
781
782	if (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(flags & P_NO_MAGIC))	740	|| (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))
783	update_now = 1;	741	|| (op->type == PLAYER && !(m.flags_ & P_PLAYER))
784		742	|| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
		743	|| (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))
785	if (QUERY_FLAG (op, FLAG_DAMNED) && !(flags & P_NO_CLERIC))	744	|| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))
786	update_now = 1;
787
788	if (QUERY_FLAG (op, FLAG_ALIVE) && !(flags & P_IS_ALIVE))
789	update_now = 1;
790
791	if (op->type == SAFE_GROUND && !(flags & P_SAFE))
792	update_now = 1;
793
794	if ((move_on | op->move_on) != move_on)	745	|| (m.move_on | op->move_on ) != m.move_on
795	update_now = 1;
796
797	if ((move_off | op->move_off) != move_off)	746	|| (m.move_off | op->move_off ) != m.move_off
798	update_now = 1;	747	|| (m.move_slow | op->move_slow) != m.move_slow
799
800	/* This isn't perfect, but I don't expect a lot of objects to	748	/* This isn't perfect, but I don't expect a lot of objects to
801	* to have move_allow right now.	749	* to have move_allow right now.
802	*/	750	*/
803	if (((move_block | op->move_block) & ~op->move_allow) != move_block)	751	|| ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block
804	update_now = 1;	752	|| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)
805		753	m.flags_ = 0;
806	if ((move_slow | op->move_slow) != move_slow)
807	update_now = 1;
808	}	754	}
809	/* if the object is being removed, we can't make intelligent	755	/* if the object is being removed, we can't make intelligent
810	* decisions, because remove_ob can't really pass the object	756	* decisions, because remove_ob can't really pass the object
811	* that is being removed.	757	* that is being removed.
812	*/	758	*/
813	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)	759	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
814	update_now = 1;	760	m.flags_ = 0;
815	else if (action == UP_OBJ_FACE)	761	else if (action == UP_OBJ_FACE)
816	/* Nothing to do for that case */ ;	762	/* Nothing to do for that case */ ;
817	else	763	else
818	LOG (llevError, "update_object called with invalid action: %d\n", action);	764	LOG (llevError, "update_object called with invalid action: %d\n", action);
819		765
820	if (update_now)
821	{
822	SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NO_ERROR | P_NEED_UPDATE);
823	update_position (op->map, op->x, op->y);
824	}
825
826	if (op->more != NULL)	766	if (op->more)
827	update_object (op->more, action);	767	update_object (op->more, action);
828	}
829
830	object::vector object::mortals;
831	object::vector object::objects; // not yet used
832	object *object::first;
833
834	void object::free_mortals ()
835	{
836	for (AUTODECL (i, mortals.begin ()); i != mortals.end ();)
837	if ((*i)->refcnt)
838	++i; // further delay freeing
839	else
840	{
841	delete *i;
842	mortals.erase (i);
843	}
844
845	static int lastmortals = 0;//D
846
847	if (mortals.size() != lastmortals && lastmortals > 100)//D
848	{
849	lastmortals = mortals.size ();//D
850	LOG (llevDebug, "%d objects in mortal queue\n", lastmortals);//D
851	}
852	}	768	}
853		769
854	object::object ()	770	object::object ()
855	{	771	{
856	SET_FLAG (this, FLAG_REMOVED);	772	SET_FLAG (this, FLAG_REMOVED);
…		…
859	face = blank_face;	775	face = blank_face;
860	}	776	}
861		777
862	object::~object ()	778	object::~object ()
863	{	779	{
		780	unlink ();
		781
864	free_key_values (this);	782	free_key_values (this);
865	}	783	}
866		784
		785	static int object_count;
		786
867	void object::link ()	787	void object::link ()
868	{	788	{
		789	assert (!index);//D
		790	uuid = UUID::gen ();
869	count = ++ob_count;	791	count = ++object_count;
870	uuid = gen_uuid ();
871		792
872	prev = 0;	793	refcnt_inc ();
873	next = object::first;	794	objects.insert (this);
874
875	if (object::first)
876	object::first->prev = this;
877
878	object::first = this;
879	}	795	}
880		796
881	void object::unlink ()	797	void object::unlink ()
882	{	798	{
883	if (this == object::first)	799	if (!index)
884	object::first = next;	800	return;
885		801
886	/* Remove this object from the list of used objects */	802	objects.erase (this);
887	if (prev) prev->next = next;	803	refcnt_dec ();
888	if (next) next->prev = prev;	804	}
889		805
890	prev = 0;	806	void
891	next = 0;	807	object::activate ()
		808	{
		809	/* If already on active list, don't do anything */
		810	if (active)
		811	return;
		812
		813	if (has_active_speed ())
		814	actives.insert (this);
		815	}
		816
		817	void
		818	object::activate_recursive ()
		819	{
		820	activate ();
		821
		822	for (object *op = inv; op; op = op->below)
		823	op->activate_recursive ();
		824	}
		825
		826	/* This function removes object 'op' from the list of active
		827	* objects.
		828	* This should only be used for style maps or other such
		829	* reference maps where you don't want an object that isn't
		830	* in play chewing up cpu time getting processed.
		831	* The reverse of this is to call update_ob_speed, which
		832	* will do the right thing based on the speed of the object.
		833	*/
		834	void
		835	object::deactivate ()
		836	{
		837	/* If not on the active list, nothing needs to be done */
		838	if (!active)
		839	return;
		840
		841	actives.erase (this);
		842	}
		843
		844	void
		845	object::deactivate_recursive ()
		846	{
		847	for (object *op = inv; op; op = op->below)
		848	op->deactivate_recursive ();
		849
		850	deactivate ();
		851	}
		852
		853	void
		854	object::set_flag_inv (int flag, int value)
		855	{
		856	for (object *op = inv; op; op = op->below)
		857	{
		858	op->flag [flag] = value;
		859	op->set_flag_inv (flag, value);
		860	}
		861	}
		862
		863	/*
		864	* Remove and free all objects in the inventory of the given object.
		865	* object.c ?
		866	*/
		867	void
		868	object::destroy_inv (bool drop_to_ground)
		869	{
		870	// need to check first, because the checks below might segfault
		871	// as we might be on an invalid mapspace and crossfire code
		872	// is too buggy to ensure that the inventory is empty.
		873	// corollary: if you create arrows etc. with stuff in tis inventory,
		874	// cf will crash below with off-map x and y
		875	if (!inv)
		876	return;
		877
		878	/* Only if the space blocks everything do we not process -
		879	* if some form of movement is allowed, let objects
		880	* drop on that space.
		881	*/
		882	if (!drop_to_ground
		883	|| !map
		884	|| map->in_memory != MAP_ACTIVE
		885	|| map->nodrop
		886	|| ms ().move_block == MOVE_ALL)
		887	{
		888	while (inv)
		889	{
		890	inv->destroy_inv (drop_to_ground);
		891	inv->destroy ();
		892	}
		893	}
		894	else
		895	{ /* Put objects in inventory onto this space */
		896	while (inv)
		897	{
		898	object *op = inv;
		899
		900	if (op->flag [FLAG_STARTEQUIP]
		901	|| op->flag [FLAG_NO_DROP]
		902	|| op->type == RUNE
		903	|| op->type == TRAP
		904	|| op->flag [FLAG_IS_A_TEMPLATE]
		905	|| op->flag [FLAG_DESTROY_ON_DEATH])
		906	op->destroy ();
		907	else
		908	map->insert (op, x, y);
		909	}
		910	}
892	}	911	}
893		912
894	object *object::create ()	913	object *object::create ()
895	{	914	{
896	object *op = new object;	915	object *op = new object;
897	op->link ();	916	op->link ();
898	return op;	917	return op;
899	}	918	}
900		919
901	/*	920	void
902	* free_object() frees everything allocated by an object, removes	921	object::do_destroy ()
903	* it from the list of used objects, and puts it on the list of
904	* free objects. The IS_FREED() flag is set in the object.
905	* The object must have been removed by remove_ob() first for
906	* this function to succeed.
907	*
908	* If destroy_inventory is set, free inventory as well. Else drop items in
909	* inventory to the ground.
910	*/
911	void object::destroy (bool destroy_inventory)
912	{	922	{
913	if (QUERY_FLAG (this, FLAG_FREED))	923	attachable::do_destroy ();
914	return;
915		924
916	if (QUERY_FLAG (this, FLAG_FRIENDLY))	925	if (flag [FLAG_IS_LINKED])
		926	remove_button_link (this);
		927
		928	if (flag [FLAG_FRIENDLY])
917	remove_friendly_object (this);	929	remove_friendly_object (this);
918		930
919	if (!QUERY_FLAG (this, FLAG_REMOVED))	931	if (!flag [FLAG_REMOVED])
920	remove_ob (this);	932	remove ();
921		933
922	SET_FLAG (this, FLAG_FREED);	934	destroy_inv (true);
		935
		936	deactivate ();
		937	unlink ();
		938
		939	flag [FLAG_FREED] = 1;
923		940
924	// hack to ensure that freed objects still have a valid map	941	// hack to ensure that freed objects still have a valid map
925	{	942	{
926	static maptile *freed_map; // freed objects are moved here to avoid crashes	943	static maptile *freed_map; // freed objects are moved here to avoid crashes
927		944
928	if (!freed_map)	945	if (!freed_map)
929	{	946	{
930	freed_map = new maptile;	947	freed_map = new maptile;
931		948
		949	freed_map->path = "<freed objects map>";
932	freed_map->name = "/internal/freed_objects_map";	950	freed_map->name = "/internal/freed_objects_map";
933	freed_map->width = 3;	951	freed_map->width = 3;
934	freed_map->height = 3;	952	freed_map->height = 3;
		953	freed_map->nodrop = 1;
935		954
936	freed_map->allocate ();	955	freed_map->alloc ();
		956	freed_map->in_memory = MAP_ACTIVE;
937	}	957	}
938		958
939	map = freed_map;	959	map = freed_map;
940	x = 1;	960	x = 1;
941	y = 1;	961	y = 1;
942	}	962	}
943		963
944	if (more)	964	if (more)
945	{	965	{
946	more->destroy (destroy_inventory);	966	more->destroy ();
947	more = 0;	967	more = 0;
948	}	968	}
949		969
950	if (inv)	970	head = 0;
951	{
952	/* Only if the space blocks everything do we not process -
953	* if some form of movement is allowed, let objects
954	* drop on that space.
955	*/
956	if (destroy_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
957	{
958	object *op = inv;
959		971
960	while (op)
961	{
962	object *tmp = op->below;
963	op->destroy (destroy_inventory);
964	op = tmp;
965	}
966	}
967	else
968	{ /* Put objects in inventory onto this space */
969	object *op = inv;
970
971	while (op)
972	{
973	object *tmp = op->below;
974
975	remove_ob (op);
976
977	if (QUERY_FLAG (op, FLAG_STARTEQUIP)
978	|| QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
979	free_object (op);
980	else
981	{
982	op->x = x;
983	op->y = y;
984	insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */
985	}
986
987	op = tmp;
988	}
989	}
990	}
991
992	// clear those pointers that likely might have circular references to us	972	// clear those pointers that likely might cause circular references
993	owner = 0;	973	owner = 0;
994	enemy = 0;	974	enemy = 0;
995	attacked_by = 0;	975	attacked_by = 0;
996		976	current_weapon = 0;
997	// only relevant for players(?), but make sure of it anyways
998	contr = 0;
999
1000	/* Remove object from the active list */
1001	speed = 0;
1002	update_ob_speed (this);
1003
1004	unlink ();
1005
1006	mortals.push_back (this);
1007	}	977	}
1008
1009	/*
1010	* sub_weight() recursively (outwards) subtracts a number from the
1011	* weight of an object (and what is carried by it's environment(s)).
1012	*/
1013		978
1014	void	979	void
1015	sub_weight (object *op, signed long weight)	980	object::destroy (bool destroy_inventory)
1016	{	981	{
1017	while (op != NULL)	982	if (destroyed ())
1018	{	983	return;
1019	if (op->type == CONTAINER)
1020	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1021		984
1022	op->carrying -= weight;	985	if (destroy_inventory)
1023	op = op->env;	986	destroy_inv (false);
1024	}
1025	}
1026		987
1027	/* remove_ob(op):	988	if (is_head ())
		989	if (sound_destroy)
		990	play_sound (sound_destroy);
		991	else if (flag [FLAG_MONSTER])
		992	play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism
		993
		994	attachable::destroy ();
		995	}
		996
		997	/* op->remove ():
1028	* This function removes the object op from the linked list of objects	998	* This function removes the object op from the linked list of objects
1029	* which it is currently tied to. When this function is done, the	999	* which it is currently tied to. When this function is done, the
1030	* object will have no environment. If the object previously had an	1000	* object will have no environment. If the object previously had an
1031	* environment, the x and y coordinates will be updated to	1001	* environment, the x and y coordinates will be updated to
1032	* the previous environment.	1002	* the previous environment.
1033	* Beware: This function is called from the editor as well!
1034	*/	1003	*/
1035
1036	void	1004	void
1037	remove_ob (object *op)	1005	object::do_remove ()
1038	{	1006	{
1039	object *tmp, *last = 0;	1007	object *tmp, *last = 0;
1040	object *otmp;	1008	object *otmp;
1041		1009
1042	int check_walk_off;
1043	maptile *m;
1044
1045	sint16 x, y;
1046
1047	if (QUERY_FLAG (op, FLAG_REMOVED))	1010	if (QUERY_FLAG (this, FLAG_REMOVED))
1048	return;	1011	return;
1049		1012
1050	SET_FLAG (op, FLAG_REMOVED);	1013	SET_FLAG (this, FLAG_REMOVED);
		1014	INVOKE_OBJECT (REMOVE, this);
1051		1015
1052	if (op->more != NULL)	1016	if (more)
1053	remove_ob (op->more);	1017	more->remove ();
1054		1018
1055	/*	1019	/*
1056	* In this case, the object to be removed is in someones	1020	* In this case, the object to be removed is in someones
1057	* inventory.	1021	* inventory.
1058	*/	1022	*/
1059	if (op->env != NULL)	1023	if (env)
1060	{	1024	{
1061	if (op->nrof)	1025	if (nrof)
1062	sub_weight (op->env, op->weight * op->nrof);	1026	sub_weight (env, weight * nrof);
1063	else	1027	else
1064	sub_weight (op->env, op->weight + op->carrying);	1028	sub_weight (env, weight + carrying);
1065		1029
1066	/* NO_FIX_PLAYER is set when a great many changes are being	1030	/* NO_FIX_PLAYER is set when a great many changes are being
1067	* made to players inventory. If set, avoiding the call	1031	* made to players inventory. If set, avoiding the call
1068	* to save cpu time.	1032	* to save cpu time.
1069	*/	1033	*/
1070	if ((otmp = is_player_inv (op->env)) != NULL && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1034	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1071	fix_player (otmp);	1035	otmp->update_stats ();
1072		1036
1073	if (op->above != NULL)	1037	if (above)
1074	op->above->below = op->below;	1038	above->below = below;
1075	else	1039	else
1076	op->env->inv = op->below;	1040	env->inv = below;
1077		1041
1078	if (op->below != NULL)	1042	if (below)
1079	op->below->above = op->above;	1043	below->above = above;
1080		1044
1081	/* we set up values so that it could be inserted into	1045	/* we set up values so that it could be inserted into
1082	* the map, but we don't actually do that - it is up	1046	* the map, but we don't actually do that - it is up
1083	* to the caller to decide what we want to do.	1047	* to the caller to decide what we want to do.
1084	*/	1048	*/
1085	op->x = op->env->x, op->y = op->env->y;	1049	x = env->x, y = env->y;
1086	op->map = op->env->map;	1050	map = env->map;
1087	op->above = NULL, op->below = NULL;	1051	above = 0, below = 0;
1088	op->env = NULL;	1052	env = 0;
1089	}	1053	}
1090	else if (op->map)	1054	else if (map)
1091	{	1055	{
1092	x = op->x;	1056	if (type == PLAYER)
1093	y = op->y;
1094	m = get_map_from_coord (op->map, &x, &y);
1095
1096	if (!m)
1097	{
1098	LOG (llevError, "remove_ob called when object was on map but appears to not be within valid coordinates? %s (%d,%d)\n",
1099	op->map->path, op->x, op->y);
1100	/* in old days, we used to set x and y to 0 and continue.
1101	* it seems if we get into this case, something is probablye
1102	* screwed up and should be fixed.
1103	*/
1104	abort ();
1105	}	1057	{
		1058	// leaving a spot always closes any open container on the ground
		1059	if (container && !container->env)
		1060	// this causes spurious floorbox updates, but it ensures
		1061	// that the CLOSE event is being sent.
		1062	close_container ();
1106		1063
1107	if (op->map != m)	1064	--map->players;
1108	LOG (llevDebug, "remove_ob: Object not really on map it claimed to be on? %s != %s, %d,%d != %d,%d\n",	1065	map->touch ();
1109	op->map->path, m->path, op->x, op->y, x, y);
1110
1111	/* Re did the following section of code - it looks like it had
1112	* lots of logic for things we no longer care about
1113	*/	1066	}
		1067
		1068	map->dirty = true;
		1069	mapspace &ms = this->ms ();
1114		1070
1115	/* link the object above us */	1071	/* link the object above us */
1116	if (op->above)	1072	if (above)
1117	op->above->below = op->below;	1073	above->below = below;
1118	else	1074	else
1119	SET_MAP_TOP (m, x, y, op->below); /* we were top, set new top */	1075	ms.top = below; /* we were top, set new top */
1120		1076
1121	/* Relink the object below us, if there is one */	1077	/* Relink the object below us, if there is one */
1122	if (op->below)	1078	if (below)
1123	op->below->above = op->above;	1079	below->above = above;
1124	else	1080	else
1125	{	1081	{
1126	/* Nothing below, which means we need to relink map object for this space	1082	/* Nothing below, which means we need to relink map object for this space
1127	* use translated coordinates in case some oddness with map tiling is	1083	* use translated coordinates in case some oddness with map tiling is
1128	* evident	1084	* evident
1129	*/	1085	*/
1130	if (GET_MAP_OB (m, x, y) != op)	1086	if (GET_MAP_OB (map, x, y) != this)
1131	{
1132	char *dump = dump_object (op);
1133	LOG (llevError,
1134	"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);	1087	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 ());
1135	free (dump);	1088
1136	dump = dump_object (GET_MAP_OB (m, x, y));	1089	ms.bot = above; /* goes on above it. */
1137	LOG (llevError, "%s\n", dump);
1138	free (dump);
1139	}	1090	}
1140		1091
1141	SET_MAP_OB (m, x, y, op->above); /* goes on above it. */
1142	}
1143
1144	op->above = 0;	1092	above = 0;
1145	op->below = 0;	1093	below = 0;
1146		1094
1147	if (op->map->in_memory == MAP_SAVING)	1095	if (map->in_memory == MAP_SAVING)
1148	return;	1096	return;
1149		1097
1150	check_walk_off = !QUERY_FLAG (op, FLAG_NO_APPLY);	1098	int check_walk_off = !flag [FLAG_NO_APPLY];
1151		1099
1152	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1100	if (object *pl = ms.player ())
		1101	{
		1102	if (pl->container == this)
		1103	/* If a container that the player is currently using somehow gets
		1104	* removed (most likely destroyed), update the player view
		1105	* appropriately.
		1106	*/
		1107	pl->close_container ();
		1108
		1109	pl->contr->ns->floorbox_update ();
		1110	}
		1111
		1112	for (tmp = ms.bot; tmp; tmp = tmp->above)
1153	{	1113	{
1154	/* No point updating the players look faces if he is the object	1114	/* No point updating the players look faces if he is the object
1155	* being removed.	1115	* being removed.
1156	*/	1116	*/
1157		1117
1158	if (tmp->type == PLAYER && tmp != op)	1118	/* See if object moving off should effect something */
		1119	if (check_walk_off
		1120	&& ((move_type & tmp->move_off)
		1121	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1159	{	1122	{
1160	/* If a container that the player is currently using somehow gets
1161	* removed (most likely destroyed), update the player view
1162	* appropriately.
1163	*/
1164	if (tmp->container == op)
1165	{
1166	CLEAR_FLAG (op, FLAG_APPLIED);
1167	tmp->container = NULL;
1168	}
1169
1170	tmp->contr->socket.update_look = 1;
1171	}
1172
1173	/* See if player moving off should effect something */
1174	if (check_walk_off
1175	&& ((op->move_type & tmp->move_off)
1176	&& (op->move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1177	{
1178	move_apply (tmp, op, NULL);	1123	move_apply (tmp, this, 0);
1179		1124
1180	if (op->destroyed ())	1125	if (destroyed ())
1181	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());	1126	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1182	}	1127	}
1183		1128
1184	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1185
1186	if (tmp->above == tmp)
1187	tmp->above = NULL;
1188
1189	last = tmp;	1129	last = tmp;
1190	}	1130	}
1191		1131
1192	/* last == NULL of there are no objects on this space */	1132	/* last == NULL if there are no objects on this space */
		1133	//TODO: this makes little sense, why only update the topmost object?
1193	if (last == NULL)	1134	if (!last)
1194	{	1135	map->at (x, y).flags_ = 0;
1195	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1196	* we could preserve the flags (GET_MAP_FLAGS), but update_position figures
1197	* those out anyways, and if there are any flags set right now, they won't
1198	* be correct anyways.
1199	*/
1200	SET_MAP_FLAGS (op->map, op->x, op->y, P_NEED_UPDATE);
1201	update_position (op->map, op->x, op->y);
1202	}
1203	else	1136	else
1204	update_object (last, UP_OBJ_REMOVE);	1137	update_object (last, UP_OBJ_REMOVE);
1205		1138
1206	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) || (op->glow_radius != 0))	1139	if (flag [FLAG_BLOCKSVIEW] || glow_radius)
1207	update_all_los (op->map, op->x, op->y);	1140	update_all_los (map, x, y);
1208	}	1141	}
1209	}	1142	}
1210		1143
1211	/*	1144	/*
1212	* merge_ob(op,top):	1145	* merge_ob(op,top):
…		…
1220	merge_ob (object *op, object *top)	1153	merge_ob (object *op, object *top)
1221	{	1154	{
1222	if (!op->nrof)	1155	if (!op->nrof)
1223	return 0;	1156	return 0;
1224		1157
1225	if (top == NULL)	1158	if (!top)
1226	for (top = op; top != NULL && top->above != NULL; top = top->above);	1159	for (top = op; top && top->above; top = top->above)
		1160	;
1227		1161
1228	for (; top != NULL; top = top->below)	1162	for (; top; top = top->below)
1229	{	1163	{
1230	if (top == op)	1164	if (top == op)
1231	continue;	1165	continue;
1232	if (CAN_MERGE (op, top))	1166
		1167	if (object::can_merge (op, top))
1233	{	1168	{
1234	top->nrof += op->nrof;	1169	top->nrof += op->nrof;
1235		1170
1236	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/	1171	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/
1237	op->weight = 0; /* Don't want any adjustements now */	1172	op->weight = 0; /* Don't want any adjustements now */
1238	remove_ob (op);	1173	op->destroy ();
1239	free_object (op);
1240	return top;	1174	return top;
1241	}	1175	}
1242	}	1176	}
1243		1177
1244	return 0;	1178	return 0;
1245	}	1179	}
1246		1180
		1181	void
		1182	object::expand_tail ()
		1183	{
		1184	if (more)
		1185	return;
		1186
		1187	object *prev = this;
		1188
		1189	for (archetype *at = (archetype *)arch->more; at; at = (archetype *)at->more)
		1190	{
		1191	object *op = arch_to_object (at);
		1192
		1193	op->name = name;
		1194	op->name_pl = name_pl;
		1195	op->title = title;
		1196
		1197	op->head = this;
		1198	prev->more = op;
		1199
		1200	prev = op;
		1201	}
		1202	}
		1203
1247	/*	1204	/*
1248	* same as insert_ob_in_map except it handle separate coordinates and do a clean	1205	* same as insert_ob_in_map except it handles separate coordinates and does a clean
1249	* job preparing multi-part monsters	1206	* job preparing multi-part monsters.
1250	*/	1207	*/
1251	object *	1208	object *
1252	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)	1209	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1253	{	1210	{
1254	object *tmp;
1255
1256	if (op->head)
1257	op = op->head;
1258
1259	for (tmp = op; tmp; tmp = tmp->more)	1211	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1260	{	1212	{
1261	tmp->x = x + tmp->arch->clone.x;	1213	tmp->x = x + tmp->arch->x;
1262	tmp->y = y + tmp->arch->clone.y;	1214	tmp->y = y + tmp->arch->y;
1263	}	1215	}
1264		1216
1265	return insert_ob_in_map (op, m, originator, flag);	1217	return insert_ob_in_map (op, m, originator, flag);
1266	}	1218	}
1267		1219
…		…
1283	* Return value:	1235	* Return value:
1284	* new object if 'op' was merged with other object	1236	* new object if 'op' was merged with other object
1285	* NULL if 'op' was destroyed	1237	* NULL if 'op' was destroyed
1286	* just 'op' otherwise	1238	* just 'op' otherwise
1287	*/	1239	*/
1288
1289	object *	1240	object *
1290	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)	1241	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1291	{	1242	{
		1243	assert (!op->flag [FLAG_FREED]);
		1244
1292	object *tmp, *top, *floor = NULL;	1245	object *top, *floor = NULL;
1293	sint16 x, y;
1294		1246
1295	if (QUERY_FLAG (op, FLAG_FREED))	1247	op->remove ();
1296	{
1297	LOG (llevError, "Trying to insert freed object!\n");
1298	return NULL;
1299	}
1300
1301	if (m == NULL)
1302	{
1303	char *dump = dump_object (op);
1304	LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
1305	free (dump);
1306	return op;
1307	}
1308
1309	if (out_of_map (m, op->x, op->y))
1310	{
1311	char *dump = dump_object (op);
1312	LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump);
1313	#ifdef MANY_CORES
1314	/* Better to catch this here, as otherwise the next use of this object
1315	* is likely to cause a crash. Better to find out where it is getting
1316	* improperly inserted.
1317	*/
1318	abort ();
1319	#endif
1320	free (dump);
1321	return op;
1322	}
1323
1324	if (!QUERY_FLAG (op, FLAG_REMOVED))
1325	{
1326	char *dump = dump_object (op);
1327	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
1328	free (dump);
1329	return op;
1330	}
1331
1332	if (op->more != NULL)
1333	{
1334	/* The part may be on a different map. */
1335
1336	object *more = op->more;
1337
1338	/* We really need the caller to normalize coordinates - if
1339	* we set the map, that doesn't work if the location is within
1340	* a map and this is straddling an edge. So only if coordinate
1341	* is clear wrong do we normalize it.
1342	*/
1343	if (OUT_OF_REAL_MAP (more->map, more->x, more->y))
1344	more->map = get_map_from_coord (m, &more->x, &more->y);
1345	else if (!more->map)
1346	{
1347	/* For backwards compatibility - when not dealing with tiled maps,
1348	* more->map should always point to the parent.
1349	*/
1350	more->map = m;
1351	}
1352
1353	if (insert_ob_in_map (more, more->map, originator, flag) == NULL)
1354	{
1355	if (!op->head)
1356	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1357
1358	return NULL;
1359	}
1360	}
1361
1362	CLEAR_FLAG (op, FLAG_REMOVED);
1363		1248
1364	/* Ideally, the caller figures this out. However, it complicates a lot	1249	/* Ideally, the caller figures this out. However, it complicates a lot
1365	* of areas of callers (eg, anything that uses find_free_spot would now	1250	* of areas of callers (eg, anything that uses find_free_spot would now
1366	* need extra work	1251	* need extra work
1367	*/	1252	*/
1368	op->map = get_map_from_coord (m, &op->x, &op->y);	1253	if (!xy_normalise (m, op->x, op->y))
1369	x = op->x;	1254	{
1370	y = op->y;	1255	op->destroy ();
		1256	return 0;
		1257	}
		1258
		1259	if (object *more = op->more)
		1260	if (!insert_ob_in_map (more, m, originator, flag))
		1261	return 0;
		1262
		1263	CLEAR_FLAG (op, FLAG_REMOVED);
		1264
		1265	op->map = m;
		1266	mapspace &ms = op->ms ();
1371		1267
1372	/* this has to be done after we translate the coordinates.	1268	/* this has to be done after we translate the coordinates.
1373	*/	1269	*/
1374	if (op->nrof && !(flag & INS_NO_MERGE))	1270	if (op->nrof && !(flag & INS_NO_MERGE))
1375	for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)	1271	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1376	if (CAN_MERGE (op, tmp))	1272	if (object::can_merge (op, tmp))
1377	{	1273	{
1378	op->nrof += tmp->nrof;	1274	op->nrof += tmp->nrof;
1379	remove_ob (tmp);	1275	tmp->destroy ();
1380	free_object (tmp);
1381	}	1276	}
1382		1277
1383	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1278	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1384	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1279	CLEAR_FLAG (op, FLAG_INV_LOCKED);
1385		1280
…		…
1398	op->below = originator->below;	1293	op->below = originator->below;
1399		1294
1400	if (op->below)	1295	if (op->below)
1401	op->below->above = op;	1296	op->below->above = op;
1402	else	1297	else
1403	SET_MAP_OB (op->map, op->x, op->y, op);	1298	ms.bot = op;
1404		1299
1405	/* since *below* originator, no need to update top */	1300	/* since *below* originator, no need to update top */
1406	originator->below = op;	1301	originator->below = op;
1407	}	1302	}
1408	else	1303	else
1409	{	1304	{
		1305	top = ms.bot;
		1306
1410	/* If there are other objects, then */	1307	/* If there are other objects, then */
1411	if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL))	1308	if (top)
1412	{	1309	{
1413	object *last = NULL;	1310	object *last = 0;
1414		1311
1415	/*	1312	/*
1416	* If there are multiple objects on this space, we do some trickier handling.	1313	* If there are multiple objects on this space, we do some trickier handling.
1417	* We've already dealt with merging if appropriate.	1314	* We've already dealt with merging if appropriate.
1418	* Generally, we want to put the new object on top. But if	1315	* Generally, we want to put the new object on top. But if
…		…
1422	* once we get to them. This reduces the need to traverse over all of	1319	* once we get to them. This reduces the need to traverse over all of
1423	* them when adding another one - this saves quite a bit of cpu time	1320	* them when adding another one - this saves quite a bit of cpu time
1424	* when lots of spells are cast in one area. Currently, it is presumed	1321	* when lots of spells are cast in one area. Currently, it is presumed
1425	* that flying non pickable objects are spell objects.	1322	* that flying non pickable objects are spell objects.
1426	*/	1323	*/
1427		1324	for (top = ms.bot; top; top = top->above)
1428	while (top != NULL)
1429	{	1325	{
1430	if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))	1326	if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))
1431	floor = top;	1327	floor = top;
1432		1328
1433	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))	1329	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))
…		…
1436	top = top->below;	1332	top = top->below;
1437	break;	1333	break;
1438	}	1334	}
1439		1335
1440	last = top;	1336	last = top;
1441	top = top->above;
1442	}	1337	}
1443		1338
1444	/* Don't want top to be NULL, so set it to the last valid object */	1339	/* Don't want top to be NULL, so set it to the last valid object */
1445	top = last;	1340	top = last;
1446		1341
…		…
1448	* looks like instead of lots of conditions here.	1343	* looks like instead of lots of conditions here.
1449	* makes things faster, and effectively the same result.	1344	* makes things faster, and effectively the same result.
1450	*/	1345	*/
1451		1346
1452	/* Have object 'fall below' other objects that block view.	1347	/* Have object 'fall below' other objects that block view.
1453	* Unless those objects are exits, type 66	1348	* Unless those objects are exits.
1454	* If INS_ON_TOP is used, don't do this processing	1349	* If INS_ON_TOP is used, don't do this processing
1455	* Need to find the object that in fact blocks view, otherwise	1350	* Need to find the object that in fact blocks view, otherwise
1456	* stacking is a bit odd.	1351	* stacking is a bit odd.
1457	*/	1352	*/
1458	if (!(flag & INS_ON_TOP) &&	1353	if (!(flag & INS_ON_TOP)
1459	(get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_BLOCKSVIEW) && (op->face && !op->face->visibility))	1354	&& ms.flags () & P_BLOCKSVIEW
		1355	&& (op->face && !faces [op->face].visibility))
1460	{	1356	{
1461	for (last = top; last != floor; last = last->below)	1357	for (last = top; last != floor; last = last->below)
1462	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1358	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1463	break;	1359	break;
		1360
1464	/* Check to see if we found the object that blocks view,	1361	/* Check to see if we found the object that blocks view,
1465	* and make sure we have a below pointer for it so that	1362	* and make sure we have a below pointer for it so that
1466	* we can get inserted below this one, which requires we	1363	* we can get inserted below this one, which requires we
1467	* set top to the object below us.	1364	* set top to the object below us.
1468	*/	1365	*/
1469	if (last && last->below && last != floor)	1366	if (last && last->below && last != floor)
1470	top = last->below;	1367	top = last->below;
1471	}	1368	}
1472	} /* If objects on this space */	1369	} /* If objects on this space */
1473		1370
1474	if (flag & INS_MAP_LOAD)
1475	top = GET_MAP_TOP (op->map, op->x, op->y);
1476
1477	if (flag & INS_ABOVE_FLOOR_ONLY)	1371	if (flag & INS_ABOVE_FLOOR_ONLY)
1478	top = floor;	1372	top = floor;
1479		1373
1480	/* Top is the object that our object (op) is going to get inserted above.	1374	/* Top is the object that our object (op) is going to get inserted above.
1481	*/	1375	*/
1482		1376
1483	/* First object on this space */	1377	/* First object on this space */
1484	if (!top)	1378	if (!top)
1485	{	1379	{
1486	op->above = GET_MAP_OB (op->map, op->x, op->y);	1380	op->above = ms.bot;
1487		1381
1488	if (op->above)	1382	if (op->above)
1489	op->above->below = op;	1383	op->above->below = op;
1490		1384
1491	op->below = NULL;	1385	op->below = 0;
1492	SET_MAP_OB (op->map, op->x, op->y, op);	1386	ms.bot = op;
1493	}	1387	}
1494	else	1388	else
1495	{ /* get inserted into the stack above top */	1389	{ /* get inserted into the stack above top */
1496	op->above = top->above;	1390	op->above = top->above;
1497		1391
…		…
1500		1394
1501	op->below = top;	1395	op->below = top;
1502	top->above = op;	1396	top->above = op;
1503	}	1397	}
1504		1398
1505	if (op->above == NULL)	1399	if (!op->above)
1506	SET_MAP_TOP (op->map, op->x, op->y, op);	1400	ms.top = op;
1507	} /* else not INS_BELOW_ORIGINATOR */	1401	} /* else not INS_BELOW_ORIGINATOR */
1508		1402
1509	if (op->type == PLAYER)	1403	if (op->type == PLAYER)
		1404	{
1510	op->contr->do_los = 1;	1405	op->contr->do_los = 1;
		1406	++op->map->players;
		1407	op->map->touch ();
		1408	}
1511		1409
1512	/* If we have a floor, we know the player, if any, will be above	1410	op->map->dirty = true;
1513	* it, so save a few ticks and start from there.	1411
1514	*/	1412	if (object *pl = ms.player ())
1515	if (!(flag & INS_MAP_LOAD))	1413	pl->contr->ns->floorbox_update ();
1516	for (tmp = floor ? floor : GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
1517	if (tmp->type == PLAYER)
1518	tmp->contr->socket.update_look = 1;
1519		1414
1520	/* If this object glows, it may affect lighting conditions that are	1415	/* If this object glows, it may affect lighting conditions that are
1521	* visible to others on this map. But update_all_los is really	1416	* visible to others on this map. But update_all_los is really
1522	* an inefficient way to do this, as it means los for all players	1417	* an inefficient way to do this, as it means los for all players
1523	* on the map will get recalculated. The players could very well	1418	* on the map will get recalculated. The players could very well
1524	* be far away from this change and not affected in any way -	1419	* be far away from this change and not affected in any way -
1525	* this should get redone to only look for players within range,	1420	* this should get redone to only look for players within range,
1526	* or just updating the P_NEED_UPDATE for spaces within this area	1421	* or just updating the P_UPTODATE for spaces within this area
1527	* of effect may be sufficient.	1422	* of effect may be sufficient.
1528	*/	1423	*/
1529	if (MAP_DARKNESS (op->map) && (op->glow_radius != 0))	1424	if (op->map->darkness && (op->glow_radius != 0))
1530	update_all_los (op->map, op->x, op->y);	1425	update_all_los (op->map, op->x, op->y);
1531		1426
1532	/* updates flags (blocked, alive, no magic, etc) for this map space */	1427	/* updates flags (blocked, alive, no magic, etc) for this map space */
1533	update_object (op, UP_OBJ_INSERT);	1428	update_object (op, UP_OBJ_INSERT);
1534		1429
		1430	INVOKE_OBJECT (INSERT, op);
		1431
1535	/* Don't know if moving this to the end will break anything. However,	1432	/* Don't know if moving this to the end will break anything. However,
1536	* we want to have update_look set above before calling this.	1433	* we want to have floorbox_update called before calling this.
1537	*	1434	*
1538	* check_move_on() must be after this because code called from	1435	* check_move_on() must be after this because code called from
1539	* check_move_on() depends on correct map flags (so functions like	1436	* check_move_on() depends on correct map flags (so functions like
1540	* blocked() and wall() work properly), and these flags are updated by	1437	* blocked() and wall() work properly), and these flags are updated by
1541	* update_object().	1438	* update_object().
1542	*/	1439	*/
1543		1440
1544	/* if this is not the head or flag has been passed, don't check walk on status */	1441	/* if this is not the head or flag has been passed, don't check walk on status */
1545	if (!(flag & INS_NO_WALK_ON) && !op->head)	1442	if (!(flag & INS_NO_WALK_ON) && op->head_ () == op)
1546	{	1443	{
1547	if (check_move_on (op, originator))	1444	if (check_move_on (op, originator))
1548	return NULL;	1445	return 0;
1549		1446
1550	/* If we are a multi part object, lets work our way through the check	1447	/* If we are a multi part object, lets work our way through the check
1551	* walk on's.	1448	* walk on's.
1552	*/	1449	*/
1553	for (tmp = op->more; tmp != NULL; tmp = tmp->more)	1450	for (object *tmp = op->more; tmp; tmp = tmp->more)
1554	if (check_move_on (tmp, originator))	1451	if (check_move_on (tmp, originator))
1555	return NULL;	1452	return 0;
1556	}	1453	}
1557		1454
1558	return op;	1455	return op;
1559	}	1456	}
1560		1457
1561	/* this function inserts an object in the map, but if it	1458	/* this function inserts an object in the map, but if it
1562	* finds an object of its own type, it'll remove that one first.	1459	* finds an object of its own type, it'll remove that one first.
1563	* op is the object to insert it under: supplies x and the map.	1460	* op is the object to insert it under: supplies x and the map.
1564	*/	1461	*/
1565	void	1462	void
1566	replace_insert_ob_in_map (const char *arch_string, object *op)	1463	replace_insert_ob_in_map (const char *arch_string, object *op)
1567	{	1464	{
1568	object *	1465	object *tmp, *tmp1;
1569	tmp;
1570	object *
1571	tmp1;
1572		1466
1573	/* first search for itself and remove any old instances */	1467	/* first search for itself and remove any old instances */
1574		1468
1575	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1469	for (tmp = op->ms ().bot; tmp; tmp = tmp->above)
1576	{
1577	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */	1470	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */
1578	{	1471	tmp->destroy ();
1579	remove_ob (tmp);
1580	free_object (tmp);
1581	}
1582	}
1583		1472
1584	tmp1 = arch_to_object (archetype::find (arch_string));	1473	tmp1 = arch_to_object (archetype::find (arch_string));
1585		1474
1586	tmp1->x = op->x;	1475	tmp1->x = op->x;
1587	tmp1->y = op->y;	1476	tmp1->y = op->y;
1588	insert_ob_in_map (tmp1, op->map, op, 0);	1477	insert_ob_in_map (tmp1, op->map, op, 0);
		1478	}
		1479
		1480	object *
		1481	object::insert_at (object *where, object *originator, int flags)
		1482	{
		1483	if (where->env)
		1484	return where->env->insert (this);
		1485	else
		1486	return where->map->insert (this, where->x, where->y, originator, flags);
1589	}	1487	}
1590		1488
1591	/*	1489	/*
1592	* get_split_ob(ob,nr) splits up ob into two parts. The part which	1490	* get_split_ob(ob,nr) splits up ob into two parts. The part which
1593	* is returned contains nr objects, and the remaining parts contains	1491	* is returned contains nr objects, and the remaining parts contains
1594	* the rest (or is removed and freed if that number is 0).	1492	* the rest (or is removed and freed if that number is 0).
1595	* On failure, NULL is returned, and the reason put into the	1493	* On failure, NULL is returned, and the reason put into the
1596	* global static errmsg array.	1494	* global static errmsg array.
1597	*/	1495	*/
1598
1599	object *	1496	object *
1600	get_split_ob (object *orig_ob, uint32 nr)	1497	get_split_ob (object *orig_ob, uint32 nr)
1601	{	1498	{
1602	object *	1499	object *newob;
1603	newob;
1604	int
1605	is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);	1500	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1606		1501
1607	if (orig_ob->nrof < nr)	1502	if (orig_ob->nrof < nr)
1608	{	1503	{
1609	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);	1504	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1610	return NULL;	1505	return NULL;
1611	}	1506	}
1612		1507
1613	newob = object_create_clone (orig_ob);	1508	newob = object_create_clone (orig_ob);
1614		1509
1615	if ((orig_ob->nrof -= nr) < 1)	1510	if ((orig_ob->nrof -= nr) < 1)
1616	{	1511	orig_ob->destroy (1);
1617	if (!is_removed)
1618	remove_ob (orig_ob);
1619	free_object2 (orig_ob, 1);
1620	}
1621	else if (!is_removed)	1512	else if (!is_removed)
1622	{	1513	{
1623	if (orig_ob->env != NULL)	1514	if (orig_ob->env != NULL)
1624	sub_weight (orig_ob->env, orig_ob->weight * nr);	1515	sub_weight (orig_ob->env, orig_ob->weight * nr);
1625	if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)	1516	if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_ACTIVE)
1626	{	1517	{
1627	strcpy (errmsg, "Tried to split object whose map is not in memory.");	1518	strcpy (errmsg, "Tried to split object whose map is not in memory.");
1628	LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n");	1519	LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n");
1629	return NULL;	1520	return NULL;
1630	}	1521	}
…		…
1640	* the amount of an object. If the amount reaches 0, the object	1531	* the amount of an object. If the amount reaches 0, the object
1641	* is subsequently removed and freed.	1532	* is subsequently removed and freed.
1642	*	1533	*
1643	* Return value: 'op' if something is left, NULL if the amount reached 0	1534	* Return value: 'op' if something is left, NULL if the amount reached 0
1644	*/	1535	*/
1645
1646	object *	1536	object *
1647	decrease_ob_nr (object *op, uint32 i)	1537	decrease_ob_nr (object *op, uint32 i)
1648	{	1538	{
1649	object *tmp;	1539	object *tmp;
1650	player *pl;
1651		1540
1652	if (i == 0) /* objects with op->nrof require this check */	1541	if (i == 0) /* objects with op->nrof require this check */
1653	return op;	1542	return op;
1654		1543
1655	if (i > op->nrof)	1544	if (i > op->nrof)
1656	i = op->nrof;	1545	i = op->nrof;
1657		1546
1658	if (QUERY_FLAG (op, FLAG_REMOVED))	1547	if (QUERY_FLAG (op, FLAG_REMOVED))
1659	op->nrof -= i;	1548	op->nrof -= i;
1660	else if (op->env != NULL)	1549	else if (op->env)
1661	{	1550	{
1662	/* is this object in the players inventory, or sub container	1551	/* is this object in the players inventory, or sub container
1663	* therein?	1552	* therein?
1664	*/	1553	*/
1665	tmp = is_player_inv (op->env);	1554	tmp = op->in_player ();
1666	/* nope. Is this a container the player has opened?	1555	/* nope. Is this a container the player has opened?
1667	* If so, set tmp to that player.	1556	* If so, set tmp to that player.
1668	* IMO, searching through all the players will mostly	1557	* IMO, searching through all the players will mostly
1669	* likely be quicker than following op->env to the map,	1558	* likely be quicker than following op->env to the map,
1670	* and then searching the map for a player.	1559	* and then searching the map for a player.
1671	*/	1560	*/
1672	if (!tmp)	1561	if (!tmp)
1673	{	1562	for_all_players (pl)
1674	for (pl = first_player; pl; pl = pl->next)
1675	if (pl->ob->container == op->env)	1563	if (pl->ob->container == op->env)
		1564	{
		1565	tmp = pl->ob;
1676	break;	1566	break;
1677	if (pl)
1678	tmp = pl->ob;
1679	else
1680	tmp = NULL;
1681	}	1567	}
1682		1568
1683	if (i < op->nrof)	1569	if (i < op->nrof)
1684	{	1570	{
1685	sub_weight (op->env, op->weight * i);	1571	sub_weight (op->env, op->weight * i);
1686	op->nrof -= i;	1572	op->nrof -= i;
1687	if (tmp)	1573	if (tmp)
1688	{
1689	esrv_send_item (tmp, op);	1574	esrv_send_item (tmp, op);
1690	}
1691	}	1575	}
1692	else	1576	else
1693	{	1577	{
1694	remove_ob (op);	1578	op->remove ();
1695	op->nrof = 0;	1579	op->nrof = 0;
1696	if (tmp)	1580	if (tmp)
1697	{
1698	esrv_del_item (tmp->contr, op->count);	1581	esrv_del_item (tmp->contr, op->count);
1699	}
1700	}	1582	}
1701	}	1583	}
1702	else	1584	else
1703	{	1585	{
1704	object *above = op->above;	1586	object *above = op->above;
1705		1587
1706	if (i < op->nrof)	1588	if (i < op->nrof)
1707	op->nrof -= i;	1589	op->nrof -= i;
1708	else	1590	else
1709	{	1591	{
1710	remove_ob (op);	1592	op->remove ();
1711	op->nrof = 0;	1593	op->nrof = 0;
1712	}	1594	}
1713		1595
1714	/* Since we just removed op, op->above is null */	1596	/* Since we just removed op, op->above is null */
1715	for (tmp = above; tmp != NULL; tmp = tmp->above)	1597	for (tmp = above; tmp; tmp = tmp->above)
1716	if (tmp->type == PLAYER)	1598	if (tmp->type == PLAYER)
1717	{	1599	{
1718	if (op->nrof)	1600	if (op->nrof)
1719	esrv_send_item (tmp, op);	1601	esrv_send_item (tmp, op);
1720	else	1602	else
…		…
1724		1606
1725	if (op->nrof)	1607	if (op->nrof)
1726	return op;	1608	return op;
1727	else	1609	else
1728	{	1610	{
1729	free_object (op);	1611	op->destroy ();
1730	return NULL;	1612	return 0;
1731	}
1732	}
1733
1734	/*
1735	* add_weight(object, weight) adds the specified weight to an object,
1736	* and also updates how much the environment(s) is/are carrying.
1737	*/
1738
1739	void
1740	add_weight (object *op, signed long weight)
1741	{
1742	while (op != NULL)
1743	{	1613	}
1744	if (op->type == CONTAINER)
1745	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1746
1747	op->carrying += weight;
1748	op = op->env;
1749	}
1750	}	1614	}
1751
1752	/*
1753	* insert_ob_in_ob(op,environment):
1754	* This function inserts the object op in the linked list
1755	* inside the object environment.
1756	*
1757	* Eneq(@csd.uu.se): Altered insert_ob_in_ob to make things picked up enter
1758	* the inventory at the last position or next to other objects of the same
1759	* type.
1760	* Frank: Now sorted by type, archetype and magic!
1761	*
1762	* The function returns now pointer to inserted item, and return value can
1763	* be != op, if items are merged. -Tero
1764	*/
1765		1615
1766	object *	1616	object *
1767	insert_ob_in_ob (object *op, object *where)	1617	insert_ob_in_ob (object *op, object *where)
1768	{	1618	{
1769	object *	1619	if (!where)
1770	tmp, *
1771	otmp;
1772
1773	if (!QUERY_FLAG (op, FLAG_REMOVED))
1774	{
1775	char *dump = dump_object (op);
1776	LOG (llevError, "Trying to insert (ob) inserted object.\n%s\n", dump);
1777	free (dump);
1778	return op;
1779	}
1780
1781	if (where == NULL)
1782	{	1620	{
1783	char *dump = dump_object (op);	1621	char *dump = dump_object (op);
1784	LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);	1622	LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
1785	free (dump);	1623	free (dump);
1786	return op;	1624	return op;
1787	}	1625	}
1788		1626
1789	if (where->head)	1627	if (where->head_ () != where)
1790	{	1628	{
1791	LOG (llevDebug, "Warning: Tried to insert object wrong part of multipart object.\n");	1629	LOG (llevError | logBacktrace, "Warning: Tried to insert object into wrong part of multipart object.\n");
1792	where = where->head;	1630	where = where->head;
1793	}	1631	}
		1632
		1633	return where->insert (op);
		1634	}
		1635
		1636	/*
		1637	* env->insert (op)
		1638	* This function inserts the object op in the linked list
		1639	* inside the object environment.
		1640	*
		1641	* The function returns now pointer to inserted item, and return value can
		1642	* be != op, if items are merged. -Tero
		1643	*/
		1644	object *
		1645	object::insert (object *op)
		1646	{
		1647	if (!QUERY_FLAG (op, FLAG_REMOVED))
		1648	op->remove ();
1794		1649
1795	if (op->more)	1650	if (op->more)
1796	{	1651	{
1797	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);	1652	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1798	return op;	1653	return op;
1799	}	1654	}
1800		1655
1801	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1656	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1802	CLEAR_FLAG (op, FLAG_REMOVED);	1657	CLEAR_FLAG (op, FLAG_REMOVED);
		1658
1803	if (op->nrof)	1659	if (op->nrof)
1804	{	1660	{
1805	for (tmp = where->inv; tmp != NULL; tmp = tmp->below)	1661	for (object *tmp = inv; tmp; tmp = tmp->below)
1806	if (CAN_MERGE (tmp, op))	1662	if (object::can_merge (tmp, op))
1807	{	1663	{
1808	/* return the original object and remove inserted object	1664	/* return the original object and remove inserted object
1809	(client needs the original object) */	1665	(client needs the original object) */
1810	tmp->nrof += op->nrof;	1666	tmp->nrof += op->nrof;
1811	/* Weight handling gets pretty funky. Since we are adding to	1667	/* Weight handling gets pretty funky. Since we are adding to
1812	* tmp->nrof, we need to increase the weight.	1668	* tmp->nrof, we need to increase the weight.
1813	*/	1669	*/
1814	add_weight (where, op->weight * op->nrof);	1670	add_weight (this, op->weight * op->nrof);
1815	SET_FLAG (op, FLAG_REMOVED);	1671	SET_FLAG (op, FLAG_REMOVED);
1816	free_object (op); /* free the inserted object */	1672	op->destroy (); /* free the inserted object */
1817	op = tmp;	1673	op = tmp;
1818	remove_ob (op); /* and fix old object's links */	1674	op->remove (); /* and fix old object's links */
1819	CLEAR_FLAG (op, FLAG_REMOVED);	1675	CLEAR_FLAG (op, FLAG_REMOVED);
1820	break;	1676	break;
1821	}	1677	}
1822		1678
1823	/* I assume combined objects have no inventory	1679	/* I assume combined objects have no inventory
1824	* We add the weight - this object could have just been removed	1680	* We add the weight - this object could have just been removed
1825	* (if it was possible to merge). calling remove_ob will subtract	1681	* (if it was possible to merge). calling remove_ob will subtract
1826	* the weight, so we need to add it in again, since we actually do	1682	* the weight, so we need to add it in again, since we actually do
1827	* the linking below	1683	* the linking below
1828	*/	1684	*/
1829	add_weight (where, op->weight * op->nrof);	1685	add_weight (this, op->weight * op->nrof);
1830	}	1686	}
1831	else	1687	else
1832	add_weight (where, (op->weight + op->carrying));	1688	add_weight (this, (op->weight + op->carrying));
1833		1689
1834	otmp = is_player_inv (where);	1690	if (object *otmp = this->in_player ())
1835	if (otmp && otmp->contr != NULL)
1836	{
1837	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1691	if (otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1838	fix_player (otmp);	1692	otmp->update_stats ();
1839	}
1840		1693
		1694	op->owner = 0; // its his/hers now. period.
1841	op->map = NULL;	1695	op->map = 0;
1842	op->env = where;	1696	op->env = this;
1843	op->above = NULL;	1697	op->above = 0;
1844	op->below = NULL;	1698	op->below = 0;
1845	op->x = 0, op->y = 0;	1699	op->x = op->y = 0;
1846		1700
1847	/* reset the light list and los of the players on the map */	1701	/* reset the light list and los of the players on the map */
1848	if ((op->glow_radius != 0) && where->map)	1702	if (op->glow_radius && map)
1849	{	1703	{
1850	#ifdef DEBUG_LIGHTS	1704	#ifdef DEBUG_LIGHTS
1851	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);	1705	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1852	#endif /* DEBUG_LIGHTS */	1706	#endif /* DEBUG_LIGHTS */
1853	if (MAP_DARKNESS (where->map))	1707	if (map->darkness)
1854	update_all_los (where->map, where->x, where->y);	1708	update_all_los (map, x, y);
1855	}	1709	}
1856		1710
1857	/* Client has no idea of ordering so lets not bother ordering it here.	1711	/* Client has no idea of ordering so lets not bother ordering it here.
1858	* It sure simplifies this function...	1712	* It sure simplifies this function...
1859	*/	1713	*/
1860	if (where->inv == NULL)	1714	if (!inv)
1861	where->inv = op;	1715	inv = op;
1862	else	1716	else
1863	{	1717	{
1864	op->below = where->inv;	1718	op->below = inv;
1865	op->below->above = op;	1719	op->below->above = op;
1866	where->inv = op;	1720	inv = op;
1867	}	1721	}
		1722
		1723	INVOKE_OBJECT (INSERT, this);
		1724
1868	return op;	1725	return op;
1869	}	1726	}
1870		1727
1871	/*	1728	/*
1872	* Checks if any objects has a move_type that matches objects	1729	* Checks if any objects has a move_type that matches objects
…		…
1886	*	1743	*
1887	* MSW 2001-07-08: Check all objects on space, not just those below	1744	* MSW 2001-07-08: Check all objects on space, not just those below
1888	* object being inserted. insert_ob_in_map may not put new objects	1745	* object being inserted. insert_ob_in_map may not put new objects
1889	* on top.	1746	* on top.
1890	*/	1747	*/
1891
1892	int	1748	int
1893	check_move_on (object *op, object *originator)	1749	check_move_on (object *op, object *originator)
1894	{	1750	{
1895	object *tmp;	1751	object *tmp;
1896	maptile *m = op->map;	1752	maptile *m = op->map;
…		…
1923		1779
1924	/* The objects have to be checked from top to bottom.	1780	/* The objects have to be checked from top to bottom.
1925	* Hence, we first go to the top:	1781	* Hence, we first go to the top:
1926	*/	1782	*/
1927		1783
1928	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL && tmp->above != NULL; tmp = tmp->above)	1784	for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above)
1929	{	1785	{
1930	/* Trim the search when we find the first other spell effect	1786	/* Trim the search when we find the first other spell effect
1931	* this helps performance so that if a space has 50 spell objects,	1787	* this helps performance so that if a space has 50 spell objects,
1932	* we don't need to check all of them.	1788	* we don't need to check all of them.
1933	*/	1789	*/
…		…
1951	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||	1807	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
1952	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))	1808	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1953	{	1809	{
1954		1810
1955	float	1811	float
1956	diff = tmp->move_slow_penalty * FABS (op->speed);	1812	diff = tmp->move_slow_penalty * fabs (op->speed);
1957		1813
1958	if (op->type == PLAYER)	1814	if (op->type == PLAYER)
1959	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||	1815	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||
1960	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))	1816	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))
1961	diff /= 4.0;	1817	diff /= 4.0;
…		…
1988	/*	1844	/*
1989	* present_arch(arch, map, x, y) searches for any objects with	1845	* present_arch(arch, map, x, y) searches for any objects with
1990	* a matching archetype at the given map and coordinates.	1846	* a matching archetype at the given map and coordinates.
1991	* The first matching object is returned, or NULL if none.	1847	* The first matching object is returned, or NULL if none.
1992	*/	1848	*/
1993
1994	object *	1849	object *
1995	present_arch (const archetype *at, maptile *m, int x, int y)	1850	present_arch (const archetype *at, maptile *m, int x, int y)
1996	{	1851	{
1997	object *
1998	tmp;
1999
2000	if (m == NULL || out_of_map (m, x, y))	1852	if (!m || out_of_map (m, x, y))
2001	{	1853	{
2002	LOG (llevError, "Present_arch called outside map.\n");	1854	LOG (llevError, "Present_arch called outside map.\n");
2003	return NULL;	1855	return NULL;
2004	}	1856	}
2005	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1857
		1858	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
2006	if (tmp->arch == at)	1859	if (tmp->arch == at)
2007	return tmp;	1860	return tmp;
		1861
2008	return NULL;	1862	return NULL;
2009	}	1863	}
2010		1864
2011	/*	1865	/*
2012	* present(type, map, x, y) searches for any objects with	1866	* present(type, map, x, y) searches for any objects with
2013	* a matching type variable at the given map and coordinates.	1867	* a matching type variable at the given map and coordinates.
2014	* The first matching object is returned, or NULL if none.	1868	* The first matching object is returned, or NULL if none.
2015	*/	1869	*/
2016
2017	object *	1870	object *
2018	present (unsigned char type, maptile *m, int x, int y)	1871	present (unsigned char type, maptile *m, int x, int y)
2019	{	1872	{
2020	object *
2021	tmp;
2022
2023	if (out_of_map (m, x, y))	1873	if (out_of_map (m, x, y))
2024	{	1874	{
2025	LOG (llevError, "Present called outside map.\n");	1875	LOG (llevError, "Present called outside map.\n");
2026	return NULL;	1876	return NULL;
2027	}	1877	}
2028	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1878
		1879	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
2029	if (tmp->type == type)	1880	if (tmp->type == type)
2030	return tmp;	1881	return tmp;
		1882
2031	return NULL;	1883	return NULL;
2032	}	1884	}
2033		1885
2034	/*	1886	/*
2035	* present_in_ob(type, object) searches for any objects with	1887	* present_in_ob(type, object) searches for any objects with
2036	* a matching type variable in the inventory of the given object.	1888	* a matching type variable in the inventory of the given object.
2037	* The first matching object is returned, or NULL if none.	1889	* The first matching object is returned, or NULL if none.
2038	*/	1890	*/
2039
2040	object *	1891	object *
2041	present_in_ob (unsigned char type, const object *op)	1892	present_in_ob (unsigned char type, const object *op)
2042	{	1893	{
2043	object *
2044	tmp;
2045
2046	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1894	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2047	if (tmp->type == type)	1895	if (tmp->type == type)
2048	return tmp;	1896	return tmp;
		1897
2049	return NULL;	1898	return NULL;
2050	}	1899	}
2051		1900
2052	/*	1901	/*
2053	* present_in_ob (type, str, object) searches for any objects with	1902	* present_in_ob (type, str, object) searches for any objects with
…		…
2061	* str is the string to match against. Note that we match against	1910	* str is the string to match against. Note that we match against
2062	* the object name, not the archetype name. this is so that the	1911	* the object name, not the archetype name. this is so that the
2063	* spell code can use one object type (force), but change it's name	1912	* spell code can use one object type (force), but change it's name
2064	* to be unique.	1913	* to be unique.
2065	*/	1914	*/
2066
2067	object *	1915	object *
2068	present_in_ob_by_name (int type, const char *str, const object *op)	1916	present_in_ob_by_name (int type, const char *str, const object *op)
2069	{	1917	{
2070	object *
2071	tmp;
2072
2073	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1918	for (object *tmp = op->inv; tmp; tmp = tmp->below)
2074	{
2075	if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name)))	1919	if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name)))
2076	return tmp;	1920	return tmp;
2077	}	1921
2078	return NULL;	1922	return 0;
2079	}	1923	}
2080		1924
2081	/*	1925	/*
2082	* present_arch_in_ob(archetype, object) searches for any objects with	1926	* present_arch_in_ob(archetype, object) searches for any objects with
2083	* a matching archetype in the inventory of the given object.	1927	* a matching archetype in the inventory of the given object.
2084	* The first matching object is returned, or NULL if none.	1928	* The first matching object is returned, or NULL if none.
2085	*/	1929	*/
2086
2087	object *	1930	object *
2088	present_arch_in_ob (const archetype *at, const object *op)	1931	present_arch_in_ob (const archetype *at, const object *op)
2089	{	1932	{
2090	object *
2091	tmp;
2092
2093	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1933	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
2094	if (tmp->arch == at)	1934	if (tmp->arch == at)
2095	return tmp;	1935	return tmp;
		1936
2096	return NULL;	1937	return NULL;
2097	}	1938	}
2098		1939
2099	/*	1940	/*
2100	* activate recursively a flag on an object inventory	1941	* activate recursively a flag on an object inventory
2101	*/	1942	*/
2102	void	1943	void
2103	flag_inv (object *op, int flag)	1944	flag_inv (object *op, int flag)
2104	{	1945	{
2105	object *
2106	tmp;
2107
2108	if (op->inv)
2109	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1946	for (object *tmp = op->inv; tmp; tmp = tmp->below)
2110	{	1947	{
2111	SET_FLAG (tmp, flag);	1948	SET_FLAG (tmp, flag);
2112	flag_inv (tmp, flag);	1949	flag_inv (tmp, flag);
2113	}	1950	}
2114	} /*	1951	}
		1952
		1953	/*
2115	* desactivate recursively a flag on an object inventory	1954	* deactivate recursively a flag on an object inventory
2116	*/	1955	*/
2117	void	1956	void
2118	unflag_inv (object *op, int flag)	1957	unflag_inv (object *op, int flag)
2119	{	1958	{
2120	object *
2121	tmp;
2122
2123	if (op->inv)
2124	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1959	for (object *tmp = op->inv; tmp; tmp = tmp->below)
2125	{	1960	{
2126	CLEAR_FLAG (tmp, flag);	1961	CLEAR_FLAG (tmp, flag);
2127	unflag_inv (tmp, flag);	1962	unflag_inv (tmp, flag);
2128	}	1963	}
2129	}
2130
2131	/*
2132	* set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in
2133	* all it's inventory (recursively).
2134	* If checksums are used, a player will get set_cheat called for
2135	* him/her-self and all object carried by a call to this function.
2136	*/
2137
2138	void
2139	set_cheat (object *op)
2140	{
2141	SET_FLAG (op, FLAG_WAS_WIZ);
2142	flag_inv (op, FLAG_WAS_WIZ);
2143	}	1964	}
2144		1965
2145	/*	1966	/*
2146	* find_free_spot(object, map, x, y, start, stop) will search for	1967	* find_free_spot(object, map, x, y, start, stop) will search for
2147	* a spot at the given map and coordinates which will be able to contain	1968	* a spot at the given map and coordinates which will be able to contain
…		…
2149	* to search (see the freearr_x/y[] definition).	1970	* to search (see the freearr_x/y[] definition).
2150	* It returns a random choice among the alternatives found.	1971	* It returns a random choice among the alternatives found.
2151	* start and stop are where to start relative to the free_arr array (1,9	1972	* start and stop are where to start relative to the free_arr array (1,9
2152	* does all 4 immediate directions). This returns the index into the	1973	* does all 4 immediate directions). This returns the index into the
2153	* array of the free spot, -1 if no spot available (dir 0 = x,y)	1974	* array of the free spot, -1 if no spot available (dir 0 = x,y)
2154	* Note - this only checks to see if there is space for the head of the
2155	* object - if it is a multispace object, this should be called for all
2156	* pieces.
2157	* Note2: This function does correctly handle tiled maps, but does not	1975	* Note: This function does correctly handle tiled maps, but does not
2158	* inform the caller. However, insert_ob_in_map will update as	1976	* inform the caller. However, insert_ob_in_map will update as
2159	* necessary, so the caller shouldn't need to do any special work.	1977	* necessary, so the caller shouldn't need to do any special work.
2160	* Note - updated to take an object instead of archetype - this is necessary	1978	* Note - updated to take an object instead of archetype - this is necessary
2161	* because arch_blocked (now ob_blocked) needs to know the movement type	1979	* because arch_blocked (now ob_blocked) needs to know the movement type
2162	* to know if the space in question will block the object. We can't use	1980	* to know if the space in question will block the object. We can't use
2163	* the archetype because that isn't correct if the monster has been	1981	* the archetype because that isn't correct if the monster has been
2164	* customized, changed states, etc.	1982	* customized, changed states, etc.
2165	*/	1983	*/
2166
2167	int	1984	int
2168	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)	1985	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2169	{	1986	{
2170	int
2171	i,
2172	index = 0, flag;
2173	static int
2174	altern[SIZEOFFREE];	1987	int altern[SIZEOFFREE];
		1988	int index = 0, flag;
2175		1989
2176	for (i = start; i < stop; i++)	1990	for (int i = start; i < stop; i++)
2177	{	1991	{
2178	flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]);	1992	mapxy pos (m, x, y); pos.move (i);
2179	if (!flag)	1993
		1994	if (!pos.normalise ())
		1995	continue;
		1996
		1997	mapspace &ms = *pos;
		1998
		1999	if (ms.flags () & P_IS_ALIVE)
		2000	continue;
		2001
		2002	/* However, often
		2003	* ob doesn't have any move type (when used to place exits)
		2004	* so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.
		2005	*/
		2006	if (ob && ob->move_type == 0 && ms.move_block != MOVE_ALL)
		2007	{
2180	altern[index++] = i;	2008	altern [index++] = i;
		2009	continue;
		2010	}
2181		2011
2182	/* Basically, if we find a wall on a space, we cut down the search size.	2012	/* Basically, if we find a wall on a space, we cut down the search size.
2183	* In this way, we won't return spaces that are on another side of a wall.	2013	* In this way, we won't return spaces that are on another side of a wall.
2184	* This mostly work, but it cuts down the search size in all directions -	2014	* This mostly work, but it cuts down the search size in all directions -
2185	* if the space being examined only has a wall to the north and empty	2015	* if the space being examined only has a wall to the north and empty
2186	* spaces in all the other directions, this will reduce the search space	2016	* spaces in all the other directions, this will reduce the search space
2187	* to only the spaces immediately surrounding the target area, and	2017	* to only the spaces immediately surrounding the target area, and
2188	* won't look 2 spaces south of the target space.	2018	* won't look 2 spaces south of the target space.
2189	*/	2019	*/
2190	else if ((flag & AB_NO_PASS) && maxfree[i] < stop)	2020	if (ms.move_block == MOVE_ALL && maxfree[i] < stop)
		2021	{
2191	stop = maxfree[i];	2022	stop = maxfree[i];
		2023	continue;
		2024	}
		2025
		2026	/* Note it is intentional that we check ob - the movement type of the
		2027	* head of the object should correspond for the entire object.
		2028	*/
		2029	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
		2030	continue;
		2031
		2032	if (ob->blocked (m, pos.x, pos.y))
		2033	continue;
		2034
		2035	altern [index++] = i;
2192	}	2036	}
		2037
2193	if (!index)	2038	if (!index)
2194	return -1;	2039	return -1;
		2040
2195	return altern[RANDOM () % index];	2041	return altern [rndm (index)];
2196	}	2042	}
2197		2043
2198	/*	2044	/*
2199	* find_first_free_spot(archetype, maptile, x, y) works like	2045	* find_first_free_spot(archetype, maptile, x, y) works like
2200	* find_free_spot(), but it will search max number of squares.	2046	* find_free_spot(), but it will search max number of squares.
2201	* But it will return the first available spot, not a random choice.	2047	* But it will return the first available spot, not a random choice.
2202	* Changed 0.93.2: Have it return -1 if there is no free spot available.	2048	* Changed 0.93.2: Have it return -1 if there is no free spot available.
2203	*/	2049	*/
2204
2205	int	2050	int
2206	find_first_free_spot (const object *ob, maptile *m, int x, int y)	2051	find_first_free_spot (const object *ob, maptile *m, int x, int y)
2207	{	2052	{
2208	int
2209	i;
2210
2211	for (i = 0; i < SIZEOFFREE; i++)	2053	for (int i = 0; i < SIZEOFFREE; i++)
2212	{
2213	if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]))	2054	if (!ob->blocked (m, x + freearr_x[i], y + freearr_y[i]))
2214	return i;	2055	return i;
2215	}	2056
2216	return -1;	2057	return -1;
2217	}	2058	}
2218		2059
2219	/*	2060	/*
2220	* The function permute(arr, begin, end) randomly reorders the array	2061	* The function permute(arr, begin, end) randomly reorders the array
2221	* arr[begin..end-1].	2062	* arr[begin..end-1].
		2063	* now uses a fisher-yates shuffle, old permute was broken
2222	*/	2064	*/
2223	static void	2065	static void
2224	permute (int *arr, int begin, int end)	2066	permute (int *arr, int begin, int end)
2225	{	2067	{
2226	int	2068	arr += begin;
2227	i,
2228	j,
2229	tmp,
2230	len;
2231
2232	len = end - begin;	2069	end -= begin;
2233	for (i = begin; i < end; i++)
2234	{
2235	j = begin + RANDOM () % len;
2236		2070
2237	tmp = arr[i];	2071	while (--end)
2238	arr[i] = arr[j];	2072	swap (arr [end], arr [rndm (end + 1)]);
2239	arr[j] = tmp;
2240	}
2241	}	2073	}
2242		2074
2243	/* new function to make monster searching more efficient, and effective!	2075	/* new function to make monster searching more efficient, and effective!
2244	* This basically returns a randomized array (in the passed pointer) of	2076	* This basically returns a randomized array (in the passed pointer) of
2245	* the spaces to find monsters. In this way, it won't always look for	2077	* the spaces to find monsters. In this way, it won't always look for
…		…
2248	* the 3x3 area will be searched, just not in a predictable order.	2080	* the 3x3 area will be searched, just not in a predictable order.
2249	*/	2081	*/
2250	void	2082	void
2251	get_search_arr (int *search_arr)	2083	get_search_arr (int *search_arr)
2252	{	2084	{
2253	int	2085	int i;
2254	i;
2255		2086
2256	for (i = 0; i < SIZEOFFREE; i++)	2087	for (i = 0; i < SIZEOFFREE; i++)
2257	{
2258	search_arr[i] = i;	2088	search_arr[i] = i;
2259	}
2260		2089
2261	permute (search_arr, 1, SIZEOFFREE1 + 1);	2090	permute (search_arr, 1, SIZEOFFREE1 + 1);
2262	permute (search_arr, SIZEOFFREE1 + 1, SIZEOFFREE2 + 1);	2091	permute (search_arr, SIZEOFFREE1 + 1, SIZEOFFREE2 + 1);
2263	permute (search_arr, SIZEOFFREE2 + 1, SIZEOFFREE);	2092	permute (search_arr, SIZEOFFREE2 + 1, SIZEOFFREE);
2264	}	2093	}
…		…
2273	* Perhaps incorrectly, but I'm making the assumption that exclude	2102	* Perhaps incorrectly, but I'm making the assumption that exclude
2274	* is actually want is going to try and move there. We need this info	2103	* is actually want is going to try and move there. We need this info
2275	* because we have to know what movement the thing looking to move	2104	* because we have to know what movement the thing looking to move
2276	* there is capable of.	2105	* there is capable of.
2277	*/	2106	*/
2278
2279	int	2107	int
2280	find_dir (maptile *m, int x, int y, object *exclude)	2108	find_dir (maptile *m, int x, int y, object *exclude)
2281	{	2109	{
2282	int
2283	i,
2284	max = SIZEOFFREE, mflags;	2110	int i, max = SIZEOFFREE, mflags;
2285		2111
2286	sint16 nx, ny;	2112	sint16 nx, ny;
2287	object *	2113	object *tmp;
2288	tmp;
2289	maptile *	2114	maptile *mp;
2290	mp;
2291		2115
2292	MoveType blocked, move_type;	2116	MoveType blocked, move_type;
2293		2117
2294	if (exclude && exclude->head)	2118	if (exclude && exclude->head_ () != exclude)
2295	{	2119	{
2296	exclude = exclude->head;	2120	exclude = exclude->head;
2297	move_type = exclude->move_type;	2121	move_type = exclude->move_type;
2298	}	2122	}
2299	else	2123	else
…		…
2307	mp = m;	2131	mp = m;
2308	nx = x + freearr_x[i];	2132	nx = x + freearr_x[i];
2309	ny = y + freearr_y[i];	2133	ny = y + freearr_y[i];
2310		2134
2311	mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);	2135	mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);
		2136
2312	if (mflags & P_OUT_OF_MAP)	2137	if (mflags & P_OUT_OF_MAP)
2313	{
2314	max = maxfree[i];	2138	max = maxfree[i];
2315	}
2316	else	2139	else
2317	{	2140	{
2318	blocked = GET_MAP_MOVE_BLOCK (mp, nx, ny);	2141	mapspace &ms = mp->at (nx, ny);
		2142
		2143	blocked = ms.move_block;
2319		2144
2320	if ((move_type & blocked) == move_type)	2145	if ((move_type & blocked) == move_type)
2321	{
2322	max = maxfree[i];	2146	max = maxfree[i];
2323	}
2324	else if (mflags & P_IS_ALIVE)	2147	else if (mflags & P_IS_ALIVE)
2325	{	2148	{
2326	for (tmp = GET_MAP_OB (mp, nx, ny); tmp != NULL; tmp = tmp->above)	2149	for (tmp = ms.bot; tmp; tmp = tmp->above)
2327	{	2150	if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)
2328	if ((QUERY_FLAG (tmp, FLAG_MONSTER) || tmp->type == PLAYER) && (tmp != exclude || (tmp->head && tmp->head != exclude)))	2151	&& (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2329	{
2330	break;	2152	break;
2331	}	2153
2332	}
2333	if (tmp)	2154	if (tmp)
2334	{
2335	return freedir[i];	2155	return freedir[i];
2336	}
2337	}	2156	}
2338	}	2157	}
2339	}	2158	}
		2159
2340	return 0;	2160	return 0;
2341	}	2161	}
2342		2162
2343	/*	2163	/*
2344	* distance(object 1, object 2) will return the square of the	2164	* distance(object 1, object 2) will return the square of the
2345	* distance between the two given objects.	2165	* distance between the two given objects.
2346	*/	2166	*/
2347
2348	int	2167	int
2349	distance (const object *ob1, const object *ob2)	2168	distance (const object *ob1, const object *ob2)
2350	{	2169	{
2351	int
2352	i;
2353
2354	i = (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);	2170	return (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);
2355	return i;
2356	}	2171	}
2357		2172
2358	/*	2173	/*
2359	* find_dir_2(delta-x,delta-y) will return a direction in which	2174	* find_dir_2(delta-x,delta-y) will return a direction in which
2360	* an object which has subtracted the x and y coordinates of another	2175	* an object which has subtracted the x and y coordinates of another
2361	* object, needs to travel toward it.	2176	* object, needs to travel toward it.
2362	*/	2177	*/
2363
2364	int	2178	int
2365	find_dir_2 (int x, int y)	2179	find_dir_2 (int x, int y)
2366	{	2180	{
2367	int	2181	int q;
2368	q;
2369		2182
2370	if (y)	2183	if (y)
2371	q = x * 100 / y;	2184	q = x * 100 / y;
2372	else if (x)	2185	else if (x)
2373	q = -300 * x;	2186	q = -300 * x;
…		…
2398		2211
2399	return 3;	2212	return 3;
2400	}	2213	}
2401		2214
2402	/*	2215	/*
2403	* absdir(int): Returns a number between 1 and 8, which represent
2404	* the "absolute" direction of a number (it actually takes care of
2405	* "overflow" in previous calculations of a direction).
2406	*/
2407
2408	int
2409	absdir (int d)
2410	{
2411	while (d < 1)
2412	d += 8;
2413	while (d > 8)
2414	d -= 8;
2415	return d;
2416	}
2417
2418	/*
2419	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is	2216	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is
2420	* between two directions (which are expected to be absolute (see absdir())	2217	* between two directions (which are expected to be absolute (see absdir())
2421	*/	2218	*/
2422
2423	int	2219	int
2424	dirdiff (int dir1, int dir2)	2220	dirdiff (int dir1, int dir2)
2425	{	2221	{
2426	int	2222	int d;
2427	d;
2428		2223
2429	d = abs (dir1 - dir2);	2224	d = abs (dir1 - dir2);
2430	if (d > 4)	2225	if (d > 4)
2431	d = 8 - d;	2226	d = 8 - d;
		2227
2432	return d;	2228	return d;
2433	}	2229	}
2434		2230
2435	/* peterm:	2231	/* peterm:
2436	* do LOS stuff for ball lightning. Go after the closest VISIBLE monster.	2232	* do LOS stuff for ball lightning. Go after the closest VISIBLE monster.
…		…
2439	* This basically means that if direction is 15, then it could either go	2235	* This basically means that if direction is 15, then it could either go
2440	* direction 4, 14, or 16 to get back to where we are.	2236	* direction 4, 14, or 16 to get back to where we are.
2441	* Moved from spell_util.c to object.c with the other related direction	2237	* Moved from spell_util.c to object.c with the other related direction
2442	* functions.	2238	* functions.
2443	*/	2239	*/
2444
2445	int
2446	reduction_dir[SIZEOFFREE][3] = {	2240	int reduction_dir[SIZEOFFREE][3] = {
2447	{0, 0, 0}, /* 0 */	2241	{0, 0, 0}, /* 0 */
2448	{0, 0, 0}, /* 1 */	2242	{0, 0, 0}, /* 1 */
2449	{0, 0, 0}, /* 2 */	2243	{0, 0, 0}, /* 2 */
2450	{0, 0, 0}, /* 3 */	2244	{0, 0, 0}, /* 3 */
2451	{0, 0, 0}, /* 4 */	2245	{0, 0, 0}, /* 4 */
…		…
2499	* find a path to that monster that we found. If not,	2293	* find a path to that monster that we found. If not,
2500	* we don't bother going toward it. Returns 1 if we	2294	* we don't bother going toward it. Returns 1 if we
2501	* can see a direct way to get it	2295	* can see a direct way to get it
2502	* Modified to be map tile aware -.MSW	2296	* Modified to be map tile aware -.MSW
2503	*/	2297	*/
2504
2505
2506	int	2298	int
2507	can_see_monsterP (maptile *m, int x, int y, int dir)	2299	can_see_monsterP (maptile *m, int x, int y, int dir)
2508	{	2300	{
2509	sint16 dx, dy;	2301	sint16 dx, dy;
2510	int
2511	mflags;	2302	int mflags;
2512		2303
2513	if (dir < 0)	2304	if (dir < 0)
2514	return 0; /* exit condition: invalid direction */	2305	return 0; /* exit condition: invalid direction */
2515		2306
2516	dx = x + freearr_x[dir];	2307	dx = x + freearr_x[dir];
…		…
2529	return 0;	2320	return 0;
2530		2321
2531	/* yes, can see. */	2322	/* yes, can see. */
2532	if (dir < 9)	2323	if (dir < 9)
2533	return 1;	2324	return 1;
		2325
2534	return can_see_monsterP (m, x, y, reduction_dir[dir][0]) |	2326	return can_see_monsterP (m, x, y, reduction_dir[dir][0])
2535	can_see_monsterP (m, x, y, reduction_dir[dir][1]) | can_see_monsterP (m, x, y, reduction_dir[dir][2]);	2327	| can_see_monsterP (m, x, y, reduction_dir[dir][1])
		2328	| can_see_monsterP (m, x, y, reduction_dir[dir][2]);
2536	}	2329	}
2537
2538
2539		2330
2540	/*	2331	/*
2541	* can_pick(picker, item): finds out if an object is possible to be	2332	* can_pick(picker, item): finds out if an object is possible to be
2542	* picked up by the picker. Returnes 1 if it can be	2333	* picked up by the picker. Returnes 1 if it can be
2543	* picked up, otherwise 0.	2334	* picked up, otherwise 0.
…		…
2545	* Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause	2336	* Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause
2546	* core dumps if they do.	2337	* core dumps if they do.
2547	*	2338	*
2548	* Add a check so we can't pick up invisible objects (0.93.8)	2339	* Add a check so we can't pick up invisible objects (0.93.8)
2549	*/	2340	*/
2550
2551	int	2341	int
2552	can_pick (const object *who, const object *item)	2342	can_pick (const object *who, const object *item)
2553	{	2343	{
2554	return /*QUERY_FLAG(who,FLAG_WIZ)|| */	2344	return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2555	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&	2345	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
2556	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3));	2346	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3));
2557	}	2347	}
2558		2348
2559
2560	/*	2349	/*
2561	* create clone from object to another	2350	* create clone from object to another
2562	*/	2351	*/
2563	object *	2352	object *
2564	object_create_clone (object *asrc)	2353	object_create_clone (object *asrc)
2565	{	2354	{
2566	object *
2567	dst = NULL, *tmp, *src, *part, *prev, *item;	2355	object *dst = 0, *tmp, *src, *prev, *item;
2568		2356
2569	if (!asrc)	2357	if (!asrc)
2570	return NULL;	2358	return 0;
2571	src = asrc;	2359
2572	if (src->head)
2573	src = src->head;	2360	src = asrc->head_ ();
2574		2361
2575	prev = NULL;	2362	prev = 0;
2576	for (part = src; part; part = part->more)	2363	for (object *part = src; part; part = part->more)
2577	{	2364	{
2578	tmp = get_object ();	2365	tmp = part->clone ();
2579	copy_object (part, tmp);
2580	tmp->x -= src->x;	2366	tmp->x -= src->x;
2581	tmp->y -= src->y;	2367	tmp->y -= src->y;
		2368
2582	if (!part->head)	2369	if (!part->head)
2583	{	2370	{
2584	dst = tmp;	2371	dst = tmp;
2585	tmp->head = NULL;	2372	tmp->head = 0;
2586	}	2373	}
2587	else	2374	else
2588	{
2589	tmp->head = dst;	2375	tmp->head = dst;
2590	}	2376
2591	tmp->more = NULL;	2377	tmp->more = 0;
		2378
2592	if (prev)	2379	if (prev)
2593	prev->more = tmp;	2380	prev->more = tmp;
		2381
2594	prev = tmp;	2382	prev = tmp;
2595	}	2383	}
2596		2384
2597	for (item = src->inv; item; item = item->below)	2385	for (item = src->inv; item; item = item->below)
2598	insert_ob_in_ob (object_create_clone (item), dst);	2386	insert_ob_in_ob (object_create_clone (item), dst);
2599		2387
2600	return dst;	2388	return dst;
2601	}
2602
2603	/* GROS - Creates an object using a string representing its content. */
2604	/* Basically, we save the content of the string to a temp file, then call */
2605	/* load_object on it. I admit it is a highly inefficient way to make things, */
2606	/* but it was simple to make and allows reusing the load_object function. */
2607	/* Remember not to use load_object_str in a time-critical situation. */
2608	/* Also remember that multiparts objects are not supported for now. */
2609
2610	object *
2611	load_object_str (const char *obstr)
2612	{
2613	object *op;
2614	char filename[MAX_BUF];
2615
2616	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2617
2618	FILE *tempfile = fopen (filename, "w");
2619
2620	if (tempfile == NULL)
2621	{
2622	LOG (llevError, "Error - Unable to access load object temp file\n");
2623	return NULL;
2624	}
2625
2626	fprintf (tempfile, obstr);
2627	fclose (tempfile);
2628
2629	op = get_object ();
2630
2631	object_thawer thawer (filename);
2632
2633	if (thawer)
2634	load_object (thawer, op, 0);
2635
2636	LOG (llevDebug, " load str completed, object=%s\n", &op->name);
2637	CLEAR_FLAG (op, FLAG_REMOVED);
2638
2639	return op;
2640	}	2389	}
2641		2390
2642	/* This returns the first object in who's inventory that	2391	/* This returns the first object in who's inventory that
2643	* has the same type and subtype match.	2392	* has the same type and subtype match.
2644	* returns NULL if no match.	2393	* returns NULL if no match.
2645	*/	2394	*/
2646	object *	2395	object *
2647	find_obj_by_type_subtype (const object *who, int type, int subtype)	2396	find_obj_by_type_subtype (const object *who, int type, int subtype)
2648	{	2397	{
2649	object *tmp;
2650
2651	for (tmp = who->inv; tmp; tmp = tmp->below)	2398	for (object *tmp = who->inv; tmp; tmp = tmp->below)
2652	if (tmp->type == type && tmp->subtype == subtype)	2399	if (tmp->type == type && tmp->subtype == subtype)
2653	return tmp;	2400	return tmp;
2654		2401
2655	return NULL;	2402	return 0;
2656	}	2403	}
2657		2404
2658	/* If ob has a field named key, return the link from the list,	2405	/* If ob has a field named key, return the link from the list,
2659	* otherwise return NULL.	2406	* otherwise return NULL.
2660	*	2407	*
…		…
2662	* do the desired thing.	2409	* do the desired thing.
2663	*/	2410	*/
2664	key_value *	2411	key_value *
2665	get_ob_key_link (const object *ob, const char *key)	2412	get_ob_key_link (const object *ob, const char *key)
2666	{	2413	{
2667	key_value *link;
2668
2669	for (link = ob->key_values; link != NULL; link = link->next)	2414	for (key_value *link = ob->key_values; link; link = link->next)
2670	if (link->key == key)	2415	if (link->key == key)
2671	return link;	2416	return link;
2672		2417
2673	return NULL;	2418	return 0;
2674	}	2419	}
2675		2420
2676	/*	2421	/*
2677	* Returns the value of op has an extra_field for key, or NULL.	2422	* Returns the value of op has an extra_field for key, or NULL.
2678	*	2423	*
…		…
2703	if (link->key == canonical_key)	2448	if (link->key == canonical_key)
2704	return link->value;	2449	return link->value;
2705		2450
2706	return 0;	2451	return 0;
2707	}	2452	}
2708
2709		2453
2710	/*	2454	/*
2711	* Updates the canonical_key in op to value.	2455	* Updates the canonical_key in op to value.
2712	*	2456	*
2713	* canonical_key is a shared string (value doesn't have to be).	2457	* canonical_key is a shared string (value doesn't have to be).
…		…
2718	* Returns TRUE on success.	2462	* Returns TRUE on success.
2719	*/	2463	*/
2720	int	2464	int
2721	set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key)	2465	set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key)
2722	{	2466	{
2723	key_value *
2724	field = NULL, *last = NULL;	2467	key_value *field = NULL, *last = NULL;
2725		2468
2726	for (field = op->key_values; field != NULL; field = field->next)	2469	for (field = op->key_values; field != NULL; field = field->next)
2727	{	2470	{
2728	if (field->key != canonical_key)	2471	if (field->key != canonical_key)
2729	{	2472	{
…		…
2738	/* Basically, if the archetype has this key set,	2481	/* Basically, if the archetype has this key set,
2739	* we need to store the null value so when we save	2482	* we need to store the null value so when we save
2740	* it, we save the empty value so that when we load,	2483	* it, we save the empty value so that when we load,
2741	* we get this value back again.	2484	* we get this value back again.
2742	*/	2485	*/
2743	if (get_ob_key_link (&op->arch->clone, canonical_key))	2486	if (get_ob_key_link (op->arch, canonical_key))
2744	field->value = 0;	2487	field->value = 0;
2745	else	2488	else
2746	{	2489	{
2747	if (last)	2490	if (last)
2748	last->next = field->next;	2491	last->next = field->next;
…		…
2757	/* IF we get here, key doesn't exist */	2500	/* IF we get here, key doesn't exist */
2758		2501
2759	/* No field, we'll have to add it. */	2502	/* No field, we'll have to add it. */
2760		2503
2761	if (!add_key)	2504	if (!add_key)
2762	{
2763	return FALSE;	2505	return FALSE;
2764	}	2506
2765	/* There isn't any good reason to store a null	2507	/* There isn't any good reason to store a null
2766	* value in the key/value list. If the archetype has	2508	* value in the key/value list. If the archetype has
2767	* this key, then we should also have it, so shouldn't	2509	* this key, then we should also have it, so shouldn't
2768	* be here. If user wants to store empty strings,	2510	* be here. If user wants to store empty strings,
2769	* should pass in ""	2511	* should pass in ""
…		…
2818	}	2560	}
2819	else	2561	else
2820	item = item->env;	2562	item = item->env;
2821	}	2563	}
2822		2564
		2565	const char *
		2566	object::flag_desc (char *desc, int len) const
		2567	{
		2568	char *p = desc;
		2569	bool first = true;
		2570
		2571	*p = 0;
		2572
		2573	for (int i = 0; i < NUM_FLAGS; i++)
		2574	{
		2575	if (len <= 10) // magic constant!
		2576	{
		2577	snprintf (p, len, ",...");
		2578	break;
		2579	}
		2580
		2581	if (flag [i])
		2582	{
		2583	int cnt = snprintf (p, len, "%s%d", first ? "" : ",", i);
		2584	len -= cnt;
		2585	p += cnt;
		2586	first = false;
		2587	}
		2588	}
		2589
		2590	return desc;
		2591	}
		2592
2823	// return a suitable string describing an objetc in enough detail to find it	2593	// return a suitable string describing an object in enough detail to find it
2824	const char *	2594	const char *
2825	object::debug_desc (char *info) const	2595	object::debug_desc (char *info) const
2826	{	2596	{
		2597	char flagdesc[512];
2827	char info2[256 * 3];	2598	char info2[256 * 4];
2828	char *p = info;	2599	char *p = info;
2829		2600
2830	p += snprintf (p, 256, "%d=\"%s%s%s\"",	2601	p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s,flags:[%s],type:%d}",
2831	count,	2602	count,
		2603	uuid.c_str (),
2832	&name,	2604	&name,
2833	title ? " " : "",	2605	title ? "\",title:\"" : "",
2834	title ? (const char *)title : "");	2606	title ? (const char *)title : "",
		2607	flag_desc (flagdesc, 512), type);
2835		2608
2836	if (env)	2609	if (!this->flag[FLAG_REMOVED] && env)
2837	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2610	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2838		2611
2839	if (map)	2612	if (map)
2840	p += snprintf (p, 256, "(on %s@%d+%d)", map->path, x, y);	2613	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2841		2614
2842	return info;	2615	return info;
2843	}	2616	}
2844		2617
2845	const char *	2618	const char *
2846	object::debug_desc () const	2619	object::debug_desc () const
2847	{	2620	{
2848	static char info[256 * 3];	2621	static char info[3][256 * 4];
		2622	static int info_idx;
		2623
2849	return debug_desc (info);	2624	return debug_desc (info [++info_idx % 3]);
2850	}	2625	}
2851		2626
		2627	struct region *
		2628	object::region () const
		2629	{
		2630	return map ? map->region (x, y)
		2631	: region::default_region ();
		2632	}
		2633
		2634	const materialtype_t *
		2635	object::dominant_material () const
		2636	{
		2637	if (materialtype_t *mt = name_to_material (materialname))
		2638	return mt;
		2639
		2640	return name_to_material (shstr_unknown);
		2641	}
		2642
		2643	void
		2644	object::open_container (object *new_container)
		2645	{
		2646	if (container == new_container)
		2647	return;
		2648
		2649	if (object *old_container = container)
		2650	{
		2651	if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
		2652	return;
		2653
		2654	#if 0
		2655	// remove the "Close old_container" object.
		2656	if (object *closer = old_container->inv)
		2657	if (closer->type == CLOSE_CON)
		2658	closer->destroy ();
		2659	#endif
		2660
		2661	old_container->flag [FLAG_APPLIED] = 0;
		2662	container = 0;
		2663
		2664	esrv_update_item (UPD_FLAGS, this, old_container);
		2665	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
		2666	play_sound (sound_find ("chest_close"));
		2667	}
		2668
		2669	if (new_container)
		2670	{
		2671	if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))
		2672	return;
		2673
		2674	// TODO: this does not seem to serve any purpose anymore?
		2675	#if 0
		2676	// insert the "Close Container" object.
		2677	if (archetype *closer = new_container->other_arch)
		2678	{
		2679	object *closer = arch_to_object (new_container->other_arch);
		2680	closer->flag [FLAG_NO_MAP_SAVE] = 1;
		2681	new_container->insert (closer);
		2682	}
		2683	#endif
		2684
		2685	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));
		2686
		2687	new_container->flag [FLAG_APPLIED] = 1;
		2688	container = new_container;
		2689
		2690	esrv_update_item (UPD_FLAGS, this, new_container);
		2691	esrv_send_inventory (this, new_container);
		2692	play_sound (sound_find ("chest_open"));
		2693	}
		2694	}
		2695
		2696	object *
		2697	object::force_find (const shstr name)
		2698	{
		2699	/* cycle through his inventory to look for the MARK we want to
		2700	* place
		2701	*/
		2702	for (object *tmp = inv; tmp; tmp = tmp->below)
		2703	if (tmp->type == FORCE && tmp->slaying == name)
		2704	return splay (tmp);
		2705
		2706	return 0;
		2707	}
		2708
		2709	void
		2710	object::force_add (const shstr name, int duration)
		2711	{
		2712	if (object *force = force_find (name))
		2713	force->destroy ();
		2714
		2715	object *force = get_archetype (FORCE_NAME);
		2716
		2717	force->slaying = name;
		2718	force->stats.food = 1;
		2719	force->speed_left = -1.f;
		2720
		2721	force->set_speed (duration ? 1.f / duration : 0.f);
		2722	force->flag [FLAG_IS_USED_UP] = true;
		2723	force->flag [FLAG_APPLIED] = true;
		2724
		2725	insert (force);
		2726	}
		2727
		2728	void
		2729	object::play_sound (faceidx sound) const
		2730	{
		2731	if (!sound)
		2732	return;
		2733
		2734	if (flag [FLAG_REMOVED])
		2735	return;
		2736
		2737	if (env)
		2738	{
		2739	if (object *pl = in_player ())
		2740	pl->contr->play_sound (sound);
		2741	}
		2742	else
		2743	map->play_sound (sound, x, y);
		2744	}
		2745

Diff Legend

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