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.165 by root, Tue Jul 10 07:31:19 2007 UTC vs.
Revision 1.225 by root, Fri May 2 20:28:44 2008 UTC

1	/*	1	/*
2	* This file is part of Crossfire TRT, the Roguelike Realtime MORPG.	2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.
3	*	3	*
4	* Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team	4	* Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5	* Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team	5	* Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team
6	* Copyright (©) 1992,2007 Frank Tore Johansen	6	* Copyright (©) 1992,2007 Frank Tore Johansen
7	*	7	*
8	* Crossfire TRT is free software: you can redistribute it and/or modify	8	* Deliantra is free software: you can redistribute it and/or modify
9	* it under the terms of the GNU General Public License as published by	9	* it under the terms of the GNU General Public License as published by
10	* the Free Software Foundation, either version 3 of the License, or	10	* the Free Software Foundation, either version 3 of the License, or
11	* (at your option) any later version.	11	* (at your option) any later version.
12	*	12	*
13	* This program is distributed in the hope that it will be useful,	13	* This program is distributed in the hope that it will be useful,
…		…
16	* GNU General Public License for more details.	16	* GNU General Public License for more details.
17	*	17	*
18	* You should have received a copy of the GNU General Public License	18	* You should have received a copy of the GNU General Public License
19	* along with this program. If not, see <http://www.gnu.org/licenses/>.	19	* along with this program. If not, see <http://www.gnu.org/licenses/>.
20	*	20	*
21	* The authors can be reached via e-mail to <crossfire@schmorp.de>	21	* The authors can be reached via e-mail to <support@deliantra.net>
22	*/	22	*/
23		23
24	/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
25	sub/add_weight will transcend the environment updating the carrying
26	variable. */
27	#include <global.h>	24	#include <global.h>
28	#include <stdio.h>	25	#include <stdio.h>
29	#include <sys/types.h>	26	#include <sys/types.h>
30	#include <sys/uio.h>	27	#include <sys/uio.h>
31	#include <object.h>	28	#include <object.h>
32	#include <funcpoint.h>
33	#include <sproto.h>	29	#include <sproto.h>
34	#include <loader.h>	30	#include <loader.h>
35		31
36	#include <bitset>	32	#include <bitset>
37		33
38	int nrofallocobjects = 0;	34	UUID UUID::cur;
39	static UUID uuid;	35	static uint64_t seq_next_save;
40	const uint64 UUID_SKIP = 1<<19;	36	static const uint64 UUID_GAP = 1<<19;
41		37
42	objectvec objects;	38	objectvec objects;
43	activevec actives;	39	activevec actives;
44		40
45	short freearr_x[SIZEOFFREE] = { 0, 0, 1, 1, 1, 0, -1, -1, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,	41	short freearr_x[SIZEOFFREE] = {
		42	0,
		43	0, 1, 1, 1, 0, -1, -1, -1,
		44	0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,
46	0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1	45	0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1
47	};	46	};
48	short freearr_y[SIZEOFFREE] = { 0, -1, -1, 0, 1, 1, 1, 0, -1, -2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2,	47	short freearr_y[SIZEOFFREE] = {
		48	0,
		49	-1, -1, 0, 1, 1, 1, 0, -1,
		50	-2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2,
49	-3, -3, -3, -3, -2, -1, 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3	51	-3, -3, -3, -3, -2, -1, 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3
50	};	52	};
51	int maxfree[SIZEOFFREE] = { 0, 9, 10, 13, 14, 17, 18, 21, 22, 25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45,	53	int maxfree[SIZEOFFREE] = {
		54	0,
		55	9, 10, 13, 14, 17, 18, 21, 22,
		56	25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45, 48,
52	48, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49	57	49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49
53	};	58	};
54	int freedir[SIZEOFFREE] = {	59	int freedir[SIZEOFFREE] = {
55	0, 1, 2, 3, 4, 5, 6, 7, 8, 1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8,	60	0,
		61	1, 2, 3, 4, 5, 6, 7, 8,
		62	1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8,
56	1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8	63	1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8
57	};	64	};
58		65
59	static void	66	static void
60	write_uuid (void)	67	write_uuid (uval64 skip, bool sync)
61	{	68	{
62	char filename1[MAX_BUF], filename2[MAX_BUF];	69	CALL_BEGIN (2);
63		70	CALL_ARG_SV (newSVval64 (skip));
64	sprintf (filename1, "%s/uuid", settings.localdir);	71	CALL_ARG_SV (boolSV (sync));
65	sprintf (filename2, "%s/uuid~", settings.localdir);	72	CALL_CALL ("cf::write_uuid", G_DISCARD);
66		73	CALL_END;
67	FILE *fp;
68
69	if (!(fp = fopen (filename2, "w")))
70	{
71	LOG (llevError, "ERROR: cannot open %s for writing, unable to write UUID!\n", filename2);
72	return;
73	}
74
75	fprintf (fp, "<1,%llx>\n", (unsigned long long)uuid.seq + UUID_SKIP * 2);
76	fclose (fp);
77	rename (filename2, filename1);
78	}	74	}
79		75
80	static void	76	static void
81	read_uuid (void)	77	read_uuid (void)
82	{	78	{
83	char filename[MAX_BUF];	79	char filename[MAX_BUF];
84		80
85	sprintf (filename, "%s/uuid", settings.localdir);	81	sprintf (filename, "%s/uuid", settings.localdir);
		82
		83	seq_next_save = 0;
86		84
87	FILE *fp;	85	FILE *fp;
88		86
89	if (!(fp = fopen (filename, "r")))	87	if (!(fp = fopen (filename, "r")))
90	{	88	{
91	if (errno == ENOENT)	89	if (errno == ENOENT)
92	{	90	{
93	LOG (llevInfo, "RESET uid to 1\n");	91	LOG (llevInfo, "RESET uid to 1\n");
94	uuid.seq = 0;	92	UUID::cur.seq = 0;
95	write_uuid ();	93	write_uuid (UUID_GAP, true);
96	return;	94	return;
97	}	95	}
98		96
99	LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);	97	LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);
100	_exit (1);	98	_exit (1);
101	}	99	}
102		100
103	int version;	101	UUID::BUF buf;
104	unsigned long long uid;	102	buf[0] = 0;
105	if (2 != fscanf (fp, "<%d,%llx>\n", &version, &uid) || version != 1)	103	fgets (buf, sizeof (buf), fp);
		104
		105	if (!UUID::cur.parse (buf))
