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

Diff Legend

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