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.74 by root, Wed Dec 20 09:14:21 2006 UTC vs.
Revision 1.248 by root, Mon Jul 14 23:47:06 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 != NULL; 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->flags ^ ob2->flags).reset (FLAG_INV_LOCKED).reset (FLAG_CLIENT_SENT).any ()	211	if (ob1->arch->archname != ob2->arch->archname
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
239	|| ob1->animation_id != ob2->animation_id	221	|| ob1->animation_id != ob2->animation_id
		222	|| (ob1->face != ob2->face && !ob1->animation_id) // face and animation are dependent on each other
240	|| ob1->client_type != ob2->client_type	223	|| ob1->client_type != ob2->client_type
241	|| ob1->materialname != ob2->materialname	224	|| ob1->materialname != ob2->materialname
242	|| ob1->lore != ob2->lore	225	|| ob1->lore != ob2->lore
243	|| ob1->subtype != ob2->subtype	226	|| ob1->subtype != ob2->subtype
244	|| ob1->move_type != ob2->move_type	227	|| ob1->move_type != ob2->move_type
245	|| ob1->move_block != ob2->move_block	228	|| ob1->move_block != ob2->move_block
246	|| ob1->move_allow != ob2->move_allow	229	|| ob1->move_allow != ob2->move_allow
247	|| ob1->move_on != ob2->move_on	230	|| ob1->move_on != ob2->move_on
248	|| ob1->move_off != ob2->move_off	231	|| ob1->move_off != ob2->move_off
249	|| ob1->move_slow != ob2->move_slow	232	|| ob1->move_slow != ob2->move_slow
250	|| ob1->move_slow_penalty != ob2->move_slow_penalty)	233	|| ob1->move_slow_penalty != ob2->move_slow_penalty
		234	|| memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
		235	|| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats)))
251	return 0;	236	return 0;
252		237
		238	if ((ob1->flag ^ ob2->flag)
		239	.reset (FLAG_INV_LOCKED)
		240	.reset (FLAG_CLIENT_SENT)
		241	.reset (FLAG_REMOVED)
		242	.any ())
		243	return 0;
		244
253	/* This is really a spellbook check - really, we should	245	/* This is really a spellbook check - we should in general
254	* check all objects in the inventory.	246	* not merge objects with real inventories, as splitting them
		247	* is hard.
255	*/	248	*/
256	if (ob1->inv || ob2->inv)	249	if (ob1->inv || ob2->inv)
257	{	250	{
258	/* if one object has inventory but the other doesn't, not equiv */	251	if (!(ob1->inv && ob2->inv))
259	if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv))	252	return 0; /* inventories differ in length */
260	return 0;
261		253
262	/* Now check to see if the two inventory objects could merge */	254	if (ob1->inv->below || ob2->inv->below)
		255	return 0; /* more than one object in inv */
		256
263	if (!object::can_merge (ob1->inv, ob2->inv))	257	if (!object::can_merge (ob1->inv, ob2->inv))
264	return 0;	258	return 0; /* inventory objects differ */
265		259
266	/* inventory ok - still need to check rest of this object to see	260	/* inventory ok - still need to check rest of this object to see
267	* if it is valid.	261	* if it is valid.
268	*/	262	*/
269	}	263	}
…		…
277		271
278	/* Note sure why the following is the case - either the object has to	272	/* 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	273	* be animated or have a very low speed. Is this an attempted monster
280	* check?	274	* check?
281	*/	275	*/
282	if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && FABS ((ob1)->speed) > MIN_ACTIVE_SPEED)	276	if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && ob1->has_active_speed ())
283	return 0;	277	return 0;
284		278
285	switch (ob1->type)	279	switch (ob1->type)
286	{	280	{
287	case SCROLL:	281	case SCROLL:
288	if (ob1->level != ob2->level)	282	if (ob1->level != ob2->level)
289	return 0;	283	return 0;
290	break;	284	break;
291	}	285	}
292		286
293	if (ob1->key_values != NULL || ob2->key_values != NULL)	287	if (ob1->key_values || ob2->key_values)
294	{	288	{
295	/* At least one of these has key_values. */	289	/* At least one of these has key_values. */
296	if ((ob1->key_values == NULL) != (ob2->key_values == NULL))	290	if ((!ob1->key_values) != (!ob2->key_values))
297	/* One has fields, but the other one doesn't. */	291	return 0; /* One has fields, but the other one doesn't. */
		292
		293	if (!compare_ob_value_lists (ob1, ob2))
298	return 0;	294	return 0;
299	else if (!compare_ob_value_lists (ob1, ob2))
300	return 0;
301	}	295	}
302		296
303	//TODO: generate an event or call into perl for additional checks
304	if (ob1->self || ob2->self)	297	if (ob1->self || ob2->self)
305	{	298	{
306	ob1->optimise ();	299	ob1->optimise ();
307	ob2->optimise ();	300	ob2->optimise ();
308		301
309	if (ob1->self || ob2->self)	302	if (ob1->self || ob2->self)
		303	{
		304	int k1 = ob1->self ? HvTOTALKEYS (ob1->self) : 0;
		305	int k2 = ob2->self ? HvTOTALKEYS (ob2->self) : 0;
		306
		307	if (k1 != k2)
310	return 0;	308	return 0;
		309
		310	if (k1 == 0)
		311	return 1;
		312
		313	if (!cfperl_can_merge (ob1, ob2))
		314	return 0;
		315	}
311	}	316	}
312		317
313	/* Everything passes, must be OK. */	318	/* Everything passes, must be OK. */
314	return 1;	319	return 1;
315	}	320	}
316		321
		322	// find player who can see this object
		323	object *
		324	object::visible_to () const
		325	{
		326	if (client_visible () && !flag [FLAG_REMOVED])
		327	{
		328	// see if we are in a container of sorts
		329	if (env)
		330	{
		331	// the player inventory itself is always visible
		332	if (env->type == PLAYER)
		333	return env;
		334
		335	// else a player could have our env open
		336	object *envest = env->outer_env ();
		337
		338	// the player itself is always on a map, so we will find him here
		339	// even if our inv is in a player.
		340	if (envest->is_on_map ())
		341	if (object *pl = envest->ms ().player ())
		342	if (pl->container == env)
		343	return pl;
		344	}
		345	else
		346	{
		347	// maybe there is a player standing on the same mapspace
		348	// this will catch the case where "this" is a player
		349	if (object *pl = ms ().player ())
		350	if ((!pl->container && pl->contr->ns && !pl->contr->ns->update_look)
		351	|| this == pl->container)
		352	return pl;
		353	}
		354	}
		355
		356	return 0;
		357	}
		358
		359	// adjust weight per container type ("of holding")
		360	static sint32
		361	weight_adjust_for (object *op, sint32 weight)
		362	{
		363	return op->type == CONTAINER
		364	? lerp (weight, 0, 100, 0, 100 - op->stats.Str)
		365	: weight;
		366	}
		367
317	/*	368	/*
		369	* adjust_weight(object, weight) adds the specified weight to an object,
		370	* and also updates how much the environment(s) is/are carrying.
		371	*/
		372	static void
		373	adjust_weight (object *op, sint32 weight)
		374	{
		375	while (op)
		376	{
		377	// adjust by actual difference to account for rounding errors
		378	// i.e. (w2 - w1) / f != w2 / f - w1 / f and the latter is correct
		379	weight = weight_adjust_for (op, op->carrying)
		380	- weight_adjust_for (op, op->carrying - weight);
		381
		382	if (!weight)
		383	return;
		384
		385	op->carrying += weight;
		386
		387	if (object *pl = op->visible_to ())
		388	if (pl != op) // player is handled lazily
		389	esrv_update_item (UPD_WEIGHT, pl, op);
		390
		391	op = op->env;
		392	}
		393	}
		394
		395	/*
318	* sum_weight() is a recursive function which calculates the weight	396	* this is a recursive function which calculates the weight
319	* an object is carrying. It goes through in figures out how much	397	* an object is carrying. It goes through op and figures out how much
320	* containers are carrying, and sums it up.	398	* containers are carrying, and sums it up.
321	*/	399	*/
322	long	400	void
323	sum_weight (object *op)	401	object::update_weight ()
324	{	402	{
325	long sum;	403	sint32 sum = 0;
326	object *inv;
327		404
328	for (sum = 0, inv = op->inv; inv != NULL; inv = inv->below)	405	for (object *op = inv; op; op = op->below)
329	{	406	{
330	if (inv->inv)	407	if (op->inv)
331	sum_weight (inv);	408	op->update_weight ();
332	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);	409
		410	sum += op->total_weight ();
		411	}
		412
		413	sum = weight_adjust_for (this, sum);
		414
		415	if (sum != carrying)
333	}	416	{
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;	417	carrying = sum;
340		418
341	return sum;	419	if (object *pl = visible_to ())
		420	if (pl != this) // player is handled lazily
		421	esrv_update_item (UPD_WEIGHT, pl, this);
		422	}
342	}	423	}
343		424
344	/**	425	/*
345	* Return the outermost environment object for a given object.	426	* Used by: Server DM commands: dumpbelow, dump. Some error messages.
346	*/	427	*/
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 *	428	char *
363	dump_object (object *op)	429	dump_object (object *op)
364	{	430	{
365	if (!op)	431	if (!op)
366	return strdup ("[NULLOBJ]");	432	return strdup ("[NULLOBJ]");
367		433
368	object_freezer freezer;	434	object_freezer freezer;
369	save_object (freezer, op, 3);	435	op->write (freezer);
370	return freezer.as_string ();	436	return freezer.as_string ();
371	}	437	}
372		438
373	/*	439	/*
374	* get_nearest_part(multi-object, object 2) returns the part of the	440	* get_nearest_part(multi-object, object 2) returns the part of the
375	* multi-object 1 which is closest to the second object.	441	* multi-object 1 which is closest to the second object.
376	* If it's not a multi-object, it is returned.	442	* If it's not a multi-object, it is returned.
377	*/	443	*/
378
379	object *	444	object *
380	get_nearest_part (object *op, const object *pl)	445	get_nearest_part (object *op, const object *pl)
381	{	446	{
382	object *tmp, *closest;	447	object *tmp, *closest;
383	int last_dist, i;	448	int last_dist, i;
384		449
385	if (op->more == NULL)	450	if (!op->more)
386	return op;	451	return op;
		452
387	for (last_dist = distance (op, pl), closest = op, tmp = op->more; tmp != NULL; tmp = tmp->more)	453	for (last_dist = distance (op, pl), closest = op, tmp = op->more;
		454	tmp;
		455	tmp = tmp->more)
388	if ((i = distance (tmp, pl)) < last_dist)	456	if ((i = distance (tmp, pl)) < last_dist)
389	closest = tmp, last_dist = i;	457	closest = tmp, last_dist = i;
		458
390	return closest;	459	return closest;
391	}	460	}
392		461
393	/*	462	/*
394	* Returns the object which has the count-variable equal to the argument.	463	* Returns the object which has the count-variable equal to the argument.
		464	* VERRRY slow.
395	*/	465	*/
396
397	object *	466	object *
398	find_object (tag_t i)	467	find_object (tag_t i)
399	{	468	{
400	for (object *op = object::first; op; op = op->next)	469	for_all_objects (op)
401	if (op->count == i)	470	if (op->count == i)
402	return op;	471	return op;
403		472
404	return 0;	473	return 0;
405	}	474	}
406		475
407	/*	476	/*
408	* Returns the first object which has a name equal to the argument.	477	* Returns the first object which has a name equal to the argument.
409	* Used only by the patch command, but not all that useful.	478	* Used only by the patch command, but not all that useful.
410	* Enables features like "patch <name-of-other-player> food 999"	479	* Enables features like "patch <name-of-other-player> food 999"
411	*/	480	*/
412
413	object *	481	object *
414	find_object_name (const char *str)	482	find_object_name (const char *str)
415	{	483	{
416	shstr_cmp str_ (str);	484	shstr_cmp str_ (str);
417	object *op;
418		485
419	for (op = object::first; op != NULL; op = op->next)	486	if (str_)
		487	for_all_objects (op)
420	if (op->name == str_)	488	if (op->name == str_)
421	break;	489	return op;
422		490
423	return op;	491	return 0;
424	}
425
426	void
427	free_all_object_data ()
428	{
429	LOG (llevDebug, "%d allocated objects\n", nrofallocobjects);
430	}	492	}
431		493
432	/*	494	/*
433	* Sets the owner and sets the skill and exp pointers to owner's current	495	* Sets the owner and sets the skill and exp pointers to owner's current
434	* skill and experience objects.	496	* skill and experience objects.
		497	* ACTUALLY NO! investigate! TODO
435	*/	498	*/
436	void	499	void
437	object::set_owner (object *owner)	500	object::set_owner (object *owner)
438	{	501	{
		502	// allow objects which own objects
439	if (!owner)	503	if (owner)
440	return;
441
442	/* next line added to allow objects which own objects */
443	/* Add a check for ownercounts in here, as I got into an endless loop
444	* with the fireball owning a poison cloud which then owned the
445	* fireball. I believe that was caused by one of the objects getting
446	* freed and then another object replacing it. Since the ownercounts
447	* didn't match, this check is valid and I believe that cause is valid.
448	*/
449	while (owner->owner)	504	while (owner->owner)
450	owner = owner->owner;	505	owner = owner->owner;
		506
		507	if (flag [FLAG_FREED])
		508	{
		509	LOG (llevError | logBacktrace, "tried to set owner of %s to %s\n", debug_desc (), owner->debug_desc ());
		510	return;
		511	}
451		512
452	this->owner = owner;	513	this->owner = owner;
		514	}
		515
		516	int
		517	object::slottype () const
		518	{
		519	if (type == SKILL)
		520	{
		521	if (IS_COMBAT_SKILL (subtype)) return slot_combat;
		522	if (IS_RANGED_SKILL (subtype)) return slot_ranged;
		523	}
		524	else
		525	{
		526	if (slot [body_combat].info) return slot_combat;
		527	if (slot [body_range ].info) return slot_ranged;
		528	}
		529
		530	return slot_none;
		531	}
		532
		533	bool
		534	object::change_weapon (object *ob)
		535	{
		536	if (current_weapon == ob)
		537	return true;
		538
		539	if (chosen_skill)
		540	chosen_skill->flag [FLAG_APPLIED] = false;
		541
		542	current_weapon = ob;
		543	chosen_skill = !ob || ob->type == SKILL ? ob : find_skill_by_name (this, ob->skill);
		544
		545	if (chosen_skill)
		546	chosen_skill->flag [FLAG_APPLIED] = true;
		547
		548	update_stats ();
		549
		550	if (ob)
		551	{
		552	// now check wether any body locations became invalid, in which case
		553	// we cannot apply the weapon at the moment.
		554	for (int i = 0; i < NUM_BODY_LOCATIONS; ++i)
		555	if (slot[i].used < 0)
		556	{
		557	current_weapon = chosen_skill = 0;
		558	update_stats ();
		559
		560	new_draw_info_format (NDI_UNIQUE, 0, this,
		561	"You try to balance all your items at once, "
		562	"but the %s is just too much for your body. "
		563	"[You need to unapply some items first.]", &ob->name);
		564	return false;
		565	}
		566
		567	//new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);
		568	}
		569	else
		570	;//new_draw_info_format (NDI_UNIQUE, 0, this, "You unwield your weapons.");
		571
		572	if (ob && !ob->flag [FLAG_APPLIED] && ob->type != SPELL)
		573	{
		574	LOG (llevError | logBacktrace, "%s changed to unapplied weapon %s",
		575	&name, ob->debug_desc ());
		576	return false;
		577	}
		578
		579	return true;
453	}	580	}
454		581
455	/* Zero the key_values on op, decrementing the shared-string	582	/* Zero the key_values on op, decrementing the shared-string
456	* refcounts and freeing the links.	583	* refcounts and freeing the links.
457	*/	584	*/
458	static void	585	static void
459	free_key_values (object *op)	586	free_key_values (object *op)
460	{	587	{
461	for (key_value *i = op->key_values; i != 0;)	588	for (key_value *i = op->key_values; i; )
462	{	589	{
463	key_value *next = i->next;	590	key_value *next = i->next;
464	delete i;	591	delete i;
465		592
466	i = next;	593	i = next;
467	}	594	}
468		595
469	op->key_values = 0;	596	op->key_values = 0;
470	}
471
472	void object::clear ()
473	{
474	attachable_base::clear ();
475
476	free_key_values (this);
477
478	owner = 0;
479	name = 0;
480	name_pl = 0;
481	title = 0;
482	race = 0;
483	slaying = 0;
484	skill = 0;
485	msg = 0;
486	lore = 0;
487	custom_name = 0;
488	materialname = 0;
489	contr = 0;
490	below = 0;
491	above = 0;
492	inv = 0;
493	container = 0;
494	env = 0;
495	more = 0;
496	head = 0;
497	map = 0;
498	active_next = 0;
499	active_prev = 0;
500
501	memset (static_cast<object_pod *>(this), 0, sizeof (object_pod));
502
503	SET_FLAG (this, FLAG_REMOVED);
504
505	/* What is not cleared is next, prev, and count */
506
507	expmul = 1.0;
508	face = blank_face;
509
510	if (settings.casting_time)
511	casting_time = -1;
512	}	597	}
513		598
514	/*	599	/*
515	* copy_to first frees everything allocated by the dst object,	600	* copy_to first frees everything allocated by the dst object,
516	* and then copies the contents of itself into the second	601	* and then copies the contents of itself into the second
…		…
520	* will point at garbage.	605	* will point at garbage.
521	*/	606	*/
522	void	607	void
523	object::copy_to (object *dst)	608	object::copy_to (object *dst)
524	{	609	{
525	bool is_freed = QUERY_FLAG (dst, FLAG_FREED);	610	dst->remove ();
526	bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED);
527
528	*(object_copy *)dst = *this;	611	*(object_copy *)dst = *this;
529	*(object_pod *)dst = *this;	612	dst->flag [FLAG_REMOVED] = true;
530
531	if (self || cb)
532	INVOKE_OBJECT (CLONE, this, ARG_OBJECT (dst));
533
534	if (is_freed)
535	SET_FLAG (dst, FLAG_FREED);
536
537	if (is_removed)
538	SET_FLAG (dst, FLAG_REMOVED);
539
540	if (speed < 0)
541	dst->speed_left = speed_left - RANDOM () % 200 / 100.0;
542		613
543	/* Copy over key_values, if any. */	614	/* Copy over key_values, if any. */
544	if (key_values)	615	if (key_values)
545	{	616	{
546	key_value *tail = 0;	617	key_value *tail = 0;
547	key_value *i;
548
549	dst->key_values = 0;	618	dst->key_values = 0;
550		619
551	for (i = key_values; i; i = i->next)	620	for (key_value *i = key_values; i; i = i->next)
552	{	621	{
553	key_value *new_link = new key_value;	622	key_value *new_link = new key_value;
554		623
555	new_link->next = 0;	624	new_link->next = 0;
556	new_link->key = i->key;	625	new_link->key = i->key;
557	new_link->value = i->value;	626	new_link->value = i->value;
558		627
559	/* Try and be clever here, too. */	628	/* Try and be clever here, too. */
560	if (!dst->key_values)	629	if (!dst->key_values)
561	{	630	{
…		…
568	tail = new_link;	637	tail = new_link;
569	}	638	}
570	}	639	}
571	}	640	}
572		641
573	update_ob_speed (dst);	642	if (speed < 0)
		643	dst->speed_left -= rndm ();
		644
		645	dst->set_speed (dst->speed);
		646	}
		647
		648	void
		649	object::instantiate ()
		650	{
		651	if (!uuid.seq) // HACK
		652	uuid = UUID::gen ();
		653
		654	speed_left = -0.1f;
		655	/* copy the body_info to the body_used - this is only really
		656	* need for monsters, but doesn't hurt to do it for everything.
		657	* by doing so, when a monster is created, it has good starting
		658	* values for the body_used info, so when items are created
		659	* for it, they can be properly equipped.
		660	*/
		661	for (int i = NUM_BODY_LOCATIONS; i--; )
		662	slot[i].used = slot[i].info;
		663
		664	attachable::instantiate ();
574	}	665	}
575		666
576	object *	667	object *
577	object::clone ()	668	object::clone ()
578	{	669	{
579	object *neu = create ();	670	object *neu = create ();
580	copy_to (neu);	671	copy_to (neu);
		672	neu->map = map; // not copied by copy_to
581	return neu;	673	return neu;
582	}	674	}
583		675
584	/*	676	/*
585	* If an object with the IS_TURNABLE() flag needs to be turned due	677	* If an object with the IS_TURNABLE() flag needs to be turned due
586	* to the closest player being on the other side, this function can	678	* to the closest player being on the other side, this function can
587	* be called to update the face variable, _and_ how it looks on the map.	679	* be called to update the face variable, _and_ how it looks on the map.
588	*/	680	*/
589
590	void	681	void
591	update_turn_face (object *op)	682	update_turn_face (object *op)
592	{	683	{
593	if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || op->arch == NULL)	684	if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || !op->arch)
594	return;	685	return;
		686
