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.134 by pippijn, Thu Mar 1 12:28:16 2007 UTC vs.
Revision 1.211 by root, Mon Apr 21 21:32:32 2008 UTC

1	/*	1	/*
2	* CrossFire, A Multiplayer game for X-windows	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 <funcpoint.h>
		30	#include <sproto.h>
34	#include <loader.h>	31	#include <loader.h>
35		32
36	#include <bitset>	33	#include <bitset>
37		34
38	int nrofallocobjects = 0;	35	UUID UUID::cur;
39	static UUID uuid;	36	static uint64_t seq_next_save;
40	const uint64 UUID_SKIP = 1<<19;	37	static const uint64 UUID_GAP = 1<<19;
41		38
42	objectvec objects;	39	objectvec objects;
43	activevec actives;	40	activevec actives;
44		41
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,	42	short freearr_x[SIZEOFFREE] = {
		43	0,
		44	0, 1, 1, 1, 0, -1, -1, -1,
		45	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	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
47	};	47	};
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,	48	short freearr_y[SIZEOFFREE] = {
		49	0,
		50	-1, -1, 0, 1, 1, 1, 0, -1,
		51	-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	52	-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	};	53	};
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,	54	int maxfree[SIZEOFFREE] = {
		55	0,
		56	9, 10, 13, 14, 17, 18, 21, 22,
		57	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	58	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	};	59	};
54	int freedir[SIZEOFFREE] = {	60	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,	61	0,
		62	1, 2, 3, 4, 5, 6, 7, 8,
		63	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	64	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	};	65	};
58		66
59	static void	67	static void
60	write_uuid (void)	68	write_uuid (uval64 skip, bool sync)
61	{	69	{
62	char filename1[MAX_BUF], filename2[MAX_BUF];	70	CALL_BEGIN (2);
63		71	CALL_ARG_SV (newSVval64 (skip));
64	sprintf (filename1, "%s/uuid", settings.localdir);	72	CALL_ARG_SV (boolSV (sync));
65	sprintf (filename2, "%s/uuid~", settings.localdir);	73	CALL_CALL ("cf::write_uuid", G_DISCARD);
66		74	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	}	75	}
79		76
80	static void	77	static void
81	read_uuid (void)	78	read_uuid (void)
82	{	79	{
83	char filename[MAX_BUF];	80	char filename[MAX_BUF];
84		81
85	sprintf (filename, "%s/uuid", settings.localdir);	82	sprintf (filename, "%s/uuid", settings.localdir);
86		83
		84	seq_next_save = 0;
		85
87	FILE *fp;	86	FILE *fp;
88		87
89	if (!(fp = fopen (filename, "r")))	88	if (!(fp = fopen (filename, "r")))
90	{	89	{
91	if (errno == ENOENT)	90	if (errno == ENOENT)
92	{	91	{
93	LOG (llevInfo, "RESET uid to 1\n");	92	LOG (llevInfo, "RESET uid to 1\n");
94	uuid.seq = 0;	93	UUID::cur.seq = 0;
95	write_uuid ();	94	write_uuid (UUID_GAP, true);
96	return;	95	return;
97	}	96	}
98		97
99	LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);	98	LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);
100	_exit (1);	99	_exit (1);
101	}	100	}
102		101
103	int version;	102	UUID::BUF buf;
104	unsigned long long uid;	103	buf[0] = 0;
105	if (2 != fscanf (fp, "<%d,%llx>\n", &version, &uid) || version != 1)	104	fgets (buf, sizeof (buf), fp);
		105
		106	if (!UUID::cur.parse (buf))
106	{	107	{
107	LOG (llevError, "FATAL: error reading uid from %s!\n", filename);	108	LOG (llevError, "FATAL: error reading uid from %s (%s)!\n", filename, buf);
108	_exit (1);	109	_exit (1);
109	}	110	}
110		111
111	uuid.seq = uid;	112	LOG (llevDebug, "read UUID: %s\n", UUID::cur.c_str ());
112	write_uuid ();	113
113	LOG (llevDebug, "read UID: %" PRId64 "\n", uid);	114	write_uuid (UUID_GAP, true);
114	fclose (fp);	115	fclose (fp);
115	}	116	}
116		117
117	UUID	118	UUID
118	gen_uuid ()	119	UUID::gen ()
119	{	120	{
120	UUID uid;	121	UUID uid;
121		122
122	uid.seq = ++uuid.seq;	123	uid.seq = ++cur.seq;
123		124
124	if (!(uuid.seq & (UUID_SKIP - 1)))	125	if (expect_false (cur.seq >= seq_next_save))
125	write_uuid ();	126	{
		127	seq_next_save = UUID::cur.seq + (UUID_GAP >> 1);
		128	write_uuid (UUID_GAP, false);
		129	}
		130
126		131
127	return uid;	132	return uid;
128	}	133	}
129		134
130	void	135	void
131	init_uuid ()	136	UUID::init ()
132	{	137	{
133	read_uuid ();	138	read_uuid ();
134	}	139	}
135		140
136	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */	141	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */
137	static int	142	static bool
138	compare_ob_value_lists_one (const object *wants, const object *has)	143	compare_ob_value_lists_one (const object *wants, const object *has)
139	{	144	{
140	key_value *wants_field;	145	key_value *wants_field;
141		146
142	/* n-squared behaviour (see get_ob_key_link()), but I'm hoping both	147	/* n-squared behaviour (see get_ob_key_link()), but I'm hoping both
…		…
150	key_value *has_field;	155	key_value *has_field;
151		156
152	/* Look for a field in has with the same key. */	157	/* Look for a field in has with the same key. */
153	has_field = get_ob_key_link (has, wants_field->key);	158	has_field = get_ob_key_link (has, wants_field->key);
154		159
155	if (has_field == NULL)	160	if (!has_field)
156	{
157	/* No field with that name. */	161	return 0; /* No field with that name. */
158	return FALSE;
159	}
160		162
161	/* Found the matching field. */	163	/* Found the matching field. */
162	if (has_field->value != wants_field->value)	164	if (has_field->value != wants_field->value)
163	{
164	/* Values don't match, so this half of the comparison is false. */	165	return 0; /* Values don't match, so this half of the comparison is false. */
165	return FALSE;
166	}
167		166
168	/* If we get here, we found a match. Now for the next field in wants. */	167	/* If we get here, we found a match. Now for the next field in wants. */
169	}	168	}
170		169
171	/* If we get here, every field in wants has a matching field in has. */	170	/* If we get here, every field in wants has a matching field in has. */
172	return TRUE;	171	return 1;
173	}	172	}
174		173
175	/* Returns TRUE if ob1 has the same key_values as ob2. */	174	/* Returns TRUE if ob1 has the same key_values as ob2. */
176	static int	175	static bool
177	compare_ob_value_lists (const object *ob1, const object *ob2)	176	compare_ob_value_lists (const object *ob1, const object *ob2)
178	{	177	{
179	/* However, there may be fields in has which aren't partnered in wants,	178	/* However, there may be fields in has which aren't partnered in wants,
180	* so we need to run the comparison *twice*. :(	179	* so we need to run the comparison *twice*. :(
181	*/	180	*/
…		…
202	|| ob1->speed != ob2->speed	201	|| ob1->speed != ob2->speed
203	|| ob1->value != ob2->value	202	|| ob1->value != ob2->value
204	|| ob1->name != ob2->name)	203	|| ob1->name != ob2->name)
205	return 0;	204	return 0;
206		205
207	//TODO: this ain't working well, use nicer and correct overflow check	206	/* 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	207	* for unsigned overflow (2c), second part checks whether the result
209	* value could not be stored in a sint32 (which unfortunately sometimes is	208	* would fit into a 32 bit signed int, which is often used to hold
210	* used to store nrof).	209	* nrof values.
211	*/	210	*/
212	if (ob1->nrof + ob2->nrof >= 1UL << 31)	211	if (~ob1->nrof < ob2->nrof || ob1->nrof + ob2->nrof > (1UL << 31))
213	return 0;	212	return 0;
214		213
215	/* If the objects have been identified, set the BEEN_APPLIED flag.	214	/* 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	215	* 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	216	* 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	217	* are not equal - just if it has been identified, the been_applied
219	* flags lose any meaning.	218	* flags lose any meaning.
220	*/	219	*/
221	if (QUERY_FLAG (ob1, FLAG_IDENTIFIED))	220	if (QUERY_FLAG (ob1, FLAG_IDENTIFIED))
222	SET_FLAG (ob1, FLAG_BEEN_APPLIED);	221	SET_FLAG (ob1, FLAG_BEEN_APPLIED);
223		222
224	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))	223	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))
225	SET_FLAG (ob2, FLAG_BEEN_APPLIED);	224	SET_FLAG (ob2, FLAG_BEEN_APPLIED);
226		225
227	if ((ob1->flag ^ ob2->flag).reset (FLAG_INV_LOCKED).reset (FLAG_CLIENT_SENT).any ()	226	if (ob1->arch->name != ob2->arch->name
228	|| ob1->arch != ob2->arch
229	|| ob1->name != ob2->name	227	|| ob1->name != ob2->name
230	|| ob1->title != ob2->title	228	|| ob1->title != ob2->title
231	|| ob1->msg != ob2->msg	229	|| ob1->msg != ob2->msg
232	|| ob1->weight != ob2->weight	230	|| 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	231	|| ob1->attacktype != ob2->attacktype
236	|| ob1->magic != ob2->magic	232	|| ob1->magic != ob2->magic
237	|| ob1->slaying != ob2->slaying	233	|| ob1->slaying != ob2->slaying
238	|| ob1->skill != ob2->skill	234	|| ob1->skill != ob2->skill
239	|| ob1->value != ob2->value	235	|| ob1->value != ob2->value
…		…
246	|| ob1->move_block != ob2->move_block	242	|| ob1->move_block != ob2->move_block
247	|| ob1->move_allow != ob2->move_allow	243	|| ob1->move_allow != ob2->move_allow
248	|| ob1->move_on != ob2->move_on	244	|| ob1->move_on != ob2->move_on
249	|| ob1->move_off != ob2->move_off	245	|| ob1->move_off != ob2->move_off
250	|| ob1->move_slow != ob2->move_slow	246	|| ob1->move_slow != ob2->move_slow
251	|| ob1->move_slow_penalty != ob2->move_slow_penalty)	247	|| ob1->move_slow_penalty != ob2->move_slow_penalty
		248	|| memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
		249	|| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats)))
