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.149 by root, Mon May 14 19:56:45 2007 UTC vs.
Revision 1.232 by root, Tue May 6 18:09:42 2008 UTC

1	/*	1	/*
2	* CrossFire, A Multiplayer game	2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.
3	*	3	*
4	* Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team	4	* Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5	* Copyright (C) 2001 Mark Wedel & Crossfire Development Team	5	* Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team
6	* Copyright (C) 1992 Frank Tore Johansen	6	* Copyright (©) 1992,2007 Frank Tore Johansen
7	*	7	*
8	* This program is free software; you can redistribute it and/or modify	8	* Deliantra is free software: you can redistribute it and/or modify
9	* it under the terms of the GNU General Public License as published by	9	* it under the terms of the GNU General Public License as published by
10	* the Free Software Foundation; either version 2 of the License, or	10	* the Free Software Foundation, either version 3 of the License, or
11	* (at your option) any later version.	11	* (at your option) any later version.
12	*	12	*
13	* This program is distributed in the hope that it will be useful,	13	* This program is distributed in the hope that it will be useful,
14	* but WITHOUT ANY WARRANTY; without even the implied warranty of	14	* but WITHOUT ANY WARRANTY; without even the implied warranty of
15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16	* GNU General Public License for more details.	16	* GNU General Public License for more details.
17	*	17	*
18	* You should have received a copy of the GNU General Public License	18	* You should have received a copy of the GNU General Public License
19	* along with this program; if not, write to the Free Software	19	* along with this program. If not, see <http://www.gnu.org/licenses/>.
20	* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21	*	20	*
22	* The authors can be reached via e-mail at <crossfire@schmorp.de>	21	* The authors can be reached via e-mail to <support@deliantra.net>
23	*/	22	*/
24		23
25	/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
26	sub/add_weight will transcend the environment updating the carrying
27	variable. */
28	#include <global.h>	24	#include <global.h>
29	#include <stdio.h>	25	#include <stdio.h>
30	#include <sys/types.h>	26	#include <sys/types.h>
31	#include <sys/uio.h>	27	#include <sys/uio.h>
32	#include <object.h>	28	#include <object.h>
33	#include <funcpoint.h>
34	#include <sproto.h>	29	#include <sproto.h>
35	#include <loader.h>	30	#include <loader.h>
36		31
37	#include <bitset>	32	#include <bitset>
38		33
39	int nrofallocobjects = 0;	34	UUID UUID::cur;
40	static UUID uuid;	35	static uint64_t seq_next_save;
41	const uint64 UUID_SKIP = 1<<19;	36	static const uint64 UUID_GAP = 1<<19;
42		37
43	objectvec objects;	38	objectvec objects;
44	activevec actives;	39	activevec actives;
45		40
46	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,	41	short freearr_x[SIZEOFFREE] = {
		42	0,
		43	0, 1, 1, 1, 0, -1, -1, -1,
		44	0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,
47	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	0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1
48	};	46	};
49	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,	47	short freearr_y[SIZEOFFREE] = {
		48	0,
		49	-1, -1, 0, 1, 1, 1, 0, -1,
		50	-2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2,
50	-3, -3, -3, -3, -2, -1, 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3	51	-3, -3, -3, -3, -2, -1, 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3
51	};	52	};
52	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,	53	int maxfree[SIZEOFFREE] = {
		54	0,
		55	9, 10, 13, 14, 17, 18, 21, 22,
		56	25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45, 48,
53	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	57	49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49
54	};	58	};
55	int freedir[SIZEOFFREE] = {	59	int freedir[SIZEOFFREE] = {
56	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,	60	0,
		61	1, 2, 3, 4, 5, 6, 7, 8,
		62	1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8,
57	1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8	63	1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8
58	};	64	};
59		65
60	static void	66	static void
61	write_uuid (void)	67	write_uuid (uval64 skip, bool sync)
62	{	68	{
63	char filename1[MAX_BUF], filename2[MAX_BUF];	69	CALL_BEGIN (2);
64		70	CALL_ARG_SV (newSVval64 (skip));
65	sprintf (filename1, "%s/uuid", settings.localdir);	71	CALL_ARG_SV (boolSV (sync));
66	sprintf (filename2, "%s/uuid~", settings.localdir);	72	CALL_CALL ("cf::write_uuid", G_DISCARD);
67		73	CALL_END;
68	FILE *fp;
69
70	if (!(fp = fopen (filename2, "w")))
71	{
72	LOG (llevError, "ERROR: cannot open %s for writing, unable to write UUID!\n", filename2);
73	return;
74	}
75
76	fprintf (fp, "<1,%llx>\n", (unsigned long long)uuid.seq + UUID_SKIP * 2);
77	fclose (fp);
78	rename (filename2, filename1);
79	}	74	}
80		75
81	static void	76	static void
82	read_uuid (void)	77	read_uuid (void)
83	{	78	{
84	char filename[MAX_BUF];	79	char filename[MAX_BUF];
85		80
86	sprintf (filename, "%s/uuid", settings.localdir);	81	sprintf (filename, "%s/uuid", settings.localdir);
		82
		83	seq_next_save = 0;
87		84
88	FILE *fp;	85	FILE *fp;
89		86
90	if (!(fp = fopen (filename, "r")))	87	if (!(fp = fopen (filename, "r")))
91	{	88	{
92	if (errno == ENOENT)	89	if (errno == ENOENT)
93	{	90	{
94	LOG (llevInfo, "RESET uid to 1\n");	91	LOG (llevInfo, "RESET uid to 1\n");
95	uuid.seq = 0;	92	UUID::cur.seq = 0;
96	write_uuid ();	93	write_uuid (UUID_GAP, true);
97	return;	94	return;
98	}	95	}
99		96
100	LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);	97	LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);
101	_exit (1);	98	_exit (1);
102	}	99	}
103		100
104	int version;	101	UUID::BUF buf;
105	unsigned long long uid;	102	buf[0] = 0;
106	if (2 != fscanf (fp, "<%d,%llx>\n", &version, &uid) || version != 1)	103	fgets (buf, sizeof (buf), fp);
		104
		105	if (!UUID::cur.parse (buf))
107	{	106	{
108	LOG (llevError, "FATAL: error reading uid from %s!\n", filename);	107	LOG (llevError, "FATAL: error reading uid from %s (%s)!\n", filename, buf);
109	_exit (1);	108	_exit (1);
110	}	109	}
111		110
112	uuid.seq = uid;	111	LOG (llevDebug, "read UUID: %s\n", UUID::cur.c_str ());
113	write_uuid ();	112
114	LOG (llevDebug, "read UID: %" PRId64 "\n", uid);	113	write_uuid (UUID_GAP, true);
115	fclose (fp);	114	fclose (fp);
116	}	115	}
117		116
118	UUID	117	UUID
119	gen_uuid ()	118	UUID::gen ()
120	{	119	{
121	UUID uid;	120	UUID uid;
122		121
123	uid.seq = ++uuid.seq;	122	uid.seq = ++cur.seq;
124		123
125	if (!(uuid.seq & (UUID_SKIP - 1)))	124	if (expect_false (cur.seq >= seq_next_save))
126	write_uuid ();	125	{
		126	seq_next_save = UUID::cur.seq + (UUID_GAP >> 1);
		127	write_uuid (UUID_GAP, false);
		128	}
		129
127		130
128	return uid;	131	return uid;
129	}	132	}
130		133
131	void	134	void
132	init_uuid ()	135	UUID::init ()
133	{	136	{
134	read_uuid ();	137	read_uuid ();
135	}	138	}
136		139
137	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */	140	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */
138	static int	141	static bool
139	compare_ob_value_lists_one (const object *wants, const object *has)	142	compare_ob_value_lists_one (const object *wants, const object *has)
140	{	143	{
141	key_value *wants_field;
142
143	/* n-squared behaviour (see get_ob_key_link()), but I'm hoping both	144	/* n-squared behaviour (see kv_get), but I'm hoping both
144	* objects with lists are rare, and lists stay short. If not, use a	145	* objects with lists are rare, and lists stay short. If not, use a
145	* different structure or at least keep the lists sorted...	146	* different structure or at least keep the lists sorted...
146	*/	147	*/
147		148
148	/* For each field in wants, */	149	/* For each field in wants, */
149	for (wants_field = wants->key_values; wants_field; wants_field = wants_field->next)	150	for (key_value *kv = wants->key_values; kv; kv = kv->next)
150	{	151	if (has->kv_get (kv->key) != kv->value)
151	key_value *has_field;	152	return false;
152
153	/* Look for a field in has with the same key. */
154	has_field = get_ob_key_link (has, wants_field->key);
155
156	if (has_field == NULL)
157	{
158	/* No field with that name. */
159	return FALSE;
160	}
161
162	/* Found the matching field. */
163	if (has_field->value != wants_field->value)
164	{
165	/* Values don't match, so this half of the comparison is false. */
166	return FALSE;
167	}
168
169	/* If we get here, we found a match. Now for the next field in wants. */
170	}
171		153
172	/* If we get here, every field in wants has a matching field in has. */	154	/* If we get here, every field in wants has a matching field in has. */
173	return TRUE;	155	return true;
174	}	156	}
175		157
176	/* Returns TRUE if ob1 has the same key_values as ob2. */	158	/* Returns TRUE if ob1 has the same key_values as ob2. */
177	static int	159	static bool
178	compare_ob_value_lists (const object *ob1, const object *ob2)	160	compare_ob_value_lists (const object *ob1, const object *ob2)
179	{	161	{
180	/* However, there may be fields in has which aren't partnered in wants,	162	/* However, there may be fields in has which aren't partnered in wants,
181	* so we need to run the comparison *twice*. :(	163	* so we need to run the comparison *twice*. :(
182	*/	164	*/
183	return compare_ob_value_lists_one (ob1, ob2) && compare_ob_value_lists_one (ob2, ob1);	165	return compare_ob_value_lists_one (ob1, ob2)
		166	&& compare_ob_value_lists_one (ob2, ob1);
184	}	167	}
185		168
186	/* Function examines the 2 objects given to it, and returns true if	169	/* Function examines the 2 objects given to it, and returns true if
187	* they can be merged together.	170	* they can be merged together.
188	*	171	*
…		…
203	|| ob1->speed != ob2->speed	186	|| ob1->speed != ob2->speed
204	|| ob1->value != ob2->value	187	|| ob1->value != ob2->value
205	|| ob1->name != ob2->name)	188	|| ob1->name != ob2->name)
206	return 0;	189	return 0;
207		190
208	//TODO: this ain't working well, use nicer and correct overflow check	191	/* Do not merge objects if nrof would overflow. First part checks
209	/* Do not merge objects if nrof would overflow. We use 1UL<<31 since that	192	* for unsigned overflow (2c), second part checks whether the result
210	* value could not be stored in a sint32 (which unfortunately sometimes is	193	* would fit into a 32 bit signed int, which is often used to hold
211	* used to store nrof).	194	* nrof values.
212	*/	195	*/
213	if (ob1->nrof + ob2->nrof >= 1UL << 31)	196	if (~ob1->nrof < ob2->nrof || ob1->nrof + ob2->nrof > (1UL << 31))
214	return 0;	197	return 0;
215		198
216	/* If the objects have been identified, set the BEEN_APPLIED flag.	199	/* If the objects have been identified, set the BEEN_APPLIED flag.
217	* This is to the comparison of the flags below will be OK. We	200	* This is to the comparison of the flags below will be OK. We
218	* just can't ignore the been applied or identified flags, as they	201	* just can't ignore the been applied or identified flags, as they
219	* are not equal - just if it has been identified, the been_applied	202	* are not equal - just if it has been identified, the been_applied
220	* flags lose any meaning.	203	* flags lose any meaning.
221	*/	204	*/
222	if (QUERY_FLAG (ob1, FLAG_IDENTIFIED))	205	if (QUERY_FLAG (ob1, FLAG_IDENTIFIED))
223	SET_FLAG (ob1, FLAG_BEEN_APPLIED);	206	SET_FLAG (ob1, FLAG_BEEN_APPLIED);
224		207
225	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))	208	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))
226	SET_FLAG (ob2, FLAG_BEEN_APPLIED);	209	SET_FLAG (ob2, FLAG_BEEN_APPLIED);
227		210
228	if ((ob1->flag ^ ob2->flag).reset (FLAG_INV_LOCKED).reset (FLAG_CLIENT_SENT).any ()	211	if (ob1->arch->name != ob2->arch->name
229	|| ob1->arch != ob2->arch
230	|| ob1->name != ob2->name	212	|| ob1->name != ob2->name
231	|| ob1->title != ob2->title	213	|| ob1->title != ob2->title
232	|| ob1->msg != ob2->msg	214	|| ob1->msg != ob2->msg
233	|| ob1->weight != ob2->weight	215	|| ob1->weight != ob2->weight
234	|| memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
235	|| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats) )
236	|| ob1->attacktype != ob2->attacktype	216	|| ob1->attacktype != ob2->attacktype
237	|| ob1->magic != ob2->magic	217	|| ob1->magic != ob2->magic
238	|| ob1->slaying != ob2->slaying	218	|| ob1->slaying != ob2->slaying
239	|| ob1->skill != ob2->skill	219	|| ob1->skill != ob2->skill
240	|| ob1->value != ob2->value	220	|| ob1->value != ob2->value
…		…
247	|| ob1->move_block != ob2->move_block	227	|| ob1->move_block != ob2->move_block
248	|| ob1->move_allow != ob2->move_allow	228	|| ob1->move_allow != ob2->move_allow
249	|| ob1->move_on != ob2->move_on	229	|| ob1->move_on != ob2->move_on
250	|| ob1->move_off != ob2->move_off	230	|| ob1->move_off != ob2->move_off
251	|| ob1->move_slow != ob2->move_slow	231	|| ob1->move_slow != ob2->move_slow
252	|| ob1->move_slow_penalty != ob2->move_slow_penalty)	232	|| ob1->move_slow_penalty != ob2->move_slow_penalty
		233	|| memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
		234	|| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats)))