595	SET_ANIMATION (op, op->direction);	687	SET_ANIMATION (op, op->direction);
596	update_object (op, UP_OBJ_FACE);	688	update_object (op, UP_OBJ_FACE);
597	}	689	}
598		690
599	/*	691	/*
600	* Updates the speed of an object. If the speed changes from 0 to another	692	* Updates the speed of an object. If the speed changes from 0 to another
601	* value, or vice versa, then add/remove the object from the active list.	693	* value, or vice versa, then add/remove the object from the active list.
602	* This function needs to be called whenever the speed of an object changes.	694	* This function needs to be called whenever the speed of an object changes.
603	*/	695	*/
604	void	696	void
605	update_ob_speed (object *op)	697	object::set_speed (float speed)
606	{	698	{
607	extern int arch_init;	699	if (flag [FLAG_FREED] && speed)
608
609	/* No reason putting the archetypes objects on the speed list,
610	* since they never really need to be updated.
611	*/
612
613	if (QUERY_FLAG (op, FLAG_FREED) && op->speed)
614	{	700	{
615	LOG (llevError, "Object %s is freed but has speed.\n", &op->name);	701	LOG (llevError, "Object %s is freed but has speed.\n", &name);
616	#ifdef MANY_CORES
617	abort ();
618	#else
619	op->speed = 0;	702	speed = 0;
620	#endif
621	}
622
623	if (arch_init)
624	return;
625
626	if (FABS (op->speed) > MIN_ACTIVE_SPEED)
627	{	703	}
628	/* If already on active list, don't do anything */
629	if (op->active_next || op->active_prev || op == active_objects)
630	return;
631		704
632	/* process_events() expects us to insert the object at the beginning	705	this->speed = speed;
633	* of the list. */
634	op->active_next = active_objects;
635		706
636	if (op->active_next != NULL)	707	if (has_active_speed ())
637	op->active_next->active_prev = op;	708	activate ();
638
639	active_objects = op;
640	}
641	else	709	else
642	{	710	deactivate ();
643	/* If not on the active list, nothing needs to be done */
644	if (!op->active_next && !op->active_prev && op != active_objects)
645	return;
646
647	if (op->active_prev == NULL)
648	{
649	active_objects = op->active_next;
650
651	if (op->active_next != NULL)
652	op->active_next->active_prev = NULL;
653	}
654	else
655	{
656	op->active_prev->active_next = op->active_next;
657
658	if (op->active_next)
659	op->active_next->active_prev = op->active_prev;
660	}
661
662	op->active_next = NULL;
663	op->active_prev = NULL;
664	}
665	}	711	}
666		712
667	/* This function removes object 'op' from the list of active
668	* objects.
669	* This should only be used for style maps or other such
670	* reference maps where you don't want an object that isn't
671	* in play chewing up cpu time getting processed.
672	* The reverse of this is to call update_ob_speed, which
673	* will do the right thing based on the speed of the object.
674	*/
675	void
676	remove_from_active_list (object *op)
677	{
678	/* If not on the active list, nothing needs to be done */
679	if (!op->active_next && !op->active_prev && op != active_objects)
680	return;
681
682	if (op->active_prev == NULL)
683	{
684	active_objects = op->active_next;
685	if (op->active_next != NULL)
686	op->active_next->active_prev = NULL;
687	}
688	else
689	{
690	op->active_prev->active_next = op->active_next;
691	if (op->active_next)
692	op->active_next->active_prev = op->active_prev;
693	}
694	op->active_next = NULL;
695	op->active_prev = NULL;
696	}
697
698	/*	713	/*
699	* update_object() updates the array which represents the map.	714	* update_object() updates the the map.
700	* It takes into account invisible objects (and represent squares covered	715	* It takes into account invisible objects (and represent squares covered
701	* by invisible objects by whatever is below them (unless it's another	716	* by invisible objects by whatever is below them (unless it's another
702	* invisible object, etc...)	717	* invisible object, etc...)
703	* If the object being updated is beneath a player, the look-window	718	* If the object being updated is beneath a player, the look-window
704	* of that player is updated (this might be a suboptimal way of	719	* of that player is updated (this might be a suboptimal way of
705	* updating that window, though, since update_object() is called _often_)	720	* updating that window, though, since update_object() is called _often_)
706	*	721	*
707	* action is a hint of what the caller believes need to be done.	722	* action is a hint of what the caller believes need to be done.
708	* For example, if the only thing that has changed is the face (due to
709	* an animation), we don't need to call update_position until that actually
710	* comes into view of a player. OTOH, many other things, like addition/removal
711	* of walls or living creatures may need us to update the flags now.
712	* current action are:	723	* current action are:
713	* UP_OBJ_INSERT: op was inserted	724	* UP_OBJ_INSERT: op was inserted
714	* UP_OBJ_REMOVE: op was removed	725	* UP_OBJ_REMOVE: op was removed
715	* UP_OBJ_CHANGE: object has somehow changed. In this case, we always update	726	* UP_OBJ_CHANGE: object has somehow changed. In this case, we always update
716	* as that is easier than trying to look at what may have changed.	727	* as that is easier than trying to look at what may have changed.
717	* UP_OBJ_FACE: only the objects face has changed.	728	* UP_OBJ_FACE: only the objects face has changed.
718	*/	729	*/
719
720	void	730	void
721	update_object (object *op, int action)	731	update_object (object *op, int action)
722	{	732	{
723	int update_now = 0, flags;	733	if (!op)
724	MoveType move_on, move_off, move_block, move_slow;
725
726	if (op == NULL)
727	{	734	{
728	/* this should never happen */	735	/* this should never happen */
729	LOG (llevDebug, "update_object() called for NULL object.\n");	736	LOG (llevError | logBacktrace, "update_object() called for NULL object.\n");
730	return;	737	return;
731	}	738	}
732		739
733	if (op->env != NULL)	740	if (!op->is_on_map ())
734	{	741	{
735	/* Animation is currently handled by client, so nothing	742	/* Animation is currently handled by client, so nothing
736	* to do in this case.	743	* to do in this case.
737	*/	744	*/
738	return;	745	return;
739	}	746	}
740		747
741	/* If the map is saving, don't do anything as everything is
742	* going to get freed anyways.
743	*/
744	if (!op->map || op->map->in_memory == MAP_SAVING)
745	return;
746
747	/* make sure the object is within map boundaries */	748	/* make sure the object is within map boundaries */
748	if (op->x < 0 || op->x >= MAP_WIDTH (op->map) || op->y < 0 || op->y >= MAP_HEIGHT (op->map))	749	if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height)
749	{	750	{
750	LOG (llevError, "update_object() called for object out of map!\n");	751	LOG (llevError, "update_object() called for object out of map!\n");
751	#ifdef MANY_CORES	752	#ifdef MANY_CORES
752	abort ();	753	abort ();
753	#endif	754	#endif
754	return;	755	return;
755	}	756	}
756		757
757	flags = GET_MAP_FLAGS (op->map, op->x, op->y);	758	mapspace &m = op->ms ();
758	SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NEED_UPDATE);
759	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);
760	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);
761	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);
762	move_off = GET_MAP_MOVE_OFF (op->map, op->x, op->y);
763		759
		760	if (!(m.flags_ & P_UPTODATE))
		761	/* nop */;
764	if (action == UP_OBJ_INSERT)	762	else if (action == UP_OBJ_INSERT)
765	{	763	{
		764	// this is likely overkill, TODO: revisit (schmorp)
766	if (QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(flags & P_BLOCKSVIEW))	765	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
767	update_now = 1;
768
769	if (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(flags & P_NO_MAGIC))	766	|| (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))
770	update_now = 1;	767	|| (op->type == PLAYER && !(m.flags_ & P_PLAYER))
771		768	|| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
		769	|| (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))
772	if (QUERY_FLAG (op, FLAG_DAMNED) && !(flags & P_NO_CLERIC))	770	|| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))
773	update_now = 1;
774
775	if (QUERY_FLAG (op, FLAG_ALIVE) && !(flags & P_IS_ALIVE))
776	update_now = 1;
777
778	if (op->type == SAFE_GROUND && !(flags & P_SAFE))
779	update_now = 1;
780
781	if ((move_on | op->move_on) != move_on)	771	|| (m.move_on | op->move_on ) != m.move_on
782	update_now = 1;
783
784	if ((move_off | op->move_off) != move_off)	772	|| (m.move_off | op->move_off ) != m.move_off
785	update_now = 1;	773	|| (m.move_slow | op->move_slow) != m.move_slow
786
787	/* This isn't perfect, but I don't expect a lot of objects to	774	/* This isn't perfect, but I don't expect a lot of objects to
788	* to have move_allow right now.	775	* to have move_allow right now.
789	*/	776	*/
790	if (((move_block | op->move_block) & ~op->move_allow) != move_block)	777	|| ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block
791	update_now = 1;	778	|| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)
792		779	m.flags_ = 0;
793	if ((move_slow | op->move_slow) != move_slow)
794	update_now = 1;
795	}	780	}
796
797	/* if the object is being removed, we can't make intelligent	781	/* if the object is being removed, we can't make intelligent
798	* decisions, because remove_ob can't really pass the object	782	* decisions, because remove_ob can't really pass the object
799	* that is being removed.	783	* that is being removed.
800	*/	784	*/
801	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)	785	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
802	update_now = 1;	786	m.flags_ = 0;
803	else if (action == UP_OBJ_FACE)	787	else if (action == UP_OBJ_FACE)
804	/* Nothing to do for that case */ ;	788	/* Nothing to do for that case */ ;
805	else	789	else
806	LOG (llevError, "update_object called with invalid action: %d\n", action);	790	LOG (llevError, "update_object called with invalid action: %d\n", action);
807		791
808	if (update_now)
809	{
810	SET_MAP_FLAGS (op->map, op->x, op->y, flags | P_NO_ERROR | P_NEED_UPDATE);
811	update_position (op->map, op->x, op->y);
812	}
813
814	if (op->more != NULL)	792	if (op->more)
815	update_object (op->more, action);	793	update_object (op->more, action);
816	}
817
818	object::vector object::mortals;
819	object::vector object::objects; // not yet used
820	object *object::first;
821
822	void object::free_mortals ()
823	{
824	for (AUTODECL (i, mortals.begin ()); i != mortals.end ();)
825	if ((*i)->refcnt)
826	++i; // further delay freeing
827	else
828	{
829	delete *i;
830	mortals.erase (i);
831	}
832	}	794	}
833		795
834	object::object ()	796	object::object ()
835	{	797	{
836	SET_FLAG (this, FLAG_REMOVED);	798	SET_FLAG (this, FLAG_REMOVED);
…		…
839	face = blank_face;	801	face = blank_face;
840	}	802	}
841		803
842	object::~object ()	804	object::~object ()
843	{	805	{
		806	unlink ();
		807
844	free_key_values (this);	808	free_key_values (this);
845	}	809	}
846		810
		811	static int object_count;
		812
