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.81 by root, Sat Dec 23 13:56:25 2006 UTC vs.
Revision 1.206 by root, Tue Apr 15 14:21:04 2008 UTC

1	/*	1	/*
2	CrossFire, A Multiplayer game for X-windows	2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.
3		3	*
		4	* Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
4	Copyright (C) 2001 Mark Wedel & Crossfire Development Team	5	* Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team
5	Copyright (C) 1992 Frank Tore Johansen	6	* Copyright (©) 1992,2007 Frank Tore Johansen
6		7	*
7	This program is free software; you can redistribute it and/or modify	8	* Deliantra is free software: you can redistribute it and/or modify
8	it under the terms of the GNU General Public License as published by	9	* it under the terms of the GNU General Public License as published by
9	the Free Software Foundation; either version 2 of the License, or	10	* the Free Software Foundation, either version 3 of the License, or
10	(at your option) any later version.	11	* (at your option) any later version.
11		12	*
12	This program is distributed in the hope that it will be useful,	13	* This program is distributed in the hope that it will be useful,
13	but WITHOUT ANY WARRANTY; without even the implied warranty of	14	* but WITHOUT ANY WARRANTY; without even the implied warranty of
14	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15	GNU General Public License for more details.	16	* GNU General Public License for more details.
16		17	*
17	You should have received a copy of the GNU General Public License	18	* You should have received a copy of the GNU General Public License
18	along with this program; if not, write to the Free Software	19	* along with this program. If not, see <http://www.gnu.org/licenses/>.
19	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	20	*
20		21	* The authors can be reached via e-mail to <support@deliantra.net>
21	The authors can be reached via e-mail at <crossfire@schmorp.de>
22	*/	22	*/
23		23
24	/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.	24	/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
25	sub/add_weight will transcend the environment updating the carrying	25	sub/add_weight will transcend the environment updating the carrying
26	variable. */	26	variable. */
27	#include <global.h>	27	#include <global.h>
28	#include <stdio.h>	28	#include <stdio.h>
29	#include <sys/types.h>	29	#include <sys/types.h>
30	#include <sys/uio.h>	30	#include <sys/uio.h>
31	#include <object.h>	31	#include <object.h>
32	#include <funcpoint.h>	32	#include <funcpoint.h>
		33	#include <sproto.h>
33	#include <loader.h>	34	#include <loader.h>
34		35
35	#include <bitset>	36	#include <bitset>
36		37
37	int nrofallocobjects = 0;	38	UUID UUID::cur;
38	static UUID uuid;	39	static uint64_t seq_next_save;
39	const uint64 UUID_SKIP = 1<<19;	40	static const uint64 UUID_GAP = 1<<19;
40		41
41	object *active_objects; /* List of active objects that need to be processed */	42	objectvec objects;
		43	activevec actives;
42		44
43	short freearr_x[SIZEOFFREE] = { 0, 0, 1, 1, 1, 0, -1, -1, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,	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,
44	0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1	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
45	};	50	};
46	short freearr_y[SIZEOFFREE] = { 0, -1, -1, 0, 1, 1, 1, 0, -1, -2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2,	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,
47	-3, -3, -3, -3, -2, -1, 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3	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
48	};	56	};
49	int maxfree[SIZEOFFREE] = { 0, 9, 10, 13, 14, 17, 18, 21, 22, 25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45,	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,
50	48, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49	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
51	};	62	};
52	int freedir[SIZEOFFREE] = {	63	int freedir[SIZEOFFREE] = {
53	0, 1, 2, 3, 4, 5, 6, 7, 8, 1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8,	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,
54	1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8	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
55	};	68	};
56		69
57	static void	70	static void
58	write_uuid (void)	71	write_uuid (uval64 skip, bool sync)
59	{	72	{
60	char filename1[MAX_BUF], filename2[MAX_BUF];	73	CALL_BEGIN (2);
61		74	CALL_ARG_SV (newSVval64 (skip));
62	sprintf (filename1, "%s/uuid", settings.localdir);	75	CALL_ARG_SV (boolSV (sync));
63	sprintf (filename2, "%s/uuid~", settings.localdir);	76	CALL_CALL ("cf::write_uuid", G_DISCARD);
64		77	CALL_END;
65	FILE *fp;
66
67	if (!(fp = fopen (filename2, "w")))
68	{
69	LOG (llevError, "ERROR: cannot open %s for writing, unable to write UUID!\n", filename2);
70	return;
71	}
72
73	fprintf (fp, "<1,%llx>\n", (unsigned long long)uuid.seq + UUID_SKIP * 2);
74	fclose (fp);
75	rename (filename2, filename1);
76	}	78	}
77		79
78	static void	80	static void
79	read_uuid (void)	81	read_uuid (void)
80	{	82	{
81	char filename[MAX_BUF];	83	char filename[MAX_BUF];
82		84
83	sprintf (filename, "%s/uuid", settings.localdir);	85	sprintf (filename, "%s/uuid", settings.localdir);
84		86
		87	seq_next_save = 0;
		88
85	FILE *fp;	89	FILE *fp;
86		90
87	if (!(fp = fopen (filename, "r")))	91	if (!(fp = fopen (filename, "r")))
88	{	92	{
89	if (errno == ENOENT)	93	if (errno == ENOENT)
90	{	94	{
91	LOG (llevInfo, "RESET uid to 1\n");	95	LOG (llevInfo, "RESET uid to 1\n");
92	uuid.seq = 0;	96	UUID::cur.seq = 0;
93	write_uuid ();	97	write_uuid (UUID_GAP, true);
94	return;	98	return;
95	}	99	}
96		100
97	LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);	101	LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);
98	_exit (1);	102	_exit (1);
99	}	103	}
100		104
101	int version;	105	UUID::BUF buf;
102	unsigned long long uid;	106	buf[0] = 0;
103	if (2 != fscanf (fp, "<%d,%llx>\n", &version, &uid) || version != 1)	107	fgets (buf, sizeof (buf), fp);
		108
		109	if (!UUID::cur.parse (buf))
