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.146 by root, Fri May 11 21:07:13 2007 UTC vs.
Revision 1.253 by root, Sun Aug 17 22:46:26 2008 UTC

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

Diff Legend

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