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.288 by root, Sat Oct 3 22:36:08 2009 UTC vs.
Revision 1.349 by root, Sun May 8 11:44:43 2011 UTC

1	/*	1	/*
2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.	2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.
3	*	3	*
4	* Copyright (©) 2005,2006,2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team	4	* Copyright (©) 2005,2006,2007,2008,2009,2010,2011 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	#include <global.h>	25	#include <global.h>
25	#include <stdio.h>	26	#include <stdio.h>
26	#include <sys/types.h>	27	#include <sys/types.h>
27	#include <sys/uio.h>	28	#include <sys/uio.h>
28	#include <object.h>	29	#include <object.h>
29	#include <sproto.h>	30	#include <sproto.h>
30	#include <loader.h>
31		31
32	#include <bitset>	32	#include <bitset>
33		33
34	UUID UUID::cur;	34	UUID UUID::cur;
35	static uint64_t seq_next_save;	35	static uint64_t seq_next_save;
36	static const uint64 UUID_GAP = 1<<19;	36	static const uint64 UUID_GAP = 1<<19;
37	uint32_t mapspace::smellcount = 10000;	37	uint32_t mapspace::smellcount = 10000;
38		38
39	objectvec objects;	39	objectvec objects;
40	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
41		49
42	short freearr_x[SIZEOFFREE] = {	50	short freearr_x[SIZEOFFREE] = {
43	0,	51	0,
44	0, 1, 1, 1, 0, -1, -1, -1,	52	0, 1, 1, 1, 0, -1, -1, -1,
45	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,
…		…
49	0,	57	0,
50	-1, -1, 0, 1, 1, 1, 0, -1,	58	-1, -1, 0, 1, 1, 1, 0, -1,
51	-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,
52	-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
53	};	61	};
54	int maxfree[SIZEOFFREE] = {
55	0,
56	9, 10, 13, 14, 17, 18, 21, 22,
57	25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45, 48,
58	49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49
59	};
60	int freedir[SIZEOFFREE] = {	62	int freedir[SIZEOFFREE] = {
61	0,	63	0,
62	1, 2, 3, 4, 5, 6, 7, 8,	64	1, 2, 3, 4, 5, 6, 7, 8,
63	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,
64	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
65	};	67	};
66		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
67	static void	95	static void
68	write_uuid (uval64 skip, bool sync)	96	write_uuid (uval64 skip, bool sync)
69	{	97	{
70	CALL_BEGIN (2);	98	CALL_BEGIN (2);
71	CALL_ARG_SV (newSVval64 (skip));	99	CALL_ARG_SV (newSVval64 (skip));
…		…
73	CALL_CALL ("cf::write_uuid", G_DISCARD);	101	CALL_CALL ("cf::write_uuid", G_DISCARD);
74	CALL_END;	102	CALL_END;
75	}	103	}
76		104
77	static void	105	static void
78	read_uuid (void)	106	read_uuid ()
79	{	107	{
80	char filename[MAX_BUF];	108	char filename[MAX_BUF];
81		109
82	sprintf (filename, "%s/uuid", settings.localdir);	110	sprintf (filename, "%s/uuid", settings.localdir);
83		111
…		…
97		125
98	LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);	126	LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);
99	_exit (1);	127	_exit (1);
100	}	128	}
101		129
102	UUID::BUF buf;	130	char buf [UUID::MAX_LEN];
103	buf[0] = 0;	131	buf[0] = 0;
104	fgets (buf, sizeof (buf), fp);	132	fgets (buf, sizeof (buf), fp);
105		133
106	if (!UUID::cur.parse (buf))	134	if (!UUID::cur.parse (buf))
107	{	135	{
…		…
134		162
135	void	163	void
136	UUID::init ()	164	UUID::init ()
137	{	165	{
138	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;
139	}	232	}
140		233
141	/* 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. */
142	static bool	235	static bool
143	compare_ob_value_lists_one (const object *wants, const object *has)	236	compare_ob_value_lists_one (const object *wants, const object *has)
144	{	237	{
145	/* n-squared behaviour (see kv_get), but I'm hoping both	238	/* n-squared behaviour (see kv.get), but I'm hoping both
146	* 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
147	* different structure or at least keep the lists sorted...	240	* different structure or at least keep the lists sorted...
148	*/	241	*/
149		242
150	/* For each field in wants, */	243	/* For each field in wants, */
151	for (key_value *kv = wants->key_values; kv; kv = kv->next)	244	for (key_value *kv = wants->kv.first; kv; kv = kv->next)
152	if (has->kv_get (kv->key) != kv->value)	245	if (has->kv.get (kv->key) != kv->value)
153	return false;	246	return false;
154		247
155	/* 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. */
156	return true;	249	return true;
157	}	250	}
…		…
179	* Improvements made with merge: Better checking on potion, and also	272	* Improvements made with merge: Better checking on potion, and also
180	* check weight	273	* check weight
181	*/	274	*/
182	bool object::can_merge_slow (object *ob1, object *ob2)	275	bool object::can_merge_slow (object *ob1, object *ob2)
183	{	276	{
184	/* A couple quicksanity checks */	277	/* A couple quick sanity checks */
185	if (ob1 == ob2	278	if (ob1 == ob2
186	|| ob1->type != ob2->type	279	|| ob1->type != ob2->type
187	|| ob1->speed != ob2->speed
188	|| ob1->value != ob2->value	280	|| ob1->value != ob2->value
189	|| 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)
190	return 0;	284	return 0;
191		285
192	/* Do not merge objects if nrof would overflow, assume nrof	286	/* Do not merge objects if nrof would overflow, assume nrof
193	* is always 0 .. 2**31-1 */	287	* is always 0 .. 2**31-1 */
194	if (ob1->nrof > 0x7fffffff - ob2->nrof)	288	if (ob1->nrof > 0x7fffffff - ob2->nrof)
…		…
198	* 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
199	* 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
200	* 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
201	* flags lose any meaning.	295	* flags lose any meaning.
202	*/	296	*/
203	if (QUERY_FLAG (ob1, FLAG_IDENTIFIED))	297	if (ob1->flag [FLAG_IDENTIFIED])
204	SET_FLAG (ob1, FLAG_BEEN_APPLIED);	298	ob1->set_flag (FLAG_BEEN_APPLIED);
205		299
206	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))	300	if (ob2->flag [FLAG_IDENTIFIED])
207	SET_FLAG (ob2, FLAG_BEEN_APPLIED);	301	ob2->set_flag (FLAG_BEEN_APPLIED);
208		302
209	if (ob1->arch->archname != ob2->arch->archname	303	if (ob1->arch->archname != ob2->arch->archname
210	|| ob1->name != ob2->name	304	|| ob1->name != ob2->name
211	|| ob1->title != ob2->title	305	|| ob1->title != ob2->title
212	|| ob1->msg != ob2->msg	306	|| ob1->msg != ob2->msg
…		…
215	|| ob1->magic != ob2->magic	309	|| ob1->magic != ob2->magic
216	|| ob1->slaying != ob2->slaying	310	|| ob1->slaying != ob2->slaying
217	|| ob1->skill != ob2->skill	311	|| ob1->skill != ob2->skill
218	|| ob1->value != ob2->value	312	|| ob1->value != ob2->value
219	|| ob1->animation_id != ob2->animation_id	313	|| ob1->animation_id != ob2->animation_id
220	|| (ob1->face != ob2->face && !ob1->animation_id) // face and animation are dependent on each other	314	|| (ob1->face != ob2->face && !ob1->animation_id) // face and animation are dependend on each other
221	|| ob1->client_type != ob2->client_type	315	|| ob1->client_type != ob2->client_type
222	|| ob1->materialname != ob2->materialname	316	|| ob1->material != ob2->material
223	|| ob1->lore != ob2->lore	317	|| ob1->lore != ob2->lore
224	|| ob1->subtype != ob2->subtype	318	|| ob1->subtype != ob2->subtype
225	|| ob1->move_type != ob2->move_type	319	|| ob1->move_type != ob2->move_type
226	|| ob1->move_block != ob2->move_block	320	|| ob1->move_block != ob2->move_block
227	|| ob1->move_allow != ob2->move_allow	321	|| ob1->move_allow != ob2->move_allow
228	|| ob1->move_on != ob2->move_on	322	|| ob1->move_on != ob2->move_on
229	|| ob1->move_off != ob2->move_off	323	|| ob1->move_off != ob2->move_off
230	|| ob1->move_slow != ob2->move_slow	324	|| ob1->move_slow != ob2->move_slow
231	|| ob1->move_slow_penalty != ob2->move_slow_penalty	325	|| fabs (ob1->move_slow_penalty - ob2->move_slow_penalty) >= (1.f / 1024.f)
232	|| memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))	326	|| memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
233	|| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats)))	327	|| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats)))
234	return 0;	328	return 0;
235		329
236	if ((ob1->flag ^ ob2->flag)	330	if ((ob1->flag ^ ob2->flag)
…		…
261		355
262	/* 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,
263	* 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
264	* some items equipped, and we don't want those to merge.	358	* some items equipped, and we don't want those to merge.
265	*/	359	*/
266	if (QUERY_FLAG (ob1, FLAG_APPLIED) || QUERY_FLAG (ob2, FLAG_APPLIED))	360	if (ob1->flag [FLAG_APPLIED] || ob2->flag [FLAG_APPLIED])
267	return 0;	361	return 0;
268		362
269	/* 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
270	* 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
271	* check?	365	* check?
272	*/	366	*/
273	if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && ob1->has_active_speed ())	367	if (!ob1->flag [FLAG_ANIMATE] && ob1->has_active_speed ())
274	return 0;	368	return 0;
275		369
276	switch (ob1->type)	370	switch (ob1->type)
277	{	371	{
278	case SCROLL:	372	case SCROLL:
279	if (ob1->level != ob2->level)	373	if (ob1->level != ob2->level)
280	return 0;	374	return 0;
281	break;	375	break;
282	}	376	}
283		377
284	if (ob1->key_values || ob2->key_values)	378	if (!ob1->kv.empty () || !ob2->kv.empty ())
285	{	379	{
286	/* At least one of these has key_values. */	380	/* At least one of these has key_values. */
287	if ((!ob1->key_values) != (!ob2->key_values))	381	if (ob1->kv.empty () != ob2->kv.empty ())
288	return 0; /* One has fields, but the other one doesn't. */	382	return 0; /* One has fields, but the other one doesn't. */
289		383
290	if (!compare_ob_value_lists (ob1, ob2))	384	if (!compare_ob_value_lists (ob1, ob2))
291	return 0;	385	return 0;
292	}	386	}
…		…
334		428
335	// the player itself is always on a map, so we will find him here	429	// the player itself is always on a map, so we will find him here
336	// even if our inv is in a player.	430	// even if our inv is in a player.
337	if (envest->is_on_map ())	431	if (envest->is_on_map ())
338	if (object *pl = envest->ms ().player ())	432	if (object *pl = envest->ms ().player ())
339	if (pl->container == env)	433	if (pl->container_ () == env)
340	return pl;	434	return pl;
341	}	435	}
342	else	436	else
343	{	437	{
344	// maybe there is a player standing on the same mapspace	438	// maybe there is a player standing on the same mapspace
345	// this will catch the case where "this" is a player	439	// this will catch the case where "this" is a player
346	if (object *pl = ms ().player ())	440	if (object *pl = ms ().player ())
347	if ((!pl->container && pl->contr->ns && !pl->contr->ns->update_look)	441	if ((pl->contr->ns && !pl->container_ () && !pl->contr->ns->update_look)
348	|| this == pl->container)	442	|| pl->container_ () == this)
349	return pl;	443	return pl;
350	}	444	}
351	}	445	}
352		446
353	return 0;	447	return 0;
354	}	448	}
355		449
356	// adjust weight per container type ("of holding")	450	// adjust weight per container type ("of holding")
357	static sint32	451	static uint32
358	weight_adjust_for (object *op, sint32 weight)	452	weight_adjust_for (object *op, uint32 weight)
359	{	453	{
360	return op->type == CONTAINER	454	return op->type == CONTAINER
361	? lerp (weight, 0, 100, 0, 100 - op->stats.Str)	455	? weight - weight * op->stats.Str / 100
362	: weight;	456	: weight;
363	}	457	}
364		458
365	/*	459	/*
366	* adjust_weight(object, weight) adds the specified weight to an object,	460	* subtracts, then adds, the specified weight to an object,
367	* and also updates how much the environment(s) is/are carrying.	461	* and also updates how much the environment(s) is/are carrying.
368	*/	462	*/
369	static void	463	static void
370	adjust_weight (object *op, sint32 weight)	464	adjust_weight (object *op, sint32 sub, sint32 add)
371	{	465	{
372	while (op)	466	while (op)
373	{	467	{
374	// adjust by actual difference to account for rounding errors	468	sint32 ocarrying = op->carrying;
375	// i.e. (w2 - w1) / f != w2 / f - w1 / f and the latter is correct
376	weight = weight_adjust_for (op, op->carrying)
377	- weight_adjust_for (op, op->carrying - weight);
378		469
379	if (!weight)	470	op->carrying -= weight_adjust_for (op, sub);
380	return;	471	op->carrying += weight_adjust_for (op, add);
381
382	op->carrying += weight;
383		472
384	if (object *pl = op->visible_to ())	473	if (object *pl = op->visible_to ())
385	if (pl != op) // player is handled lazily	474	if (pl != op) // player is handled lazily
386	esrv_update_item (UPD_WEIGHT, pl, op);	475	esrv_update_item (UPD_WEIGHT, pl, op);
387		476
		477	sub = ocarrying;
		478	add = op->carrying;
		479
388	op = op->env;	480	op = op->env;
389	}	481	}
390	}	482	}
391		483
392	/*	484	/*
…		…
399	{	491	{
400	sint32 sum = 0;	492	sint32 sum = 0;
401		493
402	for (object *op = inv; op; op = op->below)	494	for (object *op = inv; op; op = op->below)
403	{	495	{
404	if (op->inv)
405	op->update_weight ();	496	op->update_weight ();
406		497
407	sum += op->total_weight ();	498	sum += weight_adjust_for (this, op->total_weight ());
408	}	499	}
409
410	sum = weight_adjust_for (this, sum);
411		500
412	if (sum != carrying)	501	if (sum != carrying)
413	{	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
414	carrying = sum;	507	carrying = sum;
415		508
416	if (object *pl = visible_to ())	509	if (object *pl = visible_to ())
417	if (pl != this) // player is handled lazily	510	if (pl != this) // player is handled lazily
418	esrv_update_item (UPD_WEIGHT, pl, this);	511	esrv_update_item (UPD_WEIGHT, pl, this);
…		…
431	object_freezer freezer;	524	object_freezer freezer;
432	op->write (freezer);	525	op->write (freezer);
433	return freezer.as_string ();	526	return freezer.as_string ();
434	}	527	}
435		528
436	/*	529	char *
437	* get_nearest_part(multi-object, object 2) returns the part of the	530	object::as_string ()
438	* multi-object 1 which is closest to the second object.
439	* If it's not a multi-object, it is returned.
440	*/
441	object *
442	get_nearest_part (object *op, const object *pl)
443	{	531	{
444	object *tmp, *closest;	532	return dump_object (this);
445	int last_dist, i;
446
447	if (!op->more)
448	return op;
449
450	for (last_dist = distance (op, pl), closest = op, tmp = op->more;
451	tmp;
452	tmp = tmp->more)
453	if ((i = distance (tmp, pl)) < last_dist)
454	closest = tmp, last_dist = i;
455
456	return closest;
457	}	533	}
458		534
459	/*	535	/*
460	* 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.
461	* VERRRY slow.	537	* VERRRY slow.
…		…
463	object *	539	object *
464	find_object (tag_t i)	540	find_object (tag_t i)
465	{	541	{
466	for_all_objects (op)	542	for_all_objects (op)
467	if (op->count == i)	543	if (op->count == i)
		544	return op;
		545
		546	return 0;
		547	}
		548
		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)
468	return op;	559	return op;
469		560
470	return 0;	561	return 0;
471	}	562	}
472		563
…		…
506	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 ());
507	return;	598	return;
508	}	599	}
509		600
510	this->owner = owner;	601	this->owner = owner;
511	}
512
513	int
514	object::slottype () const
515	{
516	if (type == SKILL)
517	{
518	if (IS_COMBAT_SKILL (subtype)) return slot_combat;
519	if (IS_RANGED_SKILL (subtype)) return slot_ranged;
520	}
521	else
522	{
523	if (slot [body_combat].info) return slot_combat;
524	if (slot [body_range ].info) return slot_ranged;
525	}
526
527	return slot_none;
528	}
529
530	bool
531	object::change_weapon (object *ob)
532	{
533	if (current_weapon == ob)
534	return true;
535
536	if (chosen_skill)
537	chosen_skill->flag [FLAG_APPLIED] = false;
538
539	current_weapon = ob;
540	chosen_skill = !ob || ob->type == SKILL ? ob : find_skill_by_name (this, ob->skill);
541
542	if (chosen_skill)
543	chosen_skill->flag [FLAG_APPLIED] = true;
544
545	update_stats ();
546
547	if (ob)
548	{
549	// now check wether any body locations became invalid, in which case
550	// we cannot apply the weapon at the moment.
551	for (int i = 0; i < NUM_BODY_LOCATIONS; ++i)
552	if (slot[i].used < 0)
553	{
554	current_weapon = chosen_skill = 0;
555	update_stats ();
556
557	new_draw_info_format (NDI_UNIQUE, 0, this,
558	"You try to balance all your items at once, "
559	"but the %s is just too much for your body. "
560	"[You need to unapply some items first - use the 'body' command to see "
561	"how many items you cna wera on a specific body part.]", &ob->name);
562	return false;
563	}
564
565	//new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);
566	}
567	else
568	;//new_draw_info_format (NDI_UNIQUE, 0, this, "You unwield your weapons.");
569
570	if (ob && !ob->flag [FLAG_APPLIED] && ob->type != SPELL)
571	{
572	LOG (llevError | logBacktrace, "%s changed to unapplied weapon %s",
573	&name, ob->debug_desc ());
574	return false;
575	}
576
577	return true;
578	}
579
580	/* Zero the key_values on op, decrementing the shared-string
581	* refcounts and freeing the links.
582	*/
583	static void
584	free_key_values (object *op)
585	{
586	for (key_value *i = op->key_values; i; )
587	{
588	key_value *next = i->next;
589	delete i;
590
591	i = next;
592	}
593
594	op->key_values = 0;
595	}	602	}
596		603
597	/*	604	/*
598	* copy_to first frees everything allocated by the dst object,	605	* copy_to first frees everything allocated by the dst object,
599	* and then copies the contents of itself into the second	606	* and then copies the contents of itself into the second
…		…
605	void	612	void
606	object::copy_to (object *dst)	613	object::copy_to (object *dst)
607	{	614	{
608	dst->remove ();	615	dst->remove ();
609	*(object_copy *)dst = *this;	616	*(object_copy *)dst = *this;
		617
		618	// maybe move to object_copy?
		619	dst->kv = kv;
		620
610	dst->flag [FLAG_REMOVED] = true;	621	dst->flag [FLAG_REMOVED] = true;
611
612	/* Copy over key_values, if any. */
613	if (key_values)
614	{
615	key_value *tail = 0;
616	dst->key_values = 0;
617
618	for (key_value *i = key_values; i; i = i->next)
619	{
620	key_value *new_link = new key_value;
621
622	new_link->next = 0;
623	new_link->key = i->key;
624	new_link->value = i->value;
625
626	/* Try and be clever here, too. */
627	if (!dst->key_values)
628	{
629	dst->key_values = new_link;
630	tail = new_link;
631	}
632	else
633	{
634	tail->next = new_link;
635	tail = new_link;
636	}
637	}
638	}
639
640	if (speed < 0)
641	dst->speed_left -= rndm ();
642
643	dst->activate ();	622	dst->activate ();
644	}	623	}
645		624
646	void	625	void
647	object::instantiate ()	626	object::instantiate ()
648	{	627	{
649	if (!uuid.seq) // HACK	628	if (!uuid.seq) // HACK
650	uuid = UUID::gen ();	629	uuid = UUID::gen ();
651		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
652	speed_left = -0.1f;	635	speed_left = -1.;
		636
653	/* 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
654	* 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.
655	* 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
656	* values for the body_used info, so when items are created	640	* values for the body_used info, so when items are created
657	* for it, they can be properly equipped.	641	* for it, they can be properly equipped.
…		…
665	object *	649	object *
666	object::clone ()	650	object::clone ()
667	{	651	{
668	object *neu = create ();	652	object *neu = create ();
669	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
670	neu->map = map; // not copied by copy_to	659	neu->map = map; // not copied by copy_to
671	return neu;	660	return neu;
672	}	661	}
673		662
674	/*	663	/*
…		…
677	* 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.
678	*/	667	*/
679	void	668	void
680	update_turn_face (object *op)	669	update_turn_face (object *op)
681	{	670	{
682	if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || !op->arch)	671	if (!op->flag [FLAG_IS_TURNABLE] || !op->arch)
683	return;	672	return;
684		673
685	SET_ANIMATION (op, op->direction);	674	SET_ANIMATION (op, op->direction);
686	update_object (op, UP_OBJ_FACE);	675	update_object (op, UP_OBJ_FACE);
687	}	676	}
…		…
692	* 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.
693	*/	682	*/
694	void	683	void
695	object::set_speed (float speed)	684	object::set_speed (float speed)
696	{	685	{
697	if (flag [FLAG_FREED] && speed)
698	{
699	LOG (llevError, "Object %s is freed but has speed.\n", &name);
700	speed = 0;
701	}
702
703	this->speed = speed;	686	this->speed = speed;
704		687
705	if (has_active_speed ())	688	if (has_active_speed ())
706	activate ();	689	activate ();
707	else	690	else
…		…
754	}	737	}
755		738
756	mapspace &m = op->ms ();	739	mapspace &m = op->ms ();
757		740
758	if (!(m.flags_ & P_UPTODATE))	741	if (!(m.flags_ & P_UPTODATE))
759	/* nop */;	742	m.update_up (); // nothing to do except copy up
760	else if (action == UP_OBJ_INSERT)	743	else if (action == UP_OBJ_INSERT)
761	{	744	{
		745	#if 0
762	// this is likely overkill, TODO: revisit (schmorp)	746	// this is likely overkill, TODO: revisit (schmorp)
763	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))	747	if ((op->flag [FLAG_BLOCKSVIEW] && !(m.flags_ & P_BLOCKSVIEW))
764	|| (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))	748	|| (op->flag [FLAG_NO_MAGIC] && !(m.flags_ & P_NO_MAGIC))
765	|| (op->is_player () && !(m.flags_ & P_PLAYER))	749	|| (op->is_player () && !(m.flags_ & P_PLAYER))
766	|| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))	750	|| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
767	|| (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))	751	|| (op->flag [FLAG_ALIVE] && !(m.flags_ & P_IS_ALIVE))
768	|| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))	752	|| (op->flag [FLAG_DAMNED] && !(m.flags_ & P_NO_CLERIC))
769	|| (m.move_on | op->move_on ) != m.move_on	753	|| (m.move_on | op->move_on ) != m.move_on
770	|| (m.move_off | op->move_off ) != m.move_off	754	|| (m.move_off | op->move_off ) != m.move_off
771	|| (m.move_slow | op->move_slow) != m.move_slow	755	|| (m.move_slow | op->move_slow) != m.move_slow
772	/* 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
773	* have move_allow right now.	757	* have move_allow right now.
774	*/	758	*/
775	|| ((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
776	|| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)
777	m.invalidate ();	760	m.invalidate ();
		761	#else
		762	// the above is not strong enough a test to skip updating. los maybe? TODO (schmorp)
		763	m.invalidate ();
		764	#endif
778	}	765	}
779	/* if the object is being removed, we can't make intelligent	766	/* if the object is being removed, we can't make intelligent
780	* decisions, because remove_ob can't really pass the object	767	* decisions, because remove_ob can't really pass the object
781	* that is being removed.	768	* that is being removed.
782	*/	769	*/
783	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)	770	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
784	m.invalidate ();	771	m.invalidate ();
785	else if (action == UP_OBJ_FACE)	772	else if (action == UP_OBJ_FACE)
786	/* Nothing to do for that case */ ;	773	m.update_up (); // nothing to do for that case, except copy up
787	else	774	else
788	LOG (llevError, "update_object called with invalid action: %d\n", action);	775	LOG (llevError, "update_object called with invalid action: %d\n", action);
789		776
790	if (op->more)	777	if (op->more)
791	update_object (op->more, action);	778	update_object (op->more, action);
792	}	779	}
793		780
794	object::object ()	781	object::object ()
795	{	782	{
796	SET_FLAG (this, FLAG_REMOVED);	783	this->set_flag (FLAG_REMOVED);
797		784
798	//expmul = 1.0; declared const for the time being	785	//expmul = 1.0; declared const for the time being
799	face = blank_face;	786	face = blank_face;
		787	material = MATERIAL_NULL;
800	}	788	}
801		789
802	object::~object ()	790	object::~object ()
803	{	791	{
804	unlink ();	792	unlink ();
805		793
806	free_key_values (this);	794	kv.clear ();
807	}	795	}
808
809	static int object_count;
810		796
811	void object::link ()	797	void object::link ()
812	{	798	{
813	assert (!index);//D	799	assert (!index);//D
814	uuid = UUID::gen ();	800	uuid = UUID::gen ();
815	count = ++object_count;
816		801
817	refcnt_inc ();	802	refcnt_inc ();
818	objects.insert (this);	803	objects.insert (this);
		804
		805	++create_count;
		806
819	}	807	}
820		808
821	void object::unlink ()	809	void object::unlink ()
822	{	810	{
823	if (!index)	811	if (!index)
824	return;	812	return;
		813
		814	++destroy_count;
825		815
826	objects.erase (this);	816	objects.erase (this);
827	refcnt_dec ();	817	refcnt_dec ();
828	}	818	}
829		819
…		…
908	* if some form of movement is allowed, let objects	898	* if some form of movement is allowed, let objects
909	* drop on that space.	899	* drop on that space.
910	*/	900	*/
911	if (!drop_to_ground	901	if (!drop_to_ground
912	|| !map	902	|| !map
913	|| map->in_memory != MAP_ACTIVE	903	|| !map->linkable ()
914	|| map->no_drop	904	|| map->no_drop
915	|| ms ().move_block == MOVE_ALL)	905	|| ms ().move_block == MOVE_ALL)
916	{	906	{
917	while (inv)	907	while (inv)
918	inv->destroy ();	908	inv->destroy ();
…		…
934	map->insert (op, x, y);	924	map->insert (op, x, y);
935	}	925	}
936	}	926	}
937	}	927	}
938		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 *
939	object *object::create ()	966	object::create ()
940	{	967	{
941	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
942	op->link ();	990	op->link ();
		991
943	return op;	992	return op;
944	}	993	}
945		994
		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
