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.143 by root, Tue May 1 05:48:20 2007 UTC vs.
Revision 1.221 by root, Thu Apr 24 12:06:01 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 (client_visible () && !flag [FLAG_REMOVED])
		340	{
		341	// see if we are in a container of sorts
		342	if (env)
		343	{
		344	// the player inventory itself is always visible
		345	if (env->type == PLAYER)
		346	return env;
		347
		348	// else a player could have our env open
		349	object *envest = env->outer_env ();
		350
		351	// the player itself is always on a map, so we will find him here
		352	// even if our inv is in a player.
		353	if (envest->is_on_map ())
		354	if (object *pl = envest->ms ().player ())
		355	if (pl->container == env)
		356	return pl;
		357	}
		358	else
		359	{
		360	// maybe there is a player standing on the same mapspace
		361	// this will catch the case where "this" is a player
		362	if (object *pl = ms ().player ())
		363	if (!pl->container || this == pl->container)
		364	return pl;
		365	}
		366	}
		367
		368	return 0;
		369	}
		370
		371	// adjust weight per container type ("of holding")
		372	static sint32
		373	weight_adjust (object *op, sint32 weight)
		374	{
		375	return op->type == CONTAINER
		376	? lerp (weight, 0, 100, 0, 100 - op->stats.Str)
		377	: weight;
		378	}
		379
