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.99 by root, Sun Dec 31 18:10:40 2006 UTC vs.
Revision 1.253 by root, Sun Aug 17 22:46:26 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,2008 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.
25	sub/add_weight will transcend the environment updating the carrying
26	variable. */
27	#include <global.h>	24	#include <global.h>
28	#include <stdio.h>	25	#include <stdio.h>
29	#include <sys/types.h>	26	#include <sys/types.h>
30	#include <sys/uio.h>	27	#include <sys/uio.h>
31	#include <object.h>	28	#include <object.h>
32	#include <funcpoint.h>	29	#include <sproto.h>
33	#include <loader.h>	30	#include <loader.h>
34		31
35	#include <bitset>	32	#include <bitset>
36		33
37	int nrofallocobjects = 0;	34	UUID UUID::cur;
38	static UUID uuid;	35	static uint64_t seq_next_save;
39	const uint64 UUID_SKIP = 1<<19;	36	static const uint64 UUID_GAP = 1<<19;
40		37
41	object *active_objects; /* List of active objects that need to be processed */	38	objectvec objects;
		39	activevec actives;
42		40
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,	41	short freearr_x[SIZEOFFREE] = {
		42	0,
		43	0, 1, 1, 1, 0, -1, -1, -1,
		44	0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,
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	45	0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3, -3, -3, -3, -3, -2, -1
45	};	46	};
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,	47	short freearr_y[SIZEOFFREE] = {
		48	0,
		49	-1, -1, 0, 1, 1, 1, 0, -1,
		50	-2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2,
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	51	-3, -3, -3, -3, -2, -1, 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3
48	};	52	};
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,	53	int maxfree[SIZEOFFREE] = {
		54	0,
		55	9, 10, 13, 14, 17, 18, 21, 22,
		56	25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45, 48,
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	57	49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49
51	};	58	};
52	int freedir[SIZEOFFREE] = {	59	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,	60	0,
		61	1, 2, 3, 4, 5, 6, 7, 8,
		62	1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8,
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	63	1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8
55	};	64	};
56		65
57	static void	66	static void
58	write_uuid (void)	67	write_uuid (uval64 skip, bool sync)
59	{	68	{
60	char filename1[MAX_BUF], filename2[MAX_BUF];	69	CALL_BEGIN (2);
61		70	CALL_ARG_SV (newSVval64 (skip));
62	sprintf (filename1, "%s/uuid", settings.localdir);	71	CALL_ARG_SV (boolSV (sync));
63	sprintf (filename2, "%s/uuid~", settings.localdir);	72	CALL_CALL ("cf::write_uuid", G_DISCARD);
64		73	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	}	74	}
77		75
78	static void	76	static void
79	read_uuid (void)	77	read_uuid (void)
80	{	78	{
81	char filename[MAX_BUF];	79	char filename[MAX_BUF];
82		80
83	sprintf (filename, "%s/uuid", settings.localdir);	81	sprintf (filename, "%s/uuid", settings.localdir);
		82
		83	seq_next_save = 0;
84		84
85	FILE *fp;	85	FILE *fp;
86		86
87	if (!(fp = fopen (filename, "r")))	87	if (!(fp = fopen (filename, "r")))
88	{	88	{
89	if (errno == ENOENT)	89	if (errno == ENOENT)
90	{	90	{
91	LOG (llevInfo, "RESET uid to 1\n");	91	LOG (llevInfo, "RESET uid to 1\n");
92	uuid.seq = 0;	92	UUID::cur.seq = 0;
93	write_uuid ();	93	write_uuid (UUID_GAP, true);
94	return;	94	return;
95	}	95	}
96		96
97	LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);	97	LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);
98	_exit (1);	98	_exit (1);
99	}	99	}
100		100
101	int version;	101	UUID::BUF buf;
102	unsigned long long uid;	102	buf[0] = 0;
103	if (2 != fscanf (fp, "<%d,%llx>\n", &version, &uid) || version != 1)	103	fgets (buf, sizeof (buf), fp);
		104
		105	if (!UUID::cur.parse (buf))
104	{	106	{
105	LOG (llevError, "FATAL: error reading uid from %s!\n", filename);	107	LOG (llevError, "FATAL: error reading uid from %s (%s)!\n", filename, buf);
106	_exit (1);	108	_exit (1);
107	}	109	}
108		110
109	uuid.seq = uid;	111	LOG (llevDebug, "read UUID: %s\n", UUID::cur.c_str ());
110	write_uuid ();	112
111	LOG (llevDebug, "read UID: %" PRId64 "\n", uid);	113	write_uuid (UUID_GAP, true);
112	fclose (fp);	114	fclose (fp);
113	}	115	}
114		116
115	UUID	117	UUID
116	gen_uuid ()	118	UUID::gen ()
117	{	119	{
118	UUID uid;	120	UUID uid;
119		121
120	uid.seq = ++uuid.seq;	122	uid.seq = ++cur.seq;
121		123
122	if (!(uuid.seq & (UUID_SKIP - 1)))	124	if (expect_false (cur.seq >= seq_next_save))
123	write_uuid ();	125	{
		126	seq_next_save = UUID::cur.seq + (UUID_GAP >> 1);
		127	write_uuid (UUID_GAP, false);
		128	}
		129
124		130
125	return uid;	131	return uid;
126	}	132	}
127		133
128	void	134	void
129	init_uuid ()	135	UUID::init ()
130	{	136	{
131	read_uuid ();	137	read_uuid ();
132	}	138	}
133		139
134	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */	140	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */
135	static int	141	static bool
136	compare_ob_value_lists_one (const object *wants, const object *has)	142	compare_ob_value_lists_one (const object *wants, const object *has)
137	{	143	{
138	key_value *wants_field;
139
140	/* n-squared behaviour (see get_ob_key_link()), but I'm hoping both	144	/* n-squared behaviour (see kv_get), but I'm hoping both
141	* objects with lists are rare, and lists stay short. If not, use a	145	* objects with lists are rare, and lists stay short. If not, use a
142	* different structure or at least keep the lists sorted...	146	* different structure or at least keep the lists sorted...
143	*/	147	*/
144		148
145	/* For each field in wants, */	149	/* For each field in wants, */
146	for (wants_field = wants->key_values; wants_field; wants_field = wants_field->next)	150	for (key_value *kv = wants->key_values; kv; kv = kv->next)
147	{	151	if (has->kv_get (kv->key) != kv->value)
148	key_value *has_field;	152	return false;
149
150	/* Look for a field in has with the same key. */
151	has_field = get_ob_key_link (has, wants_field->key);
152
153	if (has_field == NULL)
154	{
155	/* No field with that name. */
156	return FALSE;
157	}
158
159	/* Found the matching field. */
160	if (has_field->value != wants_field->value)
161	{
162	/* Values don't match, so this half of the comparison is false. */
163	return FALSE;
164	}
165
166	/* If we get here, we found a match. Now for the next field in wants. */
167	}
168		153
169	/* If we get here, every field in wants has a matching field in has. */	154	/* If we get here, every field in wants has a matching field in has. */
170	return TRUE;	155	return true;
171	}	156	}
172		157
173	/* Returns TRUE if ob1 has the same key_values as ob2. */	158	/* Returns TRUE if ob1 has the same key_values as ob2. */
174	static int	159	static bool
175	compare_ob_value_lists (const object *ob1, const object *ob2)	160	compare_ob_value_lists (const object *ob1, const object *ob2)
176	{	161	{
177	/* However, there may be fields in has which aren't partnered in wants,	162	/* However, there may be fields in has which aren't partnered in wants,
178	* so we need to run the comparison *twice*. :(	163	* so we need to run the comparison *twice*. :(
179	*/	164	*/
180	return compare_ob_value_lists_one (ob1, ob2) && compare_ob_value_lists_one (ob2, ob1);	165	return compare_ob_value_lists_one (ob1, ob2)
		166	&& compare_ob_value_lists_one (ob2, ob1);
181	}	167	}
182		168
183	/* Function examines the 2 objects given to it, and returns true if	169	/* Function examines the 2 objects given to it, and returns true if
184	* they can be merged together.	170	* they can be merged together.
185	*	171	*
…		…
200	|| ob1->speed != ob2->speed	186	|| ob1->speed != ob2->speed
201	|| ob1->value != ob2->value	187	|| ob1->value != ob2->value
202	|| ob1->name != ob2->name)	188	|| ob1->name != ob2->name)
203	return 0;	189	return 0;
204		190
205	//TODO: this ain't working well, use nicer and correct overflow check	191	/* Do not merge objects if nrof would overflow. First part checks
206	/* Do not merge objects if nrof would overflow. We use 1UL<<31 since that	192	* for unsigned overflow (2c), second part checks whether the result
207	* value could not be stored in a sint32 (which unfortunately sometimes is	193	* would fit into a 32 bit signed int, which is often used to hold
208	* used to store nrof).	194	* nrof values.
209	*/	195	*/
210	if (ob1->nrof + ob2->nrof >= 1UL << 31)	196	if (~ob1->nrof < ob2->nrof || ob1->nrof + ob2->nrof > (1UL << 31))
211	return 0;	197	return 0;
212		198
213	/* If the objects have been identified, set the BEEN_APPLIED flag.	199	/* If the objects have been identified, set the BEEN_APPLIED flag.
214	* This is to the comparison of the flags below will be OK. We	200	* This is to the comparison of the flags below will be OK. We
215	* just can't ignore the been applied or identified flags, as they	201	* just can't ignore the been applied or identified flags, as they
216	* are not equal - just if it has been identified, the been_applied	202	* are not equal - just if it has been identified, the been_applied
217	* flags lose any meaning.	203	* flags lose any meaning.
218	*/	204	*/
219	if (QUERY_FLAG (ob1, FLAG_IDENTIFIED))	205	if (QUERY_FLAG (ob1, FLAG_IDENTIFIED))
220	SET_FLAG (ob1, FLAG_BEEN_APPLIED);	206	SET_FLAG (ob1, FLAG_BEEN_APPLIED);
221		207
222	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))	208	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))
223	SET_FLAG (ob2, FLAG_BEEN_APPLIED);	209	SET_FLAG (ob2, FLAG_BEEN_APPLIED);
224		210
225	if ((ob1->flag ^ ob2->flag).reset (FLAG_INV_LOCKED).reset (FLAG_CLIENT_SENT).any ()	211	if (ob1->arch->archname != ob2->arch->archname
226	|| ob1->arch != ob2->arch
227	|| ob1->name != ob2->name	212	|| ob1->name != ob2->name
228	|| ob1->title != ob2->title	213	|| ob1->title != ob2->title
229	|| ob1->msg != ob2->msg	214	|| ob1->msg != ob2->msg
230	|| ob1->weight != ob2->weight	215	|| ob1->weight != ob2->weight
231	|| memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
232	|| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats) )
233	|| ob1->attacktype != ob2->attacktype	216	|| ob1->attacktype != ob2->attacktype
234	|| ob1->magic != ob2->magic	217	|| ob1->magic != ob2->magic
235	|| ob1->slaying != ob2->slaying	218	|| ob1->slaying != ob2->slaying
236	|| ob1->skill != ob2->skill	219	|| ob1->skill != ob2->skill
237	|| ob1->value != ob2->value	220	|| ob1->value != ob2->value
238	|| ob1->animation_id != ob2->animation_id	221	|| ob1->animation_id != ob2->animation_id
		222	|| (ob1->face != ob2->face && !ob1->animation_id) // face and animation are dependent on each other
239	|| ob1->client_type != ob2->client_type	223	|| ob1->client_type != ob2->client_type
240	|| ob1->materialname != ob2->materialname	224	|| ob1->materialname != ob2->materialname
241	|| ob1->lore != ob2->lore	225	|| ob1->lore != ob2->lore
242	|| ob1->subtype != ob2->subtype	226	|| ob1->subtype != ob2->subtype
243	|| ob1->move_type != ob2->move_type	227	|| ob1->move_type != ob2->move_type
244	|| ob1->move_block != ob2->move_block	228	|| ob1->move_block != ob2->move_block
245	|| ob1->move_allow != ob2->move_allow	229	|| ob1->move_allow != ob2->move_allow
246	|| ob1->move_on != ob2->move_on	230	|| ob1->move_on != ob2->move_on
247	|| ob1->move_off != ob2->move_off	231	|| ob1->move_off != ob2->move_off
248	|| ob1->move_slow != ob2->move_slow	232	|| ob1->move_slow != ob2->move_slow
249	|| ob1->move_slow_penalty != ob2->move_slow_penalty)	233	|| ob1->move_slow_penalty != ob2->move_slow_penalty
		234	|| memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
		235	|| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats)))
250	return 0;	236	return 0;
251		237
		238	if ((ob1->flag ^ ob2->flag)
		239	.reset (FLAG_INV_LOCKED)
		240	.reset (FLAG_CLIENT_SENT)
		241	.reset (FLAG_REMOVED)
		242	.any ())
		243	return 0;
		244
252	/* This is really a spellbook check - really, we should	245	/* This is really a spellbook check - we should in general
253	* check all objects in the inventory.	246	* not merge objects with real inventories, as splitting them
		247	* is hard.
254	*/	248	*/
255	if (ob1->inv || ob2->inv)	249	if (ob1->inv || ob2->inv)
256	{	250	{
257	/* if one object has inventory but the other doesn't, not equiv */	251	if (!(ob1->inv && ob2->inv))
258	if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv))	252	return 0; /* inventories differ in length */
259	return 0;
260		253
261	/* Now check to see if the two inventory objects could merge */	254	if (ob1->inv->below || ob2->inv->below)
		255	return 0; /* more than one object in inv */
		256
