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.168 by root, Thu Jul 26 00:27:07 2007 UTC vs.
Revision 1.253 by root, Sun Aug 17 22:46:26 2008 UTC

1	/*	1	/*
2	* This file is part of Crossfire TRT, the Roguelike Realtime MORPG.	2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.
3	*	3	*
4	* Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team	4	* Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5	* Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team	5	* Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team
6	* Copyright (©) 1992,2007 Frank Tore Johansen	6	* Copyright (©) 1992,2007 Frank Tore Johansen
7	*	7	*
8	* Crossfire TRT 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 3 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,
…		…
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, see <http://www.gnu.org/licenses/>.	19	* along with this program. If not, see <http://www.gnu.org/licenses/>.
20	*	20	*
21	* The authors can be reached via e-mail to <crossfire@schmorp.de>	21	* The authors can be reached via e-mail to <support@deliantra.net>
22	*/	22	*/
23		23
24	/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
25	sub/add_weight will transcend the environment updating the carrying
26	variable. */
27	#include <global.h>	24	#include <global.h>
28	#include <stdio.h>	25	#include <stdio.h>
29	#include <sys/types.h>	26	#include <sys/types.h>
30	#include <sys/uio.h>	27	#include <sys/uio.h>
31	#include <object.h>	28	#include <object.h>
32	#include <funcpoint.h>
33	#include <sproto.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->archname != ob2->arch->archname
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
240	|| ob1->animation_id != ob2->animation_id	221	|| ob1->animation_id != ob2->animation_id
		222	|| (ob1->face != ob2->face && !ob1->animation_id) // face and animation are dependent on each other
241	|| ob1->client_type != ob2->client_type	223	|| ob1->client_type != ob2->client_type
242	|| ob1->materialname != ob2->materialname	224	|| ob1->materialname != ob2->materialname
243	|| ob1->lore != ob2->lore	225	|| ob1->lore != ob2->lore
244	|| ob1->subtype != ob2->subtype	226	|| ob1->subtype != ob2->subtype
245	|| ob1->move_type != ob2->move_type	227	|| ob1->move_type != ob2->move_type
246	|| ob1->move_block != ob2->move_block	228	|| ob1->move_block != ob2->move_block
247	|| ob1->move_allow != ob2->move_allow	229	|| ob1->move_allow != ob2->move_allow
248	|| ob1->move_on != ob2->move_on	230	|| ob1->move_on != ob2->move_on
249	|| ob1->move_off != ob2->move_off	231	|| ob1->move_off != ob2->move_off
250	|| ob1->move_slow != ob2->move_slow	232	|| ob1->move_slow != ob2->move_slow
251	|| ob1->move_slow_penalty != ob2->move_slow_penalty)	233	|| ob1->move_slow_penalty != ob2->move_slow_penalty
		234	|| memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
		235	|| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats)))
252	return 0;	236	return 0;
253		237
		238	if ((ob1->flag ^ ob2->flag)
		239	.reset (FLAG_INV_LOCKED)
		240	.reset (FLAG_CLIENT_SENT)
		241	.reset (FLAG_REMOVED)
		242	.any ())
		243	return 0;
		244
254	/* This is really a spellbook check - really, we should	245	/* This is really a spellbook check - we should in general
255	* check all objects in the inventory.	246	* not merge objects with real inventories, as splitting them
		247	* is hard.
256	*/	248	*/
257	if (ob1->inv || ob2->inv)	249	if (ob1->inv || ob2->inv)
258	{	250	{
259	/* if one object has inventory but the other doesn't, not equiv */	251	if (!(ob1->inv && ob2->inv))
260	if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv))	252	return 0; /* inventories differ in length */
261	return 0;
262		253
263	/* Now check to see if the two inventory objects could merge */	254	if (ob1->inv->below || ob2->inv->below)
		255	return 0; /* more than one object in inv */
		256
264	if (!object::can_merge (ob1->inv, ob2->inv))	257	if (!object::can_merge (ob1->inv, ob2->inv))
265	return 0;	258	return 0; /* inventory objects differ */
266		259
267	/* inventory ok - still need to check rest of this object to see	260	/* inventory ok - still need to check rest of this object to see
268	* if it is valid.	261	* if it is valid.
269	*/	262	*/
270	}	263	}
…		…
289	if (ob1->level != ob2->level)	282	if (ob1->level != ob2->level)
290	return 0;	283	return 0;
291	break;	284	break;
292	}	285	}
293		286
294	if (ob1->key_values != NULL || ob2->key_values != NULL)	287	if (ob1->key_values || ob2->key_values)
295	{	288	{
296	/* At least one of these has key_values. */	289	/* At least one of these has key_values. */
297	if ((ob1->key_values == NULL) != (ob2->key_values == NULL))	290	if ((!ob1->key_values) != (!ob2->key_values))
298	/* One has fields, but the other one doesn't. */	291	return 0; /* One has fields, but the other one doesn't. */
299	return 0;	292
300	else if (!compare_ob_value_lists (ob1, ob2))	293	if (!compare_ob_value_lists (ob1, ob2))
301	return 0;	294	return 0;
302	}	295	}
303		296
304	if (ob1->self || ob2->self)	297	if (ob1->self || ob2->self)
305	{	298	{
306	ob1->optimise ();	299	ob1->optimise ();
307	ob2->optimise ();	300	ob2->optimise ();
308		301
309	if (ob1->self || ob2->self)	302	if (ob1->self || ob2->self)
		303	{
		304	int k1 = ob1->self ? HvTOTALKEYS (ob1->self) : 0;
		305	int k2 = ob2->self ? HvTOTALKEYS (ob2->self) : 0;
		306
		307	if (k1 != k2)
		308	return 0;
		309
		310	if (k1 == 0)
		311	return 1;
		312
310	if (!cfperl_can_merge (ob1, ob2))	313	if (!cfperl_can_merge (ob1, ob2))
311	return 0;	314	return 0;
		315	}
312	}	316	}
313		317
314	/* Everything passes, must be OK. */	318	/* Everything passes, must be OK. */
315	return 1;	319	return 1;
316	}	320	}
317		321
		322	// find player who can see this object
		323	object *
		324	object::visible_to () const
		325	{
		326	if (client_visible () && !flag [FLAG_REMOVED])
		327	{
		328	// see if we are in a container of sorts
		329	if (env)
		330	{
		331	// the player inventory itself is always visible
		332	if (env->type == PLAYER)
		333	return env;
		334
		335	// else a player could have our env open
		336	object *envest = env->outer_env ();
		337
		338	// the player itself is always on a map, so we will find him here
		339	// even if our inv is in a player.
		340	if (envest->is_on_map ())
		341	if (object *pl = envest->ms ().player ())
		342	if (pl->container == env)
		343	return pl;
		344	}
		345	else
		346	{
		347	// maybe there is a player standing on the same mapspace
		348	// this will catch the case where "this" is a player
		349	if (object *pl = ms ().player ())
		350	if ((!pl->container && pl->contr->ns && !pl->contr->ns->update_look)
		351	|| this == pl->container)
		352	return pl;
		353	}
		354	}
		355
		356	return 0;
		357	}
		358
		359	// adjust weight per container type ("of holding")
		360	static sint32
		361	weight_adjust_for (object *op, sint32 weight)
		362	{
		363	return op->type == CONTAINER
		364	? lerp (weight, 0, 100, 0, 100 - op->stats.Str)
		365	: weight;
		366	}
		367
