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.139 by root, Sat Apr 21 17:34:22 2007 UTC vs.
Revision 1.233 by root, Tue May 6 18:47:32 2008 UTC

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

Diff Legend

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