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.254 by root, Sun Aug 31 01:17:11 2008 UTC vs.
Revision 1.339 by root, Fri Jul 2 17:39:23 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
		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
66	static void	95	static void
67	write_uuid (uval64 skip, bool sync)	96	write_uuid (uval64 skip, bool sync)
68	{	97	{
69	CALL_BEGIN (2);	98	CALL_BEGIN (2);
70	CALL_ARG_SV (newSVval64 (skip));	99	CALL_ARG_SV (newSVval64 (skip));
…		…
72	CALL_CALL ("cf::write_uuid", G_DISCARD);	101	CALL_CALL ("cf::write_uuid", G_DISCARD);
73	CALL_END;	102	CALL_END;
74	}	103	}
75		104
76	static void	105	static void
77	read_uuid (void)	106	read_uuid ()
78	{	107	{
79	char filename[MAX_BUF];	108	char filename[MAX_BUF];
80		109
81	sprintf (filename, "%s/uuid", settings.localdir);	110	sprintf (filename, "%s/uuid", settings.localdir);
82		111
…		…
96		125
97	LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);	126	LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);
98	_exit (1);	127	_exit (1);
99	}	128	}
100		129
101	UUID::BUF buf;	130	char buf [UUID::MAX_LEN];
102	buf[0] = 0;	131	buf[0] = 0;
103	fgets (buf, sizeof (buf), fp);	132	fgets (buf, sizeof (buf), fp);
104		133
105	if (!UUID::cur.parse (buf))	134	if (!UUID::cur.parse (buf))
106	{	135	{
…		…
133		162
134	void	163	void
135	UUID::init ()	164	UUID::init ()
136	{	165	{
137	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;
138	}	232	}
139		233
140	/* 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. */
141	static bool	235	static bool
142	compare_ob_value_lists_one (const object *wants, const object *has)	236	compare_ob_value_lists_one (const object *wants, const object *has)
…		…
178	* Improvements made with merge: Better checking on potion, and also	272	* Improvements made with merge: Better checking on potion, and also
179	* check weight	273	* check weight
180	*/	274	*/
181	bool object::can_merge_slow (object *ob1, object *ob2)	275	bool object::can_merge_slow (object *ob1, object *ob2)
182	{	276	{
183	/* A couple quicksanity checks */	277	/* A couple quick sanity checks */
184	if (ob1 == ob2	278	if (ob1 == ob2
185	|| ob1->type != ob2->type	279	|| ob1->type != ob2->type
186	|| ob1->speed != ob2->speed
187	|| ob1->value != ob2->value	280	|| ob1->value != ob2->value
188	|| ob1->name != ob2->name)	281	|| ob1->name != ob2->name
		282	|| fabs (ob1->speed - ob2->speed) >= MIN_ACTIVE_SPEED)
189	return 0;	283	return 0;
190		284
191	/* Do not merge objects if nrof would overflow, assume nrof	285	/* Do not merge objects if nrof would overflow, assume nrof
192	* is always 0 .. 2**31-1 */	286	* is always 0 .. 2**31-1 */
193	if (ob1->nrof > 0x7fffffff - ob2->nrof)	287	if (ob1->nrof > 0x7fffffff - ob2->nrof)
…		…
197	* This is to the comparison of the flags below will be OK. We	291	* This is to the comparison of the flags below will be OK. We
198	* just can't ignore the been applied or identified flags, as they	292	* just can't ignore the been applied or identified flags, as they
199	* are not equal - just if it has been identified, the been_applied	293	* are not equal - just if it has been identified, the been_applied
200	* flags lose any meaning.	294	* flags lose any meaning.
201	*/	295	*/
202	if (QUERY_FLAG (ob1, FLAG_IDENTIFIED))	296	if (ob1->flag [FLAG_IDENTIFIED])
203	SET_FLAG (ob1, FLAG_BEEN_APPLIED);	297	ob1->set_flag (FLAG_BEEN_APPLIED);
204		298
205	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))	299	if (ob2->flag [FLAG_IDENTIFIED])
206	SET_FLAG (ob2, FLAG_BEEN_APPLIED);	300	ob2->set_flag (FLAG_BEEN_APPLIED);
207		301
208	if (ob1->arch->archname != ob2->arch->archname	302	if (ob1->arch->archname != ob2->arch->archname
209	|| ob1->name != ob2->name	303	|| ob1->name != ob2->name
210	|| ob1->title != ob2->title	304	|| ob1->title != ob2->title
211	|| ob1->msg != ob2->msg	305	|| ob1->msg != ob2->msg
…		…
214	|| ob1->magic != ob2->magic	308	|| ob1->magic != ob2->magic
215	|| ob1->slaying != ob2->slaying	309	|| ob1->slaying != ob2->slaying
216	|| ob1->skill != ob2->skill	310	|| ob1->skill != ob2->skill
217	|| ob1->value != ob2->value	311	|| ob1->value != ob2->value
218	|| ob1->animation_id != ob2->animation_id	312	|| ob1->animation_id != ob2->animation_id
219	|| (ob1->face != ob2->face && !ob1->animation_id) // face and animation are dependent on each other	313	|| (ob1->face != ob2->face && !ob1->animation_id) // face and animation are dependend on each other
220	|| ob1->client_type != ob2->client_type	314	|| ob1->client_type != ob2->client_type
221	|| ob1->materialname != ob2->materialname	315	|| ob1->material != ob2->material
222	|| ob1->lore != ob2->lore	316	|| ob1->lore != ob2->lore
223	|| ob1->subtype != ob2->subtype	317	|| ob1->subtype != ob2->subtype
224	|| ob1->move_type != ob2->move_type	318	|| ob1->move_type != ob2->move_type
225	|| ob1->move_block != ob2->move_block	319	|| ob1->move_block != ob2->move_block
226	|| ob1->move_allow != ob2->move_allow	320	|| ob1->move_allow != ob2->move_allow
227	|| ob1->move_on != ob2->move_on	321	|| ob1->move_on != ob2->move_on
228	|| ob1->move_off != ob2->move_off	322	|| ob1->move_off != ob2->move_off
229	|| ob1->move_slow != ob2->move_slow	323	|| ob1->move_slow != ob2->move_slow
230	|| ob1->move_slow_penalty != ob2->move_slow_penalty	324	|| fabs (ob1->move_slow_penalty - ob2->move_slow_penalty) >= (1.f / 1024.f)
231	|| memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))	325	|| memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
232	|| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats)))	326	|| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats)))
233	return 0;	327	return 0;
234		328
235	if ((ob1->flag ^ ob2->flag)	329	if ((ob1->flag ^ ob2->flag)
236	.reset (FLAG_INV_LOCKED)	330	.reset (FLAG_INV_LOCKED)
237	.reset (FLAG_CLIENT_SENT)
238	.reset (FLAG_REMOVED)	331	.reset (FLAG_REMOVED)
239	.any ())	332	.any ())
240	return 0;	333	return 0;
241		334
242	/* This is really a spellbook check - we should in general	335	/* This is really a spellbook check - we should in general
…		…
261		354
262	/* Don't merge objects that are applied. With the new 'body' code,	355	/* Don't merge objects that are applied. With the new 'body' code,
263	* it is possible for most any character to have more than one of	356	* it is possible for most any character to have more than one of
264	* some items equipped, and we don't want those to merge.	357	* some items equipped, and we don't want those to merge.
265	*/	358	*/
266	if (QUERY_FLAG (ob1, FLAG_APPLIED) || QUERY_FLAG (ob2, FLAG_APPLIED))	359	if (ob1->flag [FLAG_APPLIED] || ob2->flag [FLAG_APPLIED])
267	return 0;	360	return 0;
268		361
269	/* Note sure why the following is the case - either the object has to	362	/* Note sure why the following is the case - either the object has to
270	* be animated or have a very low speed. Is this an attempted monster	363	* be animated or have a very low speed. Is this an attempted monster
271	* check?	364	* check?
272	*/	365	*/
273	if (!QUERY_FLAG (ob1, FLAG_ANIMATE) && ob1->has_active_speed ())	366	if (!ob1->flag [FLAG_ANIMATE] && ob1->has_active_speed ())
274	return 0;	367	return 0;
275		368
276	switch (ob1->type)	369	switch (ob1->type)
277	{	370	{
278	case SCROLL:	371	case SCROLL:
…		…
324	{	417	{
325	// see if we are in a container of sorts	418	// see if we are in a container of sorts
326	if (env)	419	if (env)
327	{	420	{
328	// the player inventory itself is always visible	421	// the player inventory itself is always visible
329	if (env->type == PLAYER)	422	if (env->is_player ())
330	return env;	423	return env;
331		424
332	// else a player could have our env open	425	// else a player could have our env open
333	object *envest = env->outer_env ();	426	object *envest = env->outer_env_or_self ();
334		427
335	// the player itself is always on a map, so we will find him here	428	// the player itself is always on a map, so we will find him here
336	// even if our inv is in a player.	429	// even if our inv is in a player.
337	if (envest->is_on_map ())	430	if (envest->is_on_map ())
338	if (object *pl = envest->ms ().player ())	431	if (object *pl = envest->ms ().player ())
339	if (pl->container == env)	432	if (pl->container_ () == env)
340	return pl;	433	return pl;
341	}	434	}
342	else	435	else
343	{	436	{
344	// maybe there is a player standing on the same mapspace	437	// maybe there is a player standing on the same mapspace
345	// this will catch the case where "this" is a player	438	// this will catch the case where "this" is a player
346	if (object *pl = ms ().player ())	439	if (object *pl = ms ().player ())
347	if ((!pl->container && pl->contr->ns && !pl->contr->ns->update_look)	440	if ((pl->contr->ns && !pl->container_ () && !pl->contr->ns->update_look)
348	|| this == pl->container)	441	|| pl->container_ () == this)
349	return pl;	442	return pl;
350	}	443	}
351	}	444	}
352		445
353	return 0;	446	return 0;
354	}	447	}
355		448
356	// adjust weight per container type ("of holding")	449	// adjust weight per container type ("of holding")
357	static sint32	450	static uint32
358	weight_adjust_for (object *op, sint32 weight)	451	weight_adjust_for (object *op, uint32 weight)
359	{	452	{
360	return op->type == CONTAINER	453	return op->type == CONTAINER
361	? lerp (weight, 0, 100, 0, 100 - op->stats.Str)	454	? weight - weight * op->stats.Str / 100
362	: weight;	455	: weight;
363	}	456	}
364		457
365	/*	458	/*
366	* adjust_weight(object, weight) adds the specified weight to an object,	459	* subtracts, then adds, the specified weight to an object,
367	* and also updates how much the environment(s) is/are carrying.	460	* and also updates how much the environment(s) is/are carrying.
368	*/	461	*/
369	static void	462	static void
370	adjust_weight (object *op, sint32 weight)	463	adjust_weight (object *op, sint32 sub, sint32 add)
371	{	464	{
372	while (op)	465	while (op)
373	{	466	{
374	// adjust by actual difference to account for rounding errors	467	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		468
379	if (!weight)	469	op->carrying -= weight_adjust_for (op, sub);
380	return;	470	op->carrying += weight_adjust_for (op, add);
381
382	op->carrying += weight;
383		471
384	if (object *pl = op->visible_to ())	472	if (object *pl = op->visible_to ())
385	if (pl != op) // player is handled lazily	473	if (pl != op) // player is handled lazily
386	esrv_update_item (UPD_WEIGHT, pl, op);	474	esrv_update_item (UPD_WEIGHT, pl, op);
387		475
		476	sub = ocarrying;
		477	add = op->carrying;
		478
388	op = op->env;	479	op = op->env;
389	}	480	}
390	}	481	}
391		482
392	/*	483	/*
…		…
399	{	490	{
400	sint32 sum = 0;	491	sint32 sum = 0;
401		492
402	for (object *op = inv; op; op = op->below)	493	for (object *op = inv; op; op = op->below)
403	{	494	{
404	if (op->inv)
405	op->update_weight ();	495	op->update_weight ();
406		496
407	sum += op->total_weight ();	497	sum += weight_adjust_for (this, op->total_weight ());
408	}	498	}
409
410	sum = weight_adjust_for (this, sum);
411		499
412	if (sum != carrying)	500	if (sum != carrying)
413	{	501	{
		502	if (carrying != sum && carrying)//D
		503	LOG (llevDebug, "updating carrying got %ld, expected %ld (%s)\n",
		504	(long long)sum, (long long)carrying, debug_desc ());
		505
414	carrying = sum;	506	carrying = sum;
415		507
416	if (object *pl = visible_to ())	508	if (object *pl = visible_to ())
417	if (pl != this) // player is handled lazily	509	if (pl != this) // player is handled lazily
418	esrv_update_item (UPD_WEIGHT, pl, this);	510	esrv_update_item (UPD_WEIGHT, pl, this);
…		…
431	object_freezer freezer;	523	object_freezer freezer;
432	op->write (freezer);	524	op->write (freezer);
433	return freezer.as_string ();	525	return freezer.as_string ();
434	}	526	}
435		527
436	/*	528	char *
437	* get_nearest_part(multi-object, object 2) returns the part of the	529	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	{	530	{
444	object *tmp, *closest;	531	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	}	532	}
458		533
459	/*	534	/*
460	* Returns the object which has the count-variable equal to the argument.	535	* Returns the object which has the count-variable equal to the argument.
461	* VERRRY slow.	536	* VERRRY slow.
…		…
463	object *	538	object *
464	find_object (tag_t i)	539	find_object (tag_t i)
465	{	540	{
466	for_all_objects (op)	541	for_all_objects (op)
467	if (op->count == i)	542	if (op->count == i)
		543	return op;
		544
		545	return 0;
		546	}
		547
		548	/*
		549	* Returns the object which has the uuid equal to the argument.
		550	* MOAR VERRRY slow.
		551	*/
		552
		553	object *
		554	find_object_uuid (UUID i)
		555	{
		556	for_all_objects (op)
		557	if (op->uuid == i)
468	return op;	558	return op;
469		559
470	return 0;	560	return 0;
471	}	561	}
472		562
…		…
506	LOG (llevError | logBacktrace, "tried to set owner of %s to %s\n", debug_desc (), owner->debug_desc ());	596	LOG (llevError | logBacktrace, "tried to set owner of %s to %s\n", debug_desc (), owner->debug_desc ());
507	return;	597	return;
508	}	598	}
509		599
510	this->owner = owner;	600	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	}	601	}
578		602
579	/* Zero the key_values on op, decrementing the shared-string	603	/* Zero the key_values on op, decrementing the shared-string
580	* refcounts and freeing the links.	604	* refcounts and freeing the links.
581	*/	605	*/
…		…
634	tail = new_link;	658	tail = new_link;
635	}	659	}
636	}	660	}
637	}	661	}
638		662
639	if (speed < 0)	663	dst->activate ();
640	dst->speed_left -= rndm ();
641
642	dst->set_speed (dst->speed);
643	}	664	}
644		665
645	void	666	void
646	object::instantiate ()	667	object::instantiate ()
647	{	668	{
648	if (!uuid.seq) // HACK	669	if (!uuid.seq) // HACK
649	uuid = UUID::gen ();	670	uuid = UUID::gen ();
650		671
		672	// TODO: unclean state changes, should nt be done in copy_to AND instantiate
		673	if (flag [FLAG_RANDOM_SPEED] && speed)
		674	speed_left = - speed - rndm (); // TODO animation
		675	else
651	speed_left = -0.1f;	676	speed_left = -1.;
		677
652	/* copy the body_info to the body_used - this is only really	678	/* copy the body_info to the body_used - this is only really
653	* need for monsters, but doesn't hurt to do it for everything.	679	* need for monsters, but doesn't hurt to do it for everything.
654	* by doing so, when a monster is created, it has good starting	680	* by doing so, when a monster is created, it has good starting
655	* values for the body_used info, so when items are created	681	* values for the body_used info, so when items are created
656	* for it, they can be properly equipped.	682	* for it, they can be properly equipped.
…		…
664	object *	690	object *
665	object::clone ()	691	object::clone ()
666	{	692	{
667	object *neu = create ();	693	object *neu = create ();
668	copy_to (neu);	694	copy_to (neu);
		695
		696	// TODO: unclean state changes, should not be done in clone AND instantiate
		697	if (neu->flag [FLAG_RANDOM_SPEED] && neu->speed)
		698	neu->speed_left = - neu->speed - rndm (); // TODO animation
		699
669	neu->map = map; // not copied by copy_to	700	neu->map = map; // not copied by copy_to
670	return neu;	701	return neu;
671	}	702	}
672		703
673	/*	704	/*
…		…
676	* be called to update the face variable, _and_ how it looks on the map.	707	* be called to update the face variable, _and_ how it looks on the map.
677	*/	708	*/
678	void	709	void
679	update_turn_face (object *op)	710	update_turn_face (object *op)
680	{	711	{
681	if (!QUERY_FLAG (op, FLAG_IS_TURNABLE) || !op->arch)	712	if (!op->flag [FLAG_IS_TURNABLE] || !op->arch)
682	return;	713	return;
683		714
684	SET_ANIMATION (op, op->direction);	715	SET_ANIMATION (op, op->direction);
685	update_object (op, UP_OBJ_FACE);	716	update_object (op, UP_OBJ_FACE);
686	}	717	}
…		…
691	* This function needs to be called whenever the speed of an object changes.	722	* This function needs to be called whenever the speed of an object changes.
692	*/	723	*/
693	void	724	void
694	object::set_speed (float speed)	725	object::set_speed (float speed)
695	{	726	{
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;	727	this->speed = speed;
703		728
704	if (has_active_speed ())	729	if (has_active_speed ())
705	activate ();	730	activate ();
706	else	731	else
…		…
756		781
757	if (!(m.flags_ & P_UPTODATE))	782	if (!(m.flags_ & P_UPTODATE))
758	/* nop */;	783	/* nop */;
759	else if (action == UP_OBJ_INSERT)	784	else if (action == UP_OBJ_INSERT)
760	{	785	{
		786	#if 0
761	// this is likely overkill, TODO: revisit (schmorp)	787	// this is likely overkill, TODO: revisit (schmorp)
762	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))	788	if ((op->flag [FLAG_BLOCKSVIEW] && !(m.flags_ & P_BLOCKSVIEW))
763	|| (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))	789	|| (op->flag [FLAG_NO_MAGIC] && !(m.flags_ & P_NO_MAGIC))
764	|| (op->type == PLAYER && !(m.flags_ & P_PLAYER))	790	|| (op->is_player () && !(m.flags_ & P_PLAYER))
765	|| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))	791	|| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
766	|| (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))	792	|| (op->flag [FLAG_ALIVE] && !(m.flags_ & P_IS_ALIVE))
767	|| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))	793	|| (op->flag [FLAG_DAMNED] && !(m.flags_ & P_NO_CLERIC))
768	|| (m.move_on | op->move_on ) != m.move_on	794	|| (m.move_on | op->move_on ) != m.move_on
769	|| (m.move_off | op->move_off ) != m.move_off	795	|| (m.move_off | op->move_off ) != m.move_off
770	|| (m.move_slow | op->move_slow) != m.move_slow	796	|| (m.move_slow | op->move_slow) != m.move_slow
771	/* This isn't perfect, but I don't expect a lot of objects to	797	/* This isn't perfect, but I don't expect a lot of objects to
772	* have move_allow right now.	798	* have move_allow right now.
773	*/	799	*/
774	|| ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block	800	|| ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block
		801	m.invalidate ();
		802	#else