318	/*	368	/*
		369	* adjust_weight(object, weight) adds the specified weight to an object,
		370	* and also updates how much the environment(s) is/are carrying.
		371	*/
		372	static void
		373	adjust_weight (object *op, sint32 weight)
		374	{
		375	while (op)
		376	{
		377	// adjust by actual difference to account for rounding errors
		378	// i.e. (w2 - w1) / f != w2 / f - w1 / f and the latter is correct
		379	weight = weight_adjust_for (op, op->carrying)
		380	- weight_adjust_for (op, op->carrying - weight);
		381
		382	if (!weight)
		383	return;
		384
		385	op->carrying += weight;
		386
		387	if (object *pl = op->visible_to ())
		388	if (pl != op) // player is handled lazily
		389	esrv_update_item (UPD_WEIGHT, pl, op);
		390
		391	op = op->env;
		392	}
		393	}
		394
		395	/*
319	* sum_weight() is a recursive function which calculates the weight	396	* this is a recursive function which calculates the weight
320	* an object is carrying. It goes through in figures out how much	397	* an object is carrying. It goes through op and figures out how much
321	* containers are carrying, and sums it up.	398	* containers are carrying, and sums it up.
322	*/	399	*/
323	long	400	void
324	sum_weight (object *op)	401	object::update_weight ()
325	{	402	{
326	long sum;	403	sint32 sum = 0;
327	object *inv;
328		404
329	for (sum = 0, inv = op->inv; inv; inv = inv->below)	405	for (object *op = inv; op; op = op->below)
330	{	406	{
331	if (inv->inv)	407	if (op->inv)
332	sum_weight (inv);	408	op->update_weight ();
333		409
334	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);	410	sum += op->total_weight ();
		411	}
		412
		413	sum = weight_adjust_for (this, sum);
		414
		415	if (sum != carrying)
335	}	416	{
336
337	if (op->type == CONTAINER && op->stats.Str)
338	sum = (sum * (100 - op->stats.Str)) / 100;
339
340	if (op->carrying != sum)
341	op->carrying = sum;	417	carrying = sum;
342		418
343	return sum;	419	if (object *pl = visible_to ())
		420	if (pl != this) // player is handled lazily
		421	esrv_update_item (UPD_WEIGHT, pl, this);
		422	}
344	}	423	}
345		424
346	/**	425	/*
347	* Return the outermost environment object for a given object.	426	* Used by: Server DM commands: dumpbelow, dump. Some error messages.
348	*/
349
350	object *
351	object_get_env_recursive (object *op)
352	{
353	while (op->env != NULL)
354	op = op->env;
355	return op;
356	}
357
358	/*
359	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
360	* Some error messages.
361	* The result of the dump is stored in the static global errmsg array.
362	*/	427	*/
363	char *	428	char *
364	dump_object (object *op)	429	dump_object (object *op)
365	{	430	{
366	if (!op)	431	if (!op)
…		…
374	/*	439	/*
375	* get_nearest_part(multi-object, object 2) returns the part of the	440	* get_nearest_part(multi-object, object 2) returns the part of the
376	* multi-object 1 which is closest to the second object.	441	* multi-object 1 which is closest to the second object.
377	* If it's not a multi-object, it is returned.	442	* If it's not a multi-object, it is returned.
378	*/	443	*/
379
380	object *	444	object *
381	get_nearest_part (object *op, const object *pl)	445	get_nearest_part (object *op, const object *pl)
382	{	446	{
383	object *tmp, *closest;	447	object *tmp, *closest;
384	int last_dist, i;	448	int last_dist, i;
385		449
386	if (op->more == NULL)	450	if (!op->more)
387	return op;	451	return op;
		452
388	for (last_dist = distance (op, pl), closest = op, tmp = op->more; tmp != NULL; tmp = tmp->more)	453	for (last_dist = distance (op, pl), closest = op, tmp = op->more;
		454	tmp;
		455	tmp = tmp->more)
389	if ((i = distance (tmp, pl)) < last_dist)	456	if ((i = distance (tmp, pl)) < last_dist)
390	closest = tmp, last_dist = i;	457	closest = tmp, last_dist = i;
		458
391	return closest;	459	return closest;
392	}	460	}
393		461
394	/*	462	/*
395	* Returns the object which has the count-variable equal to the argument.	463	* Returns the object which has the count-variable equal to the argument.
		464	* VERRRY slow.
396	*/	465	*/
397	object *	466	object *
398	find_object (tag_t i)	467	find_object (tag_t i)
399	{	468	{
400	for_all_objects (op)	469	for_all_objects (op)
…		…
411	*/	480	*/
412	object *	481	object *
413	find_object_name (const char *str)	482	find_object_name (const char *str)
414	{	483	{
415	shstr_cmp str_ (str);	484	shstr_cmp str_ (str);
416	object *op;
417		485
		486	if (str_)
418	for_all_objects (op)	487	for_all_objects (op)
419	if (op->name == str_)	488	if (op->name == str_)
420	break;	489	return op;
421		490
422	return op;	491	return 0;
423	}
424
425	void
426	free_all_object_data ()
427	{
428	LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);
429	}	492	}
430		493
431	/*	494	/*
432	* Sets the owner and sets the skill and exp pointers to owner's current	495	* Sets the owner and sets the skill and exp pointers to owner's current
433	* skill and experience objects.	496	* skill and experience objects.
		497	* ACTUALLY NO! investigate! TODO
434	*/	498	*/
435	void	499	void
436	object::set_owner (object *owner)	500	object::set_owner (object *owner)
437	{	501	{
		502	// allow objects which own objects
438	if (!owner)	503	if (owner)
439	return;
440
441	/* next line added to allow objects which own objects */
442	/* Add a check for ownercounts in here, as I got into an endless loop
443	* with the fireball owning a poison cloud which then owned the
444	* fireball. I believe that was caused by one of the objects getting
445	* freed and then another object replacing it. Since the ownercounts
446	* didn't match, this check is valid and I believe that cause is valid.
447	*/
448	while (owner->owner)	504	while (owner->owner)
449	owner = owner->owner;	505	owner = owner->owner;
		506
		507	if (flag [FLAG_FREED])
		508	{
		509	LOG (llevError | logBacktrace, "tried to set owner of %s to %s\n", debug_desc (), owner->debug_desc ());
		510	return;
		511	}
450		512
451	this->owner = owner;	513	this->owner = owner;
452	}	514	}
453		515
454	int	516	int
…		…
532	}	594	}
533		595
534	op->key_values = 0;	596	op->key_values = 0;
535	}	597	}
536		598
537	object &	599	/*
538	object::operator =(const object &src)	600	* copy_to first frees everything allocated by the dst object,
		601	* and then copies the contents of itself into the second
		602	* object, allocating what needs to be allocated. Basically, any
		603	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
		604	* if the first object is freed, the pointers in the new object
		605	* will point at garbage.
		606	*/
		607	void
		608	object::copy_to (object *dst)
539	{	609	{
540	bool is_freed = flag [FLAG_FREED];	610	dst->remove ();
541	bool is_removed = flag [FLAG_REMOVED];
542
543	*(object_copy *)this = src;	611	*(object_copy *)dst = *this;
544
545	flag [FLAG_FREED] = is_freed;
546	flag [FLAG_REMOVED] = is_removed;	612	dst->flag [FLAG_REMOVED] = true;
547		613
548	/* Copy over key_values, if any. */	614	/* Copy over key_values, if any. */
549	if (src.key_values)	615	if (key_values)
550	{	616	{
551	key_value *tail = 0;	617	key_value *tail = 0;
552	key_values = 0;	618	dst->key_values = 0;
553		619
554	for (key_value *i = src.key_values; i; i = i->next)	620	for (key_value *i = key_values; i; i = i->next)
555	{	621	{
556	key_value *new_link = new key_value;	622	key_value *new_link = new key_value;
557		623
558	new_link->next = 0;	624	new_link->next = 0;
559	new_link->key = i->key;	625	new_link->key = i->key;
560	new_link->value = i->value;	626	new_link->value = i->value;
561		627
562	/* Try and be clever here, too. */	628	/* Try and be clever here, too. */
563	if (!key_values)	629	if (!dst->key_values)
564	{	630	{
565	key_values = new_link;	631	dst->key_values = new_link;
566	tail = new_link;	632	tail = new_link;
567	}	633	}
568	else	634	else
569	{	635	{
570	tail->next = new_link;	636	tail->next = new_link;
571	tail = new_link;	637	tail = new_link;
572	}	638	}
573	}	639	}
574	}	640	}
575	}
576
577	/*
578	* copy_to first frees everything allocated by the dst object,
579	* and then copies the contents of itself into the second
580	* object, allocating what needs to be allocated. Basically, any
581	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
582	* if the first object is freed, the pointers in the new object
583	* will point at garbage.
584	*/
585	void
586	object::copy_to (object *dst)
587	{
588	*dst = *this;
589		641
590	if (speed < 0)	642	if (speed < 0)
591	dst->speed_left = speed_left - rndm ();	643	dst->speed_left -= rndm ();
592		644
593	dst->set_speed (dst->speed);	645	dst->set_speed (dst->speed);
594	}	646	}
595		647
596	void	648	void
597	object::instantiate ()	649	object::instantiate ()
598	{	650	{
599	if (!uuid.seq) // HACK	651	if (!uuid.seq) // HACK
600	uuid = gen_uuid ();	652	uuid = UUID::gen ();
601		653
602	speed_left = -0.1f;	654	speed_left = -0.1f;
603	/* copy the body_info to the body_used - this is only really	655	/* copy the body_info to the body_used - this is only really
604	* need for monsters, but doesn't hurt to do it for everything.	656	* need for monsters, but doesn't hurt to do it for everything.
605	* by doing so, when a monster is created, it has good starting	657	* by doing so, when a monster is created, it has good starting
…		…
615	object *	667	object *
616	object::clone ()	668	object::clone ()
617	{	669	{
618	object *neu = create ();	670	object *neu = create ();
619	copy_to (neu);	671	copy_to (neu);
		672	neu->map = map; // not copied by copy_to
620	return neu;	673	return neu;
621	}	674	}
622		675
623	/*	676	/*
624	* If an object with the IS_TURNABLE() flag needs to be turned due	677	* If an object with the IS_TURNABLE() flag needs to be turned due
…		…
675	* UP_OBJ_FACE: only the objects face has changed.	728	* UP_OBJ_FACE: only the objects face has changed.
676	*/	729	*/
677	void	730	void
678	update_object (object *op, int action)	731	update_object (object *op, int action)
679	{	732	{
680	if (op == NULL)	733	if (!op)
681	{	734	{
682	/* this should never happen */	735	/* this should never happen */
683	LOG (llevDebug, "update_object() called for NULL object.\n");	736	LOG (llevError | logBacktrace, "update_object() called for NULL object.\n");
684	return;	737	return;
685	}	738	}
686		739
687	if (op->env)	740	if (!op->is_on_map ())
688	{	741	{
689	/* Animation is currently handled by client, so nothing	742	/* Animation is currently handled by client, so nothing
690	* to do in this case.	743	* to do in this case.
691	*/	744	*/
692	return;	745	return;
693	}	746	}
694
695	/* If the map is saving, don't do anything as everything is
696	* going to get freed anyways.
697	*/
698	if (!op->map || op->map->in_memory == MAP_SAVING)
699	return;
700		747
701	/* make sure the object is within map boundaries */	748	/* make sure the object is within map boundaries */
702	if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height)	749	if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height)
703	{	750	{
704	LOG (llevError, "update_object() called for object out of map!\n");	751	LOG (llevError, "update_object() called for object out of map!\n");
…		…
723	|| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))	770	|| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))
724	|| (m.move_on | op->move_on ) != m.move_on	771	|| (m.move_on | op->move_on ) != m.move_on
725	|| (m.move_off | op->move_off ) != m.move_off	772	|| (m.move_off | op->move_off ) != m.move_off
726	|| (m.move_slow | op->move_slow) != m.move_slow	773	|| (m.move_slow | op->move_slow) != m.move_slow
727	/* This isn't perfect, but I don't expect a lot of objects to	774	/* This isn't perfect, but I don't expect a lot of objects to
728	* to have move_allow right now.	775	* have move_allow right now.
729	*/	776	*/
730	|| ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block	777	|| ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block
731	|| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)	778	|| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)
732	m.flags_ = 0;	779	m.flags_ = 0;
733	}	780	}
…		…
764	static int object_count;	811	static int object_count;
765		812
766	void object::link ()	813	void object::link ()
767	{	814	{
768	assert (!index);//D	815	assert (!index);//D
769	uuid = gen_uuid ();	816	uuid = UUID::gen ();
770	count = ++object_count;	817	count = ++object_count;
771		818
772	refcnt_inc ();	819	refcnt_inc ();
773	objects.insert (this);	820	objects.insert (this);
774	}	821	}
…		…
847	object::destroy_inv (bool drop_to_ground)	894	object::destroy_inv (bool drop_to_ground)
848	{	895	{
849	// need to check first, because the checks below might segfault	896	// need to check first, because the checks below might segfault
850	// as we might be on an invalid mapspace and crossfire code	897	// as we might be on an invalid mapspace and crossfire code
851	// is too buggy to ensure that the inventory is empty.	898	// is too buggy to ensure that the inventory is empty.
852	// corollary: if you create arrows etc. with stuff in tis inventory,	899	// corollary: if you create arrows etc. with stuff in its inventory,
853	// cf will crash below with off-map x and y	900	// cf will crash below with off-map x and y
854	if (!inv)	901	if (!inv)
855	return;	902	return;
856		903
857	/* Only if the space blocks everything do we not process -	904	/* Only if the space blocks everything do we not process -
858	* if some form of movement is allowed, let objects	905	* if some form of movement is allowed, let objects
859	* drop on that space.	906	* drop on that space.
860	*/	907	*/
861	if (!drop_to_ground	908	if (!drop_to_ground
862	|| !map	909	|| !map
863	|| map->in_memory != MAP_IN_MEMORY	910	|| map->in_memory != MAP_ACTIVE
864	|| map->nodrop	911	|| map->no_drop
865	|| ms ().move_block == MOVE_ALL)	912	|| ms ().move_block == MOVE_ALL)
866	{	913	{
867	while (inv)	914	while (inv)
868	{
869	inv->destroy_inv (drop_to_ground);
870	inv->destroy ();	915	inv->destroy (true);
871	}
872	}	916	}
873	else	917	else
874	{ /* Put objects in inventory onto this space */	918	{ /* Put objects in inventory onto this space */
875	while (inv)	919	while (inv)
876	{	920	{
…		…
880	|| op->flag [FLAG_NO_DROP]	924	|| op->flag [FLAG_NO_DROP]
881	|| op->type == RUNE	925	|| op->type == RUNE
882	|| op->type == TRAP	926	|| op->type == TRAP
883	|| op->flag [FLAG_IS_A_TEMPLATE]	927	|| op->flag [FLAG_IS_A_TEMPLATE]
884	|| op->flag [FLAG_DESTROY_ON_DEATH])	928	|| op->flag [FLAG_DESTROY_ON_DEATH])
885	op->destroy ();	929	op->destroy (true);
886	else	930	else
887	map->insert (op, x, y);	931	map->insert (op, x, y);
888	}	932	}
889	}	933	}
890	}	934	}
…		…
894	object *op = new object;	938	object *op = new object;
895	op->link ();	939	op->link ();
896	return op;	940	return op;
897	}	941	}
898		942
		943	static struct freed_map : maptile
		944	{
		945	freed_map ()
		946	{
		947	path = "<freed objects map>";
		948	name = "/internal/freed_objects_map";
		949	width = 3;
		950	height = 3;
		951	no_drop = 1;
		952	no_reset = 1;
		953
		954	alloc ();
		955	in_memory = MAP_ACTIVE;
		956	}
		957
		958	~freed_map ()
		959	{
		960	destroy ();
		961	}
		962	} freed_map; // freed objects are moved here to avoid crashes
		963