104	{	110	{
105	LOG (llevError, "FATAL: error reading uid from %s!\n", filename);	111	LOG (llevError, "FATAL: error reading uid from %s (%s)!\n", filename, buf);
106	_exit (1);	112	_exit (1);
107	}	113	}
108		114
109	uuid.seq = uid;	115	LOG (llevDebug, "read UUID: %s\n", UUID::cur.c_str ());
110	write_uuid ();	116
111	LOG (llevDebug, "read UID: %" PRId64 "\n", uid);	117	write_uuid (UUID_GAP, true);
112	fclose (fp);	118	fclose (fp);
113	}	119	}
114		120
115	UUID	121	UUID
116	gen_uuid ()	122	UUID::gen ()
117	{	123	{
118	UUID uid;	124	UUID uid;
119		125
120	uid.seq = ++uuid.seq;	126	uid.seq = ++cur.seq;
121		127
122	if (!(uuid.seq & (UUID_SKIP - 1)))	128	if (expect_false (cur.seq >= seq_next_save))
123	write_uuid ();	129	{
		130	seq_next_save = UUID::cur.seq + (UUID_GAP >> 1);
		131	write_uuid (UUID_GAP, false);
		132	}
		133
124		134
125	return uid;	135	return uid;
126	}	136	}
127		137
128	void	138	void
129	init_uuid ()	139	UUID::init ()
130	{	140	{
131	read_uuid ();	141	read_uuid ();
132	}	142	}
133		143
134	/* 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. */
135	static int	145	static bool
136	compare_ob_value_lists_one (const object *wants, const object *has)	146	compare_ob_value_lists_one (const object *wants, const object *has)
137	{	147	{
138	key_value *wants_field;	148	key_value *wants_field;
139		149
140	/* 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
141	* 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
142	* different structure or at least keep the lists sorted...	152	* different structure or at least keep the lists sorted...
143	*/	153	*/
144		154
145	/* For each field in wants, */	155	/* For each field in wants, */
146	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)
147	{	157	{
148	key_value *has_field;	158	key_value *has_field;
149		159
150	/* Look for a field in has with the same key. */	160	/* Look for a field in has with the same key. */
151	has_field = get_ob_key_link (has, wants_field->key);	161	has_field = get_ob_key_link (has, wants_field->key);
152		162
153	if (has_field == NULL)	163	if (!has_field)
154	{
155	/* No field with that name. */	164	return 0; /* No field with that name. */
156	return FALSE;
157	}
158		165
159	/* Found the matching field. */	166	/* Found the matching field. */
160	if (has_field->value != wants_field->value)	167	if (has_field->value != wants_field->value)
161	{
162	/* 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. */
163	return FALSE;
164	}
165		169
166	/* 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. */
167	}	171	}
168		172
169	/* 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. */
170	return TRUE;	174	return 1;
171	}	175	}
172		176
173	/* Returns TRUE if ob1 has the same key_values as ob2. */	177	/* Returns TRUE if ob1 has the same key_values as ob2. */
174	static int	178	static bool
175	compare_ob_value_lists (const object *ob1, const object *ob2)	179	compare_ob_value_lists (const object *ob1, const object *ob2)
176	{	180	{
177	/* 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,
178	* so we need to run the comparison *twice*. :(	182	* so we need to run the comparison *twice*. :(
179	*/	183	*/
…		…
190	* Check nrof variable *before* calling can_merge()	194	* Check nrof variable *before* calling can_merge()
191	*	195	*
192	* Improvements made with merge: Better checking on potion, and also	196	* Improvements made with merge: Better checking on potion, and also
193	* check weight	197	* check weight
194	*/	198	*/
195
196	bool object::can_merge_slow (object *ob1, object *ob2)	199	bool object::can_merge_slow (object *ob1, object *ob2)
197	{	200	{
198	/* A couple quicksanity checks */	201	/* A couple quicksanity checks */
199	if (ob1 == ob2	202	if (ob1 == ob2
200	|| ob1->type != ob2->type	203	|| ob1->type != ob2->type
201	|| ob1->speed != ob2->speed	204	|| ob1->speed != ob2->speed
202	|| ob1->value != ob2->value	205	|| ob1->value != ob2->value
203	|| ob1->name != ob2->name)	206	|| ob1->name != ob2->name)
204	return 0;	207	return 0;
205		208
206	//TODO: this ain't working well, use nicer and correct overflow check	209	/* Do not merge objects if nrof would overflow. First part checks
207	/* Do not merge objects if nrof would overflow. We use 1UL<<31 since that	210	* for unsigned overflow (2c), second part checks wether the result
208	* value could not be stored in a sint32 (which unfortunately sometimes is	211	* would fit into a 32 bit signed int, which is often used to hold
209	* used to store nrof).	212	* nrof values.
210	*/	213	*/
211	if (ob1->nrof + ob2->nrof >= 1UL << 31)	214	if (~ob1->nrof < ob2->nrof || ob1->nrof + ob2->nrof > (1UL << 31))
212	return 0;	215	return 0;
213		216
214	/* If the objects have been identified, set the BEEN_APPLIED flag.	217	/* If the objects have been identified, set the BEEN_APPLIED flag.
215	* 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
216	* 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
217	* 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
218	* flags lose any meaning.	221	* flags lose any meaning.
219	*/	222	*/
220	if (QUERY_FLAG (ob1, FLAG_IDENTIFIED))	223	if (QUERY_FLAG (ob1, FLAG_IDENTIFIED))
…		…
248	|| ob1->move_off != ob2->move_off	251	|| ob1->move_off != ob2->move_off
249	|| ob1->move_slow != ob2->move_slow	252	|| ob1->move_slow != ob2->move_slow
250	|| ob1->move_slow_penalty != ob2->move_slow_penalty)	253	|| ob1->move_slow_penalty != ob2->move_slow_penalty)
251	return 0;	254	return 0;
252		255
253	/* This is really a spellbook check - really, we should	256	/* This is really a spellbook check - we should in general
254	* check all objects in the inventory.	257	* not merge objects with real inventories, as splitting them
		258	* is hard.
255	*/	259	*/
256	if (ob1->inv || ob2->inv)	260	if (ob1->inv || ob2->inv)
257	{	261	{
258	/* if one object has inventory but the other doesn't, not equiv */	262	if (!(ob1->inv && ob2->inv))
259	if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv))	263	return 0; /* inventories differ in length */
260	return 0;
261		264
262	/* Now check to see if the two inventory objects could merge */	265	if (ob1->inv->below || ob2->inv->below)
		266	return 0; /* more than one object in inv */
		267
263	if (!object::can_merge (ob1->inv, ob2->inv))	268	if (!object::can_merge (ob1->inv, ob2->inv))
264	return 0;	269	return 0; /* inventory objects differ */
265		270
266	/* 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
267	* if it is valid.	272	* if it is valid.
268	*/	273	*/
269	}	274	}
…		…
277		282
278	/* 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
279	* 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
280	* check?	285	* check?
281	*/	286	*/
282	if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && FABS ((ob1)->speed) > MIN_ACTIVE_SPEED)	287	if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && ob1->has_active_speed ())
283	return 0;	288	return 0;
284		289
285	switch (ob1->type)	290	switch (ob1->type)
286	{	291	{
287	case SCROLL:	292	case SCROLL:
288	if (ob1->level != ob2->level)	293	if (ob1->level != ob2->level)
289	return 0;	294	return 0;
290	break;	295	break;
291	}	296	}
292		297
293	if (ob1->key_values != NULL || ob2->key_values != NULL)	298	if (ob1->key_values || ob2->key_values)
294	{	299	{
295	/* At least one of these has key_values. */	300	/* At least one of these has key_values. */
296	if ((ob1->key_values == NULL) != (ob2->key_values == NULL))	301	if ((!ob1->key_values) != (!ob2->key_values))
297	/* One has fields, but the other one doesn't. */	302	/* One has fields, but the other one doesn't. */
298	return 0;	303	return 0;
299	else if (!compare_ob_value_lists (ob1, ob2))	304	else if (!compare_ob_value_lists (ob1, ob2))
300	return 0;	305	return 0;
301	}	306	}
302		307
303	//TODO: generate an event or call into perl for additional checks
304	if (ob1->self || ob2->self)	308	if (ob1->self || ob2->self)
305	{	309	{
306	ob1->optimise ();	310	ob1->optimise ();
307	ob2->optimise ();	311	ob2->optimise ();
308		312
309	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)
310	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	}
311	}	325	}
312		326
313	/* Everything passes, must be OK. */	327	/* Everything passes, must be OK. */
314	return 1;	328	return 1;
315	}	329	}
…		…
323	sum_weight (object *op)	337	sum_weight (object *op)
324	{	338	{
325	long sum;	339	long sum;
326	object *inv;	340	object *inv;
327		341
328	for (sum = 0, inv = op->inv; inv != NULL; inv = inv->below)	342	for (sum = 0, inv = op->inv; inv; inv = inv->below)
329	{	343	{
330	if (inv->inv)	344	if (inv->inv)
331	sum_weight (inv);	345	sum_weight (inv);
		346
332	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);	347	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);
333	}	348	}
334		349
335	if (op->type == CONTAINER && op->stats.Str)	350	if (op->type == CONTAINER && op->stats.Str)
336	sum = (sum * (100 - op->stats.Str)) / 100;	351	sum = (sum * (100 - op->stats.Str)) / 100;
…		…
356	/*	371	/*
357	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.	372	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
358	* Some error messages.	373	* Some error messages.
359	* 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.
360	*/	375	*/
361
362	char *	376	char *
363	dump_object (object *op)	377	dump_object (object *op)
364	{	378	{
365	if (!op)	379	if (!op)
366	return strdup ("[NULLOBJ]");	380	return strdup ("[NULLOBJ]");
367		381
368	object_freezer freezer;	382	object_freezer freezer;
369	save_object (freezer, op, 3);	383	op->write (freezer);
370	return freezer.as_string ();	384	return freezer.as_string ();
371	}	385	}
372		386
373	/*	387	/*
374	* 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
375	* multi-object 1 which is closest to the second object.	389	* multi-object 1 which is closest to the second object.
376	* If it's not a multi-object, it is returned.	390	* If it's not a multi-object, it is returned.
377	*/	391	*/
378
379	object *	392	object *
380	get_nearest_part (object *op, const object *pl)	393	get_nearest_part (object *op, const object *pl)
381	{	394	{
382	object *tmp, *closest;	395	object *tmp, *closest;
383	int last_dist, i;	396	int last_dist, i;
…		…
391	}	404	}
392		405
393	/*	406	/*
394	* 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.
395	*/	408	*/
396
397	object *	409	object *
398	find_object (tag_t i)	410	find_object (tag_t i)
399	{	411	{
400	for (object *op = object::first; op; op = op->next)	412	for_all_objects (op)
401	if (op->count == i)	413	if (op->count == i)
402	return op;	414	return op;
403		415
404	return 0;	416	return 0;
405	}	417	}
406		418
407	/*	419	/*
408	* 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.
409	* Used only by the patch command, but not all that useful.	421	* Used only by the patch command, but not all that useful.
410	* Enables features like "patch <name-of-other-player> food 999"	422	* Enables features like "patch <name-of-other-player> food 999"
411	*/	423	*/
412
413	object *	424	object *
414	find_object_name (const char *str)	425	find_object_name (const char *str)
415	{	426	{
416	shstr_cmp str_ (str);	427	shstr_cmp str_ (str);
417	object *op;	428	object *op;
418		429
419	for (op = object::first; op != NULL; op = op->next)	430	for_all_objects (op)
420	if (op->name == str_)	431	if (op->name == str_)
421	break;	432	break;
422		433
423	return op;	434	return op;
424	}	435	}
425		436
426	void
427	free_all_object_data ()
428	{
429	LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);
430	}
431
432	/*	437	/*
433	* 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
434	* skill and experience objects.	439	* skill and experience objects.
		440	* ACTUALLY NO! investigate! TODO
435	*/	441	*/
436	void	442	void
437	object::set_owner (object *owner)	443	object::set_owner (object *owner)
438	{	444	{
		445	// allow objects which own objects
439	if (!owner)	446	if (owner)
440	return;
441
442	/* next line added to allow objects which own objects */
443	/* Add a check for ownercounts in here, as I got into an endless loop
444	* with the fireball owning a poison cloud which then owned the
445	* fireball. I believe that was caused by one of the objects getting
446	* freed and then another object replacing it. Since the ownercounts
447	* didn't match, this check is valid and I believe that cause is valid.
448	*/
449	while (owner->owner)	447	while (owner->owner)
450	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	}
451		455
452	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;
453	}	523	}
454		524
455	/* Zero the key_values on op, decrementing the shared-string	525	/* Zero the key_values on op, decrementing the shared-string
456	* refcounts and freeing the links.	526	* refcounts and freeing the links.
457	*/	527	*/
458	static void	528	static void
459	free_key_values (object *op)	529	free_key_values (object *op)
460	{	530	{
461	for (key_value *i = op->key_values; i != 0;)	531	for (key_value *i = op->key_values; i; )
462	{	532	{
463	key_value *next = i->next;	533	key_value *next = i->next;
464	delete i;	534	delete i;
465		535
466	i = next;	536	i = next;
467	}	537	}
468		538
469	op->key_values = 0;	539	op->key_values = 0;
470	}	540	}
471		541
472	/*	542	object &
473	* copy_to first frees everything allocated by the dst object,	543	object::operator =(const object &src)
474	* and then copies the contents of itself into the second
475	* object, allocating what needs to be allocated. Basically, any
476	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
477	* if the first object is freed, the pointers in the new object
478	* will point at garbage.
479	*/
480	void
481	object::copy_to (object *dst)
482	{	544	{
483	bool is_freed = QUERY_FLAG (dst, FLAG_FREED);	545	bool is_freed = flag [FLAG_FREED];
484	bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED);	546	bool is_removed = flag [FLAG_REMOVED];
485		547
486	*(object_copy *)dst = *this;	548	*(object_copy *)this = src;
487		549
488	if (self || cb)	550	flag [FLAG_FREED] = is_freed;
489	INVOKE_OBJECT (CLONE, this, ARG_OBJECT (dst));	551	flag [FLAG_REMOVED] = is_removed;
490
491	if (is_freed)
492	SET_FLAG (dst, FLAG_FREED);
493
494	if (is_removed)
495	SET_FLAG (dst, FLAG_REMOVED);
496
497	if (speed < 0)
498	dst->speed_left = speed_left - RANDOM () % 200 / 100.0;
499		552
500	/* Copy over key_values, if any. */	553	/* Copy over key_values, if any. */
501	if (key_values)	554	if (src.key_values)
502	{	555	{
503	key_value *tail = 0;	556	key_value *tail = 0;
504	key_value *i;
505
506	dst->key_values = 0;	557	key_values = 0;
507		558
508	for (i = key_values; i; i = i->next)	559	for (key_value *i = src.key_values; i; i = i->next)
509	{	560	{
510	key_value *new_link = new key_value;	561	key_value *new_link = new key_value;
511		562
512	new_link->next = 0;	563	new_link->next = 0;
513	new_link->key = i->key;	564	new_link->key = i->key;
514	new_link->value = i->value;	565	new_link->value = i->value;
515		566
516	/* Try and be clever here, too. */	567	/* Try and be clever here, too. */
517	if (!dst->key_values)	568	if (!key_values)
518	{	569	{
519	dst->key_values = new_link;	570	key_values = new_link;
520	tail = new_link;	571	tail = new_link;
521	}	572	}
522	else	573	else
523	{	574	{
524	tail->next = new_link;	575	tail->next = new_link;
525	tail = new_link;	576	tail = new_link;
526	}	577	}
527	}	578	}
528	}	579	}
		580	}
