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.275 by root, Sun Dec 28 15:28:47 2008 UTC vs.
Revision 1.347 by root, Wed May 4 07:41:13 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 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	}
…		…
328	// the player inventory itself is always visible	422	// the player inventory itself is always visible
329	if (env->is_player ())	423	if (env->is_player ())
330	return env;	424	return env;
331		425
332	// else a player could have our env open	426	// else a player could have our env open
333	object *envest = env->outer_env ();	427	object *envest = env->outer_env_or_self ();
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.]", &ob->name);
561	return false;
562	}
563
564	//new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);
565	}
566	else
567	;//new_draw_info_format (NDI_UNIQUE, 0, this, "You unwield your weapons.");
568
569	if (ob && !ob->flag [FLAG_APPLIED] && ob->type != SPELL)
570	{
571	LOG (llevError | logBacktrace, "%s changed to unapplied weapon %s",
572	&name, ob->debug_desc ());
573	return false;
574	}
575
576	return true;
577	}
578
579	/* Zero the key_values on op, decrementing the shared-string
580	* refcounts and freeing the links.
581	*/
582	static void
583	free_key_values (object *op)
584	{
585	for (key_value *i = op->key_values; i; )
586	{
587	key_value *next = i->next;
588	delete i;
589
590	i = next;
591	}
592
593	op->key_values = 0;
594	}	602	}
595		603
596	/*	604	/*
597	* copy_to first frees everything allocated by the dst object,	605	* copy_to first frees everything allocated by the dst object,
598	* and then copies the contents of itself into the second	606	* and then copies the contents of itself into the second
…		…
604	void	612	void
605	object::copy_to (object *dst)	613	object::copy_to (object *dst)
606	{	614	{
607	dst->remove ();	615	dst->remove ();
608	*(object_copy *)dst = *this;	616	*(object_copy *)dst = *this;
		617
		618	// maybe move to object_copy?
		619	dst->kv = kv;
		620
609	dst->flag [FLAG_REMOVED] = true;	621	dst->flag [FLAG_REMOVED] = true;
610
611	/* Copy over key_values, if any. */
612	if (key_values)
613	{
614	key_value *tail = 0;
615	dst->key_values = 0;
616
617	for (key_value *i = key_values; i; i = i->next)
618	{
619	key_value *new_link = new key_value;
620
621	new_link->next = 0;
622	new_link->key = i->key;
623	new_link->value = i->value;
624
625	/* Try and be clever here, too. */
626	if (!dst->key_values)
627	{
628	dst->key_values = new_link;
629	tail = new_link;
630	}
631	else
632	{
633	tail->next = new_link;
634	tail = new_link;
635	}
636	}
637	}
638
639	if (speed < 0)
640	dst->speed_left -= rndm ();
641
642	dst->activate ();	622	dst->activate ();
643	}	623	}
644		624
645	void	625	void
646	object::instantiate ()	626	object::instantiate ()
647	{	627	{
648	if (!uuid.seq) // HACK	628	if (!uuid.seq) // HACK
649	uuid = UUID::gen ();	629	uuid = UUID::gen ();
650		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
651	speed_left = -0.1f;	635	speed_left = -1.;
		636
652	/* 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
653	* 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.
654	* 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
655	* values for the body_used info, so when items are created	640	* values for the body_used info, so when items are created
656	* for it, they can be properly equipped.	641	* for it, they can be properly equipped.
…		…
664	object *	649	object *
665	object::clone ()	650	object::clone ()
666	{	651	{
667	object *neu = create ();	652	object *neu = create ();
668	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
669	neu->map = map; // not copied by copy_to	659	neu->map = map; // not copied by copy_to
670	return neu;	660	return neu;
671	}	661	}
672		662
673	/*	663	/*
…		…
676	* 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.
677	*/	667	*/
678	void	668	void
679	update_turn_face (object *op)	669	update_turn_face (object *op)
680	{	670	{
681	if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || !op->arch)	671	if (!op->flag [FLAG_IS_TURNABLE] || !op->arch)
682	return;	672	return;
683		673
684	SET_ANIMATION (op, op->direction);	674	SET_ANIMATION (op, op->direction);
685	update_object (op, UP_OBJ_FACE);	675	update_object (op, UP_OBJ_FACE);
686	}	676	}
…		…
691	* 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.
692	*/	682	*/
693	void	683	void
694	object::set_speed (float speed)	684	object::set_speed (float speed)
695	{	685	{
696	if (flag [FLAG_FREED] && speed)
697	{
698	LOG (llevError, "Object %s is freed but has speed.\n", &name);
699	speed = 0;
700	}
701
702	this->speed = speed;	686	this->speed = speed;
703		687
704	if (has_active_speed ())	688	if (has_active_speed ())
705	activate ();	689	activate ();
706	else	690	else
…		…
756		740
757	if (!(m.flags_ & P_UPTODATE))	741	if (!(m.flags_ & P_UPTODATE))
758	/* nop */;	742	/* nop */;
759	else if (action == UP_OBJ_INSERT)	743	else if (action == UP_OBJ_INSERT)
760	{	744	{
		745	#if 0
761	// this is likely overkill, TODO: revisit (schmorp)	746	// this is likely overkill, TODO: revisit (schmorp)
762	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))	747	if ((op->flag [FLAG_BLOCKSVIEW] && !(m.flags_ & P_BLOCKSVIEW))
763	|| (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))	748	|| (op->flag [FLAG_NO_MAGIC] && !(m.flags_ & P_NO_MAGIC))
764	|| (op->is_player () && !(m.flags_ & P_PLAYER))	749	|| (op->is_player () && !(m.flags_ & P_PLAYER))
765	|| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))	750	|| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
766	|| (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))	751	|| (op->flag [FLAG_ALIVE] && !(m.flags_ & P_IS_ALIVE))
767	|| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))	752	|| (op->flag [FLAG_DAMNED] && !(m.flags_ & P_NO_CLERIC))
768	|| (m.move_on | op->move_on ) != m.move_on	753	|| (m.move_on | op->move_on ) != m.move_on
769	|| (m.move_off | op->move_off ) != m.move_off	754	|| (m.move_off | op->move_off ) != m.move_off
770	|| (m.move_slow | op->move_slow) != m.move_slow	755	|| (m.move_slow | op->move_slow) != m.move_slow
771	/* 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
772	* have move_allow right now.	757	* have move_allow right now.
773	*/	758	*/
774	|| ((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
775	|| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)
776	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
777	}	765	}
778	/* if the object is being removed, we can't make intelligent	766	/* if the object is being removed, we can't make intelligent
779	* decisions, because remove_ob can't really pass the object	767	* decisions, because remove_ob can't really pass the object
780	* that is being removed.	768	* that is being removed.
781	*/	769	*/
…		…
790	update_object (op->more, action);	778	update_object (op->more, action);
791	}	779	}
792		780
793	object::object ()	781	object::object ()
794	{	782	{
795	SET_FLAG (this, FLAG_REMOVED);	783	this->set_flag (FLAG_REMOVED);
796		784
797	expmul = 1.0;	785	//expmul = 1.0; declared const for the time being
798	face = blank_face;	786	face = blank_face;
		787	material = MATERIAL_NULL;
799	}	788	}
800		789
801	object::~object ()	790	object::~object ()
802	{	791	{
803	unlink ();	792	unlink ();
804		793
805	free_key_values (this);	794	kv.clear ();
806	}	795	}
807
808	static int object_count;
809		796
810	void object::link ()	797	void object::link ()
811	{	798	{
812	assert (!index);//D	799	assert (!index);//D
813	uuid = UUID::gen ();	800	uuid = UUID::gen ();
814	count = ++object_count;
815		801
816	refcnt_inc ();	802	refcnt_inc ();
817	objects.insert (this);	803	objects.insert (this);
		804
		805	++create_count;
		806
818	}	807	}
819		808
820	void object::unlink ()	809	void object::unlink ()
821	{	810	{
822	if (!index)	811	if (!index)
823	return;	812	return;
		813
		814	++destroy_count;
824		815
825	objects.erase (this);	816	objects.erase (this);
826	refcnt_dec ();	817	refcnt_dec ();
827	}	818	}
828		819
…		…
831	{	822	{
832	/* If already on active list, don't do anything */	823	/* If already on active list, don't do anything */
833	if (active)	824	if (active)
834	return;	825	return;
835		826
836	if (has_active_speed () && flag [FLAG_FREED]) LOG (llevError | logBacktrace, "BUG: tried to activate freed object %s\n", debug_desc ());//D
837	if (has_active_speed () && flag [FLAG_DEBUG]) LOG (llevError | logBacktrace, "BUG: tried to activate DEBUG object %s\n", debug_desc ());//D temp
838
839	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
840	actives.insert (this);	832	actives.insert (this);
		833	}
841	}	834	}
842		835
843	void	836	void
844	object::activate_recursive ()	837	object::activate_recursive ()
845	{	838	{
…		…
905	* if some form of movement is allowed, let objects	898	* if some form of movement is allowed, let objects
906	* drop on that space.	899	* drop on that space.
907	*/	900	*/
908	if (!drop_to_ground	901	if (!drop_to_ground
909	|| !map	902	|| !map
910	|| map->in_memory != MAP_ACTIVE	903	|| !map->linkable ()
911	|| map->no_drop	904	|| map->no_drop
912	|| ms ().move_block == MOVE_ALL)	905	|| ms ().move_block == MOVE_ALL)
913	{	906	{
914	while (inv)	907	while (inv)
915	inv->destroy ();	908	inv->destroy ();
…		…
931	map->insert (op, x, y);	924	map->insert (op, x, y);
932	}	925	}
933	}	926	}
934	}	927	}
935		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 *
936	object *object::create ()	966	object::create ()
937	{	967	{
938	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
939	op->link ();	990	op->link ();
		991
940	return op;	992	return op;
941	}	993	}
942		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
943	static struct freed_map : maptile	1010	static struct freed_map : maptile
944	{	1011	{
945	freed_map ()	1012	freed_map ()
		1013	: maptile (3, 3)
946	{	1014	{
947	path = "<freed objects map>";	1015	path = "<freed objects map>";
948	name = "/internal/freed_objects_map";	1016	name = "/internal/freed_objects_map";
949	width = 3;
950	height = 3;
951	no_drop = 1;	1017	no_drop = 1;
952	no_reset = 1;	1018	no_reset = 1;
953		1019
954	alloc ();
955	in_memory = MAP_ACTIVE;	1020	state = MAP_ACTIVE;
956	}	1021	}
957		1022
958	~freed_map ()	1023	~freed_map ()
959	{	1024	{
960	destroy ();	1025	destroy ();
…		…
963		1028
964	void	1029	void
965	object::do_destroy ()	1030	object::do_destroy ()
966	{	1031	{
967	if (flag [FLAG_IS_LINKED])	1032	if (flag [FLAG_IS_LINKED])
968	remove_button_link (this);	1033	remove_link ();
969		1034
970	if (flag [FLAG_FRIENDLY])	1035	if (flag [FLAG_FRIENDLY])
971	remove_friendly_object (this);	1036	remove_friendly_object (this);
972		1037
973	remove ();	1038	remove ();
…		…
1010	LOG (llevError | logBacktrace, "tried to destroy the tail of an object");	1075	LOG (llevError | logBacktrace, "tried to destroy the tail of an object");
1011	head->destroy ();	1076	head->destroy ();
1012	return;	1077	return;
1013	}	1078	}
1014		1079
1015	destroy_inv (false);	1080	destroy_inv_fast ();
1016		1081
1017	if (is_head ())	1082	if (is_head ())
1018	if (sound_destroy)	1083	if (sound_destroy)
1019	play_sound (sound_destroy);	1084	play_sound (sound_destroy);
1020	else if (flag [FLAG_MONSTER])	1085	else if (flag [FLAG_MONSTER])
…		…
1031	* the previous environment.	1096	* the previous environment.
1032	*/	1097	*/
1033	void	1098	void
1034	object::do_remove ()	1099	object::do_remove ()
1035	{	1100	{
1036	object *tmp, *last = 0;
1037	object *otmp;
1038
1039	if (flag [FLAG_REMOVED])	1101	if (flag [FLAG_REMOVED])
1040	return;	1102	return;
1041		1103
1042	INVOKE_OBJECT (REMOVE, this);	1104	INVOKE_OBJECT (REMOVE, this);
1043		1105
…		…
1055	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
1056	if (object *pl = visible_to ())	1118	if (object *pl = visible_to ())
1057	esrv_del_item (pl->contr, count);	1119	esrv_del_item (pl->contr, count);
1058	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
1059		1121
1060	adjust_weight (env, -total_weight ());	1122	adjust_weight (env, total_weight (), 0);
1061		1123
1062	object *pl = in_player ();	1124	object *pl = in_player ();
1063		1125
1064	/* we set up values so that it could be inserted into	1126	/* we set up values so that it could be inserted into
1065	* 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
…		…
1075		1137
1076	above = 0;	1138	above = 0;
1077	below = 0;	1139	below = 0;
1078	env = 0;	1140	env = 0;
1079		1141
1080	/* NO_FIX_PLAYER is set when a great many changes are being	1142	if (pl && pl->is_player ())
1081	* made to players inventory. If set, avoiding the call
1082	* to save cpu time.
1083	*/	1143	{
1084	if (pl)	1144	if (expect_false (pl->contr->combat_ob == this))
1085	if (pl->is_player () && (glow_radius || !QUERY_FLAG (pl, FLAG_NO_FIX_PLAYER)))
1086	{	1145	{
1087	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	}
1088		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
1089	if (glow_radius && pl->is_on_map ())	1160	if (expect_false (glow_radius) && pl->is_on_map ())
1090	update_all_los (pl->map, pl->x, pl->y);	1161	update_all_los (pl->map, pl->x, pl->y);
1091	}	1162	}
1092	}	1163	}
1093	else if (map)	1164	else if (map)
1094	{	1165	{
1095	map->dirty = true;	1166	map->dirty = true;
1096	mapspace &ms = this->ms ();	1167	mapspace &ms = this->ms ();
…		…
1109	close_container ();	1180	close_container ();
1110		1181
1111	--map->players;	1182	--map->players;
1112	map->touch ();	1183	map->touch ();
1113	}	1184	}
1114	else if (pl->container == this)	1185	else if (pl->container_ () == this)
1115	{	1186	{
1116	// removing a container should close it	1187	// removing a container should close it
1117	close_container ();	1188	close_container ();
1118	}	1189	}
1119		1190	else
1120	esrv_del_item (pl->contr, count);	1191	esrv_del_item (pl->contr, count);
1121	}	1192	}
1122		1193
1123	/* link the object above us */	1194	/* link the object above us */
1124	// re-link, make sure compiler can easily use cmove	1195	// re-link, make sure compiler can easily use cmove
1125	*(above ? &above->below : &ms.top) = below;	1196	*(above ? &above->below : &ms.top) = below;
…		…
1128	above = 0;	1199	above = 0;
1129	below = 0;	1200	below = 0;
1130		1201
1131	ms.invalidate ();	1202	ms.invalidate ();
1132		1203
1133	if (map->in_memory == MAP_SAVING)
1134	return;
1135
1136	int check_walk_off = !flag [FLAG_NO_APPLY];	1204	int check_walk_off = !flag [FLAG_NO_APPLY];
1137		1205
1138	if (object *pl = ms.player ())	1206	if (object *pl = ms.player ())
1139	{	1207	{
1140	if (pl->container == this)	1208	if (pl->container_ () == this)
1141	/* If a container that the player is currently using somehow gets	1209	/* If a container that the player is currently using somehow gets
1142	* removed (most likely destroyed), update the player view	1210	* removed (most likely destroyed), update the player view
1143	* appropriately.	1211	* appropriately.
1144	*/	1212	*/
1145	pl->close_container ();	1213	pl->close_container ();
…		…
1149	//TODO: update floorbox to preserve ordering	1217	//TODO: update floorbox to preserve ordering
1150	if (pl->contr->ns)	1218	if (pl->contr->ns)
1151	pl->contr->ns->floorbox_update ();	1219	pl->contr->ns->floorbox_update ();
1152	}	1220	}
1153		1221
		1222	if (check_walk_off)
1154	for (tmp = ms.bot; tmp; tmp = tmp->above)	1223	for (object *above, *tmp = ms.bot; tmp; tmp = above)
1155	{	1224	{
		1225	above = tmp->above;
		1226
1156	/* 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
1157	* being removed.	1228	* being removed.
1158	*/	1229	*/
1159		1230
1160	/* See if object moving off should effect something */	1231	/* See if object moving off should effect something */
1161	if (check_walk_off
1162	&& ((move_type & tmp->move_off)	1232	if ((move_type & tmp->move_off)
1163	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))	1233	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0)
1164	{
1165	move_apply (tmp, this, 0);	1234	move_apply (tmp, this, 0);
1166
1167	if (destroyed ())
1168	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1169	}	1235	}
1170
1171	last = tmp;
1172	}
1173		1236
1174	if (affects_los ())	1237	if (affects_los ())
1175	update_all_los (map, x, y);	1238	update_all_los (map, x, y);
1176	}	1239	}
1177	}	1240	}
…		…
1221		1284
1222	object *prev = this;	1285	object *prev = this;
1223		1286
1224	for (archetype *at = (archetype *)arch->more; at; at = (archetype *)at->more)	1287	for (archetype *at = (archetype *)arch->more; at; at = (archetype *)at->more)
1225	{	1288	{
1226	object *op = arch_to_object (at);	1289	object *op = at->instance ();
1227		1290
1228	op->name = name;	1291	op->name = name;
1229	op->name_pl = name_pl;	1292	op->name_pl = name_pl;
1230	op->title = title;	1293	op->title = title;
1231		1294
…		…
1269	* 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
1270	* to be set if special handling is needed.	1333	* to be set if special handling is needed.
1271	*	1334	*
1272	* Return value:	1335	* Return value:
1273	* new object if 'op' was merged with other object	1336	* new object if 'op' was merged with other object
1274	* NULL if 'op' was destroyed	1337	* NULL if there was an error (destroyed, blocked etc.)
1275	* just 'op' otherwise	1338	* just 'op' otherwise
1276	*/	1339	*/
1277	object *	1340	object *
1278	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)
1279	{	1342	{
1280	op->remove ();	1343	op->remove ();
1281		1344
1282	if (m == &freed_map)//D TODO: remove soon	1345	if (m == &freed_map)//D TODO: remove soon
1283	{//D	1346	{//D
1284	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
1285	}//D	1348	}//D
1286		1349
1287	/* Ideally, the caller figures this out. However, it complicates a lot	1350	/* Ideally, the caller figures this out. However, it complicates a lot
1288	* 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
1289	* need extra work	1352	* need extra work
…		…
1297		1360
1298	if (object *more = op->more)	1361	if (object *more = op->more)
1299	if (!insert_ob_in_map (more, m, originator, flag))	1362	if (!insert_ob_in_map (more, m, originator, flag))
1300	return 0;	1363	return 0;
1301		1364
1302	CLEAR_FLAG (op, FLAG_REMOVED);	1365	op->flag [FLAG_REMOVED] = false;
1303		1366	op->env = 0;
1304	op->map = newmap;	1367	op->map = newmap;
		1368
1305	mapspace &ms = op->ms ();	1369	mapspace &ms = op->ms ();
1306		1370
1307	/* this has to be done after we translate the coordinates.	1371	/* this has to be done after we translate the coordinates.
1308	*/	1372	*/
1309	if (op->nrof && !(flag & INS_NO_MERGE))	1373	if (op->nrof && !(flag & INS_NO_MERGE))
…		…
1315	// from here :/	1379	// from here :/
1316	op->nrof += tmp->nrof;	1380	op->nrof += tmp->nrof;
1317	tmp->destroy ();	1381	tmp->destroy ();
1318	}	1382	}
1319		1383
1320	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 */
1321	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1385	op->clr_flag (FLAG_INV_LOCKED);
1322		1386
1323	if (!QUERY_FLAG (op, FLAG_ALIVE))	1387	if (!op->flag [FLAG_ALIVE])
1324	CLEAR_FLAG (op, FLAG_NO_STEAL);	1388	op->clr_flag (FLAG_NO_STEAL);
1325		1389
1326	if (flag & INS_BELOW_ORIGINATOR)	1390	if (flag & INS_BELOW_ORIGINATOR)
1327	{	1391	{
1328	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)
1329	{	1393	{
1330	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");	1394	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");
1331	abort ();	1395	abort ();
1332	}	1396	}
1333		1397
1334	if (!originator->is_on_map ())	1398	if (!originator->is_on_map ())
		1399	{
1335	LOG (llevDebug | logBacktrace, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map",	1400	LOG (llevError, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map",
1336	op->debug_desc (), originator->debug_desc ());	1401	op->debug_desc (), originator->debug_desc ());
		1402	abort ();
		1403	}
