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.204 by root, Fri Apr 11 17:01:52 2008 UTC vs.
Revision 1.341 by root, Fri Feb 25 07:23:38 2011 UTC

1	/*	1	/*
2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.	2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.
3	*	3	*
4	* Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra team	4	* Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5	* Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team	5	* Copyright (©) 2001 Mark Wedel & Crossfire Development Team
6	* Copyright (©) 1992,2007 Frank Tore Johansen	6	* Copyright (©) 1992 Frank Tore Johansen
7	*	7	*
8	* Deliantra is free software: you can redistribute it and/or modify	8	* Deliantra is free software: you can redistribute it and/or modify it under
9	* it under the terms of the GNU General Public License as published by	9	* the terms of the Affero GNU General Public License as published by the
10	* the Free Software Foundation, either version 3 of the License, or	10	* Free Software Foundation, either version 3 of the License, or (at your
11	* (at your option) any later version.	11	* option) any later version.
12	*	12	*
13	* This program is distributed in the hope that it will be useful,	13	* This program is distributed in the hope that it will be useful,
14	* but WITHOUT ANY WARRANTY; without even the implied warranty of	14	* but WITHOUT ANY WARRANTY; without even the implied warranty of
15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16	* GNU General Public License for more details.	16	* GNU General Public License for more details.
17	*	17	*
18	* You should have received a copy of the GNU General Public License	18	* You should have received a copy of the Affero GNU General Public License
19	* along with this program. If not, see <http://www.gnu.org/licenses/>.	19	* and the GNU General Public License along with this program. If not, see
		20	* <http://www.gnu.org/licenses/>.
20	*	21	*
21	* The authors can be reached via e-mail to <support@deliantra.net>	22	* The authors can be reached via e-mail to <support@deliantra.net>
22	*/	23	*/
23		24
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>	25	#include <global.h>
28	#include <stdio.h>	26	#include <stdio.h>
29	#include <sys/types.h>	27	#include <sys/types.h>
30	#include <sys/uio.h>	28	#include <sys/uio.h>
31	#include <object.h>	29	#include <object.h>
32	#include <funcpoint.h>
33	#include <sproto.h>	30	#include <sproto.h>
34	#include <loader.h>
35		31
36	#include <bitset>	32	#include <bitset>
37		33
38	UUID UUID::cur;	34	UUID UUID::cur;
39	static uint64_t seq_next_save;	35	static uint64_t seq_next_save;
40	static const uint64 UUID_GAP = 1<<19;	36	static const uint64 UUID_GAP = 1<<19;
		37	uint32_t mapspace::smellcount = 10000;
41		38
42	objectvec objects;	39	objectvec objects;
43	activevec actives;	40	activevec actives;
		41
		42	freelist_item *object::freelist;
		43	uint32_t object::object_count;
		44	uint32_t object::free_count;
		45	uint32_t object::create_count;
		46	uint32_t object::destroy_count;
		47
		48	//+GPL
44		49
45	short freearr_x[SIZEOFFREE] = {	50	short freearr_x[SIZEOFFREE] = {
46	0,	51	0,
47	0, 1, 1, 1, 0, -1, -1, -1,	52	0, 1, 1, 1, 0, -1, -1, -1,
48	0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,	53	0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,
…		…
52	0,	57	0,
53	-1, -1, 0, 1, 1, 1, 0, -1,	58	-1, -1, 0, 1, 1, 1, 0, -1,
54	-2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2,	59	-2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2,
55	-3, -3, -3, -3, -2, -1, 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3	60	-3, -3, -3, -3, -2, -1, 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3
56	};	61	};
57	int maxfree[SIZEOFFREE] = {
58	0,
59	9, 10, 13, 14, 17, 18, 21, 22,
60	25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45, 48,
61	49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49
62	};
63	int freedir[SIZEOFFREE] = {	62	int freedir[SIZEOFFREE] = {
64	0,	63	0,
65	1, 2, 3, 4, 5, 6, 7, 8,	64	1, 2, 3, 4, 5, 6, 7, 8,
66	1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8,	65	1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8,
67	1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8	66	1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8
68	};	67	};
69		68
		69	static int maxfree[SIZEOFFREE] = {
		70	0,
		71	9, 10, 13, 14, 17, 18, 21, 22,
		72	25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45, 48,
		73	49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49
		74	};
		75
		76	const char *wall_suffix[16] = {
		77	"0",
		78	"1_3",
		79	"1_4",
		80	"2_1_2",
		81	"1_2",
		82	"2_2_4",
		83	"2_2_1",
		84	"3_1",
		85	"1_1",
		86	"2_2_3",
		87	"2_2_2",
		88	"3_3",
		89	"2_1_1",
		90	"3_4",
		91	"3_2",
		92	"4"
		93	};
		94
70	static void	95	static void
71	write_uuid (uval64 skip, bool sync)	96	write_uuid (uval64 skip, bool sync)
72	{	97	{
73	CALL_BEGIN (2);	98	CALL_BEGIN (2);
74	CALL_ARG_SV (newSVval64 (skip));	99	CALL_ARG_SV (newSVval64 (skip));
…		…
76	CALL_CALL ("cf::write_uuid", G_DISCARD);	101	CALL_CALL ("cf::write_uuid", G_DISCARD);
77	CALL_END;	102	CALL_END;
78	}	103	}
79		104
80	static void	105	static void
81	read_uuid (void)	106	read_uuid ()
82	{	107	{
83	char filename[MAX_BUF];	108	char filename[MAX_BUF];
84		109
85	sprintf (filename, "%s/uuid", settings.localdir);	110	sprintf (filename, "%s/uuid", settings.localdir);
86		111
…		…
100		125
101	LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);	126	LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);
102	_exit (1);	127	_exit (1);
103	}	128	}
104		129
105	UUID::BUF buf;	130	char buf [UUID::MAX_LEN];
106	buf[0] = 0;	131	buf[0] = 0;
107	fgets (buf, sizeof (buf), fp);	132	fgets (buf, sizeof (buf), fp);
108		133
109	if (!UUID::cur.parse (buf))	134	if (!UUID::cur.parse (buf))
110	{	135	{
…		…
139	UUID::init ()	164	UUID::init ()
140	{	165	{
141	read_uuid ();	166	read_uuid ();
142	}	167	}
143		168
		169	bool
		170	UUID::parse (const char *s)
		171	{
		172	if (*s++ != '<' || *s++ != '1' || *s++ != '.')
		173	return false;
		174
		175	seq = 0;
		176
		177	while (*s != '>')
		178	{
		179	if (*s < '0')
		180	return false;
		181
		182	// this gives nice branchless code with gcc
		183	assert ('0' < 'a' && '0' == 48 && 'a' == 97);
		184	int digit = (*s + (*s & 0x40 ? 9 : 0)) & 15;
		185
		186	seq = (seq << 4) | digit;
		187
		188	++s;
		189	}
		190
		191	return true;
		192	}
		193
		194	char *
		195	UUID::append (char *buf) const
		196	{
		197	*buf++ = '<';
		198	*buf++ = '1';
		199	*buf++ = '.';
		200
		201	uint64_t seq = this->seq;
		202	const int bits = 64;
		203	char nz = 0;
		204	static const char tohex [] = "0123456789abcdef";
		205
		206	// assert (len >= 3 + bits / 4 + 1 + 1);
		207	for (int i = bits / 4; --i; )
		208	{
		209	uint8_t digit = seq >> (bits - 4);
		210
		211	*buf = tohex [digit];
		212	nz |= digit;
		213	buf += nz ? 1 : 0;
		214	seq <<= 4;
		215	}
		216
		217	// last digit is special - always emit
		218	uint8_t digit = seq >> (bits - 4);
		219	*buf++ = tohex [digit];
		220
		221	*buf++ = '>';
		222
		223	return buf;
		224	}
		225
		226	char *
		227	UUID::c_str () const
		228	{
		229	static char buf [MAX_LEN];
		230	*append (buf) = 0;
		231	return buf;
		232	}
		233
144	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */	234	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */
145	static int	235	static bool
146	compare_ob_value_lists_one (const object *wants, const object *has)	236	compare_ob_value_lists_one (const object *wants, const object *has)
147	{	237	{
148	key_value *wants_field;
149
150	/* n-squared behaviour (see get_ob_key_link()), but I'm hoping both	238	/* n-squared behaviour (see kv_get), but I'm hoping both
151	* objects with lists are rare, and lists stay short. If not, use a	239	* objects with lists are rare, and lists stay short. If not, use a
152	* different structure or at least keep the lists sorted...	240	* different structure or at least keep the lists sorted...
153	*/	241	*/
154		242
155	/* For each field in wants, */	243	/* For each field in wants, */
156	for (wants_field = wants->key_values; wants_field; wants_field = wants_field->next)	244	for (key_value *kv = wants->key_values; kv; kv = kv->next)
157	{	245	if (has->kv_get (kv->key) != kv->value)
158	key_value *has_field;	246	return false;
159
160	/* Look for a field in has with the same key. */
161	has_field = get_ob_key_link (has, wants_field->key);
162
163	if (has_field == NULL)
164	{
165	/* No field with that name. */
166	return FALSE;
167	}
168
169	/* Found the matching field. */
170	if (has_field->value != wants_field->value)
171	{
172	/* Values don't match, so this half of the comparison is false. */
173	return FALSE;
174	}
175
176	/* If we get here, we found a match. Now for the next field in wants. */
177	}
178		247
179	/* If we get here, every field in wants has a matching field in has. */	248	/* If we get here, every field in wants has a matching field in has. */
180	return TRUE;	249	return true;
181	}	250	}
182		251
183	/* Returns TRUE if ob1 has the same key_values as ob2. */	252	/* Returns TRUE if ob1 has the same key_values as ob2. */
184	static int	253	static bool
185	compare_ob_value_lists (const object *ob1, const object *ob2)	254	compare_ob_value_lists (const object *ob1, const object *ob2)
186	{	255	{
187	/* However, there may be fields in has which aren't partnered in wants,	256	/* However, there may be fields in has which aren't partnered in wants,
188	* so we need to run the comparison *twice*. :(	257	* so we need to run the comparison *twice*. :(
189	*/	258	*/
190	return compare_ob_value_lists_one (ob1, ob2) && compare_ob_value_lists_one (ob2, ob1);	259	return compare_ob_value_lists_one (ob1, ob2)
		260	&& compare_ob_value_lists_one (ob2, ob1);
191	}	261	}
192		262
193	/* Function examines the 2 objects given to it, and returns true if	263	/* Function examines the 2 objects given to it, and returns true if
194	* they can be merged together.	264	* they can be merged together.
195	*	265	*
…		…
202	* Improvements made with merge: Better checking on potion, and also	272	* Improvements made with merge: Better checking on potion, and also
203	* check weight	273	* check weight
204	*/	274	*/
205	bool object::can_merge_slow (object *ob1, object *ob2)	275	bool object::can_merge_slow (object *ob1, object *ob2)
206	{	276	{
207	/* A couple quicksanity checks */	277	/* A couple quick sanity checks */
208	if (ob1 == ob2	278	if (ob1 == ob2
209	|| ob1->type != ob2->type	279	|| ob1->type != ob2->type
210	|| ob1->speed != ob2->speed
211	|| ob1->value != ob2->value	280	|| ob1->value != ob2->value
212	|| ob1->name != ob2->name)	281	|| ob1->name != ob2->name
		282	|| fabs (ob1->speed - ob2->speed) >= MIN_ACTIVE_SPEED)
213	return 0;	283	return 0;
214		284
215	//TODO: this ain't working well, use nicer and correct overflow check
216	/* Do not merge objects if nrof would overflow. We use 1UL<<31 since that	285	/* Do not merge objects if nrof would overflow, assume nrof
217	* value could not be stored in a sint32 (which unfortunately sometimes is	286	* is always 0 .. 2**31-1 */
218	* used to store nrof).	287	if (ob1->nrof > 0x7fffffff - ob2->nrof)
219	*/
220	if (ob1->nrof + ob2->nrof >= 1UL << 31)
221	return 0;	288	return 0;
222		289
223	/* If the objects have been identified, set the BEEN_APPLIED flag.	290	/* If the objects have been identified, set the BEEN_APPLIED flag.
224	* This is to the comparison of the flags below will be OK. We	291	* This is to the comparison of the flags below will be OK. We
225	* just can't ignore the been applied or identified flags, as they	292	* just can't ignore the been applied or identified flags, as they
226	* are not equal - just if it has been identified, the been_applied	293	* are not equal - just if it has been identified, the been_applied
227	* flags lose any meaning.	294	* flags lose any meaning.
228	*/	295	*/
229	if (QUERY_FLAG (ob1, FLAG_IDENTIFIED))	296	if (ob1->flag [FLAG_IDENTIFIED])
230	SET_FLAG (ob1, FLAG_BEEN_APPLIED);	297	ob1->set_flag (FLAG_BEEN_APPLIED);
231		298
232	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))	299	if (ob2->flag [FLAG_IDENTIFIED])
233	SET_FLAG (ob2, FLAG_BEEN_APPLIED);	300	ob2->set_flag (FLAG_BEEN_APPLIED);
234		301
235	if ((ob1->flag ^ ob2->flag).reset (FLAG_INV_LOCKED).reset (FLAG_CLIENT_SENT).any ()	302	if (ob1->arch->archname != ob2->arch->archname
236	|| ob1->arch != ob2->arch
237	|| ob1->name != ob2->name	303	|| ob1->name != ob2->name
238	|| ob1->title != ob2->title	304	|| ob1->title != ob2->title
239	|| ob1->msg != ob2->msg	305	|| ob1->msg != ob2->msg
240	|| ob1->weight != ob2->weight	306	|| ob1->weight != ob2->weight
241	|| memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
242	|| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats) )
243	|| ob1->attacktype != ob2->attacktype	307	|| ob1->attacktype != ob2->attacktype
244	|| ob1->magic != ob2->magic	308	|| ob1->magic != ob2->magic
245	|| ob1->slaying != ob2->slaying	309	|| ob1->slaying != ob2->slaying
246	|| ob1->skill != ob2->skill	310	|| ob1->skill != ob2->skill
247	|| ob1->value != ob2->value	311	|| ob1->value != ob2->value
248	|| ob1->animation_id != ob2->animation_id	312	|| ob1->animation_id != ob2->animation_id
		313	|| (ob1->face != ob2->face && !ob1->animation_id) // face and animation are dependend on each other
249	|| ob1->client_type != ob2->client_type	314	|| ob1->client_type != ob2->client_type
250	|| ob1->materialname != ob2->materialname	315	|| ob1->material != ob2->material
251	|| ob1->lore != ob2->lore	316	|| ob1->lore != ob2->lore
252	|| ob1->subtype != ob2->subtype	317	|| ob1->subtype != ob2->subtype
253	|| ob1->move_type != ob2->move_type	318	|| ob1->move_type != ob2->move_type
254	|| ob1->move_block != ob2->move_block	319	|| ob1->move_block != ob2->move_block
255	|| ob1->move_allow != ob2->move_allow	320	|| ob1->move_allow != ob2->move_allow
256	|| ob1->move_on != ob2->move_on	321	|| ob1->move_on != ob2->move_on
257	|| ob1->move_off != ob2->move_off	322	|| ob1->move_off != ob2->move_off
258	|| ob1->move_slow != ob2->move_slow	323	|| ob1->move_slow != ob2->move_slow
259	|| ob1->move_slow_penalty != ob2->move_slow_penalty)	324	|| fabs (ob1->move_slow_penalty - ob2->move_slow_penalty) >= (1.f / 1024.f)
		325	|| memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
		326	|| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats)))