775	|| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)	803	// the above is not strong enough a test to skip updating. los maybe? TODO (schmorp)
776	m.flags_ = 0;	804	m.invalidate ();
		805	#endif
777	}	806	}
778	/* if the object is being removed, we can't make intelligent	807	/* if the object is being removed, we can't make intelligent
779	* decisions, because remove_ob can't really pass the object	808	* decisions, because remove_ob can't really pass the object
780	* that is being removed.	809	* that is being removed.
781	*/	810	*/
782	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)	811	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
783	m.flags_ = 0;	812	m.invalidate ();
784	else if (action == UP_OBJ_FACE)	813	else if (action == UP_OBJ_FACE)
785	/* Nothing to do for that case */ ;	814	/* Nothing to do for that case */ ;
786	else	815	else
787	LOG (llevError, "update_object called with invalid action: %d\n", action);	816	LOG (llevError, "update_object called with invalid action: %d\n", action);
788		817
…		…
790	update_object (op->more, action);	819	update_object (op->more, action);
791	}	820	}
792		821
793	object::object ()	822	object::object ()
794	{	823	{
795	SET_FLAG (this, FLAG_REMOVED);	824	this->set_flag (FLAG_REMOVED);
796		825
797	expmul = 1.0;	826	//expmul = 1.0; declared const for the time being
798	face = blank_face;	827	face = blank_face;
		828	material = MATERIAL_NULL;
799	}	829	}
800		830
801	object::~object ()	831	object::~object ()
802	{	832	{
803	unlink ();	833	unlink ();
804		834
805	free_key_values (this);	835	free_key_values (this);
806	}	836	}
807
808	static int object_count;
809		837
810	void object::link ()	838	void object::link ()
811	{	839	{
812	assert (!index);//D	840	assert (!index);//D
813	uuid = UUID::gen ();	841	uuid = UUID::gen ();
814	count = ++object_count;
815		842
816	refcnt_inc ();	843	refcnt_inc ();
817	objects.insert (this);	844	objects.insert (this);
		845
		846	++create_count;
		847
818	}	848	}
819		849
820	void object::unlink ()	850	void object::unlink ()
821	{	851	{
822	if (!index)	852	if (!index)
823	return;	853	return;
		854
		855	++destroy_count;
824		856
825	objects.erase (this);	857	objects.erase (this);
826	refcnt_dec ();	858	refcnt_dec ();
827	}	859	}
828		860
…		…
832	/* If already on active list, don't do anything */	864	/* If already on active list, don't do anything */
833	if (active)	865	if (active)
834	return;	866	return;
835		867
836	if (has_active_speed ())	868	if (has_active_speed ())
		869	{
		870	if (flag [FLAG_FREED])
		871	LOG (llevError | logBacktrace, "BUG: tried to activate freed object %s\n", debug_desc ());//D
		872
837	actives.insert (this);	873	actives.insert (this);
		874	}