106	{	106	{
107	LOG (llevError, "FATAL: error reading uid from %s!\n", filename);	107	LOG (llevError, "FATAL: error reading uid from %s (%s)!\n", filename, buf);
108	_exit (1);	108	_exit (1);
109	}	109	}
110		110
111	uuid.seq = uid;	111	LOG (llevDebug, "read UUID: %s\n", UUID::cur.c_str ());
112	write_uuid ();	112
113	LOG (llevDebug, "read UID: %" PRId64 "\n", uid);	113	write_uuid (UUID_GAP, true);
114	fclose (fp);	114	fclose (fp);
115	}	115	}
116		116
117	UUID	117	UUID
118	gen_uuid ()	118	UUID::gen ()
119	{	119	{
120	UUID uid;	120	UUID uid;
121		121
122	uid.seq = ++uuid.seq;	122	uid.seq = ++cur.seq;
123		123
124	if (!(uuid.seq & (UUID_SKIP - 1)))	124	if (expect_false (cur.seq >= seq_next_save))
125	write_uuid ();	125	{
		126	seq_next_save = UUID::cur.seq + (UUID_GAP >> 1);
		127	write_uuid (UUID_GAP, false);
		128	}
		129
126		130
127	return uid;	131	return uid;
128	}	132	}
129		133
130	void	134	void
131	init_uuid ()	135	UUID::init ()
132	{	136	{
133	read_uuid ();	137	read_uuid ();
134	}	138	}
135		139
136	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */	140	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */
137	static int	141	static bool
138	compare_ob_value_lists_one (const object *wants, const object *has)	142	compare_ob_value_lists_one (const object *wants, const object *has)
139	{	143	{
140	key_value *wants_field;	144	key_value *wants_field;
141		145
142	/* n-squared behaviour (see get_ob_key_link()), but I'm hoping both	146	/* n-squared behaviour (see get_ob_key_link()), but I'm hoping both
…		…
150	key_value *has_field;	154	key_value *has_field;
151		155
152	/* Look for a field in has with the same key. */	156	/* Look for a field in has with the same key. */
153	has_field = get_ob_key_link (has, wants_field->key);	157	has_field = get_ob_key_link (has, wants_field->key);
154		158
155	if (has_field == NULL)	159	if (!has_field)
156	{
157	/* No field with that name. */	160	return 0; /* No field with that name. */
158	return FALSE;
159	}
160		161
161	/* Found the matching field. */	162	/* Found the matching field. */
162	if (has_field->value != wants_field->value)	163	if (has_field->value != wants_field->value)
163	{
164	/* Values don't match, so this half of the comparison is false. */	164	return 0; /* Values don't match, so this half of the comparison is false. */
165	return FALSE;
166	}
167		165
168	/* If we get here, we found a match. Now for the next field in wants. */	166	/* If we get here, we found a match. Now for the next field in wants. */
169	}	167	}
170		168
171	/* If we get here, every field in wants has a matching field in has. */	169	/* If we get here, every field in wants has a matching field in has. */
172	return TRUE;	170	return 1;
173	}	171	}
174		172
175	/* Returns TRUE if ob1 has the same key_values as ob2. */	173	/* Returns TRUE if ob1 has the same key_values as ob2. */
176	static int	174	static bool
177	compare_ob_value_lists (const object *ob1, const object *ob2)	175	compare_ob_value_lists (const object *ob1, const object *ob2)
178	{	176	{
179	/* However, there may be fields in has which aren't partnered in wants,	177	/* However, there may be fields in has which aren't partnered in wants,
180	* so we need to run the comparison *twice*. :(	178	* so we need to run the comparison *twice*. :(
181	*/	179	*/
…		…
202	|| ob1->speed != ob2->speed	200	|| ob1->speed != ob2->speed
203	|| ob1->value != ob2->value	201	|| ob1->value != ob2->value
204	|| ob1->name != ob2->name)	202	|| ob1->name != ob2->name)
205	return 0;	203	return 0;
206		204
207	//TODO: this ain't working well, use nicer and correct overflow check	205	/* 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	206	* for unsigned overflow (2c), second part checks whether the result
209	* value could not be stored in a sint32 (which unfortunately sometimes is	207	* would fit into a 32 bit signed int, which is often used to hold
210	* used to store nrof).	208	* nrof values.
211	*/	209	*/
212	if (ob1->nrof + ob2->nrof >= 1UL << 31)	210	if (~ob1->nrof < ob2->nrof || ob1->nrof + ob2->nrof > (1UL << 31))
213	return 0;	211	return 0;
214		212
215	/* If the objects have been identified, set the BEEN_APPLIED flag.	213	/* 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	214	* 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	215	* 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	216	* are not equal - just if it has been identified, the been_applied
219	* flags lose any meaning.	217	* flags lose any meaning.
220	*/	218	*/
221	if (QUERY_FLAG (ob1, FLAG_IDENTIFIED))	219	if (QUERY_FLAG (ob1, FLAG_IDENTIFIED))
222	SET_FLAG (ob1, FLAG_BEEN_APPLIED);	220	SET_FLAG (ob1, FLAG_BEEN_APPLIED);
223		221
224	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))	222	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))
225	SET_FLAG (ob2, FLAG_BEEN_APPLIED);	223	SET_FLAG (ob2, FLAG_BEEN_APPLIED);
226		224
227	if ((ob1->flag ^ ob2->flag).reset (FLAG_INV_LOCKED).reset (FLAG_CLIENT_SENT).any ()	225	if (ob1->arch->name != ob2->arch->name
228	|| ob1->arch != ob2->arch
229	|| ob1->name != ob2->name	226	|| ob1->name != ob2->name
230	|| ob1->title != ob2->title	227	|| ob1->title != ob2->title
231	|| ob1->msg != ob2->msg	228	|| ob1->msg != ob2->msg
232	|| ob1->weight != ob2->weight	229	|| 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	230	|| ob1->attacktype != ob2->attacktype
236	|| ob1->magic != ob2->magic	231	|| ob1->magic != ob2->magic
237	|| ob1->slaying != ob2->slaying	232	|| ob1->slaying != ob2->slaying
238	|| ob1->skill != ob2->skill	233	|| ob1->skill != ob2->skill
239	|| ob1->value != ob2->value	234	|| ob1->value != ob2->value
…		…
246	|| ob1->move_block != ob2->move_block	241	|| ob1->move_block != ob2->move_block
247	|| ob1->move_allow != ob2->move_allow	242	|| ob1->move_allow != ob2->move_allow
248	|| ob1->move_on != ob2->move_on	243	|| ob1->move_on != ob2->move_on
249	|| ob1->move_off != ob2->move_off	244	|| ob1->move_off != ob2->move_off
250	|| ob1->move_slow != ob2->move_slow	245	|| ob1->move_slow != ob2->move_slow
251	|| ob1->move_slow_penalty != ob2->move_slow_penalty)	246	|| ob1->move_slow_penalty != ob2->move_slow_penalty
		247	|| memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
		248	|| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats)))
252	return 0;	249	return 0;
253		250
		251	if ((ob1->flag ^ ob2->flag)
		252	.reset (FLAG_INV_LOCKED)
		253	.reset (FLAG_CLIENT_SENT)
		254	.reset (FLAG_REMOVED)
		255	.any ())
		256	return 0;
		257
254	/* This is really a spellbook check - really, we should	258	/* This is really a spellbook check - we should in general
255	* check all objects in the inventory.	259	* not merge objects with real inventories, as splitting them
		260	* is hard.
256	*/	261	*/
257	if (ob1->inv || ob2->inv)	262	if (ob1->inv || ob2->inv)
258	{	263	{
259	/* if one object has inventory but the other doesn't, not equiv */	264	if (!(ob1->inv && ob2->inv))
260	if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv))	265	return 0; /* inventories differ in length */
261	return 0;
262		266
263	/* Now check to see if the two inventory objects could merge */	267	if (ob1->inv->below || ob2->inv->below)
		268	return 0; /* more than one object in inv */
		269