253	return 0;	235	return 0;
254		236
		237	if ((ob1->flag ^ ob2->flag)
		238	.reset (FLAG_INV_LOCKED)
		239	.reset (FLAG_CLIENT_SENT)
		240	.reset (FLAG_REMOVED)
		241	.any ())
		242	return 0;
		243
255	/* This is really a spellbook check - really, we should	244	/* This is really a spellbook check - we should in general
256	* check all objects in the inventory.	245	* not merge objects with real inventories, as splitting them
		246	* is hard.
257	*/	247	*/
258	if (ob1->inv || ob2->inv)	248	if (ob1->inv || ob2->inv)
259	{	249	{
260	/* if one object has inventory but the other doesn't, not equiv */	250	if (!(ob1->inv && ob2->inv))
261	if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv))	251	return 0; /* inventories differ in length */
262	return 0;
263		252
264	/* Now check to see if the two inventory objects could merge */	253	if (ob1->inv->below || ob2->inv->below)
		254	return 0; /* more than one object in inv */
		255
265	if (!object::can_merge (ob1->inv, ob2->inv))	256	if (!object::can_merge (ob1->inv, ob2->inv))
266	return 0;	257	return 0; /* inventory objects differ */
267		258
268	/* inventory ok - still need to check rest of this object to see	259	/* inventory ok - still need to check rest of this object to see
269	* if it is valid.	260	* if it is valid.
270	*/	261	*/
271	}	262	}
…		…
290	if (ob1->level != ob2->level)	281	if (ob1->level != ob2->level)
291	return 0;	282	return 0;
292	break;	283	break;
293	}	284	}
294		285
295	if (ob1->key_values != NULL || ob2->key_values != NULL)	286	if (ob1->key_values || ob2->key_values)
296	{	287	{
297	/* At least one of these has key_values. */	288	/* At least one of these has key_values. */
298	if ((ob1->key_values == NULL) != (ob2->key_values == NULL))	289	if ((!ob1->key_values) != (!ob2->key_values))
299	/* One has fields, but the other one doesn't. */	290	return 0; /* One has fields, but the other one doesn't. */
		291
		292	if (!compare_ob_value_lists (ob1, ob2))
300	return 0;	293	return 0;
301	else if (!compare_ob_value_lists (ob1, ob2))
302	return 0;
303	}	294	}
304		295
305	//TODO: generate an event or call into perl for additional checks
306	if (ob1->self || ob2->self)	296	if (ob1->self || ob2->self)
307	{	297	{
308	ob1->optimise ();	298	ob1->optimise ();
309	ob2->optimise ();	299	ob2->optimise ();
310		300
311	if (ob1->self || ob2->self)	301	if (ob1->self || ob2->self)
		302	{
		303	int k1 = ob1->self ? HvTOTALKEYS (ob1->self) : 0;
		304	int k2 = ob2->self ? HvTOTALKEYS (ob2->self) : 0;
		305
		306	if (k1 != k2)
312	return 0;	307	return 0;
		308
		309	if (k1 == 0)
		310	return 1;
		311
		312	if (!cfperl_can_merge (ob1, ob2))
		313	return 0;
		314	}
313	}	315	}
314		316
315	/* Everything passes, must be OK. */	317	/* Everything passes, must be OK. */
316	return 1;	318	return 1;
317	}	319	}
318		320
		321	// find player who can see this object
		322	object *
		323	object::visible_to () const
		324	{
		325	if (client_visible () && !flag [FLAG_REMOVED])
		326	{
		327	// see if we are in a container of sorts
		328	if (env)
		329	{
		330	// the player inventory itself is always visible
		331	if (env->type == PLAYER)
		332	return env;
		333
		334	// else a player could have our env open
		335	object *envest = env->outer_env ();
		336
		337	// the player itself is always on a map, so we will find him here
		338	// even if our inv is in a player.
		339	if (envest->is_on_map ())
		340	if (object *pl = envest->ms ().player ())
		341	if (pl->container == env)
		342	return pl;
		343	}
		344	else
		345	{
		346	// maybe there is a player standing on the same mapspace
		347	// this will catch the case where "this" is a player
		348	if (object *pl = ms ().player ())
		349	if (!pl->container || this == pl->container)
		350	return pl;
		351	}
		352	}
		353
		354	return 0;
		355	}
		356
		357	// adjust weight per container type ("of holding")
		358	static sint32
		359	weight_adjust (object *op, sint32 weight)
		360	{
		361	return op->type == CONTAINER
		362	? lerp (weight, 0, 100, 0, 100 - op->stats.Str)
		363	: weight;
		364	}
		365
