ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/server/common/object.C

Comparing deliantra/server/common/object.C (file contents):
Revision 1.134 by pippijn, Thu Mar 1 12:28:16 2007 UTC vs.
Revision 1.288 by root, Sat Oct 3 22:36:08 2009 UTC

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

Diff Legend

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