529		581
530	update_ob_speed (dst);	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 ();
531	}	618	}
532		619
533	object *	620	object *
534	object::clone ()	621	object::clone ()
535	{	622	{
…		…
541	/*	628	/*
542	* 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
543	* 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
544	* 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.
545	*/	632	*/
546
547	void	633	void
548	update_turn_face (object *op)	634	update_turn_face (object *op)
549	{	635	{
550	if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || op->arch == NULL)	636	if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || !op->arch)
551	return;	637	return;
		638
552	SET_ANIMATION (op, op->direction);	639	SET_ANIMATION (op, op->direction);
553	update_object (op, UP_OBJ_FACE);	640	update_object (op, UP_OBJ_FACE);
554	}	641	}
555		642
556	/*	643	/*
557	* 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
558	* 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.
559	* 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.
560	*/	647	*/
561	void	648	void
562	update_ob_speed (object *op)	649	object::set_speed (float speed)
563	{	650	{
564	extern int arch_init;	651	if (flag [FLAG_FREED] && speed)
565
566	/* No reason putting the archetypes objects on the speed list,
567	* since they never really need to be updated.
568	*/
569
570	if (QUERY_FLAG (op, FLAG_FREED) && op->speed)
571	{	652	{
572	LOG (llevError, "Object %s is freed but has speed.\n", &op->name);	653	LOG (llevError, "Object %s is freed but has speed.\n", &name);
573	#ifdef MANY_CORES
574	abort ();
575	#else
576	op->speed = 0;	654	speed = 0;
577	#endif
578	}
579
580	if (arch_init)
581	return;
582
583	if (FABS (op->speed) > MIN_ACTIVE_SPEED)
584	{	655	}
585	/* If already on active list, don't do anything */
586	if (op->active_next || op->active_prev || op == active_objects)
587	return;
588		656
589	/* process_events() expects us to insert the object at the beginning	657	this->speed = speed;
590	* of the list. */
591	op->active_next = active_objects;
592		658
593	if (op->active_next != NULL)	659	if (has_active_speed ())
594	op->active_next->active_prev = op;	660	activate ();
595
596	active_objects = op;
597	}
598	else	661	else
599	{	662	deactivate ();
600	/* If not on the active list, nothing needs to be done */
601	if (!op->active_next && !op->active_prev && op != active_objects)
602	return;
603
604	if (op->active_prev == NULL)
605	{
606	active_objects = op->active_next;
607
608	if (op->active_next != NULL)
609	op->active_next->active_prev = NULL;
610	}
611	else
612	{
613	op->active_prev->active_next = op->active_next;
614
615	if (op->active_next)
616	op->active_next->active_prev = op->active_prev;
617	}
618
619	op->active_next = NULL;
620	op->active_prev = NULL;
621	}
622	}
623
624	/* This function removes object 'op' from the list of active
625	* objects.
626	* This should only be used for style maps or other such
627	* reference maps where you don't want an object that isn't
628	* in play chewing up cpu time getting processed.
629	* The reverse of this is to call update_ob_speed, which
630	* will do the right thing based on the speed of the object.
631	*/
632	void
633	remove_from_active_list (object *op)
634	{
635	/* If not on the active list, nothing needs to be done */
636	if (!op->active_next && !op->active_prev && op != active_objects)
637	return;
638
639	if (op->active_prev == NULL)
640	{
641	active_objects = op->active_next;
642	if (op->active_next != NULL)
643	op->active_next->active_prev = NULL;
644	}
645	else
646	{
647	op->active_prev->active_next = op->active_next;
648	if (op->active_next)
649	op->active_next->active_prev = op->active_prev;
650	}
651	op->active_next = NULL;
652	op->active_prev = NULL;
653	}	663	}
654		664
655	/*	665	/*
656	* update_object() updates the the map.	666	* update_object() updates the the map.
657	* It takes into account invisible objects (and represent squares covered	667	* It takes into account invisible objects (and represent squares covered
…		…
670	* UP_OBJ_FACE: only the objects face has changed.	680	* UP_OBJ_FACE: only the objects face has changed.
671	*/	681	*/
672	void	682	void
673	update_object (object *op, int action)	683	update_object (object *op, int action)
674	{	684	{
675	MoveType move_on, move_off, move_block, move_slow;
676
677	if (op == NULL)	685	if (op == NULL)
678	{	686	{
679	/* this should never happen */	687	/* this should never happen */
680	LOG (llevDebug, "update_object() called for NULL object.\n");	688	LOG (llevDebug, "update_object() called for NULL object.\n");
681	return;	689	return;
…		…
694	*/	702	*/
695	if (!op->map || op->map->in_memory == MAP_SAVING)	703	if (!op->map || op->map->in_memory == MAP_SAVING)
696	return;	704	return;
697		705
698	/* make sure the object is within map boundaries */	706	/* make sure the object is within map boundaries */
699	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)
700	{	708	{
701	LOG (llevError, "update_object() called for object out of map!\n");	709	LOG (llevError, "update_object() called for object out of map!\n");
702	#ifdef MANY_CORES	710	#ifdef MANY_CORES
703	abort ();	711	abort ();
704	#endif	712	#endif
705	return;	713	return;
706	}	714	}
707		715
708	mapspace &m = op->ms ();	716	mapspace &m = op->ms ();
709		717
710	if (m.flags_ & P_NEED_UPDATE)	718	if (!(m.flags_ & P_UPTODATE))
711	/* nop */;	719	/* nop */;
712	else if (action == UP_OBJ_INSERT)	720	else if (action == UP_OBJ_INSERT)
713	{	721	{
714	// this is likely overkill, TODO: revisit (schmorp)	722	// this is likely overkill, TODO: revisit (schmorp)
715	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))	723	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
…		…
724	/* 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
725	* to have move_allow right now.	733	* to have move_allow right now.
726	*/	734	*/
727	|| ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block	735	|| ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block
728	|| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)	736	|| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)
729	m.flags_ = P_NEED_UPDATE;	737	m.flags_ = 0;
730	}	738	}
731	/* if the object is being removed, we can't make intelligent	739	/* if the object is being removed, we can't make intelligent
732	* decisions, because remove_ob can't really pass the object	740	* decisions, because remove_ob can't really pass the object
733	* that is being removed.	741	* that is being removed.
734	*/	742	*/
735	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)	743	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
736	m.flags_ = P_NEED_UPDATE;	744	m.flags_ = 0;
737	else if (action == UP_OBJ_FACE)	745	else if (action == UP_OBJ_FACE)
738	/* Nothing to do for that case */ ;	746	/* Nothing to do for that case */ ;
739	else	747	else
740	LOG (llevError, "update_object called with invalid action: %d\n", action);	748	LOG (llevError, "update_object called with invalid action: %d\n", action);
741		749
742	if (op->more)	750	if (op->more)
743	update_object (op->more, action);	751	update_object (op->more, action);
744	}	752	}
745		753
746	object::vector object::mortals;
747	object::vector object::objects; // not yet used
748	object *object::first;
749
750	void object::free_mortals ()
751	{
752	for (AUTODECL (i, mortals.begin ()); i != mortals.end ();)
753	if ((*i)->refcnt)
754	++i; // further delay freeing
755	else
756	{
757	delete *i;
758	mortals.erase (i);
759	}
760	}
761
762	object::object ()	754	object::object ()
763	{	755	{
764	SET_FLAG (this, FLAG_REMOVED);	756	SET_FLAG (this, FLAG_REMOVED);
765		757
766	expmul = 1.0;	758	expmul = 1.0;
767	face = blank_face;	759	face = blank_face;
768	}	760	}
769		761
770	object::~object ()	762	object::~object ()
771	{	763	{
		764	unlink ();
		765
772	free_key_values (this);	766	free_key_values (this);
773	}	767	}
774		768
		769	static int object_count;
		770
775	void object::link ()	771	void object::link ()
776	{	772	{
		773	assert (!index);//D
		774	uuid = UUID::gen ();
777	count = ++ob_count;	775	count = ++object_count;
778	uuid = gen_uuid ();
779		776
780	prev = 0;	777	refcnt_inc ();
781	next = object::first;	778	objects.insert (this);
782
783	if (object::first)
784	object::first->prev = this;
785
786	object::first = this;
787	}	779	}
788		780
789	void object::unlink ()	781	void object::unlink ()
790	{	782	{
791	if (this == object::first)	783	if (!index)
792	object::first = next;	784	return;
793		785
794	/* Remove this object from the list of used objects */	786	objects.erase (this);
795	if (prev) prev->next = next;	787	refcnt_dec ();
796	if (next) next->prev = prev;	788	}
797		789
798	prev = 0;	790	void
799	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_ACTIVE
		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	}
