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

Diff Legend

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