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.161 by root, Wed Jun 13 21:09:39 2007 UTC vs.
Revision 1.249 by root, Tue Jul 15 20:41:58 2008 UTC

1	/*	1	/*
2	* This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game.	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 it	8	* Deliantra is free software: you can redistribute it and/or modify
9	* under the terms of the GNU General Public License as published by the Free	9	* it under the terms of the GNU General Public License as published by
10	* Software Foundation; either version 2 of the License, or (at your option)	10	* the Free Software Foundation, either version 3 of the License, or
11	* 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, but	13	* This program is distributed in the hope that it will be useful,
14	* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY	14	* but WITHOUT ANY WARRANTY; without even the implied warranty of
15	* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License	15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16	* 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 along	18	* You should have received a copy of the GNU General Public License
19	* with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51	19	* along with this program. If not, see <http://www.gnu.org/licenses/>.
20	* Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
21	*	20	*
22	* 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>
23	*/	22	*/
24		23
25	/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
26	sub/add_weight will transcend the environment updating the carrying
27	variable. */
28	#include <global.h>	24	#include <global.h>
29	#include <stdio.h>	25	#include <stdio.h>
30	#include <sys/types.h>	26	#include <sys/types.h>
31	#include <sys/uio.h>	27	#include <sys/uio.h>
32	#include <object.h>	28	#include <object.h>
33	#include <funcpoint.h>
34	#include <sproto.h>	29	#include <sproto.h>
35	#include <loader.h>	30	#include <loader.h>
36		31
37	#include <bitset>	32	#include <bitset>
38		33
39	int nrofallocobjects = 0;	34	UUID UUID::cur;
40	static UUID uuid;	35	static uint64_t seq_next_save;
41	const uint64 UUID_SKIP = 1<<19;	36	static const uint64 UUID_GAP = 1<<19;
42		37
43	objectvec objects;	38	objectvec objects;
44	activevec actives;	39	activevec actives;
45		40
46	short freearr_x[SIZEOFFREE] = { 0, 0, 1, 1, 1, 0, -1, -1, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,	41	short freearr_x[SIZEOFFREE] = {
		42	0,
		43	0, 1, 1, 1, 0, -1, -1, -1,
		44	0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,
47	0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1	45	0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1
48	};	46	};
49	short freearr_y[SIZEOFFREE] = { 0, -1, -1, 0, 1, 1, 1, 0, -1, -2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2,	47	short freearr_y[SIZEOFFREE] = {
		48	0,
		49	-1, -1, 0, 1, 1, 1, 0, -1,
		50	-2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2,
50	-3, -3, -3, -3, -2, -1, 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3	51	-3, -3, -3, -3, -2, -1, 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3
51	};	52	};
52	int maxfree[SIZEOFFREE] = { 0, 9, 10, 13, 14, 17, 18, 21, 22, 25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45,	53	int maxfree[SIZEOFFREE] = {
		54	0,
		55	9, 10, 13, 14, 17, 18, 21, 22,
		56	25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45, 48,
53	48, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49	57	49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49
54	};	58	};
55	int freedir[SIZEOFFREE] = {	59	int freedir[SIZEOFFREE] = {
56	0, 1, 2, 3, 4, 5, 6, 7, 8, 1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8,	60	0,
		61	1, 2, 3, 4, 5, 6, 7, 8,
		62	1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8,
57	1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8	63	1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8
58	};	64	};
59		65
60	static void	66	static void
61	write_uuid (void)	67	write_uuid (uval64 skip, bool sync)
62	{	68	{
63	char filename1[MAX_BUF], filename2[MAX_BUF];	69	CALL_BEGIN (2);
64		70	CALL_ARG_SV (newSVval64 (skip));
65	sprintf (filename1, "%s/uuid", settings.localdir);	71	CALL_ARG_SV (boolSV (sync));
66	sprintf (filename2, "%s/uuid~", settings.localdir);	72	CALL_CALL ("cf::write_uuid", G_DISCARD);
67		73	CALL_END;
68	FILE *fp;
69
70	if (!(fp = fopen (filename2, "w")))
71	{
72	LOG (llevError, "ERROR: cannot open %s for writing, unable to write UUID!\n", filename2);
73	return;
74	}
75
76	fprintf (fp, "<1,%llx>\n", (unsigned long long)uuid.seq + UUID_SKIP * 2);
77	fclose (fp);
78	rename (filename2, filename1);
79	}	74	}
80		75
81	static void	76	static void
82	read_uuid (void)	77	read_uuid (void)
83	{	78	{
84	char filename[MAX_BUF];	79	char filename[MAX_BUF];
85		80
86	sprintf (filename, "%s/uuid", settings.localdir);	81	sprintf (filename, "%s/uuid", settings.localdir);
		82
		83	seq_next_save = 0;
87		84
88	FILE *fp;	85	FILE *fp;
89		86
90	if (!(fp = fopen (filename, "r")))	87	if (!(fp = fopen (filename, "r")))
91	{	88	{
92	if (errno == ENOENT)	89	if (errno == ENOENT)
93	{	90	{
94	LOG (llevInfo, "RESET uid to 1\n");	91	LOG (llevInfo, "RESET uid to 1\n");
95	uuid.seq = 0;	92	UUID::cur.seq = 0;
96	write_uuid ();	93	write_uuid (UUID_GAP, true);
97	return;	94	return;
98	}	95	}
99		96
100	LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);	97	LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);
101	_exit (1);	98	_exit (1);
102	}	99	}
103		100
104	int version;	101	UUID::BUF buf;
105	unsigned long long uid;	102	buf[0] = 0;
106	if (2 != fscanf (fp, "<%d,%llx>\n", &version, &uid) || version != 1)	103	fgets (buf, sizeof (buf), fp);
		104
		105	if (!UUID::cur.parse (buf))
