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

Diff Legend

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