264	if (!object::can_merge (ob1->inv, ob2->inv))	270	if (!object::can_merge (ob1->inv, ob2->inv))
265	return 0;	271	return 0; /* inventory objects differ */
266		272
267	/* inventory ok - still need to check rest of this object to see	273	/* inventory ok - still need to check rest of this object to see
268	* if it is valid.	274	* if it is valid.
269	*/	275	*/
270	}	276	}
…		…
289	if (ob1->level != ob2->level)	295	if (ob1->level != ob2->level)
290	return 0;	296	return 0;
291	break;	297	break;
292	}	298	}
293		299
294	if (ob1->key_values != NULL || ob2->key_values != NULL)	300	if (ob1->key_values || ob2->key_values)
295	{	301	{
296	/* At least one of these has key_values. */	302	/* At least one of these has key_values. */
297	if ((ob1->key_values == NULL) != (ob2->key_values == NULL))	303	if ((!ob1->key_values) != (!ob2->key_values))
298	/* One has fields, but the other one doesn't. */	304	return 0; /* One has fields, but the other one doesn't. */
		305
		306	if (!compare_ob_value_lists (ob1, ob2))
299	return 0;	307	return 0;
300	else if (!compare_ob_value_lists (ob1, ob2))
301	return 0;
302	}	308	}
303		309
304	//TODO: generate an event or call into perl for additional checks
305	if (ob1->self || ob2->self)	310	if (ob1->self || ob2->self)
306	{	311	{
307	ob1->optimise ();	312	ob1->optimise ();
308	ob2->optimise ();	313	ob2->optimise ();
309		314
310	if (ob1->self || ob2->self)	315	if (ob1->self || ob2->self)
		316	{
		317	int k1 = ob1->self ? HvTOTALKEYS (ob1->self) : 0;
		318	int k2 = ob2->self ? HvTOTALKEYS (ob2->self) : 0;
		319
		320	if (k1 != k2)
311	return 0;	321	return 0;
		322
		323	if (k1 == 0)
		324	return 1;
		325
		326	if (!cfperl_can_merge (ob1, ob2))
		327	return 0;
		328	}
312	}	329	}
313		330
314	/* Everything passes, must be OK. */	331	/* Everything passes, must be OK. */
315	return 1;	332	return 1;
316	}	333	}
317		334
		335	// find player who can see this object
		336	object *
		337	object::visible_to () const
		338	{
		339	if (client_visible () && !flag [FLAG_REMOVED])
		340	{
		341	// see if we are in a container of sorts
		342	if (env)
		343	{
		344	// the player inventory itself is always visible
		345	if (env->type == PLAYER)
		346	return env;
		347
		348	// else a player could have our env open
		349	object *envest = env->outer_env ();
		350
		351	// the player itself is always on a map, so we will find him here
		352	// even if our inv is in a player.
		353	if (envest->is_on_map ())
		354	if (object *pl = envest->ms ().player ())
		355	if (pl->container == env)
		356	return pl;
		357	}
		358	else
		359	{
		360	// maybe there is a player standing on the same mapspace
		361	// this will catch the case where "this" is a player
		362	if (object *pl = ms ().player ())
		363	if (!pl->container || this == pl->container)
		364	return pl;
		365	}
		366	}
		367
		368	return 0;
		369	}
		370
		371	// adjust weight per container type ("of holding")
		372	static sint32
		373	weight_adjust (object *op, sint32 weight)
		374	{
		375	return op->type == CONTAINER
		376	? lerp (weight, 0, 100, 0, 100 - op->stats.Str)
		377	: weight;
		378	}
		379
