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.240 by root, Wed May 7 13:40:30 2008 UTC vs.
Revision 1.336 by root, Wed Apr 28 11:19:09 2010 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 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		38
38	objectvec objects;	39	objectvec objects;
39	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
40		49
41	short freearr_x[SIZEOFFREE] = {	50	short freearr_x[SIZEOFFREE] = {
42	0,	51	0,
43	0, 1, 1, 1, 0, -1, -1, -1,	52	0, 1, 1, 1, 0, -1, -1, -1,
44	0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,	53	0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,
…		…
48	0,	57	0,
49	-1, -1, 0, 1, 1, 1, 0, -1,	58	-1, -1, 0, 1, 1, 1, 0, -1,
50	-2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2,	59	-2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2,
51	-3, -3, -3, -3, -2, -1, 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3	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
52	};	61	};
53	int maxfree[SIZEOFFREE] = {
54	0,
55	9, 10, 13, 14, 17, 18, 21, 22,
56	25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45, 48,
57	49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49
58	};
59	int freedir[SIZEOFFREE] = {	62	int freedir[SIZEOFFREE] = {
60	0,	63	0,
61	1, 2, 3, 4, 5, 6, 7, 8,	64	1, 2, 3, 4, 5, 6, 7, 8,
62	1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8,	65	1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8,
63	1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8	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
64	};	67	};
65		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
66	static void	76	static void
67	write_uuid (uval64 skip, bool sync)	77	write_uuid (uval64 skip, bool sync)
68	{	78	{
69	CALL_BEGIN (2);	79	CALL_BEGIN (2);
70	CALL_ARG_SV (newSVval64 (skip));	80	CALL_ARG_SV (newSVval64 (skip));
…		…
72	CALL_CALL ("cf::write_uuid", G_DISCARD);	82	CALL_CALL ("cf::write_uuid", G_DISCARD);
73	CALL_END;	83	CALL_END;
74	}	84	}
75		85
76	static void	86	static void
77	read_uuid (void)	87	read_uuid ()
78	{	88	{
79	char filename[MAX_BUF];	89	char filename[MAX_BUF];
80		90
81	sprintf (filename, "%s/uuid", settings.localdir);	91	sprintf (filename, "%s/uuid", settings.localdir);
82		92
…		…
96		106
97	LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);	107	LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);
98	_exit (1);	108	_exit (1);
99	}	109	}
100		110
101	UUID::BUF buf;	111	char buf [UUID::MAX_LEN];
102	buf[0] = 0;	112	buf[0] = 0;
103	fgets (buf, sizeof (buf), fp);	113	fgets (buf, sizeof (buf), fp);
104		114
105	if (!UUID::cur.parse (buf))	115	if (!UUID::cur.parse (buf))
106	{	116	{
…		…
133		143
134	void	144	void
135	UUID::init ()	145	UUID::init ()
136	{	146	{
137	read_uuid ();	147	read_uuid ();
		148	}
		149
		150	bool
		151	UUID::parse (const char *s)
		152	{
		153	if (*s++ != '<' || *s++ != '1' || *s++ != '.')
		154	return false;
		155
		156	seq = 0;
		157
		158	while (*s != '>')
		159	{
		160	if (*s < '0')
		161	return false;
		162
		163	// this gives nice branchless code with gcc
		164	assert ('0' < 'a' && '0' == 48 && 'a' == 97);
		165	int digit = (*s + (*s & 0x40 ? 9 : 0)) & 15;
		166
		167	seq = (seq << 4) | digit;
		168
		169	++s;
		170	}
		171
		172	return true;
		173	}
		174
		175	char *
		176	UUID::append (char *buf) const
		177	{
		178	*buf++ = '<';
		179	*buf++ = '1';
		180	*buf++ = '.';
		181
		182	uint64_t seq = this->seq;
		183	const int bits = 64;
		184	char nz = 0;
		185	static const char tohex [] = "0123456789abcdef";
		186
		187	// assert (len >= 3 + bits / 4 + 1 + 1);
		188	for (int i = bits / 4; --i; )
		189	{
		190	uint8_t digit = seq >> (bits - 4);
		191
		192	*buf = tohex [digit];
		193	nz |= digit;
		194	buf += nz ? 1 : 0;
		195	seq <<= 4;
		196	}
		197
		198	// last digit is special - always emit
		199	uint8_t digit = seq >> (bits - 4);
		200	*buf++ = tohex [digit];
		201
		202	*buf++ = '>';
		203
		204	return buf;
		205	}
		206
		207	char *
		208	UUID::c_str () const
		209	{
		210	static char buf [MAX_LEN];
		211	*append (buf) = 0;
		212	return buf;
138	}	213	}
139		214
140	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */	215	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */
141	static bool	216	static bool
142	compare_ob_value_lists_one (const object *wants, const object *has)	217	compare_ob_value_lists_one (const object *wants, const object *has)
…		…
178	* Improvements made with merge: Better checking on potion, and also	253	* Improvements made with merge: Better checking on potion, and also
179	* check weight	254	* check weight
180	*/	255	*/
181	bool object::can_merge_slow (object *ob1, object *ob2)	256	bool object::can_merge_slow (object *ob1, object *ob2)
182	{	257	{
183	/* A couple quicksanity checks */	258	/* A couple quick sanity checks */
184	if (ob1 == ob2	259	if (ob1 == ob2
185	|| ob1->type != ob2->type	260	|| ob1->type != ob2->type
186	|| ob1->speed != ob2->speed
187	|| ob1->value != ob2->value	261	|| ob1->value != ob2->value
188	|| ob1->name != ob2->name)	262	|| ob1->name != ob2->name
		263	|| fabs (ob1->speed - ob2->speed) >= MIN_ACTIVE_SPEED)
189	return 0;	264	return 0;
190		265
191	/* Do not merge objects if nrof would overflow. First part checks	266	/* Do not merge objects if nrof would overflow, assume nrof
192	* for unsigned overflow (2c), second part checks whether the result	267	* is always 0 .. 2**31-1 */
193	* would fit into a 32 bit signed int, which is often used to hold	268	if (ob1->nrof > 0x7fffffff - ob2->nrof)
194	* nrof values.
195	*/
196	if (~ob1->nrof < ob2->nrof || ob1->nrof + ob2->nrof > (1UL << 31))
197	return 0;	269	return 0;
198		270
199	/* If the objects have been identified, set the BEEN_APPLIED flag.	271	/* If the objects have been identified, set the BEEN_APPLIED flag.
200	* This is to the comparison of the flags below will be OK. We	272	* This is to the comparison of the flags below will be OK. We
201	* just can't ignore the been applied or identified flags, as they	273	* just can't ignore the been applied or identified flags, as they
202	* are not equal - just if it has been identified, the been_applied	274	* are not equal - just if it has been identified, the been_applied
203	* flags lose any meaning.	275	* flags lose any meaning.
204	*/	276	*/
205	if (QUERY_FLAG (ob1, FLAG_IDENTIFIED))	277	if (ob1->flag [FLAG_IDENTIFIED])
206	SET_FLAG (ob1, FLAG_BEEN_APPLIED);	278	ob1->set_flag (FLAG_BEEN_APPLIED);
207		279
208	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))	280	if (ob2->flag [FLAG_IDENTIFIED])
209	SET_FLAG (ob2, FLAG_BEEN_APPLIED);	281	ob2->set_flag (FLAG_BEEN_APPLIED);
210		282
211	if (ob1->arch->name != ob2->arch->name	283	if (ob1->arch->archname != ob2->arch->archname
212	|| ob1->name != ob2->name	284	|| ob1->name != ob2->name
213	|| ob1->title != ob2->title	285	|| ob1->title != ob2->title
214	|| ob1->msg != ob2->msg	286	|| ob1->msg != ob2->msg
215	|| ob1->weight != ob2->weight	287	|| ob1->weight != ob2->weight
216	|| ob1->attacktype != ob2->attacktype	288	|| ob1->attacktype != ob2->attacktype
217	|| ob1->magic != ob2->magic	289	|| ob1->magic != ob2->magic
218	|| ob1->slaying != ob2->slaying	290	|| ob1->slaying != ob2->slaying
219	|| ob1->skill != ob2->skill	291	|| ob1->skill != ob2->skill
220	|| ob1->value != ob2->value	292	|| ob1->value != ob2->value
221	|| ob1->animation_id != ob2->animation_id	293	|| ob1->animation_id != ob2->animation_id
		294	|| (ob1->face != ob2->face && !ob1->animation_id) // face and animation are dependend on each other
222	|| ob1->client_type != ob2->client_type	295	|| ob1->client_type != ob2->client_type
223	|| ob1->materialname != ob2->materialname	296	|| ob1->material != ob2->material
224	|| ob1->lore != ob2->lore	297	|| ob1->lore != ob2->lore
225	|| ob1->subtype != ob2->subtype	298	|| ob1->subtype != ob2->subtype
226	|| ob1->move_type != ob2->move_type	299	|| ob1->move_type != ob2->move_type
227	|| ob1->move_block != ob2->move_block	300	|| ob1->move_block != ob2->move_block
228	|| ob1->move_allow != ob2->move_allow	301	|| ob1->move_allow != ob2->move_allow
229	|| ob1->move_on != ob2->move_on	302	|| ob1->move_on != ob2->move_on
230	|| ob1->move_off != ob2->move_off	303	|| ob1->move_off != ob2->move_off
231	|| ob1->move_slow != ob2->move_slow	304	|| ob1->move_slow != ob2->move_slow
232	|| ob1->move_slow_penalty != ob2->move_slow_penalty	305	|| fabs (ob1->move_slow_penalty - ob2->move_slow_penalty) >= (1.f / 1024.f)
233	|| memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))	306	|| memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
234	|| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats)))	307	|| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats)))
235	return 0;	308	return 0;
236		309
237	if ((ob1->flag ^ ob2->flag)	310	if ((ob1->flag ^ ob2->flag)
238	.reset (FLAG_INV_LOCKED)	311	.reset (FLAG_INV_LOCKED)
239	.reset (FLAG_CLIENT_SENT)
240	.reset (FLAG_REMOVED)	312	.reset (FLAG_REMOVED)
241	.any ())	313	.any ())
242	return 0;	314	return 0;
243		315
244	/* This is really a spellbook check - we should in general	316	/* This is really a spellbook check - we should in general
…		…
263		335
264	/* Don't merge objects that are applied. With the new 'body' code,	336	/* Don't merge objects that are applied. With the new 'body' code,
265	* it is possible for most any character to have more than one of	337	* it is possible for most any character to have more than one of
266	* some items equipped, and we don't want those to merge.	338	* some items equipped, and we don't want those to merge.
267	*/	339	*/
268	if (QUERY_FLAG (ob1, FLAG_APPLIED) || QUERY_FLAG (ob2, FLAG_APPLIED))	340	if (ob1->flag [FLAG_APPLIED] || ob2->flag [FLAG_APPLIED])
269	return 0;	341	return 0;
270		342
271	/* Note sure why the following is the case - either the object has to	343	/* Note sure why the following is the case - either the object has to
272	* be animated or have a very low speed. Is this an attempted monster	344	* be animated or have a very low speed. Is this an attempted monster
273	* check?	345	* check?
274	*/	346	*/
275	if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && ob1->has_active_speed ())	347	if (!ob1->flag [FLAG_ANIMATE] && ob1->has_active_speed ())
276	return 0;	348	return 0;
277		349
278	switch (ob1->type)	350	switch (ob1->type)
279	{	351	{
280	case SCROLL:	352	case SCROLL:
…		…
326	{	398	{
327	// see if we are in a container of sorts	399	// see if we are in a container of sorts
328	if (env)	400	if (env)
329	{	401	{
330	// the player inventory itself is always visible	402	// the player inventory itself is always visible
331	if (env->type == PLAYER)	403	if (env->is_player ())
332	return env;	404	return env;
333		405
334	// else a player could have our env open	406	// else a player could have our env open
335	object *envest = env->outer_env ();	407	object *envest = env->outer_env_or_self ();
336		408
337	// the player itself is always on a map, so we will find him here	409	// the player itself is always on a map, so we will find him here
338	// even if our inv is in a player.	410	// even if our inv is in a player.
339	if (envest->is_on_map ())	411	if (envest->is_on_map ())
340	if (object *pl = envest->ms ().player ())	412	if (object *pl = envest->ms ().player ())
341	if (pl->container == env)	413	if (pl->container_ () == env)
342	return pl;	414	return pl;
343	}	415	}
344	else	416	else
345	{	417	{
346	// maybe there is a player standing on the same mapspace	418	// maybe there is a player standing on the same mapspace
347	// this will catch the case where "this" is a player	419	// this will catch the case where "this" is a player
348	if (object *pl = ms ().player ())	420	if (object *pl = ms ().player ())
349	if (!pl->container || this == pl->container)	421	if ((pl->contr->ns && !pl->container_ () && !pl->contr->ns->update_look)
		422	|| pl->container_ () == this)
350	return pl;	423	return pl;
351	}	424	}
352	}	425	}
353		426
354	return 0;	427	return 0;
…		…
372	{	445	{
373	while (op)	446	while (op)
374	{	447	{
375	// adjust by actual difference to account for rounding errors	448	// adjust by actual difference to account for rounding errors
376	// i.e. (w2 - w1) / f != w2 / f - w1 / f and the latter is correct	449	// i.e. (w2 - w1) / f != w2 / f - w1 / f and the latter is correct
377	weight = weight_adjust_for (op, op->carrying)	450	weight = weight_adjust_for (op, op->carrying + weight)
378	- weight_adjust_for (op, op->carrying - weight);	451	- weight_adjust_for (op, op->carrying);
379		452
380	if (!weight)	453	if (!weight)
381	return;	454	return;
382		455
383	op->carrying += weight;	456	op->carrying += weight;
…		…
410		483
411	sum = weight_adjust_for (this, sum);	484	sum = weight_adjust_for (this, sum);
412		485
413	if (sum != carrying)	486	if (sum != carrying)
414	{	487	{
		488	if (carrying != sum)//D
		489	LOG (llevDebug, "updating carrying got %ld, expected %ld (%s)\n",
		490	(long long)sum, (long long)carrying, debug_desc ());
		491
415	carrying = sum;	492	carrying = sum;
416		493
417	if (object *pl = visible_to ())	494	if (object *pl = visible_to ())
418	if (pl != this) // player is handled lazily	495	if (pl != this) // player is handled lazily
419	esrv_update_item (UPD_WEIGHT, pl, this);	496	esrv_update_item (UPD_WEIGHT, pl, this);
…		…
432	object_freezer freezer;	509	object_freezer freezer;
433	op->write (freezer);	510	op->write (freezer);
434	return freezer.as_string ();	511	return freezer.as_string ();
435	}	512	}
436		513
437	/*	514	char *
438	* get_nearest_part(multi-object, object 2) returns the part of the	515	object::as_string ()
439	* multi-object 1 which is closest to the second object.
440	* If it's not a multi-object, it is returned.
441	*/
442	object *
443	get_nearest_part (object *op, const object *pl)
444	{	516	{
445	object *tmp, *closest;	517	return dump_object (this);
446	int last_dist, i;
447
448	if (!op->more)
449	return op;
450
451	for (last_dist = distance (op, pl), closest = op, tmp = op->more;
452	tmp;
453	tmp = tmp->more)
454	if ((i = distance (tmp, pl)) < last_dist)
455	closest = tmp, last_dist = i;
456
457	return closest;
458	}	518	}
459		519
460	/*	520	/*
461	* Returns the object which has the count-variable equal to the argument.	521	* Returns the object which has the count-variable equal to the argument.
462	* VERRRY slow.	522	* VERRRY slow.
…		…
470		530
471	return 0;	531	return 0;
472	}	532	}
473		533
474	/*	534	/*
		535	* Returns the object which has the uuid equal to the argument.
		536	* MOAR VERRRY slow.
		537	*/
		538
		539	object *
		540	find_object_uuid (UUID i)
		541	{
		542	for_all_objects (op)
		543	if (op->uuid == i)
		544	return op;
		545
		546	return 0;
		547	}
		548
		549	/*
475	* Returns the first object which has a name equal to the argument.	550	* Returns the first object which has a name equal to the argument.
476	* Used only by the patch command, but not all that useful.	551	* Used only by the patch command, but not all that useful.
477	* Enables features like "patch <name-of-other-player> food 999"	552	* Enables features like "patch <name-of-other-player> food 999"
478	*/	553	*/
479	object *	554	object *
480	find_object_name (const char *str)	555	find_object_name (const char *str)
481	{	556	{
482	shstr_cmp str_ (str);	557	shstr_cmp str_ (str);
483	object *op;
484		558
		559	if (str_)
485	for_all_objects (op)	560	for_all_objects (op)
486	if (op->name == str_)	561	if (op->name == str_)
487	break;	562	return op;
488		563
489	return op;	564	return 0;
490	}	565	}
491		566
492	/*	567	/*
493	* Sets the owner and sets the skill and exp pointers to owner's current	568	* Sets the owner and sets the skill and exp pointers to owner's current
494	* skill and experience objects.	569	* skill and experience objects.
…		…
507	LOG (llevError | logBacktrace, "tried to set owner of %s to %s\n", debug_desc (), owner->debug_desc ());	582	LOG (llevError | logBacktrace, "tried to set owner of %s to %s\n", debug_desc (), owner->debug_desc ());
508	return;	583	return;
509	}	584	}
510		585
511	this->owner = owner;	586	this->owner = owner;
512	}
513
514	int
515	object::slottype () const
516	{
517	if (type == SKILL)
518	{
519	if (IS_COMBAT_SKILL (subtype)) return slot_combat;
520	if (IS_RANGED_SKILL (subtype)) return slot_ranged;
521	}
522	else
523	{
524	if (slot [body_combat].info) return slot_combat;
525	if (slot [body_range ].info) return slot_ranged;
526	}
527
528	return slot_none;
529	}
530
531	bool
532	object::change_weapon (object *ob)
533	{
534	if (current_weapon == ob)
535	return true;
536
537	if (chosen_skill)
538	chosen_skill->flag [FLAG_APPLIED] = false;
539
540	current_weapon = ob;
541	chosen_skill = !ob || ob->type == SKILL ? ob : find_skill_by_name (this, ob->skill);
542
543	if (chosen_skill)
544	chosen_skill->flag [FLAG_APPLIED] = true;
545
546	update_stats ();
547
548	if (ob)
549	{
550	// now check wether any body locations became invalid, in which case
551	// we cannot apply the weapon at the moment.
552	for (int i = 0; i < NUM_BODY_LOCATIONS; ++i)
553	if (slot[i].used < 0)
554	{
555	current_weapon = chosen_skill = 0;
556	update_stats ();
557
558	new_draw_info_format (NDI_UNIQUE, 0, this,
559	"You try to balance all your items at once, "
560	"but the %s is just too much for your body. "
561	"[You need to unapply some items first.]", &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	}	587	}
579		588
580	/* Zero the key_values on op, decrementing the shared-string	589	/* Zero the key_values on op, decrementing the shared-string
581	* refcounts and freeing the links.	590	* refcounts and freeing the links.
582	*/	591	*/
…		…
635	tail = new_link;	644	tail = new_link;
636	}	645	}
637	}	646	}
638	}	647	}
639		648
640	if (speed < 0)	649	dst->activate ();
641	dst->speed_left -= rndm ();
642
643	dst->set_speed (dst->speed);
644	}	650	}
645		651
646	void	652	void
647	object::instantiate ()	653	object::instantiate ()
648	{	654	{
649	if (!uuid.seq) // HACK	655	if (!uuid.seq) // HACK
650	uuid = UUID::gen ();	656	uuid = UUID::gen ();
651		657
		658	// TODO: unclean state changes, should nt be done in copy_to AND instantiate
		659	if (flag [FLAG_RANDOM_SPEED] && speed)
		660	speed_left = - speed - rndm (); // TODO animation
		661	else
652	speed_left = -0.1f;	662	speed_left = -1.;
		663
653	/* copy the body_info to the body_used - this is only really	664	/* 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.	665	* 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	666	* by doing so, when a monster is created, it has good starting
656	* values for the body_used info, so when items are created	667	* values for the body_used info, so when items are created
657	* for it, they can be properly equipped.	668	* for it, they can be properly equipped.
…		…
665	object *	676	object *
666	object::clone ()	677	object::clone ()
667	{	678	{
668	object *neu = create ();	679	object *neu = create ();
669	copy_to (neu);	680	copy_to (neu);
		681
		682	// TODO: unclean state changes, should not be done in clone AND instantiate
		683	if (neu->flag [FLAG_RANDOM_SPEED] && neu->speed)
		684	neu->speed_left = - neu->speed - rndm (); // TODO animation
		685
670	neu->map = map; // not copied by copy_to	686	neu->map = map; // not copied by copy_to
671	return neu;	687	return neu;
672	}	688	}
673		689
674	/*	690	/*
…		…
677	* be called to update the face variable, _and_ how it looks on the map.	693	* be called to update the face variable, _and_ how it looks on the map.
678	*/	694	*/
679	void	695	void
680	update_turn_face (object *op)	696	update_turn_face (object *op)
681	{	697	{
682	if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || !op->arch)	698	if (!op->flag [FLAG_IS_TURNABLE] || !op->arch)
683	return;	699	return;
684		700
685	SET_ANIMATION (op, op->direction);	701	SET_ANIMATION (op, op->direction);
686	update_object (op, UP_OBJ_FACE);	702	update_object (op, UP_OBJ_FACE);
687	}	703	}
…		…
692	* This function needs to be called whenever the speed of an object changes.	708	* This function needs to be called whenever the speed of an object changes.
693	*/	709	*/
694	void	710	void
695	object::set_speed (float speed)	711	object::set_speed (float speed)
696	{	712	{
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;	713	this->speed = speed;
704		714
705	if (has_active_speed ())	715	if (has_active_speed ())
706	activate ();	716	activate ();
707	else	717	else
…		…
757		767
758	if (!(m.flags_ & P_UPTODATE))	768	if (!(m.flags_ & P_UPTODATE))
759	/* nop */;	769	/* nop */;
760	else if (action == UP_OBJ_INSERT)	770	else if (action == UP_OBJ_INSERT)
761	{	771	{
		772	#if 0
762	// this is likely overkill, TODO: revisit (schmorp)	773	// this is likely overkill, TODO: revisit (schmorp)
763	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))	774	if ((op->flag [FLAG_BLOCKSVIEW] && !(m.flags_ & P_BLOCKSVIEW))
764	|| (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))	775	|| (op->flag [FLAG_NO_MAGIC] && !(m.flags_ & P_NO_MAGIC))
765	|| (op->type == PLAYER && !(m.flags_ & P_PLAYER))	776	|| (op->is_player () && !(m.flags_ & P_PLAYER))
766	|| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))	777	|| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
767	|| (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))	778	|| (op->flag [FLAG_ALIVE] && !(m.flags_ & P_IS_ALIVE))
768	|| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))	779	|| (op->flag [FLAG_DAMNED] && !(m.flags_ & P_NO_CLERIC))
769	|| (m.move_on | op->move_on ) != m.move_on	780	|| (m.move_on | op->move_on ) != m.move_on
770	|| (m.move_off | op->move_off ) != m.move_off	781	|| (m.move_off | op->move_off ) != m.move_off
771	|| (m.move_slow | op->move_slow) != m.move_slow	782	|| (m.move_slow | op->move_slow) != m.move_slow
772	/* This isn't perfect, but I don't expect a lot of objects to	783	/* This isn't perfect, but I don't expect a lot of objects to
773	* to have move_allow right now.	784	* have move_allow right now.
774	*/	785	*/
775	|| ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block	786	|| ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block
		787	m.invalidate ();
		788	#else
