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.95 by root, Wed Dec 27 05:42:08 2006 UTC vs.
Revision 1.207 by root, Sun Apr 20 23:25:09 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 (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
4	Copyright (C) 2001 Mark Wedel & Crossfire Development Team	5	* Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team
5	Copyright (C) 1992 Frank Tore Johansen	6	* Copyright (©) 1992,2007 Frank Tore Johansen
6		7	*
7	This program is free software; you can redistribute it and/or modify	8	* Deliantra is free software: you can redistribute it and/or modify
8	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
9	the Free Software Foundation; either version 2 of the License, or	10	* the Free Software Foundation, either version 3 of the License, or
10	(at your option) any later version.	11	* (at your option) any later version.
11		12	*
12	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,
13	but WITHOUT ANY WARRANTY; without even the implied warranty of	14	* but WITHOUT ANY WARRANTY; without even the implied warranty of
14	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15	GNU General Public License for more details.	16	* GNU General Public License for more details.
16		17	*
17	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
18	along with this program; if not, write to the Free Software	19	* along with this program. If not, see <http://www.gnu.org/licenses/>.
19	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.	20	*
20		21	* The authors can be reached via e-mail to <support@deliantra.net>
21	The authors can be reached via e-mail at <crossfire@schmorp.de>
22	*/	22	*/
23		23
24	/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.	24	/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
25	sub/add_weight will transcend the environment updating the carrying	25	sub/add_weight will transcend the environment updating the carrying
26	variable. */	26	variable. */
		27
27	#include <global.h>	28	#include <global.h>
28	#include <stdio.h>	29	#include <stdio.h>
29	#include <sys/types.h>	30	#include <sys/types.h>
30	#include <sys/uio.h>	31	#include <sys/uio.h>
31	#include <object.h>	32	#include <object.h>
32	#include <funcpoint.h>	33	#include <funcpoint.h>
		34	#include <sproto.h>
33	#include <loader.h>	35	#include <loader.h>
34		36
35	#include <bitset>	37	#include <bitset>
36		38
37	int nrofallocobjects = 0;	39	UUID UUID::cur;
38	static UUID uuid;	40	static uint64_t seq_next_save;
39	const uint64 UUID_SKIP = 1<<19;	41	static const uint64 UUID_GAP = 1<<19;
40		42
41	object *active_objects; /* List of active objects that need to be processed */	43	objectvec objects;
		44	activevec actives;
42		45
43	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,	46	short freearr_x[SIZEOFFREE] = {
		47	0,
		48	0, 1, 1, 1, 0, -1, -1, -1,
		49	0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,
44	0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1	50	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	};	51	};
46	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,	52	short freearr_y[SIZEOFFREE] = {
		53	0,
		54	-1, -1, 0, 1, 1, 1, 0, -1,
		55	-2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2,
47	-3, -3, -3, -3, -2, -1, 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3	56	-3, -3, -3, -3, -2, -1, 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3
48	};	57	};
49	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,	58	int maxfree[SIZEOFFREE] = {
		59	0,
		60	9, 10, 13, 14, 17, 18, 21, 22,
		61	25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45, 48,
50	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	62	49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49
51	};	63	};
52	int freedir[SIZEOFFREE] = {	64	int freedir[SIZEOFFREE] = {
53	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,	65	0,
		66	1, 2, 3, 4, 5, 6, 7, 8,
		67	1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8,
54	1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8	68	1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8
55	};	69	};
56		70
57	static void	71	static void
58	write_uuid (void)	72	write_uuid (uval64 skip, bool sync)
59	{	73	{
60	char filename1[MAX_BUF], filename2[MAX_BUF];	74	CALL_BEGIN (2);
61		75	CALL_ARG_SV (newSVval64 (skip));
62	sprintf (filename1, "%s/uuid", settings.localdir);	76	CALL_ARG_SV (boolSV (sync));
63	sprintf (filename2, "%s/uuid~", settings.localdir);	77	CALL_CALL ("cf::write_uuid", G_DISCARD);
64		78	CALL_END;
65	FILE *fp;
66
67	if (!(fp = fopen (filename2, "w")))
68	{
69	LOG (llevError, "ERROR: cannot open %s for writing, unable to write UUID!\n", filename2);
70	return;
71	}
72
73	fprintf (fp, "<1,%llx>\n", (unsigned long long)uuid.seq + UUID_SKIP * 2);
74	fclose (fp);
75	rename (filename2, filename1);
76	}	79	}
77		80
78	static void	81	static void
79	read_uuid (void)	82	read_uuid (void)
80	{	83	{
81	char filename[MAX_BUF];	84	char filename[MAX_BUF];
82		85
83	sprintf (filename, "%s/uuid", settings.localdir);	86	sprintf (filename, "%s/uuid", settings.localdir);
84		87
		88	seq_next_save = 0;
		89
85	FILE *fp;	90	FILE *fp;
86		91
87	if (!(fp = fopen (filename, "r")))	92	if (!(fp = fopen (filename, "r")))
88	{	93	{
89	if (errno == ENOENT)	94	if (errno == ENOENT)
90	{	95	{
91	LOG (llevInfo, "RESET uid to 1\n");	96	LOG (llevInfo, "RESET uid to 1\n");
92	uuid.seq = 0;	97	UUID::cur.seq = 0;
93	write_uuid ();	98	write_uuid (UUID_GAP, true);
94	return;	99	return;
95	}	100	}
96		101
97	LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);	102	LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);
98	_exit (1);	103	_exit (1);
99	}	104	}
100		105
101	int version;	106	UUID::BUF buf;
102	unsigned long long uid;	107	buf[0] = 0;
103	if (2 != fscanf (fp, "<%d,%llx>\n", &version, &uid) || version != 1)	108	fgets (buf, sizeof (buf), fp);
		109
		110	if (!UUID::cur.parse (buf))
104	{	111	{
105	LOG (llevError, "FATAL: error reading uid from %s!\n", filename);	112	LOG (llevError, "FATAL: error reading uid from %s (%s)!\n", filename, buf);
106	_exit (1);	113	_exit (1);
107	}	114	}
108		115
109	uuid.seq = uid;	116	LOG (llevDebug, "read UUID: %s\n", UUID::cur.c_str ());
110	write_uuid ();	117
111	LOG (llevDebug, "read UID: %" PRId64 "\n", uid);	118	write_uuid (UUID_GAP, true);
112	fclose (fp);	119	fclose (fp);
113	}	120	}
114		121
115	UUID	122	UUID
116	gen_uuid ()	123	UUID::gen ()
117	{	124	{
118	UUID uid;	125	UUID uid;
119		126
120	uid.seq = ++uuid.seq;	127	uid.seq = ++cur.seq;
121		128
122	if (!(uuid.seq & (UUID_SKIP - 1)))	129	if (expect_false (cur.seq >= seq_next_save))
123	write_uuid ();	130	{
		131	seq_next_save = UUID::cur.seq + (UUID_GAP >> 1);
		132	write_uuid (UUID_GAP, false);
		133	}
		134
124		135
125	return uid;	136	return uid;
126	}	137	}
127		138
128	void	139	void
129	init_uuid ()	140	UUID::init ()
130	{	141	{
131	read_uuid ();	142	read_uuid ();
132	}	143	}
133		144
134	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */	145	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */
135	static int	146	static bool
136	compare_ob_value_lists_one (const object *wants, const object *has)	147	compare_ob_value_lists_one (const object *wants, const object *has)
137	{	148	{
138	key_value *wants_field;	149	key_value *wants_field;
139		150
140	/* n-squared behaviour (see get_ob_key_link()), but I'm hoping both	151	/* n-squared behaviour (see get_ob_key_link()), but I'm hoping both
…		…
148	key_value *has_field;	159	key_value *has_field;
149		160
150	/* Look for a field in has with the same key. */	161	/* Look for a field in has with the same key. */
151	has_field = get_ob_key_link (has, wants_field->key);	162	has_field = get_ob_key_link (has, wants_field->key);
152		163
153	if (has_field == NULL)	164	if (!has_field)
154	{
155	/* No field with that name. */	165	return 0; /* No field with that name. */
156	return FALSE;
157	}
158		166
159	/* Found the matching field. */	167	/* Found the matching field. */
160	if (has_field->value != wants_field->value)	168	if (has_field->value != wants_field->value)
161	{
162	/* Values don't match, so this half of the comparison is false. */	169	return 0; /* Values don't match, so this half of the comparison is false. */
163	return FALSE;
164	}
165		170
166	/* If we get here, we found a match. Now for the next field in wants. */	171	/* If we get here, we found a match. Now for the next field in wants. */
167	}	172	}
168		173
169	/* If we get here, every field in wants has a matching field in has. */	174	/* If we get here, every field in wants has a matching field in has. */
170	return TRUE;	175	return 1;
171	}	176	}
172		177
173	/* Returns TRUE if ob1 has the same key_values as ob2. */	178	/* Returns TRUE if ob1 has the same key_values as ob2. */
174	static int	179	static bool
175	compare_ob_value_lists (const object *ob1, const object *ob2)	180	compare_ob_value_lists (const object *ob1, const object *ob2)
176	{	181	{
177	/* However, there may be fields in has which aren't partnered in wants,	182	/* However, there may be fields in has which aren't partnered in wants,
178	* so we need to run the comparison *twice*. :(	183	* so we need to run the comparison *twice*. :(
179	*/	184	*/
…		…
190	* Check nrof variable *before* calling can_merge()	195	* Check nrof variable *before* calling can_merge()
191	*	196	*
192	* Improvements made with merge: Better checking on potion, and also	197	* Improvements made with merge: Better checking on potion, and also
193	* check weight	198	* check weight
194	*/	199	*/
195
196	bool object::can_merge_slow (object *ob1, object *ob2)	200	bool object::can_merge_slow (object *ob1, object *ob2)
197	{	201	{
198	/* A couple quicksanity checks */	202	/* A couple quicksanity checks */
199	if (ob1 == ob2	203	if (ob1 == ob2
200	|| ob1->type != ob2->type	204	|| ob1->type != ob2->type
201	|| ob1->speed != ob2->speed	205	|| ob1->speed != ob2->speed
202	|| ob1->value != ob2->value	206	|| ob1->value != ob2->value
203	|| ob1->name != ob2->name)	207	|| ob1->name != ob2->name)
204	return 0;	208	return 0;
205		209
206	//TODO: this ain't working well, use nicer and correct overflow check	210	/* Do not merge objects if nrof would overflow. First part checks
207	/* Do not merge objects if nrof would overflow. We use 1UL<<31 since that	211	* for unsigned overflow (2c), second part checks wether the result
208	* value could not be stored in a sint32 (which unfortunately sometimes is	212	* would fit into a 32 bit signed int, which is often used to hold
209	* used to store nrof).	213	* nrof values.
210	*/	214	*/
211	if (ob1->nrof + ob2->nrof >= 1UL << 31)	215	if (~ob1->nrof < ob2->nrof || ob1->nrof + ob2->nrof > (1UL << 31))
212	return 0;	216	return 0;
213		217
214	/* If the objects have been identified, set the BEEN_APPLIED flag.	218	/* If the objects have been identified, set the BEEN_APPLIED flag.
215	* This is to the comparison of the flags below will be OK. We	219	* This is to the comparison of the flags below will be OK. We
216	* just can't ignore the been applied or identified flags, as they	220	* just can't ignore the been applied or identified flags, as they
217	* are not equal - just if it has been identified, the been_applied	221	* are not equal - just if it has been identified, the been_applied
218	* flags lose any meaning.	222	* flags lose any meaning.
219	*/	223	*/
220	if (QUERY_FLAG (ob1, FLAG_IDENTIFIED))	224	if (QUERY_FLAG (ob1, FLAG_IDENTIFIED))
…		…
248	|| ob1->move_off != ob2->move_off	252	|| ob1->move_off != ob2->move_off
249	|| ob1->move_slow != ob2->move_slow	253	|| ob1->move_slow != ob2->move_slow
250	|| ob1->move_slow_penalty != ob2->move_slow_penalty)	254	|| ob1->move_slow_penalty != ob2->move_slow_penalty)
251	return 0;	255	return 0;
252		256
253	/* This is really a spellbook check - really, we should	257	/* This is really a spellbook check - we should in general
254	* check all objects in the inventory.	258	* not merge objects with real inventories, as splitting them
		259	* is hard.
255	*/	260	*/
256	if (ob1->inv || ob2->inv)	261	if (ob1->inv || ob2->inv)
257	{	262	{
258	/* if one object has inventory but the other doesn't, not equiv */	263	if (!(ob1->inv && ob2->inv))
259	if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv))	264	return 0; /* inventories differ in length */
260	return 0;
261		265
262	/* Now check to see if the two inventory objects could merge */	266	if (ob1->inv->below || ob2->inv->below)
		267	return 0; /* more than one object in inv */
		268
263	if (!object::can_merge (ob1->inv, ob2->inv))	269	if (!object::can_merge (ob1->inv, ob2->inv))
264	return 0;	270	return 0; /* inventory objects differ */
265		271
266	/* inventory ok - still need to check rest of this object to see	272	/* inventory ok - still need to check rest of this object to see
267	* if it is valid.	273	* if it is valid.
268	*/	274	*/
269	}	275	}
…		…
277		283
278	/* Note sure why the following is the case - either the object has to	284	/* Note sure why the following is the case - either the object has to
279	* be animated or have a very low speed. Is this an attempted monster	285	* be animated or have a very low speed. Is this an attempted monster
280	* check?	286	* check?
281	*/	287	*/
282	if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && FABS ((ob1)->speed) > MIN_ACTIVE_SPEED)	288	if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && ob1->has_active_speed ())
283	return 0;	289	return 0;
284		290
285	switch (ob1->type)	291	switch (ob1->type)
286	{	292	{
287	case SCROLL:	293	case SCROLL:
288	if (ob1->level != ob2->level)	294	if (ob1->level != ob2->level)
289	return 0;	295	return 0;
290	break;	296	break;
291	}	297	}
292		298
293	if (ob1->key_values != NULL || ob2->key_values != NULL)	299	if (ob1->key_values || ob2->key_values)
294	{	300	{
295	/* At least one of these has key_values. */	301	/* At least one of these has key_values. */
296	if ((ob1->key_values == NULL) != (ob2->key_values == NULL))	302	if ((!ob1->key_values) != (!ob2->key_values))
297	/* One has fields, but the other one doesn't. */	303	/* One has fields, but the other one doesn't. */
298	return 0;	304	return 0;
299	else if (!compare_ob_value_lists (ob1, ob2))	305	else if (!compare_ob_value_lists (ob1, ob2))
300	return 0;	306	return 0;
301	}	307	}
302		308
303	//TODO: generate an event or call into perl for additional checks
304	if (ob1->self || ob2->self)	309	if (ob1->self || ob2->self)
305	{	310	{
306	ob1->optimise ();	311	ob1->optimise ();
307	ob2->optimise ();	312	ob2->optimise ();
308		313
309	if (ob1->self || ob2->self)	314	if (ob1->self || ob2->self)
		315	{
		316	int k1 = ob1->self ? HvTOTALKEYS (ob1->self) : 0;
		317	int k2 = ob2->self ? HvTOTALKEYS (ob2->self) : 0;
		318
		319	if (k1 != k2)
310	return 0;	320	return 0;
		321	else if (k1 == 0)
		322	return 1;
		323	else if (!cfperl_can_merge (ob1, ob2))
		324	return 0;
		325	}
311	}	326	}
312		327
313	/* Everything passes, must be OK. */	328	/* Everything passes, must be OK. */
314	return 1;	329	return 1;
315	}	330	}
316		331
		332	static sint32
		333	weight_adjust (object *op, sint32 weight)
		334	{
		335	return op->type == CONTAINER
		336	? lerp (weight, 0, 100, 0, 100 - op->stats.Str)
		337	: weight;
		338	}
		339