107	{	106	{
108	LOG (llevError, "FATAL: error reading uid from %s!\n", filename);	107	LOG (llevError, "FATAL: error reading uid from %s (%s)!\n", filename, buf);
109	_exit (1);	108	_exit (1);
110	}	109	}
111		110
112	uuid.seq = uid;	111	LOG (llevDebug, "read UUID: %s\n", UUID::cur.c_str ());
113	write_uuid ();	112
114	LOG (llevDebug, "read UID: %" PRId64 "\n", uid);	113	write_uuid (UUID_GAP, true);
115	fclose (fp);	114	fclose (fp);
116	}	115	}
117		116
118	UUID	117	UUID
119	gen_uuid ()	118	UUID::gen ()
120	{	119	{
121	UUID uid;	120	UUID uid;
122		121
123	uid.seq = ++uuid.seq;	122	uid.seq = ++cur.seq;
124		123
125	if (!(uuid.seq & (UUID_SKIP - 1)))	124	if (expect_false (cur.seq >= seq_next_save))
126	write_uuid ();	125	{
		126	seq_next_save = UUID::cur.seq + (UUID_GAP >> 1);
		127	write_uuid (UUID_GAP, false);
		128	}
		129
127		130
128	return uid;	131	return uid;
129	}	132	}
130		133
131	void	134	void
132	init_uuid ()	135	UUID::init ()
133	{	136	{
134	read_uuid ();	137	read_uuid ();
135	}	138	}
136		139
137	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */	140	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */
138	static int	141	static bool
139	compare_ob_value_lists_one (const object *wants, const object *has)	142	compare_ob_value_lists_one (const object *wants, const object *has)
140	{	143	{
141	key_value *wants_field;
142
143	/* n-squared behaviour (see get_ob_key_link()), but I'm hoping both	144	/* n-squared behaviour (see kv_get), but I'm hoping both
144	* objects with lists are rare, and lists stay short. If not, use a	145	* objects with lists are rare, and lists stay short. If not, use a
145	* different structure or at least keep the lists sorted...	146	* different structure or at least keep the lists sorted...
146	*/	147	*/
147		148
148	/* For each field in wants, */	149	/* For each field in wants, */
149	for (wants_field = wants->key_values; wants_field; wants_field = wants_field->next)	150	for (key_value *kv = wants->key_values; kv; kv = kv->next)
150	{	151	if (has->kv_get (kv->key) != kv->value)
151	key_value *has_field;	152	return false;
152
153	/* Look for a field in has with the same key. */
154	has_field = get_ob_key_link (has, wants_field->key);
155
156	if (has_field == NULL)
157	{
158	/* No field with that name. */
159	return FALSE;
160	}
161
162	/* Found the matching field. */
163	if (has_field->value != wants_field->value)
164	{
165	/* Values don't match, so this half of the comparison is false. */
166	return FALSE;
167	}
168
169	/* If we get here, we found a match. Now for the next field in wants. */
170	}
171		153
172	/* If we get here, every field in wants has a matching field in has. */	154	/* If we get here, every field in wants has a matching field in has. */
173	return TRUE;	155	return true;
174	}	156	}
175		157
176	/* Returns TRUE if ob1 has the same key_values as ob2. */	158	/* Returns TRUE if ob1 has the same key_values as ob2. */
177	static int	159	static bool
178	compare_ob_value_lists (const object *ob1, const object *ob2)	160	compare_ob_value_lists (const object *ob1, const object *ob2)
179	{	161	{
180	/* However, there may be fields in has which aren't partnered in wants,	162	/* However, there may be fields in has which aren't partnered in wants,
181	* so we need to run the comparison *twice*. :(	163	* so we need to run the comparison *twice*. :(
182	*/	164	*/
183	return compare_ob_value_lists_one (ob1, ob2) && compare_ob_value_lists_one (ob2, ob1);	165	return compare_ob_value_lists_one (ob1, ob2)
		166	&& compare_ob_value_lists_one (ob2, ob1);
184	}	167	}
185		168
186	/* Function examines the 2 objects given to it, and returns true if	169	/* Function examines the 2 objects given to it, and returns true if
187	* they can be merged together.	170	* they can be merged together.
188	*	171	*
…		…
203	|| ob1->speed != ob2->speed	186	|| ob1->speed != ob2->speed
204	|| ob1->value != ob2->value	187	|| ob1->value != ob2->value
205	|| ob1->name != ob2->name)	188	|| ob1->name != ob2->name)
206	return 0;	189	return 0;
207		190
208	//TODO: this ain't working well, use nicer and correct overflow check	191	/* Do not merge objects if nrof would overflow. First part checks
209	/* Do not merge objects if nrof would overflow. We use 1UL<<31 since that	192	* for unsigned overflow (2c), second part checks whether the result
210	* value could not be stored in a sint32 (which unfortunately sometimes is	193	* would fit into a 32 bit signed int, which is often used to hold
211	* used to store nrof).	194	* nrof values.
212	*/	195	*/
213	if (ob1->nrof + ob2->nrof >= 1UL << 31)	196	if (~ob1->nrof < ob2->nrof || ob1->nrof + ob2->nrof > (1UL << 31))
214	return 0;	197	return 0;
215		198
216	/* If the objects have been identified, set the BEEN_APPLIED flag.	199	/* If the objects have been identified, set the BEEN_APPLIED flag.
217	* This is to the comparison of the flags below will be OK. We	200	* This is to the comparison of the flags below will be OK. We
218	* just can't ignore the been applied or identified flags, as they	201	* just can't ignore the been applied or identified flags, as they
219	* are not equal - just if it has been identified, the been_applied	202	* are not equal - just if it has been identified, the been_applied
220	* flags lose any meaning.	203	* flags lose any meaning.
221	*/	204	*/
222	if (QUERY_FLAG (ob1, FLAG_IDENTIFIED))	205	if (QUERY_FLAG (ob1, FLAG_IDENTIFIED))
223	SET_FLAG (ob1, FLAG_BEEN_APPLIED);	206	SET_FLAG (ob1, FLAG_BEEN_APPLIED);
224		207
225	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))	208	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))
226	SET_FLAG (ob2, FLAG_BEEN_APPLIED);	209	SET_FLAG (ob2, FLAG_BEEN_APPLIED);
227		210
228	if ((ob1->flag ^ ob2->flag).reset (FLAG_INV_LOCKED).reset (FLAG_CLIENT_SENT).any ()	211	if (ob1->arch->archname != ob2->arch->archname
229	|| ob1->arch != ob2->arch
230	|| ob1->name != ob2->name	212	|| ob1->name != ob2->name
231	|| ob1->title != ob2->title	213	|| ob1->title != ob2->title
232	|| ob1->msg != ob2->msg	214	|| ob1->msg != ob2->msg
233	|| ob1->weight != ob2->weight	215	|| ob1->weight != ob2->weight
234	|| memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
235	|| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats) )
236	|| ob1->attacktype != ob2->attacktype	216	|| ob1->attacktype != ob2->attacktype
237	|| ob1->magic != ob2->magic	217	|| ob1->magic != ob2->magic
238	|| ob1->slaying != ob2->slaying	218	|| ob1->slaying != ob2->slaying
239	|| ob1->skill != ob2->skill	219	|| ob1->skill != ob2->skill
240	|| ob1->value != ob2->value	220	|| ob1->value != ob2->value
241	|| 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
242	|| ob1->client_type != ob2->client_type	223	|| ob1->client_type != ob2->client_type
243	|| ob1->materialname != ob2->materialname	224	|| ob1->materialname != ob2->materialname
244	|| ob1->lore != ob2->lore	225	|| ob1->lore != ob2->lore
245	|| ob1->subtype != ob2->subtype	226	|| ob1->subtype != ob2->subtype
246	|| ob1->move_type != ob2->move_type	227	|| ob1->move_type != ob2->move_type
247	|| ob1->move_block != ob2->move_block	228	|| ob1->move_block != ob2->move_block
248	|| ob1->move_allow != ob2->move_allow	229	|| ob1->move_allow != ob2->move_allow
249	|| ob1->move_on != ob2->move_on	230	|| ob1->move_on != ob2->move_on
250	|| ob1->move_off != ob2->move_off	231	|| ob1->move_off != ob2->move_off
251	|| ob1->move_slow != ob2->move_slow	232	|| ob1->move_slow != ob2->move_slow
252	|| 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)))
253	return 0;	236	return 0;
254		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
255	/* This is really a spellbook check - really, we should	245	/* This is really a spellbook check - we should in general
256	* check all objects in the inventory.	246	* not merge objects with real inventories, as splitting them
		247	* is hard.
257	*/	248	*/
258	if (ob1->inv || ob2->inv)	249	if (ob1->inv || ob2->inv)
259	{	250	{
260	/* if one object has inventory but the other doesn't, not equiv */	251	if (!(ob1->inv && ob2->inv))
261	if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv))	252	return 0; /* inventories differ in length */
262	return 0;
263		253
264	/* 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
265	if (!object::can_merge (ob1->inv, ob2->inv))	257	if (!object::can_merge (ob1->inv, ob2->inv))
266	return 0;	258	return 0; /* inventory objects differ */
267		259
268	/* 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
269	* if it is valid.	261	* if it is valid.
270	*/	262	*/
271	}	263	}
…		…
290	if (ob1->level != ob2->level)	282	if (ob1->level != ob2->level)
291	return 0;	283	return 0;
292	break;	284	break;
293	}	285	}
294		286
295	if (ob1->key_values != NULL || ob2->key_values != NULL)	287	if (ob1->key_values || ob2->key_values)
296	{	288	{
297	/* At least one of these has key_values. */	289	/* At least one of these has key_values. */
298	if ((ob1->key_values == NULL) != (ob2->key_values == NULL))	290	if ((!ob1->key_values) != (!ob2->key_values))
299	/* One has fields, but the other one doesn't. */	291	return 0; /* One has fields, but the other one doesn't. */
		292
		293	if (!compare_ob_value_lists (ob1, ob2))
300	return 0;	294	return 0;
301	else if (!compare_ob_value_lists (ob1, ob2))
302	return 0;
303	}	295	}
304		296
305	//TODO: generate an event or call into perl for additional checks
306	if (ob1->self || ob2->self)	297	if (ob1->self || ob2->self)
307	{	298	{
308	ob1->optimise ();	299	ob1->optimise ();
309	ob2->optimise ();	300	ob2->optimise ();
310		301
311	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)
312	return 0;	308	return 0;
		309
		310	if (k1 == 0)
		311	return 1;
		312
		313	if (!cfperl_can_merge (ob1, ob2))
		314	return 0;
		315	}