260	return 0;	327	return 0;
261		328
		329	if ((ob1->flag ^ ob2->flag)
		330	.reset (FLAG_INV_LOCKED)
		331	.reset (FLAG_REMOVED)
		332	.any ())
		333	return 0;
		334
262	/* This is really a spellbook check - really, we should	335	/* This is really a spellbook check - we should in general
263	* check all objects in the inventory.	336	* not merge objects with real inventories, as splitting them
		337	* is hard.
264	*/	338	*/
265	if (ob1->inv || ob2->inv)	339	if (ob1->inv || ob2->inv)
266	{	340	{
267	if (!(ob1->inv && ob2->inv))	341	if (!(ob1->inv && ob2->inv))
268	return 0; /* inventories differ in length */	342	return 0; /* inventories differ in length */
269		343
270	if (ob1->inv->below || ob2->inv->below)	344	if (ob1->inv->below || ob2->inv->below)
271	return 0; /* more than one object in inv */	345	return 0; /* more than one object in inv */
272		346
273	if (!object::can_merge (ob1->inv, ob2->inv))	347	if (!object::can_merge (ob1->inv, ob2->inv))
274	return 0; /* inventory objexts differ */	348	return 0; /* inventory objects differ */
275		349
276	/* inventory ok - still need to check rest of this object to see	350	/* inventory ok - still need to check rest of this object to see
277	* if it is valid.	351	* if it is valid.
278	*/	352	*/
279	}	353	}
280		354
281	/* Don't merge objects that are applied. With the new 'body' code,	355	/* Don't merge objects that are applied. With the new 'body' code,
282	* it is possible for most any character to have more than one of	356	* it is possible for most any character to have more than one of
283	* some items equipped, and we don't want those to merge.	357	* some items equipped, and we don't want those to merge.
284	*/	358	*/
285	if (QUERY_FLAG (ob1, FLAG_APPLIED) || QUERY_FLAG (ob2, FLAG_APPLIED))	359	if (ob1->flag [FLAG_APPLIED] || ob2->flag [FLAG_APPLIED])
286	return 0;	360	return 0;
287		361
288	/* Note sure why the following is the case - either the object has to	362	/* Note sure why the following is the case - either the object has to
289	* be animated or have a very low speed. Is this an attempted monster	363	* be animated or have a very low speed. Is this an attempted monster
290	* check?	364	* check?
291	*/	365	*/
292	if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && ob1->has_active_speed ())	366	if (!ob1->flag [FLAG_ANIMATE] && ob1->has_active_speed ())
293	return 0;	367	return 0;
294		368
295	switch (ob1->type)	369	switch (ob1->type)
296	{	370	{
297	case SCROLL:	371	case SCROLL:
298	if (ob1->level != ob2->level)	372	if (ob1->level != ob2->level)
299	return 0;	373	return 0;
300	break;	374	break;
301	}	375	}
302		376
303	if (ob1->key_values != NULL || ob2->key_values != NULL)	377	if (ob1->key_values || ob2->key_values)
304	{	378	{
305	/* At least one of these has key_values. */	379	/* At least one of these has key_values. */
306	if ((ob1->key_values == NULL) != (ob2->key_values == NULL))	380	if ((!ob1->key_values) != (!ob2->key_values))
307	/* One has fields, but the other one doesn't. */	381	return 0; /* One has fields, but the other one doesn't. */
308	return 0;	382
309	else if (!compare_ob_value_lists (ob1, ob2))	383	if (!compare_ob_value_lists (ob1, ob2))
310	return 0;	384	return 0;
311	}	385	}
312		386
313	if (ob1->self || ob2->self)	387	if (ob1->self || ob2->self)
314	{	388	{
…		…
320	int k1 = ob1->self ? HvTOTALKEYS (ob1->self) : 0;	394	int k1 = ob1->self ? HvTOTALKEYS (ob1->self) : 0;
321	int k2 = ob2->self ? HvTOTALKEYS (ob2->self) : 0;	395	int k2 = ob2->self ? HvTOTALKEYS (ob2->self) : 0;
322		396
323	if (k1 != k2)	397	if (k1 != k2)
324	return 0;	398	return 0;
		399
325	else if (k1 == 0)	400	if (k1 == 0)
326	return 1;	401	return 1;
		402
327	else if (!cfperl_can_merge (ob1, ob2))	403	if (!cfperl_can_merge (ob1, ob2))
328	return 0;	404	return 0;
329	}	405	}
330	}	406	}
331		407
332	/* Everything passes, must be OK. */	408	/* Everything passes, must be OK. */
333	return 1;	409	return 1;
334	}	410	}
335		411
		412	// find player who can see this object
		413	object *
		414	object::visible_to () const
		415	{
		416	if (client_visible () && !flag [FLAG_REMOVED])
		417	{
		418	// see if we are in a container of sorts
		419	if (env)
		420	{
		421	// the player inventory itself is always visible
		422	if (env->is_player ())
		423	return env;
		424
		425	// else a player could have our env open
		426	object *envest = env->outer_env_or_self ();
		427
		428	// the player itself is always on a map, so we will find him here
		429	// even if our inv is in a player.
		430	if (envest->is_on_map ())
		431	if (object *pl = envest->ms ().player ())
		432	if (pl->container_ () == env)
		433	return pl;
		434	}
		435	else
		436	{
		437	// maybe there is a player standing on the same mapspace
		438	// this will catch the case where "this" is a player
		439	if (object *pl = ms ().player ())
		440	if ((pl->contr->ns && !pl->container_ () && !pl->contr->ns->update_look)
		441	|| pl->container_ () == this)
		442	return pl;
		443	}
		444	}
		445
		446	return 0;
		447	}
		448
		449	// adjust weight per container type ("of holding")
		450	static uint32
		451	weight_adjust_for (object *op, uint32 weight)
		452	{
		453	return op->type == CONTAINER
		454	? weight - weight * op->stats.Str / 100
		455	: weight;
		456	}
		457
336	/*	458	/*
		459	* subtracts, then adds, the specified weight to an object,
		460	* and also updates how much the environment(s) is/are carrying.
		461	*/
		462	static void
		463	adjust_weight (object *op, sint32 sub, sint32 add)
		464	{
		465	while (op)
		466	{
		467	sint32 ocarrying = op->carrying;
		468
		469	op->carrying -= weight_adjust_for (op, sub);
		470	op->carrying += weight_adjust_for (op, add);
		471
		472	if (object *pl = op->visible_to ())
		473	if (pl != op) // player is handled lazily
		474	esrv_update_item (UPD_WEIGHT, pl, op);
		475
		476	sub = ocarrying;
		477	add = op->carrying;
		478
		479	op = op->env;
		480	}
		481	}
		482
		483	/*
337	* sum_weight() is a recursive function which calculates the weight	484	* this is a recursive function which calculates the weight
338	* an object is carrying. It goes through in figures out how much	485	* an object is carrying. It goes through op and figures out how much
339	* containers are carrying, and sums it up.	486	* containers are carrying, and sums it up.
340	*/	487	*/
341	long	488	void
342	sum_weight (object *op)	489	object::update_weight ()
343	{	490	{
344	long sum;	491	sint32 sum = 0;
345	object *inv;
346		492
347	for (sum = 0, inv = op->inv; inv; inv = inv->below)	493	for (object *op = inv; op; op = op->below)
348	{
349	if (inv->inv)
350	sum_weight (inv);
351
352	sum += inv->carrying + inv->weight * (inv->nrof ? inv->nrof : 1);
353	}	494	{
		495	op->update_weight ();
354		496
355	if (op->type == CONTAINER && op->stats.Str)	497	sum += weight_adjust_for (this, op->total_weight ());
356	sum = (sum * (100 - op->stats.Str)) / 100;	498	}
357		499
358	if (op->carrying != sum)	500	if (sum != carrying)
		501	{
		502	if (carrying != sum && carrying)//D
		503	LOG (llevDebug, "updating carrying got %ld, expected %ld (%s)\n",
		504	(long long)sum, (long long)carrying, debug_desc ());
		505
359	op->carrying = sum;	506	carrying = sum;
360		507
361	return sum;	508	if (object *pl = visible_to ())
		509	if (pl != this) // player is handled lazily
		510	esrv_update_item (UPD_WEIGHT, pl, this);
		511	}
362	}	512	}
363		513
364	/**	514	/*
365	* Return the outermost environment object for a given object.	515	* Used by: Server DM commands: dumpbelow, dump. Some error messages.
366	*/
367
368	object *
369	object_get_env_recursive (object *op)
370	{
371	while (op->env != NULL)
372	op = op->env;
373	return op;
374	}
375
376	/*
377	* Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
378	* Some error messages.
379	* The result of the dump is stored in the static global errmsg array.
380	*/	516	*/
381	char *	517	char *
382	dump_object (object *op)	518	dump_object (object *op)
383	{	519	{
384	if (!op)	520	if (!op)
…		…
387	object_freezer freezer;	523	object_freezer freezer;
388	op->write (freezer);	524	op->write (freezer);
389	return freezer.as_string ();	525	return freezer.as_string ();
390	}	526	}
391		527
392	/*	528	char *
393	* get_nearest_part(multi-object, object 2) returns the part of the	529	object::as_string ()
394	* multi-object 1 which is closest to the second object.
395	* If it's not a multi-object, it is returned.
396	*/
397	object *
398	get_nearest_part (object *op, const object *pl)
399	{	530	{
400	object *tmp, *closest;	531	return dump_object (this);
401	int last_dist, i;
402
403	if (op->more == NULL)
404	return op;
405	for (last_dist = distance (op, pl), closest = op, tmp = op->more; tmp != NULL; tmp = tmp->more)
406	if ((i = distance (tmp, pl)) < last_dist)
407	closest = tmp, last_dist = i;
408	return closest;
409	}	532	}
410		533
411	/*	534	/*
412	* Returns the object which has the count-variable equal to the argument.	535	* Returns the object which has the count-variable equal to the argument.
		536	* VERRRY slow.
413	*/	537	*/
414	object *	538	object *
415	find_object (tag_t i)	539	find_object (tag_t i)
416	{	540	{
417	for_all_objects (op)	541	for_all_objects (op)
…		…
420		544
421	return 0;	545	return 0;
422	}	546	}
423		547
424	/*	548	/*
		549	* Returns the object which has the uuid equal to the argument.
		550	* MOAR VERRRY slow.
		551	*/
		552
		553	object *
		554	find_object_uuid (UUID i)
		555	{
		556	for_all_objects (op)
		557	if (op->uuid == i)
		558	return op;
		559
		560	return 0;
		561	}
		562
		563	/*
425	* Returns the first object which has a name equal to the argument.	564	* Returns the first object which has a name equal to the argument.
426	* Used only by the patch command, but not all that useful.	565	* Used only by the patch command, but not all that useful.
427	* Enables features like "patch <name-of-other-player> food 999"	566	* Enables features like "patch <name-of-other-player> food 999"
428	*/	567	*/
429	object *	568	object *
430	find_object_name (const char *str)	569	find_object_name (const char *str)
431	{	570	{
432	shstr_cmp str_ (str);	571	shstr_cmp str_ (str);
433	object *op;
434		572
		573	if (str_)
435	for_all_objects (op)	574	for_all_objects (op)
436	if (op->name == str_)	575	if (op->name == str_)
437	break;	576	return op;
438		577
439	return op;	578	return 0;
440	}	579	}
441		580
442	/*	581	/*
443	* Sets the owner and sets the skill and exp pointers to owner's current	582	* Sets the owner and sets the skill and exp pointers to owner's current
444	* skill and experience objects.	583	* skill and experience objects.
…		…
459	}	598	}
460		599
461	this->owner = owner;	600	this->owner = owner;
462	}	601	}
463		602
464	int
465	object::slottype () const
466	{
467	if (type == SKILL)
468	{
469	if (IS_COMBAT_SKILL (subtype)) return slot_combat;
470	if (IS_RANGED_SKILL (subtype)) return slot_ranged;
471	}
472	else
473	{
474	if (slot [body_combat].info) return slot_combat;
475	if (slot [body_range ].info) return slot_ranged;
476	}
477
478	return slot_none;
479	}
480
481	bool
482	object::change_weapon (object *ob)
483	{
484	if (current_weapon == ob)
485	return true;
486
487	if (chosen_skill)
488	chosen_skill->flag [FLAG_APPLIED] = false;
489
490	current_weapon = ob;
491	chosen_skill = !ob || ob->type == SKILL ? ob : find_skill_by_name (this, ob->skill);
492
493	if (chosen_skill)
494	chosen_skill->flag [FLAG_APPLIED] = true;
495
496	update_stats ();
497
498	if (ob)
499	{
500	// now check wether any body locations became invalid, in which case
501	// we cannot apply the weapon at the moment.
502	for (int i = 0; i < NUM_BODY_LOCATIONS; ++i)
503	if (slot[i].used < 0)
504	{
505	current_weapon = chosen_skill = 0;
506	update_stats ();
507
508	new_draw_info_format (NDI_UNIQUE, 0, this,
509	"You try to balance all your items at once, "
510	"but the %s is just too much for your body. "
511	"[You need to unapply some items first.]", &ob->name);
512	return false;
513	}
514
515	//new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);
516	}
517	else
518	;//new_draw_info_format (NDI_UNIQUE, 0, this, "You unwield your weapons.");
519
520	if (ob && !ob->flag [FLAG_APPLIED] && ob->type != SPELL)
521	{
522	LOG (llevError | logBacktrace, "%s changed to unapplied weapon %s",
523	&name, ob->debug_desc ());
524	return false;
525	}
526
527	return true;
528	}
529
530	/* Zero the key_values on op, decrementing the shared-string	603	/* Zero the key_values on op, decrementing the shared-string
531	* refcounts and freeing the links.	604	* refcounts and freeing the links.
532	*/	605	*/
533	static void	606	static void
534	free_key_values (object *op)	607	free_key_values (object *op)
…		…
542	}	615	}
543		616
544	op->key_values = 0;	617	op->key_values = 0;
545	}	618	}
546		619
547	object &	620	/*
548	object::operator =(const object &src)	621	* copy_to first frees everything allocated by the dst object,
		622	* and then copies the contents of itself into the second
		623	* object, allocating what needs to be allocated. Basically, any
		624	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
		625	* if the first object is freed, the pointers in the new object
		626	* will point at garbage.
		627	*/
		628	void
		629	object::copy_to (object *dst)