252	return 0;	250	return 0;
253		251
		252	if ((ob1->flag ^ ob2->flag)
		253	.reset (FLAG_INV_LOCKED)
		254	.reset (FLAG_CLIENT_SENT)
		255	.reset (FLAG_REMOVED)
		256	.any ())
		257	return 0;
		258
254	/* This is really a spellbook check - really, we should	259	/* This is really a spellbook check - we should in general
255	* check all objects in the inventory.	260	* not merge objects with real inventories, as splitting them
		261	* is hard.
256	*/	262	*/
257	if (ob1->inv || ob2->inv)	263	if (ob1->inv || ob2->inv)
258	{	264	{
259	/* if one object has inventory but the other doesn't, not equiv */	265	if (!(ob1->inv && ob2->inv))
260	if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv))	266	return 0; /* inventories differ in length */
261	return 0;
262		267
263	/* Now check to see if the two inventory objects could merge */	268	if (ob1->inv->below || ob2->inv->below)
		269	return 0; /* more than one object in inv */
		270
264	if (!object::can_merge (ob1->inv, ob2->inv))	271	if (!object::can_merge (ob1->inv, ob2->inv))
265	return 0;	272	return 0; /* inventory objects differ */
266		273
267	/* inventory ok - still need to check rest of this object to see	274	/* inventory ok - still need to check rest of this object to see
268	* if it is valid.	275	* if it is valid.
269	*/	276	*/
270	}	277	}
…		…
289	if (ob1->level != ob2->level)	296	if (ob1->level != ob2->level)
290	return 0;	297	return 0;
291	break;	298	break;
292	}	299	}
293		300
294	if (ob1->key_values != NULL || ob2->key_values != NULL)	301	if (ob1->key_values || ob2->key_values)
295	{	302	{
296	/* At least one of these has key_values. */	303	/* At least one of these has key_values. */
297	if ((ob1->key_values == NULL) != (ob2->key_values == NULL))	304	if ((!ob1->key_values) != (!ob2->key_values))
298	/* One has fields, but the other one doesn't. */	305	return 0; /* One has fields, but the other one doesn't. */
		306
		307	if (!compare_ob_value_lists (ob1, ob2))
299	return 0;	308	return 0;
300	else if (!compare_ob_value_lists (ob1, ob2))
301	return 0;
302	}	309	}
303		310
304	//TODO: generate an event or call into perl for additional checks
305	if (ob1->self || ob2->self)	311	if (ob1->self || ob2->self)
306	{	312	{
307	ob1->optimise ();	313	ob1->optimise ();
308	ob2->optimise ();	314	ob2->optimise ();
309		315
310	if (ob1->self || ob2->self)	316	if (ob1->self || ob2->self)
		317	{
		318	int k1 = ob1->self ? HvTOTALKEYS (ob1->self) : 0;
		319	int k2 = ob2->self ? HvTOTALKEYS (ob2->self) : 0;
		320
		321	if (k1 != k2)
311	return 0;	322	return 0;
		323
		324	if (k1 == 0)
		325	return 1;
		326
		327	if (!cfperl_can_merge (ob1, ob2))
		328	return 0;
		329	}
312	}	330	}
313		331
314	/* Everything passes, must be OK. */	332	/* Everything passes, must be OK. */
315	return 1;	333	return 1;
316	}	334	}
317		335
		336	// adjust weight per container type ("of holding")
		337	static sint32
		338	weight_adjust (object *op, sint32 weight)
		339	{
		340	return op->type == CONTAINER
		341	? lerp (weight, 0, 100, 0, 100 - op->stats.Str)
		342	: weight;
		343	}
		344