899	void	964	void
900	object::do_destroy ()	965	object::do_destroy ()
901	{	966	{
902	attachable::do_destroy ();
903
904	if (flag [FLAG_IS_LINKED])	967	if (flag [FLAG_IS_LINKED])
905	remove_button_link (this);	968	remove_button_link (this);
906		969
907	if (flag [FLAG_FRIENDLY])	970	if (flag [FLAG_FRIENDLY])
908	remove_friendly_object (this);	971	remove_friendly_object (this);
909		972
910	if (!flag [FLAG_REMOVED])
911	remove ();	973	remove ();
912		974
913	destroy_inv (true);	975	attachable::do_destroy ();
914		976
915	deactivate ();	977	deactivate ();
916	unlink ();	978	unlink ();
917		979
918	flag [FLAG_FREED] = 1;	980	flag [FLAG_FREED] = 1;
919		981
920	// hack to ensure that freed objects still have a valid map	982	// hack to ensure that freed objects still have a valid map
921	{
922	static maptile *freed_map; // freed objects are moved here to avoid crashes
923
924	if (!freed_map)
925	{
926	freed_map = new maptile;
927
928	freed_map->name = "/internal/freed_objects_map";
929	freed_map->width = 3;
930	freed_map->height = 3;
931
932	freed_map->alloc ();
933	freed_map->in_memory = MAP_IN_MEMORY;
934	}
935
936	map = freed_map;	983	map = &freed_map;
937	x = 1;	984	x = 1;
938	y = 1;	985	y = 1;
939	}
940		986
941	if (more)	987	if (more)
942	{	988	{
943	more->destroy ();	989	more->destroy ();
944	more = 0;	990	more = 0;
…		…
957	object::destroy (bool destroy_inventory)	1003	object::destroy (bool destroy_inventory)
958	{	1004	{
959	if (destroyed ())	1005	if (destroyed ())
960	return;	1006	return;
961		1007
		1008	if (!is_head () && !head->destroyed ())
		1009	{
		1010	LOG (llevError | logBacktrace, "tried to destroy the tail of an object");
		1011	head->destroy (destroy_inventory);
		1012	return;
		1013	}
		1014
962	if (destroy_inventory)	1015	destroy_inv (!destroy_inventory);
963	destroy_inv (false);	1016
		1017	if (is_head ())
		1018	if (sound_destroy)
		1019	play_sound (sound_destroy);
		1020	else if (flag [FLAG_MONSTER])
		1021	play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism
964		1022
965	attachable::destroy ();	1023	attachable::destroy ();
966	}
967
968	/*
969	* sub_weight() recursively (outwards) subtracts a number from the
970	* weight of an object (and what is carried by it's environment(s)).
971	*/
972	void
973	sub_weight (object *op, signed long weight)
974	{
975	while (op != NULL)
976	{
977	if (op->type == CONTAINER)
978	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
979
980	op->carrying -= weight;
981	op = op->env;
982	}
983	}	1024	}
984		1025
985	/* op->remove ():	1026	/* op->remove ():
986	* This function removes the object op from the linked list of objects	1027	* This function removes the object op from the linked list of objects
987	* which it is currently tied to. When this function is done, the	1028	* which it is currently tied to. When this function is done, the
…		…
993	object::do_remove ()	1034	object::do_remove ()
994	{	1035	{
995	object *tmp, *last = 0;	1036	object *tmp, *last = 0;
996	object *otmp;	1037	object *otmp;
997		1038
998	if (QUERY_FLAG (this, FLAG_REMOVED))	1039	if (flag [FLAG_REMOVED])
999	return;	1040	return;
1000		1041
1001	SET_FLAG (this, FLAG_REMOVED);
1002	INVOKE_OBJECT (REMOVE, this);	1042	INVOKE_OBJECT (REMOVE, this);
		1043
		1044	flag [FLAG_REMOVED] = true;
1003		1045
1004	if (more)	1046	if (more)
1005	more->remove ();	1047	more->remove ();
1006		1048
1007	/*	1049	/*
1008	* In this case, the object to be removed is in someones	1050	* In this case, the object to be removed is in someones
1009	* inventory.	1051	* inventory.
1010	*/	1052	*/
1011	if (env)	1053	if (env)
1012	{	1054	{
1013	if (nrof)	1055	flag [FLAG_REMOVED] = false; // hack around the issue of visible_to checking flag_removed
1014	sub_weight (env, weight * nrof);	1056	if (object *pl = visible_to ())
1015	else	1057	esrv_del_item (pl->contr, count);
1016	sub_weight (env, weight + carrying);	1058	flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed
		1059
		1060	adjust_weight (env, -total_weight ());
		1061
		1062	/* we set up values so that it could be inserted into
		1063	* the map, but we don't actually do that - it is up
		1064	* to the caller to decide what we want to do.
		1065	*/
		1066	map = env->map;
		1067	x = env->x;
		1068	y = env->y;
		1069
		1070	// make sure cmov optimisation is applicable
		1071	*(above ? &above->below : &env->inv) = below;
		1072	*(below ? &below->above : &above ) = above; // &above is just a dummy
		1073
		1074	above = 0;
		1075	below = 0;
		1076	env = 0;
1017		1077
1018	/* NO_FIX_PLAYER is set when a great many changes are being	1078	/* NO_FIX_PLAYER is set when a great many changes are being
1019	* made to players inventory. If set, avoiding the call	1079	* made to players inventory. If set, avoiding the call
1020	* to save cpu time.	1080	* to save cpu time.
1021	*/	1081	*/
1022	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1082	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1023	otmp->update_stats ();	1083	otmp->update_stats ();
1024
1025	if (above)
1026	above->below = below;
1027	else
1028	env->inv = below;
1029
1030	if (below)
1031	below->above = above;
1032
1033	/* we set up values so that it could be inserted into
1034	* the map, but we don't actually do that - it is up
1035	* to the caller to decide what we want to do.
1036	*/
1037	x = env->x, y = env->y;
1038	map = env->map;
1039	above = 0, below = 0;
1040	env = 0;
1041	}	1084	}
1042	else if (map)	1085	else if (map)
1043	{	1086	{
1044	if (type == PLAYER)
1045	{
1046	// leaving a spot always closes any open container on the ground
1047	if (container && !container->env)
1048	// this causes spurious floorbox updates, but it ensures
1049	// that the CLOSE event is being sent.
1050	close_container ();
1051
1052	--map->players;
1053	map->touch ();
1054	}
1055
1056	map->dirty = true;	1087	map->dirty = true;
1057	mapspace &ms = this->ms ();	1088	mapspace &ms = this->ms ();
1058		1089
		1090	if (object *pl = ms.player ())
		1091	{
		1092	if (type == PLAYER) // this == pl(!)
		1093	{
		1094	// leaving a spot always closes any open container on the ground
		1095	if (container && !container->env)
		1096	// this causes spurious floorbox updates, but it ensures
		1097	// that the CLOSE event is being sent.
		1098	close_container ();
		1099
		1100	--map->players;
		1101	map->touch ();
		1102	}
		1103	else if (pl->container == this)
		1104	{
		1105	// removing a container should close it
		1106	close_container ();
		1107	}
		1108
		1109	esrv_del_item (pl->contr, count);
		1110	}
		1111
1059	/* link the object above us */	1112	/* link the object above us */
1060	if (above)	1113	// re-link, make sure compiler can easily use cmove
1061	above->below = below;	1114	*(above ? &above->below : &ms.top) = below;
1062	else	1115	*(below ? &below->above : &ms.bot) = above;
1063	ms.top = below; /* we were top, set new top */
1064
1065	/* Relink the object below us, if there is one */
1066	if (below)
1067	below->above = above;
1068	else
1069	{
1070	/* Nothing below, which means we need to relink map object for this space
1071	* use translated coordinates in case some oddness with map tiling is
1072	* evident
1073	*/
1074	if (GET_MAP_OB (map, x, y) != this)
1075	LOG (llevError, "remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom? %s\n", debug_desc ());
1076
1077	ms.bot = above; /* goes on above it. */
1078	}
1079		1116
1080	above = 0;	1117	above = 0;
1081	below = 0;	1118	below = 0;
1082		1119
		1120	ms.flags_ = 0;
		1121
1083	if (map->in_memory == MAP_SAVING)	1122	if (map->in_memory == MAP_SAVING)
1084	return;	1123	return;
1085		1124
1086	int check_walk_off = !flag [FLAG_NO_APPLY];	1125	int check_walk_off = !flag [FLAG_NO_APPLY];
		1126
		1127	if (object *pl = ms.player ())
		1128	{
		1129	if (pl->container == this)
		1130	/* If a container that the player is currently using somehow gets
		1131	* removed (most likely destroyed), update the player view
		1132	* appropriately.
		1133	*/
		1134	pl->close_container ();
		1135
		1136	//TODO: the floorbox prev/next might need updating
		1137	//esrv_del_item (pl->contr, count);
		1138	//TODO: update floorbox to preserve ordering
		1139	if (pl->contr->ns)
		1140	pl->contr->ns->floorbox_update ();
		1141	}
1087		1142
1088	for (tmp = ms.bot; tmp; tmp = tmp->above)	1143	for (tmp = ms.bot; tmp; tmp = tmp->above)
1089	{	1144	{
1090	/* No point updating the players look faces if he is the object	1145	/* No point updating the players look faces if he is the object
1091	* being removed.	1146	* being removed.
1092	*/	1147	*/
1093
1094	if (tmp->type == PLAYER && tmp != this)
1095	{
1096	/* If a container that the player is currently using somehow gets
1097	* removed (most likely destroyed), update the player view
1098	* appropriately.
1099	*/
1100	if (tmp->container == this)
1101	{
1102	flag [FLAG_APPLIED] = 0;
1103	tmp->container = 0;
1104	}
1105
1106	if (tmp->contr->ns)
1107	tmp->contr->ns->floorbox_update ();
1108	}
1109		1148
1110	/* See if object moving off should effect something */	1149	/* See if object moving off should effect something */
1111	if (check_walk_off	1150	if (check_walk_off
1112	&& ((move_type & tmp->move_off)	1151	&& ((move_type & tmp->move_off)
1113	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))	1152	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
…		…
1119	}	1158	}
1120		1159
1121	last = tmp;	1160	last = tmp;
1122	}	1161	}
1123		1162
1124	/* last == NULL if there are no objects on this space */
1125	//TODO: this makes little sense, why only update the topmost object?
1126	if (!last)
1127	map->at (x, y).flags_ = 0;
1128	else
1129	update_object (last, UP_OBJ_REMOVE);
1130
1131	if (flag [FLAG_BLOCKSVIEW] || glow_radius)	1163	if (flag [FLAG_BLOCKSVIEW] || glow_radius)
1132	update_all_los (map, x, y);	1164	update_all_los (map, x, y);
1133	}	1165	}
1134	}	1166	}
1135		1167
…		…
1145	merge_ob (object *op, object *top)	1177	merge_ob (object *op, object *top)
1146	{	1178	{
1147	if (!op->nrof)	1179	if (!op->nrof)
1148	return 0;	1180	return 0;
1149		1181
1150	if (top)	1182	if (!top)
1151	for (top = op; top && top->above; top = top->above)	1183	for (top = op; top && top->above; top = top->above)
1152	;	1184	;
1153		1185
1154	for (; top; top = top->below)	1186	for (; top; top = top->below)
1155	{
1156	if (top == op)
1157	continue;
1158
1159	if (object::can_merge (op, top))	1187	if (object::can_merge (op, top))
1160	{	1188	{
1161	top->nrof += op->nrof;	1189	top->nrof += op->nrof;
1162		1190
1163	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/	1191	if (object *pl = top->visible_to ())
1164	op->weight = 0; /* Don't want any adjustements now */	1192	esrv_update_item (UPD_NROF, pl, top);
		1193
		1194	op->weight = 0; // cancel the addition above
		1195	op->carrying = 0; // must be 0 already
		1196
1165	op->destroy ();	1197	op->destroy (1);
		1198
1166	return top;	1199	return top;
1167	}	1200	}
1168	}
1169		1201
1170	return 0;	1202	return 0;
1171	}	1203	}
1172		1204
1173	void	1205	void
…		…
1198	* job preparing multi-part monsters.	1230	* job preparing multi-part monsters.
1199	*/	1231	*/
1200	object *	1232	object *
1201	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)	1233	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1202	{	1234	{
		1235	op->remove ();
		1236
1203	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)	1237	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1204	{	1238	{
1205	tmp->x = x + tmp->arch->x;	1239	tmp->x = x + tmp->arch->x;
1206	tmp->y = y + tmp->arch->y;	1240	tmp->y = y + tmp->arch->y;
1207	}	1241	}
…		…
1230	* just 'op' otherwise	1264	* just 'op' otherwise
1231	*/	1265	*/
1232	object *	1266	object *
1233	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)	1267	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1234	{	1268	{
1235	assert (!op->flag [FLAG_FREED]);	1269	if (op->is_on_map ())
1236
1237	object *top, *floor = NULL;
1238
1239	op->remove ();
1240
1241	#if 0
1242	if (!m->active != !op->active)
1243	if (m->active)
1244	op->activate_recursive ();
1245	else
1246	op->deactivate_recursive ();
1247	#endif
1248
1249	if (out_of_map (m, op->x, op->y))
1250	{	1270	{
1251	LOG (llevError, "Trying to insert object outside the map.\n%s\n", op->debug_desc ());	1271	LOG (llevError, "insert_ob_in_map called for object already on map");
1252	#ifdef MANY_CORES
1253	/* Better to catch this here, as otherwise the next use of this object
1254	* is likely to cause a crash. Better to find out where it is getting
1255	* improperly inserted.
1256	*/
1257	abort ();	1272	abort ();
1258	#endif	1273	}
1259	return op;	1274
		1275	if (op->env)
1260	}	1276	{
		1277	LOG (llevError, "insert_ob_in_map called for object in an inventory (proceeding)");
		1278	op->remove ();
		1279	}
1261		1280
1262	if (object *more = op->more)	1281	if (op->face && !face_info (op->face))//D TODO: remove soon
1263	if (!insert_ob_in_map (more, m, originator, flag))	1282	{//D
1264	return 0;	1283	LOG (llevError | logBacktrace, "op->face out of bounds: %s", op->debug_desc ());//D
1265		1284	op->face = 1;//D
1266	CLEAR_FLAG (op, FLAG_REMOVED);	1285	}//D
1267		1286
1268	/* Ideally, the caller figures this out. However, it complicates a lot	1287	/* Ideally, the caller figures this out. However, it complicates a lot
1269	* of areas of callers (eg, anything that uses find_free_spot would now	1288	* of areas of callers (eg, anything that uses find_free_spot would now
1270	* need extra work	1289	* need extra work
1271	*/	1290	*/
1272	if (!xy_normalise (m, op->x, op->y))	1291	if (!xy_normalise (m, op->x, op->y))
		1292	{
		1293	op->head_ ()->destroy (1);// remove head_ once all tail object destroyers found
1273	return 0;	1294	return 0;
		1295	}
		1296
		1297	if (object *more = op->more)
		1298	if (!insert_ob_in_map (more, m, originator, flag))
		1299	return 0;
		1300
		1301	CLEAR_FLAG (op, FLAG_REMOVED);
1274		1302
1275	op->map = m;	1303	op->map = m;
1276	mapspace &ms = op->ms ();	1304	mapspace &ms = op->ms ();
1277		1305
1278	/* this has to be done after we translate the coordinates.	1306	/* this has to be done after we translate the coordinates.
1279	*/	1307	*/
1280	if (op->nrof && !(flag & INS_NO_MERGE))	1308	if (op->nrof && !(flag & INS_NO_MERGE))
1281	for (object *tmp = ms.bot; tmp; tmp = tmp->above)	1309	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1282	if (object::can_merge (op, tmp))	1310	if (object::can_merge (op, tmp))
1283	{	1311	{
		1312	// TODO: we actually want to update tmp, not op,
		1313	// but some caller surely breaks when we return tmp
		1314	// from here :/
1284	op->nrof += tmp->nrof;	1315	op->nrof += tmp->nrof;
1285	tmp->destroy ();	1316	tmp->destroy (1);
1286	}	1317	}
1287		1318
1288	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1319	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1289	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1320	CLEAR_FLAG (op, FLAG_INV_LOCKED);
1290		1321
…		…
1297	{	1328	{
1298	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");	1329	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");
1299	abort ();	1330	abort ();
1300	}	1331	}
1301		1332
		1333	if (!originator->is_on_map ())
		1334	LOG (llevDebug | logBacktrace, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map",
		1335	op->debug_desc (), originator->debug_desc ());
		1336
1302	op->above = originator;	1337	op->above = originator;
1303	op->below = originator->below;	1338	op->below = originator->below;
1304
1305	if (op->below)
1306	op->below->above = op;
1307	else
1308	ms.bot = op;
1309
1310	/* since *below* originator, no need to update top */
1311	originator->below = op;	1339	originator->below = op;
		1340
		1341	*(op->below ? &op->below->above : &ms.bot) = op;
1312	}	1342	}
1313	else	1343	else
1314	{	1344	{
1315	top = ms.bot;	1345	object *floor = 0;
		1346	object *top = ms.top;
1316		1347
1317	/* If there are other objects, then */	1348	/* If there are other objects, then */
1318	if ((!(flag & INS_MAP_LOAD)) && top)	1349	if (top)
1319	{	1350	{
1320	object *last = 0;
1321
1322	/*	1351	/*
1323	* If there are multiple objects on this space, we do some trickier handling.	1352	* If there are multiple objects on this space, we do some trickier handling.
1324	* We've already dealt with merging if appropriate.	1353	* We've already dealt with merging if appropriate.
1325	* Generally, we want to put the new object on top. But if	1354	* Generally, we want to put the new object on top. But if
1326	* flag contains INS_ABOVE_FLOOR_ONLY, once we find the last	1355	* flag contains INS_ABOVE_FLOOR_ONLY, once we find the last
…		…
1329	* once we get to them. This reduces the need to traverse over all of	1358	* once we get to them. This reduces the need to traverse over all of
1330	* them when adding another one - this saves quite a bit of cpu time	1359	* them when adding another one - this saves quite a bit of cpu time
1331	* when lots of spells are cast in one area. Currently, it is presumed	1360	* when lots of spells are cast in one area. Currently, it is presumed
1332	* that flying non pickable objects are spell objects.	1361	* that flying non pickable objects are spell objects.
1333	*/	1362	*/
1334	for (top = ms.bot; top; top = top->above)	1363	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1335	{	1364	{
1336	if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))	1365	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) || QUERY_FLAG (tmp, FLAG_OVERLAY_FLOOR))
1337	floor = top;	1366	floor = tmp;
1338		1367
1339	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))	1368	if (QUERY_FLAG (tmp, FLAG_NO_PICK) && (tmp->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1340	{	1369	{
1341	/* We insert above top, so we want this object below this */	1370	/* We insert above top, so we want this object below this */
1342	top = top->below;	1371	top = tmp->below;
1343	break;	1372	break;
1344	}	1373	}
1345		1374
1346	last = top;	1375	top = tmp;
1347	}	1376	}
1348
1349	/* Don't want top to be NULL, so set it to the last valid object */
1350	top = last;
1351		1377
1352	/* We let update_position deal with figuring out what the space	1378	/* We let update_position deal with figuring out what the space
1353	* looks like instead of lots of conditions here.	1379	* looks like instead of lots of conditions here.
1354	* makes things faster, and effectively the same result.	1380	* makes things faster, and effectively the same result.
1355	*/	1381	*/
…		…
1362	*/	1388	*/
1363	if (!(flag & INS_ON_TOP)	1389	if (!(flag & INS_ON_TOP)
1364	&& ms.flags () & P_BLOCKSVIEW	1390	&& ms.flags () & P_BLOCKSVIEW
1365	&& (op->face && !faces [op->face].visibility))	1391	&& (op->face && !faces [op->face].visibility))
1366	{	1392	{
		1393	object *last;
		1394
1367	for (last = top; last != floor; last = last->below)	1395	for (last = top; last != floor; last = last->below)
1368	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1396	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1369	break;	1397	break;
1370		1398
1371	/* Check to see if we found the object that blocks view,	1399	/* Check to see if we found the object that blocks view,
…		…
1375	*/	1403	*/
1376	if (last && last->below && last != floor)	1404	if (last && last->below && last != floor)
1377	top = last->below;	1405	top = last->below;
1378	}	1406	}
1379	} /* If objects on this space */	1407	} /* If objects on this space */
1380	if (flag & INS_MAP_LOAD)
1381	top = ms.top;
1382		1408
1383	if (flag & INS_ABOVE_FLOOR_ONLY)	1409	if (flag & INS_ABOVE_FLOOR_ONLY)
1384	top = floor;	1410	top = floor;
1385		1411
1386	/* Top is the object that our object (op) is going to get inserted above.	1412	// insert object above top, or bottom-most if top = 0
1387	*/
1388
1389	/* First object on this space */
1390	if (!top)	1413	if (!top)
1391	{	1414	{
		1415	op->below = 0;
1392	op->above = ms.bot;	1416	op->above = ms.bot;
1393
1394	if (op->above)
1395	op->above->below = op;
1396
1397	op->below = 0;
1398	ms.bot = op;	1417	ms.bot = op;
		1418
		1419	*(op->above ? &op->above->below : &ms.top) = op;
1399	}	1420	}
1400	else	1421	else
1401	{ /* get inserted into the stack above top */	1422	{
1402	op->above = top->above;	1423	op->above = top->above;
1403
1404	if (op->above)
1405	op->above->below = op;	1424	top->above = op;
1406		1425
1407	op->below = top;	1426	op->below = top;
1408	top->above = op;	1427	*(op->above ? &op->above->below : &ms.top) = op;
1409	}	1428	}
1410		1429	}
1411	if (!op->above)
1412	ms.top = op;
1413	} /* else not INS_BELOW_ORIGINATOR */
1414		1430
1415	if (op->type == PLAYER)	1431	if (op->type == PLAYER)
1416	{	1432	{
1417	op->contr->do_los = 1;	1433	op->contr->do_los = 1;
1418	++op->map->players;	1434	++op->map->players;
1419	op->map->touch ();	1435	op->map->touch ();
1420	}	1436	}
1421		1437
1422	op->map->dirty = true;	1438	op->map->dirty = true;
1423		1439
1424	/* If we have a floor, we know the player, if any, will be above
1425	* it, so save a few ticks and start from there.
1426	*/
1427	if (!(flag & INS_MAP_LOAD))
1428	if (object *pl = ms.player ())	1440	if (object *pl = ms.player ())
		1441	//TODO: the floorbox prev/next might need updating
		1442	//esrv_send_item (pl, op);
		1443	//TODO: update floorbox to preserve ordering