800	}	895	}
801		896
802	object *object::create ()	897	object *object::create ()
803	{	898	{
804	object *op = new object;	899	object *op = new object;
805	op->link ();	900	op->link ();
806	return op;	901	return op;
807	}	902	}
808		903
809	/*	904	void
810	* free_object() frees everything allocated by an object, removes	905	object::do_destroy ()
811	* it from the list of used objects, and puts it on the list of
812	* free objects. The IS_FREED() flag is set in the object.
813	* The object must have been removed by remove_ob() first for
814	* this function to succeed.
815	*
816	* If destroy_inventory is set, free inventory as well. Else drop items in
817	* inventory to the ground.
818	*/
819	void object::destroy (bool destroy_inventory)
820	{	906	{
821	if (QUERY_FLAG (this, FLAG_FREED))	907	attachable::do_destroy ();
822	return;
823		908
824	if (QUERY_FLAG (this, FLAG_FRIENDLY))	909	if (flag [FLAG_IS_LINKED])
		910	remove_button_link (this);
		911
		912	if (flag [FLAG_FRIENDLY])
825	remove_friendly_object (this);	913	remove_friendly_object (this);
826		914
827	if (!QUERY_FLAG (this, FLAG_REMOVED))	915	if (!flag [FLAG_REMOVED])
828	remove ();	916	remove ();
829		917
830	SET_FLAG (this, FLAG_FREED);	918	destroy_inv (true);
831		919
832	if (more)	920	deactivate ();
833	{	921	unlink ();
834	more->destroy (destroy_inventory);
835	more = 0;
836	}
837		922
838	if (inv)	923	flag [FLAG_FREED] = 1;
839	{
840	/* Only if the space blocks everything do we not process -
841	* if some form of movement is allowed, let objects
842	* drop on that space.
843	*/
844	if (destroy_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
845	{
846	object *op = inv;
847
848	while (op)
849	{
850	object *tmp = op->below;
851	op->destroy (destroy_inventory);
852	op = tmp;
853	}
854	}
855	else
856	{ /* Put objects in inventory onto this space */
857	object *op = inv;
858
859	while (op)
860	{
861	object *tmp = op->below;
862
863	op->remove ();
864
865	if (QUERY_FLAG (op, FLAG_STARTEQUIP)
866	|| QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
867	op->destroy ();
868	else
869	{
870	op->x = x;
871	op->y = y;
872	insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */
873	}
874
875	op = tmp;
876	}
877	}
878	}
879		924
880	// hack to ensure that freed objects still have a valid map	925	// hack to ensure that freed objects still have a valid map
881	{	926	{
882	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
883		928
884	if (!freed_map)	929	if (!freed_map)
885	{	930	{
886	freed_map = new maptile;	931	freed_map = new maptile;
887		932
		933	freed_map->path = "<freed objects map>";
888	freed_map->name = "/internal/freed_objects_map";	934	freed_map->name = "/internal/freed_objects_map";
889	freed_map->width = 3;	935	freed_map->width = 3;
890	freed_map->height = 3;	936	freed_map->height = 3;
		937	freed_map->nodrop = 1;
891		938
892	freed_map->allocate ();	939	freed_map->alloc ();
		940	freed_map->in_memory = MAP_ACTIVE;
893	}	941	}
894		942
895	map = freed_map;	943	map = freed_map;
896	x = 1;	944	x = 1;
897	y = 1;	945	y = 1;
898	}	946	}
899		947
		948	if (more)
		949	{
		950	more->destroy ();
		951	more = 0;
		952	}
		953
		954	head = 0;
		955
900	// clear those pointers that likely might have circular references to us	956	// clear those pointers that likely might cause circular references
901	owner = 0;	957	owner = 0;
902	enemy = 0;	958	enemy = 0;
903	attacked_by = 0;	959	attacked_by = 0;
		960	current_weapon = 0;
		961	}
904		962
905	// only relevant for players(?), but make sure of it anyways	963	void
906	contr = 0;	964	object::destroy (bool destroy_inventory)
		965	{
		966	if (destroyed ())
		967	return;
907		968
908	/* Remove object from the active list */	969	if (destroy_inventory)
909	speed = 0;	970	destroy_inv (false);
910	update_ob_speed (this);
911		971
912	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
913		977
914	mortals.push_back (this);	978	attachable::destroy ();
915	}	979	}
916		980
917	/*	981	/*
918	* sub_weight() recursively (outwards) subtracts a number from the	982	* sub_weight() recursively (outwards) subtracts a number from the
919	* 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)).
…		…
935	* 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
936	* 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
937	* object will have no environment. If the object previously had an	1001	* object will have no environment. If the object previously had an
938	* environment, the x and y coordinates will be updated to	1002	* environment, the x and y coordinates will be updated to
939	* the previous environment.	1003	* the previous environment.
940	* Beware: This function is called from the editor as well!
941	*/	1004	*/
942	void	1005	void
943	object::remove ()	1006	object::do_remove ()
944	{	1007	{
945	object *tmp, *last = 0;	1008	object *tmp, *last = 0;
946	object *otmp;	1009	object *otmp;
947		1010
948	int check_walk_off;
949
950	if (QUERY_FLAG (this, FLAG_REMOVED))	1011	if (QUERY_FLAG (this, FLAG_REMOVED))
951	return;	1012	return;
952		1013
953	SET_FLAG (this, FLAG_REMOVED);	1014	SET_FLAG (this, FLAG_REMOVED);
		1015	INVOKE_OBJECT (REMOVE, this);
954		1016
955	if (more)	1017	if (more)
956	more->remove ();	1018	more->remove ();
957		1019
958	/*	1020	/*
…		…
971	* to save cpu time.	1033	* to save cpu time.
972	*/	1034	*/
973	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1035	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
974	otmp->update_stats ();	1036	otmp->update_stats ();
975		1037
976	if (above != NULL)	1038	if (above)
977	above->below = below;	1039	above->below = below;
978	else	1040	else
979	env->inv = below;	1041	env->inv = below;
980		1042
981	if (below != NULL)	1043	if (below)
982	below->above = above;	1044	below->above = above;
983		1045
984	/* we set up values so that it could be inserted into	1046	/* we set up values so that it could be inserted into
985	* 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
986	* to the caller to decide what we want to do.	1048	* to the caller to decide what we want to do.
…		…
990	above = 0, below = 0;	1052	above = 0, below = 0;
991	env = 0;	1053	env = 0;
992	}	1054	}
993	else if (map)	1055	else if (map)
994	{	1056	{
995	/* Re did the following section of code - it looks like it had	1057	if (type == PLAYER)
996	* lots of logic for things we no longer care about
997	*/	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 ();
		1064
		1065	--map->players;
		1066	map->touch ();
		1067	}
		1068
		1069	map->dirty = true;
		1070	mapspace &ms = this->ms ();
998		1071
999	/* link the object above us */	1072	/* link the object above us */
1000	if (above)	1073	if (above)
1001	above->below = below;	1074	above->below = below;
1002	else	1075	else
1003	map->at (x, y).top = below; /* we were top, set new top */	1076	ms.top = below; /* we were top, set new top */
1004		1077
1005	/* Relink the object below us, if there is one */	1078	/* Relink the object below us, if there is one */
1006	if (below)	1079	if (below)
1007	below->above = above;	1080	below->above = above;
1008	else	1081	else
…		…
1010	/* 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
1011	* use translated coordinates in case some oddness with map tiling is	1084	* use translated coordinates in case some oddness with map tiling is
1012	* evident	1085	* evident
1013	*/	1086	*/
1014	if (GET_MAP_OB (map, x, y) != this)	1087	if (GET_MAP_OB (map, x, y) != this)
1015	{
1016	char *dump = dump_object (this);
1017	LOG (llevError,
1018	"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 ());
1019	free (dump);
1020	dump = dump_object (GET_MAP_OB (map, x, y));
1021	LOG (llevError, "%s\n", dump);
1022	free (dump);
1023	}
1024		1089
1025	map->at (x, y).bottom = above; /* goes on above it. */	1090	ms.bot = above; /* goes on above it. */
1026	}	1091	}
1027		1092
1028	above = 0;	1093	above = 0;
1029	below = 0;	1094	below = 0;
1030		1095
1031	if (map->in_memory == MAP_SAVING)	1096	if (map->in_memory == MAP_SAVING)
1032	return;	1097	return;
1033		1098
1034	check_walk_off = !QUERY_FLAG (this, FLAG_NO_APPLY);	1099	int check_walk_off = !flag [FLAG_NO_APPLY];
1035		1100
		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
1036	for (tmp = GET_MAP_OB (map, x, y); tmp; tmp = tmp->above)	1113	for (tmp = ms.bot; tmp; tmp = tmp->above)
1037	{	1114	{
1038	/* 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
1039	* being removed.	1116	* being removed.
1040	*/	1117	*/
1041		1118
1042	if (tmp->type == PLAYER && tmp != this)
1043	{
1044	/* If a container that the player is currently using somehow gets
1045	* removed (most likely destroyed), update the player view
1046	* appropriately.
1047	*/
1048	if (tmp->container == this)
1049	{
1050	CLEAR_FLAG (this, FLAG_APPLIED);
1051	tmp->container = 0;
1052	}
1053
1054	tmp->contr->ns->floorbox_update ();
1055	}
1056
1057	/* See if player moving off should effect something */	1119	/* See if object moving off should effect something */
1058	if (check_walk_off	1120	if (check_walk_off
1059	&& ((move_type & tmp->move_off)	1121	&& ((move_type & tmp->move_off)
1060	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))	1122	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1061	{	1123	{
1062	move_apply (tmp, this, 0);	1124	move_apply (tmp, this, 0);
1063		1125
1064	if (destroyed ())	1126	if (destroyed ())
1065	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 ());
1066	}	1128	}
1067		1129
1068	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1069
1070	if (tmp->above == tmp)
1071	tmp->above = 0;
1072
1073	last = tmp;	1130	last = tmp;
1074	}	1131	}
1075		1132
1076	/* 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?
1077	if (!last)	1135	if (!last)
1078	map->at (x, y).flags_ = P_NEED_UPDATE;	1136	map->at (x, y).flags_ = 0;
1079	else	1137	else
1080	update_object (last, UP_OBJ_REMOVE);	1138	update_object (last, UP_OBJ_REMOVE);
1081		1139
1082	if (QUERY_FLAG (this, FLAG_BLOCKSVIEW) || glow_radius)	1140	if (flag [FLAG_BLOCKSVIEW] || glow_radius)
1083	update_all_los (map, x, y);	1141	update_all_los (map, x, y);
1084	}	1142	}
1085	}	1143	}
1086		1144
1087	/*	1145	/*
…		…
1096	merge_ob (object *op, object *top)	1154	merge_ob (object *op, object *top)
1097	{	1155	{
1098	if (!op->nrof)	1156	if (!op->nrof)
1099	return 0;	1157	return 0;
1100		1158
1101	if (top == NULL)	1159	if (!top)
1102	for (top = op; top != NULL && top->above != NULL; top = top->above);	1160	for (top = op; top && top->above; top = top->above)
		1161	;
1103		1162
1104	for (; top != NULL; top = top->below)	1163	for (; top; top = top->below)
1105	{	1164	{
1106	if (top == op)	1165	if (top == op)
1107	continue;	1166	continue;
1108		1167
1109	if (object::can_merge (op, top))	1168	if (object::can_merge (op, top))
…		…
1118	}	1177	}
1119		1178
1120	return 0;	1179	return 0;
1121	}	1180	}
1122		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
1123	/*	1205	/*
1124	* 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
1125	* job preparing multi-part monsters	1207	* job preparing multi-part monsters.
1126	*/	1208	*/
1127	object *	1209	object *
1128	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)
1129	{	1211	{
1130	object *tmp;
1131
1132	if (op->head)
1133	op = op->head;
1134
1135	for (tmp = op; tmp; tmp = tmp->more)	1212	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1136	{	1213	{
1137	tmp->x = x + tmp->arch->clone.x;	1214	tmp->x = x + tmp->arch->x;
1138	tmp->y = y + tmp->arch->clone.y;	1215	tmp->y = y + tmp->arch->y;
1139	}	1216	}
1140		1217
1141	return insert_ob_in_map (op, m, originator, flag);	1218	return insert_ob_in_map (op, m, originator, flag);
1142	}	1219	}
1143		1220
…		…
1159	* Return value:	1236	* Return value:
1160	* new object if 'op' was merged with other object	1237	* new object if 'op' was merged with other object
1161	* NULL if 'op' was destroyed	1238	* NULL if 'op' was destroyed
1162	* just 'op' otherwise	1239	* just 'op' otherwise
1163	*/	1240	*/
1164
1165	object *	1241	object *
1166	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)
1167	{	1243	{
		1244	assert (!op->flag [FLAG_FREED]);
		1245
1168	object *tmp, *top, *floor = NULL;	1246	object *top, *floor = NULL;
1169	sint16 x, y;
1170		1247
1171	if (QUERY_FLAG (op, FLAG_FREED))	1248	op->remove ();
1172	{
1173	LOG (llevError, "Trying to insert freed object!\n");
1174	return NULL;
1175	}
1176
1177	if (m == NULL)
1178	{
1179	char *dump = dump_object (op);
1180	LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
1181	free (dump);
1182	return op;
1183	}
1184
1185	if (out_of_map (m, op->x, op->y))
1186	{
1187	char *dump = dump_object (op);
1188	LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump);
1189	#ifdef MANY_CORES
1190	/* Better to catch this here, as otherwise the next use of this object
1191	* is likely to cause a crash. Better to find out where it is getting
1192	* improperly inserted.
1193	*/
1194	abort ();
1195	#endif
1196	free (dump);
1197	return op;
1198	}
1199
1200	if (!QUERY_FLAG (op, FLAG_REMOVED))
1201	{
1202	char *dump = dump_object (op);
1203	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
1204	free (dump);
1205	return op;
1206	}
1207
1208	if (op->more != NULL)
1209	{
1210	/* The part may be on a different map. */
1211
1212	object *more = op->more;
1213
1214	/* We really need the caller to normalize coordinates - if
1215	* we set the map, that doesn't work if the location is within
1216	* a map and this is straddling an edge. So only if coordinate
1217	* is clear wrong do we normalize it.
1218	*/
1219	if (OUT_OF_REAL_MAP (more->map, more->x, more->y))
1220	more->map = get_map_from_coord (m, &more->x, &more->y);
1221	else if (!more->map)
1222	{
1223	/* For backwards compatibility - when not dealing with tiled maps,
1224	* more->map should always point to the parent.
1225	*/
1226	more->map = m;
1227	}
1228
1229	if (insert_ob_in_map (more, more->map, originator, flag) == NULL)
1230	{
1231	if (!op->head)
1232	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1233
1234	return NULL;
1235	}
1236	}
1237
1238	CLEAR_FLAG (op, FLAG_REMOVED);
1239		1249
1240	/* Ideally, the caller figures this out. However, it complicates a lot	1250	/* Ideally, the caller figures this out. However, it complicates a lot
1241	* 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
1242	* need extra work	1252	* need extra work
1243	*/	1253	*/
1244	op->map = get_map_from_coord (m, &op->x, &op->y);	1254	if (!xy_normalise (m, op->x, op->y))
1245	x = op->x;	1255	{
1246	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 ();
1247		1268
1248	/* this has to be done after we translate the coordinates.	1269	/* this has to be done after we translate the coordinates.
1249	*/	1270	*/
1250	if (op->nrof && !(flag & INS_NO_MERGE))	1271	if (op->nrof && !(flag & INS_NO_MERGE))
1251	for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)	1272	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1252	if (object::can_merge (op, tmp))	1273	if (object::can_merge (op, tmp))
1253	{	1274	{
1254	op->nrof += tmp->nrof;	1275	op->nrof += tmp->nrof;
1255	tmp->destroy ();	1276	tmp->destroy ();
1256	}	1277	}
…		…
1273	op->below = originator->below;	1294	op->below = originator->below;
1274		1295
1275	if (op->below)	1296	if (op->below)
1276	op->below->above = op;	1297	op->below->above = op;
1277	else	1298	else
1278	op->ms ().bottom = op;	1299	ms.bot = op;
1279		1300
1280	/* since *below* originator, no need to update top */	1301	/* since *below* originator, no need to update top */
1281	originator->below = op;	1302	originator->below = op;
1282	}	1303	}
1283	else	1304	else
1284	{	1305	{
		1306	top = ms.bot;
		1307
1285	/* If there are other objects, then */	1308	/* If there are other objects, then */
1286	if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL))	1309	if (top)
1287	{	1310	{
1288	object *last = NULL;	1311	object *last = 0;
1289		1312
1290	/*	1313	/*
1291	* 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.
1292	* We've already dealt with merging if appropriate.	1315	* We've already dealt with merging if appropriate.
1293	* 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
…		…
1297	* 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
1298	* 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
1299	* 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
1300	* that flying non pickable objects are spell objects.	1323	* that flying non pickable objects are spell objects.
1301	*/	1324	*/
1302		1325	for (top = ms.bot; top; top = top->above)
1303	while (top != NULL)
1304	{	1326	{
1305	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))
1306	floor = top;	1328	floor = top;
1307		1329
1308	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))
…		…
1311	top = top->below;	1333	top = top->below;
1312	break;	1334	break;
1313	}	1335	}
1314		1336
1315	last = top;	1337	last = top;
1316	top = top->above;
1317	}	1338	}
1318		1339
1319	/* 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 */
1320	top = last;	1341	top = last;
1321		1342
…		…
1323	* looks like instead of lots of conditions here.	1344	* looks like instead of lots of conditions here.
1324	* makes things faster, and effectively the same result.	1345	* makes things faster, and effectively the same result.
1325	*/	1346	*/
1326		1347
1327	/* Have object 'fall below' other objects that block view.	1348	/* Have object 'fall below' other objects that block view.
1328	* Unless those objects are exits, type 66	1349	* Unless those objects are exits.
1329	* If INS_ON_TOP is used, don't do this processing	1350	* If INS_ON_TOP is used, don't do this processing
1330	* Need to find the object that in fact blocks view, otherwise	1351	* Need to find the object that in fact blocks view, otherwise
1331	* stacking is a bit odd.	1352	* stacking is a bit odd.
1332	*/	1353	*/
1333	if (!(flag & INS_ON_TOP) &&	1354	if (!(flag & INS_ON_TOP)
1334	(get_map_flags (op->map, 0, op->x, op->y, 0, 0) & P_BLOCKSVIEW) && (op->face && !op->face->visibility))	1355	&& ms.flags () & P_BLOCKSVIEW
		1356	&& (op->face && !faces [op->face].visibility))