262	if (!object::can_merge (ob1->inv, ob2->inv))	257	if (!object::can_merge (ob1->inv, ob2->inv))
263	return 0;	258	return 0; /* inventory objects differ */
264		259
265	/* inventory ok - still need to check rest of this object to see	260	/* inventory ok - still need to check rest of this object to see
266	* if it is valid.	261	* if it is valid.
267	*/	262	*/
268	}	263	}
…		…
287	if (ob1->level != ob2->level)	282	if (ob1->level != ob2->level)
288	return 0;	283	return 0;
289	break;	284	break;
290	}	285	}
291		286
292	if (ob1->key_values != NULL || ob2->key_values != NULL)	287	if (ob1->key_values || ob2->key_values)
293	{	288	{
294	/* At least one of these has key_values. */	289	/* At least one of these has key_values. */
295	if ((ob1->key_values == NULL) != (ob2->key_values == NULL))	290	if ((!ob1->key_values) != (!ob2->key_values))
296	/* One has fields, but the other one doesn't. */	291	return 0; /* One has fields, but the other one doesn't. */
		292
		293	if (!compare_ob_value_lists (ob1, ob2))
297	return 0;	294	return 0;
298	else if (!compare_ob_value_lists (ob1, ob2))
299	return 0;
300	}	295	}
301		296
302	//TODO: generate an event or call into perl for additional checks
303	if (ob1->self || ob2->self)	297	if (ob1->self || ob2->self)
304	{	298	{
305	ob1->optimise ();	299	ob1->optimise ();
306	ob2->optimise ();	300	ob2->optimise ();
307		301
308	if (ob1->self || ob2->self)	302	if (ob1->self || ob2->self)
		303	{
		304	int k1 = ob1->self ? HvTOTALKEYS (ob1->self) : 0;
		305	int k2 = ob2->self ? HvTOTALKEYS (ob2->self) : 0;
		306
		307	if (k1 != k2)
309	return 0;	308	return 0;
		309
		310	if (k1 == 0)
		311	return 1;
		312
		313	if (!cfperl_can_merge (ob1, ob2))
		314	return 0;
		315	}
310	}	316	}
311		317
312	/* Everything passes, must be OK. */	318	/* Everything passes, must be OK. */
313	return 1;	319	return 1;
314	}	320	}
315		321
		322	// find player who can see this object
		323	object *
		324	object::visible_to () const
		325	{
		326	if (client_visible () && !flag [FLAG_REMOVED])
		327	{
		328	// see if we are in a container of sorts
		329	if (env)
		330	{
		331	// the player inventory itself is always visible
		332	if (env->type == PLAYER)
		333	return env;
		334
		335	// else a player could have our env open
		336	object *envest = env->outer_env ();
		337
		338	// the player itself is always on a map, so we will find him here
		339	// even if our inv is in a player.
		340	if (envest->is_on_map ())
		341	if (object *pl = envest->ms ().player ())
		342	if (pl->container == env)
		343	return pl;
		344	}
		345	else
		346	{
		347	// maybe there is a player standing on the same mapspace
		348	// this will catch the case where "this" is a player
		349	if (object *pl = ms ().player ())
		350	if ((!pl->container && pl->contr->ns && !pl->contr->ns->update_look)
		351	|| this == pl->container)
		352	return pl;
		353	}
		354	}
		355
		356	return 0;
		357	}
		358
		359	// adjust weight per container type ("of holding")
		360	static sint32
		361	weight_adjust_for (object *op, sint32 weight)
		362	{
		363	return op->type == CONTAINER
		364	? lerp (weight, 0, 100, 0, 100 - op->stats.Str)
		365	: weight;
		366	}
		367
316	/*	368	/*
		369	* adjust_weight(object, weight) adds the specified weight to an object,
		370	* and also updates how much the environment(s) is/are carrying.
		371	*/
		372	static void
		373	adjust_weight (object *op, sint32 weight)
		374	{
		375	while (op)
		376	{
		377	// adjust by actual difference to account for rounding errors
		378	// i.e. (w2 - w1) / f != w2 / f - w1 / f and the latter is correct
		379	weight = weight_adjust_for (op, op->carrying)
		380	- weight_adjust_for (op, op->carrying - weight);
		381
		382	if (!weight)
		383	return;
		384
		385	op->carrying += weight;
		386
		387	if (object *pl = op->visible_to ())
		388	if (pl != op) // player is handled lazily
		389	esrv_update_item (UPD_WEIGHT, pl, op);
		390
		391	op = op->env;
		392	}
		393	}
		394
		395	/*
317	* sum_weight() is a recursive function which calculates the weight	396	* this is a recursive function which calculates the weight
318	* an object is carrying. It goes through in figures out how much	397	* an object is carrying. It goes through op and figures out how much
319	* containers are carrying, and sums it up.	398	* containers are carrying, and sums it up.
320	*/	399	*/
321	long	400	void
322	sum_weight (object *op)	401	object::update_weight ()
323	{	402	{
324	long sum;	403	sint32 sum = 0;
325	object *inv;
326		404
327	for (sum = 0, inv = op->inv; inv != NULL; inv = inv->below)	405	for (object *op = inv; op; op = op->below)
328	{	406	{
329	if (inv->inv)	407	if (op->inv)
330	sum_weight (inv);	408	op->update_weight ();
331	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);	409
		410	sum += op->total_weight ();
		411	}
		412
		413	sum = weight_adjust_for (this, sum);
		414
		415	if (sum != carrying)
332	}	416	{
333
334	if (op->type == CONTAINER && op->stats.Str)
335	sum = (sum * (100 - op->stats.Str)) / 100;
336
337	if (op->carrying != sum)
338	op->carrying = sum;	417	carrying = sum;
339		418
340	return sum;	419	if (object *pl = visible_to ())
		420	if (pl != this) // player is handled lazily
		421	esrv_update_item (UPD_WEIGHT, pl, this);
		422	}
341	}	423	}
342		424
343	/**	425	/*
344	* Return the outermost environment object for a given object.	426	* Used by: Server DM commands: dumpbelow, dump. Some error messages.
345	*/	427	*/
346
347	object *
348	object_get_env_recursive (object *op)
349	{
350	while (op->env != NULL)
351	op = op->env;
352	return op;
353	}
354
355	/*
356	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
357	* Some error messages.
358	* The result of the dump is stored in the static global errmsg array.
359	*/
360
361	char *	428	char *
362	dump_object (object *op)	429	dump_object (object *op)
363	{	430	{
364	if (!op)	431	if (!op)
365	return strdup ("[NULLOBJ]");	432	return strdup ("[NULLOBJ]");
366		433
367	object_freezer freezer;	434	object_freezer freezer;
368	save_object (freezer, op, 1);	435	op->write (freezer);
369	return freezer.as_string ();	436	return freezer.as_string ();
370	}	437	}
371		438
372	/*	439	/*
373	* get_nearest_part(multi-object, object 2) returns the part of the	440	* get_nearest_part(multi-object, object 2) returns the part of the
374	* multi-object 1 which is closest to the second object.	441	* multi-object 1 which is closest to the second object.
375	* If it's not a multi-object, it is returned.	442	* If it's not a multi-object, it is returned.
376	*/	443	*/
377
378	object *	444	object *
379	get_nearest_part (object *op, const object *pl)	445	get_nearest_part (object *op, const object *pl)
380	{	446	{
381	object *tmp, *closest;	447	object *tmp, *closest;
382	int last_dist, i;	448	int last_dist, i;
383		449
384	if (op->more == NULL)	450	if (!op->more)
385	return op;	451	return op;
		452
386	for (last_dist = distance (op, pl), closest = op, tmp = op->more; tmp != NULL; tmp = tmp->more)	453	for (last_dist = distance (op, pl), closest = op, tmp = op->more;
		454	tmp;
		455	tmp = tmp->more)
387	if ((i = distance (tmp, pl)) < last_dist)	456	if ((i = distance (tmp, pl)) < last_dist)
388	closest = tmp, last_dist = i;	457	closest = tmp, last_dist = i;
		458
389	return closest;	459	return closest;
390	}	460	}
391		461
392	/*	462	/*
393	* Returns the object which has the count-variable equal to the argument.	463	* Returns the object which has the count-variable equal to the argument.
		464	* VERRRY slow.
394	*/	465	*/
395
396	object *	466	object *
397	find_object (tag_t i)	467	find_object (tag_t i)
398	{	468	{
399	for (object *op = object::first; op; op = op->next)	469	for_all_objects (op)
400	if (op->count == i)	470	if (op->count == i)
401	return op;	471	return op;
402		472
403	return 0;	473	return 0;
404	}	474	}
405		475
406	/*	476	/*
407	* Returns the first object which has a name equal to the argument.	477	* Returns the first object which has a name equal to the argument.
408	* Used only by the patch command, but not all that useful.	478	* Used only by the patch command, but not all that useful.
409	* Enables features like "patch <name-of-other-player> food 999"	479	* Enables features like "patch <name-of-other-player> food 999"
410	*/	480	*/
411
412	object *	481	object *
413	find_object_name (const char *str)	482	find_object_name (const char *str)
414	{	483	{
415	shstr_cmp str_ (str);	484	shstr_cmp str_ (str);
416	object *op;
417		485
418	for (op = object::first; op != NULL; op = op->next)	486	if (str_)
		487	for_all_objects (op)
419	if (op->name == str_)	488	if (op->name == str_)
420	break;	489	return op;
421		490
422	return op;	491	return 0;
423	}
424
425	void
426	free_all_object_data ()
427	{
428	LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);
429	}	492	}
430		493
431	/*	494	/*
432	* Sets the owner and sets the skill and exp pointers to owner's current	495	* Sets the owner and sets the skill and exp pointers to owner's current
433	* skill and experience objects.	496	* skill and experience objects.
		497	* ACTUALLY NO! investigate! TODO
434	*/	498	*/
435	void	499	void
436	object::set_owner (object *owner)	500	object::set_owner (object *owner)
437	{	501	{
		502	// allow objects which own objects
438	if (!owner)	503	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)	504	while (owner->owner)
449	owner = owner->owner;	505	owner = owner->owner;
		506
		507	if (flag [FLAG_FREED])
		508	{
		509	LOG (llevError | logBacktrace, "tried to set owner of %s to %s\n", debug_desc (), owner->debug_desc ());
		510	return;
		511	}
450		512
451	this->owner = owner;	513	this->owner = owner;
		514	}
		515
		516	int
		517	object::slottype () const
		518	{
		519	if (type == SKILL)
		520	{
		521	if (IS_COMBAT_SKILL (subtype)) return slot_combat;
		522	if (IS_RANGED_SKILL (subtype)) return slot_ranged;
		523	}
		524	else
		525	{
		526	if (slot [body_combat].info) return slot_combat;
		527	if (slot [body_range ].info) return slot_ranged;
		528	}
		529
		530	return slot_none;
		531	}
		532
		533	bool
		534	object::change_weapon (object *ob)
		535	{
		536	if (current_weapon == ob)
		537	return true;
		538
		539	if (chosen_skill)
		540	chosen_skill->flag [FLAG_APPLIED] = false;
		541
		542	current_weapon = ob;
		543	chosen_skill = !ob || ob->type == SKILL ? ob : find_skill_by_name (this, ob->skill);
		544
		545	if (chosen_skill)
		546	chosen_skill->flag [FLAG_APPLIED] = true;
		547
		548	update_stats ();
		549
		550	if (ob)
		551	{
		552	// now check wether any body locations became invalid, in which case
		553	// we cannot apply the weapon at the moment.
		554	for (int i = 0; i < NUM_BODY_LOCATIONS; ++i)
		555	if (slot[i].used < 0)
		556	{
		557	current_weapon = chosen_skill = 0;
		558	update_stats ();
		559
		560	new_draw_info_format (NDI_UNIQUE, 0, this,
		561	"You try to balance all your items at once, "
		562	"but the %s is just too much for your body. "
		563	"[You need to unapply some items first.]", &ob->name);
		564	return false;
		565	}
		566
		567	//new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);
		568	}
		569	else
		570	;//new_draw_info_format (NDI_UNIQUE, 0, this, "You unwield your weapons.");
		571
		572	if (ob && !ob->flag [FLAG_APPLIED] && ob->type != SPELL)
		573	{
		574	LOG (llevError | logBacktrace, "%s changed to unapplied weapon %s",
		575	&name, ob->debug_desc ());
		576	return false;
		577	}
		578
		579	return true;
452	}	580	}
453		581
454	/* Zero the key_values on op, decrementing the shared-string	582	/* Zero the key_values on op, decrementing the shared-string
455	* refcounts and freeing the links.	583	* refcounts and freeing the links.
456	*/	584	*/
457	static void	585	static void
458	free_key_values (object *op)	586	free_key_values (object *op)
459	{	587	{
460	for (key_value *i = op->key_values; i != 0;)	588	for (key_value *i = op->key_values; i; )
461	{	589	{
462	key_value *next = i->next;	590	key_value *next = i->next;
463	delete i;	591	delete i;
464		592
465	i = next;	593	i = next;
…		…
477	* will point at garbage.	605	* will point at garbage.
478	*/	606	*/
479	void	607	void
480	object::copy_to (object *dst)	608	object::copy_to (object *dst)
481	{	609	{
482	bool is_freed = QUERY_FLAG (dst, FLAG_FREED);	610	dst->remove ();
483	bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED);
484
485	*(object_copy *)dst = *this;	611	*(object_copy *)dst = *this;
486		612	dst->flag [FLAG_REMOVED] = true;
487	if (is_freed)
488	SET_FLAG (dst, FLAG_FREED);
489
490	if (is_removed)
491	SET_FLAG (dst, FLAG_REMOVED);
492
493	if (speed < 0)
494	dst->speed_left = speed_left - RANDOM () % 200 / 100.0;
495		613
496	/* Copy over key_values, if any. */	614	/* Copy over key_values, if any. */
497	if (key_values)	615	if (key_values)
498	{	616	{
499	key_value *tail = 0;	617	key_value *tail = 0;
500	key_value *i;
501
502	dst->key_values = 0;	618	dst->key_values = 0;
503		619
504	for (i = key_values; i; i = i->next)	620	for (key_value *i = key_values; i; i = i->next)
505	{	621	{
506	key_value *new_link = new key_value;	622	key_value *new_link = new key_value;
507		623
508	new_link->next = 0;	624	new_link->next = 0;
509	new_link->key = i->key;	625	new_link->key = i->key;
510	new_link->value = i->value;	626	new_link->value = i->value;
511		627
512	/* Try and be clever here, too. */	628	/* Try and be clever here, too. */
513	if (!dst->key_values)	629	if (!dst->key_values)
514	{	630	{
…		…
521	tail = new_link;	637	tail = new_link;
522	}	638	}
523	}	639	}
524	}	640	}
525		641
		642	if (speed < 0)
		643	dst->speed_left -= rndm ();
		644
526	dst->set_speed (dst->speed);	645	dst->set_speed (dst->speed);
		646	}
		647
		648	void
		649	object::instantiate ()
		650	{
		651	if (!uuid.seq) // HACK
		652	uuid = UUID::gen ();
		653
		654	speed_left = -0.1f;
		655	/* copy the body_info to the body_used - this is only really
		656	* need for monsters, but doesn't hurt to do it for everything.
		657	* by doing so, when a monster is created, it has good starting
		658	* values for the body_used info, so when items are created
		659	* for it, they can be properly equipped.
		660	*/
		661	for (int i = NUM_BODY_LOCATIONS; i--; )
		662	slot[i].used = slot[i].info;
		663
		664	attachable::instantiate ();
527	}	665	}
528		666
529	object *	667	object *
530	object::clone ()	668	object::clone ()
531	{	669	{
532	object *neu = create ();	670	object *neu = create ();
533	copy_to (neu);	671	copy_to (neu);
		672	neu->map = map; // not copied by copy_to
534	return neu;	673	return neu;
535	}	674	}
536		675
537	/*	676	/*
538	* If an object with the IS_TURNABLE() flag needs to be turned due	677	* If an object with the IS_TURNABLE() flag needs to be turned due
…		…
589	* UP_OBJ_FACE: only the objects face has changed.	728	* UP_OBJ_FACE: only the objects face has changed.
590	*/	729	*/
591	void	730	void
592	update_object (object *op, int action)	731	update_object (object *op, int action)
593	{	732	{
594	MoveType move_on, move_off, move_block, move_slow;	733	if (!op)
595
596	if (op == NULL)
597	{	734	{
598	/* this should never happen */	735	/* this should never happen */
599	LOG (llevDebug, "update_object() called for NULL object.\n");	736	LOG (llevError | logBacktrace, "update_object() called for NULL object.\n");
600	return;	737	return;
601	}	738	}
602		739
603	if (op->env)	740	if (!op->is_on_map ())
604	{	741	{
605	/* Animation is currently handled by client, so nothing	742	/* Animation is currently handled by client, so nothing
606	* to do in this case.	743	* to do in this case.
607	*/	744	*/
608	return;	745	return;
609	}	746	}
610
611	/* If the map is saving, don't do anything as everything is
612	* going to get freed anyways.
613	*/
614	if (!op->map || op->map->in_memory == MAP_SAVING)
615	return;
616		747
617	/* make sure the object is within map boundaries */	748	/* make sure the object is within map boundaries */
618	if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height)	749	if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height)
619	{	750	{
620	LOG (llevError, "update_object() called for object out of map!\n");	751	LOG (llevError, "update_object() called for object out of map!\n");
…		…
639	|| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))	770	|| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))
640	|| (m.move_on | op->move_on ) != m.move_on	771	|| (m.move_on | op->move_on ) != m.move_on
641	|| (m.move_off | op->move_off ) != m.move_off	772	|| (m.move_off | op->move_off ) != m.move_off
642	|| (m.move_slow | op->move_slow) != m.move_slow	773	|| (m.move_slow | op->move_slow) != m.move_slow
643	/* This isn't perfect, but I don't expect a lot of objects to	774	/* This isn't perfect, but I don't expect a lot of objects to
644	* to have move_allow right now.	775	* have move_allow right now.
645	*/	776	*/
646	|| ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block	777	|| ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block
647	|| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)	778	|| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)
648	m.flags_ = 0;	779	m.flags_ = 0;
649	}	780	}
…		…
660		791
661	if (op->more)	792	if (op->more)
662	update_object (op->more, action);	793	update_object (op->more, action);
663	}	794	}
664		795
665	object *object::first;
666
667	object::object ()	796	object::object ()
668	{	797	{
669	SET_FLAG (this, FLAG_REMOVED);	798	SET_FLAG (this, FLAG_REMOVED);
670		799
671	expmul = 1.0;	800	expmul = 1.0;
672	face = blank_face;	801	face = blank_face;
673	}	802	}
674		803
675	object::~object ()	804	object::~object ()
676	{	805	{
		806	unlink ();
		807
677	free_key_values (this);	808	free_key_values (this);
678	}	809	}
679		810
		811	static int object_count;
		812
