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.145 by root, Mon May 7 03:05:58 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>	29	#include <sproto.h>
34	#include <loader.h>	30	#include <loader.h>
35		31
36	#include <bitset>	32	#include <bitset>
37		33
38	int nrofallocobjects = 0;	34	UUID UUID::cur;
39	static UUID uuid;	35	static uint64_t seq_next_save;
40	const uint64 UUID_SKIP = 1<<19;	36	static const uint64 UUID_GAP = 1<<19;
41		37
42	objectvec objects;	38	objectvec objects;
43	activevec actives;	39	activevec actives;
44		40
45	short freearr_x[SIZEOFFREE] = { 0, 0, 1, 1, 1, 0, -1, -1, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,	41	short freearr_x[SIZEOFFREE] = {
		42	0,
		43	0, 1, 1, 1, 0, -1, -1, -1,
		44	0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,
46	0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1	45	0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1
47	};	46	};
48	short freearr_y[SIZEOFFREE] = { 0, -1, -1, 0, 1, 1, 1, 0, -1, -2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2,	47	short freearr_y[SIZEOFFREE] = {
		48	0,
		49	-1, -1, 0, 1, 1, 1, 0, -1,
		50	-2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2,
49	-3, -3, -3, -3, -2, -1, 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3	51	-3, -3, -3, -3, -2, -1, 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3
50	};	52	};
51	int maxfree[SIZEOFFREE] = { 0, 9, 10, 13, 14, 17, 18, 21, 22, 25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45,	53	int maxfree[SIZEOFFREE] = {
		54	0,
		55	9, 10, 13, 14, 17, 18, 21, 22,
		56	25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45, 48,
52	48, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49	57	49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49
53	};	58	};
54	int freedir[SIZEOFFREE] = {	59	int freedir[SIZEOFFREE] = {
55	0, 1, 2, 3, 4, 5, 6, 7, 8, 1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8,	60	0,
		61	1, 2, 3, 4, 5, 6, 7, 8,
		62	1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8,
56	1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8	63	1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8
57	};	64	};
58		65
59	static void	66	static void
60	write_uuid (void)	67	write_uuid (uval64 skip, bool sync)
61	{	68	{
62	char filename1[MAX_BUF], filename2[MAX_BUF];	69	CALL_BEGIN (2);
63		70	CALL_ARG_SV (newSVval64 (skip));
64	sprintf (filename1, "%s/uuid", settings.localdir);	71	CALL_ARG_SV (boolSV (sync));
65	sprintf (filename2, "%s/uuid~", settings.localdir);	72	CALL_CALL ("cf::write_uuid", G_DISCARD);
66		73	CALL_END;
67	FILE *fp;
68
69	if (!(fp = fopen (filename2, "w")))
70	{
71	LOG (llevError, "ERROR: cannot open %s for writing, unable to write UUID!\n", filename2);
72	return;
73	}
74
75	fprintf (fp, "<1,%llx>\n", (unsigned long long)uuid.seq + UUID_SKIP * 2);
76	fclose (fp);
77	rename (filename2, filename1);
78	}	74	}
79		75
80	static void	76	static void
81	read_uuid (void)	77	read_uuid (void)
82	{	78	{
83	char filename[MAX_BUF];	79	char filename[MAX_BUF];
84		80
85	sprintf (filename, "%s/uuid", settings.localdir);	81	sprintf (filename, "%s/uuid", settings.localdir);
		82
		83	seq_next_save = 0;
86		84
87	FILE *fp;	85	FILE *fp;
88		86
89	if (!(fp = fopen (filename, "r")))	87	if (!(fp = fopen (filename, "r")))
90	{	88	{
91	if (errno == ENOENT)	89	if (errno == ENOENT)
92	{	90	{
93	LOG (llevInfo, "RESET uid to 1\n");	91	LOG (llevInfo, "RESET uid to 1\n");
94	uuid.seq = 0;	92	UUID::cur.seq = 0;
95	write_uuid ();	93	write_uuid (UUID_GAP, true);
96	return;	94	return;
97	}	95	}
98		96
99	LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);	97	LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);
100	_exit (1);	98	_exit (1);
101	}	99	}
102		100
103	int version;	101	UUID::BUF buf;
104	unsigned long long uid;	102	buf[0] = 0;
105	if (2 != fscanf (fp, "<%d,%llx>\n", &version, &uid) || version != 1)	103	fgets (buf, sizeof (buf), fp);
		104
		105	if (!UUID::cur.parse (buf))