317	/*	340	/*
		341	* add_weight(object, weight) adds the specified weight to an object,
		342	* and also updates how much the environment(s) is/are carrying.
		343	*/
		344	static void
		345	add_weight (object *op, sint32 weight)
		346	{
		347	while (op)
		348	{
		349	weight = weight_adjust (op, weight);
		350
		351	op->carrying += weight;
		352	op = op->env;
		353	}
		354	}
		355
		356	/*
		357	* sub_weight() recursively (outwards) subtracts a number from the
		358	* weight of an object (and what is carried by it's environment(s)).
		359	*/
		360	static void
		361	sub_weight (object *op, long weight)
		362	{
		363	add_weight (op, -weight);
		364	}
		365
		366	/*
318	* sum_weight() is a recursive function which calculates the weight	367	* this is a recursive function which calculates the weight
319	* an object is carrying. It goes through in figures out how much	368	* an object is carrying. It goes through op and figures out how much
320	* containers are carrying, and sums it up.	369	* containers are carrying, and sums it up.
321	*/	370	*/
322	long	371	void
323	sum_weight (object *op)	372	object::update_weight ()
324	{	373	{
325	long sum;	374	sint32 sum = 0;
326	object *inv;
327		375
328	for (sum = 0, inv = op->inv; inv != NULL; inv = inv->below)	376	for (object *op = inv; op; op = op->below)
329	{	377	{
330	if (inv->inv)	378	if (op->inv)
331	sum_weight (inv);	379	op->update_weight ();
332	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);
333	}
334		380
335	if (op->type == CONTAINER && op->stats.Str)	381	sum += op->total_weight ();
336	sum = (sum * (100 - op->stats.Str)) / 100;	382	}
337		383
338	if (op->carrying != sum)	384	carrying = weight_adjust (this, sum);
339	op->carrying = sum;
340
341	return sum;
342	}
343
344	/**
345	* Return the outermost environment object for a given object.
346	*/
347
348	object *
349	object_get_env_recursive (object *op)
350	{
351	while (op->env != NULL)
352	op = op->env;
353	return op;
354	}	385	}
355		386
356	/*	387	/*
357	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.	388	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
358	* Some error messages.	389	* Some error messages.
359	* The result of the dump is stored in the static global errmsg array.	390	* The result of the dump is stored in the static global errmsg array.
360	*/	391	*/
361
362	char *	392	char *
363	dump_object (object *op)	393	dump_object (object *op)
364	{	394	{
365	if (!op)	395	if (!op)
366	return strdup ("[NULLOBJ]");	396	return strdup ("[NULLOBJ]");
367		397
368	object_freezer freezer;	398	object_freezer freezer;
369	save_object (freezer, op, 1);	399	op->write (freezer);
370	return freezer.as_string ();	400	return freezer.as_string ();
371	}	401	}
372		402
373	/*	403	/*
374	* get_nearest_part(multi-object, object 2) returns the part of the	404	* get_nearest_part(multi-object, object 2) returns the part of the
375	* multi-object 1 which is closest to the second object.	405	* multi-object 1 which is closest to the second object.
376	* If it's not a multi-object, it is returned.	406	* If it's not a multi-object, it is returned.
377	*/	407	*/
378
379	object *	408	object *
380	get_nearest_part (object *op, const object *pl)	409	get_nearest_part (object *op, const object *pl)
381	{	410	{
382	object *tmp, *closest;	411	object *tmp, *closest;
383	int last_dist, i;	412	int last_dist, i;
…		…
391	}	420	}
392		421
393	/*	422	/*
394	* Returns the object which has the count-variable equal to the argument.	423	* Returns the object which has the count-variable equal to the argument.
395	*/	424	*/
396
397	object *	425	object *
398	find_object (tag_t i)	426	find_object (tag_t i)
399	{	427	{
400	for (object *op = object::first; op; op = op->next)	428	for_all_objects (op)
401	if (op->count == i)	429	if (op->count == i)
402	return op;	430	return op;
403		431
404	return 0;	432	return 0;
405	}	433	}
406		434
407	/*	435	/*
408	* Returns the first object which has a name equal to the argument.	436	* Returns the first object which has a name equal to the argument.
409	* Used only by the patch command, but not all that useful.	437	* Used only by the patch command, but not all that useful.
410	* Enables features like "patch <name-of-other-player> food 999"	438	* Enables features like "patch <name-of-other-player> food 999"
411	*/	439	*/
412
413	object *	440	object *
414	find_object_name (const char *str)	441	find_object_name (const char *str)
415	{	442	{
416	shstr_cmp str_ (str);	443	shstr_cmp str_ (str);
417	object *op;	444	object *op;
418		445
419	for (op = object::first; op != NULL; op = op->next)	446	for_all_objects (op)
420	if (op->name == str_)	447	if (op->name == str_)
421	break;	448	break;
422		449
423	return op;	450	return op;
424	}	451	}
425		452
426	void
427	free_all_object_data ()
428	{
429	LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);
430	}
431
432	/*	453	/*
433	* Sets the owner and sets the skill and exp pointers to owner's current	454	* Sets the owner and sets the skill and exp pointers to owner's current
434	* skill and experience objects.	455	* skill and experience objects.
		456	* ACTUALLY NO! investigate! TODO
435	*/	457	*/
436	void	458	void
437	object::set_owner (object *owner)	459	object::set_owner (object *owner)
438	{	460	{
		461	// allow objects which own objects
439	if (!owner)	462	if (owner)
440	return;
441
442	/* next line added to allow objects which own objects */
443	/* Add a check for ownercounts in here, as I got into an endless loop
444	* with the fireball owning a poison cloud which then owned the
445	* fireball. I believe that was caused by one of the objects getting
446	* freed and then another object replacing it. Since the ownercounts
447	* didn't match, this check is valid and I believe that cause is valid.
448	*/
449	while (owner->owner)	463	while (owner->owner)
450	owner = owner->owner;	464	owner = owner->owner;
		465
		466	if (flag [FLAG_FREED])
		467	{
		468	LOG (llevError | logBacktrace, "tried to set owner of %s to %s\n", debug_desc (), owner->debug_desc ());
		469	return;
		470	}
451		471
452	this->owner = owner;	472	this->owner = owner;
		473	}
		474
		475	int
		476	object::slottype () const
		477	{
		478	if (type == SKILL)
		479	{
		480	if (IS_COMBAT_SKILL (subtype)) return slot_combat;
		481	if (IS_RANGED_SKILL (subtype)) return slot_ranged;
		482	}
		483	else
		484	{
		485	if (slot [body_combat].info) return slot_combat;
		486	if (slot [body_range ].info) return slot_ranged;
		487	}
		488
		489	return slot_none;
		490	}
		491
		492	bool
		493	object::change_weapon (object *ob)
		494	{
		495	if (current_weapon == ob)
		496	return true;
		497
		498	if (chosen_skill)
		499	chosen_skill->flag [FLAG_APPLIED] = false;
		500
		501	current_weapon = ob;
		502	chosen_skill = !ob || ob->type == SKILL ? ob : find_skill_by_name (this, ob->skill);
		503
		504	if (chosen_skill)
		505	chosen_skill->flag [FLAG_APPLIED] = true;
		506
		507	update_stats ();
		508
		509	if (ob)
		510	{
		511	// now check wether any body locations became invalid, in which case
		512	// we cannot apply the weapon at the moment.
		513	for (int i = 0; i < NUM_BODY_LOCATIONS; ++i)
		514	if (slot[i].used < 0)
		515	{
		516	current_weapon = chosen_skill = 0;
		517	update_stats ();
		518
		519	new_draw_info_format (NDI_UNIQUE, 0, this,
		520	"You try to balance all your items at once, "
		521	"but the %s is just too much for your body. "
		522	"[You need to unapply some items first.]", &ob->name);
		523	return false;
		524	}
		525
		526	//new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);
		527	}
		528	else
		529	;//new_draw_info_format (NDI_UNIQUE, 0, this, "You unwield your weapons.");
		530
		531	if (ob && !ob->flag [FLAG_APPLIED] && ob->type != SPELL)
		532	{
		533	LOG (llevError | logBacktrace, "%s changed to unapplied weapon %s",
		534	&name, ob->debug_desc ());
		535	return false;
		536	}
		537
		538	return true;
453	}	539	}
454		540
455	/* Zero the key_values on op, decrementing the shared-string	541	/* Zero the key_values on op, decrementing the shared-string
456	* refcounts and freeing the links.	542	* refcounts and freeing the links.
457	*/	543	*/
458	static void	544	static void
459	free_key_values (object *op)	545	free_key_values (object *op)
460	{	546	{
461	for (key_value *i = op->key_values; i != 0;)	547	for (key_value *i = op->key_values; i; )
462	{	548	{
463	key_value *next = i->next;	549	key_value *next = i->next;
464	delete i;	550	delete i;
465		551
466	i = next;	552	i = next;
467	}	553	}
468		554
469	op->key_values = 0;	555	op->key_values = 0;
470	}	556	}
471		557
472	/*	558	object &
473	* copy_to first frees everything allocated by the dst object,	559	object::operator =(const object &src)
474	* and then copies the contents of itself into the second
475	* object, allocating what needs to be allocated. Basically, any
476	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
477	* if the first object is freed, the pointers in the new object
478	* will point at garbage.
479	*/
480	void
481	object::copy_to (object *dst)
482	{	560	{
483	bool is_freed = QUERY_FLAG (dst, FLAG_FREED);	561	bool is_freed = flag [FLAG_FREED];
484	bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED);	562	bool is_removed = flag [FLAG_REMOVED];
485		563
486	*(object_copy *)dst = *this;	564	*(object_copy *)this = src;
487		565
488	if (is_freed)	566	flag [FLAG_FREED] = is_freed;
489	SET_FLAG (dst, FLAG_FREED);	567	flag [FLAG_REMOVED] = is_removed;
490
491	if (is_removed)
492	SET_FLAG (dst, FLAG_REMOVED);
493
494	if (speed < 0)
495	dst->speed_left = speed_left - RANDOM () % 200 / 100.0;
496		568
497	/* Copy over key_values, if any. */	569	/* Copy over key_values, if any. */
498	if (key_values)	570	if (src.key_values)
499	{	571	{
500	key_value *tail = 0;	572	key_value *tail = 0;
501	key_value *i;
502
503	dst->key_values = 0;	573	key_values = 0;
504		574
505	for (i = key_values; i; i = i->next)	575	for (key_value *i = src.key_values; i; i = i->next)
506	{	576	{
507	key_value *new_link = new key_value;	577	key_value *new_link = new key_value;
508		578
509	new_link->next = 0;	579	new_link->next = 0;
510	new_link->key = i->key;	580	new_link->key = i->key;
511	new_link->value = i->value;	581	new_link->value = i->value;
512		582
513	/* Try and be clever here, too. */	583	/* Try and be clever here, too. */
514	if (!dst->key_values)	584	if (!key_values)
515	{	585	{
516	dst->key_values = new_link;	586	key_values = new_link;
517	tail = new_link;	587	tail = new_link;
518	}	588	}
519	else	589	else
520	{	590	{
521	tail->next = new_link;	591	tail->next = new_link;
522	tail = new_link;	592	tail = new_link;
523	}	593	}
524	}	594	}
525	}	595	}
		596	}
		597
		598	/*
		599	* copy_to first frees everything allocated by the dst object,
		600	* and then copies the contents of itself into the second
		601	* object, allocating what needs to be allocated. Basically, any
		602	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
		603	* if the first object is freed, the pointers in the new object
		604	* will point at garbage.
		605	*/
		606	void
		607	object::copy_to (object *dst)
		608	{
		609	*dst = *this;
		610
		611	if (speed < 0)
		612	dst->speed_left -= rndm ();
526		613
527	dst->set_speed (dst->speed);	614	dst->set_speed (dst->speed);
		615	}
		616
		617	void
		618	object::instantiate ()
		619	{
		620	if (!uuid.seq) // HACK
		621	uuid = UUID::gen ();
		622
		623	speed_left = -0.1f;
		624	/* copy the body_info to the body_used - this is only really
		625	* need for monsters, but doesn't hurt to do it for everything.
		626	* by doing so, when a monster is created, it has good starting
		627	* values for the body_used info, so when items are created
		628	* for it, they can be properly equipped.
		629	*/
		630	for (int i = NUM_BODY_LOCATIONS; i--; )
		631	slot[i].used = slot[i].info;
		632
		633	attachable::instantiate ();
528	}	634	}
529		635
530	object *	636	object *
531	object::clone ()	637	object::clone ()
532	{	638	{
…		…
538	/*	644	/*
539	* If an object with the IS_TURNABLE() flag needs to be turned due	645	* If an object with the IS_TURNABLE() flag needs to be turned due
540	* to the closest player being on the other side, this function can	646	* to the closest player being on the other side, this function can
541	* be called to update the face variable, _and_ how it looks on the map.	647	* be called to update the face variable, _and_ how it looks on the map.
542	*/	648	*/
543
544	void	649	void
545	update_turn_face (object *op)	650	update_turn_face (object *op)
546	{	651	{
547	if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || op->arch == NULL)	652	if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || !op->arch)
548	return;	653	return;
		654
549	SET_ANIMATION (op, op->direction);	655	SET_ANIMATION (op, op->direction);
550	update_object (op, UP_OBJ_FACE);	656	update_object (op, UP_OBJ_FACE);
551	}	657	}
552		658
553	/*	659	/*
…		…
556	* This function needs to be called whenever the speed of an object changes.	662	* This function needs to be called whenever the speed of an object changes.
557	*/	663	*/
558	void	664	void
559	object::set_speed (float speed)	665	object::set_speed (float speed)
560	{	666	{
561	extern int arch_init;
562
563	/* No reason putting the archetypes objects on the speed list,
564	* since they never really need to be updated.
565	*/
566	if (flag [FLAG_FREED] && speed)	667	if (flag [FLAG_FREED] && speed)
567	{	668	{
568	LOG (llevError, "Object %s is freed but has speed.\n", &name);	669	LOG (llevError, "Object %s is freed but has speed.\n", &name);
569	speed = 0;	670	speed = 0;
570	}	671	}
571		672
572	this->speed = speed;	673	this->speed = speed;
573		674
574	if (arch_init)	675	if (has_active_speed ())
575	return;	676	activate ();
576
577	if (FABS (speed) > MIN_ACTIVE_SPEED)
578	{
579	/* If already on active list, don't do anything */
580	if (active_next || active_prev || this == active_objects)
581	return;
582
583	/* process_events() expects us to insert the object at the beginning
584	* of the list. */
585	active_next = active_objects;
586
587	if (active_next)
588	active_next->active_prev = this;
589
590	active_objects = this;
591	}
592	else	677	else
593	{	678	deactivate ();
594	/* If not on the active list, nothing needs to be done */
595	if (!active_next && !active_prev && this != active_objects)
596	return;
597
598	if (!active_prev)
599	{
600	active_objects = active_next;
601
602	if (active_next)
603	active_next->active_prev = 0;
604	}
605	else
606	{
607	active_prev->active_next = active_next;
608
609	if (active_next)
610	active_next->active_prev = active_prev;
611	}
612
613	active_next = 0;
614	active_prev = 0;
615	}
616	}
617
618	/* This function removes object 'op' from the list of active
619	* objects.
620	* This should only be used for style maps or other such
621	* reference maps where you don't want an object that isn't
622	* in play chewing up cpu time getting processed.
623	* The reverse of this is to call update_ob_speed, which
624	* will do the right thing based on the speed of the object.
625	*/
626	void
627	remove_from_active_list (object *op)
628	{
629	/* If not on the active list, nothing needs to be done */
630	if (!op->active_next && !op->active_prev && op != active_objects)
631	return;
632
633	if (op->active_prev == NULL)
634	{
635	active_objects = op->active_next;
636	if (op->active_next != NULL)
637	op->active_next->active_prev = NULL;
638	}
639	else
640	{
641	op->active_prev->active_next = op->active_next;
642	if (op->active_next)
643	op->active_next->active_prev = op->active_prev;
644	}
645	op->active_next = NULL;
646	op->active_prev = NULL;
647	}	679	}
648		680
649	/*	681	/*
650	* update_object() updates the the map.	682	* update_object() updates the the map.
651	* It takes into account invisible objects (and represent squares covered	683	* It takes into account invisible objects (and represent squares covered
…		…
664	* UP_OBJ_FACE: only the objects face has changed.	696	* UP_OBJ_FACE: only the objects face has changed.
665	*/	697	*/
666	void	698	void
667	update_object (object *op, int action)	699	update_object (object *op, int action)
668	{	700	{
669	MoveType move_on, move_off, move_block, move_slow;
670
671	if (op == NULL)	701	if (op == NULL)
672	{	702	{
673	/* this should never happen */	703	/* this should never happen */
674	LOG (llevDebug, "update_object() called for NULL object.\n");	704	LOG (llevDebug, "update_object() called for NULL object.\n");
675	return;	705	return;
…		…
699	return;	729	return;
700	}	730	}
701		731
702	mapspace &m = op->ms ();	732	mapspace &m = op->ms ();
703		733
704	if (m.flags_ & P_NEED_UPDATE)	734	if (!(m.flags_ & P_UPTODATE))
705	/* nop */;	735	/* nop */;
706	else if (action == UP_OBJ_INSERT)	736	else if (action == UP_OBJ_INSERT)
707	{	737	{
708	// this is likely overkill, TODO: revisit (schmorp)	738	// this is likely overkill, TODO: revisit (schmorp)
709	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))	739	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
…		…
718	/* This isn't perfect, but I don't expect a lot of objects to	748	/* This isn't perfect, but I don't expect a lot of objects to
719	* to have move_allow right now.	749	* to have move_allow right now.
720	*/	750	*/
721	|| ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block	751	|| ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block
722	|| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)	752	|| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)
723	m.flags_ = P_NEED_UPDATE;	753	m.flags_ = 0;
724	}	754	}
725	/* if the object is being removed, we can't make intelligent	755	/* if the object is being removed, we can't make intelligent
726	* decisions, because remove_ob can't really pass the object	756	* decisions, because remove_ob can't really pass the object
727	* that is being removed.	757	* that is being removed.
728	*/	758	*/
729	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)	759	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
730	m.flags_ = P_NEED_UPDATE;	760	m.flags_ = 0;
731	else if (action == UP_OBJ_FACE)	761	else if (action == UP_OBJ_FACE)
732	/* Nothing to do for that case */ ;	762	/* Nothing to do for that case */ ;
733	else	763	else
734	LOG (llevError, "update_object called with invalid action: %d\n", action);	764	LOG (llevError, "update_object called with invalid action: %d\n", action);
735		765
736	if (op->more)	766	if (op->more)
737	update_object (op->more, action);	767	update_object (op->more, action);
738	}	768	}
739		769
740	object::vector object::objects; // not yet used
741	object *object::first;
742
743	object::object ()	770	object::object ()
744	{	771	{
745	SET_FLAG (this, FLAG_REMOVED);	772	SET_FLAG (this, FLAG_REMOVED);
746		773
747	expmul = 1.0;	774	expmul = 1.0;
748	face = blank_face;	775	face = blank_face;
749	}	776	}
750		777
751	object::~object ()	778	object::~object ()
752	{	779	{
		780	unlink ();
		781
753	free_key_values (this);	782	free_key_values (this);
754	}	783	}
755		784
		785	static int object_count;
		786
