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.186 by root, Thu Aug 30 05:18:37 2007 UTC vs.
Revision 1.267 by root, Tue Dec 23 01:51:27 2008 UTC

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

Diff Legend

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