106	{	106	{
107	LOG (llevError, "FATAL: error reading uid from %s!\n", filename);	107	LOG (llevError, "FATAL: error reading uid from %s (%s)!\n", filename, buf);
108	_exit (1);	108	_exit (1);
109	}	109	}
110		110
111	uuid.seq = uid;	111	LOG (llevDebug, "read UUID: %s\n", UUID::cur.c_str ());
112	write_uuid ();	112
113	LOG (llevDebug, "read UID: %" PRId64 "\n", uid);	113	write_uuid (UUID_GAP, true);
114	fclose (fp);	114	fclose (fp);
115	}	115	}
116		116
117	UUID	117	UUID
118	gen_uuid ()	118	UUID::gen ()
119	{	119	{
120	UUID uid;	120	UUID uid;
121		121
122	uid.seq = ++uuid.seq;	122	uid.seq = ++cur.seq;
123		123
124	if (!(uuid.seq & (UUID_SKIP - 1)))	124	if (expect_false (cur.seq >= seq_next_save))
125	write_uuid ();	125	{
		126	seq_next_save = UUID::cur.seq + (UUID_GAP >> 1);
		127	write_uuid (UUID_GAP, false);
		128	}
		129
126		130
127	return uid;	131	return uid;
128	}	132	}
129		133
130	void	134	void
131	init_uuid ()	135	UUID::init ()
132	{	136	{
133	read_uuid ();	137	read_uuid ();
134	}	138	}
135		139
136	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */	140	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */
137	static int	141	static bool
138	compare_ob_value_lists_one (const object *wants, const object *has)	142	compare_ob_value_lists_one (const object *wants, const object *has)
139	{	143	{
140	key_value *wants_field;	144	key_value *wants_field;
141		145
142	/* n-squared behaviour (see get_ob_key_link()), but I'm hoping both	146	/* n-squared behaviour (see get_ob_key_link()), but I'm hoping both
…		…
150	key_value *has_field;	154	key_value *has_field;
151		155
152	/* Look for a field in has with the same key. */	156	/* Look for a field in has with the same key. */
153	has_field = get_ob_key_link (has, wants_field->key);	157	has_field = get_ob_key_link (has, wants_field->key);
154		158
155	if (has_field == NULL)	159	if (!has_field)
156	{
157	/* No field with that name. */	160	return 0; /* No field with that name. */
158	return FALSE;
159	}
160		161
161	/* Found the matching field. */	162	/* Found the matching field. */
162	if (has_field->value != wants_field->value)	163	if (has_field->value != wants_field->value)
163	{
164	/* Values don't match, so this half of the comparison is false. */	164	return 0; /* Values don't match, so this half of the comparison is false. */
165	return FALSE;
166	}
167		165
168	/* If we get here, we found a match. Now for the next field in wants. */	166	/* If we get here, we found a match. Now for the next field in wants. */
169	}	167	}
170		168
171	/* If we get here, every field in wants has a matching field in has. */	169	/* If we get here, every field in wants has a matching field in has. */
172	return TRUE;	170	return 1;
173	}	171	}
174		172
175	/* Returns TRUE if ob1 has the same key_values as ob2. */	173	/* Returns TRUE if ob1 has the same key_values as ob2. */
176	static int	174	static bool
177	compare_ob_value_lists (const object *ob1, const object *ob2)	175	compare_ob_value_lists (const object *ob1, const object *ob2)
178	{	176	{
179	/* However, there may be fields in has which aren't partnered in wants,	177	/* However, there may be fields in has which aren't partnered in wants,
180	* so we need to run the comparison *twice*. :(	178	* so we need to run the comparison *twice*. :(
181	*/	179	*/
…		…
202	|| ob1->speed != ob2->speed	200	|| ob1->speed != ob2->speed
203	|| ob1->value != ob2->value	201	|| ob1->value != ob2->value
204	|| ob1->name != ob2->name)	202	|| ob1->name != ob2->name)
205	return 0;	203	return 0;
206		204
207	//TODO: this ain't working well, use nicer and correct overflow check	205	/* Do not merge objects if nrof would overflow. First part checks
208	/* Do not merge objects if nrof would overflow. We use 1UL<<31 since that	206	* for unsigned overflow (2c), second part checks whether the result
209	* value could not be stored in a sint32 (which unfortunately sometimes is	207	* would fit into a 32 bit signed int, which is often used to hold
210	* used to store nrof).	208	* nrof values.
211	*/	209	*/
212	if (ob1->nrof + ob2->nrof >= 1UL << 31)	210	if (~ob1->nrof < ob2->nrof || ob1->nrof + ob2->nrof > (1UL << 31))
213	return 0;	211	return 0;
214		212
215	/* If the objects have been identified, set the BEEN_APPLIED flag.	213	/* If the objects have been identified, set the BEEN_APPLIED flag.
216	* This is to the comparison of the flags below will be OK. We	214	* This is to the comparison of the flags below will be OK. We
217	* just can't ignore the been applied or identified flags, as they	215	* just can't ignore the been applied or identified flags, as they
218	* are not equal - just if it has been identified, the been_applied	216	* are not equal - just if it has been identified, the been_applied
219	* flags lose any meaning.	217	* flags lose any meaning.
220	*/	218	*/
221	if (QUERY_FLAG (ob1, FLAG_IDENTIFIED))	219	if (QUERY_FLAG (ob1, FLAG_IDENTIFIED))
222	SET_FLAG (ob1, FLAG_BEEN_APPLIED);	220	SET_FLAG (ob1, FLAG_BEEN_APPLIED);
223		221
224	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))	222	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))
225	SET_FLAG (ob2, FLAG_BEEN_APPLIED);	223	SET_FLAG (ob2, FLAG_BEEN_APPLIED);
226		224
227	if ((ob1->flag ^ ob2->flag).reset (FLAG_INV_LOCKED).reset (FLAG_CLIENT_SENT).any ()	225	if (ob1->arch->name != ob2->arch->name
228	|| ob1->arch != ob2->arch
229	|| ob1->name != ob2->name	226	|| ob1->name != ob2->name
230	|| ob1->title != ob2->title	227	|| ob1->title != ob2->title
231	|| ob1->msg != ob2->msg	228	|| ob1->msg != ob2->msg
232	|| ob1->weight != ob2->weight	229	|| ob1->weight != ob2->weight
233	|| memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
234	|| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats) )
235	|| ob1->attacktype != ob2->attacktype	230	|| ob1->attacktype != ob2->attacktype
236	|| ob1->magic != ob2->magic	231	|| ob1->magic != ob2->magic
237	|| ob1->slaying != ob2->slaying	232	|| ob1->slaying != ob2->slaying
238	|| ob1->skill != ob2->skill	233	|| ob1->skill != ob2->skill
239	|| ob1->value != ob2->value	234	|| ob1->value != ob2->value
…		…
246	|| ob1->move_block != ob2->move_block	241	|| ob1->move_block != ob2->move_block
247	|| ob1->move_allow != ob2->move_allow	242	|| ob1->move_allow != ob2->move_allow
248	|| ob1->move_on != ob2->move_on	243	|| ob1->move_on != ob2->move_on
249	|| ob1->move_off != ob2->move_off	244	|| ob1->move_off != ob2->move_off
250	|| ob1->move_slow != ob2->move_slow	245	|| ob1->move_slow != ob2->move_slow
251	|| ob1->move_slow_penalty != ob2->move_slow_penalty)	246	|| ob1->move_slow_penalty != ob2->move_slow_penalty
		247	|| memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
		248	|| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats)))
252	return 0;	249	return 0;
253		250
		251	if ((ob1->flag ^ ob2->flag)
		252	.reset (FLAG_INV_LOCKED)
		253	.reset (FLAG_CLIENT_SENT)
		254	.reset (FLAG_REMOVED)
		255	.any ())
		256	return 0;
		257
254	/* This is really a spellbook check - really, we should	258	/* This is really a spellbook check - we should in general
255	* check all objects in the inventory.	259	* not merge objects with real inventories, as splitting them
		260	* is hard.
256	*/	261	*/
257	if (ob1->inv || ob2->inv)	262	if (ob1->inv || ob2->inv)
258	{	263	{
259	/* if one object has inventory but the other doesn't, not equiv */	264	if (!(ob1->inv && ob2->inv))
260	if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv))	265	return 0; /* inventories differ in length */
261	return 0;
262		266
263	/* Now check to see if the two inventory objects could merge */	267	if (ob1->inv->below || ob2->inv->below)
		268	return 0; /* more than one object in inv */
		269
