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.189 by root, Thu Sep 13 16:23:01 2007 UTC vs.
Revision 1.295 by root, Fri Nov 6 13:03:34 2009 UTC

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

Diff Legend

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