680	void object::link ()	813	void object::link ()
681	{	814	{
		815	assert (!index);//D
		816	uuid = UUID::gen ();
682	count = ++ob_count;	817	count = ++object_count;
683	uuid = gen_uuid ();
684		818
685	prev = 0;	819	refcnt_inc ();
686	next = object::first;	820	objects.insert (this);
687
688	if (object::first)
689	object::first->prev = this;
690
691	object::first = this;
692	}	821	}
693		822
694	void object::unlink ()	823	void object::unlink ()
695	{	824	{
696	if (this == object::first)	825	if (!index)
697	object::first = next;	826	return;
698		827
699	/* Remove this object from the list of used objects */	828	objects.erase (this);
700	if (prev) prev->next = next;	829	refcnt_dec ();
701	if (next) next->prev = prev;
702
703	prev = 0;
704	next = 0;
705	}
706
707	bool
708	object::active () const
709	{
710	return active_next || active_prev || this == active_objects;
711	}	830	}
712		831
713	void	832	void
714	object::activate ()	833	object::activate ()
715	{	834	{
716	/* If already on active list, don't do anything */	835	/* If already on active list, don't do anything */
717	if (active ())	836	if (active)
718	return;	837	return;
719		838
720	if (has_active_speed ())	839	if (has_active_speed ())
721	{	840	actives.insert (this);
722	/* process_events() expects us to insert the object at the beginning
723	* of the list. */
724	active_next = active_objects;
725
726	if (active_next)
727	active_next->active_prev = this;
728
729	active_objects = this;
730	}
731	}	841	}
732		842
733	void	843	void
734	object::activate_recursive ()	844	object::activate_recursive ()
735	{	845	{
736	activate ();	846	activate ();
737		847
738	for (object *op = inv; op; op = op->above)	848	for (object *op = inv; op; op = op->below)
739	op->activate_recursive ();	849	op->activate_recursive ();
740	}	850	}
741		851
742	/* This function removes object 'op' from the list of active	852	/* This function removes object 'op' from the list of active
743	* objects.	853	* objects.
…		…
749	*/	859	*/
750	void	860	void
751	object::deactivate ()	861	object::deactivate ()
752	{	862	{
753	/* If not on the active list, nothing needs to be done */	863	/* If not on the active list, nothing needs to be done */
754	if (!active ())	864	if (!active)
755	return;	865	return;
756		866
757	if (active_prev == 0)	867	actives.erase (this);
758	{
759	active_objects = active_next;
760	if (active_next)
761	active_next->active_prev = 0;
762	}
763	else
764	{
765	active_prev->active_next = active_next;
766	if (active_next)
767	active_next->active_prev = active_prev;
768	}
769
770	active_next = 0;
771	active_prev = 0;
772	}	868	}
773		869
774	void	870	void
775	object::deactivate_recursive ()	871	object::deactivate_recursive ()
776	{	872	{
777	for (object *op = inv; op; op = op->above)	873	for (object *op = inv; op; op = op->below)
778	op->deactivate_recursive ();	874	op->deactivate_recursive ();
779		875
780	deactivate ();	876	deactivate ();
		877	}
		878
		879	void
		880	object::set_flag_inv (int flag, int value)
		881	{
		882	for (object *op = inv; op; op = op->below)
		883	{
		884	op->flag [flag] = value;
		885	op->set_flag_inv (flag, value);
		886	}
781	}	887	}
782		888
783	/*	889	/*
784	* Remove and free all objects in the inventory of the given object.	890	* Remove and free all objects in the inventory of the given object.
785	* object.c ?	891	* object.c ?
…		…
788	object::destroy_inv (bool drop_to_ground)	894	object::destroy_inv (bool drop_to_ground)
789	{	895	{
790	// need to check first, because the checks below might segfault	896	// need to check first, because the checks below might segfault
791	// as we might be on an invalid mapspace and crossfire code	897	// as we might be on an invalid mapspace and crossfire code
792	// is too buggy to ensure that the inventory is empty.	898	// is too buggy to ensure that the inventory is empty.
793	// corollary: if you create arrows etc. with stuff in tis inventory,	899	// corollary: if you create arrows etc. with stuff in its inventory,
794	// cf will crash below with off-map x and y	900	// cf will crash below with off-map x and y
795	if (!inv)	901	if (!inv)
796	return;	902	return;
797		903
798	/* Only if the space blocks everything do we not process -	904	/* Only if the space blocks everything do we not process -
799	* if some form of movement is allowed, let objects	905	* if some form of movement is allowed, let objects
800	* drop on that space.	906	* drop on that space.
801	*/	907	*/
802	if (!drop_to_ground	908	if (!drop_to_ground
803	|| !map	909	|| !map
804	|| map->in_memory != MAP_IN_MEMORY	910	|| map->in_memory != MAP_ACTIVE
		911	|| map->no_drop
805	|| ms ().move_block == MOVE_ALL)	912	|| ms ().move_block == MOVE_ALL)
806	{	913	{
807	while (inv)	914	while (inv)
808	{
809	inv->destroy_inv (drop_to_ground);
810	inv->destroy ();	915	inv->destroy (true);
811	}
812	}	916	}
813	else	917	else
814	{ /* Put objects in inventory onto this space */	918	{ /* Put objects in inventory onto this space */
815	while (inv)	919	while (inv)
816	{	920	{
…		…
818		922
819	if (op->flag [FLAG_STARTEQUIP]	923	if (op->flag [FLAG_STARTEQUIP]
820	|| op->flag [FLAG_NO_DROP]	924	|| op->flag [FLAG_NO_DROP]
821	|| op->type == RUNE	925	|| op->type == RUNE
822	|| op->type == TRAP	926	|| op->type == TRAP
823	|| op->flag [FLAG_IS_A_TEMPLATE])	927	|| op->flag [FLAG_IS_A_TEMPLATE]
		928	|| op->flag [FLAG_DESTROY_ON_DEATH])
824	op->destroy ();	929	op->destroy (true);
825	else	930	else
826	map->insert (op, x, y);	931	map->insert (op, x, y);
827	}	932	}
828	}	933	}
829	}	934	}
…		…
833	object *op = new object;	938	object *op = new object;
834	op->link ();	939	op->link ();
835	return op;	940	return op;
836	}	941	}
837		942
		943	static struct freed_map : maptile
		944	{
		945	freed_map ()
		946	{
		947	path = "<freed objects map>";
		948	name = "/internal/freed_objects_map";
		949	width = 3;
		950	height = 3;
		951	no_drop = 1;
		952	no_reset = 1;
		953
		954	alloc ();
		955	in_memory = MAP_ACTIVE;
		956	}
		957
		958	~freed_map ()
		959	{
		960	destroy ();
		961	}
		962	} freed_map; // freed objects are moved here to avoid crashes
		963