264	if (!object::can_merge (ob1->inv, ob2->inv))	270	if (!object::can_merge (ob1->inv, ob2->inv))
265	return 0;	271	return 0; /* inventory objects differ */
266		272
267	/* inventory ok - still need to check rest of this object to see	273	/* inventory ok - still need to check rest of this object to see
268	* if it is valid.	274	* if it is valid.
269	*/	275	*/
270	}	276	}
…		…
289	if (ob1->level != ob2->level)	295	if (ob1->level != ob2->level)
290	return 0;	296	return 0;
291	break;	297	break;
292	}	298	}
293		299
294	if (ob1->key_values != NULL || ob2->key_values != NULL)	300	if (ob1->key_values || ob2->key_values)
295	{	301	{
296	/* At least one of these has key_values. */	302	/* At least one of these has key_values. */
297	if ((ob1->key_values == NULL) != (ob2->key_values == NULL))	303	if ((!ob1->key_values) != (!ob2->key_values))
298	/* One has fields, but the other one doesn't. */	304	return 0; /* One has fields, but the other one doesn't. */
		305
		306	if (!compare_ob_value_lists (ob1, ob2))
299	return 0;	307	return 0;
300	else if (!compare_ob_value_lists (ob1, ob2))
301	return 0;
302	}	308	}
303		309
304	//TODO: generate an event or call into perl for additional checks
305	if (ob1->self || ob2->self)	310	if (ob1->self || ob2->self)
306	{	311	{
307	ob1->optimise ();	312	ob1->optimise ();
308	ob2->optimise ();	313	ob2->optimise ();
309		314
310	if (ob1->self || ob2->self)	315	if (ob1->self || ob2->self)
		316	{
		317	int k1 = ob1->self ? HvTOTALKEYS (ob1->self) : 0;
		318	int k2 = ob2->self ? HvTOTALKEYS (ob2->self) : 0;
		319
		320	if (k1 != k2)
311	return 0;	321	return 0;
		322
		323	if (k1 == 0)
		324	return 1;
		325
		326	if (!cfperl_can_merge (ob1, ob2))
		327	return 0;
		328	}
312	}	329	}
313		330
314	/* Everything passes, must be OK. */	331	/* Everything passes, must be OK. */
315	return 1;	332	return 1;
316	}	333	}
317		334
		335	// find player who can see this object
		336	object *
		337	object::visible_to () const
		338	{
		339	if (!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
318	/*	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	/*
319	* sum_weight() is a recursive function which calculates the weight	404	* this is a recursive function which calculates the weight
320	* 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
321	* containers are carrying, and sums it up.	406	* containers are carrying, and sums it up.
322	*/	407	*/
323	long	408	void
324	sum_weight (object *op)	409	object::update_weight ()
325	{	410	{
326	long sum;	411	sint32 sum = 0;
327	object *inv;
328		412
329	for (sum = 0, inv = op->inv; inv; inv = inv->below)	413	for (object *op = inv; op; op = op->below)
330	{	414	{
331	if (inv->inv)	415	if (op->inv)
332	sum_weight (inv);	416	op->update_weight ();
333		417
334	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)
335	}	424	{
336
337	if (op->type == CONTAINER && op->stats.Str)
338	sum = (sum * (100 - op->stats.Str)) / 100;
339
340	if (op->carrying != sum)
341	op->carrying = sum;	425	carrying = sum;
342		426
343	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	}
344	}	431	}
345		432
346	/**	433	/*
347	* Return the outermost environment object for a given object.	434	* Used by: Server DM commands: dumpbelow, dump. Some error messages.
348	*/
349
350	object *
351	object_get_env_recursive (object *op)
352	{
353	while (op->env != NULL)
354	op = op->env;
355	return op;
356	}
357
358	/*
359	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
360	* Some error messages.
361	* The result of the dump is stored in the static global errmsg array.
362	*/	435	*/
363	char *	436	char *
364	dump_object (object *op)	437	dump_object (object *op)
365	{	438	{
366	if (!op)	439	if (!op)
…		…
374	/*	447	/*
375	* 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
376	* multi-object 1 which is closest to the second object.	449	* multi-object 1 which is closest to the second object.
377	* If it's not a multi-object, it is returned.	450	* If it's not a multi-object, it is returned.
378	*/	451	*/
379
380	object *	452	object *
381	get_nearest_part (object *op, const object *pl)	453	get_nearest_part (object *op, const object *pl)
382	{	454	{
383	object *tmp, *closest;	455	object *tmp, *closest;
384	int last_dist, i;	456	int last_dist, i;
385		457
386	if (op->more == NULL)	458	if (!op->more)
387	return op;	459	return op;
		460
388	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)
389	if ((i = distance (tmp, pl)) < last_dist)	464	if ((i = distance (tmp, pl)) < last_dist)
390	closest = tmp, last_dist = i;	465	closest = tmp, last_dist = i;
		466
391	return closest;	467	return closest;
392	}	468	}
393		469
394	/*	470	/*
395	* 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.
396	*/	473	*/
397	object *	474	object *
398	find_object (tag_t i)	475	find_object (tag_t i)
399	{	476	{
400	for_all_objects (op)	477	for_all_objects (op)
…		…
420	break;	497	break;
421		498
422	return op;	499	return op;
423	}	500	}
424		501
425	void
426	free_all_object_data ()
427	{
428	LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);
429	}
430
431	/*	502	/*
432	* 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
433	* skill and experience objects.	504	* skill and experience objects.
		505	* ACTUALLY NO! investigate! TODO
434	*/	506	*/
435	void	507	void
436	object::set_owner (object *owner)	508	object::set_owner (object *owner)
437	{	509	{
		510	// allow objects which own objects
438	if (!owner)	511	if (owner)
439	return;
440
441	/* next line added to allow objects which own objects */
442	/* Add a check for ownercounts in here, as I got into an endless loop
443	* with the fireball owning a poison cloud which then owned the
444	* fireball. I believe that was caused by one of the objects getting
445	* freed and then another object replacing it. Since the ownercounts
446	* didn't match, this check is valid and I believe that cause is valid.
447	*/
448	while (owner->owner)	512	while (owner->owner)
449	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	}
450		520
451	this->owner = owner;	521	this->owner = owner;
452	}	522	}
453		523
454	void	524	int
		525	object::slottype () const
		526	{
		527	if (type == SKILL)
		528	{
		529	if (IS_COMBAT_SKILL (subtype)) return slot_combat;
		530	if (IS_RANGED_SKILL (subtype)) return slot_ranged;
		531	}
		532	else
		533	{
		534	if (slot [body_combat].info) return slot_combat;
		535	if (slot [body_range ].info) return slot_ranged;
		536	}
		537
		538	return slot_none;
		539	}
		540
		541	bool
455	object::set_weapon (object *ob)	542	object::change_weapon (object *ob)
456	{	543	{
457	if (current_weapon == ob)	544	if (current_weapon == ob)
458	return;	545	return true;
		546
		547	if (chosen_skill)
		548	chosen_skill->flag [FLAG_APPLIED] = false;
459		549
460	current_weapon = ob;	550	current_weapon = ob;
461	new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);	551	chosen_skill = !ob || ob->type == SKILL ? ob : find_skill_by_name (this, ob->skill);
		552
		553	if (chosen_skill)
		554	chosen_skill->flag [FLAG_APPLIED] = true;
		555
462	update_stats ();	556	update_stats ();
		557
		558	if (ob)
		559	{
		560	// now check wether any body locations became invalid, in which case
		561	// we cannot apply the weapon at the moment.
		562	for (int i = 0; i < NUM_BODY_LOCATIONS; ++i)
		563	if (slot[i].used < 0)
		564	{
		565	current_weapon = chosen_skill = 0;
		566	update_stats ();
		567
		568	new_draw_info_format (NDI_UNIQUE, 0, this,
		569	"You try to balance all your items at once, "
		570	"but the %s is just too much for your body. "
		571	"[You need to unapply some items first.]", &ob->name);
		572	return false;
		573	}
		574
		575	//new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);
		576	}
		577	else
		578	;//new_draw_info_format (NDI_UNIQUE, 0, this, "You unwield your weapons.");
		579
		580	if (ob && !ob->flag [FLAG_APPLIED] && ob->type != SPELL)
		581	{
		582	LOG (llevError | logBacktrace, "%s changed to unapplied weapon %s",
		583	&name, ob->debug_desc ());
		584	return false;
		585	}
		586
		587	return true;
463	}	588	}
464		589
465	/* Zero the key_values on op, decrementing the shared-string	590	/* Zero the key_values on op, decrementing the shared-string
466	* refcounts and freeing the links.	591	* refcounts and freeing the links.
467	*/	592	*/
…		…
531	object::copy_to (object *dst)	656	object::copy_to (object *dst)
532	{	657	{
533	*dst = *this;	658	*dst = *this;
534		659
535	if (speed < 0)	660	if (speed < 0)
536	dst->speed_left = speed_left - rndm ();	661	dst->speed_left -= rndm ();
537		662
538	dst->set_speed (dst->speed);	663	dst->set_speed (dst->speed);
539	}	664	}
540		665
541	void	666	void
542	object::instantiate ()	667	object::instantiate ()
543	{	668	{
544	if (!uuid.seq) // HACK	669	if (!uuid.seq) // HACK
545	uuid = gen_uuid ();	670	uuid = UUID::gen ();
546		671
547	speed_left = -0.1f;	672	speed_left = -0.1f;
548	/* 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
549	* 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.
550	* 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
…		…
709	static int object_count;	834	static int object_count;
710		835
711	void object::link ()	836	void object::link ()
712	{	837	{
713	assert (!index);//D	838	assert (!index);//D
714	uuid = gen_uuid ();	839	uuid = UUID::gen ();
715	count = ++object_count;	840	count = ++object_count;
716		841
717	refcnt_inc ();	842	refcnt_inc ();
718	objects.insert (this);	843	objects.insert (this);
719	}	844	}
…		…
792	object::destroy_inv (bool drop_to_ground)	917	object::destroy_inv (bool drop_to_ground)
793	{	918	{
794	// need to check first, because the checks below might segfault	919	// need to check first, because the checks below might segfault
795	// as we might be on an invalid mapspace and crossfire code	920	// as we might be on an invalid mapspace and crossfire code
796	// is too buggy to ensure that the inventory is empty.	921	// is too buggy to ensure that the inventory is empty.
797	// corollary: if you create arrows etc. with stuff in tis inventory,	922	// corollary: if you create arrows etc. with stuff in its inventory,
798	// cf will crash below with off-map x and y	923	// cf will crash below with off-map x and y
799	if (!inv)	924	if (!inv)
800	return;	925	return;
801		926
802	/* Only if the space blocks everything do we not process -	927	/* Only if the space blocks everything do we not process -
803	* if some form of movement is allowed, let objects	928	* if some form of movement is allowed, let objects
804	* drop on that space.	929	* drop on that space.
805	*/	930	*/
806	if (!drop_to_ground	931	if (!drop_to_ground
807	|| !map	932	|| !map
808	|| map->in_memory != MAP_IN_MEMORY	933	|| map->in_memory != MAP_ACTIVE
809	|| map->nodrop	934	|| map->nodrop
810	|| ms ().move_block == MOVE_ALL)	935	|| ms ().move_block == MOVE_ALL)
811	{	936	{
812	while (inv)	937	while (inv)
813	{	938	{
814	inv->destroy_inv (drop_to_ground);	939	inv->destroy_inv (false);
815	inv->destroy ();	940	inv->destroy ();
816	}	941	}
817	}	942	}
818	else	943	else
819	{ /* Put objects in inventory onto this space */	944	{ /* Put objects in inventory onto this space */
…		…
825	|| op->flag [FLAG_NO_DROP]	950	|| op->flag [FLAG_NO_DROP]
826	|| op->type == RUNE	951	|| op->type == RUNE
827	|| op->type == TRAP	952	|| op->type == TRAP
828	|| op->flag [FLAG_IS_A_TEMPLATE]	953	|| op->flag [FLAG_IS_A_TEMPLATE]
829	|| op->flag [FLAG_DESTROY_ON_DEATH])	954	|| op->flag [FLAG_DESTROY_ON_DEATH])
830	op->destroy ();	955	op->destroy (true);
831	else	956	else
832	map->insert (op, x, y);	957	map->insert (op, x, y);
833	}	958	}
834	}	959	}
835	}	960	}
…		…
842	}	967	}
843		968
844	void	969	void
845	object::do_destroy ()	970	object::do_destroy ()
846	{	971	{
847	attachable::do_destroy ();
848
849	if (flag [FLAG_IS_LINKED])	972	if (flag [FLAG_IS_LINKED])
850	remove_button_link (this);	973	remove_button_link (this);
851		974
852	if (flag [FLAG_FRIENDLY])	975	if (flag [FLAG_FRIENDLY])
853	remove_friendly_object (this);	976	remove_friendly_object (this);
854		977
855	if (!flag [FLAG_REMOVED])
856	remove ();	978	remove ();
857		979
858	destroy_inv (true);	980	attachable::do_destroy ();
859		981
860	deactivate ();	982	deactivate ();
861	unlink ();	983	unlink ();
862		984
863	flag [FLAG_FREED] = 1;	985	flag [FLAG_FREED] = 1;
…		…
868		990
869	if (!freed_map)	991	if (!freed_map)
870	{	992	{
871	freed_map = new maptile;	993	freed_map = new maptile;
872		994
		995	freed_map->path = "<freed objects map>";
873	freed_map->name = "/internal/freed_objects_map";	996	freed_map->name = "/internal/freed_objects_map";
874	freed_map->width = 3;	997	freed_map->width = 3;
875	freed_map->height = 3;	998	freed_map->height = 3;
		999	freed_map->nodrop = 1;
876		1000
877	freed_map->alloc ();	1001	freed_map->alloc ();
878	freed_map->in_memory = MAP_IN_MEMORY;	1002	freed_map->in_memory = MAP_ACTIVE;
879	}	1003	}
880		1004
881	map = freed_map;	1005	map = freed_map;
882	x = 1;	1006	x = 1;
883	y = 1;	1007	y = 1;
884	}	1008	}
885		1009
886	head = 0;
887
888	if (more)	1010	if (more)
889	{	1011	{
890	more->destroy ();	1012	more->destroy ();
891	more = 0;	1013	more = 0;
892	}	1014	}
893		1015
		1016	head = 0;
		1017