756	void object::link ()	787	void object::link ()
757	{	788	{
		789	assert (!index);//D
		790	uuid = UUID::gen ();
758	count = ++ob_count;	791	count = ++object_count;
759	uuid = gen_uuid ();
760		792
761	prev = 0;	793	refcnt_inc ();
762	next = object::first;	794	objects.insert (this);
763
764	if (object::first)
765	object::first->prev = this;
766
767	object::first = this;
768	}	795	}
769		796
770	void object::unlink ()	797	void object::unlink ()
771	{	798	{
772	if (this == object::first)	799	if (!index)
773	object::first = next;	800	return;
774		801
775	/* Remove this object from the list of used objects */	802	objects.erase (this);
776	if (prev) prev->next = next;	803	refcnt_dec ();
777	if (next) next->prev = prev;	804	}
778		805
779	prev = 0;	806	void
780	next = 0;	807	object::activate ()
		808	{
		809	/* If already on active list, don't do anything */
		810	if (active)
		811	return;
		812
		813	if (has_active_speed ())
		814	actives.insert (this);
		815	}
		816
		817	void
		818	object::activate_recursive ()
		819	{
		820	activate ();
		821
		822	for (object *op = inv; op; op = op->below)
		823	op->activate_recursive ();
		824	}
		825
		826	/* This function removes object 'op' from the list of active
		827	* objects.
		828	* This should only be used for style maps or other such
		829	* reference maps where you don't want an object that isn't
		830	* in play chewing up cpu time getting processed.
		831	* The reverse of this is to call update_ob_speed, which
		832	* will do the right thing based on the speed of the object.
		833	*/
		834	void
		835	object::deactivate ()
		836	{
		837	/* If not on the active list, nothing needs to be done */
		838	if (!active)
		839	return;
		840
		841	actives.erase (this);
		842	}
		843
		844	void
		845	object::deactivate_recursive ()
		846	{
		847	for (object *op = inv; op; op = op->below)
		848	op->deactivate_recursive ();
		849
		850	deactivate ();
		851	}
		852
		853	void
		854	object::set_flag_inv (int flag, int value)
		855	{
		856	for (object *op = inv; op; op = op->below)
		857	{
		858	op->flag [flag] = value;
		859	op->set_flag_inv (flag, value);
		860	}
781	}	861	}
782		862
783	/*	863	/*
784	* Remove and free all objects in the inventory of the given object.	864	* Remove and free all objects in the inventory of the given object.
785	* object.c ?	865	* object.c ?
…		…
799	* if some form of movement is allowed, let objects	879	* if some form of movement is allowed, let objects
800	* drop on that space.	880	* drop on that space.
801	*/	881	*/
802	if (!drop_to_ground	882	if (!drop_to_ground
803	|| !map	883	|| !map
804	|| map->in_memory != MAP_IN_MEMORY	884	|| map->in_memory != MAP_ACTIVE
		885	|| map->nodrop
805	|| ms ().move_block == MOVE_ALL)	886	|| ms ().move_block == MOVE_ALL)
806	{	887	{
807	while (inv)	888	while (inv)
808	{	889	{
809	inv->destroy_inv (drop_to_ground);	890	inv->destroy_inv (drop_to_ground);
…		…
818		899
819	if (op->flag [FLAG_STARTEQUIP]	900	if (op->flag [FLAG_STARTEQUIP]
820	|| op->flag [FLAG_NO_DROP]	901	|| op->flag [FLAG_NO_DROP]
821	|| op->type == RUNE	902	|| op->type == RUNE
822	|| op->type == TRAP	903	|| op->type == TRAP
823	|| op->flag [FLAG_IS_A_TEMPLATE])	904	|| op->flag [FLAG_IS_A_TEMPLATE]
		905	|| op->flag [FLAG_DESTROY_ON_DEATH])
824	op->destroy ();	906	op->destroy ();
825	else	907	else
826	map->insert (op, x, y);	908	map->insert (op, x, y);
827	}	909	}
828	}	910	}
…		…
836	}	918	}
837		919
838	void	920	void
839	object::do_destroy ()	921	object::do_destroy ()
840	{	922	{
		923	attachable::do_destroy ();
		924
841	if (flag [FLAG_IS_LINKED])	925	if (flag [FLAG_IS_LINKED])
842	remove_button_link (this);	926	remove_button_link (this);
843		927
844	if (flag [FLAG_FRIENDLY])	928	if (flag [FLAG_FRIENDLY])
845	remove_friendly_object (this);	929	remove_friendly_object (this);
846		930
847	if (!flag [FLAG_REMOVED])	931	if (!flag [FLAG_REMOVED])
848	remove ();	932	remove ();
849		933
850	if (flag [FLAG_FREED])	934	destroy_inv (true);
851	return;
852		935
853	set_speed (0);	936	deactivate ();
		937	unlink ();
854		938
855	flag [FLAG_FREED] = 1;	939	flag [FLAG_FREED] = 1;
856
857	attachable::do_destroy ();
858
859	destroy_inv (true);
860	unlink ();
861		940
862	// hack to ensure that freed objects still have a valid map	941	// hack to ensure that freed objects still have a valid map
863	{	942	{
864	static maptile *freed_map; // freed objects are moved here to avoid crashes	943	static maptile *freed_map; // freed objects are moved here to avoid crashes
865		944
866	if (!freed_map)	945	if (!freed_map)
867	{	946	{
868	freed_map = new maptile;	947	freed_map = new maptile;
869		948
		949	freed_map->path = "<freed objects map>";
870	freed_map->name = "/internal/freed_objects_map";	950	freed_map->name = "/internal/freed_objects_map";
871	freed_map->width = 3;	951	freed_map->width = 3;
872	freed_map->height = 3;	952	freed_map->height = 3;
		953	freed_map->nodrop = 1;
873		954
874	freed_map->allocate ();	955	freed_map->alloc ();
		956	freed_map->in_memory = MAP_ACTIVE;
875	}	957	}
876		958
877	map = freed_map;	959	map = freed_map;
878	x = 1;	960	x = 1;
879	y = 1;	961	y = 1;
880	}	962	}
881		963
882	head = 0;
883
884	if (more)	964	if (more)
885	{	965	{
886	more->destroy ();	966	more->destroy ();
887	more = 0;	967	more = 0;
888	}	968	}
889		969
		970	head = 0;
		971
890	// clear those pointers that likely might have circular references to us	972	// clear those pointers that likely might cause circular references
891	owner = 0;	973	owner = 0;
892	enemy = 0;	974	enemy = 0;
893	attacked_by = 0;	975	attacked_by = 0;
894		976	current_weapon = 0;
895	// only relevant for players(?), but make sure of it anyways
896	contr = 0;
897	}	977	}
898		978
899	void	979	void
900	object::destroy (bool destroy_inventory)	980	object::destroy (bool destroy_inventory)
901	{	981	{
…		…
903	return;	983	return;
904		984
905	if (destroy_inventory)	985	if (destroy_inventory)
906	destroy_inv (false);	986	destroy_inv (false);
907		987
		988	if (is_head ())
		989	if (sound_destroy)
		990	play_sound (sound_destroy);
		991	else if (flag [FLAG_MONSTER])
		992	play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism
		993
908	attachable::destroy ();	994	attachable::destroy ();
909	}
910
911	/*
912	* sub_weight() recursively (outwards) subtracts a number from the
913	* weight of an object (and what is carried by it's environment(s)).
914	*/
915	void
916	sub_weight (object *op, signed long weight)
917	{
918	while (op != NULL)
919	{
920	if (op->type == CONTAINER)
921	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
922
923	op->carrying -= weight;
924	op = op->env;
925	}
926	}	995	}
927		996
928	/* op->remove ():	997	/* op->remove ():
929	* This function removes the object op from the linked list of objects	998	* This function removes the object op from the linked list of objects
930	* which it is currently tied to. When this function is done, the	999	* which it is currently tied to. When this function is done, the
931	* object will have no environment. If the object previously had an	1000	* object will have no environment. If the object previously had an
932	* environment, the x and y coordinates will be updated to	1001	* environment, the x and y coordinates will be updated to
933	* the previous environment.	1002	* the previous environment.
934	* Beware: This function is called from the editor as well!
935	*/	1003	*/
936	void	1004	void
937	object::remove ()	1005	object::do_remove ()
938	{	1006	{
939	object *tmp, *last = 0;	1007	object *tmp, *last = 0;
940	object *otmp;	1008	object *otmp;
941		1009
942	if (QUERY_FLAG (this, FLAG_REMOVED))	1010	if (QUERY_FLAG (this, FLAG_REMOVED))
…		…
964	* to save cpu time.	1032	* to save cpu time.
965	*/	1033	*/
966	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1034	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
967	otmp->update_stats ();	1035	otmp->update_stats ();
968		1036
969	if (above != NULL)	1037	if (above)
970	above->below = below;	1038	above->below = below;
971	else	1039	else
972	env->inv = below;	1040	env->inv = below;
973		1041
974	if (below != NULL)	1042	if (below)
975	below->above = above;	1043	below->above = above;
976		1044
977	/* we set up values so that it could be inserted into	1045	/* we set up values so that it could be inserted into
978	* the map, but we don't actually do that - it is up	1046	* the map, but we don't actually do that - it is up
979	* to the caller to decide what we want to do.	1047	* to the caller to decide what we want to do.
…		…
983	above = 0, below = 0;	1051	above = 0, below = 0;
984	env = 0;	1052	env = 0;
985	}	1053	}
986	else if (map)	1054	else if (map)
987	{	1055	{
988	/* Re did the following section of code - it looks like it had	1056	if (type == PLAYER)
989	* lots of logic for things we no longer care about
990	*/	1057	{
		1058	// leaving a spot always closes any open container on the ground
		1059	if (container && !container->env)
		1060	// this causes spurious floorbox updates, but it ensures
		1061	// that the CLOSE event is being sent.
		1062	close_container ();
		1063
		1064	--map->players;
		1065	map->touch ();
		1066	}
		1067
		1068	map->dirty = true;
		1069	mapspace &ms = this->ms ();
991		1070
992	/* link the object above us */	1071	/* link the object above us */
993	if (above)	1072	if (above)
994	above->below = below;	1073	above->below = below;
995	else	1074	else
996	map->at (x, y).top = below; /* we were top, set new top */	1075	ms.top = below; /* we were top, set new top */
997		1076
998	/* Relink the object below us, if there is one */	1077	/* Relink the object below us, if there is one */
999	if (below)	1078	if (below)
1000	below->above = above;	1079	below->above = above;
1001	else	1080	else
…		…
1003	/* Nothing below, which means we need to relink map object for this space	1082	/* Nothing below, which means we need to relink map object for this space
1004	* use translated coordinates in case some oddness with map tiling is	1083	* use translated coordinates in case some oddness with map tiling is
1005	* evident	1084	* evident
1006	*/	1085	*/
1007	if (GET_MAP_OB (map, x, y) != this)	1086	if (GET_MAP_OB (map, x, y) != this)
1008	{
1009	char *dump = dump_object (this);
1010	LOG (llevError,
1011	"remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom?\n%s\n", dump);	1087	LOG (llevError, "remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom? %s\n", debug_desc ());
1012	free (dump);
1013	dump = dump_object (GET_MAP_OB (map, x, y));
1014	LOG (llevError, "%s\n", dump);
1015	free (dump);
1016	}
1017		1088
1018	map->at (x, y).bot = above; /* goes on above it. */	1089	ms.bot = above; /* goes on above it. */
1019	}	1090	}
1020		1091
1021	above = 0;	1092	above = 0;
1022	below = 0;	1093	below = 0;
1023		1094
1024	if (map->in_memory == MAP_SAVING)	1095	if (map->in_memory == MAP_SAVING)
1025	return;	1096	return;
1026		1097
1027	int check_walk_off = !flag [FLAG_NO_APPLY];	1098	int check_walk_off = !flag [FLAG_NO_APPLY];
1028		1099
		1100	if (object *pl = ms.player ())
		1101	{
		1102	if (pl->container == this)
		1103	/* If a container that the player is currently using somehow gets
		1104	* removed (most likely destroyed), update the player view
		1105	* appropriately.
		1106	*/
		1107	pl->close_container ();
		1108
		1109	pl->contr->ns->floorbox_update ();
		1110	}
		1111