318	/*	380	/*
		381	* adjust_weight(object, weight) adds the specified weight to an object,
		382	* and also updates how much the environment(s) is/are carrying.
		383	*/
		384	static void
		385	adjust_weight (object *op, sint32 weight)
		386	{
		387	while (op)
		388	{
		389	weight = weight_adjust (op, weight);
		390
		391	if (!weight)
		392	return;
		393
		394	op->carrying += weight;
		395
		396	if (object *pl = op->visible_to ())
		397	if (pl != op) // player is handled lazily
		398	esrv_update_item (UPD_WEIGHT, pl, op);
		399
		400	op = op->env;
		401	}
		402	}
		403
		404	/*
319	* sum_weight() is a recursive function which calculates the weight	405	* this is a recursive function which calculates the weight
320	* an object is carrying. It goes through in figures out how much	406	* an object is carrying. It goes through op and figures out how much
321	* containers are carrying, and sums it up.	407	* containers are carrying, and sums it up.
322	*/	408	*/
323	long	409	void
324	sum_weight (object *op)	410	object::update_weight ()
325	{	411	{
326	long sum;	412	sint32 sum = 0;
327	object *inv;
328		413
329	for (sum = 0, inv = op->inv; inv; inv = inv->below)	414	for (object *op = inv; op; op = op->below)
330	{	415	{
331	if (inv->inv)	416	if (op->inv)
332	sum_weight (inv);	417	op->update_weight ();
333		418
334	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);	419	sum += op->total_weight ();
		420	}
		421
		422	sum = weight_adjust (this, sum);
		423
		424	if (sum != carrying)
335	}	425	{
336
337	if (op->type == CONTAINER && op->stats.Str)
338	sum = (sum * (100 - op->stats.Str)) / 100;
339
340	if (op->carrying != sum)
341	op->carrying = sum;	426	carrying = sum;
342		427
343	return sum;	428	if (object *pl = visible_to ())
		429	if (pl != this) // player is handled lazily
		430	esrv_update_item (UPD_WEIGHT, pl, this);
		431	}
344	}	432	}
345		433
346	/**	434	/*
347	* Return the outermost environment object for a given object.	435	* Used by: Server DM commands: dumpbelow, dump. Some error messages.
348	*/
349
350	object *
351	object_get_env_recursive (object *op)
352	{
353	while (op->env != NULL)
354	op = op->env;
355	return op;
356	}
357
358	/*
359	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
360	* Some error messages.
361	* The result of the dump is stored in the static global errmsg array.
362	*/	436	*/
363	char *	437	char *
364	dump_object (object *op)	438	dump_object (object *op)
365	{	439	{
366	if (!op)	440	if (!op)
…		…
374	/*	448	/*
375	* get_nearest_part(multi-object, object 2) returns the part of the	449	* get_nearest_part(multi-object, object 2) returns the part of the
376	* multi-object 1 which is closest to the second object.	450	* multi-object 1 which is closest to the second object.
377	* If it's not a multi-object, it is returned.	451	* If it's not a multi-object, it is returned.
378	*/	452	*/
379
380	object *	453	object *
381	get_nearest_part (object *op, const object *pl)	454	get_nearest_part (object *op, const object *pl)
382	{	455	{
383	object *tmp, *closest;	456	object *tmp, *closest;
384	int last_dist, i;	457	int last_dist, i;
385		458
386	if (op->more == NULL)	459	if (!op->more)
387	return op;	460	return op;
		461
388	for (last_dist = distance (op, pl), closest = op, tmp = op->more; tmp != NULL; tmp = tmp->more)	462	for (last_dist = distance (op, pl), closest = op, tmp = op->more;
		463	tmp;
		464	tmp = tmp->more)
389	if ((i = distance (tmp, pl)) < last_dist)	465	if ((i = distance (tmp, pl)) < last_dist)
390	closest = tmp, last_dist = i;	466	closest = tmp, last_dist = i;
		467
391	return closest;	468	return closest;
392	}	469	}
393		470
394	/*	471	/*
395	* Returns the object which has the count-variable equal to the argument.	472	* Returns the object which has the count-variable equal to the argument.
		473	* VERRRY slow.
396	*/	474	*/
397	object *	475	object *
398	find_object (tag_t i)	476	find_object (tag_t i)
399	{	477	{
400	for_all_objects (op)	478	for_all_objects (op)
…		…
420	break;	498	break;
421		499
422	return op;	500	return op;
423	}	501	}
424		502
425	void
426	free_all_object_data ()
427	{
428	LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);
429	}
430
431	/*	503	/*
432	* Sets the owner and sets the skill and exp pointers to owner's current	504	* Sets the owner and sets the skill and exp pointers to owner's current
433	* skill and experience objects.	505	* skill and experience objects.
		506	* ACTUALLY NO! investigate! TODO
434	*/	507	*/
435	void	508	void
436	object::set_owner (object *owner)	509	object::set_owner (object *owner)
437	{	510	{
		511	// allow objects which own objects
438	if (!owner)	512	if (owner)
439	return;
440
441	/* next line added to allow objects which own objects */
442	/* Add a check for ownercounts in here, as I got into an endless loop
443	* with the fireball owning a poison cloud which then owned the
444	* fireball. I believe that was caused by one of the objects getting
445	* freed and then another object replacing it. Since the ownercounts
446	* didn't match, this check is valid and I believe that cause is valid.
447	*/
448	while (owner->owner)	513	while (owner->owner)
449	owner = owner->owner;	514	owner = owner->owner;
		515
		516	if (flag [FLAG_FREED])
		517	{
		518	LOG (llevError | logBacktrace, "tried to set owner of %s to %s\n", debug_desc (), owner->debug_desc ());
		519	return;
		520	}
450		521
451	this->owner = owner;	522	this->owner = owner;
		523	}
		524
		525	int
		526	object::slottype () const
		527	{
		528	if (type == SKILL)
		529	{
		530	if (IS_COMBAT_SKILL (subtype)) return slot_combat;
		531	if (IS_RANGED_SKILL (subtype)) return slot_ranged;
		532	}
		533	else
		534	{
		535	if (slot [body_combat].info) return slot_combat;
		536	if (slot [body_range ].info) return slot_ranged;
		537	}
		538
		539	return slot_none;
		540	}
		541
		542	bool
		543	object::change_weapon (object *ob)
		544	{
		545	if (current_weapon == ob)
		546	return true;
		547
		548	if (chosen_skill)
		549	chosen_skill->flag [FLAG_APPLIED] = false;
		550
		551	current_weapon = ob;
		552	chosen_skill = !ob || ob->type == SKILL ? ob : find_skill_by_name (this, ob->skill);
		553
		554	if (chosen_skill)
		555	chosen_skill->flag [FLAG_APPLIED] = true;
		556
		557	update_stats ();
		558
		559	if (ob)
		560	{
		561	// now check wether any body locations became invalid, in which case
		562	// we cannot apply the weapon at the moment.
		563	for (int i = 0; i < NUM_BODY_LOCATIONS; ++i)
		564	if (slot[i].used < 0)
		565	{
		566	current_weapon = chosen_skill = 0;
		567	update_stats ();
		568
		569	new_draw_info_format (NDI_UNIQUE, 0, this,
		570	"You try to balance all your items at once, "
		571	"but the %s is just too much for your body. "
		572	"[You need to unapply some items first.]", &ob->name);
		573	return false;
		574	}
		575
		576	//new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);
		577	}
		578	else
		579	;//new_draw_info_format (NDI_UNIQUE, 0, this, "You unwield your weapons.");
		580
		581	if (ob && !ob->flag [FLAG_APPLIED] && ob->type != SPELL)
		582	{
		583	LOG (llevError | logBacktrace, "%s changed to unapplied weapon %s",
		584	&name, ob->debug_desc ());
		585	return false;
		586	}
		587
		588	return true;
452	}	589	}
453		590
454	/* Zero the key_values on op, decrementing the shared-string	591	/* Zero the key_values on op, decrementing the shared-string
455	* refcounts and freeing the links.	592	* refcounts and freeing the links.
456	*/	593	*/
…		…
520	object::copy_to (object *dst)	657	object::copy_to (object *dst)
521	{	658	{
522	*dst = *this;	659	*dst = *this;
523		660
524	if (speed < 0)	661	if (speed < 0)
525	dst->speed_left = speed_left - rndm ();	662	dst->speed_left -= rndm ();
526		663
527	dst->set_speed (dst->speed);	664	dst->set_speed (dst->speed);
528	}	665	}
529		666
530	void	667	void
531	object::instantiate ()	668	object::instantiate ()
532	{	669	{
533	if (!uuid.seq) // HACK	670	if (!uuid.seq) // HACK
534	uuid = gen_uuid ();	671	uuid = UUID::gen ();
535		672
536	speed_left = -0.1f;	673	speed_left = -0.1f;
537	/* copy the body_info to the body_used - this is only really	674	/* copy the body_info to the body_used - this is only really
538	* need for monsters, but doesn't hurt to do it for everything.	675	* need for monsters, but doesn't hurt to do it for everything.
539	* by doing so, when a monster is created, it has good starting	676	* by doing so, when a monster is created, it has good starting
540	* values for the body_used info, so when items are created	677	* values for the body_used info, so when items are created
541	* for it, they can be properly equipped.	678	* for it, they can be properly equipped.
542	*/	679	*/
543	memcpy (body_used, body_info, sizeof (body_used));	680	for (int i = NUM_BODY_LOCATIONS; i--; )
		681	slot[i].used = slot[i].info;
544		682
545	attachable::instantiate ();	683	attachable::instantiate ();
546	}	684	}
547		685
548	object *	686	object *
…		…
697	static int object_count;	835	static int object_count;
698		836
699	void object::link ()	837	void object::link ()
700	{	838	{
701	assert (!index);//D	839	assert (!index);//D
702	uuid = gen_uuid ();	840	uuid = UUID::gen ();
703	count = ++object_count;	841	count = ++object_count;
704		842
705	refcnt_inc ();	843	refcnt_inc ();
706	objects.insert (this);	844	objects.insert (this);
707	}	845	}
…		…
780	object::destroy_inv (bool drop_to_ground)	918	object::destroy_inv (bool drop_to_ground)
781	{	919	{
782	// need to check first, because the checks below might segfault	920	// need to check first, because the checks below might segfault
783	// as we might be on an invalid mapspace and crossfire code	921	// as we might be on an invalid mapspace and crossfire code
784	// is too buggy to ensure that the inventory is empty.	922	// is too buggy to ensure that the inventory is empty.
785	// corollary: if you create arrows etc. with stuff in tis inventory,	923	// corollary: if you create arrows etc. with stuff in its inventory,
786	// cf will crash below with off-map x and y	924	// cf will crash below with off-map x and y
787	if (!inv)	925	if (!inv)
788	return;	926	return;
789		927
790	/* Only if the space blocks everything do we not process -	928	/* Only if the space blocks everything do we not process -
791	* if some form of movement is allowed, let objects	929	* if some form of movement is allowed, let objects
792	* drop on that space.	930	* drop on that space.
793	*/	931	*/
794	if (!drop_to_ground	932	if (!drop_to_ground
795	|| !map	933	|| !map
796	|| map->in_memory != MAP_IN_MEMORY	934	|| map->in_memory != MAP_ACTIVE
797	|| map->nodrop	935	|| map->nodrop
798	|| ms ().move_block == MOVE_ALL)	936	|| ms ().move_block == MOVE_ALL)
799	{	937	{
800	while (inv)	938	while (inv)
801	{	939	{
802	inv->destroy_inv (drop_to_ground);	940	inv->destroy_inv (false);
803	inv->destroy ();	941	inv->destroy ();
804	}	942	}
805	}	943	}
806	else	944	else
807	{ /* Put objects in inventory onto this space */	945	{ /* Put objects in inventory onto this space */
…		…
813	|| op->flag [FLAG_NO_DROP]	951	|| op->flag [FLAG_NO_DROP]
814	|| op->type == RUNE	952	|| op->type == RUNE
815	|| op->type == TRAP	953	|| op->type == TRAP
816	|| op->flag [FLAG_IS_A_TEMPLATE]	954	|| op->flag [FLAG_IS_A_TEMPLATE]
817	|| op->flag [FLAG_DESTROY_ON_DEATH])	955	|| op->flag [FLAG_DESTROY_ON_DEATH])
818	op->destroy ();	956	op->destroy (true);
819	else	957	else
820	map->insert (op, x, y);	958	map->insert (op, x, y);
821	}	959	}
822	}	960	}
823	}	961	}
…		…
830	}	968	}
831		969
832	void	970	void
833	object::do_destroy ()	971	object::do_destroy ()
834	{	972	{
835	attachable::do_destroy ();
836
837	if (flag [FLAG_IS_LINKED])	973	if (flag [FLAG_IS_LINKED])
838	remove_button_link (this);	974	remove_button_link (this);
839		975
840	if (flag [FLAG_FRIENDLY])	976	if (flag [FLAG_FRIENDLY])
841	remove_friendly_object (this);	977	remove_friendly_object (this);
842		978
843	if (!flag [FLAG_REMOVED])
844	remove ();	979	remove ();
845		980
846	destroy_inv (true);	981	attachable::do_destroy ();
847		982
848	deactivate ();	983	deactivate ();
849	unlink ();	984	unlink ();
850		985
851	flag [FLAG_FREED] = 1;	986	flag [FLAG_FREED] = 1;
…		…
856		991
857	if (!freed_map)	992	if (!freed_map)
858	{	993	{
859	freed_map = new maptile;	994	freed_map = new maptile;
860		995
		996	freed_map->path = "<freed objects map>";
861	freed_map->name = "/internal/freed_objects_map";	997	freed_map->name = "/internal/freed_objects_map";
862	freed_map->width = 3;	998	freed_map->width = 3;
863	freed_map->height = 3;	999	freed_map->height = 3;
		1000	freed_map->nodrop = 1;
864		1001
865	freed_map->alloc ();	1002	freed_map->alloc ();
866	freed_map->in_memory = MAP_IN_MEMORY;	1003	freed_map->in_memory = MAP_ACTIVE;
867	}	1004	}
868		1005
869	map = freed_map;	1006	map = freed_map;
870	x = 1;	1007	x = 1;
871	y = 1;	1008	y = 1;
872	}	1009	}
873		1010
874	head = 0;
875
876	if (more)	1011	if (more)
877	{	1012	{
878	more->destroy ();	1013	more->destroy ();
879	more = 0;	1014	more = 0;
880	}	1015	}
881		1016
		1017	head = 0;
		1018
