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

Diff Legend

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