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.122 by root, Wed Jan 24 22:42:48 2007 UTC vs.
Revision 1.251 by root, Sun Jul 20 16:56:34 2008 UTC

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

Diff Legend

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