776	|| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)	789	// the above is not strong enough a test to skip updating. los maybe? TODO (schmorp)
777	m.flags_ = 0;	790	m.invalidate ();
		791	#endif
778	}	792	}
779	/* if the object is being removed, we can't make intelligent	793	/* if the object is being removed, we can't make intelligent
780	* decisions, because remove_ob can't really pass the object	794	* decisions, because remove_ob can't really pass the object
781	* that is being removed.	795	* that is being removed.
782	*/	796	*/
783	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)	797	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
784	m.flags_ = 0;	798	m.invalidate ();
785	else if (action == UP_OBJ_FACE)	799	else if (action == UP_OBJ_FACE)
786	/* Nothing to do for that case */ ;	800	/* Nothing to do for that case */ ;
787	else	801	else
788	LOG (llevError, "update_object called with invalid action: %d\n", action);	802	LOG (llevError, "update_object called with invalid action: %d\n", action);
789		803
…		…
791	update_object (op->more, action);	805	update_object (op->more, action);
792	}	806	}
793		807
794	object::object ()	808	object::object ()
795	{	809	{
796	SET_FLAG (this, FLAG_REMOVED);	810	this->set_flag (FLAG_REMOVED);
797		811
798	expmul = 1.0;	812	//expmul = 1.0; declared const for the time being
799	face = blank_face;	813	face = blank_face;
		814	material = MATERIAL_NULL;
800	}	815	}
801		816
802	object::~object ()	817	object::~object ()
803	{	818	{
804	unlink ();	819	unlink ();
805		820
806	free_key_values (this);	821	free_key_values (this);
807	}	822	}
808
809	static int object_count;
810		823
811	void object::link ()	824	void object::link ()
812	{	825	{
813	assert (!index);//D	826	assert (!index);//D
814	uuid = UUID::gen ();	827	uuid = UUID::gen ();
815	count = ++object_count;
816		828
817	refcnt_inc ();	829	refcnt_inc ();
818	objects.insert (this);	830	objects.insert (this);
		831
		832	++create_count;
		833
819	}	834	}
820		835
821	void object::unlink ()	836	void object::unlink ()
822	{	837	{
823	if (!index)	838	if (!index)
824	return;	839	return;
		840
		841	++destroy_count;
825		842
826	objects.erase (this);	843	objects.erase (this);
827	refcnt_dec ();	844	refcnt_dec ();
828	}	845	}
829		846
…		…
833	/* If already on active list, don't do anything */	850	/* If already on active list, don't do anything */
834	if (active)	851	if (active)
835	return;	852	return;
836		853
837	if (has_active_speed ())	854	if (has_active_speed ())
		855	{
		856	if (flag [FLAG_FREED])
		857	LOG (llevError | logBacktrace, "BUG: tried to activate freed object %s\n", debug_desc ());//D
		858
838	actives.insert (this);	859	actives.insert (this);
		860	}