319	/*	366	/*
		367	* adjust_weight(object, weight) adds the specified weight to an object,
		368	* and also updates how much the environment(s) is/are carrying.
		369	*/
		370	static void
		371	adjust_weight (object *op, sint32 weight)
		372	{
		373	while (op)
		374	{
		375	weight = weight_adjust (op, weight);
		376
		377	if (!weight)
		378	return;
		379
		380	op->carrying += weight;
		381
		382	if (object *pl = op->visible_to ())
		383	if (pl != op) // player is handled lazily
		384	esrv_update_item (UPD_WEIGHT, pl, op);
		385
		386	op = op->env;
		387	}
		388	}
		389
		390	/*
320	* sum_weight() is a recursive function which calculates the weight	391	* this is a recursive function which calculates the weight
321	* an object is carrying. It goes through in figures out how much	392	* an object is carrying. It goes through op and figures out how much
322	* containers are carrying, and sums it up.	393	* containers are carrying, and sums it up.
323	*/	394	*/
324	long	395	void
325	sum_weight (object *op)	396	object::update_weight ()
326	{	397	{
327	long sum;	398	sint32 sum = 0;
328	object *inv;
329		399
330	for (sum = 0, inv = op->inv; inv; inv = inv->below)	400	for (object *op = inv; op; op = op->below)
331	{	401	{
332	if (inv->inv)	402	if (op->inv)
333	sum_weight (inv);	403	op->update_weight ();
334		404
335	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);	405	sum += op->total_weight ();
		406	}
		407
		408	sum = weight_adjust (this, sum);
		409
		410	if (sum != carrying)
336	}	411	{
337
338	if (op->type == CONTAINER && op->stats.Str)
339	sum = (sum * (100 - op->stats.Str)) / 100;
340
341	if (op->carrying != sum)
342	op->carrying = sum;	412	carrying = sum;
343		413
344	return sum;	414	if (object *pl = visible_to ())
		415	if (pl != this) // player is handled lazily
		416	esrv_update_item (UPD_WEIGHT, pl, this);
		417	}
345	}	418	}
346		419
347	/**	420	/*
348	* Return the outermost environment object for a given object.	421	* Used by: Server DM commands: dumpbelow, dump. Some error messages.
349	*/
350
351	object *
352	object_get_env_recursive (object *op)
353	{
354	while (op->env != NULL)
355	op = op->env;
356	return op;
357	}
358
359	/*
360	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
361	* Some error messages.
362	* The result of the dump is stored in the static global errmsg array.
363	*/	422	*/
364	char *	423	char *
365	dump_object (object *op)	424	dump_object (object *op)
366	{	425	{
367	if (!op)	426	if (!op)
…		…
375	/*	434	/*
376	* get_nearest_part(multi-object, object 2) returns the part of the	435	* get_nearest_part(multi-object, object 2) returns the part of the
377	* multi-object 1 which is closest to the second object.	436	* multi-object 1 which is closest to the second object.
378	* If it's not a multi-object, it is returned.	437	* If it's not a multi-object, it is returned.
379	*/	438	*/
380
381	object *	439	object *
382	get_nearest_part (object *op, const object *pl)	440	get_nearest_part (object *op, const object *pl)
383	{	441	{
384	object *tmp, *closest;	442	object *tmp, *closest;
385	int last_dist, i;	443	int last_dist, i;
386		444
387	if (op->more == NULL)	445	if (!op->more)
388	return op;	446	return op;
		447
389	for (last_dist = distance (op, pl), closest = op, tmp = op->more; tmp != NULL; tmp = tmp->more)	448	for (last_dist = distance (op, pl), closest = op, tmp = op->more;
		449	tmp;
		450	tmp = tmp->more)
390	if ((i = distance (tmp, pl)) < last_dist)	451	if ((i = distance (tmp, pl)) < last_dist)
391	closest = tmp, last_dist = i;	452	closest = tmp, last_dist = i;
		453
392	return closest;	454	return closest;
393	}	455	}
394		456
395	/*	457	/*
396	* Returns the object which has the count-variable equal to the argument.	458	* Returns the object which has the count-variable equal to the argument.
		459	* VERRRY slow.
397	*/	460	*/
398	object *	461	object *
399	find_object (tag_t i)	462	find_object (tag_t i)
400	{	463	{
401	for_all_objects (op)	464	for_all_objects (op)
…		…
421	break;	484	break;
422		485
423	return op;	486	return op;
424	}	487	}
425		488
426	void
427	free_all_object_data ()
428	{
429	LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);
430	}
431
432	/*	489	/*
433	* Sets the owner and sets the skill and exp pointers to owner's current	490	* Sets the owner and sets the skill and exp pointers to owner's current
434	* skill and experience objects.	491	* skill and experience objects.
		492	* ACTUALLY NO! investigate! TODO
435	*/	493	*/
436	void	494	void
437	object::set_owner (object *owner)	495	object::set_owner (object *owner)
438	{	496	{
		497	// allow objects which own objects
439	if (!owner)	498	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)	499	while (owner->owner)
450	owner = owner->owner;	500	owner = owner->owner;
		501
		502	if (flag [FLAG_FREED])
		503	{
		504	LOG (llevError | logBacktrace, "tried to set owner of %s to %s\n", debug_desc (), owner->debug_desc ());
		505	return;
		506	}
451		507
452	this->owner = owner;	508	this->owner = owner;
453	}	509	}
454		510
455	int	511	int
…		…
473	object::change_weapon (object *ob)	529	object::change_weapon (object *ob)
474	{	530	{
475	if (current_weapon == ob)	531	if (current_weapon == ob)
476	return true;	532	return true;
477		533
		534	if (chosen_skill)
		535	chosen_skill->flag [FLAG_APPLIED] = false;
		536
478	current_weapon = ob;	537	current_weapon = ob;
479	chosen_skill = !ob || ob->type == SKILL ? ob : find_skill_by_name (this, ob->skill);	538	chosen_skill = !ob || ob->type == SKILL ? ob : find_skill_by_name (this, ob->skill);
		539
		540	if (chosen_skill)
		541	chosen_skill->flag [FLAG_APPLIED] = true;
480		542
481	update_stats ();	543	update_stats ();
482		544
483	if (ob)	545	if (ob)
484	{	546	{
…		…
489	{	551	{
490	current_weapon = chosen_skill = 0;	552	current_weapon = chosen_skill = 0;
491	update_stats ();	553	update_stats ();
492		554
493	new_draw_info_format (NDI_UNIQUE, 0, this,	555	new_draw_info_format (NDI_UNIQUE, 0, this,
494	"You try to balance your applied items all at once, but the %s is too much. "	556	"You try to balance all your items at once, "
		557	"but the %s is just too much for your body. "
495	"You need to unapply some items first.", &ob->name);	558	"[You need to unapply some items first.]", &ob->name);
496	return false;	559	return false;
497	}	560	}
498		561
499	//new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);	562	//new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);
500	}	563	}
501	else	564	else
502	;//new_draw_info_format (NDI_UNIQUE, 0, this, "You unwield your weapons.");	565	;//new_draw_info_format (NDI_UNIQUE, 0, this, "You unwield your weapons.");
503		566
		567	if (ob && !ob->flag [FLAG_APPLIED] && ob->type != SPELL)
		568	{
		569	LOG (llevError | logBacktrace, "%s changed to unapplied weapon %s",
		570	&name, ob->debug_desc ());
		571	return false;
		572	}
		573
504	return true;	574	return true;
505	}	575	}
506		576
507	/* Zero the key_values on op, decrementing the shared-string	577	/* Zero the key_values on op, decrementing the shared-string
508	* refcounts and freeing the links.	578	* refcounts and freeing the links.
…		…
519	}	589	}
520		590
521	op->key_values = 0;	591	op->key_values = 0;
522	}	592	}
523		593
524	object &	594	/*
525	object::operator =(const object &src)	595	* copy_to first frees everything allocated by the dst object,
		596	* and then copies the contents of itself into the second
		597	* object, allocating what needs to be allocated. Basically, any
		598	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
		599	* if the first object is freed, the pointers in the new object
		600	* will point at garbage.
		601	*/
		602	void
		603	object::copy_to (object *dst)
526	{	604	{
527	bool is_freed = flag [FLAG_FREED];	605	dst->remove ();
528	bool is_removed = flag [FLAG_REMOVED];
529
530	*(object_copy *)this = src;	606	*(object_copy *)dst = *this;
531
532	flag [FLAG_FREED] = is_freed;
533	flag [FLAG_REMOVED] = is_removed;	607	dst->flag [FLAG_REMOVED] = true;
534		608
535	/* Copy over key_values, if any. */	609	/* Copy over key_values, if any. */
536	if (src.key_values)	610	if (key_values)
537	{	611	{
538	key_value *tail = 0;	612	key_value *tail = 0;
539	key_values = 0;	613	dst->key_values = 0;
540		614
541	for (key_value *i = src.key_values; i; i = i->next)	615	for (key_value *i = key_values; i; i = i->next)
542	{	616	{
543	key_value *new_link = new key_value;	617	key_value *new_link = new key_value;
544		618
545	new_link->next = 0;	619	new_link->next = 0;
546	new_link->key = i->key;	620	new_link->key = i->key;
547	new_link->value = i->value;	621	new_link->value = i->value;
548		622
549	/* Try and be clever here, too. */	623	/* Try and be clever here, too. */
550	if (!key_values)	624	if (!dst->key_values)
551	{	625	{
552	key_values = new_link;	626	dst->key_values = new_link;
553	tail = new_link;	627	tail = new_link;
554	}	628	}
555	else	629	else
556	{	630	{
557	tail->next = new_link;	631	tail->next = new_link;
558	tail = new_link;	632	tail = new_link;
559	}	633	}
560	}	634	}
561	}	635	}
562	}
563
564	/*
565	* copy_to first frees everything allocated by the dst object,
566	* and then copies the contents of itself into the second
567	* object, allocating what needs to be allocated. Basically, any
568	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
569	* if the first object is freed, the pointers in the new object
570	* will point at garbage.
571	*/
572	void
573	object::copy_to (object *dst)
574	{
575	*dst = *this;
576		636
577	if (speed < 0)	637	if (speed < 0)
578	dst->speed_left = speed_left - rndm ();	638	dst->speed_left -= rndm ();
579		639
580	dst->set_speed (dst->speed);	640	dst->set_speed (dst->speed);
581	}	641	}
582		642
583	void	643	void
584	object::instantiate ()	644	object::instantiate ()
585	{	645	{
586	if (!uuid.seq) // HACK	646	if (!uuid.seq) // HACK
587	uuid = gen_uuid ();	647	uuid = UUID::gen ();
588		648
589	speed_left = -0.1f;	649	speed_left = -0.1f;
590	/* copy the body_info to the body_used - this is only really	650	/* copy the body_info to the body_used - this is only really
591	* need for monsters, but doesn't hurt to do it for everything.	651	* need for monsters, but doesn't hurt to do it for everything.
592	* by doing so, when a monster is created, it has good starting	652	* by doing so, when a monster is created, it has good starting
…		…
602	object *	662	object *
603	object::clone ()	663	object::clone ()
604	{	664	{
605	object *neu = create ();	665	object *neu = create ();
606	copy_to (neu);	666	copy_to (neu);
		667	neu->map = map; // not copied by copy_to
607	return neu;	668	return neu;
608	}	669	}
609		670
610	/*	671	/*
611	* If an object with the IS_TURNABLE() flag needs to be turned due	672	* If an object with the IS_TURNABLE() flag needs to be turned due
…		…
662	* UP_OBJ_FACE: only the objects face has changed.	723	* UP_OBJ_FACE: only the objects face has changed.
663	*/	724	*/
664	void	725	void
665	update_object (object *op, int action)	726	update_object (object *op, int action)
666	{	727	{
667	if (op == NULL)	728	if (!op)
668	{	729	{
669	/* this should never happen */	730	/* this should never happen */
670	LOG (llevDebug, "update_object() called for NULL object.\n");	731	LOG (llevError | logBacktrace, "update_object() called for NULL object.\n");
671	return;	732	return;
672	}	733	}
673		734
674	if (op->env)	735	if (!op->is_on_map ())
675	{	736	{
676	/* Animation is currently handled by client, so nothing	737	/* Animation is currently handled by client, so nothing
677	* to do in this case.	738	* to do in this case.
678	*/	739	*/
679	return;	740	return;
680	}	741	}
681
682	/* If the map is saving, don't do anything as everything is
683	* going to get freed anyways.
684	*/
685	if (!op->map || op->map->in_memory == MAP_SAVING)
686	return;
687		742
688	/* make sure the object is within map boundaries */	743	/* make sure the object is within map boundaries */
689	if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height)	744	if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height)
690	{	745	{
691	LOG (llevError, "update_object() called for object out of map!\n");	746	LOG (llevError, "update_object() called for object out of map!\n");
…		…
751	static int object_count;	806	static int object_count;
752		807
753	void object::link ()	808	void object::link ()
754	{	809	{
755	assert (!index);//D	810	assert (!index);//D
756	uuid = gen_uuid ();	811	uuid = UUID::gen ();
757	count = ++object_count;	812	count = ++object_count;
758		813
759	refcnt_inc ();	814	refcnt_inc ();
760	objects.insert (this);	815	objects.insert (this);
761	}	816	}
…		…
834	object::destroy_inv (bool drop_to_ground)	889	object::destroy_inv (bool drop_to_ground)
835	{	890	{
836	// need to check first, because the checks below might segfault	891	// need to check first, because the checks below might segfault
837	// as we might be on an invalid mapspace and crossfire code	892	// as we might be on an invalid mapspace and crossfire code
838	// is too buggy to ensure that the inventory is empty.	893	// is too buggy to ensure that the inventory is empty.
839	// corollary: if you create arrows etc. with stuff in tis inventory,	894	// corollary: if you create arrows etc. with stuff in its inventory,
840	// cf will crash below with off-map x and y	895	// cf will crash below with off-map x and y
841	if (!inv)	896	if (!inv)
842	return;	897	return;
843		898
844	/* Only if the space blocks everything do we not process -	899	/* Only if the space blocks everything do we not process -
845	* if some form of movement is allowed, let objects	900	* if some form of movement is allowed, let objects
846	* drop on that space.	901	* drop on that space.
847	*/	902	*/
848	if (!drop_to_ground	903	if (!drop_to_ground
849	|| !map	904	|| !map
850	|| map->in_memory != MAP_IN_MEMORY	905	|| map->in_memory != MAP_ACTIVE
851	|| map->nodrop	906	|| map->nodrop
852	|| ms ().move_block == MOVE_ALL)	907	|| ms ().move_block == MOVE_ALL)
853	{	908	{
854	while (inv)	909	while (inv)
855	{	910	{
856	inv->destroy_inv (drop_to_ground);	911	inv->destroy_inv (false);
857	inv->destroy ();	912	inv->destroy ();
858	}	913	}
859	}	914	}
860	else	915	else
861	{ /* Put objects in inventory onto this space */	916	{ /* Put objects in inventory onto this space */
…		…
867	|| op->flag [FLAG_NO_DROP]	922	|| op->flag [FLAG_NO_DROP]
868	|| op->type == RUNE	923	|| op->type == RUNE
869	|| op->type == TRAP	924	|| op->type == TRAP
870	|| op->flag [FLAG_IS_A_TEMPLATE]	925	|| op->flag [FLAG_IS_A_TEMPLATE]
871	|| op->flag [FLAG_DESTROY_ON_DEATH])	926	|| op->flag [FLAG_DESTROY_ON_DEATH])
872	op->destroy ();	927	op->destroy (true);
873	else	928	else
874	map->insert (op, x, y);	929	map->insert (op, x, y);
875	}	930	}
876	}	931	}
877	}	932	}
…		…
881	object *op = new object;	936	object *op = new object;
882	op->link ();	937	op->link ();
883	return op;	938	return op;
884	}	939	}
885		940
		941	static struct freed_map : maptile
		942	{
		943	freed_map ()
		944	{
		945	path = "<freed objects map>";
		946	name = "/internal/freed_objects_map";
		947	width = 3;
		948	height = 3;
		949	nodrop = 1;
		950
		951	alloc ();
		952	in_memory = MAP_ACTIVE;
		953	}
		954
		955	~freed_map ()
		956	{
		957	destroy ();
		958	}
		959	} freed_map; // freed objects are moved here to avoid crashes
		960