1429	if (pl->contr->ns)	1444	if (pl->contr->ns)
1430	pl->contr->ns->floorbox_update ();	1445	pl->contr->ns->floorbox_update ();
1431		1446
1432	/* If this object glows, it may affect lighting conditions that are	1447	/* If this object glows, it may affect lighting conditions that are
1433	* visible to others on this map. But update_all_los is really	1448	* visible to others on this map. But update_all_los is really
1434	* an inefficient way to do this, as it means los for all players	1449	* an inefficient way to do this, as it means los for all players
1435	* on the map will get recalculated. The players could very well	1450	* on the map will get recalculated. The players could very well
…		…
1477	* op is the object to insert it under: supplies x and the map.	1492	* op is the object to insert it under: supplies x and the map.
1478	*/	1493	*/
1479	void	1494	void
1480	replace_insert_ob_in_map (const char *arch_string, object *op)	1495	replace_insert_ob_in_map (const char *arch_string, object *op)
1481	{	1496	{
1482	object *tmp, *tmp1;
1483
1484	/* first search for itself and remove any old instances */	1497	/* first search for itself and remove any old instances */
1485		1498
1486	for (tmp = op->ms ().bot; tmp; tmp = tmp->above)	1499	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1487	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */	1500	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */
1488	tmp->destroy ();	1501	tmp->destroy (1);
1489		1502
1490	tmp1 = arch_to_object (archetype::find (arch_string));	1503	object *tmp = arch_to_object (archetype::find (arch_string));
1491		1504
1492	tmp1->x = op->x;	1505	tmp->x = op->x;
1493	tmp1->y = op->y;	1506	tmp->y = op->y;
		1507
1494	insert_ob_in_map (tmp1, op->map, op, 0);	1508	insert_ob_in_map (tmp, op->map, op, 0);
1495	}	1509	}
1496		1510
1497	object *	1511	object *
1498	object::insert_at (object *where, object *originator, int flags)	1512	object::insert_at (object *where, object *originator, int flags)
1499	{	1513	{
		1514	if (where->env)
		1515	return where->env->insert (this);
		1516	else
1500	return where->map->insert (this, where->x, where->y, originator, flags);	1517	return where->map->insert (this, where->x, where->y, originator, flags);
1501	}	1518	}
1502		1519
1503	/*	1520	/*
1504	* get_split_ob(ob,nr) splits up ob into two parts. The part which
1505	* is returned contains nr objects, and the remaining parts contains
1506	* the rest (or is removed and freed if that number is 0).
1507	* On failure, NULL is returned, and the reason put into the
1508	* global static errmsg array.
1509	*/
1510	object *
1511	get_split_ob (object *orig_ob, uint32 nr)
1512	{
1513	object *newob;
1514	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1515
1516	if (orig_ob->nrof < nr)
1517	{
1518	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1519	return NULL;
1520	}
1521
1522	newob = object_create_clone (orig_ob);
1523
1524	if ((orig_ob->nrof -= nr) < 1)
1525	orig_ob->destroy (1);
1526	else if (!is_removed)
1527	{
1528	if (orig_ob->env != NULL)
1529	sub_weight (orig_ob->env, orig_ob->weight * nr);
1530	if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)
1531	{
1532	strcpy (errmsg, "Tried to split object whose map is not in memory.");
1533	LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n");
1534	return NULL;
1535	}
1536	}
1537
1538	newob->nrof = nr;
1539
1540	return newob;
1541	}
1542
1543	/*
1544	* decrease_ob_nr(object, number) decreases a specified number from	1521	* decrease(object, number) decreases a specified number from
1545	* the amount of an object. If the amount reaches 0, the object	1522	* the amount of an object. If the amount reaches 0, the object
1546	* is subsequently removed and freed.	1523	* is subsequently removed and freed.
1547	*	1524	*
1548	* Return value: 'op' if something is left, NULL if the amount reached 0	1525	* Return value: 'op' if something is left, NULL if the amount reached 0
1549	*/	1526	*/
		1527	bool
		1528	object::decrease (sint32 nr)
		1529	{
		1530	if (!nr)
		1531	return true;
		1532
		1533	nr = min (nr, nrof);
		1534
		1535	if (nrof > nr)
		1536	{
		1537	nrof -= nr;
		1538	adjust_weight (env, -weight * max (1, nr)); // carrying == 0
		1539
		1540	if (object *pl = visible_to ())
		1541	esrv_update_item (UPD_NROF, pl, this);
		1542
		1543	return true;
		1544	}
		1545	else
		1546	{
		1547	destroy ();
		1548	return false;
		1549	}
		1550	}
		1551
		1552	/*
		1553	* split(ob,nr) splits up ob into two parts. The part which
		1554	* is returned contains nr objects, and the remaining parts contains
		1555	* the rest (or is removed and returned if that number is 0).
		1556	* On failure, NULL is returned.
		1557	*/
