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.149 by root, Mon May 14 19:56:45 2007 UTC vs.
Revision 1.273 by root, Sat Dec 27 04:15:56 2008 UTC

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

Diff Legend

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