847	void object::link ()	813	void object::link ()
848	{	814	{
		815	assert (!index);//D
		816	uuid = UUID::gen ();
849	count = ++ob_count;	817	count = ++object_count;
850	uuid = gen_uuid ();
851		818
852	prev = 0;	819	refcnt_inc ();
853	next = object::first;	820	objects.insert (this);
854
855	if (object::first)
856	object::first->prev = this;
857
858	object::first = this;
859	}	821	}
860		822
861	void object::unlink ()	823	void object::unlink ()
862	{	824	{
863	if (this == object::first)	825	if (!index)
864	object::first = next;	826	return;
865		827
866	/* Remove this object from the list of used objects */	828	objects.erase (this);
867	if (prev) prev->next = next;	829	refcnt_dec ();
868	if (next) next->prev = prev;	830	}
869		831
870	prev = 0;	832	void
871	next = 0;	833	object::activate ()
		834	{
		835	/* If already on active list, don't do anything */
		836	if (active)
		837	return;
		838
		839	if (has_active_speed ())
		840	actives.insert (this);
		841	}
		842
		843	void
		844	object::activate_recursive ()
		845	{
		846	activate ();
		847
		848	for (object *op = inv; op; op = op->below)
		849	op->activate_recursive ();
		850	}
		851
		852	/* This function removes object 'op' from the list of active
		853	* objects.
		854	* This should only be used for style maps or other such
		855	* reference maps where you don't want an object that isn't
		856	* in play chewing up cpu time getting processed.
		857	* The reverse of this is to call update_ob_speed, which
		858	* will do the right thing based on the speed of the object.
		859	*/
		860	void
		861	object::deactivate ()
		862	{
		863	/* If not on the active list, nothing needs to be done */
		864	if (!active)
		865	return;
		866
		867	actives.erase (this);
		868	}
		869
		870	void
		871	object::deactivate_recursive ()
		872	{
		873	for (object *op = inv; op; op = op->below)
		874	op->deactivate_recursive ();
		875
		876	deactivate ();
		877	}
		878
		879	void
		880	object::set_flag_inv (int flag, int value)
		881	{
		882	for (object *op = inv; op; op = op->below)
		883	{
		884	op->flag [flag] = value;
		885	op->set_flag_inv (flag, value);
		886	}
		887	}
		888
		889	/*
		890	* Remove and free all objects in the inventory of the given object.
		891	* object.c ?
		892	*/
		893	void
		894	object::destroy_inv (bool drop_to_ground)
		895	{
		896	// need to check first, because the checks below might segfault
		897	// as we might be on an invalid mapspace and crossfire code
		898	// is too buggy to ensure that the inventory is empty.
		899	// corollary: if you create arrows etc. with stuff in its inventory,
		900	// cf will crash below with off-map x and y
		901	if (!inv)
		902	return;
		903
		904	/* Only if the space blocks everything do we not process -
		905	* if some form of movement is allowed, let objects
		906	* drop on that space.
		907	*/
		908	if (!drop_to_ground
		909	|| !map
		910	|| map->in_memory != MAP_ACTIVE
		911	|| map->no_drop
		912	|| ms ().move_block == MOVE_ALL)
		913	{
		914	while (inv)
		915	{
		916	inv->destroy_inv (false);
		917	inv->destroy ();
		918	}
		919	}
		920	else
		921	{ /* Put objects in inventory onto this space */
		922	while (inv)
		923	{
		924	object *op = inv;
		925
		926	if (op->flag [FLAG_STARTEQUIP]
		927	|| op->flag [FLAG_NO_DROP]
		928	|| op->type == RUNE
		929	|| op->type == TRAP
		930	|| op->flag [FLAG_IS_A_TEMPLATE]
		931	|| op->flag [FLAG_DESTROY_ON_DEATH])
		932	op->destroy (true);
		933	else
		934	map->insert (op, x, y);
		935	}
		936	}
872	}	937	}
873		938
874	object *object::create ()	939	object *object::create ()
875	{	940	{
876	object *op = new object;	941	object *op = new object;
877	op->link ();	942	op->link ();
878	return op;	943	return op;
879	}	944	}
880		945
881	/*	946	static struct freed_map : maptile
882	* free_object() frees everything allocated by an object, removes	947	{
883	* it from the list of used objects, and puts it on the list of	948	freed_map ()
884	* free objects. The IS_FREED() flag is set in the object.	949	{
885	* The object must have been removed by remove_ob() first for	950	path = "<freed objects map>";
886	* this function to succeed.	951	name = "/internal/freed_objects_map";
887	*	952	width = 3;
888	* If destroy_inventory is set, free inventory as well. Else drop items in	953	height = 3;
889	* inventory to the ground.	954	no_drop = 1;
890	*/	955	no_reset = 1;
		956
		957	alloc ();
		958	in_memory = MAP_ACTIVE;
		959	}
		960
		961	~freed_map ()
		962	{
		963	destroy ();
		964	}
		965	} freed_map; // freed objects are moved here to avoid crashes
		966
		967	void
		968	object::do_destroy ()
		969	{
		970	if (flag [FLAG_IS_LINKED])
		971	remove_button_link (this);
		972
		973	if (flag [FLAG_FRIENDLY])
		974	remove_friendly_object (this);
		975
		976	remove ();
		977
		978	attachable::do_destroy ();
		979
		980	deactivate ();
		981	unlink ();
		982
		983	flag [FLAG_FREED] = 1;
		984
		985	// hack to ensure that freed objects still have a valid map
		986	map = &freed_map;
		987	x = 1;
		988	y = 1;
		989
		990	if (more)
		991	{
		992	more->destroy ();
		993	more = 0;
		994	}
		995
		996	head = 0;
		997
		998	// clear those pointers that likely might cause circular references
		999	owner = 0;
		1000	enemy = 0;
		1001	attacked_by = 0;
		1002	current_weapon = 0;
		1003	}
		1004
		1005	void
891	void object::destroy (bool destroy_inventory)	1006	object::destroy (bool destroy_inventory)
892	{	1007	{
893	if (QUERY_FLAG (this, FLAG_FREED))	1008	if (destroyed ())
894	return;	1009	return;
895		1010
896	if (QUERY_FLAG (this, FLAG_FRIENDLY))	1011	if (!is_head () && !head->destroyed ())
897	remove_friendly_object (this);
898
899	if (!QUERY_FLAG (this, FLAG_REMOVED))
900	remove ();
901
902	SET_FLAG (this, FLAG_FREED);
903
904	if (more)
905	{	1012	{
		1013	LOG (llevError | logBacktrace, "tried to destroy the tail of an object");
906	more->destroy (destroy_inventory);	1014	head->destroy (destroy_inventory);
907	more = 0;	1015	return;
908	}
909
910	if (inv)
911	{
912	/* Only if the space blocks everything do we not process -
913	* if some form of movement is allowed, let objects
914	* drop on that space.
915	*/
916	if (destroy_inventory || !map || map->in_memory != MAP_IN_MEMORY || GET_MAP_MOVE_BLOCK (map, x, y) == MOVE_ALL)
917	{
918	object *op = inv;
919
920	while (op)
921	{
922	object *tmp = op->below;
923	op->destroy (destroy_inventory);
924	op = tmp;
925	}
926	}
927	else
928	{ /* Put objects in inventory onto this space */
929	object *op = inv;
930
931	while (op)
932	{
933	object *tmp = op->below;
934
935	op->remove ();
936
937	if (QUERY_FLAG (op, FLAG_STARTEQUIP)
938	|| QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
939	op->destroy ();
940	else
941	{
942	op->x = x;
943	op->y = y;
944	insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */
945	}
946
947	op = tmp;
948	}
949	}
950	}
951
952	// hack to ensure that freed objects still have a valid map
953	{
954	static maptile *freed_map; // freed objects are moved here to avoid crashes
955
956	if (!freed_map)
957	{
958	freed_map = new maptile;
959
960	freed_map->name = "/internal/freed_objects_map";
961	freed_map->width = 3;
962	freed_map->height = 3;
963
964	freed_map->allocate ();
965	}	1016	}
966		1017
967	map = freed_map;	1018	destroy_inv (!destroy_inventory);
968	x = 1;
969	y = 1;
970	}
971		1019
972	// clear those pointers that likely might have circular references to us	1020	if (is_head ())
973	owner = 0;	1021	if (sound_destroy)
974	enemy = 0;	1022	play_sound (sound_destroy);
975	attacked_by = 0;	1023	else if (flag [FLAG_MONSTER])
		1024	play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism
976		1025
977	// only relevant for players(?), but make sure of it anyways	1026	attachable::destroy ();
978	contr = 0;
979
980	/* Remove object from the active list */
981	speed = 0;
982	update_ob_speed (this);
983
984	unlink ();
985
986	mortals.push_back (this);
987	}
988
989	/*
990	* sub_weight() recursively (outwards) subtracts a number from the
991	* weight of an object (and what is carried by it's environment(s)).
992	*/
993	void
994	sub_weight (object *op, signed long weight)
995	{
996	while (op != NULL)
997	{
998	if (op->type == CONTAINER)
999	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1000
1001	op->carrying -= weight;
1002	op = op->env;
1003	}
1004	}	1027	}
1005		1028
1006	/* op->remove ():	1029	/* op->remove ():
1007	* This function removes the object op from the linked list of objects	1030	* This function removes the object op from the linked list of objects
1008	* which it is currently tied to. When this function is done, the	1031	* which it is currently tied to. When this function is done, the
1009	* object will have no environment. If the object previously had an	1032	* object will have no environment. If the object previously had an
1010	* environment, the x and y coordinates will be updated to	1033	* environment, the x and y coordinates will be updated to
1011	* the previous environment.	1034	* the previous environment.
1012	* Beware: This function is called from the editor as well!
1013	*/	1035	*/
1014	void	1036	void
1015	object::remove ()	1037	object::do_remove ()
1016	{	1038	{
1017	object *tmp, *last = 0;	1039	object *tmp, *last = 0;
1018	object *otmp;	1040	object *otmp;
1019		1041
1020	int check_walk_off;	1042	if (flag [FLAG_REMOVED])
1021
1022	if (QUERY_FLAG (this, FLAG_REMOVED))
1023	return;	1043	return;
1024		1044
1025	SET_FLAG (this, FLAG_REMOVED);	1045	INVOKE_OBJECT (REMOVE, this);
		1046
		1047	flag [FLAG_REMOVED] = true;
1026		1048
1027	if (more)	1049	if (more)
1028	more->remove ();	1050	more->remove ();
1029		1051
1030	/*	1052	/*
1031	* In this case, the object to be removed is in someones	1053	* In this case, the object to be removed is in someones
1032	* inventory.	1054	* inventory.
1033	*/	1055	*/
1034	if (env)	1056	if (env)
1035	{	1057	{
1036	if (nrof)	1058	flag [FLAG_REMOVED] = false; // hack around the issue of visible_to checking flag_removed
1037	sub_weight (env, weight * nrof);	1059	if (object *pl = visible_to ())
1038	else	1060	esrv_del_item (pl->contr, count);
1039	sub_weight (env, weight + carrying);	1061	flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed
		1062
		1063	adjust_weight (env, -total_weight ());
		1064
		1065	/* we set up values so that it could be inserted into
		1066	* the map, but we don't actually do that - it is up
		1067	* to the caller to decide what we want to do.
		1068	*/
		1069	map = env->map;
		1070	x = env->x;
		1071	y = env->y;
		1072
		1073	// make sure cmov optimisation is applicable
		1074	*(above ? &above->below : &env->inv) = below;
		1075	*(below ? &below->above : &above ) = above; // &above is just a dummy
		1076
		1077	above = 0;
		1078	below = 0;
		1079	env = 0;
1040		1080
1041	/* NO_FIX_PLAYER is set when a great many changes are being	1081	/* NO_FIX_PLAYER is set when a great many changes are being
1042	* made to players inventory. If set, avoiding the call	1082	* made to players inventory. If set, avoiding the call
1043	* to save cpu time.	1083	* to save cpu time.
1044	*/	1084	*/
1045	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1085	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1046	fix_player (otmp);	1086	otmp->update_stats ();
1047
1048	if (above != NULL)
1049	above->below = below;
1050	else
1051	env->inv = below;
1052
1053	if (below != NULL)
1054	below->above = above;
1055
1056	/* we set up values so that it could be inserted into
1057	* the map, but we don't actually do that - it is up
1058	* to the caller to decide what we want to do.
1059	*/
1060	x = env->x, y = env->y;
1061	map = env->map;
1062	above = 0, below = 0;
1063	env = 0;
1064	}	1087	}
1065	else if (map)	1088	else if (map)
1066	{	1089	{
1067	/* Re did the following section of code - it looks like it had	1090	map->dirty = true;
1068	* lots of logic for things we no longer care about	1091	mapspace &ms = this->ms ();
		1092
		1093	if (object *pl = ms.player ())
1069	*/	1094	{
		1095	if (type == PLAYER) // this == pl(!)
		1096	{
		1097	// leaving a spot always closes any open container on the ground
		1098	if (container && !container->env)
		1099	// this causes spurious floorbox updates, but it ensures
		1100	// that the CLOSE event is being sent.
		1101	close_container ();
		1102
		1103	--map->players;
		1104	map->touch ();
		1105	}
		1106	else if (pl->container == this)
		1107	{
		1108	// removing a container should close it
		1109	close_container ();
		1110	}
		1111
		1112	esrv_del_item (pl->contr, count);
		1113	}
1070		1114
1071	/* link the object above us */	1115	/* link the object above us */
1072	if (above)	1116	// re-link, make sure compiler can easily use cmove
1073	above->below = below;	1117	*(above ? &above->below : &ms.top) = below;
1074	else	1118	*(below ? &below->above : &ms.bot) = above;
1075	SET_MAP_TOP (map, x, y, below); /* we were top, set new top */
1076
1077	/* Relink the object below us, if there is one */
1078	if (below)
1079	below->above = above;
1080	else
1081	{
1082	/* Nothing below, which means we need to relink map object for this space
1083	* use translated coordinates in case some oddness with map tiling is
1084	* evident
1085	*/
1086	if (GET_MAP_OB (map, x, y) != this)
1087	{
1088	char *dump = dump_object (this);
1089	LOG (llevError,
1090	"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);
1091	free (dump);
1092	dump = dump_object (GET_MAP_OB (map, x, y));
1093	LOG (llevError, "%s\n", dump);
1094	free (dump);
1095	}
1096
1097	SET_MAP_OB (map, x, y, above); /* goes on above it. */
1098	}
1099		1119
1100	above = 0;	1120	above = 0;
1101	below = 0;	1121	below = 0;
1102		1122
1103	if (map->in_memory == MAP_SAVING)	1123	if (map->in_memory == MAP_SAVING)
1104	return;	1124	return;
1105		1125
1106	check_walk_off = !QUERY_FLAG (this, FLAG_NO_APPLY);	1126	int check_walk_off = !flag [FLAG_NO_APPLY];
1107		1127
		1128	if (object *pl = ms.player ())
		1129	{
		1130	if (pl->container == this)
		1131	/* If a container that the player is currently using somehow gets
		1132	* removed (most likely destroyed), update the player view
		1133	* appropriately.
		1134	*/
		1135	pl->close_container ();
		1136
		1137	//TODO: the floorbox prev/next might need updating
		1138	//esrv_del_item (pl->contr, count);
		1139	//TODO: update floorbox to preserve ordering
		1140	if (pl->contr->ns)
		1141	pl->contr->ns->floorbox_update ();
		1142	}
		1143
1108	for (tmp = GET_MAP_OB (map, x, y); tmp; tmp = tmp->above)	1144	for (tmp = ms.bot; tmp; tmp = tmp->above)
1109	{	1145	{
1110	/* No point updating the players look faces if he is the object	1146	/* No point updating the players look faces if he is the object
1111	* being removed.	1147	* being removed.
1112	*/	1148	*/
1113		1149
1114	if (tmp->type == PLAYER && tmp != this)
1115	{
1116	/* If a container that the player is currently using somehow gets
1117	* removed (most likely destroyed), update the player view
1118	* appropriately.
1119	*/
1120	if (tmp->container == this)
1121	{
1122	CLEAR_FLAG (this, FLAG_APPLIED);
1123	tmp->container = 0;
1124	}
1125
1126	tmp->contr->socket->floorbox_update ();
1127	}
1128
1129	/* See if player moving off should effect something */	1150	/* See if object moving off should effect something */
1130	if (check_walk_off	1151	if (check_walk_off
1131	&& ((move_type & tmp->move_off)	1152	&& ((move_type & tmp->move_off)
1132	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))	1153	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
1133	{	1154	{
1134	move_apply (tmp, this, 0);	1155	move_apply (tmp, this, 0);
1135		1156
1136	if (destroyed ())	1157	if (destroyed ())
1137	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());	1158	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1138	}	1159	}
1139		1160
1140	/* Eneq(@csd.uu.se): Fixed this to skip tmp->above=tmp */
1141
1142	if (tmp->above == tmp)
1143	tmp->above = 0;
1144
1145	last = tmp;	1161	last = tmp;
1146	}	1162	}
1147		1163
1148	/* last == NULL of there are no objects on this space */	1164	/* last == NULL if there are no objects on this space */
		1165	//TODO: this makes little sense, why only update the topmost object?
1149	if (!last)	1166	if (!last)
1150	{	1167	map->at (x, y).flags_ = 0;
1151	/* set P_NEED_UPDATE, otherwise update_position will complain. In theory,
1152	* we could preserve the flags (GET_MAP_FLAGS), but update_position figures
1153	* those out anyways, and if there are any flags set right now, they won't
1154	* be correct anyways.
1155	*/
1156	SET_MAP_FLAGS (map, x, y, P_NEED_UPDATE);
1157	update_position (map, x, y);
1158	}
1159	else	1168	else
1160	update_object (last, UP_OBJ_REMOVE);	1169	update_object (last, UP_OBJ_REMOVE);
1161		1170
1162	if (QUERY_FLAG (this, FLAG_BLOCKSVIEW) || glow_radius)	1171	if (flag [FLAG_BLOCKSVIEW] || glow_radius)
1163	update_all_los (map, x, y);	1172	update_all_los (map, x, y);
1164	}	1173	}
1165	}	1174	}
1166		1175
1167	/*	1176	/*
…		…
1176	merge_ob (object *op, object *top)	1185	merge_ob (object *op, object *top)
1177	{	1186	{
1178	if (!op->nrof)	1187	if (!op->nrof)
1179	return 0;	1188	return 0;
1180		1189
1181	if (top == NULL)	1190	if (!top)
1182	for (top = op; top != NULL && top->above != NULL; top = top->above);	1191	for (top = op; top && top->above; top = top->above)
		1192	;
1183		1193
1184	for (; top != NULL; top = top->below)	1194	for (; top; top = top->below)
1185	{
1186	if (top == op)
1187	continue;
1188
1189	if (object::can_merge (op, top))	1195	if (object::can_merge (op, top))
1190	{	1196	{
1191	top->nrof += op->nrof;	1197	top->nrof += op->nrof;
1192		1198
1193	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/	1199	if (object *pl = top->visible_to ())
1194	op->weight = 0; /* Don't want any adjustements now */	1200	esrv_update_item (UPD_NROF, pl, top);
		1201
		1202	op->weight = 0; // cancel the addition above
		1203	op->carrying = 0; // must be 0 already
		1204
1195	op->destroy ();	1205	op->destroy (1);
		1206
1196	return top;	1207	return top;
1197	}	1208	}
1198	}
1199		1209
1200	return 0;	1210	return 0;
1201	}	1211	}
1202		1212
		1213	void
		1214	object::expand_tail ()
		1215	{
		1216	if (more)
		1217	return;
		1218
		1219	object *prev = this;
		1220
		1221	for (archetype *at = (archetype *)arch->more; at; at = (archetype *)at->more)
		1222	{
		1223	object *op = arch_to_object (at);
		1224
		1225	op->name = name;
		1226	op->name_pl = name_pl;
		1227	op->title = title;
		1228
		1229	op->head = this;
		1230	prev->more = op;
		1231
		1232	prev = op;
		1233	}
		1234	}
		1235