549	{	630	{
550	bool is_freed = flag [FLAG_FREED];	631	dst->remove ();
551	bool is_removed = flag [FLAG_REMOVED];
552
553	*(object_copy *)this = src;	632	*(object_copy *)dst = *this;
554
555	flag [FLAG_FREED] = is_freed;
556	flag [FLAG_REMOVED] = is_removed;	633	dst->flag [FLAG_REMOVED] = true;
557		634
558	/* Copy over key_values, if any. */	635	/* Copy over key_values, if any. */
559	if (src.key_values)	636	if (key_values)
560	{	637	{
561	key_value *tail = 0;	638	key_value *tail = 0;
562	key_values = 0;	639	dst->key_values = 0;
563		640
564	for (key_value *i = src.key_values; i; i = i->next)	641	for (key_value *i = key_values; i; i = i->next)
565	{	642	{
566	key_value *new_link = new key_value;	643	key_value *new_link = new key_value;
567		644
568	new_link->next = 0;	645	new_link->next = 0;
569	new_link->key = i->key;	646	new_link->key = i->key;
570	new_link->value = i->value;	647	new_link->value = i->value;
571		648
572	/* Try and be clever here, too. */	649	/* Try and be clever here, too. */
573	if (!key_values)	650	if (!dst->key_values)
574	{	651	{
575	key_values = new_link;	652	dst->key_values = new_link;
576	tail = new_link;	653	tail = new_link;
577	}	654	}
578	else	655	else
579	{	656	{
580	tail->next = new_link;	657	tail->next = new_link;
581	tail = new_link;	658	tail = new_link;
582	}	659	}
583	}	660	}
584	}	661	}
585	}
586		662
587	/*	663	dst->activate ();
588	* copy_to first frees everything allocated by the dst object,
589	* and then copies the contents of itself into the second
590	* object, allocating what needs to be allocated. Basically, any
591	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
592	* if the first object is freed, the pointers in the new object
593	* will point at garbage.
594	*/
595	void
596	object::copy_to (object *dst)
597	{
598	*dst = *this;
599
600	if (speed < 0)
601	dst->speed_left -= rndm ();
602
603	dst->set_speed (dst->speed);
604	}	664	}
605		665
606	void	666	void
607	object::instantiate ()	667	object::instantiate ()
608	{	668	{
609	if (!uuid.seq) // HACK	669	if (!uuid.seq) // HACK
610	uuid = UUID::gen ();	670	uuid = UUID::gen ();
611		671
		672	// TODO: unclean state changes, should not be done in copy_to AND instantiate
		673	if (flag [FLAG_RANDOM_SPEED] && speed)
		674	speed_left = - speed - rndm (); // TODO animation
		675	else
612	speed_left = -0.1f;	676	speed_left = -1.;
		677
613	/* copy the body_info to the body_used - this is only really	678	/* copy the body_info to the body_used - this is only really
614	* need for monsters, but doesn't hurt to do it for everything.	679	* need for monsters, but doesn't hurt to do it for everything.
615	* by doing so, when a monster is created, it has good starting	680	* by doing so, when a monster is created, it has good starting
616	* values for the body_used info, so when items are created	681	* values for the body_used info, so when items are created
617	* for it, they can be properly equipped.	682	* for it, they can be properly equipped.
…		…
625	object *	690	object *
626	object::clone ()	691	object::clone ()
627	{	692	{
628	object *neu = create ();	693	object *neu = create ();
629	copy_to (neu);	694	copy_to (neu);
		695
		696	// TODO: unclean state changes, should not be done in clone AND instantiate
		697	if (neu->flag [FLAG_RANDOM_SPEED] && neu->speed)
		698	neu->speed_left = - neu->speed - rndm (); // TODO animation
		699
		700	neu->map = map; // not copied by copy_to
630	return neu;	701	return neu;
631	}	702	}
632		703
633	/*	704	/*
634	* If an object with the IS_TURNABLE() flag needs to be turned due	705	* If an object with the IS_TURNABLE() flag needs to be turned due
…		…
636	* be called to update the face variable, _and_ how it looks on the map.	707	* be called to update the face variable, _and_ how it looks on the map.
637	*/	708	*/
638	void	709	void
639	update_turn_face (object *op)	710	update_turn_face (object *op)
640	{	711	{
641	if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || !op->arch)	712	if (!op->flag [FLAG_IS_TURNABLE] || !op->arch)
642	return;	713	return;
643		714
644	SET_ANIMATION (op, op->direction);	715	SET_ANIMATION (op, op->direction);
645	update_object (op, UP_OBJ_FACE);	716	update_object (op, UP_OBJ_FACE);
646	}	717	}
…		…
651	* This function needs to be called whenever the speed of an object changes.	722	* This function needs to be called whenever the speed of an object changes.
652	*/	723	*/
653	void	724	void
654	object::set_speed (float speed)	725	object::set_speed (float speed)
655	{	726	{
656	if (flag [FLAG_FREED] && speed)
657	{
658	LOG (llevError, "Object %s is freed but has speed.\n", &name);
659	speed = 0;
660	}
661
662	this->speed = speed;	727	this->speed = speed;
663		728
664	if (has_active_speed ())	729	if (has_active_speed ())
665	activate ();	730	activate ();
666	else	731	else
…		…
685	* UP_OBJ_FACE: only the objects face has changed.	750	* UP_OBJ_FACE: only the objects face has changed.
686	*/	751	*/
687	void	752	void
688	update_object (object *op, int action)	753	update_object (object *op, int action)
689	{	754	{
690	if (op == NULL)	755	if (!op)
691	{	756	{
692	/* this should never happen */	757	/* this should never happen */
693	LOG (llevDebug, "update_object() called for NULL object.\n");	758	LOG (llevError | logBacktrace, "update_object() called for NULL object.\n");
694	return;	759	return;
695	}	760	}
696		761
697	if (op->env)	762	if (!op->is_on_map ())
698	{	763	{
699	/* Animation is currently handled by client, so nothing	764	/* Animation is currently handled by client, so nothing
700	* to do in this case.	765	* to do in this case.
701	*/	766	*/
702	return;	767	return;
703	}	768	}
704
705	/* If the map is saving, don't do anything as everything is
706	* going to get freed anyways.
707	*/
708	if (!op->map || op->map->in_memory == MAP_SAVING)
709	return;
710		769
711	/* make sure the object is within map boundaries */	770	/* make sure the object is within map boundaries */
712	if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height)	771	if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height)
713	{	772	{
714	LOG (llevError, "update_object() called for object out of map!\n");	773	LOG (llevError, "update_object() called for object out of map!\n");
…		…
722		781
723	if (!(m.flags_ & P_UPTODATE))	782	if (!(m.flags_ & P_UPTODATE))
724	/* nop */;	783	/* nop */;
725	else if (action == UP_OBJ_INSERT)	784	else if (action == UP_OBJ_INSERT)
726	{	785	{
		786	#if 0
727	// this is likely overkill, TODO: revisit (schmorp)	787	// this is likely overkill, TODO: revisit (schmorp)
728	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))	788	if ((op->flag [FLAG_BLOCKSVIEW] && !(m.flags_ & P_BLOCKSVIEW))
729	|| (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))	789	|| (op->flag [FLAG_NO_MAGIC] && !(m.flags_ & P_NO_MAGIC))
730	|| (op->type == PLAYER && !(m.flags_ & P_PLAYER))	790	|| (op->is_player () && !(m.flags_ & P_PLAYER))
731	|| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))	791	|| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
732	|| (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))	792	|| (op->flag [FLAG_ALIVE] && !(m.flags_ & P_IS_ALIVE))
733	|| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))	793	|| (op->flag [FLAG_DAMNED] && !(m.flags_ & P_NO_CLERIC))
734	|| (m.move_on | op->move_on ) != m.move_on	794	|| (m.move_on | op->move_on ) != m.move_on
735	|| (m.move_off | op->move_off ) != m.move_off	795	|| (m.move_off | op->move_off ) != m.move_off
736	|| (m.move_slow | op->move_slow) != m.move_slow	796	|| (m.move_slow | op->move_slow) != m.move_slow
737	/* This isn't perfect, but I don't expect a lot of objects to	797	/* This isn't perfect, but I don't expect a lot of objects to
738	* to have move_allow right now.	798	* have move_allow right now.
739	*/	799	*/
740	|| ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block	800	|| ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block
		801	m.invalidate ();
		802	#else
741	|| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)	803	// the above is not strong enough a test to skip updating. los maybe? TODO (schmorp)
742	m.flags_ = 0;	804	m.invalidate ();
		805	#endif
743	}	806	}
744	/* if the object is being removed, we can't make intelligent	807	/* if the object is being removed, we can't make intelligent
745	* decisions, because remove_ob can't really pass the object	808	* decisions, because remove_ob can't really pass the object
746	* that is being removed.	809	* that is being removed.
747	*/	810	*/
748	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)	811	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
749	m.flags_ = 0;	812	m.invalidate ();
750	else if (action == UP_OBJ_FACE)	813	else if (action == UP_OBJ_FACE)
751	/* Nothing to do for that case */ ;	814	/* Nothing to do for that case */ ;
752	else	815	else
753	LOG (llevError, "update_object called with invalid action: %d\n", action);	816	LOG (llevError, "update_object called with invalid action: %d\n", action);
754		817
…		…
756	update_object (op->more, action);	819	update_object (op->more, action);
757	}	820	}
758		821
759	object::object ()	822	object::object ()
760	{	823	{
761	SET_FLAG (this, FLAG_REMOVED);	824	this->set_flag (FLAG_REMOVED);
762		825
763	expmul = 1.0;	826	//expmul = 1.0; declared const for the time being
764	face = blank_face;	827	face = blank_face;
		828	material = MATERIAL_NULL;
765	}	829	}
766		830
767	object::~object ()	831	object::~object ()
768	{	832	{
769	unlink ();	833	unlink ();
770		834
771	free_key_values (this);	835	free_key_values (this);
772	}	836	}
773
774	static int object_count;
775		837
776	void object::link ()	838	void object::link ()
777	{	839	{
778	assert (!index);//D	840	assert (!index);//D
779	uuid = UUID::gen ();	841	uuid = UUID::gen ();
780	count = ++object_count;
781		842
782	refcnt_inc ();	843	refcnt_inc ();
783	objects.insert (this);	844	objects.insert (this);
		845
		846	++create_count;
		847
784	}	848	}
785		849
786	void object::unlink ()	850	void object::unlink ()
787	{	851	{
788	if (!index)	852	if (!index)
789	return;	853	return;
		854
		855	++destroy_count;
790		856
791	objects.erase (this);	857	objects.erase (this);
792	refcnt_dec ();	858	refcnt_dec ();
793	}	859	}
794		860
…		…
798	/* If already on active list, don't do anything */	864	/* If already on active list, don't do anything */
799	if (active)	865	if (active)
800	return;	866	return;
801		867
802	if (has_active_speed ())	868	if (has_active_speed ())
		869	{
		870	if (flag [FLAG_FREED])
		871	LOG (llevError | logBacktrace, "BUG: tried to activate freed object %s\n", debug_desc ());//D
		872
803	actives.insert (this);	873	actives.insert (this);
		874	}