946	static struct freed_map : maptile	1010	static struct freed_map : maptile
947	{	1011	{
948	freed_map ()	1012	freed_map ()
		1013	: maptile (3, 3)
949	{	1014	{
950	path = "<freed objects map>";	1015	path = "<freed objects map>";
951	name = "/internal/freed_objects_map";	1016	name = "/internal/freed_objects_map";
952	width = 3;
953	height = 3;
954	no_drop = 1;	1017	no_drop = 1;
955	no_reset = 1;	1018	no_reset = 1;
956		1019
957	alloc ();
958	in_memory = MAP_ACTIVE;	1020	state = MAP_ACTIVE;
959	}	1021	}
960		1022
961	~freed_map ()	1023	~freed_map ()
962	{	1024	{
963	destroy ();	1025	destroy ();
…		…
1013	LOG (llevError | logBacktrace, "tried to destroy the tail of an object");	1075	LOG (llevError | logBacktrace, "tried to destroy the tail of an object");
1014	head->destroy ();	1076	head->destroy ();
1015	return;	1077	return;
1016	}	1078	}
1017		1079
1018	destroy_inv (false);	1080	destroy_inv_fast ();
1019		1081
1020	if (is_head ())	1082	if (is_head ())
1021	if (sound_destroy)	1083	if (sound_destroy)
1022	play_sound (sound_destroy);	1084	play_sound (sound_destroy);
1023	else if (flag [FLAG_MONSTER])	1085	else if (flag [FLAG_MONSTER])
…		…
1034	* the previous environment.	1096	* the previous environment.
1035	*/	1097	*/
1036	void	1098	void
1037	object::do_remove ()	1099	object::do_remove ()
1038	{	1100	{
1039	object *tmp, *last = 0;
1040	object *otmp;
1041
1042	if (flag [FLAG_REMOVED])	1101	if (flag [FLAG_REMOVED])
1043	return;	1102	return;
1044		1103
1045	INVOKE_OBJECT (REMOVE, this);	1104	INVOKE_OBJECT (REMOVE, this);
1046		1105
…		…
1058	flag [FLAG_REMOVED] = false; // hack around the issue of visible_to checking flag_removed	1117	flag [FLAG_REMOVED] = false; // hack around the issue of visible_to checking flag_removed
1059	if (object *pl = visible_to ())	1118	if (object *pl = visible_to ())
1060	esrv_del_item (pl->contr, count);	1119	esrv_del_item (pl->contr, count);
1061	flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed	1120	flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed
1062		1121
1063	adjust_weight (env, -total_weight ());	1122	adjust_weight (env, total_weight (), 0);
1064		1123
1065	object *pl = in_player ();	1124	object *pl = in_player ();
1066		1125
1067	/* we set up values so that it could be inserted into	1126	/* we set up values so that it could be inserted into
1068	* the map, but we don't actually do that - it is up	1127	* the map, but we don't actually do that - it is up
…		…
1078		1137
1079	above = 0;	1138	above = 0;
1080	below = 0;	1139	below = 0;
1081	env = 0;	1140	env = 0;
1082		1141
1083	/* NO_FIX_PLAYER is set when a great many changes are being	1142	if (pl && pl->is_player ())
1084	* made to players inventory. If set, avoiding the call
1085	* to save cpu time.
1086	*/	1143	{
1087	if (pl)	1144	if (expect_false (pl->contr->combat_ob == this))
1088	if (pl->is_player () && (glow_radius || !QUERY_FLAG (pl, FLAG_NO_FIX_PLAYER)))
1089	{	1145	{
1090	pl->update_stats ();	1146	pl->apply (pl->contr->combat_ob, AP_UNAPPLY | AP_IGNORE_CURSE);
		1147	pl->contr->combat_ob = 0;
		1148	if (pl->contr->ranged_ob) pl->apply (pl->contr->ranged_ob);
		1149	}
1091		1150
		1151	if (expect_false (pl->contr->ranged_ob == this))
		1152	{
		1153	pl->apply (pl->contr->ranged_ob, AP_UNAPPLY | AP_IGNORE_CURSE);
		1154	pl->contr->ranged_ob = 0;
		1155	if (pl->contr->combat_ob) pl->apply (pl->contr->combat_ob);
		1156	}
		1157
		1158	pl->contr->queue_stats_update ();
		1159
1092	if (glow_radius && pl->is_on_map ())	1160	if (expect_false (glow_radius) && pl->is_on_map ())
1093	update_all_los (pl->map, pl->x, pl->y);	1161	update_all_los (pl->map, pl->x, pl->y);
1094	}	1162	}
1095	}	1163	}
1096	else if (map)	1164	else if (map)
1097	{	1165	{
1098	map->dirty = true;	1166	map->dirty = true;
1099	mapspace &ms = this->ms ();	1167	mapspace &ms = this->ms ();
…		…
1112	close_container ();	1180	close_container ();
1113		1181
1114	--map->players;	1182	--map->players;
1115	map->touch ();	1183	map->touch ();
1116	}	1184	}
1117	else if (pl->container == this)	1185	else if (pl->container_ () == this)
1118	{	1186	{
1119	// removing a container should close it	1187	// removing a container should close it
1120	close_container ();	1188	close_container ();
1121	}	1189	}
1122		1190	else
1123	esrv_del_item (pl->contr, count);	1191	esrv_del_item (pl->contr, count);
1124	}	1192	}
1125		1193
1126	/* link the object above us */	1194	/* link the object above us */
1127	// re-link, make sure compiler can easily use cmove	1195	// re-link, make sure compiler can easily use cmove
1128	*(above ? &above->below : &ms.top) = below;	1196	*(above ? &above->below : &ms.top) = below;
…		…
1131	above = 0;	1199	above = 0;
1132	below = 0;	1200	below = 0;
1133		1201
1134	ms.invalidate ();	1202	ms.invalidate ();
1135		1203
1136	if (map->in_memory == MAP_SAVING)
1137	return;
1138
1139	int check_walk_off = !flag [FLAG_NO_APPLY];	1204	int check_walk_off = !flag [FLAG_NO_APPLY];
1140		1205
1141	if (object *pl = ms.player ())	1206	if (object *pl = ms.player ())
1142	{	1207	{
1143	if (pl->container == this)	1208	if (pl->container_ () == this)
1144	/* If a container that the player is currently using somehow gets	1209	/* If a container that the player is currently using somehow gets
1145	* removed (most likely destroyed), update the player view	1210	* removed (most likely destroyed), update the player view
1146	* appropriately.	1211	* appropriately.
1147	*/	1212	*/
1148	pl->close_container ();	1213	pl->close_container ();
…		…
1152	//TODO: update floorbox to preserve ordering	1217	//TODO: update floorbox to preserve ordering
1153	if (pl->contr->ns)	1218	if (pl->contr->ns)
1154	pl->contr->ns->floorbox_update ();	1219	pl->contr->ns->floorbox_update ();
1155	}	1220	}
1156		1221
		1222	if (check_walk_off)