882	// clear those pointers that likely might have circular references to us	1019	// clear those pointers that likely might cause circular references
883	owner = 0;	1020	owner = 0;
884	enemy = 0;	1021	enemy = 0;
885	attacked_by = 0;	1022	attacked_by = 0;
		1023	current_weapon = 0;
886	}	1024	}
887		1025
888	void	1026	void
889	object::destroy (bool destroy_inventory)	1027	object::destroy (bool destroy_inventory)
890	{	1028	{
891	if (destroyed ())	1029	if (destroyed ())
892	return;	1030	return;
893		1031
		1032	if (!is_head () && !head->destroyed ())
		1033	{
		1034	LOG (llevError | logBacktrace, "tried to destroy the tail of an object");
		1035	head->destroy (destroy_inventory);
		1036	}
		1037
894	if (destroy_inventory)	1038	destroy_inv (!destroy_inventory);
895	destroy_inv (false);	1039
		1040	if (is_head ())
		1041	if (sound_destroy)
		1042	play_sound (sound_destroy);
		1043	else if (flag [FLAG_MONSTER])
		1044	play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism
896		1045
897	attachable::destroy ();	1046	attachable::destroy ();
898	}
899
900	/*
901	* sub_weight() recursively (outwards) subtracts a number from the
902	* weight of an object (and what is carried by it's environment(s)).
903	*/
904	void
905	sub_weight (object *op, signed long weight)
906	{
907	while (op != NULL)
908	{
909	if (op->type == CONTAINER)
910	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
911
912	op->carrying -= weight;
913	op = op->env;
914	}
915	}	1047	}
916		1048
917	/* op->remove ():	1049	/* op->remove ():
918	* This function removes the object op from the linked list of objects	1050	* This function removes the object op from the linked list of objects
919	* which it is currently tied to. When this function is done, the	1051	* which it is currently tied to. When this function is done, the
…		…
925	object::do_remove ()	1057	object::do_remove ()
926	{	1058	{
927	object *tmp, *last = 0;	1059	object *tmp, *last = 0;
928	object *otmp;	1060	object *otmp;
929		1061
930	if (QUERY_FLAG (this, FLAG_REMOVED))	1062	if (flag [FLAG_REMOVED])
931	return;	1063	return;
932		1064
933	SET_FLAG (this, FLAG_REMOVED);
934	INVOKE_OBJECT (REMOVE, this);	1065	INVOKE_OBJECT (REMOVE, this);
		1066
		1067	flag [FLAG_REMOVED] = true;
935		1068
936	if (more)	1069	if (more)
937	more->remove ();	1070	more->remove ();
938		1071
939	/*	1072	/*
940	* In this case, the object to be removed is in someones	1073	* In this case, the object to be removed is in someones
941	* inventory.	1074	* inventory.
942	*/	1075	*/
943	if (env)	1076	if (env)
944	{	1077	{
		1078	flag [FLAG_REMOVED] = false; // hack around the issue of visible_to checking flag_removed
		1079	if (object *pl = visible_to ())
		1080	esrv_del_item (pl->contr, count);
		1081	flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed
		1082
		1083	adjust_weight (env, -total_weight ());
		1084
		1085	*(above ? &above->below : &env->inv) = below;
		1086
945	if (nrof)	1087	if (below)
946	sub_weight (env, weight * nrof);	1088	below->above = above;
947	else	1089
948	sub_weight (env, weight + carrying);	1090	/* we set up values so that it could be inserted into
		1091	* the map, but we don't actually do that - it is up
		1092	* to the caller to decide what we want to do.
		1093	*/
		1094	map = env->map;
		1095	x = env->x;
		1096	y = env->y;
		1097	above = 0;
		1098	below = 0;
		1099	env = 0;
949		1100
950	/* NO_FIX_PLAYER is set when a great many changes are being	1101	/* NO_FIX_PLAYER is set when a great many changes are being
951	* made to players inventory. If set, avoiding the call	1102	* made to players inventory. If set, avoiding the call
952	* to save cpu time.	1103	* to save cpu time.
953	*/	1104	*/
954	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1105	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
955	otmp->update_stats ();	1106	otmp->update_stats ();
956
957	if (above)
958	above->below = below;
959	else
960	env->inv = below;
961
962	if (below)
963	below->above = above;
964
965	/* we set up values so that it could be inserted into
966	* the map, but we don't actually do that - it is up
967	* to the caller to decide what we want to do.
968	*/
969	x = env->x, y = env->y;
970	map = env->map;
971	above = 0, below = 0;
972	env = 0;
973	}	1107	}
974	else if (map)	1108	else if (map)
975	{	1109	{
976	if (type == PLAYER)
977	{
978	// leaving a spot always closes any open container on the ground
979	if (container && !container->env)
980	// this causes spurious floorbox updates, but it ensures
981	// that the CLOSE event is being sent.
982	close_container ();
983
984	--map->players;
985	map->touch ();
986	}
987
988	map->dirty = true;	1110	map->dirty = true;
989	mapspace &ms = this->ms ();	1111	mapspace &ms = this->ms ();
		1112
		1113	if (object *pl = ms.player ())
		1114	{
		1115	if (type == PLAYER) // this == pl(!)
		1116	{
		1117	// leaving a spot always closes any open container on the ground
		1118	if (container && !container->env)
		1119	// this causes spurious floorbox updates, but it ensures
		1120	// that the CLOSE event is being sent.
		1121	close_container ();
		1122
		1123	--map->players;
		1124	map->touch ();
		1125	}
		1126	else if (pl->container == this)
		1127	{
		1128	// removing a container should close it
		1129	close_container ();
		1130	}
		1131
		1132	esrv_del_item (pl->contr, count);
		1133	}
990		1134
991	/* link the object above us */	1135	/* link the object above us */
992	if (above)	1136	if (above)
993	above->below = below;	1137	above->below = below;
994	else	1138	else
…		…
1015	if (map->in_memory == MAP_SAVING)	1159	if (map->in_memory == MAP_SAVING)
1016	return;	1160	return;
1017		1161
1018	int check_walk_off = !flag [FLAG_NO_APPLY];	1162	int check_walk_off = !flag [FLAG_NO_APPLY];
1019		1163
		1164	if (object *pl = ms.player ())
		1165	{
		1166	if (pl->container == this)
		1167	/* If a container that the player is currently using somehow gets
		1168	* removed (most likely destroyed), update the player view
		1169	* appropriately.
		1170	*/
		1171	pl->close_container ();
		1172
		1173	//TODO: the floorbox prev/next might need updating
		1174	esrv_del_item (pl->contr, count);
		1175	}
		1176
1020	for (tmp = ms.bot; tmp; tmp = tmp->above)	1177	for (tmp = ms.bot; tmp; tmp = tmp->above)
1021	{	1178	{
1022	/* No point updating the players look faces if he is the object	1179	/* No point updating the players look faces if he is the object
1023	* being removed.	1180	* being removed.
1024	*/	1181	*/
1025
1026	if (tmp->type == PLAYER && tmp != this)
1027	{
1028	/* If a container that the player is currently using somehow gets
1029	* removed (most likely destroyed), update the player view
1030	* appropriately.
1031	*/
1032	if (tmp->container == this)
1033	{
1034	flag [FLAG_APPLIED] = 0;
1035	tmp->container = 0;
1036	}
1037
1038	if (tmp->contr->ns)
1039	tmp->contr->ns->floorbox_update ();
1040	}
1041		1182
1042	/* See if object moving off should effect something */	1183	/* See if object moving off should effect something */
1043	if (check_walk_off	1184	if (check_walk_off
1044	&& ((move_type & tmp->move_off)	1185	&& ((move_type & tmp->move_off)
1045	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))	1186	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
…		…
1048		1189
1049	if (destroyed ())	1190	if (destroyed ())
1050	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());	1191	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1051	}	1192	}
1052		1193
1053	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1054	//TODO: why is this horrible hacka fix? get rid of this code=bug! (schmorp)
1055	if (tmp->above == tmp)
1056	tmp->above = 0;
1057
1058	last = tmp;	1194	last = tmp;
1059	}	1195	}
1060		1196
1061	/* last == NULL if there are no objects on this space */	1197	/* last == NULL if there are no objects on this space */
1062	//TODO: this makes little sense, why only update the topmost object?	1198	//TODO: this makes little sense, why only update the topmost object?
…		…
1082	merge_ob (object *op, object *top)	1218	merge_ob (object *op, object *top)
1083	{	1219	{
1084	if (!op->nrof)	1220	if (!op->nrof)
1085	return 0;	1221	return 0;
1086		1222
1087	if (top)	1223	if (!top)
1088	for (top = op; top && top->above; top = top->above)	1224	for (top = op; top && top->above; top = top->above)
1089	;	1225	;
1090		1226
1091	for (; top; top = top->below)	1227	for (; top; top = top->below)
1092	{
1093	if (top == op)
1094	continue;
1095
1096	if (object::can_merge (op, top))	1228	if (object::can_merge (op, top))
1097	{	1229	{
1098	top->nrof += op->nrof;	1230	top->nrof += op->nrof;
1099		1231
1100	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/	1232	if (object *pl = top->visible_to ())
1101	op->weight = 0; /* Don't want any adjustements now */	1233	esrv_update_item (UPD_NROF, pl, top);
		1234
		1235	op->weight = 0; // cancel the addition above
		1236	op->carrying = 0; // must be 0 already
		1237
1102	op->destroy ();	1238	op->destroy (1);
		1239
1103	return top;	1240	return top;
1104	}	1241	}
1105	}
1106		1242
1107	return 0;	1243	return 0;
1108	}	1244	}
1109		1245
1110	void	1246	void
…		…
1113	if (more)	1249	if (more)
1114	return;	1250	return;
1115		1251
1116	object *prev = this;	1252	object *prev = this;
1117		1253
1118	for (archetype *at = arch->more; at; at = at->more)	1254	for (archetype *at = (archetype *)arch->more; at; at = (archetype *)at->more)
1119	{	1255	{
1120	object *op = arch_to_object (at);	1256	object *op = arch_to_object (at);
1121		1257
1122	op->name = name;	1258	op->name = name;
1123	op->name_pl = name_pl;	1259	op->name_pl = name_pl;
…		…
1137	object *	1273	object *
1138	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)	1274	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1139	{	1275	{
1140	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)	1276	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1141	{	1277	{
1142	tmp->x = x + tmp->arch->clone.x;	1278	tmp->x = x + tmp->arch->x;
1143	tmp->y = y + tmp->arch->clone.y;	1279	tmp->y = y + tmp->arch->y;
1144	}	1280	}
1145		1281
1146	return insert_ob_in_map (op, m, originator, flag);	1282	return insert_ob_in_map (op, m, originator, flag);
1147	}	1283	}
1148		1284
…		…
1169	object *	1305	object *
1170	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)	1306	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1171	{	1307	{
1172	assert (!op->flag [FLAG_FREED]);	1308	assert (!op->flag [FLAG_FREED]);
1173		1309
1174	object *tmp, *top, *floor = NULL;
1175
1176	op->remove ();	1310	op->remove ();
1177
1178	#if 0
1179	if (!m->active != !op->active)
1180	if (m->active)
1181	op->activate_recursive ();
1182	else
1183	op->deactivate_recursive ();
1184	#endif
1185
1186	if (out_of_map (m, op->x, op->y))
1187	{
1188	LOG (llevError, "Trying to insert object outside the map.\n%s\n", op->debug_desc ());
1189	#ifdef MANY_CORES
1190	/* Better to catch this here, as otherwise the next use of this object
1191	* is likely to cause a crash. Better to find out where it is getting
1192	* improperly inserted.
1193	*/
1194	abort ();
1195	#endif
1196	return op;
1197	}
1198
1199	if (object *more = op->more)
1200	{
1201	if (!insert_ob_in_map (more, m, originator, flag))
1202	{
1203	if (!op->head)
1204	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1205
1206	return 0;
1207	}
1208	}
1209
1210	CLEAR_FLAG (op, FLAG_REMOVED);
1211		1311
1212	/* Ideally, the caller figures this out. However, it complicates a lot	1312	/* Ideally, the caller figures this out. However, it complicates a lot
1213	* of areas of callers (eg, anything that uses find_free_spot would now	1313	* of areas of callers (eg, anything that uses find_free_spot would now
1214	* need extra work	1314	* need extra work
1215	*/	1315	*/
1216	if (!xy_normalise (m, op->x, op->y))	1316	if (!xy_normalise (m, op->x, op->y))
		1317	{
		1318	op->destroy (1);
1217	return 0;	1319	return 0;
		1320	}
		1321
		1322	if (object *more = op->more)
		1323	if (!insert_ob_in_map (more, m, originator, flag))
		1324	return 0;
		1325
		1326	CLEAR_FLAG (op, FLAG_REMOVED);
1218		1327
1219	op->map = m;	1328	op->map = m;
1220	mapspace &ms = op->ms ();	1329	mapspace &ms = op->ms ();
1221		1330
1222	/* this has to be done after we translate the coordinates.	1331	/* this has to be done after we translate the coordinates.
1223	*/	1332	*/
1224	if (op->nrof && !(flag & INS_NO_MERGE))	1333	if (op->nrof && !(flag & INS_NO_MERGE))
1225	for (tmp = ms.bot; tmp; tmp = tmp->above)	1334	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1226	if (object::can_merge (op, tmp))	1335	if (object::can_merge (op, tmp))
1227	{	1336	{
		1337	// TODO: we atcually want to update tmp, not op,
		1338	// but some caller surely breaks when we return tmp
		1339	// from here :/
1228	op->nrof += tmp->nrof;	1340	op->nrof += tmp->nrof;
1229	tmp->destroy ();	1341	tmp->destroy (1);
1230	}	1342	}
1231		1343
1232	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1344	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1233	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1345	CLEAR_FLAG (op, FLAG_INV_LOCKED);
1234		1346
…		…
1254	/* since *below* originator, no need to update top */	1366	/* since *below* originator, no need to update top */
1255	originator->below = op;	1367	originator->below = op;
1256	}	1368	}
1257	else	1369	else
1258	{	1370	{
		1371	object *top, *floor = NULL;
		1372
1259	top = ms.bot;	1373	top = ms.bot;
1260		1374
1261	/* If there are other objects, then */	1375	/* If there are other objects, then */
1262	if ((!(flag & INS_MAP_LOAD)) && top)	1376	if (top)
1263	{	1377	{
1264	object *last = 0;	1378	object *last = 0;
1265		1379
1266	/*	1380	/*
1267	* If there are multiple objects on this space, we do some trickier handling.	1381	* If there are multiple objects on this space, we do some trickier handling.
…		…
1320	if (last && last->below && last != floor)	1434	if (last && last->below && last != floor)
1321	top = last->below;	1435	top = last->below;
1322	}	1436	}
1323	} /* If objects on this space */	1437	} /* If objects on this space */
1324		1438
1325	if (flag & INS_MAP_LOAD)
1326	top = ms.top;
1327
1328	if (flag & INS_ABOVE_FLOOR_ONLY)	1439	if (flag & INS_ABOVE_FLOOR_ONLY)
1329	top = floor;	1440	top = floor;
1330		1441
1331	/* Top is the object that our object (op) is going to get inserted above.	1442	/* Top is the object that our object (op) is going to get inserted above.
1332	*/	1443	*/
…		…
1364	op->map->touch ();	1475	op->map->touch ();
1365	}	1476	}
1366		1477
1367	op->map->dirty = true;	1478	op->map->dirty = true;
1368		1479
1369	/* If we have a floor, we know the player, if any, will be above
1370	* it, so save a few ticks and start from there.
1371	*/
1372	if (!(flag & INS_MAP_LOAD))
1373	if (object *pl = ms.player ())	1480	if (object *pl = ms.player ())
1374	if (pl->contr->ns)	1481	//TODO: the floorbox prev/next might need updating
1375	pl->contr->ns->floorbox_update ();	1482	esrv_send_item (pl, op);
1376		1483
1377	/* If this object glows, it may affect lighting conditions that are	1484	/* If this object glows, it may affect lighting conditions that are
1378	* visible to others on this map. But update_all_los is really	1485	* visible to others on this map. But update_all_los is really
1379	* an inefficient way to do this, as it means los for all players	1486	* an inefficient way to do this, as it means los for all players
1380	* on the map will get recalculated. The players could very well	1487	* on the map will get recalculated. The players could very well
…		…
1399	* blocked() and wall() work properly), and these flags are updated by	1506	* blocked() and wall() work properly), and these flags are updated by
1400	* update_object().	1507	* update_object().
1401	*/	1508	*/
1402		1509
1403	/* if this is not the head or flag has been passed, don't check walk on status */	1510	/* if this is not the head or flag has been passed, don't check walk on status */
1404	if (!(flag & INS_NO_WALK_ON) && !op->head)	1511	if (!(flag & INS_NO_WALK_ON) && op->head_ () == op)
1405	{	1512	{
1406	if (check_move_on (op, originator))	1513	if (check_move_on (op, originator))
1407	return 0;	1514	return 0;
1408		1515
1409	/* If we are a multi part object, lets work our way through the check	1516	/* If we are a multi part object, lets work our way through the check
1410	* walk on's.	1517	* walk on's.
1411	*/	1518	*/
1412	for (tmp = op->more; tmp != NULL; tmp = tmp->more)	1519	for (object *tmp = op->more; tmp; tmp = tmp->more)
1413	if (check_move_on (tmp, originator))	1520	if (check_move_on (tmp, originator))
1414	return 0;	1521	return 0;
1415	}	1522	}
1416		1523
1417	return op;	1524	return op;
…		…
1422	* op is the object to insert it under: supplies x and the map.	1529	* op is the object to insert it under: supplies x and the map.
1423	*/	1530	*/
1424	void	1531	void
1425	replace_insert_ob_in_map (const char *arch_string, object *op)	1532	replace_insert_ob_in_map (const char *arch_string, object *op)
1426	{	1533	{
1427	object *tmp, *tmp1;
1428
1429	/* first search for itself and remove any old instances */	1534	/* first search for itself and remove any old instances */
1430		1535
1431	for (tmp = op->ms ().bot; tmp; tmp = tmp->above)	1536	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1432	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */	1537	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */
1433	tmp->destroy ();	1538	tmp->destroy (1);
1434		1539
1435	tmp1 = arch_to_object (archetype::find (arch_string));	1540	object *tmp = arch_to_object (archetype::find (arch_string));
1436		1541
1437	tmp1->x = op->x;	1542	tmp->x = op->x;
1438	tmp1->y = op->y;	1543	tmp->y = op->y;
		1544
1439	insert_ob_in_map (tmp1, op->map, op, 0);	1545	insert_ob_in_map (tmp, op->map, op, 0);
1440	}	1546	}
1441		1547
1442	object *	1548	object *
1443	object::insert_at (object *where, object *originator, int flags)	1549	object::insert_at (object *where, object *originator, int flags)
1444	{	1550	{
		1551	if (where->env)
		1552	return where->env->insert (this);
		1553	else
1445	return where->map->insert (this, where->x, where->y, originator, flags);	1554	return where->map->insert (this, where->x, where->y, originator, flags);
1446	}	1555	}
1447		1556
1448	/*	1557	/*
1449	* get_split_ob(ob,nr) splits up ob into two parts. The part which
1450	* is returned contains nr objects, and the remaining parts contains
1451	* the rest (or is removed and freed if that number is 0).
1452	* On failure, NULL is returned, and the reason put into the
1453	* global static errmsg array.
1454	*/
1455	object *
1456	get_split_ob (object *orig_ob, uint32 nr)
1457	{
1458	object *newob;
1459	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1460
1461	if (orig_ob->nrof < nr)
1462	{
1463	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1464	return NULL;
1465	}
1466
1467	newob = object_create_clone (orig_ob);
1468
1469	if ((orig_ob->nrof -= nr) < 1)
1470	orig_ob->destroy (1);
1471	else if (!is_removed)
1472	{
1473	if (orig_ob->env != NULL)
1474	sub_weight (orig_ob->env, orig_ob->weight * nr);
1475	if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)
1476	{
1477	strcpy (errmsg, "Tried to split object whose map is not in memory.");
1478	LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n");
1479	return NULL;
1480	}
1481	}
1482
1483	newob->nrof = nr;
1484
1485	return newob;
1486	}
1487
1488	/*
1489	* decrease_ob_nr(object, number) decreases a specified number from	1558	* decrease(object, number) decreases a specified number from
1490	* the amount of an object. If the amount reaches 0, the object	1559	* the amount of an object. If the amount reaches 0, the object
1491	* is subsequently removed and freed.	1560	* is subsequently removed and freed.
1492	*	1561	*
1493	* Return value: 'op' if something is left, NULL if the amount reached 0	1562	* Return value: 'op' if something is left, NULL if the amount reached 0
1494	*/	1563	*/
		1564	bool
		1565	object::decrease (sint32 nr)
		1566	{
		1567	if (!nr)
		1568	return true;
		1569
		1570	nr = min (nr, nrof);
		1571
		1572	nrof -= nr;
		1573
		1574	if (nrof)
		1575	{
		1576	adjust_weight (env, -weight * nr); // carrying == 0
		1577
		1578	if (object *pl = visible_to ())
		1579	esrv_update_item (UPD_NROF, pl, this);
		1580
		1581	return true;
		1582	}
		1583	else
		1584	{
		1585	destroy (1);
		1586	return false;
		1587	}
		1588	}
		1589
		1590	/*
		1591	* split(ob,nr) splits up ob into two parts. The part which
		1592	* is returned contains nr objects, and the remaining parts contains
		1593	* the rest (or is removed and returned if that number is 0).
		1594	* On failure, NULL is returned.
		1595	*/