1029	for (tmp = map->at (x, y).bot; tmp; tmp = tmp->above)	1112	for (tmp = ms.bot; tmp; tmp = tmp->above)
1030	{	1113	{
1031	/* No point updating the players look faces if he is the object	1114	/* No point updating the players look faces if he is the object
1032	* being removed.	1115	* being removed.
1033	*/	1116	*/
1034		1117
1035	if (tmp->type == PLAYER && tmp != this)
1036	{
1037	/* If a container that the player is currently using somehow gets
1038	* removed (most likely destroyed), update the player view
1039	* appropriately.
1040	*/
1041	if (tmp->container == this)
1042	{
1043	flag [FLAG_APPLIED] = 0;
1044	tmp->container = 0;
1045	}
1046
1047	if (tmp->contr->ns)
1048	tmp->contr->ns->floorbox_update ();
1049	}
1050
1051	/* See if player moving off should effect something */	1118	/* See if object moving off should effect something */
1052	if (check_walk_off	1119	if (check_walk_off
1053	&& ((move_type & tmp->move_off)	1120	&& ((move_type & tmp->move_off)
1054	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))	1121	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1055	{	1122	{
1056	move_apply (tmp, this, 0);	1123	move_apply (tmp, this, 0);
1057		1124
1058	if (destroyed ())	1125	if (destroyed ())
1059	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());	1126	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1060	}	1127	}
1061		1128
1062	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1063
1064	if (tmp->above == tmp)
1065	tmp->above = 0;
1066
1067	last = tmp;	1129	last = tmp;
1068	}	1130	}
1069		1131
1070	/* last == NULL of there are no objects on this space */	1132	/* last == NULL if there are no objects on this space */
		1133	//TODO: this makes little sense, why only update the topmost object?
1071	if (!last)	1134	if (!last)
1072	map->at (x, y).flags_ = P_NEED_UPDATE;	1135	map->at (x, y).flags_ = 0;
1073	else	1136	else
1074	update_object (last, UP_OBJ_REMOVE);	1137	update_object (last, UP_OBJ_REMOVE);
1075		1138
1076	if (flag [FLAG_BLOCKSVIEW] || glow_radius)	1139	if (flag [FLAG_BLOCKSVIEW] || glow_radius)
1077	update_all_los (map, x, y);	1140	update_all_los (map, x, y);
…		…
1090	merge_ob (object *op, object *top)	1153	merge_ob (object *op, object *top)
1091	{	1154	{
1092	if (!op->nrof)	1155	if (!op->nrof)
1093	return 0;	1156	return 0;
1094		1157
1095	if (top)	1158	if (!top)
1096	for (top = op; top && top->above; top = top->above)	1159	for (top = op; top && top->above; top = top->above)
1097	;	1160	;
1098		1161
1099	for (; top; top = top->below)	1162	for (; top; top = top->below)
1100	{	1163	{
…		…
1113	}	1176	}
1114		1177
1115	return 0;	1178	return 0;
1116	}	1179	}
1117		1180
		1181	void
		1182	object::expand_tail ()
		1183	{
		1184	if (more)
		1185	return;
		1186
		1187	object *prev = this;
		1188
		1189	for (archetype *at = (archetype *)arch->more; at; at = (archetype *)at->more)
		1190	{
		1191	object *op = arch_to_object (at);
		1192
		1193	op->name = name;
		1194	op->name_pl = name_pl;
		1195	op->title = title;
		1196
		1197	op->head = this;
		1198	prev->more = op;
		1199
		1200	prev = op;
		1201	}
		1202	}
		1203
1118	/*	1204	/*
1119	* same as insert_ob_in_map except it handle separate coordinates and do a clean	1205	* same as insert_ob_in_map except it handles separate coordinates and does a clean
1120	* job preparing multi-part monsters	1206	* job preparing multi-part monsters.
1121	*/	1207	*/
1122	object *	1208	object *
1123	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)	1209	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1124	{	1210	{
1125	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)	1211	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1126	{	1212	{
1127	tmp->x = x + tmp->arch->clone.x;	1213	tmp->x = x + tmp->arch->x;
1128	tmp->y = y + tmp->arch->clone.y;	1214	tmp->y = y + tmp->arch->y;
1129	}	1215	}
1130		1216
1131	return insert_ob_in_map (op, m, originator, flag);	1217	return insert_ob_in_map (op, m, originator, flag);
1132	}	1218	}
1133		1219
…		…
1152	* just 'op' otherwise	1238	* just 'op' otherwise
1153	*/	1239	*/
1154	object *	1240	object *
1155	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)	1241	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1156	{	1242	{
		1243	assert (!op->flag [FLAG_FREED]);
		1244
1157	object *tmp, *top, *floor = NULL;	1245	object *top, *floor = NULL;
1158	sint16 x, y;
1159		1246
1160	if (QUERY_FLAG (op, FLAG_FREED))	1247	op->remove ();
1161	{
1162	LOG (llevError, "Trying to insert freed object!\n");
1163	return NULL;
1164	}
1165
1166	if (m == NULL)
1167	{
1168	char *dump = dump_object (op);
1169	LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
1170	free (dump);
1171	return op;
1172	}
1173
1174	if (out_of_map (m, op->x, op->y))
1175	{
1176	char *dump = dump_object (op);
1177	LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump);
1178	#ifdef MANY_CORES
1179	/* Better to catch this here, as otherwise the next use of this object
1180	* is likely to cause a crash. Better to find out where it is getting
1181	* improperly inserted.
1182	*/
1183	abort ();
1184	#endif
1185	free (dump);
1186	return op;
1187	}
1188
1189	if (!QUERY_FLAG (op, FLAG_REMOVED))
1190	{
1191	char *dump = dump_object (op);
1192	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
1193	free (dump);
1194	return op;
1195	}
1196
1197	if (op->more)
1198	{
1199	/* The part may be on a different map. */
1200
1201	object *more = op->more;
1202
1203	/* We really need the caller to normalize coordinates - if
1204	* we set the map, that doesn't work if the location is within
1205	* a map and this is straddling an edge. So only if coordinate
1206	* is clear wrong do we normalize it.
1207	*/
1208	if (OUT_OF_REAL_MAP (more->map, more->x, more->y))
1209	more->map = get_map_from_coord (m, &more->x, &more->y);
1210	else if (!more->map)
1211	{
1212	/* For backwards compatibility - when not dealing with tiled maps,
1213	* more->map should always point to the parent.
1214	*/
1215	more->map = m;
1216	}
1217
1218	if (insert_ob_in_map (more, more->map, originator, flag) == NULL)
1219	{
1220	if (!op->head)
1221	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1222
1223	return 0;
1224	}
1225	}
1226
1227	CLEAR_FLAG (op, FLAG_REMOVED);
1228		1248
1229	/* Ideally, the caller figures this out. However, it complicates a lot	1249	/* Ideally, the caller figures this out. However, it complicates a lot
1230	* of areas of callers (eg, anything that uses find_free_spot would now	1250	* of areas of callers (eg, anything that uses find_free_spot would now
1231	* need extra work	1251	* need extra work
1232	*/	1252	*/
1233	op->map = get_map_from_coord (m, &op->x, &op->y);	1253	if (!xy_normalise (m, op->x, op->y))
1234	x = op->x;	1254	{
1235	y = op->y;	1255	op->destroy ();
		1256	return 0;
		1257	}
		1258
		1259	if (object *more = op->more)
		1260	if (!insert_ob_in_map (more, m, originator, flag))
		1261	return 0;
		1262
		1263	CLEAR_FLAG (op, FLAG_REMOVED);
		1264
		1265	op->map = m;
		1266	mapspace &ms = op->ms ();
1236		1267
1237	/* this has to be done after we translate the coordinates.	1268	/* this has to be done after we translate the coordinates.
1238	*/	1269	*/
1239	if (op->nrof && !(flag & INS_NO_MERGE))	1270	if (op->nrof && !(flag & INS_NO_MERGE))
1240	for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)	1271	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1241	if (object::can_merge (op, tmp))	1272	if (object::can_merge (op, tmp))
1242	{	1273	{
1243	op->nrof += tmp->nrof;	1274	op->nrof += tmp->nrof;
1244	tmp->destroy ();	1275	tmp->destroy ();
1245	}	1276	}
…		…
1262	op->below = originator->below;	1293	op->below = originator->below;
1263		1294
1264	if (op->below)	1295	if (op->below)
1265	op->below->above = op;	1296	op->below->above = op;
1266	else	1297	else
1267	op->ms ().bot = op;	1298	ms.bot = op;
1268		1299
1269	/* since *below* originator, no need to update top */	1300	/* since *below* originator, no need to update top */
1270	originator->below = op;	1301	originator->below = op;
1271	}	1302	}
1272	else	1303	else
1273	{	1304	{
		1305	top = ms.bot;
		1306
1274	/* If there are other objects, then */	1307	/* If there are other objects, then */
1275	if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL))	1308	if (top)
1276	{	1309	{
1277	object *last = NULL;	1310	object *last = 0;
1278		1311
1279	/*	1312	/*
1280	* If there are multiple objects on this space, we do some trickier handling.	1313	* If there are multiple objects on this space, we do some trickier handling.
1281	* We've already dealt with merging if appropriate.	1314	* We've already dealt with merging if appropriate.
1282	* Generally, we want to put the new object on top. But if	1315	* Generally, we want to put the new object on top. But if
…		…
1286	* once we get to them. This reduces the need to traverse over all of	1319	* once we get to them. This reduces the need to traverse over all of
1287	* them when adding another one - this saves quite a bit of cpu time	1320	* them when adding another one - this saves quite a bit of cpu time
1288	* when lots of spells are cast in one area. Currently, it is presumed	1321	* when lots of spells are cast in one area. Currently, it is presumed
1289	* that flying non pickable objects are spell objects.	1322	* that flying non pickable objects are spell objects.
1290	*/	1323	*/
1291		1324	for (top = ms.bot; top; top = top->above)
1292	while (top != NULL)
1293	{	1325	{
1294	if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))	1326	if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))
1295	floor = top;	1327	floor = top;
1296		1328
1297	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))	1329	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))
…		…
1300	top = top->below;	1332	top = top->below;
1301	break;	1333	break;
1302	}	1334	}
1303		1335
1304	last = top;	1336	last = top;
1305	top = top->above;
1306	}	1337	}
1307		1338
1308	/* Don't want top to be NULL, so set it to the last valid object */	1339	/* Don't want top to be NULL, so set it to the last valid object */
1309	top = last;	1340	top = last;
1310		1341
…		…
1312	* looks like instead of lots of conditions here.	1343	* looks like instead of lots of conditions here.
1313	* makes things faster, and effectively the same result.	1344	* makes things faster, and effectively the same result.
1314	*/	1345	*/
1315		1346
1316	/* Have object 'fall below' other objects that block view.	1347	/* Have object 'fall below' other objects that block view.
1317	* Unless those objects are exits, type 66	1348	* Unless those objects are exits.
1318	* If INS_ON_TOP is used, don't do this processing	1349	* If INS_ON_TOP is used, don't do this processing
1319	* Need to find the object that in fact blocks view, otherwise	1350	* Need to find the object that in fact blocks view, otherwise
1320	* stacking is a bit odd.	1351	* stacking is a bit odd.
1321	*/	1352	*/
1322	if (!(flag & INS_ON_TOP) &&	1353	if (!(flag & INS_ON_TOP)
1323	(get_map_flags (op->map, 0, op->x, op->y, 0, 0) & P_BLOCKSVIEW) && (op->face && !op->face->visibility))	1354	&& ms.flags () & P_BLOCKSVIEW
		1355	&& (op->face && !faces [op->face].visibility))