886	void	961	void
887	object::do_destroy ()	962	object::do_destroy ()
888	{	963	{
889	attachable::do_destroy ();
890
891	if (flag [FLAG_IS_LINKED])	964	if (flag [FLAG_IS_LINKED])
892	remove_button_link (this);	965	remove_button_link (this);
893		966
894	if (flag [FLAG_FRIENDLY])	967	if (flag [FLAG_FRIENDLY])
895	remove_friendly_object (this);	968	remove_friendly_object (this);
896		969
897	if (!flag [FLAG_REMOVED])
898	remove ();	970	remove ();
899		971
900	destroy_inv (true);	972	attachable::do_destroy ();
901		973
902	deactivate ();	974	deactivate ();
903	unlink ();	975	unlink ();
904		976
905	flag [FLAG_FREED] = 1;	977	flag [FLAG_FREED] = 1;
906		978
907	// hack to ensure that freed objects still have a valid map	979	// hack to ensure that freed objects still have a valid map
908	{
909	static maptile *freed_map; // freed objects are moved here to avoid crashes
910
911	if (!freed_map)
912	{
913	freed_map = new maptile;
914
915	freed_map->name = "/internal/freed_objects_map";
916	freed_map->width = 3;
917	freed_map->height = 3;
918
919	freed_map->alloc ();
920	freed_map->in_memory = MAP_IN_MEMORY;
921	}
922
923	map = freed_map;	980	map = &freed_map;
924	x = 1;	981	x = 1;
925	y = 1;	982	y = 1;
926	}
927
928	head = 0;
929		983
930	if (more)	984	if (more)
931	{	985	{
932	more->destroy ();	986	more->destroy ();
933	more = 0;	987	more = 0;
934	}	988	}
935		989
		990	head = 0;
		991
936	// clear those pointers that likely might have circular references to us	992	// clear those pointers that likely might cause circular references
937	owner = 0;	993	owner = 0;
938	enemy = 0;	994	enemy = 0;
939	attacked_by = 0;	995	attacked_by = 0;
		996	current_weapon = 0;
940	}	997	}
941		998
942	void	999	void
943	object::destroy (bool destroy_inventory)	1000	object::destroy (bool destroy_inventory)
944	{	1001	{
945	if (destroyed ())	1002	if (destroyed ())
946	return;	1003	return;
947		1004
		1005	if (!is_head () && !head->destroyed ())
		1006	{
		1007	LOG (llevError | logBacktrace, "tried to destroy the tail of an object");
		1008	head->destroy (destroy_inventory);
		1009	return;
		1010	}
		1011
948	if (destroy_inventory)	1012	destroy_inv (!destroy_inventory);
949	destroy_inv (false);	1013
		1014	if (is_head ())
		1015	if (sound_destroy)
		1016	play_sound (sound_destroy);
		1017	else if (flag [FLAG_MONSTER])
		1018	play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism
950		1019
951	attachable::destroy ();	1020	attachable::destroy ();
952	}
953
954	/*
955	* sub_weight() recursively (outwards) subtracts a number from the
956	* weight of an object (and what is carried by it's environment(s)).
957	*/
958	void
959	sub_weight (object *op, signed long weight)
960	{
961	while (op != NULL)
962	{
963	if (op->type == CONTAINER)
964	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
965
966	op->carrying -= weight;
967	op = op->env;
968	}
969	}	1021	}
970		1022
971	/* op->remove ():	1023	/* op->remove ():
972	* This function removes the object op from the linked list of objects	1024	* This function removes the object op from the linked list of objects
973	* which it is currently tied to. When this function is done, the	1025	* which it is currently tied to. When this function is done, the
…		…
979	object::do_remove ()	1031	object::do_remove ()
980	{	1032	{
981	object *tmp, *last = 0;	1033	object *tmp, *last = 0;
982	object *otmp;	1034	object *otmp;
983		1035
984	if (QUERY_FLAG (this, FLAG_REMOVED))	1036	if (flag [FLAG_REMOVED])
985	return;	1037	return;
986		1038
987	SET_FLAG (this, FLAG_REMOVED);
988	INVOKE_OBJECT (REMOVE, this);	1039	INVOKE_OBJECT (REMOVE, this);
		1040
		1041	flag [FLAG_REMOVED] = true;
989		1042
990	if (more)	1043	if (more)
991	more->remove ();	1044	more->remove ();
992		1045
993	/*	1046	/*
994	* In this case, the object to be removed is in someones	1047	* In this case, the object to be removed is in someones
995	* inventory.	1048	* inventory.
996	*/	1049	*/
997	if (env)	1050	if (env)
998	{	1051	{
		1052	flag [FLAG_REMOVED] = false; // hack around the issue of visible_to checking flag_removed
		1053	if (object *pl = visible_to ())
		1054	esrv_del_item (pl->contr, count);
		1055	flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed
		1056
		1057	adjust_weight (env, -total_weight ());
		1058
		1059	*(above ? &above->below : &env->inv) = below;
		1060
999	if (nrof)	1061	if (below)
1000	sub_weight (env, weight * nrof);	1062	below->above = above;
1001	else	1063
1002	sub_weight (env, weight + carrying);	1064	/* we set up values so that it could be inserted into
		1065	* the map, but we don't actually do that - it is up
		1066	* to the caller to decide what we want to do.
		1067	*/
		1068	map = env->map;
		1069	x = env->x;
		1070	y = env->y;
		1071	above = 0;
		1072	below = 0;
		1073	env = 0;
1003		1074
1004	/* NO_FIX_PLAYER is set when a great many changes are being	1075	/* NO_FIX_PLAYER is set when a great many changes are being
1005	* made to players inventory. If set, avoiding the call	1076	* made to players inventory. If set, avoiding the call
1006	* to save cpu time.	1077	* to save cpu time.
1007	*/	1078	*/
1008	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1079	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1009	otmp->update_stats ();	1080	otmp->update_stats ();
1010
1011	if (above)
1012	above->below = below;
1013	else
1014	env->inv = below;
1015
1016	if (below)
1017	below->above = above;
1018
1019	/* we set up values so that it could be inserted into
1020	* the map, but we don't actually do that - it is up
1021	* to the caller to decide what we want to do.
1022	*/
1023	x = env->x, y = env->y;
1024	map = env->map;
1025	above = 0, below = 0;
1026	env = 0;
1027	}	1081	}
1028	else if (map)	1082	else if (map)
1029	{	1083	{
1030	if (type == PLAYER)
1031	{
1032	// leaving a spot always closes any open container on the ground
1033	if (container && !container->env)
1034	// this causes spurious floorbox updates, but it ensures
1035	// that the CLOSE event is being sent.
1036	close_container ();
1037
1038	--map->players;
1039	map->touch ();
1040	}
1041
1042	map->dirty = true;	1084	map->dirty = true;
1043	mapspace &ms = this->ms ();	1085	mapspace &ms = this->ms ();
		1086
		1087	if (object *pl = ms.player ())
		1088	{
		1089	if (type == PLAYER) // this == pl(!)
		1090	{
		1091	// leaving a spot always closes any open container on the ground
		1092	if (container && !container->env)
		1093	// this causes spurious floorbox updates, but it ensures
		1094	// that the CLOSE event is being sent.
		1095	close_container ();
		1096
		1097	--map->players;
		1098	map->touch ();
		1099	}
		1100	else if (pl->container == this)
		1101	{
		1102	// removing a container should close it
		1103	close_container ();
		1104	}
		1105
		1106	esrv_del_item (pl->contr, count);
		1107	}
1044		1108
1045	/* link the object above us */	1109	/* link the object above us */
1046	if (above)	1110	if (above)
1047	above->below = below;	1111	above->below = below;
1048	else	1112	else
…		…
1069	if (map->in_memory == MAP_SAVING)	1133	if (map->in_memory == MAP_SAVING)
1070	return;	1134	return;
1071		1135
1072	int check_walk_off = !flag [FLAG_NO_APPLY];	1136	int check_walk_off = !flag [FLAG_NO_APPLY];
1073		1137
		1138	if (object *pl = ms.player ())
		1139	{
		1140	if (pl->container == this)
		1141	/* If a container that the player is currently using somehow gets
		1142	* removed (most likely destroyed), update the player view
		1143	* appropriately.
		1144	*/
		1145	pl->close_container ();
		1146
		1147	//TODO: the floorbox prev/next might need updating
		1148	//esrv_del_item (pl->contr, count);
		1149	//TODO: update floorbox to preserve ordering
		1150	if (pl->contr->ns)
		1151	pl->contr->ns->floorbox_update ();
		1152	}
		1153
1074	for (tmp = ms.bot; tmp; tmp = tmp->above)	1154	for (tmp = ms.bot; tmp; tmp = tmp->above)
1075	{	1155	{
1076	/* No point updating the players look faces if he is the object	1156	/* No point updating the players look faces if he is the object
1077	* being removed.	1157	* being removed.
1078	*/	1158	*/
1079
1080	if (tmp->type == PLAYER && tmp != this)
1081	{
1082	/* If a container that the player is currently using somehow gets
1083	* removed (most likely destroyed), update the player view
1084	* appropriately.
1085	*/
1086	if (tmp->container == this)
1087	{
1088	flag [FLAG_APPLIED] = 0;
1089	tmp->container = 0;
1090	}
1091
1092	if (tmp->contr->ns)
1093	tmp->contr->ns->floorbox_update ();
1094	}
1095		1159
1096	/* See if object moving off should effect something */	1160	/* See if object moving off should effect something */
1097	if (check_walk_off	1161	if (check_walk_off
1098	&& ((move_type & tmp->move_off)	1162	&& ((move_type & tmp->move_off)
1099	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))	1163	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
…		…
1102		1166
1103	if (destroyed ())	1167	if (destroyed ())
1104	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());	1168	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1105	}	1169	}
1106		1170
1107	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1108	//TODO: why is this horrible hacka fix? get rid of this code=bug! (schmorp)
1109	if (tmp->above == tmp)
1110	tmp->above = 0;
1111
1112	last = tmp;	1171	last = tmp;
1113	}	1172	}
1114		1173
1115	/* last == NULL if there are no objects on this space */	1174	/* last == NULL if there are no objects on this space */
1116	//TODO: this makes little sense, why only update the topmost object?	1175	//TODO: this makes little sense, why only update the topmost object?
…		…
1136	merge_ob (object *op, object *top)	1195	merge_ob (object *op, object *top)
1137	{	1196	{
1138	if (!op->nrof)	1197	if (!op->nrof)
1139	return 0;	1198	return 0;
1140		1199
1141	if (top)	1200	if (!top)
1142	for (top = op; top && top->above; top = top->above)	1201	for (top = op; top && top->above; top = top->above)
1143	;	1202	;
1144		1203
1145	for (; top; top = top->below)	1204	for (; top; top = top->below)
1146	{
1147	if (top == op)
1148	continue;
1149
1150	if (object::can_merge (op, top))	1205	if (object::can_merge (op, top))
1151	{	1206	{
1152	top->nrof += op->nrof;	1207	top->nrof += op->nrof;
1153		1208
1154	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/	1209	if (object *pl = top->visible_to ())
1155	op->weight = 0; /* Don't want any adjustements now */	1210	esrv_update_item (UPD_NROF, pl, top);
		1211
		1212	op->weight = 0; // cancel the addition above
		1213	op->carrying = 0; // must be 0 already
		1214
1156	op->destroy ();	1215	op->destroy (1);
		1216
1157	return top;	1217	return top;
1158	}	1218	}
1159	}
1160		1219
1161	return 0;	1220	return 0;
1162	}	1221	}
1163		1222
1164	void	1223	void
…		…
1167	if (more)	1226	if (more)
1168	return;	1227	return;
1169		1228
1170	object *prev = this;	1229	object *prev = this;
1171		1230
1172	for (archetype *at = arch->more; at; at = at->more)	1231	for (archetype *at = (archetype *)arch->more; at; at = (archetype *)at->more)
1173	{	1232	{
1174	object *op = arch_to_object (at);	1233	object *op = arch_to_object (at);
1175		1234
1176	op->name = name;	1235	op->name = name;
1177	op->name_pl = name_pl;	1236	op->name_pl = name_pl;
…		…
1191	object *	1250	object *
1192	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)	1251	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1193	{	1252	{
1194	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)	1253	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1195	{	1254	{
1196	tmp->x = x + tmp->arch->clone.x;	1255	tmp->x = x + tmp->arch->x;
1197	tmp->y = y + tmp->arch->clone.y;	1256	tmp->y = y + tmp->arch->y;
1198	}	1257	}
1199		1258
1200	return insert_ob_in_map (op, m, originator, flag);	1259	return insert_ob_in_map (op, m, originator, flag);
1201	}	1260	}
1202		1261
…		…
1223	object *	1282	object *
1224	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)	1283	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1225	{	1284	{
1226	assert (!op->flag [FLAG_FREED]);	1285	assert (!op->flag [FLAG_FREED]);
1227		1286
1228	object *tmp, *top, *floor = NULL;
1229
1230	op->remove ();	1287	op->remove ();
1231
1232	#if 0
1233	if (!m->active != !op->active)
1234	if (m->active)
1235	op->activate_recursive ();
1236	else
1237	op->deactivate_recursive ();
1238	#endif
1239
1240	if (out_of_map (m, op->x, op->y))
1241	{
1242	LOG (llevError, "Trying to insert object outside the map.\n%s\n", op->debug_desc ());
1243	#ifdef MANY_CORES
1244	/* Better to catch this here, as otherwise the next use of this object
1245	* is likely to cause a crash. Better to find out where it is getting
1246	* improperly inserted.
1247	*/
1248	abort ();
1249	#endif
1250	return op;
1251	}
1252
1253	if (object *more = op->more)
1254	{
1255	if (!insert_ob_in_map (more, m, originator, flag))
1256	{
1257	if (!op->head)
1258	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1259
1260	return 0;
1261	}
1262	}
1263
1264	CLEAR_FLAG (op, FLAG_REMOVED);
1265		1288
1266	/* Ideally, the caller figures this out. However, it complicates a lot	1289	/* Ideally, the caller figures this out. However, it complicates a lot
1267	* of areas of callers (eg, anything that uses find_free_spot would now	1290	* of areas of callers (eg, anything that uses find_free_spot would now
1268	* need extra work	1291	* need extra work
1269	*/	1292	*/
1270	if (!xy_normalise (m, op->x, op->y))	1293	if (!xy_normalise (m, op->x, op->y))
		1294	{
		1295	op->head_ ()->destroy (1);// remove head_ once all tail object destroyers found
1271	return 0;	1296	return 0;
		1297	}
		1298
		1299	if (object *more = op->more)
		1300	if (!insert_ob_in_map (more, m, originator, flag))
		1301	return 0;
		1302
		1303	CLEAR_FLAG (op, FLAG_REMOVED);
1272		1304
1273	op->map = m;	1305	op->map = m;
1274	mapspace &ms = op->ms ();	1306	mapspace &ms = op->ms ();
1275		1307
1276	/* this has to be done after we translate the coordinates.	1308	/* this has to be done after we translate the coordinates.
1277	*/	1309	*/
1278	if (op->nrof && !(flag & INS_NO_MERGE))	1310	if (op->nrof && !(flag & INS_NO_MERGE))
1279	for (tmp = ms.bot; tmp; tmp = tmp->above)	1311	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1280	if (object::can_merge (op, tmp))	1312	if (object::can_merge (op, tmp))
1281	{	1313	{
		1314	// TODO: we atcually want to update tmp, not op,
		1315	// but some caller surely breaks when we return tmp
		1316	// from here :/
1282	op->nrof += tmp->nrof;	1317	op->nrof += tmp->nrof;
1283	tmp->destroy ();	1318	tmp->destroy (1);
1284	}	1319	}
1285		1320
1286	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1321	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1287	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1322	CLEAR_FLAG (op, FLAG_INV_LOCKED);
1288		1323
…		…
1308	/* since *below* originator, no need to update top */	1343	/* since *below* originator, no need to update top */
1309	originator->below = op;	1344	originator->below = op;
1310	}	1345	}
1311	else	1346	else
1312	{	1347	{
		1348	object *top, *floor = NULL;
		1349
1313	top = ms.bot;	1350	top = ms.bot;
1314		1351
1315	/* If there are other objects, then */	1352	/* If there are other objects, then */
1316	if ((!(flag & INS_MAP_LOAD)) && top)	1353	if (top)
1317	{	1354	{
1318	object *last = 0;	1355	object *last = 0;
1319		1356
1320	/*	1357	/*
1321	* If there are multiple objects on this space, we do some trickier handling.	1358	* If there are multiple objects on this space, we do some trickier handling.
…		…
1374	if (last && last->below && last != floor)	1411	if (last && last->below && last != floor)
1375	top = last->below;	1412	top = last->below;
1376	}	1413	}
1377	} /* If objects on this space */	1414	} /* If objects on this space */
1378		1415
1379	if (flag & INS_MAP_LOAD)
1380	top = ms.top;
1381
1382	if (flag & INS_ABOVE_FLOOR_ONLY)	1416	if (flag & INS_ABOVE_FLOOR_ONLY)
1383	top = floor;	1417	top = floor;
1384		1418
1385	/* Top is the object that our object (op) is going to get inserted above.	1419	/* Top is the object that our object (op) is going to get inserted above.
1386	*/	1420	*/
…		…
1418	op->map->touch ();	1452	op->map->touch ();
1419	}	1453	}
1420		1454
1421	op->map->dirty = true;	1455	op->map->dirty = true;
1422		1456
1423	/* If we have a floor, we know the player, if any, will be above
1424	* it, so save a few ticks and start from there.
1425	*/
1426	if (!(flag & INS_MAP_LOAD))
1427	if (object *pl = ms.player ())	1457	if (object *pl = ms.player ())
		1458	//TODO: the floorbox prev/next might need updating
		1459	//esrv_send_item (pl, op);
		1460	//TODO: update floorbox to preserve ordering
1428	if (pl->contr->ns)	1461	if (pl->contr->ns)
1429	pl->contr->ns->floorbox_update ();	1462	pl->contr->ns->floorbox_update ();
1430		1463
1431	/* If this object glows, it may affect lighting conditions that are	1464	/* If this object glows, it may affect lighting conditions that are
1432	* visible to others on this map. But update_all_los is really	1465	* visible to others on this map. But update_all_los is really
1433	* an inefficient way to do this, as it means los for all players	1466	* an inefficient way to do this, as it means los for all players
1434	* on the map will get recalculated. The players could very well	1467	* on the map will get recalculated. The players could very well
…		…
1453	* blocked() and wall() work properly), and these flags are updated by	1486	* blocked() and wall() work properly), and these flags are updated by
1454	* update_object().	1487	* update_object().
1455	*/	1488	*/
1456		1489
1457	/* if this is not the head or flag has been passed, don't check walk on status */	1490	/* if this is not the head or flag has been passed, don't check walk on status */
1458	if (!(flag & INS_NO_WALK_ON) && !op->head)	1491	if (!(flag & INS_NO_WALK_ON) && op->head_ () == op)
1459	{	1492	{
1460	if (check_move_on (op, originator))	1493	if (check_move_on (op, originator))
1461	return 0;	1494	return 0;
1462		1495
1463	/* If we are a multi part object, lets work our way through the check	1496	/* If we are a multi part object, lets work our way through the check
1464	* walk on's.	1497	* walk on's.
1465	*/	1498	*/
1466	for (tmp = op->more; tmp != NULL; tmp = tmp->more)	1499	for (object *tmp = op->more; tmp; tmp = tmp->more)
1467	if (check_move_on (tmp, originator))	1500	if (check_move_on (tmp, originator))
1468	return 0;	1501	return 0;
1469	}	1502	}
1470		1503
1471	return op;	1504	return op;
…		…
1476	* op is the object to insert it under: supplies x and the map.	1509	* op is the object to insert it under: supplies x and the map.
1477	*/	1510	*/
1478	void	1511	void
1479	replace_insert_ob_in_map (const char *arch_string, object *op)	1512	replace_insert_ob_in_map (const char *arch_string, object *op)
1480	{	1513	{
1481	object *tmp, *tmp1;
1482
1483	/* first search for itself and remove any old instances */	1514	/* first search for itself and remove any old instances */
1484		1515
1485	for (tmp = op->ms ().bot; tmp; tmp = tmp->above)	1516	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1486	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */	1517	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */
1487	tmp->destroy ();	1518	tmp->destroy (1);
1488		1519
1489	tmp1 = arch_to_object (archetype::find (arch_string));	1520	object *tmp = arch_to_object (archetype::find (arch_string));
1490		1521
1491	tmp1->x = op->x;	1522	tmp->x = op->x;
1492	tmp1->y = op->y;	1523	tmp->y = op->y;
		1524
1493	insert_ob_in_map (tmp1, op->map, op, 0);	1525	insert_ob_in_map (tmp, op->map, op, 0);
1494	}	1526	}
1495		1527
1496	object *	1528	object *
1497	object::insert_at (object *where, object *originator, int flags)	1529	object::insert_at (object *where, object *originator, int flags)
1498	{	1530	{
		1531	if (where->env)
		1532	return where->env->insert (this);
		1533	else
1499	return where->map->insert (this, where->x, where->y, originator, flags);	1534	return where->map->insert (this, where->x, where->y, originator, flags);
1500	}	1535	}
1501		1536
1502	/*	1537	/*
1503	* get_split_ob(ob,nr) splits up ob into two parts. The part which
1504	* is returned contains nr objects, and the remaining parts contains
1505	* the rest (or is removed and freed if that number is 0).
1506	* On failure, NULL is returned, and the reason put into the
1507	* global static errmsg array.
1508	*/
1509	object *
1510	get_split_ob (object *orig_ob, uint32 nr)
1511	{
1512	object *newob;
1513	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1514
1515	if (orig_ob->nrof < nr)
1516	{
1517	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1518	return NULL;
1519	}
1520
1521	newob = object_create_clone (orig_ob);
1522
1523	if ((orig_ob->nrof -= nr) < 1)
1524	orig_ob->destroy (1);
1525	else if (!is_removed)
1526	{
1527	if (orig_ob->env != NULL)
1528	sub_weight (orig_ob->env, orig_ob->weight * nr);
1529	if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)
1530	{
1531	strcpy (errmsg, "Tried to split object whose map is not in memory.");
1532	LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n");
1533	return NULL;
1534	}
1535	}
1536
1537	newob->nrof = nr;
1538
1539	return newob;
1540	}
1541
1542	/*
1543	* decrease_ob_nr(object, number) decreases a specified number from	1538	* decrease(object, number) decreases a specified number from
1544	* the amount of an object. If the amount reaches 0, the object	1539	* the amount of an object. If the amount reaches 0, the object
1545	* is subsequently removed and freed.	1540	* is subsequently removed and freed.
1546	*	1541	*
1547	* Return value: 'op' if something is left, NULL if the amount reached 0	1542	* Return value: 'op' if something is left, NULL if the amount reached 0
1548	*/	1543	*/
		1544	bool
		1545	object::decrease (sint32 nr)
		1546	{
		1547	if (!nr)
		1548	return true;
		1549
		1550	nr = min (nr, nrof);
		1551
		1552	nrof -= nr;
		1553
		1554	if (nrof)
		1555	{
		1556	adjust_weight (env, -weight * nr); // carrying == 0
		1557
		1558	if (object *pl = visible_to ())
		1559	esrv_update_item (UPD_NROF, pl, this);
		1560
		1561	return true;
		1562	}
		1563	else
		1564	{
		1565	destroy (1);
		1566	return false;
		1567	}
		1568	}
		1569
		1570	/*
		1571	* split(ob,nr) splits up ob into two parts. The part which
		1572	* is returned contains nr objects, and the remaining parts contains
		1573	* the rest (or is removed and returned if that number is 0).
		1574	* On failure, NULL is returned.
		1575	*/