1203	/*	1236	/*
1204	* same as insert_ob_in_map except it handle separate coordinates and do a clean	1237	* same as insert_ob_in_map except it handles separate coordinates and does a clean
1205	* job preparing multi-part monsters	1238	* job preparing multi-part monsters.
1206	*/	1239	*/
1207	object *	1240	object *
1208	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)	1241	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1209	{	1242	{
1210	object *tmp;	1243	op->remove ();
1211		1244
1212	if (op->head)
1213	op = op->head;
1214
1215	for (tmp = op; tmp; tmp = tmp->more)	1245	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1216	{	1246	{
1217	tmp->x = x + tmp->arch->clone.x;	1247	tmp->x = x + tmp->arch->x;
1218	tmp->y = y + tmp->arch->clone.y;	1248	tmp->y = y + tmp->arch->y;
1219	}	1249	}
1220		1250
1221	return insert_ob_in_map (op, m, originator, flag);	1251	return insert_ob_in_map (op, m, originator, flag);
1222	}	1252	}
1223		1253
…		…
1239	* Return value:	1269	* Return value:
1240	* new object if 'op' was merged with other object	1270	* new object if 'op' was merged with other object
1241	* NULL if 'op' was destroyed	1271	* NULL if 'op' was destroyed
1242	* just 'op' otherwise	1272	* just 'op' otherwise
1243	*/	1273	*/
1244
1245	object *	1274	object *
1246	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)	1275	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1247	{	1276	{
1248	object *tmp, *top, *floor = NULL;	1277	if (op->is_on_map ())
1249	sint16 x, y;
1250
1251	if (QUERY_FLAG (op, FLAG_FREED))
1252	{
1253	LOG (llevError, "Trying to insert freed object!\n");
1254	return NULL;
1255	}	1278	{
1256		1279	LOG (llevError, "insert_ob_in_map called for object already on map");
1257	if (m == NULL)
1258	{
1259	char *dump = dump_object (op);
1260	LOG (llevError, "Trying to insert in null-map!\n%s\n", dump);
1261	free (dump);
1262	return op;
1263	}
1264
1265	if (out_of_map (m, op->x, op->y))
1266	{
1267	char *dump = dump_object (op);
1268	LOG (llevError, "Trying to insert object outside the map.\n%s\n", dump);
1269	#ifdef MANY_CORES
1270	/* Better to catch this here, as otherwise the next use of this object
1271	* is likely to cause a crash. Better to find out where it is getting
1272	* improperly inserted.
1273	*/
1274	abort ();	1280	abort ();
1275	#endif
1276	free (dump);
1277	return op;
1278	}
1279
1280	if (!QUERY_FLAG (op, FLAG_REMOVED))
1281	{	1281	}
1282	char *dump = dump_object (op);	1282
1283	LOG (llevError, "Trying to insert (map) inserted object.\n%s\n", dump);	1283	if (op->env)
1284	free (dump);
1285	return op;
1286	}	1284	{
1287		1285	LOG (llevError, "insert_ob_in_map called for object in an inventory (proceeding)");
1288	if (op->more != NULL)	1286	op->remove ();
1289	{	1287	}
1290	/* The part may be on a different map. */
1291		1288
1292	object *more = op->more;	1289	if (op->face && !face_info (op->face))//D TODO: remove soon
1293		1290	{//D
1294	/* We really need the caller to normalize coordinates - if	1291	LOG (llevError | logBacktrace, "op->face out of bounds: %s", op->debug_desc ());//D
1295	* we set the map, that doesn't work if the location is within	1292	op->face = 1;//D
1296	* a map and this is straddling an edge. So only if coordinate
1297	* is clear wrong do we normalize it.
1298	*/
1299	if (OUT_OF_REAL_MAP (more->map, more->x, more->y))
1300	more->map = get_map_from_coord (m, &more->x, &more->y);
1301	else if (!more->map)
1302	{
1303	/* For backwards compatibility - when not dealing with tiled maps,
1304	* more->map should always point to the parent.
1305	*/
1306	more->map = m;
1307	}
1308
1309	if (insert_ob_in_map (more, more->map, originator, flag) == NULL)
1310	{
1311	if (!op->head)
1312	LOG (llevError, "BUG: insert_ob_in_map(): inserting op->more killed op\n");
1313
1314	return NULL;
1315	}
1316	}	1293	}//D
1317
1318	CLEAR_FLAG (op, FLAG_REMOVED);
1319		1294
1320	/* Ideally, the caller figures this out. However, it complicates a lot	1295	/* Ideally, the caller figures this out. However, it complicates a lot
1321	* of areas of callers (eg, anything that uses find_free_spot would now	1296	* of areas of callers (eg, anything that uses find_free_spot would now
1322	* need extra work	1297	* need extra work
1323	*/	1298	*/
1324	op->map = get_map_from_coord (m, &op->x, &op->y);	1299	if (!xy_normalise (m, op->x, op->y))
1325	x = op->x;	1300	{
1326	y = op->y;	1301	op->head_ ()->destroy (1);// remove head_ once all tail object destroyers found
		1302	return 0;
		1303	}
		1304
		1305	if (object *more = op->more)
		1306	if (!insert_ob_in_map (more, m, originator, flag))
		1307	return 0;
		1308
		1309	CLEAR_FLAG (op, FLAG_REMOVED);
		1310
		1311	op->map = m;
		1312	mapspace &ms = op->ms ();
1327		1313
1328	/* this has to be done after we translate the coordinates.	1314	/* this has to be done after we translate the coordinates.
1329	*/	1315	*/
1330	if (op->nrof && !(flag & INS_NO_MERGE))	1316	if (op->nrof && !(flag & INS_NO_MERGE))
1331	for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)	1317	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1332	if (object::can_merge (op, tmp))	1318	if (object::can_merge (op, tmp))
1333	{	1319	{
		1320	// TODO: we actually want to update tmp, not op,
		1321	// but some caller surely breaks when we return tmp
		1322	// from here :/
1334	op->nrof += tmp->nrof;	1323	op->nrof += tmp->nrof;
1335	tmp->destroy ();	1324	tmp->destroy (1);
1336	}	1325	}
1337		1326
1338	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1327	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1339	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1328	CLEAR_FLAG (op, FLAG_INV_LOCKED);
1340		1329
…		…
1347	{	1336	{
1348	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");	1337	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");
1349	abort ();	1338	abort ();
1350	}	1339	}
1351		1340
		1341	if (!originator->is_on_map ())
		1342	LOG (llevDebug | logBacktrace, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map",
		1343	op->debug_desc (), originator->debug_desc ());
		1344
1352	op->above = originator;	1345	op->above = originator;
1353	op->below = originator->below;	1346	op->below = originator->below;
1354
1355	if (op->below)
1356	op->below->above = op;
1357	else
1358	SET_MAP_OB (op->map, op->x, op->y, op);
1359
1360	/* since *below* originator, no need to update top */
1361	originator->below = op;	1347	originator->below = op;
		1348
		1349	*(op->below ? &op->below->above : &ms.bot) = op;
1362	}	1350	}
1363	else	1351	else
1364	{	1352	{
		1353	object *floor = 0;
		1354	object *top = ms.top;
		1355
1365	/* If there are other objects, then */	1356	/* If there are other objects, then */
1366	if ((!(flag & INS_MAP_LOAD)) && ((top = GET_MAP_OB (op->map, op->x, op->y)) != NULL))	1357	if (top)
1367	{	1358	{
1368	object *last = NULL;
1369
1370	/*	1359	/*
1371	* If there are multiple objects on this space, we do some trickier handling.	1360	* If there are multiple objects on this space, we do some trickier handling.
1372	* We've already dealt with merging if appropriate.	1361	* We've already dealt with merging if appropriate.
1373	* Generally, we want to put the new object on top. But if	1362	* Generally, we want to put the new object on top. But if
1374	* flag contains INS_ABOVE_FLOOR_ONLY, once we find the last	1363	* flag contains INS_ABOVE_FLOOR_ONLY, once we find the last
…		…
1377	* once we get to them. This reduces the need to traverse over all of	1366	* once we get to them. This reduces the need to traverse over all of
1378	* them when adding another one - this saves quite a bit of cpu time	1367	* them when adding another one - this saves quite a bit of cpu time
1379	* when lots of spells are cast in one area. Currently, it is presumed	1368	* when lots of spells are cast in one area. Currently, it is presumed
1380	* that flying non pickable objects are spell objects.	1369	* that flying non pickable objects are spell objects.
1381	*/	1370	*/
1382		1371	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1383	while (top != NULL)
1384	{	1372	{
1385	if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))	1373	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) || QUERY_FLAG (tmp, FLAG_OVERLAY_FLOOR))
1386	floor = top;	1374	floor = tmp;
1387		1375
1388	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))	1376	if (QUERY_FLAG (tmp, FLAG_NO_PICK) && (tmp->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1389	{	1377	{
1390	/* We insert above top, so we want this object below this */	1378	/* We insert above top, so we want this object below this */
1391	top = top->below;	1379	top = tmp->below;
1392	break;	1380	break;
1393	}	1381	}
1394		1382
1395	last = top;
1396	top = top->above;	1383	top = tmp;
1397	}	1384	}
1398
1399	/* Don't want top to be NULL, so set it to the last valid object */
1400	top = last;
1401		1385
1402	/* We let update_position deal with figuring out what the space	1386	/* We let update_position deal with figuring out what the space
1403	* looks like instead of lots of conditions here.	1387	* looks like instead of lots of conditions here.
1404	* makes things faster, and effectively the same result.	1388	* makes things faster, and effectively the same result.
1405	*/	1389	*/
1406		1390
1407	/* Have object 'fall below' other objects that block view.	1391	/* Have object 'fall below' other objects that block view.
1408	* Unless those objects are exits, type 66	1392	* Unless those objects are exits.
1409	* If INS_ON_TOP is used, don't do this processing	1393	* If INS_ON_TOP is used, don't do this processing
1410	* Need to find the object that in fact blocks view, otherwise	1394	* Need to find the object that in fact blocks view, otherwise
1411	* stacking is a bit odd.	1395	* stacking is a bit odd.
1412	*/	1396	*/
1413	if (!(flag & INS_ON_TOP) &&	1397	if (!(flag & INS_ON_TOP)
1414	(get_map_flags (op->map, NULL, op->x, op->y, NULL, NULL) & P_BLOCKSVIEW) && (op->face && !op->face->visibility))	1398	&& ms.flags () & P_BLOCKSVIEW
		1399	&& (op->face && !faces [op->face].visibility))
