ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/server/common/object.C

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

Diff Legend

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