894	// clear those pointers that likely might have circular references to us	1018	// clear those pointers that likely might cause circular references
895	owner = 0;	1019	owner = 0;
896	enemy = 0;	1020	enemy = 0;
897	attacked_by = 0;	1021	attacked_by = 0;
		1022	current_weapon = 0;
898	}	1023	}
899		1024
900	void	1025	void
901	object::destroy (bool destroy_inventory)	1026	object::destroy (bool destroy_inventory)
902	{	1027	{
903	if (destroyed ())	1028	if (destroyed ())
904	return;	1029	return;
905		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
906	if (destroy_inventory)	1037	destroy_inv (!destroy_inventory);
907	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
908		1044
909	attachable::destroy ();	1045	attachable::destroy ();
910	}
911
912	/*
913	* sub_weight() recursively (outwards) subtracts a number from the
914	* weight of an object (and what is carried by it's environment(s)).
915	*/
916	void
917	sub_weight (object *op, signed long weight)
918	{
919	while (op != NULL)
920	{
921	if (op->type == CONTAINER)
922	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
923
924	op->carrying -= weight;
925	op = op->env;
926	}
927	}	1046	}
928		1047
929	/* op->remove ():	1048	/* op->remove ():
930	* 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
931	* 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
…		…
937	object::do_remove ()	1056	object::do_remove ()
938	{	1057	{
939	object *tmp, *last = 0;	1058	object *tmp, *last = 0;
940	object *otmp;	1059	object *otmp;
941		1060
942	if (QUERY_FLAG (this, FLAG_REMOVED))	1061	if (flag [FLAG_REMOVED])
943	return;	1062	return;
944		1063
945	SET_FLAG (this, FLAG_REMOVED);
946	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;
947		1070
948	if (more)	1071	if (more)
949	more->remove ();	1072	more->remove ();
950		1073
951	/*	1074	/*
952	* In this case, the object to be removed is in someones	1075	* In this case, the object to be removed is in someones
953	* inventory.	1076	* inventory.
954	*/	1077	*/
955	if (env)	1078	if (env)
956	{	1079	{
		1080	adjust_weight (env, -total_weight ());
		1081
		1082	*(above ? &above->below : &env->inv) = below;
		1083
957	if (nrof)	1084	if (below)
958	sub_weight (env, weight * nrof);	1085	below->above = above;
959	else	1086
960	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;
961		1097
962	/* 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
963	* made to players inventory. If set, avoiding the call	1099	* made to players inventory. If set, avoiding the call
964	* to save cpu time.	1100	* to save cpu time.
965	*/	1101	*/
966	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))
967	otmp->update_stats ();	1103	otmp->update_stats ();
968
969	if (above)
970	above->below = below;
971	else
972	env->inv = below;
973
974	if (below)
975	below->above = above;
976
977	/* we set up values so that it could be inserted into
978	* the map, but we don't actually do that - it is up
979	* to the caller to decide what we want to do.
980	*/
981	x = env->x, y = env->y;
982	map = env->map;
983	above = 0, below = 0;
984	env = 0;
985	}	1104	}
986	else if (map)	1105	else if (map)
987	{	1106	{
988	if (type == PLAYER)	1107	if (type == PLAYER)
989	{	1108	{
…		…
1027	if (map->in_memory == MAP_SAVING)	1146	if (map->in_memory == MAP_SAVING)
1028	return;	1147	return;
1029		1148
1030	int check_walk_off = !flag [FLAG_NO_APPLY];	1149	int check_walk_off = !flag [FLAG_NO_APPLY];
1031		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
1032	for (tmp = ms.bot; tmp; tmp = tmp->above)	1164	for (tmp = ms.bot; tmp; tmp = tmp->above)
1033	{	1165	{
1034	/* 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
1035	* being removed.	1167	* being removed.
1036	*/	1168	*/
1037
1038	if (tmp->type == PLAYER && tmp != this)
1039	{
1040	/* If a container that the player is currently using somehow gets
1041	* removed (most likely destroyed), update the player view
1042	* appropriately.
1043	*/
1044	if (tmp->container == this)
1045	{
1046	flag [FLAG_APPLIED] = 0;
1047	tmp->container = 0;
1048	}
1049
1050	if (tmp->contr->ns)
1051	tmp->contr->ns->floorbox_update ();
1052	}
1053		1169
1054	/* See if object moving off should effect something */	1170	/* See if object moving off should effect something */
1055	if (check_walk_off	1171	if (check_walk_off
1056	&& ((move_type & tmp->move_off)	1172	&& ((move_type & tmp->move_off)
1057	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))	1173	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
…		…
1060		1176
1061	if (destroyed ())	1177	if (destroyed ())
1062	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 ());
1063	}	1179	}
1064		1180
1065	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1066	//TODO: why is this horrible hacka fix? get rid of this code=bug! (schmorp)
1067	if (tmp->above == tmp)
1068	tmp->above = 0;
1069
1070	last = tmp;	1181	last = tmp;
1071	}	1182	}
1072		1183
1073	/* last == NULL if there are no objects on this space */	1184	/* last == NULL if there are no objects on this space */
1074	//TODO: this makes little sense, why only update the topmost object?	1185	//TODO: this makes little sense, why only update the topmost object?
…		…
1094	merge_ob (object *op, object *top)	1205	merge_ob (object *op, object *top)
1095	{	1206	{
1096	if (!op->nrof)	1207	if (!op->nrof)
1097	return 0;	1208	return 0;
1098		1209
1099	if (top)	1210	if (!top)
1100	for (top = op; top && top->above; top = top->above)	1211	for (top = op; top && top->above; top = top->above)
1101	;	1212	;
1102		1213
1103	for (; top; top = top->below)	1214	for (; top; top = top->below)
1104	{
1105	if (top == op)
1106	continue;
1107
1108	if (object::can_merge (op, top))	1215	if (object::can_merge (op, top))
1109	{	1216	{
1110	top->nrof += op->nrof;	1217	top->nrof += op->nrof;
1111		1218
1112	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/	1219	if (object *pl = top->visible_to ())
1113	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
1114	op->destroy ();	1225	op->destroy (1);
		1226
1115	return top;	1227	return top;
1116	}	1228	}
1117	}
1118		1229
1119	return 0;	1230	return 0;
1120	}	1231	}
1121		1232
1122	void	1233	void
…		…
1125	if (more)	1236	if (more)
1126	return;	1237	return;
1127		1238
1128	object *prev = this;	1239	object *prev = this;
1129		1240
1130	for (archetype *at = arch->more; at; at = at->more)	1241	for (archetype *at = (archetype *)arch->more; at; at = (archetype *)at->more)
1131	{	1242	{
1132	object *op = arch_to_object (at);	1243	object *op = arch_to_object (at);
1133		1244
1134	op->name = name;	1245	op->name = name;
1135	op->name_pl = name_pl;	1246	op->name_pl = name_pl;
…		…
1149	object *	1260	object *
1150	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)
1151	{	1262	{
1152	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)	1263	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1153	{	1264	{
1154	tmp->x = x + tmp->arch->clone.x;	1265	tmp->x = x + tmp->arch->x;
1155	tmp->y = y + tmp->arch->clone.y;	1266	tmp->y = y + tmp->arch->y;
1156	}	1267	}
1157		1268
1158	return insert_ob_in_map (op, m, originator, flag);	1269	return insert_ob_in_map (op, m, originator, flag);
1159	}	1270	}
1160		1271
…		…
1181	object *	1292	object *
1182	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)
1183	{	1294	{
1184	assert (!op->flag [FLAG_FREED]);	1295	assert (!op->flag [FLAG_FREED]);
1185		1296
1186	object *tmp, *top, *floor = NULL;
1187
1188	op->remove ();	1297	op->remove ();
1189
1190	#if 0
1191	if (!m->active != !op->active)
1192	if (m->active)
1193	op->activate_recursive ();
1194	else
1195	op->deactivate_recursive ();
1196	#endif
1197
1198	if (out_of_map (m, op->x, op->y))
1199	{
1200	LOG (llevError, "Trying to insert object outside the map.\n%s\n", op->debug_desc ());
1201	#ifdef MANY_CORES
1202	/* Better to catch this here, as otherwise the next use of this object
1203	* is likely to cause a crash. Better to find out where it is getting
1204	* improperly inserted.
1205	*/
1206	abort ();
1207	#endif
1208	return op;
1209	}
1210
1211	if (object *more = op->more)
1212	{
1213	if (!insert_ob_in_map (more, m, originator, flag))
1214	{
1215	if (!op->head)
1216	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1217
1218	return 0;
1219	}
1220	}
1221
1222	CLEAR_FLAG (op, FLAG_REMOVED);
1223		1298
1224	/* Ideally, the caller figures this out. However, it complicates a lot	1299	/* Ideally, the caller figures this out. However, it complicates a lot
1225	* 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
1226	* need extra work	1301	* need extra work
1227	*/	1302	*/
1228	if (!xy_normalise (m, op->x, op->y))	1303	if (!xy_normalise (m, op->x, op->y))
		1304	{
		1305	op->destroy (1);
1229	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);
1230		1314
1231	op->map = m;	1315	op->map = m;
1232	mapspace &ms = op->ms ();	1316	mapspace &ms = op->ms ();
1233		1317
1234	/* this has to be done after we translate the coordinates.	1318	/* this has to be done after we translate the coordinates.
1235	*/	1319	*/
1236	if (op->nrof && !(flag & INS_NO_MERGE))	1320	if (op->nrof && !(flag & INS_NO_MERGE))
1237	for (tmp = ms.bot; tmp; tmp = tmp->above)	1321	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1238	if (object::can_merge (op, tmp))	1322	if (object::can_merge (op, tmp))
1239	{	1323	{
		1324	// TODO: we atcually want to update tmp, not op,
		1325	// but some caller surely breaks when we return tmp
		1326	// from here :/
1240	op->nrof += tmp->nrof;	1327	op->nrof += tmp->nrof;
1241	tmp->destroy ();	1328	tmp->destroy (1);
1242	}	1329	}
1243		1330
1244	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 */
1245	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1332	CLEAR_FLAG (op, FLAG_INV_LOCKED);
1246		1333
…		…
1266	/* since *below* originator, no need to update top */	1353	/* since *below* originator, no need to update top */
1267	originator->below = op;	1354	originator->below = op;
1268	}	1355	}
1269	else	1356	else
1270	{	1357	{
		1358	object *top, *floor = NULL;
		1359
1271	top = ms.bot;	1360	top = ms.bot;
1272		1361
1273	/* If there are other objects, then */	1362	/* If there are other objects, then */
1274	if ((!(flag & INS_MAP_LOAD)) && top)	1363	if (top)
1275	{	1364	{
1276	object *last = 0;	1365	object *last = 0;
1277		1366
1278	/*	1367	/*
1279	* 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.
…		…
1332	if (last && last->below && last != floor)	1421	if (last && last->below && last != floor)
1333	top = last->below;	1422	top = last->below;
1334	}	1423	}
1335	} /* If objects on this space */	1424	} /* If objects on this space */
1336		1425
1337	if (flag & INS_MAP_LOAD)
1338	top = ms.top;
1339
1340	if (flag & INS_ABOVE_FLOOR_ONLY)	1426	if (flag & INS_ABOVE_FLOOR_ONLY)
1341	top = floor;	1427	top = floor;
1342		1428
1343	/* 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.
1344	*/	1430	*/
…		…
1376	op->map->touch ();	1462	op->map->touch ();
1377	}	1463	}
1378		1464
1379	op->map->dirty = true;	1465	op->map->dirty = true;
1380		1466
1381	/* If we have a floor, we know the player, if any, will be above
1382	* it, so save a few ticks and start from there.
1383	*/
1384	if (!(flag & INS_MAP_LOAD))
1385	if (object *pl = ms.player ())	1467	if (object *pl = ms.player ())
1386	if (pl->contr->ns)	1468	//TODO: the floorbox prev/next might need updating
1387	pl->contr->ns->floorbox_update ();	1469	esrv_send_item (pl, op);
1388		1470
1389	/* If this object glows, it may affect lighting conditions that are	1471	/* If this object glows, it may affect lighting conditions that are
1390	* 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
1391	* 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
1392	* on the map will get recalculated. The players could very well	1474	* on the map will get recalculated. The players could very well
…		…
1411	* blocked() and wall() work properly), and these flags are updated by	1493	* blocked() and wall() work properly), and these flags are updated by
1412	* update_object().	1494	* update_object().
1413	*/	1495	*/
1414		1496
1415	/* 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 */
1416	if (!(flag & INS_NO_WALK_ON) && !op->head)	1498	if (!(flag & INS_NO_WALK_ON) && op->head_ () == op)
1417	{	1499	{
1418	if (check_move_on (op, originator))	1500	if (check_move_on (op, originator))
1419	return 0;	1501	return 0;
1420		1502
1421	/* 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
1422	* walk on's.	1504	* walk on's.
1423	*/	1505	*/
1424	for (tmp = op->more; tmp != NULL; tmp = tmp->more)	1506	for (object *tmp = op->more; tmp; tmp = tmp->more)
1425	if (check_move_on (tmp, originator))	1507	if (check_move_on (tmp, originator))
1426	return 0;	1508	return 0;
1427	}	1509	}
1428		1510
1429	return op;	1511	return op;
…		…
1434	* 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.
1435	*/	1517	*/
1436	void	1518	void
1437	replace_insert_ob_in_map (const char *arch_string, object *op)	1519	replace_insert_ob_in_map (const char *arch_string, object *op)
1438	{	1520	{
1439	object *tmp, *tmp1;
1440
1441	/* first search for itself and remove any old instances */	1521	/* first search for itself and remove any old instances */
1442		1522
1443	for (tmp = op->ms ().bot; tmp; tmp = tmp->above)	1523	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1444	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */	1524	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */
1445	tmp->destroy ();	1525	tmp->destroy (1);
1446		1526
1447	tmp1 = arch_to_object (archetype::find (arch_string));	1527	object *tmp = arch_to_object (archetype::find (arch_string));
1448		1528
1449	tmp1->x = op->x;	1529	tmp->x = op->x;
1450	tmp1->y = op->y;	1530	tmp->y = op->y;
		1531
1451	insert_ob_in_map (tmp1, op->map, op, 0);	1532	insert_ob_in_map (tmp, op->map, op, 0);
1452	}	1533	}
1453		1534
1454	object *	1535	object *
1455	object::insert_at (object *where, object *originator, int flags)	1536	object::insert_at (object *where, object *originator, int flags)
1456	{	1537	{
		1538	if (where->env)
		1539	return where->env->insert (this);
		1540	else
1457	return where->map->insert (this, where->x, where->y, originator, flags);	1541	return where->map->insert (this, where->x, where->y, originator, flags);
1458	}	1542	}
1459		1543
1460	/*	1544	/*
1461	* get_split_ob(ob,nr) splits up ob into two parts. The part which
1462	* is returned contains nr objects, and the remaining parts contains
1463	* the rest (or is removed and freed if that number is 0).
1464	* On failure, NULL is returned, and the reason put into the
1465	* global static errmsg array.
1466	*/
1467	object *
1468	get_split_ob (object *orig_ob, uint32 nr)
1469	{
1470	object *newob;
1471	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1472
1473	if (orig_ob->nrof < nr)
1474	{
1475	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1476	return NULL;
1477	}
1478
1479	newob = object_create_clone (orig_ob);
1480
1481	if ((orig_ob->nrof -= nr) < 1)
1482	orig_ob->destroy (1);
1483	else if (!is_removed)
1484	{
1485	if (orig_ob->env != NULL)
1486	sub_weight (orig_ob->env, orig_ob->weight * nr);
1487	if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)
1488	{
1489	strcpy (errmsg, "Tried to split object whose map is not in memory.");
1490	LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n");
1491	return NULL;
1492	}
1493	}
1494
1495	newob->nrof = nr;
1496
1497	return newob;
1498	}
1499
1500	/*
1501	* decrease_ob_nr(object, number) decreases a specified number from	1545	* decrease(object, number) decreases a specified number from
1502	* 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
1503	* is subsequently removed and freed.	1547	* is subsequently removed and freed.
1504	*	1548	*
1505	* 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
1506	*/	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	*/
1507	object *	1583	object *
1508	decrease_ob_nr (object *op, uint32 i)	1584	object::split (sint32 nr)
1509	{	1585	{
1510	object *tmp;	1586	int have = number_of ();
1511		1587
1512	if (i == 0) /* objects with op->nrof require this check */	1588	if (have < nr)
1513	return op;	1589	return 0;
1514		1590	else if (have == nr)
1515	if (i > op->nrof)
1516	i = op->nrof;
1517
1518	if (QUERY_FLAG (op, FLAG_REMOVED))
1519	op->nrof -= i;
1520	else if (op->env)
1521	{	1591	{
1522	/* is this object in the players inventory, or sub container
1523	* therein?
1524	*/
1525	tmp = op->in_player ();
1526	/* nope. Is this a container the player has opened?
1527	* If so, set tmp to that player.
1528	* IMO, searching through all the players will mostly
1529	* likely be quicker than following op->env to the map,
1530	* and then searching the map for a player.
1531	*/
1532	if (!tmp)
1533	for_all_players (pl)
1534	if (pl->ob->container == op->env)
1535	{
1536	tmp = pl->ob;
1537	break;
1538	}
1539
1540	if (i < op->nrof)
1541	{
1542	sub_weight (op->env, op->weight * i);
1543	op->nrof -= i;
1544	if (tmp)
1545	esrv_send_item (tmp, op);
1546	}
1547	else
1548	{
1549	op->remove ();	1592	remove ();
1550	op->nrof = 0;	1593	return this;
1551	if (tmp)
1552	esrv_del_item (tmp->contr, op->count);
1553	}
1554	}	1594	}
1555	else	1595	else
1556	{	1596	{
1557	object *above = op->above;	1597	decrease (nr);
1558		1598
1559	if (i < op->nrof)	1599	object *op = object_create_clone (this);
1560	op->nrof -= i;	1600	op->nrof = nr;
1561	else
1562	{
1563	op->remove ();
1564	op->nrof = 0;
1565	}
1566
1567	/* Since we just removed op, op->above is null */
1568	for (tmp = above; tmp; tmp = tmp->above)
1569	if (tmp->type == PLAYER)
1570	{
1571	if (op->nrof)
1572	esrv_send_item (tmp, op);
1573	else
1574	esrv_del_item (tmp->contr, op->count);
1575	}
1576	}
1577
1578	if (op->nrof)
1579	return op;	1601	return op;
1580	else
1581	{
1582	op->destroy ();
1583	return 0;
1584	}
1585	}
1586
1587	/*
1588	* add_weight(object, weight) adds the specified weight to an object,
1589	* and also updates how much the environment(s) is/are carrying.
1590	*/
1591	void
1592	add_weight (object *op, signed long weight)
1593	{
1594	while (op != NULL)
1595	{
1596	if (op->type == CONTAINER)
1597	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1598
1599	op->carrying += weight;
1600	op = op->env;
1601	}	1602	}
1602	}	1603	}
1603		1604
1604	object *	1605	object *
1605	insert_ob_in_ob (object *op, object *where)	1606	insert_ob_in_ob (object *op, object *where)
…		…
1610	LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);	1611	LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
1611	free (dump);	1612	free (dump);
1612	return op;	1613	return op;
1613	}	1614	}
1614		1615
1615	if (where->head)	1616	if (where->head_ () != where)
1616	{	1617	{
1617	LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n");	1618	LOG (llevError | logBacktrace, "Warning: Tried to insert object into wrong part of multipart object.\n");
1618	where = where->head;	1619	where = where->head;
1619	}	1620	}
1620		1621
1621	return where->insert (op);	1622	return where->insert (op);
1622	}	1623	}
…		…
1630	* be != op, if items are merged. -Tero	1631	* be != op, if items are merged. -Tero
1631	*/	1632	*/
1632	object *	1633	object *
1633	object::insert (object *op)	1634	object::insert (object *op)
1634	{	1635	{
1635	object *tmp, *otmp;
1636
1637	if (!QUERY_FLAG (op, FLAG_REMOVED))
1638	op->remove ();
1639
1640	if (op->more)	1636	if (op->more)
1641	{	1637	{
1642	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);
1643	return op;	1639	return op;
1644	}	1640	}
1645		1641
1646	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1642	op->remove ();
1647	CLEAR_FLAG (op, FLAG_REMOVED);	1643
		1644	op->flag [FLAG_OBJ_ORIGINAL] = 0;
		1645
1648	if (op->nrof)	1646	if (op->nrof)
1649	{
1650	for (tmp = inv; tmp != NULL; tmp = tmp->below)	1647	for (object *tmp = inv; tmp; tmp = tmp->below)
1651	if (object::can_merge (tmp, op))	1648	if (object::can_merge (tmp, op))
1652	{	1649	{
1653	/* return the original object and remove inserted object	1650	/* return the original object and remove inserted object
1654	(client needs the original object) */	1651	(client needs the original object) */
1655	tmp->nrof += op->nrof;	1652	tmp->nrof += op->nrof;
1656	/* Weight handling gets pretty funky. Since we are adding to	1653
1657	* tmp->nrof, we need to increase the weight.	1654	if (object *pl = tmp->visible_to ())
1658	*/	1655	esrv_update_item (UPD_NROF, pl, tmp);
		1656
1659	add_weight (this, op->weight * op->nrof);	1657	adjust_weight (this, op->total_weight ());
1660	SET_FLAG (op, FLAG_REMOVED);	1658
1661	op->destroy (); /* free the inserted object */	1659	op->destroy (1);
1662	op = tmp;	1660	op = tmp;
1663	op->remove (); /* and fix old object's links */	1661	goto inserted;
1664	CLEAR_FLAG (op, FLAG_REMOVED);
1665	break;
1666	}	1662	}
1667		1663
1668	/* I assume combined objects have no inventory	1664	op->owner = 0; // it's his/hers now. period.
1669	* We add the weight - this object could have just been removed
1670	* (if it was possible to merge). calling remove_ob will subtract
1671	* the weight, so we need to add it in again, since we actually do
1672	* the linking below
1673	*/
1674	add_weight (this, op->weight * op->nrof);
1675	}
1676	else
1677	add_weight (this, (op->weight + op->carrying));
1678
1679	otmp = this->in_player ();
1680	if (otmp && otmp->contr)
1681	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1682	otmp->update_stats ();
1683
1684	op->map = 0;	1665	op->map = 0;
1685	op->env = this;	1666	op->x = 0;
		1667	op->y = 0;
		1668
1686	op->above = 0;	1669	op->above = 0;
1687	op->below = 0;	1670	op->below = inv;
1688	op->x = 0, op->y = 0;	1671	op->env = this;
1689		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:
1690	/* 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 */
1691	if ((op->glow_radius != 0) && map)	1687	if (op->glow_radius && map && map->darkness)
1692	{
1693	#ifdef DEBUG_LIGHTS
1694	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1695	#endif /* DEBUG_LIGHTS */
1696	if (map->darkness)
1697	update_all_los (map, x, y);	1688	update_all_los (map, x, y);
1698	}
1699		1689
1700	/* Client has no idea of ordering so lets not bother ordering it here.	1690	// if this is a player's inventory, update stats
1701	* It sure simplifies this function...	1691	if (type == PLAYER && !flag [FLAG_NO_FIX_PLAYER])
1702	*/	1692	update_stats ();
1703	if (!inv)
1704	inv = op;
1705	else
1706	{
1707	op->below = inv;
1708	op->below->above = op;
1709	inv = op;
1710	}
1711		1693
1712	INVOKE_OBJECT (INSERT, this);	1694	INVOKE_OBJECT (INSERT, this);
1713		1695
1714	return op;	1696	return op;
1715	}	1697	}
…		…
1930	* activate recursively a flag on an object inventory	1912	* activate recursively a flag on an object inventory
1931	*/	1913	*/
1932	void	1914	void
1933	flag_inv (object *op, int flag)	1915	flag_inv (object *op, int flag)
1934	{	1916	{
1935	if (op->inv)
1936	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)	1917	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1937	{	1918	{
1938	SET_FLAG (tmp, flag);	1919	SET_FLAG (tmp, flag);
1939	flag_inv (tmp, flag);	1920	flag_inv (tmp, flag);
1940	}	1921	}
1941	}	1922	}
1942		1923
1943	/*	1924	/*
1944	* deactivate recursively a flag on an object inventory	1925	* deactivate recursively a flag on an object inventory
1945	*/	1926	*/
1946	void	1927	void
1947	unflag_inv (object *op, int flag)	1928	unflag_inv (object *op, int flag)
1948	{	1929	{
1949	if (op->inv)
1950	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)	1930	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1951	{	1931	{
1952	CLEAR_FLAG (tmp, flag);	1932	CLEAR_FLAG (tmp, flag);
1953	unflag_inv (tmp, flag);	1933	unflag_inv (tmp, flag);
1954	}	1934	}
1955	}
1956
1957	/*
1958	* set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in
1959	* all it's inventory (recursively).
1960	* If checksums are used, a player will get set_cheat called for
1961	* him/her-self and all object carried by a call to this function.
1962	*/
1963	void
1964	set_cheat (object *op)
1965	{
1966	SET_FLAG (op, FLAG_WAS_WIZ);
1967	flag_inv (op, FLAG_WAS_WIZ);
1968	}	1935	}
1969		1936
1970	/*	1937	/*
1971	* 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
1972	* 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
…		…
1974	* to search (see the freearr_x/y[] definition).	1941	* to search (see the freearr_x/y[] definition).
1975	* It returns a random choice among the alternatives found.	1942	* It returns a random choice among the alternatives found.
1976	* 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
1977	* does all 4 immediate directions). This returns the index into the	1944	* does all 4 immediate directions). This returns the index into the
1978	* 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)
1979	* Note - this only checks to see if there is space for the head of the
1980	* object - if it is a multispace object, this should be called for all
1981	* pieces.
1982	* Note2: This function does correctly handle tiled maps, but does not	1946	* Note: This function does correctly handle tiled maps, but does not
1983	* inform the caller. However, insert_ob_in_map will update as	1947	* inform the caller. However, insert_ob_in_map will update as
1984	* 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.
1985	* 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
1986	* 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
1987	* 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
…		…
1989	* customized, changed states, etc.	1953	* customized, changed states, etc.
1990	*/	1954	*/
1991	int	1955	int
1992	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)
1993	{	1957	{
		1958	int altern[SIZEOFFREE];
1994	int index = 0, flag;	1959	int index = 0, flag;
1995	int altern[SIZEOFFREE];
1996		1960
1997	for (int i = start; i < stop; i++)	1961	for (int i = start; i < stop; i++)
1998	{	1962	{
1999	flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]);	1963	mapxy pos (m, x, y); pos.move (i);
2000	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	{
2001	altern [index++] = i;	1979	altern [index++] = i;
		1980	continue;
		1981	}
2002		1982
2003	/* 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.
2004	* 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.
2005	* 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 -
2006	* 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
2007	* 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
2008	* to only the spaces immediately surrounding the target area, and	1988	* to only the spaces immediately surrounding the target area, and
2009	* won't look 2 spaces south of the target space.	1989	* won't look 2 spaces south of the target space.
2010	*/	1990	*/
2011	else if ((flag & P_NO_PASS) && maxfree[i] < stop)	1991	if (ms.move_block == MOVE_ALL && maxfree[i] < stop)
		1992	{
2012	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;
2013	}	2007	}
2014		2008
2015	if (!index)	2009	if (!index)
2016	return -1;	2010	return -1;
2017		2011
…		…
2026	*/	2020	*/
2027	int	2021	int
2028	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)
2029	{	2023	{
2030	for (int i = 0; i < SIZEOFFREE; i++)	2024	for (int i = 0; i < SIZEOFFREE; i++)
2031	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]))
2032	return i;	2026	return i;
2033		2027
2034	return -1;	2028	return -1;
2035	}	2029	}
2036		2030
…		…
2090	object *tmp;	2084	object *tmp;
2091	maptile *mp;	2085	maptile *mp;
2092		2086
2093	MoveType blocked, move_type;	2087	MoveType blocked, move_type;
2094		2088
2095	if (exclude && exclude->head)	2089	if (exclude && exclude->head_ () != exclude)
2096	{	2090	{
2097	exclude = exclude->head;	2091	exclude = exclude->head;
2098	move_type = exclude->move_type;	2092	move_type = exclude->move_type;
2099	}	2093	}
2100	else	2094	else
…		…
2123	max = maxfree[i];	2117	max = maxfree[i];
2124	else if (mflags & P_IS_ALIVE)	2118	else if (mflags & P_IS_ALIVE)
2125	{	2119	{
2126	for (tmp = ms.bot; tmp; tmp = tmp->above)	2120	for (tmp = ms.bot; tmp; tmp = tmp->above)
2127	if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)	2121	if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)
2128	&& (tmp != exclude || (tmp->head && tmp->head != exclude)))	2122	&& (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2129	break;	2123	break;
2130		2124
2131	if (tmp)	2125	if (tmp)
2132	return freedir[i];	2126	return freedir[i];
2133	}	2127	}
…		…
2313	* 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
2314	* core dumps if they do.	2308	* core dumps if they do.
2315	*	2309	*
2316	* 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)
2317	*/	2311	*/
2318
2319	int	2312	int
2320	can_pick (const object *who, const object *item)	2313	can_pick (const object *who, const object *item)
2321	{	2314	{
2322	return /*QUERY_FLAG(who,FLAG_WIZ)|| */	2315	return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2323	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&	2316	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
…		…
2328	* create clone from object to another	2321	* create clone from object to another
2329	*/	2322	*/
2330	object *	2323	object *
2331	object_create_clone (object *asrc)	2324	object_create_clone (object *asrc)
2332	{	2325	{
2333	object *dst = 0, *tmp, *src, *part, *prev, *item;	2326	object *dst = 0, *tmp, *src, *prev, *item;
2334		2327
2335	if (!asrc)	2328	if (!asrc)
2336	return 0;	2329	return 0;
2337		2330
2338	src = asrc;
2339	if (src->head)
2340	src = src->head;	2331	src = asrc->head_ ();
2341		2332
2342	prev = 0;	2333	prev = 0;
2343	for (part = src; part; part = part->more)	2334	for (object *part = src; part; part = part->more)
2344	{	2335	{
2345	tmp = part->clone ();	2336	tmp = part->clone ();
2346	tmp->x -= src->x;	2337	tmp->x -= src->x;
2347	tmp->y -= src->y;	2338	tmp->y -= src->y;
2348		2339
…		…
2461	/* Basically, if the archetype has this key set,	2452	/* Basically, if the archetype has this key set,
2462	* we need to store the null value so when we save	2453	* we need to store the null value so when we save
2463	* it, we save the empty value so that when we load,	2454	* it, we save the empty value so that when we load,
2464	* we get this value back again.	2455	* we get this value back again.
2465	*/	2456	*/
2466	if (get_ob_key_link (&op->arch->clone, canonical_key))	2457	if (get_ob_key_link (op->arch, canonical_key))
2467	field->value = 0;	2458	field->value = 0;
2468	else	2459	else
2469	{	2460	{
2470	if (last)	2461	if (last)
2471	last->next = field->next;	2462	last->next = field->next;
…		…
2540	}	2531	}
2541	else	2532	else
2542	item = item->env;	2533	item = item->env;
2543	}	2534	}
2544		2535
2545
2546	const char *	2536	const char *
2547	object::flag_desc (char *desc, int len) const	2537	object::flag_desc (char *desc, int len) const
2548	{	2538	{
2549	char *p = desc;	2539	char *p = desc;
2550	bool first = true;	2540	bool first = true;
…		…
2577	{	2567	{
2578	char flagdesc[512];	2568	char flagdesc[512];
2579	char info2[256 * 4];	2569	char info2[256 * 4];
2580	char *p = info;	2570	char *p = info;
2581		2571
2582	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}",
2583	count, uuid.seq,	2573	count,
		2574	uuid.c_str (),
2584	&name,	2575	&name,
2585	title ? "\",title:\"" : "",	2576	title ? "\",title:\"" : "",
2586	title ? (const char *)title : "",	2577	title ? (const char *)title : "",
2587	flag_desc (flagdesc, 512), type);	2578	flag_desc (flagdesc, 512), type);
2588		2579
2589	if (env)	2580	if (!flag[FLAG_REMOVED] && env)
2590	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2581	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2591		2582
2592	if (map)	2583	if (map)
2593	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);
2594		2585
…		…
2612	}	2603	}
2613		2604
2614	const materialtype_t *	2605	const materialtype_t *
2615	object::dominant_material () const	2606	object::dominant_material () const
2616	{	2607	{
2617	if (materialtype_t *mat = name_to_material (materialname))	2608	if (materialtype_t *mt = name_to_material (materialname))
2618	return mat;	2609	return mt;
2619		2610
2620	// omfg this is slow, this has to be temporary :)
2621	shstr unknown ("unknown");
2622
2623	return name_to_material (unknown);	2611	return name_to_material (shstr_unknown);
2624	}	2612	}
2625		2613
2626	void	2614	void
2627	object::open_container (object *new_container)	2615	object::open_container (object *new_container)
2628	{	2616	{
…		…
2639	if (object *closer = old_container->inv)	2627	if (object *closer = old_container->inv)
2640	if (closer->type == CLOSE_CON)	2628	if (closer->type == CLOSE_CON)
2641	closer->destroy ();	2629	closer->destroy ();
2642	#endif	2630	#endif
2643		2631
2644	old_container->flag [FLAG_APPLIED] = 0;	2632	old_container->flag [FLAG_APPLIED] = false;
2645	container = 0;	2633	container = 0;
2646		2634
2647	esrv_update_item (UPD_FLAGS, this, old_container);	2635	esrv_update_item (UPD_FLAGS, this, old_container);
2648	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"));
2649	}	2638	}
2650		2639
2651	if (new_container)	2640	if (new_container)
2652	{	2641	{
2653	if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))	2642	if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))
…		…
2664	}	2653	}
2665	#endif	2654	#endif
2666		2655
2667	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));
2668		2657
2669	new_container->flag [FLAG_APPLIED] = 1;	2658	new_container->flag [FLAG_APPLIED] = true;
2670	container = new_container;	2659	container = new_container;
2671		2660
2672	esrv_update_item (UPD_FLAGS, this, new_container);	2661	esrv_update_item (UPD_FLAGS, this, new_container);
2673	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)
2674	}	2709	{
		2710	if (object *pl = in_player ())
		2711	pl->contr->play_sound (sound);
		2712	}
		2713	else
		2714	map->play_sound (sound, x, y);
2675	}	2715	}
2676		2716
2677

Diff Legend

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