1415	{	1400	{
		1401	object *last;
		1402
1416	for (last = top; last != floor; last = last->below)	1403	for (last = top; last != floor; last = last->below)
1417	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1404	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1418	break;	1405	break;
		1406
1419	/* Check to see if we found the object that blocks view,	1407	/* Check to see if we found the object that blocks view,
1420	* and make sure we have a below pointer for it so that	1408	* and make sure we have a below pointer for it so that
1421	* we can get inserted below this one, which requires we	1409	* we can get inserted below this one, which requires we
1422	* set top to the object below us.	1410	* set top to the object below us.
1423	*/	1411	*/
1424	if (last && last->below && last != floor)	1412	if (last && last->below && last != floor)
1425	top = last->below;	1413	top = last->below;
1426	}	1414	}
1427	} /* If objects on this space */	1415	} /* If objects on this space */
1428		1416
1429	if (flag & INS_MAP_LOAD)
1430	top = GET_MAP_TOP (op->map, op->x, op->y);
1431
1432	if (flag & INS_ABOVE_FLOOR_ONLY)	1417	if (flag & INS_ABOVE_FLOOR_ONLY)
1433	top = floor;	1418	top = floor;
1434		1419
1435	/* Top is the object that our object (op) is going to get inserted above.	1420	// insert object above top, or bottom-most if top = 0
1436	*/
1437
1438	/* First object on this space */
1439	if (!top)	1421	if (!top)
1440	{	1422	{
1441	op->above = GET_MAP_OB (op->map, op->x, op->y);
1442
1443	if (op->above)
1444	op->above->below = op;
1445
1446	op->below = NULL;	1423	op->below = 0;
1447	SET_MAP_OB (op->map, op->x, op->y, op);	1424	op->above = ms.bot;
		1425	ms.bot = op;
		1426
		1427	*(op->above ? &op->above->below : &ms.top) = op;
1448	}	1428	}
1449	else	1429	else
1450	{ /* get inserted into the stack above top */	1430	{
1451	op->above = top->above;	1431	op->above = top->above;
1452
1453	if (op->above)
1454	op->above->below = op;	1432	top->above = op;
1455		1433
1456	op->below = top;	1434	op->below = top;
1457	top->above = op;	1435	*(op->above ? &op->above->below : &ms.top) = op;
1458	}	1436	}
1459		1437	}
1460	if (op->above == NULL)
1461	SET_MAP_TOP (op->map, op->x, op->y, op);
1462	} /* else not INS_BELOW_ORIGINATOR */
1463		1438
1464	if (op->type == PLAYER)	1439	if (op->type == PLAYER)
		1440	{
1465	op->contr->do_los = 1;	1441	op->contr->do_los = 1;
		1442	++op->map->players;
		1443	op->map->touch ();
		1444	}
1466		1445
1467	/* If we have a floor, we know the player, if any, will be above	1446	op->map->dirty = true;
1468	* it, so save a few ticks and start from there.	1447
1469	*/	1448	if (object *pl = ms.player ())
1470	if (!(flag & INS_MAP_LOAD))	1449	//TODO: the floorbox prev/next might need updating
1471	for (tmp = floor ? floor : GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1450	//esrv_send_item (pl, op);
1472	if (tmp->type == PLAYER)	1451	//TODO: update floorbox to preserve ordering
		1452	if (pl->contr->ns)
1473	tmp->contr->socket->floorbox_update ();	1453	pl->contr->ns->floorbox_update ();
1474		1454
1475	/* If this object glows, it may affect lighting conditions that are	1455	/* If this object glows, it may affect lighting conditions that are
1476	* visible to others on this map. But update_all_los is really	1456	* visible to others on this map. But update_all_los is really
1477	* an inefficient way to do this, as it means los for all players	1457	* an inefficient way to do this, as it means los for all players
1478	* on the map will get recalculated. The players could very well	1458	* on the map will get recalculated. The players could very well
1479	* be far away from this change and not affected in any way -	1459	* be far away from this change and not affected in any way -
1480	* this should get redone to only look for players within range,	1460	* this should get redone to only look for players within range,
1481	* or just updating the P_NEED_UPDATE for spaces within this area	1461	* or just updating the P_UPTODATE for spaces within this area
1482	* of effect may be sufficient.	1462	* of effect may be sufficient.
1483	*/	1463	*/
1484	if (MAP_DARKNESS (op->map) && (op->glow_radius != 0))	1464	if (op->map->darkness && (op->glow_radius != 0))
1485	update_all_los (op->map, op->x, op->y);	1465	update_all_los (op->map, op->x, op->y);
1486		1466
1487	/* updates flags (blocked, alive, no magic, etc) for this map space */	1467	/* updates flags (blocked, alive, no magic, etc) for this map space */
1488	update_object (op, UP_OBJ_INSERT);	1468	update_object (op, UP_OBJ_INSERT);
		1469
		1470	INVOKE_OBJECT (INSERT, op);
1489		1471
1490	/* Don't know if moving this to the end will break anything. However,	1472	/* Don't know if moving this to the end will break anything. However,
1491	* we want to have floorbox_update called before calling this.	1473	* we want to have floorbox_update called before calling this.
1492	*	1474	*
1493	* check_move_on() must be after this because code called from	1475	* check_move_on() must be after this because code called from
…		…
1495	* blocked() and wall() work properly), and these flags are updated by	1477	* blocked() and wall() work properly), and these flags are updated by
1496	* update_object().	1478	* update_object().
1497	*/	1479	*/
1498		1480
1499	/* if this is not the head or flag has been passed, don't check walk on status */	1481	/* if this is not the head or flag has been passed, don't check walk on status */
1500	if (!(flag & INS_NO_WALK_ON) && !op->head)	1482	if (!(flag & INS_NO_WALK_ON) && op->head_ () == op)
1501	{	1483	{
1502	if (check_move_on (op, originator))	1484	if (check_move_on (op, originator))
1503	return NULL;	1485	return 0;
1504		1486
1505	/* If we are a multi part object, lets work our way through the check	1487	/* If we are a multi part object, lets work our way through the check
1506	* walk on's.	1488	* walk on's.
1507	*/	1489	*/
1508	for (tmp = op->more; tmp != NULL; tmp = tmp->more)	1490	for (object *tmp = op->more; tmp; tmp = tmp->more)
1509	if (check_move_on (tmp, originator))	1491	if (check_move_on (tmp, originator))
1510	return NULL;	1492	return 0;
1511	}	1493	}
1512		1494
1513	return op;	1495	return op;
1514	}	1496	}
1515		1497
1516	/* this function inserts an object in the map, but if it	1498	/* this function inserts an object in the map, but if it
1517	* finds an object of its own type, it'll remove that one first.	1499	* finds an object of its own type, it'll remove that one first.
1518	* op is the object to insert it under: supplies x and the map.	1500	* op is the object to insert it under: supplies x and the map.
1519	*/	1501	*/
1520	void	1502	void
1521	replace_insert_ob_in_map (const char *arch_string, object *op)	1503	replace_insert_ob_in_map (const char *arch_string, object *op)
1522	{	1504	{
1523	object *
1524	tmp;
1525	object *
1526	tmp1;
1527
1528	/* first search for itself and remove any old instances */	1505	/* first search for itself and remove any old instances */
1529		1506
1530	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)	1507	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1531	if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */	1508	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */
1532	tmp->destroy ();	1509	tmp->destroy (1);
1533		1510
1534	tmp1 = arch_to_object (archetype::find (arch_string));	1511	object *tmp = arch_to_object (archetype::find (arch_string));
1535		1512
1536	tmp1->x = op->x;	1513	tmp->x = op->x;
1537	tmp1->y = op->y;	1514	tmp->y = op->y;
		1515
1538	insert_ob_in_map (tmp1, op->map, op, 0);	1516	insert_ob_in_map (tmp, op->map, op, 0);
1539	}	1517	}
1540
1541	/*
1542	* get_split_ob(ob,nr) splits up ob into two parts. The part which
1543	* is returned contains nr objects, and the remaining parts contains
1544	* the rest (or is removed and freed if that number is 0).
1545	* On failure, NULL is returned, and the reason put into the
1546	* global static errmsg array.
1547	*/
1548		1518
1549	object *	1519	object *
1550	get_split_ob (object *orig_ob, uint32 nr)	1520	object::insert_at (object *where, object *originator, int flags)
1551	{	1521	{
1552	object *newob;	1522	if (where->env)
1553	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);	1523	return where->env->insert (this);
1554		1524	else
1555	if (orig_ob->nrof < nr)	1525	return where->map->insert (this, where->x, where->y, originator, flags);
1556	{
1557	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1558	return NULL;
1559	}
1560
1561	newob = object_create_clone (orig_ob);
1562
1563	if ((orig_ob->nrof -= nr) < 1)
1564	orig_ob->destroy (1);
1565	else if (!is_removed)
1566	{
1567	if (orig_ob->env != NULL)
1568	sub_weight (orig_ob->env, orig_ob->weight * nr);
1569	if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)
1570	{
1571	strcpy (errmsg, "Tried to split object whose map is not in memory.");
1572	LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n");
1573	return NULL;
1574	}
1575	}
1576
1577	newob->nrof = nr;
1578
1579	return newob;
1580	}	1526	}
1581		1527
1582	/*	1528	/*
1583	* decrease_ob_nr(object, number) decreases a specified number from	1529	* decrease(object, number) decreases a specified number from
1584	* the amount of an object. If the amount reaches 0, the object	1530	* the amount of an object. If the amount reaches 0, the object
1585	* is subsequently removed and freed.	1531	* is subsequently removed and freed.
1586	*	1532	*
1587	* Return value: 'op' if something is left, NULL if the amount reached 0	1533	* Return value: 'op' if something is left, NULL if the amount reached 0
1588	*/	1534	*/
		1535	bool
		1536	object::decrease (sint32 nr)
		1537	{
		1538	if (!nr)
		1539	return true;
1589		1540
		1541	nr = min (nr, nrof);
		1542
		1543	nrof -= nr;
		1544
		1545	if (nrof)
		1546	{
		1547	adjust_weight (env, -weight * max (1, nr)); // carrying == 0
		1548
		1549	if (object *pl = visible_to ())
		1550	esrv_update_item (UPD_NROF, pl, this);
		1551
		1552	return true;
		1553	}
		1554	else
		1555	{
		1556	destroy (1);
		1557	return false;
		1558	}
		1559	}
		1560
		1561	/*
		1562	* split(ob,nr) splits up ob into two parts. The part which
		1563	* is returned contains nr objects, and the remaining parts contains
		1564	* the rest (or is removed and returned if that number is 0).
		1565	* On failure, NULL is returned.
		1566	*/