1157	for (tmp = ms.bot; tmp; tmp = tmp->above)	1223	for (object *above, *tmp = ms.bot; tmp; tmp = above)
1158	{	1224	{
		1225	above = tmp->above;
		1226
1159	/* No point updating the players look faces if he is the object	1227	/* No point updating the players look faces if he is the object
1160	* being removed.	1228	* being removed.
1161	*/	1229	*/
1162		1230
1163	/* See if object moving off should effect something */	1231	/* See if object moving off should effect something */
1164	if (check_walk_off
1165	&& ((move_type & tmp->move_off)	1232	if ((move_type & tmp->move_off)
1166	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))	1233	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0)
1167	{
1168	move_apply (tmp, this, 0);	1234	move_apply (tmp, this, 0);
1169
1170	if (destroyed ())
1171	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1172	}	1235	}
1173
1174	last = tmp;
1175	}
1176		1236
1177	if (affects_los ())	1237	if (affects_los ())
1178	update_all_los (map, x, y);	1238	update_all_los (map, x, y);
1179	}	1239	}
1180	}	1240	}
…		…
1224		1284
1225	object *prev = this;	1285	object *prev = this;
1226		1286
1227	for (archetype *at = (archetype *)arch->more; at; at = (archetype *)at->more)	1287	for (archetype *at = (archetype *)arch->more; at; at = (archetype *)at->more)
1228	{	1288	{
1229	object *op = arch_to_object (at);	1289	object *op = at->instance ();
1230		1290
1231	op->name = name;	1291	op->name = name;
1232	op->name_pl = name_pl;	1292	op->name_pl = name_pl;
1233	op->title = title;	1293	op->title = title;
1234		1294
…		…
1272	* Passing 0 for flag gives proper default values, so flag really only needs	1332	* Passing 0 for flag gives proper default values, so flag really only needs
1273	* to be set if special handling is needed.	1333	* to be set if special handling is needed.
1274	*	1334	*
1275	* Return value:	1335	* Return value:
1276	* new object if 'op' was merged with other object	1336	* new object if 'op' was merged with other object
1277	* NULL if 'op' was destroyed	1337	* NULL if there was an error (destroyed, blocked etc.)
1278	* just 'op' otherwise	1338	* just 'op' otherwise
1279	*/	1339	*/
1280	object *	1340	object *
1281	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)	1341	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1282	{	1342	{
1283	op->remove ();	1343	op->remove ();
1284		1344
1285	if (m == &freed_map)//D TODO: remove soon	1345	if (m == &freed_map)//D TODO: remove soon
1286	{//D	1346	{//D
1287	LOG (llevError | logBacktrace, "tries to insret object on freed objects map: %s", op->debug_desc ());//D	1347	LOG (llevError | logBacktrace, "tries to insert object on freed objects map: %s", op->debug_desc ());//D
1288	}//D	1348	}//D
1289		1349
1290	/* Ideally, the caller figures this out. However, it complicates a lot	1350	/* Ideally, the caller figures this out. However, it complicates a lot
1291	* of areas of callers (eg, anything that uses find_free_spot would now	1351	* of areas of callers (eg, anything that uses find_free_spot would now
1292	* need extra work	1352	* need extra work
…		…
1319	// from here :/	1379	// from here :/
1320	op->nrof += tmp->nrof;	1380	op->nrof += tmp->nrof;
1321	tmp->destroy ();	1381	tmp->destroy ();
1322	}	1382	}
1323		1383
1324	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1384	op->clr_flag (FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1325	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1385	op->clr_flag (FLAG_INV_LOCKED);
1326		1386
1327	if (!QUERY_FLAG (op, FLAG_ALIVE))	1387	if (!op->flag [FLAG_ALIVE])
1328	CLEAR_FLAG (op, FLAG_NO_STEAL);	1388	op->clr_flag (FLAG_NO_STEAL);
1329		1389
1330	if (flag & INS_BELOW_ORIGINATOR)	1390	if (flag & INS_BELOW_ORIGINATOR)
1331	{	1391	{
1332	if (originator->map != op->map || originator->x != op->x || originator->y != op->y)	1392	if (originator->map != op->map || originator->x != op->x || originator->y != op->y)
1333	{	1393	{
…		…
1368	* when lots of spells are cast in one area. Currently, it is presumed	1428	* when lots of spells are cast in one area. Currently, it is presumed
1369	* that flying non pickable objects are spell objects.	1429	* that flying non pickable objects are spell objects.
1370	*/	1430	*/
1371	for (object *tmp = ms.bot; tmp; tmp = tmp->above)	1431	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1372	{	1432	{
1373	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) || QUERY_FLAG (tmp, FLAG_OVERLAY_FLOOR))	1433	if (tmp->flag [FLAG_IS_FLOOR] || tmp->flag [FLAG_OVERLAY_FLOOR])
1374	floor = tmp;	1434	floor = tmp;
1375		1435
1376	if (QUERY_FLAG (tmp, FLAG_NO_PICK) && (tmp->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (tmp, FLAG_IS_FLOOR))	1436	if (tmp->flag [FLAG_NO_PICK] && (tmp->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !tmp->flag [FLAG_IS_FLOOR])
1377	{	1437	{
1378	/* We insert above top, so we want this object below this */	1438	/* We insert above top, so we want this object below this */
1379	top = tmp->below;	1439	top = tmp->below;
1380	break;	1440	break;
1381	}	1441	}
…		…
1399	&& (op->face && !faces [op->face].visibility))	1459	&& (op->face && !faces [op->face].visibility))
1400	{	1460	{
1401	object *last;	1461	object *last;
1402		1462
1403	for (last = top; last != floor; last = last->below)	1463	for (last = top; last != floor; last = last->below)
1404	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1464	if (last->flag [FLAG_BLOCKSVIEW] && (last->type != EXIT))
1405	break;	1465	break;
1406		1466
1407	/* Check to see if we found the object that blocks view,	1467	/* Check to see if we found the object that blocks view,
1408	* and make sure we have a below pointer for it so that	1468	* and make sure we have a below pointer for it so that
1409	* we can get inserted below this one, which requires we	1469	* we can get inserted below this one, which requires we
…		…
1482	*/	1542	*/
1483		1543
1484	/* if this is not the head or flag has been passed, don't check walk on status */	1544	/* if this is not the head or flag has been passed, don't check walk on status */
1485	if (!(flag & INS_NO_WALK_ON) && op->is_head ())	1545	if (!(flag & INS_NO_WALK_ON) && op->is_head ())
1486	{	1546	{
1487	if (check_move_on (op, originator))	1547	if (check_move_on (op, originator, flag))
1488	return 0;	1548	return 0;
1489		1549
1490	/* If we are a multi part object, lets work our way through the check	1550	/* If we are a multi part object, let's work our way through the check
1491	* walk on's.	1551	* walk on's.
1492	*/	1552	*/
1493	for (object *tmp = op->more; tmp; tmp = tmp->more)	1553	for (object *tmp = op->more; tmp; tmp = tmp->more)
1494	if (check_move_on (tmp, originator))	1554	if (check_move_on (tmp, originator, flag))
1495	return 0;	1555	return 0;
1496	}	1556	}
1497		1557
1498	return op;	1558	return op;
1499	}	1559	}
…		…
1509		1569
1510	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)	1570	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1511	if (tmp->arch->archname == archname) /* same archetype */	1571	if (tmp->arch->archname == archname) /* same archetype */
1512	tmp->destroy ();	1572	tmp->destroy ();
1513		1573
1514	object *tmp = arch_to_object (archetype::find (archname));	1574	object *tmp = archetype::find (archname)->instance ();
1515		1575
1516	tmp->x = op->x;	1576	tmp->x = op->x;
1517	tmp->y = op->y;	1577	tmp->y = op->y;
1518		1578
1519	insert_ob_in_map (tmp, op->map, op, 0);	1579	insert_ob_in_map (tmp, op->map, op, 0);
…		…
1524	{	1584	{
1525	if (where->env)	1585	if (where->env)
1526	return where->env->insert (this);	1586	return where->env->insert (this);
1527	else	1587	else
1528	return where->map->insert (this, where->x, where->y, originator, flags);	1588	return where->map->insert (this, where->x, where->y, originator, flags);
		1589	}
		1590
		1591	// check whether we can put this into the map, respect max_volume, max_items
		1592	bool
		1593	object::can_drop_at (maptile *m, int x, int y, object *originator)
		1594	{
		1595	mapspace &ms = m->at (x, y);
		1596
		1597	int items = ms.items ();
		1598
		1599	if (!items // testing !items ensures we can drop at least one item
		1600	|| (items < m->max_items
		1601	&& ms.volume () < m->max_volume))
		1602	return true;
		1603
		1604	if (originator && originator->is_player ())
		1605	originator->contr->failmsgf (
		1606	"No matter how hard you try, you just cannot put the %s here H<Try to remove some items from the floor first.>",
		1607	query_name ()
		1608	);
		1609
		1610	return false;
1529	}	1611	}
1530		1612
1531	/*	1613	/*
1532	* decrease(object, number) decreases a specified number from	1614	* decrease(object, number) decreases a specified number from
1533	* the amount of an object. If the amount reaches 0, the object	1615	* the amount of an object. If the amount reaches 0, the object
…		…
1543		1625
1544	nr = min (nr, nrof);	1626	nr = min (nr, nrof);
1545		1627
1546	if (nrof > nr)	1628	if (nrof > nr)
1547	{	1629	{
		1630	sint64 oweight = total_weight ();
		1631
1548	nrof -= nr;	1632	nrof -= nr;
1549	adjust_weight (env, -weight * max (1, nr)); // carrying == 0
1550		1633
1551	if (object *pl = visible_to ())	1634	if (object *pl = visible_to ())
1552	esrv_update_item (UPD_NROF, pl, this);	1635	esrv_update_item (UPD_NROF, pl, this);
		1636
		1637	adjust_weight (env, oweight, total_weight ());
1553		1638
1554	return true;	1639	return true;
1555	}	1640	}
1556	else	1641	else
1557	{	1642	{
…		…
1632	if (op->nrof)	1717	if (op->nrof)
1633	for (object *tmp = inv; tmp; tmp = tmp->below)	1718	for (object *tmp = inv; tmp; tmp = tmp->below)
1634	if (object::can_merge (tmp, op))	1719	if (object::can_merge (tmp, op))
1635	{	1720	{
1636	/* return the original object and remove inserted object	1721	/* return the original object and remove inserted object
1637	(client needs the original object) */	1722	(client prefers the original object) */
		1723
		1724	// carring must be 0 for mergable objects
		1725	sint64 oweight = tmp->weight * tmp->nrof;
		1726
1638	tmp->nrof += op->nrof;	1727	tmp->nrof += op->nrof;
1639		1728
1640	if (object *pl = tmp->visible_to ())	1729	if (object *pl = tmp->visible_to ())
1641	esrv_update_item (UPD_NROF, pl, tmp);	1730	esrv_update_item (UPD_NROF, pl, tmp);
1642		1731
1643	adjust_weight (this, op->total_weight ());	1732	adjust_weight (this, oweight, tmp->weight * tmp->nrof);
1644		1733
1645	op->destroy ();	1734	op->destroy ();
1646	op = tmp;	1735	op = tmp;
1647	goto inserted;	1736	goto inserted;
1648	}	1737	}
…		…
1664	op->flag [FLAG_REMOVED] = 0;	1753	op->flag [FLAG_REMOVED] = 0;
1665		1754
1666	if (object *pl = op->visible_to ())	1755	if (object *pl = op->visible_to ())
1667	esrv_send_item (pl, op);	1756	esrv_send_item (pl, op);
1668		1757
1669	adjust_weight (this, op->total_weight ());	1758	adjust_weight (this, 0, op->total_weight ());
1670		1759
1671	inserted:	1760	inserted:
1672	/* reset the light list and los of the players on the map */	1761	/* reset the light list and los of the players on the map */
1673	if (op->glow_radius && is_on_map ())	1762	if (op->glow_radius && is_on_map ())
1674	{	1763	{
1675	update_stats ();	1764	update_stats ();
1676	update_all_los (map, x, y);	1765	update_all_los (map, x, y);
1677	}	1766	}
1678	else if (is_player () && !flag [FLAG_NO_FIX_PLAYER])	1767	else if (is_player ())
1679	// if this is a player's inventory, update stats	1768	// if this is a player's inventory, update stats
1680	update_stats ();	1769	contr->queue_stats_update ();
1681		1770
1682	INVOKE_OBJECT (INSERT, this);	1771	INVOKE_OBJECT (INSERT, this);
1683		1772
1684	return op;	1773	return op;
1685	}	1774	}
…		…
1703	* MSW 2001-07-08: Check all objects on space, not just those below	1792	* MSW 2001-07-08: Check all objects on space, not just those below
1704	* object being inserted. insert_ob_in_map may not put new objects	1793	* object being inserted. insert_ob_in_map may not put new objects
1705	* on top.	1794	* on top.
1706	*/	1795	*/
1707	int	1796	int
1708	check_move_on (object *op, object *originator)	1797	check_move_on (object *op, object *originator, int flags)
1709	{	1798	{
1710	if (QUERY_FLAG (op, FLAG_NO_APPLY))	1799	if (op->flag [FLAG_NO_APPLY])
1711	return 0;	1800	return 0;
1712		1801
1713	object *tmp;	1802	object *tmp;
1714	maptile *m = op->map;	1803	maptile *m = op->map;
1715	int x = op->x, y = op->y;	1804	int x = op->x, y = op->y;
…		…
1752	* Second check makes sure that the movement types not being slowed	1841	* Second check makes sure that the movement types not being slowed
1753	* (~slow_move) is not blocked on this space - just because the	1842	* (~slow_move) is not blocked on this space - just because the
1754	* space doesn't slow down swimming (for example), if you can't actually	1843	* space doesn't slow down swimming (for example), if you can't actually
1755	* swim on that space, can't use it to avoid the penalty.	1844	* swim on that space, can't use it to avoid the penalty.
1756	*/	1845	*/
1757	if (!QUERY_FLAG (op, FLAG_WIZPASS))	1846	if (!op->flag [FLAG_WIZPASS])
1758	{	1847	{
1759	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||	1848	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
1760	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))	1849	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1761	{	1850	{
1762	float diff = tmp->move_slow_penalty * fabs (op->speed);	1851	float diff = tmp->move_slow_penalty * fabs (op->speed);
…		…
1772		1861
1773	/* Basically same logic as above, except now for actual apply. */	1862	/* Basically same logic as above, except now for actual apply. */
1774	if ((!op->move_type && tmp->move_on & MOVE_WALK) ||	1863	if ((!op->move_type && tmp->move_on & MOVE_WALK) ||
1775	((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))	1864	((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))
1776	{	1865	{
		1866	if ((flags & INS_NO_AUTO_EXIT)
		1867	&& (tmp->type == EXIT || tmp->type == TELEPORTER
		1868	|| tmp->type == HOLE || tmp->type == TRAPDOOR)) //TODO: temporary, fix exits instead
		1869	continue;
		1870
1777	move_apply (tmp, op, originator);	1871	move_apply (tmp, op, originator);
1778		1872
1779	if (op->destroyed ())	1873	if (op->destroyed ())
1780	return 1;	1874	return 1;
1781		1875
…		…
1893	void	1987	void
1894	flag_inv (object *op, int flag)	1988	flag_inv (object *op, int flag)
1895	{	1989	{
1896	for (object *tmp = op->inv; tmp; tmp = tmp->below)	1990	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1897	{	1991	{
1898	SET_FLAG (tmp, flag);	1992	tmp->set_flag (flag);
1899	flag_inv (tmp, flag);	1993	flag_inv (tmp, flag);
1900	}	1994	}
1901	}	1995	}
1902		1996
1903	/*	1997	/*
…		…
1906	void	2000	void
1907	unflag_inv (object *op, int flag)	2001	unflag_inv (object *op, int flag)
1908	{	2002	{
1909	for (object *tmp = op->inv; tmp; tmp = tmp->below)	2003	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1910	{	2004	{
1911	CLEAR_FLAG (tmp, flag);	2005	tmp->clr_flag (flag);
1912	unflag_inv (tmp, flag);	2006	unflag_inv (tmp, flag);
1913	}	2007	}
1914	}	2008	}
1915		2009
1916	/*	2010	/*
…		…
2106	{	2200	{
2107	return (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);	2201	return (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);
2108	}	2202	}
2109		2203
2110	/*	2204	/*
2111	* find_dir_2(delta-x,delta-y) will return a direction in which	2205	* find_dir_2(delta-x,delta-y) will return a direction value
2112	* an object which has subtracted the x and y coordinates of another	2206	* for running into direct [dx, dy].
2113	* object, needs to travel toward it.	2207	* (the opposite of crossfire's find_dir_2!)
2114	*/	2208	*/
2115	int	2209	int
2116	find_dir_2 (int x, int y)	2210	find_dir_2 (int x, int y)
2117	{	2211	{
		2212	#if 1 // new algorithm
		2213	// this works by putting x, y into 16 sectors, which
		2214	// are not equal sized, but are a better approximation
		2215	// then the old algorithm, and then using a mapping
		2216	// table to map it into a direction value.
		2217	// basically, it maps these comparisons to each bit
		2218	// bit #3: x < 0
		2219	// bit #2: y < 0
		2220	// bit #1: x > y
		2221	// bit #0: x > 2y
		2222
		2223	static const uint8 dir[16] = {
		2224	4, 5, 4, 3,
		2225	2, 1, 2, 3,
		2226	6, 5, 6, 7,
		2227	8, 1, 8, 7,
		2228	};
		2229	int sector = 0;
		2230
		2231	// this is a bit ugly, but more likely to result in branchless code
		2232	sector |= x < 0 ? 8 : 0;
		2233	x = x < 0 ? -x : x; // abs
		2234
		2235	sector |= y < 0 ? 4 : 0;
		2236	y = y < 0 ? -y : y; // abs
		2237
		2238	if (x > y)
		2239	{
		2240	sector |= 2;
		2241
		2242	if (x > y * 2)
		2243	sector |= 1;
		2244	}
		2245	else
		2246	{
		2247	if (y > x * 2)
		2248	sector |= 1;
		2249	else if (!y)
		2250	return 0; // x == 0 here
		2251	}
		2252
		2253	return dir [sector];
		2254	#else // old algorithm
2118	int q;	2255	int q;
2119		2256
2120	if (y)	2257	if (y)
2121	q = x * 100 / y;	2258	q = 128 * x / y;
2122	else if (x)	2259	else if (x)
2123	q = -300 * x;	2260	q = -512 * x; // to make it > 309
2124	else	2261	else
2125	return 0;	2262	return 0;
2126		2263
2127	if (y > 0)	2264	if (y > 0)
2128	{	2265	{
2129	if (q < -242)	2266	if (q < -309) return 7;
		2267	if (q < -52) return 6;
		2268	if (q < 52) return 5;
		2269	if (q < 309) return 4;
		2270
2130	return 3;	2271	return 3;
2131	if (q < -41)	2272	}
2132	return 2;	2273	else
2133	if (q < 41)	2274	{
2134	return 1;	2275	if (q < -309) return 3;
2135	if (q < 242)	2276	if (q < -52) return 2;
2136	return 8;	2277	if (q < 52) return 1;
		2278	if (q < 309) return 8;
		2279
2137	return 7;	2280	return 7;
2138	}	2281	}
2139		2282	#endif
2140	if (q < -242)
2141	return 7;
2142	if (q < -41)
2143	return 6;
2144	if (q < 41)
2145	return 5;
2146	if (q < 242)
2147	return 4;
2148
2149	return 3;
2150	}	2283	}
2151		2284
2152	/*	2285	/*
2153	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is	2286	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is
2154	* between two directions (which are expected to be absolute (see absdir())	2287	* between two directions (which are expected to be absolute (see absdir())
2155	*/	2288	*/
2156	int	2289	int
2157	dirdiff (int dir1, int dir2)	2290	dirdiff (int dir1, int dir2)
2158	{	2291	{
2159	int d;
2160
2161	d = abs (dir1 - dir2);	2292	int d = abs (dir1 - dir2);
2162	if (d > 4)
2163	d = 8 - d;
2164		2293
2165	return d;	2294	return d > 4 ? 8 - d : d;
2166	}	2295	}
2167		2296
2168	/* peterm:	2297	/* peterm:
2169	* do LOS stuff for ball lightning. Go after the closest VISIBLE monster.	2298	* do LOS stuff for ball lightning. Go after the closest VISIBLE monster.
2170	* Basically, this is a table of directions, and what directions	2299	* Basically, this is a table of directions, and what directions
…		…
2172	* This basically means that if direction is 15, then it could either go	2301	* This basically means that if direction is 15, then it could either go
2173	* direction 4, 14, or 16 to get back to where we are.	2302	* direction 4, 14, or 16 to get back to where we are.
2174	* Moved from spell_util.c to object.c with the other related direction	2303	* Moved from spell_util.c to object.c with the other related direction
2175	* functions.	2304	* functions.
2176	*/	2305	*/
2177	const int reduction_dir[SIZEOFFREE][3] = {	2306	static const int reduction_dir[SIZEOFFREE][3] = {
2178	{0, 0, 0}, /* 0 */	2307	{0, 0, 0}, /* 0 */
2179	{0, 0, 0}, /* 1 */	2308	{0, 0, 0}, /* 1 */
2180	{0, 0, 0}, /* 2 */	2309	{0, 0, 0}, /* 2 */
2181	{0, 0, 0}, /* 3 */	2310	{0, 0, 0}, /* 3 */
2182	{0, 0, 0}, /* 4 */	2311	{0, 0, 0}, /* 4 */
…		…
2276	* Add a check so we can't pick up invisible objects (0.93.8)	2405	* Add a check so we can't pick up invisible objects (0.93.8)
2277	*/	2406	*/
2278	int	2407	int
2279	can_pick (const object *who, const object *item)	2408	can_pick (const object *who, const object *item)
2280	{	2409	{
2281	return /*QUERY_FLAG(who,FLAG_WIZ)|| */	2410	return /*who->flag [FLAG_WIZ]|| */
2282	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&	2411	(item->weight > 0 && !item->flag [FLAG_NO_PICK] &&
2283	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->is_player () || item->weight < who->weight / 3));	2412	!item->flag [FLAG_ALIVE] && !item->invisible && (who->is_player () || item->weight < who->weight / 3));
2284	}	2413	}
		2414
		2415	//-GPL
2285		2416
2286	/*	2417	/*
2287	* create clone from object to another	2418	* create clone from object to another
2288	*/	2419	*/
2289	object *	2420	object *
…		…
2320	return tmp;	2451	return tmp;
2321		2452
2322	return 0;	2453	return 0;
2323	}	2454	}
2324		2455
		2456	/* Zero the key_values on op, decrementing the shared-string
		2457	* refcounts and freeing the links.
		2458	*/
		2459	void
		2460	key_values::clear ()
		2461	{
		2462	for (key_value *kvp = first; kvp; )
		2463	{
		2464	key_value *next = kvp->next;
		2465	delete kvp;
		2466	kvp = next;
		2467	}
		2468
		2469	first = 0;
		2470	}
		2471
2325	shstr_tmp	2472	shstr_tmp
2326	object::kv_get (shstr_tmp key) const	2473	key_values::get (shstr_tmp key) const
2327	{	2474	{
2328	for (key_value *kv = key_values; kv; kv = kv->next)	2475	for (key_value *kv = first; kv; kv = kv->next)
2329	if (kv->key == key)	2476	if (kv->key == key)
2330	return kv->value;	2477	return kv->value;
2331		2478
2332	return shstr ();	2479	return shstr ();
2333	}	2480	}
2334		2481
2335	void	2482	void
		2483	key_values::add (shstr_tmp key, shstr_tmp value)
		2484	{
		2485	key_value *kv = new key_value;
		2486
		2487	kv->next = first;
		2488	kv->key = key;
		2489	kv->value = value;
		2490
		2491	first = kv;
		2492	}
		2493
		2494	void
2336	object::kv_set (shstr_tmp key, shstr_tmp value)	2495	key_values::set (shstr_tmp key, shstr_tmp value)
2337	{	2496	{
2338	for (key_value *kv = key_values; kv; kv = kv->next)	2497	for (key_value *kv = first; kv; kv = kv->next)
2339	if (kv->key == key)	2498	if (kv->key == key)
2340	{	2499	{
2341	kv->value = value;	2500	kv->value = value;
2342	return;	2501	return;
2343	}	2502	}
2344		2503
2345	key_value *kv = new key_value;	2504	add (key, value);
2346
2347	kv->next = key_values;
2348	kv->key = key;
2349	kv->value = value;
2350
2351	key_values = kv;
2352	}	2505	}
2353		2506
2354	void	2507	void
2355	object::kv_del (shstr_tmp key)	2508	key_values::del (shstr_tmp key)
2356	{	2509	{
2357	for (key_value **kvp = &key_values; *kvp; kvp = &(*kvp)->next)	2510	for (key_value **kvp = &first; *kvp; kvp = &(*kvp)->next)
2358	if ((*kvp)->key == key)	2511	if ((*kvp)->key == key)
2359	{	2512	{
2360	key_value *kv = *kvp;	2513	key_value *kv = *kvp;
2361	*kvp = (*kvp)->next;	2514	*kvp = (*kvp)->next;
2362	delete kv;	2515	delete kv;
2363	return;	2516	return;
2364	}	2517	}
		2518	}
		2519
		2520	void
		2521	key_values::reverse ()
		2522	{
		2523	key_value *prev = 0;
		2524	key_value *head = first;
		2525
		2526	while (head)
		2527	{
		2528	key_value *node = head;
		2529	head = head->next;
		2530	node->next = prev;
		2531	prev = node;
		2532	}
		2533
		2534	first = prev;
		2535	}
		2536
		2537	key_values &
		2538	key_values::operator =(const key_values &kv)
		2539	{
		2540	clear ();
		2541
		2542	for (key_value *kvp = kv.first; kvp; kvp = kvp->next)
		2543	add (kvp->key, kvp->value);
		2544
		2545	reverse ();
2365	}	2546	}
2366		2547
2367	object::depth_iterator::depth_iterator (object *container)	2548	object::depth_iterator::depth_iterator (object *container)
2368	: iterator_base (container)	2549	: iterator_base (container)
2369	{	2550	{
…		…
2453	{	2634	{
2454	return map ? map->region (x, y)	2635	return map ? map->region (x, y)
2455	: region::default_region ();	2636	: region::default_region ();
2456	}	2637	}
2457		2638
2458	const materialtype_t *	2639	//+GPL
2459	object::dominant_material () const
2460	{
2461	if (materialtype_t *mt = name_to_material (materialname))
2462	return mt;
2463
2464	return name_to_material (shstr_unknown);
2465	}
2466		2640
2467	void	2641	void
2468	object::open_container (object *new_container)	2642	object::open_container (object *new_container)
2469	{	2643	{
2470	if (container == new_container)	2644	if (container == new_container)
…		…
2505	// TODO: this does not seem to serve any purpose anymore?	2679	// TODO: this does not seem to serve any purpose anymore?
2506	#if 0	2680	#if 0
2507	// insert the "Close Container" object.	2681	// insert the "Close Container" object.
2508	if (archetype *closer = new_container->other_arch)	2682	if (archetype *closer = new_container->other_arch)
2509	{	2683	{
2510	object *closer = arch_to_object (new_container->other_arch);	2684	object *closer = new_container->other_arch->instance ();
2511	closer->flag [FLAG_NO_MAP_SAVE] = 1;	2685	closer->flag [FLAG_NO_MAP_SAVE] = 1;
2512	new_container->insert (closer);	2686	new_container->insert (closer);
2513	}	2687	}
2514	#endif	2688	#endif
2515		2689
…		…
2527	play_sound (sound_find ("chest_open"));	2701	play_sound (sound_find ("chest_open"));
2528	}	2702	}
2529	// else if (!old_container->env && contr && contr->ns)	2703	// else if (!old_container->env && contr && contr->ns)
2530	// contr->ns->floorbox_reset ();	2704	// contr->ns->floorbox_reset ();
2531	}	2705	}
		2706
		2707	//-GPL
		2708
		2709	// prefetch some flat area around the player
		2710	static void
		2711	prefetch_surrounding_area (object *op, maptile *map, int range)
		2712	{
		2713	for (maprect *rect = map->split_to_tiles (mapwalk_buf,
		2714	op->x - range , op->y - range ,
		2715	op->x + range + 1, op->y + range + 1);
		2716	rect->m;
		2717	++rect)
		2718	{
		2719	rect->m->touch ();
		2720	rect->m->activate ();
		2721	}
		2722	}
		2723
		2724	// prefetch a generous area around the player, also up and down
		2725	void
		2726	object::prefetch_surrounding_maps ()
		2727	{
		2728	prefetch_surrounding_area (this, map, 40);
		2729
		2730	if (maptile *m = map->tile_available (TILE_DOWN))
		2731	prefetch_surrounding_area (this, m, 20);
		2732
		2733	if (maptile *m = map->tile_available (TILE_UP))
		2734	prefetch_surrounding_area (this, m, 20);
		2735	}
		2736
		2737	//+GPL
2532		2738
2533	object *	2739	object *
2534	object::force_find (shstr_tmp name)	2740	object::force_find (shstr_tmp name)
2535	{	2741	{
2536	/* cycle through his inventory to look for the MARK we want to	2742	/* cycle through his inventory to look for the MARK we want to
…		…
2541	return splay (tmp);	2747	return splay (tmp);
2542		2748
2543	return 0;	2749	return 0;
2544	}	2750	}
2545		2751
		2752	void
		2753	object::force_set_timer (int duration)
		2754	{
		2755	this->duration = 1;
		2756	this->speed_left = -1.f;
		2757
		2758	this->set_speed (duration ? 1.f / duration : 0.f);
		2759	}
		2760
2546	object *	2761	object *
2547	object::force_add (shstr_tmp name, int duration)	2762	object::force_add (shstr_tmp name, int duration)
2548	{	2763	{
2549	if (object *force = force_find (name))	2764	if (object *force = force_find (name))
2550	force->destroy ();	2765	force->destroy ();
2551		2766
2552	object *force = get_archetype (FORCE_NAME);	2767	object *force = archetype::get (FORCE_NAME);
2553		2768
2554	force->slaying = name;	2769	force->slaying = name;
2555	force->stats.food = 1;	2770	force->force_set_timer (duration);
2556	force->speed_left = -1.f;
2557
2558	force->set_speed (duration ? 1.f / duration : 0.f);
2559	force->flag [FLAG_IS_USED_UP] = true;
2560	force->flag [FLAG_APPLIED] = true;	2771	force->flag [FLAG_APPLIED] = true;
2561		2772
2562	return insert (force);	2773	return insert (force);
2563	}	2774	}
2564		2775
2565	void	2776	void
…		…
2614		2825
2615	insert (force);	2826	insert (force);
2616	}	2827	}
2617	}	2828	}
2618		2829
		2830	void object::change_move_type (MoveType mt)
		2831	{
		2832	if (move_type == mt)
		2833	return;
		2834
		2835	if (is_on_map ())
		2836	{
		2837	// we are on the map, so handle move_on/off effects
		2838	remove ();
		2839	move_type = mt;
		2840	map->insert (this, x, y, this);
		2841	}
		2842	else
		2843	move_type = mt;
		2844	}
		2845
		2846	/* object should be a player.
		2847	* we return the object the player has marked with the 'mark' command
		2848	* below. If no match is found (or object has changed), we return
		2849	* NULL. We leave it up to the calling function to print messages if
		2850	* nothing is found.
		2851	*/
		2852	object *
		2853	object::mark () const
		2854	{
		2855	if (contr && contr->mark && contr->mark->env == this)
		2856	return contr->mark;
		2857	else
		2858	return 0;
		2859	}
		2860
		2861	// put marked object first in the inventory
		2862	// this is used by identify-like spells so players can influence
		2863	// the order a bit.
		2864	void
		2865	object::splay_marked ()
		2866	{
		2867	if (object *marked = mark ())
		2868	splay (marked);
		2869	}
		2870

Diff Legend

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