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.154 by root, Thu May 17 21:11:42 2007 UTC vs.
Revision 1.219 by root, Wed Apr 23 21:09:10 2008 UTC

1	/*	1	/*
2	* CrossFire, A Multiplayer game	2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.
3	*	3	*
4	* Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team	4	* Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5	* Copyright (C) 2001 Mark Wedel & Crossfire Development Team	5	* Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team
6	* Copyright (C) 1992 Frank Tore Johansen	6	* Copyright (©) 1992,2007 Frank Tore Johansen
7	*	7	*
8	* This program is free software; you can redistribute it and/or modify	8	* Deliantra is free software: you can redistribute it and/or modify
9	* it under the terms of the GNU General Public License as published by	9	* it under the terms of the GNU General Public License as published by
10	* the Free Software Foundation; either version 2 of the License, or	10	* the Free Software Foundation, either version 3 of the License, or
11	* (at your option) any later version.	11	* (at your option) any later version.
12	*	12	*
13	* This program is distributed in the hope that it will be useful,	13	* This program is distributed in the hope that it will be useful,
14	* but WITHOUT ANY WARRANTY; without even the implied warranty of	14	* but WITHOUT ANY WARRANTY; without even the implied warranty of
15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16	* GNU General Public License for more details.	16	* GNU General Public License for more details.
17	*	17	*
18	* You should have received a copy of the GNU General Public License	18	* You should have received a copy of the GNU General Public License
19	* along with this program; if not, write to the Free Software	19	* along with this program. If not, see <http://www.gnu.org/licenses/>.
20	* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21	*	20	*
22	* The authors can be reached via e-mail at <crossfire@schmorp.de>	21	* The authors can be reached via e-mail to <support@deliantra.net>
23	*/	22	*/
24		23
25	/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
26	sub/add_weight will transcend the environment updating the carrying
27	variable. */
28	#include <global.h>	24	#include <global.h>
29	#include <stdio.h>	25	#include <stdio.h>
30	#include <sys/types.h>	26	#include <sys/types.h>
31	#include <sys/uio.h>	27	#include <sys/uio.h>
32	#include <object.h>	28	#include <object.h>
33	#include <funcpoint.h>
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 (!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	return pl;
		364	}
		365	}
		366
		367	return 0;
		368	}
		369
		370	// adjust weight per container type ("of holding")
		371	static sint32
		372	weight_adjust (object *op, sint32 weight)
		373	{
		374	return op->type == CONTAINER
		375	? lerp (weight, 0, 100, 0, 100 - op->stats.Str)
		376	: weight;
		377	}
		378