839	}	861	}
840		862
841	void	863	void
842	object::activate_recursive ()	864	object::activate_recursive ()
843	{	865	{
…		…
908	|| map->in_memory != MAP_ACTIVE	930	|| map->in_memory != MAP_ACTIVE
909	|| map->no_drop	931	|| map->no_drop
910	|| ms ().move_block == MOVE_ALL)	932	|| ms ().move_block == MOVE_ALL)
911	{	933	{
912	while (inv)	934	while (inv)
913	{
914	inv->destroy_inv (false);
915	inv->destroy ();	935	inv->destroy ();
916	}
917	}	936	}
918	else	937	else
919	{ /* Put objects in inventory onto this space */	938	{ /* Put objects in inventory onto this space */
920	while (inv)	939	while (inv)
921	{	940	{
…		…
925	|| op->flag [FLAG_NO_DROP]	944	|| op->flag [FLAG_NO_DROP]
926	|| op->type == RUNE	945	|| op->type == RUNE
927	|| op->type == TRAP	946	|| op->type == TRAP
928	|| op->flag [FLAG_IS_A_TEMPLATE]	947	|| op->flag [FLAG_IS_A_TEMPLATE]
929	|| op->flag [FLAG_DESTROY_ON_DEATH])	948	|| op->flag [FLAG_DESTROY_ON_DEATH])
930	op->destroy (true);	949	op->destroy ();
931	else	950	else
932	map->insert (op, x, y);	951	map->insert (op, x, y);
933	}	952	}
934	}	953	}
935	}	954	}
936		955
		956	/*
		957	* Remove and free all objects in the inventory of the given object.
		958	* Unlike destroy_inv, this assumes the *this is destroyed as well
		959	* well, so we can (and have to!) take shortcuts.
		960	*/
		961	void
		962	object::destroy_inv_fast ()
		963	{
		964	while (object *op = inv)
		965	{
		966	// remove from object the fast way
		967	op->flag [FLAG_REMOVED] = true;
		968	op->env = 0;
		969	if ((inv = inv->below))
		970	inv->above = 0;
		971
		972	// then destroy
		973	op->destroy ();
		974	}
		975	}
		976
		977	void
		978	object::freelist_free (int count)
		979	{
		980	while (count-- && freelist)
		981	{
		982	freelist_item *next = freelist->next;
		983	// count is being "destroyed"
		984
		985	sfree ((char *)freelist, sizeof (object));
		986
		987	freelist = next;
		988	--free_count;
		989	}
		990	}
		991
		992	object *
937	object *object::create ()	993	object::create ()
938	{	994	{
939	object *op = new object;	995	object *op;
		996
		997	if (freelist)
		998	{
		999	freelist_item li = *freelist;
		1000	memset (freelist, 0, sizeof (object));
		1001
		1002	op = new (freelist) object;
		1003	op->count = li.count;
		1004
		1005	freelist = li.next;
		1006	--free_count;
		1007	}
		1008	else
		1009	{
		1010	void *ni = salloc0<char> (sizeof (object));
		1011
		1012	op = new(ni) object;
		1013
		1014	op->count = ++object_count;
		1015	}
		1016
940	op->link ();	1017	op->link ();
		1018
941	return op;	1019	return op;
942	}	1020	}
943		1021
		1022	void
		1023	object::do_delete ()
		1024	{
		1025	uint32_t count = this->count;
		1026
		1027	this->~object ();
		1028
		1029	freelist_item *li = (freelist_item *)this;
		1030	li->next = freelist;
		1031	li->count = count;
		1032
		1033	freelist = li;
		1034	++free_count;
		1035	}
		1036