804	}	875	}
805		876
806	void	877	void
807	object::activate_recursive ()	878	object::activate_recursive ()
808	{	879	{
…		…
857	object::destroy_inv (bool drop_to_ground)	928	object::destroy_inv (bool drop_to_ground)
858	{	929	{
859	// need to check first, because the checks below might segfault	930	// need to check first, because the checks below might segfault
860	// as we might be on an invalid mapspace and crossfire code	931	// as we might be on an invalid mapspace and crossfire code
861	// is too buggy to ensure that the inventory is empty.	932	// is too buggy to ensure that the inventory is empty.
862	// corollary: if you create arrows etc. with stuff in tis inventory,	933	// corollary: if you create arrows etc. with stuff in its inventory,
863	// cf will crash below with off-map x and y	934	// cf will crash below with off-map x and y
864	if (!inv)	935	if (!inv)
865	return;	936	return;
866		937
867	/* Only if the space blocks everything do we not process -	938	/* Only if the space blocks everything do we not process -
868	* if some form of movement is allowed, let objects	939	* if some form of movement is allowed, let objects
869	* drop on that space.	940	* drop on that space.
870	*/	941	*/
871	if (!drop_to_ground	942	if (!drop_to_ground
872	|| !map	943	|| !map
873	|| map->in_memory != MAP_IN_MEMORY	944	|| map->in_memory != MAP_ACTIVE
874	|| map->nodrop	945	|| map->no_drop
875	|| ms ().move_block == MOVE_ALL)	946	|| ms ().move_block == MOVE_ALL)
876	{	947	{
877	while (inv)	948	while (inv)
878	{
879	inv->destroy_inv (drop_to_ground);
880	inv->destroy ();	949	inv->destroy ();
881	}
882	}	950	}
883	else	951	else
884	{ /* Put objects in inventory onto this space */	952	{ /* Put objects in inventory onto this space */
885	while (inv)	953	while (inv)
886	{	954	{
…		…
897	map->insert (op, x, y);	965	map->insert (op, x, y);
898	}	966	}
899	}	967	}
900	}	968	}
901		969
		970	/*
		971	* Remove and free all objects in the inventory of the given object.
		972	* Unlike destroy_inv, this assumes the *this is destroyed as well
		973	* well, so we can (and have to!) take shortcuts.
		974	*/
		975	void
		976	object::destroy_inv_fast ()
		977	{
		978	while (object *op = inv)
		979	{
		980	// remove from object the fast way
		981	op->flag [FLAG_REMOVED] = true;
		982	op->env = 0;
		983	if ((inv = inv->below))
		984	inv->above = 0;
		985
		986	// then destroy
		987	op->destroy ();
		988	}
		989	}
		990
		991	void
		992	object::freelist_free (int count)
		993	{
		994	while (count-- && freelist)
		995	{
		996	freelist_item *next = freelist->next;
		997	// count is being "destroyed"
		998
		999	sfree ((char *)freelist, sizeof (object));
		1000
		1001	freelist = next;
		1002	--free_count;
		1003	}
		1004	}
		1005
		1006	object *
902	object *object::create ()	1007	object::create ()
903	{	1008	{
904	object *op = new object;	1009	object *op;
		1010
		1011	if (freelist)
		1012	{
		1013	freelist_item li = *freelist;
		1014	memset (freelist, 0, sizeof (object));
		1015
		1016	op = new (freelist) object;
		1017	op->count = li.count;
		1018
		1019	freelist = li.next;
		1020	--free_count;
		1021	}
		1022	else
		1023	{
		1024	void *ni = salloc0<char> (sizeof (object));
		1025
		1026	op = new(ni) object;
		1027
		1028	op->count = ++object_count;
		1029	}
		1030
905	op->link ();	1031	op->link ();
		1032
906	return op;	1033	return op;
907	}	1034	}
908		1035
909	void	1036	void
		1037	object::do_delete ()
		1038	{
		1039	uint32_t count = this->count;
		1040
		1041	this->~object ();
		1042
		1043	freelist_item *li = (freelist_item *)this;
		1044	li->next = freelist;
		1045	li->count = count;
		1046
		1047	freelist = li;
		1048	++free_count;
		1049	}
		1050
		1051	static struct freed_map : maptile
		1052	{
		1053	freed_map ()
		1054	: maptile (3, 3)
		1055	{
		1056	path = "<freed objects map>";
		1057	name = "/internal/freed_objects_map";
		1058	no_drop = 1;
		1059	no_reset = 1;
		1060
		1061	in_memory = MAP_ACTIVE;
		1062	}
		1063
		1064	~freed_map ()
		1065	{
		1066	destroy ();
		1067	}
		1068	} freed_map; // freed objects are moved here to avoid crashes
		1069
		1070	void
910	object::do_destroy ()	1071	object::do_destroy ()
911	{	1072	{
912	attachable::do_destroy ();
913
914	if (flag [FLAG_IS_LINKED])	1073	if (flag [FLAG_IS_LINKED])
915	remove_button_link (this);	1074	remove_link ();
916		1075
917	if (flag [FLAG_FRIENDLY])	1076	if (flag [FLAG_FRIENDLY])
918	remove_friendly_object (this);	1077	remove_friendly_object (this);
919		1078
920	if (!flag [FLAG_REMOVED])
921	remove ();	1079	remove ();
922		1080
923	destroy_inv (true);	1081	attachable::do_destroy ();
924		1082
925	deactivate ();	1083	deactivate ();
926	unlink ();	1084	unlink ();
927		1085
928	flag [FLAG_FREED] = 1;	1086	flag [FLAG_FREED] = 1;
929		1087
930	// hack to ensure that freed objects still have a valid map	1088	// hack to ensure that freed objects still have a valid map
931	{
932	static maptile *freed_map; // freed objects are moved here to avoid crashes
933
934	if (!freed_map)
935	{
936	freed_map = new maptile;
937
938	freed_map->path = "<freed objects map>";
939	freed_map->name = "/internal/freed_objects_map";
940	freed_map->width = 3;
941	freed_map->height = 3;
942	freed_map->nodrop = 1;
943
944	freed_map->alloc ();
945	freed_map->in_memory = MAP_IN_MEMORY;
946	}
947
948	map = freed_map;	1089	map = &freed_map;
949	x = 1;	1090	x = 1;
950	y = 1;	1091	y = 1;
951	}
952		1092
953	if (more)	1093	if (more)
954	{	1094	{
955	more->destroy ();	1095	more->destroy ();
956	more = 0;	1096	more = 0;
…		…
964	attacked_by = 0;	1104	attacked_by = 0;
965	current_weapon = 0;	1105	current_weapon = 0;
966	}	1106	}
967		1107
968	void	1108	void
969	object::destroy (bool destroy_inventory)	1109	object::destroy ()
970	{	1110	{
971	if (destroyed ())	1111	if (destroyed ())
972	return;	1112	return;
973		1113
974	if (destroy_inventory)	1114	if (!is_head () && !head->destroyed ())
		1115	{
		1116	LOG (llevError | logBacktrace, "tried to destroy the tail of an object");
		1117	head->destroy ();
		1118	return;
		1119	}
		1120
975	destroy_inv (false);	1121	destroy_inv_fast ();
976		1122
977	if (is_head ())	1123	if (is_head ())
978	if (sound_destroy)	1124	if (sound_destroy)
979	play_sound (sound_destroy);	1125	play_sound (sound_destroy);
980	else if (flag [FLAG_MONSTER])	1126	else if (flag [FLAG_MONSTER])
981	play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism	1127	play_sound (sound_find ("monster_destroy")); // quick hack, too lazy to create a generic mechanism
982		1128
983	attachable::destroy ();	1129	attachable::destroy ();
984	}
985
986	/*
987	* sub_weight() recursively (outwards) subtracts a number from the
988	* weight of an object (and what is carried by it's environment(s)).
989	*/
990	void
991	sub_weight (object *op, signed long weight)
992	{
993	while (op != NULL)
994	{
995	if (op->type == CONTAINER)
996	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
997
998	op->carrying -= weight;
999	op = op->env;
1000	}
1001	}	1130	}
1002		1131
1003	/* op->remove ():	1132	/* op->remove ():
1004	* This function removes the object op from the linked list of objects	1133	* This function removes the object op from the linked list of objects
1005	* which it is currently tied to. When this function is done, the	1134	* which it is currently tied to. When this function is done, the
…		…
1008	* the previous environment.	1137	* the previous environment.
1009	*/	1138	*/
1010	void	1139	void
1011	object::do_remove ()	1140	object::do_remove ()
1012	{	1141	{
1013	object *tmp, *last = 0;	1142	if (flag [FLAG_REMOVED])
1014	object *otmp;
1015
1016	if (QUERY_FLAG (this, FLAG_REMOVED))
1017	return;	1143	return;
1018		1144
1019	SET_FLAG (this, FLAG_REMOVED);
1020	INVOKE_OBJECT (REMOVE, this);	1145	INVOKE_OBJECT (REMOVE, this);
		1146
		1147	flag [FLAG_REMOVED] = true;
1021		1148
1022	if (more)	1149	if (more)
1023	more->remove ();	1150	more->remove ();
1024		1151
1025	/*	1152	/*
1026	* In this case, the object to be removed is in someones	1153	* In this case, the object to be removed is in someones
1027	* inventory.	1154	* inventory.
1028	*/	1155	*/
1029	if (env)	1156	if (env)
1030	{	1157	{
1031	if (nrof)	1158	flag [FLAG_REMOVED] = false; // hack around the issue of visible_to checking flag_removed
1032	sub_weight (env, weight * nrof);	1159	if (object *pl = visible_to ())
1033	else	1160	esrv_del_item (pl->contr, count);
1034	sub_weight (env, weight + carrying);	1161	flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed
1035		1162
1036	/* NO_FIX_PLAYER is set when a great many changes are being	1163	adjust_weight (env, total_weight (), 0);
1037	* made to players inventory. If set, avoiding the call
1038	* to save cpu time.
1039	*/
1040	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1041	otmp->update_stats ();
1042		1164
1043	if (above)	1165	object *pl = in_player ();
1044	above->below = below;
1045	else
1046	env->inv = below;
1047
1048	if (below)
1049	below->above = above;
1050		1166
1051	/* we set up values so that it could be inserted into	1167	/* we set up values so that it could be inserted into
1052	* the map, but we don't actually do that - it is up	1168	* the map, but we don't actually do that - it is up
1053	* to the caller to decide what we want to do.	1169	* to the caller to decide what we want to do.
1054	*/	1170	*/
1055	x = env->x, y = env->y;
1056	map = env->map;	1171	map = env->map;
1057	above = 0, below = 0;	1172	x = env->x;
		1173	y = env->y;
		1174
		1175	// make sure cmov optimisation is applicable
		1176	*(above ? &above->below : &env->inv) = below;
		1177	*(below ? &below->above : &above ) = above; // &above is just a dummy
		1178
		1179	above = 0;
		1180	below = 0;
1058	env = 0;	1181	env = 0;
		1182
		1183	if (pl && pl->is_player ())
		1184	{
		1185	if (expect_false (pl->contr->combat_ob == this))
		1186	{
		1187	pl->apply (pl->contr->combat_ob, AP_UNAPPLY | AP_IGNORE_CURSE);
		1188	pl->contr->combat_ob = 0;
		1189	if (pl->contr->ranged_ob) pl->apply (pl->contr->ranged_ob);
		1190	}
		1191
		1192	if (expect_false (pl->contr->ranged_ob == this))
		1193	{
		1194	pl->apply (pl->contr->ranged_ob, AP_UNAPPLY | AP_IGNORE_CURSE);
		1195	pl->contr->ranged_ob = 0;
		1196	if (pl->contr->combat_ob) pl->apply (pl->contr->combat_ob);
		1197	}
		1198
		1199	pl->contr->queue_stats_update ();
		1200
		1201	if (expect_false (glow_radius) && pl->is_on_map ())
		1202	update_all_los (pl->map, pl->x, pl->y);
		1203	}
1059	}	1204	}
1060	else if (map)	1205	else if (map)
1061	{	1206	{
1062	if (type == PLAYER)
1063	{
1064	// leaving a spot always closes any open container on the ground
1065	if (container && !container->env)
1066	// this causes spurious floorbox updates, but it ensures
1067	// that the CLOSE event is being sent.
1068	close_container ();
1069
1070	--map->players;
1071	map->touch ();
1072	}
1073
1074	map->dirty = true;	1207	map->dirty = true;
1075	mapspace &ms = this->ms ();	1208	mapspace &ms = this->ms ();
1076		1209
		1210	if (object *pl = ms.player ())
		1211	{
		1212	if (is_player ())
		1213	{
		1214	if (!flag [FLAG_WIZPASS])
		1215	ms.smell = ++mapspace::smellcount; // remember the smell of the player
		1216
		1217	// leaving a spot always closes any open container on the ground
		1218	if (container && !container->env)
		1219	// this causes spurious floorbox updates, but it ensures
		1220	// that the CLOSE event is being sent.
		1221	close_container ();
		1222
		1223	--map->players;
		1224	map->touch ();
		1225	}
		1226	else if (pl->container_ () == this)
		1227	{
		1228	// removing a container should close it
		1229	close_container ();
		1230	}
		1231	else
		1232	esrv_del_item (pl->contr, count);
		1233	}
		1234
1077	/* link the object above us */	1235	/* link the object above us */
1078	if (above)	1236	// re-link, make sure compiler can easily use cmove
1079	above->below = below;	1237	*(above ? &above->below : &ms.top) = below;
1080	else	1238	*(below ? &below->above : &ms.bot) = above;
1081	ms.top = below; /* we were top, set new top */
1082
1083	/* Relink the object below us, if there is one */
1084	if (below)
1085	below->above = above;
1086	else
1087	{
1088	/* Nothing below, which means we need to relink map object for this space
1089	* use translated coordinates in case some oddness with map tiling is
1090	* evident
1091	*/
1092	if (GET_MAP_OB (map, x, y) != this)
1093	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 ());
1094
1095	ms.bot = above; /* goes on above it. */
1096	}
1097		1239
1098	above = 0;	1240	above = 0;
1099	below = 0;	1241	below = 0;
1100		1242
		1243	ms.invalidate ();
		1244
1101	if (map->in_memory == MAP_SAVING)	1245	if (map->in_memory == MAP_SAVING)
1102	return;	1246	return;
1103		1247
1104	int check_walk_off = !flag [FLAG_NO_APPLY];	1248	int check_walk_off = !flag [FLAG_NO_APPLY];
1105		1249
1106	if (object *pl = ms.player ())	1250	if (object *pl = ms.player ())
1107	{	1251	{
1108	if (pl->container == this)	1252	if (pl->container_ () == this)
1109	/* If a container that the player is currently using somehow gets	1253	/* If a container that the player is currently using somehow gets
1110	* removed (most likely destroyed), update the player view	1254	* removed (most likely destroyed), update the player view
1111	* appropriately.	1255	* appropriately.
1112	*/	1256	*/
1113	pl->close_container ();	1257	pl->close_container ();
1114		1258
		1259	//TODO: the floorbox prev/next might need updating
		1260	//esrv_del_item (pl->contr, count);
		1261	//TODO: update floorbox to preserve ordering
		1262	if (pl->contr->ns)
1115	pl->contr->ns->floorbox_update ();	1263	pl->contr->ns->floorbox_update ();
1116	}	1264	}
1117		1265
		1266	if (check_walk_off)
1118	for (tmp = ms.bot; tmp; tmp = tmp->above)	1267	for (object *above, *tmp = ms.bot; tmp; tmp = above)
1119	{	1268	{
		1269	above = tmp->above;
		1270
1120	/* No point updating the players look faces if he is the object	1271	/* No point updating the players look faces if he is the object
1121	* being removed.	1272	* being removed.
1122	*/	1273	*/
1123		1274
1124	/* See if object moving off should effect something */	1275	/* See if object moving off should effect something */
1125	if (check_walk_off
1126	&& ((move_type & tmp->move_off)	1276	if ((move_type & tmp->move_off)
1127	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))	1277	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0)
1128	{
1129	move_apply (tmp, this, 0);	1278	move_apply (tmp, this, 0);
1130
1131	if (destroyed ())
1132	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1133	}	1279	}
1134		1280
1135	last = tmp;	1281	if (affects_los ())
1136	}
1137
1138	/* last == NULL if there are no objects on this space */
1139	//TODO: this makes little sense, why only update the topmost object?
1140	if (!last)
1141	map->at (x, y).flags_ = 0;
1142	else
1143	update_object (last, UP_OBJ_REMOVE);
1144
1145	if (flag [FLAG_BLOCKSVIEW] || glow_radius)
1146	update_all_los (map, x, y);	1282	update_all_los (map, x, y);
1147	}	1283	}
1148	}	1284	}
1149		1285
1150	/*	1286	/*
…		…
1164	if (!top)	1300	if (!top)
1165	for (top = op; top && top->above; top = top->above)	1301	for (top = op; top && top->above; top = top->above)
1166	;	1302	;
1167		1303
1168	for (; top; top = top->below)	1304	for (; top; top = top->below)
1169	{
1170	if (top == op)
1171	continue;
1172
1173	if (object::can_merge (op, top))	1305	if (object::can_merge (op, top))
1174	{	1306	{
1175	top->nrof += op->nrof;	1307	top->nrof += op->nrof;
1176		1308
1177	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/	1309	if (object *pl = top->visible_to ())
1178	op->weight = 0; /* Don't want any adjustements now */	1310	esrv_update_item (UPD_NROF, pl, top);
		1311
		1312	op->weight = 0; // cancel the addition above
		1313	op->carrying = 0; // must be 0 already
		1314
1179	op->destroy ();	1315	op->destroy ();
		1316
1180	return top;	1317	return top;
1181	}	1318	}
1182	}
1183		1319
1184	return 0;	1320	return 0;
1185	}	1321	}
1186		1322
1187	void	1323	void
…		…
1192		1328
1193	object *prev = this;	1329	object *prev = this;
1194		1330
1195	for (archetype *at = (archetype *)arch->more; at; at = (archetype *)at->more)	1331	for (archetype *at = (archetype *)arch->more; at; at = (archetype *)at->more)
1196	{	1332	{
1197	object *op = arch_to_object (at);	1333	object *op = at->instance ();
1198		1334
1199	op->name = name;	1335	op->name = name;
1200	op->name_pl = name_pl;	1336	op->name_pl = name_pl;
1201	op->title = title;	1337	op->title = title;
1202		1338
…		…
1212	* job preparing multi-part monsters.	1348	* job preparing multi-part monsters.
1213	*/	1349	*/
1214	object *	1350	object *
1215	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)	1351	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1216	{	1352	{
		1353	op->remove ();
		1354
1217	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)	1355	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1218	{	1356	{
1219	tmp->x = x + tmp->arch->x;	1357	tmp->x = x + tmp->arch->x;
1220	tmp->y = y + tmp->arch->y;	1358	tmp->y = y + tmp->arch->y;
1221	}	1359	}
…		…
1238	* Passing 0 for flag gives proper default values, so flag really only needs	1376	* Passing 0 for flag gives proper default values, so flag really only needs
1239	* to be set if special handling is needed.	1377	* to be set if special handling is needed.
1240	*	1378	*
1241	* Return value:	1379	* Return value:
1242	* new object if 'op' was merged with other object	1380	* new object if 'op' was merged with other object
1243	* NULL if 'op' was destroyed	1381	* NULL if there was an error (destroyed, blocked etc.)
1244	* just 'op' otherwise	1382	* just 'op' otherwise
1245	*/	1383	*/
1246	object *	1384	object *
1247	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)	1385	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1248	{	1386	{
1249	assert (!op->flag [FLAG_FREED]);
1250
1251	object *top, *floor = NULL;
1252
1253	op->remove ();	1387	op->remove ();
		1388
		1389	if (m == &freed_map)//D TODO: remove soon
		1390	{//D
		1391	LOG (llevError | logBacktrace, "tries to insret object on freed objects map: %s", op->debug_desc ());//D
		1392	}//D
1254		1393
1255	/* Ideally, the caller figures this out. However, it complicates a lot	1394	/* Ideally, the caller figures this out. However, it complicates a lot
1256	* of areas of callers (eg, anything that uses find_free_spot would now	1395	* of areas of callers (eg, anything that uses find_free_spot would now
1257	* need extra work	1396	* need extra work
1258	*/	1397	*/
		1398	maptile *newmap = m;
1259	if (!xy_normalise (m, op->x, op->y))	1399	if (!xy_normalise (newmap, op->x, op->y))
1260	{	1400	{
1261	op->destroy ();	1401	op->head_ ()->destroy ();// remove head_ once all tail object destroyers found
1262	return 0;	1402	return 0;
1263	}	1403	}
1264		1404
1265	if (object *more = op->more)	1405	if (object *more = op->more)
1266	if (!insert_ob_in_map (more, m, originator, flag))	1406	if (!insert_ob_in_map (more, m, originator, flag))
1267	return 0;	1407	return 0;
1268		1408
1269	CLEAR_FLAG (op, FLAG_REMOVED);	1409	op->flag [FLAG_REMOVED] = false;
1270		1410	op->env = 0;
1271	op->map = m;	1411	op->map = newmap;
		1412
1272	mapspace &ms = op->ms ();	1413	mapspace &ms = op->ms ();
1273		1414
1274	/* this has to be done after we translate the coordinates.	1415	/* this has to be done after we translate the coordinates.
1275	*/	1416	*/
1276	if (op->nrof && !(flag & INS_NO_MERGE))	1417	if (op->nrof && !(flag & INS_NO_MERGE))
1277	for (object *tmp = ms.bot; tmp; tmp = tmp->above)	1418	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1278	if (object::can_merge (op, tmp))	1419	if (object::can_merge (op, tmp))
1279	{	1420	{
		1421	// TODO: we actually want to update tmp, not op,
		1422	// but some caller surely breaks when we return tmp
		1423	// from here :/
1280	op->nrof += tmp->nrof;	1424	op->nrof += tmp->nrof;
1281	tmp->destroy ();	1425	tmp->destroy ();
1282	}	1426	}
1283		1427
1284	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1428	op->clr_flag (FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1285	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1429	op->clr_flag (FLAG_INV_LOCKED);
1286		1430
1287	if (!QUERY_FLAG (op, FLAG_ALIVE))	1431	if (!op->flag [FLAG_ALIVE])
1288	CLEAR_FLAG (op, FLAG_NO_STEAL);	1432	op->clr_flag (FLAG_NO_STEAL);
1289		1433
1290	if (flag & INS_BELOW_ORIGINATOR)	1434	if (flag & INS_BELOW_ORIGINATOR)
1291	{	1435	{
1292	if (originator->map != op->map || originator->x != op->x || originator->y != op->y)	1436	if (originator->map != op->map || originator->x != op->x || originator->y != op->y)
1293	{	1437	{
1294	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");	1438	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");
1295	abort ();	1439	abort ();
1296	}	1440	}
1297		1441
		1442	if (!originator->is_on_map ())
		1443	{
		1444	LOG (llevError, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map",
		1445	op->debug_desc (), originator->debug_desc ());
		1446	abort ();
		1447	}
		1448
1298	op->above = originator;	1449	op->above = originator;
1299	op->below = originator->below;	1450	op->below = originator->below;
1300
1301	if (op->below)
1302	op->below->above = op;
1303	else
1304	ms.bot = op;
1305
1306	/* since *below* originator, no need to update top */
1307	originator->below = op;	1451	originator->below = op;
		1452
		1453	*(op->below ? &op->below->above : &ms.bot) = op;
1308	}	1454	}
1309	else	1455	else
1310	{	1456	{
1311	top = ms.bot;	1457	object *floor = 0;
		1458	object *top = ms.top;
1312		1459
1313	/* If there are other objects, then */	1460	/* If there are other objects, then */
1314	if (top)	1461	if (top)
1315	{	1462	{
1316	object *last = 0;
1317
1318	/*	1463	/*
1319	* If there are multiple objects on this space, we do some trickier handling.	1464	* If there are multiple objects on this space, we do some trickier handling.
1320	* We've already dealt with merging if appropriate.	1465	* We've already dealt with merging if appropriate.
1321	* Generally, we want to put the new object on top. But if	1466	* Generally, we want to put the new object on top. But if
1322	* flag contains INS_ABOVE_FLOOR_ONLY, once we find the last	1467	* flag contains INS_ABOVE_FLOOR_ONLY, once we find the last
…		…
1325	* once we get to them. This reduces the need to traverse over all of	1470	* once we get to them. This reduces the need to traverse over all of
1326	* them when adding another one - this saves quite a bit of cpu time	1471	* them when adding another one - this saves quite a bit of cpu time
1327	* when lots of spells are cast in one area. Currently, it is presumed	1472	* when lots of spells are cast in one area. Currently, it is presumed
1328	* that flying non pickable objects are spell objects.	1473	* that flying non pickable objects are spell objects.
1329	*/	1474	*/
1330	for (top = ms.bot; top; top = top->above)	1475	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1331	{	1476	{
1332	if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))	1477	if (tmp->flag [FLAG_IS_FLOOR] || tmp->flag [FLAG_OVERLAY_FLOOR])
1333	floor = top;	1478	floor = tmp;
1334		1479
1335	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))	1480	if (tmp->flag [FLAG_NO_PICK] && (tmp->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !tmp->flag [FLAG_IS_FLOOR])
1336	{	1481	{
1337	/* We insert above top, so we want this object below this */	1482	/* We insert above top, so we want this object below this */
1338	top = top->below;	1483	top = tmp->below;
1339	break;	1484	break;
1340	}	1485	}
1341		1486
1342	last = top;	1487	top = tmp;
1343	}	1488	}
1344
1345	/* Don't want top to be NULL, so set it to the last valid object */
1346	top = last;
1347		1489
1348	/* We let update_position deal with figuring out what the space	1490	/* We let update_position deal with figuring out what the space
1349	* looks like instead of lots of conditions here.	1491	* looks like instead of lots of conditions here.
1350	* makes things faster, and effectively the same result.	1492	* makes things faster, and effectively the same result.
1351	*/	1493	*/
…		…
1358	*/	1500	*/
1359	if (!(flag & INS_ON_TOP)	1501	if (!(flag & INS_ON_TOP)
1360	&& ms.flags () & P_BLOCKSVIEW	1502	&& ms.flags () & P_BLOCKSVIEW
1361	&& (op->face && !faces [op->face].visibility))	1503	&& (op->face && !faces [op->face].visibility))
1362	{	1504	{
		1505	object *last;
		1506
1363	for (last = top; last != floor; last = last->below)	1507	for (last = top; last != floor; last = last->below)
1364	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1508	if (last->flag [FLAG_BLOCKSVIEW] && (last->type != EXIT))
1365	break;	1509	break;
1366		1510
1367	/* Check to see if we found the object that blocks view,	1511	/* Check to see if we found the object that blocks view,
1368	* and make sure we have a below pointer for it so that	1512	* and make sure we have a below pointer for it so that
1369	* we can get inserted below this one, which requires we	1513	* we can get inserted below this one, which requires we
…		…
1375	} /* If objects on this space */	1519	} /* If objects on this space */
1376		1520
1377	if (flag & INS_ABOVE_FLOOR_ONLY)	1521	if (flag & INS_ABOVE_FLOOR_ONLY)
1378	top = floor;	1522	top = floor;
1379		1523
1380	/* Top is the object that our object (op) is going to get inserted above.	1524	// insert object above top, or bottom-most if top = 0
1381	*/
1382
1383	/* First object on this space */
1384	if (!top)	1525	if (!top)
1385	{	1526	{
		1527	op->below = 0;
1386	op->above = ms.bot;	1528	op->above = ms.bot;
1387
1388	if (op->above)
1389	op->above->below = op;
1390
1391	op->below = 0;
1392	ms.bot = op;	1529	ms.bot = op;
		1530
		1531	*(op->above ? &op->above->below : &ms.top) = op;
1393	}	1532	}
1394	else	1533	else
1395	{ /* get inserted into the stack above top */	1534	{
1396	op->above = top->above;	1535	op->above = top->above;
1397
1398	if (op->above)
1399	op->above->below = op;	1536	top->above = op;
1400		1537
1401	op->below = top;	1538	op->below = top;
1402	top->above = op;	1539	*(op->above ? &op->above->below : &ms.top) = op;
1403	}	1540	}
		1541	}
1404		1542
1405	if (!op->above)	1543	if (op->is_player ())
1406	ms.top = op;
1407	} /* else not INS_BELOW_ORIGINATOR */
1408
1409	if (op->type == PLAYER)
1410	{	1544	{
1411	op->contr->do_los = 1;	1545	op->contr->do_los = 1;
1412	++op->map->players;	1546	++op->map->players;
1413	op->map->touch ();	1547	op->map->touch ();
1414	}	1548	}
1415		1549
1416	op->map->dirty = true;	1550	op->map->dirty = true;
1417		1551
1418	if (object *pl = ms.player ())	1552	if (object *pl = ms.player ())
		1553	//TODO: the floorbox prev/next might need updating
		1554	//esrv_send_item (pl, op);
		1555	//TODO: update floorbox to preserve ordering
		1556	if (pl->contr->ns)
1419	pl->contr->ns->floorbox_update ();	1557	pl->contr->ns->floorbox_update ();
1420		1558
1421	/* If this object glows, it may affect lighting conditions that are	1559	/* If this object glows, it may affect lighting conditions that are
1422	* visible to others on this map. But update_all_los is really	1560	* visible to others on this map. But update_all_los is really
1423	* an inefficient way to do this, as it means los for all players	1561	* an inefficient way to do this, as it means los for all players
1424	* on the map will get recalculated. The players could very well	1562	* on the map will get recalculated. The players could very well
1425	* be far away from this change and not affected in any way -	1563	* be far away from this change and not affected in any way -
1426	* this should get redone to only look for players within range,	1564	* this should get redone to only look for players within range,
1427	* or just updating the P_UPTODATE for spaces within this area	1565	* or just updating the P_UPTODATE for spaces within this area
1428	* of effect may be sufficient.	1566	* of effect may be sufficient.
1429	*/	1567	*/
1430	if (op->map->darkness && (op->glow_radius != 0))	1568	if (op->affects_los ())
		1569	{
		1570	op->ms ().invalidate ();
1431	update_all_los (op->map, op->x, op->y);	1571	update_all_los (op->map, op->x, op->y);
		1572	}
1432		1573
1433	/* updates flags (blocked, alive, no magic, etc) for this map space */	1574	/* updates flags (blocked, alive, no magic, etc) for this map space */
1434	update_object (op, UP_OBJ_INSERT);	1575	update_object (op, UP_OBJ_INSERT);
1435		1576
1436	INVOKE_OBJECT (INSERT, op);	1577	INVOKE_OBJECT (INSERT, op);
…		…
1443	* blocked() and wall() work properly), and these flags are updated by	1584	* blocked() and wall() work properly), and these flags are updated by
1444	* update_object().	1585	* update_object().
1445	*/	1586	*/
1446		1587
1447	/* if this is not the head or flag has been passed, don't check walk on status */	1588	/* if this is not the head or flag has been passed, don't check walk on status */
1448	if (!(flag & INS_NO_WALK_ON) && op->head_ () == op)	1589	if (!(flag & INS_NO_WALK_ON) && op->is_head ())
1449	{	1590	{
1450	if (check_move_on (op, originator))	1591	if (check_move_on (op, originator, flag))
1451	return 0;	1592	return 0;
1452		1593
1453	/* If we are a multi part object, lets work our way through the check	1594	/* If we are a multi part object, let's work our way through the check
1454	* walk on's.	1595	* walk on's.
1455	*/	1596	*/
1456	for (object *tmp = op->more; tmp; tmp = tmp->more)	1597	for (object *tmp = op->more; tmp; tmp = tmp->more)
1457	if (check_move_on (tmp, originator))	1598	if (check_move_on (tmp, originator, flag))
1458	return 0;	1599	return 0;
1459	}	1600	}
1460		1601
1461	return op;	1602	return op;
1462	}	1603	}
…		…
1464	/* this function inserts an object in the map, but if it	1605	/* this function inserts an object in the map, but if it
1465	* finds an object of its own type, it'll remove that one first.	1606	* finds an object of its own type, it'll remove that one first.
1466	* op is the object to insert it under: supplies x and the map.	1607	* op is the object to insert it under: supplies x and the map.
1467	*/	1608	*/
1468	void	1609	void
1469	replace_insert_ob_in_map (const char *arch_string, object *op)	1610	replace_insert_ob_in_map (shstr_tmp archname, object *op)
1470	{	1611	{
1471	object *tmp, *tmp1;
1472
1473	/* first search for itself and remove any old instances */	1612	/* first search for itself and remove any old instances */
1474		1613
1475	for (tmp = op->ms ().bot; tmp; tmp = tmp->above)	1614	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1476	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */	1615	if (tmp->arch->archname == archname) /* same archetype */
1477	tmp->destroy ();	1616	tmp->destroy ();
1478		1617
1479	tmp1 = arch_to_object (archetype::find (arch_string));	1618	object *tmp = archetype::find (archname)->instance ();
1480		1619
1481	tmp1->x = op->x;	1620	tmp->x = op->x;
1482	tmp1->y = op->y;	1621	tmp->y = op->y;
		1622
1483	insert_ob_in_map (tmp1, op->map, op, 0);	1623	insert_ob_in_map (tmp, op->map, op, 0);
1484	}	1624	}
1485		1625
1486	object *	1626	object *
1487	object::insert_at (object *where, object *originator, int flags)	1627	object::insert_at (object *where, object *originator, int flags)
1488	{	1628	{
		1629	if (where->env)
		1630	return where->env->insert (this);
		1631	else
1489	return where->map->insert (this, where->x, where->y, originator, flags);	1632	return where->map->insert (this, where->x, where->y, originator, flags);
1490	}	1633	}
1491		1634
1492	/*	1635	// check whether we can put this into the map, respect max_volume, max_items
1493	* get_split_ob(ob,nr) splits up ob into two parts. The part which	1636	bool
1494	* is returned contains nr objects, and the remaining parts contains	1637	object::can_drop_at (maptile *m, int x, int y, object *originator)
1495	* the rest (or is removed and freed if that number is 0).
1496	* On failure, NULL is returned, and the reason put into the
1497	* global static errmsg array.
1498	*/
1499	object *
1500	get_split_ob (object *orig_ob, uint32 nr)
1501	{	1638	{
1502	object *newob;	1639	mapspace &ms = m->at (x, y);
1503	int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1504		1640
1505	if (orig_ob->nrof < nr)	1641	int items = ms.items ();
1506	{
1507	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1508	return NULL;
1509	}
1510		1642
1511	newob = object_create_clone (orig_ob);	1643	if (!items // testing !items ensures we can drop at least one item
		1644	|| (items < m->max_items
		1645	&& ms.volume () < m->max_volume))
		1646	return true;
1512		1647
1513	if ((orig_ob->nrof -= nr) < 1)	1648	if (originator && originator->is_player ())
1514	orig_ob->destroy (1);	1649	originator->contr->failmsgf (
1515	else if (!is_removed)	1650	"No matter how hard you try, you just cannot put the %s here H<Try to remove some items from the floor first.>",
1516	{	1651	query_name ()
1517	if (orig_ob->env != NULL)	1652	);
1518	sub_weight (orig_ob->env, orig_ob->weight * nr);
1519	if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)
1520	{
1521	strcpy (errmsg, "Tried to split object whose map is not in memory.");
1522	LOG (llevDebug, "Error, Tried to split object whose map is not in memory.\n");
1523	return NULL;
1524	}
1525	}
1526		1653
1527	newob->nrof = nr;	1654	return false;
1528
1529	return newob;
1530	}	1655	}
1531		1656
1532	/*	1657	/*
1533	* decrease_ob_nr(object, number) decreases a specified number from	1658	* decrease(object, number) decreases a specified number from
1534	* the amount of an object. If the amount reaches 0, the object	1659	* the amount of an object. If the amount reaches 0, the object
1535	* is subsequently removed and freed.	1660	* is subsequently removed and freed.
1536	*	1661	*
1537	* Return value: 'op' if something is left, NULL if the amount reached 0	1662	* Return value: 'op' if something is left, NULL if the amount reached 0
1538	*/	1663	*/
		1664	bool
		1665	object::decrease (sint32 nr)
		1666	{
		1667	if (!nr)
		1668	return true;
		1669
		1670	nr = min (nr, nrof);
		1671
		1672	if (nrof > nr)
		1673	{
		1674	sint64 oweight = total_weight ();
		1675
		1676	nrof -= nr;
		1677
		1678	if (object *pl = visible_to ())
		1679	esrv_update_item (UPD_NROF, pl, this);
		1680
		1681	adjust_weight (env, oweight, total_weight ());
		1682
		1683	return true;
		1684	}
		1685	else
		1686	{
		1687	destroy ();
		1688	return false;
		1689	}
		1690	}
		1691
		1692	/*
		1693	* split(ob,nr) splits up ob into two parts. The part which
		1694	* is returned contains nr objects, and the remaining parts contains
		1695	* the rest (or is removed and returned if that number is 0).
		1696	* On failure, NULL is returned.
		1697	*/