319	/*	379	/*
		380	* adjust_weight(object, weight) adds the specified weight to an object,
		381	* and also updates how much the environment(s) is/are carrying.
		382	*/
		383	static void
		384	adjust_weight (object *op, sint32 weight)
		385	{
		386	while (op)
		387	{
		388	weight = weight_adjust (op, weight);
		389
		390	if (!weight)
		391	return;
		392
		393	op->carrying += weight;
		394
		395	if (object *pl = op->visible_to ())
		396	if (pl != op) // player is handled lazily
		397	esrv_update_item (UPD_WEIGHT, pl, op);
		398
		399	op = op->env;
		400	}
		401	}
		402
		403	/*
320	* sum_weight() is a recursive function which calculates the weight	404	* this is a recursive function which calculates the weight
321	* an object is carrying. It goes through in figures out how much	405	* an object is carrying. It goes through op and figures out how much
322	* containers are carrying, and sums it up.	406	* containers are carrying, and sums it up.
323	*/	407	*/
324	long	408	void
325	sum_weight (object *op)	409	object::update_weight ()
326	{	410	{
327	long sum;	411	sint32 sum = 0;
328	object *inv;
329		412
330	for (sum = 0, inv = op->inv; inv; inv = inv->below)	413	for (object *op = inv; op; op = op->below)
331	{	414	{
332	if (inv->inv)	415	if (op->inv)
333	sum_weight (inv);	416	op->update_weight ();
334		417
335	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);	418	sum += op->total_weight ();
		419	}
		420
		421	sum = weight_adjust (this, sum);
		422
		423	if (sum != carrying)
336	}	424	{
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;	425	carrying = sum;
343		426
344	return sum;	427	if (object *pl = visible_to ())
		428	if (pl != this) // player is handled lazily
		429	esrv_update_item (UPD_WEIGHT, pl, this);
		430	}
345	}	431	}
346		432
347	/**	433	/*
348	* Return the outermost environment object for a given object.	434	* 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	*/	435	*/
364	char *	436	char *
365	dump_object (object *op)	437	dump_object (object *op)
366	{	438	{
367	if (!op)	439	if (!op)
…		…
375	/*	447	/*
376	* get_nearest_part(multi-object, object 2) returns the part of the	448	* get_nearest_part(multi-object, object 2) returns the part of the
377	* multi-object 1 which is closest to the second object.	449	* multi-object 1 which is closest to the second object.
378	* If it's not a multi-object, it is returned.	450	* If it's not a multi-object, it is returned.
379	*/	451	*/
380
381	object *	452	object *
382	get_nearest_part (object *op, const object *pl)	453	get_nearest_part (object *op, const object *pl)
383	{	454	{
384	object *tmp, *closest;	455	object *tmp, *closest;
385	int last_dist, i;	456	int last_dist, i;
386		457
387	if (op->more == NULL)	458	if (!op->more)
388	return op;	459	return op;
		460
389	for (last_dist = distance (op, pl), closest = op, tmp = op->more; tmp != NULL; tmp = tmp->more)	461	for (last_dist = distance (op, pl), closest = op, tmp = op->more;
		462	tmp;
		463	tmp = tmp->more)
390	if ((i = distance (tmp, pl)) < last_dist)	464	if ((i = distance (tmp, pl)) < last_dist)
391	closest = tmp, last_dist = i;	465	closest = tmp, last_dist = i;
		466
392	return closest;	467	return closest;
393	}	468	}
394		469
395	/*	470	/*
396	* Returns the object which has the count-variable equal to the argument.	471	* Returns the object which has the count-variable equal to the argument.
		472	* VERRRY slow.
397	*/	473	*/
398	object *	474	object *
399	find_object (tag_t i)	475	find_object (tag_t i)
400	{	476	{
401	for_all_objects (op)	477	for_all_objects (op)
…		…
421	break;	497	break;
422		498
423	return op;	499	return op;
424	}	500	}
425		501
426	void
427	free_all_object_data ()
428	{
429	LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);
430	}
431
432	/*	502	/*
433	* Sets the owner and sets the skill and exp pointers to owner's current	503	* Sets the owner and sets the skill and exp pointers to owner's current
434	* skill and experience objects.	504	* skill and experience objects.
		505	* ACTUALLY NO! investigate! TODO
435	*/	506	*/
436	void	507	void
437	object::set_owner (object *owner)	508	object::set_owner (object *owner)
438	{	509	{
		510	// allow objects which own objects
439	if (!owner)	511	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)	512	while (owner->owner)
450	owner = owner->owner;	513	owner = owner->owner;
		514
		515	if (flag [FLAG_FREED])
		516	{
		517	LOG (llevError | logBacktrace, "tried to set owner of %s to %s\n", debug_desc (), owner->debug_desc ());
		518	return;
		519	}
451		520
452	this->owner = owner;	521	this->owner = owner;
453	}	522	}
454		523
455	int	524	int
…		…
495	{	564	{
496	current_weapon = chosen_skill = 0;	565	current_weapon = chosen_skill = 0;
497	update_stats ();	566	update_stats ();
498		567
499	new_draw_info_format (NDI_UNIQUE, 0, this,	568	new_draw_info_format (NDI_UNIQUE, 0, this,
500	"You try to balance your applied items all at once, but the %s is too much. "	569	"You try to balance all your items at once, "
		570	"but the %s is just too much for your body. "
501	"You need to unapply some items first.", &ob->name);	571	"[You need to unapply some items first.]", &ob->name);
502	return false;	572	return false;
503	}	573	}
504		574
505	//new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);	575	//new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);
506	}	576	}
…		…
586	object::copy_to (object *dst)	656	object::copy_to (object *dst)
587	{	657	{
588	*dst = *this;	658	*dst = *this;
589		659
590	if (speed < 0)	660	if (speed < 0)
591	dst->speed_left = speed_left - rndm ();	661	dst->speed_left -= rndm ();
592		662
593	dst->set_speed (dst->speed);	663	dst->set_speed (dst->speed);
594	}	664	}
595		665
596	void	666	void
597	object::instantiate ()	667	object::instantiate ()
598	{	668	{
599	if (!uuid.seq) // HACK	669	if (!uuid.seq) // HACK
600	uuid = gen_uuid ();	670	uuid = UUID::gen ();
601		671
602	speed_left = -0.1f;	672	speed_left = -0.1f;
603	/* copy the body_info to the body_used - this is only really	673	/* 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.	674	* 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	675	* by doing so, when a monster is created, it has good starting
…		…
764	static int object_count;	834	static int object_count;
765		835
766	void object::link ()	836	void object::link ()
767	{	837	{
768	assert (!index);//D	838	assert (!index);//D
769	uuid = gen_uuid ();	839	uuid = UUID::gen ();
770	count = ++object_count;	840	count = ++object_count;
771		841
772	refcnt_inc ();	842	refcnt_inc ();
773	objects.insert (this);	843	objects.insert (this);
774	}	844	}
…		…
847	object::destroy_inv (bool drop_to_ground)	917	object::destroy_inv (bool drop_to_ground)
848	{	918	{
849	// need to check first, because the checks below might segfault	919	// need to check first, because the checks below might segfault
850	// as we might be on an invalid mapspace and crossfire code	920	// as we might be on an invalid mapspace and crossfire code
851	// is too buggy to ensure that the inventory is empty.	921	// is too buggy to ensure that the inventory is empty.
852	// corollary: if you create arrows etc. with stuff in tis inventory,	922	// corollary: if you create arrows etc. with stuff in its inventory,
853	// cf will crash below with off-map x and y	923	// cf will crash below with off-map x and y
854	if (!inv)	924	if (!inv)
855	return;	925	return;
856		926
857	/* Only if the space blocks everything do we not process -	927	/* Only if the space blocks everything do we not process -
858	* if some form of movement is allowed, let objects	928	* if some form of movement is allowed, let objects
859	* drop on that space.	929	* drop on that space.
860	*/	930	*/
861	if (!drop_to_ground	931	if (!drop_to_ground
862	|| !map	932	|| !map
863	|| map->in_memory != MAP_IN_MEMORY	933	|| map->in_memory != MAP_ACTIVE
864	|| map->nodrop	934	|| map->nodrop
865	|| ms ().move_block == MOVE_ALL)	935	|| ms ().move_block == MOVE_ALL)
866	{	936	{
867	while (inv)	937	while (inv)
868	{	938	{
869	inv->destroy_inv (drop_to_ground);	939	inv->destroy_inv (false);
870	inv->destroy ();	940	inv->destroy ();
871	}	941	}
872	}	942	}
873	else	943	else
874	{ /* Put objects in inventory onto this space */	944	{ /* Put objects in inventory onto this space */
…		…
880	|| op->flag [FLAG_NO_DROP]	950	|| op->flag [FLAG_NO_DROP]
881	|| op->type == RUNE	951	|| op->type == RUNE
882	|| op->type == TRAP	952	|| op->type == TRAP
883	|| op->flag [FLAG_IS_A_TEMPLATE]	953	|| op->flag [FLAG_IS_A_TEMPLATE]
884	|| op->flag [FLAG_DESTROY_ON_DEATH])	954	|| op->flag [FLAG_DESTROY_ON_DEATH])
885	op->destroy ();	955	op->destroy (true);
886	else	956	else
887	map->insert (op, x, y);	957	map->insert (op, x, y);
888	}	958	}
889	}	959	}
890	}	960	}
…		…
897	}	967	}
898		968
899	void	969	void
900	object::do_destroy ()	970	object::do_destroy ()
901	{	971	{
902	attachable::do_destroy ();
903
904	if (flag [FLAG_IS_LINKED])	972	if (flag [FLAG_IS_LINKED])
905	remove_button_link (this);	973	remove_button_link (this);
906		974
907	if (flag [FLAG_FRIENDLY])	975	if (flag [FLAG_FRIENDLY])
908	remove_friendly_object (this);	976	remove_friendly_object (this);
909		977
910	if (!flag [FLAG_REMOVED])
911	remove ();	978	remove ();
912		979
913	destroy_inv (true);	980	attachable::do_destroy ();
914		981
915	deactivate ();	982	deactivate ();
916	unlink ();	983	unlink ();
917		984
918	flag [FLAG_FREED] = 1;	985	flag [FLAG_FREED] = 1;
…		…
923		990
924	if (!freed_map)	991	if (!freed_map)
925	{	992	{
926	freed_map = new maptile;	993	freed_map = new maptile;
927		994
		995	freed_map->path = "<freed objects map>";
928	freed_map->name = "/internal/freed_objects_map";	996	freed_map->name = "/internal/freed_objects_map";
929	freed_map->width = 3;	997	freed_map->width = 3;
930	freed_map->height = 3;	998	freed_map->height = 3;
		999	freed_map->nodrop = 1;
931		1000
932	freed_map->alloc ();	1001	freed_map->alloc ();
933	freed_map->in_memory = MAP_IN_MEMORY;	1002	freed_map->in_memory = MAP_ACTIVE;
934	}	1003	}
935		1004
936	map = freed_map;	1005	map = freed_map;
937	x = 1;	1006	x = 1;
938	y = 1;	1007	y = 1;
939	}	1008	}
940		1009
941	head = 0;
942
943	if (more)	1010	if (more)
944	{	1011	{
945	more->destroy ();	1012	more->destroy ();
946	more = 0;	1013	more = 0;
947	}	1014	}
948		1015
		1016	head = 0;
		1017
949	// clear those pointers that likely might have circular references to us	1018	// clear those pointers that likely might cause circular references
950	owner = 0;	1019	owner = 0;
951	enemy = 0;	1020	enemy = 0;
952	attacked_by = 0;	1021	attacked_by = 0;
		1022	current_weapon = 0;
