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.131 by root, Sat Feb 10 15:20:23 2007 UTC vs.
Revision 1.205 by root, Sun Apr 13 01:34:08 2008 UTC

1	/*	1	/*
2	* CrossFire, A Multiplayer game for X-windows	2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.
3	*	3	*
4	* Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team	4	* Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5	* Copyright (C) 2001 Mark Wedel & Crossfire Development Team	5	* Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team
6	* Copyright (C) 1992 Frank Tore Johansen	6	* Copyright (©) 1992,2007 Frank Tore Johansen
7	*	7	*
8	* This program is free software; you can redistribute it and/or modify	8	* Deliantra is free software: you can redistribute it and/or modify
9	* it under the terms of the GNU General Public License as published by	9	* it under the terms of the GNU General Public License as published by
10	* the Free Software Foundation; either version 2 of the License, or	10	* the Free Software Foundation, either version 3 of the License, or
11	* (at your option) any later version.	11	* (at your option) any later version.
12	*	12	*
13	* This program is distributed in the hope that it will be useful,	13	* This program is distributed in the hope that it will be useful,
14	* but WITHOUT ANY WARRANTY; without even the implied warranty of	14	* but WITHOUT ANY WARRANTY; without even the implied warranty of
15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16	* GNU General Public License for more details.	16	* GNU General Public License for more details.
17	*	17	*
18	* You should have received a copy of the GNU General Public License	18	* You should have received a copy of the GNU General Public License
19	* along with this program; if not, write to the Free Software	19	* along with this program. If not, see <http://www.gnu.org/licenses/>.
20	* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
21	*	20	*
22	* The authors can be reached via e-mail at <crossfire@schmorp.de>	21	* The authors can be reached via e-mail to <support@deliantra.net>
23	*/	22	*/
24		23
25	/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.	24	/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
26	sub/add_weight will transcend the environment updating the carrying	25	sub/add_weight will transcend the environment updating the carrying
27	variable. */	26	variable. */
…		…
29	#include <stdio.h>	28	#include <stdio.h>
30	#include <sys/types.h>	29	#include <sys/types.h>
31	#include <sys/uio.h>	30	#include <sys/uio.h>
32	#include <object.h>	31	#include <object.h>
33	#include <funcpoint.h>	32	#include <funcpoint.h>
		33	#include <sproto.h>
34	#include <loader.h>	34	#include <loader.h>
35		35
36	#include <bitset>	36	#include <bitset>
37		37
38	int nrofallocobjects = 0;	38	UUID UUID::cur;
39	static UUID uuid;	39	static uint64_t seq_next_save;
40	const uint64 UUID_SKIP = 1<<19;	40	static const uint64 UUID_GAP = 1<<19;
41		41
42	objectvec objects;	42	objectvec objects;
43	activevec actives;	43	activevec actives;
44		44
45	short freearr_x[SIZEOFFREE] = { 0, 0, 1, 1, 1, 0, -1, -1, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,	45	short freearr_x[SIZEOFFREE] = {
		46	0,
		47	0, 1, 1, 1, 0, -1, -1, -1,
		48	0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,
46	0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1	49	0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1
47	};	50	};
48	short freearr_y[SIZEOFFREE] = { 0, -1, -1, 0, 1, 1, 1, 0, -1, -2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2,	51	short freearr_y[SIZEOFFREE] = {
		52	0,
		53	-1, -1, 0, 1, 1, 1, 0, -1,
		54	-2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2,
49	-3, -3, -3, -3, -2, -1, 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3	55	-3, -3, -3, -3, -2, -1, 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3
50	};	56	};
51	int maxfree[SIZEOFFREE] = { 0, 9, 10, 13, 14, 17, 18, 21, 22, 25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45,	57	int maxfree[SIZEOFFREE] = {
		58	0,
		59	9, 10, 13, 14, 17, 18, 21, 22,
		60	25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45, 48,
52	48, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49	61	49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49
53	};	62	};
54	int freedir[SIZEOFFREE] = {	63	int freedir[SIZEOFFREE] = {
55	0, 1, 2, 3, 4, 5, 6, 7, 8, 1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8,	64	0,
		65	1, 2, 3, 4, 5, 6, 7, 8,
		66	1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8,
56	1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8	67	1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8
57	};	68	};
58		69
59	static void	70	static void
60	write_uuid (void)	71	write_uuid (uval64 skip, bool sync)
61	{	72	{
62	char filename1[MAX_BUF], filename2[MAX_BUF];	73	CALL_BEGIN (2);
63		74	CALL_ARG_SV (newSVval64 (skip));
64	sprintf (filename1, "%s/uuid", settings.localdir);	75	CALL_ARG_SV (boolSV (sync));
65	sprintf (filename2, "%s/uuid~", settings.localdir);	76	CALL_CALL ("cf::write_uuid", G_DISCARD);
66		77	CALL_END;
67	FILE *fp;
68
69	if (!(fp = fopen (filename2, "w")))
70	{
71	LOG (llevError, "ERROR: cannot open %s for writing, unable to write UUID!\n", filename2);
72	return;
73	}
74
75	fprintf (fp, "<1,%llx>\n", (unsigned long long)uuid.seq + UUID_SKIP * 2);
76	fclose (fp);
77	rename (filename2, filename1);
78	}	78	}
79		79
80	static void	80	static void
81	read_uuid (void)	81	read_uuid (void)
82	{	82	{
83	char filename[MAX_BUF];	83	char filename[MAX_BUF];
84		84
85	sprintf (filename, "%s/uuid", settings.localdir);	85	sprintf (filename, "%s/uuid", settings.localdir);
86		86
		87	seq_next_save = 0;
		88
87	FILE *fp;	89	FILE *fp;
88		90
89	if (!(fp = fopen (filename, "r")))	91	if (!(fp = fopen (filename, "r")))
90	{	92	{
91	if (errno == ENOENT)	93	if (errno == ENOENT)
92	{	94	{
93	LOG (llevInfo, "RESET uid to 1\n");	95	LOG (llevInfo, "RESET uid to 1\n");
94	uuid.seq = 0;	96	UUID::cur.seq = 0;
95	write_uuid ();	97	write_uuid (UUID_GAP, true);
96	return;	98	return;
97	}	99	}
98		100
99	LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);	101	LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);
100	_exit (1);	102	_exit (1);
101	}	103	}
102		104
103	int version;	105	UUID::BUF buf;
104	unsigned long long uid;	106	buf[0] = 0;
105	if (2 != fscanf (fp, "<%d,%llx>\n", &version, &uid) || version != 1)	107	fgets (buf, sizeof (buf), fp);
		108
		109	if (!UUID::cur.parse (buf))