1590	object *	1567	object *
1591	decrease_ob_nr (object *op, uint32 i)	1568	object::split (sint32 nr)
1592	{	1569	{
1593	object *tmp;	1570	int have = number_of ();
1594	player *pl;
1595		1571
1596	if (i == 0) /* objects with op->nrof require this check */	1572	if (have < nr)
1597	return op;	1573	return 0;
1598		1574	else if (have == nr)
1599	if (i > op->nrof)
1600	i = op->nrof;
1601
1602	if (QUERY_FLAG (op, FLAG_REMOVED))
1603	op->nrof -= i;
1604	else if (op->env)
1605	{	1575	{
1606	/* is this object in the players inventory, or sub container
1607	* therein?
1608	*/
1609	tmp = op->in_player ();
1610	/* nope. Is this a container the player has opened?
1611	* If so, set tmp to that player.
1612	* IMO, searching through all the players will mostly
1613	* likely be quicker than following op->env to the map,
1614	* and then searching the map for a player.
1615	*/
1616	if (!tmp)
1617	{
1618	for (pl = first_player; pl; pl = pl->next)
1619	if (pl->ob->container == op->env)
1620	{
1621	tmp = pl->ob;
1622	break;
1623	}
1624	}
1625
1626	if (i < op->nrof)
1627	{
1628	sub_weight (op->env, op->weight * i);
1629	op->nrof -= i;
1630	if (tmp)
1631	esrv_send_item (tmp, op);
1632	}
1633	else
1634	{
1635	op->remove ();	1576	remove ();
1636	op->nrof = 0;	1577	return this;
1637	if (tmp)
1638	esrv_del_item (tmp->contr, op->count);
1639	}
1640	}	1578	}
1641	else	1579	else
1642	{	1580	{
1643	object *above = op->above;	1581	decrease (nr);
1644		1582
1645	if (i < op->nrof)	1583	object *op = deep_clone ();
1646	op->nrof -= i;	1584	op->nrof = nr;
1647	else
1648	{
1649	op->remove ();
1650	op->nrof = 0;
1651	}
1652
1653	/* Since we just removed op, op->above is null */
1654	for (tmp = above; tmp; tmp = tmp->above)
1655	if (tmp->type == PLAYER)
1656	{
1657	if (op->nrof)
1658	esrv_send_item (tmp, op);
1659	else
1660	esrv_del_item (tmp->contr, op->count);
1661	}
1662	}
1663
1664	if (op->nrof)
1665	return op;	1585	return op;
1666	else
1667	{
1668	op->destroy ();
1669	return 0;
1670	}
1671	}
1672
1673	/*
1674	* add_weight(object, weight) adds the specified weight to an object,
1675	* and also updates how much the environment(s) is/are carrying.
1676	*/
1677
1678	void
1679	add_weight (object *op, signed long weight)
1680	{
1681	while (op != NULL)
1682	{
1683	if (op->type == CONTAINER)
1684	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1685
1686	op->carrying += weight;
1687	op = op->env;
1688	}	1586	}
1689	}	1587	}
1690		1588
1691	object *	1589	object *
1692	insert_ob_in_ob (object *op, object *where)	1590	insert_ob_in_ob (object *op, object *where)
…		…
1697	LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);	1595	LOG (llevError, "Trying to put object in NULL.\n%s\n", dump);
1698	free (dump);	1596	free (dump);
1699	return op;	1597	return op;
1700	}	1598	}
1701		1599
1702	if (where->head)	1600	if (where->head_ () != where)
1703	{	1601	{
1704	LOG (llevDebug, "Warning: Tried to insert object into wrong part of multipart object.\n");	1602	LOG (llevError | logBacktrace, "Warning: Tried to insert object into wrong part of multipart object.\n");
1705	where = where->head;	1603	where = where->head;
1706	}	1604	}
1707		1605
1708	return where->insert (op);	1606	return where->insert (op);
1709	}	1607	}
…		…
1714	* inside the object environment.	1612	* inside the object environment.
1715	*	1613	*
1716	* The function returns now pointer to inserted item, and return value can	1614	* The function returns now pointer to inserted item, and return value can
1717	* be != op, if items are merged. -Tero	1615	* be != op, if items are merged. -Tero
1718	*/	1616	*/
1719
1720	object *	1617	object *
1721	object::insert (object *op)	1618	object::insert (object *op)
1722	{	1619	{
1723	object *tmp, *otmp;
1724
1725	if (!QUERY_FLAG (op, FLAG_REMOVED))
1726	op->remove ();
1727
1728	if (op->more)	1620	if (op->more)
1729	{	1621	{
1730	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);	1622	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1731	return op;	1623	return op;
1732	}	1624	}
1733		1625
1734	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1626	op->remove ();
1735	CLEAR_FLAG (op, FLAG_REMOVED);	1627
		1628	op->flag [FLAG_OBJ_ORIGINAL] = 0;
		1629
1736	if (op->nrof)	1630	if (op->nrof)
1737	{
1738	for (tmp = inv; tmp != NULL; tmp = tmp->below)	1631	for (object *tmp = inv; tmp; tmp = tmp->below)
1739	if (object::can_merge (tmp, op))	1632	if (object::can_merge (tmp, op))
1740	{	1633	{
1741	/* return the original object and remove inserted object	1634	/* return the original object and remove inserted object
1742	(client needs the original object) */	1635	(client needs the original object) */
1743	tmp->nrof += op->nrof;	1636	tmp->nrof += op->nrof;
1744	/* Weight handling gets pretty funky. Since we are adding to	1637
1745	* tmp->nrof, we need to increase the weight.	1638	if (object *pl = tmp->visible_to ())
1746	*/	1639	esrv_update_item (UPD_NROF, pl, tmp);
		1640
1747	add_weight (this, op->weight * op->nrof);	1641	adjust_weight (this, op->total_weight ());
1748	SET_FLAG (op, FLAG_REMOVED);	1642
1749	op->destroy (); /* free the inserted object */	1643	op->destroy (1);
1750	op = tmp;	1644	op = tmp;
1751	op->remove (); /* and fix old object's links */	1645	goto inserted;
1752	CLEAR_FLAG (op, FLAG_REMOVED);
1753	break;
1754	}	1646	}
1755		1647
1756	/* I assume combined objects have no inventory	1648	op->owner = 0; // it's his/hers now. period.
1757	* We add the weight - this object could have just been removed
1758	* (if it was possible to merge). calling remove_ob will subtract
1759	* the weight, so we need to add it in again, since we actually do
1760	* the linking below
1761	*/
1762	add_weight (this, op->weight * op->nrof);
1763	}
1764	else
1765	add_weight (this, (op->weight + op->carrying));
1766
1767	otmp = this->in_player ();
1768	if (otmp && otmp->contr)
1769	if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1770	fix_player (otmp);
1771
1772	op->map = 0;	1649	op->map = 0;
1773	op->env = this;	1650	op->x = 0;
		1651	op->y = 0;
		1652
1774	op->above = 0;	1653	op->above = 0;
1775	op->below = 0;	1654	op->below = inv;
1776	op->x = 0, op->y = 0;	1655	op->env = this;
1777		1656
		1657	if (inv)
		1658	inv->above = op;
		1659
		1660	inv = op;
		1661
		1662	op->flag [FLAG_REMOVED] = 0;
		1663
		1664	if (object *pl = op->visible_to ())
		1665	esrv_send_item (pl, op);
		1666
		1667	adjust_weight (this, op->total_weight ());
		1668
		1669	inserted:
1778	/* reset the light list and los of the players on the map */	1670	/* reset the light list and los of the players on the map */
1779	if ((op->glow_radius != 0) && map)	1671	if (op->glow_radius && map && map->darkness)
1780	{
1781	#ifdef DEBUG_LIGHTS
1782	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1783	#endif /* DEBUG_LIGHTS */
1784	if (MAP_DARKNESS (map))
1785	update_all_los (map, x, y);	1672	update_all_los (map, x, y);
1786	}
1787		1673
1788	/* Client has no idea of ordering so lets not bother ordering it here.	1674	// if this is a player's inventory, update stats
1789	* It sure simplifies this function...	1675	if (type == PLAYER && !flag [FLAG_NO_FIX_PLAYER])
1790	*/	1676	update_stats ();
1791	if (!inv)	1677
1792	inv = op;	1678	INVOKE_OBJECT (INSERT, this);
1793	else
1794	{
1795	op->below = inv;
1796	op->below->above = op;
1797	inv = op;
1798	}
1799		1679
1800	return op;	1680	return op;
1801	}	1681	}
1802		1682
1803	/*	1683	/*
…		…
1818	*	1698	*
1819	* MSW 2001-07-08: Check all objects on space, not just those below	1699	* MSW 2001-07-08: Check all objects on space, not just those below
1820	* object being inserted. insert_ob_in_map may not put new objects	1700	* object being inserted. insert_ob_in_map may not put new objects
1821	* on top.	1701	* on top.
1822	*/	1702	*/
1823
1824	int	1703	int
1825	check_move_on (object *op, object *originator)	1704	check_move_on (object *op, object *originator)
1826	{	1705	{
1827	object *tmp;	1706	object *tmp;
1828	maptile *m = op->map;	1707	maptile *m = op->map;
…		…
1855		1734
1856	/* The objects have to be checked from top to bottom.	1735	/* The objects have to be checked from top to bottom.
1857	* Hence, we first go to the top:	1736	* Hence, we first go to the top:
1858	*/	1737	*/
1859		1738
1860	for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL && tmp->above != NULL; tmp = tmp->above)	1739	for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above)
1861	{	1740	{
1862	/* Trim the search when we find the first other spell effect	1741	/* Trim the search when we find the first other spell effect
1863	* this helps performance so that if a space has 50 spell objects,	1742	* this helps performance so that if a space has 50 spell objects,
1864	* we don't need to check all of them.	1743	* we don't need to check all of them.
1865	*/	1744	*/
…		…
1883	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||	1762	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
1884	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))	1763	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1885	{	1764	{
1886		1765
1887	float	1766	float
1888	diff = tmp->move_slow_penalty * FABS (op->speed);	1767	diff = tmp->move_slow_penalty * fabs (op->speed);
1889		1768
1890	if (op->type == PLAYER)	1769	if (op->type == PLAYER)
1891	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||	1770	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||
1892	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))	1771	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))
1893	diff /= 4.0;	1772	diff /= 4.0;
…		…
1920	/*	1799	/*
1921	* present_arch(arch, map, x, y) searches for any objects with	1800	* present_arch(arch, map, x, y) searches for any objects with
1922	* a matching archetype at the given map and coordinates.	1801	* a matching archetype at the given map and coordinates.
1923	* The first matching object is returned, or NULL if none.	1802	* The first matching object is returned, or NULL if none.
1924	*/	1803	*/
1925
1926	object *	1804	object *
1927	present_arch (const archetype *at, maptile *m, int x, int y)	1805	present_arch (const archetype *at, maptile *m, int x, int y)
1928	{	1806	{
1929	object *
1930	tmp;
1931
1932	if (m == NULL || out_of_map (m, x, y))	1807	if (!m || out_of_map (m, x, y))
1933	{	1808	{
1934	LOG (llevError, "Present_arch called outside map.\n");	1809	LOG (llevError, "Present_arch called outside map.\n");
1935	return NULL;	1810	return NULL;
1936	}	1811	}
1937	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1812
1938	if (tmp->arch == at)	1813	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
		1814	if (tmp->arch->archname == at->archname)
1939	return tmp;	1815	return tmp;
		1816
1940	return NULL;	1817	return NULL;
1941	}	1818	}
1942		1819
1943	/*	1820	/*
1944	* present(type, map, x, y) searches for any objects with	1821	* present(type, map, x, y) searches for any objects with
1945	* a matching type variable at the given map and coordinates.	1822	* a matching type variable at the given map and coordinates.
1946	* The first matching object is returned, or NULL if none.	1823	* The first matching object is returned, or NULL if none.
1947	*/	1824	*/
1948
1949	object *	1825	object *
1950	present (unsigned char type, maptile *m, int x, int y)	1826	present (unsigned char type, maptile *m, int x, int y)
1951	{	1827	{
1952	object *
1953	tmp;
1954
1955	if (out_of_map (m, x, y))	1828	if (out_of_map (m, x, y))
1956	{	1829	{
1957	LOG (llevError, "Present called outside map.\n");	1830	LOG (llevError, "Present called outside map.\n");
1958	return NULL;	1831	return NULL;
1959	}	1832	}
1960	for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)	1833
		1834	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1961	if (tmp->type == type)	1835	if (tmp->type == type)
1962	return tmp;	1836	return tmp;
		1837
1963	return NULL;	1838	return NULL;
1964	}	1839	}
1965		1840
1966	/*	1841	/*
1967	* present_in_ob(type, object) searches for any objects with	1842	* present_in_ob(type, object) searches for any objects with
1968	* a matching type variable in the inventory of the given object.	1843	* a matching type variable in the inventory of the given object.
1969	* The first matching object is returned, or NULL if none.	1844	* The first matching object is returned, or NULL if none.
1970	*/	1845	*/
1971
1972	object *	1846	object *
1973	present_in_ob (unsigned char type, const object *op)	1847	present_in_ob (unsigned char type, const object *op)
1974	{	1848	{
1975	object *
1976	tmp;
1977
1978	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1849	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)
1979	if (tmp->type == type)	1850	if (tmp->type == type)
1980	return tmp;	1851	return tmp;
		1852
1981	return NULL;	1853	return NULL;
1982	}	1854	}
1983		1855
1984	/*	1856	/*
1985	* present_in_ob (type, str, object) searches for any objects with	1857	* present_in_ob (type, str, object) searches for any objects with
…		…
1993	* str is the string to match against. Note that we match against	1865	* str is the string to match against. Note that we match against
1994	* the object name, not the archetype name. this is so that the	1866	* the object name, not the archetype name. this is so that the
1995	* spell code can use one object type (force), but change it's name	1867	* spell code can use one object type (force), but change it's name
1996	* to be unique.	1868	* to be unique.
1997	*/	1869	*/
1998
1999	object *	1870	object *
2000	present_in_ob_by_name (int type, const char *str, const object *op)	1871	present_in_ob_by_name (int type, const char *str, const object *op)
2001	{	1872	{
2002	object *
2003	tmp;
2004
2005	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1873	for (object *tmp = op->inv; tmp; tmp = tmp->below)
2006	{
2007	if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name)))	1874	if ((type == -1 || tmp->type == type) && (!strcmp (str, tmp->name)))
2008	return tmp;	1875	return tmp;
2009	}	1876
2010	return NULL;	1877	return 0;
2011	}	1878	}
2012		1879
2013	/*	1880	/*
2014	* present_arch_in_ob(archetype, object) searches for any objects with	1881	* present_arch_in_ob(archetype, object) searches for any objects with
2015	* a matching archetype in the inventory of the given object.	1882	* a matching archetype in the inventory of the given object.
2016	* The first matching object is returned, or NULL if none.	1883	* The first matching object is returned, or NULL if none.
2017	*/	1884	*/
2018
2019	object *	1885	object *
2020	present_arch_in_ob (const archetype *at, const object *op)	1886	present_arch_in_ob (const archetype *at, const object *op)
2021	{	1887	{
2022	object *
2023	tmp;
2024
2025	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1888	for (object *tmp = op->inv; tmp; tmp = tmp->below)
2026	if (tmp->arch == at)	1889	if (tmp->arch->archname == at->archname)
2027	return tmp;	1890	return tmp;
		1891
2028	return NULL;	1892	return NULL;
2029	}	1893	}
2030		1894
2031	/*	1895	/*
2032	* activate recursively a flag on an object inventory	1896	* activate recursively a flag on an object inventory
2033	*/	1897	*/
2034	void	1898	void
2035	flag_inv (object *op, int flag)	1899	flag_inv (object *op, int flag)
2036	{	1900	{
2037	object *
2038	tmp;
2039
2040	if (op->inv)
2041	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1901	for (object *tmp = op->inv; tmp; tmp = tmp->below)
2042	{	1902	{
2043	SET_FLAG (tmp, flag);	1903	SET_FLAG (tmp, flag);
2044	flag_inv (tmp, flag);	1904	flag_inv (tmp, flag);
2045	}	1905	}
2046	} /*	1906	}
		1907
		1908	/*
2047	* desactivate recursively a flag on an object inventory	1909	* deactivate recursively a flag on an object inventory
2048	*/	1910	*/
2049	void	1911	void
2050	unflag_inv (object *op, int flag)	1912	unflag_inv (object *op, int flag)
2051	{	1913	{
2052	object *
2053	tmp;
2054
2055	if (op->inv)
2056	for (tmp = op->inv; tmp != NULL; tmp = tmp->below)	1914	for (object *tmp = op->inv; tmp; tmp = tmp->below)
2057	{	1915	{
2058	CLEAR_FLAG (tmp, flag);	1916	CLEAR_FLAG (tmp, flag);
2059	unflag_inv (tmp, flag);	1917	unflag_inv (tmp, flag);
2060	}	1918	}
2061	}
2062
2063	/*
2064	* set_cheat(object) sets the cheat flag (WAS_WIZ) in the object and in
2065	* all it's inventory (recursively).
2066	* If checksums are used, a player will get set_cheat called for
2067	* him/her-self and all object carried by a call to this function.
2068	*/
2069
2070	void
2071	set_cheat (object *op)
2072	{
2073	SET_FLAG (op, FLAG_WAS_WIZ);
2074	flag_inv (op, FLAG_WAS_WIZ);
2075	}	1919	}
2076		1920
2077	/*	1921	/*
2078	* find_free_spot(object, map, x, y, start, stop) will search for	1922	* find_free_spot(object, map, x, y, start, stop) will search for
2079	* a spot at the given map and coordinates which will be able to contain	1923	* a spot at the given map and coordinates which will be able to contain
…		…
2081	* to search (see the freearr_x/y[] definition).	1925	* to search (see the freearr_x/y[] definition).
2082	* It returns a random choice among the alternatives found.	1926	* It returns a random choice among the alternatives found.
2083	* start and stop are where to start relative to the free_arr array (1,9	1927	* start and stop are where to start relative to the free_arr array (1,9
2084	* does all 4 immediate directions). This returns the index into the	1928	* does all 4 immediate directions). This returns the index into the
2085	* array of the free spot, -1 if no spot available (dir 0 = x,y)	1929	* array of the free spot, -1 if no spot available (dir 0 = x,y)
2086	* Note - this only checks to see if there is space for the head of the
2087	* object - if it is a multispace object, this should be called for all
2088	* pieces.
2089	* Note2: This function does correctly handle tiled maps, but does not	1930	* Note: This function does correctly handle tiled maps, but does not
2090	* inform the caller. However, insert_ob_in_map will update as	1931	* inform the caller. However, insert_ob_in_map will update as
2091	* necessary, so the caller shouldn't need to do any special work.	1932	* necessary, so the caller shouldn't need to do any special work.
2092	* Note - updated to take an object instead of archetype - this is necessary	1933	* Note - updated to take an object instead of archetype - this is necessary
2093	* because arch_blocked (now ob_blocked) needs to know the movement type	1934	* because arch_blocked (now ob_blocked) needs to know the movement type
2094	* to know if the space in question will block the object. We can't use	1935	* to know if the space in question will block the object. We can't use
2095	* the archetype because that isn't correct if the monster has been	1936	* the archetype because that isn't correct if the monster has been
2096	* customized, changed states, etc.	1937	* customized, changed states, etc.
2097	*/	1938	*/
2098
2099	int	1939	int
2100	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)	1940	find_free_spot (const object *ob, maptile *m, int x, int y, int start, int stop)
2101	{	1941	{
2102	int
2103	i,
2104	index = 0, flag;
2105	static int
2106	altern[SIZEOFFREE];	1942	int altern[SIZEOFFREE];
		1943	int index = 0, flag;
2107		1944
2108	for (i = start; i < stop; i++)	1945	for (int i = start; i < stop; i++)
2109	{	1946	{
2110	flag = ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]);	1947	mapxy pos (m, x, y); pos.move (i);
2111	if (!flag)	1948
		1949	if (!pos.normalise ())
		1950	continue;
		1951
		1952	mapspace &ms = *pos;
		1953
		1954	if (ms.flags () & P_IS_ALIVE)
		1955	continue;
		1956
		1957	/* However, often
		1958	* ob doesn't have any move type (when used to place exits)
		1959	* so the AND operation in OB_TYPE_MOVE_BLOCK doesn't work.
		1960	*/
		1961	if (ob && ob->move_type == 0 && ms.move_block != MOVE_ALL)
		1962	{
2112	altern[index++] = i;	1963	altern [index++] = i;
		1964	continue;
		1965	}
2113		1966
2114	/* Basically, if we find a wall on a space, we cut down the search size.	1967	/* Basically, if we find a wall on a space, we cut down the search size.
2115	* In this way, we won't return spaces that are on another side of a wall.	1968	* In this way, we won't return spaces that are on another side of a wall.
2116	* This mostly work, but it cuts down the search size in all directions -	1969	* This mostly work, but it cuts down the search size in all directions -
2117	* if the space being examined only has a wall to the north and empty	1970	* if the space being examined only has a wall to the north and empty
2118	* spaces in all the other directions, this will reduce the search space	1971	* spaces in all the other directions, this will reduce the search space
2119	* to only the spaces immediately surrounding the target area, and	1972	* to only the spaces immediately surrounding the target area, and
2120	* won't look 2 spaces south of the target space.	1973	* won't look 2 spaces south of the target space.
2121	*/	1974	*/
2122	else if ((flag & P_NO_PASS) && maxfree[i] < stop)	1975	if (ms.move_block == MOVE_ALL && maxfree[i] < stop)
		1976	{
2123	stop = maxfree[i];	1977	stop = maxfree[i];
		1978	continue;
		1979	}
		1980
		1981	/* Note it is intentional that we check ob - the movement type of the
		1982	* head of the object should correspond for the entire object.
		1983	*/
		1984	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
		1985	continue;
		1986
		1987	if (ob->blocked (m, pos.x, pos.y))
		1988	continue;
		1989
		1990	altern [index++] = i;
2124	}	1991	}
2125		1992
2126	if (!index)	1993	if (!index)
2127	return -1;	1994	return -1;
2128		1995
2129	return altern[RANDOM () % index];	1996	return altern [rndm (index)];
2130	}	1997	}
2131		1998
2132	/*	1999	/*
2133	* find_first_free_spot(archetype, maptile, x, y) works like	2000	* find_first_free_spot(archetype, maptile, x, y) works like
2134	* find_free_spot(), but it will search max number of squares.	2001	* find_free_spot(), but it will search max number of squares.
2135	* But it will return the first available spot, not a random choice.	2002	* But it will return the first available spot, not a random choice.
2136	* Changed 0.93.2: Have it return -1 if there is no free spot available.	2003	* Changed 0.93.2: Have it return -1 if there is no free spot available.
2137	*/	2004	*/
2138
2139	int	2005	int
2140	find_first_free_spot (const object *ob, maptile *m, int x, int y)	2006	find_first_free_spot (const object *ob, maptile *m, int x, int y)
2141	{	2007	{
2142	int
2143	i;
2144
2145	for (i = 0; i < SIZEOFFREE; i++)	2008	for (int i = 0; i < SIZEOFFREE; i++)
2146	{
2147	if (!ob_blocked (ob, m, x + freearr_x[i], y + freearr_y[i]))	2009	if (!ob->blocked (m, x + freearr_x[i], y + freearr_y[i]))
2148	return i;	2010	return i;
2149	}	2011
2150	return -1;	2012	return -1;
2151	}	2013	}
2152		2014
2153	/*	2015	/*
2154	* The function permute(arr, begin, end) randomly reorders the array	2016	* The function permute(arr, begin, end) randomly reorders the array
2155	* arr[begin..end-1].	2017	* arr[begin..end-1].
		2018	* now uses a fisher-yates shuffle, old permute was broken
2156	*/	2019	*/
2157	static void	2020	static void
2158	permute (int *arr, int begin, int end)	2021	permute (int *arr, int begin, int end)
2159	{	2022	{
2160	int	2023	arr += begin;
2161	i,
2162	j,
2163	tmp,
2164	len;
2165
2166	len = end - begin;	2024	end -= begin;
2167	for (i = begin; i < end; i++)
2168	{
2169	j = begin + RANDOM () % len;
2170		2025
2171	tmp = arr[i];	2026	while (--end)
2172	arr[i] = arr[j];	2027	swap (arr [end], arr [rndm (end + 1)]);
2173	arr[j] = tmp;
2174	}
2175	}	2028	}
2176		2029
2177	/* new function to make monster searching more efficient, and effective!	2030	/* new function to make monster searching more efficient, and effective!
2178	* This basically returns a randomized array (in the passed pointer) of	2031	* This basically returns a randomized array (in the passed pointer) of
2179	* the spaces to find monsters. In this way, it won't always look for	2032	* the spaces to find monsters. In this way, it won't always look for
…		…
2182	* the 3x3 area will be searched, just not in a predictable order.	2035	* the 3x3 area will be searched, just not in a predictable order.
2183	*/	2036	*/
2184	void	2037	void
2185	get_search_arr (int *search_arr)	2038	get_search_arr (int *search_arr)
2186	{	2039	{
2187	int	2040	int i;
2188	i;
2189		2041
2190	for (i = 0; i < SIZEOFFREE; i++)	2042	for (i = 0; i < SIZEOFFREE; i++)
2191	{
2192	search_arr[i] = i;	2043	search_arr[i] = i;
2193	}
2194		2044
2195	permute (search_arr, 1, SIZEOFFREE1 + 1);	2045	permute (search_arr, 1, SIZEOFFREE1 + 1);
2196	permute (search_arr, SIZEOFFREE1 + 1, SIZEOFFREE2 + 1);	2046	permute (search_arr, SIZEOFFREE1 + 1, SIZEOFFREE2 + 1);
2197	permute (search_arr, SIZEOFFREE2 + 1, SIZEOFFREE);	2047	permute (search_arr, SIZEOFFREE2 + 1, SIZEOFFREE);
2198	}	2048	}
…		…
2207	* Perhaps incorrectly, but I'm making the assumption that exclude	2057	* Perhaps incorrectly, but I'm making the assumption that exclude
2208	* is actually want is going to try and move there. We need this info	2058	* is actually want is going to try and move there. We need this info
2209	* because we have to know what movement the thing looking to move	2059	* because we have to know what movement the thing looking to move
2210	* there is capable of.	2060	* there is capable of.
2211	*/	2061	*/
2212
2213	int	2062	int
2214	find_dir (maptile *m, int x, int y, object *exclude)	2063	find_dir (maptile *m, int x, int y, object *exclude)
2215	{	2064	{
2216	int
2217	i,
2218	max = SIZEOFFREE, mflags;	2065	int i, max = SIZEOFFREE, mflags;
2219		2066
2220	sint16 nx, ny;	2067	sint16 nx, ny;
2221	object *	2068	object *tmp;
2222	tmp;
2223	maptile *	2069	maptile *mp;
2224	mp;
2225		2070
2226	MoveType blocked, move_type;	2071	MoveType blocked, move_type;
2227		2072
2228	if (exclude && exclude->head)	2073	if (exclude && exclude->head_ () != exclude)
2229	{	2074	{
2230	exclude = exclude->head;	2075	exclude = exclude->head;
2231	move_type = exclude->move_type;	2076	move_type = exclude->move_type;
2232	}	2077	}
2233	else	2078	else
…		…
2241	mp = m;	2086	mp = m;
2242	nx = x + freearr_x[i];	2087	nx = x + freearr_x[i];
2243	ny = y + freearr_y[i];	2088	ny = y + freearr_y[i];
2244		2089
2245	mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);	2090	mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);
		2091