1495	object *	1596	object *
1496	decrease_ob_nr (object *op, uint32 i)	1597	object::split (sint32 nr)
1497	{	1598	{
1498	object *tmp;	1599	int have = number_of ();
1499		1600
1500	if (i == 0) /* objects with op->nrof require this check */	1601	if (have < nr)
1501	return op;	1602	return 0;
1502		1603	else if (have == nr)
1503	if (i > op->nrof)
1504	i = op->nrof;
1505
1506	if (QUERY_FLAG (op, FLAG_REMOVED))
1507	op->nrof -= i;
1508	else if (op->env)
1509	{	1604	{
1510	/* is this object in the players inventory, or sub container
1511	* therein?
1512	*/
1513	tmp = op->in_player ();
1514	/* nope. Is this a container the player has opened?
1515	* If so, set tmp to that player.
1516	* IMO, searching through all the players will mostly
1517	* likely be quicker than following op->env to the map,
1518	* and then searching the map for a player.
1519	*/
1520	if (!tmp)
1521	for_all_players (pl)
1522	if (pl->ob->container == op->env)
1523	{
1524	tmp = pl->ob;
1525	break;
1526	}
1527
1528	if (i < op->nrof)
1529	{
1530	sub_weight (op->env, op->weight * i);
1531	op->nrof -= i;
1532	if (tmp)
1533	esrv_send_item (tmp, op);
1534	}
1535	else
1536	{
1537	op->remove ();	1605	remove ();
1538	op->nrof = 0;	1606	return this;
1539	if (tmp)
1540	esrv_del_item (tmp->contr, op->count);
1541	}
1542	}	1607	}
1543	else	1608	else
1544	{	1609	{
1545	object *above = op->above;	1610	decrease (nr);
1546		1611
1547	if (i < op->nrof)	1612	object *op = object_create_clone (this);
1548	op->nrof -= i;	1613	op->nrof = nr;
1549	else
1550	{
1551	op->remove ();
1552	op->nrof = 0;
1553	}
1554
1555	/* Since we just removed op, op->above is null */
1556	for (tmp = above; tmp; tmp = tmp->above)
1557	if (tmp->type == PLAYER)
1558	{
1559	if (op->nrof)
1560	esrv_send_item (tmp, op);
1561	else
1562	esrv_del_item (tmp->contr, op->count);
1563	}
1564	}
1565
1566	if (op->nrof)
1567	return op;	1614	return op;
1568	else
1569	{
1570	op->destroy ();
1571	return 0;
1572	}
1573	}
1574
1575	/*
1576	* add_weight(object, weight) adds the specified weight to an object,
1577	* and also updates how much the environment(s) is/are carrying.
1578	*/
1579	void
1580	add_weight (object *op, signed long weight)
1581	{
1582	while (op != NULL)
1583	{
1584	if (op->type == CONTAINER)
1585	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1586
1587	op->carrying += weight;
1588	op = op->env;
1589	}	1615	}
1590	}	1616	}
1591		1617
1592	object *	1618	object *
1593	insert_ob_in_ob (object *op, object *where)	1619	insert_ob_in_ob (object *op, object *where)
…		…
1598	LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);	1624	LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
1599	free (dump);	1625	free (dump);
1600	return op;	1626	return op;
1601	}	1627	}
1602		1628
1603	if (where->head)	1629	if (where->head_ () != where)
1604	{	1630	{
1605	LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n");	1631	LOG (llevError | logBacktrace, "Warning: Tried to insert object into wrong part of multipart object.\n");
1606	where = where->head;	1632	where = where->head;
1607	}	1633	}
1608		1634
1609	return where->insert (op);	1635	return where->insert (op);
1610	}	1636	}
…		…
1618	* be != op, if items are merged. -Tero	1644	* be != op, if items are merged. -Tero
1619	*/	1645	*/
1620	object *	1646	object *
1621	object::insert (object *op)	1647	object::insert (object *op)
1622	{	1648	{
1623	object *tmp, *otmp;
1624
1625	if (!QUERY_FLAG (op, FLAG_REMOVED))
1626	op->remove ();
1627
1628	if (op->more)	1649	if (op->more)
1629	{	1650	{
1630	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);	1651	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1631	return op;	1652	return op;
1632	}	1653	}
1633		1654
1634	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1655	op->remove ();
1635	CLEAR_FLAG (op, FLAG_REMOVED);	1656
		1657	op->flag [FLAG_OBJ_ORIGINAL] = 0;
		1658
1636	if (op->nrof)	1659	if (op->nrof)
1637	{
1638	for (tmp = inv; tmp != NULL; tmp = tmp->below)	1660	for (object *tmp = inv; tmp; tmp = tmp->below)
1639	if (object::can_merge (tmp, op))	1661	if (object::can_merge (tmp, op))
1640	{	1662	{
1641	/* return the original object and remove inserted object	1663	/* return the original object and remove inserted object
1642	(client needs the original object) */	1664	(client needs the original object) */
1643	tmp->nrof += op->nrof;	1665	tmp->nrof += op->nrof;
1644	/* Weight handling gets pretty funky. Since we are adding to	1666
1645	* tmp->nrof, we need to increase the weight.	1667	if (object *pl = tmp->visible_to ())
1646	*/	1668	esrv_update_item (UPD_NROF, pl, tmp);
		1669
1647	add_weight (this, op->weight * op->nrof);	1670	adjust_weight (this, op->total_weight ());
1648	SET_FLAG (op, FLAG_REMOVED);	1671
1649	op->destroy (); /* free the inserted object */	1672	op->destroy (1);
1650	op = tmp;	1673	op = tmp;
1651	op->remove (); /* and fix old object's links */	1674	goto inserted;
1652	CLEAR_FLAG (op, FLAG_REMOVED);
1653	break;
1654	}	1675	}
1655		1676
1656	/* I assume combined objects have no inventory	1677	op->owner = 0; // it's his/hers now. period.
1657	* We add the weight - this object could have just been removed
1658	* (if it was possible to merge). calling remove_ob will subtract
1659	* the weight, so we need to add it in again, since we actually do
1660	* the linking below
1661	*/
1662	add_weight (this, op->weight * op->nrof);
1663	}
1664	else
1665	add_weight (this, (op->weight + op->carrying));
1666
1667	otmp = this->in_player ();
1668	if (otmp && otmp->contr)
1669	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1670	otmp->update_stats ();
1671
1672	op->map = 0;	1678	op->map = 0;
1673	op->env = this;	1679	op->x = 0;
		1680	op->y = 0;
		1681
1674	op->above = 0;	1682	op->above = 0;
1675	op->below = 0;	1683	op->below = inv;
1676	op->x = 0, op->y = 0;	1684	op->env = this;
1677		1685
		1686	if (inv)
		1687	inv->above = op;
		1688
		1689	inv = op;
		1690
		1691	op->flag [FLAG_REMOVED] = 0;
		1692
		1693	if (object *pl = op->visible_to ())
		1694	esrv_send_item (pl, op);
		1695
		1696	adjust_weight (this, op->total_weight ());
		1697
		1698	inserted:
1678	/* reset the light list and los of the players on the map */	1699	/* reset the light list and los of the players on the map */
1679	if ((op->glow_radius != 0) && map)	1700	if (op->glow_radius && map && map->darkness)
1680	{
1681	#ifdef DEBUG_LIGHTS
1682	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1683	#endif /* DEBUG_LIGHTS */
1684	if (map->darkness)
1685	update_all_los (map, x, y);	1701	update_all_los (map, x, y);
1686	}
1687		1702
1688	/* Client has no idea of ordering so lets not bother ordering it here.	1703	// if this is a player's inventory, update stats
1689	* It sure simplifies this function...	1704	if (type == PLAYER && !flag [FLAG_NO_FIX_PLAYER])
1690	*/	1705	update_stats ();
1691	if (!inv)
1692	inv = op;
1693	else
1694	{
1695	op->below = inv;
1696	op->below->above = op;
1697	inv = op;
1698	}
1699		1706
1700	INVOKE_OBJECT (INSERT, this);	1707	INVOKE_OBJECT (INSERT, this);
1701		1708
1702	return op;	1709	return op;
1703	}	1710	}
…		…
1918	* activate recursively a flag on an object inventory	1925	* activate recursively a flag on an object inventory
1919	*/	1926	*/
1920	void	1927	void
1921	flag_inv (object *op, int flag)	1928	flag_inv (object *op, int flag)
1922	{	1929	{
1923	if (op->inv)
1924	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)	1930	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1925	{	1931	{
1926	SET_FLAG (tmp, flag);	1932	SET_FLAG (tmp, flag);
1927	flag_inv (tmp, flag);	1933	flag_inv (tmp, flag);
1928	}	1934	}
1929	}	1935	}
1930		1936
1931	/*	1937	/*
1932	* deactivate recursively a flag on an object inventory	1938	* deactivate recursively a flag on an object inventory
1933	*/	1939	*/
1934	void	1940	void
1935	unflag_inv (object *op, int flag)	1941	unflag_inv (object *op, int flag)
1936	{	1942	{
1937	if (op->inv)
1938	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)	1943	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1939	{	1944	{
1940	CLEAR_FLAG (tmp, flag);	1945	CLEAR_FLAG (tmp, flag);
1941	unflag_inv (tmp, flag);	1946	unflag_inv (tmp, flag);
1942	}	1947	}
1943	}
1944
1945	/*
1946	* set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in
1947	* all it's inventory (recursively).
1948	* If checksums are used, a player will get set_cheat called for
1949	* him/her-self and all object carried by a call to this function.
1950	*/
1951	void
1952	set_cheat (object *op)
1953	{
1954	SET_FLAG (op, FLAG_WAS_WIZ);
1955	flag_inv (op, FLAG_WAS_WIZ);
1956	}	1948	}
1957		1949
1958	/*	1950	/*
1959	* find_free_spot(object, map, x, y, start, stop) will search for	1951	* find_free_spot(object, map, x, y, start, stop) will search for
1960	* a spot at the given map and coordinates which will be able to contain	1952	* a spot at the given map and coordinates which will be able to contain
…		…
1962	* to search (see the freearr_x/y[] definition).	1954	* to search (see the freearr_x/y[] definition).
1963	* It returns a random choice among the alternatives found.	1955	* It returns a random choice among the alternatives found.
1964	* start and stop are where to start relative to the free_arr array (1,9	1956	* start and stop are where to start relative to the free_arr array (1,9
1965	* does all 4 immediate directions). This returns the index into the	1957	* does all 4 immediate directions). This returns the index into the
1966	* array of the free spot, -1 if no spot available (dir 0 = x,y)	1958	* array of the free spot, -1 if no spot available (dir 0 = x,y)
1967	* Note - this only checks to see if there is space for the head of the
1968	* object - if it is a multispace object, this should be called for all
1969	* pieces.
1970	* Note2: This function does correctly handle tiled maps, but does not	1959	* Note: This function does correctly handle tiled maps, but does not
1971	* inform the caller. However, insert_ob_in_map will update as	1960	* inform the caller. However, insert_ob_in_map will update as
1972	* necessary, so the caller shouldn't need to do any special work.	1961	* necessary, so the caller shouldn't need to do any special work.
1973	* Note - updated to take an object instead of archetype - this is necessary	1962	* Note - updated to take an object instead of archetype - this is necessary
1974	* because arch_blocked (now ob_blocked) needs to know the movement type	1963	* because arch_blocked (now ob_blocked) needs to know the movement type
1975	* to know if the space in question will block the object. We can't use	1964	* to know if the space in question will block the object. We can't use
…		…
1977	* customized, changed states, etc.	1966	* customized, changed states, etc.
1978	*/	1967	*/
1979	int	1968	int
1980	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)	1969	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
1981	{	1970	{
		1971	int altern[SIZEOFFREE];
1982	int index = 0, flag;	1972	int index = 0, flag;
1983	int altern[SIZEOFFREE];
1984		1973
1985	for (int i = start; i < stop; i++)	1974	for (int i = start; i < stop; i++)
1986	{	1975	{
1987	flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]);	1976	mapxy pos (m, x, y); pos.move (i);
1988	if (!flag)	1977
		1978	if (!pos.normalise ())
		1979	continue;
		1980
		1981	mapspace &ms = *pos;
		1982
		1983	if (ms.flags () & P_IS_ALIVE)
		1984	continue;
		1985
		1986	/* However, often
		1987	* ob doesn't have any move type (when used to place exits)
		1988	* so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.
		1989	*/
		1990	if (ob && ob->move_type == 0 && ms.move_block != MOVE_ALL)
		1991	{
1989	altern [index++] = i;	1992	altern [index++] = i;
		1993	continue;
		1994	}
1990		1995
1991	/* Basically, if we find a wall on a space, we cut down the search size.	1996	/* Basically, if we find a wall on a space, we cut down the search size.
1992	* In this way, we won't return spaces that are on another side of a wall.	1997	* In this way, we won't return spaces that are on another side of a wall.
1993	* This mostly work, but it cuts down the search size in all directions -	1998	* This mostly work, but it cuts down the search size in all directions -
1994	* if the space being examined only has a wall to the north and empty	1999	* if the space being examined only has a wall to the north and empty
1995	* spaces in all the other directions, this will reduce the search space	2000	* spaces in all the other directions, this will reduce the search space
1996	* to only the spaces immediately surrounding the target area, and	2001	* to only the spaces immediately surrounding the target area, and
1997	* won't look 2 spaces south of the target space.	2002	* won't look 2 spaces south of the target space.
1998	*/	2003	*/
1999	else if ((flag & P_NO_PASS) && maxfree[i] < stop)	2004	if (ms.move_block == MOVE_ALL && maxfree[i] < stop)
		2005	{
2000	stop = maxfree[i];	2006	stop = maxfree[i];
		2007	continue;
		2008	}
		2009
		2010	/* Note it is intentional that we check ob - the movement type of the
		2011	* head of the object should correspond for the entire object.
		2012	*/
		2013	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
		2014	continue;
		2015
		2016	if (ob->blocked (m, pos.x, pos.y))
		2017	continue;
		2018
		2019	altern [index++] = i;
2001	}	2020	}
2002		2021
2003	if (!index)	2022	if (!index)
2004	return -1;	2023	return -1;
2005		2024
…		…
2014	*/	2033	*/
2015	int	2034	int
2016	find_first_free_spot (const object *ob, maptile *m, int x, int y)	2035	find_first_free_spot (const object *ob, maptile *m, int x, int y)
2017	{	2036	{
2018	for (int i = 0; i < SIZEOFFREE; i++)	2037	for (int i = 0; i < SIZEOFFREE; i++)
2019	if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]))	2038	if (!ob->blocked (m, x + freearr_x[i], y + freearr_y[i]))
2020	return i;	2039	return i;
2021		2040
2022	return -1;	2041	return -1;
2023	}	2042	}
2024		2043
…		…
2078	object *tmp;	2097	object *tmp;
2079	maptile *mp;	2098	maptile *mp;
2080		2099
2081	MoveType blocked, move_type;	2100	MoveType blocked, move_type;
2082		2101
2083	if (exclude && exclude->head)	2102	if (exclude && exclude->head_ () != exclude)
2084	{	2103	{
2085	exclude = exclude->head;	2104	exclude = exclude->head;
2086	move_type = exclude->move_type;	2105	move_type = exclude->move_type;
2087	}	2106	}
2088	else	2107	else
…		…
2111	max = maxfree[i];	2130	max = maxfree[i];
2112	else if (mflags & P_IS_ALIVE)	2131	else if (mflags & P_IS_ALIVE)
2113	{	2132	{
2114	for (tmp = ms.bot; tmp; tmp = tmp->above)	2133	for (tmp = ms.bot; tmp; tmp = tmp->above)
2115	if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)	2134	if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)
2116	&& (tmp != exclude || (tmp->head && tmp->head != exclude)))	2135	&& (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2117	break;	2136	break;
2118		2137
2119	if (tmp)	2138	if (tmp)
2120	return freedir[i];	2139	return freedir[i];
2121	}	2140	}
…		…
2301	* Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause	2320	* Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause
2302	* core dumps if they do.	2321	* core dumps if they do.
2303	*	2322	*
2304	* Add a check so we can't pick up invisible objects (0.93.8)	2323	* Add a check so we can't pick up invisible objects (0.93.8)
2305	*/	2324	*/
2306
2307	int	2325	int
2308	can_pick (const object *who, const object *item)	2326	can_pick (const object *who, const object *item)
2309	{	2327	{
2310	return /*QUERY_FLAG(who,FLAG_WIZ)|| */	2328	return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2311	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&	2329	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
…		…
2316	* create clone from object to another	2334	* create clone from object to another
2317	*/	2335	*/
2318	object *	2336	object *
2319	object_create_clone (object *asrc)	2337	object_create_clone (object *asrc)
2320	{	2338	{
2321	object *dst = 0, *tmp, *src, *part, *prev, *item;	2339	object *dst = 0, *tmp, *src, *prev, *item;
2322		2340
2323	if (!asrc)	2341	if (!asrc)
2324	return 0;	2342	return 0;
2325		2343
2326	src = asrc;
2327	if (src->head)
2328	src = src->head;	2344	src = asrc->head_ ();
2329		2345
2330	prev = 0;	2346	prev = 0;
2331	for (part = src; part; part = part->more)	2347	for (object *part = src; part; part = part->more)
2332	{	2348	{
2333	tmp = part->clone ();	2349	tmp = part->clone ();
2334	tmp->x -= src->x;	2350	tmp->x -= src->x;
2335	tmp->y -= src->y;	2351	tmp->y -= src->y;
2336		2352
…		…
2449	/* Basically, if the archetype has this key set,	2465	/* Basically, if the archetype has this key set,
2450	* we need to store the null value so when we save	2466	* we need to store the null value so when we save
2451	* it, we save the empty value so that when we load,	2467	* it, we save the empty value so that when we load,
2452	* we get this value back again.	2468	* we get this value back again.
2453	*/	2469	*/
2454	if (get_ob_key_link (&op->arch->clone, canonical_key))	2470	if (get_ob_key_link (op->arch, canonical_key))
2455	field->value = 0;	2471	field->value = 0;
2456	else	2472	else
2457	{	2473	{
2458	if (last)	2474	if (last)
2459	last->next = field->next;	2475	last->next = field->next;
…		…
2528	}	2544	}
2529	else	2545	else
2530	item = item->env;	2546	item = item->env;
2531	}	2547	}
2532		2548
2533
2534	const char *	2549	const char *
2535	object::flag_desc (char *desc, int len) const	2550	object::flag_desc (char *desc, int len) const
2536	{	2551	{
2537	char *p = desc;	2552	char *p = desc;
2538	bool first = true;	2553	bool first = true;
…		…
2565	{	2580	{
2566	char flagdesc[512];	2581	char flagdesc[512];
2567	char info2[256 * 4];	2582	char info2[256 * 4];
2568	char *p = info;	2583	char *p = info;
2569		2584
2570	p += snprintf (p, 512, "{cnt:%d,uuid:<1.%" PRIx64 ">,name:\"%s\"%s%s,flags:[%s],type:%d}",	2585	p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s,flags:[%s],type:%d}",
2571	count, uuid.seq,	2586	count,
		2587	uuid.c_str (),
2572	&name,	2588	&name,
2573	title ? "\",title:\"" : "",	2589	title ? "\",title:\"" : "",
2574	title ? (const char *)title : "",	2590	title ? (const char *)title : "",
2575	flag_desc (flagdesc, 512), type);	2591	flag_desc (flagdesc, 512), type);
2576		2592
2577	if (env)	2593	if (!flag[FLAG_REMOVED] && env)
2578	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2594	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2579		2595
2580	if (map)	2596	if (map)
2581	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);	2597	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2582		2598
…		…
2600	}	2616	}
2601		2617
2602	const materialtype_t *	2618	const materialtype_t *
2603	object::dominant_material () const	2619	object::dominant_material () const
2604	{	2620	{
2605	if (materialtype_t *mat = name_to_material (materialname))	2621	if (materialtype_t *mt = name_to_material (materialname))
2606	return mat;	2622	return mt;
2607		2623
2608	// omfg this is slow, this has to be temporary :)
2609	shstr unknown ("unknown");
2610
2611	return name_to_material (unknown);	2624	return name_to_material (shstr_unknown);
2612	}	2625	}
2613		2626
2614	void	2627	void
2615	object::open_container (object *new_container)	2628	object::open_container (object *new_container)
2616	{	2629	{
2617	if (container == new_container)	2630	if (container == new_container)
2618	return;	2631	return;
2619		2632
2620	if (object *old_container = container)	2633	object *old_container = container;
		2634
		2635	if (old_container)
2621	{	2636	{
2622	if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))	2637	if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
2623	return;	2638	return;
2624		2639
2625	#if 0	2640	#if 0
…		…
2627	if (object *closer = old_container->inv)	2642	if (object *closer = old_container->inv)
2628	if (closer->type == CLOSE_CON)	2643	if (closer->type == CLOSE_CON)
2629	closer->destroy ();	2644	closer->destroy ();
2630	#endif	2645	#endif
2631		2646
		2647	// make sure the container is available
		2648	esrv_send_item (this, old_container);
		2649
2632	old_container->flag [FLAG_APPLIED] = 0;	2650	old_container->flag [FLAG_APPLIED] = false;
2633	container = 0;	2651	container = 0;
2634		2652
		2653	// client needs item update to make it work, client bug requires this to be separate
2635	esrv_update_item (UPD_FLAGS, this, old_container);	2654	esrv_update_item (UPD_FLAGS, this, old_container);
		2655
2636	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));	2656	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
		2657	play_sound (sound_find ("chest_close"));
2637	}	2658	}
2638		2659
2639	if (new_container)	2660	if (new_container)
2640	{	2661	{
2641	if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))	2662	if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))
…		…
2652	}	2673	}
2653	#endif	2674	#endif
2654		2675
2655	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));	2676	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));
2656		2677
		2678	// make sure the container is available, client bug requires this to be separate
		2679	esrv_send_item (this, new_container);
		2680