1549	object *	1576	object *
1550	decrease_ob_nr (object *op, uint32 i)	1577	object::split (sint32 nr)
1551	{	1578	{
1552	object *tmp;	1579	int have = number_of ();
1553		1580
1554	if (i == 0) /* objects with op->nrof require this check */	1581	if (have < nr)
1555	return op;	1582	return 0;
1556		1583	else if (have == nr)
1557	if (i > op->nrof)
1558	i = op->nrof;
1559
1560	if (QUERY_FLAG (op, FLAG_REMOVED))
1561	op->nrof -= i;
1562	else if (op->env)
1563	{	1584	{
1564	/* is this object in the players inventory, or sub container
1565	* therein?
1566	*/
1567	tmp = op->in_player ();
1568	/* nope. Is this a container the player has opened?
1569	* If so, set tmp to that player.
1570	* IMO, searching through all the players will mostly
1571	* likely be quicker than following op->env to the map,
1572	* and then searching the map for a player.
1573	*/
1574	if (!tmp)
1575	for_all_players (pl)
1576	if (pl->ob->container == op->env)
1577	{
1578	tmp = pl->ob;
1579	break;
1580	}
1581
1582	if (i < op->nrof)
1583	{
1584	sub_weight (op->env, op->weight * i);
1585	op->nrof -= i;
1586	if (tmp)
1587	esrv_send_item (tmp, op);
1588	}
1589	else
1590	{
1591	op->remove ();	1585	remove ();
1592	op->nrof = 0;	1586	return this;
1593	if (tmp)
1594	esrv_del_item (tmp->contr, op->count);
1595	}
1596	}	1587	}
1597	else	1588	else
1598	{	1589	{
1599	object *above = op->above;	1590	decrease (nr);
1600		1591
1601	if (i < op->nrof)	1592	object *op = deep_clone ();
1602	op->nrof -= i;	1593	op->nrof = nr;
1603	else
1604	{
1605	op->remove ();
1606	op->nrof = 0;
1607	}
1608
1609	/* Since we just removed op, op->above is null */
1610	for (tmp = above; tmp; tmp = tmp->above)
1611	if (tmp->type == PLAYER)
1612	{
1613	if (op->nrof)
1614	esrv_send_item (tmp, op);
1615	else
1616	esrv_del_item (tmp->contr, op->count);
1617	}
1618	}
1619
1620	if (op->nrof)
1621	return op;	1594	return op;
1622	else
1623	{
1624	op->destroy ();
1625	return 0;
1626	}
1627	}
1628
1629	/*
1630	* add_weight(object, weight) adds the specified weight to an object,
1631	* and also updates how much the environment(s) is/are carrying.
1632	*/
1633	void
1634	add_weight (object *op, signed long weight)
1635	{
1636	while (op != NULL)
1637	{
1638	if (op->type == CONTAINER)
1639	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1640
1641	op->carrying += weight;
1642	op = op->env;
1643	}	1595	}
1644	}	1596	}
1645		1597
1646	object *	1598	object *
1647	insert_ob_in_ob (object *op, object *where)	1599	insert_ob_in_ob (object *op, object *where)
…		…
1652	LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);	1604	LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
1653	free (dump);	1605	free (dump);
1654	return op;	1606	return op;
1655	}	1607	}
1656		1608
1657	if (where->head)	1609	if (where->head_ () != where)
1658	{	1610	{
1659	LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n");	1611	LOG (llevError | logBacktrace, "Warning: Tried to insert object into wrong part of multipart object.\n");
1660	where = where->head;	1612	where = where->head;
1661	}	1613	}
1662		1614
1663	return where->insert (op);	1615	return where->insert (op);
1664	}	1616	}
…		…
1672	* be != op, if items are merged. -Tero	1624	* be != op, if items are merged. -Tero
1673	*/	1625	*/
1674	object *	1626	object *
1675	object::insert (object *op)	1627	object::insert (object *op)
1676	{	1628	{
1677	object *tmp, *otmp;
1678
1679	if (!QUERY_FLAG (op, FLAG_REMOVED))
1680	op->remove ();
1681
1682	if (op->more)	1629	if (op->more)
1683	{	1630	{
1684	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);	1631	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1685	return op;	1632	return op;
1686	}	1633	}
1687		1634
1688	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1635	op->remove ();
1689	CLEAR_FLAG (op, FLAG_REMOVED);	1636
		1637	op->flag [FLAG_OBJ_ORIGINAL] = 0;
		1638
1690	if (op->nrof)	1639	if (op->nrof)
1691	{
1692	for (tmp = inv; tmp != NULL; tmp = tmp->below)	1640	for (object *tmp = inv; tmp; tmp = tmp->below)
1693	if (object::can_merge (tmp, op))	1641	if (object::can_merge (tmp, op))
1694	{	1642	{
1695	/* return the original object and remove inserted object	1643	/* return the original object and remove inserted object
1696	(client needs the original object) */	1644	(client needs the original object) */
1697	tmp->nrof += op->nrof;	1645	tmp->nrof += op->nrof;
1698	/* Weight handling gets pretty funky. Since we are adding to	1646
1699	* tmp->nrof, we need to increase the weight.	1647	if (object *pl = tmp->visible_to ())
1700	*/	1648	esrv_update_item (UPD_NROF, pl, tmp);
		1649
1701	add_weight (this, op->weight * op->nrof);	1650	adjust_weight (this, op->total_weight ());
1702	SET_FLAG (op, FLAG_REMOVED);	1651
1703	op->destroy (); /* free the inserted object */	1652	op->destroy (1);
1704	op = tmp;	1653	op = tmp;
1705	op->remove (); /* and fix old object's links */	1654	goto inserted;
1706	CLEAR_FLAG (op, FLAG_REMOVED);
1707	break;
1708	}	1655	}
1709		1656
1710	/* I assume combined objects have no inventory	1657	op->owner = 0; // it's his/hers now. period.
1711	* We add the weight - this object could have just been removed
1712	* (if it was possible to merge). calling remove_ob will subtract
1713	* the weight, so we need to add it in again, since we actually do
1714	* the linking below
1715	*/
1716	add_weight (this, op->weight * op->nrof);
1717	}
1718	else
1719	add_weight (this, (op->weight + op->carrying));
1720
1721	otmp = this->in_player ();
1722	if (otmp && otmp->contr)
1723	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1724	otmp->update_stats ();
1725
1726	op->map = 0;	1658	op->map = 0;
1727	op->env = this;	1659	op->x = 0;
		1660	op->y = 0;
		1661
1728	op->above = 0;	1662	op->above = 0;
1729	op->below = 0;	1663	op->below = inv;
1730	op->x = 0, op->y = 0;	1664	op->env = this;
1731		1665
		1666	if (inv)
		1667	inv->above = op;
		1668
		1669	inv = op;
		1670
		1671	op->flag [FLAG_REMOVED] = 0;
		1672
		1673	if (object *pl = op->visible_to ())
		1674	esrv_send_item (pl, op);
		1675
		1676	adjust_weight (this, op->total_weight ());
		1677
		1678	inserted:
1732	/* reset the light list and los of the players on the map */	1679	/* reset the light list and los of the players on the map */
1733	if ((op->glow_radius != 0) && map)	1680	if (op->glow_radius && map && map->darkness)
1734	{
1735	#ifdef DEBUG_LIGHTS
1736	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1737	#endif /* DEBUG_LIGHTS */
1738	if (map->darkness)
1739	update_all_los (map, x, y);	1681	update_all_los (map, x, y);
1740	}
1741		1682
1742	/* Client has no idea of ordering so lets not bother ordering it here.	1683	// if this is a player's inventory, update stats
1743	* It sure simplifies this function...	1684	if (type == PLAYER && !flag [FLAG_NO_FIX_PLAYER])
1744	*/	1685	update_stats ();
1745	if (!inv)
1746	inv = op;
1747	else
1748	{
1749	op->below = inv;
1750	op->below->above = op;
1751	inv = op;
1752	}
1753		1686
1754	INVOKE_OBJECT (INSERT, this);	1687	INVOKE_OBJECT (INSERT, this);
1755		1688
1756	return op;	1689	return op;
1757	}	1690	}
…		…
1885	LOG (llevError, "Present_arch called outside map.\n");	1818	LOG (llevError, "Present_arch called outside map.\n");
1886	return NULL;	1819	return NULL;
1887	}	1820	}
1888		1821
1889	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)	1822	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1890	if (tmp->arch == at)	1823	if (tmp->arch->archname == at->archname)
1891	return tmp;	1824	return tmp;
1892		1825
1893	return NULL;	1826	return NULL;
1894	}	1827	}
1895		1828
…		…
1959	* The first matching object is returned, or NULL if none.	1892	* The first matching object is returned, or NULL if none.
1960	*/	1893	*/
1961	object *	1894	object *
1962	present_arch_in_ob (const archetype *at, const object *op)	1895	present_arch_in_ob (const archetype *at, const object *op)
1963	{	1896	{
1964	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)	1897	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1965	if (tmp->arch == at)	1898	if (tmp->arch->archname == at->archname)
1966	return tmp;	1899	return tmp;
1967		1900
1968	return NULL;	1901	return NULL;
1969	}	1902	}
1970		1903
…		…
1972	* activate recursively a flag on an object inventory	1905	* activate recursively a flag on an object inventory
1973	*/	1906	*/
1974	void	1907	void
1975	flag_inv (object *op, int flag)	1908	flag_inv (object *op, int flag)
1976	{	1909	{
1977	if (op->inv)
1978	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)	1910	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1979	{	1911	{
1980	SET_FLAG (tmp, flag);	1912	SET_FLAG (tmp, flag);
1981	flag_inv (tmp, flag);	1913	flag_inv (tmp, flag);
1982	}	1914	}
1983	}	1915	}
1984		1916
1985	/*	1917	/*
1986	* deactivate recursively a flag on an object inventory	1918	* deactivate recursively a flag on an object inventory
1987	*/	1919	*/
1988	void	1920	void
1989	unflag_inv (object *op, int flag)	1921	unflag_inv (object *op, int flag)
1990	{	1922	{
1991	if (op->inv)
1992	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)	1923	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1993	{	1924	{
1994	CLEAR_FLAG (tmp, flag);	1925	CLEAR_FLAG (tmp, flag);
1995	unflag_inv (tmp, flag);	1926	unflag_inv (tmp, flag);
1996	}	1927	}
1997	}
1998
1999	/*
2000	* set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in
2001	* all it's inventory (recursively).
2002	* If checksums are used, a player will get set_cheat called for
2003	* him/her-self and all object carried by a call to this function.
2004	*/
2005	void
2006	set_cheat (object *op)
2007	{
2008	SET_FLAG (op, FLAG_WAS_WIZ);
2009	flag_inv (op, FLAG_WAS_WIZ);
2010	}	1928	}
2011		1929
2012	/*	1930	/*
2013	* find_free_spot(object, map, x, y, start, stop) will search for	1931	* find_free_spot(object, map, x, y, start, stop) will search for
2014	* a spot at the given map and coordinates which will be able to contain	1932	* a spot at the given map and coordinates which will be able to contain
…		…
2016	* to search (see the freearr_x/y[] definition).	1934	* to search (see the freearr_x/y[] definition).
2017	* It returns a random choice among the alternatives found.	1935	* It returns a random choice among the alternatives found.
2018	* start and stop are where to start relative to the free_arr array (1,9	1936	* start and stop are where to start relative to the free_arr array (1,9
2019	* does all 4 immediate directions). This returns the index into the	1937	* does all 4 immediate directions). This returns the index into the
2020	* array of the free spot, -1 if no spot available (dir 0 = x,y)	1938	* array of the free spot, -1 if no spot available (dir 0 = x,y)
2021	* Note - this only checks to see if there is space for the head of the
2022	* object - if it is a multispace object, this should be called for all
2023	* pieces.
2024	* Note2: This function does correctly handle tiled maps, but does not	1939	* Note: This function does correctly handle tiled maps, but does not
2025	* inform the caller. However, insert_ob_in_map will update as	1940	* inform the caller. However, insert_ob_in_map will update as
2026	* necessary, so the caller shouldn't need to do any special work.	1941	* necessary, so the caller shouldn't need to do any special work.
2027	* Note - updated to take an object instead of archetype - this is necessary	1942	* Note - updated to take an object instead of archetype - this is necessary
2028	* because arch_blocked (now ob_blocked) needs to know the movement type	1943	* because arch_blocked (now ob_blocked) needs to know the movement type
2029	* to know if the space in question will block the object. We can't use	1944	* to know if the space in question will block the object. We can't use
…		…
2031	* customized, changed states, etc.	1946	* customized, changed states, etc.
2032	*/	1947	*/
2033	int	1948	int
2034	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)	1949	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2035	{	1950	{
		1951	int altern[SIZEOFFREE];
2036	int index = 0, flag;	1952	int index = 0, flag;
2037	int altern[SIZEOFFREE];
2038		1953
2039	for (int i = start; i < stop; i++)	1954	for (int i = start; i < stop; i++)
2040	{	1955	{
2041	flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]);	1956	mapxy pos (m, x, y); pos.move (i);
2042	if (!flag)	1957
		1958	if (!pos.normalise ())
		1959	continue;
		1960
		1961	mapspace &ms = *pos;
		1962
		1963	if (ms.flags () & P_IS_ALIVE)
		1964	continue;
		1965
		1966	/* However, often
		1967	* ob doesn't have any move type (when used to place exits)
		1968	* so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.
		1969	*/
		1970	if (ob && ob->move_type == 0 && ms.move_block != MOVE_ALL)
		1971	{
2043	altern [index++] = i;	1972	altern [index++] = i;
		1973	continue;
		1974	}
2044		1975
2045	/* Basically, if we find a wall on a space, we cut down the search size.	1976	/* Basically, if we find a wall on a space, we cut down the search size.
2046	* In this way, we won't return spaces that are on another side of a wall.	1977	* In this way, we won't return spaces that are on another side of a wall.
2047	* This mostly work, but it cuts down the search size in all directions -	1978	* This mostly work, but it cuts down the search size in all directions -
2048	* if the space being examined only has a wall to the north and empty	1979	* if the space being examined only has a wall to the north and empty
2049	* spaces in all the other directions, this will reduce the search space	1980	* spaces in all the other directions, this will reduce the search space
2050	* to only the spaces immediately surrounding the target area, and	1981	* to only the spaces immediately surrounding the target area, and
2051	* won't look 2 spaces south of the target space.	1982	* won't look 2 spaces south of the target space.
2052	*/	1983	*/
2053	else if ((flag & P_NO_PASS) && maxfree[i] < stop)	1984	if (ms.move_block == MOVE_ALL && maxfree[i] < stop)
		1985	{
2054	stop = maxfree[i];	1986	stop = maxfree[i];
		1987	continue;
		1988	}
		1989
		1990	/* Note it is intentional that we check ob - the movement type of the
		1991	* head of the object should correspond for the entire object.
		1992	*/
		1993	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
		1994	continue;
		1995
		1996	if (ob->blocked (m, pos.x, pos.y))
		1997	continue;
		1998
		1999	altern [index++] = i;
2055	}	2000	}
2056		2001
2057	if (!index)	2002	if (!index)
2058	return -1;	2003	return -1;
2059		2004
…		…
2068	*/	2013	*/
2069	int	2014	int
2070	find_first_free_spot (const object *ob, maptile *m, int x, int y)	2015	find_first_free_spot (const object *ob, maptile *m, int x, int y)
2071	{	2016	{
2072	for (int i = 0; i < SIZEOFFREE; i++)	2017	for (int i = 0; i < SIZEOFFREE; i++)
2073	if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]))	2018	if (!ob->blocked (m, x + freearr_x[i], y + freearr_y[i]))
2074	return i;	2019	return i;
2075		2020
2076	return -1;	2021	return -1;
2077	}	2022	}
2078		2023
…		…
2132	object *tmp;	2077	object *tmp;
2133	maptile *mp;	2078	maptile *mp;
2134		2079
2135	MoveType blocked, move_type;	2080	MoveType blocked, move_type;
2136		2081
2137	if (exclude && exclude->head)	2082	if (exclude && exclude->head_ () != exclude)
2138	{	2083	{
2139	exclude = exclude->head;	2084	exclude = exclude->head;
2140	move_type = exclude->move_type;	2085	move_type = exclude->move_type;
2141	}	2086	}
2142	else	2087	else
…		…
2165	max = maxfree[i];	2110	max = maxfree[i];
2166	else if (mflags & P_IS_ALIVE)	2111	else if (mflags & P_IS_ALIVE)
2167	{	2112	{
2168	for (tmp = ms.bot; tmp; tmp = tmp->above)	2113	for (tmp = ms.bot; tmp; tmp = tmp->above)
2169	if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)	2114	if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)
2170	&& (tmp != exclude || (tmp->head && tmp->head != exclude)))	2115	&& (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2171	break;	2116	break;
2172		2117
2173	if (tmp)	2118	if (tmp)
2174	return freedir[i];	2119	return freedir[i];
2175	}	2120	}
…		…
2355	* Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause	2300	* Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause
2356	* core dumps if they do.	2301	* core dumps if they do.
2357	*	2302	*
2358	* Add a check so we can't pick up invisible objects (0.93.8)	2303	* Add a check so we can't pick up invisible objects (0.93.8)
2359	*/	2304	*/
2360
2361	int	2305	int
2362	can_pick (const object *who, const object *item)	2306	can_pick (const object *who, const object *item)
2363	{	2307	{
2364	return /*QUERY_FLAG(who,FLAG_WIZ)|| */	2308	return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2365	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&	2309	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
…		…
2368		2312
2369	/*	2313	/*
2370	* create clone from object to another	2314	* create clone from object to another
2371	*/	2315	*/
2372	object *	2316	object *
2373	object_create_clone (object *asrc)	2317	object::deep_clone ()
2374	{	2318	{
2375	object *dst = 0, *tmp, *src, *part, *prev, *item;	2319	assert (("deep_clone called on non-head object", is_head ()));
2376		2320
2377	if (!asrc)	2321	object *dst = clone ();
2378	return 0;
2379		2322
2380	src = asrc;	2323	object *prev = dst;
2381	if (src->head)
2382	src = src->head;
2383
2384	prev = 0;
2385	for (part = src; part; part = part->more)	2324	for (object *part = this->more; part; part = part->more)
2386	{	2325	{
2387	tmp = part->clone ();	2326	object *tmp = part->clone ();
2388	tmp->x -= src->x;
2389	tmp->y -= src->y;
2390
2391	if (!part->head)
2392	{
2393	dst = tmp;
2394	tmp->head = 0;
2395	}
2396	else
2397	tmp->head = dst;	2327	tmp->head = dst;
2398
2399	tmp->more = 0;
2400
2401	if (prev)
2402	prev->more = tmp;	2328	prev->more = tmp;
2403
2404	prev = tmp;	2329	prev = tmp;
2405	}	2330	}
2406		2331
2407	for (item = src->inv; item; item = item->below)	2332	for (object *item = inv; item; item = item->below)
2408	insert_ob_in_ob (object_create_clone (item), dst);	2333	insert_ob_in_ob (item->deep_clone (), dst);
2409		2334
2410	return dst;	2335	return dst;
2411	}	2336	}
2412		2337
2413	/* This returns the first object in who's inventory that	2338	/* This returns the first object in who's inventory that
…		…
2422	return tmp;	2347	return tmp;
2423		2348
2424	return 0;	2349	return 0;
2425	}	2350	}
2426		2351
2427	/* If ob has a field named key, return the link from the list,	2352	const shstr &
2428	* otherwise return NULL.	2353	object::kv_get (const shstr &key) const
2429	*
2430	* key must be a passed in shared string - otherwise, this won't
2431	* do the desired thing.
2432	*/
2433	key_value *
2434	get_ob_key_link (const object *ob, const char *key)
2435	{	2354	{
2436	for (key_value *link = ob->key_values; link; link = link->next)	2355	for (key_value *kv = key_values; kv; kv = kv->next)
2437	if (link->key == key)	2356	if (kv->key == key)
2438	return link;
2439
2440	return 0;
2441	}
2442
2443	/*
2444	* Returns the value of op has an extra_field for key, or NULL.
2445	*
2446	* The argument doesn't need to be a shared string.
2447	*
2448	* The returned string is shared.
2449	*/
2450	const char *
2451	get_ob_key_value (const object *op, const char *const key)
2452	{
2453	key_value *link;
2454	shstr_cmp canonical_key (key);
2455
2456	if (!canonical_key)
2457	{
2458	/* 1. There being a field named key on any object
2459	* implies there'd be a shared string to find.
2460	* 2. Since there isn't, no object has this field.
2461	* 3. Therefore, *this* object doesn't have this field.
2462	*/
2463	return 0;
2464	}
2465
2466	/* This is copied from get_ob_key_link() above -
2467	* only 4 lines, and saves the function call overhead.
2468	*/
2469	for (link = op->key_values; link; link = link->next)
2470	if (link->key == canonical_key)
2471	return link->value;	2357	return kv->value;
2472		2358
2473	return 0;	2359	return shstr_null;
2474	}	2360	}
2475		2361
2476	/*	2362	void
2477	* Updates the canonical_key in op to value.	2363	object::kv_set (const shstr &key, const shstr &value)
2478	*
2479	* canonical_key is a shared string (value doesn't have to be).
2480	*
2481	* Unless add_key is TRUE, it won't add fields, only change the value of existing
2482	* keys.
2483	*
2484	* Returns TRUE on success.
2485	*/
2486	int
2487	set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key)
2488	{	2364	{
2489	key_value *field = NULL, *last = NULL;	2365	for (key_value *kv = key_values; kv; kv = kv->next)
2490		2366	if (kv->key == key)
2491	for (field = op->key_values; field != NULL; field = field->next)
2492	{
2493	if (field->key != canonical_key)
2494	{	2367	{
2495	last = field;	2368	kv->value = value;
2496	continue;	2369	return;
2497	}	2370	}
2498		2371
2499	if (value)	2372	key_value *kv = new key_value;
2500	field->value = value;	2373
2501	else	2374	kv->next = key_values;
		2375	kv->key = key;
		2376	kv->value = value;
		2377
		2378	key_values = kv;
		2379	}
		2380
		2381	void
		2382	object::kv_del (const shstr &key)
		2383	{
		2384	for (key_value **kvp = &key_values; *kvp; kvp = &(*kvp)->next)
		2385	if ((*kvp)->key == key)
2502	{	2386	{
2503	/* Basically, if the archetype has this key set,	2387	key_value *kv = *kvp;
2504	* we need to store the null value so when we save	2388	*kvp = (*kvp)->next;
2505	* it, we save the empty value so that when we load,	2389	delete kv;
2506	* we get this value back again.	2390	return;
2507	*/
2508	if (get_ob_key_link (&op->arch->clone, canonical_key))
2509	field->value = 0;
2510	else
2511	{
2512	if (last)
2513	last->next = field->next;
2514	else
2515	op->key_values = field->next;
2516
2517	delete field;
2518	}
2519	}	2391	}
2520	return TRUE;
2521	}
2522	/* IF we get here, key doesn't exist */
2523
2524	/* No field, we'll have to add it. */
2525
2526	if (!add_key)
2527	return FALSE;
2528
2529	/* There isn't any good reason to store a null
2530	* value in the key/value list. If the archetype has
2531	* this key, then we should also have it, so shouldn't
2532	* be here. If user wants to store empty strings,
2533	* should pass in ""
2534	*/
2535	if (value == NULL)
2536	return TRUE;
2537
2538	field = new key_value;
2539
2540	field->key = canonical_key;
2541	field->value = value;
2542	/* Usual prepend-addition. */
2543	field->next = op->key_values;
2544	op->key_values = field;
2545
2546	return TRUE;
2547	}
2548
2549	/*
2550	* Updates the key in op to value.
2551	*
2552	* If add_key is FALSE, this will only update existing keys,
2553	* and not add new ones.
2554	* In general, should be little reason FALSE is ever passed in for add_key
2555	*
2556	* Returns TRUE on success.
2557	*/
2558	int
2559	set_ob_key_value (object *op, const char *key, const char *value, int add_key)
2560	{
2561	shstr key_ (key);
2562
2563	return set_ob_key_value_s (op, key_, value, add_key);
2564	}	2392	}
2565		2393
2566	object::depth_iterator::depth_iterator (object *container)	2394	object::depth_iterator::depth_iterator (object *container)
2567	: iterator_base (container)	2395	: iterator_base (container)
2568	{	2396	{
…		…
2581	item = item->inv;	2409	item = item->inv;
2582	}	2410	}
2583	else	2411	else
2584	item = item->env;	2412	item = item->env;
2585	}	2413	}
2586
2587		2414
2588	const char *	2415	const char *
2589	object::flag_desc (char *desc, int len) const	2416	object::flag_desc (char *desc, int len) const
2590	{	2417	{
2591	char *p = desc;	2418	char *p = desc;
…		…
2619	{	2446	{
2620	char flagdesc[512];	2447	char flagdesc[512];
2621	char info2[256 * 4];	2448	char info2[256 * 4];
2622	char *p = info;	2449	char *p = info;
2623		2450
2624	p += snprintf (p, 512, "{cnt:%d,uuid:<1.%" PRIx64 ">,name:\"%s\"%s%s,flags:[%s],type:%d}",	2451	p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s,flags:[%s],type:%d}",
2625	count, uuid.seq,	2452	count,
		2453	uuid.c_str (),
2626	&name,	2454	&name,
2627	title ? "\",title:\"" : "",	2455	title ? "\",title:\"" : "",
2628	title ? (const char *)title : "",	2456	title ? (const char *)title : "",
2629	flag_desc (flagdesc, 512), type);	2457	flag_desc (flagdesc, 512), type);
2630		2458
2631	if (env)	2459	if (!flag[FLAG_REMOVED] && env)
2632	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2460	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2633		2461
2634	if (map)	2462	if (map)
2635	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);	2463	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2636		2464
…		…
2654	}	2482	}
2655		2483
2656	const materialtype_t *	2484	const materialtype_t *
2657	object::dominant_material () const	2485	object::dominant_material () const
2658	{	2486	{
2659	if (materialtype_t *mat = name_to_material (materialname))	2487	if (materialtype_t *mt = name_to_material (materialname))
2660	return mat;	2488	return mt;
2661		2489
2662	// omfg this is slow, this has to be temporary :)
2663	shstr unknown ("unknown");
2664
2665	return name_to_material (unknown);	2490	return name_to_material (shstr_unknown);
2666	}	2491	}
2667		2492
2668	void	2493	void
2669	object::open_container (object *new_container)	2494	object::open_container (object *new_container)
2670	{	2495	{
2671	if (container == new_container)	2496	if (container == new_container)
2672	return;	2497	return;
2673		2498
2674	if (object *old_container = container)	2499	object *old_container = container;
		2500
		2501	if (old_container)
2675	{	2502	{
2676	if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))	2503	if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
2677	return;	2504	return;
2678		2505
2679	#if 0	2506	#if 0
…		…
2681	if (object *closer = old_container->inv)	2508	if (object *closer = old_container->inv)
2682	if (closer->type == CLOSE_CON)	2509	if (closer->type == CLOSE_CON)
2683	closer->destroy ();	2510	closer->destroy ();
2684	#endif	2511	#endif
2685		2512
		2513	// make sure the container is available
		2514	esrv_send_item (this, old_container);
		2515
2686	old_container->flag [FLAG_APPLIED] = 0;	2516	old_container->flag [FLAG_APPLIED] = false;
2687	container = 0;	2517	container = 0;
2688		2518
		2519	// client needs item update to make it work, client bug requires this to be separate
2689	esrv_update_item (UPD_FLAGS, this, old_container);	2520	esrv_update_item (UPD_FLAGS, this, old_container);
		2521
2690	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));	2522	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
		2523	play_sound (sound_find ("chest_close"));
