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.135 by root, Sun Mar 11 02:12:44 2007 UTC vs.
Revision 1.230 by root, Sun May 4 08:25:32 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 (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>	29	#include <sproto.h>
34	#include <loader.h>	30	#include <loader.h>
35		31
36	#include <bitset>	32	#include <bitset>
37		33
38	int nrofallocobjects = 0;	34	UUID UUID::cur;
39	static UUID uuid;	35	static uint64_t seq_next_save;
40	const uint64 UUID_SKIP = 1<<19;	36	static const uint64 UUID_GAP = 1<<19;
41		37
42	objectvec objects;	38	objectvec objects;
43	activevec actives;	39	activevec actives;
44		40
45	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,
46	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
47	};	46	};
48	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,
49	-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
50	};	52	};
51	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,
52	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
53	};	58	};
54	int freedir[SIZEOFFREE] = {	59	int freedir[SIZEOFFREE] = {
55	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,
56	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
57	};	64	};
58		65
59	static void	66	static void
60	write_uuid (void)	67	write_uuid (uval64 skip, bool sync)
61	{	68	{
62	char filename1[MAX_BUF], filename2[MAX_BUF];	69	CALL_BEGIN (2);
63		70	CALL_ARG_SV (newSVval64 (skip));
64	sprintf (filename1, "%s/uuid", settings.localdir);	71	CALL_ARG_SV (boolSV (sync));
65	sprintf (filename2, "%s/uuid~", settings.localdir);	72	CALL_CALL ("cf::write_uuid", G_DISCARD);
66		73	CALL_END;
67	FILE *fp;
68
69	if (!(fp = fopen (filename2, "w")))
70	{
71	LOG (llevError, "ERROR: cannot open %s for writing, unable to write UUID!\n", filename2);
72	return;
73	}
74
75	fprintf (fp, "<1,%llx>\n", (unsigned long long)uuid.seq + UUID_SKIP * 2);
76	fclose (fp);
77	rename (filename2, filename1);
78	}	74	}
79		75
80	static void	76	static void
81	read_uuid (void)	77	read_uuid (void)
82	{	78	{
83	char filename[MAX_BUF];	79	char filename[MAX_BUF];
84		80
85	sprintf (filename, "%s/uuid", settings.localdir);	81	sprintf (filename, "%s/uuid", settings.localdir);
		82
		83	seq_next_save = 0;
86		84
87	FILE *fp;	85	FILE *fp;
88		86
89	if (!(fp = fopen (filename, "r")))	87	if (!(fp = fopen (filename, "r")))
90	{	88	{
91	if (errno == ENOENT)	89	if (errno == ENOENT)
92	{	90	{
93	LOG (llevInfo, "RESET uid to 1\n");	91	LOG (llevInfo, "RESET uid to 1\n");
94	uuid.seq = 0;	92	UUID::cur.seq = 0;
95	write_uuid ();	93	write_uuid (UUID_GAP, true);
96	return;	94	return;
97	}	95	}
98		96
99	LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);	97	LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);
100	_exit (1);	98	_exit (1);
101	}	99	}
102		100
103	int version;	101	UUID::BUF buf;
104	unsigned long long uid;	102	buf[0] = 0;
105	if (2 != fscanf (fp, "<%d,%llx>\n", &version, &uid) || version != 1)	103	fgets (buf, sizeof (buf), fp);
		104
		105	if (!UUID::cur.parse (buf))
