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

Diff Legend

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