1337		1404
1338	op->above = originator;	1405	op->above = originator;
1339	op->below = originator->below;	1406	op->below = originator->below;
1340	originator->below = op;	1407	originator->below = op;
1341		1408
…		…
1361	* 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
1362	* that flying non pickable objects are spell objects.	1429	* that flying non pickable objects are spell objects.
1363	*/	1430	*/
1364	for (object *tmp = ms.bot; tmp; tmp = tmp->above)	1431	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1365	{	1432	{
1366	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])
1367	floor = tmp;	1434	floor = tmp;
1368		1435
1369	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])
1370	{	1437	{
1371	/* We insert above top, so we want this object below this */	1438	/* We insert above top, so we want this object below this */
1372	top = tmp->below;	1439	top = tmp->below;
1373	break;	1440	break;
1374	}	1441	}
…		…
1392	&& (op->face && !faces [op->face].visibility))	1459	&& (op->face && !faces [op->face].visibility))
1393	{	1460	{
1394	object *last;	1461	object *last;
1395		1462
1396	for (last = top; last != floor; last = last->below)	1463	for (last = top; last != floor; last = last->below)
1397	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1464	if (last->flag [FLAG_BLOCKSVIEW] && (last->type != EXIT))
1398	break;	1465	break;
1399		1466
1400	/* Check to see if we found the object that blocks view,	1467	/* Check to see if we found the object that blocks view,
1401	* 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
1402	* we can get inserted below this one, which requires we	1469	* we can get inserted below this one, which requires we
…		…
1473	* blocked() and wall() work properly), and these flags are updated by	1540	* blocked() and wall() work properly), and these flags are updated by
1474	* update_object().	1541	* update_object().
1475	*/	1542	*/
1476		1543
1477	/* 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 */
1478	if (!(flag & INS_NO_WALK_ON) && op->head_ () == op)	1545	if (!(flag & INS_NO_WALK_ON) && op->is_head ())
1479	{	1546	{
1480	if (check_move_on (op, originator))	1547	if (check_move_on (op, originator, flag))
1481	return 0;	1548	return 0;
1482		1549
1483	/* 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
1484	* walk on's.	1551	* walk on's.
1485	*/	1552	*/
1486	for (object *tmp = op->more; tmp; tmp = tmp->more)	1553	for (object *tmp = op->more; tmp; tmp = tmp->more)
1487	if (check_move_on (tmp, originator))	1554	if (check_move_on (tmp, originator, flag))
1488	return 0;	1555	return 0;
1489	}	1556	}
1490		1557
1491	return op;	1558	return op;
1492	}	1559	}
…		…
1494	/* this function inserts an object in the map, but if it	1561	/* this function inserts an object in the map, but if it
1495	* finds an object of its own type, it'll remove that one first.	1562	* finds an object of its own type, it'll remove that one first.
1496	* op is the object to insert it under: supplies x and the map.	1563	* op is the object to insert it under: supplies x and the map.
1497	*/	1564	*/
1498	void	1565	void
1499	replace_insert_ob_in_map (const char *arch_string, object *op)	1566	replace_insert_ob_in_map (shstr_tmp archname, object *op)
1500	{	1567	{
1501	/* first search for itself and remove any old instances */	1568	/* first search for itself and remove any old instances */
1502		1569
1503	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)	1570	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1504	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */	1571	if (tmp->arch->archname == archname) /* same archetype */
1505	tmp->destroy ();	1572	tmp->destroy ();
1506		1573
1507	object *tmp = arch_to_object (archetype::find (arch_string));	1574	object *tmp = archetype::find (archname)->instance ();
1508		1575
1509	tmp->x = op->x;	1576	tmp->x = op->x;
1510	tmp->y = op->y;	1577	tmp->y = op->y;
1511		1578
1512	insert_ob_in_map (tmp, op->map, op, 0);	1579	insert_ob_in_map (tmp, op->map, op, 0);
…		…
1517	{	1584	{
1518	if (where->env)	1585	if (where->env)
1519	return where->env->insert (this);	1586	return where->env->insert (this);
1520	else	1587	else
1521	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;
1522	}	1611	}
1523		1612
1524	/*	1613	/*
1525	* decrease(object, number) decreases a specified number from	1614	* decrease(object, number) decreases a specified number from
1526	* 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
…		…
1536		1625
1537	nr = min (nr, nrof);	1626	nr = min (nr, nrof);
1538		1627
1539	if (nrof > nr)	1628	if (nrof > nr)
1540	{	1629	{
		1630	sint64 oweight = total_weight ();
		1631
1541	nrof -= nr;	1632	nrof -= nr;
1542	adjust_weight (env, -weight * max (1, nr)); // carrying == 0
1543		1633
1544	if (object *pl = visible_to ())	1634	if (object *pl = visible_to ())
1545	esrv_update_item (UPD_NROF, pl, this);	1635	esrv_update_item (UPD_NROF, pl, this);
		1636
		1637	adjust_weight (env, oweight, total_weight ());
1546		1638
1547	return true;	1639	return true;
1548	}	1640	}
1549	else	1641	else
1550	{	1642	{
…		…
1625	if (op->nrof)	1717	if (op->nrof)
1626	for (object *tmp = inv; tmp; tmp = tmp->below)	1718	for (object *tmp = inv; tmp; tmp = tmp->below)
1627	if (object::can_merge (tmp, op))	1719	if (object::can_merge (tmp, op))
1628	{	1720	{
1629	/* return the original object and remove inserted object	1721	/* return the original object and remove inserted object
1630	(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
1631	tmp->nrof += op->nrof;	1727	tmp->nrof += op->nrof;
1632		1728
1633	if (object *pl = tmp->visible_to ())	1729	if (object *pl = tmp->visible_to ())
1634	esrv_update_item (UPD_NROF, pl, tmp);	1730	esrv_update_item (UPD_NROF, pl, tmp);
1635		1731
1636	adjust_weight (this, op->total_weight ());	1732	adjust_weight (this, oweight, tmp->weight * tmp->nrof);
1637		1733
1638	op->destroy ();	1734	op->destroy ();
1639	op = tmp;	1735	op = tmp;
1640	goto inserted;	1736	goto inserted;
1641	}	1737	}
…		…
1657	op->flag [FLAG_REMOVED] = 0;	1753	op->flag [FLAG_REMOVED] = 0;
1658		1754
1659	if (object *pl = op->visible_to ())	1755	if (object *pl = op->visible_to ())
1660	esrv_send_item (pl, op);	1756	esrv_send_item (pl, op);
1661		1757
1662	adjust_weight (this, op->total_weight ());	1758	adjust_weight (this, 0, op->total_weight ());
1663		1759
1664	inserted:	1760	inserted:
1665	/* 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 */
1666	if (op->glow_radius && is_on_map ())	1762	if (op->glow_radius && is_on_map ())
1667	{	1763	{
1668	update_stats ();	1764	update_stats ();
1669	update_all_los (map, x, y);	1765	update_all_los (map, x, y);
1670	}	1766	}
1671	else if (is_player () && !flag [FLAG_NO_FIX_PLAYER])	1767	else if (is_player ())
1672	// if this is a player's inventory, update stats	1768	// if this is a player's inventory, update stats
1673	update_stats ();	1769	contr->queue_stats_update ();
1674		1770
1675	INVOKE_OBJECT (INSERT, this);	1771	INVOKE_OBJECT (INSERT, this);
1676		1772
1677	return op;	1773	return op;
1678	}	1774	}
…		…
1696	* 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
1697	* 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
1698	* on top.	1794	* on top.
1699	*/	1795	*/
1700	int	1796	int
1701	check_move_on (object *op, object *originator)	1797	check_move_on (object *op, object *originator, int flags)
1702	{	1798	{
		1799	if (op->flag [FLAG_NO_APPLY])
		1800	return 0;
		1801
1703	object *tmp;	1802	object *tmp;
1704	maptile *m = op->map;	1803	maptile *m = op->map;
1705	int x = op->x, y = op->y;	1804	int x = op->x, y = op->y;
1706		1805
1707	MoveType move_on, move_slow, move_block;	1806	mapspace &ms = m->at (x, y);
1708		1807
1709	if (QUERY_FLAG (op, FLAG_NO_APPLY))	1808	ms.update ();
1710	return 0;
1711		1809
1712	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);	1810	MoveType move_on = ms.move_on;
1713	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);	1811	MoveType move_slow = ms.move_slow;
1714	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);	1812	MoveType move_block = ms.move_block;
1715		1813
1716	/* if nothing on this space will slow op down or be applied,	1814	/* if nothing on this space will slow op down or be applied,
1717	* no need to do checking below. have to make sure move_type	1815	* no need to do checking below. have to make sure move_type
1718	* is set, as lots of objects don't have it set - we treat that	1816	* is set, as lots of objects don't have it set - we treat that
1719	* as walking.	1817	* as walking.
…		…
1730	return 0;	1828	return 0;
1731		1829
1732	/* The objects have to be checked from top to bottom.	1830	/* The objects have to be checked from top to bottom.
1733	* Hence, we first go to the top:	1831	* Hence, we first go to the top:
1734	*/	1832	*/
1735		1833	for (object *next, *tmp = ms.top; tmp; tmp = next)
1736	for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above)
1737	{
1738	/* Trim the search when we find the first other spell effect
1739	* this helps performance so that if a space has 50 spell objects,
1740	* we don't need to check all of them.
1741	*/
1742	if ((tmp->move_type & MOVE_FLY_LOW) && QUERY_FLAG (tmp, FLAG_NO_PICK))
1743	break;
1744	}	1834	{
		1835	next = tmp->below;
1745		1836
1746	for (; tmp; tmp = tmp->below)
1747	{
1748	if (tmp == op)	1837	if (tmp == op)
1749	continue; /* Can't apply yourself */	1838	continue; /* Can't apply yourself */
1750		1839
1751	/* Check to see if one of the movement types should be slowed down.	1840	/* Check to see if one of the movement types should be slowed down.
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
1763	float
1764	diff = tmp->move_slow_penalty * fabs (op->speed);	1851	float diff = tmp->move_slow_penalty * fabs (op->speed);
1765		1852
1766	if (op->is_player ())	1853	if (op->is_player ())
1767	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||	1854	if ((tmp->flag [FLAG_IS_HILLY ] && find_skill_by_number (op, SK_CLIMBING)) ||
1768	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))	1855	(tmp->flag [FLAG_IS_WOODED] && find_skill_by_number (op, SK_WOODSMAN)))
1769	diff /= 4.0;	1856	diff /= 4.0;
1770		1857
1771	op->speed_left -= diff;	1858	op->speed_left -= diff;
1772	}	1859	}
1773	}	1860	}
1774		1861
1775	/* Basically same logic as above, except now for actual apply. */	1862	/* Basically same logic as above, except now for actual apply. */
1776	if ((!op->move_type && tmp->move_on & MOVE_WALK) ||	1863	if ((!op->move_type && tmp->move_on & MOVE_WALK) ||
1777	((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))
1778	{	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
1779	move_apply (tmp, op, originator);	1871	move_apply (tmp, op, originator);
1780		1872
1781	if (op->destroyed ())	1873	if (op->destroyed ())
1782	return 1;	1874	return 1;
1783		1875
…		…
1895	void	1987	void
1896	flag_inv (object *op, int flag)	1988	flag_inv (object *op, int flag)
1897	{	1989	{
1898	for (object *tmp = op->inv; tmp; tmp = tmp->below)	1990	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1899	{	1991	{
1900	SET_FLAG (tmp, flag);	1992	tmp->set_flag (flag);
1901	flag_inv (tmp, flag);	1993	flag_inv (tmp, flag);
1902	}	1994	}
1903	}	1995	}
1904		1996
1905	/*	1997	/*
…		…
1908	void	2000	void
1909	unflag_inv (object *op, int flag)	2001	unflag_inv (object *op, int flag)
1910	{	2002	{
1911	for (object *tmp = op->inv; tmp; tmp = tmp->below)	2003	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1912	{	2004	{
1913	CLEAR_FLAG (tmp, flag);	2005	tmp->clr_flag (flag);
1914	unflag_inv (tmp, flag);	2006	unflag_inv (tmp, flag);
1915	}	2007	}
1916	}	2008	}
1917		2009
1918	/*	2010	/*
…		…
2108	{	2200	{
2109	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);
2110	}	2202	}
2111		2203
2112	/*	2204	/*
2113	* 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
2114	* an object which has subtracted the x and y coordinates of another	2206	* for running into direct [dx, dy].
2115	* object, needs to travel toward it.	2207	* (the opposite of crossfire's find_dir_2!)
2116	*/	2208	*/
2117	int	2209	int
2118	find_dir_2 (int x, int y)	2210	find_dir_2 (int x, int y)
2119	{	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
2120	int q;	2255	int q;
2121		2256
2122	if (y)	2257	if (y)
2123	q = x * 100 / y;	2258	q = 128 * x / y;
2124	else if (x)	2259	else if (x)
2125	q = -300 * x;	2260	q = -512 * x; // to make it > 309
2126	else	2261	else
2127	return 0;	2262	return 0;
2128		2263
2129	if (y > 0)	2264	if (y > 0)
2130	{	2265	{
2131	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
2132	return 3;	2271	return 3;
2133	if (q < -41)	2272	}
2134	return 2;	2273	else
2135	if (q < 41)	2274	{
2136	return 1;	2275	if (q < -309) return 3;
2137	if (q < 242)	2276	if (q < -52) return 2;
2138	return 8;	2277	if (q < 52) return 1;
		2278	if (q < 309) return 8;
		2279
2139	return 7;	2280	return 7;
2140	}	2281	}
2141		2282	#endif
2142	if (q < -242)
2143	return 7;
2144	if (q < -41)
2145	return 6;
2146	if (q < 41)
2147	return 5;
2148	if (q < 242)
2149	return 4;
2150
2151	return 3;
2152	}	2283	}
2153		2284
2154	/*	2285	/*
2155	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is	2286	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is
2156	* between two directions (which are expected to be absolute (see absdir())	2287	* between two directions (which are expected to be absolute (see absdir())
2157	*/	2288	*/
2158	int	2289	int
2159	dirdiff (int dir1, int dir2)	2290	dirdiff (int dir1, int dir2)
2160	{	2291	{
2161	int d;
2162
2163	d = abs (dir1 - dir2);	2292	int d = abs (dir1 - dir2);
2164	if (d > 4)
2165	d = 8 - d;
2166		2293
2167	return d;	2294	return d > 4 ? 8 - d : d;
2168	}	2295	}
2169		2296
2170	/* peterm:	2297	/* peterm:
2171	* 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.
2172	* Basically, this is a table of directions, and what directions	2299	* Basically, this is a table of directions, and what directions
…		…
2174	* 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
2175	* 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.
2176	* 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
2177	* functions.	2304	* functions.
2178	*/	2305	*/
2179	int reduction_dir[SIZEOFFREE][3] = {	2306	static const int reduction_dir[SIZEOFFREE][3] = {
2180	{0, 0, 0}, /* 0 */	2307	{0, 0, 0}, /* 0 */
2181	{0, 0, 0}, /* 1 */	2308	{0, 0, 0}, /* 1 */
2182	{0, 0, 0}, /* 2 */	2309	{0, 0, 0}, /* 2 */
2183	{0, 0, 0}, /* 3 */	2310	{0, 0, 0}, /* 3 */
2184	{0, 0, 0}, /* 4 */	2311	{0, 0, 0}, /* 4 */
…		…
2278	* 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)
2279	*/	2406	*/
2280	int	2407	int
2281	can_pick (const object *who, const object *item)	2408	can_pick (const object *who, const object *item)
2282	{	2409	{
2283	return /*QUERY_FLAG(who,FLAG_WIZ)|| */	2410	return /*who->flag [FLAG_WIZ]|| */
2284	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&	2411	(item->weight > 0 && !item->flag [FLAG_NO_PICK] &&
2285	!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));
2286	}	2413	}
2287		2414
2288	/*	2415	/*
2289	* create clone from object to another	2416	* create clone from object to another
2290	*/	2417	*/
…		…
2322	return tmp;	2449	return tmp;
2323		2450
2324	return 0;	2451	return 0;
2325	}	2452	}
2326		2453
2327	const shstr &	2454	/* Zero the key_values on op, decrementing the shared-string
2328	object::kv_get (const shstr &key) const	2455	* refcounts and freeing the links.
		2456	*/
		2457	void
		2458	key_values::clear ()
2329	{	2459	{
		2460	for (key_value *kvp = first; kvp; )
		2461	{
		2462	key_value *next = kvp->next;
		2463	delete kvp;
		2464	kvp = next;
		2465	}
		2466
		2467	first = 0;
		2468	}
		2469
		2470	shstr_tmp
		2471	key_values::get (shstr_tmp key) const
		2472	{
2330	for (key_value *kv = key_values; kv; kv = kv->next)	2473	for (key_value *kv = first; kv; kv = kv->next)
2331	if (kv->key == key)	2474	if (kv->key == key)
2332	return kv->value;	2475	return kv->value;
2333		2476
2334	return shstr_null;	2477	return shstr ();
2335	}	2478	}
2336		2479
2337	void	2480	void
2338	object::kv_set (const shstr &key, const shstr &value)	2481	key_values::add (shstr_tmp key, shstr_tmp value)
2339	{	2482	{
		2483	key_value *kv = new key_value;
		2484
		2485	kv->next = first;
		2486	kv->key = key;
		2487	kv->value = value;
		2488
		2489	first = kv;
		2490	}
		2491
		2492	void
		2493	key_values::set (shstr_tmp key, shstr_tmp value)
		2494	{
2340	for (key_value *kv = key_values; kv; kv = kv->next)	2495	for (key_value *kv = first; kv; kv = kv->next)
2341	if (kv->key == key)	2496	if (kv->key == key)
2342	{	2497	{
2343	kv->value = value;	2498	kv->value = value;
2344	return;	2499	return;
2345	}	2500	}
2346		2501
2347	key_value *kv = new key_value;	2502	add (key, value);
2348
2349	kv->next = key_values;
2350	kv->key = key;
2351	kv->value = value;
2352
2353	key_values = kv;
2354	}	2503	}
2355		2504
2356	void	2505	void
2357	object::kv_del (const shstr &key)	2506	key_values::del (shstr_tmp key)
2358	{	2507	{
2359	for (key_value **kvp = &key_values; *kvp; kvp = &(*kvp)->next)	2508	for (key_value **kvp = &first; *kvp; kvp = &(*kvp)->next)
2360	if ((*kvp)->key == key)	2509	if ((*kvp)->key == key)
2361	{	2510	{
2362	key_value *kv = *kvp;	2511	key_value *kv = *kvp;
2363	*kvp = (*kvp)->next;	2512	*kvp = (*kvp)->next;
2364	delete kv;	2513	delete kv;
2365	return;	2514	return;
2366	}	2515	}
		2516	}
		2517
		2518	void
		2519	key_values::reverse ()
		2520	{
		2521	key_value *prev = 0;
		2522	key_value *head = first;
		2523
		2524	while (head)
		2525	{
		2526	key_value *node = head;
		2527	head = head->next;
		2528	node->next = prev;
		2529	prev = node;
		2530	}
		2531
		2532	first = prev;
		2533	}
		2534
		2535	key_values &
		2536	key_values::operator =(const key_values &kv)
		2537	{
		2538	clear ();
		2539
		2540	for (key_value *kvp = kv.first; kvp; kvp = kvp->next)
		2541	add (kvp->key, kvp->value);
		2542
		2543	reverse ();
2367	}	2544	}
2368		2545
2369	object::depth_iterator::depth_iterator (object *container)	2546	object::depth_iterator::depth_iterator (object *container)
2370	: iterator_base (container)	2547	: iterator_base (container)
2371	{	2548	{
…		…
2455	{	2632	{
2456	return map ? map->region (x, y)	2633	return map ? map->region (x, y)
2457	: region::default_region ();	2634	: region::default_region ();
2458	}	2635	}
2459		2636
2460	const materialtype_t *
2461	object::dominant_material () const
2462	{
2463	if (materialtype_t *mt = name_to_material (materialname))
2464	return mt;
2465
2466	return name_to_material (shstr_unknown);
2467	}
2468
2469	void	2637	void
2470	object::open_container (object *new_container)	2638	object::open_container (object *new_container)
2471	{	2639	{
2472	if (container == new_container)	2640	if (container == new_container)
2473	return;	2641	return;
…		…
2493	container = 0;	2661	container = 0;
2494		2662
2495	// client needs item update to make it work, client bug requires this to be separate	2663	// client needs item update to make it work, client bug requires this to be separate
2496	esrv_update_item (UPD_FLAGS, this, old_container);	2664	esrv_update_item (UPD_FLAGS, this, old_container);
2497		2665
2498	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));	2666	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", old_container->query_name ());
2499	play_sound (sound_find ("chest_close"));	2667	play_sound (sound_find ("chest_close"));
2500	}	2668	}
2501		2669
2502	if (new_container)	2670	if (new_container)
2503	{	2671	{
…		…
2507	// TODO: this does not seem to serve any purpose anymore?	2675	// TODO: this does not seem to serve any purpose anymore?
2508	#if 0	2676	#if 0
2509	// insert the "Close Container" object.	2677	// insert the "Close Container" object.
2510	if (archetype *closer = new_container->other_arch)	2678	if (archetype *closer = new_container->other_arch)
2511	{	2679	{
2512	object *closer = arch_to_object (new_container->other_arch);	2680	object *closer = new_container->other_arch->instance ();
2513	closer->flag [FLAG_NO_MAP_SAVE] = 1;	2681	closer->flag [FLAG_NO_MAP_SAVE] = 1;
2514	new_container->insert (closer);	2682	new_container->insert (closer);
2515	}	2683	}
2516	#endif	2684	#endif
2517		2685
2518	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));	2686	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", new_container->query_name ());
2519		2687
2520	// make sure the container is available, client bug requires this to be separate	2688	// make sure the container is available, client bug requires this to be separate
2521	esrv_send_item (this, new_container);	2689	esrv_send_item (this, new_container);
2522		2690
2523	new_container->flag [FLAG_APPLIED] = true;	2691	new_container->flag [FLAG_APPLIED] = true;
…		…
2531	// else if (!old_container->env && contr && contr->ns)	2699	// else if (!old_container->env && contr && contr->ns)
2532	// contr->ns->floorbox_reset ();	2700	// contr->ns->floorbox_reset ();
2533	}	2701	}
2534		2702
2535	object *	2703	object *
2536	object::force_find (const shstr name)	2704	object::force_find (shstr_tmp name)
2537	{	2705	{
2538	/* cycle through his inventory to look for the MARK we want to	2706	/* cycle through his inventory to look for the MARK we want to
2539	* place	2707	* place
2540	*/	2708	*/
2541	for (object *tmp = inv; tmp; tmp = tmp->below)	2709	for (object *tmp = inv; tmp; tmp = tmp->below)
…		…
2543	return splay (tmp);	2711	return splay (tmp);
2544		2712
2545	return 0;	2713	return 0;
2546	}	2714	}
2547		2715
		2716	//-GPL
		2717
		2718	void
		2719	object::force_set_timer (int duration)
		2720	{
		2721	this->duration = 1;
		2722	this->speed_left = -1.f;
		2723
		2724	this->set_speed (duration ? 1.f / duration : 0.f);
		2725	}
		2726