2657	new_container->flag [FLAG_APPLIED] = 1;	2681	new_container->flag [FLAG_APPLIED] = true;
2658	container = new_container;	2682	container = new_container;
2659		2683
		2684	// client needs flag change
2660	esrv_update_item (UPD_FLAGS, this, new_container);	2685	esrv_update_item (UPD_FLAGS, this, new_container);
2661	esrv_send_inventory (this, new_container);	2686	esrv_send_inventory (this, new_container);
		2687	play_sound (sound_find ("chest_open"));
		2688	}
		2689	// else if (!old_container->env && contr && contr->ns)
		2690	// contr->ns->floorbox_reset ();
		2691	}
		2692
		2693	object *
		2694	object::force_find (const shstr name)
		2695	{
		2696	/* cycle through his inventory to look for the MARK we want to
		2697	* place
		2698	*/
		2699	for (object *tmp = inv; tmp; tmp = tmp->below)
		2700	if (tmp->type == FORCE && tmp->slaying == name)
		2701	return splay (tmp);
		2702
		2703	return 0;
		2704	}
		2705
		2706	void
		2707	object::force_add (const shstr name, int duration)
		2708	{
		2709	if (object *force = force_find (name))
		2710	force->destroy ();
		2711
		2712	object *force = get_archetype (FORCE_NAME);
		2713
		2714	force->slaying = name;
		2715	force->stats.food = 1;
		2716	force->speed_left = -1.f;
		2717
		2718	force->set_speed (duration ? 1.f / duration : 0.f);
		2719	force->flag [FLAG_IS_USED_UP] = true;
		2720	force->flag [FLAG_APPLIED] = true;
		2721
		2722	insert (force);
		2723	}
		2724
		2725	void
		2726	object::play_sound (faceidx sound)
		2727	{
		2728	if (!sound)
		2729	return;
		2730
		2731	if (flag [FLAG_REMOVED])
		2732	return;
		2733
		2734	if (env)
2662	}	2735	{
		2736	if (object *pl = in_player ())
		2737	pl->contr->play_sound (sound);
		2738	}
		2739	else
		2740	map->play_sound (sound, x, y);
2663	}	2741	}
2664		2742
2665

Diff Legend

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