313	}	316	}
314		317
315	/* Everything passes, must be OK. */	318	/* Everything passes, must be OK. */
316	return 1;	319	return 1;
317	}	320	}
318		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
319	/*	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	/*
320	* sum_weight() is a recursive function which calculates the weight	396	* this is a recursive function which calculates the weight
321	* 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
322	* containers are carrying, and sums it up.	398	* containers are carrying, and sums it up.
323	*/	399	*/
324	long	400	void
325	sum_weight (object *op)	401	object::update_weight ()
326	{	402	{
327	long sum;	403	sint32 sum = 0;
328	object *inv;
329		404
330	for (sum = 0, inv = op->inv; inv; inv = inv->below)	405	for (object *op = inv; op; op = op->below)
331	{	406	{
332	if (inv->inv)	407	if (op->inv)
333	sum_weight (inv);	408	op->update_weight ();
334		409
335	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)
336	}	416	{
337
338	if (op->type == CONTAINER && op->stats.Str)
339	sum = (sum * (100 - op->stats.Str)) / 100;
340
341	if (op->carrying != sum)
342	op->carrying = sum;	417	carrying = sum;
343		418
344	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	}
345	}	423	}
346		424
347	/**	425	/*
348	* Return the outermost environment object for a given object.	426	* Used by: Server DM commands: dumpbelow, dump. Some error messages.
349	*/
350
351	object *
352	object_get_env_recursive (object *op)
353	{
354	while (op->env != NULL)
355	op = op->env;
356	return op;
357	}
358
359	/*
360	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
361	* Some error messages.
362	* The result of the dump is stored in the static global errmsg array.
363	*/	427	*/
364	char *	428	char *
365	dump_object (object *op)	429	dump_object (object *op)
366	{	430	{
367	if (!op)	431	if (!op)
…		…
375	/*	439	/*
376	* 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
377	* multi-object 1 which is closest to the second object.	441	* multi-object 1 which is closest to the second object.
378	* If it's not a multi-object, it is returned.	442	* If it's not a multi-object, it is returned.
379	*/	443	*/
380
381	object *	444	object *
382	get_nearest_part (object *op, const object *pl)	445	get_nearest_part (object *op, const object *pl)
383	{	446	{
384	object *tmp, *closest;	447	object *tmp, *closest;
385	int last_dist, i;	448	int last_dist, i;
386		449
387	if (op->more == NULL)	450	if (!op->more)
388	return op;	451	return op;
		452
389	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)
390	if ((i = distance (tmp, pl)) < last_dist)	456	if ((i = distance (tmp, pl)) < last_dist)
391	closest = tmp, last_dist = i;	457	closest = tmp, last_dist = i;
		458
392	return closest;	459	return closest;
393	}	460	}
394		461
395	/*	462	/*
396	* 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.
397	*/	465	*/
398	object *	466	object *
399	find_object (tag_t i)	467	find_object (tag_t i)
400	{	468	{
401	for_all_objects (op)	469	for_all_objects (op)
…		…
412	*/	480	*/
413	object *	481	object *
414	find_object_name (const char *str)	482	find_object_name (const char *str)
415	{	483	{
416	shstr_cmp str_ (str);	484	shstr_cmp str_ (str);
417	object *op;
418		485
		486	if (str_)
419	for_all_objects (op)	487	for_all_objects (op)
420	if (op->name == str_)	488	if (op->name == str_)
421	break;	489	return op;
422		490
423	return op;	491	return 0;
424	}
425
426	void
427	free_all_object_data ()
428	{
429	LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);
430	}	492	}
431		493
432	/*	494	/*
433	* 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
434	* skill and experience objects.	496	* skill and experience objects.
		497	* ACTUALLY NO! investigate! TODO
435	*/	498	*/
436	void	499	void
437	object::set_owner (object *owner)	500	object::set_owner (object *owner)
438	{	501	{
		502	// allow objects which own objects
439	if (!owner)	503	if (owner)
440	return;
441
442	/* next line added to allow objects which own objects */
443	/* Add a check for ownercounts in here, as I got into an endless loop
444	* with the fireball owning a poison cloud which then owned the
445	* fireball. I believe that was caused by one of the objects getting
446	* freed and then another object replacing it. Since the ownercounts
447	* didn't match, this check is valid and I believe that cause is valid.
448	*/
449	while (owner->owner)	504	while (owner->owner)
450	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	}
451		512
452	this->owner = owner;	513	this->owner = owner;
453	}	514	}
454		515
455	int	516	int
…		…
533	}	594	}
534		595
535	op->key_values = 0;	596	op->key_values = 0;
536	}	597	}
537		598
538	object &	599	/*
539	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)
540	{	609	{
541	bool is_freed = flag [FLAG_FREED];	610	dst->remove ();
542	bool is_removed = flag [FLAG_REMOVED];
543
544	*(object_copy *)this = src;	611	*(object_copy *)dst = *this;
545
546	flag [FLAG_FREED] = is_freed;
547	flag [FLAG_REMOVED] = is_removed;	612	dst->flag [FLAG_REMOVED] = true;
548		613
549	/* Copy over key_values, if any. */	614	/* Copy over key_values, if any. */
550	if (src.key_values)	615	if (key_values)
551	{	616	{
552	key_value *tail = 0;	617	key_value *tail = 0;
553	key_values = 0;	618	dst->key_values = 0;
554		619
555	for (key_value *i = src.key_values; i; i = i->next)	620	for (key_value *i = key_values; i; i = i->next)
556	{	621	{
557	key_value *new_link = new key_value;	622	key_value *new_link = new key_value;
558		623
559	new_link->next = 0;	624	new_link->next = 0;
560	new_link->key = i->key;	625	new_link->key = i->key;
561	new_link->value = i->value;	626	new_link->value = i->value;
562		627
563	/* Try and be clever here, too. */	628	/* Try and be clever here, too. */
564	if (!key_values)	629	if (!dst->key_values)
565	{	630	{
566	key_values = new_link;	631	dst->key_values = new_link;
567	tail = new_link;	632	tail = new_link;
568	}	633	}
569	else	634	else
570	{	635	{
571	tail->next = new_link;	636	tail->next = new_link;
572	tail = new_link;	637	tail = new_link;
573	}	638	}
574	}	639	}
575	}	640	}
576	}
577
578	/*
579	* copy_to first frees everything allocated by the dst object,
580	* and then copies the contents of itself into the second
581	* object, allocating what needs to be allocated. Basically, any
582	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
583	* if the first object is freed, the pointers in the new object
584	* will point at garbage.
585	*/
586	void
587	object::copy_to (object *dst)
588	{
589	*dst = *this;
590		641
591	if (speed < 0)	642	if (speed < 0)
592	dst->speed_left = speed_left - rndm ();	643	dst->speed_left -= rndm ();
593		644
594	dst->set_speed (dst->speed);	645	dst->set_speed (dst->speed);
595	}	646	}
596		647
597	void	648	void
598	object::instantiate ()	649	object::instantiate ()
599	{	650	{
600	if (!uuid.seq) // HACK	651	if (!uuid.seq) // HACK
601	uuid = gen_uuid ();	652	uuid = UUID::gen ();
602		653
603	speed_left = -0.1f;	654	speed_left = -0.1f;
604	/* 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
605	* 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.
606	* 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
…		…
616	object *	667	object *
617	object::clone ()	668	object::clone ()
618	{	669	{
619	object *neu = create ();	670	object *neu = create ();
620	copy_to (neu);	671	copy_to (neu);
		672	neu->map = map; // not copied by copy_to
621	return neu;	673	return neu;
622	}	674	}
623		675
624	/*	676	/*
625	* 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
…		…
676	* UP_OBJ_FACE: only the objects face has changed.	728	* UP_OBJ_FACE: only the objects face has changed.
677	*/	729	*/
678	void	730	void
679	update_object (object *op, int action)	731	update_object (object *op, int action)
680	{	732	{
681	if (op == NULL)	733	if (!op)
682	{	734	{
683	/* this should never happen */	735	/* this should never happen */
684	LOG (llevDebug, "update_object() called for NULL object.\n");	736	LOG (llevError | logBacktrace, "update_object() called for NULL object.\n");
685	return;	737	return;
686	}	738	}
687		739
688	if (op->env)	740	if (!op->is_on_map ())
689	{	741	{
690	/* Animation is currently handled by client, so nothing	742	/* Animation is currently handled by client, so nothing
691	* to do in this case.	743	* to do in this case.
692	*/	744	*/
693	return;	745	return;
694	}	746	}
695
696	/* If the map is saving, don't do anything as everything is
697	* going to get freed anyways.
698	*/
699	if (!op->map || op->map->in_memory == MAP_SAVING)
700	return;
701		747
702	/* make sure the object is within map boundaries */	748	/* make sure the object is within map boundaries */
703	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)
704	{	750	{
705	LOG (llevError, "update_object() called for object out of map!\n");	751	LOG (llevError, "update_object() called for object out of map!\n");
…		…
765	static int object_count;	811	static int object_count;
766		812
767	void object::link ()	813	void object::link ()
768	{	814	{
769	assert (!index);//D	815	assert (!index);//D
770	uuid = gen_uuid ();	816	uuid = UUID::gen ();
771	count = ++object_count;	817	count = ++object_count;
772		818
773	refcnt_inc ();	819	refcnt_inc ();
774	objects.insert (this);	820	objects.insert (this);
775	}	821	}
…		…
848	object::destroy_inv (bool drop_to_ground)	894	object::destroy_inv (bool drop_to_ground)
849	{	895	{
850	// need to check first, because the checks below might segfault	896	// need to check first, because the checks below might segfault
851	// as we might be on an invalid mapspace and crossfire code	897	// as we might be on an invalid mapspace and crossfire code
852	// is too buggy to ensure that the inventory is empty.	898	// is too buggy to ensure that the inventory is empty.
853	// corollary: if you create arrows etc. with stuff in tis inventory,	899	// corollary: if you create arrows etc. with stuff in its inventory,
854	// cf will crash below with off-map x and y	900	// cf will crash below with off-map x and y
855	if (!inv)	901	if (!inv)
856	return;	902	return;
857		903
858	/* Only if the space blocks everything do we not process -	904	/* Only if the space blocks everything do we not process -
859	* if some form of movement is allowed, let objects	905	* if some form of movement is allowed, let objects
860	* drop on that space.	906	* drop on that space.
861	*/	907	*/
862	if (!drop_to_ground	908	if (!drop_to_ground
863	|| !map	909	|| !map
864	|| map->in_memory != MAP_IN_MEMORY	910	|| map->in_memory != MAP_ACTIVE
865	|| map->nodrop	911	|| map->no_drop
866	|| ms ().move_block == MOVE_ALL)	912	|| ms ().move_block == MOVE_ALL)
867	{	913	{
868	while (inv)	914	while (inv)
869	{	915	{
870	inv->destroy_inv (drop_to_ground);	916	inv->destroy_inv (false);
871	inv->destroy ();	917	inv->destroy ();
872	}	918	}
873	}	919	}
874	else	920	else
875	{ /* Put objects in inventory onto this space */	921	{ /* Put objects in inventory onto this space */
…		…
881	|| op->flag [FLAG_NO_DROP]	927	|| op->flag [FLAG_NO_DROP]
882	|| op->type == RUNE	928	|| op->type == RUNE
883	|| op->type == TRAP	929	|| op->type == TRAP
884	|| op->flag [FLAG_IS_A_TEMPLATE]	930	|| op->flag [FLAG_IS_A_TEMPLATE]
885	|| op->flag [FLAG_DESTROY_ON_DEATH])	931	|| op->flag [FLAG_DESTROY_ON_DEATH])
886	op->destroy ();	932	op->destroy (true);
887	else	933	else
888	map->insert (op, x, y);	934	map->insert (op, x, y);
889	}	935	}
890	}	936	}
891	}	937	}
…		…
895	object *op = new object;	941	object *op = new object;
896	op->link ();	942	op->link ();
897	return op;	943	return op;
898	}	944	}
899		945
		946	static struct freed_map : maptile
		947	{
		948	freed_map ()
		949	{
		950	path = "<freed objects map>";
		951	name = "/internal/freed_objects_map";
		952	width = 3;
		953	height = 3;
		954	no_drop = 1;
		955	no_reset = 1;
		956
		957	alloc ();
		958	in_memory = MAP_ACTIVE;
		959	}
		960
		961	~freed_map ()
		962	{
		963	destroy ();
		964	}
		965	} freed_map; // freed objects are moved here to avoid crashes
		966