838	}	875	}
839		876
840	void	877	void
841	object::activate_recursive ()	878	object::activate_recursive ()
842	{	879	{
…		…
907	|| map->in_memory != MAP_ACTIVE	944	|| map->in_memory != MAP_ACTIVE
908	|| map->no_drop	945	|| map->no_drop
909	|| ms ().move_block == MOVE_ALL)	946	|| ms ().move_block == MOVE_ALL)
910	{	947	{
911	while (inv)	948	while (inv)
912	inv->destroy (true);	949	inv->destroy ();
913	}	950	}
914	else	951	else
915	{ /* Put objects in inventory onto this space */	952	{ /* Put objects in inventory onto this space */
916	while (inv)	953	while (inv)
917	{	954	{
…		…
921	|| op->flag [FLAG_NO_DROP]	958	|| op->flag [FLAG_NO_DROP]
922	|| op->type == RUNE	959	|| op->type == RUNE
923	|| op->type == TRAP	960	|| op->type == TRAP
924	|| op->flag [FLAG_IS_A_TEMPLATE]	961	|| op->flag [FLAG_IS_A_TEMPLATE]
925	|| op->flag [FLAG_DESTROY_ON_DEATH])	962	|| op->flag [FLAG_DESTROY_ON_DEATH])
926	op->destroy (true);	963	op->destroy ();
927	else	964	else
928	map->insert (op, x, y);	965	map->insert (op, x, y);
929	}	966	}
930	}	967	}
931	}	968	}
932		969
		970	/*
		971	* Remove and free all objects in the inventory of the given object.
		972	* Unlike destroy_inv, this assumes the *this is destroyed as well
		973	* well, so we can (and have to!) take shortcuts.
		974	*/
		975	void
		976	object::destroy_inv_fast ()
		977	{
		978	while (object *op = inv)
		979	{
		980	// remove from object the fast way
		981	op->flag [FLAG_REMOVED] = true;
		982	op->env = 0;
		983	if ((inv = inv->below))
		984	inv->above = 0;
		985
		986	// then destroy
		987	op->destroy ();
		988	}
		989	}
		990
		991	void
		992	object::freelist_free (int count)
		993	{
		994	while (count-- && freelist)
		995	{
		996	freelist_item *next = freelist->next;
		997	// count is being "destroyed"
		998
		999	sfree ((char *)freelist, sizeof (object));
		1000
		1001	freelist = next;
		1002	--free_count;
		1003	}
		1004	}
		1005
		1006	object *
933	object *object::create ()	1007	object::create ()
934	{	1008	{
935	object *op = new object;	1009	object *op;
		1010
		1011	if (freelist)
		1012	{
		1013	freelist_item li = *freelist;
		1014	memset (freelist, 0, sizeof (object));
		1015
		1016	op = new (freelist) object;
		1017	op->count = li.count;
		1018
		1019	freelist = li.next;
		1020	--free_count;
		1021	}
		1022	else
		1023	{
		1024	void *ni = salloc0<char> (sizeof (object));
		1025
		1026	op = new(ni) object;
		1027
		1028	op->count = ++object_count;
		1029	}
		1030
936	op->link ();	1031	op->link ();
		1032
937	return op;	1033	return op;
938	}	1034	}
939		1035
		1036	void
		1037	object::do_delete ()
		1038	{
		1039	uint32_t count = this->count;
		1040
		1041	this->~object ();
		1042
		1043	freelist_item *li = (freelist_item *)this;
		1044	li->next = freelist;
		1045	li->count = count;
		1046
		1047	freelist = li;
		1048	++free_count;
		1049	}
		1050