1539	object *	1698	object *
1540	decrease_ob_nr (object *op, uint32 i)	1699	object::split (sint32 nr)
1541	{	1700	{
1542	object *tmp;	1701	int have = number_of ();
1543		1702
1544	if (i == 0) /* objects with op->nrof require this check */	1703	if (have < nr)
1545	return op;	1704	return 0;
1546		1705	else if (have == nr)
1547	if (i > op->nrof)
1548	i = op->nrof;
1549
1550	if (QUERY_FLAG (op, FLAG_REMOVED))
1551	op->nrof -= i;
1552	else if (op->env)
1553	{	1706	{
1554	/* is this object in the players inventory, or sub container
1555	* therein?
1556	*/
1557	tmp = op->in_player ();
1558	/* nope. Is this a container the player has opened?
1559	* If so, set tmp to that player.
1560	* IMO, searching through all the players will mostly
1561	* likely be quicker than following op->env to the map,
1562	* and then searching the map for a player.
1563	*/
1564	if (!tmp)
1565	for_all_players (pl)
1566	if (pl->ob->container == op->env)
1567	{
1568	tmp = pl->ob;
1569	break;
1570	}
1571
1572	if (i < op->nrof)
1573	{
1574	sub_weight (op->env, op->weight * i);
1575	op->nrof -= i;
1576	if (tmp)
1577	esrv_send_item (tmp, op);
1578	}
1579	else
1580	{
1581	op->remove ();	1707	remove ();
1582	op->nrof = 0;	1708	return this;
1583	if (tmp)
1584	esrv_del_item (tmp->contr, op->count);
1585	}
1586	}	1709	}
1587	else	1710	else
1588	{	1711	{
1589	object *above = op->above;	1712	decrease (nr);
1590		1713
1591	if (i < op->nrof)	1714	object *op = deep_clone ();
1592	op->nrof -= i;	1715	op->nrof = nr;
1593	else
1594	{
1595	op->remove ();
1596	op->nrof = 0;
1597	}
1598
1599	/* Since we just removed op, op->above is null */
1600	for (tmp = above; tmp; tmp = tmp->above)
1601	if (tmp->type == PLAYER)
1602	{
1603	if (op->nrof)
1604	esrv_send_item (tmp, op);
1605	else
1606	esrv_del_item (tmp->contr, op->count);
1607	}
1608	}
1609
1610	if (op->nrof)
1611	return op;	1716	return op;
1612	else
1613	{
1614	op->destroy ();
1615	return 0;
1616	}
1617	}
1618
1619	/*
1620	* add_weight(object, weight) adds the specified weight to an object,
1621	* and also updates how much the environment(s) is/are carrying.
1622	*/
1623	void
1624	add_weight (object *op, signed long weight)
1625	{
1626	while (op != NULL)
1627	{
1628	if (op->type == CONTAINER)
1629	weight = (signed long) (weight * (100 - op->stats.Str) / 100);
1630
1631	op->carrying += weight;
1632	op = op->env;
1633	}	1717	}
1634	}	1718	}
1635		1719
1636	object *	1720	object *
1637	insert_ob_in_ob (object *op, object *where)	1721	insert_ob_in_ob (object *op, object *where)
…		…
1662	* be != op, if items are merged. -Tero	1746	* be != op, if items are merged. -Tero
1663	*/	1747	*/
1664	object *	1748	object *
1665	object::insert (object *op)	1749	object::insert (object *op)
1666	{	1750	{
1667	if (!QUERY_FLAG (op, FLAG_REMOVED))
1668	op->remove ();
1669
1670	if (op->more)	1751	if (op->more)
1671	{	1752	{
1672	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);	1753	LOG (llevError, "Tried to insert multipart object %s (%d)\n", &op->name, op->count);
1673	return op;	1754	return op;
1674	}	1755	}
1675		1756
1676	CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);	1757	op->remove ();
1677	CLEAR_FLAG (op, FLAG_REMOVED);	1758
		1759	op->flag [FLAG_OBJ_ORIGINAL] = 0;