900	void	967	void
901	object::do_destroy ()	968	object::do_destroy ()
902	{	969	{
903	attachable::do_destroy ();
904
905	if (flag [FLAG_IS_LINKED])	970	if (flag [FLAG_IS_LINKED])
906	remove_button_link (this);	971	remove_button_link (this);
907		972
908	if (flag [FLAG_FRIENDLY])	973	if (flag [FLAG_FRIENDLY])
909	remove_friendly_object (this);	974	remove_friendly_object (this);
910		975
911	if (!flag [FLAG_REMOVED])
912	remove ();	976	remove ();
913		977
914	destroy_inv (true);	978	attachable::do_destroy ();
915		979
916	deactivate ();	980	deactivate ();
917	unlink ();	981	unlink ();
918		982
919	flag [FLAG_FREED] = 1;	983	flag [FLAG_FREED] = 1;
920		984
921	// hack to ensure that freed objects still have a valid map	985	// hack to ensure that freed objects still have a valid map
922	{
923	static maptile *freed_map; // freed objects are moved here to avoid crashes
924
925	if (!freed_map)
926	{
927	freed_map = new maptile;
928
929	freed_map->name = "/internal/freed_objects_map";
930	freed_map->width = 3;
931	freed_map->height = 3;
932
933	freed_map->alloc ();
934	freed_map->in_memory = MAP_IN_MEMORY;
935	}
936
937	map = freed_map;	986	map = &freed_map;
938	x = 1;	987	x = 1;
939	y = 1;	988	y = 1;
940	}
941
942	head = 0;
943		989
944	if (more)	990	if (more)
945	{	991	{
946	more->destroy ();	992	more->destroy ();
947	more = 0;	993	more = 0;
948	}	994	}
949		995
		996	head = 0;
		997
950	// clear those pointers that likely might have circular references to us	998	// clear those pointers that likely might cause circular references
951	owner = 0;	999	owner = 0;
952	enemy = 0;	1000	enemy = 0;
953	attacked_by = 0;	1001	attacked_by = 0;
		1002	current_weapon = 0;
954	}	1003	}
955		1004
956	void	1005	void
957	object::destroy (bool destroy_inventory)	1006	object::destroy (bool destroy_inventory)
958	{	1007	{
959	if (destroyed ())	1008	if (destroyed ())
960	return;	1009	return;
961		1010
		1011	if (!is_head () && !head->destroyed ())
		1012	{
		1013	LOG (llevError | logBacktrace, "tried to destroy the tail of an object");
		1014	head->destroy (destroy_inventory);
		1015	return;
		1016	}
		1017
962	if (destroy_inventory)	1018	destroy_inv (!destroy_inventory);
963	destroy_inv (false);	1019
		1020	if (is_head ())
		1021	if (sound_destroy)
		1022	play_sound (sound_destroy);
		1023	else if (flag [FLAG_MONSTER])
		1024	play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism
964		1025
965	attachable::destroy ();	1026	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	}	1027	}
984		1028
985	/* op->remove ():	1029	/* op->remove ():
986	* This function removes the object op from the linked list of objects	1030	* 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	1031	* which it is currently tied to. When this function is done, the
…		…
993	object::do_remove ()	1037	object::do_remove ()
994	{	1038	{
995	object *tmp, *last = 0;	1039	object *tmp, *last = 0;
996	object *otmp;	1040	object *otmp;
997		1041
998	if (QUERY_FLAG (this, FLAG_REMOVED))	1042	if (flag [FLAG_REMOVED])
999	return;	1043	return;
1000		1044
1001	SET_FLAG (this, FLAG_REMOVED);
1002	INVOKE_OBJECT (REMOVE, this);	1045	INVOKE_OBJECT (REMOVE, this);
		1046
		1047	flag [FLAG_REMOVED] = true;
1003		1048
1004	if (more)	1049	if (more)
1005	more->remove ();	1050	more->remove ();
1006		1051
1007	/*	1052	/*
1008	* In this case, the object to be removed is in someones	1053	* In this case, the object to be removed is in someones
1009	* inventory.	1054	* inventory.
1010	*/	1055	*/
1011	if (env)	1056	if (env)
1012	{	1057	{
1013	if (nrof)	1058	flag [FLAG_REMOVED] = false; // hack around the issue of visible_to checking flag_removed
1014	sub_weight (env, weight * nrof);	1059	if (object *pl = visible_to ())
1015	else	1060	esrv_del_item (pl->contr, count);
1016	sub_weight (env, weight + carrying);	1061	flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed
		1062
		1063	adjust_weight (env, -total_weight ());
		1064
		1065	/* we set up values so that it could be inserted into
		1066	* the map, but we don't actually do that - it is up
		1067	* to the caller to decide what we want to do.
		1068	*/
		1069	map = env->map;
		1070	x = env->x;
		1071	y = env->y;
		1072
		1073	// make sure cmov optimisation is applicable
		1074	*(above ? &above->below : &env->inv) = below;
		1075	*(below ? &below->above : &above ) = above; // &above is just a dummy
		1076
		1077	above = 0;
		1078	below = 0;
		1079	env = 0;
1017		1080
1018	/* NO_FIX_PLAYER is set when a great many changes are being	1081	/* NO_FIX_PLAYER is set when a great many changes are being
1019	* made to players inventory. If set, avoiding the call	1082	* made to players inventory. If set, avoiding the call
1020	* to save cpu time.	1083	* to save cpu time.
1021	*/	1084	*/
1022	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1085	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1023	otmp->update_stats ();	1086	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	}	1087	}
1042	else if (map)	1088	else if (map)
1043	{	1089	{
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;	1090	map->dirty = true;
1057	mapspace &ms = this->ms ();	1091	mapspace &ms = this->ms ();
1058		1092
		1093	if (object *pl = ms.player ())
		1094	{
		1095	if (type == PLAYER) // this == pl(!)
		1096	{
		1097	// leaving a spot always closes any open container on the ground
		1098	if (container && !container->env)
		1099	// this causes spurious floorbox updates, but it ensures
		1100	// that the CLOSE event is being sent.
		1101	close_container ();
		1102
		1103	--map->players;
		1104	map->touch ();
		1105	}
		1106	else if (pl->container == this)
		1107	{
		1108	// removing a container should close it
		1109	close_container ();
		1110	}
		1111
		1112	esrv_del_item (pl->contr, count);
		1113	}
		1114
1059	/* link the object above us */	1115	/* link the object above us */
1060	if (above)	1116	// re-link, make sure compiler can easily use cmove
1061	above->below = below;	1117	*(above ? &above->below : &ms.top) = below;
1062	else	1118	*(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		1119
1080	above = 0;	1120	above = 0;
1081	below = 0;	1121	below = 0;
1082		1122
1083	if (map->in_memory == MAP_SAVING)	1123	if (map->in_memory == MAP_SAVING)
1084	return;	1124	return;
1085		1125
1086	int check_walk_off = !flag [FLAG_NO_APPLY];	1126	int check_walk_off = !flag [FLAG_NO_APPLY];
		1127
		1128	if (object *pl = ms.player ())
		1129	{
		1130	if (pl->container == this)
		1131	/* If a container that the player is currently using somehow gets
		1132	* removed (most likely destroyed), update the player view
		1133	* appropriately.
		1134	*/
		1135	pl->close_container ();
		1136
		1137	//TODO: the floorbox prev/next might need updating
		1138	//esrv_del_item (pl->contr, count);
		1139	//TODO: update floorbox to preserve ordering
		1140	if (pl->contr->ns)
		1141	pl->contr->ns->floorbox_update ();
		1142	}
1087		1143
1088	for (tmp = ms.bot; tmp; tmp = tmp->above)	1144	for (tmp = ms.bot; tmp; tmp = tmp->above)
1089	{	1145	{
1090	/* No point updating the players look faces if he is the object	1146	/* No point updating the players look faces if he is the object
1091	* being removed.	1147	* being removed.
1092	*/	1148	*/
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		1149
1110	/* See if object moving off should effect something */	1150	/* See if object moving off should effect something */
1111	if (check_walk_off	1151	if (check_walk_off
1112	&& ((move_type & tmp->move_off)	1152	&& ((move_type & tmp->move_off)
1113	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))	1153	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
…		…
1145	merge_ob (object *op, object *top)	1185	merge_ob (object *op, object *top)
1146	{	1186	{
1147	if (!op->nrof)	1187	if (!op->nrof)
1148	return 0;	1188	return 0;
1149		1189
1150	if (top)	1190	if (!top)
1151	for (top = op; top && top->above; top = top->above)	1191	for (top = op; top && top->above; top = top->above)
1152	;	1192	;
1153		1193
1154	for (; top; top = top->below)	1194	for (; top; top = top->below)
1155	{
1156	if (top == op)
1157	continue;
1158
1159	if (object::can_merge (op, top))	1195	if (object::can_merge (op, top))
1160	{	1196	{
1161	top->nrof += op->nrof;	1197	top->nrof += op->nrof;
1162		1198
1163	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/	1199	if (object *pl = top->visible_to ())
1164	op->weight = 0; /* Don't want any adjustements now */	1200	esrv_update_item (UPD_NROF, pl, top);
		1201
		1202	op->weight = 0; // cancel the addition above
		1203	op->carrying = 0; // must be 0 already
		1204
1165	op->destroy ();	1205	op->destroy (1);
		1206
1166	return top;	1207	return top;
1167	}	1208	}
1168	}
1169		1209
1170	return 0;	1210	return 0;
1171	}	1211	}
1172		1212
1173	void	1213	void
…		…
1198	* job preparing multi-part monsters.	1238	* job preparing multi-part monsters.
1199	*/	1239	*/
1200	object *	1240	object *
1201	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)	1241	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1202	{	1242	{
		1243	op->remove ();
		1244
1203	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)	1245	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1204	{	1246	{
1205	tmp->x = x + tmp->arch->x;	1247	tmp->x = x + tmp->arch->x;
1206	tmp->y = y + tmp->arch->y;	1248	tmp->y = y + tmp->arch->y;
1207	}	1249	}
…		…
1230	* just 'op' otherwise	1272	* just 'op' otherwise
1231	*/	1273	*/
1232	object *	1274	object *
1233	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)	1275	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1234	{	1276	{
1235	assert (!op->flag [FLAG_FREED]);	1277	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	{	1278	{
1251	LOG (llevError, "Trying to insert object outside the map.\n%s\n", op->debug_desc ());	1279	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 ();	1280	abort ();
1258	#endif	1281	}
1259	return op;	1282
		1283	if (op->env)
1260	}	1284	{
		1285	LOG (llevError, "insert_ob_in_map called for object in an inventory (proceeding)");
		1286	op->remove ();
		1287	}
1261		1288
1262	if (object *more = op->more)	1289	if (op->face && !face_info (op->face))//D TODO: remove soon
1263	if (!insert_ob_in_map (more, m, originator, flag))	1290	{//D
1264	return 0;	1291	LOG (llevError | logBacktrace, "op->face out of bounds: %s", op->debug_desc ());//D
1265		1292	op->face = 1;//D
1266	CLEAR_FLAG (op, FLAG_REMOVED);	1293	}//D
1267		1294
1268	/* Ideally, the caller figures this out. However, it complicates a lot	1295	/* 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	1296	* of areas of callers (eg, anything that uses find_free_spot would now
1270	* need extra work	1297	* need extra work
1271	*/	1298	*/
1272	if (!xy_normalise (m, op->x, op->y))	1299	if (!xy_normalise (m, op->x, op->y))
		1300	{
		1301	op->head_ ()->destroy (1);// remove head_ once all tail object destroyers found
1273	return 0;	1302	return 0;
		1303	}
		1304
		1305	if (object *more = op->more)
		1306	if (!insert_ob_in_map (more, m, originator, flag))
		1307	return 0;
		1308
		1309	CLEAR_FLAG (op, FLAG_REMOVED);
1274		1310
1275	op->map = m;	1311	op->map = m;
1276	mapspace &ms = op->ms ();	1312	mapspace &ms = op->ms ();
1277		1313
1278	/* this has to be done after we translate the coordinates.	1314	/* this has to be done after we translate the coordinates.
1279	*/	1315	*/
1280	if (op->nrof && !(flag & INS_NO_MERGE))	1316	if (op->nrof && !(flag & INS_NO_MERGE))
1281	for (object *tmp = ms.bot; tmp; tmp = tmp->above)	1317	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1282	if (object::can_merge (op, tmp))	1318	if (object::can_merge (op, tmp))
1283	{	1319	{
		1320	// TODO: we actually want to update tmp, not op,
		1321	// but some caller surely breaks when we return tmp
		1322	// from here :/
1284	op->nrof += tmp->nrof;	1323	op->nrof += tmp->nrof;
1285	tmp->destroy ();	1324	tmp->destroy (1);
1286	}	1325	}
1287		1326
1288	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1327	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1289	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1328	CLEAR_FLAG (op, FLAG_INV_LOCKED);
1290		1329
…		…
1297	{	1336	{
1298	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");	1337	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");
1299	abort ();	1338	abort ();
1300	}	1339	}
1301		1340
		1341	if (!originator->is_on_map ())
		1342	LOG (llevDebug | logBacktrace, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map",
		1343	op->debug_desc (), originator->debug_desc ());
		1344
1302	op->above = originator;	1345	op->above = originator;
1303	op->below = originator->below;	1346	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;	1347	originator->below = op;
		1348
		1349	*(op->below ? &op->below->above : &ms.bot) = op;
1312	}	1350	}
1313	else	1351	else
1314	{	1352	{
1315	top = ms.bot;	1353	object *floor = 0;
		1354	object *top = ms.top;
1316		1355
1317	/* If there are other objects, then */	1356	/* If there are other objects, then */
1318	if ((!(flag & INS_MAP_LOAD)) && top)	1357	if (top)
1319	{	1358	{
1320	object *last = 0;
1321
1322	/*	1359	/*
1323	* If there are multiple objects on this space, we do some trickier handling.	1360	* If there are multiple objects on this space, we do some trickier handling.
1324	* We've already dealt with merging if appropriate.	1361	* We've already dealt with merging if appropriate.
1325	* Generally, we want to put the new object on top. But if	1362	* Generally, we want to put the new object on top. But if
1326	* flag contains INS_ABOVE_FLOOR_ONLY, once we find the last	1363	* 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	1366	* 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	1367	* 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	1368	* when lots of spells are cast in one area. Currently, it is presumed
1332	* that flying non pickable objects are spell objects.	1369	* that flying non pickable objects are spell objects.
1333	*/	1370	*/
1334	for (top = ms.bot; top; top = top->above)	1371	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1335	{	1372	{
1336	if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))	1373	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) || QUERY_FLAG (tmp, FLAG_OVERLAY_FLOOR))
1337	floor = top;	1374	floor = tmp;
1338		1375
1339	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))	1376	if (QUERY_FLAG (tmp, FLAG_NO_PICK) && (tmp->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1340	{	1377	{
1341	/* We insert above top, so we want this object below this */	1378	/* We insert above top, so we want this object below this */
1342	top = top->below;	1379	top = tmp->below;
1343	break;	1380	break;
1344	}	1381	}
1345		1382
1346	last = top;	1383	top = tmp;
1347	}	1384	}
1348
1349	/* Don't want top to be NULL, so set it to the last valid object */
1350	top = last;
1351		1385
1352	/* We let update_position deal with figuring out what the space	1386	/* We let update_position deal with figuring out what the space
1353	* looks like instead of lots of conditions here.	1387	* looks like instead of lots of conditions here.
1354	* makes things faster, and effectively the same result.	1388	* makes things faster, and effectively the same result.
1355	*/	1389	*/
…		…
1362	*/	1396	*/
1363	if (!(flag & INS_ON_TOP)	1397	if (!(flag & INS_ON_TOP)
1364	&& ms.flags () & P_BLOCKSVIEW	1398	&& ms.flags () & P_BLOCKSVIEW
1365	&& (op->face && !faces [op->face].visibility))	1399	&& (op->face && !faces [op->face].visibility))
1366	{	1400	{
		1401	object *last;
		1402
1367	for (last = top; last != floor; last = last->below)	1403	for (last = top; last != floor; last = last->below)
1368	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1404	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1369	break;	1405	break;
1370		1406
1371	/* Check to see if we found the object that blocks view,	1407	/* Check to see if we found the object that blocks view,
…		…
1376	if (last && last->below && last != floor)	1412	if (last && last->below && last != floor)
1377	top = last->below;	1413	top = last->below;
1378	}	1414	}
1379	} /* If objects on this space */	1415	} /* If objects on this space */
1380		1416
1381	if (flag & INS_MAP_LOAD)
1382	top = ms.top;
1383
1384	if (flag & INS_ABOVE_FLOOR_ONLY)	1417	if (flag & INS_ABOVE_FLOOR_ONLY)
1385	top = floor;	1418	top = floor;
1386		1419
1387	/* Top is the object that our object (op) is going to get inserted above.	1420	// insert object above top, or bottom-most if top = 0
1388	*/
1389
1390	/* First object on this space */
1391	if (!top)	1421	if (!top)
1392	{	1422	{
		1423	op->below = 0;
1393	op->above = ms.bot;	1424	op->above = ms.bot;
1394
1395	if (op->above)
1396	op->above->below = op;
1397
1398	op->below = 0;
1399	ms.bot = op;	1425	ms.bot = op;
		1426
		1427	*(op->above ? &op->above->below : &ms.top) = op;
1400	}	1428	}
1401	else	1429	else
1402	{ /* get inserted into the stack above top */	1430	{
1403	op->above = top->above;	1431	op->above = top->above;
1404
1405	if (op->above)
1406	op->above->below = op;	1432	top->above = op;
1407		1433
1408	op->below = top;	1434	op->below = top;
1409	top->above = op;	1435	*(op->above ? &op->above->below : &ms.top) = op;
1410	}	1436	}
1411		1437	}
1412	if (!op->above)
1413	ms.top = op;
1414	} /* else not INS_BELOW_ORIGINATOR */
1415		1438
1416	if (op->type == PLAYER)	1439	if (op->type == PLAYER)
1417	{	1440	{
1418	op->contr->do_los = 1;	1441	op->contr->do_los = 1;
1419	++op->map->players;	1442	++op->map->players;
1420	op->map->touch ();	1443	op->map->touch ();
1421	}	1444	}
1422		1445
1423	op->map->dirty = true;	1446	op->map->dirty = true;
1424		1447
1425	/* If we have a floor, we know the player, if any, will be above
1426	* it, so save a few ticks and start from there.
1427	*/
1428	if (!(flag & INS_MAP_LOAD))
1429	if (object *pl = ms.player ())	1448	if (object *pl = ms.player ())
		1449	//TODO: the floorbox prev/next might need updating
		1450	//esrv_send_item (pl, op);
		1451	//TODO: update floorbox to preserve ordering
1430	if (pl->contr->ns)	1452	if (pl->contr->ns)
1431	pl->contr->ns->floorbox_update ();	1453	pl->contr->ns->floorbox_update ();
1432		1454
1433	/* If this object glows, it may affect lighting conditions that are	1455	/* If this object glows, it may affect lighting conditions that are
1434	* visible to others on this map. But update_all_los is really	1456	* 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	1457	* an inefficient way to do this, as it means los for all players
1436	* on the map will get recalculated. The players could very well	1458	* on the map will get recalculated. The players could very well
…		…
1478	* op is the object to insert it under: supplies x and the map.	1500	* op is the object to insert it under: supplies x and the map.
1479	*/	1501	*/
1480	void	1502	void
1481	replace_insert_ob_in_map (const char *arch_string, object *op)	1503	replace_insert_ob_in_map (const char *arch_string, object *op)
1482	{	1504	{
1483	object *tmp, *tmp1;
1484
1485	/* first search for itself and remove any old instances */	1505	/* first search for itself and remove any old instances */
1486		1506
1487	for (tmp = op->ms ().bot; tmp; tmp = tmp->above)	1507	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1488	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */	1508	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */
1489	tmp->destroy ();	1509	tmp->destroy (1);
1490		1510
1491	tmp1 = arch_to_object (archetype::find (arch_string));	1511	object *tmp = arch_to_object (archetype::find (arch_string));
1492		1512
1493	tmp1->x = op->x;	1513	tmp->x = op->x;
1494	tmp1->y = op->y;	1514	tmp->y = op->y;
		1515
1495	insert_ob_in_map (tmp1, op->map, op, 0);	1516	insert_ob_in_map (tmp, op->map, op, 0);
1496	}	1517	}
1497		1518
1498	object *	1519	object *
1499	object::insert_at (object *where, object *originator, int flags)	1520	object::insert_at (object *where, object *originator, int flags)
1500	{	1521	{
		1522	if (where->env)
		1523	return where->env->insert (this);
		1524	else
1501	return where->map->insert (this, where->x, where->y, originator, flags);	1525	return where->map->insert (this, where->x, where->y, originator, flags);
1502	}	1526	}
1503		1527
1504	/*	1528	/*
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	1529	* decrease(object, number) decreases a specified number from
1546	* the amount of an object. If the amount reaches 0, the object	1530	* the amount of an object. If the amount reaches 0, the object
1547	* is subsequently removed and freed.	1531	* is subsequently removed and freed.
1548	*	1532	*
1549	* Return value: 'op' if something is left, NULL if the amount reached 0	1533	* Return value: 'op' if something is left, NULL if the amount reached 0
1550	*/	1534	*/
		1535	bool
		1536	object::decrease (sint32 nr)
		1537	{
		1538	if (!nr)
		1539	return true;
		1540
		1541	nr = min (nr, nrof);
		1542
		1543	nrof -= nr;
		1544
		1545	if (nrof)
		1546	{
		1547	adjust_weight (env, -weight * max (1, nr)); // carrying == 0
		1548
		1549	if (object *pl = visible_to ())
		1550	esrv_update_item (UPD_NROF, pl, this);
		1551
		1552	return true;
		1553	}
		1554	else
		1555	{
		1556	destroy ();
		1557	return false;
		1558	}
		1559	}
		1560
		1561	/*
		1562	* split(ob,nr) splits up ob into two parts. The part which
		1563	* is returned contains nr objects, and the remaining parts contains
		1564	* the rest (or is removed and returned if that number is 0).
		1565	* On failure, NULL is returned.
		1566	*/
1551	object *	1567	object *
1552	decrease_ob_nr (object *op, uint32 i)	1568	object::split (sint32 nr)
1553	{	1569	{
1554	object *tmp;	1570	int have = number_of ();
1555		1571
1556	if (i == 0) /* objects with op->nrof require this check */	1572	if (have < nr)
1557	return op;	1573	return 0;
1558		1574	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	{	1575	{
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 ();	1576	remove ();
1594	op->nrof = 0;	1577	return this;
1595	if (tmp)
1596	esrv_del_item (tmp->contr, op->count);
1597	}
1598	}	1578	}
1599	else	1579	else
1600	{	1580	{
1601	object *above = op->above;	1581	decrease (nr);
1602		1582
1603	if (i < op->nrof)	1583	object *op = deep_clone ();
1604	op->nrof -= i;	1584	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;	1585	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	}	1586	}
1646	}	1587	}
1647		1588
1648	object *	1589	object *
1649	insert_ob_in_ob (object *op, object *where)	1590	insert_ob_in_ob (object *op, object *where)
…		…
1674	* be != op, if items are merged. -Tero	1615	* be != op, if items are merged. -Tero
1675	*/	1616	*/
1676	object *	1617	object *
1677	object::insert (object *op)	1618	object::insert (object *op)
1678	{	1619	{
1679	object *tmp, *otmp;
1680
1681	if (!QUERY_FLAG (op, FLAG_REMOVED))
1682	op->remove ();
1683
1684	if (op->more)	1620	if (op->more)
1685	{	1621	{
1686	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);	1622	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1687	return op;	1623	return op;
1688	}	1624	}
1689		1625
1690	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1626	op->remove ();
1691	CLEAR_FLAG (op, FLAG_REMOVED);	1627
		1628	op->flag [FLAG_OBJ_ORIGINAL] = 0;
		1629
1692	if (op->nrof)	1630	if (op->nrof)
1693	{
1694	for (tmp = inv; tmp != NULL; tmp = tmp->below)	1631	for (object *tmp = inv; tmp; tmp = tmp->below)
1695	if (object::can_merge (tmp, op))	1632	if (object::can_merge (tmp, op))
1696	{	1633	{
1697	/* return the original object and remove inserted object	1634	/* return the original object and remove inserted object
1698	(client needs the original object) */	1635	(client needs the original object) */
1699	tmp->nrof += op->nrof;	1636	tmp->nrof += op->nrof;
1700	/* Weight handling gets pretty funky. Since we are adding to	1637
1701	* tmp->nrof, we need to increase the weight.	1638	if (object *pl = tmp->visible_to ())
1702	*/	1639	esrv_update_item (UPD_NROF, pl, tmp);
		1640
1703	add_weight (this, op->weight * op->nrof);	1641	adjust_weight (this, op->total_weight ());
1704	SET_FLAG (op, FLAG_REMOVED);	1642
1705	op->destroy (); /* free the inserted object */	1643	op->destroy (1);
1706	op = tmp;	1644	op = tmp;
1707	op->remove (); /* and fix old object's links */	1645	goto inserted;
1708	CLEAR_FLAG (op, FLAG_REMOVED);
1709	break;
1710	}	1646	}
1711		1647
1712	/* I assume combined objects have no inventory	1648	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;	1649	op->map = 0;
1729	op->env = this;	1650	op->x = 0;
		1651	op->y = 0;
		1652
1730	op->above = 0;	1653	op->above = 0;
1731	op->below = 0;	1654	op->below = inv;
1732	op->x = 0, op->y = 0;	1655	op->env = this;
1733		1656
		1657	if (inv)
		1658	inv->above = op;
		1659
		1660	inv = op;
		1661
		1662	op->flag [FLAG_REMOVED] = 0;
		1663
		1664	if (object *pl = op->visible_to ())
		1665	esrv_send_item (pl, op);
		1666
		1667	adjust_weight (this, op->total_weight ());
		1668
		1669	inserted:
1734	/* reset the light list and los of the players on the map */	1670	/* reset the light list and los of the players on the map */
1735	if ((op->glow_radius != 0) && map)	1671	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);	1672	update_all_los (map, x, y);
1742	}
1743		1673
1744	/* Client has no idea of ordering so lets not bother ordering it here.	1674	// if this is a player's inventory, update stats
1745	* It sure simplifies this function...	1675	if (type == PLAYER && !flag [FLAG_NO_FIX_PLAYER])
1746	*/	1676	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		1677
1756	INVOKE_OBJECT (INSERT, this);	1678	INVOKE_OBJECT (INSERT, this);
1757		1679
1758	return op;	1680	return op;
1759	}	1681	}
…		…
1887	LOG (llevError, "Present_arch called outside map.\n");	1809	LOG (llevError, "Present_arch called outside map.\n");
1888	return NULL;	1810	return NULL;
1889	}	1811	}
1890		1812
1891	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)	1813	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1892	if (tmp->arch == at)	1814	if (tmp->arch->archname == at->archname)
1893	return tmp;	1815	return tmp;
1894		1816
1895	return NULL;	1817	return NULL;
1896	}	1818	}
1897		1819
…		…
1961	* The first matching object is returned, or NULL if none.	1883	* The first matching object is returned, or NULL if none.
1962	*/	1884	*/
1963	object *	1885	object *
1964	present_arch_in_ob (const archetype *at, const object *op)	1886	present_arch_in_ob (const archetype *at, const object *op)
1965	{	1887	{
1966	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)	1888	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1967	if (tmp->arch == at)	1889	if (tmp->arch->archname == at->archname)
1968	return tmp;	1890	return tmp;
1969		1891
1970	return NULL;	1892	return NULL;
1971	}	1893	}
1972		1894
…		…
1974	* activate recursively a flag on an object inventory	1896	* activate recursively a flag on an object inventory
1975	*/	1897	*/
1976	void	1898	void
1977	flag_inv (object *op, int flag)	1899	flag_inv (object *op, int flag)
1978	{	1900	{
1979	if (op->inv)
1980	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)	1901	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1981	{	1902	{
1982	SET_FLAG (tmp, flag);	1903	SET_FLAG (tmp, flag);
1983	flag_inv (tmp, flag);	1904	flag_inv (tmp, flag);
1984	}	1905	}
1985	}	1906	}
1986		1907
1987	/*	1908	/*
1988	* deactivate recursively a flag on an object inventory	1909	* deactivate recursively a flag on an object inventory
1989	*/	1910	*/
1990	void	1911	void
1991	unflag_inv (object *op, int flag)	1912	unflag_inv (object *op, int flag)
1992	{	1913	{
1993	if (op->inv)
1994	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)	1914	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1995	{	1915	{
1996	CLEAR_FLAG (tmp, flag);	1916	CLEAR_FLAG (tmp, flag);
1997	unflag_inv (tmp, flag);	1917	unflag_inv (tmp, flag);
1998	}	1918	}
1999	}	1919	}
2000		1920
2001	/*	1921	/*
2002	* find_free_spot(object, map, x, y, start, stop) will search for	1922	* 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	1923	* a spot at the given map and coordinates which will be able to contain
…		…
2005	* to search (see the freearr_x/y[] definition).	1925	* to search (see the freearr_x/y[] definition).
2006	* It returns a random choice among the alternatives found.	1926	* 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	1927	* 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	1928	* 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)	1929	* 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	1930	* Note: This function does correctly handle tiled maps, but does not
2014	* inform the caller. However, insert_ob_in_map will update as	1931	* inform the caller. However, insert_ob_in_map will update as
2015	* necessary, so the caller shouldn't need to do any special work.	1932	* 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	1933	* 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	1934	* 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	1935	* to know if the space in question will block the object. We can't use
…		…
2020	* customized, changed states, etc.	1937	* customized, changed states, etc.
2021	*/	1938	*/
2022	int	1939	int
2023	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)	1940	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2024	{	1941	{
		1942	int altern[SIZEOFFREE];
2025	int index = 0, flag;	1943	int index = 0, flag;
2026	int altern[SIZEOFFREE];
2027		1944
2028	for (int i = start; i < stop; i++)	1945	for (int i = start; i < stop; i++)
2029	{	1946	{
2030	flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]);	1947	mapxy pos (m, x, y); pos.move (i);
2031	if (!flag)	1948
		1949	if (!pos.normalise ())
		1950	continue;
		1951
		1952	mapspace &ms = *pos;
		1953
		1954	if (ms.flags () & P_IS_ALIVE)
		1955	continue;
		1956
		1957	/* However, often
		1958	* ob doesn't have any move type (when used to place exits)
		1959	* so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.
		1960	*/
		1961	if (ob && ob->move_type == 0 && ms.move_block != MOVE_ALL)
		1962	{
2032	altern [index++] = i;	1963	altern [index++] = i;
		1964	continue;
		1965	}
2033		1966
2034	/* Basically, if we find a wall on a space, we cut down the search size.	1967	/* 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.	1968	* 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 -	1969	* 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	1970	* 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	1971	* spaces in all the other directions, this will reduce the search space
2039	* to only the spaces immediately surrounding the target area, and	1972	* to only the spaces immediately surrounding the target area, and
2040	* won't look 2 spaces south of the target space.	1973	* won't look 2 spaces south of the target space.
2041	*/	1974	*/
2042	else if ((flag & P_NO_PASS) && maxfree[i] < stop)	1975	if (ms.move_block == MOVE_ALL && maxfree[i] < stop)
		1976	{
2043	stop = maxfree[i];	1977	stop = maxfree[i];
		1978	continue;
		1979	}
		1980
		1981	/* Note it is intentional that we check ob - the movement type of the
		1982	* head of the object should correspond for the entire object.
		1983	*/
		1984	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
		1985	continue;
		1986
		1987	if (ob->blocked (m, pos.x, pos.y))
		1988	continue;
		1989
		1990	altern [index++] = i;
2044	}	1991	}
2045		1992
2046	if (!index)	1993	if (!index)
2047	return -1;	1994	return -1;
2048		1995
…		…
2057	*/	2004	*/
2058	int	2005	int
2059	find_first_free_spot (const object *ob, maptile *m, int x, int y)	2006	find_first_free_spot (const object *ob, maptile *m, int x, int y)
2060	{	2007	{
2061	for (int i = 0; i < SIZEOFFREE; i++)	2008	for (int i = 0; i < SIZEOFFREE; i++)
2062	if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]))	2009	if (!ob->blocked (m, x + freearr_x[i], y + freearr_y[i]))
2063	return i;	2010	return i;
2064		2011
2065	return -1;	2012	return -1;
2066	}	2013	}
2067		2014
…		…
2344	* Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause	2291	* Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause
2345	* core dumps if they do.	2292	* core dumps if they do.
2346	*	2293	*
2347	* Add a check so we can't pick up invisible objects (0.93.8)	2294	* Add a check so we can't pick up invisible objects (0.93.8)
2348	*/	2295	*/
2349
2350	int	2296	int
2351	can_pick (const object *who, const object *item)	2297	can_pick (const object *who, const object *item)
2352	{	2298	{
2353	return /*QUERY_FLAG(who,FLAG_WIZ)|| */	2299	return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2354	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&	2300	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
…		…
2357		2303
2358	/*	2304	/*
2359	* create clone from object to another	2305	* create clone from object to another
2360	*/	2306	*/
2361	object *	2307	object *
2362	object_create_clone (object *asrc)	2308	object::deep_clone ()
2363	{	2309	{
2364	object *dst = 0, *tmp, *src, *prev, *item;	2310	assert (("deep_clone called on non-head object", is_head ()));
2365		2311
2366	if (!asrc)	2312	object *dst = clone ();
2367	return 0;
2368		2313
2369	src = asrc->head_ ();	2314	object *prev = dst;
2370
2371	prev = 0;
2372	for (object *part = src; part; part = part->more)	2315	for (object *part = this->more; part; part = part->more)
2373	{	2316	{
2374	tmp = part->clone ();	2317	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;	2318	tmp->head = dst;
2385
2386	tmp->more = 0;
2387
2388	if (prev)
2389	prev->more = tmp;	2319	prev->more = tmp;
2390
2391	prev = tmp;	2320	prev = tmp;
2392	}	2321	}
2393		2322
2394	for (item = src->inv; item; item = item->below)	2323	for (object *item = inv; item; item = item->below)
2395	insert_ob_in_ob (object_create_clone (item), dst);	2324	insert_ob_in_ob (item->deep_clone (), dst);
2396		2325
2397	return dst;	2326	return dst;
2398	}	2327	}
2399		2328
2400	/* This returns the first object in who's inventory that	2329	/* This returns the first object in who's inventory that
…		…
2409	return tmp;	2338	return tmp;
2410		2339
2411	return 0;	2340	return 0;
2412	}	2341	}
2413		2342
2414	/* If ob has a field named key, return the link from the list,	2343	const shstr &
2415	* otherwise return NULL.	2344	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	{	2345	{
2423	for (key_value *link = ob->key_values; link; link = link->next)	2346	for (key_value *kv = key_values; kv; kv = kv->next)
2424	if (link->key == key)	2347	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;	2348	return kv->value;
2459		2349
2460	return 0;	2350	return shstr_null;
2461	}	2351	}
2462		2352
2463	/*	2353	void
2464	* Updates the canonical_key in op to value.	2354	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	{	2355	{
2476	key_value *field = NULL, *last = NULL;	2356	for (key_value *kv = key_values; kv; kv = kv->next)
2477		2357	if (kv->key == key)
2478	for (field = op->key_values; field != NULL; field = field->next)
2479	{
2480	if (field->key != canonical_key)
2481	{	2358	{
2482	last = field;	2359	kv->value = value;
2483	continue;	2360	return;
2484	}	2361	}
2485		2362
2486	if (value)	2363	key_value *kv = new key_value;
2487	field->value = value;	2364
2488	else	2365	kv->next = key_values;
		2366	kv->key = key;
		2367	kv->value = value;
		2368
		2369	key_values = kv;
		2370	}
		2371
		2372	void
		2373	object::kv_del (const shstr &key)
		2374	{
		2375	for (key_value **kvp = &key_values; *kvp; kvp = &(*kvp)->next)
		2376	if ((*kvp)->key == key)
2489	{	2377	{
2490	/* Basically, if the archetype has this key set,	2378	key_value *kv = *kvp;
2491	* we need to store the null value so when we save	2379	*kvp = (*kvp)->next;
2492	* it, we save the empty value so that when we load,	2380	delete kv;
2493	* we get this value back again.	2381	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	}	2382	}
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	}	2383	}
2552		2384
2553	object::depth_iterator::depth_iterator (object *container)	2385	object::depth_iterator::depth_iterator (object *container)
2554	: iterator_base (container)	2386	: iterator_base (container)
2555	{	2387	{
…		…
2568	item = item->inv;	2400	item = item->inv;
2569	}	2401	}
2570	else	2402	else
2571	item = item->env;	2403	item = item->env;
2572	}	2404	}
2573
2574		2405
2575	const char *	2406	const char *
2576	object::flag_desc (char *desc, int len) const	2407	object::flag_desc (char *desc, int len) const
2577	{	2408	{
2578	char *p = desc;	2409	char *p = desc;
…		…
2606	{	2437	{
2607	char flagdesc[512];	2438	char flagdesc[512];
2608	char info2[256 * 4];	2439	char info2[256 * 4];
2609	char *p = info;	2440	char *p = info;
2610		2441
2611	p += snprintf (p, 512, "{cnt:%d,uuid:<1.%" PRIx64 ">,name:\"%s\"%s%s,flags:[%s],type:%d}",	2442	p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s%s,flags:[%s],type:%d}",
2612	count, uuid.seq,	2443	count,
		2444	uuid.c_str (),
2613	&name,	2445	&name,
2614	title ? "\",title:\"" : "",	2446	title ? ",title:\"" : "",
2615	title ? (const char *)title : "",	2447	title ? (const char *)title : "",
		2448	title ? "\"" : "",
2616	flag_desc (flagdesc, 512), type);	2449	flag_desc (flagdesc, 512), type);
2617		2450
2618	if (env)	2451	if (!flag[FLAG_REMOVED] && env)
2619	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2452	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2620		2453
2621	if (map)	2454	if (map)
2622	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);	2455	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2623		2456
…		…
2641	}	2474	}
2642		2475
2643	const materialtype_t *	2476	const materialtype_t *
2644	object::dominant_material () const	2477	object::dominant_material () const
2645	{	2478	{
2646	if (materialtype_t *mat = name_to_material (materialname))	2479	if (materialtype_t *mt = name_to_material (materialname))
2647	return mat;	2480	return mt;
2648		2481
2649	// omfg this is slow, this has to be temporary :)
2650	shstr unknown ("unknown");
2651
2652	return name_to_material (unknown);	2482	return name_to_material (shstr_unknown);
2653	}	2483	}
2654		2484
2655	void	2485	void
2656	object::open_container (object *new_container)	2486	object::open_container (object *new_container)
2657	{	2487	{
2658	if (container == new_container)	2488	if (container == new_container)
2659	return;	2489	return;
2660		2490
2661	if (object *old_container = container)	2491	object *old_container = container;
		2492
		2493	if (old_container)
2662	{	2494	{
2663	if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))	2495	if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
2664	return;	2496	return;
2665		2497
2666	#if 0	2498	#if 0
…		…
2668	if (object *closer = old_container->inv)	2500	if (object *closer = old_container->inv)
2669	if (closer->type == CLOSE_CON)	2501	if (closer->type == CLOSE_CON)
2670	closer->destroy ();	2502	closer->destroy ();
2671	#endif	2503	#endif
2672		2504
		2505	// make sure the container is available
		2506	esrv_send_item (this, old_container);
		2507
2673	old_container->flag [FLAG_APPLIED] = 0;	2508	old_container->flag [FLAG_APPLIED] = false;
2674	container = 0;	2509	container = 0;
2675		2510
		2511	// client needs item update to make it work, client bug requires this to be separate
2676	esrv_update_item (UPD_FLAGS, this, old_container);	2512	esrv_update_item (UPD_FLAGS, this, old_container);
		2513
2677	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));	2514	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
		2515	play_sound (sound_find ("chest_close"));
2678	}	2516	}
2679		2517
2680	if (new_container)	2518	if (new_container)
2681	{	2519	{
2682	if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))	2520	if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))
…		…
2693	}	2531	}
2694	#endif	2532	#endif
2695		2533
2696	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));	2534	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));
2697		2535
		2536	// make sure the container is available, client bug requires this to be separate
		2537	esrv_send_item (this, new_container);
		2538
2698	new_container->flag [FLAG_APPLIED] = 1;	2539	new_container->flag [FLAG_APPLIED] = true;
2699	container = new_container;	2540	container = new_container;
2700		2541
		2542	// client needs flag change
2701	esrv_update_item (UPD_FLAGS, this, new_container);	2543	esrv_update_item (UPD_FLAGS, this, new_container);
2702	esrv_send_inventory (this, new_container);	2544	esrv_send_inventory (this, new_container);
		2545	play_sound (sound_find ("chest_open"));
		2546	}
		2547	// else if (!old_container->env && contr && contr->ns)
		2548	// contr->ns->floorbox_reset ();
		2549	}
		2550
		2551	object *
		2552	object::force_find (const shstr name)
		2553	{
		2554	/* cycle through his inventory to look for the MARK we want to
		2555	* place
		2556	*/
		2557	for (object *tmp = inv; tmp; tmp = tmp->below)
		2558	if (tmp->type == FORCE && tmp->slaying == name)
		2559	return splay (tmp);
		2560
		2561	return 0;
		2562	}
		2563
		2564	void
		2565	object::force_add (const shstr name, int duration)
		2566	{
		2567	if (object *force = force_find (name))
		2568	force->destroy ();
		2569
		2570	object *force = get_archetype (FORCE_NAME);
		2571
		2572	force->slaying = name;
		2573	force->stats.food = 1;
		2574	force->speed_left = -1.f;
		2575
		2576	force->set_speed (duration ? 1.f / duration : 0.f);
		2577	force->flag [FLAG_IS_USED_UP] = true;
		2578	force->flag [FLAG_APPLIED] = true;
		2579
		2580	insert (force);
		2581	}
		2582
		2583	void
		2584	object::play_sound (faceidx sound)
		2585	{
		2586	if (!sound)
		2587	return;
		2588
		2589	if (flag [FLAG_REMOVED])
		2590	return;
		2591
		2592	if (env)
2703	}	2593	{
		2594	if (object *pl = in_player ())
		2595	pl->contr->play_sound (sound);
		2596	}
		2597	else
		2598	map->play_sound (sound, x, y);
2704	}	2599	}
2705		2600
2706

Diff Legend

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