2691	}	2524	}
2692		2525
2693	if (new_container)	2526	if (new_container)
2694	{	2527	{
2695	if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))	2528	if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))
…		…
2706	}	2539	}
2707	#endif	2540	#endif
2708		2541
2709	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));	2542	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));
2710		2543
		2544	// make sure the container is available, client bug requires this to be separate
		2545	esrv_send_item (this, new_container);
		2546
2711	new_container->flag [FLAG_APPLIED] = 1;	2547	new_container->flag [FLAG_APPLIED] = true;
2712	container = new_container;	2548	container = new_container;
2713		2549
		2550	// client needs flag change
2714	esrv_update_item (UPD_FLAGS, this, new_container);	2551	esrv_update_item (UPD_FLAGS, this, new_container);
2715	esrv_send_inventory (this, new_container);	2552	esrv_send_inventory (this, new_container);
		2553	play_sound (sound_find ("chest_open"));
		2554	}
		2555	// else if (!old_container->env && contr && contr->ns)
		2556	// contr->ns->floorbox_reset ();
		2557	}
		2558
		2559	object *
		2560	object::force_find (const shstr name)
		2561	{
		2562	/* cycle through his inventory to look for the MARK we want to
		2563	* place
		2564	*/
		2565	for (object *tmp = inv; tmp; tmp = tmp->below)
		2566	if (tmp->type == FORCE && tmp->slaying == name)
		2567	return splay (tmp);
		2568
		2569	return 0;
		2570	}
		2571
		2572	void
		2573	object::force_add (const shstr name, int duration)
		2574	{
		2575	if (object *force = force_find (name))
		2576	force->destroy ();
		2577
		2578	object *force = get_archetype (FORCE_NAME);
		2579
		2580	force->slaying = name;
		2581	force->stats.food = 1;
		2582	force->speed_left = -1.f;
		2583
		2584	force->set_speed (duration ? 1.f / duration : 0.f);
		2585	force->flag [FLAG_IS_USED_UP] = true;
		2586	force->flag [FLAG_APPLIED] = true;
		2587
		2588	insert (force);
		2589	}
		2590
		2591	void
		2592	object::play_sound (faceidx sound)
		2593	{
		2594	if (!sound)
		2595	return;
		2596
		2597	if (flag [FLAG_REMOVED])
		2598	return;
		2599
		2600	if (env)
2716	}	2601	{
		2602	if (object *pl = in_player ())
		2603	pl->contr->play_sound (sound);
		2604	}
		2605	else
		2606	map->play_sound (sound, x, y);
2717	}	2607	}
2718		2608
2719

Diff Legend

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