1678		1760
1679	if (op->nrof)	1761	if (op->nrof)
1680	{
1681	for (object *tmp = inv; tmp; tmp = tmp->below)	1762	for (object *tmp = inv; tmp; tmp = tmp->below)
1682	if (object::can_merge (tmp, op))	1763	if (object::can_merge (tmp, op))
1683	{	1764	{
1684	/* return the original object and remove inserted object	1765	/* return the original object and remove inserted object
1685	(client needs the original object) */	1766	(client prefers the original object) */
		1767
		1768	// carring must be 0 for mergable objects
		1769	sint64 oweight = tmp->weight * tmp->nrof;
		1770
1686	tmp->nrof += op->nrof;	1771	tmp->nrof += op->nrof;
1687	/* Weight handling gets pretty funky. Since we are adding to	1772
1688	* tmp->nrof, we need to increase the weight.	1773	if (object *pl = tmp->visible_to ())
1689	*/	1774	esrv_update_item (UPD_NROF, pl, tmp);
		1775
1690	add_weight (this, op->weight * op->nrof);	1776	adjust_weight (this, oweight, tmp->weight * tmp->nrof);
1691	SET_FLAG (op, FLAG_REMOVED);	1777
1692	op->destroy (); /* free the inserted object */	1778	op->destroy ();
1693	op = tmp;	1779	op = tmp;
1694	op->remove (); /* and fix old object's links */	1780	goto inserted;
1695	CLEAR_FLAG (op, FLAG_REMOVED);
1696	break;
1697	}	1781	}
1698		1782
1699	/* I assume combined objects have no inventory
1700	* We add the weight - this object could have just been removed
1701	* (if it was possible to merge). calling remove_ob will subtract
1702	* the weight, so we need to add it in again, since we actually do
1703	* the linking below
1704	*/
1705	add_weight (this, op->weight * op->nrof);
1706	}
1707	else
1708	add_weight (this, (op->weight + op->carrying));
1709
1710	if (object *otmp = this->in_player ())
1711	if (otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
1712	otmp->update_stats ();
1713
1714	op->owner = 0; // its his/hers now. period.	1783	op->owner = 0; // it's his/hers now. period.
1715	op->map = 0;	1784	op->map = 0;
		1785	op->x = 0;
		1786	op->y = 0;
		1787
		1788	op->above = 0;
		1789	op->below = inv;
1716	op->env = this;	1790	op->env = this;
1717	op->above = 0;
1718	op->below = 0;
1719	op->x = op->y = 0;
1720		1791
		1792	if (inv)
		1793	inv->above = op;
		1794
		1795	inv = op;
		1796
		1797	op->flag [FLAG_REMOVED] = 0;
		1798
		1799	if (object *pl = op->visible_to ())
		1800	esrv_send_item (pl, op);
		1801
		1802	adjust_weight (this, 0, op->total_weight ());
		1803
		1804	inserted:
1721	/* reset the light list and los of the players on the map */	1805	/* reset the light list and los of the players on the map */
1722	if (op->glow_radius && map)	1806	if (op->glow_radius && is_on_map ())
1723	{	1807	{
1724	#ifdef DEBUG_LIGHTS	1808	update_stats ();
1725	LOG (llevDebug, " insert_ob_in_ob(): got %s to insert in map/op\n", op->name);
1726	#endif /* DEBUG_LIGHTS */
1727	if (map->darkness)
1728	update_all_los (map, x, y);	1809	update_all_los (map, x, y);
1729	}
1730
1731	/* Client has no idea of ordering so lets not bother ordering it here.
1732	* It sure simplifies this function...
1733	*/
1734	if (!inv)
1735	inv = op;
1736	else
1737	{	1810	}
1738	op->below = inv;	1811	else if (is_player ())
1739	op->below->above = op;	1812	// if this is a player's inventory, update stats
1740	inv = op;	1813	contr->queue_stats_update ();
1741	}
1742		1814
1743	INVOKE_OBJECT (INSERT, this);	1815	INVOKE_OBJECT (INSERT, this);
1744		1816
1745	return op;	1817	return op;
1746	}	1818	}
…		…
1764	* MSW 2001-07-08: Check all objects on space, not just those below	1836	* MSW 2001-07-08: Check all objects on space, not just those below
1765	* object being inserted. insert_ob_in_map may not put new objects	1837	* object being inserted. insert_ob_in_map may not put new objects
1766	* on top.	1838	* on top.
1767	*/	1839	*/
1768	int	1840	int
1769	check_move_on (object *op, object *originator)	1841	check_move_on (object *op, object *originator, int flags)
1770	{	1842	{
		1843	if (op->flag [FLAG_NO_APPLY])
		1844	return 0;
		1845
1771	object *tmp;	1846	object *tmp;
1772	maptile *m = op->map;	1847	maptile *m = op->map;
1773	int x = op->x, y = op->y;	1848	int x = op->x, y = op->y;
1774		1849
1775	MoveType move_on, move_slow, move_block;	1850	mapspace &ms = m->at (x, y);
1776		1851
1777	if (QUERY_FLAG (op, FLAG_NO_APPLY))	1852	ms.update ();
1778	return 0;
1779		1853
1780	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);	1854	MoveType move_on = ms.move_on;
1781	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);	1855	MoveType move_slow = ms.move_slow;
1782	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);	1856	MoveType move_block = ms.move_block;
1783		1857
1784	/* if nothing on this space will slow op down or be applied,	1858	/* if nothing on this space will slow op down or be applied,
1785	* no need to do checking below. have to make sure move_type	1859	* no need to do checking below. have to make sure move_type
1786	* is set, as lots of objects don't have it set - we treat that	1860	* is set, as lots of objects don't have it set - we treat that
1787	* as walking.	1861	* as walking.
…		…
1798	return 0;	1872	return 0;
1799		1873
1800	/* The objects have to be checked from top to bottom.	1874	/* The objects have to be checked from top to bottom.
1801	* Hence, we first go to the top:	1875	* Hence, we first go to the top:
1802	*/	1876	*/
1803		1877	for (object *next, *tmp = ms.top; tmp; tmp = next)
1804	for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above)
1805	{
1806	/* Trim the search when we find the first other spell effect
1807	* this helps performance so that if a space has 50 spell objects,
1808	* we don't need to check all of them.
1809	*/
1810	if ((tmp->move_type & MOVE_FLY_LOW) && QUERY_FLAG (tmp, FLAG_NO_PICK))
1811	break;
1812	}	1878	{
		1879	next = tmp->below;
1813		1880
1814	for (; tmp; tmp = tmp->below)
1815	{
1816	if (tmp == op)	1881	if (tmp == op)
1817	continue; /* Can't apply yourself */	1882	continue; /* Can't apply yourself */
1818		1883
1819	/* Check to see if one of the movement types should be slowed down.	1884	/* Check to see if one of the movement types should be slowed down.
1820	* Second check makes sure that the movement types not being slowed	1885	* Second check makes sure that the movement types not being slowed
1821	* (~slow_move) is not blocked on this space - just because the	1886	* (~slow_move) is not blocked on this space - just because the
1822	* space doesn't slow down swimming (for example), if you can't actually	1887	* space doesn't slow down swimming (for example), if you can't actually
1823	* swim on that space, can't use it to avoid the penalty.	1888	* swim on that space, can't use it to avoid the penalty.
1824	*/	1889	*/
1825	if (!QUERY_FLAG (op, FLAG_WIZPASS))	1890	if (!op->flag [FLAG_WIZPASS])
1826	{	1891	{
1827	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||	1892	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
1828	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))	1893	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1829	{	1894	{
1830
1831	float
1832	diff = tmp->move_slow_penalty * fabs (op->speed);	1895	float diff = tmp->move_slow_penalty * fabs (op->speed);
1833		1896
1834	if (op->type == PLAYER)	1897	if (op->is_player ())
1835	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||	1898	if ((tmp->flag [FLAG_IS_HILLY ] && find_skill_by_number (op, SK_CLIMBING)) ||
1836	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))	1899	(tmp->flag [FLAG_IS_WOODED] && find_skill_by_number (op, SK_WOODSMAN)))
1837	diff /= 4.0;	1900	diff /= 4.0;
1838		1901
1839	op->speed_left -= diff;	1902	op->speed_left -= diff;
1840	}	1903	}
1841	}	1904	}
1842		1905
1843	/* Basically same logic as above, except now for actual apply. */	1906	/* Basically same logic as above, except now for actual apply. */
1844	if ((!op->move_type && tmp->move_on & MOVE_WALK) ||	1907	if ((!op->move_type && tmp->move_on & MOVE_WALK) ||
1845	((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))	1908	((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))
1846	{	1909	{
		1910	if ((flags & INS_NO_AUTO_EXIT)
		1911	&& (tmp->type == EXIT || tmp->type == TELEPORTER
		1912	|| tmp->type == HOLE || tmp->type == TRAPDOOR)) //TODO: temporary, fix exits instead
		1913	continue;
		1914
1847	move_apply (tmp, op, originator);	1915	move_apply (tmp, op, originator);
1848		1916
1849	if (op->destroyed ())	1917	if (op->destroyed ())
1850	return 1;	1918	return 1;
1851		1919
…		…
1874	LOG (llevError, "Present_arch called outside map.\n");	1942	LOG (llevError, "Present_arch called outside map.\n");
1875	return NULL;	1943	return NULL;
1876	}	1944	}
1877		1945
1878	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)	1946	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1879	if (tmp->arch == at)	1947	if (tmp->arch->archname == at->archname)
1880	return tmp;	1948	return tmp;
1881		1949
1882	return NULL;	1950	return NULL;
1883	}	1951	}
1884		1952
…		…
1948	* The first matching object is returned, or NULL if none.	2016	* The first matching object is returned, or NULL if none.
1949	*/	2017	*/
1950	object *	2018	object *
1951	present_arch_in_ob (const archetype *at, const object *op)	2019	present_arch_in_ob (const archetype *at, const object *op)
1952	{	2020	{
1953	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)	2021	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1954	if (tmp->arch == at)	2022	if (tmp->arch->archname == at->archname)
1955	return tmp;	2023	return tmp;
1956		2024
1957	return NULL;	2025	return NULL;
1958	}	2026	}
1959		2027
…		…
1963	void	2031	void
1964	flag_inv (object *op, int flag)	2032	flag_inv (object *op, int flag)
1965	{	2033	{
1966	for (object *tmp = op->inv; tmp; tmp = tmp->below)	2034	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1967	{	2035	{
1968	SET_FLAG (tmp, flag);	2036	tmp->set_flag (flag);
1969	flag_inv (tmp, flag);	2037	flag_inv (tmp, flag);
1970	}	2038	}
1971	}	2039	}
1972		2040
1973	/*	2041	/*
…		…
1976	void	2044	void
1977	unflag_inv (object *op, int flag)	2045	unflag_inv (object *op, int flag)
1978	{	2046	{
1979	for (object *tmp = op->inv; tmp; tmp = tmp->below)	2047	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1980	{	2048	{
1981	CLEAR_FLAG (tmp, flag);	2049	tmp->clr_flag (flag);
1982	unflag_inv (tmp, flag);	2050	unflag_inv (tmp, flag);
1983	}	2051	}
1984	}	2052	}
1985		2053
1986	/*	2054	/*
…		…
2047	* head of the object should correspond for the entire object.	2115	* head of the object should correspond for the entire object.
2048	*/	2116	*/
2049	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))	2117	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
2050	continue;	2118	continue;
2051		2119
2052	if (ob->blocked (m, pos.x, pos.y))	2120	if (ob->blocked (pos.m, pos.x, pos.y))
2053	continue;	2121	continue;
2054		2122
2055	altern [index++] = i;	2123	altern [index++] = i;
2056	}	2124	}
2057		2125
…		…
2125	* there is capable of.	2193	* there is capable of.
2126	*/	2194	*/
2127	int	2195	int
2128	find_dir (maptile *m, int x, int y, object *exclude)	2196	find_dir (maptile *m, int x, int y, object *exclude)
2129	{	2197	{
2130	int i, max = SIZEOFFREE, mflags;	2198	int max = SIZEOFFREE, mflags;
2131
2132	sint16 nx, ny;
2133	object *tmp;
2134	maptile *mp;
2135
2136	MoveType blocked, move_type;	2199	MoveType move_type;
2137		2200
2138	if (exclude && exclude->head_ () != exclude)	2201	if (exclude && exclude->head_ () != exclude)
2139	{	2202	{
2140	exclude = exclude->head;	2203	exclude = exclude->head;
2141	move_type = exclude->move_type;	2204	move_type = exclude->move_type;
…		…
2144	{	2207	{
2145	/* If we don't have anything, presume it can use all movement types. */	2208	/* If we don't have anything, presume it can use all movement types. */
2146	move_type = MOVE_ALL;	2209	move_type = MOVE_ALL;
2147	}	2210	}
2148		2211
2149	for (i = 1; i < max; i++)	2212	for (int i = 1; i < max; i++)
2150	{	2213	{
2151	mp = m;	2214	mapxy pos (m, x, y);
2152	nx = x + freearr_x[i];	2215	pos.move (i);
2153	ny = y + freearr_y[i];
2154		2216
2155	mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);	2217	if (!pos.normalise ())
2156
2157	if (mflags & P_OUT_OF_MAP)
2158	max = maxfree[i];	2218	max = maxfree[i];
2159	else	2219	else
2160	{	2220	{
2161	mapspace &ms = mp->at (nx, ny);	2221	mapspace &ms = *pos;
2162		2222
2163	blocked = ms.move_block;
2164
2165	if ((move_type & blocked) == move_type)	2223	if ((move_type & ms.move_block) == move_type)
2166	max = maxfree[i];	2224	max = maxfree [i];
2167	else if (mflags & P_IS_ALIVE)	2225	else if (ms.flags () & P_IS_ALIVE)
2168	{	2226	{
2169	for (tmp = ms.bot; tmp; tmp = tmp->above)	2227	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
2170	if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)	2228	if ((tmp->flag [FLAG_MONSTER] || tmp->is_player ())
2171	&& (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))	2229	&& (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2172	break;
2173
2174	if (tmp)
2175	return freedir[i];	2230	return freedir [i];
2176	}	2231	}
2177	}	2232	}
2178	}	2233	}
2179		2234
2180	return 0;	2235	return 0;
…		…
2189	{	2244	{
2190	return (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);	2245	return (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);
2191	}	2246	}
2192		2247
2193	/*	2248	/*
2194	* find_dir_2(delta-x,delta-y) will return a direction in which	2249	* find_dir_2(delta-x,delta-y) will return a direction value
2195	* an object which has subtracted the x and y coordinates of another	2250	* for running into direct [dx, dy].
2196	* object, needs to travel toward it.	2251	* (the opposite of crossfire's find_dir_2!)
2197	*/	2252	*/
2198	int	2253	int
2199	find_dir_2 (int x, int y)	2254	find_dir_2 (int x, int y)
2200	{	2255	{
		2256	#if 1 // new algorithm
		2257	// this works by putting x, y into 16 sectors, which
		2258	// are not equal sized, but are a better approximation
		2259	// then the old algorithm, and then using a mapping
		2260	// table to map it into a direction value.
		2261	// basically, it maps these comparisons to each bit
		2262	// bit #3: x < 0
		2263	// bit #2: y < 0
		2264	// bit #1: x > y
		2265	// bit #0: x > 2y
		2266
		2267	static const uint8 dir[16] = {
		2268	4, 5, 4, 3,
		2269	2, 1, 2, 3,
		2270	6, 5, 6, 7,
		2271	8, 1, 8, 7,
		2272	};
		2273	int sector = 0;
		2274
		2275	// this is a bit ugly, but more likely to result in branchless code
		2276	sector |= x < 0 ? 8 : 0;
		2277	x = x < 0 ? -x : x; // abs
		2278
		2279	sector |= y < 0 ? 4 : 0;
		2280	y = y < 0 ? -y : y; // abs
		2281
		2282	if (x > y)
		2283	{
		2284	sector |= 2;
		2285
		2286	if (x > y * 2)
		2287	sector |= 1;
		2288	}
		2289	else
		2290	{
		2291	if (y > x * 2)
		2292	sector |= 1;
		2293	else if (!y)
		2294	return 0; // x == 0 here
		2295	}
		2296
		2297	return dir [sector];
		2298	#else // old algorithm
2201	int q;	2299	int q;
2202		2300
2203	if (y)	2301	if (y)
2204	q = x * 100 / y;	2302	q = 128 * x / y;
2205	else if (x)	2303	else if (x)
2206	q = -300 * x;	2304	q = -512 * x; // to make it > 309
2207	else	2305	else
2208	return 0;	2306	return 0;
2209		2307
2210	if (y > 0)	2308	if (y > 0)
2211	{	2309	{
2212	if (q < -242)	2310	if (q < -309) return 7;
		2311	if (q < -52) return 6;
		2312	if (q < 52) return 5;
		2313	if (q < 309) return 4;
		2314
2213	return 3;	2315	return 3;
2214	if (q < -41)	2316	}
2215	return 2;	2317	else
2216	if (q < 41)	2318	{
2217	return 1;	2319	if (q < -309) return 3;
2218	if (q < 242)	2320	if (q < -52) return 2;
2219	return 8;	2321	if (q < 52) return 1;
		2322	if (q < 309) return 8;
		2323
2220	return 7;	2324	return 7;
2221	}	2325	}
2222		2326	#endif
2223	if (q < -242)
2224	return 7;
2225	if (q < -41)
2226	return 6;
2227	if (q < 41)
2228	return 5;
2229	if (q < 242)
2230	return 4;
2231
2232	return 3;
2233	}	2327	}
2234		2328
2235	/*	2329	/*
2236	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is	2330	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is
2237	* between two directions (which are expected to be absolute (see absdir())	2331	* between two directions (which are expected to be absolute (see absdir())
2238	*/	2332	*/
2239	int	2333	int
2240	dirdiff (int dir1, int dir2)	2334	dirdiff (int dir1, int dir2)
2241	{	2335	{
2242	int d;
2243
2244	d = abs (dir1 - dir2);	2336	int d = abs (dir1 - dir2);
2245	if (d > 4)
2246	d = 8 - d;
2247		2337
2248	return d;	2338	return d > 4 ? 8 - d : d;
2249	}	2339	}
2250		2340
2251	/* peterm:	2341	/* peterm:
2252	* do LOS stuff for ball lightning. Go after the closest VISIBLE monster.	2342	* do LOS stuff for ball lightning. Go after the closest VISIBLE monster.
2253	* Basically, this is a table of directions, and what directions	2343	* Basically, this is a table of directions, and what directions
…		…
2255	* This basically means that if direction is 15, then it could either go	2345	* This basically means that if direction is 15, then it could either go
2256	* direction 4, 14, or 16 to get back to where we are.	2346	* direction 4, 14, or 16 to get back to where we are.
2257	* Moved from spell_util.c to object.c with the other related direction	2347	* Moved from spell_util.c to object.c with the other related direction
2258	* functions.	2348	* functions.
2259	*/	2349	*/
2260	int reduction_dir[SIZEOFFREE][3] = {	2350	static const int reduction_dir[SIZEOFFREE][3] = {
2261	{0, 0, 0}, /* 0 */	2351	{0, 0, 0}, /* 0 */
2262	{0, 0, 0}, /* 1 */	2352	{0, 0, 0}, /* 1 */
2263	{0, 0, 0}, /* 2 */	2353	{0, 0, 0}, /* 2 */
2264	{0, 0, 0}, /* 3 */	2354	{0, 0, 0}, /* 3 */
2265	{0, 0, 0}, /* 4 */	2355	{0, 0, 0}, /* 4 */
…		…
2359	* Add a check so we can't pick up invisible objects (0.93.8)	2449	* Add a check so we can't pick up invisible objects (0.93.8)
2360	*/	2450	*/
2361	int	2451	int
2362	can_pick (const object *who, const object *item)	2452	can_pick (const object *who, const object *item)
2363	{	2453	{
2364	return /*QUERY_FLAG(who,FLAG_WIZ)|| */	2454	return /*who->flag [FLAG_WIZ]|| */
2365	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&	2455	(item->weight > 0 && !item->flag [FLAG_NO_PICK] &&
2366	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3));	2456	!item->flag [FLAG_ALIVE] && !item->invisible && (who->is_player () || item->weight < who->weight / 3));
2367	}	2457	}
2368		2458
2369	/*	2459	/*
2370	* create clone from object to another	2460	* create clone from object to another
2371	*/	2461	*/
2372	object *	2462	object *
2373	object_create_clone (object *asrc)	2463	object::deep_clone ()
2374	{	2464	{
2375	object *dst = 0, *tmp, *src, *prev, *item;	2465	assert (("deep_clone called on non-head object", is_head ()));
2376		2466
2377	if (!asrc)	2467	object *dst = clone ();
2378	return 0;
2379		2468
2380	src = asrc->head_ ();	2469	object *prev = dst;
2381
2382	prev = 0;
2383	for (object *part = src; part; part = part->more)	2470	for (object *part = this->more; part; part = part->more)
2384	{	2471	{
2385	tmp = part->clone ();	2472	object *tmp = part->clone ();
2386	tmp->x -= src->x;
2387	tmp->y -= src->y;
2388
2389	if (!part->head)
2390	{
2391	dst = tmp;
2392	tmp->head = 0;
2393	}
2394	else
2395	tmp->head = dst;	2473	tmp->head = dst;
2396
2397	tmp->more = 0;
2398
2399	if (prev)
2400	prev->more = tmp;	2474	prev->more = tmp;
2401
2402	prev = tmp;	2475	prev = tmp;
2403	}	2476	}
2404		2477
2405	for (item = src->inv; item; item = item->below)	2478	for (object *item = inv; item; item = item->below)
2406	insert_ob_in_ob (object_create_clone (item), dst);	2479	insert_ob_in_ob (item->deep_clone (), dst);
2407		2480
2408	return dst;	2481	return dst;
2409	}	2482	}
2410		2483
2411	/* This returns the first object in who's inventory that	2484	/* This returns the first object in who's inventory that
…		…
2420	return tmp;	2493	return tmp;
2421		2494
2422	return 0;	2495	return 0;
2423	}	2496	}
2424		2497
2425	/* If ob has a field named key, return the link from the list,	2498	shstr_tmp
2426	* otherwise return NULL.	2499	object::kv_get (shstr_tmp key) const
2427	*
2428	* key must be a passed in shared string - otherwise, this won't
2429	* do the desired thing.
2430	*/
2431	key_value *
2432	get_ob_key_link (const object *ob, const char *key)
2433	{	2500	{
2434	for (key_value *link = ob->key_values; link; link = link->next)	2501	for (key_value *kv = key_values; kv; kv = kv->next)
2435	if (link->key == key)	2502	if (kv->key == key)
2436	return link;
2437
2438	return 0;
2439	}
2440
2441	/*
2442	* Returns the value of op has an extra_field for key, or NULL.
2443	*
2444	* The argument doesn't need to be a shared string.
2445	*
2446	* The returned string is shared.
2447	*/
2448	const char *
2449	get_ob_key_value (const object *op, const char *const key)
2450	{
2451	key_value *link;
2452	shstr_cmp canonical_key (key);
2453
2454	if (!canonical_key)
2455	{
2456	/* 1. There being a field named key on any object
2457	* implies there'd be a shared string to find.
2458	* 2. Since there isn't, no object has this field.
2459	* 3. Therefore, *this* object doesn't have this field.
2460	*/
2461	return 0;
2462	}
2463
2464	/* This is copied from get_ob_key_link() above -
2465	* only 4 lines, and saves the function call overhead.
2466	*/
2467	for (link = op->key_values; link; link = link->next)
2468	if (link->key == canonical_key)
2469	return link->value;	2503	return kv->value;
2470		2504
2471	return 0;	2505	return shstr ();
2472	}	2506	}
2473		2507
2474	/*	2508	void
2475	* Updates the canonical_key in op to value.	2509	object::kv_set (shstr_tmp key, shstr_tmp value)
2476	*
2477	* canonical_key is a shared string (value doesn't have to be).
2478	*
2479	* Unless add_key is TRUE, it won't add fields, only change the value of existing
2480	* keys.
2481	*
2482	* Returns TRUE on success.
2483	*/
2484	int
2485	set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key)
2486	{	2510	{
2487	key_value *field = NULL, *last = NULL;	2511	for (key_value *kv = key_values; kv; kv = kv->next)
2488		2512	if (kv->key == key)
2489	for (field = op->key_values; field != NULL; field = field->next)
2490	{
2491	if (field->key != canonical_key)
2492	{	2513	{
2493	last = field;	2514	kv->value = value;
2494	continue;	2515	return;
2495	}	2516	}
2496		2517
2497	if (value)	2518	key_value *kv = new key_value;
2498	field->value = value;	2519
2499	else	2520	kv->next = key_values;
		2521	kv->key = key;
		2522	kv->value = value;
		2523
		2524	key_values = kv;
		2525	}
		2526
		2527	void
		2528	object::kv_del (shstr_tmp key)
		2529	{
		2530	for (key_value **kvp = &key_values; *kvp; kvp = &(*kvp)->next)
		2531	if ((*kvp)->key == key)
2500	{	2532	{
2501	/* Basically, if the archetype has this key set,	2533	key_value *kv = *kvp;
2502	* we need to store the null value so when we save	2534	*kvp = (*kvp)->next;
2503	* it, we save the empty value so that when we load,	2535	delete kv;
2504	* we get this value back again.	2536	return;
2505	*/
2506	if (get_ob_key_link (op->arch, canonical_key))
2507	field->value = 0;
2508	else
2509	{
2510	if (last)
2511	last->next = field->next;
2512	else
2513	op->key_values = field->next;
2514
2515	delete field;
2516	}
2517	}	2537	}
2518	return TRUE;
2519	}
2520	/* IF we get here, key doesn't exist */
2521
2522	/* No field, we'll have to add it. */
2523
2524	if (!add_key)
2525	return FALSE;
2526
2527	/* There isn't any good reason to store a null
2528	* value in the key/value list. If the archetype has
2529	* this key, then we should also have it, so shouldn't
2530	* be here. If user wants to store empty strings,
2531	* should pass in ""
2532	*/
2533	if (value == NULL)
2534	return TRUE;
2535
2536	field = new key_value;
2537
2538	field->key = canonical_key;
2539	field->value = value;
2540	/* Usual prepend-addition. */
2541	field->next = op->key_values;
2542	op->key_values = field;
2543
2544	return TRUE;
2545	}
2546
2547	/*
2548	* Updates the key in op to value.
2549	*
2550	* If add_key is FALSE, this will only update existing keys,
2551	* and not add new ones.
2552	* In general, should be little reason FALSE is ever passed in for add_key
2553	*
2554	* Returns TRUE on success.
2555	*/
2556	int
2557	set_ob_key_value (object *op, const char *key, const char *value, int add_key)
2558	{
2559	shstr key_ (key);
2560
2561	return set_ob_key_value_s (op, key_, value, add_key);
2562	}	2538	}
2563		2539
2564	object::depth_iterator::depth_iterator (object *container)	2540	object::depth_iterator::depth_iterator (object *container)
2565	: iterator_base (container)	2541	: iterator_base (container)
2566	{	2542	{
…		…
2616	{	2592	{
2617	char flagdesc[512];	2593	char flagdesc[512];
2618	char info2[256 * 4];	2594	char info2[256 * 4];
2619	char *p = info;	2595	char *p = info;
2620		2596
2621	p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s,flags:[%s],type:%d}",	2597	p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s%s,flags:[%s],type:%d}",
2622	count,	2598	count,
2623	uuid.c_str (),	2599	uuid.c_str (),
2624	&name,	2600	&name,
2625	title ? "\",title:\"" : "",	2601	title ? ",title:\"" : "",
2626	title ? (const char *)title : "",	2602	title ? (const char *)title : "",
		2603	title ? "\"" : "",
2627	flag_desc (flagdesc, 512), type);	2604	flag_desc (flagdesc, 512), type);
2628		2605
2629	if (!this->flag[FLAG_REMOVED] && env)	2606	if (!flag[FLAG_REMOVED] && env)
2630	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2607	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2631		2608
2632	if (map)	2609	if (map)
2633	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);	2610	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2634		2611
…		…
2649	{	2626	{
2650	return map ? map->region (x, y)	2627	return map ? map->region (x, y)
2651	: region::default_region ();	2628	: region::default_region ();
2652	}	2629	}
2653		2630
2654	const materialtype_t *
2655	object::dominant_material () const
2656	{
2657	if (materialtype_t *mt = name_to_material (materialname))
2658	return mt;
2659
2660	return name_to_material (shstr_unknown);
2661	}
2662
2663	void	2631	void
2664	object::open_container (object *new_container)	2632	object::open_container (object *new_container)
2665	{	2633	{
2666	if (container == new_container)	2634	if (container == new_container)
2667	return;	2635	return;
2668		2636
2669	if (object *old_container = container)	2637	object *old_container = container;
		2638
		2639	if (old_container)
2670	{	2640	{
2671	if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))	2641	if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
2672	return;	2642	return;
2673		2643
2674	#if 0	2644	#if 0
…		…
2676	if (object *closer = old_container->inv)	2646	if (object *closer = old_container->inv)
2677	if (closer->type == CLOSE_CON)	2647	if (closer->type == CLOSE_CON)
2678	closer->destroy ();	2648	closer->destroy ();
2679	#endif	2649	#endif
2680		2650
		2651	// make sure the container is available
		2652	esrv_send_item (this, old_container);
		2653
2681	old_container->flag [FLAG_APPLIED] = 0;	2654	old_container->flag [FLAG_APPLIED] = false;
2682	container = 0;	2655	container = 0;
2683		2656
		2657	// client needs item update to make it work, client bug requires this to be separate
2684	esrv_update_item (UPD_FLAGS, this, old_container);	2658	esrv_update_item (UPD_FLAGS, this, old_container);
		2659
2685	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));	2660	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", old_container->query_name ());
2686	play_sound (sound_find ("chest_close"));	2661	play_sound (sound_find ("chest_close"));
2687	}	2662	}
2688		2663
2689	if (new_container)	2664	if (new_container)
2690	{	2665	{
…		…
2694	// TODO: this does not seem to serve any purpose anymore?	2669	// TODO: this does not seem to serve any purpose anymore?
2695	#if 0	2670	#if 0
2696	// insert the "Close Container" object.	2671	// insert the "Close Container" object.
2697	if (archetype *closer = new_container->other_arch)	2672	if (archetype *closer = new_container->other_arch)
2698	{	2673	{
2699	object *closer = arch_to_object (new_container->other_arch);	2674	object *closer = new_container->other_arch->instance ();
2700	closer->flag [FLAG_NO_MAP_SAVE] = 1;	2675	closer->flag [FLAG_NO_MAP_SAVE] = 1;
2701	new_container->insert (closer);	2676	new_container->insert (closer);
2702	}	2677	}
2703	#endif	2678	#endif
2704		2679
2705	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));	2680	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", new_container->query_name ());
2706		2681
		2682	// make sure the container is available, client bug requires this to be separate
		2683	esrv_send_item (this, new_container);
		2684