838	void	964	void
839	object::do_destroy ()	965	object::do_destroy ()
840	{	966	{
841	if (flag [FLAG_IS_LINKED])	967	if (flag [FLAG_IS_LINKED])
842	remove_button_link (this);	968	remove_button_link (this);
843		969
844	if (flag [FLAG_FRIENDLY])	970	if (flag [FLAG_FRIENDLY])
845	remove_friendly_object (this);	971	remove_friendly_object (this);
846		972
847	if (!flag [FLAG_REMOVED])
848	remove ();	973	remove ();
849		974
850	if (flag [FLAG_FREED])	975	attachable::do_destroy ();
851	return;
852		976
853	set_speed (0);	977	deactivate ();
		978	unlink ();
854		979
855	flag [FLAG_FREED] = 1;	980	flag [FLAG_FREED] = 1;
856		981
857	attachable::do_destroy ();
858
859	destroy_inv (true);
860	unlink ();
861
862	// hack to ensure that freed objects still have a valid map	982	// hack to ensure that freed objects still have a valid map
863	{
864	static maptile *freed_map; // freed objects are moved here to avoid crashes
865
866	if (!freed_map)
867	{
868	freed_map = new maptile;
869
870	freed_map->name = "/internal/freed_objects_map";
871	freed_map->width = 3;
872	freed_map->height = 3;
873
874	freed_map->alloc ();
875	}
876
877	map = freed_map;	983	map = &freed_map;
878	x = 1;	984	x = 1;
879	y = 1;	985	y = 1;
880	}
881
882	head = 0;
883		986
884	if (more)	987	if (more)
885	{	988	{
886	more->destroy ();	989	more->destroy ();
887	more = 0;	990	more = 0;
888	}	991	}
889		992
		993	head = 0;
		994
890	// clear those pointers that likely might have circular references to us	995	// clear those pointers that likely might cause circular references
891	owner = 0;	996	owner = 0;
892	enemy = 0;	997	enemy = 0;
893	attacked_by = 0;	998	attacked_by = 0;
894		999	current_weapon = 0;
895	// only relevant for players(?), but make sure of it anyways
896	contr = 0;
897	}	1000	}
898		1001
899	void	1002	void
900	object::destroy (bool destroy_inventory)	1003	object::destroy (bool destroy_inventory)
901	{	1004	{
902	if (destroyed ())	1005	if (destroyed ())
903	return;	1006	return;
904		1007
		1008	if (!is_head () && !head->destroyed ())
		1009	{
		1010	LOG (llevError | logBacktrace, "tried to destroy the tail of an object");
		1011	head->destroy (destroy_inventory);
		1012	return;
		1013	}
		1014
905	if (destroy_inventory)	1015	destroy_inv (!destroy_inventory);
906	destroy_inv (false);	1016
		1017	if (is_head ())
		1018	if (sound_destroy)
		1019	play_sound (sound_destroy);
		1020	else if (flag [FLAG_MONSTER])
		1021	play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism
907		1022
908	attachable::destroy ();	1023	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	}	1024	}
927		1025
928	/* op->remove ():	1026	/* op->remove ():
929	* This function removes the object op from the linked list of objects	1027	* 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	1028	* which it is currently tied to. When this function is done, the
931	* object will have no environment. If the object previously had an	1029	* object will have no environment. If the object previously had an
932	* environment, the x and y coordinates will be updated to	1030	* environment, the x and y coordinates will be updated to
933	* the previous environment.	1031	* the previous environment.
934	* Beware: This function is called from the editor as well!
935	*/	1032	*/
936	void	1033	void
937	object::remove ()	1034	object::do_remove ()
938	{	1035	{
939	object *tmp, *last = 0;	1036	object *tmp, *last = 0;
940	object *otmp;	1037	object *otmp;
941		1038
942	if (QUERY_FLAG (this, FLAG_REMOVED))	1039	if (flag [FLAG_REMOVED])
943	return;	1040	return;
944		1041
945	SET_FLAG (this, FLAG_REMOVED);
946	INVOKE_OBJECT (REMOVE, this);	1042	INVOKE_OBJECT (REMOVE, this);
		1043
		1044	flag [FLAG_REMOVED] = true;
947		1045
948	if (more)	1046	if (more)
949	more->remove ();	1047	more->remove ();
950		1048
951	/*	1049	/*
952	* In this case, the object to be removed is in someones	1050	* In this case, the object to be removed is in someones
953	* inventory.	1051	* inventory.
954	*/	1052	*/
955	if (env)	1053	if (env)
956	{	1054	{
957	if (nrof)	1055	flag [FLAG_REMOVED] = false; // hack around the issue of visible_to checking flag_removed
958	sub_weight (env, weight * nrof);	1056	if (object *pl = visible_to ())
959	else	1057	esrv_del_item (pl->contr, count);
960	sub_weight (env, weight + carrying);	1058	flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed
		1059
		1060	adjust_weight (env, -total_weight ());
		1061
		1062	/* we set up values so that it could be inserted into
		1063	* the map, but we don't actually do that - it is up
		1064	* to the caller to decide what we want to do.
		1065	*/
		1066	map = env->map;
		1067	x = env->x;
		1068	y = env->y;
		1069
		1070	// make sure cmov optimisation is applicable
		1071	*(above ? &above->below : &env->inv) = below;
		1072	*(below ? &below->above : &above ) = above; // &above is just a dummy
		1073
		1074	above = 0;
		1075	below = 0;
		1076	env = 0;
961		1077
962	/* NO_FIX_PLAYER is set when a great many changes are being	1078	/* NO_FIX_PLAYER is set when a great many changes are being
963	* made to players inventory. If set, avoiding the call	1079	* made to players inventory. If set, avoiding the call
964	* to save cpu time.	1080	* to save cpu time.
965	*/	1081	*/
966	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1082	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
967	otmp->update_stats ();	1083	otmp->update_stats ();
968
969	if (above)
970	above->below = below;
971	else
972	env->inv = below;
973
974	if (below)
975	below->above = above;
976
977	/* we set up values so that it could be inserted into
978	* the map, but we don't actually do that - it is up
979	* to the caller to decide what we want to do.
980	*/
981	x = env->x, y = env->y;
982	map = env->map;
983	above = 0, below = 0;
984	env = 0;
985	}	1084	}
986	else if (map)	1085	else if (map)
987	{	1086	{
988	if (type == PLAYER)	1087	map->dirty = true;
		1088	mapspace &ms = this->ms ();
		1089
		1090	if (object *pl = ms.player ())
989	{	1091	{
		1092	if (type == PLAYER) // this == pl(!)
		1093	{
		1094	// leaving a spot always closes any open container on the ground
		1095	if (container && !container->env)
		1096	// this causes spurious floorbox updates, but it ensures
		1097	// that the CLOSE event is being sent.
		1098	close_container ();
		1099
990	--map->players;	1100	--map->players;
991	map->last_access = runtime;	1101	map->touch ();
		1102	}
		1103	else if (pl->container == this)
		1104	{
		1105	// removing a container should close it
		1106	close_container ();
		1107	}
		1108
		1109	esrv_del_item (pl->contr, count);
992	}	1110	}
993		1111
994	map->dirty = true;
995
996	/* link the object above us */	1112	/* link the object above us */
997	if (above)	1113	// re-link, make sure compiler can easily use cmove
998	above->below = below;	1114	*(above ? &above->below : &ms.top) = below;
999	else	1115	*(below ? &below->above : &ms.bot) = above;
1000	map->at (x, y).top = below; /* we were top, set new top */
1001
1002	/* Relink the object below us, if there is one */
1003	if (below)
1004	below->above = above;
1005	else
1006	{
1007	/* Nothing below, which means we need to relink map object for this space
1008	* use translated coordinates in case some oddness with map tiling is
1009	* evident
1010	*/
1011	if (GET_MAP_OB (map, x, y) != this)
1012	{
1013	char *dump = dump_object (this);
1014	LOG (llevError,
1015	"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);
1016	free (dump);
1017	dump = dump_object (GET_MAP_OB (map, x, y));
1018	LOG (llevError, "%s\n", dump);
1019	free (dump);
1020	}
1021
1022	map->at (x, y).bot = above; /* goes on above it. */
1023	}
1024		1116
1025	above = 0;	1117	above = 0;
1026	below = 0;	1118	below = 0;
1027		1119
		1120	ms.flags_ = 0;
		1121
1028	if (map->in_memory == MAP_SAVING)	1122	if (map->in_memory == MAP_SAVING)
1029	return;	1123	return;
1030		1124
1031	int check_walk_off = !flag [FLAG_NO_APPLY];	1125	int check_walk_off = !flag [FLAG_NO_APPLY];
1032		1126
		1127	if (object *pl = ms.player ())
		1128	{
		1129	if (pl->container == this)
		1130	/* If a container that the player is currently using somehow gets
		1131	* removed (most likely destroyed), update the player view
		1132	* appropriately.
		1133	*/
		1134	pl->close_container ();
		1135
		1136	//TODO: the floorbox prev/next might need updating
		1137	//esrv_del_item (pl->contr, count);
		1138	//TODO: update floorbox to preserve ordering
		1139	if (pl->contr->ns)
		1140	pl->contr->ns->floorbox_update ();
		1141	}
		1142
1033	for (tmp = map->at (x, y).bot; tmp; tmp = tmp->above)	1143	for (tmp = ms.bot; tmp; tmp = tmp->above)
1034	{	1144	{
1035	/* No point updating the players look faces if he is the object	1145	/* No point updating the players look faces if he is the object
1036	* being removed.	1146	* being removed.
1037	*/	1147	*/
1038
1039	if (tmp->type == PLAYER && tmp != this)
1040	{
1041	/* If a container that the player is currently using somehow gets
1042	* removed (most likely destroyed), update the player view
1043	* appropriately.
1044	*/
1045	if (tmp->container == this)
1046	{
1047	flag [FLAG_APPLIED] = 0;
1048	tmp->container = 0;
1049	}
1050
1051	if (tmp->contr->ns)
1052	tmp->contr->ns->floorbox_update ();
1053	}
1054		1148
1055	/* See if object moving off should effect something */	1149	/* See if object moving off should effect something */
1056	if (check_walk_off	1150	if (check_walk_off
1057	&& ((move_type & tmp->move_off)	1151	&& ((move_type & tmp->move_off)
1058	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))	1152	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
…		…
1061		1155
1062	if (destroyed ())	1156	if (destroyed ())
1063	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());	1157	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1064	}	1158	}
1065		1159
1066	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1067	//TODO: why is this horrible hacka fix? get rid of this code=bug! (schmorp)
1068	if (tmp->above == tmp)
1069	tmp->above = 0;
1070
1071	last = tmp;	1160	last = tmp;
1072	}	1161	}
1073
1074	/* last == NULL if there are no objects on this space */
1075	//TODO: this makes little sense, why only update the topmost object?
1076	if (!last)
1077	map->at (x, y).flags_ = 0;
1078	else
1079	update_object (last, UP_OBJ_REMOVE);
1080		1162
1081	if (flag [FLAG_BLOCKSVIEW] || glow_radius)	1163	if (flag [FLAG_BLOCKSVIEW] || glow_radius)
1082	update_all_los (map, x, y);	1164	update_all_los (map, x, y);
1083	}	1165	}
1084	}	1166	}
…		…
1095	merge_ob (object *op, object *top)	1177	merge_ob (object *op, object *top)
1096	{	1178	{
1097	if (!op->nrof)	1179	if (!op->nrof)
1098	return 0;	1180	return 0;
1099		1181
1100	if (top)	1182	if (!top)
1101	for (top = op; top && top->above; top = top->above)	1183	for (top = op; top && top->above; top = top->above)
1102	;	1184	;
1103		1185
1104	for (; top; top = top->below)	1186	for (; top; top = top->below)
1105	{
1106	if (top == op)
1107	continue;
1108
1109	if (object::can_merge (op, top))	1187	if (object::can_merge (op, top))
1110	{	1188	{
1111	top->nrof += op->nrof;	1189	top->nrof += op->nrof;
1112		1190
1113	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/	1191	if (object *pl = top->visible_to ())
1114	op->weight = 0; /* Don't want any adjustements now */	1192	esrv_update_item (UPD_NROF, pl, top);
		1193
		1194	op->weight = 0; // cancel the addition above
		1195	op->carrying = 0; // must be 0 already
		1196
1115	op->destroy ();	1197	op->destroy (1);
		1198
1116	return top;	1199	return top;
1117	}	1200	}
1118	}
1119		1201
1120	return 0;	1202	return 0;
1121	}	1203	}
1122		1204
		1205	void
		1206	object::expand_tail ()
		1207	{
		1208	if (more)
		1209	return;
		1210
		1211	object *prev = this;
		1212
		1213	for (archetype *at = (archetype *)arch->more; at; at = (archetype *)at->more)
		1214	{
		1215	object *op = arch_to_object (at);
		1216
		1217	op->name = name;
		1218	op->name_pl = name_pl;
		1219	op->title = title;
		1220
		1221	op->head = this;
		1222	prev->more = op;
		1223
		1224	prev = op;
		1225	}
		1226	}
		1227
1123	/*	1228	/*
1124	* same as insert_ob_in_map except it handle separate coordinates and do a clean	1229	* same as insert_ob_in_map except it handles separate coordinates and does a clean
1125	* job preparing multi-part monsters	1230	* job preparing multi-part monsters.
1126	*/	1231	*/
1127	object *	1232	object *
1128	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)	1233	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1129	{	1234	{
		1235	op->remove ();
		1236
1130	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)	1237	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1131	{	1238	{
1132	tmp->x = x + tmp->arch->clone.x;	1239	tmp->x = x + tmp->arch->x;
1133	tmp->y = y + tmp->arch->clone.y;	1240	tmp->y = y + tmp->arch->y;
1134	}	1241	}
1135		1242
1136	return insert_ob_in_map (op, m, originator, flag);	1243	return insert_ob_in_map (op, m, originator, flag);
1137	}	1244	}
1138		1245
…		…
1157	* just 'op' otherwise	1264	* just 'op' otherwise
1158	*/	1265	*/
1159	object *	1266	object *
1160	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)	1267	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1161	{	1268	{
1162	object *tmp, *top, *floor = NULL;	1269	if (op->is_on_map ())
1163	sint16 x, y;
1164
1165	if (QUERY_FLAG (op, FLAG_FREED))
1166	{
1167	LOG (llevError, "Trying to insert freed object!\n");
1168	return NULL;
1169	}	1270	{
1170		1271	LOG (llevError, "insert_ob_in_map called for object already on map");
1171	if (!m)
1172	{
1173	char *dump = dump_object (op);
1174	LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
1175	free (dump);
1176	return op;
1177	}
1178
1179	if (out_of_map (m, op->x, op->y))
1180	{
1181	char *dump = dump_object (op);
1182	LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump);
1183	#ifdef MANY_CORES
1184	/* Better to catch this here, as otherwise the next use of this object
1185	* is likely to cause a crash. Better to find out where it is getting
1186	* improperly inserted.
1187	*/
1188	abort ();	1272	abort ();
1189	#endif
1190	free (dump);
1191	return op;
1192	}
1193
1194	if (!QUERY_FLAG (op, FLAG_REMOVED))
1195	{	1273	}
1196	char *dump = dump_object (op);
1197	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);
1198	free (dump);
1199	return op;
1200	}
1201		1274
1202	if (op->more)	1275	if (op->env)
1203	{
1204	/* The part may be on a different map. */
1205
1206	object *more = op->more;
1207
1208	/* We really need the caller to normalize coordinates - if
1209	* we set the map, that doesn't work if the location is within
1210	* a map and this is straddling an edge. So only if coordinate
1211	* is clear wrong do we normalize it.
1212	*/
1213	if (OUT_OF_REAL_MAP (more->map, more->x, more->y))
1214	more->map = get_map_from_coord (m, &more->x, &more->y);
1215	else if (!more->map)
1216	{
1217	/* For backwards compatibility - when not dealing with tiled maps,
1218	* more->map should always point to the parent.
1219	*/
1220	more->map = m;
1221	}
1222
1223	if (insert_ob_in_map (more, more->map, originator, flag) == NULL)
1224	{
1225	if (!op->head)
1226	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1227
1228	return 0;
1229	}
1230	}	1276	{
		1277	LOG (llevError, "insert_ob_in_map called for object in an inventory (proceeding)");
		1278	op->remove ();
		1279	}