1335	{	1357	{
1336	for (last = top; last != floor; last = last->below)	1358	for (last = top; last != floor; last = last->below)
1337	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1359	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1338	break;	1360	break;
		1361
1339	/* Check to see if we found the object that blocks view,	1362	/* Check to see if we found the object that blocks view,
1340	* 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
1341	* we can get inserted below this one, which requires we	1364	* we can get inserted below this one, which requires we
1342	* set top to the object below us.	1365	* set top to the object below us.
1343	*/	1366	*/
1344	if (last && last->below && last != floor)	1367	if (last && last->below && last != floor)
1345	top = last->below;	1368	top = last->below;
1346	}	1369	}
1347	} /* If objects on this space */	1370	} /* If objects on this space */
1348		1371
1349	if (flag & INS_MAP_LOAD)
1350	top = GET_MAP_TOP (op->map, op->x, op->y);
1351
1352	if (flag & INS_ABOVE_FLOOR_ONLY)	1372	if (flag & INS_ABOVE_FLOOR_ONLY)
1353	top = floor;	1373	top = floor;
1354		1374
1355	/* 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.
1356	*/	1376	*/
1357		1377
1358	/* First object on this space */	1378	/* First object on this space */
1359	if (!top)	1379	if (!top)
1360	{	1380	{
1361	op->above = GET_MAP_OB (op->map, op->x, op->y);	1381	op->above = ms.bot;
1362		1382
1363	if (op->above)	1383	if (op->above)
1364	op->above->below = op;	1384	op->above->below = op;
1365		1385
1366	op->below = NULL;	1386	op->below = 0;
1367	op->ms ().bottom = op;	1387	ms.bot = op;
1368	}	1388	}
1369	else	1389	else
1370	{ /* get inserted into the stack above top */	1390	{ /* get inserted into the stack above top */
1371	op->above = top->above;	1391	op->above = top->above;
1372		1392
…		…
1375		1395
1376	op->below = top;	1396	op->below = top;
1377	top->above = op;	1397	top->above = op;
1378	}	1398	}
1379		1399
1380	if (op->above == NULL)	1400	if (!op->above)
1381	op->ms ().top = op;	1401	ms.top = op;
1382	} /* else not INS_BELOW_ORIGINATOR */	1402	} /* else not INS_BELOW_ORIGINATOR */
1383		1403
1384	if (op->type == PLAYER)	1404	if (op->type == PLAYER)
		1405	{
1385	op->contr->do_los = 1;	1406	op->contr->do_los = 1;
		1407	++op->map->players;
		1408	op->map->touch ();
		1409	}
1386		1410
1387	/* If we have a floor, we know the player, if any, will be above	1411	op->map->dirty = true;
1388	* it, so save a few ticks and start from there.	1412
1389	*/
1390	if (!(flag & INS_MAP_LOAD))
1391	if (object *pl = op->ms ().player ())	1413	if (object *pl = ms.player ())
1392	pl->contr->ns->floorbox_update ();	1414	pl->contr->ns->floorbox_update ();
1393		1415
1394	/* If this object glows, it may affect lighting conditions that are	1416	/* If this object glows, it may affect lighting conditions that are
1395	* 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
1396	* 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
1397	* on the map will get recalculated. The players could very well	1419	* on the map will get recalculated. The players could very well
1398	* 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 -
1399	* this should get redone to only look for players within range,	1421	* this should get redone to only look for players within range,
1400	* or just updating the P_NEED_UPDATE for spaces within this area	1422	* or just updating the P_UPTODATE for spaces within this area
1401	* of effect may be sufficient.	1423	* of effect may be sufficient.
1402	*/	1424	*/
1403	if (MAP_DARKNESS (op->map) && (op->glow_radius != 0))	1425	if (op->map->darkness && (op->glow_radius != 0))
1404	update_all_los (op->map, op->x, op->y);	1426	update_all_los (op->map, op->x, op->y);
1405		1427
1406	/* updates flags (blocked, alive, no magic, etc) for this map space */	1428	/* updates flags (blocked, alive, no magic, etc) for this map space */
1407	update_object (op, UP_OBJ_INSERT);	1429	update_object (op, UP_OBJ_INSERT);
		1430
		1431	INVOKE_OBJECT (INSERT, op);