2246	if (mflags & P_OUT_OF_MAP)	2092	if (mflags & P_OUT_OF_MAP)
2247	{
2248	max = maxfree[i];	2093	max = maxfree[i];
2249	}
2250	else	2094	else
2251	{	2095	{
2252	blocked = GET_MAP_MOVE_BLOCK (mp, nx, ny);	2096	mapspace &ms = mp->at (nx, ny);
		2097
		2098	blocked = ms.move_block;
2253		2099
2254	if ((move_type & blocked) == move_type)	2100	if ((move_type & blocked) == move_type)
2255	{
2256	max = maxfree[i];	2101	max = maxfree[i];
2257	}
2258	else if (mflags & P_IS_ALIVE)	2102	else if (mflags & P_IS_ALIVE)
2259	{	2103	{
2260	for (tmp = GET_MAP_OB (mp, nx, ny); tmp != NULL; tmp = tmp->above)	2104	for (tmp = ms.bot; tmp; tmp = tmp->above)
2261	{	2105	if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)
2262	if ((QUERY_FLAG (tmp, FLAG_MONSTER) || tmp->type == PLAYER) && (tmp != exclude || (tmp->head && tmp->head != exclude)))	2106	&& (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2263	{
2264	break;	2107	break;
2265	}	2108
2266	}
2267	if (tmp)	2109	if (tmp)
2268	{
2269	return freedir[i];	2110	return freedir[i];
2270	}
2271	}	2111	}
2272	}	2112	}
2273	}	2113	}
		2114