2707	new_container->flag [FLAG_APPLIED] = 1;	2685	new_container->flag [FLAG_APPLIED] = true;
2708	container = new_container;	2686	container = new_container;
2709		2687
		2688	// client needs flag change
2710	esrv_update_item (UPD_FLAGS, this, new_container);	2689	esrv_update_item (UPD_FLAGS, this, new_container);
2711	esrv_send_inventory (this, new_container);	2690	esrv_send_inventory (this, new_container);
2712	play_sound (sound_find ("chest_open"));	2691	play_sound (sound_find ("chest_open"));
2713	}	2692	}
		2693	// else if (!old_container->env && contr && contr->ns)
		2694	// contr->ns->floorbox_reset ();
2714	}	2695	}
2715		2696
2716	object *	2697	object *
2717	object::force_find (const shstr name)	2698	object::force_find (shstr_tmp name)
2718	{	2699	{
2719	/* cycle through his inventory to look for the MARK we want to	2700	/* cycle through his inventory to look for the MARK we want to
2720	* place	2701	* place
2721	*/	2702	*/
2722	for (object *tmp = inv; tmp; tmp = tmp->below)	2703	for (object *tmp = inv; tmp; tmp = tmp->below)
…		…
2724	return splay (tmp);	2705	return splay (tmp);
2725		2706
2726	return 0;	2707	return 0;
2727	}	2708	}
2728		2709
		2710	//-GPL
		2711