1231		1280
1232	CLEAR_FLAG (op, FLAG_REMOVED);	1281	if (op->face && !face_info (op->face))//D TODO: remove soon
		1282	{//D
		1283	LOG (llevError | logBacktrace, "op->face out of bounds: %s", op->debug_desc ());//D
		1284	op->face = 1;//D
		1285	}//D
1233		1286
1234	/* Ideally, the caller figures this out. However, it complicates a lot	1287	/* Ideally, the caller figures this out. However, it complicates a lot
1235	* of areas of callers (eg, anything that uses find_free_spot would now	1288	* of areas of callers (eg, anything that uses find_free_spot would now
1236	* need extra work	1289	* need extra work
1237	*/	1290	*/
1238	op->map = get_map_from_coord (m, &op->x, &op->y);	1291	if (!xy_normalise (m, op->x, op->y))
1239	x = op->x;	1292	{
1240	y = op->y;	1293	op->head_ ()->destroy (1);// remove head_ once all tail object destroyers found
		1294	return 0;
		1295	}
		1296
		1297	if (object *more = op->more)
		1298	if (!insert_ob_in_map (more, m, originator, flag))
		1299	return 0;
		1300
		1301	CLEAR_FLAG (op, FLAG_REMOVED);
		1302
		1303	op->map = m;
		1304	mapspace &ms = op->ms ();
1241		1305
1242	/* this has to be done after we translate the coordinates.	1306	/* this has to be done after we translate the coordinates.
1243	*/	1307	*/
1244	if (op->nrof && !(flag & INS_NO_MERGE))	1308	if (op->nrof && !(flag & INS_NO_MERGE))
1245	for (tmp = GET_MAP_OB (op->map, x, y); tmp; tmp = tmp->above)	1309	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1246	if (object::can_merge (op, tmp))	1310	if (object::can_merge (op, tmp))
1247	{	1311	{
		1312	// TODO: we actually want to update tmp, not op,
		1313	// but some caller surely breaks when we return tmp
		1314	// from here :/
1248	op->nrof += tmp->nrof;	1315	op->nrof += tmp->nrof;
1249	tmp->destroy ();	1316	tmp->destroy (1);
1250	}	1317	}
1251		1318
1252	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1319	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1253	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1320	CLEAR_FLAG (op, FLAG_INV_LOCKED);
1254		1321
…		…
1261	{	1328	{
1262	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");	1329	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");
1263	abort ();	1330	abort ();
1264	}	1331	}
1265		1332
		1333	if (!originator->is_on_map ())
		1334	LOG (llevDebug | logBacktrace, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map",
		1335	op->debug_desc (), originator->debug_desc ());
		1336
1266	op->above = originator;	1337	op->above = originator;
1267	op->below = originator->below;	1338	op->below = originator->below;
1268
1269	if (op->below)
1270	op->below->above = op;
1271	else
1272	op->ms ().bot = op;
1273
1274	/* since *below* originator, no need to update top */
1275	originator->below = op;	1339	originator->below = op;
		1340
		1341	*(op->below ? &op->below->above : &ms.bot) = op;
1276	}	1342	}
1277	else	1343	else
1278	{	1344	{
		1345	object *floor = 0;
		1346	object *top = ms.top;
		1347
1279	/* If there are other objects, then */	1348	/* If there are other objects, then */
1280	if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL))	1349	if (top)
1281	{	1350	{
1282	object *last = 0;
1283
1284	/*	1351	/*
1285	* If there are multiple objects on this space, we do some trickier handling.	1352	* If there are multiple objects on this space, we do some trickier handling.
1286	* We've already dealt with merging if appropriate.	1353	* We've already dealt with merging if appropriate.
1287	* Generally, we want to put the new object on top. But if	1354	* Generally, we want to put the new object on top. But if
1288	* flag contains INS_ABOVE_FLOOR_ONLY, once we find the last	1355	* flag contains INS_ABOVE_FLOOR_ONLY, once we find the last
…		…
1291	* once we get to them. This reduces the need to traverse over all of	1358	* once we get to them. This reduces the need to traverse over all of
1292	* them when adding another one - this saves quite a bit of cpu time	1359	* them when adding another one - this saves quite a bit of cpu time
1293	* when lots of spells are cast in one area. Currently, it is presumed	1360	* when lots of spells are cast in one area. Currently, it is presumed
1294	* that flying non pickable objects are spell objects.	1361	* that flying non pickable objects are spell objects.
1295	*/	1362	*/
1296	while (top)	1363	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1297	{	1364	{
1298	if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))	1365	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) || QUERY_FLAG (tmp, FLAG_OVERLAY_FLOOR))
1299	floor = top;	1366	floor = tmp;
1300		1367
1301	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))	1368	if (QUERY_FLAG (tmp, FLAG_NO_PICK) && (tmp->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1302	{	1369	{
1303	/* We insert above top, so we want this object below this */	1370	/* We insert above top, so we want this object below this */
1304	top = top->below;	1371	top = tmp->below;
1305	break;	1372	break;
1306	}	1373	}
1307		1374
1308	last = top;
1309	top = top->above;	1375	top = tmp;
1310	}	1376	}
1311
1312	/* Don't want top to be NULL, so set it to the last valid object */
1313	top = last;
1314		1377
1315	/* We let update_position deal with figuring out what the space	1378	/* We let update_position deal with figuring out what the space
1316	* looks like instead of lots of conditions here.	1379	* looks like instead of lots of conditions here.
1317	* makes things faster, and effectively the same result.	1380	* makes things faster, and effectively the same result.
1318	*/	1381	*/
1319		1382
1320	/* Have object 'fall below' other objects that block view.	1383	/* Have object 'fall below' other objects that block view.
1321	* Unless those objects are exits, type 66	1384	* Unless those objects are exits.
1322	* If INS_ON_TOP is used, don't do this processing	1385	* If INS_ON_TOP is used, don't do this processing
1323	* Need to find the object that in fact blocks view, otherwise	1386	* Need to find the object that in fact blocks view, otherwise
1324	* stacking is a bit odd.	1387	* stacking is a bit odd.
1325	*/	1388	*/
1326	if (!(flag & INS_ON_TOP) &&	1389	if (!(flag & INS_ON_TOP)
1327	(get_map_flags (op->map, 0, op->x, op->y, 0, 0) & P_BLOCKSVIEW) && (op->face && !op->face->visibility))	1390	&& ms.flags () & P_BLOCKSVIEW
		1391	&& (op->face && !faces [op->face].visibility))
1328	{	1392	{
		1393	object *last;
		1394
1329	for (last = top; last != floor; last = last->below)	1395	for (last = top; last != floor; last = last->below)
1330	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1396	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1331	break;	1397	break;
		1398
1332	/* Check to see if we found the object that blocks view,	1399	/* Check to see if we found the object that blocks view,
1333	* and make sure we have a below pointer for it so that	1400	* and make sure we have a below pointer for it so that
1334	* we can get inserted below this one, which requires we	1401	* we can get inserted below this one, which requires we
1335	* set top to the object below us.	1402	* set top to the object below us.
1336	*/	1403	*/
1337	if (last && last->below && last != floor)	1404	if (last && last->below && last != floor)
1338	top = last->below;	1405	top = last->below;
1339	}	1406	}
1340	} /* If objects on this space */	1407	} /* If objects on this space */
1341		1408
1342	if (flag & INS_MAP_LOAD)
1343	top = GET_MAP_TOP (op->map, op->x, op->y);
1344
1345	if (flag & INS_ABOVE_FLOOR_ONLY)	1409	if (flag & INS_ABOVE_FLOOR_ONLY)
1346	top = floor;	1410	top = floor;
1347		1411
1348	/* Top is the object that our object (op) is going to get inserted above.	1412	// insert object above top, or bottom-most if top = 0
1349	*/
1350
1351	/* First object on this space */
1352	if (!top)	1413	if (!top)
1353	{	1414	{
1354	op->above = GET_MAP_OB (op->map, op->x, op->y);
1355
1356	if (op->above)
1357	op->above->below = op;
1358
1359	op->below = 0;	1415	op->below = 0;
		1416	op->above = ms.bot;
1360	op->ms ().bot = op;	1417	ms.bot = op;
		1418
		1419	*(op->above ? &op->above->below : &ms.top) = op;
1361	}	1420	}
1362	else	1421	else
1363	{ /* get inserted into the stack above top */	1422	{
1364	op->above = top->above;	1423	op->above = top->above;
1365
1366	if (op->above)
1367	op->above->below = op;	1424	top->above = op;
1368		1425
1369	op->below = top;	1426	op->below = top;
1370	top->above = op;	1427	*(op->above ? &op->above->below : &ms.top) = op;
1371	}	1428	}
1372		1429	}
1373	if (!op->above)
1374	op->ms ().top = op;
1375	} /* else not INS_BELOW_ORIGINATOR */
1376		1430
1377	if (op->type == PLAYER)	1431	if (op->type == PLAYER)
1378	{	1432	{
1379	op->contr->do_los = 1;	1433	op->contr->do_los = 1;
1380	++op->map->players;	1434	++op->map->players;
1381	op->map->last_access = runtime;	1435	op->map->touch ();
1382	}	1436	}
1383		1437
1384	op->map->dirty = true;	1438	op->map->dirty = true;
1385		1439
1386	/* If we have a floor, we know the player, if any, will be above
1387	* it, so save a few ticks and start from there.
1388	*/
1389	if (!(flag & INS_MAP_LOAD))
1390	if (object *pl = op->ms ().player ())	1440	if (object *pl = ms.player ())
		1441	//TODO: the floorbox prev/next might need updating
		1442	//esrv_send_item (pl, op);
		1443	//TODO: update floorbox to preserve ordering