106	{	106	{
107	LOG (llevError, "FATAL: error reading uid from %s!\n", filename);	107	LOG (llevError, "FATAL: error reading uid from %s (%s)!\n", filename, buf);
108	_exit (1);	108	_exit (1);
109	}	109	}
110		110
111	uuid.seq = uid;	111	LOG (llevDebug, "read UUID: %s\n", UUID::cur.c_str ());
112	write_uuid ();	112
113	LOG (llevDebug, "read UID: %" PRId64 "\n", uid);	113	write_uuid (UUID_GAP, true);
114	fclose (fp);	114	fclose (fp);
115	}	115	}
116		116
117	UUID	117	UUID
118	gen_uuid ()	118	UUID::gen ()
119	{	119	{
120	UUID uid;	120	UUID uid;
121		121
122	uid.seq = ++uuid.seq;	122	uid.seq = ++cur.seq;
123		123
124	if (!(uuid.seq & (UUID_SKIP - 1)))	124	if (expect_false (cur.seq >= seq_next_save))
125	write_uuid ();	125	{
		126	seq_next_save = UUID::cur.seq + (UUID_GAP >> 1);
		127	write_uuid (UUID_GAP, false);
		128	}
		129
126		130
127	return uid;	131	return uid;
128	}	132	}
129		133
130	void	134	void
131	init_uuid ()	135	UUID::init ()
132	{	136	{
133	read_uuid ();	137	read_uuid ();
134	}	138	}
135		139
136	/* 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. */
137	static int	141	static bool
138	compare_ob_value_lists_one (const object *wants, const object *has)	142	compare_ob_value_lists_one (const object *wants, const object *has)
139	{	143	{
140	key_value *wants_field;
141
142	/* 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
143	* 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
144	* different structure or at least keep the lists sorted...	146	* different structure or at least keep the lists sorted...
145	*/	147	*/
146		148
147	/* For each field in wants, */	149	/* For each field in wants, */
148	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)
149	{	151	if (has->kv_get (kv->key) != kv->value)
150	key_value *has_field;	152	return false;
151
152	/* Look for a field in has with the same key. */
153	has_field = get_ob_key_link (has, wants_field->key);
154
155	if (has_field == NULL)
156	{
157	/* No field with that name. */
158	return FALSE;
159	}
160
161	/* Found the matching field. */
162	if (has_field->value != wants_field->value)
163	{
164	/* Values don't match, so this half of the comparison is false. */
165	return FALSE;
166	}
167
168	/* If we get here, we found a match. Now for the next field in wants. */
169	}
170		153
171	/* 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. */
172	return TRUE;	155	return true;
173	}	156	}
174		157
175	/* Returns TRUE if ob1 has the same key_values as ob2. */	158	/* Returns TRUE if ob1 has the same key_values as ob2. */
176	static int	159	static bool
177	compare_ob_value_lists (const object *ob1, const object *ob2)	160	compare_ob_value_lists (const object *ob1, const object *ob2)
178	{	161	{
179	/* 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,
180	* so we need to run the comparison *twice*. :(	163	* so we need to run the comparison *twice*. :(
181	*/	164	*/
182	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);
183	}	167	}
184		168
185	/* 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
186	* they can be merged together.	170	* they can be merged together.
187	*	171	*
…		…
202	|| ob1->speed != ob2->speed	186	|| ob1->speed != ob2->speed
203	|| ob1->value != ob2->value	187	|| ob1->value != ob2->value
204	|| ob1->name != ob2->name)	188	|| ob1->name != ob2->name)
205	return 0;	189	return 0;
206		190
207	//TODO: this ain't working well, use nicer and correct overflow check	191	/* Do not merge objects if nrof would overflow. First part checks
208	/* 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
209	* 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
210	* used to store nrof).	194	* nrof values.
211	*/	195	*/
212	if (ob1->nrof + ob2->nrof >= 1UL << 31)	196	if (~ob1->nrof < ob2->nrof || ob1->nrof + ob2->nrof > (1UL << 31))
213	return 0;	197	return 0;
214		198
215	/* If the objects have been identified, set the BEEN_APPLIED flag.	199	/* If the objects have been identified, set the BEEN_APPLIED flag.
216	* 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
217	* 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
218	* 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
219	* flags lose any meaning.	203	* flags lose any meaning.
220	*/	204	*/
221	if (QUERY_FLAG (ob1, FLAG_IDENTIFIED))	205	if (QUERY_FLAG (ob1, FLAG_IDENTIFIED))
222	SET_FLAG (ob1, FLAG_BEEN_APPLIED);	206	SET_FLAG (ob1, FLAG_BEEN_APPLIED);
223		207
224	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))	208	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))
225	SET_FLAG (ob2, FLAG_BEEN_APPLIED);	209	SET_FLAG (ob2, FLAG_BEEN_APPLIED);
226		210
227	if ((ob1->flag ^ ob2->flag).reset (FLAG_INV_LOCKED).reset (FLAG_CLIENT_SENT).any ()	211	if (ob1->arch->name != ob2->arch->name
228	|| ob1->arch != ob2->arch
229	|| ob1->name != ob2->name	212	|| ob1->name != ob2->name
230	|| ob1->title != ob2->title	213	|| ob1->title != ob2->title
231	|| ob1->msg != ob2->msg	214	|| ob1->msg != ob2->msg
232	|| ob1->weight != ob2->weight	215	|| ob1->weight != ob2->weight
233	|| memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
234	|| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats) )
235	|| ob1->attacktype != ob2->attacktype	216	|| ob1->attacktype != ob2->attacktype
236	|| ob1->magic != ob2->magic	217	|| ob1->magic != ob2->magic
237	|| ob1->slaying != ob2->slaying	218	|| ob1->slaying != ob2->slaying
238	|| ob1->skill != ob2->skill	219	|| ob1->skill != ob2->skill
239	|| ob1->value != ob2->value	220	|| ob1->value != ob2->value
…		…
246	|| ob1->move_block != ob2->move_block	227	|| ob1->move_block != ob2->move_block
247	|| ob1->move_allow != ob2->move_allow	228	|| ob1->move_allow != ob2->move_allow
248	|| ob1->move_on != ob2->move_on	229	|| ob1->move_on != ob2->move_on
249	|| ob1->move_off != ob2->move_off	230	|| ob1->move_off != ob2->move_off
250	|| ob1->move_slow != ob2->move_slow	231	|| ob1->move_slow != ob2->move_slow
251	|| 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)))
252	return 0;	235	return 0;
253		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
254	/* This is really a spellbook check - really, we should	244	/* This is really a spellbook check - we should in general
255	* check all objects in the inventory.	245	* not merge objects with real inventories, as splitting them
		246	* is hard.
256	*/	247	*/
257	if (ob1->inv || ob2->inv)	248	if (ob1->inv || ob2->inv)
258	{	249	{
259	/* if one object has inventory but the other doesn't, not equiv */	250	if (!(ob1->inv && ob2->inv))
260	if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv))	251	return 0; /* inventories differ in length */
261	return 0;
262		252
263	/* 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
264	if (!object::can_merge (ob1->inv, ob2->inv))	256	if (!object::can_merge (ob1->inv, ob2->inv))
265	return 0;	257	return 0; /* inventory objects differ */
266		258
267	/* 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
268	* if it is valid.	260	* if it is valid.
269	*/	261	*/
270	}	262	}
…		…
289	if (ob1->level != ob2->level)	281	if (ob1->level != ob2->level)
290	return 0;	282	return 0;
291	break;	283	break;
292	}	284	}
293		285
294	if (ob1->key_values != NULL || ob2->key_values != NULL)	286	if (ob1->key_values || ob2->key_values)
295	{	287	{
296	/* At least one of these has key_values. */	288	/* At least one of these has key_values. */
297	if ((ob1->key_values == NULL) != (ob2->key_values == NULL))	289	if ((!ob1->key_values) != (!ob2->key_values))
298	/* 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))
299	return 0;	293	return 0;
300	else if (!compare_ob_value_lists (ob1, ob2))
301	return 0;
302	}	294	}
303		295
304	//TODO: generate an event or call into perl for additional checks
305	if (ob1->self || ob2->self)	296	if (ob1->self || ob2->self)
306	{	297	{
307	ob1->optimise ();	298	ob1->optimise ();
308	ob2->optimise ();	299	ob2->optimise ();
309		300
310	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)
311	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	}
312	}	315	}
313		316
314	/* Everything passes, must be OK. */	317	/* Everything passes, must be OK. */
315	return 1;	318	return 1;
316	}	319	}
317		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
318	/*	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	/*
319	* sum_weight() is a recursive function which calculates the weight	391	* this is a recursive function which calculates the weight
320	* 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
321	* containers are carrying, and sums it up.	393	* containers are carrying, and sums it up.
322	*/	394	*/
323	long	395	void
324	sum_weight (object *op)	396	object::update_weight ()
325	{	397	{
326	long sum;	398	sint32 sum = 0;
327	object *inv;
328		399
329	for (sum = 0, inv = op->inv; inv != NULL; inv = inv->below)	400	for (object *op = inv; op; op = op->below)
330	{	401	{
331	if (inv->inv)	402	if (op->inv)
332	sum_weight (inv);	403	op->update_weight ();
333	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);	404
		405	sum += op->total_weight ();
		406	}
		407
		408	sum = weight_adjust (this, sum);
		409
		410	if (sum != carrying)
334	}	411	{
335
336	if (op->type == CONTAINER && op->stats.Str)
337	sum = (sum * (100 - op->stats.Str)) / 100;
338
339	if (op->carrying != sum)
340	op->carrying = sum;	412	carrying = sum;
341		413
342	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	}
343	}	418	}
344		419
345	/**	420	/*
346	* Return the outermost environment object for a given object.	421	* Used by: Server DM commands: dumpbelow, dump. Some error messages.
347	*/
348
349	object *
350	object_get_env_recursive (object *op)
351	{
352	while (op->env != NULL)
353	op = op->env;
354	return op;
355	}
356
357	/*
358	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
359	* Some error messages.
360	* The result of the dump is stored in the static global errmsg array.
361	*/	422	*/
362	char *	423	char *
363	dump_object (object *op)	424	dump_object (object *op)
364	{	425	{
365	if (!op)	426	if (!op)
…		…
373	/*	434	/*
374	* 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
375	* multi-object 1 which is closest to the second object.	436	* multi-object 1 which is closest to the second object.
376	* If it's not a multi-object, it is returned.	437	* If it's not a multi-object, it is returned.
377	*/	438	*/
378
379	object *	439	object *
380	get_nearest_part (object *op, const object *pl)	440	get_nearest_part (object *op, const object *pl)
381	{	441	{
382	object *tmp, *closest;	442	object *tmp, *closest;
383	int last_dist, i;	443	int last_dist, i;
384		444
385	if (op->more == NULL)	445	if (!op->more)
386	return op;	446	return op;
		447
387	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)
388	if ((i = distance (tmp, pl)) < last_dist)	451	if ((i = distance (tmp, pl)) < last_dist)
389	closest = tmp, last_dist = i;	452	closest = tmp, last_dist = i;
		453
390	return closest;	454	return closest;
391	}	455	}
392		456
393	/*	457	/*
394	* 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.
395	*/	460	*/
396	object *	461	object *
397	find_object (tag_t i)	462	find_object (tag_t i)
398	{	463	{
399	for_all_objects (op)	464	for_all_objects (op)
…		…
419	break;	484	break;
420		485
421	return op;	486	return op;
422	}	487	}
423		488
424	void
425	free_all_object_data ()
426	{
427	LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);
428	}
429
430	/*	489	/*
431	* 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
432	* skill and experience objects.	491	* skill and experience objects.
		492	* ACTUALLY NO! investigate! TODO
433	*/	493	*/
434	void	494	void
435	object::set_owner (object *owner)	495	object::set_owner (object *owner)
436	{	496	{
		497	// allow objects which own objects
437	if (!owner)	498	if (owner)
438	return;
439
440	/* next line added to allow objects which own objects */
441	/* Add a check for ownercounts in here, as I got into an endless loop
442	* with the fireball owning a poison cloud which then owned the
443	* fireball. I believe that was caused by one of the objects getting
444	* freed and then another object replacing it. Since the ownercounts
445	* didn't match, this check is valid and I believe that cause is valid.
446	*/
447	while (owner->owner)	499	while (owner->owner)
448	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	}
449		507
450	this->owner = owner;	508	this->owner = owner;
		509	}
		510
		511	int
		512	object::slottype () const
		513	{
		514	if (type == SKILL)
		515	{
		516	if (IS_COMBAT_SKILL (subtype)) return slot_combat;
		517	if (IS_RANGED_SKILL (subtype)) return slot_ranged;
		518	}
		519	else
		520	{
		521	if (slot [body_combat].info) return slot_combat;
		522	if (slot [body_range ].info) return slot_ranged;
		523	}
		524
		525	return slot_none;
		526	}
		527
		528	bool
		529	object::change_weapon (object *ob)
		530	{
		531	if (current_weapon == ob)
		532	return true;
		533
		534	if (chosen_skill)
		535	chosen_skill->flag [FLAG_APPLIED] = false;
		536
		537	current_weapon = ob;
		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;
		542
		543	update_stats ();
		544
		545	if (ob)
		546	{
		547	// now check wether any body locations became invalid, in which case
		548	// we cannot apply the weapon at the moment.
		549	for (int i = 0; i < NUM_BODY_LOCATIONS; ++i)
		550	if (slot[i].used < 0)
		551	{
		552	current_weapon = chosen_skill = 0;
		553	update_stats ();
		554
		555	new_draw_info_format (NDI_UNIQUE, 0, this,
		556	"You try to balance all your items at once, "
		557	"but the %s is just too much for your body. "
		558	"[You need to unapply some items first.]", &ob->name);
		559	return false;
		560	}
		561
		562	//new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);
		563	}
		564	else
		565	;//new_draw_info_format (NDI_UNIQUE, 0, this, "You unwield your weapons.");
		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
		574	return true;
451	}	575	}
452		576
453	/* Zero the key_values on op, decrementing the shared-string	577	/* Zero the key_values on op, decrementing the shared-string
454	* refcounts and freeing the links.	578	* refcounts and freeing the links.
455	*/	579	*/
456	static void	580	static void
457	free_key_values (object *op)	581	free_key_values (object *op)
458	{	582	{
459	for (key_value *i = op->key_values; i != 0;)	583	for (key_value *i = op->key_values; i; )
460	{	584	{
461	key_value *next = i->next;	585	key_value *next = i->next;
462	delete i;	586	delete i;
463		587
464	i = next;	588	i = next;
…		…
476	* will point at garbage.	600	* will point at garbage.
477	*/	601	*/
478	void	602	void
479	object::copy_to (object *dst)	603	object::copy_to (object *dst)
480	{	604	{
481	bool is_freed = QUERY_FLAG (dst, FLAG_FREED);	605	dst->remove ();
482	bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED);
483
484	*(object_copy *)dst = *this;	606	*(object_copy *)dst = *this;
485		607	dst->flag [FLAG_REMOVED] = true;
486	if (is_freed)
487	SET_FLAG (dst, FLAG_FREED);
488
489	if (is_removed)
490	SET_FLAG (dst, FLAG_REMOVED);
491
492	if (speed < 0)
493	dst->speed_left = speed_left - rndm ();
494		608
495	/* Copy over key_values, if any. */	609	/* Copy over key_values, if any. */
496	if (key_values)	610	if (key_values)
497	{	611	{
498	key_value *tail = 0;	612	key_value *tail = 0;
499	key_value *i;
500
501	dst->key_values = 0;	613	dst->key_values = 0;
502		614
503	for (i = key_values; i; i = i->next)	615	for (key_value *i = key_values; i; i = i->next)
504	{	616	{
505	key_value *new_link = new key_value;	617	key_value *new_link = new key_value;
506		618
507	new_link->next = 0;	619	new_link->next = 0;
508	new_link->key = i->key;	620	new_link->key = i->key;
509	new_link->value = i->value;	621	new_link->value = i->value;
510		622
511	/* Try and be clever here, too. */	623	/* Try and be clever here, too. */
512	if (!dst->key_values)	624	if (!dst->key_values)
513	{	625	{
…		…
520	tail = new_link;	632	tail = new_link;
521	}	633	}
522	}	634	}
523	}	635	}
524		636
		637	if (speed < 0)
		638	dst->speed_left -= rndm ();
		639
525	dst->set_speed (dst->speed);	640	dst->set_speed (dst->speed);
526	}	641	}
527		642
528	void	643	void
529	object::instantiate ()	644	object::instantiate ()
530	{	645	{
531	if (!uuid.seq) // HACK	646	if (!uuid.seq) // HACK
532	uuid = gen_uuid ();	647	uuid = UUID::gen ();
533		648
534	speed_left = -0.1f;	649	speed_left = -0.1f;
535	/* 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
536	* 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.
537	* 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
538	* values for the body_used info, so when items are created	653	* values for the body_used info, so when items are created
539	* for it, they can be properly equipped.	654	* for it, they can be properly equipped.
540	*/	655	*/
541	memcpy (body_used, body_info, sizeof (body_used));	656	for (int i = NUM_BODY_LOCATIONS; i--; )
		657	slot[i].used = slot[i].info;
542		658
543	attachable::instantiate ();	659	attachable::instantiate ();
544	}	660	}
545		661
546	object *	662	object *
547	object::clone ()	663	object::clone ()
548	{	664	{
549	object *neu = create ();	665	object *neu = create ();
550	copy_to (neu);	666	copy_to (neu);
		667	neu->map = map; // not copied by copy_to
551	return neu;	668	return neu;
552	}	669	}
553		670
554	/*	671	/*
555	* 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
…		…
606	* UP_OBJ_FACE: only the objects face has changed.	723	* UP_OBJ_FACE: only the objects face has changed.
607	*/	724	*/
608	void	725	void
609	update_object (object *op, int action)	726	update_object (object *op, int action)
610	{	727	{
611	if (op == NULL)	728	if (!op)
612	{	729	{
613	/* this should never happen */	730	/* this should never happen */
614	LOG (llevDebug, "update_object() called for NULL object.\n");	731	LOG (llevError | logBacktrace, "update_object() called for NULL object.\n");
615	return;	732	return;
616	}	733	}
617		734
618	if (op->env)	735	if (!op->is_on_map ())
619	{	736	{
620	/* Animation is currently handled by client, so nothing	737	/* Animation is currently handled by client, so nothing
621	* to do in this case.	738	* to do in this case.
622	*/	739	*/
623	return;	740	return;
624	}	741	}
625
626	/* If the map is saving, don't do anything as everything is
627	* going to get freed anyways.
628	*/
629	if (!op->map || op->map->in_memory == MAP_SAVING)
630	return;
631		742
632	/* make sure the object is within map boundaries */	743	/* make sure the object is within map boundaries */
633	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)
634	{	745	{
635	LOG (llevError, "update_object() called for object out of map!\n");	746	LOG (llevError, "update_object() called for object out of map!\n");
…		…
695	static int object_count;	806	static int object_count;
696		807
697	void object::link ()	808	void object::link ()
698	{	809	{
699	assert (!index);//D	810	assert (!index);//D
700	uuid = gen_uuid ();	811	uuid = UUID::gen ();
701	count = ++object_count;	812	count = ++object_count;
702		813
703	refcnt_inc ();	814	refcnt_inc ();
704	objects.insert (this);	815	objects.insert (this);
705	}	816	}
…		…
778	object::destroy_inv (bool drop_to_ground)	889	object::destroy_inv (bool drop_to_ground)
779	{	890	{
780	// need to check first, because the checks below might segfault	891	// need to check first, because the checks below might segfault
781	// as we might be on an invalid mapspace and crossfire code	892	// as we might be on an invalid mapspace and crossfire code
782	// is too buggy to ensure that the inventory is empty.	893	// is too buggy to ensure that the inventory is empty.
783	// corollary: if you create arrows etc. with stuff in tis inventory,	894	// corollary: if you create arrows etc. with stuff in its inventory,
784	// cf will crash below with off-map x and y	895	// cf will crash below with off-map x and y
785	if (!inv)	896	if (!inv)
786	return;	897	return;
787		898
788	/* Only if the space blocks everything do we not process -	899	/* Only if the space blocks everything do we not process -
789	* if some form of movement is allowed, let objects	900	* if some form of movement is allowed, let objects
790	* drop on that space.	901	* drop on that space.
791	*/	902	*/
792	if (!drop_to_ground	903	if (!drop_to_ground
793	|| !map	904	|| !map
794	|| map->in_memory != MAP_IN_MEMORY	905	|| map->in_memory != MAP_ACTIVE
795	|| map->nodrop	906	|| map->nodrop
796	|| ms ().move_block == MOVE_ALL)	907	|| ms ().move_block == MOVE_ALL)
797	{	908	{
798	while (inv)	909	while (inv)
799	{	910	{
800	inv->destroy_inv (drop_to_ground);	911	inv->destroy_inv (false);
801	inv->destroy ();	912	inv->destroy ();
802	}	913	}
803	}	914	}
804	else	915	else
805	{ /* Put objects in inventory onto this space */	916	{ /* Put objects in inventory onto this space */
…		…
811	|| op->flag [FLAG_NO_DROP]	922	|| op->flag [FLAG_NO_DROP]
812	|| op->type == RUNE	923	|| op->type == RUNE
813	|| op->type == TRAP	924	|| op->type == TRAP
814	|| op->flag [FLAG_IS_A_TEMPLATE]	925	|| op->flag [FLAG_IS_A_TEMPLATE]
815	|| op->flag [FLAG_DESTROY_ON_DEATH])	926	|| op->flag [FLAG_DESTROY_ON_DEATH])
816	op->destroy ();	927	op->destroy (true);
817	else	928	else
818	map->insert (op, x, y);	929	map->insert (op, x, y);
819	}	930	}
820	}	931	}
821	}	932	}
…		…
825	object *op = new object;	936	object *op = new object;
826	op->link ();	937	op->link ();
827	return op;	938	return op;
828	}	939	}
829		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
830	void	961	void
831	object::do_destroy ()	962	object::do_destroy ()
832	{	963	{
833	attachable::do_destroy ();
834
835	if (flag [FLAG_IS_LINKED])	964	if (flag [FLAG_IS_LINKED])
836	remove_button_link (this);	965	remove_button_link (this);
837		966
838	if (flag [FLAG_FRIENDLY])	967	if (flag [FLAG_FRIENDLY])
839	{
840	remove_friendly_object (this);	968	remove_friendly_object (this);
841		969
842	if (type == GOLEM
843	&& owner
844	&& owner->type == PLAYER
845	&& owner->contr->ranges[range_golem] == this)
846	owner->contr->ranges[range_golem] = 0;
847	}
848
849	if (!flag [FLAG_REMOVED])
850	remove ();	970	remove ();
851		971
852	destroy_inv (true);	972	attachable::do_destroy ();
853		973
854	deactivate ();	974	deactivate ();
855	unlink ();	975	unlink ();
856		976
857	flag [FLAG_FREED] = 1;	977	flag [FLAG_FREED] = 1;
858		978
859	// hack to ensure that freed objects still have a valid map	979	// hack to ensure that freed objects still have a valid map
860	{
861	static maptile *freed_map; // freed objects are moved here to avoid crashes
862
863	if (!freed_map)
864	{
865	freed_map = new maptile;
866
867	freed_map->name = "/internal/freed_objects_map";
868	freed_map->width = 3;
869	freed_map->height = 3;
870
871	freed_map->alloc ();
872	freed_map->in_memory = MAP_IN_MEMORY;
873	}
874
875	map = freed_map;	980	map = &freed_map;
876	x = 1;	981	x = 1;
877	y = 1;	982	y = 1;
878	}
879
880	head = 0;
881		983
882	if (more)	984	if (more)
883	{	985	{
884	more->destroy ();	986	more->destroy ();
885	more = 0;	987	more = 0;
886	}	988	}
887		989
		990	head = 0;
		991
888	// clear those pointers that likely might have circular references to us	992	// clear those pointers that likely might cause circular references
889	owner = 0;	993	owner = 0;
890	enemy = 0;	994	enemy = 0;
891	attacked_by = 0;	995	attacked_by = 0;
		996	current_weapon = 0;
892	}	997	}
893		998
894	void	999	void
895	object::destroy (bool destroy_inventory)	1000	object::destroy (bool destroy_inventory)
896	{	1001	{
897	if (destroyed ())	1002	if (destroyed ())
898	return;	1003	return;
899		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
900	if (destroy_inventory)	1012	destroy_inv (!destroy_inventory);
901	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
902		1019
903	attachable::destroy ();	1020	attachable::destroy ();
904	}
905
906	/*
907	* sub_weight() recursively (outwards) subtracts a number from the
908	* weight of an object (and what is carried by it's environment(s)).
909	*/
910	void
911	sub_weight (object *op, signed long weight)
912	{
913	while (op != NULL)
914	{
915	if (op->type == CONTAINER)
916	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
917
918	op->carrying -= weight;
919	op = op->env;
920	}
921	}	1021	}
922		1022
923	/* op->remove ():	1023	/* op->remove ():
924	* 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
925	* 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
…		…
931	object::do_remove ()	1031	object::do_remove ()
932	{	1032	{
933	object *tmp, *last = 0;	1033	object *tmp, *last = 0;
934	object *otmp;	1034	object *otmp;
935		1035
936	if (QUERY_FLAG (this, FLAG_REMOVED))	1036	if (flag [FLAG_REMOVED])
937	return;	1037	return;
938		1038
939	SET_FLAG (this, FLAG_REMOVED);
940	INVOKE_OBJECT (REMOVE, this);	1039	INVOKE_OBJECT (REMOVE, this);
		1040
		1041	flag [FLAG_REMOVED] = true;
941		1042
942	if (more)	1043	if (more)
943	more->remove ();	1044	more->remove ();
944		1045
945	/*	1046	/*
946	* In this case, the object to be removed is in someones	1047	* In this case, the object to be removed is in someones
947	* inventory.	1048	* inventory.
948	*/	1049	*/
949	if (env)	1050	if (env)
950	{	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
951	if (nrof)	1061	if (below)
952	sub_weight (env, weight * nrof);	1062	below->above = above;
953	else	1063
954	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;
955		1074
956	/* 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
957	* made to players inventory. If set, avoiding the call	1076	* made to players inventory. If set, avoiding the call
958	* to save cpu time.	1077	* to save cpu time.
959	*/	1078	*/
960	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))
961	otmp->update_stats ();	1080	otmp->update_stats ();
962
963	if (above)
964	above->below = below;
965	else
966	env->inv = below;
967
968	if (below)
969	below->above = above;
970
971	/* we set up values so that it could be inserted into
972	* the map, but we don't actually do that - it is up
973	* to the caller to decide what we want to do.
974	*/
975	x = env->x, y = env->y;
976	map = env->map;
977	above = 0, below = 0;
978	env = 0;
979	}	1081	}
980	else if (map)	1082	else if (map)
981	{	1083	{
982	if (type == PLAYER)
983	{
984	// leaving a spot always closes any open container on the ground
985	if (container && !container->env)
986	// this causes spurious floorbox updates, but it ensures
987	// that the CLOSE event is being sent.
988	close_container ();
989
990	--map->players;
991	map->touch ();
992	}
993
994	map->dirty = true;	1084	map->dirty = true;
995	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	}
996		1108
997	/* link the object above us */	1109	/* link the object above us */
998	if (above)	1110	if (above)
999	above->below = below;	1111	above->below = below;
1000	else	1112	else
…		…
1021	if (map->in_memory == MAP_SAVING)	1133	if (map->in_memory == MAP_SAVING)
1022	return;	1134	return;
1023		1135
1024	int check_walk_off = !flag [FLAG_NO_APPLY];	1136	int check_walk_off = !flag [FLAG_NO_APPLY];
1025		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
1026	for (tmp = ms.bot; tmp; tmp = tmp->above)	1154	for (tmp = ms.bot; tmp; tmp = tmp->above)
1027	{	1155	{
1028	/* 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
1029	* being removed.	1157	* being removed.
1030	*/	1158	*/
1031
1032	if (tmp->type == PLAYER && tmp != this)
1033	{
1034	/* If a container that the player is currently using somehow gets
1035	* removed (most likely destroyed), update the player view
1036	* appropriately.
1037	*/
1038	if (tmp->container == this)
1039	{
1040	flag [FLAG_APPLIED] = 0;
1041	tmp->container = 0;
1042	}
1043
1044	if (tmp->contr->ns)
1045	tmp->contr->ns->floorbox_update ();
1046	}
1047		1159
1048	/* See if object moving off should effect something */	1160	/* See if object moving off should effect something */
1049	if (check_walk_off	1161	if (check_walk_off
1050	&& ((move_type & tmp->move_off)	1162	&& ((move_type & tmp->move_off)
1051	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))	1163	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
…		…
1054		1166
1055	if (destroyed ())	1167	if (destroyed ())
1056	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 ());
1057	}	1169	}
1058		1170
1059	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1060	//TODO: why is this horrible hacka fix? get rid of this code=bug! (schmorp)
1061	if (tmp->above == tmp)
1062	tmp->above = 0;
1063
1064	last = tmp;	1171	last = tmp;
1065	}	1172	}
1066		1173
1067	/* last == NULL if there are no objects on this space */	1174	/* last == NULL if there are no objects on this space */
1068	//TODO: this makes little sense, why only update the topmost object?	1175	//TODO: this makes little sense, why only update the topmost object?
…		…
1088	merge_ob (object *op, object *top)	1195	merge_ob (object *op, object *top)
1089	{	1196	{
1090	if (!op->nrof)	1197	if (!op->nrof)
1091	return 0;	1198	return 0;
1092		1199
1093	if (top)	1200	if (!top)
1094	for (top = op; top && top->above; top = top->above)	1201	for (top = op; top && top->above; top = top->above)
1095	;	1202	;
1096		1203
1097	for (; top; top = top->below)	1204	for (; top; top = top->below)
1098	{
1099	if (top == op)
1100	continue;
1101
1102	if (object::can_merge (op, top))	1205	if (object::can_merge (op, top))
1103	{	1206	{
1104	top->nrof += op->nrof;	1207	top->nrof += op->nrof;
1105		1208
1106	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/	1209	if (object *pl = top->visible_to ())
1107	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
1108	op->destroy ();	1215	op->destroy (1);
		1216
1109	return top;	1217	return top;
1110	}	1218	}
1111	}
1112		1219
1113	return 0;	1220	return 0;
		1221	}
		1222
		1223	void
		1224	object::expand_tail ()
		1225	{
		1226	if (more)
		1227	return;
		1228
		1229	object *prev = this;
		1230
		1231	for (archetype *at = (archetype *)arch->more; at; at = (archetype *)at->more)
		1232	{
		1233	object *op = arch_to_object (at);
		1234
		1235	op->name = name;
		1236	op->name_pl = name_pl;
		1237	op->title = title;
		1238
		1239	op->head = this;
		1240	prev->more = op;
		1241
		1242	prev = op;
		1243	}
1114	}	1244	}
1115		1245
1116	/*	1246	/*
1117	* same as insert_ob_in_map except it handles separate coordinates and does a clean	1247	* same as insert_ob_in_map except it handles separate coordinates and does a clean
1118	* job preparing multi-part monsters.	1248	* job preparing multi-part monsters.
…		…
1120	object *	1250	object *
1121	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)
1122	{	1252	{
1123	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)	1253	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1124	{	1254	{
1125	tmp->x = x + tmp->arch->clone.x;	1255	tmp->x = x + tmp->arch->x;
1126	tmp->y = y + tmp->arch->clone.y;	1256	tmp->y = y + tmp->arch->y;
1127	}	1257	}
1128		1258
1129	return insert_ob_in_map (op, m, originator, flag);	1259	return insert_ob_in_map (op, m, originator, flag);
1130	}	1260	}
1131		1261
…		…
1150	* just 'op' otherwise	1280	* just 'op' otherwise
1151	*/	1281	*/
1152	object *	1282	object *
1153	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)
1154	{	1284	{
1155	object *tmp, *top, *floor = NULL;	1285	assert (!op->flag [FLAG_FREED]);
1156
1157	if (QUERY_FLAG (op, FLAG_FREED))
1158	{
1159	LOG (llevError, "Trying to insert freed object!\n");
1160	return NULL;
1161	}
1162
1163	if (!QUERY_FLAG (op, FLAG_REMOVED))
1164	LOG (llevError, "Trying to insert already inserted object %s\n", op->debug_desc ());
1165		1286
1166	op->remove ();	1287	op->remove ();
1167
1168	if (!m)
1169	{
1170	char *dump = dump_object (op);
1171	LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
1172	free (dump);
1173	return op;
1174	}
1175
1176	if (out_of_map (m, op->x, op->y))
1177	{
1178	char *dump = dump_object (op);
1179	LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump);
1180	#ifdef MANY_CORES
1181	/* Better to catch this here, as otherwise the next use of this object
1182	* is likely to cause a crash. Better to find out where it is getting
1183	* improperly inserted.
1184	*/
1185	abort ();
1186	#endif
1187	free (dump);
1188	return op;
1189	}
1190
1191	if (object *more = op->more)
1192	{
1193	if (!insert_ob_in_map (more, m, originator, flag))
1194	{
1195	if (!op->head)
1196	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1197
1198	return 0;
1199	}
1200	}
1201
1202	CLEAR_FLAG (op, FLAG_REMOVED);
1203		1288
1204	/* Ideally, the caller figures this out. However, it complicates a lot	1289	/* Ideally, the caller figures this out. However, it complicates a lot
1205	* 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
1206	* need extra work	1291	* need extra work
1207	*/	1292	*/
1208	if (!xy_normalise (m, op->x, op->y))	1293	if (!xy_normalise (m, op->x, op->y))
		1294	{
		1295	op->destroy (1);
1209	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);
1210		1304
1211	op->map = m;	1305	op->map = m;
1212	mapspace &ms = op->ms ();	1306	mapspace &ms = op->ms ();
1213		1307
1214	/* this has to be done after we translate the coordinates.	1308	/* this has to be done after we translate the coordinates.
1215	*/	1309	*/
1216	if (op->nrof && !(flag & INS_NO_MERGE))	1310	if (op->nrof && !(flag & INS_NO_MERGE))
1217	for (tmp = ms.bot; tmp; tmp = tmp->above)	1311	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1218	if (object::can_merge (op, tmp))	1312	if (object::can_merge (op, tmp))
1219	{	1313	{
		1314	// TODO: we atcually want to update tmp, not op,
		1315	// but some caller surely breaks when we return tmp
		1316	// from here :/
1220	op->nrof += tmp->nrof;	1317	op->nrof += tmp->nrof;
1221	tmp->destroy ();	1318	tmp->destroy (1);
1222	}	1319	}
1223		1320
1224	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 */
1225	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1322	CLEAR_FLAG (op, FLAG_INV_LOCKED);
1226		1323
…		…
1246	/* since *below* originator, no need to update top */	1343	/* since *below* originator, no need to update top */
1247	originator->below = op;	1344	originator->below = op;
1248	}	1345	}
1249	else	1346	else
1250	{	1347	{
		1348	object *top, *floor = NULL;
		1349
1251	top = ms.bot;	1350	top = ms.bot;
1252		1351
1253	/* If there are other objects, then */	1352	/* If there are other objects, then */
1254	if ((!(flag & INS_MAP_LOAD)) && top)	1353	if (top)
1255	{	1354	{
1256	object *last = 0;	1355	object *last = 0;
1257		1356
1258	/*	1357	/*
1259	* 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.
…		…
1312	if (last && last->below && last != floor)	1411	if (last && last->below && last != floor)
1313	top = last->below;	1412	top = last->below;
1314	}	1413	}
1315	} /* If objects on this space */	1414	} /* If objects on this space */
1316		1415
1317	if (flag & INS_MAP_LOAD)
1318	top = ms.top;
1319
1320	if (flag & INS_ABOVE_FLOOR_ONLY)	1416	if (flag & INS_ABOVE_FLOOR_ONLY)
1321	top = floor;	1417	top = floor;
1322		1418
1323	/* 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.
1324	*/	1420	*/
…		…
1356	op->map->touch ();	1452	op->map->touch ();
1357	}	1453	}
1358		1454
1359	op->map->dirty = true;	1455	op->map->dirty = true;
1360		1456
1361	/* If we have a floor, we know the player, if any, will be above
1362	* it, so save a few ticks and start from there.
1363	*/
1364	if (!(flag & INS_MAP_LOAD))
1365	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
1366	if (pl->contr->ns)	1461	if (pl->contr->ns)
1367	pl->contr->ns->floorbox_update ();	1462	pl->contr->ns->floorbox_update ();
1368		1463
1369	/* If this object glows, it may affect lighting conditions that are	1464	/* If this object glows, it may affect lighting conditions that are
1370	* 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
1371	* 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
1372	* on the map will get recalculated. The players could very well	1467	* on the map will get recalculated. The players could very well
…		…
1391	* blocked() and wall() work properly), and these flags are updated by	1486	* blocked() and wall() work properly), and these flags are updated by
1392	* update_object().	1487	* update_object().
1393	*/	1488	*/
1394		1489
1395	/* 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 */
1396	if (!(flag & INS_NO_WALK_ON) && !op->head)	1491	if (!(flag & INS_NO_WALK_ON) && op->head_ () == op)
1397	{	1492	{
1398	if (check_move_on (op, originator))	1493	if (check_move_on (op, originator))
1399	return 0;	1494	return 0;
1400		1495
1401	/* 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
1402	* walk on's.	1497	* walk on's.
1403	*/	1498	*/
1404	for (tmp = op->more; tmp != NULL; tmp = tmp->more)	1499	for (object *tmp = op->more; tmp; tmp = tmp->more)
1405	if (check_move_on (tmp, originator))	1500	if (check_move_on (tmp, originator))
1406	return 0;	1501	return 0;
1407	}	1502	}
1408		1503
1409	return op;	1504	return op;
…		…
1414	* 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.
1415	*/	1510	*/
1416	void	1511	void
1417	replace_insert_ob_in_map (const char *arch_string, object *op)	1512	replace_insert_ob_in_map (const char *arch_string, object *op)
1418	{	1513	{
1419	object *tmp, *tmp1;
1420
1421	/* first search for itself and remove any old instances */	1514	/* first search for itself and remove any old instances */
1422		1515
1423	for (tmp = op->ms ().bot; tmp; tmp = tmp->above)	1516	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1424	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */	1517	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */
1425	tmp->destroy ();	1518	tmp->destroy (1);
1426		1519
1427	tmp1 = arch_to_object (archetype::find (arch_string));	1520	object *tmp = arch_to_object (archetype::find (arch_string));
1428		1521
1429	tmp1->x = op->x;	1522	tmp->x = op->x;
1430	tmp1->y = op->y;	1523	tmp->y = op->y;
		1524
1431	insert_ob_in_map (tmp1, op->map, op, 0);	1525	insert_ob_in_map (tmp, op->map, op, 0);
1432	}	1526	}
1433		1527
1434	// XXX: function not returning object*
1435	object *	1528	object *
1436	object::insert_at (object *where, object *originator, int flags)	1529	object::insert_at (object *where, object *originator, int flags)
1437	{	1530	{
		1531	if (where->env)
		1532	return where->env->insert (this);
		1533	else
1438	where->map->insert (this, where->x, where->y, originator, flags);	1534	return where->map->insert (this, where->x, where->y, originator, flags);
1439	}	1535	}
1440		1536
1441	/*	1537	/*
1442	* get_split_ob(ob,nr) splits up ob into two parts. The part which
1443	* is returned contains nr objects, and the remaining parts contains
1444	* the rest (or is removed and freed if that number is 0).
1445	* On failure, NULL is returned, and the reason put into the
1446	* global static errmsg array.
1447	*/
1448	object *
1449	get_split_ob (object *orig_ob, uint32 nr)
1450	{
1451	object *newob;
1452	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1453
1454	if (orig_ob->nrof < nr)
1455	{
1456	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1457	return NULL;
1458	}
1459
1460	newob = object_create_clone (orig_ob);
1461
1462	if ((orig_ob->nrof -= nr) < 1)
1463	orig_ob->destroy (1);
1464	else if (!is_removed)
1465	{
1466	if (orig_ob->env != NULL)
1467	sub_weight (orig_ob->env, orig_ob->weight * nr);
1468	if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)
1469	{
1470	strcpy (errmsg, "Tried to split object whose map is not in memory.");
1471	LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n");
1472	return NULL;
1473	}
1474	}
1475
1476	newob->nrof = nr;
1477
1478	return newob;
1479	}
1480
1481	/*
1482	* decrease_ob_nr(object, number) decreases a specified number from	1538	* decrease(object, number) decreases a specified number from
1483	* 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
1484	* is subsequently removed and freed.	1540	* is subsequently removed and freed.
1485	*	1541	*
1486	* 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
1487	*/	1543	*/
		1544	bool
		1545	object::decrease (sint32 nr)
		1546	{
		1547	if (!nr)
		1548	return true;
1488		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	*/
1489	object *	1576	object *
1490	decrease_ob_nr (object *op, uint32 i)	1577	object::split (sint32 nr)
1491	{	1578	{
1492	object *tmp;	1579	int have = number_of ();
1493		1580
1494	if (i == 0) /* objects with op->nrof require this check */	1581	if (have < nr)
1495	return op;	1582	return 0;
1496		1583	else if (have == nr)
1497	if (i > op->nrof)
1498	i = op->nrof;
1499
1500	if (QUERY_FLAG (op, FLAG_REMOVED))
1501	op->nrof -= i;
1502	else if (op->env)
1503	{	1584	{
1504	/* is this object in the players inventory, or sub container
1505	* therein?
1506	*/
1507	tmp = op->in_player ();
1508	/* nope. Is this a container the player has opened?
1509	* If so, set tmp to that player.
1510	* IMO, searching through all the players will mostly
1511	* likely be quicker than following op->env to the map,
1512	* and then searching the map for a player.
1513	*/
1514	if (!tmp)
1515	for_all_players (pl)
1516	if (pl->ob->container == op->env)
1517	{
1518	tmp = pl->ob;
1519	break;
1520	}
1521
1522	if (i < op->nrof)
1523	{
1524	sub_weight (op->env, op->weight * i);
1525	op->nrof -= i;
1526	if (tmp)
1527	esrv_send_item (tmp, op);
1528	}
1529	else
1530	{
1531	op->remove ();	1585	remove ();
1532	op->nrof = 0;	1586	return this;
1533	if (tmp)
1534	esrv_del_item (tmp->contr, op->count);
1535	}
1536	}	1587	}
1537	else	1588	else
1538	{	1589	{
1539	object *above = op->above;	1590	decrease (nr);
1540		1591
1541	if (i < op->nrof)	1592	object *op = deep_clone ();
1542	op->nrof -= i;	1593	op->nrof = nr;
1543	else
1544	{
1545	op->remove ();
1546	op->nrof = 0;
1547	}
1548
1549	/* Since we just removed op, op->above is null */
1550	for (tmp = above; tmp; tmp = tmp->above)
1551	if (tmp->type == PLAYER)
1552	{
1553	if (op->nrof)
1554	esrv_send_item (tmp, op);
1555	else
1556	esrv_del_item (tmp->contr, op->count);
1557	}
1558	}
1559
1560	if (op->nrof)
1561	return op;	1594	return op;
1562	else
1563	{
1564	op->destroy ();
1565	return 0;
1566	}
1567	}
1568
1569	/*
1570	* add_weight(object, weight) adds the specified weight to an object,
1571	* and also updates how much the environment(s) is/are carrying.
1572	*/
1573
1574	void
1575	add_weight (object *op, signed long weight)
1576	{
1577	while (op != NULL)
1578	{
1579	if (op->type == CONTAINER)
1580	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1581
1582	op->carrying += weight;
1583	op = op->env;
1584	}	1595	}
1585	}	1596	}
1586		1597
1587	object *	1598	object *
1588	insert_ob_in_ob (object *op, object *where)	1599	insert_ob_in_ob (object *op, object *where)
…		…
1593	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);
1594	free (dump);	1605	free (dump);
1595	return op;	1606	return op;
1596	}	1607	}
1597		1608
1598	if (where->head)	1609	if (where->head_ () != where)
1599	{	1610	{
1600	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");
1601	where = where->head;	1612	where = where->head;
1602	}	1613	}
1603		1614
1604	return where->insert (op);	1615	return where->insert (op);
1605	}	1616	}
…		…
1610	* inside the object environment.	1621	* inside the object environment.
1611	*	1622	*
1612	* The function returns now pointer to inserted item, and return value can	1623	* The function returns now pointer to inserted item, and return value can
1613	* be != op, if items are merged. -Tero	1624	* be != op, if items are merged. -Tero
1614	*/	1625	*/
1615
1616	object *	1626	object *
1617	object::insert (object *op)	1627	object::insert (object *op)
1618	{	1628	{
1619	object *tmp, *otmp;
1620
1621	if (!QUERY_FLAG (op, FLAG_REMOVED))
1622	op->remove ();
1623
1624	if (op->more)	1629	if (op->more)
1625	{	1630	{
1626	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);
1627	return op;	1632	return op;
1628	}	1633	}
1629		1634
1630	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1635	op->remove ();
1631	CLEAR_FLAG (op, FLAG_REMOVED);	1636
		1637	op->flag [FLAG_OBJ_ORIGINAL] = 0;
		1638
1632	if (op->nrof)	1639	if (op->nrof)
1633	{
1634	for (tmp = inv; tmp != NULL; tmp = tmp->below)	1640	for (object *tmp = inv; tmp; tmp = tmp->below)
1635	if (object::can_merge (tmp, op))	1641	if (object::can_merge (tmp, op))
1636	{	1642	{
1637	/* return the original object and remove inserted object	1643	/* return the original object and remove inserted object
1638	(client needs the original object) */	1644	(client needs the original object) */
1639	tmp->nrof += op->nrof;	1645	tmp->nrof += op->nrof;
1640	/* Weight handling gets pretty funky. Since we are adding to	1646
1641	* tmp->nrof, we need to increase the weight.	1647	if (object *pl = tmp->visible_to ())
1642	*/	1648	esrv_update_item (UPD_NROF, pl, tmp);
		1649
1643	add_weight (this, op->weight * op->nrof);	1650	adjust_weight (this, op->total_weight ());
1644	SET_FLAG (op, FLAG_REMOVED);	1651
1645	op->destroy (); /* free the inserted object */	1652	op->destroy (1);
1646	op = tmp;	1653	op = tmp;
1647	op->remove (); /* and fix old object's links */	1654	goto inserted;
1648	CLEAR_FLAG (op, FLAG_REMOVED);
1649	break;
1650	}	1655	}
1651		1656
1652	/* I assume combined objects have no inventory	1657	op->owner = 0; // it's his/hers now. period.
1653	* We add the weight - this object could have just been removed
1654	* (if it was possible to merge). calling remove_ob will subtract
1655	* the weight, so we need to add it in again, since we actually do
1656	* the linking below
1657	*/
1658	add_weight (this, op->weight * op->nrof);
1659	}
1660	else
1661	add_weight (this, (op->weight + op->carrying));
1662
1663	otmp = this->in_player ();
1664	if (otmp && otmp->contr)
1665	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1666	otmp->update_stats ();
1667
1668	op->map = 0;	1658	op->map = 0;
1669	op->env = this;	1659	op->x = 0;
		1660	op->y = 0;
		1661
1670	op->above = 0;	1662	op->above = 0;
1671	op->below = 0;	1663	op->below = inv;
1672	op->x = 0, op->y = 0;	1664	op->env = this;
1673		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:
1674	/* 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 */
1675	if ((op->glow_radius != 0) && map)	1680	if (op->glow_radius && map && map->darkness)
1676	{
1677	#ifdef DEBUG_LIGHTS
1678	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1679	#endif /* DEBUG_LIGHTS */
1680	if (map->darkness)
1681	update_all_los (map, x, y);	1681	update_all_los (map, x, y);
1682	}
1683		1682
1684	/* Client has no idea of ordering so lets not bother ordering it here.	1683	// if this is a player's inventory, update stats
1685	* It sure simplifies this function...	1684	if (type == PLAYER && !flag [FLAG_NO_FIX_PLAYER])
1686	*/	1685	update_stats ();
1687	if (!inv)
1688	inv = op;
1689	else
1690	{
1691	op->below = inv;
1692	op->below->above = op;
1693	inv = op;
1694	}
1695		1686
1696	INVOKE_OBJECT (INSERT, this);	1687	INVOKE_OBJECT (INSERT, this);
1697		1688
1698	return op;	1689	return op;
1699	}	1690	}
…		…
1914	* activate recursively a flag on an object inventory	1905	* activate recursively a flag on an object inventory
1915	*/	1906	*/
1916	void	1907	void
1917	flag_inv (object *op, int flag)	1908	flag_inv (object *op, int flag)
1918	{	1909	{
1919	if (op->inv)
1920	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)	1910	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1921	{	1911	{
1922	SET_FLAG (tmp, flag);	1912	SET_FLAG (tmp, flag);
1923	flag_inv (tmp, flag);	1913	flag_inv (tmp, flag);
1924	}	1914	}
1925	}	1915	}
1926		1916
1927	/*	1917	/*
1928	* deactivate recursively a flag on an object inventory	1918	* deactivate recursively a flag on an object inventory
1929	*/	1919	*/
1930	void	1920	void
1931	unflag_inv (object *op, int flag)	1921	unflag_inv (object *op, int flag)
1932	{	1922	{
1933	if (op->inv)
1934	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)	1923	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1935	{	1924	{
1936	CLEAR_FLAG (tmp, flag);	1925	CLEAR_FLAG (tmp, flag);
1937	unflag_inv (tmp, flag);	1926	unflag_inv (tmp, flag);
1938	}	1927	}
1939	}
1940
1941	/*
1942	* set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in
1943	* all it's inventory (recursively).
1944	* If checksums are used, a player will get set_cheat called for
1945	* him/her-self and all object carried by a call to this function.
1946	*/
1947	void
1948	set_cheat (object *op)
1949	{
1950	SET_FLAG (op, FLAG_WAS_WIZ);
1951	flag_inv (op, FLAG_WAS_WIZ);
1952	}	1928	}
1953		1929
1954	/*	1930	/*
1955	* 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
1956	* 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
…		…
1958	* to search (see the freearr_x/y[] definition).	1934	* to search (see the freearr_x/y[] definition).
1959	* It returns a random choice among the alternatives found.	1935	* It returns a random choice among the alternatives found.
1960	* 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
1961	* does all 4 immediate directions). This returns the index into the	1937	* does all 4 immediate directions). This returns the index into the
1962	* 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)
1963	* Note - this only checks to see if there is space for the head of the
1964	* object - if it is a multispace object, this should be called for all
1965	* pieces.
1966	* Note2: This function does correctly handle tiled maps, but does not	1939	* Note: This function does correctly handle tiled maps, but does not
1967	* inform the caller. However, insert_ob_in_map will update as	1940	* inform the caller. However, insert_ob_in_map will update as
1968	* 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.
1969	* 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
1970	* 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
1971	* 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
…		…
1973	* customized, changed states, etc.	1946	* customized, changed states, etc.
1974	*/	1947	*/
1975	int	1948	int
1976	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)
1977	{	1950	{
		1951	int altern[SIZEOFFREE];
1978	int index = 0, flag;	1952	int index = 0, flag;
1979	int altern[SIZEOFFREE];
1980		1953
1981	for (int i = start; i < stop; i++)	1954	for (int i = start; i < stop; i++)
1982	{	1955	{
1983	flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]);	1956	mapxy pos (m, x, y); pos.move (i);
1984	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	{
1985	altern [index++] = i;	1972	altern [index++] = i;
		1973	continue;
		1974	}
1986		1975
1987	/* 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.
1988	* 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.
1989	* 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 -
1990	* 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
1991	* 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
1992	* to only the spaces immediately surrounding the target area, and	1981	* to only the spaces immediately surrounding the target area, and
1993	* won't look 2 spaces south of the target space.	1982	* won't look 2 spaces south of the target space.
1994	*/	1983	*/
1995	else if ((flag & P_NO_PASS) && maxfree[i] < stop)	1984	if (ms.move_block == MOVE_ALL && maxfree[i] < stop)
		1985	{
1996	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;
1997	}	2000	}
1998		2001
1999	if (!index)	2002	if (!index)
2000	return -1;	2003	return -1;
2001		2004
…		…
2010	*/	2013	*/
2011	int	2014	int
2012	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)
2013	{	2016	{
2014	for (int i = 0; i < SIZEOFFREE; i++)	2017	for (int i = 0; i < SIZEOFFREE; i++)
2015	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]))
2016	return i;	2019	return i;
2017		2020
2018	return -1;	2021	return -1;
2019	}	2022	}
2020		2023
…		…
2074	object *tmp;	2077	object *tmp;
2075	maptile *mp;	2078	maptile *mp;
2076		2079
2077	MoveType blocked, move_type;	2080	MoveType blocked, move_type;
2078		2081
2079	if (exclude && exclude->head)	2082	if (exclude && exclude->head_ () != exclude)
2080	{	2083	{
2081	exclude = exclude->head;	2084	exclude = exclude->head;
2082	move_type = exclude->move_type;	2085	move_type = exclude->move_type;
2083	}	2086	}
2084	else	2087	else
…		…
2107	max = maxfree[i];	2110	max = maxfree[i];
2108	else if (mflags & P_IS_ALIVE)	2111	else if (mflags & P_IS_ALIVE)
2109	{	2112	{
2110	for (tmp = ms.bot; tmp; tmp = tmp->above)	2113	for (tmp = ms.bot; tmp; tmp = tmp->above)
2111	if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)	2114	if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)
2112	&& (tmp != exclude || (tmp->head && tmp->head != exclude)))	2115	&& (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2113	break;	2116	break;
2114		2117
2115	if (tmp)	2118	if (tmp)
2116	return freedir[i];	2119	return freedir[i];
2117	}	2120	}
…		…
2297	* 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
2298	* core dumps if they do.	2301	* core dumps if they do.
2299	*	2302	*
2300	* 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)
2301	*/	2304	*/
2302
2303	int	2305	int
2304	can_pick (const object *who, const object *item)	2306	can_pick (const object *who, const object *item)
2305	{	2307	{
2306	return /*QUERY_FLAG(who,FLAG_WIZ)|| */	2308	return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2307	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&	2309	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
…		…
2310		2312
2311	/*	2313	/*
2312	* create clone from object to another	2314	* create clone from object to another
2313	*/	2315	*/
2314	object *	2316	object *
2315	object_create_clone (object *asrc)	2317	object::deep_clone ()
2316	{	2318	{
2317	object *dst = 0, *tmp, *src, *part, *prev, *item;	2319	assert (("deep_clone called on non-head object", is_head ()));
2318		2320
2319	if (!asrc)	2321	object *dst = clone ();
2320	return 0;
2321		2322
2322	src = asrc;	2323	object *prev = dst;
2323	if (src->head)
2324	src = src->head;
2325
2326	prev = 0;
2327	for (part = src; part; part = part->more)	2324	for (object *part = this->more; part; part = part->more)
2328	{	2325	{
2329	tmp = part->clone ();	2326	object *tmp = part->clone ();
2330	tmp->x -= src->x;
2331	tmp->y -= src->y;
2332
2333	if (!part->head)
2334	{
2335	dst = tmp;
2336	tmp->head = 0;
2337	}
2338	else
2339	tmp->head = dst;	2327	tmp->head = dst;
2340
2341	tmp->more = 0;
2342
2343	if (prev)
2344	prev->more = tmp;	2328	prev->more = tmp;
2345
2346	prev = tmp;	2329	prev = tmp;
2347	}	2330	}
2348		2331
2349	for (item = src->inv; item; item = item->below)	2332	for (object *item = inv; item; item = item->below)
2350	insert_ob_in_ob (object_create_clone (item), dst);	2333	insert_ob_in_ob (item->deep_clone (), dst);
2351		2334
2352	return dst;	2335	return dst;
2353	}	2336	}
2354		2337
2355	/* This returns the first object in who's inventory that	2338	/* This returns the first object in who's inventory that
…		…
2364	return tmp;	2347	return tmp;
2365		2348
2366	return 0;	2349	return 0;
2367	}	2350	}
2368		2351
2369	/* If ob has a field named key, return the link from the list,	2352	const shstr &
2370	* otherwise return NULL.	2353	object::kv_get (const shstr &key) const
2371	*
2372	* key must be a passed in shared string - otherwise, this won't
2373	* do the desired thing.
2374	*/
2375	key_value *
2376	get_ob_key_link (const object *ob, const char *key)
2377	{	2354	{
2378	for (key_value *link = ob->key_values; link; link = link->next)	2355	for (key_value *kv = key_values; kv; kv = kv->next)
2379	if (link->key == key)	2356	if (kv->key == key)
2380	return link;
2381
2382	return 0;
2383	}
2384
2385	/*
2386	* Returns the value of op has an extra_field for key, or NULL.
2387	*
2388	* The argument doesn't need to be a shared string.
2389	*
2390	* The returned string is shared.
2391	*/
2392	const char *
2393	get_ob_key_value (const object *op, const char *const key)
2394	{
2395	key_value *link;
2396	shstr_cmp canonical_key (key);
2397
2398	if (!canonical_key)
2399	{
2400	/* 1. There being a field named key on any object
2401	* implies there'd be a shared string to find.
2402	* 2. Since there isn't, no object has this field.
2403	* 3. Therefore, *this* object doesn't have this field.
2404	*/
2405	return 0;
2406	}
2407
2408	/* This is copied from get_ob_key_link() above -
2409	* only 4 lines, and saves the function call overhead.
2410	*/
2411	for (link = op->key_values; link; link = link->next)
2412	if (link->key == canonical_key)
2413	return link->value;	2357	return kv->value;
2414		2358
2415	return 0;	2359	return shstr_null;
2416	}	2360	}
2417		2361
2418		2362	void
2419	/*	2363	object::kv_set (const shstr &key, const shstr &value)
2420	* Updates the canonical_key in op to value.
2421	*
2422	* canonical_key is a shared string (value doesn't have to be).
2423	*
2424	* Unless add_key is TRUE, it won't add fields, only change the value of existing
2425	* keys.
2426	*
2427	* Returns TRUE on success.
2428	*/
2429	int
2430	set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key)
2431	{	2364	{
2432	key_value *field = NULL, *last = NULL;	2365	for (key_value *kv = key_values; kv; kv = kv->next)
2433		2366	if (kv->key == key)
2434	for (field = op->key_values; field != NULL; field = field->next)
2435	{
2436	if (field->key != canonical_key)
2437	{	2367	{
2438	last = field;	2368	kv->value = value;
2439	continue;	2369	return;
2440	}	2370	}
2441		2371
2442	if (value)	2372	key_value *kv = new key_value;
2443	field->value = value;	2373
2444	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)
2445	{	2386	{
2446	/* Basically, if the archetype has this key set,	2387	key_value *kv = *kvp;
2447	* we need to store the null value so when we save	2388	*kvp = (*kvp)->next;
2448	* it, we save the empty value so that when we load,	2389	delete kv;
2449	* we get this value back again.	2390	return;
2450	*/
2451	if (get_ob_key_link (&op->arch->clone, canonical_key))
2452	field->value = 0;
2453	else
2454	{
2455	if (last)
2456	last->next = field->next;
2457	else
2458	op->key_values = field->next;
2459
2460	delete field;
2461	}
2462	}	2391	}
2463	return TRUE;
2464	}
2465	/* IF we get here, key doesn't exist */
2466
2467	/* No field, we'll have to add it. */
2468
2469	if (!add_key)
2470	return FALSE;
2471
2472	/* There isn't any good reason to store a null
2473	* value in the key/value list. If the archetype has
2474	* this key, then we should also have it, so shouldn't
2475	* be here. If user wants to store empty strings,
2476	* should pass in ""
2477	*/
2478	if (value == NULL)
2479	return TRUE;
2480
2481	field = new key_value;
2482
2483	field->key = canonical_key;
2484	field->value = value;
2485	/* Usual prepend-addition. */
2486	field->next = op->key_values;
2487	op->key_values = field;
2488
2489	return TRUE;
2490	}
2491
2492	/*
2493	* Updates the key in op to value.
2494	*
2495	* If add_key is FALSE, this will only update existing keys,
2496	* and not add new ones.
2497	* In general, should be little reason FALSE is ever passed in for add_key
2498	*
2499	* Returns TRUE on success.
2500	*/
2501	int
2502	set_ob_key_value (object *op, const char *key, const char *value, int add_key)
2503	{
2504	shstr key_ (key);
2505
2506	return set_ob_key_value_s (op, key_, value, add_key);
2507	}	2392	}
2508		2393
2509	object::depth_iterator::depth_iterator (object *container)	2394	object::depth_iterator::depth_iterator (object *container)
2510	: iterator_base (container)	2395	: iterator_base (container)
2511	{	2396	{
…		…
2524	item = item->inv;	2409	item = item->inv;
2525	}	2410	}
2526	else	2411	else
2527	item = item->env;	2412	item = item->env;
2528	}	2413	}
2529
2530		2414
2531	const char *	2415	const char *
2532	object::flag_desc (char *desc, int len) const	2416	object::flag_desc (char *desc, int len) const
2533	{	2417	{
2534	char *p = desc;	2418	char *p = desc;
…		…
2562	{	2446	{
2563	char flagdesc[512];	2447	char flagdesc[512];
2564	char info2[256 * 4];	2448	char info2[256 * 4];
2565	char *p = info;	2449	char *p = info;
2566		2450
2567	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}",
2568	count, uuid.seq,	2452	count,
		2453	uuid.c_str (),
2569	&name,	2454	&name,
2570	title ? "\",title:\"" : "",	2455	title ? "\",title:\"" : "",
2571	title ? (const char *)title : "",	2456	title ? (const char *)title : "",
2572	flag_desc (flagdesc, 512), type);	2457	flag_desc (flagdesc, 512), type);
2573		2458
2574	if (env)	2459	if (!flag[FLAG_REMOVED] && env)
2575	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2460	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2576		2461
2577	if (map)	2462	if (map)
2578	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);
2579		2464
…		…
2581	}	2466	}
2582		2467
2583	const char *	2468	const char *
2584	object::debug_desc () const	2469	object::debug_desc () const
2585	{	2470	{
2586	static char info[256 * 4];	2471	static char info[3][256 * 4];
		2472	static int info_idx;
		2473
2587	return debug_desc (info);	2474	return debug_desc (info [++info_idx % 3]);
2588	}
2589
2590	const char *
2591	object::debug_desc2 () const
2592	{
2593	static char info[256 * 4];
2594	return debug_desc (info);
2595	}	2475	}
2596		2476
2597	struct region *	2477	struct region *
2598	object::region () const	2478	object::region () const
2599	{	2479	{
…		…
2602	}	2482	}
2603		2483
2604	const materialtype_t *	2484	const materialtype_t *
2605	object::dominant_material () const	2485	object::dominant_material () const
2606	{	2486	{
2607	if (materialtype_t *mat = name_to_material (materialname))	2487	if (materialtype_t *mt = name_to_material (materialname))
2608	return mat;	2488	return mt;
2609		2489
2610	// omfg this is slow, this has to be temporary :)
2611	shstr unknown ("unknown");
2612
2613	return name_to_material (unknown);	2490	return name_to_material (shstr_unknown);
2614	}	2491	}
2615		2492
2616	void	2493	void
2617	object::open_container (object *new_container)	2494	object::open_container (object *new_container)
2618	{	2495	{
2619	if (container == new_container)	2496	if (container == new_container)
2620	return;	2497	return;
2621		2498
2622	if (object *old_container = container)	2499	object *old_container = container;
		2500
		2501	if (old_container)
2623	{	2502	{
2624	if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))	2503	if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
2625	return;	2504	return;
2626		2505
2627	#if 0	2506	#if 0
…		…
2629	if (object *closer = old_container->inv)	2508	if (object *closer = old_container->inv)
2630	if (closer->type == CLOSE_CON)	2509	if (closer->type == CLOSE_CON)
2631	closer->destroy ();	2510	closer->destroy ();
2632	#endif	2511	#endif
2633		2512
		2513	// make sure the container is available
		2514	esrv_send_item (this, old_container);
		2515
2634	old_container->flag [FLAG_APPLIED] = 0;	2516	old_container->flag [FLAG_APPLIED] = false;
2635	container = 0;	2517	container = 0;
2636		2518
		2519	// client needs item update to make it work, client bug requires this to be separate
2637	esrv_update_item (UPD_FLAGS, this, old_container);	2520	esrv_update_item (UPD_FLAGS, this, old_container);
		2521
2638	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"));
2639	}	2524	}
2640		2525
2641	if (new_container)	2526	if (new_container)
2642	{	2527	{
2643	if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))	2528	if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))
…		…
2654	}	2539	}
2655	#endif	2540	#endif
2656		2541
2657	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));
2658		2543
		2544	// make sure the container is available, client bug requires this to be separate
		2545	esrv_send_item (this, new_container);
		2546
2659	new_container->flag [FLAG_APPLIED] = 1;	2547	new_container->flag [FLAG_APPLIED] = true;
2660	container = new_container;	2548	container = new_container;
2661		2549
		2550	// client needs flag change
2662	esrv_update_item (UPD_FLAGS, this, new_container);	2551	esrv_update_item (UPD_FLAGS, this, new_container);
2663	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)
2664	}	2601	{
		2602	if (object *pl = in_player ())
		2603	pl->contr->play_sound (sound);
		2604	}
		2605	else
		2606	map->play_sound (sound, x, y);
2665	}	2607	}
2666		2608
2667

Diff Legend

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