106	{	110	{
107	LOG (llevError, "FATAL: error reading uid from %s!\n", filename);	111	LOG (llevError, "FATAL: error reading uid from %s (%s)!\n", filename, buf);
108	_exit (1);	112	_exit (1);
109	}	113	}
110		114
111	uuid.seq = uid;	115	LOG (llevDebug, "read UUID: %s\n", UUID::cur.c_str ());
112	write_uuid ();	116
113	LOG (llevDebug, "read UID: %" PRId64 "\n", uid);	117	write_uuid (UUID_GAP, true);
114	fclose (fp);	118	fclose (fp);
115	}	119	}
116		120
117	UUID	121	UUID
118	gen_uuid ()	122	UUID::gen ()
119	{	123	{
120	UUID uid;	124	UUID uid;
121		125
122	uid.seq = ++uuid.seq;	126	uid.seq = ++cur.seq;
123		127
124	if (!(uuid.seq & (UUID_SKIP - 1)))	128	if (expect_false (cur.seq >= seq_next_save))
125	write_uuid ();	129	{
		130	seq_next_save = UUID::cur.seq + (UUID_GAP >> 1);
		131	write_uuid (UUID_GAP, false);
		132	}
		133
126		134
127	return uid;	135	return uid;
128	}	136	}
129		137
130	void	138	void
131	init_uuid ()	139	UUID::init ()
132	{	140	{
133	read_uuid ();	141	read_uuid ();
134	}	142	}
135		143
136	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */	144	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */
137	static int	145	static bool
138	compare_ob_value_lists_one (const object *wants, const object *has)	146	compare_ob_value_lists_one (const object *wants, const object *has)
139	{	147	{
140	key_value *wants_field;	148	key_value *wants_field;
141		149
142	/* n-squared behaviour (see get_ob_key_link()), but I'm hoping both	150	/* n-squared behaviour (see get_ob_key_link()), but I'm hoping both
…		…
150	key_value *has_field;	158	key_value *has_field;
151		159
152	/* Look for a field in has with the same key. */	160	/* Look for a field in has with the same key. */
153	has_field = get_ob_key_link (has, wants_field->key);	161	has_field = get_ob_key_link (has, wants_field->key);
154		162
155	if (has_field == NULL)	163	if (!has_field)
156	{
157	/* No field with that name. */	164	return 0; /* No field with that name. */
158	return FALSE;
159	}
160		165
161	/* Found the matching field. */	166	/* Found the matching field. */
162	if (has_field->value != wants_field->value)	167	if (has_field->value != wants_field->value)
163	{
164	/* Values don't match, so this half of the comparison is false. */	168	return 0; /* Values don't match, so this half of the comparison is false. */
165	return FALSE;
166	}
167		169
168	/* If we get here, we found a match. Now for the next field in wants. */	170	/* If we get here, we found a match. Now for the next field in wants. */
169	}	171	}
170		172
171	/* If we get here, every field in wants has a matching field in has. */	173	/* If we get here, every field in wants has a matching field in has. */
172	return TRUE;	174	return 1;
173	}	175	}
174		176
175	/* Returns TRUE if ob1 has the same key_values as ob2. */	177	/* Returns TRUE if ob1 has the same key_values as ob2. */
176	static int	178	static bool
177	compare_ob_value_lists (const object *ob1, const object *ob2)	179	compare_ob_value_lists (const object *ob1, const object *ob2)
178	{	180	{
179	/* However, there may be fields in has which aren't partnered in wants,	181	/* However, there may be fields in has which aren't partnered in wants,
180	* so we need to run the comparison *twice*. :(	182	* so we need to run the comparison *twice*. :(
181	*/	183	*/
…		…
202	|| ob1->speed != ob2->speed	204	|| ob1->speed != ob2->speed
203	|| ob1->value != ob2->value	205	|| ob1->value != ob2->value
204	|| ob1->name != ob2->name)	206	|| ob1->name != ob2->name)
205	return 0;	207	return 0;
206		208
207	//TODO: this ain't working well, use nicer and correct overflow check	209	/* Do not merge objects if nrof would overflow. First part checks
208	/* Do not merge objects if nrof would overflow. We use 1UL<<31 since that	210	* for unsigned overflow (2c), second part checks wether the result
209	* value could not be stored in a sint32 (which unfortunately sometimes is	211	* would fit into a 32 bit signed int, which is often used to hold
210	* used to store nrof).	212	* nrof values.
211	*/	213	*/
212	if (ob1->nrof + ob2->nrof >= 1UL << 31)	214	if (~ob1->nrof < ob2->nrof || ob1->nrof + ob2->nrof > (1UL << 31))
213	return 0;	215	return 0;
214		216
215	/* If the objects have been identified, set the BEEN_APPLIED flag.	217	/* If the objects have been identified, set the BEEN_APPLIED flag.
216	* This is to the comparison of the flags below will be OK. We	218	* This is to the comparison of the flags below will be OK. We
217	* just can't ignore the been applied or identified flags, as they	219	* just can't ignore the been applied or identified flags, as they
218	* are not equal - just if it has been identified, the been_applied	220	* are not equal - just if it has been identified, the been_applied
219	* flags lose any meaning.	221	* flags lose any meaning.
220	*/	222	*/
221	if (QUERY_FLAG (ob1, FLAG_IDENTIFIED))	223	if (QUERY_FLAG (ob1, FLAG_IDENTIFIED))
…		…
249	|| ob1->move_off != ob2->move_off	251	|| ob1->move_off != ob2->move_off
250	|| ob1->move_slow != ob2->move_slow	252	|| ob1->move_slow != ob2->move_slow
251	|| ob1->move_slow_penalty != ob2->move_slow_penalty)	253	|| ob1->move_slow_penalty != ob2->move_slow_penalty)
252	return 0;	254	return 0;
253		255
254	/* This is really a spellbook check - really, we should	256	/* This is really a spellbook check - we should in general
255	* check all objects in the inventory.	257	* not merge objects with real inventories, as splitting them
		258	* is hard.
256	*/	259	*/
257	if (ob1->inv || ob2->inv)	260	if (ob1->inv || ob2->inv)
258	{	261	{
259	/* if one object has inventory but the other doesn't, not equiv */	262	if (!(ob1->inv && ob2->inv))
260	if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv))	263	return 0; /* inventories differ in length */
261	return 0;
262		264
263	/* Now check to see if the two inventory objects could merge */	265	if (ob1->inv->below || ob2->inv->below)
		266	return 0; /* more than one object in inv */
		267