940	static struct freed_map : maptile	1051	static struct freed_map : maptile
941	{	1052	{
942	freed_map ()	1053	freed_map ()
		1054	: maptile (3, 3)
943	{	1055	{
944	path = "<freed objects map>";	1056	path = "<freed objects map>";
945	name = "/internal/freed_objects_map";	1057	name = "/internal/freed_objects_map";
946	width = 3;
947	height = 3;
948	no_drop = 1;	1058	no_drop = 1;
949	no_reset = 1;	1059	no_reset = 1;
950		1060
951	alloc ();
952	in_memory = MAP_ACTIVE;	1061	in_memory = MAP_ACTIVE;
953	}	1062	}
954		1063
955	~freed_map ()	1064	~freed_map ()
956	{	1065	{
…		…
960		1069
961	void	1070	void
962	object::do_destroy ()	1071	object::do_destroy ()
963	{	1072	{
964	if (flag [FLAG_IS_LINKED])	1073	if (flag [FLAG_IS_LINKED])
965	remove_button_link (this);	1074	remove_link ();
966		1075
967	if (flag [FLAG_FRIENDLY])	1076	if (flag [FLAG_FRIENDLY])
968	remove_friendly_object (this);	1077	remove_friendly_object (this);
969		1078
970	remove ();	1079	remove ();
…		…
995	attacked_by = 0;	1104	attacked_by = 0;
996	current_weapon = 0;	1105	current_weapon = 0;
997	}	1106	}
998		1107
999	void	1108	void
1000	object::destroy (bool destroy_inventory)	1109	object::destroy ()
1001	{	1110	{
1002	if (destroyed ())	1111	if (destroyed ())
1003	return;	1112	return;
1004		1113
1005	if (!is_head () && !head->destroyed ())	1114	if (!is_head () && !head->destroyed ())
1006	{	1115	{
1007	LOG (llevError | logBacktrace, "tried to destroy the tail of an object");	1116	LOG (llevError | logBacktrace, "tried to destroy the tail of an object");
1008	head->destroy (destroy_inventory);	1117	head->destroy ();
1009	return;	1118	return;
1010	}	1119	}
1011		1120
1012	destroy_inv (!destroy_inventory);	1121	destroy_inv_fast ();
1013		1122
1014	if (is_head ())	1123	if (is_head ())
1015	if (sound_destroy)	1124	if (sound_destroy)
1016	play_sound (sound_destroy);	1125	play_sound (sound_destroy);
1017	else if (flag [FLAG_MONSTER])	1126	else if (flag [FLAG_MONSTER])
…		…
1028	* the previous environment.	1137	* the previous environment.
1029	*/	1138	*/
1030	void	1139	void
1031	object::do_remove ()	1140	object::do_remove ()
1032	{	1141	{
1033	object *tmp, *last = 0;
1034	object *otmp;
1035
1036	if (flag [FLAG_REMOVED])	1142	if (flag [FLAG_REMOVED])
1037	return;	1143	return;
1038		1144
1039	INVOKE_OBJECT (REMOVE, this);	1145	INVOKE_OBJECT (REMOVE, this);
1040		1146
…		…
1052	flag [FLAG_REMOVED] = false; // hack around the issue of visible_to checking flag_removed	1158	flag [FLAG_REMOVED] = false; // hack around the issue of visible_to checking flag_removed
1053	if (object *pl = visible_to ())	1159	if (object *pl = visible_to ())
1054	esrv_del_item (pl->contr, count);	1160	esrv_del_item (pl->contr, count);
1055	flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed	1161	flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed
1056		1162
1057	adjust_weight (env, -total_weight ());	1163	adjust_weight (env, total_weight (), 0);
		1164
		1165	object *pl = in_player ();
1058		1166
1059	/* we set up values so that it could be inserted into	1167	/* we set up values so that it could be inserted into
1060	* the map, but we don't actually do that - it is up	1168	* the map, but we don't actually do that - it is up
1061	* to the caller to decide what we want to do.	1169	* to the caller to decide what we want to do.
1062	*/	1170	*/
…		…
1070		1178
1071	above = 0;	1179	above = 0;
1072	below = 0;	1180	below = 0;
1073	env = 0;	1181	env = 0;
1074		1182
1075	/* NO_FIX_PLAYER is set when a great many changes are being	1183	if (pl && pl->is_player ())
1076	* made to players inventory. If set, avoiding the call
1077	* to save cpu time.
1078	*/	1184	{
1079	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1185	if (expect_false (pl->contr->combat_ob == this))
1080	otmp->update_stats ();	1186	{
		1187	pl->apply (pl->contr->combat_ob, AP_UNAPPLY | AP_IGNORE_CURSE);
		1188	pl->contr->combat_ob = 0;
		1189	if (pl->contr->ranged_ob) pl->apply (pl->contr->ranged_ob);
		1190	}
		1191
		1192	if (expect_false (pl->contr->ranged_ob == this))
		1193	{
		1194	pl->apply (pl->contr->ranged_ob, AP_UNAPPLY | AP_IGNORE_CURSE);
		1195	pl->contr->ranged_ob = 0;
		1196	if (pl->contr->combat_ob) pl->apply (pl->contr->combat_ob);
		1197	}
		1198
		1199	pl->contr->queue_stats_update ();
		1200
		1201	if (expect_false (glow_radius) && pl->is_on_map ())
		1202	update_all_los (pl->map, pl->x, pl->y);
		1203	}
1081	}	1204	}
1082	else if (map)	1205	else if (map)
1083	{	1206	{
1084	map->dirty = true;	1207	map->dirty = true;
1085	mapspace &ms = this->ms ();	1208	mapspace &ms = this->ms ();
1086		1209
1087	if (object *pl = ms.player ())	1210	if (object *pl = ms.player ())
1088	{	1211	{
1089	if (type == PLAYER) // this == pl(!)	1212	if (is_player ())
1090	{	1213	{
		1214	if (!flag [FLAG_WIZPASS])
		1215	ms.smell = ++mapspace::smellcount; // remember the smell of the player
		1216
1091	// leaving a spot always closes any open container on the ground	1217	// leaving a spot always closes any open container on the ground
1092	if (container && !container->env)	1218	if (container && !container->env)
1093	// this causes spurious floorbox updates, but it ensures	1219	// this causes spurious floorbox updates, but it ensures
1094	// that the CLOSE event is being sent.	1220	// that the CLOSE event is being sent.
1095	close_container ();	1221	close_container ();
1096		1222
1097	--map->players;	1223	--map->players;
1098	map->touch ();	1224	map->touch ();
1099	}	1225	}
1100	else if (pl->container == this)	1226	else if (pl->container_ () == this)
1101	{	1227	{
1102	// removing a container should close it	1228	// removing a container should close it
1103	close_container ();	1229	close_container ();
1104	}	1230	}
1105		1231	else
1106	esrv_del_item (pl->contr, count);	1232	esrv_del_item (pl->contr, count);
1107	}	1233	}
1108		1234
1109	/* link the object above us */	1235	/* link the object above us */
1110	// re-link, make sure compiler can easily use cmove	1236	// re-link, make sure compiler can easily use cmove
1111	*(above ? &above->below : &ms.top) = below;	1237	*(above ? &above->below : &ms.top) = below;
1112	*(below ? &below->above : &ms.bot) = above;	1238	*(below ? &below->above : &ms.bot) = above;
1113		1239
1114	above = 0;	1240	above = 0;
1115	below = 0;	1241	below = 0;
1116		1242
1117	ms.flags_ = 0;	1243	ms.invalidate ();
1118		1244
1119	if (map->in_memory == MAP_SAVING)	1245	if (map->in_memory == MAP_SAVING)
1120	return;	1246	return;
1121		1247
1122	int check_walk_off = !flag [FLAG_NO_APPLY];	1248	int check_walk_off = !flag [FLAG_NO_APPLY];
1123		1249
1124	if (object *pl = ms.player ())	1250	if (object *pl = ms.player ())
1125	{	1251	{
1126	if (pl->container == this)	1252	if (pl->container_ () == this)
1127	/* If a container that the player is currently using somehow gets	1253	/* If a container that the player is currently using somehow gets
1128	* removed (most likely destroyed), update the player view	1254	* removed (most likely destroyed), update the player view
1129	* appropriately.	1255	* appropriately.
1130	*/	1256	*/
1131	pl->close_container ();	1257	pl->close_container ();
…		…
1135	//TODO: update floorbox to preserve ordering	1261	//TODO: update floorbox to preserve ordering
1136	if (pl->contr->ns)	1262	if (pl->contr->ns)
1137	pl->contr->ns->floorbox_update ();	1263	pl->contr->ns->floorbox_update ();
1138	}	1264	}
1139		1265
		1266	if (check_walk_off)
1140	for (tmp = ms.bot; tmp; tmp = tmp->above)	1267	for (object *above, *tmp = ms.bot; tmp; tmp = above)
1141	{	1268	{
		1269	above = tmp->above;
		1270
1142	/* No point updating the players look faces if he is the object	1271	/* No point updating the players look faces if he is the object
1143	* being removed.	1272	* being removed.
1144	*/	1273	*/
1145		1274
1146	/* See if object moving off should effect something */	1275	/* See if object moving off should effect something */
1147	if (check_walk_off
1148	&& ((move_type & tmp->move_off)	1276	if ((move_type & tmp->move_off)
1149	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))	1277	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0)
1150	{
1151	move_apply (tmp, this, 0);	1278	move_apply (tmp, this, 0);
1152
1153	if (destroyed ())
1154	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1155	}	1279	}
1156		1280
1157	last = tmp;	1281	if (affects_los ())
1158	}
1159
1160	if (flag [FLAG_BLOCKSVIEW] || glow_radius)
1161	update_all_los (map, x, y);	1282	update_all_los (map, x, y);
1162	}	1283	}
1163	}	1284	}
1164		1285
1165	/*	1286	/*
…		…
1189	esrv_update_item (UPD_NROF, pl, top);	1310	esrv_update_item (UPD_NROF, pl, top);
1190		1311
1191	op->weight = 0; // cancel the addition above	1312	op->weight = 0; // cancel the addition above
1192	op->carrying = 0; // must be 0 already	1313	op->carrying = 0; // must be 0 already
1193		1314
1194	op->destroy (1);	1315	op->destroy ();
1195		1316
1196	return top;	1317	return top;
1197	}	1318	}
1198		1319
1199	return 0;	1320	return 0;
…		…
1207		1328
1208	object *prev = this;	1329	object *prev = this;
1209		1330
1210	for (archetype *at = (archetype *)arch->more; at; at = (archetype *)at->more)	1331	for (archetype *at = (archetype *)arch->more; at; at = (archetype *)at->more)
1211	{	1332	{
1212	object *op = arch_to_object (at);	1333	object *op = at->instance ();
1213		1334
1214	op->name = name;	1335	op->name = name;
1215	op->name_pl = name_pl;	1336	op->name_pl = name_pl;
1216	op->title = title;	1337	op->title = title;
1217		1338
…		…
1255	* Passing 0 for flag gives proper default values, so flag really only needs	1376	* Passing 0 for flag gives proper default values, so flag really only needs
1256	* to be set if special handling is needed.	1377	* to be set if special handling is needed.
1257	*	1378	*
1258	* Return value:	1379	* Return value:
1259	* new object if 'op' was merged with other object	1380	* new object if 'op' was merged with other object
1260	* NULL if 'op' was destroyed	1381	* NULL if there was an error (destroyed, blocked etc.)
1261	* just 'op' otherwise	1382	* just 'op' otherwise
1262	*/	1383	*/
1263	object *	1384	object *
1264	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)	1385	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1265	{	1386	{
1266	if (op->is_on_map ())
1267	{
1268	LOG (llevError, "insert_ob_in_map called for object already on map");
1269	abort ();
1270	}
1271
1272	if (op->env)
1273	{
1274	LOG (llevError, "insert_ob_in_map called for object in an inventory (proceeding)");
1275	op->remove ();	1387	op->remove ();
1276	}
1277		1388
1278	if (op->face && !face_info (op->face))//D TODO: remove soon	1389	if (m == &freed_map)//D TODO: remove soon
1279	{//D	1390	{//D
1280	LOG (llevError | logBacktrace, "op->face out of bounds: %s", op->debug_desc ());//D	1391	LOG (llevError | logBacktrace, "tries to insret object on freed objects map: %s", op->debug_desc ());//D
1281	op->face = 1;//D
1282	}//D	1392	}//D
1283		1393
1284	/* Ideally, the caller figures this out. However, it complicates a lot	1394	/* Ideally, the caller figures this out. However, it complicates a lot
1285	* of areas of callers (eg, anything that uses find_free_spot would now	1395	* of areas of callers (eg, anything that uses find_free_spot would now
1286	* need extra work	1396	* need extra work
1287	*/	1397	*/
		1398	maptile *newmap = m;
1288	if (!xy_normalise (m, op->x, op->y))	1399	if (!xy_normalise (newmap, op->x, op->y))
1289	{	1400	{
1290	op->head_ ()->destroy (1);// remove head_ once all tail object destroyers found	1401	op->head_ ()->destroy ();// remove head_ once all tail object destroyers found
1291	return 0;	1402	return 0;
1292	}	1403	}
1293		1404
1294	if (object *more = op->more)	1405	if (object *more = op->more)
1295	if (!insert_ob_in_map (more, m, originator, flag))	1406	if (!insert_ob_in_map (more, m, originator, flag))
1296	return 0;	1407	return 0;
1297		1408
1298	CLEAR_FLAG (op, FLAG_REMOVED);	1409	op->flag [FLAG_REMOVED] = false;
1299		1410	op->env = 0;
1300	op->map = m;	1411	op->map = newmap;
		1412
1301	mapspace &ms = op->ms ();	1413	mapspace &ms = op->ms ();
1302		1414
1303	/* this has to be done after we translate the coordinates.	1415	/* this has to be done after we translate the coordinates.
1304	*/	1416	*/
1305	if (op->nrof && !(flag & INS_NO_MERGE))	1417	if (op->nrof && !(flag & INS_NO_MERGE))
…		…
1308	{	1420	{
1309	// TODO: we actually want to update tmp, not op,	1421	// TODO: we actually want to update tmp, not op,
1310	// but some caller surely breaks when we return tmp	1422	// but some caller surely breaks when we return tmp
1311	// from here :/	1423	// from here :/
1312	op->nrof += tmp->nrof;	1424	op->nrof += tmp->nrof;
1313	tmp->destroy (1);	1425	tmp->destroy ();
1314	}	1426	}
1315		1427
1316	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1428	op->clr_flag (FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1317	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1429	op->clr_flag (FLAG_INV_LOCKED);
1318		1430
1319	if (!QUERY_FLAG (op, FLAG_ALIVE))	1431	if (!op->flag [FLAG_ALIVE])
1320	CLEAR_FLAG (op, FLAG_NO_STEAL);	1432	op->clr_flag (FLAG_NO_STEAL);
1321		1433
1322	if (flag & INS_BELOW_ORIGINATOR)	1434	if (flag & INS_BELOW_ORIGINATOR)
1323	{	1435	{
1324	if (originator->map != op->map || originator->x != op->x || originator->y != op->y)	1436	if (originator->map != op->map || originator->x != op->x || originator->y != op->y)
1325	{	1437	{
1326	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");	1438	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");
1327	abort ();	1439	abort ();
1328	}	1440	}
1329		1441
1330	if (!originator->is_on_map ())	1442	if (!originator->is_on_map ())
		1443	{
1331	LOG (llevDebug | logBacktrace, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map",	1444	LOG (llevError, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map",
1332	op->debug_desc (), originator->debug_desc ());	1445	op->debug_desc (), originator->debug_desc ());
		1446	abort ();
		1447	}
1333		1448
1334	op->above = originator;	1449	op->above = originator;
1335	op->below = originator->below;	1450	op->below = originator->below;
1336	originator->below = op;	1451	originator->below = op;
1337		1452
…		…
1357	* when lots of spells are cast in one area. Currently, it is presumed	1472	* when lots of spells are cast in one area. Currently, it is presumed
1358	* that flying non pickable objects are spell objects.	1473	* that flying non pickable objects are spell objects.
1359	*/	1474	*/
1360	for (object *tmp = ms.bot; tmp; tmp = tmp->above)	1475	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1361	{	1476	{
1362	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) || QUERY_FLAG (tmp, FLAG_OVERLAY_FLOOR))	1477	if (tmp->flag [FLAG_IS_FLOOR] || tmp->flag [FLAG_OVERLAY_FLOOR])
1363	floor = tmp;	1478	floor = tmp;
1364		1479
1365	if (QUERY_FLAG (tmp, FLAG_NO_PICK) && (tmp->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (tmp, FLAG_IS_FLOOR))	1480	if (tmp->flag [FLAG_NO_PICK] && (tmp->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !tmp->flag [FLAG_IS_FLOOR])
1366	{	1481	{
1367	/* We insert above top, so we want this object below this */	1482	/* We insert above top, so we want this object below this */
1368	top = tmp->below;	1483	top = tmp->below;
1369	break;	1484	break;
1370	}	1485	}
…		…
1388	&& (op->face && !faces [op->face].visibility))	1503	&& (op->face && !faces [op->face].visibility))
1389	{	1504	{
1390	object *last;	1505	object *last;
1391		1506
1392	for (last = top; last != floor; last = last->below)	1507	for (last = top; last != floor; last = last->below)
1393	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1508	if (last->flag [FLAG_BLOCKSVIEW] && (last->type != EXIT))
1394	break;	1509	break;
1395		1510
1396	/* Check to see if we found the object that blocks view,	1511	/* Check to see if we found the object that blocks view,
1397	* and make sure we have a below pointer for it so that	1512	* and make sure we have a below pointer for it so that
1398	* we can get inserted below this one, which requires we	1513	* we can get inserted below this one, which requires we
…		…
1423	op->below = top;	1538	op->below = top;
1424	*(op->above ? &op->above->below : &ms.top) = op;	1539	*(op->above ? &op->above->below : &ms.top) = op;
1425	}	1540	}
1426	}	1541	}
1427		1542
1428	if (op->type == PLAYER)	1543	if (op->is_player ())
1429	{	1544	{
1430	op->contr->do_los = 1;	1545	op->contr->do_los = 1;
1431	++op->map->players;	1546	++op->map->players;
1432	op->map->touch ();	1547	op->map->touch ();
1433	}	1548	}
…		…
1448	* be far away from this change and not affected in any way -	1563	* be far away from this change and not affected in any way -
1449	* this should get redone to only look for players within range,	1564	* this should get redone to only look for players within range,
1450	* or just updating the P_UPTODATE for spaces within this area	1565	* or just updating the P_UPTODATE for spaces within this area
1451	* of effect may be sufficient.	1566	* of effect may be sufficient.
1452	*/	1567	*/
1453	if (op->map->darkness && (op->glow_radius != 0))	1568	if (op->affects_los ())
		1569	{
		1570	op->ms ().invalidate ();
1454	update_all_los (op->map, op->x, op->y);	1571	update_all_los (op->map, op->x, op->y);
		1572	}
1455		1573
1456	/* updates flags (blocked, alive, no magic, etc) for this map space */	1574	/* updates flags (blocked, alive, no magic, etc) for this map space */
1457	update_object (op, UP_OBJ_INSERT);	1575	update_object (op, UP_OBJ_INSERT);
1458		1576
1459	INVOKE_OBJECT (INSERT, op);	1577	INVOKE_OBJECT (INSERT, op);
…		…
1466	* blocked() and wall() work properly), and these flags are updated by	1584	* blocked() and wall() work properly), and these flags are updated by
1467	* update_object().	1585	* update_object().
1468	*/	1586	*/
1469		1587
1470	/* if this is not the head or flag has been passed, don't check walk on status */	1588	/* if this is not the head or flag has been passed, don't check walk on status */
1471	if (!(flag & INS_NO_WALK_ON) && op->head_ () == op)	1589	if (!(flag & INS_NO_WALK_ON) && op->is_head ())
1472	{	1590	{
1473	if (check_move_on (op, originator))	1591	if (check_move_on (op, originator, flag))
1474	return 0;	1592	return 0;
1475		1593
1476	/* If we are a multi part object, lets work our way through the check	1594	/* If we are a multi part object, let's work our way through the check
1477	* walk on's.	1595	* walk on's.
1478	*/	1596	*/
1479	for (object *tmp = op->more; tmp; tmp = tmp->more)	1597	for (object *tmp = op->more; tmp; tmp = tmp->more)
1480	if (check_move_on (tmp, originator))	1598	if (check_move_on (tmp, originator, flag))
1481	return 0;	1599	return 0;
1482	}	1600	}
1483		1601
1484	return op;	1602	return op;
1485	}	1603	}
…		…
1487	/* this function inserts an object in the map, but if it	1605	/* this function inserts an object in the map, but if it
1488	* finds an object of its own type, it'll remove that one first.	1606	* finds an object of its own type, it'll remove that one first.
1489	* op is the object to insert it under: supplies x and the map.	1607	* op is the object to insert it under: supplies x and the map.
1490	*/	1608	*/
1491	void	1609	void
1492	replace_insert_ob_in_map (const char *arch_string, object *op)	1610	replace_insert_ob_in_map (shstr_tmp archname, object *op)
1493	{	1611	{
1494	/* first search for itself and remove any old instances */	1612	/* first search for itself and remove any old instances */
1495		1613
1496	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)	1614	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1497	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */	1615	if (tmp->arch->archname == archname) /* same archetype */
1498	tmp->destroy (1);	1616	tmp->destroy ();
1499		1617
1500	object *tmp = arch_to_object (archetype::find (arch_string));	1618	object *tmp = archetype::find (archname)->instance ();
1501		1619
1502	tmp->x = op->x;	1620	tmp->x = op->x;
1503	tmp->y = op->y;	1621	tmp->y = op->y;
1504		1622
1505	insert_ob_in_map (tmp, op->map, op, 0);	1623	insert_ob_in_map (tmp, op->map, op, 0);
…		…
1510	{	1628	{
1511	if (where->env)	1629	if (where->env)
1512	return where->env->insert (this);	1630	return where->env->insert (this);
1513	else	1631	else
1514	return where->map->insert (this, where->x, where->y, originator, flags);	1632	return where->map->insert (this, where->x, where->y, originator, flags);
		1633	}
		1634
		1635	// check whether we can put this into the map, respect max_volume, max_items
		1636	bool
		1637	object::can_drop_at (maptile *m, int x, int y, object *originator)
		1638	{
		1639	mapspace &ms = m->at (x, y);
		1640
		1641	int items = ms.items ();
		1642
		1643	if (!items // testing !items ensures we can drop at least one item
		1644	|| (items < m->max_items
		1645	&& ms.volume () < m->max_volume))
		1646	return true;
		1647
		1648	if (originator && originator->is_player ())
		1649	originator->contr->failmsgf (
		1650	"No matter how hard you try, you just cannot put the %s here H<Try to remove some items from the floor first.>",
		1651	query_name ()
		1652	);
		1653
		1654	return false;
1515	}	1655	}
1516		1656
1517	/*	1657	/*
1518	* decrease(object, number) decreases a specified number from	1658	* decrease(object, number) decreases a specified number from
1519	* the amount of an object. If the amount reaches 0, the object	1659	* the amount of an object. If the amount reaches 0, the object
…		…
1529		1669
1530	nr = min (nr, nrof);	1670	nr = min (nr, nrof);
1531		1671
1532	if (nrof > nr)	1672	if (nrof > nr)
1533	{	1673	{
		1674	sint64 oweight = total_weight ();
		1675
1534	nrof -= nr;	1676	nrof -= nr;
1535	adjust_weight (env, -weight * max (1, nr)); // carrying == 0
1536		1677
1537	if (object *pl = visible_to ())	1678	if (object *pl = visible_to ())
1538	esrv_update_item (UPD_NROF, pl, this);	1679	esrv_update_item (UPD_NROF, pl, this);
		1680
		1681	adjust_weight (env, oweight, total_weight ());
1539		1682
1540	return true;	1683	return true;
1541	}	1684	}
1542	else	1685	else
1543	{	1686	{
…		…
1618	if (op->nrof)	1761	if (op->nrof)
1619	for (object *tmp = inv; tmp; tmp = tmp->below)	1762	for (object *tmp = inv; tmp; tmp = tmp->below)
1620	if (object::can_merge (tmp, op))	1763	if (object::can_merge (tmp, op))
1621	{	1764	{
1622	/* return the original object and remove inserted object	1765	/* return the original object and remove inserted object
1623	(client needs the original object) */	1766	(client prefers the original object) */
		1767
		1768	// carring must be 0 for mergable objects
		1769	sint64 oweight = tmp->weight * tmp->nrof;
		1770
1624	tmp->nrof += op->nrof;	1771	tmp->nrof += op->nrof;
1625		1772
1626	if (object *pl = tmp->visible_to ())	1773	if (object *pl = tmp->visible_to ())
1627	esrv_update_item (UPD_NROF, pl, tmp);	1774	esrv_update_item (UPD_NROF, pl, tmp);
1628		1775
1629	adjust_weight (this, op->total_weight ());	1776	adjust_weight (this, oweight, tmp->weight * tmp->nrof);
1630		1777
1631	op->destroy (1);	1778	op->destroy ();
1632	op = tmp;	1779	op = tmp;
1633	goto inserted;	1780	goto inserted;
1634	}	1781	}
1635		1782
1636	op->owner = 0; // it's his/hers now. period.	1783	op->owner = 0; // it's his/hers now. period.
…		…
1650	op->flag [FLAG_REMOVED] = 0;	1797	op->flag [FLAG_REMOVED] = 0;
1651		1798
1652	if (object *pl = op->visible_to ())	1799	if (object *pl = op->visible_to ())
1653	esrv_send_item (pl, op);	1800	esrv_send_item (pl, op);
1654		1801
1655	adjust_weight (this, op->total_weight ());	1802	adjust_weight (this, 0, op->total_weight ());
1656		1803
1657	inserted:	1804	inserted:
1658	/* reset the light list and los of the players on the map */	1805	/* reset the light list and los of the players on the map */
1659	if (op->glow_radius && map && map->darkness)	1806	if (op->glow_radius && is_on_map ())
		1807	{
		1808	update_stats ();
1660	update_all_los (map, x, y);	1809	update_all_los (map, x, y);
1661		1810	}
		1811	else if (is_player ())
1662	// if this is a player's inventory, update stats	1812	// if this is a player's inventory, update stats
1663	if (type == PLAYER && !flag [FLAG_NO_FIX_PLAYER])	1813	contr->queue_stats_update ();
1664	update_stats ();
1665		1814
1666	INVOKE_OBJECT (INSERT, this);	1815	INVOKE_OBJECT (INSERT, this);
1667		1816
1668	return op;	1817	return op;
1669	}	1818	}
…		…
1687	* MSW 2001-07-08: Check all objects on space, not just those below	1836	* MSW 2001-07-08: Check all objects on space, not just those below
1688	* object being inserted. insert_ob_in_map may not put new objects	1837	* object being inserted. insert_ob_in_map may not put new objects
1689	* on top.	1838	* on top.
1690	*/	1839	*/
1691	int	1840	int
1692	check_move_on (object *op, object *originator)	1841	check_move_on (object *op, object *originator, int flags)
1693	{	1842	{
		1843	if (op->flag [FLAG_NO_APPLY])
		1844	return 0;
		1845
1694	object *tmp;	1846	object *tmp;
1695	maptile *m = op->map;	1847	maptile *m = op->map;
1696	int x = op->x, y = op->y;	1848	int x = op->x, y = op->y;
1697		1849
1698	MoveType move_on, move_slow, move_block;	1850	mapspace &ms = m->at (x, y);
1699		1851
1700	if (QUERY_FLAG (op, FLAG_NO_APPLY))	1852	ms.update ();
1701	return 0;
1702		1853
1703	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);	1854	MoveType move_on = ms.move_on;
1704	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);	1855	MoveType move_slow = ms.move_slow;
1705	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);	1856	MoveType move_block = ms.move_block;
1706		1857
1707	/* if nothing on this space will slow op down or be applied,	1858	/* if nothing on this space will slow op down or be applied,
1708	* no need to do checking below. have to make sure move_type	1859	* no need to do checking below. have to make sure move_type
1709	* is set, as lots of objects don't have it set - we treat that	1860	* is set, as lots of objects don't have it set - we treat that
1710	* as walking.	1861	* as walking.
…		…
1721	return 0;	1872	return 0;
1722		1873
1723	/* The objects have to be checked from top to bottom.	1874	/* The objects have to be checked from top to bottom.
1724	* Hence, we first go to the top:	1875	* Hence, we first go to the top:
1725	*/	1876	*/
1726		1877	for (object *next, *tmp = ms.top; tmp; tmp = next)
1727	for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above)
1728	{
1729	/* Trim the search when we find the first other spell effect
1730	* this helps performance so that if a space has 50 spell objects,
1731	* we don't need to check all of them.
1732	*/
1733	if ((tmp->move_type & MOVE_FLY_LOW) && QUERY_FLAG (tmp, FLAG_NO_PICK))
1734	break;
1735	}	1878	{
		1879	next = tmp->below;
1736		1880
1737	for (; tmp; tmp = tmp->below)
1738	{
1739	if (tmp == op)	1881	if (tmp == op)
1740	continue; /* Can't apply yourself */	1882	continue; /* Can't apply yourself */
1741		1883
1742	/* Check to see if one of the movement types should be slowed down.	1884	/* Check to see if one of the movement types should be slowed down.
1743	* Second check makes sure that the movement types not being slowed	1885	* Second check makes sure that the movement types not being slowed
1744	* (~slow_move) is not blocked on this space - just because the	1886	* (~slow_move) is not blocked on this space - just because the
1745	* space doesn't slow down swimming (for example), if you can't actually	1887	* space doesn't slow down swimming (for example), if you can't actually
1746	* swim on that space, can't use it to avoid the penalty.	1888	* swim on that space, can't use it to avoid the penalty.
1747	*/	1889	*/
1748	if (!QUERY_FLAG (op, FLAG_WIZPASS))	1890	if (!op->flag [FLAG_WIZPASS])
1749	{	1891	{
1750	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||	1892	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
1751	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))	1893	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1752	{	1894	{
1753
1754	float
1755	diff = tmp->move_slow_penalty * fabs (op->speed);	1895	float diff = tmp->move_slow_penalty * fabs (op->speed);
1756		1896
1757	if (op->type == PLAYER)	1897	if (op->is_player ())
1758	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||	1898	if ((tmp->flag [FLAG_IS_HILLY ] && find_skill_by_number (op, SK_CLIMBING)) ||
1759	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))	1899	(tmp->flag [FLAG_IS_WOODED] && find_skill_by_number (op, SK_WOODSMAN)))
1760	diff /= 4.0;	1900	diff /= 4.0;
1761		1901
1762	op->speed_left -= diff;	1902	op->speed_left -= diff;
1763	}	1903	}
1764	}	1904	}
1765		1905
1766	/* Basically same logic as above, except now for actual apply. */	1906	/* Basically same logic as above, except now for actual apply. */
1767	if ((!op->move_type && tmp->move_on & MOVE_WALK) ||	1907	if ((!op->move_type && tmp->move_on & MOVE_WALK) ||
1768	((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))	1908	((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))
1769	{	1909	{
		1910	if ((flags & INS_NO_AUTO_EXIT)
		1911	&& (tmp->type == EXIT || tmp->type == TELEPORTER
		1912	|| tmp->type == HOLE || tmp->type == TRAPDOOR)) //TODO: temporary, fix exits instead
		1913	continue;
		1914
1770	move_apply (tmp, op, originator);	1915	move_apply (tmp, op, originator);
1771		1916
1772	if (op->destroyed ())	1917	if (op->destroyed ())
1773	return 1;	1918	return 1;
1774		1919
…		…
1886	void	2031	void
1887	flag_inv (object *op, int flag)	2032	flag_inv (object *op, int flag)
1888	{	2033	{
1889	for (object *tmp = op->inv; tmp; tmp = tmp->below)	2034	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1890	{	2035	{
1891	SET_FLAG (tmp, flag);	2036	tmp->set_flag (flag);
1892	flag_inv (tmp, flag);	2037	flag_inv (tmp, flag);
1893	}	2038	}
1894	}	2039	}
1895		2040
1896	/*	2041	/*
…		…
1899	void	2044	void
1900	unflag_inv (object *op, int flag)	2045	unflag_inv (object *op, int flag)
1901	{	2046	{
1902	for (object *tmp = op->inv; tmp; tmp = tmp->below)	2047	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1903	{	2048	{
1904	CLEAR_FLAG (tmp, flag);	2049	tmp->clr_flag (flag);
1905	unflag_inv (tmp, flag);	2050	unflag_inv (tmp, flag);
1906	}	2051	}
1907	}	2052	}
1908		2053
1909	/*	2054	/*
…		…
1970	* head of the object should correspond for the entire object.	2115	* head of the object should correspond for the entire object.
1971	*/	2116	*/
1972	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))	2117	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
1973	continue;	2118	continue;
1974		2119
1975	if (ob->blocked (m, pos.x, pos.y))	2120	if (ob->blocked (pos.m, pos.x, pos.y))
1976	continue;	2121	continue;
1977		2122
1978	altern [index++] = i;	2123	altern [index++] = i;
1979	}	2124	}
1980		2125
…		…
2048	* there is capable of.	2193	* there is capable of.
2049	*/	2194	*/
2050	int	2195	int
2051	find_dir (maptile *m, int x, int y, object *exclude)	2196	find_dir (maptile *m, int x, int y, object *exclude)
2052	{	2197	{
2053	int i, max = SIZEOFFREE, mflags;	2198	int max = SIZEOFFREE, mflags;
2054
2055	sint16 nx, ny;
2056	object *tmp;
2057	maptile *mp;
2058
2059	MoveType blocked, move_type;	2199	MoveType move_type;
2060		2200
2061	if (exclude && exclude->head_ () != exclude)	2201	if (exclude && exclude->head_ () != exclude)
2062	{	2202	{
2063	exclude = exclude->head;	2203	exclude = exclude->head;
2064	move_type = exclude->move_type;	2204	move_type = exclude->move_type;
…		…
2067	{	2207	{
2068	/* If we don't have anything, presume it can use all movement types. */	2208	/* If we don't have anything, presume it can use all movement types. */
2069	move_type = MOVE_ALL;	2209	move_type = MOVE_ALL;
2070	}	2210	}
2071		2211
2072	for (i = 1; i < max; i++)	2212	for (int i = 1; i < max; i++)
2073	{	2213	{
2074	mp = m;	2214	mapxy pos (m, x, y);
2075	nx = x + freearr_x[i];	2215	pos.move (i);
2076	ny = y + freearr_y[i];
2077		2216
2078	mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);	2217	if (!pos.normalise ())
2079
2080	if (mflags & P_OUT_OF_MAP)
2081	max = maxfree[i];	2218	max = maxfree[i];
2082	else	2219	else
2083	{	2220	{
2084	mapspace &ms = mp->at (nx, ny);	2221	mapspace &ms = *pos;
2085		2222
2086	blocked = ms.move_block;
2087
2088	if ((move_type & blocked) == move_type)	2223	if ((move_type & ms.move_block) == move_type)
2089	max = maxfree[i];	2224	max = maxfree [i];
2090	else if (mflags & P_IS_ALIVE)	2225	else if (ms.flags () & P_IS_ALIVE)
2091	{	2226	{
2092	for (tmp = ms.bot; tmp; tmp = tmp->above)	2227	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
2093	if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)	2228	if ((tmp->flag [FLAG_MONSTER] || tmp->is_player ())
2094	&& (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))	2229	&& (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2095	break;
2096
2097	if (tmp)
2098	return freedir[i];	2230	return freedir [i];
2099	}	2231	}
2100	}	2232	}
2101	}	2233	}
2102		2234
2103	return 0;	2235	return 0;
…		…
2112	{	2244	{
2113	return (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);	2245	return (ob1->x - ob2->x) * (ob1->x - ob2->x) + (ob1->y - ob2->y) * (ob1->y - ob2->y);
2114	}	2246	}
2115		2247
2116	/*	2248	/*
2117	* find_dir_2(delta-x,delta-y) will return a direction in which	2249	* find_dir_2(delta-x,delta-y) will return a direction value
2118	* an object which has subtracted the x and y coordinates of another	2250	* for running into direct [dx, dy].
2119	* object, needs to travel toward it.	2251	* (the opposite of crossfire's find_dir_2!)
2120	*/	2252	*/
2121	int	2253	int
2122	find_dir_2 (int x, int y)	2254	find_dir_2 (int x, int y)
2123	{	2255	{
		2256	#if 1 // new algorithm
		2257	// this works by putting x, y into 16 sectors, which
		2258	// are not equal sized, but are a better approximation
		2259	// then the old algorithm, and then using a mapping
		2260	// table to map it into a direction value.
		2261	// basically, it maps these comparisons to each bit
		2262	// bit #3: x < 0
		2263	// bit #2: y < 0
		2264	// bit #1: x > y
		2265	// bit #0: x > 2y
		2266
		2267	static const uint8 dir[16] = {
		2268	4, 5, 4, 3,
		2269	2, 1, 2, 3,
		2270	6, 5, 6, 7,
		2271	8, 1, 8, 7,
		2272	};
		2273	int sector = 0;
		2274
		2275	// this is a bit ugly, but more likely to result in branchless code
		2276	sector |= x < 0 ? 8 : 0;
		2277	x = x < 0 ? -x : x; // abs
		2278
		2279	sector |= y < 0 ? 4 : 0;
		2280	y = y < 0 ? -y : y; // abs
		2281
		2282	if (x > y)
		2283	{
		2284	sector |= 2;
		2285
		2286	if (x > y * 2)
		2287	sector |= 1;
		2288	}
		2289	else
		2290	{
		2291	if (y > x * 2)
		2292	sector |= 1;
		2293	else if (!y)
		2294	return 0; // x == 0 here
		2295	}
		2296
		2297	return dir [sector];
		2298	#else // old algorithm
2124	int q;	2299	int q;
2125		2300
2126	if (y)	2301	if (y)
2127	q = x * 100 / y;	2302	q = 128 * x / y;
2128	else if (x)	2303	else if (x)
2129	q = -300 * x;	2304	q = -512 * x; // to make it > 309
2130	else	2305	else
2131	return 0;	2306	return 0;
2132		2307
2133	if (y > 0)	2308	if (y > 0)
2134	{	2309	{
2135	if (q < -242)	2310	if (q < -309) return 7;
		2311	if (q < -52) return 6;
		2312	if (q < 52) return 5;
		2313	if (q < 309) return 4;
		2314
2136	return 3;	2315	return 3;
2137	if (q < -41)	2316	}
2138	return 2;	2317	else
2139	if (q < 41)	2318	{
2140	return 1;	2319	if (q < -309) return 3;
2141	if (q < 242)	2320	if (q < -52) return 2;
2142	return 8;	2321	if (q < 52) return 1;
		2322	if (q < 309) return 8;
		2323
2143	return 7;	2324	return 7;
2144	}	2325	}
2145		2326	#endif
2146	if (q < -242)
2147	return 7;
2148	if (q < -41)
2149	return 6;
2150	if (q < 41)
2151	return 5;
2152	if (q < 242)
2153	return 4;
2154
2155	return 3;
2156	}	2327	}
2157		2328
2158	/*	2329	/*
2159	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is	2330	* dirdiff(dir1, dir2) returns how many 45-degrees differences there is
2160	* between two directions (which are expected to be absolute (see absdir())	2331	* between two directions (which are expected to be absolute (see absdir())
2161	*/	2332	*/
2162	int	2333	int
2163	dirdiff (int dir1, int dir2)	2334	dirdiff (int dir1, int dir2)
2164	{	2335	{
2165	int d;
2166
2167	d = abs (dir1 - dir2);	2336	int d = abs (dir1 - dir2);
2168	if (d > 4)
2169	d = 8 - d;
2170		2337
2171	return d;	2338	return d > 4 ? 8 - d : d;
2172	}	2339	}
2173		2340
2174	/* peterm:	2341	/* peterm:
2175	* do LOS stuff for ball lightning. Go after the closest VISIBLE monster.	2342	* do LOS stuff for ball lightning. Go after the closest VISIBLE monster.
2176	* Basically, this is a table of directions, and what directions	2343	* Basically, this is a table of directions, and what directions
…		…
2178	* This basically means that if direction is 15, then it could either go	2345	* This basically means that if direction is 15, then it could either go
2179	* direction 4, 14, or 16 to get back to where we are.	2346	* direction 4, 14, or 16 to get back to where we are.
2180	* Moved from spell_util.c to object.c with the other related direction	2347	* Moved from spell_util.c to object.c with the other related direction
2181	* functions.	2348	* functions.
2182	*/	2349	*/
2183	int reduction_dir[SIZEOFFREE][3] = {	2350	static const int reduction_dir[SIZEOFFREE][3] = {
2184	{0, 0, 0}, /* 0 */	2351	{0, 0, 0}, /* 0 */
2185	{0, 0, 0}, /* 1 */	2352	{0, 0, 0}, /* 1 */
2186	{0, 0, 0}, /* 2 */	2353	{0, 0, 0}, /* 2 */
2187	{0, 0, 0}, /* 3 */	2354	{0, 0, 0}, /* 3 */
2188	{0, 0, 0}, /* 4 */	2355	{0, 0, 0}, /* 4 */
…		…
2282	* Add a check so we can't pick up invisible objects (0.93.8)	2449	* Add a check so we can't pick up invisible objects (0.93.8)
2283	*/	2450	*/
2284	int	2451	int
2285	can_pick (const object *who, const object *item)	2452	can_pick (const object *who, const object *item)
2286	{	2453	{
2287	return /*QUERY_FLAG(who,FLAG_WIZ)|| */	2454	return /*who->flag [FLAG_WIZ]|| */
2288	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&	2455	(item->weight > 0 && !item->flag [FLAG_NO_PICK] &&
2289	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3));	2456	!item->flag [FLAG_ALIVE] && !item->invisible && (who->is_player () || item->weight < who->weight / 3));
2290	}	2457	}
2291		2458
2292	/*	2459	/*
2293	* create clone from object to another	2460	* create clone from object to another
2294	*/	2461	*/
…		…
2326	return tmp;	2493	return tmp;
2327		2494
2328	return 0;	2495	return 0;
2329	}	2496	}
2330		2497
2331	const shstr &	2498	shstr_tmp
2332	object::kv_get (const shstr &key) const	2499	object::kv_get (shstr_tmp key) const
2333	{	2500	{
2334	for (key_value *kv = key_values; kv; kv = kv->next)	2501	for (key_value *kv = key_values; kv; kv = kv->next)
2335	if (kv->key == key)	2502	if (kv->key == key)
2336	return kv->value;	2503	return kv->value;
2337		2504
2338	return shstr_null;	2505	return shstr ();
2339	}	2506	}
2340		2507
2341	void	2508	void
2342	object::kv_set (const shstr &key, const shstr &value)	2509	object::kv_set (shstr_tmp key, shstr_tmp value)
2343	{	2510	{
2344	for (key_value *kv = key_values; kv; kv = kv->next)	2511	for (key_value *kv = key_values; kv; kv = kv->next)
2345	if (kv->key == key)	2512	if (kv->key == key)
2346	{	2513	{
2347	kv->value = value;	2514	kv->value = value;
…		…
2356		2523
2357	key_values = kv;	2524	key_values = kv;
2358	}	2525	}
2359		2526
2360	void	2527	void
2361	object::kv_del (const shstr &key)	2528	object::kv_del (shstr_tmp key)
2362	{	2529	{
2363	for (key_value **kvp = &key_values; *kvp; kvp = &(*kvp)->next)	2530	for (key_value **kvp = &key_values; *kvp; kvp = &(*kvp)->next)
2364	if ((*kvp)->key == key)	2531	if ((*kvp)->key == key)
2365	{	2532	{
2366	key_value *kv = *kvp;	2533	key_value *kv = *kvp;
…		…
2459	{	2626	{
2460	return map ? map->region (x, y)	2627	return map ? map->region (x, y)
2461	: region::default_region ();	2628	: region::default_region ();
2462	}	2629	}
2463		2630
2464	const materialtype_t *
2465	object::dominant_material () const
2466	{
2467	if (materialtype_t *mt = name_to_material (materialname))
2468	return mt;
2469
2470	return name_to_material (shstr_unknown);
2471	}
2472
2473	void	2631	void
2474	object::open_container (object *new_container)	2632	object::open_container (object *new_container)
2475	{	2633	{
2476	if (container == new_container)	2634	if (container == new_container)
2477	return;	2635	return;
…		…
2497	container = 0;	2655	container = 0;
2498		2656
2499	// client needs item update to make it work, client bug requires this to be separate	2657	// client needs item update to make it work, client bug requires this to be separate
2500	esrv_update_item (UPD_FLAGS, this, old_container);	2658	esrv_update_item (UPD_FLAGS, this, old_container);
2501		2659
2502	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));	2660	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", old_container->query_name ());
2503	play_sound (sound_find ("chest_close"));	2661	play_sound (sound_find ("chest_close"));
2504	}	2662	}
2505		2663
2506	if (new_container)	2664	if (new_container)
2507	{	2665	{
…		…
2511	// TODO: this does not seem to serve any purpose anymore?	2669	// TODO: this does not seem to serve any purpose anymore?
2512	#if 0	2670	#if 0
2513	// insert the "Close Container" object.	2671	// insert the "Close Container" object.
2514	if (archetype *closer = new_container->other_arch)	2672	if (archetype *closer = new_container->other_arch)
2515	{	2673	{
2516	object *closer = arch_to_object (new_container->other_arch);	2674	object *closer = new_container->other_arch->instance ();
2517	closer->flag [FLAG_NO_MAP_SAVE] = 1;	2675	closer->flag [FLAG_NO_MAP_SAVE] = 1;
2518	new_container->insert (closer);	2676	new_container->insert (closer);
2519	}	2677	}
2520	#endif	2678	#endif
2521		2679
2522	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));	2680	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", new_container->query_name ());
2523		2681
2524	// make sure the container is available, client bug requires this to be separate	2682	// make sure the container is available, client bug requires this to be separate
2525	esrv_send_item (this, new_container);	2683	esrv_send_item (this, new_container);
2526		2684
2527	new_container->flag [FLAG_APPLIED] = true;	2685	new_container->flag [FLAG_APPLIED] = true;
…		…
2535	// else if (!old_container->env && contr && contr->ns)	2693	// else if (!old_container->env && contr && contr->ns)
2536	// contr->ns->floorbox_reset ();	2694	// contr->ns->floorbox_reset ();
2537	}	2695	}
2538		2696
2539	object *	2697	object *
2540	object::force_find (const shstr name)	2698	object::force_find (shstr_tmp name)
2541	{	2699	{
2542	/* cycle through his inventory to look for the MARK we want to	2700	/* cycle through his inventory to look for the MARK we want to
2543	* place	2701	* place
2544	*/	2702	*/
2545	for (object *tmp = inv; tmp; tmp = tmp->below)	2703	for (object *tmp = inv; tmp; tmp = tmp->below)
…		…
2547	return splay (tmp);	2705	return splay (tmp);
2548		2706
2549	return 0;	2707	return 0;
2550	}	2708	}
2551		2709
		2710	//-GPL
		2711
2552	void	2712	void
		2713	object::force_set_timer (int duration)
		2714	{
		2715	this->duration = 1;
		2716	this->speed_left = -1.f;
		2717
		2718	this->set_speed (duration ? 1.f / duration : 0.f);
		2719	}
		2720
		2721	object *
2553	object::force_add (const shstr name, int duration)	2722	object::force_add (shstr_tmp name, int duration)
2554	{	2723	{
2555	if (object *force = force_find (name))	2724	if (object *force = force_find (name))
2556	force->destroy ();	2725	force->destroy ();
2557		2726
2558	object *force = get_archetype (FORCE_NAME);	2727	object *force = get_archetype (FORCE_NAME);
2559		2728
2560	force->slaying = name;	2729	force->slaying = name;
2561	force->stats.food = 1;	2730	force->force_set_timer (duration);
2562	force->speed_left = -1.f;
2563
2564	force->set_speed (duration ? 1.f / duration : 0.f);
2565	force->flag [FLAG_IS_USED_UP] = true;
2566	force->flag [FLAG_APPLIED] = true;	2731	force->flag [FLAG_APPLIED] = true;
2567		2732
2568	insert (force);	2733	return insert (force);
2569	}	2734	}
2570		2735
2571	void	2736	void
2572	object::play_sound (faceidx sound)	2737	object::play_sound (faceidx sound) const
2573	{	2738	{
2574	if (!sound)	2739	if (!sound)
2575	return;	2740	return;
2576		2741
2577	if (flag [FLAG_REMOVED])	2742	if (is_on_map ())
		2743	map->play_sound (sound, x, y);
		2744	else if (object *pl = in_player ())
		2745	pl->contr->play_sound (sound);
		2746	}
		2747
		2748	void
		2749	object::say_msg (const char *msg) const
		2750	{
		2751	if (is_on_map ())
		2752	map->say_msg (msg, x, y);
		2753	else if (object *pl = in_player ())
		2754	pl->contr->play_sound (sound);
		2755	}
		2756
		2757	void
		2758	object::make_noise ()
		2759	{
		2760	// we do not model noise in the map, so instead put
		2761	// a temporary light into the noise source
		2762	// could use the map instead, but that's less reliable for our
		2763	// goal, which is to make invisibility a bit harder to exploit
		2764
		2765	// currently only works sensibly for players
		2766	if (!is_player ())
2578	return;	2767	return;
2579		2768
2580	if (env)	2769	// find old force, or create new one
2581	{	2770	object *force = force_find (shstr_noise_force);
2582	if (object *pl = in_player ())	2771
2583	pl->contr->play_sound (sound);	2772	if (force)
2584	}	2773	force->speed_left = -1.f; // patch old speed up
2585	else	2774	else
2586	map->play_sound (sound, x, y);	2775	{
2587	}	2776	force = archetype::get (shstr_noise_force);
2588		2777
		2778	force->slaying = shstr_noise_force;
		2779	force->stats.food = 1;
		2780	force->speed_left = -1.f;
		2781
		2782	force->set_speed (1.f / 4.f);
		2783	force->flag [FLAG_IS_USED_UP] = true;
		2784	force->flag [FLAG_APPLIED] = true;
		2785
		2786	insert (force);
		2787	}
		2788	}
		2789
		2790	void object::change_move_type (MoveType mt)
		2791	{
		2792	if (move_type == mt)
		2793	return;
		2794
		2795	if (is_on_map ())
		2796	{
		2797	// we are on the map, so handle move_on/off effects
		2798	remove ();
		2799	move_type = mt;
		2800	map->insert (this, x, y, this);
		2801	}
		2802	else
		2803	move_type = mt;
		2804	}
		2805
		2806	/* object should be a player.
		2807	* we return the object the player has marked with the 'mark' command
		2808	* below. If no match is found (or object has changed), we return
		2809	* NULL. We leave it up to the calling function to print messages if
		2810	* nothing is found.
		2811	*/
		2812	object *
		2813	object::mark () const
		2814	{
		2815	if (contr && contr->mark && contr->mark->env == this)
		2816	return contr->mark;
		2817	else
		2818	return 0;
		2819	}
		2820

Diff Legend

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