944	static struct freed_map : maptile	1037	static struct freed_map : maptile
945	{	1038	{
946	freed_map ()	1039	freed_map ()
		1040	: maptile (3, 3)
947	{	1041	{
948	path = "<freed objects map>";	1042	path = "<freed objects map>";
949	name = "/internal/freed_objects_map";	1043	name = "/internal/freed_objects_map";
950	width = 3;
951	height = 3;
952	no_drop = 1;	1044	no_drop = 1;
953	no_reset = 1;	1045	no_reset = 1;
954		1046
955	alloc ();
956	in_memory = MAP_ACTIVE;	1047	in_memory = MAP_ACTIVE;
957	}	1048	}
958		1049
959	~freed_map ()	1050	~freed_map ()
960	{	1051	{
…		…
964		1055
965	void	1056	void
966	object::do_destroy ()	1057	object::do_destroy ()
967	{	1058	{
968	if (flag [FLAG_IS_LINKED])	1059	if (flag [FLAG_IS_LINKED])
969	remove_button_link (this);	1060	remove_link ();
970		1061
971	if (flag [FLAG_FRIENDLY])	1062	if (flag [FLAG_FRIENDLY])
972	remove_friendly_object (this);	1063	remove_friendly_object (this);
973		1064
974	remove ();	1065	remove ();
…		…
999	attacked_by = 0;	1090	attacked_by = 0;
1000	current_weapon = 0;	1091	current_weapon = 0;
1001	}	1092	}
1002		1093
1003	void	1094	void
1004	object::destroy (bool destroy_inventory)	1095	object::destroy ()
1005	{	1096	{
1006	if (destroyed ())	1097	if (destroyed ())
1007	return;	1098	return;
1008		1099
1009	if (!is_head () && !head->destroyed ())	1100	if (!is_head () && !head->destroyed ())
1010	{	1101	{
1011	LOG (llevError | logBacktrace, "tried to destroy the tail of an object");	1102	LOG (llevError | logBacktrace, "tried to destroy the tail of an object");
1012	head->destroy (destroy_inventory);	1103	head->destroy ();
1013	return;	1104	return;
1014	}	1105	}
1015		1106
1016	destroy_inv (!destroy_inventory);	1107	destroy_inv_fast ();
1017		1108
1018	if (is_head ())	1109	if (is_head ())
1019	if (sound_destroy)	1110	if (sound_destroy)
1020	play_sound (sound_destroy);	1111	play_sound (sound_destroy);
1021	else if (flag [FLAG_MONSTER])	1112	else if (flag [FLAG_MONSTER])
…		…
1032	* the previous environment.	1123	* the previous environment.
1033	*/	1124	*/
1034	void	1125	void
1035	object::do_remove ()	1126	object::do_remove ()
1036	{	1127	{
1037	object *tmp, *last = 0;
1038	object *otmp;
1039
1040	if (flag [FLAG_REMOVED])	1128	if (flag [FLAG_REMOVED])
1041	return;	1129	return;
1042		1130
1043	INVOKE_OBJECT (REMOVE, this);	1131	INVOKE_OBJECT (REMOVE, this);
1044		1132
…		…
1057	if (object *pl = visible_to ())	1145	if (object *pl = visible_to ())
1058	esrv_del_item (pl->contr, count);	1146	esrv_del_item (pl->contr, count);
1059	flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed	1147	flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed
1060		1148
1061	adjust_weight (env, -total_weight ());	1149	adjust_weight (env, -total_weight ());
		1150
		1151	object *pl = in_player ();
1062		1152
1063	/* we set up values so that it could be inserted into	1153	/* we set up values so that it could be inserted into
1064	* the map, but we don't actually do that - it is up	1154	* the map, but we don't actually do that - it is up
1065	* to the caller to decide what we want to do.	1155	* to the caller to decide what we want to do.
1066	*/	1156	*/
…		…
1074		1164
1075	above = 0;	1165	above = 0;
1076	below = 0;	1166	below = 0;
1077	env = 0;	1167	env = 0;
1078		1168
1079	/* NO_FIX_PLAYER is set when a great many changes are being	1169	if (pl && pl->is_player ())
1080	* made to players inventory. If set, avoiding the call
1081	* to save cpu time.
1082	*/	1170	{
1083	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1171	if (expect_false (pl->contr->combat_ob == this))
1084	otmp->update_stats ();	1172	{
		1173	pl->apply (pl->contr->combat_ob, AP_UNAPPLY);
		1174	pl->contr->combat_ob = 0;
		1175	if (pl->contr->ranged_ob) pl->apply (pl->contr->ranged_ob);
		1176	}
		1177
		1178	if (expect_false (pl->contr->ranged_ob == this))
		1179	{
		1180	pl->apply (pl->contr->ranged_ob, AP_UNAPPLY);
		1181	pl->contr->ranged_ob = 0;
		1182	if (pl->contr->combat_ob) pl->apply (pl->contr->combat_ob);
		1183	}
		1184
		1185	pl->contr->queue_stats_update ();
		1186
		1187	if (expect_false (glow_radius) && pl->is_on_map ())
		1188	update_all_los (pl->map, pl->x, pl->y);
		1189	}
1085	}	1190	}
1086	else if (map)	1191	else if (map)
1087	{	1192	{
1088	map->dirty = true;	1193	map->dirty = true;
1089	mapspace &ms = this->ms ();	1194	mapspace &ms = this->ms ();
1090		1195
1091	if (object *pl = ms.player ())	1196	if (object *pl = ms.player ())
1092	{	1197	{
1093	if (type == PLAYER) // this == pl(!)	1198	if (is_player ())
1094	{	1199	{
		1200	if (!flag [FLAG_WIZPASS])
		1201	ms.smell = ++mapspace::smellcount; // remember the smell of the player
		1202
1095	// leaving a spot always closes any open container on the ground	1203	// leaving a spot always closes any open container on the ground
1096	if (container && !container->env)	1204	if (container && !container->env)
1097	// this causes spurious floorbox updates, but it ensures	1205	// this causes spurious floorbox updates, but it ensures
1098	// that the CLOSE event is being sent.	1206	// that the CLOSE event is being sent.
1099	close_container ();	1207	close_container ();
1100		1208
1101	--map->players;	1209	--map->players;
1102	map->touch ();	1210	map->touch ();
1103	}	1211	}
1104	else if (pl->container == this)	1212	else if (pl->container_ () == this)
1105	{	1213	{
1106	// removing a container should close it	1214	// removing a container should close it
1107	close_container ();	1215	close_container ();
1108	}	1216	}
1109		1217	else
1110	esrv_del_item (pl->contr, count);	1218	esrv_del_item (pl->contr, count);
1111	}	1219	}
1112		1220
1113	/* link the object above us */	1221	/* link the object above us */
1114	// re-link, make sure compiler can easily use cmove	1222	// re-link, make sure compiler can easily use cmove
1115	*(above ? &above->below : &ms.top) = below;	1223	*(above ? &above->below : &ms.top) = below;
1116	*(below ? &below->above : &ms.bot) = above;	1224	*(below ? &below->above : &ms.bot) = above;
1117		1225
1118	above = 0;	1226	above = 0;
1119	below = 0;	1227	below = 0;
1120		1228
		1229	ms.invalidate ();
		1230
1121	if (map->in_memory == MAP_SAVING)	1231	if (map->in_memory == MAP_SAVING)
1122	return;	1232	return;
1123		1233
1124	int check_walk_off = !flag [FLAG_NO_APPLY];	1234	int check_walk_off = !flag [FLAG_NO_APPLY];
1125		1235
1126	if (object *pl = ms.player ())	1236	if (object *pl = ms.player ())
1127	{	1237	{
1128	if (pl->container == this)	1238	if (pl->container_ () == this)
1129	/* If a container that the player is currently using somehow gets	1239	/* If a container that the player is currently using somehow gets
1130	* removed (most likely destroyed), update the player view	1240	* removed (most likely destroyed), update the player view
1131	* appropriately.	1241	* appropriately.
1132	*/	1242	*/
1133	pl->close_container ();	1243	pl->close_container ();
…		…
1137	//TODO: update floorbox to preserve ordering	1247	//TODO: update floorbox to preserve ordering
1138	if (pl->contr->ns)	1248	if (pl->contr->ns)
1139	pl->contr->ns->floorbox_update ();	1249	pl->contr->ns->floorbox_update ();
1140	}	1250	}
1141		1251
		1252	if (check_walk_off)
1142	for (tmp = ms.bot; tmp; tmp = tmp->above)	1253	for (object *above, *tmp = ms.bot; tmp; tmp = above)
1143	{	1254	{
		1255	above = tmp->above;
		1256
1144	/* No point updating the players look faces if he is the object	1257	/* No point updating the players look faces if he is the object
1145	* being removed.	1258	* being removed.
1146	*/	1259	*/
1147		1260
1148	/* See if object moving off should effect something */	1261	/* See if object moving off should effect something */
1149	if (check_walk_off
1150	&& ((move_type & tmp->move_off)	1262	if ((move_type & tmp->move_off)
1151	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))	1263	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0)
1152	{
1153	move_apply (tmp, this, 0);	1264	move_apply (tmp, this, 0);
1154
1155	if (destroyed ())
1156	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1157	}	1265	}
1158		1266
1159	last = tmp;	1267	if (affects_los ())
1160	}
1161
1162	/* last == NULL if there are no objects on this space */
1163	//TODO: this makes little sense, why only update the topmost object?
1164	if (!last)
1165	map->at (x, y).flags_ = 0;
1166	else
1167	update_object (last, UP_OBJ_REMOVE);
1168
1169	if (flag [FLAG_BLOCKSVIEW] || glow_radius)
1170	update_all_los (map, x, y);	1268	update_all_los (map, x, y);
1171	}	1269	}
1172	}	1270	}
1173		1271
1174	/*	1272	/*
…		…
1198	esrv_update_item (UPD_NROF, pl, top);	1296	esrv_update_item (UPD_NROF, pl, top);
1199		1297
1200	op->weight = 0; // cancel the addition above	1298	op->weight = 0; // cancel the addition above
1201	op->carrying = 0; // must be 0 already	1299	op->carrying = 0; // must be 0 already
1202		1300
1203	op->destroy (1);	1301	op->destroy ();
1204		1302
1205	return top;	1303	return top;
1206	}	1304	}
1207		1305
1208	return 0;	1306	return 0;
…		…
1216		1314
1217	object *prev = this;	1315	object *prev = this;
1218		1316
1219	for (archetype *at = (archetype *)arch->more; at; at = (archetype *)at->more)	1317	for (archetype *at = (archetype *)arch->more; at; at = (archetype *)at->more)
1220	{	1318	{
1221	object *op = arch_to_object (at);	1319	object *op = at->instance ();
1222		1320
1223	op->name = name;	1321	op->name = name;
1224	op->name_pl = name_pl;	1322	op->name_pl = name_pl;
1225	op->title = title;	1323	op->title = title;
1226		1324
…		…
1236	* job preparing multi-part monsters.	1334	* job preparing multi-part monsters.
1237	*/	1335	*/
1238	object *	1336	object *
1239	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)	1337	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1240	{	1338	{
		1339	op->remove ();
		1340
1241	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)	1341	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1242	{	1342	{
1243	tmp->x = x + tmp->arch->x;	1343	tmp->x = x + tmp->arch->x;
1244	tmp->y = y + tmp->arch->y;	1344	tmp->y = y + tmp->arch->y;
1245	}	1345	}
…		…
1262	* Passing 0 for flag gives proper default values, so flag really only needs	1362	* Passing 0 for flag gives proper default values, so flag really only needs
1263	* to be set if special handling is needed.	1363	* to be set if special handling is needed.
1264	*	1364	*
1265	* Return value:	1365	* Return value:
1266	* new object if 'op' was merged with other object	1366	* new object if 'op' was merged with other object
1267	* NULL if 'op' was destroyed	1367	* NULL if there was an error (destroyed, blocked etc.)
1268	* just 'op' otherwise	1368	* just 'op' otherwise
1269	*/	1369	*/
1270	object *	1370	object *
1271	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)	1371	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1272	{	1372	{
1273	op->remove ();	1373	op->remove ();
		1374
		1375	if (m == &freed_map)//D TODO: remove soon
		1376	{//D
		1377	LOG (llevError | logBacktrace, "tries to insret object on freed objects map: %s", op->debug_desc ());//D
		1378	}//D
1274		1379
1275	/* Ideally, the caller figures this out. However, it complicates a lot	1380	/* Ideally, the caller figures this out. However, it complicates a lot
1276	* of areas of callers (eg, anything that uses find_free_spot would now	1381	* of areas of callers (eg, anything that uses find_free_spot would now
1277	* need extra work	1382	* need extra work
1278	*/	1383	*/
		1384	maptile *newmap = m;
1279	if (!xy_normalise (m, op->x, op->y))	1385	if (!xy_normalise (newmap, op->x, op->y))
1280	{	1386	{
1281	op->head_ ()->destroy (1);// remove head_ once all tail object destroyers found	1387	op->head_ ()->destroy ();// remove head_ once all tail object destroyers found
1282	return 0;	1388	return 0;
1283	}	1389	}
1284		1390
1285	if (object *more = op->more)	1391	if (object *more = op->more)
1286	if (!insert_ob_in_map (more, m, originator, flag))	1392	if (!insert_ob_in_map (more, m, originator, flag))
1287	return 0;	1393	return 0;
1288		1394
1289	CLEAR_FLAG (op, FLAG_REMOVED);	1395	op->flag [FLAG_REMOVED] = false;
1290		1396	op->env = 0;
1291	op->map = m;	1397	op->map = newmap;
		1398
1292	mapspace &ms = op->ms ();	1399	mapspace &ms = op->ms ();
1293		1400
1294	/* this has to be done after we translate the coordinates.	1401	/* this has to be done after we translate the coordinates.
1295	*/	1402	*/
1296	if (op->nrof && !(flag & INS_NO_MERGE))	1403	if (op->nrof && !(flag & INS_NO_MERGE))
…		…
1299	{	1406	{
1300	// TODO: we actually want to update tmp, not op,	1407	// TODO: we actually want to update tmp, not op,
1301	// but some caller surely breaks when we return tmp	1408	// but some caller surely breaks when we return tmp
1302	// from here :/	1409	// from here :/
1303	op->nrof += tmp->nrof;	1410	op->nrof += tmp->nrof;
1304	tmp->destroy (1);	1411	tmp->destroy ();
1305	}	1412	}
1306		1413
1307	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1414	op->clr_flag (FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1308	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1415	op->clr_flag (FLAG_INV_LOCKED);
1309		1416
1310	if (!QUERY_FLAG (op, FLAG_ALIVE))	1417	if (!op->flag [FLAG_ALIVE])
1311	CLEAR_FLAG (op, FLAG_NO_STEAL);	1418	op->clr_flag (FLAG_NO_STEAL);
1312		1419
1313	if (flag & INS_BELOW_ORIGINATOR)	1420	if (flag & INS_BELOW_ORIGINATOR)
1314	{	1421	{
1315	if (originator->map != op->map || originator->x != op->x || originator->y != op->y || !originator->is_on_map ())	1422	if (originator->map != op->map || originator->x != op->x || originator->y != op->y)
1316	{	1423	{
1317	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");	1424	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");
		1425	abort ();
		1426	}
		1427
		1428	if (!originator->is_on_map ())
		1429	{
		1430	LOG (llevError, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map",
		1431	op->debug_desc (), originator->debug_desc ());
1318	abort ();	1432	abort ();
1319	}	1433	}
1320		1434
1321	op->above = originator;	1435	op->above = originator;
1322	op->below = originator->below;	1436	op->below = originator->below;
…		…
1344	* when lots of spells are cast in one area. Currently, it is presumed	1458	* when lots of spells are cast in one area. Currently, it is presumed
1345	* that flying non pickable objects are spell objects.	1459	* that flying non pickable objects are spell objects.
1346	*/	1460	*/
1347	for (object *tmp = ms.bot; tmp; tmp = tmp->above)	1461	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1348	{	1462	{
1349	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) || QUERY_FLAG (tmp, FLAG_OVERLAY_FLOOR))	1463	if (tmp->flag [FLAG_IS_FLOOR] || tmp->flag [FLAG_OVERLAY_FLOOR])
1350	floor = tmp;	1464	floor = tmp;
1351		1465
1352	if (QUERY_FLAG (tmp, FLAG_NO_PICK) && (tmp->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (tmp, FLAG_IS_FLOOR))	1466	if (tmp->flag [FLAG_NO_PICK] && (tmp->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !tmp->flag [FLAG_IS_FLOOR])
1353	{	1467	{
1354	/* We insert above top, so we want this object below this */	1468	/* We insert above top, so we want this object below this */
1355	top = tmp->below;	1469	top = tmp->below;
1356	break;	1470	break;
1357	}	1471	}
…		…
1375	&& (op->face && !faces [op->face].visibility))	1489	&& (op->face && !faces [op->face].visibility))
1376	{	1490	{
1377	object *last;	1491	object *last;
1378		1492
1379	for (last = top; last != floor; last = last->below)	1493	for (last = top; last != floor; last = last->below)
1380	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1494	if (last->flag [FLAG_BLOCKSVIEW] && (last->type != EXIT))
1381	break;	1495	break;
1382		1496
1383	/* Check to see if we found the object that blocks view,	1497	/* Check to see if we found the object that blocks view,
1384	* and make sure we have a below pointer for it so that	1498	* and make sure we have a below pointer for it so that
1385	* we can get inserted below this one, which requires we	1499	* we can get inserted below this one, which requires we
…		…
1410	op->below = top;	1524	op->below = top;
1411	*(op->above ? &op->above->below : &ms.top) = op;	1525	*(op->above ? &op->above->below : &ms.top) = op;
1412	}	1526	}
1413	}	1527	}
1414		1528
1415	if (op->type == PLAYER)	1529	if (op->is_player ())
1416	{	1530	{
1417	op->contr->do_los = 1;	1531	op->contr->do_los = 1;
1418	++op->map->players;	1532	++op->map->players;
1419	op->map->touch ();	1533	op->map->touch ();
1420	}	1534	}
…		…
1435	* be far away from this change and not affected in any way -	1549	* be far away from this change and not affected in any way -
1436	* this should get redone to only look for players within range,	1550	* this should get redone to only look for players within range,
1437	* or just updating the P_UPTODATE for spaces within this area	1551	* or just updating the P_UPTODATE for spaces within this area
1438	* of effect may be sufficient.	1552	* of effect may be sufficient.
1439	*/	1553	*/
1440	if (op->map->darkness && (op->glow_radius != 0))	1554	if (op->affects_los ())
		1555	{
		1556	op->ms ().invalidate ();
1441	update_all_los (op->map, op->x, op->y);	1557	update_all_los (op->map, op->x, op->y);
		1558	}
1442		1559
1443	/* updates flags (blocked, alive, no magic, etc) for this map space */	1560	/* updates flags (blocked, alive, no magic, etc) for this map space */
1444	update_object (op, UP_OBJ_INSERT);	1561	update_object (op, UP_OBJ_INSERT);
1445		1562
1446	INVOKE_OBJECT (INSERT, op);	1563	INVOKE_OBJECT (INSERT, op);
…		…
1453	* blocked() and wall() work properly), and these flags are updated by	1570	* blocked() and wall() work properly), and these flags are updated by
1454	* update_object().	1571	* update_object().
1455	*/	1572	*/
1456		1573
1457	/* if this is not the head or flag has been passed, don't check walk on status */	1574	/* if this is not the head or flag has been passed, don't check walk on status */
1458	if (!(flag & INS_NO_WALK_ON) && op->head_ () == op)	1575	if (!(flag & INS_NO_WALK_ON) && op->is_head ())
1459	{	1576	{
1460	if (check_move_on (op, originator))	1577	if (check_move_on (op, originator, flag))
1461	return 0;	1578	return 0;
1462		1579
1463	/* If we are a multi part object, lets work our way through the check	1580	/* If we are a multi part object, let's work our way through the check
1464	* walk on's.	1581	* walk on's.
1465	*/	1582	*/
1466	for (object *tmp = op->more; tmp; tmp = tmp->more)	1583	for (object *tmp = op->more; tmp; tmp = tmp->more)
1467	if (check_move_on (tmp, originator))	1584	if (check_move_on (tmp, originator, flag))
1468	return 0;	1585	return 0;
1469	}	1586	}
1470		1587
1471	return op;	1588	return op;
1472	}	1589	}
…		…
1474	/* this function inserts an object in the map, but if it	1591	/* this function inserts an object in the map, but if it
1475	* finds an object of its own type, it'll remove that one first.	1592	* finds an object of its own type, it'll remove that one first.
1476	* op is the object to insert it under: supplies x and the map.	1593	* op is the object to insert it under: supplies x and the map.
1477	*/	1594	*/
1478	void	1595	void
1479	replace_insert_ob_in_map (const char *arch_string, object *op)	1596	replace_insert_ob_in_map (shstr_tmp archname, object *op)
1480	{	1597	{
1481	/* first search for itself and remove any old instances */	1598	/* first search for itself and remove any old instances */
1482		1599
1483	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)	1600	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1484	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */	1601	if (tmp->arch->archname == archname) /* same archetype */
1485	tmp->destroy (1);	1602	tmp->destroy ();
1486		1603
1487	object *tmp = arch_to_object (archetype::find (arch_string));	1604	object *tmp = archetype::find (archname)->instance ();
1488		1605
1489	tmp->x = op->x;	1606	tmp->x = op->x;
1490	tmp->y = op->y;	1607	tmp->y = op->y;
1491		1608
1492	insert_ob_in_map (tmp, op->map, op, 0);	1609	insert_ob_in_map (tmp, op->map, op, 0);
…		…
1497	{	1614	{
1498	if (where->env)	1615	if (where->env)
1499	return where->env->insert (this);	1616	return where->env->insert (this);
1500	else	1617	else
1501	return where->map->insert (this, where->x, where->y, originator, flags);	1618	return where->map->insert (this, where->x, where->y, originator, flags);
		1619	}
		1620
		1621	// check whether we can put this into the map, respect max_volume, max_items
		1622	bool
		1623	object::can_drop_at (maptile *m, int x, int y, object *originator)
		1624	{
		1625	mapspace &ms = m->at (x, y);
		1626
		1627	int items = ms.items ();
		1628
		1629	if (!items // testing !items ensures we can drop at least one item
		1630	|| (items < m->max_items
		1631	&& ms.volume () < m->max_volume))
		1632	return true;
		1633
		1634	if (originator && originator->is_player ())
		1635	originator->contr->failmsgf (
		1636	"No matter how hard you try, you just cannot put the %s here H<Try to remove some items from the floor first.>",
		1637	query_name ()
		1638	);
		1639
		1640	return false;
1502	}	1641	}
1503		1642
1504	/*	1643	/*
1505	* decrease(object, number) decreases a specified number from	1644	* decrease(object, number) decreases a specified number from
1506	* the amount of an object. If the amount reaches 0, the object	1645	* the amount of an object. If the amount reaches 0, the object
…		…
1514	if (!nr)	1653	if (!nr)
1515	return true;	1654	return true;
1516		1655
1517	nr = min (nr, nrof);	1656	nr = min (nr, nrof);
1518		1657
		1658	if (nrof > nr)
		1659	{
1519	nrof -= nr;	1660	nrof -= nr;
1520
1521	if (nrof)
1522	{
1523	adjust_weight (env, -weight * nr); // carrying == 0	1661	adjust_weight (env, -weight * max (1, nr)); // carrying == 0
1524		1662
1525	if (object *pl = visible_to ())	1663	if (object *pl = visible_to ())
1526	esrv_update_item (UPD_NROF, pl, this);	1664	esrv_update_item (UPD_NROF, pl, this);
1527		1665
1528	return true;	1666	return true;
1529	}	1667	}
1530	else	1668	else
1531	{	1669	{
1532	destroy (1);	1670	destroy ();
1533	return false;	1671	return false;
1534	}	1672	}
1535	}	1673	}
1536		1674
1537	/*	1675	/*
…		…
1614	if (object *pl = tmp->visible_to ())	1752	if (object *pl = tmp->visible_to ())
1615	esrv_update_item (UPD_NROF, pl, tmp);	1753	esrv_update_item (UPD_NROF, pl, tmp);
1616		1754
1617	adjust_weight (this, op->total_weight ());	1755	adjust_weight (this, op->total_weight ());
1618		1756
1619	op->destroy (1);	1757	op->destroy ();
1620	op = tmp;	1758	op = tmp;
1621	goto inserted;	1759	goto inserted;
1622	}	1760	}
1623		1761
1624	op->owner = 0; // it's his/hers now. period.	1762	op->owner = 0; // it's his/hers now. period.
…		…
1642		1780
1643	adjust_weight (this, op->total_weight ());	1781	adjust_weight (this, op->total_weight ());
1644		1782
1645	inserted:	1783	inserted:
1646	/* reset the light list and los of the players on the map */	1784	/* reset the light list and los of the players on the map */
1647	if (op->glow_radius && map && map->darkness)	1785	if (op->glow_radius && is_on_map ())
		1786	{
		1787	update_stats ();
1648	update_all_los (map, x, y);	1788	update_all_los (map, x, y);
1649		1789	}
		1790	else if (is_player ())
1650	// if this is a player's inventory, update stats	1791	// if this is a player's inventory, update stats
1651	if (type == PLAYER && !flag [FLAG_NO_FIX_PLAYER])	1792	contr->queue_stats_update ();
1652	update_stats ();
1653		1793
1654	INVOKE_OBJECT (INSERT, this);	1794	INVOKE_OBJECT (INSERT, this);
1655		1795
1656	return op;	1796	return op;
1657	}	1797	}
…		…
1675	* MSW 2001-07-08: Check all objects on space, not just those below	1815	* MSW 2001-07-08: Check all objects on space, not just those below
1676	* object being inserted. insert_ob_in_map may not put new objects	1816	* object being inserted. insert_ob_in_map may not put new objects
1677	* on top.	1817	* on top.
1678	*/	1818	*/
1679	int	1819	int
1680	check_move_on (object *op, object *originator)	1820	check_move_on (object *op, object *originator, int flags)
1681	{	1821	{
		1822	if (op->flag [FLAG_NO_APPLY])
		1823	return 0;
		1824
1682	object *tmp;	1825	object *tmp;
1683	maptile *m = op->map;	1826	maptile *m = op->map;
1684	int x = op->x, y = op->y;	1827	int x = op->x, y = op->y;
1685		1828
1686	MoveType move_on, move_slow, move_block;	1829	mapspace &ms = m->at (x, y);
1687		1830
1688	if (QUERY_FLAG (op, FLAG_NO_APPLY))	1831	ms.update ();
1689	return 0;
1690		1832
1691	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);	1833	MoveType move_on = ms.move_on;
1692	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);	1834	MoveType move_slow = ms.move_slow;
1693	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);	1835	MoveType move_block = ms.move_block;
1694		1836
1695	/* if nothing on this space will slow op down or be applied,	1837	/* if nothing on this space will slow op down or be applied,
1696	* no need to do checking below. have to make sure move_type	1838	* no need to do checking below. have to make sure move_type
1697	* is set, as lots of objects don't have it set - we treat that	1839	* is set, as lots of objects don't have it set - we treat that
1698	* as walking.	1840	* as walking.
…		…
1709	return 0;	1851	return 0;
1710		1852
1711	/* The objects have to be checked from top to bottom.	1853	/* The objects have to be checked from top to bottom.
1712	* Hence, we first go to the top:	1854	* Hence, we first go to the top:
1713	*/	1855	*/
1714		1856	for (object *next, *tmp = ms.top; tmp; tmp = next)
1715	for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above)
1716	{
1717	/* Trim the search when we find the first other spell effect
1718	* this helps performance so that if a space has 50 spell objects,
1719	* we don't need to check all of them.
1720	*/
1721	if ((tmp->move_type & MOVE_FLY_LOW) && QUERY_FLAG (tmp, FLAG_NO_PICK))
1722	break;
1723	}	1857	{
		1858	next = tmp->below;
1724		1859
1725	for (; tmp; tmp = tmp->below)
1726	{
1727	if (tmp == op)	1860	if (tmp == op)
1728	continue; /* Can't apply yourself */	1861	continue; /* Can't apply yourself */
1729		1862
1730	/* Check to see if one of the movement types should be slowed down.	1863	/* Check to see if one of the movement types should be slowed down.
1731	* Second check makes sure that the movement types not being slowed	1864	* Second check makes sure that the movement types not being slowed
1732	* (~slow_move) is not blocked on this space - just because the	1865	* (~slow_move) is not blocked on this space - just because the
1733	* space doesn't slow down swimming (for example), if you can't actually	1866	* space doesn't slow down swimming (for example), if you can't actually
1734	* swim on that space, can't use it to avoid the penalty.	1867	* swim on that space, can't use it to avoid the penalty.
1735	*/	1868	*/
1736	if (!QUERY_FLAG (op, FLAG_WIZPASS))	1869	if (!op->flag [FLAG_WIZPASS])
1737	{	1870	{
1738	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||	1871	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
1739	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))	1872	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1740	{	1873	{
1741
1742	float
1743	diff = tmp->move_slow_penalty * fabs (op->speed);	1874	float diff = tmp->move_slow_penalty * fabs (op->speed);
1744		1875
1745	if (op->type == PLAYER)	1876	if (op->is_player ())
1746	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||	1877	if ((tmp->flag [FLAG_IS_HILLY ] && find_skill_by_number (op, SK_CLIMBING)) ||
1747	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))	1878	(tmp->flag [FLAG_IS_WOODED] && find_skill_by_number (op, SK_WOODSMAN)))
1748	diff /= 4.0;	1879	diff /= 4.0;
1749		1880
1750	op->speed_left -= diff;	1881	op->speed_left -= diff;
1751	}	1882	}
1752	}	1883	}
1753		1884
1754	/* Basically same logic as above, except now for actual apply. */	1885	/* Basically same logic as above, except now for actual apply. */
1755	if ((!op->move_type && tmp->move_on & MOVE_WALK) ||	1886	if ((!op->move_type && tmp->move_on & MOVE_WALK) ||
1756	((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))	1887	((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))
1757	{	1888	{
		1889	if ((flags & INS_NO_AUTO_EXIT)
		1890	&& (tmp->type == EXIT || tmp->type == TELEPORTER
		1891	|| tmp->type == HOLE || tmp->type == TRAPDOOR)) //TODO: temporary, fix exits instead
		1892	continue;
		1893
1758	move_apply (tmp, op, originator);	1894	move_apply (tmp, op, originator);
1759		1895
1760	if (op->destroyed ())	1896	if (op->destroyed ())
1761	return 1;	1897	return 1;
1762		1898
…		…
1874	void	2010	void
1875	flag_inv (object *op, int flag)	2011	flag_inv (object *op, int flag)
1876	{	2012	{
1877	for (object *tmp = op->inv; tmp; tmp = tmp->below)	2013	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1878	{	2014	{
1879	SET_FLAG (tmp, flag);	2015	tmp->set_flag (flag);
1880	flag_inv (tmp, flag);	2016	flag_inv (tmp, flag);
1881	}	2017	}
1882	}	2018	}
1883		2019
1884	/*	2020	/*
…		…
1887	void	2023	void
1888	unflag_inv (object *op, int flag)	2024	unflag_inv (object *op, int flag)
1889	{	2025	{
1890	for (object *tmp = op->inv; tmp; tmp = tmp->below)	2026	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1891	{	2027	{
1892	CLEAR_FLAG (tmp, flag);	2028	tmp->clr_flag (flag);
1893	unflag_inv (tmp, flag);	2029	unflag_inv (tmp, flag);
1894	}	2030	}
1895	}	2031	}
1896		2032
1897	/*	2033	/*
…		…
1958	* head of the object should correspond for the entire object.	2094	* head of the object should correspond for the entire object.
1959	*/	2095	*/
1960	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))	2096	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
1961	continue;	2097	continue;
1962		2098
1963	if (ob->blocked (m, pos.x, pos.y))	2099	if (ob->blocked (pos.m, pos.x, pos.y))
1964	continue;	2100	continue;
1965		2101
1966	altern [index++] = i;	2102	altern [index++] = i;
1967	}	2103	}
1968		2104
…		…
2036	* there is capable of.	2172	* there is capable of.
2037	*/	2173	*/
2038	int	2174	int
2039	find_dir (maptile *m, int x, int y, object *exclude)	2175	find_dir (maptile *m, int x, int y, object *exclude)
2040	{	2176	{
2041	int i, max = SIZEOFFREE, mflags;	2177	int max = SIZEOFFREE, mflags;
2042
2043	sint16 nx, ny;
2044	object *tmp;
2045	maptile *mp;
2046
2047	MoveType blocked, move_type;	2178	MoveType move_type;
2048		2179
2049	if (exclude && exclude->head_ () != exclude)	2180	if (exclude && exclude->head_ () != exclude)
2050	{	2181	{
2051	exclude = exclude->head;	2182	exclude = exclude->head;
2052	move_type = exclude->move_type;	2183	move_type = exclude->move_type;
…		…
2055	{	2186	{
2056	/* If we don't have anything, presume it can use all movement types. */	2187	/* If we don't have anything, presume it can use all movement types. */
2057	move_type = MOVE_ALL;	2188	move_type = MOVE_ALL;
2058	}	2189	}
2059		2190
2060	for (i = 1; i < max; i++)	2191	for (int i = 1; i < max; i++)
2061	{	2192	{
2062	mp = m;	2193	mapxy pos (m, x, y);
2063	nx = x + freearr_x[i];	2194	pos.move (i);
2064	ny = y + freearr_y[i];
2065		2195
2066	mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);	2196	if (!pos.normalise ())
2067
2068	if (mflags & P_OUT_OF_MAP)
2069	max = maxfree[i];	2197	max = maxfree[i];
2070	else	2198	else
2071	{	2199	{
2072	mapspace &ms = mp->at (nx, ny);	2200	mapspace &ms = *pos;
2073		2201
2074	blocked = ms.move_block;
2075
2076	if ((move_type & blocked) == move_type)	2202	if ((move_type & ms.move_block) == move_type)
2077	max = maxfree[i];	2203	max = maxfree [i];
2078	else if (mflags & P_IS_ALIVE)	2204	else if (ms.flags () & P_IS_ALIVE)
2079	{	2205	{
2080	for (tmp = ms.bot; tmp; tmp = tmp->above)	2206	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
2081	if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)	2207	if ((tmp->flag [FLAG_MONSTER] || tmp->is_player ())
2082	&& (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))	2208	&& (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2083	break;
2084
2085	if (tmp)
2086	return freedir[i];	2209	return freedir [i];
2087	}	2210	}
2088	}	2211	}
2089	}	2212	}
2090		2213
2091	return 0;	2214	return 0;
…		…
2100	{	2223	{
2101	return (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);	2224	return (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);
2102	}	2225	}
2103		2226
2104	/*	2227	/*
2105	* find_dir_2(delta-x,delta-y) will return a direction in which	2228	* find_dir_2(delta-x,delta-y) will return a direction value
2106	* an object which has subtracted the x and y coordinates of another	2229	* for running into direct [dx, dy].
2107	* object, needs to travel toward it.	2230	* (the opposite of crossfire's find_dir_2!)
2108	*/	2231	*/
2109	int	2232	int
2110	find_dir_2 (int x, int y)	2233	find_dir_2 (int x, int y)
2111	{	2234	{
		2235	#if 1 // new algorithm
		2236	// this works by putting x, y into 16 sectors, which
		2237	// are not equal sized, but are a better approximation
		2238	// then the old algorithm, and then using a mapping
		2239	// table to map it into a direction value.
		2240	// basically, it maps these comparisons to each bit
		2241	// bit #3: x < 0
		2242	// bit #2: y < 0
		2243	// bit #1: x > y
		2244	// bit #0: x > 2y
		2245
		2246	static const uint8 dir[16] = {
		2247	4, 5, 4, 3,
		2248	2, 1, 2, 3,
		2249	6, 5, 6, 7,
		2250	8, 1, 8, 7,
		2251	};
		2252	int sector = 0;
		2253
		2254	// this is a bit ugly, but more likely to result in branchless code
		2255	sector |= x < 0 ? 8 : 0;
		2256	x = x < 0 ? -x : x; // abs
		2257
		2258	sector |= y < 0 ? 4 : 0;
		2259	y = y < 0 ? -y : y; // abs
		2260
		2261	if (x > y)
		2262	{
		2263	sector |= 2;
		2264
		2265	if (x > y * 2)
		2266	sector |= 1;
		2267	}
		2268	else
		2269	{
		2270	if (y > x * 2)
		2271	sector |= 1;
		2272	else if (!y)
		2273	return 0; // x == 0 here
		2274	}
		2275
		2276	return dir [sector];
		2277	#else // old algorithm
2112	int q;	2278	int q;
2113		2279
2114	if (y)	2280	if (y)
2115	q = x * 100 / y;	2281	q = 128 * x / y;
2116	else if (x)	2282	else if (x)
2117	q = -300 * x;	2283	q = -512 * x; // to make it > 309
2118	else	2284	else
2119	return 0;	2285	return 0;
2120		2286
2121	if (y > 0)	2287	if (y > 0)
2122	{	2288	{
2123	if (q < -242)	2289	if (q < -309) return 7;
		2290	if (q < -52) return 6;
		2291	if (q < 52) return 5;
		2292	if (q < 309) return 4;
		2293
2124	return 3;	2294	return 3;
2125	if (q < -41)	2295	}
2126	return 2;	2296	else
2127	if (q < 41)	2297	{
2128	return 1;	2298	if (q < -309) return 3;
2129	if (q < 242)	2299	if (q < -52) return 2;
2130	return 8;	2300	if (q < 52) return 1;
		2301	if (q < 309) return 8;
		2302
2131	return 7;	2303	return 7;
2132	}	2304	}
2133		2305	#endif
2134	if (q < -242)
2135	return 7;
2136	if (q < -41)
2137	return 6;
2138	if (q < 41)
2139	return 5;
2140	if (q < 242)
2141	return 4;
2142
2143	return 3;
2144	}	2306	}
2145		2307
2146	/*	2308	/*
2147	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is	2309	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is
2148	* between two directions (which are expected to be absolute (see absdir())	2310	* between two directions (which are expected to be absolute (see absdir())
2149	*/	2311	*/
2150	int	2312	int
2151	dirdiff (int dir1, int dir2)	2313	dirdiff (int dir1, int dir2)
2152	{	2314	{
2153	int d;
2154
2155	d = abs (dir1 - dir2);	2315	int d = abs (dir1 - dir2);
2156	if (d > 4)
2157	d = 8 - d;
2158		2316
2159	return d;	2317	return d > 4 ? 8 - d : d;
2160	}	2318	}
2161		2319
2162	/* peterm:	2320	/* peterm:
2163	* do LOS stuff for ball lightning. Go after the closest VISIBLE monster.	2321	* do LOS stuff for ball lightning. Go after the closest VISIBLE monster.
2164	* Basically, this is a table of directions, and what directions	2322	* Basically, this is a table of directions, and what directions
…		…
2166	* This basically means that if direction is 15, then it could either go	2324	* This basically means that if direction is 15, then it could either go
2167	* direction 4, 14, or 16 to get back to where we are.	2325	* direction 4, 14, or 16 to get back to where we are.
2168	* Moved from spell_util.c to object.c with the other related direction	2326	* Moved from spell_util.c to object.c with the other related direction
2169	* functions.	2327	* functions.
2170	*/	2328	*/
2171	int reduction_dir[SIZEOFFREE][3] = {	2329	static const int reduction_dir[SIZEOFFREE][3] = {
2172	{0, 0, 0}, /* 0 */	2330	{0, 0, 0}, /* 0 */
2173	{0, 0, 0}, /* 1 */	2331	{0, 0, 0}, /* 1 */
2174	{0, 0, 0}, /* 2 */	2332	{0, 0, 0}, /* 2 */
2175	{0, 0, 0}, /* 3 */	2333	{0, 0, 0}, /* 3 */
2176	{0, 0, 0}, /* 4 */	2334	{0, 0, 0}, /* 4 */
…		…
2270	* Add a check so we can't pick up invisible objects (0.93.8)	2428	* Add a check so we can't pick up invisible objects (0.93.8)
2271	*/	2429	*/
2272	int	2430	int
2273	can_pick (const object *who, const object *item)	2431	can_pick (const object *who, const object *item)
2274	{	2432	{
2275	return /*QUERY_FLAG(who,FLAG_WIZ)|| */	2433	return /*who->flag [FLAG_WIZ]|| */
2276	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&	2434	(item->weight > 0 && !item->flag [FLAG_NO_PICK] &&
2277	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3));	2435	!item->flag [FLAG_ALIVE] && !item->invisible && (who->is_player () || item->weight < who->weight / 3));
2278	}	2436	}
2279		2437
2280	/*	2438	/*
2281	* create clone from object to another	2439	* create clone from object to another
2282	*/	2440	*/
…		…
2314	return tmp;	2472	return tmp;
2315		2473
2316	return 0;	2474	return 0;
2317	}	2475	}
2318		2476
2319	const shstr &	2477	shstr_tmp
2320	object::kv_get (const shstr &key) const	2478	object::kv_get (shstr_tmp key) const
2321	{	2479	{
2322	for (key_value *kv = key_values; kv; kv = kv->next)	2480	for (key_value *kv = key_values; kv; kv = kv->next)
2323	if (kv->key == key)	2481	if (kv->key == key)
2324	return kv->value;	2482	return kv->value;
2325		2483
2326	return shstr_null;	2484	return shstr ();
2327	}	2485	}
2328		2486
2329	void	2487	void
2330	object::kv_set (const shstr &key, const shstr &value)	2488	object::kv_set (shstr_tmp key, shstr_tmp value)
2331	{	2489	{
2332	for (key_value *kv = key_values; kv; kv = kv->next)	2490	for (key_value *kv = key_values; kv; kv = kv->next)
2333	if (kv->key == key)	2491	if (kv->key == key)
2334	{	2492	{
2335	kv->value = value;	2493	kv->value = value;
…		…
2344		2502
2345	key_values = kv;	2503	key_values = kv;
2346	}	2504	}
2347		2505
2348	void	2506	void
2349	object::kv_del (const shstr &key)	2507	object::kv_del (shstr_tmp key)
2350	{	2508	{
2351	for (key_value **kvp = &key_values; *kvp; kvp = &(*kvp)->next)	2509	for (key_value **kvp = &key_values; *kvp; kvp = &(*kvp)->next)
2352	if ((*kvp)->key == key)	2510	if ((*kvp)->key == key)
2353	{	2511	{
2354	key_value *kv = *kvp;	2512	key_value *kv = *kvp;
…		…
2413	{	2571	{
2414	char flagdesc[512];	2572	char flagdesc[512];
2415	char info2[256 * 4];	2573	char info2[256 * 4];
2416	char *p = info;	2574	char *p = info;
2417		2575
2418	p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s,flags:[%s],type:%d}",	2576	p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s%s,flags:[%s],type:%d}",
2419	count,	2577	count,
2420	uuid.c_str (),	2578	uuid.c_str (),
2421	&name,	2579	&name,
2422	title ? "\",title:\"" : "",	2580	title ? ",title:\"" : "",
2423	title ? (const char *)title : "",	2581	title ? (const char *)title : "",
		2582	title ? "\"" : "",
2424	flag_desc (flagdesc, 512), type);	2583	flag_desc (flagdesc, 512), type);
2425		2584
2426	if (!flag[FLAG_REMOVED] && env)	2585	if (!flag[FLAG_REMOVED] && env)
2427	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2586	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2428		2587
…		…
2444	struct region *	2603	struct region *
2445	object::region () const	2604	object::region () const
2446	{	2605	{
2447	return map ? map->region (x, y)	2606	return map ? map->region (x, y)
2448	: region::default_region ();	2607	: region::default_region ();
2449	}
2450
2451	const materialtype_t *
2452	object::dominant_material () const
2453	{
2454	if (materialtype_t *mt = name_to_material (materialname))
2455	return mt;
2456
2457	return name_to_material (shstr_unknown);
2458	}	2608	}
2459		2609
2460	void	2610	void
2461	object::open_container (object *new_container)	2611	object::open_container (object *new_container)
2462	{	2612	{
…		…
2484	container = 0;	2634	container = 0;
2485		2635
2486	// client needs item update to make it work, client bug requires this to be separate	2636	// client needs item update to make it work, client bug requires this to be separate
2487	esrv_update_item (UPD_FLAGS, this, old_container);	2637	esrv_update_item (UPD_FLAGS, this, old_container);
2488		2638
2489	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));	2639	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", old_container->query_name ());
2490	play_sound (sound_find ("chest_close"));	2640	play_sound (sound_find ("chest_close"));
2491	}	2641	}
2492		2642
2493	if (new_container)	2643	if (new_container)
2494	{	2644	{
…		…
2498	// TODO: this does not seem to serve any purpose anymore?	2648	// TODO: this does not seem to serve any purpose anymore?
2499	#if 0	2649	#if 0
2500	// insert the "Close Container" object.	2650	// insert the "Close Container" object.
2501	if (archetype *closer = new_container->other_arch)	2651	if (archetype *closer = new_container->other_arch)
2502	{	2652	{
2503	object *closer = arch_to_object (new_container->other_arch);	2653	object *closer = new_container->other_arch->instance ();
2504	closer->flag [FLAG_NO_MAP_SAVE] = 1;	2654	closer->flag [FLAG_NO_MAP_SAVE] = 1;
2505	new_container->insert (closer);	2655	new_container->insert (closer);
2506	}	2656	}
2507	#endif	2657	#endif
2508		2658
2509	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));	2659	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", new_container->query_name ());
2510		2660
2511	// make sure the container is available, client bug requires this to be separate	2661	// make sure the container is available, client bug requires this to be separate
2512	esrv_send_item (this, new_container);	2662	esrv_send_item (this, new_container);
2513		2663
2514	new_container->flag [FLAG_APPLIED] = true;	2664	new_container->flag [FLAG_APPLIED] = true;
…		…
2522	// else if (!old_container->env && contr && contr->ns)	2672	// else if (!old_container->env && contr && contr->ns)
2523	// contr->ns->floorbox_reset ();	2673	// contr->ns->floorbox_reset ();
2524	}	2674	}
2525		2675
2526	object *	2676	object *
2527	object::force_find (const shstr name)	2677	object::force_find (shstr_tmp name)
2528	{	2678	{
2529	/* cycle through his inventory to look for the MARK we want to	2679	/* cycle through his inventory to look for the MARK we want to
2530	* place	2680	* place
2531	*/	2681	*/
2532	for (object *tmp = inv; tmp; tmp = tmp->below)	2682	for (object *tmp = inv; tmp; tmp = tmp->below)
…		…
2534	return splay (tmp);	2684	return splay (tmp);
2535		2685
2536	return 0;	2686	return 0;
2537	}	2687	}
2538		2688
		2689	//-GPL
		2690
2539	void	2691	void
		2692	object::force_set_timer (int duration)
		2693	{
		2694	this->duration = 1;
		2695	this->speed_left = -1.f;
		2696
		2697	this->set_speed (duration ? 1.f / duration : 0.f);
		2698	}
		2699
		2700	object *
2540	object::force_add (const shstr name, int duration)	2701	object::force_add (shstr_tmp name, int duration)
2541	{	2702	{
2542	if (object *force = force_find (name))	2703	if (object *force = force_find (name))
2543	force->destroy ();	2704	force->destroy ();
2544		2705
2545	object *force = get_archetype (FORCE_NAME);	2706	object *force = get_archetype (FORCE_NAME);
2546		2707
2547	force->slaying = name;	2708	force->slaying = name;
2548	force->stats.food = 1;	2709	force->force_set_timer (duration);
2549	force->speed_left = -1.f;
2550
2551	force->set_speed (duration ? 1.f / duration : 0.f);
2552	force->flag [FLAG_IS_USED_UP] = true;
2553	force->flag [FLAG_APPLIED] = true;	2710	force->flag [FLAG_APPLIED] = true;
2554		2711
2555	insert (force);	2712	return insert (force);
2556	}	2713	}
2557		2714
2558	void	2715	void
2559	object::play_sound (faceidx sound)	2716	object::play_sound (faceidx sound) const
2560	{	2717	{
2561	if (!sound)	2718	if (!sound)
2562	return;	2719	return;
2563		2720
2564	if (flag [FLAG_REMOVED])	2721	if (is_on_map ())
		2722	map->play_sound (sound, x, y);
		2723	else if (object *pl = in_player ())
		2724	pl->contr->play_sound (sound);
		2725	}
		2726
		2727	void
		2728	object::say_msg (const char *msg) const
		2729	{
		2730	if (is_on_map ())
		2731	map->say_msg (msg, x, y);
		2732	else if (object *pl = in_player ())
		2733	pl->contr->play_sound (sound);
		2734	}
		2735
		2736	void
		2737	object::make_noise ()
		2738	{
		2739	// we do not model noise in the map, so instead put
		2740	// a temporary light into the noise source
		2741	// could use the map instead, but that's less reliable for our
		2742	// goal, which is to make invisibility a bit harder to exploit
		2743
		2744	// currently only works sensibly for players
		2745	if (!is_player ())
2565	return;	2746	return;
2566		2747
2567	if (env)	2748	// find old force, or create new one
2568	{	2749	object *force = force_find (shstr_noise_force);
2569	if (object *pl = in_player ())	2750
2570	pl->contr->play_sound (sound);	2751	if (force)
2571	}	2752	force->speed_left = -1.f; // patch old speed up
2572	else	2753	else
2573	map->play_sound (sound, x, y);	2754	{
2574	}	2755	force = archetype::get (shstr_noise_force);
2575		2756
		2757	force->slaying = shstr_noise_force;
		2758	force->stats.food = 1;
		2759	force->speed_left = -1.f;
		2760
		2761	force->set_speed (1.f / 4.f);
		2762	force->flag [FLAG_IS_USED_UP] = true;
		2763	force->flag [FLAG_APPLIED] = true;
		2764
		2765	insert (force);
		2766	}
		2767	}
		2768
		2769	void object::change_move_type (MoveType mt)
		2770	{
		2771	if (move_type == mt)
		2772	return;
		2773
		2774	if (is_on_map ())
		2775	{
		2776	// we are on the map, so handle move_on/off effects
		2777	remove ();
		2778	move_type = mt;
		2779	map->insert (this, x, y, this);
		2780	}
		2781	else
		2782	move_type = mt;
		2783	}
		2784
		2785	/* object should be a player.
		2786	* we return the object the player has marked with the 'mark' command
		2787	* below. If no match is found (or object has changed), we return
		2788	* NULL. We leave it up to the calling function to print messages if
		2789	* nothing is found.
		2790	*/
		2791	object *
		2792	object::mark () const
		2793	{
		2794	if (contr && contr->mark && contr->mark->env == this)
		2795	return contr->mark;
		2796	else
		2797	return 0;
		2798	}
		2799

Diff Legend

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