318	/*	380	/*
		381	* adjust_weight(object, weight) adds the specified weight to an object,
		382	* and also updates how much the environment(s) is/are carrying.
		383	*/
		384	static void
		385	adjust_weight (object *op, sint32 weight)
		386	{
		387	while (op)
		388	{
		389	weight = weight_adjust (op, weight);
		390
		391	if (!weight)
		392	return;
		393
		394	op->carrying += weight;
		395
		396	if (object *pl = op->visible_to ())
		397	if (pl != op) // player is handled lazily
		398	esrv_update_item (UPD_WEIGHT, pl, op);
		399
		400	op = op->env;
		401	}
		402	}
		403
		404	/*
319	* sum_weight() is a recursive function which calculates the weight	405	* this is a recursive function which calculates the weight
320	* an object is carrying. It goes through in figures out how much	406	* an object is carrying. It goes through op and figures out how much
321	* containers are carrying, and sums it up.	407	* containers are carrying, and sums it up.
322	*/	408	*/
323	long	409	void
324	sum_weight (object *op)	410	object::update_weight ()
325	{	411	{
326	long sum;	412	sint32 sum = 0;
327	object *inv;
328		413
329	for (sum = 0, inv = op->inv; inv; inv = inv->below)	414	for (object *op = inv; op; op = op->below)
330	{	415	{
331	if (inv->inv)	416	if (op->inv)
332	sum_weight (inv);	417	op->update_weight ();
333		418
334	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);	419	sum += op->total_weight ();
		420	}
		421
		422	sum = weight_adjust (this, sum);
		423
		424	if (sum != carrying)
335	}	425	{
336
337	if (op->type == CONTAINER && op->stats.Str)
338	sum = (sum * (100 - op->stats.Str)) / 100;
339
340	if (op->carrying != sum)
341	op->carrying = sum;	426	carrying = sum;
342		427
343	return sum;	428	if (object *pl = visible_to ())
		429	if (pl != this) // player is handled lazily
		430	esrv_update_item (UPD_WEIGHT, pl, this);
		431	}
344	}	432	}
345		433
346	/**	434	/*
347	* Return the outermost environment object for a given object.	435	* Used by: Server DM commands: dumpbelow, dump. Some error messages.
348	*/
349
350	object *
351	object_get_env_recursive (object *op)
352	{
353	while (op->env != NULL)
354	op = op->env;
355	return op;
356	}
357
358	/*
359	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
360	* Some error messages.
361	* The result of the dump is stored in the static global errmsg array.
362	*/	436	*/
363	char *	437	char *
364	dump_object (object *op)	438	dump_object (object *op)
365	{	439	{
366	if (!op)	440	if (!op)
…		…
374	/*	448	/*
375	* get_nearest_part(multi-object, object 2) returns the part of the	449	* get_nearest_part(multi-object, object 2) returns the part of the
376	* multi-object 1 which is closest to the second object.	450	* multi-object 1 which is closest to the second object.
377	* If it's not a multi-object, it is returned.	451	* If it's not a multi-object, it is returned.
378	*/	452	*/
379
380	object *	453	object *
381	get_nearest_part (object *op, const object *pl)	454	get_nearest_part (object *op, const object *pl)
382	{	455	{
383	object *tmp, *closest;	456	object *tmp, *closest;
384	int last_dist, i;	457	int last_dist, i;
385		458
386	if (op->more == NULL)	459	if (!op->more)
387	return op;	460	return op;
		461
388	for (last_dist = distance (op, pl), closest = op, tmp = op->more; tmp != NULL; tmp = tmp->more)	462	for (last_dist = distance (op, pl), closest = op, tmp = op->more;
		463	tmp;
		464	tmp = tmp->more)
389	if ((i = distance (tmp, pl)) < last_dist)	465	if ((i = distance (tmp, pl)) < last_dist)
390	closest = tmp, last_dist = i;	466	closest = tmp, last_dist = i;
		467
391	return closest;	468	return closest;
392	}	469	}
393		470
394	/*	471	/*
395	* Returns the object which has the count-variable equal to the argument.	472	* Returns the object which has the count-variable equal to the argument.
		473	* VERRRY slow.
396	*/	474	*/
397	object *	475	object *
398	find_object (tag_t i)	476	find_object (tag_t i)
399	{	477	{
400	for_all_objects (op)	478	for_all_objects (op)
…		…
420	break;	498	break;
421		499
422	return op;	500	return op;
423	}	501	}
424		502
425	void
426	free_all_object_data ()
427	{
428	LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);
429	}
430
431	/*	503	/*
432	* Sets the owner and sets the skill and exp pointers to owner's current	504	* Sets the owner and sets the skill and exp pointers to owner's current
433	* skill and experience objects.	505	* skill and experience objects.
		506	* ACTUALLY NO! investigate! TODO
434	*/	507	*/
435	void	508	void
436	object::set_owner (object *owner)	509	object::set_owner (object *owner)
437	{	510	{
		511	// allow objects which own objects
438	if (!owner)	512	if (owner)
439	return;
440
441	/* next line added to allow objects which own objects */
442	/* Add a check for ownercounts in here, as I got into an endless loop
443	* with the fireball owning a poison cloud which then owned the
444	* fireball. I believe that was caused by one of the objects getting
445	* freed and then another object replacing it. Since the ownercounts
446	* didn't match, this check is valid and I believe that cause is valid.
447	*/
448	while (owner->owner)	513	while (owner->owner)
449	owner = owner->owner;	514	owner = owner->owner;
		515
		516	if (flag [FLAG_FREED])
		517	{
		518	LOG (llevError | logBacktrace, "tried to set owner of %s to %s\n", debug_desc (), owner->debug_desc ());
		519	return;
		520	}
450		521
451	this->owner = owner;	522	this->owner = owner;
452	}	523	}
453		524
454	int	525	int
…		…
535	}	606	}
536		607
537	object &	608	object &
538	object::operator =(const object &src)	609	object::operator =(const object &src)
539	{	610	{
540	bool is_freed = flag [FLAG_FREED];	611	remove ();
541	bool is_removed = flag [FLAG_REMOVED];
542		612
543	*(object_copy *)this = src;	613	*(object_copy *)this = src;
544		614
545	flag [FLAG_FREED] = is_freed;
546	flag [FLAG_REMOVED] = is_removed;	615	flag [FLAG_REMOVED] = true;
547		616
548	/* Copy over key_values, if any. */	617	/* Copy over key_values, if any. */
549	if (src.key_values)	618	if (src.key_values)
550	{	619	{
551	key_value *tail = 0;	620	key_value *tail = 0;
…		…
586	object::copy_to (object *dst)	655	object::copy_to (object *dst)
587	{	656	{
588	*dst = *this;	657	*dst = *this;
589		658
590	if (speed < 0)	659	if (speed < 0)
591	dst->speed_left = speed_left - rndm ();	660	dst->speed_left -= rndm ();
592		661
593	dst->set_speed (dst->speed);	662	dst->set_speed (dst->speed);
594	}	663	}
595		664
596	void	665	void
597	object::instantiate ()	666	object::instantiate ()
598	{	667	{
599	if (!uuid.seq) // HACK	668	if (!uuid.seq) // HACK
600	uuid = gen_uuid ();	669	uuid = UUID::gen ();
601		670
602	speed_left = -0.1f;	671	speed_left = -0.1f;
603	/* copy the body_info to the body_used - this is only really	672	/* copy the body_info to the body_used - this is only really
604	* need for monsters, but doesn't hurt to do it for everything.	673	* need for monsters, but doesn't hurt to do it for everything.
605	* by doing so, when a monster is created, it has good starting	674	* by doing so, when a monster is created, it has good starting
…		…
615	object *	684	object *
616	object::clone ()	685	object::clone ()
617	{	686	{
618	object *neu = create ();	687	object *neu = create ();
619	copy_to (neu);	688	copy_to (neu);
		689	neu->map = map; // not copied by copy_to
620	return neu;	690	return neu;
621	}	691	}
622		692
623	/*	693	/*
624	* If an object with the IS_TURNABLE() flag needs to be turned due	694	* If an object with the IS_TURNABLE() flag needs to be turned due
…		…
675	* UP_OBJ_FACE: only the objects face has changed.	745	* UP_OBJ_FACE: only the objects face has changed.
676	*/	746	*/
677	void	747	void
678	update_object (object *op, int action)	748	update_object (object *op, int action)
679	{	749	{
680	if (op == NULL)	750	if (!op)
681	{	751	{
682	/* this should never happen */	752	/* this should never happen */
683	LOG (llevDebug, "update_object() called for NULL object.\n");	753	LOG (llevError | logBacktrace, "update_object() called for NULL object.\n");
684	return;	754	return;
685	}	755	}
686		756
687	if (op->env)	757	if (!op->is_on_map ())
688	{	758	{
689	/* Animation is currently handled by client, so nothing	759	/* Animation is currently handled by client, so nothing
690	* to do in this case.	760	* to do in this case.
691	*/	761	*/
692	return;	762	return;
693	}	763	}
694
695	/* If the map is saving, don't do anything as everything is
696	* going to get freed anyways.
697	*/
698	if (!op->map || op->map->in_memory == MAP_SAVING)
699	return;
700		764
701	/* make sure the object is within map boundaries */	765	/* make sure the object is within map boundaries */
702	if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height)	766	if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height)
703	{	767	{
704	LOG (llevError, "update_object() called for object out of map!\n");	768	LOG (llevError, "update_object() called for object out of map!\n");
…		…
764	static int object_count;	828	static int object_count;
765		829
766	void object::link ()	830	void object::link ()
767	{	831	{
768	assert (!index);//D	832	assert (!index);//D
769	uuid = gen_uuid ();	833	uuid = UUID::gen ();
770	count = ++object_count;	834	count = ++object_count;
771		835
772	refcnt_inc ();	836	refcnt_inc ();
773	objects.insert (this);	837	objects.insert (this);
774	}	838	}
…		…
847	object::destroy_inv (bool drop_to_ground)	911	object::destroy_inv (bool drop_to_ground)
848	{	912	{
849	// need to check first, because the checks below might segfault	913	// need to check first, because the checks below might segfault
850	// as we might be on an invalid mapspace and crossfire code	914	// as we might be on an invalid mapspace and crossfire code
851	// is too buggy to ensure that the inventory is empty.	915	// is too buggy to ensure that the inventory is empty.
852	// corollary: if you create arrows etc. with stuff in tis inventory,	916	// corollary: if you create arrows etc. with stuff in its inventory,
853	// cf will crash below with off-map x and y	917	// cf will crash below with off-map x and y
854	if (!inv)	918	if (!inv)
855	return;	919	return;
856		920
857	/* Only if the space blocks everything do we not process -	921	/* Only if the space blocks everything do we not process -
858	* if some form of movement is allowed, let objects	922	* if some form of movement is allowed, let objects
859	* drop on that space.	923	* drop on that space.
860	*/	924	*/
861	if (!drop_to_ground	925	if (!drop_to_ground
862	|| !map	926	|| !map
863	|| map->in_memory != MAP_IN_MEMORY	927	|| map->in_memory != MAP_ACTIVE
864	|| map->nodrop	928	|| map->nodrop
865	|| ms ().move_block == MOVE_ALL)	929	|| ms ().move_block == MOVE_ALL)
866	{	930	{
867	while (inv)	931	while (inv)
868	{	932	{
869	inv->destroy_inv (drop_to_ground);	933	inv->destroy_inv (false);
870	inv->destroy ();	934	inv->destroy ();
871	}	935	}
872	}	936	}
873	else	937	else
874	{ /* Put objects in inventory onto this space */	938	{ /* Put objects in inventory onto this space */
…		…
880	|| op->flag [FLAG_NO_DROP]	944	|| op->flag [FLAG_NO_DROP]
881	|| op->type == RUNE	945	|| op->type == RUNE
882	|| op->type == TRAP	946	|| op->type == TRAP
883	|| op->flag [FLAG_IS_A_TEMPLATE]	947	|| op->flag [FLAG_IS_A_TEMPLATE]
884	|| op->flag [FLAG_DESTROY_ON_DEATH])	948	|| op->flag [FLAG_DESTROY_ON_DEATH])
885	op->destroy ();	949	op->destroy (true);
886	else	950	else
887	map->insert (op, x, y);	951	map->insert (op, x, y);
888	}	952	}
889	}	953	}
890	}	954	}
…		…
894	object *op = new object;	958	object *op = new object;
895	op->link ();	959	op->link ();
896	return op;	960	return op;
897	}	961	}
898		962
		963	static struct freed_map : maptile
		964	{
		965	freed_map ()
		966	{
		967	path = "<freed objects map>";
		968	name = "/internal/freed_objects_map";
		969	width = 3;
		970	height = 3;
		971	nodrop = 1;
		972
		973	alloc ();
		974	in_memory = MAP_ACTIVE;
		975	}
		976	} freed_map; // freed objects are moved here to avoid crashes
		977
899	void	978	void
900	object::do_destroy ()	979	object::do_destroy ()
901	{	980	{
902	attachable::do_destroy ();
903
904	if (flag [FLAG_IS_LINKED])	981	if (flag [FLAG_IS_LINKED])
905	remove_button_link (this);	982	remove_button_link (this);
906		983
907	if (flag [FLAG_FRIENDLY])	984	if (flag [FLAG_FRIENDLY])
908	remove_friendly_object (this);	985	remove_friendly_object (this);
909		986
910	if (!flag [FLAG_REMOVED])
911	remove ();	987	remove ();
912		988
913	destroy_inv (true);	989	attachable::do_destroy ();
914		990
915	deactivate ();	991	deactivate ();
916	unlink ();	992	unlink ();
917		993
918	flag [FLAG_FREED] = 1;	994	flag [FLAG_FREED] = 1;
919		995
920	// hack to ensure that freed objects still have a valid map	996	// hack to ensure that freed objects still have a valid map
921	{
922	static maptile *freed_map; // freed objects are moved here to avoid crashes
923
924	if (!freed_map)
925	{
926	freed_map = new maptile;
927
928	freed_map->name = "/internal/freed_objects_map";
929	freed_map->width = 3;
930	freed_map->height = 3;
931
932	freed_map->alloc ();
933	freed_map->in_memory = MAP_IN_MEMORY;
934	}
935
936	map = freed_map;	997	map = &freed_map;
937	x = 1;	998	x = 1;
938	y = 1;	999	y = 1;
939	}
940		1000
941	if (more)	1001	if (more)
942	{	1002	{
943	more->destroy ();	1003	more->destroy ();
944	more = 0;	1004	more = 0;
…		…
957	object::destroy (bool destroy_inventory)	1017	object::destroy (bool destroy_inventory)
958	{	1018	{
959	if (destroyed ())	1019	if (destroyed ())
960	return;	1020	return;
961		1021
		1022	if (!is_head () && !head->destroyed ())
		1023	{
		1024	LOG (llevError | logBacktrace, "tried to destroy the tail of an object");
		1025	head->destroy (destroy_inventory);
		1026	return;
		1027	}
		1028
962	if (destroy_inventory)	1029	destroy_inv (!destroy_inventory);
963	destroy_inv (false);	1030
		1031	if (is_head ())
		1032	if (sound_destroy)
		1033	play_sound (sound_destroy);
		1034	else if (flag [FLAG_MONSTER])
		1035	play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism
964		1036
965	attachable::destroy ();	1037	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	}	1038	}
984		1039
985	/* op->remove ():	1040	/* op->remove ():
986	* This function removes the object op from the linked list of objects	1041	* 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	1042	* which it is currently tied to. When this function is done, the
…		…
993	object::do_remove ()	1048	object::do_remove ()
994	{	1049	{
995	object *tmp, *last = 0;	1050	object *tmp, *last = 0;
996	object *otmp;	1051	object *otmp;
997		1052
998	if (QUERY_FLAG (this, FLAG_REMOVED))	1053	if (flag [FLAG_REMOVED])
999	return;	1054	return;
1000		1055
1001	SET_FLAG (this, FLAG_REMOVED);
1002	INVOKE_OBJECT (REMOVE, this);	1056	INVOKE_OBJECT (REMOVE, this);
		1057
		1058	flag [FLAG_REMOVED] = true;
1003		1059
1004	if (more)	1060	if (more)
1005	more->remove ();	1061	more->remove ();
1006		1062
1007	/*	1063	/*
1008	* In this case, the object to be removed is in someones	1064	* In this case, the object to be removed is in someones
1009	* inventory.	1065	* inventory.
1010	*/	1066	*/
1011	if (env)	1067	if (env)
1012	{	1068	{
		1069	flag [FLAG_REMOVED] = false; // hack around the issue of visible_to checking flag_removed
		1070	if (object *pl = visible_to ())
		1071	esrv_del_item (pl->contr, count);
		1072	flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed
		1073
		1074	adjust_weight (env, -total_weight ());
		1075
		1076	*(above ? &above->below : &env->inv) = below;
		1077
1013	if (nrof)	1078	if (below)
1014	sub_weight (env, weight * nrof);	1079	below->above = above;
1015	else	1080
1016	sub_weight (env, weight + carrying);	1081	/* we set up values so that it could be inserted into
		1082	* the map, but we don't actually do that - it is up
		1083	* to the caller to decide what we want to do.
		1084	*/
		1085	map = env->map;
		1086	x = env->x;
		1087	y = env->y;
		1088	above = 0;
		1089	below = 0;
		1090	env = 0;
1017		1091
1018	/* NO_FIX_PLAYER is set when a great many changes are being	1092	/* NO_FIX_PLAYER is set when a great many changes are being
1019	* made to players inventory. If set, avoiding the call	1093	* made to players inventory. If set, avoiding the call
1020	* to save cpu time.	1094	* to save cpu time.
1021	*/	1095	*/
1022	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1096	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1023	otmp->update_stats ();	1097	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	}	1098	}
1042	else if (map)	1099	else if (map)
1043	{	1100	{
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;	1101	map->dirty = true;
1057	mapspace &ms = this->ms ();	1102	mapspace &ms = this->ms ();
		1103
		1104	if (object *pl = ms.player ())
		1105	{
		1106	if (type == PLAYER) // this == pl(!)
		1107	{
		1108	// leaving a spot always closes any open container on the ground
		1109	if (container && !container->env)
		1110	// this causes spurious floorbox updates, but it ensures
		1111	// that the CLOSE event is being sent.
		1112	close_container ();
		1113
		1114	--map->players;
		1115	map->touch ();
		1116	}
		1117	else if (pl->container == this)
		1118	{
		1119	// removing a container should close it
		1120	close_container ();
		1121	}
		1122
		1123	esrv_del_item (pl->contr, count);
		1124	}
1058		1125
1059	/* link the object above us */	1126	/* link the object above us */
1060	if (above)	1127	if (above)
1061	above->below = below;	1128	above->below = below;
1062	else	1129	else
…		…
1083	if (map->in_memory == MAP_SAVING)	1150	if (map->in_memory == MAP_SAVING)
1084	return;	1151	return;
1085		1152
1086	int check_walk_off = !flag [FLAG_NO_APPLY];	1153	int check_walk_off = !flag [FLAG_NO_APPLY];
1087		1154
		1155	if (object *pl = ms.player ())
		1156	{
		1157	if (pl->container == this)
		1158	/* If a container that the player is currently using somehow gets
		1159	* removed (most likely destroyed), update the player view
		1160	* appropriately.
		1161	*/
		1162	pl->close_container ();
		1163
		1164	//TODO: the floorbox prev/next might need updating
		1165	esrv_del_item (pl->contr, count);
		1166	}
		1167
1088	for (tmp = ms.bot; tmp; tmp = tmp->above)	1168	for (tmp = ms.bot; tmp; tmp = tmp->above)
1089	{	1169	{
1090	/* No point updating the players look faces if he is the object	1170	/* No point updating the players look faces if he is the object
1091	* being removed.	1171	* being removed.
1092	*/	1172	*/
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		1173
1110	/* See if object moving off should effect something */	1174	/* See if object moving off should effect something */
1111	if (check_walk_off	1175	if (check_walk_off
1112	&& ((move_type & tmp->move_off)	1176	&& ((move_type & tmp->move_off)
1113	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))	1177	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
…		…
1145	merge_ob (object *op, object *top)	1209	merge_ob (object *op, object *top)
1146	{	1210	{
1147	if (!op->nrof)	1211	if (!op->nrof)
1148	return 0;	1212	return 0;
1149		1213
1150	if (top)	1214	if (!top)
1151	for (top = op; top && top->above; top = top->above)	1215	for (top = op; top && top->above; top = top->above)
1152	;	1216	;
1153		1217
1154	for (; top; top = top->below)	1218	for (; top; top = top->below)
1155	{
1156	if (top == op)
1157	continue;
1158
1159	if (object::can_merge (op, top))	1219	if (object::can_merge (op, top))
1160	{	1220	{
1161	top->nrof += op->nrof;	1221	top->nrof += op->nrof;
1162		1222
1163	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/	1223	if (object *pl = top->visible_to ())
1164	op->weight = 0; /* Don't want any adjustements now */	1224	esrv_update_item (UPD_NROF, pl, top);
		1225
		1226	op->weight = 0; // cancel the addition above
		1227	op->carrying = 0; // must be 0 already
		1228
1165	op->destroy ();	1229	op->destroy (1);
		1230
1166	return top;	1231	return top;
1167	}	1232	}
1168	}
1169		1233
1170	return 0;	1234	return 0;
1171	}	1235	}
1172		1236
1173	void	1237	void
…		…
1232	object *	1296	object *
1233	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)	1297	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1234	{	1298	{
1235	assert (!op->flag [FLAG_FREED]);	1299	assert (!op->flag [FLAG_FREED]);
1236		1300
1237	object *top, *floor = NULL;
1238
1239	op->remove ();	1301	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	{
1251	LOG (llevError, "Trying to insert object outside the map.\n%s\n", op->debug_desc ());
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 ();
1258	#endif
1259	return op;
1260	}
1261
1262	if (object *more = op->more)
1263	if (!insert_ob_in_map (more, m, originator, flag))
1264	return 0;
1265
1266	CLEAR_FLAG (op, FLAG_REMOVED);
1267		1302
1268	/* Ideally, the caller figures this out. However, it complicates a lot	1303	/* 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	1304	* of areas of callers (eg, anything that uses find_free_spot would now
1270	* need extra work	1305	* need extra work
1271	*/	1306	*/
1272	if (!xy_normalise (m, op->x, op->y))	1307	if (!xy_normalise (m, op->x, op->y))
		1308	{
		1309	op->destroy (1);
1273	return 0;	1310	return 0;
		1311	}
		1312
		1313	if (object *more = op->more)
		1314	if (!insert_ob_in_map (more, m, originator, flag))
		1315	return 0;
		1316
		1317	CLEAR_FLAG (op, FLAG_REMOVED);
1274		1318
1275	op->map = m;	1319	op->map = m;
1276	mapspace &ms = op->ms ();	1320	mapspace &ms = op->ms ();
1277		1321
1278	/* this has to be done after we translate the coordinates.	1322	/* this has to be done after we translate the coordinates.
1279	*/	1323	*/
1280	if (op->nrof && !(flag & INS_NO_MERGE))	1324	if (op->nrof && !(flag & INS_NO_MERGE))
1281	for (object *tmp = ms.bot; tmp; tmp = tmp->above)	1325	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1282	if (object::can_merge (op, tmp))	1326	if (object::can_merge (op, tmp))
1283	{	1327	{
		1328	// TODO: we atcually want to update tmp, not op,
		1329	// but some caller surely breaks when we return tmp
		1330	// from here :/
1284	op->nrof += tmp->nrof;	1331	op->nrof += tmp->nrof;
1285	tmp->destroy ();	1332	tmp->destroy (1);
1286	}	1333	}
1287		1334
1288	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1335	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1289	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1336	CLEAR_FLAG (op, FLAG_INV_LOCKED);
1290		1337
…		…
1310	/* since *below* originator, no need to update top */	1357	/* since *below* originator, no need to update top */
1311	originator->below = op;	1358	originator->below = op;
1312	}	1359	}
1313	else	1360	else
1314	{	1361	{
		1362	object *top, *floor = NULL;
		1363
1315	top = ms.bot;	1364	top = ms.bot;
1316		1365
1317	/* If there are other objects, then */	1366	/* If there are other objects, then */
1318	if ((!(flag & INS_MAP_LOAD)) && top)	1367	if (top)
1319	{	1368	{
1320	object *last = 0;	1369	object *last = 0;
1321		1370
1322	/*	1371	/*
1323	* If there are multiple objects on this space, we do some trickier handling.	1372	* If there are multiple objects on this space, we do some trickier handling.
…		…
1376	if (last && last->below && last != floor)	1425	if (last && last->below && last != floor)
1377	top = last->below;	1426	top = last->below;
1378	}	1427	}
1379	} /* If objects on this space */	1428	} /* If objects on this space */
1380		1429
1381	if (flag & INS_MAP_LOAD)
1382	top = ms.top;
1383
1384	if (flag & INS_ABOVE_FLOOR_ONLY)	1430	if (flag & INS_ABOVE_FLOOR_ONLY)
1385	top = floor;	1431	top = floor;
1386		1432
1387	/* Top is the object that our object (op) is going to get inserted above.	1433	/* Top is the object that our object (op) is going to get inserted above.
1388	*/	1434	*/
…		…
1420	op->map->touch ();	1466	op->map->touch ();
1421	}	1467	}
1422		1468
1423	op->map->dirty = true;	1469	op->map->dirty = true;
1424		1470
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 ())	1471	if (object *pl = ms.player ())
1430	if (pl->contr->ns)	1472	//TODO: the floorbox prev/next might need updating
1431	pl->contr->ns->floorbox_update ();	1473	esrv_send_item (pl, op);
1432		1474
1433	/* If this object glows, it may affect lighting conditions that are	1475	/* If this object glows, it may affect lighting conditions that are
1434	* visible to others on this map. But update_all_los is really	1476	* 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	1477	* 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	1478	* 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.	1520	* op is the object to insert it under: supplies x and the map.
1479	*/	1521	*/
1480	void	1522	void
1481	replace_insert_ob_in_map (const char *arch_string, object *op)	1523	replace_insert_ob_in_map (const char *arch_string, object *op)
1482	{	1524	{
1483	object *tmp, *tmp1;
1484
1485	/* first search for itself and remove any old instances */	1525	/* first search for itself and remove any old instances */
1486		1526
1487	for (tmp = op->ms ().bot; tmp; tmp = tmp->above)	1527	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1488	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */	1528	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */
1489	tmp->destroy ();	1529	tmp->destroy (1);
1490		1530
1491	tmp1 = arch_to_object (archetype::find (arch_string));	1531	object *tmp = arch_to_object (archetype::find (arch_string));
1492		1532
1493	tmp1->x = op->x;	1533	tmp->x = op->x;
1494	tmp1->y = op->y;	1534	tmp->y = op->y;
		1535
1495	insert_ob_in_map (tmp1, op->map, op, 0);	1536	insert_ob_in_map (tmp, op->map, op, 0);
1496	}	1537	}
1497		1538
1498	object *	1539	object *
1499	object::insert_at (object *where, object *originator, int flags)	1540	object::insert_at (object *where, object *originator, int flags)
1500	{	1541	{
		1542	if (where->env)
		1543	return where->env->insert (this);
		1544	else
1501	return where->map->insert (this, where->x, where->y, originator, flags);	1545	return where->map->insert (this, where->x, where->y, originator, flags);
1502	}	1546	}
1503		1547
1504	/*	1548	/*
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	1549	* decrease(object, number) decreases a specified number from
1546	* the amount of an object. If the amount reaches 0, the object	1550	* the amount of an object. If the amount reaches 0, the object
1547	* is subsequently removed and freed.	1551	* is subsequently removed and freed.
1548	*	1552	*
1549	* Return value: 'op' if something is left, NULL if the amount reached 0	1553	* Return value: 'op' if something is left, NULL if the amount reached 0
1550	*/	1554	*/
		1555	bool
		1556	object::decrease (sint32 nr)
		1557	{
		1558	if (!nr)
		1559	return true;
		1560
		1561	nr = min (nr, nrof);
		1562
		1563	nrof -= nr;
		1564
		1565	if (nrof)
		1566	{
		1567	adjust_weight (env, -weight * nr); // carrying == 0
		1568
		1569	if (object *pl = visible_to ())
		1570	esrv_update_item (UPD_NROF, pl, this);
		1571
		1572	return true;
		1573	}
		1574	else
		1575	{
		1576	destroy (1);
		1577	return false;
		1578	}
		1579	}
		1580
		1581	/*
		1582	* split(ob,nr) splits up ob into two parts. The part which
		1583	* is returned contains nr objects, and the remaining parts contains
		1584	* the rest (or is removed and returned if that number is 0).
		1585	* On failure, NULL is returned.
		1586	*/
1551	object *	1587	object *
1552	decrease_ob_nr (object *op, uint32 i)	1588	object::split (sint32 nr)
1553	{	1589	{
1554	object *tmp;	1590	int have = number_of ();
1555		1591
1556	if (i == 0) /* objects with op->nrof require this check */	1592	if (have < nr)
1557	return op;	1593	return 0;
1558		1594	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	{	1595	{
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 ();	1596	remove ();
1594	op->nrof = 0;	1597	return this;
1595	if (tmp)
1596	esrv_del_item (tmp->contr, op->count);
1597	}
1598	}	1598	}
1599	else	1599	else
1600	{	1600	{
1601	object *above = op->above;	1601	decrease (nr);
1602		1602
1603	if (i < op->nrof)	1603	object *op = object_create_clone (this);
1604	op->nrof -= i;	1604	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;	1605	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	}	1606	}
1646	}	1607	}
1647		1608
1648	object *	1609	object *
1649	insert_ob_in_ob (object *op, object *where)	1610	insert_ob_in_ob (object *op, object *where)
…		…
1674	* be != op, if items are merged. -Tero	1635	* be != op, if items are merged. -Tero
1675	*/	1636	*/
1676	object *	1637	object *
1677	object::insert (object *op)	1638	object::insert (object *op)
1678	{	1639	{
1679	object *tmp, *otmp;
1680
1681	if (!QUERY_FLAG (op, FLAG_REMOVED))
1682	op->remove ();
1683
1684	if (op->more)	1640	if (op->more)
1685	{	1641	{
1686	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);	1642	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1687	return op;	1643	return op;
1688	}	1644	}
1689		1645
1690	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1646	op->remove ();
1691	CLEAR_FLAG (op, FLAG_REMOVED);	1647
		1648	op->flag [FLAG_OBJ_ORIGINAL] = 0;
		1649
1692	if (op->nrof)	1650	if (op->nrof)
1693	{
1694	for (tmp = inv; tmp != NULL; tmp = tmp->below)	1651	for (object *tmp = inv; tmp; tmp = tmp->below)
1695	if (object::can_merge (tmp, op))	1652	if (object::can_merge (tmp, op))
1696	{	1653	{
1697	/* return the original object and remove inserted object	1654	/* return the original object and remove inserted object
1698	(client needs the original object) */	1655	(client needs the original object) */
1699	tmp->nrof += op->nrof;	1656	tmp->nrof += op->nrof;
1700	/* Weight handling gets pretty funky. Since we are adding to	1657
1701	* tmp->nrof, we need to increase the weight.	1658	if (object *pl = tmp->visible_to ())
1702	*/	1659	esrv_update_item (UPD_NROF, pl, tmp);
		1660
1703	add_weight (this, op->weight * op->nrof);	1661	adjust_weight (this, op->total_weight ());
1704	SET_FLAG (op, FLAG_REMOVED);	1662
1705	op->destroy (); /* free the inserted object */	1663	op->destroy (1);
1706	op = tmp;	1664	op = tmp;
1707	op->remove (); /* and fix old object's links */	1665	goto inserted;
1708	CLEAR_FLAG (op, FLAG_REMOVED);
1709	break;
1710	}	1666	}
1711		1667
1712	/* I assume combined objects have no inventory	1668	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;	1669	op->map = 0;
1729	op->env = this;	1670	op->x = 0;
		1671	op->y = 0;
		1672
1730	op->above = 0;	1673	op->above = 0;
1731	op->below = 0;	1674	op->below = inv;
1732	op->x = 0, op->y = 0;	1675	op->env = this;
1733		1676
		1677	if (inv)
		1678	inv->above = op;
		1679
		1680	inv = op;
		1681
		1682	op->flag [FLAG_REMOVED] = 0;
		1683
		1684	if (object *pl = op->visible_to ())
		1685	esrv_send_item (pl, op);
		1686
		1687	adjust_weight (this, op->total_weight ());
		1688
		1689	inserted:
1734	/* reset the light list and los of the players on the map */	1690	/* reset the light list and los of the players on the map */
1735	if ((op->glow_radius != 0) && map)	1691	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);	1692	update_all_los (map, x, y);
1742	}
1743		1693
1744	/* Client has no idea of ordering so lets not bother ordering it here.	1694	// if this is a player's inventory, update stats
1745	* It sure simplifies this function...	1695	if (type == PLAYER && !flag [FLAG_NO_FIX_PLAYER])
1746	*/	1696	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		1697
1756	INVOKE_OBJECT (INSERT, this);	1698	INVOKE_OBJECT (INSERT, this);
1757		1699
1758	return op;	1700	return op;
1759	}	1701	}
…		…
1974	* activate recursively a flag on an object inventory	1916	* activate recursively a flag on an object inventory
1975	*/	1917	*/
1976	void	1918	void
1977	flag_inv (object *op, int flag)	1919	flag_inv (object *op, int flag)
1978	{	1920	{
1979	if (op->inv)
1980	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)	1921	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1981	{	1922	{
1982	SET_FLAG (tmp, flag);	1923	SET_FLAG (tmp, flag);
1983	flag_inv (tmp, flag);	1924	flag_inv (tmp, flag);
1984	}	1925	}
1985	}	1926	}
1986		1927
1987	/*	1928	/*
1988	* deactivate recursively a flag on an object inventory	1929	* deactivate recursively a flag on an object inventory
1989	*/	1930	*/
1990	void	1931	void
1991	unflag_inv (object *op, int flag)	1932	unflag_inv (object *op, int flag)
1992	{	1933	{
1993	if (op->inv)
1994	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)	1934	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1995	{	1935	{
1996	CLEAR_FLAG (tmp, flag);	1936	CLEAR_FLAG (tmp, flag);
1997	unflag_inv (tmp, flag);	1937	unflag_inv (tmp, flag);
1998	}	1938	}
1999	}	1939	}
2000		1940
2001	/*	1941	/*
2002	* find_free_spot(object, map, x, y, start, stop) will search for	1942	* 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	1943	* a spot at the given map and coordinates which will be able to contain
…		…
2005	* to search (see the freearr_x/y[] definition).	1945	* to search (see the freearr_x/y[] definition).
2006	* It returns a random choice among the alternatives found.	1946	* 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	1947	* 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	1948	* 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)	1949	* 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	1950	* Note: This function does correctly handle tiled maps, but does not
2014	* inform the caller. However, insert_ob_in_map will update as	1951	* inform the caller. However, insert_ob_in_map will update as
2015	* necessary, so the caller shouldn't need to do any special work.	1952	* 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	1953	* 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	1954	* 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	1955	* to know if the space in question will block the object. We can't use
…		…
2020	* customized, changed states, etc.	1957	* customized, changed states, etc.
2021	*/	1958	*/
2022	int	1959	int
2023	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)	1960	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2024	{	1961	{
		1962	int altern[SIZEOFFREE];
2025	int index = 0, flag;	1963	int index = 0, flag;
2026	int altern[SIZEOFFREE];
2027		1964
2028	for (int i = start; i < stop; i++)	1965	for (int i = start; i < stop; i++)
2029	{	1966	{
2030	flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]);	1967	mapxy pos (m, x, y); pos.move (i);
2031	if (!flag)	1968
		1969	if (!pos.normalise ())
		1970	continue;
		1971
		1972	mapspace &ms = *pos;
		1973
		1974	if (ms.flags () & P_IS_ALIVE)
		1975	continue;
		1976
		1977	/* However, often
		1978	* ob doesn't have any move type (when used to place exits)
		1979	* so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.
		1980	*/
		1981	if (ob && ob->move_type == 0 && ms.move_block != MOVE_ALL)
		1982	{
2032	altern [index++] = i;	1983	altern [index++] = i;
		1984	continue;
		1985	}
2033		1986
2034	/* Basically, if we find a wall on a space, we cut down the search size.	1987	/* 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.	1988	* 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 -	1989	* 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	1990	* 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	1991	* spaces in all the other directions, this will reduce the search space
2039	* to only the spaces immediately surrounding the target area, and	1992	* to only the spaces immediately surrounding the target area, and
2040	* won't look 2 spaces south of the target space.	1993	* won't look 2 spaces south of the target space.
2041	*/	1994	*/
2042	else if ((flag & P_NO_PASS) && maxfree[i] < stop)	1995	if (ms.move_block == MOVE_ALL && maxfree[i] < stop)
		1996	{
2043	stop = maxfree[i];	1997	stop = maxfree[i];
		1998	continue;
		1999	}
		2000
		2001	/* Note it is intentional that we check ob - the movement type of the
		2002	* head of the object should correspond for the entire object.
		2003	*/
		2004	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
		2005	continue;
		2006
		2007	if (ob->blocked (m, pos.x, pos.y))
		2008	continue;
		2009
		2010	altern [index++] = i;
2044	}	2011	}
2045		2012
2046	if (!index)	2013	if (!index)
2047	return -1;	2014	return -1;
2048		2015
…		…
2057	*/	2024	*/
2058	int	2025	int
2059	find_first_free_spot (const object *ob, maptile *m, int x, int y)	2026	find_first_free_spot (const object *ob, maptile *m, int x, int y)
2060	{	2027	{
2061	for (int i = 0; i < SIZEOFFREE; i++)	2028	for (int i = 0; i < SIZEOFFREE; i++)
2062	if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]))	2029	if (!ob->blocked (m, x + freearr_x[i], y + freearr_y[i]))
2063	return i;	2030	return i;
2064		2031
2065	return -1;	2032	return -1;
2066	}	2033	}
2067		2034
…		…
2344	* Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause	2311	* Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause
2345	* core dumps if they do.	2312	* core dumps if they do.
2346	*	2313	*
2347	* Add a check so we can't pick up invisible objects (0.93.8)	2314	* Add a check so we can't pick up invisible objects (0.93.8)
2348	*/	2315	*/
2349
2350	int	2316	int
2351	can_pick (const object *who, const object *item)	2317	can_pick (const object *who, const object *item)
2352	{	2318	{
2353	return /*QUERY_FLAG(who,FLAG_WIZ)|| */	2319	return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2354	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&	2320	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
…		…
2359	* create clone from object to another	2325	* create clone from object to another
2360	*/	2326	*/
2361	object *	2327	object *
2362	object_create_clone (object *asrc)	2328	object_create_clone (object *asrc)
2363	{	2329	{
2364	object *dst = 0, *tmp, *src, *prev, *item;	2330	object *dst = 0;
2365		2331
2366	if (!asrc)	2332	if (!asrc)
2367	return 0;	2333	return 0;
2368		2334
2369	src = asrc->head_ ();	2335	object *src = asrc->head_ ();
2370		2336
2371	prev = 0;	2337	object *prev = 0;
2372	for (object *part = src; part; part = part->more)	2338	for (object *part = src; part; part = part->more)
2373	{	2339	{
2374	tmp = part->clone ();	2340	object *tmp = part->clone ();
		2341
2375	tmp->x -= src->x;	2342	tmp->x -= src->x;
2376	tmp->y -= src->y;	2343	tmp->y -= src->y;
2377		2344
2378	if (!part->head)	2345	if (!part->head)
2379	{	2346	{
…		…
2389	prev->more = tmp;	2356	prev->more = tmp;
2390		2357
2391	prev = tmp;	2358	prev = tmp;
2392	}	2359	}
2393		2360
2394	for (item = src->inv; item; item = item->below)	2361	for (object *item = src->inv; item; item = item->below)
2395	insert_ob_in_ob (object_create_clone (item), dst);	2362	insert_ob_in_ob (object_create_clone (item), dst);
2396		2363
2397	return dst;	2364	return dst;
2398	}	2365	}
2399		2366
…		…
2605	{	2572	{
2606	char flagdesc[512];	2573	char flagdesc[512];
2607	char info2[256 * 4];	2574	char info2[256 * 4];
2608	char *p = info;	2575	char *p = info;
2609		2576
2610	p += snprintf (p, 512, "{cnt:%d,uuid:<1.%" PRIx64 ">,name:\"%s\"%s%s,flags:[%s],type:%d}",	2577	p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s,flags:[%s],type:%d}",
2611	count, uuid.seq,	2578	count,
		2579	uuid.c_str (),
2612	&name,	2580	&name,
2613	title ? "\",title:\"" : "",	2581	title ? "\",title:\"" : "",
2614	title ? (const char *)title : "",	2582	title ? (const char *)title : "",
2615	flag_desc (flagdesc, 512), type);	2583	flag_desc (flagdesc, 512), type);
2616		2584
2617	if (env)	2585	if (!flag[FLAG_REMOVED] && env)
2618	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2586	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2619		2587
2620	if (map)	2588	if (map)
2621	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);	2589	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2622		2590
…		…
2652	object::open_container (object *new_container)	2620	object::open_container (object *new_container)
2653	{	2621	{
2654	if (container == new_container)	2622	if (container == new_container)
2655	return;	2623	return;
2656		2624
2657	if (object *old_container = container)	2625	object *old_container = container;
		2626
		2627	if (old_container)
2658	{	2628	{
2659	if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))	2629	if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
2660	return;	2630	return;
2661		2631
2662	#if 0	2632	#if 0
…		…
2664	if (object *closer = old_container->inv)	2634	if (object *closer = old_container->inv)
2665	if (closer->type == CLOSE_CON)	2635	if (closer->type == CLOSE_CON)
2666	closer->destroy ();	2636	closer->destroy ();
2667	#endif	2637	#endif
2668		2638
		2639	// make sure the container is available
		2640	esrv_send_item (this, old_container);
		2641
2669	old_container->flag [FLAG_APPLIED] = 0;	2642	old_container->flag [FLAG_APPLIED] = false;
2670	container = 0;	2643	container = 0;
2671		2644
		2645	// client needs item update to make it work, client bug requires this to be separate
2672	esrv_update_item (UPD_FLAGS, this, old_container);	2646	esrv_update_item (UPD_FLAGS, this, old_container);
		2647
2673	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));	2648	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
		2649	play_sound (sound_find ("chest_close"));
2674	}	2650	}
2675		2651
2676	if (new_container)	2652	if (new_container)
2677	{	2653	{
2678	if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))	2654	if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))
…		…
2689	}	2665	}
2690	#endif	2666	#endif
2691		2667
2692	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));	2668	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));
2693		2669
		2670	// make sure the container is available, client bug requires this to be separate
		2671	esrv_send_item (this, new_container);
		2672