2274	return 0;	2115	return 0;
2275	}	2116	}
2276		2117
2277	/*	2118	/*
2278	* distance(object 1, object 2) will return the square of the	2119	* distance(object 1, object 2) will return the square of the
2279	* distance between the two given objects.	2120	* distance between the two given objects.
2280	*/	2121	*/
2281
2282	int	2122	int
2283	distance (const object *ob1, const object *ob2)	2123	distance (const object *ob1, const object *ob2)
2284	{	2124	{
2285	int
2286	i;
2287
2288	i = (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);	2125	return (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);
2289	return i;
2290	}	2126	}
2291		2127
2292	/*	2128	/*
2293	* find_dir_2(delta-x,delta-y) will return a direction in which	2129	* find_dir_2(delta-x,delta-y) will return a direction in which
2294	* an object which has subtracted the x and y coordinates of another	2130	* an object which has subtracted the x and y coordinates of another
2295	* object, needs to travel toward it.	2131	* object, needs to travel toward it.
2296	*/	2132	*/
2297
2298	int	2133	int
2299	find_dir_2 (int x, int y)	2134	find_dir_2 (int x, int y)
2300	{	2135	{
2301	int	2136	int q;
2302	q;
2303		2137
2304	if (y)	2138	if (y)
2305	q = x * 100 / y;	2139	q = x * 100 / y;
2306	else if (x)	2140	else if (x)
2307	q = -300 * x;	2141	q = -300 * x;
…		…
2332		2166
2333	return 3;	2167	return 3;
2334	}	2168	}
2335		2169
2336	/*	2170	/*
2337	* absdir(int): Returns a number between 1 and 8, which represent
2338	* the "absolute" direction of a number (it actually takes care of
2339	* "overflow" in previous calculations of a direction).
2340	*/
2341
2342	int
2343	absdir (int d)
2344	{
2345	while (d < 1)
2346	d += 8;
2347	while (d > 8)
2348	d -= 8;
2349	return d;
2350	}
2351
2352	/*
2353	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is	2171	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is
2354	* between two directions (which are expected to be absolute (see absdir())	2172	* between two directions (which are expected to be absolute (see absdir())
2355	*/	2173	*/
2356
2357	int	2174	int
2358	dirdiff (int dir1, int dir2)	2175	dirdiff (int dir1, int dir2)
2359	{	2176	{
2360	int	2177	int d;
2361	d;
2362		2178
2363	d = abs (dir1 - dir2);	2179	d = abs (dir1 - dir2);
2364	if (d > 4)	2180	if (d > 4)
2365	d = 8 - d;	2181	d = 8 - d;
		2182
2366	return d;	2183	return d;
2367	}	2184	}
2368		2185
2369	/* peterm:	2186	/* peterm:
2370	* do LOS stuff for ball lightning. Go after the closest VISIBLE monster.	2187	* do LOS stuff for ball lightning. Go after the closest VISIBLE monster.
…		…
2373	* This basically means that if direction is 15, then it could either go	2190	* This basically means that if direction is 15, then it could either go
2374	* direction 4, 14, or 16 to get back to where we are.	2191	* direction 4, 14, or 16 to get back to where we are.
2375	* Moved from spell_util.c to object.c with the other related direction	2192	* Moved from spell_util.c to object.c with the other related direction
2376	* functions.	2193	* functions.
2377	*/	2194	*/
2378
2379	int
2380	reduction_dir[SIZEOFFREE][3] = {	2195	int reduction_dir[SIZEOFFREE][3] = {
2381	{0, 0, 0}, /* 0 */	2196	{0, 0, 0}, /* 0 */
2382	{0, 0, 0}, /* 1 */	2197	{0, 0, 0}, /* 1 */
2383	{0, 0, 0}, /* 2 */	2198	{0, 0, 0}, /* 2 */
2384	{0, 0, 0}, /* 3 */	2199	{0, 0, 0}, /* 3 */
2385	{0, 0, 0}, /* 4 */	2200	{0, 0, 0}, /* 4 */
…		…
2433	* find a path to that monster that we found. If not,	2248	* find a path to that monster that we found. If not,
2434	* we don't bother going toward it. Returns 1 if we	2249	* we don't bother going toward it. Returns 1 if we
2435	* can see a direct way to get it	2250	* can see a direct way to get it
2436	* Modified to be map tile aware -.MSW	2251	* Modified to be map tile aware -.MSW
2437	*/	2252	*/
2438
2439
2440	int	2253	int
2441	can_see_monsterP (maptile *m, int x, int y, int dir)	2254	can_see_monsterP (maptile *m, int x, int y, int dir)
2442	{	2255	{
2443	sint16 dx, dy;	2256	sint16 dx, dy;
2444	int
2445	mflags;	2257	int mflags;
2446		2258
2447	if (dir < 0)	2259	if (dir < 0)
2448	return 0; /* exit condition: invalid direction */	2260	return 0; /* exit condition: invalid direction */
2449		2261
2450	dx = x + freearr_x[dir];	2262	dx = x + freearr_x[dir];
…		…
2463	return 0;	2275	return 0;
2464		2276
2465	/* yes, can see. */	2277	/* yes, can see. */
2466	if (dir < 9)	2278	if (dir < 9)
2467	return 1;	2279	return 1;
		2280
2468	return can_see_monsterP (m, x, y, reduction_dir[dir][0]) |	2281	return can_see_monsterP (m, x, y, reduction_dir[dir][0])
2469	can_see_monsterP (m, x, y, reduction_dir[dir][1]) | can_see_monsterP (m, x, y, reduction_dir[dir][2]);	2282	| can_see_monsterP (m, x, y, reduction_dir[dir][1])
		2283	| can_see_monsterP (m, x, y, reduction_dir[dir][2]);
2470	}	2284	}
2471
2472
2473		2285
2474	/*	2286	/*
2475	* can_pick(picker, item): finds out if an object is possible to be	2287	* can_pick(picker, item): finds out if an object is possible to be
2476	* picked up by the picker. Returnes 1 if it can be	2288	* picked up by the picker. Returnes 1 if it can be
2477	* picked up, otherwise 0.	2289	* picked up, otherwise 0.
…		…
2479	* Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause	2291	* Cf 0.91.3 - don't let WIZ's pick up anything - will likely cause
2480	* core dumps if they do.	2292	* core dumps if they do.
2481	*	2293	*
2482	* Add a check so we can't pick up invisible objects (0.93.8)	2294	* Add a check so we can't pick up invisible objects (0.93.8)
2483	*/	2295	*/
2484
2485	int	2296	int
2486	can_pick (const object *who, const object *item)	2297	can_pick (const object *who, const object *item)
2487	{	2298	{
2488	return /*QUERY_FLAG(who,FLAG_WIZ)|| */	2299	return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2489	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&	2300	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
2490	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3));	2301	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3));
2491	}	2302	}
2492		2303
2493
2494	/*	2304	/*
2495	* create clone from object to another	2305	* create clone from object to another
2496	*/	2306	*/
2497	object *	2307	object *
2498	object_create_clone (object *asrc)	2308	object::deep_clone ()
2499	{	2309	{
2500	object *dst = 0, *tmp, *src, *part, *prev, *item;	2310	assert (("deep_clone called on non-head object", is_head ()));
2501		2311
2502	if (!asrc)	2312	object *dst = clone ();
2503	return 0;
2504		2313
2505	src = asrc;	2314	object *prev = dst;
2506	if (src->head)
2507	src = src->head;
2508
2509	prev = 0;
2510	for (part = src; part; part = part->more)	2315	for (object *part = this->more; part; part = part->more)
2511	{	2316	{
2512	tmp = part->clone ();	2317	object *tmp = part->clone ();
2513	tmp->x -= src->x;
2514	tmp->y -= src->y;
2515
2516	if (!part->head)
2517	{
2518	dst = tmp;
2519	tmp->head = 0;
2520	}
2521	else
2522	{
2523	tmp->head = dst;	2318	tmp->head = dst;
2524	}
2525
2526	tmp->more = 0;
2527
2528	if (prev)
2529	prev->more = tmp;	2319	prev->more = tmp;
2530
2531	prev = tmp;	2320	prev = tmp;
2532	}	2321	}
2533		2322
2534	for (item = src->inv; item; item = item->below)	2323	for (object *item = inv; item; item = item->below)
2535	insert_ob_in_ob (object_create_clone (item), dst);	2324	insert_ob_in_ob (item->deep_clone (), dst);
2536		2325
2537	return dst;	2326	return dst;
2538	}
2539
2540	/* GROS - Creates an object using a string representing its content. */
2541	/* Basically, we save the content of the string to a temp file, then call */
2542	/* load_object on it. I admit it is a highly inefficient way to make things, */
2543	/* but it was simple to make and allows reusing the load_object function. */
2544	/* Remember not to use load_object_str in a time-critical situation. */
2545	/* Also remember that multiparts objects are not supported for now. */
2546
2547	object *
2548	load_object_str (const char *obstr)
2549	{
2550	object *op;
2551	char filename[MAX_BUF];
2552
2553	sprintf (filename, "%s/cfloadobstr2044", settings.tmpdir);
2554
2555	FILE *tempfile = fopen (filename, "w");
2556
2557	if (tempfile == NULL)
2558	{
2559	LOG (llevError, "Error - Unable to access load object temp file\n");
2560	return NULL;
2561	}
2562
2563	fprintf (tempfile, obstr);
2564	fclose (tempfile);
2565
2566	op = object::create ();
2567
2568	object_thawer thawer (filename);
2569
2570	if (thawer)
2571	load_object (thawer, op, 0);
2572
2573	LOG (llevDebug, " load str completed, object=%s\n", &op->name);
2574	CLEAR_FLAG (op, FLAG_REMOVED);
2575
2576	return op;
2577	}	2327	}
2578		2328
2579	/* This returns the first object in who's inventory that	2329	/* This returns the first object in who's inventory that
2580	* has the same type and subtype match.	2330	* has the same type and subtype match.
2581	* returns NULL if no match.	2331	* returns NULL if no match.
2582	*/	2332	*/
2583	object *	2333	object *
2584	find_obj_by_type_subtype (const object *who, int type, int subtype)	2334	find_obj_by_type_subtype (const object *who, int type, int subtype)
2585	{	2335	{
2586	object *tmp;
2587
2588	for (tmp = who->inv; tmp; tmp = tmp->below)	2336	for (object *tmp = who->inv; tmp; tmp = tmp->below)
2589	if (tmp->type == type && tmp->subtype == subtype)	2337	if (tmp->type == type && tmp->subtype == subtype)
2590	return tmp;	2338	return tmp;
2591		2339
2592	return NULL;
2593	}
2594
2595	/* If ob has a field named key, return the link from the list,
2596	* otherwise return NULL.
2597	*
2598	* key must be a passed in shared string - otherwise, this won't
2599	* do the desired thing.
2600	*/
2601	key_value *
2602	get_ob_key_link (const object *ob, const char *key)
2603	{
2604	key_value *link;
2605
2606	for (link = ob->key_values; link != NULL; link = link->next)
2607	if (link->key == key)
2608	return link;
2609
2610	return NULL;
2611	}
2612
2613	/*
2614	* Returns the value of op has an extra_field for key, or NULL.
2615	*
2616	* The argument doesn't need to be a shared string.
2617	*
2618	* The returned string is shared.
2619	*/
2620	const char *
2621	get_ob_key_value (const object *op, const char *const key)
2622	{
2623	key_value *link;
2624	shstr_cmp canonical_key (key);
2625
2626	if (!canonical_key)
2627	{
2628	/* 1. There being a field named key on any object
2629	* implies there'd be a shared string to find.
2630	* 2. Since there isn't, no object has this field.
2631	* 3. Therefore, *this* object doesn't have this field.
2632	*/
2633	return 0;
2634	}
2635
2636	/* This is copied from get_ob_key_link() above -
2637	* only 4 lines, and saves the function call overhead.
2638	*/
2639	for (link = op->key_values; link; link = link->next)
2640	if (link->key == canonical_key)
2641	return link->value;
2642
2643	return 0;	2340	return 0;
2644	}	2341	}
2645		2342
2646		2343	const shstr &
2647	/*	2344	object::kv_get (const shstr &key) const
2648	* Updates the canonical_key in op to value.
2649	*
2650	* canonical_key is a shared string (value doesn't have to be).
2651	*
2652	* Unless add_key is TRUE, it won't add fields, only change the value of existing
2653	* keys.
2654	*
2655	* Returns TRUE on success.
2656	*/
2657	int
2658	set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key)
2659	{	2345	{
2660	key_value *	2346	for (key_value *kv = key_values; kv; kv = kv->next)
2661	field = NULL, *last = NULL;	2347	if (kv->key == key)
		2348	return kv->value;
2662		2349
2663	for (field = op->key_values; field != NULL; field = field->next)	2350	return shstr_null;
2664	{	2351	}
2665	if (field->key != canonical_key)	2352
		2353	void
		2354	object::kv_set (const shstr &key, const shstr &value)
		2355	{
		2356	for (key_value *kv = key_values; kv; kv = kv->next)
		2357	if (kv->key == key)
2666	{	2358	{
2667	last = field;	2359	kv->value = value;
2668	continue;	2360	return;
2669	}	2361	}
2670		2362
2671	if (value)	2363	key_value *kv = new key_value;
2672	field->value = value;	2364
2673	else	2365	kv->next = key_values;
		2366	kv->key = key;
		2367	kv->value = value;
		2368
		2369	key_values = kv;
		2370	}
		2371
		2372	void
		2373	object::kv_del (const shstr &key)
		2374	{
		2375	for (key_value **kvp = &key_values; *kvp; kvp = &(*kvp)->next)
		2376	if ((*kvp)->key == key)
2674	{	2377	{
2675	/* Basically, if the archetype has this key set,	2378	key_value *kv = *kvp;
2676	* we need to store the null value so when we save	2379	*kvp = (*kvp)->next;
2677	* it, we save the empty value so that when we load,	2380	delete kv;
2678	* we get this value back again.	2381	return;
2679	*/
2680	if (get_ob_key_link (&op->arch->clone, canonical_key))
2681	field->value = 0;
2682	else
2683	{
2684	if (last)
2685	last->next = field->next;
2686	else
2687	op->key_values = field->next;
2688
2689	delete field;
2690	}
2691	}	2382	}
2692	return TRUE;
2693	}
2694	/* IF we get here, key doesn't exist */
2695
2696	/* No field, we'll have to add it. */
2697
2698	if (!add_key)
2699	{
2700	return FALSE;
2701	}
2702	/* There isn't any good reason to store a null
2703	* value in the key/value list. If the archetype has
2704	* this key, then we should also have it, so shouldn't
2705	* be here. If user wants to store empty strings,
2706	* should pass in ""
2707	*/
2708	if (value == NULL)
2709	return TRUE;
2710
2711	field = new key_value;
2712
2713	field->key = canonical_key;
2714	field->value = value;
2715	/* Usual prepend-addition. */
2716	field->next = op->key_values;
2717	op->key_values = field;
2718
2719	return TRUE;
2720	}
2721
2722	/*
2723	* Updates the key in op to value.
2724	*
2725	* If add_key is FALSE, this will only update existing keys,
2726	* and not add new ones.
2727	* In general, should be little reason FALSE is ever passed in for add_key
2728	*
2729	* Returns TRUE on success.
2730	*/
2731	int
2732	set_ob_key_value (object *op, const char *key, const char *value, int add_key)
2733	{
2734	shstr key_ (key);
2735
2736	return set_ob_key_value_s (op, key_, value, add_key);
2737	}	2383	}
2738		2384
2739	object::depth_iterator::depth_iterator (object *container)	2385	object::depth_iterator::depth_iterator (object *container)
2740	: iterator_base (container)	2386	: iterator_base (container)
2741	{	2387	{
…		…
2755	}	2401	}
2756	else	2402	else
2757	item = item->env;	2403	item = item->env;
2758	}	2404	}
2759		2405
		2406	const char *
		2407	object::flag_desc (char *desc, int len) const
		2408	{
		2409	char *p = desc;
		2410	bool first = true;
		2411
		2412	*p = 0;
		2413
		2414	for (int i = 0; i < NUM_FLAGS; i++)
		2415	{
		2416	if (len <= 10) // magic constant!
		2417	{
		2418	snprintf (p, len, ",...");
		2419	break;
		2420	}
		2421
		2422	if (flag [i])
		2423	{
		2424	int cnt = snprintf (p, len, "%s%d", first ? "" : ",", i);
		2425	len -= cnt;
		2426	p += cnt;
		2427	first = false;
		2428	}
		2429	}
		2430
		2431	return desc;
		2432	}
		2433
2760	// return a suitable string describing an objetc in enough detail to find it	2434	// return a suitable string describing an object in enough detail to find it
2761	const char *	2435	const char *
2762	object::debug_desc (char *info) const	2436	object::debug_desc (char *info) const
2763	{	2437	{
		2438	char flagdesc[512];
2764	char info2[256 * 3];	2439	char info2[256 * 4];
2765	char *p = info;	2440	char *p = info;
2766		2441
2767	p += snprintf (p, 256, "%d=\"%s%s%s\"",	2442	p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s%s,flags:[%s],type:%d}",
2768	count,	2443	count,
		2444	uuid.c_str (),
2769	&name,	2445	&name,
2770	title ? " " : "",	2446	title ? ",title:\"" : "",
2771	title ? (const char *)title : "");	2447	title ? (const char *)title : "",
		2448	title ? "\"" : "",
		2449	flag_desc (flagdesc, 512), type);
2772		2450
2773	if (env)	2451	if (!flag[FLAG_REMOVED] && env)
2774	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2452	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2775		2453
2776	if (map)	2454	if (map)
2777	p += snprintf (p, 256, "(on %s@%d+%d)", map->path, x, y);	2455	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2778		2456
2779	return info;	2457	return info;
2780	}	2458	}
2781		2459
2782	const char *	2460	const char *
2783	object::debug_desc () const	2461	object::debug_desc () const
2784	{	2462	{
2785	static char info[256 * 3];	2463	static char info[3][256 * 4];
		2464	static int info_idx;
		2465
2786	return debug_desc (info);	2466	return debug_desc (info [++info_idx % 3]);
2787	}	2467	}
2788		2468
		2469	struct region *
		2470	object::region () const
		2471	{
		2472	return map ? map->region (x, y)
		2473	: region::default_region ();
		2474	}
		2475
		2476	const materialtype_t *
		2477	object::dominant_material () const
		2478	{
		2479	if (materialtype_t *mt = name_to_material (materialname))
		2480	return mt;
		2481
		2482	return name_to_material (shstr_unknown);
		2483	}
		2484
		2485	void
		2486	object::open_container (object *new_container)
		2487	{
		2488	if (container == new_container)
		2489	return;
		2490
		2491	object *old_container = container;
		2492
		2493	if (old_container)
		2494	{
		2495	if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
		2496	return;
		2497
		2498	#if 0
		2499	// remove the "Close old_container" object.
		2500	if (object *closer = old_container->inv)
		2501	if (closer->type == CLOSE_CON)
		2502	closer->destroy ();
		2503	#endif
		2504
		2505	// make sure the container is available
		2506	esrv_send_item (this, old_container);
		2507
		2508	old_container->flag [FLAG_APPLIED] = false;
		2509	container = 0;
		2510
		2511	// client needs item update to make it work, client bug requires this to be separate
		2512	esrv_update_item (UPD_FLAGS, this, old_container);
		2513
		2514	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));
		2515	play_sound (sound_find ("chest_close"));
		2516	}
		2517
		2518	if (new_container)
		2519	{
		2520	if (INVOKE_OBJECT (OPEN, new_container, ARG_OBJECT (this)))
		2521	return;
		2522
		2523	// TODO: this does not seem to serve any purpose anymore?
		2524	#if 0
		2525	// insert the "Close Container" object.
		2526	if (archetype *closer = new_container->other_arch)
		2527	{
		2528	object *closer = arch_to_object (new_container->other_arch);
		2529	closer->flag [FLAG_NO_MAP_SAVE] = 1;
		2530	new_container->insert (closer);
		2531	}
		2532	#endif
		2533
		2534	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));
		2535
		2536	// make sure the container is available, client bug requires this to be separate
		2537	esrv_send_item (this, new_container);
		2538
		2539	new_container->flag [FLAG_APPLIED] = true;
		2540	container = new_container;
		2541
		2542	// client needs flag change
		2543	esrv_update_item (UPD_FLAGS, this, new_container);
		2544	esrv_send_inventory (this, new_container);
		2545	play_sound (sound_find ("chest_open"));
		2546	}
		2547	// else if (!old_container->env && contr && contr->ns)
		2548	// contr->ns->floorbox_reset ();
		2549	}
		2550
		2551	object *
		2552	object::force_find (const shstr name)
		2553	{
		2554	/* cycle through his inventory to look for the MARK we want to
		2555	* place
		2556	*/
		2557	for (object *tmp = inv; tmp; tmp = tmp->below)
		2558	if (tmp->type == FORCE && tmp->slaying == name)
		2559	return splay (tmp);
		2560
		2561	return 0;
		2562	}
		2563
		2564	void
		2565	object::force_add (const shstr name, int duration)
		2566	{
		2567	if (object *force = force_find (name))
		2568	force->destroy ();
		2569
		2570	object *force = get_archetype (FORCE_NAME);
		2571
		2572	force->slaying = name;
		2573	force->stats.food = 1;
		2574	force->speed_left = -1.f;
		2575
		2576	force->set_speed (duration ? 1.f / duration : 0.f);
		2577	force->flag [FLAG_IS_USED_UP] = true;
		2578	force->flag [FLAG_APPLIED] = true;
		2579
		2580	insert (force);
		2581	}
		2582
		2583	void
		2584	object::play_sound (faceidx sound)
		2585	{
		2586	if (!sound)
		2587	return;
		2588
		2589	if (flag [FLAG_REMOVED])
		2590	return;
		2591
		2592	if (env)
		2593	{
		2594	if (object *pl = in_player ())
		2595	pl->contr->play_sound (sound);
		2596	}
		2597	else
		2598	map->play_sound (sound, x, y);
		2599	}
		2600

Diff Legend

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