2729	void	2712	void
		2713	object::force_set_timer (int duration)
		2714	{
		2715	this->duration = 1;
		2716	this->speed_left = -1.f;
		2717
		2718	this->set_speed (duration ? 1.f / duration : 0.f);
		2719	}
		2720
		2721	object *
2730	object::force_add (const shstr name, int duration)	2722	object::force_add (shstr_tmp name, int duration)
2731	{	2723	{
2732	if (object *force = force_find (name))	2724	if (object *force = force_find (name))
2733	force->destroy ();	2725	force->destroy ();
2734		2726
2735	object *force = get_archetype (FORCE_NAME);	2727	object *force = get_archetype (FORCE_NAME);
2736		2728
2737	force->slaying = name;	2729	force->slaying = name;
2738	force->stats.food = 1;	2730	force->force_set_timer (duration);
2739	force->speed_left = -1.f;
2740
2741	force->set_speed (duration ? 1.f / duration : 0.f);
2742	force->flag [FLAG_IS_USED_UP] = true;
2743	force->flag [FLAG_APPLIED] = true;	2731	force->flag [FLAG_APPLIED] = true;
2744		2732
2745	insert (force);	2733	return insert (force);
2746	}	2734	}
2747		2735
2748	void	2736	void
2749	object::play_sound (faceidx sound) const	2737	object::play_sound (faceidx sound) const
2750	{	2738	{
2751	if (!sound)	2739	if (!sound)
2752	return;	2740	return;
2753		2741
2754	if (flag [FLAG_REMOVED])	2742	if (is_on_map ())
		2743	map->play_sound (sound, x, y);
		2744	else if (object *pl = in_player ())
		2745	pl->contr->play_sound (sound);
		2746	}
		2747
		2748	void
		2749	object::say_msg (const char *msg) const
		2750	{
		2751	if (is_on_map ())
		2752	map->say_msg (msg, x, y);
		2753	else if (object *pl = in_player ())
		2754	pl->contr->play_sound (sound);
		2755	}
		2756
		2757	void
		2758	object::make_noise ()
		2759	{
		2760	// we do not model noise in the map, so instead put
		2761	// a temporary light into the noise source
		2762	// could use the map instead, but that's less reliable for our
		2763	// goal, which is to make invisibility a bit harder to exploit
		2764
		2765	// currently only works sensibly for players
		2766	if (!is_player ())
2755	return;	2767	return;
2756		2768
2757	if (env)	2769	// find old force, or create new one
2758	{	2770	object *force = force_find (shstr_noise_force);
2759	if (object *pl = in_player ())	2771
2760	pl->contr->play_sound (sound);	2772	if (force)
2761	}	2773	force->speed_left = -1.f; // patch old speed up
2762	else	2774	else
2763	map->play_sound (sound, x, y);	2775	{
2764	}	2776	force = archetype::get (shstr_noise_force);
2765		2777
		2778	force->slaying = shstr_noise_force;
		2779	force->stats.food = 1;
		2780	force->speed_left = -1.f;
		2781
		2782	force->set_speed (1.f / 4.f);
		2783	force->flag [FLAG_IS_USED_UP] = true;
		2784	force->flag [FLAG_APPLIED] = true;
		2785
		2786	insert (force);
		2787	}
		2788	}
		2789
		2790	void object::change_move_type (MoveType mt)
		2791	{
		2792	if (move_type == mt)
		2793	return;
		2794
		2795	if (is_on_map ())
		2796	{
		2797	// we are on the map, so handle move_on/off effects
		2798	remove ();
		2799	move_type = mt;
		2800	map->insert (this, x, y, this);
		2801	}
		2802	else
		2803	move_type = mt;
		2804	}
		2805
		2806	/* object should be a player.
		2807	* we return the object the player has marked with the 'mark' command
		2808	* below. If no match is found (or object has changed), we return
		2809	* NULL. We leave it up to the calling function to print messages if
		2810	* nothing is found.
		2811	*/
		2812	object *
		2813	object::mark () const
		2814	{
		2815	if (contr && contr->mark && contr->mark->env == this)
		2816	return contr->mark;
		2817	else
		2818	return 0;
		2819	}
		2820
		2821	// put marked object first in the inventory
		2822	// this is used by identify-like spells so players can influence
		2823	// the order a bit.
		2824	void
		2825	object::splay_marked ()
		2826	{
		2827	if (object *marked = mark ())
		2828	splay (marked);
		2829	}
		2830

Diff Legend

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