1324	{	1356	{
1325	for (last = top; last != floor; last = last->below)	1357	for (last = top; last != floor; last = last->below)
1326	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1358	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1327	break;	1359	break;
		1360
1328	/* Check to see if we found the object that blocks view,	1361	/* Check to see if we found the object that blocks view,
1329	* and make sure we have a below pointer for it so that	1362	* and make sure we have a below pointer for it so that
1330	* we can get inserted below this one, which requires we	1363	* we can get inserted below this one, which requires we
1331	* set top to the object below us.	1364	* set top to the object below us.
1332	*/	1365	*/
1333	if (last && last->below && last != floor)	1366	if (last && last->below && last != floor)
1334	top = last->below;	1367	top = last->below;
1335	}	1368	}
1336	} /* If objects on this space */	1369	} /* If objects on this space */
1337		1370
1338	if (flag & INS_MAP_LOAD)
1339	top = GET_MAP_TOP (op->map, op->x, op->y);
1340
1341	if (flag & INS_ABOVE_FLOOR_ONLY)	1371	if (flag & INS_ABOVE_FLOOR_ONLY)
1342	top = floor;	1372	top = floor;
1343		1373
1344	/* Top is the object that our object (op) is going to get inserted above.	1374	/* Top is the object that our object (op) is going to get inserted above.
1345	*/	1375	*/
1346		1376
1347	/* First object on this space */	1377	/* First object on this space */
1348	if (!top)	1378	if (!top)
1349	{	1379	{
1350	op->above = GET_MAP_OB (op->map, op->x, op->y);	1380	op->above = ms.bot;
1351		1381
1352	if (op->above)	1382	if (op->above)
1353	op->above->below = op;	1383	op->above->below = op;
1354		1384
1355	op->below = NULL;	1385	op->below = 0;
1356	op->ms ().bot = op;	1386	ms.bot = op;
1357	}	1387	}
1358	else	1388	else
1359	{ /* get inserted into the stack above top */	1389	{ /* get inserted into the stack above top */
1360	op->above = top->above;	1390	op->above = top->above;
1361		1391
…		…
1364		1394
1365	op->below = top;	1395	op->below = top;
1366	top->above = op;	1396	top->above = op;
1367	}	1397	}
1368		1398
1369	if (op->above == NULL)	1399	if (!op->above)
1370	op->ms ().top = op;	1400	ms.top = op;
1371	} /* else not INS_BELOW_ORIGINATOR */	1401	} /* else not INS_BELOW_ORIGINATOR */
1372		1402
1373	if (op->type == PLAYER)	1403	if (op->type == PLAYER)
		1404	{
1374	op->contr->do_los = 1;	1405	op->contr->do_los = 1;
		1406	++op->map->players;
		1407	op->map->touch ();
		1408	}