1391	if (pl->contr->ns)	1444	if (pl->contr->ns)
1392	pl->contr->ns->floorbox_update ();	1445	pl->contr->ns->floorbox_update ();
1393		1446
1394	/* If this object glows, it may affect lighting conditions that are	1447	/* If this object glows, it may affect lighting conditions that are
1395	* visible to others on this map. But update_all_los is really	1448	* visible to others on this map. But update_all_los is really
1396	* an inefficient way to do this, as it means los for all players	1449	* an inefficient way to do this, as it means los for all players
1397	* on the map will get recalculated. The players could very well	1450	* on the map will get recalculated. The players could very well
…		…
1416	* blocked() and wall() work properly), and these flags are updated by	1469	* blocked() and wall() work properly), and these flags are updated by
1417	* update_object().	1470	* update_object().
1418	*/	1471	*/
1419		1472
1420	/* if this is not the head or flag has been passed, don't check walk on status */	1473	/* if this is not the head or flag has been passed, don't check walk on status */
1421	if (!(flag & INS_NO_WALK_ON) && !op->head)	1474	if (!(flag & INS_NO_WALK_ON) && op->head_ () == op)
1422	{	1475	{
1423	if (check_move_on (op, originator))	1476	if (check_move_on (op, originator))
1424	return 0;	1477	return 0;
1425		1478
1426	/* If we are a multi part object, lets work our way through the check	1479	/* If we are a multi part object, lets work our way through the check
1427	* walk on's.	1480	* walk on's.
1428	*/	1481	*/
1429	for (tmp = op->more; tmp != NULL; tmp = tmp->more)	1482	for (object *tmp = op->more; tmp; tmp = tmp->more)
1430	if (check_move_on (tmp, originator))	1483	if (check_move_on (tmp, originator))
1431	return 0;	1484	return 0;
1432	}	1485	}
1433		1486
1434	return op;	1487	return op;
…		…
1439	* op is the object to insert it under: supplies x and the map.	1492	* op is the object to insert it under: supplies x and the map.
1440	*/	1493	*/
1441	void	1494	void
1442	replace_insert_ob_in_map (const char *arch_string, object *op)	1495	replace_insert_ob_in_map (const char *arch_string, object *op)
1443	{	1496	{
1444	object *tmp, *tmp1;
1445
1446	/* first search for itself and remove any old instances */	1497	/* first search for itself and remove any old instances */
1447		1498
1448	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1499	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1449	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */	1500	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */
1450	tmp->destroy ();	1501	tmp->destroy (1);
1451		1502
1452	tmp1 = arch_to_object (archetype::find (arch_string));	1503	object *tmp = arch_to_object (archetype::find (arch_string));
1453		1504
1454	tmp1->x = op->x;	1505	tmp->x = op->x;
1455	tmp1->y = op->y;	1506	tmp->y = op->y;
		1507
1456	insert_ob_in_map (tmp1, op->map, op, 0);	1508	insert_ob_in_map (tmp, op->map, op, 0);
1457	}	1509	}
1458		1510
1459	object *	1511	object *
1460	object::insert_at (object *where, object *originator, int flags)	1512	object::insert_at (object *where, object *originator, int flags)
1461	{	1513	{
		1514	if (where->env)
		1515	return where->env->insert (this);
		1516	else
1462	where->map->insert (this, where->x, where->y, originator, flags);	1517	return where->map->insert (this, where->x, where->y, originator, flags);
1463	}	1518	}
1464		1519
1465	/*	1520	/*
1466	* get_split_ob(ob,nr) splits up ob into two parts. The part which
1467	* is returned contains nr objects, and the remaining parts contains
1468	* the rest (or is removed and freed if that number is 0).
1469	* On failure, NULL is returned, and the reason put into the
1470	* global static errmsg array.
1471	*/
1472	object *
1473	get_split_ob (object *orig_ob, uint32 nr)
1474	{
1475	object *newob;
1476	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1477
1478	if (orig_ob->nrof < nr)
1479	{
1480	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1481	return NULL;
1482	}
1483
1484	newob = object_create_clone (orig_ob);
1485
1486	if ((orig_ob->nrof -= nr) < 1)
1487	orig_ob->destroy (1);
1488	else if (!is_removed)
1489	{
1490	if (orig_ob->env != NULL)
1491	sub_weight (orig_ob->env, orig_ob->weight * nr);
1492	if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)
1493	{
1494	strcpy (errmsg, "Tried to split object whose map is not in memory.");
1495	LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n");
1496	return NULL;
1497	}
1498	}
1499
1500	newob->nrof = nr;
1501
1502	return newob;
1503	}
1504
1505	/*
1506	* decrease_ob_nr(object, number) decreases a specified number from	1521	* decrease(object, number) decreases a specified number from
1507	* the amount of an object. If the amount reaches 0, the object	1522	* the amount of an object. If the amount reaches 0, the object
1508	* is subsequently removed and freed.	1523	* is subsequently removed and freed.
1509	*	1524	*
1510	* Return value: 'op' if something is left, NULL if the amount reached 0	1525	* Return value: 'op' if something is left, NULL if the amount reached 0
1511	*/	1526	*/
		1527	bool
		1528	object::decrease (sint32 nr)
		1529	{
		1530	if (!nr)
		1531	return true;
1512		1532
		1533	nr = min (nr, nrof);
		1534
		1535	if (nrof > nr)
		1536	{
		1537	nrof -= nr;
		1538	adjust_weight (env, -weight * max (1, nr)); // carrying == 0
		1539
		1540	if (object *pl = visible_to ())
		1541	esrv_update_item (UPD_NROF, pl, this);
		1542
		1543	return true;
		1544	}
		1545	else
		1546	{
		1547	destroy ();
		1548	return false;
		1549	}
		1550	}
		1551
		1552	/*
		1553	* split(ob,nr) splits up ob into two parts. The part which
		1554	* is returned contains nr objects, and the remaining parts contains
		1555	* the rest (or is removed and returned if that number is 0).
		1556	* On failure, NULL is returned.
		1557	*/
