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.55 by root, Sun Dec 3 00:41:33 2006 UTC vs.
Revision 1.205 by root, Sun Apr 13 01:34:08 2008 UTC

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

Diff Legend

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