2694	new_container->flag [FLAG_APPLIED] = 1;	2673	new_container->flag [FLAG_APPLIED] = true;
2695	container = new_container;	2674	container = new_container;
2696		2675
		2676	// client needs flag change
2697	esrv_update_item (UPD_FLAGS, this, new_container);	2677	esrv_update_item (UPD_FLAGS, this, new_container);
2698	esrv_send_inventory (this, new_container);	2678	esrv_send_inventory (this, new_container);
		2679	play_sound (sound_find ("chest_open"));
2699	}	2680	}
		2681	// else if (!old_container->env && contr && contr->ns)
		2682	// contr->ns->floorbox_reset ();
2700	}	2683	}
2701		2684
2702	object *	2685	object *
2703	object::force_find (const shstr name)	2686	object::force_find (const shstr name)
2704	{	2687	{
…		…
2729	force->flag [FLAG_APPLIED] = true;	2712	force->flag [FLAG_APPLIED] = true;
2730		2713
2731	insert (force);	2714	insert (force);
2732	}	2715	}
2733		2716
		2717	void
		2718	object::play_sound (faceidx sound)
		2719	{
		2720	if (!sound)
		2721	return;
2734		2722
		2723	if (flag [FLAG_REMOVED])
		2724	return;
		2725
		2726	if (env)
		2727	{
		2728	if (object *pl = in_player ())
		2729	pl->contr->play_sound (sound);
		2730	}
		2731	else
		2732	map->play_sound (sound, x, y);
		2733	}
		2734

Diff Legend

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