953	}	1023	}
954		1024
955	void	1025	void
956	object::destroy (bool destroy_inventory)	1026	object::destroy (bool destroy_inventory)
957	{	1027	{
958	if (destroyed ())	1028	if (destroyed ())
959	return;	1029	return;
960		1030
		1031	if (!is_head () && !head->destroyed ())
		1032	{
		1033	LOG (llevError | logBacktrace, "tried to destroy the tail of an object");
		1034	head->destroy (destroy_inventory);
		1035	}
		1036
961	if (destroy_inventory)	1037	destroy_inv (!destroy_inventory);
962	destroy_inv (false);	1038
		1039	if (is_head ())
		1040	if (sound_destroy)
		1041	play_sound (sound_destroy);
		1042	else if (flag [FLAG_MONSTER])
		1043	play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism
963		1044
964	attachable::destroy ();	1045	attachable::destroy ();
965	}
966
967	/*
968	* sub_weight() recursively (outwards) subtracts a number from the
969	* weight of an object (and what is carried by it's environment(s)).
970	*/
971	void
972	sub_weight (object *op, signed long weight)
973	{
974	while (op != NULL)
975	{
976	if (op->type == CONTAINER)
977	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
978
979	op->carrying -= weight;
980	op = op->env;
981	}
982	}	1046	}
983		1047
984	/* op->remove ():	1048	/* op->remove ():
985	* This function removes the object op from the linked list of objects	1049	* This function removes the object op from the linked list of objects
986	* which it is currently tied to. When this function is done, the	1050	* which it is currently tied to. When this function is done, the
…		…
992	object::do_remove ()	1056	object::do_remove ()
993	{	1057	{
994	object *tmp, *last = 0;	1058	object *tmp, *last = 0;
995	object *otmp;	1059	object *otmp;
996		1060
997	if (QUERY_FLAG (this, FLAG_REMOVED))	1061	if (flag [FLAG_REMOVED])
998	return;	1062	return;
999		1063
1000	SET_FLAG (this, FLAG_REMOVED);
1001	INVOKE_OBJECT (REMOVE, this);	1064	INVOKE_OBJECT (REMOVE, this);
		1065
		1066	if (object *pl = visible_to ())
		1067	esrv_del_item (pl->contr, count);
		1068
		1069	flag [FLAG_REMOVED] = true;
1002		1070
1003	if (more)	1071	if (more)
1004	more->remove ();	1072	more->remove ();
1005		1073
1006	/*	1074	/*
1007	* In this case, the object to be removed is in someones	1075	* In this case, the object to be removed is in someones
1008	* inventory.	1076	* inventory.
1009	*/	1077	*/
1010	if (env)	1078	if (env)
1011	{	1079	{
		1080	adjust_weight (env, -total_weight ());
		1081
		1082	*(above ? &above->below : &env->inv) = below;
		1083
1012	if (nrof)	1084	if (below)
1013	sub_weight (env, weight * nrof);	1085	below->above = above;
1014	else	1086
1015	sub_weight (env, weight + carrying);	1087	/* we set up values so that it could be inserted into
		1088	* the map, but we don't actually do that - it is up
		1089	* to the caller to decide what we want to do.
		1090	*/
		1091	map = env->map;
		1092	x = env->x;
		1093	y = env->y;
		1094	above = 0;
		1095	below = 0;
		1096	env = 0;
1016		1097
1017	/* NO_FIX_PLAYER is set when a great many changes are being	1098	/* NO_FIX_PLAYER is set when a great many changes are being
1018	* made to players inventory. If set, avoiding the call	1099	* made to players inventory. If set, avoiding the call
1019	* to save cpu time.	1100	* to save cpu time.
1020	*/	1101	*/
1021	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1102	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1022	otmp->update_stats ();	1103	otmp->update_stats ();
1023
1024	if (above)
1025	above->below = below;
1026	else
1027	env->inv = below;
1028
1029	if (below)
1030	below->above = above;
1031
1032	/* we set up values so that it could be inserted into
1033	* the map, but we don't actually do that - it is up
1034	* to the caller to decide what we want to do.
1035	*/
1036	x = env->x, y = env->y;
1037	map = env->map;
1038	above = 0, below = 0;
1039	env = 0;
1040	}	1104	}
1041	else if (map)	1105	else if (map)
1042	{	1106	{
1043	if (type == PLAYER)	1107	if (type == PLAYER)
1044	{	1108	{
…		…
1082	if (map->in_memory == MAP_SAVING)	1146	if (map->in_memory == MAP_SAVING)
1083	return;	1147	return;
1084		1148
1085	int check_walk_off = !flag [FLAG_NO_APPLY];	1149	int check_walk_off = !flag [FLAG_NO_APPLY];
1086		1150
		1151	if (object *pl = ms.player ())
		1152	{
		1153	if (pl->container == this)
		1154	/* If a container that the player is currently using somehow gets
		1155	* removed (most likely destroyed), update the player view
		1156	* appropriately.
		1157	*/
		1158	pl->close_container ();
		1159
		1160	//TODO: the floorbox prev/next might need updating
		1161	esrv_del_item (pl->contr, count);
		1162	}
		1163
1087	for (tmp = ms.bot; tmp; tmp = tmp->above)	1164	for (tmp = ms.bot; tmp; tmp = tmp->above)
1088	{	1165	{
1089	/* No point updating the players look faces if he is the object	1166	/* No point updating the players look faces if he is the object
1090	* being removed.	1167	* being removed.
1091	*/	1168	*/
1092
1093	if (tmp->type == PLAYER && tmp != this)
1094	{
1095	/* If a container that the player is currently using somehow gets
1096	* removed (most likely destroyed), update the player view
1097	* appropriately.
1098	*/
1099	if (tmp->container == this)
1100	{
1101	flag [FLAG_APPLIED] = 0;
1102	tmp->container = 0;
1103	}
1104
1105	if (tmp->contr->ns)
1106	tmp->contr->ns->floorbox_update ();
1107	}
1108		1169
1109	/* See if object moving off should effect something */	1170	/* See if object moving off should effect something */
1110	if (check_walk_off	1171	if (check_walk_off
1111	&& ((move_type & tmp->move_off)	1172	&& ((move_type & tmp->move_off)
1112	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))	1173	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
…		…
1115		1176
1116	if (destroyed ())	1177	if (destroyed ())
1117	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());	1178	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1118	}	1179	}
1119		1180
1120	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1121	//TODO: why is this horrible hacka fix? get rid of this code=bug! (schmorp)
1122	if (tmp->above == tmp)
1123	tmp->above = 0;
1124
1125	last = tmp;	1181	last = tmp;
1126	}	1182	}
1127		1183
1128	/* last == NULL if there are no objects on this space */	1184	/* last == NULL if there are no objects on this space */
1129	//TODO: this makes little sense, why only update the topmost object?	1185	//TODO: this makes little sense, why only update the topmost object?
…		…
1149	merge_ob (object *op, object *top)	1205	merge_ob (object *op, object *top)
1150	{	1206	{
1151	if (!op->nrof)	1207	if (!op->nrof)
1152	return 0;	1208	return 0;
1153		1209
1154	if (top)	1210	if (!top)
1155	for (top = op; top && top->above; top = top->above)	1211	for (top = op; top && top->above; top = top->above)
1156	;	1212	;
1157		1213
1158	for (; top; top = top->below)	1214	for (; top; top = top->below)
1159	{
1160	if (top == op)
1161	continue;
1162
1163	if (object::can_merge (op, top))	1215	if (object::can_merge (op, top))
1164	{	1216	{
1165	top->nrof += op->nrof;	1217	top->nrof += op->nrof;
1166		1218
1167	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/	1219	if (object *pl = top->visible_to ())
1168	op->weight = 0; /* Don't want any adjustements now */	1220	esrv_update_item (UPD_NROF, pl, top);
		1221
		1222	op->weight = 0; // cancel the addition above
		1223	op->carrying = 0; // must be 0 already
		1224
1169	op->destroy ();	1225	op->destroy (1);
		1226
1170	return top;	1227	return top;
1171	}	1228	}
1172	}
1173		1229
1174	return 0;	1230	return 0;
1175	}	1231	}
1176		1232
1177	void	1233	void
…		…
1180	if (more)	1236	if (more)
1181	return;	1237	return;
1182		1238
1183	object *prev = this;	1239	object *prev = this;
1184		1240
1185	for (archetype *at = arch->more; at; at = at->more)	1241	for (archetype *at = (archetype *)arch->more; at; at = (archetype *)at->more)
1186	{	1242	{
1187	object *op = arch_to_object (at);	1243	object *op = arch_to_object (at);
1188		1244
1189	op->name = name;	1245	op->name = name;
1190	op->name_pl = name_pl;	1246	op->name_pl = name_pl;
…		…
1204	object *	1260	object *
1205	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)	1261	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1206	{	1262	{
1207	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)	1263	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1208	{	1264	{
1209	tmp->x = x + tmp->arch->clone.x;	1265	tmp->x = x + tmp->arch->x;
1210	tmp->y = y + tmp->arch->clone.y;	1266	tmp->y = y + tmp->arch->y;
1211	}	1267	}
1212		1268
1213	return insert_ob_in_map (op, m, originator, flag);	1269	return insert_ob_in_map (op, m, originator, flag);
1214	}	1270	}
1215		1271
…		…
1236	object *	1292	object *
1237	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)	1293	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1238	{	1294	{
1239	assert (!op->flag [FLAG_FREED]);	1295	assert (!op->flag [FLAG_FREED]);
1240		1296
1241	object *tmp, *top, *floor = NULL;
1242
1243	op->remove ();	1297	op->remove ();
1244
1245	#if 0
1246	if (!m->active != !op->active)
1247	if (m->active)
1248	op->activate_recursive ();
1249	else
1250	op->deactivate_recursive ();
1251	#endif
1252
1253	if (out_of_map (m, op->x, op->y))
1254	{
1255	LOG (llevError, "Trying to insert object outside the map.\n%s\n", op->debug_desc ());
1256	#ifdef MANY_CORES
1257	/* Better to catch this here, as otherwise the next use of this object
1258	* is likely to cause a crash. Better to find out where it is getting
1259	* improperly inserted.
1260	*/
1261	abort ();
1262	#endif
1263	return op;
1264	}
1265
1266	if (object *more = op->more)
1267	{
1268	if (!insert_ob_in_map (more, m, originator, flag))
1269	{
1270	if (!op->head)
1271	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1272
1273	return 0;
1274	}
1275	}
1276
1277	CLEAR_FLAG (op, FLAG_REMOVED);
1278		1298
1279	/* Ideally, the caller figures this out. However, it complicates a lot	1299	/* Ideally, the caller figures this out. However, it complicates a lot
1280	* of areas of callers (eg, anything that uses find_free_spot would now	1300	* of areas of callers (eg, anything that uses find_free_spot would now
1281	* need extra work	1301	* need extra work
1282	*/	1302	*/
1283	if (!xy_normalise (m, op->x, op->y))	1303	if (!xy_normalise (m, op->x, op->y))
		1304	{
		1305	op->destroy (1);
1284	return 0;	1306	return 0;
		1307	}
		1308
		1309	if (object *more = op->more)
		1310	if (!insert_ob_in_map (more, m, originator, flag))
		1311	return 0;
		1312
		1313	CLEAR_FLAG (op, FLAG_REMOVED);
1285		1314
1286	op->map = m;	1315	op->map = m;
1287	mapspace &ms = op->ms ();	1316	mapspace &ms = op->ms ();
1288		1317
1289	/* this has to be done after we translate the coordinates.	1318	/* this has to be done after we translate the coordinates.
1290	*/	1319	*/
1291	if (op->nrof && !(flag & INS_NO_MERGE))	1320	if (op->nrof && !(flag & INS_NO_MERGE))
1292	for (tmp = ms.bot; tmp; tmp = tmp->above)	1321	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1293	if (object::can_merge (op, tmp))	1322	if (object::can_merge (op, tmp))
1294	{	1323	{
		1324	// TODO: we atcually want to update tmp, not op,
		1325	// but some caller surely breaks when we return tmp
		1326	// from here :/
1295	op->nrof += tmp->nrof;	1327	op->nrof += tmp->nrof;
1296	tmp->destroy ();	1328	tmp->destroy (1);
1297	}	1329	}
1298		1330
1299	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1331	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1300	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1332	CLEAR_FLAG (op, FLAG_INV_LOCKED);
1301		1333
…		…
1321	/* since *below* originator, no need to update top */	1353	/* since *below* originator, no need to update top */
1322	originator->below = op;	1354	originator->below = op;
1323	}	1355	}
1324	else	1356	else
1325	{	1357	{
		1358	object *top, *floor = NULL;
		1359
1326	top = ms.bot;	1360	top = ms.bot;
1327		1361
1328	/* If there are other objects, then */	1362	/* If there are other objects, then */
1329	if ((!(flag & INS_MAP_LOAD)) && top)	1363	if (top)
1330	{	1364	{
1331	object *last = 0;	1365	object *last = 0;
1332		1366
1333	/*	1367	/*
1334	* If there are multiple objects on this space, we do some trickier handling.	1368	* If there are multiple objects on this space, we do some trickier handling.
…		…
1387	if (last && last->below && last != floor)	1421	if (last && last->below && last != floor)
1388	top = last->below;	1422	top = last->below;
1389	}	1423	}
1390	} /* If objects on this space */	1424	} /* If objects on this space */
1391		1425
1392	if (flag & INS_MAP_LOAD)
1393	top = ms.top;
1394
1395	if (flag & INS_ABOVE_FLOOR_ONLY)	1426	if (flag & INS_ABOVE_FLOOR_ONLY)
1396	top = floor;	1427	top = floor;
1397		1428
1398	/* Top is the object that our object (op) is going to get inserted above.	1429	/* Top is the object that our object (op) is going to get inserted above.
1399	*/	1430	*/
…		…
1431	op->map->touch ();	1462	op->map->touch ();
1432	}	1463	}
1433		1464
1434	op->map->dirty = true;	1465	op->map->dirty = true;
1435		1466
1436	/* If we have a floor, we know the player, if any, will be above
1437	* it, so save a few ticks and start from there.
1438	*/
1439	if (!(flag & INS_MAP_LOAD))
1440	if (object *pl = ms.player ())	1467	if (object *pl = ms.player ())
1441	if (pl->contr->ns)	1468	//TODO: the floorbox prev/next might need updating
1442	pl->contr->ns->floorbox_update ();	1469	esrv_send_item (pl, op);
1443		1470
1444	/* If this object glows, it may affect lighting conditions that are	1471	/* If this object glows, it may affect lighting conditions that are
1445	* visible to others on this map. But update_all_los is really	1472	* visible to others on this map. But update_all_los is really
1446	* an inefficient way to do this, as it means los for all players	1473	* an inefficient way to do this, as it means los for all players
1447	* on the map will get recalculated. The players could very well	1474	* on the map will get recalculated. The players could very well
…		…
1466	* blocked() and wall() work properly), and these flags are updated by	1493	* blocked() and wall() work properly), and these flags are updated by
1467	* update_object().	1494	* update_object().
1468	*/	1495	*/
1469		1496
1470	/* if this is not the head or flag has been passed, don't check walk on status */	1497	/* if this is not the head or flag has been passed, don't check walk on status */
1471	if (!(flag & INS_NO_WALK_ON) && !op->head)	1498	if (!(flag & INS_NO_WALK_ON) && op->head_ () == op)
1472	{	1499	{
1473	if (check_move_on (op, originator))	1500	if (check_move_on (op, originator))
1474	return 0;	1501	return 0;
1475		1502
1476	/* If we are a multi part object, lets work our way through the check	1503	/* If we are a multi part object, lets work our way through the check
1477	* walk on's.	1504	* walk on's.
1478	*/	1505	*/
1479	for (tmp = op->more; tmp != NULL; tmp = tmp->more)	1506	for (object *tmp = op->more; tmp; tmp = tmp->more)
1480	if (check_move_on (tmp, originator))	1507	if (check_move_on (tmp, originator))
1481	return 0;	1508	return 0;
1482	}	1509	}
1483		1510
1484	return op;	1511	return op;
…		…
1489	* op is the object to insert it under: supplies x and the map.	1516	* op is the object to insert it under: supplies x and the map.
1490	*/	1517	*/
1491	void	1518	void
1492	replace_insert_ob_in_map (const char *arch_string, object *op)	1519	replace_insert_ob_in_map (const char *arch_string, object *op)
1493	{	1520	{
1494	object *tmp, *tmp1;
1495
1496	/* first search for itself and remove any old instances */	1521	/* first search for itself and remove any old instances */
1497		1522
1498	for (tmp = op->ms ().bot; tmp; tmp = tmp->above)	1523	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1499	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */	1524	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */
1500	tmp->destroy ();	1525	tmp->destroy (1);
1501		1526
1502	tmp1 = arch_to_object (archetype::find (arch_string));	1527	object *tmp = arch_to_object (archetype::find (arch_string));
1503		1528
1504	tmp1->x = op->x;	1529	tmp->x = op->x;
1505	tmp1->y = op->y;	1530	tmp->y = op->y;
		1531
1506	insert_ob_in_map (tmp1, op->map, op, 0);	1532	insert_ob_in_map (tmp, op->map, op, 0);
1507	}	1533	}
1508		1534
1509	object *	1535	object *
1510	object::insert_at (object *where, object *originator, int flags)	1536	object::insert_at (object *where, object *originator, int flags)
1511	{	1537	{
		1538	if (where->env)
		1539	return where->env->insert (this);
		1540	else
1512	return where->map->insert (this, where->x, where->y, originator, flags);	1541	return where->map->insert (this, where->x, where->y, originator, flags);
1513	}	1542	}
1514		1543
1515	/*	1544	/*
1516	* get_split_ob(ob,nr) splits up ob into two parts. The part which
1517	* is returned contains nr objects, and the remaining parts contains
1518	* the rest (or is removed and freed if that number is 0).
1519	* On failure, NULL is returned, and the reason put into the
1520	* global static errmsg array.
1521	*/
1522	object *
1523	get_split_ob (object *orig_ob, uint32 nr)
1524	{
1525	object *newob;
1526	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1527
1528	if (orig_ob->nrof < nr)
1529	{
1530	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1531	return NULL;
1532	}
1533
1534	newob = object_create_clone (orig_ob);
1535
1536	if ((orig_ob->nrof -= nr) < 1)
1537	orig_ob->destroy (1);
1538	else if (!is_removed)
1539	{
1540	if (orig_ob->env != NULL)
1541	sub_weight (orig_ob->env, orig_ob->weight * nr);
1542	if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)
1543	{
1544	strcpy (errmsg, "Tried to split object whose map is not in memory.");
1545	LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n");
1546	return NULL;
1547	}
1548	}
1549
1550	newob->nrof = nr;
1551
1552	return newob;
1553	}
1554
1555	/*
1556	* decrease_ob_nr(object, number) decreases a specified number from	1545	* decrease(object, number) decreases a specified number from
1557	* the amount of an object. If the amount reaches 0, the object	1546	* the amount of an object. If the amount reaches 0, the object
1558	* is subsequently removed and freed.	1547	* is subsequently removed and freed.
1559	*	1548	*
1560	* Return value: 'op' if something is left, NULL if the amount reached 0	1549	* Return value: 'op' if something is left, NULL if the amount reached 0
1561	*/	1550	*/
		1551	bool
		1552	object::decrease (sint32 nr)
		1553	{
		1554	if (!nr)
		1555	return true;
		1556
		1557	nr = min (nr, nrof);
		1558
		1559	nrof -= nr;
		1560
		1561	if (nrof)
		1562	{
		1563	adjust_weight (env, -weight * nr); // carrying == 0
		1564
		1565	if (object *pl = visible_to ())
		1566	esrv_update_item (UPD_NROF, pl, this);
		1567
		1568	return true;
		1569	}
		1570	else
		1571	{
		1572	destroy (1);
		1573	return false;
		1574	}
		1575	}
		1576
		1577	/*
		1578	* split(ob,nr) splits up ob into two parts. The part which
		1579	* is returned contains nr objects, and the remaining parts contains
		1580	* the rest (or is removed and returned if that number is 0).
		1581	* On failure, NULL is returned.
		1582	*/
1562	object *	1583	object *
1563	decrease_ob_nr (object *op, uint32 i)	1584	object::split (sint32 nr)
1564	{	1585	{
1565	object *tmp;	1586	int have = number_of ();
1566		1587
1567	if (i == 0) /* objects with op->nrof require this check */	1588	if (have < nr)
1568	return op;	1589	return 0;
1569		1590	else if (have == nr)
1570	if (i > op->nrof)
1571	i = op->nrof;
1572
1573	if (QUERY_FLAG (op, FLAG_REMOVED))
1574	op->nrof -= i;
1575	else if (op->env)
1576	{	1591	{
1577	/* is this object in the players inventory, or sub container
1578	* therein?
1579	*/
1580	tmp = op->in_player ();
1581	/* nope. Is this a container the player has opened?
1582	* If so, set tmp to that player.
1583	* IMO, searching through all the players will mostly
1584	* likely be quicker than following op->env to the map,
1585	* and then searching the map for a player.
1586	*/
1587	if (!tmp)
1588	for_all_players (pl)
1589	if (pl->ob->container == op->env)
1590	{
1591	tmp = pl->ob;
1592	break;
1593	}
1594
1595	if (i < op->nrof)
1596	{
1597	sub_weight (op->env, op->weight * i);
1598	op->nrof -= i;
1599	if (tmp)
1600	esrv_send_item (tmp, op);
1601	}
1602	else
1603	{
1604	op->remove ();	1592	remove ();
1605	op->nrof = 0;	1593	return this;
1606	if (tmp)
1607	esrv_del_item (tmp->contr, op->count);
1608	}
1609	}	1594	}
1610	else	1595	else
1611	{	1596	{
1612	object *above = op->above;	1597	decrease (nr);
1613		1598
1614	if (i < op->nrof)	1599	object *op = object_create_clone (this);
1615	op->nrof -= i;	1600	op->nrof = nr;
1616	else
1617	{
1618	op->remove ();
1619	op->nrof = 0;
1620	}
1621
1622	/* Since we just removed op, op->above is null */
1623	for (tmp = above; tmp; tmp = tmp->above)
1624	if (tmp->type == PLAYER)
1625	{
1626	if (op->nrof)
1627	esrv_send_item (tmp, op);
1628	else
1629	esrv_del_item (tmp->contr, op->count);
1630	}
1631	}
1632
1633	if (op->nrof)
1634	return op;	1601	return op;
1635	else
1636	{
1637	op->destroy ();
1638	return 0;
1639	}
1640	}
1641
1642	/*
1643	* add_weight(object, weight) adds the specified weight to an object,
1644	* and also updates how much the environment(s) is/are carrying.
1645	*/
1646	void
1647	add_weight (object *op, signed long weight)
1648	{
1649	while (op != NULL)
1650	{
1651	if (op->type == CONTAINER)
1652	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1653
1654	op->carrying += weight;
1655	op = op->env;
1656	}	1602	}
1657	}	1603	}
1658		1604
1659	object *	1605	object *
1660	insert_ob_in_ob (object *op, object *where)	1606	insert_ob_in_ob (object *op, object *where)
…		…
1685	* be != op, if items are merged. -Tero	1631	* be != op, if items are merged. -Tero
1686	*/	1632	*/
1687	object *	1633	object *
1688	object::insert (object *op)	1634	object::insert (object *op)
1689	{	1635	{
1690	object *tmp, *otmp;
1691
1692	if (!QUERY_FLAG (op, FLAG_REMOVED))
1693	op->remove ();
1694
1695	if (op->more)	1636	if (op->more)
1696	{	1637	{
1697	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);	1638	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1698	return op;	1639	return op;
1699	}	1640	}
1700		1641
1701	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1642	op->remove ();
1702	CLEAR_FLAG (op, FLAG_REMOVED);	1643
		1644	op->flag [FLAG_OBJ_ORIGINAL] = 0;
		1645
1703	if (op->nrof)	1646	if (op->nrof)
1704	{
1705	for (tmp = inv; tmp != NULL; tmp = tmp->below)	1647	for (object *tmp = inv; tmp; tmp = tmp->below)
1706	if (object::can_merge (tmp, op))	1648	if (object::can_merge (tmp, op))
1707	{	1649	{
1708	/* return the original object and remove inserted object	1650	/* return the original object and remove inserted object
1709	(client needs the original object) */	1651	(client needs the original object) */
1710	tmp->nrof += op->nrof;	1652	tmp->nrof += op->nrof;
1711	/* Weight handling gets pretty funky. Since we are adding to	1653
1712	* tmp->nrof, we need to increase the weight.	1654	if (object *pl = tmp->visible_to ())
1713	*/	1655	esrv_update_item (UPD_NROF, pl, tmp);
		1656
1714	add_weight (this, op->weight * op->nrof);	1657	adjust_weight (this, op->total_weight ());
1715	SET_FLAG (op, FLAG_REMOVED);	1658
1716	op->destroy (); /* free the inserted object */	1659	op->destroy (1);
1717	op = tmp;	1660	op = tmp;
1718	op->remove (); /* and fix old object's links */	1661	goto inserted;
1719	CLEAR_FLAG (op, FLAG_REMOVED);
1720	break;
1721	}	1662	}
1722		1663
1723	/* I assume combined objects have no inventory	1664	op->owner = 0; // it's his/hers now. period.
1724	* We add the weight - this object could have just been removed
1725	* (if it was possible to merge). calling remove_ob will subtract
1726	* the weight, so we need to add it in again, since we actually do
1727	* the linking below
1728	*/
1729	add_weight (this, op->weight * op->nrof);
1730	}
1731	else
1732	add_weight (this, (op->weight + op->carrying));
1733
1734	otmp = this->in_player ();
1735	if (otmp && otmp->contr)
1736	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1737	otmp->update_stats ();
1738
1739	op->map = 0;	1665	op->map = 0;
1740	op->env = this;	1666	op->x = 0;
		1667	op->y = 0;
		1668
1741	op->above = 0;	1669	op->above = 0;
1742	op->below = 0;	1670	op->below = inv;
1743	op->x = 0, op->y = 0;	1671	op->env = this;
1744		1672
		1673	if (inv)
		1674	inv->above = op;
		1675
		1676	inv = op;
		1677
		1678	op->flag [FLAG_REMOVED] = 0;
		1679
		1680	if (object *pl = op->visible_to ())
		1681	esrv_send_item (pl, op);
		1682
		1683	adjust_weight (this, op->total_weight ());
		1684
		1685	inserted:
1745	/* reset the light list and los of the players on the map */	1686	/* reset the light list and los of the players on the map */
1746	if ((op->glow_radius != 0) && map)	1687	if (op->glow_radius && map && map->darkness)
1747	{
1748	#ifdef DEBUG_LIGHTS
1749	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1750	#endif /* DEBUG_LIGHTS */
1751	if (map->darkness)
1752	update_all_los (map, x, y);	1688	update_all_los (map, x, y);
1753	}
1754		1689
1755	/* Client has no idea of ordering so lets not bother ordering it here.	1690	// if this is a player's inventory, update stats
1756	* It sure simplifies this function...	1691	if (type == PLAYER && !flag [FLAG_NO_FIX_PLAYER])
1757	*/	1692	update_stats ();
1758	if (!inv)
1759	inv = op;
1760	else
1761	{
1762	op->below = inv;
1763	op->below->above = op;
1764	inv = op;
1765	}
1766		1693
1767	INVOKE_OBJECT (INSERT, this);	1694	INVOKE_OBJECT (INSERT, this);
1768		1695
1769	return op;	1696	return op;
1770	}	1697	}
…		…
1985	* activate recursively a flag on an object inventory	1912	* activate recursively a flag on an object inventory
1986	*/	1913	*/
1987	void	1914	void
1988	flag_inv (object *op, int flag)	1915	flag_inv (object *op, int flag)
1989	{	1916	{
1990	if (op->inv)
1991	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)	1917	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1992	{	1918	{
1993	SET_FLAG (tmp, flag);	1919	SET_FLAG (tmp, flag);
1994	flag_inv (tmp, flag);	1920	flag_inv (tmp, flag);
1995	}	1921	}
1996	}	1922	}
1997		1923
1998	/*	1924	/*
1999	* deactivate recursively a flag on an object inventory	1925	* deactivate recursively a flag on an object inventory
2000	*/	1926	*/
2001	void	1927	void
2002	unflag_inv (object *op, int flag)	1928	unflag_inv (object *op, int flag)
2003	{	1929	{
2004	if (op->inv)
2005	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)	1930	for (object *tmp = op->inv; tmp; tmp = tmp->below)
2006	{	1931	{
2007	CLEAR_FLAG (tmp, flag);	1932	CLEAR_FLAG (tmp, flag);
2008	unflag_inv (tmp, flag);	1933	unflag_inv (tmp, flag);
2009	}	1934	}
2010	}	1935	}
2011		1936
2012	/*	1937	/*
2013	* find_free_spot(object, map, x, y, start, stop) will search for	1938	* find_free_spot(object, map, x, y, start, stop) will search for
2014	* a spot at the given map and coordinates which will be able to contain	1939	* a spot at the given map and coordinates which will be able to contain
…		…
2016	* to search (see the freearr_x/y[] definition).	1941	* to search (see the freearr_x/y[] definition).
2017	* It returns a random choice among the alternatives found.	1942	* It returns a random choice among the alternatives found.
2018	* start and stop are where to start relative to the free_arr array (1,9	1943	* start and stop are where to start relative to the free_arr array (1,9
2019	* does all 4 immediate directions). This returns the index into the	1944	* does all 4 immediate directions). This returns the index into the
2020	* array of the free spot, -1 if no spot available (dir 0 = x,y)	1945	* array of the free spot, -1 if no spot available (dir 0 = x,y)
2021	* Note - this only checks to see if there is space for the head of the
2022	* object - if it is a multispace object, this should be called for all
2023	* pieces.
2024	* Note2: This function does correctly handle tiled maps, but does not	1946	* Note: This function does correctly handle tiled maps, but does not
2025	* inform the caller. However, insert_ob_in_map will update as	1947	* inform the caller. However, insert_ob_in_map will update as
2026	* necessary, so the caller shouldn't need to do any special work.	1948	* necessary, so the caller shouldn't need to do any special work.
2027	* Note - updated to take an object instead of archetype - this is necessary	1949	* Note - updated to take an object instead of archetype - this is necessary
2028	* because arch_blocked (now ob_blocked) needs to know the movement type	1950	* because arch_blocked (now ob_blocked) needs to know the movement type
2029	* to know if the space in question will block the object. We can't use	1951	* to know if the space in question will block the object. We can't use
…		…
2031	* customized, changed states, etc.	1953	* customized, changed states, etc.
2032	*/	1954	*/
2033	int	1955	int
2034	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)	1956	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2035	{	1957	{
		1958	int altern[SIZEOFFREE];
2036	int index = 0, flag;	1959	int index = 0, flag;
2037	int altern[SIZEOFFREE];
2038		1960
2039	for (int i = start; i < stop; i++)	1961	for (int i = start; i < stop; i++)
2040	{	1962	{
2041	flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]);	1963	mapxy pos (m, x, y); pos.move (i);
2042	if (!flag)	1964
		1965	if (!pos.normalise ())
		1966	continue;
		1967
		1968	mapspace &ms = *pos;
		1969
		1970	if (ms.flags () & P_IS_ALIVE)
		1971	continue;
		1972
		1973	/* However, often
		1974	* ob doesn't have any move type (when used to place exits)
		1975	* so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.
		1976	*/
		1977	if (ob && ob->move_type == 0 && ms.move_block != MOVE_ALL)
		1978	{
2043	altern [index++] = i;	1979	altern [index++] = i;
		1980	continue;
		1981	}
2044		1982
2045	/* Basically, if we find a wall on a space, we cut down the search size.	1983	/* Basically, if we find a wall on a space, we cut down the search size.
2046	* In this way, we won't return spaces that are on another side of a wall.	1984	* In this way, we won't return spaces that are on another side of a wall.
2047	* This mostly work, but it cuts down the search size in all directions -	1985	* This mostly work, but it cuts down the search size in all directions -
2048	* if the space being examined only has a wall to the north and empty	1986	* if the space being examined only has a wall to the north and empty
2049	* spaces in all the other directions, this will reduce the search space	1987	* spaces in all the other directions, this will reduce the search space
2050	* to only the spaces immediately surrounding the target area, and	1988	* to only the spaces immediately surrounding the target area, and
2051	* won't look 2 spaces south of the target space.	1989	* won't look 2 spaces south of the target space.
2052	*/	1990	*/
2053	else if ((flag & P_NO_PASS) && maxfree[i] < stop)	1991	if (ms.move_block == MOVE_ALL && maxfree[i] < stop)
		1992	{
2054	stop = maxfree[i];	1993	stop = maxfree[i];
		1994	continue;
		1995	}
		1996
		1997	/* Note it is intentional that we check ob - the movement type of the
		1998	* head of the object should correspond for the entire object.
		1999	*/
		2000	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
		2001	continue;
		2002
		2003	if (ob->blocked (m, pos.x, pos.y))
		2004	continue;
		2005
		2006	altern [index++] = i;
2055	}	2007	}
2056		2008
2057	if (!index)	2009	if (!index)
2058	return -1;	2010	return -1;
2059		2011
…		…
2068	*/	2020	*/
2069	int	2021	int
2070	find_first_free_spot (const object *ob, maptile *m, int x, int y)	2022	find_first_free_spot (const object *ob, maptile *m, int x, int y)
2071	{	2023	{
2072	for (int i = 0; i < SIZEOFFREE; i++)	2024	for (int i = 0; i < SIZEOFFREE; i++)
2073	if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]))	2025	if (!ob->blocked (m, x + freearr_x[i], y + freearr_y[i]))
2074	return i;	2026	return i;
2075		2027
2076	return -1;	2028	return -1;
2077	}	2029	}
2078		2030
…		…
2132	object *tmp;	2084	object *tmp;
2133	maptile *mp;	2085	maptile *mp;
2134		2086
2135	MoveType blocked, move_type;	2087	MoveType blocked, move_type;
2136		2088
2137	if (exclude && exclude->head)	2089	if (exclude && exclude->head_ () != exclude)
2138	{	2090	{
2139	exclude = exclude->head;	2091	exclude = exclude->head;
2140	move_type = exclude->move_type;	2092	move_type = exclude->move_type;
2141	}	2093	}
2142	else	2094	else
…		…
2165	max = maxfree[i];	2117	max = maxfree[i];
2166	else if (mflags & P_IS_ALIVE)	2118	else if (mflags & P_IS_ALIVE)
2167	{	2119	{
2168	for (tmp = ms.bot; tmp; tmp = tmp->above)	2120	for (tmp = ms.bot; tmp; tmp = tmp->above)
2169	if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)	2121	if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)
2170	&& (tmp != exclude || (tmp->head && tmp->head != exclude)))	2122	&& (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2171	break;	2123	break;
2172		2124
2173	if (tmp)	2125	if (tmp)
2174	return freedir[i];	2126	return freedir[i];
2175	}	2127	}
…		…
2355	* Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause	2307	* Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause
2356	* core dumps if they do.	2308	* core dumps if they do.
2357	*	2309	*
2358	* Add a check so we can't pick up invisible objects (0.93.8)	2310	* Add a check so we can't pick up invisible objects (0.93.8)
2359	*/	2311	*/
2360
2361	int	2312	int
2362	can_pick (const object *who, const object *item)	2313	can_pick (const object *who, const object *item)
2363	{	2314	{
2364	return /*QUERY_FLAG(who,FLAG_WIZ)|| */	2315	return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2365	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&	2316	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
…		…
2370	* create clone from object to another	2321	* create clone from object to another
2371	*/	2322	*/
2372	object *	2323	object *
2373	object_create_clone (object *asrc)	2324	object_create_clone (object *asrc)
2374	{	2325	{
2375	object *dst = 0, *tmp, *src, *part, *prev, *item;	2326	object *dst = 0, *tmp, *src, *prev, *item;
2376		2327
2377	if (!asrc)	2328	if (!asrc)
2378	return 0;	2329	return 0;
2379		2330
2380	src = asrc;
2381	if (src->head)
2382	src = src->head;	2331	src = asrc->head_ ();
2383		2332
2384	prev = 0;	2333	prev = 0;
2385	for (part = src; part; part = part->more)	2334	for (object *part = src; part; part = part->more)
2386	{	2335	{
2387	tmp = part->clone ();	2336	tmp = part->clone ();
2388	tmp->x -= src->x;	2337	tmp->x -= src->x;
2389	tmp->y -= src->y;	2338	tmp->y -= src->y;
2390		2339
…		…
2503	/* Basically, if the archetype has this key set,	2452	/* Basically, if the archetype has this key set,
2504	* we need to store the null value so when we save	2453	* we need to store the null value so when we save
2505	* it, we save the empty value so that when we load,	2454	* it, we save the empty value so that when we load,
2506	* we get this value back again.	2455	* we get this value back again.
2507	*/	2456	*/
2508	if (get_ob_key_link (&op->arch->clone, canonical_key))	2457	if (get_ob_key_link (op->arch, canonical_key))
2509	field->value = 0;	2458	field->value = 0;
2510	else	2459	else
2511	{	2460	{
2512	if (last)	2461	if (last)
2513	last->next = field->next;	2462	last->next = field->next;
…		…
2582	}	2531	}
2583	else	2532	else
2584	item = item->env;	2533	item = item->env;
2585	}	2534	}
2586		2535
2587
2588	const char *	2536	const char *
2589	object::flag_desc (char *desc, int len) const	2537	object::flag_desc (char *desc, int len) const
2590	{	2538	{
2591	char *p = desc;	2539	char *p = desc;
2592	bool first = true;	2540	bool first = true;
…		…
2619	{	2567	{
2620	char flagdesc[512];	2568	char flagdesc[512];
2621	char info2[256 * 4];	2569	char info2[256 * 4];
2622	char *p = info;	2570	char *p = info;
2623		2571
2624	p += snprintf (p, 512, "{cnt:%d,uuid:<1.%" PRIx64 ">,name:\"%s\"%s%s,flags:[%s],type:%d}",	2572	p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s,flags:[%s],type:%d}",
2625	count, uuid.seq,	2573	count,
		2574	uuid.c_str (),
2626	&name,	2575	&name,
2627	title ? "\",title:\"" : "",	2576	title ? "\",title:\"" : "",
2628	title ? (const char *)title : "",	2577	title ? (const char *)title : "",
2629	flag_desc (flagdesc, 512), type);	2578	flag_desc (flagdesc, 512), type);
2630		2579
2631	if (env)	2580	if (!flag[FLAG_REMOVED] && env)
2632	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2581	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2633		2582
2634	if (map)	2583	if (map)
2635	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);	2584	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2636		2585
…		…
2654	}	2603	}
2655		2604
2656	const materialtype_t *	2605	const materialtype_t *
2657	object::dominant_material () const	2606	object::dominant_material () const
2658	{	2607	{
2659	if (materialtype_t *mat = name_to_material (materialname))	2608	if (materialtype_t *mt = name_to_material (materialname))
2660	return mat;	2609	return mt;
2661		2610
2662	// omfg this is slow, this has to be temporary :)
2663	shstr unknown ("unknown");
2664
2665	return name_to_material (unknown);	2611	return name_to_material (shstr_unknown);
2666	}	2612	}
2667		2613
2668	void	2614	void
2669	object::open_container (object *new_container)	2615	object::open_container (object *new_container)
2670	{	2616	{
…		…
2681	if (object *closer = old_container->inv)	2627	if (object *closer = old_container->inv)
2682	if (closer->type == CLOSE_CON)	2628	if (closer->type == CLOSE_CON)
2683	closer->destroy ();	2629	closer->destroy ();
2684	#endif	2630	#endif
2685		2631
2686	old_container->flag [FLAG_APPLIED] = 0;	2632	old_container->flag [FLAG_APPLIED] = false;
2687	container = 0;	2633	container = 0;
2688		2634
2689	esrv_update_item (UPD_FLAGS, this, old_container);	2635	esrv_update_item (UPD_FLAGS, this, old_container);
2690	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));	2636	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
		2637	play_sound (sound_find ("chest_close"));
2691	}	2638	}
2692		2639
2693	if (new_container)	2640	if (new_container)
2694	{	2641	{
2695	if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))	2642	if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))
…		…
2706	}	2653	}
2707	#endif	2654	#endif
2708		2655
2709	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));	2656	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));
2710		2657
2711	new_container->flag [FLAG_APPLIED] = 1;	2658	new_container->flag [FLAG_APPLIED] = true;
2712	container = new_container;	2659	container = new_container;
2713		2660
2714	esrv_update_item (UPD_FLAGS, this, new_container);	2661	esrv_update_item (UPD_FLAGS, this, new_container);
2715	esrv_send_inventory (this, new_container);	2662	esrv_send_inventory (this, new_container);
		2663	play_sound (sound_find ("chest_open"));
		2664	}
		2665	}
		2666
		2667	object *
		2668	object::force_find (const shstr name)
		2669	{
		2670	/* cycle through his inventory to look for the MARK we want to
		2671	* place
		2672	*/
		2673	for (object *tmp = inv; tmp; tmp = tmp->below)
		2674	if (tmp->type == FORCE && tmp->slaying == name)
		2675	return splay (tmp);
		2676
		2677	return 0;
		2678	}
		2679
		2680	void
		2681	object::force_add (const shstr name, int duration)
		2682	{
		2683	if (object *force = force_find (name))
		2684	force->destroy ();
		2685
		2686	object *force = get_archetype (FORCE_NAME);
		2687
		2688	force->slaying = name;
		2689	force->stats.food = 1;
		2690	force->speed_left = -1.f;
		2691
		2692	force->set_speed (duration ? 1.f / duration : 0.f);
		2693	force->flag [FLAG_IS_USED_UP] = true;
		2694	force->flag [FLAG_APPLIED] = true;
		2695
		2696	insert (force);
		2697	}
		2698
		2699	void
		2700	object::play_sound (faceidx sound)
		2701	{
		2702	if (!sound)
		2703	return;
		2704
		2705	if (flag [FLAG_REMOVED])
		2706	return;
		2707
		2708	if (env)
2716	}	2709	{
		2710	if (object *pl = in_player ())
		2711	pl->contr->play_sound (sound);
		2712	}
		2713	else
		2714	map->play_sound (sound, x, y);
2717	}	2715	}
2718		2716
2719

Diff Legend

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