1513	object *	1558	object *
1514	decrease_ob_nr (object *op, uint32 i)	1559	object::split (sint32 nr)
1515	{	1560	{
1516	object *tmp;	1561	int have = number_of ();
1517		1562
1518	if (i == 0) /* objects with op->nrof require this check */	1563	if (have < nr)
1519	return op;	1564	return 0;
1520		1565	else if (have == nr)
1521	if (i > op->nrof)
1522	i = op->nrof;
1523
1524	if (QUERY_FLAG (op, FLAG_REMOVED))
1525	op->nrof -= i;
1526	else if (op->env)
1527	{	1566	{
1528	/* is this object in the players inventory, or sub container
1529	* therein?
1530	*/
1531	tmp = op->in_player ();
1532	/* nope. Is this a container the player has opened?
1533	* If so, set tmp to that player.
1534	* IMO, searching through all the players will mostly
1535	* likely be quicker than following op->env to the map,
1536	* and then searching the map for a player.
1537	*/
1538	if (!tmp)
1539	for_all_players (pl)
1540	if (pl->ob->container == op->env)
1541	{
1542	tmp = pl->ob;
1543	break;
1544	}
1545
1546	if (i < op->nrof)
1547	{
1548	sub_weight (op->env, op->weight * i);
1549	op->nrof -= i;
1550	if (tmp)
1551	esrv_send_item (tmp, op);
1552	}
1553	else
1554	{
1555	op->remove ();	1567	remove ();
1556	op->nrof = 0;	1568	return this;
1557	if (tmp)
1558	esrv_del_item (tmp->contr, op->count);
1559	}
1560	}	1569	}
1561	else	1570	else
1562	{	1571	{
1563	object *above = op->above;	1572	decrease (nr);
1564		1573
1565	if (i < op->nrof)	1574	object *op = deep_clone ();
1566	op->nrof -= i;	1575	op->nrof = nr;
1567	else
1568	{
1569	op->remove ();
1570	op->nrof = 0;
1571	}
1572
1573	/* Since we just removed op, op->above is null */
1574	for (tmp = above; tmp; tmp = tmp->above)
1575	if (tmp->type == PLAYER)
1576	{
1577	if (op->nrof)
1578	esrv_send_item (tmp, op);
1579	else
1580	esrv_del_item (tmp->contr, op->count);
1581	}
1582	}
1583
1584	if (op->nrof)
1585	return op;	1576	return op;
1586	else
1587	{
1588	op->destroy ();
1589	return 0;
1590	}
1591	}
1592
1593	/*
1594	* add_weight(object, weight) adds the specified weight to an object,
1595	* and also updates how much the environment(s) is/are carrying.
1596	*/
1597
1598	void
1599	add_weight (object *op, signed long weight)
1600	{
1601	while (op != NULL)
1602	{
1603	if (op->type == CONTAINER)
1604	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1605
1606	op->carrying += weight;
1607	op = op->env;
1608	}	1577	}
1609	}	1578	}
1610		1579
1611	object *	1580	object *
1612	insert_ob_in_ob (object *op, object *where)	1581	insert_ob_in_ob (object *op, object *where)
…		…
1617	LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);	1586	LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
1618	free (dump);	1587	free (dump);
1619	return op;	1588	return op;
1620	}	1589	}
1621		1590
1622	if (where->head)	1591	if (where->head_ () != where)
1623	{	1592	{
1624	LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n");	1593	LOG (llevError | logBacktrace, "Warning: Tried to insert object into wrong part of multipart object.\n");
1625	where = where->head;	1594	where = where->head;
1626	}	1595	}
1627		1596
1628	return where->insert (op);	1597	return where->insert (op);
1629	}	1598	}
…		…
1634	* inside the object environment.	1603	* inside the object environment.
1635	*	1604	*
1636	* The function returns now pointer to inserted item, and return value can	1605	* The function returns now pointer to inserted item, and return value can
1637	* be != op, if items are merged. -Tero	1606	* be != op, if items are merged. -Tero
1638	*/	1607	*/
1639
1640	object *	1608	object *
1641	object::insert (object *op)	1609	object::insert (object *op)
1642	{	1610	{
1643	object *tmp, *otmp;
1644
1645	if (!QUERY_FLAG (op, FLAG_REMOVED))
1646	op->remove ();
1647
1648	if (op->more)	1611	if (op->more)
1649	{	1612	{
1650	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);	1613	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1651	return op;	1614	return op;
1652	}	1615	}
1653		1616
1654	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1617	op->remove ();
1655	CLEAR_FLAG (op, FLAG_REMOVED);	1618
		1619	op->flag [FLAG_OBJ_ORIGINAL] = 0;
		1620
1656	if (op->nrof)	1621	if (op->nrof)
1657	{
1658	for (tmp = inv; tmp != NULL; tmp = tmp->below)	1622	for (object *tmp = inv; tmp; tmp = tmp->below)
1659	if (object::can_merge (tmp, op))	1623	if (object::can_merge (tmp, op))
1660	{	1624	{
1661	/* return the original object and remove inserted object	1625	/* return the original object and remove inserted object
1662	(client needs the original object) */	1626	(client needs the original object) */
1663	tmp->nrof += op->nrof;	1627	tmp->nrof += op->nrof;
1664	/* Weight handling gets pretty funky. Since we are adding to	1628
1665	* tmp->nrof, we need to increase the weight.	1629	if (object *pl = tmp->visible_to ())
1666	*/	1630	esrv_update_item (UPD_NROF, pl, tmp);
		1631
1667	add_weight (this, op->weight * op->nrof);	1632	adjust_weight (this, op->total_weight ());
1668	SET_FLAG (op, FLAG_REMOVED);	1633
1669	op->destroy (); /* free the inserted object */	1634	op->destroy (1);
1670	op = tmp;	1635	op = tmp;
1671	op->remove (); /* and fix old object's links */	1636	goto inserted;
1672	CLEAR_FLAG (op, FLAG_REMOVED);
1673	break;
1674	}	1637	}
1675		1638
1676	/* I assume combined objects have no inventory	1639	op->owner = 0; // it's his/hers now. period.
1677	* We add the weight - this object could have just been removed
1678	* (if it was possible to merge). calling remove_ob will subtract
1679	* the weight, so we need to add it in again, since we actually do
1680	* the linking below
1681	*/
1682	add_weight (this, op->weight * op->nrof);
1683	}
1684	else
1685	add_weight (this, (op->weight + op->carrying));
1686
1687	otmp = this->in_player ();
1688	if (otmp && otmp->contr)
1689	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1690	otmp->update_stats ();
1691
1692	op->map = 0;	1640	op->map = 0;
1693	op->env = this;	1641	op->x = 0;
		1642	op->y = 0;
		1643
1694	op->above = 0;	1644	op->above = 0;
1695	op->below = 0;	1645	op->below = inv;
1696	op->x = 0, op->y = 0;	1646	op->env = this;
1697		1647
		1648	if (inv)
		1649	inv->above = op;
		1650
		1651	inv = op;
		1652
		1653	op->flag [FLAG_REMOVED] = 0;
		1654
		1655	if (object *pl = op->visible_to ())
		1656	esrv_send_item (pl, op);
		1657
		1658	adjust_weight (this, op->total_weight ());
		1659
		1660	inserted:
1698	/* reset the light list and los of the players on the map */	1661	/* reset the light list and los of the players on the map */
1699	if ((op->glow_radius != 0) && map)	1662	if (op->glow_radius && map && map->darkness)
1700	{
1701	#ifdef DEBUG_LIGHTS
1702	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1703	#endif /* DEBUG_LIGHTS */
1704	if (map->darkness)
1705	update_all_los (map, x, y);	1663	update_all_los (map, x, y);
1706	}
1707		1664
1708	/* Client has no idea of ordering so lets not bother ordering it here.	1665	// if this is a player's inventory, update stats
1709	* It sure simplifies this function...	1666	if (type == PLAYER && !flag [FLAG_NO_FIX_PLAYER])
1710	*/	1667	update_stats ();
1711	if (!inv)
1712	inv = op;
1713	else
1714	{
1715	op->below = inv;
1716	op->below->above = op;
1717	inv = op;
1718	}
1719		1668
1720	INVOKE_OBJECT (INSERT, this);	1669	INVOKE_OBJECT (INSERT, this);
1721		1670
1722	return op;	1671	return op;
1723	}	1672	}
…		…
1776		1725
1777	/* The objects have to be checked from top to bottom.	1726	/* The objects have to be checked from top to bottom.
1778	* Hence, we first go to the top:	1727	* Hence, we first go to the top:
1779	*/	1728	*/
1780		1729
1781	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp && tmp->above; tmp = tmp->above)	1730	for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above)
1782	{	1731	{
1783	/* Trim the search when we find the first other spell effect	1732	/* Trim the search when we find the first other spell effect
1784	* this helps performance so that if a space has 50 spell objects,	1733	* this helps performance so that if a space has 50 spell objects,
1785	* we don't need to check all of them.	1734	* we don't need to check all of them.
1786	*/	1735	*/
…		…
1804	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||	1753	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
1805	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))	1754	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1806	{	1755	{
1807		1756
1808	float	1757	float
1809	diff = tmp->move_slow_penalty * FABS (op->speed);	1758	diff = tmp->move_slow_penalty * fabs (op->speed);
1810		1759
1811	if (op->type == PLAYER)	1760	if (op->type == PLAYER)
1812	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||	1761	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||
1813	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))	1762	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))
1814	diff /= 4.0;	1763	diff /= 4.0;
…		…
1844	* The first matching object is returned, or NULL if none.	1793	* The first matching object is returned, or NULL if none.
1845	*/	1794	*/
1846	object *	1795	object *
1847	present_arch (const archetype *at, maptile *m, int x, int y)	1796	present_arch (const archetype *at, maptile *m, int x, int y)
1848	{	1797	{
1849	if (m == NULL || out_of_map (m, x, y))	1798	if (!m || out_of_map (m, x, y))
1850	{	1799	{
1851	LOG (llevError, "Present_arch called outside map.\n");	1800	LOG (llevError, "Present_arch called outside map.\n");
1852	return NULL;	1801	return NULL;
1853	}	1802	}
1854		1803
1855	for (object *tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1804	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1856	if (tmp->arch == at)	1805	if (tmp->arch->archname == at->archname)
1857	return tmp;	1806	return tmp;
1858		1807
1859	return NULL;	1808	return NULL;
1860	}	1809	}
1861		1810
…		…
1871	{	1820	{
1872	LOG (llevError, "Present called outside map.\n");	1821	LOG (llevError, "Present called outside map.\n");
1873	return NULL;	1822	return NULL;
1874	}	1823	}
1875		1824
1876	for (object *tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1825	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1877	if (tmp->type == type)	1826	if (tmp->type == type)
1878	return tmp;	1827	return tmp;
1879		1828
1880	return NULL;	1829	return NULL;
1881	}	1830	}
…		…
1925	* The first matching object is returned, or NULL if none.	1874	* The first matching object is returned, or NULL if none.
1926	*/	1875	*/
1927	object *	1876	object *
1928	present_arch_in_ob (const archetype *at, const object *op)	1877	present_arch_in_ob (const archetype *at, const object *op)
1929	{	1878	{
1930	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)	1879	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1931	if (tmp->arch == at)	1880	if (tmp->arch->archname == at->archname)
1932	return tmp;	1881	return tmp;
1933		1882
1934	return NULL;	1883	return NULL;
1935	}	1884	}
1936		1885
…		…
1938	* activate recursively a flag on an object inventory	1887	* activate recursively a flag on an object inventory
1939	*/	1888	*/
1940	void	1889	void
1941	flag_inv (object *op, int flag)	1890	flag_inv (object *op, int flag)
1942	{	1891	{
1943	if (op->inv)
1944	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)	1892	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1945	{	1893	{
1946	SET_FLAG (tmp, flag);	1894	SET_FLAG (tmp, flag);
1947	flag_inv (tmp, flag);	1895	flag_inv (tmp, flag);
1948	}	1896	}
1949	}	1897	}
1950		1898
1951	/*	1899	/*
1952	* deactivate recursively a flag on an object inventory	1900	* deactivate recursively a flag on an object inventory
1953	*/	1901	*/
1954	void	1902	void
1955	unflag_inv (object *op, int flag)	1903	unflag_inv (object *op, int flag)
1956	{	1904	{
1957	if (op->inv)
1958	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)	1905	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1959	{	1906	{
1960	CLEAR_FLAG (tmp, flag);	1907	CLEAR_FLAG (tmp, flag);
1961	unflag_inv (tmp, flag);	1908	unflag_inv (tmp, flag);
1962	}	1909	}
1963	}
1964
1965	/*
1966	* set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in
1967	* all it's inventory (recursively).
1968	* If checksums are used, a player will get set_cheat called for
1969	* him/her-self and all object carried by a call to this function.
1970	*/
1971	void
1972	set_cheat (object *op)
1973	{
1974	SET_FLAG (op, FLAG_WAS_WIZ);
1975	flag_inv (op, FLAG_WAS_WIZ);
1976	}	1910	}
1977		1911
1978	/*	1912	/*
1979	* find_free_spot(object, map, x, y, start, stop) will search for	1913	* find_free_spot(object, map, x, y, start, stop) will search for
1980	* a spot at the given map and coordinates which will be able to contain	1914	* a spot at the given map and coordinates which will be able to contain
…		…
1982	* to search (see the freearr_x/y[] definition).	1916	* to search (see the freearr_x/y[] definition).
1983	* It returns a random choice among the alternatives found.	1917	* It returns a random choice among the alternatives found.
1984	* start and stop are where to start relative to the free_arr array (1,9	1918	* start and stop are where to start relative to the free_arr array (1,9
1985	* does all 4 immediate directions). This returns the index into the	1919	* does all 4 immediate directions). This returns the index into the
1986	* array of the free spot, -1 if no spot available (dir 0 = x,y)	1920	* array of the free spot, -1 if no spot available (dir 0 = x,y)
1987	* Note - this only checks to see if there is space for the head of the
1988	* object - if it is a multispace object, this should be called for all
1989	* pieces.
1990	* Note2: This function does correctly handle tiled maps, but does not	1921	* Note: This function does correctly handle tiled maps, but does not
1991	* inform the caller. However, insert_ob_in_map will update as	1922	* inform the caller. However, insert_ob_in_map will update as
1992	* necessary, so the caller shouldn't need to do any special work.	1923	* necessary, so the caller shouldn't need to do any special work.
1993	* Note - updated to take an object instead of archetype - this is necessary	1924	* Note - updated to take an object instead of archetype - this is necessary
1994	* because arch_blocked (now ob_blocked) needs to know the movement type	1925	* because arch_blocked (now ob_blocked) needs to know the movement type
1995	* to know if the space in question will block the object. We can't use	1926	* to know if the space in question will block the object. We can't use
…		…
1997	* customized, changed states, etc.	1928	* customized, changed states, etc.
1998	*/	1929	*/
1999	int	1930	int
2000	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)	1931	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2001	{	1932	{
		1933	int altern[SIZEOFFREE];
2002	int index = 0, flag;	1934	int index = 0, flag;
2003	int altern[SIZEOFFREE];
2004		1935
2005	for (int i = start; i < stop; i++)	1936	for (int i = start; i < stop; i++)
2006	{	1937	{
2007	flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]);	1938	mapxy pos (m, x, y); pos.move (i);
2008	if (!flag)	1939
		1940	if (!pos.normalise ())
		1941	continue;
		1942
		1943	mapspace &ms = *pos;
		1944
		1945	if (ms.flags () & P_IS_ALIVE)
		1946	continue;
		1947
		1948	/* However, often
		1949	* ob doesn't have any move type (when used to place exits)
		1950	* so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.
		1951	*/
		1952	if (ob && ob->move_type == 0 && ms.move_block != MOVE_ALL)
		1953	{
2009	altern [index++] = i;	1954	altern [index++] = i;
		1955	continue;
		1956	}
2010		1957
2011	/* Basically, if we find a wall on a space, we cut down the search size.	1958	/* Basically, if we find a wall on a space, we cut down the search size.
2012	* In this way, we won't return spaces that are on another side of a wall.	1959	* In this way, we won't return spaces that are on another side of a wall.
2013	* This mostly work, but it cuts down the search size in all directions -	1960	* This mostly work, but it cuts down the search size in all directions -
2014	* if the space being examined only has a wall to the north and empty	1961	* if the space being examined only has a wall to the north and empty
2015	* spaces in all the other directions, this will reduce the search space	1962	* spaces in all the other directions, this will reduce the search space
2016	* to only the spaces immediately surrounding the target area, and	1963	* to only the spaces immediately surrounding the target area, and
2017	* won't look 2 spaces south of the target space.	1964	* won't look 2 spaces south of the target space.
2018	*/	1965	*/
2019	else if ((flag & P_NO_PASS) && maxfree[i] < stop)	1966	if (ms.move_block == MOVE_ALL && maxfree[i] < stop)
		1967	{
2020	stop = maxfree[i];	1968	stop = maxfree[i];
		1969	continue;
		1970	}
		1971
		1972	/* Note it is intentional that we check ob - the movement type of the
		1973	* head of the object should correspond for the entire object.
		1974	*/
		1975	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
		1976	continue;
		1977
		1978	if (ob->blocked (m, pos.x, pos.y))
		1979	continue;
		1980
		1981	altern [index++] = i;
2021	}	1982	}
2022		1983
2023	if (!index)	1984	if (!index)
2024	return -1;	1985	return -1;
2025		1986
2026	return altern[RANDOM () % index];	1987	return altern [rndm (index)];
2027	}	1988	}
2028		1989
2029	/*	1990	/*
2030	* find_first_free_spot(archetype, maptile, x, y) works like	1991	* find_first_free_spot(archetype, maptile, x, y) works like
2031	* find_free_spot(), but it will search max number of squares.	1992	* find_free_spot(), but it will search max number of squares.
…		…
2034	*/	1995	*/
2035	int	1996	int
2036	find_first_free_spot (const object *ob, maptile *m, int x, int y)	1997	find_first_free_spot (const object *ob, maptile *m, int x, int y)
2037	{	1998	{
2038	for (int i = 0; i < SIZEOFFREE; i++)	1999	for (int i = 0; i < SIZEOFFREE; i++)
2039	if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]))	2000	if (!ob->blocked (m, x + freearr_x[i], y + freearr_y[i]))
2040	return i;	2001	return i;
2041		2002
2042	return -1;	2003	return -1;
2043	}	2004	}
2044		2005
…		…
2052	{	2013	{
2053	arr += begin;	2014	arr += begin;
2054	end -= begin;	2015	end -= begin;
2055		2016
2056	while (--end)	2017	while (--end)
2057	swap (arr [end], arr [RANDOM () % (end + 1)]);	2018	swap (arr [end], arr [rndm (end + 1)]);
2058	}	2019	}
2059		2020
2060	/* new function to make monster searching more efficient, and effective!	2021	/* new function to make monster searching more efficient, and effective!
2061	* This basically returns a randomized array (in the passed pointer) of	2022	* This basically returns a randomized array (in the passed pointer) of
2062	* the spaces to find monsters. In this way, it won't always look for	2023	* the spaces to find monsters. In this way, it won't always look for
…		…
2098	object *tmp;	2059	object *tmp;
2099	maptile *mp;	2060	maptile *mp;
2100		2061
2101	MoveType blocked, move_type;	2062	MoveType blocked, move_type;
2102		2063
2103	if (exclude && exclude->head)	2064	if (exclude && exclude->head_ () != exclude)
2104	{	2065	{
2105	exclude = exclude->head;	2066	exclude = exclude->head;
2106	move_type = exclude->move_type;	2067	move_type = exclude->move_type;
2107	}	2068	}
2108	else	2069	else
…		…
2131	max = maxfree[i];	2092	max = maxfree[i];
2132	else if (mflags & P_IS_ALIVE)	2093	else if (mflags & P_IS_ALIVE)
2133	{	2094	{
2134	for (tmp = ms.bot; tmp; tmp = tmp->above)	2095	for (tmp = ms.bot; tmp; tmp = tmp->above)
2135	if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)	2096	if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)
2136	&& (tmp != exclude || (tmp->head && tmp->head != exclude)))	2097	&& (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2137	break;	2098	break;
2138		2099
2139	if (tmp)	2100	if (tmp)
2140	return freedir[i];	2101	return freedir[i];
2141	}	2102	}
…		…
2196		2157
2197	return 3;	2158	return 3;
2198	}	2159	}
2199		2160
2200	/*	2161	/*
2201	* absdir(int): Returns a number between 1 and 8, which represent
2202	* the "absolute" direction of a number (it actually takes care of
2203	* "overflow" in previous calculations of a direction).
2204	*/
2205
2206	int
2207	absdir (int d)
2208	{
2209	while (d < 1)
2210	d += 8;
2211
2212	while (d > 8)
2213	d -= 8;
2214
2215	return d;
2216	}
2217
2218	/*
2219	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is	2162	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is
2220	* between two directions (which are expected to be absolute (see absdir())	2163	* between two directions (which are expected to be absolute (see absdir())
2221	*/	2164	*/
2222
2223	int	2165	int
2224	dirdiff (int dir1, int dir2)	2166	dirdiff (int dir1, int dir2)
2225	{	2167	{
2226	int d;	2168	int d;
2227		2169
…		…
2340	* Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause	2282	* Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause
2341	* core dumps if they do.	2283	* core dumps if they do.
2342	*	2284	*
2343	* Add a check so we can't pick up invisible objects (0.93.8)	2285	* Add a check so we can't pick up invisible objects (0.93.8)
2344	*/	2286	*/
2345
2346	int	2287	int
2347	can_pick (const object *who, const object *item)	2288	can_pick (const object *who, const object *item)
2348	{	2289	{
2349	return /*QUERY_FLAG(who,FLAG_WIZ)|| */	2290	return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2350	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&	2291	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
…		…
2353		2294
2354	/*	2295	/*
2355	* create clone from object to another	2296	* create clone from object to another
2356	*/	2297	*/
2357	object *	2298	object *
2358	object_create_clone (object *asrc)	2299	object::deep_clone ()
2359	{	2300	{
2360	object *dst = 0, *tmp, *src, *part, *prev, *item;	2301	assert (("deep_clone called on non-head object", is_head ()));
2361		2302
2362	if (!asrc)	2303	object *dst = clone ();
2363	return 0;
2364		2304
2365	src = asrc;	2305	object *prev = dst;
2366	if (src->head)
2367	src = src->head;
2368
2369	prev = 0;
2370	for (part = src; part; part = part->more)	2306	for (object *part = this->more; part; part = part->more)
2371	{	2307	{
2372	tmp = part->clone ();	2308	object *tmp = part->clone ();
2373	tmp->x -= src->x;
2374	tmp->y -= src->y;
2375
2376	if (!part->head)
2377	{
2378	dst = tmp;
2379	tmp->head = 0;
2380	}
2381	else
2382	tmp->head = dst;	2309	tmp->head = dst;
2383
2384	tmp->more = 0;
2385
2386	if (prev)
2387	prev->more = tmp;	2310	prev->more = tmp;
2388
2389	prev = tmp;	2311	prev = tmp;
2390	}	2312	}
2391		2313
2392	for (item = src->inv; item; item = item->below)	2314	for (object *item = inv; item; item = item->below)
2393	insert_ob_in_ob (object_create_clone (item), dst);	2315	insert_ob_in_ob (item->deep_clone (), dst);
2394		2316
2395	return dst;	2317	return dst;
2396	}
2397
2398	/* GROS - Creates an object using a string representing its content. */
2399	/* Basically, we save the content of the string to a temp file, then call */
2400	/* load_object on it. I admit it is a highly inefficient way to make things, */
2401	/* but it was simple to make and allows reusing the load_object function. */
2402	/* Remember not to use load_object_str in a time-critical situation. */
2403	/* Also remember that multiparts objects are not supported for now. */
2404	object *
2405	load_object_str (const char *obstr)
2406	{
2407	object *op;
2408	char filename[MAX_BUF];
2409
2410	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2411
2412	FILE *tempfile = fopen (filename, "w");
2413
2414	if (tempfile == NULL)
2415	{
2416	LOG (llevError, "Error - Unable to access load object temp file\n");
2417	return NULL;
2418	}
2419
2420	fprintf (tempfile, obstr);
2421	fclose (tempfile);
2422
2423	op = object::create ();
2424
2425	object_thawer thawer (filename);
2426
2427	if (thawer)
2428	load_object (thawer, op, 0);
2429
2430	LOG (llevDebug, " load str completed, object=%s\n", &op->name);
2431	CLEAR_FLAG (op, FLAG_REMOVED);
2432
2433	return op;
2434	}	2318	}
2435		2319
2436	/* This returns the first object in who's inventory that	2320	/* This returns the first object in who's inventory that
2437	* has the same type and subtype match.	2321	* has the same type and subtype match.
2438	* returns NULL if no match.	2322	* returns NULL if no match.
…		…
2445	return tmp;	2329	return tmp;
2446		2330
2447	return 0;	2331	return 0;
2448	}	2332	}
2449		2333
2450	/* If ob has a field named key, return the link from the list,	2334	const shstr &
2451	* otherwise return NULL.	2335	object::kv_get (const shstr &key) const
2452	*
2453	* key must be a passed in shared string - otherwise, this won't
2454	* do the desired thing.
2455	*/
2456	key_value *
2457	get_ob_key_link (const object *ob, const char *key)
2458	{	2336	{
2459	for (key_value *link = ob->key_values; link; link = link->next)	2337	for (key_value *kv = key_values; kv; kv = kv->next)
2460	if (link->key == key)	2338	if (kv->key == key)
2461	return link;
2462
2463	return 0;
2464	}
2465
2466	/*
2467	* Returns the value of op has an extra_field for key, or NULL.
2468	*
2469	* The argument doesn't need to be a shared string.
2470	*
2471	* The returned string is shared.
2472	*/
2473	const char *
2474	get_ob_key_value (const object *op, const char *const key)
2475	{
2476	key_value *link;
2477	shstr_cmp canonical_key (key);
2478
2479	if (!canonical_key)
2480	{
2481	/* 1. There being a field named key on any object
2482	* implies there'd be a shared string to find.
2483	* 2. Since there isn't, no object has this field.
2484	* 3. Therefore, *this* object doesn't have this field.
2485	*/
2486	return 0;
2487	}
2488
2489	/* This is copied from get_ob_key_link() above -
2490	* only 4 lines, and saves the function call overhead.
2491	*/
2492	for (link = op->key_values; link; link = link->next)
2493	if (link->key == canonical_key)
2494	return link->value;	2339	return kv->value;
2495		2340
2496	return 0;	2341	return shstr_null;
2497	}	2342	}
2498		2343
2499		2344	void
2500	/*	2345	object::kv_set (const shstr &key, const shstr &value)
2501	* Updates the canonical_key in op to value.
2502	*
2503	* canonical_key is a shared string (value doesn't have to be).
2504	*
2505	* Unless add_key is TRUE, it won't add fields, only change the value of existing
2506	* keys.
2507	*
2508	* Returns TRUE on success.
2509	*/
2510	int
2511	set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key)
2512	{	2346	{
2513	key_value *field = NULL, *last = NULL;	2347	for (key_value *kv = key_values; kv; kv = kv->next)
2514		2348	if (kv->key == key)
2515	for (field = op->key_values; field != NULL; field = field->next)
2516	{
2517	if (field->key != canonical_key)
2518	{	2349	{
2519	last = field;	2350	kv->value = value;
2520	continue;	2351	return;
2521	}	2352	}
2522		2353
2523	if (value)	2354	key_value *kv = new key_value;
2524	field->value = value;	2355
2525	else	2356	kv->next = key_values;
		2357	kv->key = key;
		2358	kv->value = value;
		2359
		2360	key_values = kv;
		2361	}
		2362
		2363	void
		2364	object::kv_del (const shstr &key)
		2365	{
		2366	for (key_value **kvp = &key_values; *kvp; kvp = &(*kvp)->next)
		2367	if ((*kvp)->key == key)
2526	{	2368	{
2527	/* Basically, if the archetype has this key set,	2369	key_value *kv = *kvp;
2528	* we need to store the null value so when we save	2370	*kvp = (*kvp)->next;
2529	* it, we save the empty value so that when we load,	2371	delete kv;
2530	* we get this value back again.	2372	return;
2531	*/
2532	if (get_ob_key_link (&op->arch->clone, canonical_key))
2533	field->value = 0;
2534	else
2535	{
2536	if (last)
2537	last->next = field->next;
2538	else
2539	op->key_values = field->next;
2540
2541	delete field;
2542	}
2543	}	2373	}
2544	return TRUE;
2545	}
2546	/* IF we get here, key doesn't exist */
2547
2548	/* No field, we'll have to add it. */
2549
2550	if (!add_key)
2551	return FALSE;
2552
2553	/* There isn't any good reason to store a null
2554	* value in the key/value list. If the archetype has
2555	* this key, then we should also have it, so shouldn't
2556	* be here. If user wants to store empty strings,
2557	* should pass in ""
2558	*/
2559	if (value == NULL)
2560	return TRUE;
2561
2562	field = new key_value;
2563
2564	field->key = canonical_key;
2565	field->value = value;
2566	/* Usual prepend-addition. */
2567	field->next = op->key_values;
2568	op->key_values = field;
2569
2570	return TRUE;
2571	}
2572
2573	/*
2574	* Updates the key in op to value.
2575	*
2576	* If add_key is FALSE, this will only update existing keys,
2577	* and not add new ones.
2578	* In general, should be little reason FALSE is ever passed in for add_key
2579	*
2580	* Returns TRUE on success.
2581	*/
2582	int
2583	set_ob_key_value (object *op, const char *key, const char *value, int add_key)
2584	{
2585	shstr key_ (key);
2586
2587	return set_ob_key_value_s (op, key_, value, add_key);
2588	}	2374	}
2589		2375
2590	object::depth_iterator::depth_iterator (object *container)	2376	object::depth_iterator::depth_iterator (object *container)
2591	: iterator_base (container)	2377	: iterator_base (container)
2592	{	2378	{
…		…
2606	}	2392	}
2607	else	2393	else
2608	item = item->env;	2394	item = item->env;
2609	}	2395	}
2610		2396
2611
2612	const char *	2397	const char *
2613	object::flag_desc (char *desc, int len) const	2398	object::flag_desc (char *desc, int len) const
2614	{	2399	{
2615	char *p = desc;	2400	char *p = desc;
2616	bool first = true;	2401	bool first = true;
		2402
		2403	*p = 0;
2617		2404
2618	for (int i = 0; i < NUM_FLAGS; i++)	2405	for (int i = 0; i < NUM_FLAGS; i++)
2619	{	2406	{
2620	if (len <= 10) // magic constant!	2407	if (len <= 10) // magic constant!
2621	{	2408	{
2622	snprintf (p, len, ",...");	2409	snprintf (p, len, ",...");
2623	break;	2410	break;
2624	}	2411	}
2625		2412
2626	if (flag[i])	2413	if (flag [i])
2627	{	2414	{
2628	int cnt = snprintf (p, len, "%s%d", first ? "" : ",", i);	2415	int cnt = snprintf (p, len, "%s%d", first ? "" : ",", i);
2629	len -= cnt;	2416	len -= cnt;
2630	p += cnt;	2417	p += cnt;
2631	first = false;	2418	first = false;
…		…
2633	}	2420	}
2634		2421
2635	return desc;	2422	return desc;
2636	}	2423	}
2637		2424
2638	// return a suitable string describing an objetc in enough detail to find it	2425	// return a suitable string describing an object in enough detail to find it
2639	const char *	2426	const char *
2640	object::debug_desc (char *info) const	2427	object::debug_desc (char *info) const
2641	{	2428	{
2642	char flagdesc[512];	2429	char flagdesc[512];
2643	char info2[256 * 4];	2430	char info2[256 * 4];
2644	char *p = info;	2431	char *p = info;
2645		2432
2646	p += snprintf (p, 512, "{cnt:%d,uuid:<1,%" PRIx64 ">,name:\"%s%s%s\",flags:[%s],type:%d}",	2433	p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s%s,flags:[%s],type:%d}",
2647	count, uuid.seq,	2434	count,
		2435	uuid.c_str (),
2648	&name,	2436	&name,
2649	title ? "\",title:" : "",	2437	title ? ",title:\"" : "",
2650	title ? (const char *)title : "",	2438	title ? (const char *)title : "",
		2439	title ? "\"" : "",
2651	flag_desc (flagdesc, 512), type);	2440	flag_desc (flagdesc, 512), type);
2652		2441
2653	if (env)	2442	if (!flag[FLAG_REMOVED] && env)
2654	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2443	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2655		2444
2656	if (map)	2445	if (map)
2657	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);	2446	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2658		2447
…		…
2660	}	2449	}
2661		2450
2662	const char *	2451	const char *
2663	object::debug_desc () const	2452	object::debug_desc () const
2664	{	2453	{
2665	static char info[256 * 3];	2454	static char info[3][256 * 4];
		2455	static int info_idx;
		2456
2666	return debug_desc (info);	2457	return debug_desc (info [++info_idx % 3]);
2667	}	2458	}
2668		2459
		2460	struct region *
		2461	object::region () const
		2462	{
		2463	return map ? map->region (x, y)
		2464	: region::default_region ();
		2465	}
		2466
		2467	const materialtype_t *
		2468	object::dominant_material () const
		2469	{
		2470	if (materialtype_t *mt = name_to_material (materialname))
		2471	return mt;
		2472
		2473	return name_to_material (shstr_unknown);
		2474	}
		2475
		2476	void
		2477	object::open_container (object *new_container)
		2478	{
		2479	if (container == new_container)
		2480	return;
		2481
		2482	object *old_container = container;
		2483
		2484	if (old_container)
		2485	{
		2486	if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
		2487	return;
		2488
		2489	#if 0
		2490	// remove the "Close old_container" object.
		2491	if (object *closer = old_container->inv)
		2492	if (closer->type == CLOSE_CON)
		2493	closer->destroy ();
		2494	#endif
		2495
		2496	// make sure the container is available
		2497	esrv_send_item (this, old_container);
		2498
		2499	old_container->flag [FLAG_APPLIED] = false;
		2500	container = 0;
		2501
		2502	// client needs item update to make it work, client bug requires this to be separate
		2503	esrv_update_item (UPD_FLAGS, this, old_container);
		2504
		2505	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
		2506	play_sound (sound_find ("chest_close"));
		2507	}
		2508
		2509	if (new_container)
		2510	{
		2511	if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))
		2512	return;
		2513
		2514	// TODO: this does not seem to serve any purpose anymore?
		2515	#if 0
		2516	// insert the "Close Container" object.
		2517	if (archetype *closer = new_container->other_arch)
		2518	{
		2519	object *closer = arch_to_object (new_container->other_arch);
		2520	closer->flag [FLAG_NO_MAP_SAVE] = 1;
		2521	new_container->insert (closer);
		2522	}
		2523	#endif
		2524
		2525	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));
		2526
		2527	// make sure the container is available, client bug requires this to be separate
		2528	esrv_send_item (this, new_container);
		2529
		2530	new_container->flag [FLAG_APPLIED] = true;
		2531	container = new_container;
		2532
		2533	// client needs flag change
		2534	esrv_update_item (UPD_FLAGS, this, new_container);
		2535	esrv_send_inventory (this, new_container);
		2536	play_sound (sound_find ("chest_open"));
		2537	}
		2538	// else if (!old_container->env && contr && contr->ns)
		2539	// contr->ns->floorbox_reset ();
		2540	}
		2541
		2542	object *
		2543	object::force_find (const shstr name)
		2544	{
		2545	/* cycle through his inventory to look for the MARK we want to
		2546	* place
		2547	*/
		2548	for (object *tmp = inv; tmp; tmp = tmp->below)
		2549	if (tmp->type == FORCE && tmp->slaying == name)
		2550	return splay (tmp);
		2551
		2552	return 0;
		2553	}
		2554
		2555	void
		2556	object::force_add (const shstr name, int duration)
		2557	{
		2558	if (object *force = force_find (name))
		2559	force->destroy ();
		2560
		2561	object *force = get_archetype (FORCE_NAME);
		2562
		2563	force->slaying = name;
		2564	force->stats.food = 1;
		2565	force->speed_left = -1.f;
		2566
		2567	force->set_speed (duration ? 1.f / duration : 0.f);
		2568	force->flag [FLAG_IS_USED_UP] = true;
		2569	force->flag [FLAG_APPLIED] = true;
		2570
		2571	insert (force);
		2572	}
		2573
		2574	void
		2575	object::play_sound (faceidx sound)
		2576	{
		2577	if (!sound)
		2578	return;
		2579
		2580	if (flag [FLAG_REMOVED])
		2581	return;
		2582
		2583	if (env)
		2584	{
		2585	if (object *pl = in_player ())
		2586	pl->contr->play_sound (sound);
		2587	}
		2588	else
		2589	map->play_sound (sound, x, y);
		2590	}
		2591

Diff Legend

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