1375		1409
1376	/* If we have a floor, we know the player, if any, will be above	1410	op->map->dirty = true;
1377	* it, so save a few ticks and start from there.	1411
1378	*/
1379	if (!(flag & INS_MAP_LOAD))
1380	if (object *pl = op->ms ().player ())	1412	if (object *pl = ms.player ())
1381	if (pl->contr->ns)
1382	pl->contr->ns->floorbox_update ();	1413	pl->contr->ns->floorbox_update ();
1383		1414
1384	/* If this object glows, it may affect lighting conditions that are	1415	/* If this object glows, it may affect lighting conditions that are
1385	* visible to others on this map. But update_all_los is really	1416	* visible to others on this map. But update_all_los is really
1386	* an inefficient way to do this, as it means los for all players	1417	* an inefficient way to do this, as it means los for all players
1387	* on the map will get recalculated. The players could very well	1418	* on the map will get recalculated. The players could very well
1388	* be far away from this change and not affected in any way -	1419	* be far away from this change and not affected in any way -
1389	* this should get redone to only look for players within range,	1420	* this should get redone to only look for players within range,
1390	* or just updating the P_NEED_UPDATE for spaces within this area	1421	* or just updating the P_UPTODATE for spaces within this area
1391	* of effect may be sufficient.	1422	* of effect may be sufficient.
1392	*/	1423	*/
1393	if (op->map->darkness && (op->glow_radius != 0))	1424	if (op->map->darkness && (op->glow_radius != 0))
1394	update_all_los (op->map, op->x, op->y);	1425	update_all_los (op->map, op->x, op->y);
1395		1426
…		…
1406	* blocked() and wall() work properly), and these flags are updated by	1437	* blocked() and wall() work properly), and these flags are updated by
1407	* update_object().	1438	* update_object().
1408	*/	1439	*/
1409		1440
1410	/* if this is not the head or flag has been passed, don't check walk on status */	1441	/* if this is not the head or flag has been passed, don't check walk on status */
1411	if (!(flag & INS_NO_WALK_ON) && !op->head)	1442	if (!(flag & INS_NO_WALK_ON) && op->head_ () == op)
1412	{	1443	{
1413	if (check_move_on (op, originator))	1444	if (check_move_on (op, originator))
1414	return 0;	1445	return 0;
1415		1446
1416	/* If we are a multi part object, lets work our way through the check	1447	/* If we are a multi part object, lets work our way through the check
1417	* walk on's.	1448	* walk on's.
1418	*/	1449	*/
1419	for (tmp = op->more; tmp != NULL; tmp = tmp->more)	1450	for (object *tmp = op->more; tmp; tmp = tmp->more)
1420	if (check_move_on (tmp, originator))	1451	if (check_move_on (tmp, originator))
1421	return 0;	1452	return 0;
1422	}	1453	}
1423		1454
1424	return op;	1455	return op;
…		…
1433	{	1464	{
1434	object *tmp, *tmp1;	1465	object *tmp, *tmp1;
1435		1466
1436	/* first search for itself and remove any old instances */	1467	/* first search for itself and remove any old instances */
1437		1468
1438	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1469	for (tmp = op->ms ().bot; tmp; tmp = tmp->above)
1439	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */	1470	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */
1440	tmp->destroy ();	1471	tmp->destroy ();
1441		1472
1442	tmp1 = arch_to_object (archetype::find (arch_string));	1473	tmp1 = arch_to_object (archetype::find (arch_string));
1443		1474
1444	tmp1->x = op->x;	1475	tmp1->x = op->x;
…		…
1447	}	1478	}
1448		1479
1449	object *	1480	object *
1450	object::insert_at (object *where, object *originator, int flags)	1481	object::insert_at (object *where, object *originator, int flags)
1451	{	1482	{
		1483	if (where->env)
		1484	return where->env->insert (this);
		1485	else
1452	where->map->insert (this, where->x, where->y, originator, flags);	1486	return where->map->insert (this, where->x, where->y, originator, flags);
1453	}	1487	}
1454		1488
1455	/*	1489	/*
1456	* get_split_ob(ob,nr) splits up ob into two parts. The part which	1490	* get_split_ob(ob,nr) splits up ob into two parts. The part which
1457	* is returned contains nr objects, and the remaining parts contains	1491	* is returned contains nr objects, and the remaining parts contains
…		…
1477	orig_ob->destroy (1);	1511	orig_ob->destroy (1);
1478	else if (!is_removed)	1512	else if (!is_removed)
1479	{	1513	{
1480	if (orig_ob->env != NULL)	1514	if (orig_ob->env != NULL)
1481	sub_weight (orig_ob->env, orig_ob->weight * nr);	1515	sub_weight (orig_ob->env, orig_ob->weight * nr);
1482	if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)	1516	if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_ACTIVE)
1483	{	1517	{
1484	strcpy (errmsg, "Tried to split object whose map is not in memory.");	1518	strcpy (errmsg, "Tried to split object whose map is not in memory.");
1485	LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n");	1519	LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n");
1486	return NULL;	1520	return NULL;
1487	}	1521	}
…		…
1497	* the amount of an object. If the amount reaches 0, the object	1531	* the amount of an object. If the amount reaches 0, the object
1498	* is subsequently removed and freed.	1532	* is subsequently removed and freed.
1499	*	1533	*
1500	* Return value: 'op' if something is left, NULL if the amount reached 0	1534	* Return value: 'op' if something is left, NULL if the amount reached 0
1501	*/	1535	*/
1502
1503	object *	1536	object *
1504	decrease_ob_nr (object *op, uint32 i)	1537	decrease_ob_nr (object *op, uint32 i)
1505	{	1538	{
1506	object *tmp;	1539	object *tmp;
1507		1540
…		…
1578	op->destroy ();	1611	op->destroy ();
1579	return 0;	1612	return 0;
1580	}	1613	}
1581	}	1614	}
1582		1615
1583	/*
1584	* add_weight(object, weight) adds the specified weight to an object,
1585	* and also updates how much the environment(s) is/are carrying.
1586	*/
1587
1588	void
1589	add_weight (object *op, signed long weight)
1590	{
1591	while (op != NULL)
1592	{
1593	if (op->type == CONTAINER)
1594	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1595
1596	op->carrying += weight;
1597	op = op->env;
1598	}
1599	}
1600
1601	object *	1616	object *
1602	insert_ob_in_ob (object *op, object *where)	1617	insert_ob_in_ob (object *op, object *where)
1603	{	1618	{
1604	if (!where)	1619	if (!where)
1605	{	1620	{
…		…
1607	LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);	1622	LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
1608	free (dump);	1623	free (dump);
1609	return op;	1624	return op;
1610	}	1625	}
1611		1626
1612	if (where->head)	1627	if (where->head_ () != where)
1613	{	1628	{
1614	LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n");	1629	LOG (llevError | logBacktrace, "Warning: Tried to insert object into wrong part of multipart object.\n");
1615	where = where->head;	1630	where = where->head;
1616	}	1631	}
1617		1632
1618	return where->insert (op);	1633	return where->insert (op);
1619	}	1634	}
…		…
1624	* inside the object environment.	1639	* inside the object environment.
1625	*	1640	*
1626	* The function returns now pointer to inserted item, and return value can	1641	* The function returns now pointer to inserted item, and return value can
1627	* be != op, if items are merged. -Tero	1642	* be != op, if items are merged. -Tero
1628	*/	1643	*/
1629
1630	object *	1644	object *
1631	object::insert (object *op)	1645	object::insert (object *op)
1632	{	1646	{
1633	object *tmp, *otmp;
1634
1635	if (!QUERY_FLAG (op, FLAG_REMOVED))	1647	if (!QUERY_FLAG (op, FLAG_REMOVED))
1636	op->remove ();	1648	op->remove ();
1637		1649
1638	if (op->more)	1650	if (op->more)
1639	{	1651	{
…		…
1641	return op;	1653	return op;
1642	}	1654	}
1643		1655
1644	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1656	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1645	CLEAR_FLAG (op, FLAG_REMOVED);	1657	CLEAR_FLAG (op, FLAG_REMOVED);
		1658
1646	if (op->nrof)	1659	if (op->nrof)
1647	{	1660	{
1648	for (tmp = inv; tmp != NULL; tmp = tmp->below)	1661	for (object *tmp = inv; tmp; tmp = tmp->below)
1649	if (object::can_merge (tmp, op))	1662	if (object::can_merge (tmp, op))
1650	{	1663	{
1651	/* return the original object and remove inserted object	1664	/* return the original object and remove inserted object
1652	(client needs the original object) */	1665	(client needs the original object) */
1653	tmp->nrof += op->nrof;	1666	tmp->nrof += op->nrof;
…		…
1672	add_weight (this, op->weight * op->nrof);	1685	add_weight (this, op->weight * op->nrof);
1673	}	1686	}
1674	else	1687	else
1675	add_weight (this, (op->weight + op->carrying));	1688	add_weight (this, (op->weight + op->carrying));
1676		1689
1677	otmp = this->in_player ();	1690	if (object *otmp = this->in_player ())
1678	if (otmp && otmp->contr)
1679	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1691	if (otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1680	otmp->update_stats ();	1692	otmp->update_stats ();
1681		1693
		1694	op->owner = 0; // its his/hers now. period.
1682	op->map = 0;	1695	op->map = 0;
1683	op->env = this;	1696	op->env = this;
1684	op->above = 0;	1697	op->above = 0;
1685	op->below = 0;	1698	op->below = 0;
1686	op->x = 0, op->y = 0;	1699	op->x = op->y = 0;
1687		1700
1688	/* reset the light list and los of the players on the map */	1701	/* reset the light list and los of the players on the map */
1689	if ((op->glow_radius != 0) && map)	1702	if (op->glow_radius && map)
1690	{	1703	{
1691	#ifdef DEBUG_LIGHTS	1704	#ifdef DEBUG_LIGHTS
1692	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);	1705	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1693	#endif /* DEBUG_LIGHTS */	1706	#endif /* DEBUG_LIGHTS */
1694	if (map->darkness)	1707	if (map->darkness)
…		…
1766		1779
1767	/* The objects have to be checked from top to bottom.	1780	/* The objects have to be checked from top to bottom.
1768	* Hence, we first go to the top:	1781	* Hence, we first go to the top:
1769	*/	1782	*/
1770		1783
1771	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp && tmp->above; tmp = tmp->above)	1784	for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above)
1772	{	1785	{
1773	/* Trim the search when we find the first other spell effect	1786	/* Trim the search when we find the first other spell effect
1774	* this helps performance so that if a space has 50 spell objects,	1787	* this helps performance so that if a space has 50 spell objects,
1775	* we don't need to check all of them.	1788	* we don't need to check all of them.
1776	*/	1789	*/
…		…
1794	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||	1807	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
1795	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))	1808	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1796	{	1809	{
1797		1810
1798	float	1811	float
1799	diff = tmp->move_slow_penalty * FABS (op->speed);	1812	diff = tmp->move_slow_penalty * fabs (op->speed);
1800		1813
1801	if (op->type == PLAYER)	1814	if (op->type == PLAYER)
1802	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||	1815	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||
1803	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))	1816	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))
1804	diff /= 4.0;	1817	diff /= 4.0;
…		…
1834	* The first matching object is returned, or NULL if none.	1847	* The first matching object is returned, or NULL if none.
1835	*/	1848	*/
1836	object *	1849	object *
1837	present_arch (const archetype *at, maptile *m, int x, int y)	1850	present_arch (const archetype *at, maptile *m, int x, int y)
1838	{	1851	{
1839	if (m == NULL || out_of_map (m, x, y))	1852	if (!m || out_of_map (m, x, y))
1840	{	1853	{
1841	LOG (llevError, "Present_arch called outside map.\n");	1854	LOG (llevError, "Present_arch called outside map.\n");
1842	return NULL;	1855	return NULL;
1843	}	1856	}
1844		1857
1845	for (object *tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1858	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1846	if (tmp->arch == at)	1859	if (tmp->arch == at)
1847	return tmp;	1860	return tmp;
1848		1861
1849	return NULL;	1862	return NULL;
1850	}	1863	}
…		…
1861	{	1874	{
1862	LOG (llevError, "Present called outside map.\n");	1875	LOG (llevError, "Present called outside map.\n");
1863	return NULL;	1876	return NULL;
1864	}	1877	}
1865		1878
1866	for (object *tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1879	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1867	if (tmp->type == type)	1880	if (tmp->type == type)
1868	return tmp;	1881	return tmp;
1869		1882
1870	return NULL;	1883	return NULL;
1871	}	1884	}
…		…
1928	* activate recursively a flag on an object inventory	1941	* activate recursively a flag on an object inventory
1929	*/	1942	*/
1930	void	1943	void
1931	flag_inv (object *op, int flag)	1944	flag_inv (object *op, int flag)
1932	{	1945	{
1933	if (op->inv)
1934	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)	1946	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1935	{	1947	{
1936	SET_FLAG (tmp, flag);	1948	SET_FLAG (tmp, flag);
1937	flag_inv (tmp, flag);	1949	flag_inv (tmp, flag);
1938	}	1950	}
1939	}	1951	}
1940		1952
1941	/*	1953	/*
1942	* deactivate recursively a flag on an object inventory	1954	* deactivate recursively a flag on an object inventory
1943	*/	1955	*/
1944	void	1956	void
1945	unflag_inv (object *op, int flag)	1957	unflag_inv (object *op, int flag)
1946	{	1958	{
1947	if (op->inv)
1948	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)	1959	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1949	{	1960	{
1950	CLEAR_FLAG (tmp, flag);	1961	CLEAR_FLAG (tmp, flag);
1951	unflag_inv (tmp, flag);	1962	unflag_inv (tmp, flag);
1952	}	1963	}
1953	}
1954
1955	/*
1956	* set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in
1957	* all it's inventory (recursively).
1958	* If checksums are used, a player will get set_cheat called for
1959	* him/her-self and all object carried by a call to this function.
1960	*/
1961	void
1962	set_cheat (object *op)
1963	{
1964	SET_FLAG (op, FLAG_WAS_WIZ);
1965	flag_inv (op, FLAG_WAS_WIZ);
1966	}	1964	}
1967		1965
1968	/*	1966	/*
1969	* find_free_spot(object, map, x, y, start, stop) will search for	1967	* find_free_spot(object, map, x, y, start, stop) will search for
1970	* a spot at the given map and coordinates which will be able to contain	1968	* a spot at the given map and coordinates which will be able to contain
…		…
1972	* to search (see the freearr_x/y[] definition).	1970	* to search (see the freearr_x/y[] definition).
1973	* It returns a random choice among the alternatives found.	1971	* It returns a random choice among the alternatives found.
1974	* start and stop are where to start relative to the free_arr array (1,9	1972	* start and stop are where to start relative to the free_arr array (1,9
1975	* does all 4 immediate directions). This returns the index into the	1973	* does all 4 immediate directions). This returns the index into the
1976	* array of the free spot, -1 if no spot available (dir 0 = x,y)	1974	* array of the free spot, -1 if no spot available (dir 0 = x,y)
1977	* Note - this only checks to see if there is space for the head of the
1978	* object - if it is a multispace object, this should be called for all
1979	* pieces.
1980	* Note2: This function does correctly handle tiled maps, but does not	1975	* Note: This function does correctly handle tiled maps, but does not
1981	* inform the caller. However, insert_ob_in_map will update as	1976	* inform the caller. However, insert_ob_in_map will update as
1982	* necessary, so the caller shouldn't need to do any special work.	1977	* necessary, so the caller shouldn't need to do any special work.
1983	* Note - updated to take an object instead of archetype - this is necessary	1978	* Note - updated to take an object instead of archetype - this is necessary
1984	* because arch_blocked (now ob_blocked) needs to know the movement type	1979	* because arch_blocked (now ob_blocked) needs to know the movement type
1985	* to know if the space in question will block the object. We can't use	1980	* to know if the space in question will block the object. We can't use
…		…
1987	* customized, changed states, etc.	1982	* customized, changed states, etc.
1988	*/	1983	*/
1989	int	1984	int
1990	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)	1985	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
1991	{	1986	{
		1987	int altern[SIZEOFFREE];
1992	int index = 0, flag;	1988	int index = 0, flag;
1993	int altern[SIZEOFFREE];
1994		1989
1995	for (int i = start; i < stop; i++)	1990	for (int i = start; i < stop; i++)
1996	{	1991	{
1997	flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]);	1992	mapxy pos (m, x, y); pos.move (i);
1998	if (!flag)	1993
		1994	if (!pos.normalise ())
		1995	continue;
		1996
		1997	mapspace &ms = *pos;
		1998
		1999	if (ms.flags () & P_IS_ALIVE)
		2000	continue;
		2001
		2002	/* However, often
		2003	* ob doesn't have any move type (when used to place exits)
		2004	* so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.
		2005	*/
		2006	if (ob && ob->move_type == 0 && ms.move_block != MOVE_ALL)
		2007	{
1999	altern [index++] = i;	2008	altern [index++] = i;
		2009	continue;
		2010	}
2000		2011
2001	/* Basically, if we find a wall on a space, we cut down the search size.	2012	/* Basically, if we find a wall on a space, we cut down the search size.
2002	* In this way, we won't return spaces that are on another side of a wall.	2013	* In this way, we won't return spaces that are on another side of a wall.
2003	* This mostly work, but it cuts down the search size in all directions -	2014	* This mostly work, but it cuts down the search size in all directions -
2004	* if the space being examined only has a wall to the north and empty	2015	* if the space being examined only has a wall to the north and empty
2005	* spaces in all the other directions, this will reduce the search space	2016	* spaces in all the other directions, this will reduce the search space
2006	* to only the spaces immediately surrounding the target area, and	2017	* to only the spaces immediately surrounding the target area, and
2007	* won't look 2 spaces south of the target space.	2018	* won't look 2 spaces south of the target space.
2008	*/	2019	*/
2009	else if ((flag & P_NO_PASS) && maxfree[i] < stop)	2020	if (ms.move_block == MOVE_ALL && maxfree[i] < stop)
		2021	{
2010	stop = maxfree[i];	2022	stop = maxfree[i];
		2023	continue;
		2024	}
		2025
		2026	/* Note it is intentional that we check ob - the movement type of the
		2027	* head of the object should correspond for the entire object.
		2028	*/
		2029	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
		2030	continue;
		2031
		2032	if (ob->blocked (m, pos.x, pos.y))
		2033	continue;
		2034
		2035	altern [index++] = i;
2011	}	2036	}
2012		2037
2013	if (!index)	2038	if (!index)
2014	return -1;	2039	return -1;
2015		2040
2016	return altern[RANDOM () % index];	2041	return altern [rndm (index)];
2017	}	2042	}
2018		2043
2019	/*	2044	/*
2020	* find_first_free_spot(archetype, maptile, x, y) works like	2045	* find_first_free_spot(archetype, maptile, x, y) works like
2021	* find_free_spot(), but it will search max number of squares.	2046	* find_free_spot(), but it will search max number of squares.
…		…
2024	*/	2049	*/
2025	int	2050	int
2026	find_first_free_spot (const object *ob, maptile *m, int x, int y)	2051	find_first_free_spot (const object *ob, maptile *m, int x, int y)
2027	{	2052	{
2028	for (int i = 0; i < SIZEOFFREE; i++)	2053	for (int i = 0; i < SIZEOFFREE; i++)
2029	if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]))	2054	if (!ob->blocked (m, x + freearr_x[i], y + freearr_y[i]))
2030	return i;	2055	return i;
2031		2056
2032	return -1;	2057	return -1;
2033	}	2058	}
2034		2059
…		…
2042	{	2067	{
2043	arr += begin;	2068	arr += begin;
2044	end -= begin;	2069	end -= begin;
2045		2070
2046	while (--end)	2071	while (--end)
2047	swap (arr [end], arr [RANDOM () % (end + 1)]);	2072	swap (arr [end], arr [rndm (end + 1)]);
2048	}	2073	}
2049		2074
2050	/* new function to make monster searching more efficient, and effective!	2075	/* new function to make monster searching more efficient, and effective!
2051	* This basically returns a randomized array (in the passed pointer) of	2076	* This basically returns a randomized array (in the passed pointer) of
2052	* the spaces to find monsters. In this way, it won't always look for	2077	* the spaces to find monsters. In this way, it won't always look for
…		…
2088	object *tmp;	2113	object *tmp;
2089	maptile *mp;	2114	maptile *mp;
2090		2115
2091	MoveType blocked, move_type;	2116	MoveType blocked, move_type;
2092		2117
2093	if (exclude && exclude->head)	2118	if (exclude && exclude->head_ () != exclude)
2094	{	2119	{
2095	exclude = exclude->head;	2120	exclude = exclude->head;
2096	move_type = exclude->move_type;	2121	move_type = exclude->move_type;
2097	}	2122	}
2098	else	2123	else
…		…
2121	max = maxfree[i];	2146	max = maxfree[i];
2122	else if (mflags & P_IS_ALIVE)	2147	else if (mflags & P_IS_ALIVE)
2123	{	2148	{
2124	for (tmp = ms.bot; tmp; tmp = tmp->above)	2149	for (tmp = ms.bot; tmp; tmp = tmp->above)
2125	if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)	2150	if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)
2126	&& (tmp != exclude || (tmp->head && tmp->head != exclude)))	2151	&& (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2127	break;	2152	break;
2128		2153
2129	if (tmp)	2154	if (tmp)
2130	return freedir[i];	2155	return freedir[i];
2131	}	2156	}
…		…
2186		2211
2187	return 3;	2212	return 3;
2188	}	2213	}
2189		2214
2190	/*	2215	/*
2191	* absdir(int): Returns a number between 1 and 8, which represent
2192	* the "absolute" direction of a number (it actually takes care of
2193	* "overflow" in previous calculations of a direction).
2194	*/
2195
2196	int
2197	absdir (int d)
2198	{
2199	while (d < 1)
2200	d += 8;
2201
2202	while (d > 8)
2203	d -= 8;
2204
2205	return d;
2206	}
2207
2208	/*
2209	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is	2216	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is
2210	* between two directions (which are expected to be absolute (see absdir())	2217	* between two directions (which are expected to be absolute (see absdir())
2211	*/	2218	*/
2212
2213	int	2219	int
2214	dirdiff (int dir1, int dir2)	2220	dirdiff (int dir1, int dir2)
2215	{	2221	{
2216	int d;	2222	int d;
2217		2223
…		…
2330	* Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause	2336	* Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause
2331	* core dumps if they do.	2337	* core dumps if they do.
2332	*	2338	*
2333	* Add a check so we can't pick up invisible objects (0.93.8)	2339	* Add a check so we can't pick up invisible objects (0.93.8)
2334	*/	2340	*/
2335
2336	int	2341	int
2337	can_pick (const object *who, const object *item)	2342	can_pick (const object *who, const object *item)
2338	{	2343	{
2339	return /*QUERY_FLAG(who,FLAG_WIZ)|| */	2344	return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2340	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&	2345	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
…		…
2345	* create clone from object to another	2350	* create clone from object to another
2346	*/	2351	*/
2347	object *	2352	object *
2348	object_create_clone (object *asrc)	2353	object_create_clone (object *asrc)
2349	{	2354	{
2350	object *dst = 0, *tmp, *src, *part, *prev, *item;	2355	object *dst = 0, *tmp, *src, *prev, *item;
2351		2356
2352	if (!asrc)	2357	if (!asrc)
2353	return 0;	2358	return 0;
2354		2359
2355	src = asrc;
2356	if (src->head)
2357	src = src->head;	2360	src = asrc->head_ ();
2358		2361
2359	prev = 0;	2362	prev = 0;
2360	for (part = src; part; part = part->more)	2363	for (object *part = src; part; part = part->more)
2361	{	2364	{
2362	tmp = part->clone ();	2365	tmp = part->clone ();
2363	tmp->x -= src->x;	2366	tmp->x -= src->x;
2364	tmp->y -= src->y;	2367	tmp->y -= src->y;
2365		2368
…		…
2381		2384
2382	for (item = src->inv; item; item = item->below)	2385	for (item = src->inv; item; item = item->below)
2383	insert_ob_in_ob (object_create_clone (item), dst);	2386	insert_ob_in_ob (object_create_clone (item), dst);
2384		2387
2385	return dst;	2388	return dst;
2386	}
2387
2388	/* GROS - Creates an object using a string representing its content. */
2389	/* Basically, we save the content of the string to a temp file, then call */
2390	/* load_object on it. I admit it is a highly inefficient way to make things, */
2391	/* but it was simple to make and allows reusing the load_object function. */
2392	/* Remember not to use load_object_str in a time-critical situation. */
2393	/* Also remember that multiparts objects are not supported for now. */
2394	object *
2395	load_object_str (const char *obstr)
2396	{
2397	object *op;
2398	char filename[MAX_BUF];
2399
2400	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2401
2402	FILE *tempfile = fopen (filename, "w");
2403
2404	if (tempfile == NULL)
2405	{
2406	LOG (llevError, "Error - Unable to access load object temp file\n");
2407	return NULL;
2408	}
2409
2410	fprintf (tempfile, obstr);
2411	fclose (tempfile);
2412
2413	op = object::create ();
2414
2415	object_thawer thawer (filename);
2416
2417	if (thawer)
2418	load_object (thawer, op, 0);
2419
2420	LOG (llevDebug, " load str completed, object=%s\n", &op->name);
2421	CLEAR_FLAG (op, FLAG_REMOVED);
2422
2423	return op;
2424	}	2389	}
2425		2390
2426	/* This returns the first object in who's inventory that	2391	/* This returns the first object in who's inventory that
2427	* has the same type and subtype match.	2392	* has the same type and subtype match.
2428	* returns NULL if no match.	2393	* returns NULL if no match.
…		…
2483	if (link->key == canonical_key)	2448	if (link->key == canonical_key)
2484	return link->value;	2449	return link->value;
2485		2450
2486	return 0;	2451	return 0;
2487	}	2452	}
2488
2489		2453
2490	/*	2454	/*
2491	* Updates the canonical_key in op to value.	2455	* Updates the canonical_key in op to value.
2492	*	2456	*
2493	* canonical_key is a shared string (value doesn't have to be).	2457	* canonical_key is a shared string (value doesn't have to be).
…		…
2517	/* Basically, if the archetype has this key set,	2481	/* Basically, if the archetype has this key set,
2518	* we need to store the null value so when we save	2482	* we need to store the null value so when we save
2519	* it, we save the empty value so that when we load,	2483	* it, we save the empty value so that when we load,
2520	* we get this value back again.	2484	* we get this value back again.
2521	*/	2485	*/
2522	if (get_ob_key_link (&op->arch->clone, canonical_key))	2486	if (get_ob_key_link (op->arch, canonical_key))
2523	field->value = 0;	2487	field->value = 0;
2524	else	2488	else
2525	{	2489	{
2526	if (last)	2490	if (last)
2527	last->next = field->next;	2491	last->next = field->next;
…		…
2596	}	2560	}
2597	else	2561	else
2598	item = item->env;	2562	item = item->env;
2599	}	2563	}
2600		2564
		2565	const char *
		2566	object::flag_desc (char *desc, int len) const
		2567	{
		2568	char *p = desc;
		2569	bool first = true;
		2570
		2571	*p = 0;
		2572
		2573	for (int i = 0; i < NUM_FLAGS; i++)
		2574	{
		2575	if (len <= 10) // magic constant!
		2576	{
		2577	snprintf (p, len, ",...");
		2578	break;
		2579	}
		2580
		2581	if (flag [i])
		2582	{
		2583	int cnt = snprintf (p, len, "%s%d", first ? "" : ",", i);
		2584	len -= cnt;
		2585	p += cnt;
		2586	first = false;
		2587	}
		2588	}
		2589
		2590	return desc;
		2591	}
		2592
2601	// return a suitable string describing an objetc in enough detail to find it	2593	// return a suitable string describing an object in enough detail to find it
2602	const char *	2594	const char *
2603	object::debug_desc (char *info) const	2595	object::debug_desc (char *info) const
2604	{	2596	{
		2597	char flagdesc[512];
2605	char info2[256 * 3];	2598	char info2[256 * 4];
2606	char *p = info;	2599	char *p = info;
2607		2600
2608	p += snprintf (p, 256, "%d=\"%s%s%s\"",	2601	p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s,flags:[%s],type:%d}",
2609	count,	2602	count,
		2603	uuid.c_str (),
2610	&name,	2604	&name,
2611	title ? " " : "",	2605	title ? "\",title:\"" : "",
2612	title ? (const char *)title : "");	2606	title ? (const char *)title : "",
		2607	flag_desc (flagdesc, 512), type);
2613		2608
2614	if (env)	2609	if (!this->flag[FLAG_REMOVED] && env)
2615	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2610	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2616		2611
2617	if (map)	2612	if (map)
2618	p += snprintf (p, 256, "(on %s@%d+%d)", map->path, x, y);	2613	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2619		2614
2620	return info;	2615	return info;
2621	}	2616	}
2622		2617
2623	const char *	2618	const char *
2624	object::debug_desc () const	2619	object::debug_desc () const
2625	{	2620	{
2626	static char info[256 * 3];	2621	static char info[3][256 * 4];
		2622	static int info_idx;
		2623
2627	return debug_desc (info);	2624	return debug_desc (info [++info_idx % 3]);
2628	}	2625	}
2629		2626
		2627	struct region *
		2628	object::region () const
		2629	{
		2630	return map ? map->region (x, y)
		2631	: region::default_region ();
		2632	}
		2633
		2634	const materialtype_t *
		2635	object::dominant_material () const
		2636	{
		2637	if (materialtype_t *mt = name_to_material (materialname))
		2638	return mt;
		2639
		2640	return name_to_material (shstr_unknown);
		2641	}
		2642
		2643	void
		2644	object::open_container (object *new_container)
		2645	{
		2646	if (container == new_container)
		2647	return;
		2648
		2649	if (object *old_container = container)
		2650	{
		2651	if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
		2652	return;
		2653
		2654	#if 0
		2655	// remove the "Close old_container" object.
		2656	if (object *closer = old_container->inv)
		2657	if (closer->type == CLOSE_CON)
		2658	closer->destroy ();
		2659	#endif
		2660
		2661	old_container->flag [FLAG_APPLIED] = 0;
		2662	container = 0;
		2663
		2664	esrv_update_item (UPD_FLAGS, this, old_container);
		2665	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
		2666	play_sound (sound_find ("chest_close"));
		2667	}
		2668
		2669	if (new_container)
		2670	{
		2671	if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))
		2672	return;
		2673
		2674	// TODO: this does not seem to serve any purpose anymore?
		2675	#if 0
		2676	// insert the "Close Container" object.
		2677	if (archetype *closer = new_container->other_arch)
		2678	{
		2679	object *closer = arch_to_object (new_container->other_arch);
		2680	closer->flag [FLAG_NO_MAP_SAVE] = 1;
		2681	new_container->insert (closer);
		2682	}
		2683	#endif
		2684
		2685	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));
		2686
		2687	new_container->flag [FLAG_APPLIED] = 1;
		2688	container = new_container;
		2689
		2690	esrv_update_item (UPD_FLAGS, this, new_container);
		2691	esrv_send_inventory (this, new_container);
		2692	play_sound (sound_find ("chest_open"));
		2693	}
		2694	}
		2695
		2696	object *
		2697	object::force_find (const shstr name)
		2698	{
		2699	/* cycle through his inventory to look for the MARK we want to
		2700	* place
		2701	*/
		2702	for (object *tmp = inv; tmp; tmp = tmp->below)
		2703	if (tmp->type == FORCE && tmp->slaying == name)
		2704	return splay (tmp);
		2705
		2706	return 0;
		2707	}
		2708
		2709	void
		2710	object::force_add (const shstr name, int duration)
		2711	{
		2712	if (object *force = force_find (name))
		2713	force->destroy ();
		2714
		2715	object *force = get_archetype (FORCE_NAME);
		2716
		2717	force->slaying = name;
		2718	force->stats.food = 1;
		2719	force->speed_left = -1.f;
		2720
		2721	force->set_speed (duration ? 1.f / duration : 0.f);
		2722	force->flag [FLAG_IS_USED_UP] = true;
		2723	force->flag [FLAG_APPLIED] = true;
		2724
		2725	insert (force);
		2726	}
		2727
		2728	void
		2729	object::play_sound (faceidx sound) const
		2730	{
		2731	if (!sound)
		2732	return;
		2733
		2734	if (flag [FLAG_REMOVED])
		2735	return;
		2736
		2737	if (env)
		2738	{
		2739	if (object *pl = in_player ())
		2740	pl->contr->play_sound (sound);
		2741	}
		2742	else
		2743	map->play_sound (sound, x, y);
		2744	}
		2745

Diff Legend

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