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.155 by root, Thu May 17 21:32:08 2007 UTC vs.
Revision 1.254 by root, Sun Aug 31 01:17:11 2008 UTC

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

Diff Legend

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