1408		1432
1409	/* 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,
1410	* we want to have floorbox_update called before calling this.	1434	* we want to have floorbox_update called before calling this.
1411	*	1435	*
1412	* check_move_on() must be after this because code called from	1436	* check_move_on() must be after this because code called from
…		…
1414	* blocked() and wall() work properly), and these flags are updated by	1438	* blocked() and wall() work properly), and these flags are updated by
1415	* update_object().	1439	* update_object().
1416	*/	1440	*/
1417		1441
1418	/* 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 */
1419	if (!(flag & INS_NO_WALK_ON) && !op->head)	1443	if (!(flag & INS_NO_WALK_ON) && op->head_ () == op)
1420	{	1444	{
1421	if (check_move_on (op, originator))	1445	if (check_move_on (op, originator))
1422	return NULL;	1446	return 0;
1423		1447
1424	/* 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
1425	* walk on's.	1449	* walk on's.
1426	*/	1450	*/
1427	for (tmp = op->more; tmp != NULL; tmp = tmp->more)	1451	for (object *tmp = op->more; tmp; tmp = tmp->more)
1428	if (check_move_on (tmp, originator))	1452	if (check_move_on (tmp, originator))
1429	return NULL;	1453	return 0;
1430	}	1454	}
1431		1455
1432	return op;	1456	return op;
1433	}	1457	}
1434		1458
…		…
1441	{	1465	{
1442	object *tmp, *tmp1;	1466	object *tmp, *tmp1;
1443		1467
1444	/* first search for itself and remove any old instances */	1468	/* first search for itself and remove any old instances */
1445		1469
1446	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)
1447	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */	1471	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */
1448	tmp->destroy ();	1472	tmp->destroy ();
1449		1473
1450	tmp1 = arch_to_object (archetype::find (arch_string));	1474	tmp1 = arch_to_object (archetype::find (arch_string));
1451		1475
1452	tmp1->x = op->x;	1476	tmp1->x = op->x;
1453	tmp1->y = op->y;	1477	tmp1->y = op->y;
1454	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);
1455	}	1488	}
1456		1489
1457	/*	1490	/*
1458	* 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
1459	* is returned contains nr objects, and the remaining parts contains	1492	* is returned contains nr objects, and the remaining parts contains
1460	* 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).
1461	* On failure, NULL is returned, and the reason put into the	1494	* On failure, NULL is returned, and the reason put into the
1462	* global static errmsg array.	1495	* global static errmsg array.
1463	*/	1496	*/
1464
1465	object *	1497	object *
1466	get_split_ob (object *orig_ob, uint32 nr)	1498	get_split_ob (object *orig_ob, uint32 nr)
1467	{	1499	{
1468	object *newob;	1500	object *newob;
1469	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);	1501	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
…		…
1480	orig_ob->destroy (1);	1512	orig_ob->destroy (1);
1481	else if (!is_removed)	1513	else if (!is_removed)
1482	{	1514	{
1483	if (orig_ob->env != NULL)	1515	if (orig_ob->env != NULL)
1484	sub_weight (orig_ob->env, orig_ob->weight * nr);	1516	sub_weight (orig_ob->env, orig_ob->weight * nr);
1485	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_ACTIVE)
1486	{	1518	{
1487	strcpy (errmsg, "Tried to split object whose map is not in memory.");	1519	strcpy (errmsg, "Tried to split object whose map is not in memory.");
1488	LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n");	1520	LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n");
1489	return NULL;	1521	return NULL;
1490	}	1522	}
…		…
1500	* 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
1501	* is subsequently removed and freed.	1533	* is subsequently removed and freed.
1502	*	1534	*
1503	* 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
1504	*/	1536	*/
1505
1506	object *	1537	object *
1507	decrease_ob_nr (object *op, uint32 i)	1538	decrease_ob_nr (object *op, uint32 i)
1508	{	1539	{
1509	object *tmp;	1540	object *tmp;
1510		1541
…		…
1585		1616
1586	/*	1617	/*
1587	* add_weight(object, weight) adds the specified weight to an object,	1618	* add_weight(object, weight) adds the specified weight to an object,
1588	* and also updates how much the environment(s) is/are carrying.	1619	* and also updates how much the environment(s) is/are carrying.
1589	*/	1620	*/
1590
1591	void	1621	void
1592	add_weight (object *op, signed long weight)	1622	add_weight (object *op, signed long weight)
1593	{	1623	{
1594	while (op != NULL)	1624	while (op != NULL)
1595	{	1625	{
…		…
1610	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);
1611	free (dump);	1641	free (dump);
1612	return op;	1642	return op;
1613	}	1643	}
1614		1644
1615	if (where->head)	1645	if (where->head_ () != where)
1616	{	1646	{
1617	LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n");	1647	LOG (llevError | logBacktrace, "Warning: Tried to insert object into wrong part of multipart object.\n");
1618	where = where->head;	1648	where = where->head;
1619	}	1649	}
1620		1650
1621	return where->insert (op);	1651	return where->insert (op);
1622	}	1652	}
…		…
1627	* inside the object environment.	1657	* inside the object environment.
1628	*	1658	*
1629	* The function returns now pointer to inserted item, and return value can	1659	* The function returns now pointer to inserted item, and return value can
1630	* be != op, if items are merged. -Tero	1660	* be != op, if items are merged. -Tero
1631	*/	1661	*/
1632
1633	object *	1662	object *
1634	object::insert (object *op)	1663	object::insert (object *op)
1635	{	1664	{
1636	object *tmp, *otmp;
1637
1638	if (!QUERY_FLAG (op, FLAG_REMOVED))	1665	if (!QUERY_FLAG (op, FLAG_REMOVED))
1639	op->remove ();	1666	op->remove ();
1640		1667
1641	if (op->more)	1668	if (op->more)
1642	{	1669	{
…		…
1644	return op;	1671	return op;
1645	}	1672	}
1646		1673
1647	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1674	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1648	CLEAR_FLAG (op, FLAG_REMOVED);	1675	CLEAR_FLAG (op, FLAG_REMOVED);
		1676
1649	if (op->nrof)	1677	if (op->nrof)
1650	{	1678	{
1651	for (tmp = inv; tmp != NULL; tmp = tmp->below)	1679	for (object *tmp = inv; tmp; tmp = tmp->below)
1652	if (object::can_merge (tmp, op))	1680	if (object::can_merge (tmp, op))
1653	{	1681	{
1654	/* return the original object and remove inserted object	1682	/* return the original object and remove inserted object
1655	(client needs the original object) */	1683	(client needs the original object) */
1656	tmp->nrof += op->nrof;	1684	tmp->nrof += op->nrof;
…		…
1675	add_weight (this, op->weight * op->nrof);	1703	add_weight (this, op->weight * op->nrof);
1676	}	1704	}
1677	else	1705	else
1678	add_weight (this, (op->weight + op->carrying));	1706	add_weight (this, (op->weight + op->carrying));
1679		1707
1680	otmp = this->in_player ();	1708	if (object *otmp = this->in_player ())
1681	if (otmp && otmp->contr)
1682	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1709	if (otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1683	otmp->update_stats ();	1710	otmp->update_stats ();
1684		1711
		1712	op->owner = 0; // its his/hers now. period.
1685	op->map = 0;	1713	op->map = 0;
1686	op->env = this;	1714	op->env = this;
1687	op->above = 0;	1715	op->above = 0;
1688	op->below = 0;	1716	op->below = 0;
1689	op->x = 0, op->y = 0;	1717	op->x = op->y = 0;
1690		1718
1691	/* 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 */
1692	if ((op->glow_radius != 0) && map)	1720	if (op->glow_radius && map)
1693	{	1721	{
1694	#ifdef DEBUG_LIGHTS	1722	#ifdef DEBUG_LIGHTS
1695	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);
1696	#endif /* DEBUG_LIGHTS */	1724	#endif /* DEBUG_LIGHTS */
1697	if (MAP_DARKNESS (map))	1725	if (map->darkness)
1698	update_all_los (map, x, y);	1726	update_all_los (map, x, y);
1699	}	1727	}
1700		1728
1701	/* 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.
1702	* It sure simplifies this function...	1730	* It sure simplifies this function...
…		…
1707	{	1735	{
1708	op->below = inv;	1736	op->below = inv;
1709	op->below->above = op;	1737	op->below->above = op;
1710	inv = op;	1738	inv = op;
1711	}	1739	}
		1740
		1741	INVOKE_OBJECT (INSERT, this);
1712		1742
1713	return op;	1743	return op;
1714	}	1744	}
1715		1745
1716	/*	1746	/*
…		…
1731	*	1761	*
1732	* 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
1733	* 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
1734	* on top.	1764	* on top.
1735	*/	1765	*/
1736
1737	int	1766	int
1738	check_move_on (object *op, object *originator)	1767	check_move_on (object *op, object *originator)
1739	{	1768	{
1740	object *tmp;	1769	object *tmp;
1741	maptile *m = op->map;	1770	maptile *m = op->map;
…		…
1768		1797
1769	/* The objects have to be checked from top to bottom.	1798	/* The objects have to be checked from top to bottom.
1770	* Hence, we first go to the top:	1799	* Hence, we first go to the top:
1771	*/	1800	*/
1772		1801
1773	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)
1774	{	1803	{
1775	/* Trim the search when we find the first other spell effect	1804	/* Trim the search when we find the first other spell effect
1776	* 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,
1777	* we don't need to check all of them.	1806	* we don't need to check all of them.
1778	*/	1807	*/
…		…
1796	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||	1825	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
1797	((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))
1798	{	1827	{
1799		1828
1800	float	1829	float
1801	diff = tmp->move_slow_penalty * FABS (op->speed);	1830	diff = tmp->move_slow_penalty * fabs (op->speed);
1802		1831
1803	if (op->type == PLAYER)	1832	if (op->type == PLAYER)
1804	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)) ||
1805	(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)))
1806	diff /= 4.0;	1835	diff /= 4.0;
…		…
1833	/*	1862	/*
1834	* present_arch(arch, map, x, y) searches for any objects with	1863	* present_arch(arch, map, x, y) searches for any objects with
1835	* a matching archetype at the given map and coordinates.	1864	* a matching archetype at the given map and coordinates.
1836	* The first matching object is returned, or NULL if none.	1865	* The first matching object is returned, or NULL if none.
1837	*/	1866	*/
1838
1839	object *	1867	object *
1840	present_arch (const archetype *at, maptile *m, int x, int y)	1868	present_arch (const archetype *at, maptile *m, int x, int y)
1841	{	1869	{
1842	object *
1843	tmp;
1844
1845	if (m == NULL || out_of_map (m, x, y))	1870	if (!m || out_of_map (m, x, y))
1846	{	1871	{
1847	LOG (llevError, "Present_arch called outside map.\n");	1872	LOG (llevError, "Present_arch called outside map.\n");
1848	return NULL;	1873	return NULL;
1849	}	1874	}
1850	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)
1851	if (tmp->arch == at)	1877	if (tmp->arch == at)
1852	return tmp;	1878	return tmp;
		1879
1853	return NULL;	1880	return NULL;
1854	}	1881	}
1855		1882
1856	/*	1883	/*
1857	* present(type, map, x, y) searches for any objects with	1884	* present(type, map, x, y) searches for any objects with
1858	* a matching type variable at the given map and coordinates.	1885	* a matching type variable at the given map and coordinates.
1859	* The first matching object is returned, or NULL if none.	1886	* The first matching object is returned, or NULL if none.
1860	*/	1887	*/
1861
1862	object *	1888	object *
1863	present (unsigned char type, maptile *m, int x, int y)	1889	present (unsigned char type, maptile *m, int x, int y)
1864	{	1890	{
1865	object *
1866	tmp;
1867
1868	if (out_of_map (m, x, y))	1891	if (out_of_map (m, x, y))
1869	{	1892	{
1870	LOG (llevError, "Present called outside map.\n");	1893	LOG (llevError, "Present called outside map.\n");
1871	return NULL;	1894	return NULL;
1872	}	1895	}
1873	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)
1874	if (tmp->type == type)	1898	if (tmp->type == type)
1875	return tmp;	1899	return tmp;
		1900
1876	return NULL;	1901	return NULL;
1877	}	1902	}
1878		1903
1879	/*	1904	/*
1880	* present_in_ob(type, object) searches for any objects with	1905	* present_in_ob(type, object) searches for any objects with
1881	* a matching type variable in the inventory of the given object.	1906	* a matching type variable in the inventory of the given object.
1882	* The first matching object is returned, or NULL if none.	1907	* The first matching object is returned, or NULL if none.
1883	*/	1908	*/
1884
1885	object *	1909	object *
1886	present_in_ob (unsigned char type, const object *op)	1910	present_in_ob (unsigned char type, const object *op)
1887	{	1911	{
1888	object *
1889	tmp;
1890
1891	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1912	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
1892	if (tmp->type == type)	1913	if (tmp->type == type)
1893	return tmp;	1914	return tmp;
		1915
1894	return NULL;	1916	return NULL;
1895	}	1917	}
1896		1918
1897	/*	1919	/*
1898	* present_in_ob (type, str, object) searches for any objects with	1920	* present_in_ob (type, str, object) searches for any objects with
…		…
1906	* 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
1907	* 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
1908	* 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
1909	* to be unique.	1931	* to be unique.
1910	*/	1932	*/
1911
1912	object *	1933	object *
1913	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)
1914	{	1935	{
1915	object *
1916	tmp;
1917
1918	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1936	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1919	{
1920	if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name)))	1937	if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name)))
1921	return tmp;	1938	return tmp;
1922	}	1939
1923	return NULL;	1940	return 0;
1924	}	1941	}
1925		1942
1926	/*	1943	/*
1927	* present_arch_in_ob(archetype, object) searches for any objects with	1944	* present_arch_in_ob(archetype, object) searches for any objects with
1928	* a matching archetype in the inventory of the given object.	1945	* a matching archetype in the inventory of the given object.
1929	* The first matching object is returned, or NULL if none.	1946	* The first matching object is returned, or NULL if none.
1930	*/	1947	*/
1931
1932	object *	1948	object *
1933	present_arch_in_ob (const archetype *at, const object *op)	1949	present_arch_in_ob (const archetype *at, const object *op)
1934	{	1950	{
1935	object *
1936	tmp;
1937
1938	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1951	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
1939	if (tmp->arch == at)	1952	if (tmp->arch == at)
1940	return tmp;	1953	return tmp;
		1954
1941	return NULL;	1955	return NULL;
1942	}	1956	}
1943		1957
1944	/*	1958	/*
1945	* activate recursively a flag on an object inventory	1959	* activate recursively a flag on an object inventory
1946	*/	1960	*/
1947	void	1961	void
1948	flag_inv (object *op, int flag)	1962	flag_inv (object *op, int flag)
1949	{	1963	{
1950	object *
1951	tmp;
1952
1953	if (op->inv)
1954	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1964	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1955	{	1965	{
1956	SET_FLAG (tmp, flag);	1966	SET_FLAG (tmp, flag);
1957	flag_inv (tmp, flag);	1967	flag_inv (tmp, flag);
1958	}	1968	}
1959	} /*	1969	}
		1970
		1971	/*
1960	* desactivate recursively a flag on an object inventory	1972	* deactivate recursively a flag on an object inventory
1961	*/	1973	*/
1962	void	1974	void
1963	unflag_inv (object *op, int flag)	1975	unflag_inv (object *op, int flag)
1964	{	1976	{
1965	object *
1966	tmp;
1967
1968	if (op->inv)
1969	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1977	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1970	{	1978	{
1971	CLEAR_FLAG (tmp, flag);	1979	CLEAR_FLAG (tmp, flag);
1972	unflag_inv (tmp, flag);	1980	unflag_inv (tmp, flag);
1973	}	1981	}
1974	}
1975
1976	/*
1977	* set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in
1978	* all it's inventory (recursively).
1979	* If checksums are used, a player will get set_cheat called for
1980	* him/her-self and all object carried by a call to this function.
1981	*/
1982
1983	void
1984	set_cheat (object *op)
1985	{
1986	SET_FLAG (op, FLAG_WAS_WIZ);
1987	flag_inv (op, FLAG_WAS_WIZ);
1988	}	1982	}
1989		1983
1990	/*	1984	/*
1991	* 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
1992	* 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
…		…
1994	* to search (see the freearr_x/y[] definition).	1988	* to search (see the freearr_x/y[] definition).
1995	* It returns a random choice among the alternatives found.	1989	* It returns a random choice among the alternatives found.
1996	* 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
1997	* does all 4 immediate directions). This returns the index into the	1991	* does all 4 immediate directions). This returns the index into the
1998	* 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)
1999	* Note - this only checks to see if there is space for the head of the
2000	* object - if it is a multispace object, this should be called for all
2001	* pieces.
2002	* Note2: This function does correctly handle tiled maps, but does not	1993	* Note: This function does correctly handle tiled maps, but does not
2003	* inform the caller. However, insert_ob_in_map will update as	1994	* inform the caller. However, insert_ob_in_map will update as
2004	* 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.
2005	* 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
2006	* 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
2007	* 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
2008	* 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
2009	* customized, changed states, etc.	2000	* customized, changed states, etc.
2010	*/	2001	*/
2011
2012	int	2002	int
2013	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)
2014	{	2004	{
2015	int
2016	i,
2017	index = 0, flag;
2018	static int
2019	altern[SIZEOFFREE];	2005	int altern[SIZEOFFREE];
		2006	int index = 0, flag;
2020		2007
2021	for (i = start; i < stop; i++)	2008	for (int i = start; i < stop; i++)
2022	{	2009	{
2023	flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]);	2010	mapxy pos (m, x, y); pos.move (i);
2024	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	{
2025	altern[index++] = i;	2026	altern [index++] = i;
		2027	continue;
		2028	}
2026		2029
2027	/* 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.
2028	* 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.
2029	* 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 -
2030	* 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
2031	* 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
2032	* to only the spaces immediately surrounding the target area, and	2035	* to only the spaces immediately surrounding the target area, and
2033	* won't look 2 spaces south of the target space.	2036	* won't look 2 spaces south of the target space.
2034	*/	2037	*/
2035	else if ((flag & P_NO_PASS) && maxfree[i] < stop)	2038	if (ms.move_block == MOVE_ALL && maxfree[i] < stop)
		2039	{
2036	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;
2037	}	2054	}
2038		2055
2039	if (!index)	2056	if (!index)
2040	return -1;	2057	return -1;
2041		2058
2042	return altern[RANDOM () % index];	2059	return altern [rndm (index)];
2043	}	2060	}
2044		2061
2045	/*	2062	/*
2046	* find_first_free_spot(archetype, maptile, x, y) works like	2063	* find_first_free_spot(archetype, maptile, x, y) works like
2047	* find_free_spot(), but it will search max number of squares.	2064	* find_free_spot(), but it will search max number of squares.
2048	* 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.
2049	* 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.
2050	*/	2067	*/
2051
2052	int	2068	int
2053	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)
2054	{	2070	{
2055	int
2056	i;
2057
2058	for (i = 0; i < SIZEOFFREE; i++)	2071	for (int i = 0; i < SIZEOFFREE; i++)
2059	{
2060	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]))
2061	return i;	2073	return i;
2062	}	2074
2063	return -1;	2075	return -1;
2064	}	2076	}
2065		2077
2066	/*	2078	/*
2067	* The function permute(arr, begin, end) randomly reorders the array	2079	* The function permute(arr, begin, end) randomly reorders the array
2068	* arr[begin..end-1].	2080	* arr[begin..end-1].
		2081	* now uses a fisher-yates shuffle, old permute was broken
2069	*/	2082	*/
2070	static void	2083	static void
2071	permute (int *arr, int begin, int end)	2084	permute (int *arr, int begin, int end)
2072	{	2085	{
2073	int	2086	arr += begin;
2074	i,
2075	j,
2076	tmp,
2077	len;
2078
2079	len = end - begin;	2087	end -= begin;
2080	for (i = begin; i < end; i++)
2081	{
2082	j = begin + RANDOM () % len;
2083		2088
2084	tmp = arr[i];	2089	while (--end)
2085	arr[i] = arr[j];	2090	swap (arr [end], arr [rndm (end + 1)]);
2086	arr[j] = tmp;
2087	}
2088	}	2091	}
2089		2092
2090	/* new function to make monster searching more efficient, and effective!	2093	/* new function to make monster searching more efficient, and effective!
2091	* This basically returns a randomized array (in the passed pointer) of	2094	* This basically returns a randomized array (in the passed pointer) of
2092	* 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
…		…
2095	* 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.
2096	*/	2099	*/
2097	void	2100	void
2098	get_search_arr (int *search_arr)	2101	get_search_arr (int *search_arr)
2099	{	2102	{
2100	int	2103	int i;
2101	i;
2102		2104
2103	for (i = 0; i < SIZEOFFREE; i++)	2105	for (i = 0; i < SIZEOFFREE; i++)
2104	{
2105	search_arr[i] = i;	2106	search_arr[i] = i;
2106	}
2107		2107
2108	permute (search_arr, 1, SIZEOFFREE1 + 1);	2108	permute (search_arr, 1, SIZEOFFREE1 + 1);
2109	permute (search_arr, SIZEOFFREE1 + 1, SIZEOFFREE2 + 1);	2109	permute (search_arr, SIZEOFFREE1 + 1, SIZEOFFREE2 + 1);
2110	permute (search_arr, SIZEOFFREE2 + 1, SIZEOFFREE);	2110	permute (search_arr, SIZEOFFREE2 + 1, SIZEOFFREE);
2111	}	2111	}
…		…
2120	* Perhaps incorrectly, but I'm making the assumption that exclude	2120	* Perhaps incorrectly, but I'm making the assumption that exclude
2121	* 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
2122	* 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
2123	* there is capable of.	2123	* there is capable of.
2124	*/	2124	*/
2125
2126	int	2125	int
2127	find_dir (maptile *m, int x, int y, object *exclude)	2126	find_dir (maptile *m, int x, int y, object *exclude)
2128	{	2127	{
2129	int
2130	i,
2131	max = SIZEOFFREE, mflags;	2128	int i, max = SIZEOFFREE, mflags;
2132		2129
2133	sint16 nx, ny;	2130	sint16 nx, ny;
2134	object *	2131	object *tmp;
2135	tmp;
2136	maptile *	2132	maptile *mp;
2137	mp;
2138		2133
2139	MoveType blocked, move_type;	2134	MoveType blocked, move_type;
2140		2135
2141	if (exclude && exclude->head)	2136	if (exclude && exclude->head_ () != exclude)
2142	{	2137	{
2143	exclude = exclude->head;	2138	exclude = exclude->head;
2144	move_type = exclude->move_type;	2139	move_type = exclude->move_type;
2145	}	2140	}
2146	else	2141	else
…		…
2159		2154
2160	if (mflags & P_OUT_OF_MAP)	2155	if (mflags & P_OUT_OF_MAP)
2161	max = maxfree[i];	2156	max = maxfree[i];
2162	else	2157	else
2163	{	2158	{
2164	blocked = GET_MAP_MOVE_BLOCK (mp, nx, ny);	2159	mapspace &ms = mp->at (nx, ny);
		2160
		2161	blocked = ms.move_block;
2165		2162
2166	if ((move_type & blocked) == move_type)	2163	if ((move_type & blocked) == move_type)
2167	max = maxfree[i];	2164	max = maxfree[i];
2168	else if (mflags & P_IS_ALIVE)	2165	else if (mflags & P_IS_ALIVE)
2169	{	2166	{
2170	for (tmp = GET_MAP_OB (mp, nx, ny); tmp; tmp = tmp->above)	2167	for (tmp = ms.bot; tmp; tmp = tmp->above)
2171	if ((QUERY_FLAG (tmp, FLAG_MONSTER) || tmp->type == PLAYER) && (tmp != exclude || (tmp->head && tmp->head != exclude)))	2168	if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)
		2169	&& (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2172	break;	2170	break;
2173		2171
2174	if (tmp)	2172	if (tmp)
2175	return freedir[i];	2173	return freedir[i];
2176	}	2174	}
…		…
2182		2180
2183	/*	2181	/*
2184	* distance(object 1, object 2) will return the square of the	2182	* distance(object 1, object 2) will return the square of the
2185	* distance between the two given objects.	2183	* distance between the two given objects.
2186	*/	2184	*/
2187
2188	int	2185	int
2189	distance (const object *ob1, const object *ob2)	2186	distance (const object *ob1, const object *ob2)
2190	{	2187	{
2191	int i;
2192
2193	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);
2194	return i;
2195	}	2189	}
2196		2190
2197	/*	2191	/*
2198	* 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
2199	* 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
2200	* object, needs to travel toward it.	2194	* object, needs to travel toward it.
2201	*/	2195	*/
2202
2203	int	2196	int
2204	find_dir_2 (int x, int y)	2197	find_dir_2 (int x, int y)
2205	{	2198	{
2206	int q;	2199	int q;
2207		2200
…		…
2236		2229
2237	return 3;	2230	return 3;
2238	}	2231	}
2239		2232
2240	/*	2233	/*
2241	* absdir(int): Returns a number between 1 and 8, which represent
2242	* the "absolute" direction of a number (it actually takes care of
2243	* "overflow" in previous calculations of a direction).
2244	*/
2245
2246	int
2247	absdir (int d)
2248	{
2249	while (d < 1)
2250	d += 8;
2251	while (d > 8)
2252	d -= 8;
2253	return d;
2254	}
2255
2256	/*
2257	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is	2234	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is
2258	* between two directions (which are expected to be absolute (see absdir())	2235	* between two directions (which are expected to be absolute (see absdir())
2259	*/	2236	*/
2260
2261	int	2237	int
2262	dirdiff (int dir1, int dir2)	2238	dirdiff (int dir1, int dir2)
2263	{	2239	{
2264	int	2240	int d;
2265	d;
2266		2241
2267	d = abs (dir1 - dir2);	2242	d = abs (dir1 - dir2);
2268	if (d > 4)	2243	if (d > 4)
2269	d = 8 - d;	2244	d = 8 - d;
		2245
2270	return d;	2246	return d;
2271	}	2247	}
2272		2248
2273	/* peterm:	2249	/* peterm:
2274	* 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.
…		…
2277	* 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
2278	* 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.
2279	* 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
2280	* functions.	2256	* functions.
2281	*/	2257	*/
2282
2283	int
2284	reduction_dir[SIZEOFFREE][3] = {	2258	int reduction_dir[SIZEOFFREE][3] = {
2285	{0, 0, 0}, /* 0 */	2259	{0, 0, 0}, /* 0 */
2286	{0, 0, 0}, /* 1 */	2260	{0, 0, 0}, /* 1 */
2287	{0, 0, 0}, /* 2 */	2261	{0, 0, 0}, /* 2 */
2288	{0, 0, 0}, /* 3 */	2262	{0, 0, 0}, /* 3 */
2289	{0, 0, 0}, /* 4 */	2263	{0, 0, 0}, /* 4 */
…		…
2380	* 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
2381	* core dumps if they do.	2355	* core dumps if they do.
2382	*	2356	*
2383	* 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)
2384	*/	2358	*/
2385
2386	int	2359	int
2387	can_pick (const object *who, const object *item)	2360	can_pick (const object *who, const object *item)
2388	{	2361	{
2389	return /*QUERY_FLAG(who,FLAG_WIZ)|| */	2362	return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2390	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&	2363	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
…		…
2395	* create clone from object to another	2368	* create clone from object to another
2396	*/	2369	*/
2397	object *	2370	object *
2398	object_create_clone (object *asrc)	2371	object_create_clone (object *asrc)
2399	{	2372	{
2400	object *dst = 0, *tmp, *src, *part, *prev, *item;	2373	object *dst = 0, *tmp, *src, *prev, *item;
2401		2374
2402	if (!asrc)	2375	if (!asrc)
2403	return 0;	2376	return 0;
2404		2377
2405	src = asrc;
2406	if (src->head)
2407	src = src->head;	2378	src = asrc->head_ ();
2408		2379
2409	prev = 0;	2380	prev = 0;
2410	for (part = src; part; part = part->more)	2381	for (object *part = src; part; part = part->more)
2411	{	2382	{
2412	tmp = part->clone ();	2383	tmp = part->clone ();
2413	tmp->x -= src->x;	2384	tmp->x -= src->x;
2414	tmp->y -= src->y;	2385	tmp->y -= src->y;
2415		2386
…		…
2433	insert_ob_in_ob (object_create_clone (item), dst);	2404	insert_ob_in_ob (object_create_clone (item), dst);
2434		2405
2435	return dst;	2406	return dst;
2436	}	2407	}
2437		2408
2438	/* GROS - Creates an object using a string representing its content. */
2439	/* Basically, we save the content of the string to a temp file, then call */
2440	/* load_object on it. I admit it is a highly inefficient way to make things, */
2441	/* but it was simple to make and allows reusing the load_object function. */
2442	/* Remember not to use load_object_str in a time-critical situation. */
2443	/* Also remember that multiparts objects are not supported for now. */
2444
2445	object *
2446	load_object_str (const char *obstr)
2447	{
2448	object *op;
2449	char filename[MAX_BUF];
2450
2451	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2452
2453	FILE *tempfile = fopen (filename, "w");
2454
2455	if (tempfile == NULL)
2456	{
2457	LOG (llevError, "Error - Unable to access load object temp file\n");
2458	return NULL;
2459	}
2460
2461	fprintf (tempfile, obstr);
2462	fclose (tempfile);
2463
2464	op = object::create ();
2465
2466	object_thawer thawer (filename);
2467
2468	if (thawer)
2469	load_object (thawer, op, 0);
2470
2471	LOG (llevDebug, " load str completed, object=%s\n", &op->name);
2472	CLEAR_FLAG (op, FLAG_REMOVED);
2473
2474	return op;
2475	}
2476
2477	/* This returns the first object in who's inventory that	2409	/* This returns the first object in who's inventory that
2478	* has the same type and subtype match.	2410	* has the same type and subtype match.
2479	* returns NULL if no match.	2411	* returns NULL if no match.
2480	*/	2412	*/
2481	object *	2413	object *
2482	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)
2483	{	2415	{
2484	object *tmp;
2485
2486	for (tmp = who->inv; tmp; tmp = tmp->below)	2416	for (object *tmp = who->inv; tmp; tmp = tmp->below)
2487	if (tmp->type == type && tmp->subtype == subtype)	2417	if (tmp->type == type && tmp->subtype == subtype)
2488	return tmp;	2418	return tmp;
2489		2419
2490	return NULL;	2420	return 0;
2491	}	2421	}
2492		2422
2493	/* 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,
2494	* otherwise return NULL.	2424	* otherwise return NULL.
2495	*	2425	*
…		…
2497	* do the desired thing.	2427	* do the desired thing.
2498	*/	2428	*/
2499	key_value *	2429	key_value *
2500	get_ob_key_link (const object *ob, const char *key)	2430	get_ob_key_link (const object *ob, const char *key)
2501	{	2431	{
2502	key_value *link;
2503
2504	for (link = ob->key_values; link != NULL; link = link->next)	2432	for (key_value *link = ob->key_values; link; link = link->next)
2505	if (link->key == key)	2433	if (link->key == key)
2506	return link;	2434	return link;
2507		2435
2508	return NULL;	2436	return 0;
2509	}	2437	}
2510		2438
2511	/*	2439	/*
2512	* 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.
2513	*	2441	*
…		…
2538	if (link->key == canonical_key)	2466	if (link->key == canonical_key)
2539	return link->value;	2467	return link->value;
2540		2468
2541	return 0;	2469	return 0;
2542	}	2470	}
2543
2544		2471
2545	/*	2472	/*
2546	* Updates the canonical_key in op to value.	2473	* Updates the canonical_key in op to value.
2547	*	2474	*
2548	* 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).
…		…
2553	* Returns TRUE on success.	2480	* Returns TRUE on success.
2554	*/	2481	*/
2555	int	2482	int
2556	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)
2557	{	2484	{
2558	key_value *
2559	field = NULL, *last = NULL;	2485	key_value *field = NULL, *last = NULL;
2560		2486
2561	for (field = op->key_values; field != NULL; field = field->next)	2487	for (field = op->key_values; field != NULL; field = field->next)
2562	{	2488	{
2563	if (field->key != canonical_key)	2489	if (field->key != canonical_key)
2564	{	2490	{
…		…
2573	/* Basically, if the archetype has this key set,	2499	/* Basically, if the archetype has this key set,
2574	* we need to store the null value so when we save	2500	* we need to store the null value so when we save
2575	* it, we save the empty value so that when we load,	2501	* it, we save the empty value so that when we load,
2576	* we get this value back again.	2502	* we get this value back again.
2577	*/	2503	*/
2578	if (get_ob_key_link (&op->arch->clone, canonical_key))	2504	if (get_ob_key_link (op->arch, canonical_key))
2579	field->value = 0;	2505	field->value = 0;
2580	else	2506	else
2581	{	2507	{
2582	if (last)	2508	if (last)
2583	last->next = field->next;	2509	last->next = field->next;
…		…
2592	/* IF we get here, key doesn't exist */	2518	/* IF we get here, key doesn't exist */
2593		2519
2594	/* No field, we'll have to add it. */	2520	/* No field, we'll have to add it. */
2595		2521
2596	if (!add_key)	2522	if (!add_key)
2597	{
2598	return FALSE;	2523	return FALSE;
2599	}	2524
2600	/* There isn't any good reason to store a null	2525	/* There isn't any good reason to store a null
2601	* value in the key/value list. If the archetype has	2526	* value in the key/value list. If the archetype has
2602	* this key, then we should also have it, so shouldn't	2527	* this key, then we should also have it, so shouldn't
2603	* be here. If user wants to store empty strings,	2528	* be here. If user wants to store empty strings,
2604	* should pass in ""	2529	* should pass in ""
…		…
2653	}	2578	}
2654	else	2579	else
2655	item = item->env;	2580	item = item->env;
2656	}	2581	}
2657		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
2658	// 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
2659	const char *	2612	const char *
2660	object::debug_desc (char *info) const	2613	object::debug_desc (char *info) const
2661	{	2614	{
		2615	char flagdesc[512];
2662	char info2[256 * 3];	2616	char info2[256 * 4];
2663	char *p = info;	2617	char *p = info;
2664		2618
2665	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}",
2666	count,	2620	count,
		2621	uuid.c_str (),
2667	&name,	2622	&name,
2668	title ? " " : "",	2623	title ? "\",title:\"" : "",
2669	title ? (const char *)title : "");	2624	title ? (const char *)title : "",
		2625	flag_desc (flagdesc, 512), type);
2670		2626
2671	if (env)	2627	if (!this->flag[FLAG_REMOVED] && env)
2672	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2628	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2673		2629
2674	if (map)	2630	if (map)
2675	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);
2676		2632
2677	return info;	2633	return info;
2678	}	2634	}
2679		2635
2680	const char *	2636	const char *
2681	object::debug_desc () const	2637	object::debug_desc () const
2682	{	2638	{
2683	static char info[256 * 3];	2639	static char info[3][256 * 4];
		2640	static int info_idx;
		2641
2684	return debug_desc (info);	2642	return debug_desc (info [++info_idx % 3]);
2685	}	2643	}
2686		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