318	/*	345	/*
		346	* adjust_weight(object, weight) adds the specified weight to an object,
		347	* and also updates how much the environment(s) is/are carrying.
		348	*/
		349	static void
		350	adjust_weight (object *op, sint32 weight)
		351	{
		352	while (op)
		353	{
		354	weight = weight_adjust (op, weight);
		355
		356	op->carrying += weight;
		357	op = op->env;
		358	}
		359	}
		360
		361	/*
319	* sum_weight() is a recursive function which calculates the weight	362	* this is a recursive function which calculates the weight
320	* an object is carrying. It goes through in figures out how much	363	* an object is carrying. It goes through op and figures out how much
321	* containers are carrying, and sums it up.	364	* containers are carrying, and sums it up.
322	*/	365	*/
323	long	366	void
324	sum_weight (object *op)	367	object::update_weight ()
325	{	368	{
326	long sum;	369	sint32 sum = 0;
327	object *inv;
328		370
329	for (sum = 0, inv = op->inv; inv != NULL; inv = inv->below)	371	for (object *op = inv; op; op = op->below)
330	{	372	{
331	if (inv->inv)	373	if (op->inv)
332	sum_weight (inv);	374	op->update_weight ();
333	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);
334	}
335		375
336	if (op->type == CONTAINER && op->stats.Str)	376	sum += op->total_weight ();
337	sum = (sum * (100 - op->stats.Str)) / 100;	377	}
338		378
339	if (op->carrying != sum)	379	carrying = weight_adjust (this, sum);
340	op->carrying = sum;
341
342	return sum;
343	}	380	}
344		381
345	/**	382	/*
346	* Return the outermost environment object for a given object.	383	* Used by: Server DM commands: dumpbelow, dump. Some error messages.
347	*/
348
349	object *
350	object_get_env_recursive (object *op)
351	{
352	while (op->env != NULL)
353	op = op->env;
354	return op;
355	}
356
357	/*
358	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
359	* Some error messages.
360	* The result of the dump is stored in the static global errmsg array.
361	*/	384	*/
362	char *	385	char *
363	dump_object (object *op)	386	dump_object (object *op)
364	{	387	{
365	if (!op)	388	if (!op)
…		…
373	/*	396	/*
374	* get_nearest_part(multi-object, object 2) returns the part of the	397	* get_nearest_part(multi-object, object 2) returns the part of the
375	* multi-object 1 which is closest to the second object.	398	* multi-object 1 which is closest to the second object.
376	* If it's not a multi-object, it is returned.	399	* If it's not a multi-object, it is returned.
377	*/	400	*/
378
379	object *	401	object *
380	get_nearest_part (object *op, const object *pl)	402	get_nearest_part (object *op, const object *pl)
381	{	403	{
382	object *tmp, *closest;	404	object *tmp, *closest;
383	int last_dist, i;	405	int last_dist, i;
384		406
385	if (op->more == NULL)	407	if (!op->more)
386	return op;	408	return op;
		409
387	for (last_dist = distance (op, pl), closest = op, tmp = op->more; tmp != NULL; tmp = tmp->more)	410	for (last_dist = distance (op, pl), closest = op, tmp = op->more;
		411	tmp;
		412	tmp = tmp->more)
388	if ((i = distance (tmp, pl)) < last_dist)	413	if ((i = distance (tmp, pl)) < last_dist)
389	closest = tmp, last_dist = i;	414	closest = tmp, last_dist = i;
		415
390	return closest;	416	return closest;
391	}	417	}
392		418
393	/*	419	/*
394	* Returns the object which has the count-variable equal to the argument.	420	* Returns the object which has the count-variable equal to the argument.
		421	* VERRRY slow.
395	*/	422	*/
396	object *	423	object *
397	find_object (tag_t i)	424	find_object (tag_t i)
398	{	425	{
399	for_all_objects (op)	426	for_all_objects (op)
…		…
419	break;	446	break;
420		447
421	return op;	448	return op;
422	}	449	}
423		450
424	void
425	free_all_object_data ()
426	{
427	LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);
428	}
429
430	/*	451	/*
431	* Sets the owner and sets the skill and exp pointers to owner's current	452	* Sets the owner and sets the skill and exp pointers to owner's current
432	* skill and experience objects.	453	* skill and experience objects.
		454	* ACTUALLY NO! investigate! TODO
433	*/	455	*/
434	void	456	void
435	object::set_owner (object *owner)	457	object::set_owner (object *owner)
436	{	458	{
		459	// allow objects which own objects
437	if (!owner)	460	if (owner)
438	return;
439
440	/* next line added to allow objects which own objects */
441	/* Add a check for ownercounts in here, as I got into an endless loop
442	* with the fireball owning a poison cloud which then owned the
443	* fireball. I believe that was caused by one of the objects getting
444	* freed and then another object replacing it. Since the ownercounts
445	* didn't match, this check is valid and I believe that cause is valid.
446	*/
447	while (owner->owner)	461	while (owner->owner)
448	owner = owner->owner;	462	owner = owner->owner;
		463
		464	if (flag [FLAG_FREED])
		465	{
		466	LOG (llevError | logBacktrace, "tried to set owner of %s to %s\n", debug_desc (), owner->debug_desc ());
		467	return;
		468	}
449		469
450	this->owner = owner;	470	this->owner = owner;
		471	}
		472
		473	int
		474	object::slottype () const
		475	{
		476	if (type == SKILL)
		477	{
		478	if (IS_COMBAT_SKILL (subtype)) return slot_combat;
		479	if (IS_RANGED_SKILL (subtype)) return slot_ranged;
		480	}
		481	else
		482	{
		483	if (slot [body_combat].info) return slot_combat;
		484	if (slot [body_range ].info) return slot_ranged;
		485	}
		486
		487	return slot_none;
		488	}
		489
		490	bool
		491	object::change_weapon (object *ob)
		492	{
		493	if (current_weapon == ob)
		494	return true;
		495
		496	if (chosen_skill)
		497	chosen_skill->flag [FLAG_APPLIED] = false;
		498
		499	current_weapon = ob;
		500	chosen_skill = !ob || ob->type == SKILL ? ob : find_skill_by_name (this, ob->skill);
		501
		502	if (chosen_skill)
		503	chosen_skill->flag [FLAG_APPLIED] = true;
		504
		505	update_stats ();
		506
		507	if (ob)
		508	{
		509	// now check wether any body locations became invalid, in which case
		510	// we cannot apply the weapon at the moment.
		511	for (int i = 0; i < NUM_BODY_LOCATIONS; ++i)
		512	if (slot[i].used < 0)
		513	{
		514	current_weapon = chosen_skill = 0;
		515	update_stats ();
		516
		517	new_draw_info_format (NDI_UNIQUE, 0, this,
		518	"You try to balance all your items at once, "
		519	"but the %s is just too much for your body. "
		520	"[You need to unapply some items first.]", &ob->name);
		521	return false;
		522	}
		523
		524	//new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);
		525	}
		526	else
		527	;//new_draw_info_format (NDI_UNIQUE, 0, this, "You unwield your weapons.");
		528
		529	if (ob && !ob->flag [FLAG_APPLIED] && ob->type != SPELL)
		530	{
		531	LOG (llevError | logBacktrace, "%s changed to unapplied weapon %s",
		532	&name, ob->debug_desc ());
		533	return false;
		534	}
		535
		536	return true;
451	}	537	}
452		538
453	/* Zero the key_values on op, decrementing the shared-string	539	/* Zero the key_values on op, decrementing the shared-string
454	* refcounts and freeing the links.	540	* refcounts and freeing the links.
455	*/	541	*/
456	static void	542	static void
457	free_key_values (object *op)	543	free_key_values (object *op)
458	{	544	{
459	for (key_value *i = op->key_values; i != 0;)	545	for (key_value *i = op->key_values; i; )
460	{	546	{
461	key_value *next = i->next;	547	key_value *next = i->next;
462	delete i;	548	delete i;
463		549
464	i = next;	550	i = next;
465	}	551	}
466		552
467	op->key_values = 0;	553	op->key_values = 0;
468	}	554	}
469		555
470	/*	556	object &
471	* copy_to first frees everything allocated by the dst object,	557	object::operator =(const object &src)
472	* and then copies the contents of itself into the second
473	* object, allocating what needs to be allocated. Basically, any
474	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
475	* if the first object is freed, the pointers in the new object
476	* will point at garbage.
477	*/
478	void
479	object::copy_to (object *dst)
480	{	558	{
481	bool is_freed = QUERY_FLAG (dst, FLAG_FREED);	559	bool is_freed = flag [FLAG_FREED];
482	bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED);	560	bool is_removed = flag [FLAG_REMOVED];
483		561
484	*(object_copy *)dst = *this;	562	*(object_copy *)this = src;
485		563
486	if (is_freed)	564	flag [FLAG_FREED] = is_freed;
487	SET_FLAG (dst, FLAG_FREED);	565	flag [FLAG_REMOVED] = is_removed;
488
489	if (is_removed)
490	SET_FLAG (dst, FLAG_REMOVED);
491
492	if (speed < 0)
493	dst->speed_left = speed_left - rndm ();
494		566
495	/* Copy over key_values, if any. */	567	/* Copy over key_values, if any. */
496	if (key_values)	568	if (src.key_values)
497	{	569	{
498	key_value *tail = 0;	570	key_value *tail = 0;
499	key_value *i;
500
501	dst->key_values = 0;	571	key_values = 0;
502		572
503	for (i = key_values; i; i = i->next)	573	for (key_value *i = src.key_values; i; i = i->next)
504	{	574	{
505	key_value *new_link = new key_value;	575	key_value *new_link = new key_value;
506		576
507	new_link->next = 0;	577	new_link->next = 0;
508	new_link->key = i->key;	578	new_link->key = i->key;
509	new_link->value = i->value;	579	new_link->value = i->value;
510		580
511	/* Try and be clever here, too. */	581	/* Try and be clever here, too. */
512	if (!dst->key_values)	582	if (!key_values)
513	{	583	{
514	dst->key_values = new_link;	584	key_values = new_link;
515	tail = new_link;	585	tail = new_link;
516	}	586	}
517	else	587	else
518	{	588	{
519	tail->next = new_link;	589	tail->next = new_link;
520	tail = new_link;	590	tail = new_link;
521	}	591	}
522	}	592	}
523	}	593	}
		594	}
		595
		596	/*
		597	* copy_to first frees everything allocated by the dst object,
		598	* and then copies the contents of itself into the second
		599	* object, allocating what needs to be allocated. Basically, any
		600	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
		601	* if the first object is freed, the pointers in the new object
		602	* will point at garbage.
		603	*/
		604	void
		605	object::copy_to (object *dst)
		606	{
		607	*dst = *this;
		608
		609	if (speed < 0)
		610	dst->speed_left -= rndm ();
524		611
525	dst->set_speed (dst->speed);	612	dst->set_speed (dst->speed);
526	}	613	}
527		614
528	void	615	void
529	object::instantiate ()	616	object::instantiate ()
530	{	617	{
531	if (!uuid.seq) // HACK	618	if (!uuid.seq) // HACK
532	uuid = gen_uuid ();	619	uuid = UUID::gen ();
533		620
534	speed_left = -0.1f;	621	speed_left = -0.1f;
535	/* copy the body_info to the body_used - this is only really	622	/* copy the body_info to the body_used - this is only really
536	* need for monsters, but doesn't hurt to do it for everything.	623	* need for monsters, but doesn't hurt to do it for everything.
537	* by doing so, when a monster is created, it has good starting	624	* by doing so, when a monster is created, it has good starting
538	* values for the body_used info, so when items are created	625	* values for the body_used info, so when items are created
539	* for it, they can be properly equipped.	626	* for it, they can be properly equipped.
540	*/	627	*/
541	memcpy (body_used, body_info, sizeof (body_used));	628	for (int i = NUM_BODY_LOCATIONS; i--; )
		629	slot[i].used = slot[i].info;
542		630
543	attachable::instantiate ();	631	attachable::instantiate ();
544	}	632	}
545		633
546	object *	634	object *
…		…
695	static int object_count;	783	static int object_count;
696		784
697	void object::link ()	785	void object::link ()
698	{	786	{
699	assert (!index);//D	787	assert (!index);//D
700	uuid = gen_uuid ();	788	uuid = UUID::gen ();
701	count = ++object_count;	789	count = ++object_count;
702		790
703	refcnt_inc ();	791	refcnt_inc ();
704	objects.insert (this);	792	objects.insert (this);
705	}	793	}
…		…
789	* if some form of movement is allowed, let objects	877	* if some form of movement is allowed, let objects
790	* drop on that space.	878	* drop on that space.
791	*/	879	*/
792	if (!drop_to_ground	880	if (!drop_to_ground
793	|| !map	881	|| !map
794	|| map->in_memory != MAP_IN_MEMORY	882	|| map->in_memory != MAP_ACTIVE
795	|| map->nodrop	883	|| map->nodrop
796	|| ms ().move_block == MOVE_ALL)	884	|| ms ().move_block == MOVE_ALL)
797	{	885	{
798	while (inv)	886	while (inv)
799	{	887	{
…		…
834		922
835	if (flag [FLAG_IS_LINKED])	923	if (flag [FLAG_IS_LINKED])
836	remove_button_link (this);	924	remove_button_link (this);
837		925
838	if (flag [FLAG_FRIENDLY])	926	if (flag [FLAG_FRIENDLY])
839	{
840	remove_friendly_object (this);	927	remove_friendly_object (this);
841
842	if (type == GOLEM
843	&& owner
844	&& owner->type == PLAYER
845	&& owner->contr->ranges[range_golem] == this)
846	owner->contr->ranges[range_golem] = 0;
847	}
848		928
849	if (!flag [FLAG_REMOVED])	929	if (!flag [FLAG_REMOVED])
850	remove ();	930	remove ();
851		931
852	destroy_inv (true);	932	destroy_inv (true);
…		…
862		942
863	if (!freed_map)	943	if (!freed_map)
864	{	944	{
865	freed_map = new maptile;	945	freed_map = new maptile;
866		946
		947	freed_map->path = "<freed objects map>";
867	freed_map->name = "/internal/freed_objects_map";	948	freed_map->name = "/internal/freed_objects_map";
868	freed_map->width = 3;	949	freed_map->width = 3;
869	freed_map->height = 3;	950	freed_map->height = 3;
		951	freed_map->nodrop = 1;
870		952
871	freed_map->alloc ();	953	freed_map->alloc ();
872	freed_map->in_memory = MAP_IN_MEMORY;	954	freed_map->in_memory = MAP_ACTIVE;
873	}	955	}
874		956
875	map = freed_map;	957	map = freed_map;
876	x = 1;	958	x = 1;
877	y = 1;	959	y = 1;
878	}	960	}
879		961
880	head = 0;
881
882	if (more)	962	if (more)
883	{	963	{
884	more->destroy ();	964	more->destroy ();
885	more = 0;	965	more = 0;
886	}	966	}
887		967
		968	head = 0;
		969
888	// clear those pointers that likely might have circular references to us	970	// clear those pointers that likely might cause circular references
889	owner = 0;	971	owner = 0;
890	enemy = 0;	972	enemy = 0;
891	attacked_by = 0;	973	attacked_by = 0;
		974	current_weapon = 0;
892	}	975	}
893		976
894	void	977	void
895	object::destroy (bool destroy_inventory)	978	object::destroy (bool destroy_inventory)
896	{	979	{
…		…
898	return;	981	return;
899		982
900	if (destroy_inventory)	983	if (destroy_inventory)
901	destroy_inv (false);	984	destroy_inv (false);
902		985
		986	if (is_head ())
		987	if (sound_destroy)
		988	play_sound (sound_destroy);
		989	else if (flag [FLAG_MONSTER])
		990	play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism
		991
903	attachable::destroy ();	992	attachable::destroy ();
904	}
905
906	/*
907	* sub_weight() recursively (outwards) subtracts a number from the
908	* weight of an object (and what is carried by it's environment(s)).
909	*/
910	void
911	sub_weight (object *op, signed long weight)
912	{
913	while (op != NULL)
914	{
915	if (op->type == CONTAINER)
916	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
917
918	op->carrying -= weight;
919	op = op->env;
920	}
921	}	993	}
922		994
923	/* op->remove ():	995	/* op->remove ():
924	* This function removes the object op from the linked list of objects	996	* This function removes the object op from the linked list of objects
925	* which it is currently tied to. When this function is done, the	997	* which it is currently tied to. When this function is done, the
…		…
946	* In this case, the object to be removed is in someones	1018	* In this case, the object to be removed is in someones
947	* inventory.	1019	* inventory.
948	*/	1020	*/
949	if (env)	1021	if (env)
950	{	1022	{
		1023	adjust_weight (env, -total_weight ());
		1024
		1025	*(above ? &above->below : &env->inv) = below;
		1026
951	if (nrof)	1027	if (below)
952	sub_weight (env, weight * nrof);	1028	below->above = above;
953	else	1029
954	sub_weight (env, weight + carrying);	1030	/* we set up values so that it could be inserted into
		1031	* the map, but we don't actually do that - it is up
		1032	* to the caller to decide what we want to do.
		1033	*/
		1034	map = env->map;
		1035	x = env->x;
		1036	y = env->y;
		1037	above = 0;
		1038	below = 0;
		1039	env = 0;
955		1040
956	/* NO_FIX_PLAYER is set when a great many changes are being	1041	/* NO_FIX_PLAYER is set when a great many changes are being
957	* made to players inventory. If set, avoiding the call	1042	* made to players inventory. If set, avoiding the call
958	* to save cpu time.	1043	* to save cpu time.
959	*/	1044	*/
960	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1045	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
961	otmp->update_stats ();	1046	otmp->update_stats ();
962
963	if (above)
964	above->below = below;
965	else
966	env->inv = below;
967
968	if (below)
969	below->above = above;
970
971	/* we set up values so that it could be inserted into
972	* the map, but we don't actually do that - it is up
973	* to the caller to decide what we want to do.
974	*/
975	x = env->x, y = env->y;
976	map = env->map;
977	above = 0, below = 0;
978	env = 0;
979	}	1047	}
980	else if (map)	1048	else if (map)
981	{	1049	{
982	if (type == PLAYER)	1050	if (type == PLAYER)
983	{	1051	{
…		…
1021	if (map->in_memory == MAP_SAVING)	1089	if (map->in_memory == MAP_SAVING)
1022	return;	1090	return;
1023		1091
1024	int check_walk_off = !flag [FLAG_NO_APPLY];	1092	int check_walk_off = !flag [FLAG_NO_APPLY];
1025		1093
		1094	if (object *pl = ms.player ())
		1095	{
		1096	if (pl->container == this)
		1097	/* If a container that the player is currently using somehow gets
		1098	* removed (most likely destroyed), update the player view
		1099	* appropriately.
		1100	*/
		1101	pl->close_container ();
		1102
		1103	pl->contr->ns->floorbox_update ();
		1104	}
		1105
1026	for (tmp = ms.bot; tmp; tmp = tmp->above)	1106	for (tmp = ms.bot; tmp; tmp = tmp->above)
1027	{	1107	{
1028	/* No point updating the players look faces if he is the object	1108	/* No point updating the players look faces if he is the object
1029	* being removed.	1109	* being removed.
1030	*/	1110	*/
1031
1032	if (tmp->type == PLAYER && tmp != this)
1033	{
1034	/* If a container that the player is currently using somehow gets
1035	* removed (most likely destroyed), update the player view
1036	* appropriately.
1037	*/
1038	if (tmp->container == this)
1039	{
1040	flag [FLAG_APPLIED] = 0;
1041	tmp->container = 0;
1042	}
1043
1044	if (tmp->contr->ns)
1045	tmp->contr->ns->floorbox_update ();
1046	}
1047		1111
1048	/* See if object moving off should effect something */	1112	/* See if object moving off should effect something */
1049	if (check_walk_off	1113	if (check_walk_off
1050	&& ((move_type & tmp->move_off)	1114	&& ((move_type & tmp->move_off)
1051	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))	1115	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
…		…
1054		1118
1055	if (destroyed ())	1119	if (destroyed ())
1056	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());	1120	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1057	}	1121	}
1058		1122
1059	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1060	//TODO: why is this horrible hacka fix? get rid of this code=bug! (schmorp)
1061	if (tmp->above == tmp)
1062	tmp->above = 0;
1063
1064	last = tmp;	1123	last = tmp;
1065	}	1124	}
1066		1125
1067	/* last == NULL if there are no objects on this space */	1126	/* last == NULL if there are no objects on this space */
1068	//TODO: this makes little sense, why only update the topmost object?	1127	//TODO: this makes little sense, why only update the topmost object?
…		…
1088	merge_ob (object *op, object *top)	1147	merge_ob (object *op, object *top)
1089	{	1148	{
1090	if (!op->nrof)	1149	if (!op->nrof)
1091	return 0;	1150	return 0;
1092		1151
1093	if (top)	1152	if (!top)
1094	for (top = op; top && top->above; top = top->above)	1153	for (top = op; top && top->above; top = top->above)
1095	;	1154	;
1096		1155
1097	for (; top; top = top->below)	1156	for (; top; top = top->below)
1098	{	1157	{
…		…
1111	}	1170	}
1112		1171
1113	return 0;	1172	return 0;
1114	}	1173	}
1115		1174
		1175	void
		1176	object::expand_tail ()
		1177	{
		1178	if (more)
		1179	return;
		1180
		1181	object *prev = this;
		1182
		1183	for (archetype *at = (archetype *)arch->more; at; at = (archetype *)at->more)
		1184	{
		1185	object *op = arch_to_object (at);
		1186
		1187	op->name = name;
		1188	op->name_pl = name_pl;
		1189	op->title = title;
		1190
		1191	op->head = this;
		1192	prev->more = op;
		1193
		1194	prev = op;
		1195	}
		1196	}
		1197
1116	/*	1198	/*
1117	* same as insert_ob_in_map except it handles separate coordinates and does a clean	1199	* same as insert_ob_in_map except it handles separate coordinates and does a clean
1118	* job preparing multi-part monsters.	1200	* job preparing multi-part monsters.
1119	*/	1201	*/
1120	object *	1202	object *
1121	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)	1203	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1122	{	1204	{
1123	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)	1205	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1124	{	1206	{
1125	tmp->x = x + tmp->arch->clone.x;	1207	tmp->x = x + tmp->arch->x;
1126	tmp->y = y + tmp->arch->clone.y;	1208	tmp->y = y + tmp->arch->y;
1127	}	1209	}
1128		1210
1129	return insert_ob_in_map (op, m, originator, flag);	1211	return insert_ob_in_map (op, m, originator, flag);
1130	}	1212	}
1131		1213
…		…
1150	* just 'op' otherwise	1232	* just 'op' otherwise
1151	*/	1233	*/
1152	object *	1234	object *
1153	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)	1235	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1154	{	1236	{
		1237	assert (!op->flag [FLAG_FREED]);
		1238
1155	object *tmp, *top, *floor = NULL;	1239	object *top, *floor = NULL;
1156
1157	if (QUERY_FLAG (op, FLAG_FREED))
1158	{
1159	LOG (llevError, "Trying to insert freed object!\n");
1160	return NULL;
1161	}
1162
1163	if (!QUERY_FLAG (op, FLAG_REMOVED))
1164	LOG (llevError, "Trying to insert already inserted object %s\n", op->debug_desc ());
1165		1240
1166	op->remove ();	1241	op->remove ();
1167
1168	if (!m)
1169	{
1170	char *dump = dump_object (op);
1171	LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
1172	free (dump);
1173	return op;
1174	}
1175
1176	if (out_of_map (m, op->x, op->y))
1177	{
1178	char *dump = dump_object (op);
1179	LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump);
1180	#ifdef MANY_CORES
1181	/* Better to catch this here, as otherwise the next use of this object
1182	* is likely to cause a crash. Better to find out where it is getting
1183	* improperly inserted.
1184	*/
1185	abort ();
1186	#endif
1187	free (dump);
1188	return op;
1189	}
1190
1191	if (object *more = op->more)
1192	{
1193	if (!insert_ob_in_map (more, m, originator, flag))
1194	{
1195	if (!op->head)
1196	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1197
1198	return 0;
1199	}
1200	}
1201
1202	CLEAR_FLAG (op, FLAG_REMOVED);
1203		1242
1204	/* Ideally, the caller figures this out. However, it complicates a lot	1243	/* Ideally, the caller figures this out. However, it complicates a lot
1205	* of areas of callers (eg, anything that uses find_free_spot would now	1244	* of areas of callers (eg, anything that uses find_free_spot would now
1206	* need extra work	1245	* need extra work
1207	*/	1246	*/
1208	if (!xy_normalise (m, op->x, op->y))	1247	if (!xy_normalise (m, op->x, op->y))
		1248	{
		1249	op->destroy ();
1209	return 0;	1250	return 0;
		1251	}
		1252
		1253	if (object *more = op->more)
		1254	if (!insert_ob_in_map (more, m, originator, flag))
		1255	return 0;
		1256
		1257	CLEAR_FLAG (op, FLAG_REMOVED);
1210		1258
1211	op->map = m;	1259	op->map = m;
1212	mapspace &ms = op->ms ();	1260	mapspace &ms = op->ms ();
1213		1261
1214	/* this has to be done after we translate the coordinates.	1262	/* this has to be done after we translate the coordinates.
1215	*/	1263	*/
1216	if (op->nrof && !(flag & INS_NO_MERGE))	1264	if (op->nrof && !(flag & INS_NO_MERGE))
1217	for (tmp = ms.bot; tmp; tmp = tmp->above)	1265	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1218	if (object::can_merge (op, tmp))	1266	if (object::can_merge (op, tmp))
1219	{	1267	{
1220	op->nrof += tmp->nrof;	1268	op->nrof += tmp->nrof;
1221	tmp->destroy ();	1269	tmp->destroy (1);
1222	}	1270	}
1223		1271
1224	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1272	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1225	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1273	CLEAR_FLAG (op, FLAG_INV_LOCKED);
1226		1274
…		…
1249	else	1297	else
1250	{	1298	{
1251	top = ms.bot;	1299	top = ms.bot;
1252		1300
1253	/* If there are other objects, then */	1301	/* If there are other objects, then */
1254	if ((!(flag & INS_MAP_LOAD)) && top)	1302	if (top)
1255	{	1303	{
1256	object *last = 0;	1304	object *last = 0;
1257		1305
1258	/*	1306	/*
1259	* If there are multiple objects on this space, we do some trickier handling.	1307	* If there are multiple objects on this space, we do some trickier handling.
…		…
1289	* looks like instead of lots of conditions here.	1337	* looks like instead of lots of conditions here.
1290	* makes things faster, and effectively the same result.	1338	* makes things faster, and effectively the same result.
1291	*/	1339	*/
1292		1340
1293	/* Have object 'fall below' other objects that block view.	1341	/* Have object 'fall below' other objects that block view.
1294	* Unless those objects are exits, type 66	1342	* Unless those objects are exits.
1295	* If INS_ON_TOP is used, don't do this processing	1343	* If INS_ON_TOP is used, don't do this processing
1296	* Need to find the object that in fact blocks view, otherwise	1344	* Need to find the object that in fact blocks view, otherwise
1297	* stacking is a bit odd.	1345	* stacking is a bit odd.
1298	*/	1346	*/
1299	if (!(flag & INS_ON_TOP)	1347	if (!(flag & INS_ON_TOP)
1300	&& ms.flags () & P_BLOCKSVIEW	1348	&& ms.flags () & P_BLOCKSVIEW
1301	&& (op->face && !op->face->visibility))	1349	&& (op->face && !faces [op->face].visibility))
1302	{	1350	{
1303	for (last = top; last != floor; last = last->below)	1351	for (last = top; last != floor; last = last->below)
1304	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1352	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1305	break;	1353	break;
1306		1354
…		…
1312	if (last && last->below && last != floor)	1360	if (last && last->below && last != floor)
1313	top = last->below;	1361	top = last->below;
1314	}	1362	}
1315	} /* If objects on this space */	1363	} /* If objects on this space */
1316		1364
1317	if (flag & INS_MAP_LOAD)
1318	top = ms.top;
1319
1320	if (flag & INS_ABOVE_FLOOR_ONLY)	1365	if (flag & INS_ABOVE_FLOOR_ONLY)
1321	top = floor;	1366	top = floor;
1322		1367
1323	/* Top is the object that our object (op) is going to get inserted above.	1368	/* Top is the object that our object (op) is going to get inserted above.
1324	*/	1369	*/
…		…
1356	op->map->touch ();	1401	op->map->touch ();
1357	}	1402	}
1358		1403
1359	op->map->dirty = true;	1404	op->map->dirty = true;
1360		1405
1361	/* If we have a floor, we know the player, if any, will be above
1362	* it, so save a few ticks and start from there.
1363	*/
1364	if (!(flag & INS_MAP_LOAD))
1365	if (object *pl = ms.player ())	1406	if (object *pl = ms.player ())
1366	if (pl->contr->ns)
1367	pl->contr->ns->floorbox_update ();	1407	pl->contr->ns->floorbox_update ();
1368		1408
1369	/* If this object glows, it may affect lighting conditions that are	1409	/* If this object glows, it may affect lighting conditions that are
1370	* visible to others on this map. But update_all_los is really	1410	* visible to others on this map. But update_all_los is really
1371	* an inefficient way to do this, as it means los for all players	1411	* an inefficient way to do this, as it means los for all players
1372	* on the map will get recalculated. The players could very well	1412	* on the map will get recalculated. The players could very well
…		…
1391	* blocked() and wall() work properly), and these flags are updated by	1431	* blocked() and wall() work properly), and these flags are updated by
1392	* update_object().	1432	* update_object().
1393	*/	1433	*/
1394		1434
1395	/* if this is not the head or flag has been passed, don't check walk on status */	1435	/* if this is not the head or flag has been passed, don't check walk on status */
1396	if (!(flag & INS_NO_WALK_ON) && !op->head)	1436	if (!(flag & INS_NO_WALK_ON) && op->head_ () == op)
1397	{	1437	{
1398	if (check_move_on (op, originator))	1438	if (check_move_on (op, originator))
1399	return 0;	1439	return 0;
1400		1440
1401	/* If we are a multi part object, lets work our way through the check	1441	/* If we are a multi part object, lets work our way through the check
1402	* walk on's.	1442	* walk on's.
1403	*/	1443	*/
1404	for (tmp = op->more; tmp != NULL; tmp = tmp->more)	1444	for (object *tmp = op->more; tmp; tmp = tmp->more)
1405	if (check_move_on (tmp, originator))	1445	if (check_move_on (tmp, originator))
1406	return 0;	1446	return 0;
1407	}	1447	}
1408		1448
1409	return op;	1449	return op;
…		…
1414	* op is the object to insert it under: supplies x and the map.	1454	* op is the object to insert it under: supplies x and the map.
1415	*/	1455	*/
1416	void	1456	void
1417	replace_insert_ob_in_map (const char *arch_string, object *op)	1457	replace_insert_ob_in_map (const char *arch_string, object *op)
1418	{	1458	{
1419	object *tmp, *tmp1;
1420
1421	/* first search for itself and remove any old instances */	1459	/* first search for itself and remove any old instances */
1422		1460
1423	for (tmp = op->ms ().bot; tmp; tmp = tmp->above)	1461	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1424	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */	1462	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */
1425	tmp->destroy ();	1463	tmp->destroy (1);
1426		1464
1427	tmp1 = arch_to_object (archetype::find (arch_string));	1465	object *tmp = arch_to_object (archetype::find (arch_string));
1428		1466
1429	tmp1->x = op->x;	1467	tmp->x = op->x;
1430	tmp1->y = op->y;	1468	tmp->y = op->y;
		1469
1431	insert_ob_in_map (tmp1, op->map, op, 0);	1470	insert_ob_in_map (tmp, op->map, op, 0);
1432	}	1471	}
1433		1472
1434	// XXX: function not returning object*
1435	object *	1473	object *
1436	object::insert_at (object *where, object *originator, int flags)	1474	object::insert_at (object *where, object *originator, int flags)
1437	{	1475	{
		1476	if (where->env)
		1477	return where->env->insert (this);
		1478	else
1438	where->map->insert (this, where->x, where->y, originator, flags);	1479	return where->map->insert (this, where->x, where->y, originator, flags);
1439	}	1480	}
1440		1481
1441	/*	1482	// find player who can see this object
1442	* get_split_ob(ob,nr) splits up ob into two parts. The part which	1483	static object *
1443	* is returned contains nr objects, and the remaining parts contains	1484	visible_to (object *op)
1444	* the rest (or is removed and freed if that number is 0).
1445	* On failure, NULL is returned, and the reason put into the
1446	* global static errmsg array.
1447	*/
1448	object *
1449	get_split_ob (object *orig_ob, uint32 nr)
1450	{	1485	{
1451	object *newob;	1486	if (!op->flag [FLAG_REMOVED])
1452	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1453
1454	if (orig_ob->nrof < nr)
1455	{
1456	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1457	return NULL;
1458	}	1487	{
1459		1488	// see if we are in a container of sorts
1460	newob = object_create_clone (orig_ob);	1489	if (object *env = op->env)
1461
1462	if ((orig_ob->nrof -= nr) < 1)
1463	orig_ob->destroy (1);
1464	else if (!is_removed)
1465	{
1466	if (orig_ob->env != NULL)
1467	sub_weight (orig_ob->env, orig_ob->weight * nr);
1468	if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)
1469	{
1470	strcpy (errmsg, "Tried to split object whose map is not in memory.");
1471	LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n");
1472	return NULL;
1473	}	1490	{
1474	}	1491	// the player inventory itself is always visible
		1492	if (env->type == PLAYER)
		1493	return env;
1475		1494
1476	newob->nrof = nr;	1495	// else a player could have our env open
		1496	env = env->outer_env ();
1477		1497
		1498	// the player itself is always on a map, so we will find him here
		1499	// even if our inv is in a player.
		1500	if (env->is_on_map ())
		1501	if (object *pl = env->ms ().player ())
		1502	if (pl->container == op->env)
		1503	return pl;
		1504	}
		1505	else
		1506	{
		1507	// maybe there is a player standing on the same mapspace
		1508	if (object *pl = op->ms ().player ())
		1509	return pl;
		1510	}
		1511	}
		1512
1478	return newob;	1513	return 0;
1479	}	1514	}
1480		1515
1481	/*	1516	/*
1482	* decrease_ob_nr(object, number) decreases a specified number from	1517	* decrease(object, number) decreases a specified number from
1483	* the amount of an object. If the amount reaches 0, the object	1518	* the amount of an object. If the amount reaches 0, the object
1484	* is subsequently removed and freed.	1519	* is subsequently removed and freed.
1485	*	1520	*
1486	* Return value: 'op' if something is left, NULL if the amount reached 0	1521	* Return value: 'op' if something is left, NULL if the amount reached 0
1487	*/	1522	*/
		1523	bool
		1524	object::decrease (sint32 nr)
		1525	{
		1526	nr = min (nr, nrof);
1488		1527
		1528	if (!nr)
		1529	return 1;
		1530
		1531	nrof -= nr;
		1532
		1533	object *visible = visible_to (this);
		1534
		1535	if (nrof)
		1536	{
		1537	adjust_weight (env, -weight * nr); // carrying == 0
		1538
		1539	if (visible)
		1540	esrv_send_item (visible, this);
		1541
		1542	return 1;
		1543	}
		1544	else
		1545	{
		1546	if (visible)
		1547	esrv_del_item (visible->contr, count);
		1548
		1549	this->destroy (1);
		1550	return 0;
		1551	}
		1552	}
		1553
		1554	/*
		1555	* split(ob,nr) splits up ob into two parts. The part which
		1556	* is returned contains nr objects, and the remaining parts contains
		1557	* the rest (or is removed and returned if that number is 0).
		1558	* On failure, NULL is returned.
		1559	*/