264	if (!object::can_merge (ob1->inv, ob2->inv))	268	if (!object::can_merge (ob1->inv, ob2->inv))
265	return 0;	269	return 0; /* inventory objects differ */
266		270
267	/* inventory ok - still need to check rest of this object to see	271	/* inventory ok - still need to check rest of this object to see
268	* if it is valid.	272	* if it is valid.
269	*/	273	*/
270	}	274	}
…		…
289	if (ob1->level != ob2->level)	293	if (ob1->level != ob2->level)
290	return 0;	294	return 0;
291	break;	295	break;
292	}	296	}
293		297
294	if (ob1->key_values != NULL || ob2->key_values != NULL)	298	if (ob1->key_values || ob2->key_values)
295	{	299	{
296	/* At least one of these has key_values. */	300	/* At least one of these has key_values. */
297	if ((ob1->key_values == NULL) != (ob2->key_values == NULL))	301	if ((!ob1->key_values) != (!ob2->key_values))
298	/* One has fields, but the other one doesn't. */	302	/* One has fields, but the other one doesn't. */
299	return 0;	303	return 0;
300	else if (!compare_ob_value_lists (ob1, ob2))	304	else if (!compare_ob_value_lists (ob1, ob2))
301	return 0;	305	return 0;
302	}	306	}
303		307
304	//TODO: generate an event or call into perl for additional checks
305	if (ob1->self || ob2->self)	308	if (ob1->self || ob2->self)
306	{	309	{
307	ob1->optimise ();	310	ob1->optimise ();
308	ob2->optimise ();	311	ob2->optimise ();
309		312
310	if (ob1->self || ob2->self)	313	if (ob1->self || ob2->self)
		314	{
		315	int k1 = ob1->self ? HvTOTALKEYS (ob1->self) : 0;
		316	int k2 = ob2->self ? HvTOTALKEYS (ob2->self) : 0;
		317
		318	if (k1 != k2)
311	return 0;	319	return 0;
		320	else if (k1 == 0)
		321	return 1;
		322	else if (!cfperl_can_merge (ob1, ob2))
		323	return 0;
		324	}
312	}	325	}
313		326
314	/* Everything passes, must be OK. */	327	/* Everything passes, must be OK. */
315	return 1;	328	return 1;
316	}	329	}
…		…
324	sum_weight (object *op)	337	sum_weight (object *op)
325	{	338	{
326	long sum;	339	long sum;
327	object *inv;	340	object *inv;
328		341
329	for (sum = 0, inv = op->inv; inv != NULL; inv = inv->below)	342	for (sum = 0, inv = op->inv; inv; inv = inv->below)
330	{	343	{
331	if (inv->inv)	344	if (inv->inv)
332	sum_weight (inv);	345	sum_weight (inv);
		346
333	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);	347	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);
334	}	348	}
335		349
336	if (op->type == CONTAINER && op->stats.Str)	350	if (op->type == CONTAINER && op->stats.Str)
337	sum = (sum * (100 - op->stats.Str)) / 100;	351	sum = (sum * (100 - op->stats.Str)) / 100;
…		…
357	/*	371	/*
358	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.	372	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
359	* Some error messages.	373	* Some error messages.
360	* The result of the dump is stored in the static global errmsg array.	374	* The result of the dump is stored in the static global errmsg array.
361	*/	375	*/
362
363	char *	376	char *
364	dump_object (object *op)	377	dump_object (object *op)
365	{	378	{
366	if (!op)	379	if (!op)
367	return strdup ("[NULLOBJ]");	380	return strdup ("[NULLOBJ]");
368		381
369	object_freezer freezer;	382	object_freezer freezer;
370	save_object (freezer, op, 1);	383	op->write (freezer);
371	return freezer.as_string ();	384	return freezer.as_string ();
372	}	385	}
373		386
374	/*	387	/*
375	* get_nearest_part(multi-object, object 2) returns the part of the	388	* get_nearest_part(multi-object, object 2) returns the part of the
376	* multi-object 1 which is closest to the second object.	389	* multi-object 1 which is closest to the second object.
377	* If it's not a multi-object, it is returned.	390	* If it's not a multi-object, it is returned.
378	*/	391	*/
379
380	object *	392	object *
381	get_nearest_part (object *op, const object *pl)	393	get_nearest_part (object *op, const object *pl)
382	{	394	{
383	object *tmp, *closest;	395	object *tmp, *closest;
384	int last_dist, i;	396	int last_dist, i;
…		…
420	break;	432	break;
421		433
422	return op;	434	return op;
423	}	435	}
424		436
425	void
426	free_all_object_data ()
427	{
428	LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);
429	}
430
431	/*	437	/*
432	* Sets the owner and sets the skill and exp pointers to owner's current	438	* Sets the owner and sets the skill and exp pointers to owner's current
433	* skill and experience objects.	439	* skill and experience objects.
		440	* ACTUALLY NO! investigate! TODO
434	*/	441	*/
435	void	442	void
436	object::set_owner (object *owner)	443	object::set_owner (object *owner)
437	{	444	{
		445	// allow objects which own objects
438	if (!owner)	446	if (owner)
439	return;
440
441	/* next line added to allow objects which own objects */
442	/* Add a check for ownercounts in here, as I got into an endless loop
443	* with the fireball owning a poison cloud which then owned the
444	* fireball. I believe that was caused by one of the objects getting
445	* freed and then another object replacing it. Since the ownercounts
446	* didn't match, this check is valid and I believe that cause is valid.
447	*/
448	while (owner->owner)	447	while (owner->owner)
449	owner = owner->owner;	448	owner = owner->owner;
		449
		450	if (flag [FLAG_FREED])
		451	{
		452	LOG (llevError | logBacktrace, "tried to set owner of %s to %s\n", debug_desc (), owner->debug_desc ());
		453	return;
		454	}
450		455
451	this->owner = owner;	456	this->owner = owner;
		457	}
		458
		459	int
		460	object::slottype () const
		461	{
		462	if (type == SKILL)
		463	{
		464	if (IS_COMBAT_SKILL (subtype)) return slot_combat;
		465	if (IS_RANGED_SKILL (subtype)) return slot_ranged;
		466	}
		467	else
		468	{
		469	if (slot [body_combat].info) return slot_combat;
		470	if (slot [body_range ].info) return slot_ranged;
		471	}
		472
		473	return slot_none;
		474	}
		475
		476	bool
		477	object::change_weapon (object *ob)
		478	{
		479	if (current_weapon == ob)
		480	return true;
		481
		482	if (chosen_skill)
		483	chosen_skill->flag [FLAG_APPLIED] = false;
		484
		485	current_weapon = ob;
		486	chosen_skill = !ob || ob->type == SKILL ? ob : find_skill_by_name (this, ob->skill);
		487
		488	if (chosen_skill)
		489	chosen_skill->flag [FLAG_APPLIED] = true;
		490
		491	update_stats ();
		492
		493	if (ob)
		494	{
		495	// now check wether any body locations became invalid, in which case
		496	// we cannot apply the weapon at the moment.
		497	for (int i = 0; i < NUM_BODY_LOCATIONS; ++i)
		498	if (slot[i].used < 0)
		499	{
		500	current_weapon = chosen_skill = 0;
		501	update_stats ();
		502
		503	new_draw_info_format (NDI_UNIQUE, 0, this,
		504	"You try to balance all your items at once, "
		505	"but the %s is just too much for your body. "
		506	"[You need to unapply some items first.]", &ob->name);
		507	return false;
		508	}
		509
		510	//new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);
		511	}
		512	else
		513	;//new_draw_info_format (NDI_UNIQUE, 0, this, "You unwield your weapons.");
		514
		515	if (ob && !ob->flag [FLAG_APPLIED] && ob->type != SPELL)
		516	{
		517	LOG (llevError | logBacktrace, "%s changed to unapplied weapon %s",
		518	&name, ob->debug_desc ());
		519	return false;
		520	}
		521
		522	return true;
452	}	523	}
453		524
454	/* Zero the key_values on op, decrementing the shared-string	525	/* Zero the key_values on op, decrementing the shared-string
455	* refcounts and freeing the links.	526	* refcounts and freeing the links.
456	*/	527	*/
457	static void	528	static void
458	free_key_values (object *op)	529	free_key_values (object *op)
459	{	530	{
460	for (key_value *i = op->key_values; i != 0;)	531	for (key_value *i = op->key_values; i; )
461	{	532	{
462	key_value *next = i->next;	533	key_value *next = i->next;
463	delete i;	534	delete i;
464		535
465	i = next;	536	i = next;
466	}	537	}
467		538
468	op->key_values = 0;	539	op->key_values = 0;
469	}	540	}
470		541
471	/*	542	object &
472	* copy_to first frees everything allocated by the dst object,	543	object::operator =(const object &src)
473	* and then copies the contents of itself into the second
474	* object, allocating what needs to be allocated. Basically, any
475	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
476	* if the first object is freed, the pointers in the new object
477	* will point at garbage.
478	*/
479	void
480	object::copy_to (object *dst)
481	{	544	{
482	bool is_freed = QUERY_FLAG (dst, FLAG_FREED);	545	bool is_freed = flag [FLAG_FREED];
483	bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED);	546	bool is_removed = flag [FLAG_REMOVED];
484		547
485	*(object_copy *)dst = *this;	548	*(object_copy *)this = src;
486		549
487	if (is_freed)	550	flag [FLAG_FREED] = is_freed;
488	SET_FLAG (dst, FLAG_FREED);	551	flag [FLAG_REMOVED] = is_removed;
489
490	if (is_removed)
491	SET_FLAG (dst, FLAG_REMOVED);
492
493	if (speed < 0)
494	dst->speed_left = speed_left - rndm ();
495		552
496	/* Copy over key_values, if any. */	553	/* Copy over key_values, if any. */
497	if (key_values)	554	if (src.key_values)
498	{	555	{
499	key_value *tail = 0;	556	key_value *tail = 0;
500	key_value *i;
501
502	dst->key_values = 0;	557	key_values = 0;
503		558
504	for (i = key_values; i; i = i->next)	559	for (key_value *i = src.key_values; i; i = i->next)
505	{	560	{
506	key_value *new_link = new key_value;	561	key_value *new_link = new key_value;
507		562
508	new_link->next = 0;	563	new_link->next = 0;
509	new_link->key = i->key;	564	new_link->key = i->key;
510	new_link->value = i->value;	565	new_link->value = i->value;
511		566
512	/* Try and be clever here, too. */	567	/* Try and be clever here, too. */
513	if (!dst->key_values)	568	if (!key_values)
514	{	569	{
515	dst->key_values = new_link;	570	key_values = new_link;
516	tail = new_link;	571	tail = new_link;
517	}	572	}
518	else	573	else
519	{	574	{
520	tail->next = new_link;	575	tail->next = new_link;
521	tail = new_link;	576	tail = new_link;
522	}	577	}
523	}	578	}
524	}	579	}
		580	}
		581
		582	/*
		583	* copy_to first frees everything allocated by the dst object,
		584	* and then copies the contents of itself into the second
		585	* object, allocating what needs to be allocated. Basically, any
		586	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
		587	* if the first object is freed, the pointers in the new object
		588	* will point at garbage.
		589	*/
		590	void
		591	object::copy_to (object *dst)
		592	{
		593	*dst = *this;
		594
		595	if (speed < 0)
		596	dst->speed_left -= rndm ();
525		597
526	dst->set_speed (dst->speed);	598	dst->set_speed (dst->speed);
		599	}
		600
		601	void
		602	object::instantiate ()
		603	{
		604	if (!uuid.seq) // HACK
		605	uuid = UUID::gen ();
		606
		607	speed_left = -0.1f;
		608	/* copy the body_info to the body_used - this is only really
		609	* need for monsters, but doesn't hurt to do it for everything.
		610	* by doing so, when a monster is created, it has good starting
		611	* values for the body_used info, so when items are created
		612	* for it, they can be properly equipped.
		613	*/
		614	for (int i = NUM_BODY_LOCATIONS; i--; )
		615	slot[i].used = slot[i].info;
		616
		617	attachable::instantiate ();
527	}	618	}
528		619
529	object *	620	object *
530	object::clone ()	621	object::clone ()
531	{	622	{
…		…
589	* UP_OBJ_FACE: only the objects face has changed.	680	* UP_OBJ_FACE: only the objects face has changed.
590	*/	681	*/
591	void	682	void
592	update_object (object *op, int action)	683	update_object (object *op, int action)
593	{	684	{
594	MoveType move_on, move_off, move_block, move_slow;
595
596	if (op == NULL)	685	if (op == NULL)
597	{	686	{
598	/* this should never happen */	687	/* this should never happen */
599	LOG (llevDebug, "update_object() called for NULL object.\n");	688	LOG (llevDebug, "update_object() called for NULL object.\n");
600	return;	689	return;
…		…
680	static int object_count;	769	static int object_count;
681		770
682	void object::link ()	771	void object::link ()
683	{	772	{
684	assert (!index);//D	773	assert (!index);//D
685	uuid = gen_uuid ();	774	uuid = UUID::gen ();
686	count = ++object_count;	775	count = ++object_count;
687		776
688	refcnt_inc ();	777	refcnt_inc ();
689	objects.insert (this);	778	objects.insert (this);
690	}	779	}
…		…
819		908
820	if (flag [FLAG_IS_LINKED])	909	if (flag [FLAG_IS_LINKED])
821	remove_button_link (this);	910	remove_button_link (this);
822		911
823	if (flag [FLAG_FRIENDLY])	912	if (flag [FLAG_FRIENDLY])
824	{
825	remove_friendly_object (this);	913	remove_friendly_object (this);
826
827	if (type == GOLEM
828	&& owner
829	&& owner->type == PLAYER
830	&& owner->contr->ranges[range_golem] == this)
831	owner->contr->ranges[range_golem] = 0;
832	}
833		914
834	if (!flag [FLAG_REMOVED])	915	if (!flag [FLAG_REMOVED])
835	remove ();	916	remove ();
836		917
837	destroy_inv (true);	918	destroy_inv (true);
…		…
847		928
848	if (!freed_map)	929	if (!freed_map)
849	{	930	{
850	freed_map = new maptile;	931	freed_map = new maptile;
851		932
		933	freed_map->path = "<freed objects map>";
852	freed_map->name = "/internal/freed_objects_map";	934	freed_map->name = "/internal/freed_objects_map";
853	freed_map->width = 3;	935	freed_map->width = 3;
854	freed_map->height = 3;	936	freed_map->height = 3;
		937	freed_map->nodrop = 1;
855		938
856	freed_map->alloc ();	939	freed_map->alloc ();
857	freed_map->in_memory = MAP_IN_MEMORY;	940	freed_map->in_memory = MAP_IN_MEMORY;
858	}	941	}
859		942
860	map = freed_map;	943	map = freed_map;
861	x = 1;	944	x = 1;
862	y = 1;	945	y = 1;
863	}	946	}
864		947
865	head = 0;
866
867	if (more)	948	if (more)
868	{	949	{
869	more->destroy ();	950	more->destroy ();
870	more = 0;	951	more = 0;
871	}	952	}
872		953
		954	head = 0;
		955
873	// clear those pointers that likely might have circular references to us	956	// clear those pointers that likely might cause circular references
874	owner = 0;	957	owner = 0;
875	enemy = 0;	958	enemy = 0;
876	attacked_by = 0;	959	attacked_by = 0;
		960	current_weapon = 0;
877	}	961	}
878		962
879	void	963	void
880	object::destroy (bool destroy_inventory)	964	object::destroy (bool destroy_inventory)
881	{	965	{
882	if (destroyed ())	966	if (destroyed ())
883	return;	967	return;
884		968
885	if (destroy_inventory)	969	if (destroy_inventory)
886	destroy_inv (false);	970	destroy_inv (false);
		971
		972	if (is_head ())
		973	if (sound_destroy)
		974	play_sound (sound_destroy);
		975	else if (flag [FLAG_MONSTER])
		976	play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism
887		977
888	attachable::destroy ();	978	attachable::destroy ();
889	}	979	}
890		980
891	/*	981	/*
…		…
1006	if (map->in_memory == MAP_SAVING)	1096	if (map->in_memory == MAP_SAVING)
1007	return;	1097	return;
1008		1098
1009	int check_walk_off = !flag [FLAG_NO_APPLY];	1099	int check_walk_off = !flag [FLAG_NO_APPLY];
1010		1100
		1101	if (object *pl = ms.player ())
		1102	{
		1103	if (pl->container == this)
		1104	/* If a container that the player is currently using somehow gets
		1105	* removed (most likely destroyed), update the player view
		1106	* appropriately.
		1107	*/
		1108	pl->close_container ();
		1109
		1110	pl->contr->ns->floorbox_update ();
		1111	}
		1112
1011	for (tmp = ms.bot; tmp; tmp = tmp->above)	1113	for (tmp = ms.bot; tmp; tmp = tmp->above)
1012	{	1114	{
1013	/* No point updating the players look faces if he is the object	1115	/* No point updating the players look faces if he is the object
1014	* being removed.	1116	* being removed.
1015	*/	1117	*/
1016
1017	if (tmp->type == PLAYER && tmp != this)
1018	{
1019	/* If a container that the player is currently using somehow gets
1020	* removed (most likely destroyed), update the player view
1021	* appropriately.
1022	*/
1023	if (tmp->container == this)
1024	{
1025	flag [FLAG_APPLIED] = 0;
1026	tmp->container = 0;
1027	}
1028
1029	if (tmp->contr->ns)
1030	tmp->contr->ns->floorbox_update ();
1031	}
1032		1118
1033	/* See if object moving off should effect something */	1119	/* See if object moving off should effect something */
1034	if (check_walk_off	1120	if (check_walk_off
1035	&& ((move_type & tmp->move_off)	1121	&& ((move_type & tmp->move_off)
1036	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))	1122	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
…		…
1039		1125
1040	if (destroyed ())	1126	if (destroyed ())
1041	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());	1127	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1042	}	1128	}
1043		1129
1044	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1045	//TODO: why is this horrible hacka fix? get rid of this code=bug! (schmorp)
1046	if (tmp->above == tmp)
1047	tmp->above = 0;
1048
1049	last = tmp;	1130	last = tmp;
1050	}	1131	}
1051		1132
1052	/* last == NULL if there are no objects on this space */	1133	/* last == NULL if there are no objects on this space */
1053	//TODO: this makes little sense, why only update the topmost object?	1134	//TODO: this makes little sense, why only update the topmost object?
…		…
1073	merge_ob (object *op, object *top)	1154	merge_ob (object *op, object *top)
1074	{	1155	{
1075	if (!op->nrof)	1156	if (!op->nrof)
1076	return 0;	1157	return 0;
1077		1158
1078	if (top)	1159	if (!top)
1079	for (top = op; top && top->above; top = top->above)	1160	for (top = op; top && top->above; top = top->above)
1080	;	1161	;
1081		1162
1082	for (; top; top = top->below)	1163	for (; top; top = top->below)
1083	{	1164	{
…		…
1096	}	1177	}
1097		1178
1098	return 0;	1179	return 0;
1099	}	1180	}
1100		1181
		1182	void
		1183	object::expand_tail ()
		1184	{
		1185	if (more)
		1186	return;
		1187
		1188	object *prev = this;
		1189
		1190	for (archetype *at = (archetype *)arch->more; at; at = (archetype *)at->more)
		1191	{
		1192	object *op = arch_to_object (at);
		1193
		1194	op->name = name;
		1195	op->name_pl = name_pl;
		1196	op->title = title;
		1197
		1198	op->head = this;
		1199	prev->more = op;
		1200
		1201	prev = op;
		1202	}
		1203	}
		1204
