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.93 by root, Tue Dec 26 20:04:09 2006 UTC vs.
Revision 1.233 by root, Tue May 6 18:47:32 2008 UTC

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

Diff Legend

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