1550	object *	1558	object *
1551	decrease_ob_nr (object *op, uint32 i)	1559	object::split (sint32 nr)
1552	{	1560	{
1553	object *tmp;	1561	int have = number_of ();
1554		1562
1555	if (i == 0) /* objects with op->nrof require this check */	1563	if (have < nr)
1556	return op;	1564	return 0;
1557		1565	else if (have == nr)
1558	if (i > op->nrof)
1559	i = op->nrof;
1560
1561	if (QUERY_FLAG (op, FLAG_REMOVED))
1562	op->nrof -= i;
1563	else if (op->env)
1564	{	1566	{
1565	/* is this object in the players inventory, or sub container
1566	* therein?
1567	*/
1568	tmp = op->in_player ();
1569	/* nope. Is this a container the player has opened?
1570	* If so, set tmp to that player.
1571	* IMO, searching through all the players will mostly
1572	* likely be quicker than following op->env to the map,
1573	* and then searching the map for a player.
1574	*/
1575	if (!tmp)
1576	for_all_players (pl)
1577	if (pl->ob->container == op->env)
1578	{
1579	tmp = pl->ob;
1580	break;
1581	}
1582
1583	if (i < op->nrof)
1584	{
1585	sub_weight (op->env, op->weight * i);
1586	op->nrof -= i;
1587	if (tmp)
1588	esrv_send_item (tmp, op);
1589	}
1590	else
1591	{
1592	op->remove ();	1567	remove ();
1593	op->nrof = 0;	1568	return this;
1594	if (tmp)
1595	esrv_del_item (tmp->contr, op->count);
1596	}
1597	}	1569	}
1598	else	1570	else
1599	{	1571	{
1600	object *above = op->above;	1572	decrease (nr);
1601		1573
1602	if (i < op->nrof)	1574	object *op = deep_clone ();
1603	op->nrof -= i;	1575	op->nrof = nr;
1604	else
1605	{
1606	op->remove ();
1607	op->nrof = 0;
1608	}
1609
1610	/* Since we just removed op, op->above is null */
1611	for (tmp = above; tmp; tmp = tmp->above)
1612	if (tmp->type == PLAYER)
1613	{
1614	if (op->nrof)
1615	esrv_send_item (tmp, op);
1616	else
1617	esrv_del_item (tmp->contr, op->count);
1618	}
1619	}
1620
1621	if (op->nrof)
1622	return op;	1576	return op;
1623	else
1624	{
1625	op->destroy ();
1626	return 0;
1627	}
1628	}
1629
1630	/*
1631	* add_weight(object, weight) adds the specified weight to an object,
1632	* and also updates how much the environment(s) is/are carrying.
1633	*/
1634	void
1635	add_weight (object *op, signed long weight)
1636	{
1637	while (op != NULL)
1638	{
1639	if (op->type == CONTAINER)
1640	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1641
1642	op->carrying += weight;
1643	op = op->env;
1644	}	1577	}
1645	}	1578	}
1646		1579
1647	object *	1580	object *
1648	insert_ob_in_ob (object *op, object *where)	1581	insert_ob_in_ob (object *op, object *where)
…		…
1673	* be != op, if items are merged. -Tero	1606	* be != op, if items are merged. -Tero
1674	*/	1607	*/
1675	object *	1608	object *
1676	object::insert (object *op)	1609	object::insert (object *op)
1677	{	1610	{
1678	object *tmp, *otmp;
1679
1680	if (!QUERY_FLAG (op, FLAG_REMOVED))
1681	op->remove ();
1682
1683	if (op->more)	1611	if (op->more)
1684	{	1612	{
1685	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);	1613	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1686	return op;	1614	return op;
1687	}	1615	}
1688		1616
1689	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1617	op->remove ();
1690	CLEAR_FLAG (op, FLAG_REMOVED);	1618
		1619	op->flag [FLAG_OBJ_ORIGINAL] = 0;
		1620
1691	if (op->nrof)	1621	if (op->nrof)
1692	{
1693	for (tmp = inv; tmp != NULL; tmp = tmp->below)	1622	for (object *tmp = inv; tmp; tmp = tmp->below)
1694	if (object::can_merge (tmp, op))	1623	if (object::can_merge (tmp, op))
1695	{	1624	{
1696	/* return the original object and remove inserted object	1625	/* return the original object and remove inserted object
1697	(client needs the original object) */	1626	(client needs the original object) */
1698	tmp->nrof += op->nrof;	1627	tmp->nrof += op->nrof;
1699	/* Weight handling gets pretty funky. Since we are adding to	1628
1700	* tmp->nrof, we need to increase the weight.	1629	if (object *pl = tmp->visible_to ())
1701	*/	1630	esrv_update_item (UPD_NROF, pl, tmp);
		1631
1702	add_weight (this, op->weight * op->nrof);	1632	adjust_weight (this, op->total_weight ());
1703	SET_FLAG (op, FLAG_REMOVED);	1633
1704	op->destroy (); /* free the inserted object */	1634	op->destroy (1);
1705	op = tmp;	1635	op = tmp;
1706	op->remove (); /* and fix old object's links */	1636	goto inserted;
1707	CLEAR_FLAG (op, FLAG_REMOVED);
1708	break;
1709	}	1637	}
1710		1638
1711	/* I assume combined objects have no inventory	1639	op->owner = 0; // it's his/hers now. period.
1712	* We add the weight - this object could have just been removed
1713	* (if it was possible to merge). calling remove_ob will subtract
1714	* the weight, so we need to add it in again, since we actually do
1715	* the linking below
1716	*/
1717	add_weight (this, op->weight * op->nrof);
1718	}
1719	else
1720	add_weight (this, (op->weight + op->carrying));
1721
1722	otmp = this->in_player ();
1723	if (otmp && otmp->contr)
1724	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1725	otmp->update_stats ();
1726
1727	op->map = 0;	1640	op->map = 0;
1728	op->env = this;	1641	op->x = 0;
		1642	op->y = 0;
		1643
1729	op->above = 0;	1644	op->above = 0;
1730	op->below = 0;	1645	op->below = inv;
1731	op->x = 0, op->y = 0;	1646	op->env = this;
1732		1647
		1648	if (inv)
		1649	inv->above = op;
		1650
		1651	inv = op;
		1652
		1653	op->flag [FLAG_REMOVED] = 0;
		1654
		1655	if (object *pl = op->visible_to ())
		1656	esrv_send_item (pl, op);
		1657
		1658	adjust_weight (this, op->total_weight ());
		1659
		1660	inserted:
1733	/* reset the light list and los of the players on the map */	1661	/* reset the light list and los of the players on the map */
1734	if ((op->glow_radius != 0) && map)	1662	if (op->glow_radius && map && map->darkness)
1735	{
1736	#ifdef DEBUG_LIGHTS
1737	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1738	#endif /* DEBUG_LIGHTS */
1739	if (map->darkness)
1740	update_all_los (map, x, y);	1663	update_all_los (map, x, y);
1741	}
1742		1664
1743	/* Client has no idea of ordering so lets not bother ordering it here.	1665	// if this is a player's inventory, update stats
1744	* It sure simplifies this function...	1666	if (type == PLAYER && !flag [FLAG_NO_FIX_PLAYER])
1745	*/	1667	update_stats ();
1746	if (!inv)
1747	inv = op;
1748	else
1749	{
1750	op->below = inv;
1751	op->below->above = op;
1752	inv = op;
1753	}
1754		1668
1755	INVOKE_OBJECT (INSERT, this);	1669	INVOKE_OBJECT (INSERT, this);
1756		1670
1757	return op;	1671	return op;
1758	}	1672	}
…		…
1886	LOG (llevError, "Present_arch called outside map.\n");	1800	LOG (llevError, "Present_arch called outside map.\n");
1887	return NULL;	1801	return NULL;
1888	}	1802	}
1889		1803
1890	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)	1804	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1891	if (tmp->arch == at)	1805	if (tmp->arch->archname == at->archname)
1892	return tmp;	1806	return tmp;
1893		1807
1894	return NULL;	1808	return NULL;
1895	}	1809	}
1896		1810
…		…
1960	* The first matching object is returned, or NULL if none.	1874	* The first matching object is returned, or NULL if none.
1961	*/	1875	*/
1962	object *	1876	object *
1963	present_arch_in_ob (const archetype *at, const object *op)	1877	present_arch_in_ob (const archetype *at, const object *op)
1964	{	1878	{
1965	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)	1879	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1966	if (tmp->arch == at)	1880	if (tmp->arch->archname == at->archname)
1967	return tmp;	1881	return tmp;
1968		1882
1969	return NULL;	1883	return NULL;
1970	}	1884	}
1971		1885
…		…
1973	* activate recursively a flag on an object inventory	1887	* activate recursively a flag on an object inventory
1974	*/	1888	*/
1975	void	1889	void
1976	flag_inv (object *op, int flag)	1890	flag_inv (object *op, int flag)
1977	{	1891	{
1978	if (op->inv)
1979	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)	1892	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1980	{	1893	{
1981	SET_FLAG (tmp, flag);	1894	SET_FLAG (tmp, flag);
1982	flag_inv (tmp, flag);	1895	flag_inv (tmp, flag);
1983	}	1896	}
1984	}	1897	}
1985		1898
1986	/*	1899	/*
1987	* deactivate recursively a flag on an object inventory	1900	* deactivate recursively a flag on an object inventory
1988	*/	1901	*/
1989	void	1902	void
1990	unflag_inv (object *op, int flag)	1903	unflag_inv (object *op, int flag)
1991	{	1904	{
1992	if (op->inv)
1993	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)	1905	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1994	{	1906	{
1995	CLEAR_FLAG (tmp, flag);	1907	CLEAR_FLAG (tmp, flag);
1996	unflag_inv (tmp, flag);	1908	unflag_inv (tmp, flag);
1997	}	1909	}
1998	}	1910	}
1999		1911
2000	/*	1912	/*
2001	* find_free_spot(object, map, x, y, start, stop) will search for	1913	* find_free_spot(object, map, x, y, start, stop) will search for
2002	* a spot at the given map and coordinates which will be able to contain	1914	* a spot at the given map and coordinates which will be able to contain
…		…
2004	* to search (see the freearr_x/y[] definition).	1916	* to search (see the freearr_x/y[] definition).
2005	* It returns a random choice among the alternatives found.	1917	* It returns a random choice among the alternatives found.
2006	* start and stop are where to start relative to the free_arr array (1,9	1918	* start and stop are where to start relative to the free_arr array (1,9
2007	* does all 4 immediate directions). This returns the index into the	1919	* does all 4 immediate directions). This returns the index into the
2008	* array of the free spot, -1 if no spot available (dir 0 = x,y)	1920	* array of the free spot, -1 if no spot available (dir 0 = x,y)
2009	* Note - this only checks to see if there is space for the head of the
2010	* object - if it is a multispace object, this should be called for all
2011	* pieces.
2012	* Note2: This function does correctly handle tiled maps, but does not	1921	* Note: This function does correctly handle tiled maps, but does not
2013	* inform the caller. However, insert_ob_in_map will update as	1922	* inform the caller. However, insert_ob_in_map will update as
2014	* necessary, so the caller shouldn't need to do any special work.	1923	* necessary, so the caller shouldn't need to do any special work.
2015	* Note - updated to take an object instead of archetype - this is necessary	1924	* Note - updated to take an object instead of archetype - this is necessary
2016	* because arch_blocked (now ob_blocked) needs to know the movement type	1925	* because arch_blocked (now ob_blocked) needs to know the movement type
2017	* to know if the space in question will block the object. We can't use	1926	* to know if the space in question will block the object. We can't use
…		…
2019	* customized, changed states, etc.	1928	* customized, changed states, etc.
2020	*/	1929	*/
2021	int	1930	int
2022	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)	1931	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2023	{	1932	{
		1933	int altern[SIZEOFFREE];
2024	int index = 0, flag;	1934	int index = 0, flag;
2025	int altern[SIZEOFFREE];
2026		1935
2027	for (int i = start; i < stop; i++)	1936	for (int i = start; i < stop; i++)
2028	{	1937	{
2029	flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]);	1938	mapxy pos (m, x, y); pos.move (i);
2030	if (!flag)	1939
		1940	if (!pos.normalise ())
		1941	continue;
		1942
		1943	mapspace &ms = *pos;
		1944
		1945	if (ms.flags () & P_IS_ALIVE)
		1946	continue;
		1947
		1948	/* However, often
		1949	* ob doesn't have any move type (when used to place exits)
		1950	* so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.
		1951	*/
		1952	if (ob && ob->move_type == 0 && ms.move_block != MOVE_ALL)
		1953	{
2031	altern [index++] = i;	1954	altern [index++] = i;
		1955	continue;
		1956	}
2032		1957
2033	/* Basically, if we find a wall on a space, we cut down the search size.	1958	/* Basically, if we find a wall on a space, we cut down the search size.
2034	* In this way, we won't return spaces that are on another side of a wall.	1959	* In this way, we won't return spaces that are on another side of a wall.
2035	* This mostly work, but it cuts down the search size in all directions -	1960	* This mostly work, but it cuts down the search size in all directions -
2036	* if the space being examined only has a wall to the north and empty	1961	* if the space being examined only has a wall to the north and empty
2037	* spaces in all the other directions, this will reduce the search space	1962	* spaces in all the other directions, this will reduce the search space
2038	* to only the spaces immediately surrounding the target area, and	1963	* to only the spaces immediately surrounding the target area, and
2039	* won't look 2 spaces south of the target space.	1964	* won't look 2 spaces south of the target space.
2040	*/	1965	*/
2041	else if ((flag & P_NO_PASS) && maxfree[i] < stop)	1966	if (ms.move_block == MOVE_ALL && maxfree[i] < stop)
		1967	{
2042	stop = maxfree[i];	1968	stop = maxfree[i];
		1969	continue;
		1970	}
		1971
		1972	/* Note it is intentional that we check ob - the movement type of the
		1973	* head of the object should correspond for the entire object.
		1974	*/
		1975	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
		1976	continue;
		1977
		1978	if (ob->blocked (m, pos.x, pos.y))
		1979	continue;
		1980
		1981	altern [index++] = i;
2043	}	1982	}
2044		1983
2045	if (!index)	1984	if (!index)
2046	return -1;	1985	return -1;
2047		1986
…		…
2056	*/	1995	*/
2057	int	1996	int
2058	find_first_free_spot (const object *ob, maptile *m, int x, int y)	1997	find_first_free_spot (const object *ob, maptile *m, int x, int y)
2059	{	1998	{
2060	for (int i = 0; i < SIZEOFFREE; i++)	1999	for (int i = 0; i < SIZEOFFREE; i++)
2061	if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]))	2000	if (!ob->blocked (m, x + freearr_x[i], y + freearr_y[i]))
2062	return i;	2001	return i;
2063		2002
2064	return -1;	2003	return -1;
2065	}	2004	}
2066		2005
…		…
2343	* Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause	2282	* Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause
2344	* core dumps if they do.	2283	* core dumps if they do.
2345	*	2284	*
2346	* Add a check so we can't pick up invisible objects (0.93.8)	2285	* Add a check so we can't pick up invisible objects (0.93.8)
2347	*/	2286	*/
2348
2349	int	2287	int
2350	can_pick (const object *who, const object *item)	2288	can_pick (const object *who, const object *item)
2351	{	2289	{
2352	return /*QUERY_FLAG(who,FLAG_WIZ)|| */	2290	return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2353	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&	2291	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
…		…
2356		2294
2357	/*	2295	/*
2358	* create clone from object to another	2296	* create clone from object to another
2359	*/	2297	*/
2360	object *	2298	object *
2361	object_create_clone (object *asrc)	2299	object::deep_clone ()
2362	{	2300	{
2363	object *dst = 0, *tmp, *src, *prev, *item;	2301	assert (("deep_clone called on non-head object", is_head ()));
2364		2302
2365	if (!asrc)	2303	object *dst = clone ();
2366	return 0;
2367		2304
2368	src = asrc->head_ ();	2305	object *prev = dst;
2369
2370	prev = 0;
2371	for (object *part = src; part; part = part->more)	2306	for (object *part = this->more; part; part = part->more)
2372	{	2307	{
2373	tmp = part->clone ();	2308	object *tmp = part->clone ();
2374	tmp->x -= src->x;
2375	tmp->y -= src->y;
2376
2377	if (!part->head)
2378	{
2379	dst = tmp;
2380	tmp->head = 0;
2381	}
2382	else
2383	tmp->head = dst;	2309	tmp->head = dst;
2384
2385	tmp->more = 0;
2386
2387	if (prev)
2388	prev->more = tmp;	2310	prev->more = tmp;
2389
2390	prev = tmp;	2311	prev = tmp;
2391	}	2312	}
2392		2313
2393	for (item = src->inv; item; item = item->below)	2314	for (object *item = inv; item; item = item->below)
2394	insert_ob_in_ob (object_create_clone (item), dst);	2315	insert_ob_in_ob (item->deep_clone (), dst);
2395		2316
2396	return dst;	2317	return dst;
2397	}	2318	}
2398		2319
2399	/* This returns the first object in who's inventory that	2320	/* This returns the first object in who's inventory that
…		…
2408	return tmp;	2329	return tmp;
2409		2330
2410	return 0;	2331	return 0;
2411	}	2332	}
2412		2333
2413	/* If ob has a field named key, return the link from the list,	2334	const shstr &
2414	* otherwise return NULL.	2335	object::kv_get (const shstr &key) const
2415	*
2416	* key must be a passed in shared string - otherwise, this won't
2417	* do the desired thing.
2418	*/
2419	key_value *
2420	get_ob_key_link (const object *ob, const char *key)
2421	{	2336	{
2422	for (key_value *link = ob->key_values; link; link = link->next)	2337	for (key_value *kv = key_values; kv; kv = kv->next)
2423	if (link->key == key)	2338	if (kv->key == key)
2424	return link;
2425
2426	return 0;
2427	}
2428
2429	/*
2430	* Returns the value of op has an extra_field for key, or NULL.
2431	*
2432	* The argument doesn't need to be a shared string.
2433	*
2434	* The returned string is shared.
2435	*/
2436	const char *
2437	get_ob_key_value (const object *op, const char *const key)
2438	{
2439	key_value *link;
2440	shstr_cmp canonical_key (key);
2441
2442	if (!canonical_key)
2443	{
2444	/* 1. There being a field named key on any object
2445	* implies there'd be a shared string to find.
2446	* 2. Since there isn't, no object has this field.
2447	* 3. Therefore, *this* object doesn't have this field.
2448	*/
2449	return 0;
2450	}
2451
2452	/* This is copied from get_ob_key_link() above -
2453	* only 4 lines, and saves the function call overhead.
2454	*/
2455	for (link = op->key_values; link; link = link->next)
2456	if (link->key == canonical_key)
2457	return link->value;	2339	return kv->value;
2458		2340
2459	return 0;	2341	return shstr_null;
2460	}	2342	}
2461		2343
2462	/*	2344	void
2463	* Updates the canonical_key in op to value.	2345	object::kv_set (const shstr &key, const shstr &value)
2464	*
2465	* canonical_key is a shared string (value doesn't have to be).
2466	*
2467	* Unless add_key is TRUE, it won't add fields, only change the value of existing
2468	* keys.
2469	*
2470	* Returns TRUE on success.
2471	*/
2472	int
2473	set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key)
2474	{	2346	{
2475	key_value *field = NULL, *last = NULL;	2347	for (key_value *kv = key_values; kv; kv = kv->next)
2476		2348	if (kv->key == key)
2477	for (field = op->key_values; field != NULL; field = field->next)
2478	{
2479	if (field->key != canonical_key)
2480	{	2349	{
2481	last = field;	2350	kv->value = value;
2482	continue;	2351	return;
2483	}	2352	}
2484		2353
2485	if (value)	2354	key_value *kv = new key_value;
2486	field->value = value;	2355
2487	else	2356	kv->next = key_values;
		2357	kv->key = key;
		2358	kv->value = value;
		2359
		2360	key_values = kv;
		2361	}
		2362
		2363	void
		2364	object::kv_del (const shstr &key)
		2365	{
		2366	for (key_value **kvp = &key_values; *kvp; kvp = &(*kvp)->next)
		2367	if ((*kvp)->key == key)
2488	{	2368	{
2489	/* Basically, if the archetype has this key set,	2369	key_value *kv = *kvp;
2490	* we need to store the null value so when we save	2370	*kvp = (*kvp)->next;
2491	* it, we save the empty value so that when we load,	2371	delete kv;
2492	* we get this value back again.	2372	return;
2493	*/
2494	if (get_ob_key_link (op->arch, canonical_key))
2495	field->value = 0;
2496	else
2497	{
2498	if (last)
2499	last->next = field->next;
2500	else
2501	op->key_values = field->next;
2502
2503	delete field;
2504	}
2505	}	2373	}
2506	return TRUE;
2507	}
2508	/* IF we get here, key doesn't exist */
2509
2510	/* No field, we'll have to add it. */
2511
2512	if (!add_key)
2513	return FALSE;
2514
2515	/* There isn't any good reason to store a null
2516	* value in the key/value list. If the archetype has
2517	* this key, then we should also have it, so shouldn't
2518	* be here. If user wants to store empty strings,
2519	* should pass in ""
2520	*/
2521	if (value == NULL)
2522	return TRUE;
2523
2524	field = new key_value;
2525
2526	field->key = canonical_key;
2527	field->value = value;
2528	/* Usual prepend-addition. */
2529	field->next = op->key_values;
2530	op->key_values = field;
2531
2532	return TRUE;
2533	}
2534
2535	/*
2536	* Updates the key in op to value.
2537	*
2538	* If add_key is FALSE, this will only update existing keys,
2539	* and not add new ones.
2540	* In general, should be little reason FALSE is ever passed in for add_key
2541	*
2542	* Returns TRUE on success.
2543	*/
2544	int
2545	set_ob_key_value (object *op, const char *key, const char *value, int add_key)
2546	{
2547	shstr key_ (key);
2548
2549	return set_ob_key_value_s (op, key_, value, add_key);
2550	}	2374	}
2551		2375
2552	object::depth_iterator::depth_iterator (object *container)	2376	object::depth_iterator::depth_iterator (object *container)
2553	: iterator_base (container)	2377	: iterator_base (container)
2554	{	2378	{
…		…
2604	{	2428	{
2605	char flagdesc[512];	2429	char flagdesc[512];
2606	char info2[256 * 4];	2430	char info2[256 * 4];
2607	char *p = info;	2431	char *p = info;
2608		2432
2609	p += snprintf (p, 512, "{cnt:%d,uuid:<1.%" PRIx64 ">,name:\"%s\"%s%s,flags:[%s],type:%d}",	2433	p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s%s,flags:[%s],type:%d}",
2610	count, uuid.seq,	2434	count,
		2435	uuid.c_str (),
2611	&name,	2436	&name,
2612	title ? "\",title:\"" : "",	2437	title ? ",title:\"" : "",
2613	title ? (const char *)title : "",	2438	title ? (const char *)title : "",
		2439	title ? "\"" : "",
2614	flag_desc (flagdesc, 512), type);	2440	flag_desc (flagdesc, 512), type);
2615		2441
2616	if (env)	2442	if (!flag[FLAG_REMOVED] && env)
2617	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2443	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2618		2444
2619	if (map)	2445	if (map)
2620	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);	2446	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2621		2447
…		…
2651	object::open_container (object *new_container)	2477	object::open_container (object *new_container)
2652	{	2478	{
2653	if (container == new_container)	2479	if (container == new_container)
2654	return;	2480	return;
2655		2481
2656	if (object *old_container = container)	2482	object *old_container = container;
		2483
		2484	if (old_container)
2657	{	2485	{
2658	if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))	2486	if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
2659	return;	2487	return;
2660		2488
2661	#if 0	2489	#if 0
…		…
2663	if (object *closer = old_container->inv)	2491	if (object *closer = old_container->inv)
2664	if (closer->type == CLOSE_CON)	2492	if (closer->type == CLOSE_CON)
2665	closer->destroy ();	2493	closer->destroy ();
2666	#endif	2494	#endif
2667		2495
		2496	// make sure the container is available
		2497	esrv_send_item (this, old_container);
		2498
2668	old_container->flag [FLAG_APPLIED] = 0;	2499	old_container->flag [FLAG_APPLIED] = false;
2669	container = 0;	2500	container = 0;
2670		2501
		2502	// client needs item update to make it work, client bug requires this to be separate
2671	esrv_update_item (UPD_FLAGS, this, old_container);	2503	esrv_update_item (UPD_FLAGS, this, old_container);
		2504
2672	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));	2505	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
		2506	play_sound (sound_find ("chest_close"));
2673	}	2507	}
2674		2508
2675	if (new_container)	2509	if (new_container)
2676	{	2510	{
2677	if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))	2511	if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))
…		…
2688	}	2522	}
2689	#endif	2523	#endif
2690		2524
2691	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));	2525	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));
2692		2526
		2527	// make sure the container is available, client bug requires this to be separate
		2528	esrv_send_item (this, new_container);
		2529