1101	/*	1205	/*
1102	* same as insert_ob_in_map except it handles separate coordinates and does a clean	1206	* same as insert_ob_in_map except it handles separate coordinates and does a clean
1103	* job preparing multi-part monsters.	1207	* job preparing multi-part monsters.
1104	*/	1208	*/
1105	object *	1209	object *
1106	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)	1210	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1107	{	1211	{
1108	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)	1212	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1109	{	1213	{
1110	tmp->x = x + tmp->arch->clone.x;	1214	tmp->x = x + tmp->arch->x;
1111	tmp->y = y + tmp->arch->clone.y;	1215	tmp->y = y + tmp->arch->y;
1112	}	1216	}
1113		1217
1114	return insert_ob_in_map (op, m, originator, flag);	1218	return insert_ob_in_map (op, m, originator, flag);
1115	}	1219	}
1116		1220
…		…
1135	* just 'op' otherwise	1239	* just 'op' otherwise
1136	*/	1240	*/
1137	object *	1241	object *
1138	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)	1242	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1139	{	1243	{
		1244	assert (!op->flag [FLAG_FREED]);
		1245
1140	object *tmp, *top, *floor = NULL;	1246	object *top, *floor = NULL;
1141
1142	if (QUERY_FLAG (op, FLAG_FREED))
1143	{
1144	LOG (llevError, "Trying to insert freed object!\n");
1145	return NULL;
1146	}
1147
1148	if (!QUERY_FLAG (op, FLAG_REMOVED))
1149	LOG (llevError, "Trying to insert already inserted object %s\n", op->debug_desc ());
1150		1247
1151	op->remove ();	1248	op->remove ();
1152
1153	if (!m)
1154	{
1155	char *dump = dump_object (op);
1156	LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
1157	free (dump);
1158	return op;
1159	}
1160
1161	if (out_of_map (m, op->x, op->y))
1162	{
1163	char *dump = dump_object (op);
1164	LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump);
1165	#ifdef MANY_CORES
1166	/* Better to catch this here, as otherwise the next use of this object
1167	* is likely to cause a crash. Better to find out where it is getting
1168	* improperly inserted.
1169	*/
1170	abort ();
1171	#endif
1172	free (dump);
1173	return op;
1174	}
1175
1176	if (object *more = op->more)
1177	{
1178	if (!insert_ob_in_map (more, m, originator, flag))
1179	{
1180	if (!op->head)
1181	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1182
1183	return 0;
1184	}
1185	}
1186
1187	CLEAR_FLAG (op, FLAG_REMOVED);
1188		1249
1189	/* Ideally, the caller figures this out. However, it complicates a lot	1250	/* Ideally, the caller figures this out. However, it complicates a lot
1190	* of areas of callers (eg, anything that uses find_free_spot would now	1251	* of areas of callers (eg, anything that uses find_free_spot would now
1191	* need extra work	1252	* need extra work
1192	*/	1253	*/
1193	if (!xy_normalise (m, op->x, op->y))	1254	if (!xy_normalise (m, op->x, op->y))
		1255	{
		1256	op->destroy ();
1194	return 0;	1257	return 0;
		1258	}
		1259
		1260	if (object *more = op->more)
		1261	if (!insert_ob_in_map (more, m, originator, flag))
		1262	return 0;
		1263
		1264	CLEAR_FLAG (op, FLAG_REMOVED);
1195		1265
1196	op->map = m;	1266	op->map = m;
1197	mapspace &ms = op->ms ();	1267	mapspace &ms = op->ms ();
1198		1268
1199	/* this has to be done after we translate the coordinates.	1269	/* this has to be done after we translate the coordinates.
1200	*/	1270	*/
1201	if (op->nrof && !(flag & INS_NO_MERGE))	1271	if (op->nrof && !(flag & INS_NO_MERGE))
1202	for (tmp = ms.bot; tmp; tmp = tmp->above)	1272	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1203	if (object::can_merge (op, tmp))	1273	if (object::can_merge (op, tmp))
1204	{	1274	{
1205	op->nrof += tmp->nrof;	1275	op->nrof += tmp->nrof;
1206	tmp->destroy ();	1276	tmp->destroy ();
1207	}	1277	}
…		…
1234	else	1304	else
1235	{	1305	{
1236	top = ms.bot;	1306	top = ms.bot;
1237		1307
1238	/* If there are other objects, then */	1308	/* If there are other objects, then */
1239	if ((!(flag & INS_MAP_LOAD)) && top)	1309	if (top)
1240	{	1310	{
1241	object *last = 0;	1311	object *last = 0;
1242		1312
1243	/*	1313	/*
1244	* If there are multiple objects on this space, we do some trickier handling.	1314	* If there are multiple objects on this space, we do some trickier handling.
…		…
1274	* looks like instead of lots of conditions here.	1344	* looks like instead of lots of conditions here.
1275	* makes things faster, and effectively the same result.	1345	* makes things faster, and effectively the same result.
1276	*/	1346	*/
1277		1347
1278	/* Have object 'fall below' other objects that block view.	1348	/* Have object 'fall below' other objects that block view.
1279	* Unless those objects are exits, type 66	1349	* Unless those objects are exits.
1280	* If INS_ON_TOP is used, don't do this processing	1350	* If INS_ON_TOP is used, don't do this processing
1281	* Need to find the object that in fact blocks view, otherwise	1351	* Need to find the object that in fact blocks view, otherwise
1282	* stacking is a bit odd.	1352	* stacking is a bit odd.
1283	*/	1353	*/
1284	if (!(flag & INS_ON_TOP)	1354	if (!(flag & INS_ON_TOP)
1285	&& ms.flags () & P_BLOCKSVIEW	1355	&& ms.flags () & P_BLOCKSVIEW
1286	&& (op->face && !op->face->visibility))	1356	&& (op->face && !faces [op->face].visibility))
1287	{	1357	{
1288	for (last = top; last != floor; last = last->below)	1358	for (last = top; last != floor; last = last->below)
1289	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1359	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1290	break;	1360	break;
1291		1361
…		…
1297	if (last && last->below && last != floor)	1367	if (last && last->below && last != floor)
1298	top = last->below;	1368	top = last->below;
1299	}	1369	}
1300	} /* If objects on this space */	1370	} /* If objects on this space */
1301		1371
1302	if (flag & INS_MAP_LOAD)
1303	top = ms.top;
1304
1305	if (flag & INS_ABOVE_FLOOR_ONLY)	1372	if (flag & INS_ABOVE_FLOOR_ONLY)
1306	top = floor;	1373	top = floor;
1307		1374
1308	/* Top is the object that our object (op) is going to get inserted above.	1375	/* Top is the object that our object (op) is going to get inserted above.
1309	*/	1376	*/
…		…
1341	op->map->touch ();	1408	op->map->touch ();
1342	}	1409	}
1343		1410
1344	op->map->dirty = true;	1411	op->map->dirty = true;
1345		1412
1346	/* If we have a floor, we know the player, if any, will be above
1347	* it, so save a few ticks and start from there.
1348	*/
1349	if (!(flag & INS_MAP_LOAD))
1350	if (object *pl = ms.player ())	1413	if (object *pl = ms.player ())
1351	if (pl->contr->ns)
1352	pl->contr->ns->floorbox_update ();	1414	pl->contr->ns->floorbox_update ();
1353		1415
1354	/* If this object glows, it may affect lighting conditions that are	1416	/* If this object glows, it may affect lighting conditions that are
1355	* visible to others on this map. But update_all_los is really	1417	* visible to others on this map. But update_all_los is really
1356	* an inefficient way to do this, as it means los for all players	1418	* an inefficient way to do this, as it means los for all players
1357	* on the map will get recalculated. The players could very well	1419	* on the map will get recalculated. The players could very well
…		…
1376	* blocked() and wall() work properly), and these flags are updated by	1438	* blocked() and wall() work properly), and these flags are updated by
1377	* update_object().	1439	* update_object().
1378	*/	1440	*/
1379		1441
1380	/* if this is not the head or flag has been passed, don't check walk on status */	1442	/* if this is not the head or flag has been passed, don't check walk on status */
1381	if (!(flag & INS_NO_WALK_ON) && !op->head)	1443	if (!(flag & INS_NO_WALK_ON) && op->head_ () == op)
1382	{	1444	{
1383	if (check_move_on (op, originator))	1445	if (check_move_on (op, originator))
1384	return 0;	1446	return 0;
1385		1447
1386	/* If we are a multi part object, lets work our way through the check	1448	/* If we are a multi part object, lets work our way through the check
1387	* walk on's.	1449	* walk on's.
1388	*/	1450	*/
1389	for (tmp = op->more; tmp != NULL; tmp = tmp->more)	1451	for (object *tmp = op->more; tmp; tmp = tmp->more)
1390	if (check_move_on (tmp, originator))	1452	if (check_move_on (tmp, originator))
1391	return 0;	1453	return 0;
1392	}	1454	}
1393		1455
1394	return op;	1456	return op;
…		…
1404	object *tmp, *tmp1;	1466	object *tmp, *tmp1;
1405		1467
1406	/* first search for itself and remove any old instances */	1468	/* first search for itself and remove any old instances */
1407		1469
1408	for (tmp = op->ms ().bot; tmp; tmp = tmp->above)	1470	for (tmp = op->ms ().bot; tmp; tmp = tmp->above)
1409	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */	1471	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */
1410	tmp->destroy ();	1472	tmp->destroy ();
1411		1473
1412	tmp1 = arch_to_object (archetype::find (arch_string));	1474	tmp1 = arch_to_object (archetype::find (arch_string));
1413		1475
1414	tmp1->x = op->x;	1476	tmp1->x = op->x;
…		…
1417	}	1479	}
1418		1480
1419	object *	1481	object *
1420	object::insert_at (object *where, object *originator, int flags)	1482	object::insert_at (object *where, object *originator, int flags)
1421	{	1483	{
		1484	if (where->env)
		1485	return where->env->insert (this);
		1486	else
1422	where->map->insert (this, where->x, where->y, originator, flags);	1487	return where->map->insert (this, where->x, where->y, originator, flags);
1423	}	1488	}
1424		1489
1425	/*	1490	/*
1426	* get_split_ob(ob,nr) splits up ob into two parts. The part which	1491	* get_split_ob(ob,nr) splits up ob into two parts. The part which
1427	* is returned contains nr objects, and the remaining parts contains	1492	* is returned contains nr objects, and the remaining parts contains
…		…
1467	* the amount of an object. If the amount reaches 0, the object	1532	* the amount of an object. If the amount reaches 0, the object
1468	* is subsequently removed and freed.	1533	* is subsequently removed and freed.
1469	*	1534	*
1470	* Return value: 'op' if something is left, NULL if the amount reached 0	1535	* Return value: 'op' if something is left, NULL if the amount reached 0
1471	*/	1536	*/
1472
1473	object *	1537	object *
1474	decrease_ob_nr (object *op, uint32 i)	1538	decrease_ob_nr (object *op, uint32 i)
1475	{	1539	{
1476	object *tmp;	1540	object *tmp;
1477		1541
…		…
1552		1616
1553	/*	1617	/*
1554	* add_weight(object, weight) adds the specified weight to an object,	1618	* add_weight(object, weight) adds the specified weight to an object,
1555	* and also updates how much the environment(s) is/are carrying.	1619	* and also updates how much the environment(s) is/are carrying.
1556	*/	1620	*/
1557
1558	void	1621	void
1559	add_weight (object *op, signed long weight)	1622	add_weight (object *op, signed long weight)
1560	{	1623	{
1561	while (op != NULL)	1624	while (op != NULL)
1562	{	1625	{
…		…
1577	LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);	1640	LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
1578	free (dump);	1641	free (dump);
1579	return op;	1642	return op;
1580	}	1643	}
1581		1644
1582	if (where->head)	1645	if (where->head_ () != where)
1583	{	1646	{
1584	LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n");	1647	LOG (llevError | logBacktrace, "Warning: Tried to insert object into wrong part of multipart object.\n");
1585	where = where->head;	1648	where = where->head;
1586	}	1649	}
1587		1650
1588	return where->insert (op);	1651	return where->insert (op);
1589	}	1652	}
…		…
1594	* inside the object environment.	1657	* inside the object environment.
1595	*	1658	*
1596	* The function returns now pointer to inserted item, and return value can	1659	* The function returns now pointer to inserted item, and return value can
1597	* be != op, if items are merged. -Tero	1660	* be != op, if items are merged. -Tero
1598	*/	1661	*/
1599
1600	object *	1662	object *
1601	object::insert (object *op)	1663	object::insert (object *op)
1602	{	1664	{
1603	object *tmp, *otmp;
1604
1605	if (!QUERY_FLAG (op, FLAG_REMOVED))	1665	if (!QUERY_FLAG (op, FLAG_REMOVED))
1606	op->remove ();	1666	op->remove ();
1607		1667
1608	if (op->more)	1668	if (op->more)
1609	{	1669	{
…		…
1611	return op;	1671	return op;
1612	}	1672	}
1613		1673
1614	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1674	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1615	CLEAR_FLAG (op, FLAG_REMOVED);	1675	CLEAR_FLAG (op, FLAG_REMOVED);
		1676
1616	if (op->nrof)	1677	if (op->nrof)
1617	{	1678	{
1618	for (tmp = inv; tmp != NULL; tmp = tmp->below)	1679	for (object *tmp = inv; tmp; tmp = tmp->below)
1619	if (object::can_merge (tmp, op))	1680	if (object::can_merge (tmp, op))
1620	{	1681	{
1621	/* return the original object and remove inserted object	1682	/* return the original object and remove inserted object
1622	(client needs the original object) */	1683	(client needs the original object) */
1623	tmp->nrof += op->nrof;	1684	tmp->nrof += op->nrof;
…		…
1642	add_weight (this, op->weight * op->nrof);	1703	add_weight (this, op->weight * op->nrof);
1643	}	1704	}
1644	else	1705	else
1645	add_weight (this, (op->weight + op->carrying));	1706	add_weight (this, (op->weight + op->carrying));
1646		1707
1647	otmp = this->in_player ();	1708	if (object *otmp = this->in_player ())
1648	if (otmp && otmp->contr)
1649	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1709	if (otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1650	otmp->update_stats ();	1710	otmp->update_stats ();
1651		1711
		1712	op->owner = 0; // its his/hers now. period.
1652	op->map = 0;	1713	op->map = 0;
1653	op->env = this;	1714	op->env = this;
1654	op->above = 0;	1715	op->above = 0;
1655	op->below = 0;	1716	op->below = 0;
1656	op->x = 0, op->y = 0;	1717	op->x = op->y = 0;
1657		1718
1658	/* reset the light list and los of the players on the map */	1719	/* reset the light list and los of the players on the map */
1659	if ((op->glow_radius != 0) && map)	1720	if (op->glow_radius && map)
1660	{	1721	{
1661	#ifdef DEBUG_LIGHTS	1722	#ifdef DEBUG_LIGHTS
1662	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);	1723	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1663	#endif /* DEBUG_LIGHTS */	1724	#endif /* DEBUG_LIGHTS */
1664	if (map->darkness)	1725	if (map->darkness)
…		…
1898	* activate recursively a flag on an object inventory	1959	* activate recursively a flag on an object inventory
1899	*/	1960	*/
1900	void	1961	void
1901	flag_inv (object *op, int flag)	1962	flag_inv (object *op, int flag)
1902	{	1963	{
1903	if (op->inv)
1904	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)	1964	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1905	{	1965	{
1906	SET_FLAG (tmp, flag);	1966	SET_FLAG (tmp, flag);
1907	flag_inv (tmp, flag);	1967	flag_inv (tmp, flag);
1908	}	1968	}
1909	}	1969	}
1910		1970
1911	/*	1971	/*
1912	* deactivate recursively a flag on an object inventory	1972	* deactivate recursively a flag on an object inventory
1913	*/	1973	*/
1914	void	1974	void
1915	unflag_inv (object *op, int flag)	1975	unflag_inv (object *op, int flag)
1916	{	1976	{
1917	if (op->inv)
1918	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)	1977	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1919	{	1978	{
1920	CLEAR_FLAG (tmp, flag);	1979	CLEAR_FLAG (tmp, flag);
1921	unflag_inv (tmp, flag);	1980	unflag_inv (tmp, flag);
1922	}	1981	}
1923	}
1924
1925	/*
1926	* set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in
1927	* all it's inventory (recursively).
1928	* If checksums are used, a player will get set_cheat called for
1929	* him/her-self and all object carried by a call to this function.
1930	*/
1931	void
1932	set_cheat (object *op)
1933	{
1934	SET_FLAG (op, FLAG_WAS_WIZ);
1935	flag_inv (op, FLAG_WAS_WIZ);
1936	}	1982	}
1937		1983
1938	/*	1984	/*
1939	* find_free_spot(object, map, x, y, start, stop) will search for	1985	* find_free_spot(object, map, x, y, start, stop) will search for
1940	* a spot at the given map and coordinates which will be able to contain	1986	* a spot at the given map and coordinates which will be able to contain
…		…
1942	* to search (see the freearr_x/y[] definition).	1988	* to search (see the freearr_x/y[] definition).
1943	* It returns a random choice among the alternatives found.	1989	* It returns a random choice among the alternatives found.
1944	* start and stop are where to start relative to the free_arr array (1,9	1990	* start and stop are where to start relative to the free_arr array (1,9
1945	* does all 4 immediate directions). This returns the index into the	1991	* does all 4 immediate directions). This returns the index into the
1946	* array of the free spot, -1 if no spot available (dir 0 = x,y)	1992	* array of the free spot, -1 if no spot available (dir 0 = x,y)
1947	* Note - this only checks to see if there is space for the head of the
1948	* object - if it is a multispace object, this should be called for all
1949	* pieces.
1950	* Note2: This function does correctly handle tiled maps, but does not	1993	* Note: This function does correctly handle tiled maps, but does not
1951	* inform the caller. However, insert_ob_in_map will update as	1994	* inform the caller. However, insert_ob_in_map will update as
1952	* necessary, so the caller shouldn't need to do any special work.	1995	* necessary, so the caller shouldn't need to do any special work.
1953	* Note - updated to take an object instead of archetype - this is necessary	1996	* Note - updated to take an object instead of archetype - this is necessary
1954	* because arch_blocked (now ob_blocked) needs to know the movement type	1997	* because arch_blocked (now ob_blocked) needs to know the movement type
1955	* to know if the space in question will block the object. We can't use	1998	* to know if the space in question will block the object. We can't use
…		…
1957	* customized, changed states, etc.	2000	* customized, changed states, etc.
1958	*/	2001	*/
1959	int	2002	int
1960	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)	2003	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
1961	{	2004	{
		2005	int altern[SIZEOFFREE];
1962	int index = 0, flag;	2006	int index = 0, flag;
1963	int altern[SIZEOFFREE];
1964		2007
1965	for (int i = start; i < stop; i++)	2008	for (int i = start; i < stop; i++)
1966	{	2009	{
1967	flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]);	2010	mapxy pos (m, x, y); pos.move (i);
1968	if (!flag)	2011
		2012	if (!pos.normalise ())
		2013	continue;
		2014
		2015	mapspace &ms = *pos;
		2016
		2017	if (ms.flags () & P_IS_ALIVE)
		2018	continue;
		2019
		2020	/* However, often
		2021	* ob doesn't have any move type (when used to place exits)
		2022	* so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.
		2023	*/
		2024	if (ob && ob->move_type == 0 && ms.move_block != MOVE_ALL)
		2025	{
1969	altern [index++] = i;	2026	altern [index++] = i;
		2027	continue;
		2028	}
1970		2029
1971	/* Basically, if we find a wall on a space, we cut down the search size.	2030	/* Basically, if we find a wall on a space, we cut down the search size.
1972	* In this way, we won't return spaces that are on another side of a wall.	2031	* In this way, we won't return spaces that are on another side of a wall.
1973	* This mostly work, but it cuts down the search size in all directions -	2032	* This mostly work, but it cuts down the search size in all directions -
1974	* if the space being examined only has a wall to the north and empty	2033	* if the space being examined only has a wall to the north and empty
1975	* spaces in all the other directions, this will reduce the search space	2034	* spaces in all the other directions, this will reduce the search space
1976	* to only the spaces immediately surrounding the target area, and	2035	* to only the spaces immediately surrounding the target area, and
1977	* won't look 2 spaces south of the target space.	2036	* won't look 2 spaces south of the target space.
1978	*/	2037	*/
1979	else if ((flag & P_NO_PASS) && maxfree[i] < stop)	2038	if (ms.move_block == MOVE_ALL && maxfree[i] < stop)
		2039	{
1980	stop = maxfree[i];	2040	stop = maxfree[i];
		2041	continue;
		2042	}
		2043
		2044	/* Note it is intentional that we check ob - the movement type of the
		2045	* head of the object should correspond for the entire object.
		2046	*/
		2047	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
		2048	continue;
		2049
		2050	if (ob->blocked (m, pos.x, pos.y))
		2051	continue;
		2052
		2053	altern [index++] = i;
1981	}	2054	}
1982		2055
1983	if (!index)	2056	if (!index)
1984	return -1;	2057	return -1;
1985		2058
…		…
1994	*/	2067	*/
1995	int	2068	int
1996	find_first_free_spot (const object *ob, maptile *m, int x, int y)	2069	find_first_free_spot (const object *ob, maptile *m, int x, int y)
1997	{	2070	{
1998	for (int i = 0; i < SIZEOFFREE; i++)	2071	for (int i = 0; i < SIZEOFFREE; i++)
1999	if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]))	2072	if (!ob->blocked (m, x + freearr_x[i], y + freearr_y[i]))
2000	return i;	2073	return i;
2001		2074
2002	return -1;	2075	return -1;
2003	}	2076	}
2004		2077
…		…
2058	object *tmp;	2131	object *tmp;
2059	maptile *mp;	2132	maptile *mp;
2060		2133
2061	MoveType blocked, move_type;	2134	MoveType blocked, move_type;
2062		2135
2063	if (exclude && exclude->head)	2136	if (exclude && exclude->head_ () != exclude)
2064	{	2137	{
2065	exclude = exclude->head;	2138	exclude = exclude->head;
2066	move_type = exclude->move_type;	2139	move_type = exclude->move_type;
2067	}	2140	}
2068	else	2141	else
…		…
2091	max = maxfree[i];	2164	max = maxfree[i];
2092	else if (mflags & P_IS_ALIVE)	2165	else if (mflags & P_IS_ALIVE)
2093	{	2166	{
2094	for (tmp = ms.bot; tmp; tmp = tmp->above)	2167	for (tmp = ms.bot; tmp; tmp = tmp->above)
2095	if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)	2168	if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)
2096	&& (tmp != exclude || (tmp->head && tmp->head != exclude)))	2169	&& (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2097	break;	2170	break;
2098		2171
2099	if (tmp)	2172	if (tmp)
2100	return freedir[i];	2173	return freedir[i];
2101	}	2174	}
…		…
2281	* Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause	2354	* Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause
2282	* core dumps if they do.	2355	* core dumps if they do.
2283	*	2356	*
2284	* Add a check so we can't pick up invisible objects (0.93.8)	2357	* Add a check so we can't pick up invisible objects (0.93.8)
2285	*/	2358	*/
2286
2287	int	2359	int
2288	can_pick (const object *who, const object *item)	2360	can_pick (const object *who, const object *item)
2289	{	2361	{
2290	return /*QUERY_FLAG(who,FLAG_WIZ)|| */	2362	return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2291	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&	2363	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
…		…
2296	* create clone from object to another	2368	* create clone from object to another
2297	*/	2369	*/
2298	object *	2370	object *
2299	object_create_clone (object *asrc)	2371	object_create_clone (object *asrc)
2300	{	2372	{
2301	object *dst = 0, *tmp, *src, *part, *prev, *item;	2373	object *dst = 0, *tmp, *src, *prev, *item;
2302		2374
2303	if (!asrc)	2375	if (!asrc)
2304	return 0;	2376	return 0;
2305		2377
2306	src = asrc;
2307	if (src->head)
2308	src = src->head;	2378	src = asrc->head_ ();
2309		2379
2310	prev = 0;	2380	prev = 0;
2311	for (part = src; part; part = part->more)	2381	for (object *part = src; part; part = part->more)
2312	{	2382	{
2313	tmp = part->clone ();	2383	tmp = part->clone ();
2314	tmp->x -= src->x;	2384	tmp->x -= src->x;
2315	tmp->y -= src->y;	2385	tmp->y -= src->y;
2316		2386
…		…
2332		2402
2333	for (item = src->inv; item; item = item->below)	2403	for (item = src->inv; item; item = item->below)
2334	insert_ob_in_ob (object_create_clone (item), dst);	2404	insert_ob_in_ob (object_create_clone (item), dst);
2335		2405
2336	return dst;	2406	return dst;
2337	}
2338
2339	/* GROS - Creates an object using a string representing its content. */
2340	/* Basically, we save the content of the string to a temp file, then call */
2341	/* load_object on it. I admit it is a highly inefficient way to make things, */
2342	/* but it was simple to make and allows reusing the load_object function. */
2343	/* Remember not to use load_object_str in a time-critical situation. */
2344	/* Also remember that multiparts objects are not supported for now. */
2345	object *
2346	load_object_str (const char *obstr)
2347	{
2348	object *op;
2349	char filename[MAX_BUF];
2350
2351	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2352
2353	FILE *tempfile = fopen (filename, "w");
2354
2355	if (tempfile == NULL)
2356	{
2357	LOG (llevError, "Error - Unable to access load object temp file\n");
2358	return NULL;
2359	}
2360
2361	fprintf (tempfile, obstr);
2362	fclose (tempfile);
2363
2364	op = object::create ();
2365
2366	object_thawer thawer (filename);
2367
2368	if (thawer)
2369	load_object (thawer, op, 0);
2370
2371	LOG (llevDebug, " load str completed, object=%s\n", &op->name);
2372	CLEAR_FLAG (op, FLAG_REMOVED);
2373
2374	return op;
2375	}	2407	}
2376		2408
2377	/* This returns the first object in who's inventory that	2409	/* This returns the first object in who's inventory that
2378	* has the same type and subtype match.	2410	* has the same type and subtype match.
2379	* returns NULL if no match.	2411	* returns NULL if no match.
…		…
2434	if (link->key == canonical_key)	2466	if (link->key == canonical_key)
2435	return link->value;	2467	return link->value;
2436		2468
2437	return 0;	2469	return 0;
2438	}	2470	}
2439
2440		2471
2441	/*	2472	/*
2442	* Updates the canonical_key in op to value.	2473	* Updates the canonical_key in op to value.
2443	*	2474	*
2444	* canonical_key is a shared string (value doesn't have to be).	2475	* canonical_key is a shared string (value doesn't have to be).
…		…
2468	/* Basically, if the archetype has this key set,	2499	/* Basically, if the archetype has this key set,
2469	* we need to store the null value so when we save	2500	* we need to store the null value so when we save
2470	* it, we save the empty value so that when we load,	2501	* it, we save the empty value so that when we load,
2471	* we get this value back again.	2502	* we get this value back again.
2472	*/	2503	*/
2473	if (get_ob_key_link (&op->arch->clone, canonical_key))	2504	if (get_ob_key_link (op->arch, canonical_key))
2474	field->value = 0;	2505	field->value = 0;
2475	else	2506	else
2476	{	2507	{
2477	if (last)	2508	if (last)
2478	last->next = field->next;	2509	last->next = field->next;
…		…
2547	}	2578	}
2548	else	2579	else
2549	item = item->env;	2580	item = item->env;
2550	}	2581	}
2551		2582
2552
2553	const char *	2583	const char *
2554	object::flag_desc (char *desc, int len) const	2584	object::flag_desc (char *desc, int len) const
2555	{	2585	{
2556	char *p = desc;	2586	char *p = desc;
2557	bool first = true;	2587	bool first = true;
…		…
2584	{	2614	{
2585	char flagdesc[512];	2615	char flagdesc[512];
2586	char info2[256 * 4];	2616	char info2[256 * 4];
2587	char *p = info;	2617	char *p = info;
2588		2618
2589	p += snprintf (p, 512, "{cnt:%d,uuid:<1.%" PRIx64 ">,name:\"%s\"%s%s,flags:[%s],type:%d}",	2619	p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s,flags:[%s],type:%d}",
2590	count, uuid.seq,	2620	count,
		2621	uuid.c_str (),
2591	&name,	2622	&name,
2592	title ? "\",title:\"" : "",	2623	title ? "\",title:\"" : "",
2593	title ? (const char *)title : "",	2624	title ? (const char *)title : "",
2594	flag_desc (flagdesc, 512), type);	2625	flag_desc (flagdesc, 512), type);
2595		2626
2596	if (env)	2627	if (!this->flag[FLAG_REMOVED] && env)
2597	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2628	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2598		2629
2599	if (map)	2630	if (map)
2600	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);	2631	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2601		2632
…		…
2603	}	2634	}
2604		2635
2605	const char *	2636	const char *
2606	object::debug_desc () const	2637	object::debug_desc () const
2607	{	2638	{
2608	static char info[256 * 4];	2639	static char info[3][256 * 4];
		2640	static int info_idx;
		2641
2609	return debug_desc (info);	2642	return debug_desc (info [++info_idx % 3]);
2610	}
2611
2612	const char *
2613	object::debug_desc2 () const
2614	{
2615	static char info[256 * 4];
2616	return debug_desc (info);
2617	}	2643	}
2618		2644
2619	struct region *	2645	struct region *
2620	object::region () const	2646	object::region () const
2621	{	2647	{
…		…
2624	}	2650	}
2625		2651
2626	const materialtype_t *	2652	const materialtype_t *
2627	object::dominant_material () const	2653	object::dominant_material () const
2628	{	2654	{
2629	if (materialtype_t *mat = name_to_material (materialname))	2655	if (materialtype_t *mt = name_to_material (materialname))
2630	return mat;	2656	return mt;
2631		2657
2632	// omfg this is slow, this has to be temporary :)
2633	shstr unknown ("unknown");
2634
2635	return name_to_material (unknown);	2658	return name_to_material (shstr_unknown);
2636	}	2659	}
2637		2660
2638	void	2661	void
2639	object::open_container (object *new_container)	2662	object::open_container (object *new_container)
2640	{	2663	{
2641	if (container == new_container)	2664	if (container == new_container)
2642	return;	2665	return;
2643
2644	if (contr && contr->ns)
2645	contr->ns->floorbox_reset ();
2646		2666
2647	if (object *old_container = container)	2667	if (object *old_container = container)
2648	{	2668	{
2649	if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))	2669	if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
2650	return;	2670	return;
…		…
2659	old_container->flag [FLAG_APPLIED] = 0;	2679	old_container->flag [FLAG_APPLIED] = 0;
2660	container = 0;	2680	container = 0;
2661		2681
2662	esrv_update_item (UPD_FLAGS, this, old_container);	2682	esrv_update_item (UPD_FLAGS, this, old_container);
2663	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));	2683	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
		2684	play_sound (sound_find ("chest_close"));
2664	}	2685	}
2665		2686
2666	if (new_container)	2687	if (new_container)
2667	{	2688	{
2668	if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))	2689	if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))
…		…
2677	closer->flag [FLAG_NO_MAP_SAVE] = 1;	2698	closer->flag [FLAG_NO_MAP_SAVE] = 1;
2678	new_container->insert (closer);	2699	new_container->insert (closer);
2679	}	2700	}
2680	#endif	2701	#endif
2681		2702
		2703	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));
		2704
