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

Diff Legend

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