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.149 by root, Mon May 14 19:56:45 2007 UTC vs.
Revision 1.243 by root, Sat May 17 00:17:02 2008 UTC

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

Diff Legend

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