1489	object *	1560	object *
1490	decrease_ob_nr (object *op, uint32 i)	1561	object::split (sint32 nr)
1491	{	1562	{
1492	object *tmp;	1563	if (nrof < nr)
1493
1494	if (i == 0) /* objects with op->nrof require this check */
1495	return op;	1564	return 0;
1496		1565	else if (nrof == nr)
1497	if (i > op->nrof)
1498	i = op->nrof;
1499
1500	if (QUERY_FLAG (op, FLAG_REMOVED))
1501	op->nrof -= i;
1502	else if (op->env)
1503	{	1566	{
1504	/* is this object in the players inventory, or sub container
1505	* therein?
1506	*/
1507	tmp = op->in_player ();
1508	/* nope. Is this a container the player has opened?
1509	* If so, set tmp to that player.
1510	* IMO, searching through all the players will mostly
1511	* likely be quicker than following op->env to the map,
1512	* and then searching the map for a player.
1513	*/
1514	if (!tmp)
1515	for_all_players (pl)
1516	if (pl->ob->container == op->env)
1517	{
1518	tmp = pl->ob;
1519	break;
1520	}
1521
1522	if (i < op->nrof)
1523	{
1524	sub_weight (op->env, op->weight * i);
1525	op->nrof -= i;
1526	if (tmp)
1527	esrv_send_item (tmp, op);
1528	}
1529	else
1530	{
1531	op->remove ();	1567	remove ();
1532	op->nrof = 0;	1568	return this;
1533	if (tmp)
1534	esrv_del_item (tmp->contr, op->count);
1535	}
1536	}	1569	}
1537	else	1570	else
1538	{	1571	{
1539	object *above = op->above;	1572	decrease (nr);
1540		1573
1541	if (i < op->nrof)	1574	object *op = object_create_clone (this);
1542	op->nrof -= i;	1575	op->nrof = nr;
1543	else
1544	{
1545	op->remove ();
1546	op->nrof = 0;
1547	}
1548
1549	/* Since we just removed op, op->above is null */
1550	for (tmp = above; tmp; tmp = tmp->above)
1551	if (tmp->type == PLAYER)
1552	{
1553	if (op->nrof)
1554	esrv_send_item (tmp, op);
1555	else
1556	esrv_del_item (tmp->contr, op->count);
1557	}
1558	}
1559
1560	if (op->nrof)
1561	return op;	1576	return op;
1562	else
1563	{
1564	op->destroy ();
1565	return 0;
1566	}
1567	}
1568
1569	/*
1570	* add_weight(object, weight) adds the specified weight to an object,
1571	* and also updates how much the environment(s) is/are carrying.
1572	*/
1573
1574	void
1575	add_weight (object *op, signed long weight)
1576	{
1577	while (op != NULL)
1578	{
1579	if (op->type == CONTAINER)
1580	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1581
1582	op->carrying += weight;
1583	op = op->env;
1584	}	1577	}
1585	}	1578	}
1586		1579
1587	object *	1580	object *
1588	insert_ob_in_ob (object *op, object *where)	1581	insert_ob_in_ob (object *op, object *where)
…		…
1593	LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);	1586	LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
1594	free (dump);	1587	free (dump);
1595	return op;	1588	return op;
1596	}	1589	}
1597		1590
1598	if (where->head)	1591	if (where->head_ () != where)
1599	{	1592	{
1600	LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n");	1593	LOG (llevError | logBacktrace, "Warning: Tried to insert object into wrong part of multipart object.\n");
1601	where = where->head;	1594	where = where->head;
1602	}	1595	}
1603		1596
1604	return where->insert (op);	1597	return where->insert (op);
1605	}	1598	}
…		…
1610	* inside the object environment.	1603	* inside the object environment.
1611	*	1604	*
1612	* The function returns now pointer to inserted item, and return value can	1605	* The function returns now pointer to inserted item, and return value can
1613	* be != op, if items are merged. -Tero	1606	* be != op, if items are merged. -Tero
1614	*/	1607	*/
1615
1616	object *	1608	object *
1617	object::insert (object *op)	1609	object::insert (object *op)
1618	{	1610	{
1619	object *tmp, *otmp;
1620
1621	if (!QUERY_FLAG (op, FLAG_REMOVED))
1622	op->remove ();
1623
1624	if (op->more)	1611	if (op->more)
1625	{	1612	{
1626	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);	1613	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1627	return op;	1614	return op;
1628	}	1615	}
1629		1616
1630	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1617	op->remove ();
1631	CLEAR_FLAG (op, FLAG_REMOVED);	1618
		1619	op->flag [FLAG_OBJ_ORIGINAL] = 0;
		1620
1632	if (op->nrof)	1621	if (op->nrof)
1633	{
1634	for (tmp = inv; tmp != NULL; tmp = tmp->below)	1622	for (object *tmp = inv; tmp; tmp = tmp->below)
1635	if (object::can_merge (tmp, op))	1623	if (object::can_merge (tmp, op))
1636	{	1624	{
1637	/* return the original object and remove inserted object	1625	/* return the original object and remove inserted object
1638	(client needs the original object) */	1626	(client needs the original object) */
1639	tmp->nrof += op->nrof;	1627	tmp->nrof += op->nrof;
1640	/* Weight handling gets pretty funky. Since we are adding to
1641	* tmp->nrof, we need to increase the weight.
1642	*/
1643	add_weight (this, op->weight * op->nrof);	1628	adjust_weight (this, op->total_weight ());
1644	SET_FLAG (op, FLAG_REMOVED);	1629
1645	op->destroy (); /* free the inserted object */	1630	op->destroy (1);
1646	op = tmp;	1631	op = tmp;
1647	op->remove (); /* and fix old object's links */	1632	goto inserted;
1648	CLEAR_FLAG (op, FLAG_REMOVED);
1649	break;
1650	}	1633	}
1651		1634
1652	/* I assume combined objects have no inventory	1635	op->owner = 0; // it's his/hers now. period.
1653	* We add the weight - this object could have just been removed	1636	op->map = 0;
1654	* (if it was possible to merge). calling remove_ob will subtract	1637	op->x = 0;
1655	* the weight, so we need to add it in again, since we actually do	1638	op->y = 0;
1656	* the linking below
1657	*/
1658	add_weight (this, op->weight * op->nrof);
1659	}
1660	else
1661	add_weight (this, (op->weight + op->carrying));
1662		1639
1663	otmp = this->in_player ();	1640	op->above = 0;
1664	if (otmp && otmp->contr)	1641	op->below = inv;
		1642	op->env = this;
		1643
		1644	if (inv)
		1645	inv->above = op;
		1646
		1647	inv = op;
		1648
		1649	op->flag [FLAG_REMOVED] = 0;
		1650
		1651	adjust_weight (this, op->total_weight ());
		1652
		1653	inserted:
		1654	/* reset the light list and los of the players on the map */
		1655	if (op->glow_radius && map && map->darkness)
		1656	update_all_los (map, x, y);
		1657
		1658	if (object *otmp = in_player ())
1665	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1659	if (otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1666	otmp->update_stats ();	1660	otmp->update_stats ();
1667
1668	op->map = 0;
1669	op->env = this;
1670	op->above = 0;
1671	op->below = 0;
1672	op->x = 0, op->y = 0;
1673
1674	/* reset the light list and los of the players on the map */
1675	if ((op->glow_radius != 0) && map)
1676	{
1677	#ifdef DEBUG_LIGHTS
1678	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1679	#endif /* DEBUG_LIGHTS */
1680	if (map->darkness)
1681	update_all_los (map, x, y);
1682	}
1683
1684	/* Client has no idea of ordering so lets not bother ordering it here.
1685	* It sure simplifies this function...
1686	*/
1687	if (!inv)
1688	inv = op;
1689	else
1690	{
1691	op->below = inv;
1692	op->below->above = op;
1693	inv = op;
1694	}
1695		1661
1696	INVOKE_OBJECT (INSERT, this);	1662	INVOKE_OBJECT (INSERT, this);
1697		1663
1698	return op;	1664	return op;
1699	}	1665	}
…		…
1914	* activate recursively a flag on an object inventory	1880	* activate recursively a flag on an object inventory
1915	*/	1881	*/
1916	void	1882	void
1917	flag_inv (object *op, int flag)	1883	flag_inv (object *op, int flag)
1918	{	1884	{
1919	if (op->inv)
1920	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)	1885	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1921	{	1886	{
1922	SET_FLAG (tmp, flag);	1887	SET_FLAG (tmp, flag);
1923	flag_inv (tmp, flag);	1888	flag_inv (tmp, flag);
1924	}	1889	}
1925	}	1890	}
1926		1891
1927	/*	1892	/*
1928	* deactivate recursively a flag on an object inventory	1893	* deactivate recursively a flag on an object inventory
1929	*/	1894	*/
1930	void	1895	void
1931	unflag_inv (object *op, int flag)	1896	unflag_inv (object *op, int flag)
1932	{	1897	{
1933	if (op->inv)
1934	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)	1898	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1935	{	1899	{
1936	CLEAR_FLAG (tmp, flag);	1900	CLEAR_FLAG (tmp, flag);
1937	unflag_inv (tmp, flag);	1901	unflag_inv (tmp, flag);
1938	}	1902	}
1939	}
1940
1941	/*
1942	* set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in
1943	* all it's inventory (recursively).
1944	* If checksums are used, a player will get set_cheat called for
1945	* him/her-self and all object carried by a call to this function.
1946	*/
1947	void
1948	set_cheat (object *op)
1949	{
1950	SET_FLAG (op, FLAG_WAS_WIZ);
1951	flag_inv (op, FLAG_WAS_WIZ);
1952	}	1903	}
1953		1904
1954	/*	1905	/*
1955	* find_free_spot(object, map, x, y, start, stop) will search for	1906	* find_free_spot(object, map, x, y, start, stop) will search for
1956	* a spot at the given map and coordinates which will be able to contain	1907	* a spot at the given map and coordinates which will be able to contain
…		…
1958	* to search (see the freearr_x/y[] definition).	1909	* to search (see the freearr_x/y[] definition).
1959	* It returns a random choice among the alternatives found.	1910	* It returns a random choice among the alternatives found.
1960	* start and stop are where to start relative to the free_arr array (1,9	1911	* start and stop are where to start relative to the free_arr array (1,9
1961	* does all 4 immediate directions). This returns the index into the	1912	* does all 4 immediate directions). This returns the index into the
1962	* array of the free spot, -1 if no spot available (dir 0 = x,y)	1913	* array of the free spot, -1 if no spot available (dir 0 = x,y)
1963	* Note - this only checks to see if there is space for the head of the
1964	* object - if it is a multispace object, this should be called for all
1965	* pieces.
1966	* Note2: This function does correctly handle tiled maps, but does not	1914	* Note: This function does correctly handle tiled maps, but does not
1967	* inform the caller. However, insert_ob_in_map will update as	1915	* inform the caller. However, insert_ob_in_map will update as
1968	* necessary, so the caller shouldn't need to do any special work.	1916	* necessary, so the caller shouldn't need to do any special work.
1969	* Note - updated to take an object instead of archetype - this is necessary	1917	* Note - updated to take an object instead of archetype - this is necessary
1970	* because arch_blocked (now ob_blocked) needs to know the movement type	1918	* because arch_blocked (now ob_blocked) needs to know the movement type
1971	* to know if the space in question will block the object. We can't use	1919	* to know if the space in question will block the object. We can't use
…		…
1973	* customized, changed states, etc.	1921	* customized, changed states, etc.
1974	*/	1922	*/
1975	int	1923	int
1976	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)	1924	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
1977	{	1925	{
		1926	int altern[SIZEOFFREE];
1978	int index = 0, flag;	1927	int index = 0, flag;
1979	int altern[SIZEOFFREE];
1980		1928
1981	for (int i = start; i < stop; i++)	1929	for (int i = start; i < stop; i++)
1982	{	1930	{
1983	flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]);	1931	mapxy pos (m, x, y); pos.move (i);
1984	if (!flag)	1932
		1933	if (!pos.normalise ())
		1934	continue;
		1935
		1936	mapspace &ms = *pos;
		1937
		1938	if (ms.flags () & P_IS_ALIVE)
		1939	continue;
		1940
		1941	/* However, often
		1942	* ob doesn't have any move type (when used to place exits)
		1943	* so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.
		1944	*/
		1945	if (ob && ob->move_type == 0 && ms.move_block != MOVE_ALL)
		1946	{
1985	altern [index++] = i;	1947	altern [index++] = i;
		1948	continue;
		1949	}
1986		1950
1987	/* Basically, if we find a wall on a space, we cut down the search size.	1951	/* Basically, if we find a wall on a space, we cut down the search size.
1988	* In this way, we won't return spaces that are on another side of a wall.	1952	* In this way, we won't return spaces that are on another side of a wall.
1989	* This mostly work, but it cuts down the search size in all directions -	1953	* This mostly work, but it cuts down the search size in all directions -
1990	* if the space being examined only has a wall to the north and empty	1954	* if the space being examined only has a wall to the north and empty
1991	* spaces in all the other directions, this will reduce the search space	1955	* spaces in all the other directions, this will reduce the search space
1992	* to only the spaces immediately surrounding the target area, and	1956	* to only the spaces immediately surrounding the target area, and
1993	* won't look 2 spaces south of the target space.	1957	* won't look 2 spaces south of the target space.
1994	*/	1958	*/
1995	else if ((flag & P_NO_PASS) && maxfree[i] < stop)	1959	if (ms.move_block == MOVE_ALL && maxfree[i] < stop)
		1960	{
1996	stop = maxfree[i];	1961	stop = maxfree[i];
		1962	continue;
		1963	}
		1964
		1965	/* Note it is intentional that we check ob - the movement type of the
		1966	* head of the object should correspond for the entire object.
		1967	*/
		1968	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
		1969	continue;
		1970
		1971	if (ob->blocked (m, pos.x, pos.y))
		1972	continue;
		1973
		1974	altern [index++] = i;
1997	}	1975	}
1998		1976
1999	if (!index)	1977	if (!index)
2000	return -1;	1978	return -1;
2001		1979
…		…
2010	*/	1988	*/
2011	int	1989	int
2012	find_first_free_spot (const object *ob, maptile *m, int x, int y)	1990	find_first_free_spot (const object *ob, maptile *m, int x, int y)
2013	{	1991	{
2014	for (int i = 0; i < SIZEOFFREE; i++)	1992	for (int i = 0; i < SIZEOFFREE; i++)
2015	if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]))	1993	if (!ob->blocked (m, x + freearr_x[i], y + freearr_y[i]))
2016	return i;	1994	return i;
2017		1995
2018	return -1;	1996	return -1;
2019	}	1997	}
2020		1998
…		…
2074	object *tmp;	2052	object *tmp;
2075	maptile *mp;	2053	maptile *mp;
2076		2054
2077	MoveType blocked, move_type;	2055	MoveType blocked, move_type;
2078		2056
2079	if (exclude && exclude->head)	2057	if (exclude && exclude->head_ () != exclude)
2080	{	2058	{
2081	exclude = exclude->head;	2059	exclude = exclude->head;
2082	move_type = exclude->move_type;	2060	move_type = exclude->move_type;
2083	}	2061	}
2084	else	2062	else
…		…
2107	max = maxfree[i];	2085	max = maxfree[i];
2108	else if (mflags & P_IS_ALIVE)	2086	else if (mflags & P_IS_ALIVE)
2109	{	2087	{
2110	for (tmp = ms.bot; tmp; tmp = tmp->above)	2088	for (tmp = ms.bot; tmp; tmp = tmp->above)
2111	if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)	2089	if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)
2112	&& (tmp != exclude || (tmp->head && tmp->head != exclude)))	2090	&& (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2113	break;	2091	break;
2114		2092
2115	if (tmp)	2093	if (tmp)
2116	return freedir[i];	2094	return freedir[i];
2117	}	2095	}
…		…
2297	* Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause	2275	* Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause
2298	* core dumps if they do.	2276	* core dumps if they do.
2299	*	2277	*
2300	* Add a check so we can't pick up invisible objects (0.93.8)	2278	* Add a check so we can't pick up invisible objects (0.93.8)
2301	*/	2279	*/
2302
2303	int	2280	int
2304	can_pick (const object *who, const object *item)	2281	can_pick (const object *who, const object *item)
2305	{	2282	{
2306	return /*QUERY_FLAG(who,FLAG_WIZ)|| */	2283	return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2307	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&	2284	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
…		…
2312	* create clone from object to another	2289	* create clone from object to another
2313	*/	2290	*/
2314	object *	2291	object *
2315	object_create_clone (object *asrc)	2292	object_create_clone (object *asrc)
2316	{	2293	{
2317	object *dst = 0, *tmp, *src, *part, *prev, *item;	2294	object *dst = 0, *tmp, *src, *prev, *item;
2318		2295
2319	if (!asrc)	2296	if (!asrc)
2320	return 0;	2297	return 0;
2321		2298
2322	src = asrc;
2323	if (src->head)
2324	src = src->head;	2299	src = asrc->head_ ();
2325		2300
2326	prev = 0;	2301	prev = 0;
2327	for (part = src; part; part = part->more)	2302	for (object *part = src; part; part = part->more)
2328	{	2303	{
2329	tmp = part->clone ();	2304	tmp = part->clone ();
2330	tmp->x -= src->x;	2305	tmp->x -= src->x;
2331	tmp->y -= src->y;	2306	tmp->y -= src->y;
2332		2307
…		…
2412	if (link->key == canonical_key)	2387	if (link->key == canonical_key)
2413	return link->value;	2388	return link->value;
2414		2389
2415	return 0;	2390	return 0;
2416	}	2391	}
2417
2418		2392
2419	/*	2393	/*
2420	* Updates the canonical_key in op to value.	2394	* Updates the canonical_key in op to value.
2421	*	2395	*
2422	* canonical_key is a shared string (value doesn't have to be).	2396	* canonical_key is a shared string (value doesn't have to be).
…		…
2446	/* Basically, if the archetype has this key set,	2420	/* Basically, if the archetype has this key set,
2447	* we need to store the null value so when we save	2421	* we need to store the null value so when we save
2448	* it, we save the empty value so that when we load,	2422	* it, we save the empty value so that when we load,
2449	* we get this value back again.	2423	* we get this value back again.
2450	*/	2424	*/
2451	if (get_ob_key_link (&op->arch->clone, canonical_key))	2425	if (get_ob_key_link (op->arch, canonical_key))
2452	field->value = 0;	2426	field->value = 0;
2453	else	2427	else
2454	{	2428	{
2455	if (last)	2429	if (last)
2456	last->next = field->next;	2430	last->next = field->next;
…		…
2525	}	2499	}
2526	else	2500	else
2527	item = item->env;	2501	item = item->env;
2528	}	2502	}
2529		2503
2530
2531	const char *	2504	const char *
2532	object::flag_desc (char *desc, int len) const	2505	object::flag_desc (char *desc, int len) const
2533	{	2506	{
2534	char *p = desc;	2507	char *p = desc;
2535	bool first = true;	2508	bool first = true;
…		…
2562	{	2535	{
2563	char flagdesc[512];	2536	char flagdesc[512];
2564	char info2[256 * 4];	2537	char info2[256 * 4];
2565	char *p = info;	2538	char *p = info;
2566		2539
2567	p += snprintf (p, 512, "{cnt:%d,uuid:<1.%" PRIx64 ">,name:\"%s\"%s%s,flags:[%s],type:%d}",	2540	p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s,flags:[%s],type:%d}",
2568	count, uuid.seq,	2541	count,
		2542	uuid.c_str (),
2569	&name,	2543	&name,
2570	title ? "\",title:\"" : "",	2544	title ? "\",title:\"" : "",
2571	title ? (const char *)title : "",	2545	title ? (const char *)title : "",
2572	flag_desc (flagdesc, 512), type);	2546	flag_desc (flagdesc, 512), type);
2573		2547
2574	if (env)	2548	if (!this->flag[FLAG_REMOVED] && env)
2575	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2549	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2576		2550
2577	if (map)	2551	if (map)
2578	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);	2552	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2579		2553
…		…
2581	}	2555	}
2582		2556
2583	const char *	2557	const char *
2584	object::debug_desc () const	2558	object::debug_desc () const
2585	{	2559	{
2586	static char info[256 * 4];	2560	static char info[3][256 * 4];
		2561	static int info_idx;
		2562
2587	return debug_desc (info);	2563	return debug_desc (info [++info_idx % 3]);
2588	}
2589
2590	const char *
2591	object::debug_desc2 () const
2592	{
2593	static char info[256 * 4];
2594	return debug_desc (info);
2595	}	2564	}
2596		2565
2597	struct region *	2566	struct region *
2598	object::region () const	2567	object::region () const
2599	{	2568	{
…		…
2602	}	2571	}
2603		2572
2604	const materialtype_t *	2573	const materialtype_t *
2605	object::dominant_material () const	2574	object::dominant_material () const
2606	{	2575	{
2607	if (materialtype_t *mat = name_to_material (materialname))	2576	if (materialtype_t *mt = name_to_material (materialname))
2608	return mat;	2577	return mt;
2609		2578
2610	// omfg this is slow, this has to be temporary :)
2611	shstr unknown ("unknown");
2612
2613	return name_to_material (unknown);	2579	return name_to_material (shstr_unknown);
2614	}	2580	}
2615		2581
2616	void	2582	void
2617	object::open_container (object *new_container)	2583	object::open_container (object *new_container)
2618	{	2584	{
…		…
2634	old_container->flag [FLAG_APPLIED] = 0;	2600	old_container->flag [FLAG_APPLIED] = 0;
2635	container = 0;	2601	container = 0;
2636		2602
2637	esrv_update_item (UPD_FLAGS, this, old_container);	2603	esrv_update_item (UPD_FLAGS, this, old_container);
2638	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));	2604	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
		2605	play_sound (sound_find ("chest_close"));
2639	}	2606	}
2640		2607
2641	if (new_container)	2608	if (new_container)
2642	{	2609	{
2643	if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))	2610	if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))
…		…
2659	new_container->flag [FLAG_APPLIED] = 1;	2626	new_container->flag [FLAG_APPLIED] = 1;
2660	container = new_container;	2627	container = new_container;
2661		2628
2662	esrv_update_item (UPD_FLAGS, this, new_container);	2629	esrv_update_item (UPD_FLAGS, this, new_container);
2663	esrv_send_inventory (this, new_container);	2630	esrv_send_inventory (this, new_container);
		2631	play_sound (sound_find ("chest_open"));
		2632	}
		2633	}
		2634
		2635	object *
		2636	object::force_find (const shstr name)
		2637	{
		2638	/* cycle through his inventory to look for the MARK we want to
		2639	* place
		2640	*/
		2641	for (object *tmp = inv; tmp; tmp = tmp->below)
		2642	if (tmp->type == FORCE && tmp->slaying == name)
		2643	return splay (tmp);
		2644
		2645	return 0;
		2646	}
		2647
		2648	void
		2649	object::force_add (const shstr name, int duration)
		2650	{
		2651	if (object *force = force_find (name))
		2652	force->destroy ();
		2653
		2654	object *force = get_archetype (FORCE_NAME);
		2655
		2656	force->slaying = name;
		2657	force->stats.food = 1;
		2658	force->speed_left = -1.f;
		2659
		2660	force->set_speed (duration ? 1.f / duration : 0.f);
		2661	force->flag [FLAG_IS_USED_UP] = true;
		2662	force->flag [FLAG_APPLIED] = true;
		2663
		2664	insert (force);
		2665	}
		2666
		2667	void
		2668	object::play_sound (faceidx sound)
		2669	{
		2670	if (!sound)
		2671	return;
		2672
		2673	if (flag [FLAG_REMOVED])
		2674	return;
		2675
		2676	if (env)
2664	}	2677	{
		2678	if (object *pl = in_player ())
		2679	pl->contr->play_sound (sound);
		2680	}
		2681	else
		2682	map->play_sound (sound, x, y);
2665	}	2683	}
2666		2684
2667

Diff Legend

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