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.152 by root, Thu May 17 14:14:54 2007 UTC vs.
Revision 1.257 by root, Tue Sep 16 16:03:02 2008 UTC

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

Diff Legend

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