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.159 by root, Mon Jun 4 13:04:00 2007 UTC vs.
Revision 1.223 by root, Wed Apr 30 08:29:31 2008 UTC

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

Diff Legend

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