2548	object *	2727	object *
2549	object::force_add (const shstr name, int duration)	2728	object::force_add (shstr_tmp name, int duration)
2550	{	2729	{
2551	if (object *force = force_find (name))	2730	if (object *force = force_find (name))
2552	force->destroy ();	2731	force->destroy ();
2553		2732
2554	object *force = get_archetype (FORCE_NAME);	2733	object *force = archetype::get (FORCE_NAME);
2555		2734
2556	force->slaying = name;	2735	force->slaying = name;
2557	force->stats.food = 1;	2736	force->force_set_timer (duration);
2558	force->speed_left = -1.f;
2559
2560	force->set_speed (duration ? 1.f / duration : 0.f);
2561	force->flag [FLAG_IS_USED_UP] = true;
2562	force->flag [FLAG_APPLIED] = true;	2737	force->flag [FLAG_APPLIED] = true;
2563		2738
2564	return insert (force);	2739	return insert (force);
2565	}	2740	}
2566		2741
2567	void	2742	void
2568	object::play_sound (faceidx sound)	2743	object::play_sound (faceidx sound) const
2569	{	2744	{
2570	if (!sound)	2745	if (!sound)
2571	return;	2746	return;
2572		2747
2573	if (flag [FLAG_REMOVED])	2748	if (is_on_map ())
2574	return;
2575
2576	if (env)
2577	{
2578	if (object *pl = in_player ())
2579	pl->contr->play_sound (sound);
2580	}
2581	else
2582	map->play_sound (sound, x, y);	2749	map->play_sound (sound, x, y);
		2750	else if (object *pl = in_player ())
		2751	pl->contr->play_sound (sound);
		2752	}
		2753
		2754	void
		2755	object::say_msg (const char *msg) const
		2756	{
		2757	if (is_on_map ())
		2758	map->say_msg (msg, x, y);
		2759	else if (object *pl = in_player ())
		2760	pl->contr->play_sound (sound);
2583	}	2761	}
2584		2762
2585	void	2763	void
2586	object::make_noise ()	2764	object::make_noise ()
2587	{	2765	{
…		…
2613		2791
2614	insert (force);	2792	insert (force);
2615	}	2793	}
2616	}	2794	}
2617		2795
		2796	void object::change_move_type (MoveType mt)
		2797	{
		2798	if (move_type == mt)
		2799	return;
		2800
		2801	if (is_on_map ())
		2802	{
		2803	// we are on the map, so handle move_on/off effects
		2804	remove ();
		2805	move_type = mt;
		2806	map->insert (this, x, y, this);
		2807	}
		2808	else
		2809	move_type = mt;
		2810	}
		2811
		2812	/* object should be a player.
		2813	* we return the object the player has marked with the 'mark' command
		2814	* below. If no match is found (or object has changed), we return
		2815	* NULL. We leave it up to the calling function to print messages if
		2816	* nothing is found.
		2817	*/
		2818	object *
		2819	object::mark () const
		2820	{
		2821	if (contr && contr->mark && contr->mark->env == this)
		2822	return contr->mark;
		2823	else
		2824	return 0;
		2825	}
		2826
		2827	// put marked object first in the inventory
		2828	// this is used by identify-like spells so players can influence
		2829	// the order a bit.
		2830	void
		2831	object::splay_marked ()
		2832	{
		2833	if (object *marked = mark ())
		2834	splay (marked);
		2835	}
		2836

Diff Legend

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