2682	new_container->flag [FLAG_APPLIED] = 1;	2705	new_container->flag [FLAG_APPLIED] = 1;
2683	container = new_container;	2706	container = new_container;
2684		2707
2685	esrv_update_item (UPD_FLAGS, this, new_container);	2708	esrv_update_item (UPD_FLAGS, this, new_container);
2686	esrv_send_inventory (this, new_container);	2709	esrv_send_inventory (this, new_container);
2687	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));	2710	play_sound (sound_find ("chest_open"));
		2711	}
		2712	}
		2713
		2714	object *
		2715	object::force_find (const shstr name)
		2716	{
		2717	/* cycle through his inventory to look for the MARK we want to
		2718	* place
		2719	*/
		2720	for (object *tmp = inv; tmp; tmp = tmp->below)
		2721	if (tmp->type == FORCE && tmp->slaying == name)
		2722	return splay (tmp);
		2723
		2724	return 0;
		2725	}
		2726
		2727	void
		2728	object::force_add (const shstr name, int duration)
		2729	{
		2730	if (object *force = force_find (name))
		2731	force->destroy ();
		2732
		2733	object *force = get_archetype (FORCE_NAME);
		2734
		2735	force->slaying = name;
		2736	force->stats.food = 1;
		2737	force->speed_left = -1.f;
		2738
		2739	force->set_speed (duration ? 1.f / duration : 0.f);
		2740	force->flag [FLAG_IS_USED_UP] = true;
		2741	force->flag [FLAG_APPLIED] = true;
		2742
		2743	insert (force);
		2744	}
		2745
		2746	void
		2747	object::play_sound (faceidx sound) const
		2748	{
		2749	if (!sound)
		2750	return;
		2751
		2752	if (flag [FLAG_REMOVED])
		2753	return;
		2754
		2755	if (env)
2688	}	2756	{
		2757	if (object *pl = in_player ())
		2758	pl->contr->play_sound (sound);
		2759	}
		2760	else
		2761	map->play_sound (sound, x, y);
2689	}	2762	}
2690		2763
2691

Diff Legend

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