2693	new_container->flag [FLAG_APPLIED] = 1;	2530	new_container->flag [FLAG_APPLIED] = true;
2694	container = new_container;	2531	container = new_container;
2695		2532
		2533	// client needs flag change
2696	esrv_update_item (UPD_FLAGS, this, new_container);	2534	esrv_update_item (UPD_FLAGS, this, new_container);
2697	esrv_send_inventory (this, new_container);	2535	esrv_send_inventory (this, new_container);
		2536	play_sound (sound_find ("chest_open"));
2698	}	2537	}
		2538	// else if (!old_container->env && contr && contr->ns)
		2539	// contr->ns->floorbox_reset ();
2699	}	2540	}
2700		2541
2701	object *	2542	object *
2702	object::force_find (const shstr name)	2543	object::force_find (const shstr name)
2703	{	2544	{
…		…
2729		2570
2730	insert (force);	2571	insert (force);
2731	}	2572	}
2732		2573
2733	void	2574	void
2734	object::play_sound (faceidx sound) const	2575	object::play_sound (faceidx sound)
2735	{	2576	{
2736	if (map)	2577	if (!sound)
		2578	return;
		2579
		2580	if (flag [FLAG_REMOVED])
		2581	return;
		2582
		2583	if (env)
		2584	{
		2585	if (object *pl = in_player ())
		2586	pl->contr->play_sound (sound);
		2587	}
		2588	else
2737	map->play_sound (sound, x, y);	2589	map->play_sound (sound, x, y);
2738	}	2590	}
		2591

Diff Legend

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