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.216 by root, Tue Apr 22 23:50:23 2008 UTC vs.
Revision 1.307 by root, Sun Nov 29 10:55:18 2009 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 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5	* Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team	5	* Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team
6	* Copyright (©) 1992,2007 Frank Tore Johansen	6	* Copyright (©) 1992,2007 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>
…		…
32	#include <bitset>	33	#include <bitset>
33		34
34	UUID UUID::cur;	35	UUID UUID::cur;
35	static uint64_t seq_next_save;	36	static uint64_t seq_next_save;
36	static const uint64 UUID_GAP = 1<<19;	37	static const uint64 UUID_GAP = 1<<19;
		38	uint32_t mapspace::smellcount = 10000;
37		39
38	objectvec objects;	40	objectvec objects;
39	activevec actives;	41	activevec actives;
		42
		43	//+GPL
40		44
41	short freearr_x[SIZEOFFREE] = {	45	short freearr_x[SIZEOFFREE] = {
42	0,	46	0,
43	0, 1, 1, 1, 0, -1, -1, -1,	47	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,	48	0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,
…		…
48	0,	52	0,
49	-1, -1, 0, 1, 1, 1, 0, -1,	53	-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,	54	-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	55	-3, -3, -3, -3, -2, -1, 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3
52	};	56	};
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] = {	57	int freedir[SIZEOFFREE] = {
60	0,	58	0,
61	1, 2, 3, 4, 5, 6, 7, 8,	59	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,	60	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	61	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	};	62	};
65		63
		64	static int maxfree[SIZEOFFREE] = {
		65	0,
		66	9, 10, 13, 14, 17, 18, 21, 22,
		67	25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45, 48,
		68	49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49
		69	};
		70
66	static void	71	static void
67	write_uuid (uval64 skip, bool sync)	72	write_uuid (uval64 skip, bool sync)
68	{	73	{
69	CALL_BEGIN (2);	74	CALL_BEGIN (2);
70	CALL_ARG_SV (newSVval64 (skip));	75	CALL_ARG_SV (newSVval64 (skip));
…		…
72	CALL_CALL ("cf::write_uuid", G_DISCARD);	77	CALL_CALL ("cf::write_uuid", G_DISCARD);
73	CALL_END;	78	CALL_END;
74	}	79	}
75		80
76	static void	81	static void
77	read_uuid (void)	82	read_uuid ()
78	{	83	{
79	char filename[MAX_BUF];	84	char filename[MAX_BUF];
80		85
81	sprintf (filename, "%s/uuid", settings.localdir);	86	sprintf (filename, "%s/uuid", settings.localdir);
82		87
…		…
96		101
97	LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);	102	LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);
98	_exit (1);	103	_exit (1);
99	}	104	}
100		105
101	UUID::BUF buf;	106	char buf [UUID::MAX_LEN];
102	buf[0] = 0;	107	buf[0] = 0;
103	fgets (buf, sizeof (buf), fp);	108	fgets (buf, sizeof (buf), fp);
104		109
105	if (!UUID::cur.parse (buf))	110	if (!UUID::cur.parse (buf))
106	{	111	{
…		…
133		138
134	void	139	void
135	UUID::init ()	140	UUID::init ()
136	{	141	{
137	read_uuid ();	142	read_uuid ();
		143	}
		144
		145	bool
		146	UUID::parse (const char *s)
		147	{
		148	if (*s++ != '<' || *s++ != '1' || *s++ != '.')
		149	return false;
		150
		151	seq = 0;
		152
		153	while (*s != '>')
		154	{
		155	if (*s < '0')
		156	return false;
		157
		158	// this gives nice branchless code with gcc
		159	assert ('0' < 'a' && '0' == 48 && 'a' == 97);
		160	int digit = (*s + (*s & 0x40 ? 9 : 0)) & 15;
		161
		162	seq = (seq << 4) | digit;
		163
		164	++s;
		165	}
		166
		167	return true;
		168	}
		169
		170	char *
		171	UUID::append (char *buf) const
		172	{
		173	*buf++ = '<';
		174	*buf++ = '1';
		175	*buf++ = '.';
		176
		177	uint64_t seq = this->seq;
		178	const int bits = 64;
		179	char nz = 0;
		180	static const char tohex [] = "0123456789abcdef";
		181
		182	// assert (len >= 3 + bits / 4 + 1 + 1);
		183	for (int i = bits / 4; --i; )
		184	{
		185	uint8_t digit = seq >> (bits - 4);
		186
		187	*buf = tohex [digit];
		188	nz |= digit;
		189	buf += nz ? 1 : 0;
		190	seq <<= 4;
		191	}
		192
		193	// last digit is special - always emit
		194	uint8_t digit = seq >> (bits - 4);
		195	*buf++ = tohex [digit];
		196
		197	*buf++ = '>';
		198
		199	return buf;
		200	}
		201
		202	char *
		203	UUID::c_str () const
		204	{
		205	static char buf [MAX_LEN];
		206	*append (buf) = 0;
		207	return buf;
138	}	208	}
139		209
140	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */	210	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */
141	static bool	211	static bool
142	compare_ob_value_lists_one (const object *wants, const object *has)	212	compare_ob_value_lists_one (const object *wants, const object *has)
143	{	213	{
144	key_value *wants_field;
145
146	/* n-squared behaviour (see get_ob_key_link()), but I'm hoping both	214	/* n-squared behaviour (see kv_get), but I'm hoping both
147	* objects with lists are rare, and lists stay short. If not, use a	215	* objects with lists are rare, and lists stay short. If not, use a
148	* different structure or at least keep the lists sorted...	216	* different structure or at least keep the lists sorted...
149	*/	217	*/
150		218
151	/* For each field in wants, */	219	/* For each field in wants, */
152	for (wants_field = wants->key_values; wants_field; wants_field = wants_field->next)	220	for (key_value *kv = wants->key_values; kv; kv = kv->next)
153	{	221	if (has->kv_get (kv->key) != kv->value)
154	key_value *has_field;	222	return false;
155
156	/* Look for a field in has with the same key. */
157	has_field = get_ob_key_link (has, wants_field->key);
158
159	if (!has_field)
160	return 0; /* No field with that name. */
161
162	/* Found the matching field. */
163	if (has_field->value != wants_field->value)
164	return 0; /* Values don't match, so this half of the comparison is false. */
165
166	/* If we get here, we found a match. Now for the next field in wants. */
167	}
168		223
169	/* If we get here, every field in wants has a matching field in has. */	224	/* If we get here, every field in wants has a matching field in has. */
170	return 1;	225	return true;
171	}	226	}
172		227
173	/* Returns TRUE if ob1 has the same key_values as ob2. */	228	/* Returns TRUE if ob1 has the same key_values as ob2. */
174	static bool	229	static bool
175	compare_ob_value_lists (const object *ob1, const object *ob2)	230	compare_ob_value_lists (const object *ob1, const object *ob2)
176	{	231	{
177	/* However, there may be fields in has which aren't partnered in wants,	232	/* However, there may be fields in has which aren't partnered in wants,
178	* so we need to run the comparison *twice*. :(	233	* so we need to run the comparison *twice*. :(
179	*/	234	*/
180	return compare_ob_value_lists_one (ob1, ob2) && compare_ob_value_lists_one (ob2, ob1);	235	return compare_ob_value_lists_one (ob1, ob2)
		236	&& compare_ob_value_lists_one (ob2, ob1);
181	}	237	}
182		238
183	/* Function examines the 2 objects given to it, and returns true if	239	/* Function examines the 2 objects given to it, and returns true if
184	* they can be merged together.	240	* they can be merged together.
185	*	241	*
…		…
195	bool object::can_merge_slow (object *ob1, object *ob2)	251	bool object::can_merge_slow (object *ob1, object *ob2)
196	{	252	{
197	/* A couple quicksanity checks */	253	/* A couple quicksanity checks */
198	if (ob1 == ob2	254	if (ob1 == ob2
199	|| ob1->type != ob2->type	255	|| ob1->type != ob2->type
200	|| ob1->speed != ob2->speed	256	|| fabs (ob1->speed - ob2->speed) >= MIN_ACTIVE_SPEED
201	|| ob1->value != ob2->value	257	|| ob1->value != ob2->value
202	|| ob1->name != ob2->name)	258	|| ob1->name != ob2->name)
203	return 0;	259	return 0;
204		260
205	/* Do not merge objects if nrof would overflow. First part checks	261	/* Do not merge objects if nrof would overflow, assume nrof
206	* for unsigned overflow (2c), second part checks whether the result	262	* is always 0 .. 2**31-1 */
207	* would fit into a 32 bit signed int, which is often used to hold	263	if (ob1->nrof > 0x7fffffff - ob2->nrof)
208	* nrof values.
209	*/
210	if (~ob1->nrof < ob2->nrof || ob1->nrof + ob2->nrof > (1UL << 31))
211	return 0;	264	return 0;
212		265
213	/* If the objects have been identified, set the BEEN_APPLIED flag.	266	/* If the objects have been identified, set the BEEN_APPLIED flag.
214	* This is to the comparison of the flags below will be OK. We	267	* This is to the comparison of the flags below will be OK. We
215	* just can't ignore the been applied or identified flags, as they	268	* just can't ignore the been applied or identified flags, as they
…		…
220	SET_FLAG (ob1, FLAG_BEEN_APPLIED);	273	SET_FLAG (ob1, FLAG_BEEN_APPLIED);
221		274
222	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))	275	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))
223	SET_FLAG (ob2, FLAG_BEEN_APPLIED);	276	SET_FLAG (ob2, FLAG_BEEN_APPLIED);
224		277
225	if (ob1->arch->name != ob2->arch->name	278	if (ob1->arch->archname != ob2->arch->archname
226	|| ob1->name != ob2->name	279	|| ob1->name != ob2->name
227	|| ob1->title != ob2->title	280	|| ob1->title != ob2->title
228	|| ob1->msg != ob2->msg	281	|| ob1->msg != ob2->msg
229	|| ob1->weight != ob2->weight	282	|| ob1->weight != ob2->weight
230	|| ob1->attacktype != ob2->attacktype	283	|| ob1->attacktype != ob2->attacktype
231	|| ob1->magic != ob2->magic	284	|| ob1->magic != ob2->magic
232	|| ob1->slaying != ob2->slaying	285	|| ob1->slaying != ob2->slaying
233	|| ob1->skill != ob2->skill	286	|| ob1->skill != ob2->skill
234	|| ob1->value != ob2->value	287	|| ob1->value != ob2->value
235	|| ob1->animation_id != ob2->animation_id	288	|| ob1->animation_id != ob2->animation_id
		289	|| (ob1->face != ob2->face && !ob1->animation_id) // face and animation are dependent on each other
236	|| ob1->client_type != ob2->client_type	290	|| ob1->client_type != ob2->client_type
237	|| ob1->materialname != ob2->materialname	291	|| ob1->material != ob2->material
238	|| ob1->lore != ob2->lore	292	|| ob1->lore != ob2->lore
239	|| ob1->subtype != ob2->subtype	293	|| ob1->subtype != ob2->subtype
240	|| ob1->move_type != ob2->move_type	294	|| ob1->move_type != ob2->move_type
241	|| ob1->move_block != ob2->move_block	295	|| ob1->move_block != ob2->move_block
242	|| ob1->move_allow != ob2->move_allow	296	|| ob1->move_allow != ob2->move_allow
243	|| ob1->move_on != ob2->move_on	297	|| ob1->move_on != ob2->move_on
244	|| ob1->move_off != ob2->move_off	298	|| ob1->move_off != ob2->move_off
245	|| ob1->move_slow != ob2->move_slow	299	|| ob1->move_slow != ob2->move_slow
246	|| ob1->move_slow_penalty != ob2->move_slow_penalty	300	|| fabs (ob1->move_slow_penalty - ob2->move_slow_penalty) >= (1.f / 1024.f)
247	|| memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))	301	|| memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
248	|| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats)))	302	|| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats)))
249	return 0;	303	return 0;
250		304
251	if ((ob1->flag ^ ob2->flag)	305	if ((ob1->flag ^ ob2->flag)
252	.reset (FLAG_INV_LOCKED)	306	.reset (FLAG_INV_LOCKED)
253	.reset (FLAG_CLIENT_SENT)
254	.reset (FLAG_REMOVED)	307	.reset (FLAG_REMOVED)
255	.any ())	308	.any ())
256	return 0;	309	return 0;
257		310
258	/* This is really a spellbook check - we should in general	311	/* This is really a spellbook check - we should in general
…		…
334		387
335	// find player who can see this object	388	// find player who can see this object
336	object *	389	object *
337	object::visible_to () const	390	object::visible_to () const
338	{	391	{
339	if (!flag [FLAG_REMOVED])	392	if (client_visible () && !flag [FLAG_REMOVED])
340	{	393	{
341	// see if we are in a container of sorts	394	// see if we are in a container of sorts
342	if (env)	395	if (env)
343	{	396	{
344	// the player inventory itself is always visible	397	// the player inventory itself is always visible
345	if (env->type == PLAYER)	398	if (env->is_player ())
346	return env;	399	return env;
347		400
348	// else a player could have our env open	401	// else a player could have our env open
349	object *envest = env->outer_env ();	402	object *envest = env->outer_env_or_self ();
350		403
351	// the player itself is always on a map, so we will find him here	404	// the player itself is always on a map, so we will find him here
352	// even if our inv is in a player.	405	// even if our inv is in a player.
353	if (envest->is_on_map ())	406	if (envest->is_on_map ())
354	if (object *pl = envest->ms ().player ())	407	if (object *pl = envest->ms ().player ())
355	if (pl->container == env)	408	if (pl->container_ () == env)
356	return pl;	409	return pl;
357	}	410	}
358	else	411	else
359	{	412	{
360	// maybe there is a player standing on the same mapspace	413	// maybe there is a player standing on the same mapspace
361	// this will catch the case where "this" is a player	414	// this will catch the case where "this" is a player
362	if (object *pl = ms ().player ())	415	if (object *pl = ms ().player ())
		416	if ((pl->contr->ns && !pl->container_ () && !pl->contr->ns->update_look)
		417	|| pl->container_ () == this)
363	return pl;	418	return pl;
364	}	419	}
365	}	420	}
366		421
367	return 0;	422	return 0;
368	}	423	}
369		424
370	// adjust weight per container type ("of holding")	425	// adjust weight per container type ("of holding")
371	static sint32	426	static sint32
372	weight_adjust (object *op, sint32 weight)	427	weight_adjust_for (object *op, sint32 weight)
373	{	428	{
374	return op->type == CONTAINER	429	return op->type == CONTAINER
375	? lerp (weight, 0, 100, 0, 100 - op->stats.Str)	430	? lerp (weight, 0, 100, 0, 100 - op->stats.Str)
376	: weight;	431	: weight;
377	}	432	}
…		…
383	static void	438	static void
384	adjust_weight (object *op, sint32 weight)	439	adjust_weight (object *op, sint32 weight)
385	{	440	{
386	while (op)	441	while (op)
387	{	442	{
		443	// adjust by actual difference to account for rounding errors
		444	// i.e. (w2 - w1) / f != w2 / f - w1 / f and the latter is correct
388	weight = weight_adjust (op, weight);	445	weight = weight_adjust_for (op, op->carrying)
		446	- weight_adjust_for (op, op->carrying - weight);
389		447
390	if (!weight)	448	if (!weight)
391	return;	449	return;
392		450
393	op->carrying += weight;	451	op->carrying += weight;
…		…
416	op->update_weight ();	474	op->update_weight ();
417		475
418	sum += op->total_weight ();	476	sum += op->total_weight ();
419	}	477	}
420		478
421	sum = weight_adjust (this, sum);	479	sum = weight_adjust_for (this, sum);
422		480
423	if (sum != carrying)	481	if (sum != carrying)
424	{	482	{
425	carrying = sum;	483	carrying = sum;
426		484
…		…
442	object_freezer freezer;	500	object_freezer freezer;
443	op->write (freezer);	501	op->write (freezer);
444	return freezer.as_string ();	502	return freezer.as_string ();
445	}	503	}
446		504
447	/*	505	char *
448	* get_nearest_part(multi-object, object 2) returns the part of the	506	object::as_string ()
449	* multi-object 1 which is closest to the second object.
450	* If it's not a multi-object, it is returned.
451	*/
452	object *
453	get_nearest_part (object *op, const object *pl)
454	{	507	{
455	object *tmp, *closest;	508	return dump_object (this);
456	int last_dist, i;
457
458	if (!op->more)
459	return op;
460
461	for (last_dist = distance (op, pl), closest = op, tmp = op->more;
462	tmp;
463	tmp = tmp->more)
464	if ((i = distance (tmp, pl)) < last_dist)
465	closest = tmp, last_dist = i;
466
467	return closest;
468	}	509	}
469		510
470	/*	511	/*
471	* Returns the object which has the count-variable equal to the argument.	512	* Returns the object which has the count-variable equal to the argument.
472	* VERRRY slow.	513	* VERRRY slow.
…		…
488	*/	529	*/
489	object *	530	object *
490	find_object_name (const char *str)	531	find_object_name (const char *str)
491	{	532	{
492	shstr_cmp str_ (str);	533	shstr_cmp str_ (str);
493	object *op;
494		534
		535	if (str_)
495	for_all_objects (op)	536	for_all_objects (op)
496	if (op->name == str_)	537	if (op->name == str_)
497	break;	538	return op;
498		539
499	return op;	540	return 0;
500	}	541	}
501		542
502	/*	543	/*
503	* Sets the owner and sets the skill and exp pointers to owner's current	544	* Sets the owner and sets the skill and exp pointers to owner's current
504	* skill and experience objects.	545	* skill and experience objects.
…		…
566	update_stats ();	607	update_stats ();
567		608
568	new_draw_info_format (NDI_UNIQUE, 0, this,	609	new_draw_info_format (NDI_UNIQUE, 0, this,
569	"You try to balance all your items at once, "	610	"You try to balance all your items at once, "
570	"but the %s is just too much for your body. "	611	"but the %s is just too much for your body. "
571	"[You need to unapply some items first.]", &ob->name);	612	"[You need to unapply some items first - use the 'body' command to see "
		613	"how many items you cna wera on a specific body part.]", &ob->name);
572	return false;	614	return false;
573	}	615	}
574		616
575	//new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);	617	//new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);
576	}	618	}
…		…
602	}	644	}
603		645
604	op->key_values = 0;	646	op->key_values = 0;
605	}	647	}
606		648
607	object &	649	/*
608	object::operator =(const object &src)	650	* copy_to first frees everything allocated by the dst object,
		651	* and then copies the contents of itself into the second
		652	* object, allocating what needs to be allocated. Basically, any
		653	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
		654	* if the first object is freed, the pointers in the new object
		655	* will point at garbage.
		656	*/
		657	void
		658	object::copy_to (object *dst)
609	{	659	{
610	bool is_freed = flag [FLAG_FREED];	660	dst->remove ();
611	bool is_removed = flag [FLAG_REMOVED];
612
613	*(object_copy *)this = src;	661	*(object_copy *)dst = *this;
614
615	flag [FLAG_FREED] = is_freed;
616	flag [FLAG_REMOVED] = is_removed;	662	dst->flag [FLAG_REMOVED] = true;
617		663
618	/* Copy over key_values, if any. */	664	/* Copy over key_values, if any. */
619	if (src.key_values)	665	if (key_values)
620	{	666	{
621	key_value *tail = 0;	667	key_value *tail = 0;
622	key_values = 0;	668	dst->key_values = 0;
623		669
624	for (key_value *i = src.key_values; i; i = i->next)	670	for (key_value *i = key_values; i; i = i->next)
625	{	671	{
626	key_value *new_link = new key_value;	672	key_value *new_link = new key_value;
627		673
628	new_link->next = 0;	674	new_link->next = 0;
629	new_link->key = i->key;	675	new_link->key = i->key;
630	new_link->value = i->value;	676	new_link->value = i->value;
631		677
632	/* Try and be clever here, too. */	678	/* Try and be clever here, too. */
633	if (!key_values)	679	if (!dst->key_values)
634	{	680	{
635	key_values = new_link;	681	dst->key_values = new_link;
636	tail = new_link;	682	tail = new_link;
637	}	683	}
638	else	684	else
639	{	685	{
640	tail->next = new_link;	686	tail->next = new_link;
641	tail = new_link;	687	tail = new_link;
642	}	688	}
643	}	689	}
644	}	690	}
645	}
646		691
647	/*	692	dst->activate ();
648	* copy_to first frees everything allocated by the dst object,
649	* and then copies the contents of itself into the second
650	* object, allocating what needs to be allocated. Basically, any
651	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
652	* if the first object is freed, the pointers in the new object
653	* will point at garbage.
654	*/
655	void
656	object::copy_to (object *dst)
657	{
658	*dst = *this;
659
660	if (speed < 0)
661	dst->speed_left -= rndm ();
662
663	dst->set_speed (dst->speed);
664	}	693	}
665		694
666	void	695	void
667	object::instantiate ()	696	object::instantiate ()
668	{	697	{
669	if (!uuid.seq) // HACK	698	if (!uuid.seq) // HACK
670	uuid = UUID::gen ();	699	uuid = UUID::gen ();
671		700
		701	// TODO: unclean state changes, should nt be done in copy_to AND instantiate
		702	if (flag [FLAG_RANDOM_SPEED] && speed)
		703	speed_left = -rndm (); // TODO animation
		704	else
672	speed_left = -0.1f;	705	speed_left = -speed;
		706
673	/* copy the body_info to the body_used - this is only really	707	/* copy the body_info to the body_used - this is only really
674	* need for monsters, but doesn't hurt to do it for everything.	708	* need for monsters, but doesn't hurt to do it for everything.
675	* by doing so, when a monster is created, it has good starting	709	* by doing so, when a monster is created, it has good starting
676	* values for the body_used info, so when items are created	710	* values for the body_used info, so when items are created
677	* for it, they can be properly equipped.	711	* for it, they can be properly equipped.
…		…
685	object *	719	object *
686	object::clone ()	720	object::clone ()
687	{	721	{
688	object *neu = create ();	722	object *neu = create ();
689	copy_to (neu);	723	copy_to (neu);
		724
		725	// TODO: unclean state changes, should not be done in clone AND instantiate
		726	if (neu->flag [FLAG_RANDOM_SPEED] && neu->speed)
		727	neu->speed_left = -rndm (); // TODO animation
		728
		729	neu->map = map; // not copied by copy_to
690	return neu;	730	return neu;
691	}	731	}
692		732
693	/*	733	/*
694	* If an object with the IS_TURNABLE() flag needs to be turned due	734	* If an object with the IS_TURNABLE() flag needs to be turned due
…		…
711	* This function needs to be called whenever the speed of an object changes.	751	* This function needs to be called whenever the speed of an object changes.
712	*/	752	*/
713	void	753	void
714	object::set_speed (float speed)	754	object::set_speed (float speed)
715	{	755	{
716	if (flag [FLAG_FREED] && speed)
717	{
718	LOG (llevError, "Object %s is freed but has speed.\n", &name);
719	speed = 0;
720	}
721
722	this->speed = speed;	756	this->speed = speed;
723		757
724	if (has_active_speed ())	758	if (has_active_speed ())
725	activate ();	759	activate ();
726	else	760	else
…		…
745	* UP_OBJ_FACE: only the objects face has changed.	779	* UP_OBJ_FACE: only the objects face has changed.
746	*/	780	*/
747	void	781	void
748	update_object (object *op, int action)	782	update_object (object *op, int action)
749	{	783	{
750	if (op == NULL)	784	if (!op)
751	{	785	{
752	/* this should never happen */	786	/* this should never happen */
753	LOG (llevDebug, "update_object() called for NULL object.\n");	787	LOG (llevError | logBacktrace, "update_object() called for NULL object.\n");
754	return;	788	return;
755	}	789	}
756		790
757	if (op->env)	791	if (!op->is_on_map ())
758	{	792	{
759	/* Animation is currently handled by client, so nothing	793	/* Animation is currently handled by client, so nothing
760	* to do in this case.	794	* to do in this case.
761	*/	795	*/
762	return;	796	return;
763	}	797	}
764
765	/* If the map is saving, don't do anything as everything is
766	* going to get freed anyways.
767	*/
768	if (!op->map || op->map->in_memory == MAP_SAVING)
769	return;
770		798
771	/* make sure the object is within map boundaries */	799	/* make sure the object is within map boundaries */
772	if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height)	800	if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height)
773	{	801	{
774	LOG (llevError, "update_object() called for object out of map!\n");	802	LOG (llevError, "update_object() called for object out of map!\n");
…		…
782		810
783	if (!(m.flags_ & P_UPTODATE))	811	if (!(m.flags_ & P_UPTODATE))
784	/* nop */;	812	/* nop */;
785	else if (action == UP_OBJ_INSERT)	813	else if (action == UP_OBJ_INSERT)
786	{	814	{
		815	#if 0
787	// this is likely overkill, TODO: revisit (schmorp)	816	// this is likely overkill, TODO: revisit (schmorp)
788	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))	817	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
789	|| (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))	818	|| (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))
790	|| (op->type == PLAYER && !(m.flags_ & P_PLAYER))	819	|| (op->is_player () && !(m.flags_ & P_PLAYER))
791	|| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))	820	|| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
792	|| (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))	821	|| (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))
793	|| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))	822	|| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))
794	|| (m.move_on | op->move_on ) != m.move_on	823	|| (m.move_on | op->move_on ) != m.move_on
795	|| (m.move_off | op->move_off ) != m.move_off	824	|| (m.move_off | op->move_off ) != m.move_off
796	|| (m.move_slow | op->move_slow) != m.move_slow	825	|| (m.move_slow | op->move_slow) != m.move_slow
797	/* This isn't perfect, but I don't expect a lot of objects to	826	/* This isn't perfect, but I don't expect a lot of objects to
798	* to have move_allow right now.	827	* have move_allow right now.
799	*/	828	*/
800	|| ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block	829	|| ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block
		830	m.invalidate ();
		831	#else
801	|| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)	832	// the above is not strong enough a test to skip updating. los maybe? TODO (schmorp)
802	m.flags_ = 0;	833	m.invalidate ();
		834	#endif
803	}	835	}
804	/* if the object is being removed, we can't make intelligent	836	/* if the object is being removed, we can't make intelligent
805	* decisions, because remove_ob can't really pass the object	837	* decisions, because remove_ob can't really pass the object
806	* that is being removed.	838	* that is being removed.
807	*/	839	*/
808	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)	840	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
809	m.flags_ = 0;	841	m.invalidate ();
810	else if (action == UP_OBJ_FACE)	842	else if (action == UP_OBJ_FACE)
811	/* Nothing to do for that case */ ;	843	/* Nothing to do for that case */ ;
812	else	844	else
813	LOG (llevError, "update_object called with invalid action: %d\n", action);	845	LOG (llevError, "update_object called with invalid action: %d\n", action);
814		846
…		…
818		850
819	object::object ()	851	object::object ()
820	{	852	{
821	SET_FLAG (this, FLAG_REMOVED);	853	SET_FLAG (this, FLAG_REMOVED);
822		854
823	expmul = 1.0;	855	//expmul = 1.0; declared const for the time being
824	face = blank_face;	856	face = blank_face;
		857	material = MATERIAL_NULL;
825	}	858	}
826		859
827	object::~object ()	860	object::~object ()
828	{	861	{
829	unlink ();	862	unlink ();
…		…
858	/* If already on active list, don't do anything */	891	/* If already on active list, don't do anything */
859	if (active)	892	if (active)
860	return;	893	return;
861		894
862	if (has_active_speed ())	895	if (has_active_speed ())
		896	{
		897	if (flag [FLAG_FREED])
		898	LOG (llevError | logBacktrace, "BUG: tried to activate freed object %s\n", debug_desc ());//D
		899
863	actives.insert (this);	900	actives.insert (this);
		901	}
864	}	902	}
865		903
866	void	904	void
867	object::activate_recursive ()	905	object::activate_recursive ()
868	{	906	{
…		…
917	object::destroy_inv (bool drop_to_ground)	955	object::destroy_inv (bool drop_to_ground)
918	{	956	{
919	// need to check first, because the checks below might segfault	957	// need to check first, because the checks below might segfault
920	// as we might be on an invalid mapspace and crossfire code	958	// as we might be on an invalid mapspace and crossfire code
921	// is too buggy to ensure that the inventory is empty.	959	// is too buggy to ensure that the inventory is empty.
922	// corollary: if you create arrows etc. with stuff in tis inventory,	960	// corollary: if you create arrows etc. with stuff in its inventory,
923	// cf will crash below with off-map x and y	961	// cf will crash below with off-map x and y
924	if (!inv)	962	if (!inv)
925	return;	963	return;
926		964
927	/* Only if the space blocks everything do we not process -	965	/* Only if the space blocks everything do we not process -
…		…
929	* drop on that space.	967	* drop on that space.
930	*/	968	*/
931	if (!drop_to_ground	969	if (!drop_to_ground
932	|| !map	970	|| !map
933	|| map->in_memory != MAP_ACTIVE	971	|| map->in_memory != MAP_ACTIVE
934	|| map->nodrop	972	|| map->no_drop
935	|| ms ().move_block == MOVE_ALL)	973	|| ms ().move_block == MOVE_ALL)
936	{	974	{
937	while (inv)	975	while (inv)
938	{
939	inv->destroy_inv (drop_to_ground);
940	inv->destroy ();	976	inv->destroy ();
941	}
942	}	977	}
943	else	978	else
944	{ /* Put objects in inventory onto this space */	979	{ /* Put objects in inventory onto this space */
945	while (inv)	980	while (inv)
946	{	981	{
…		…
964	object *op = new object;	999	object *op = new object;
965	op->link ();	1000	op->link ();
966	return op;	1001	return op;
967	}	1002	}
968		1003
		1004	static struct freed_map : maptile
		1005	{
		1006	freed_map ()
		1007	{
		1008	path = "<freed objects map>";
		1009	name = "/internal/freed_objects_map";
		1010	width = 3;
		1011	height = 3;
		1012	no_drop = 1;
		1013	no_reset = 1;
		1014
		1015	alloc ();
		1016	in_memory = MAP_ACTIVE;
		1017	}
		1018
		1019	~freed_map ()
		1020	{
		1021	destroy ();
		1022	}
		1023	} freed_map; // freed objects are moved here to avoid crashes
		1024
969	void	1025	void
970	object::do_destroy ()	1026	object::do_destroy ()
971	{	1027	{
972	if (flag [FLAG_IS_LINKED])	1028	if (flag [FLAG_IS_LINKED])
973	remove_button_link (this);	1029	remove_link ();
974		1030
975	if (flag [FLAG_FRIENDLY])	1031	if (flag [FLAG_FRIENDLY])
976	remove_friendly_object (this);	1032	remove_friendly_object (this);
977		1033
978	remove ();	1034	remove ();
979		1035
980	attachable::do_destroy ();	1036	attachable::do_destroy ();
981		1037
982	destroy_inv (true);
983
984	deactivate ();	1038	deactivate ();
985	unlink ();	1039	unlink ();
986		1040
987	flag [FLAG_FREED] = 1;	1041	flag [FLAG_FREED] = 1;
988		1042
989	// hack to ensure that freed objects still have a valid map	1043	// hack to ensure that freed objects still have a valid map
990	{
991	static maptile *freed_map; // freed objects are moved here to avoid crashes
992
993	if (!freed_map)
994	{
995	freed_map = new maptile;
996
997	freed_map->path = "<freed objects map>";
998	freed_map->name = "/internal/freed_objects_map";
999	freed_map->width = 3;
1000	freed_map->height = 3;
1001	freed_map->nodrop = 1;
1002
1003	freed_map->alloc ();
1004	freed_map->in_memory = MAP_ACTIVE;
1005	}
1006
1007	map = freed_map;	1044	map = &freed_map;
1008	x = 1;	1045	x = 1;
1009	y = 1;	1046	y = 1;
1010	}
1011		1047
1012	if (more)	1048	if (more)
1013	{	1049	{
1014	more->destroy ();	1050	more->destroy ();
1015	more = 0;	1051	more = 0;
…		…
1023	attacked_by = 0;	1059	attacked_by = 0;
1024	current_weapon = 0;	1060	current_weapon = 0;
1025	}	1061	}
1026		1062
1027	void	1063	void
1028	object::destroy (bool destroy_inventory)	1064	object::destroy ()
1029	{	1065	{
1030	if (destroyed ())	1066	if (destroyed ())
1031	return;	1067	return;
1032		1068
1033	if (destroy_inventory)	1069	if (!is_head () && !head->destroyed ())
		1070	{
		1071	LOG (llevError | logBacktrace, "tried to destroy the tail of an object");
		1072	head->destroy ();
		1073	return;
		1074	}
		1075
1034	destroy_inv (false);	1076	destroy_inv (false);
1035		1077
1036	if (is_head ())	1078	if (is_head ())
1037	if (sound_destroy)	1079	if (sound_destroy)
1038	play_sound (sound_destroy);	1080	play_sound (sound_destroy);
1039	else if (flag [FLAG_MONSTER])	1081	else if (flag [FLAG_MONSTER])
…		…
1050	* the previous environment.	1092	* the previous environment.
1051	*/	1093	*/
1052	void	1094	void
1053	object::do_remove ()	1095	object::do_remove ()
1054	{	1096	{
1055	object *tmp, *last = 0;
1056	object *otmp;
1057
1058	if (flag [FLAG_REMOVED])	1097	if (flag [FLAG_REMOVED])
1059	return;	1098	return;
1060		1099
1061	INVOKE_OBJECT (REMOVE, this);	1100	INVOKE_OBJECT (REMOVE, this);
1062
1063	if (object *pl = visible_to ())
1064	esrv_del_item (pl->contr, count);
1065		1101
1066	flag [FLAG_REMOVED] = true;	1102	flag [FLAG_REMOVED] = true;
1067		1103
1068	if (more)	1104	if (more)
1069	more->remove ();	1105	more->remove ();
…		…
1072	* In this case, the object to be removed is in someones	1108	* In this case, the object to be removed is in someones
1073	* inventory.	1109	* inventory.
1074	*/	1110	*/
1075	if (env)	1111	if (env)
1076	{	1112	{
		1113	flag [FLAG_REMOVED] = false; // hack around the issue of visible_to checking flag_removed
		1114	if (object *pl = visible_to ())
		1115	esrv_del_item (pl->contr, count);
		1116	flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed
		1117
1077	adjust_weight (env, -total_weight ());	1118	adjust_weight (env, -total_weight ());
1078		1119
1079	*(above ? &above->below : &env->inv) = below;	1120	object *pl = in_player ();
1080
1081	if (below)
1082	below->above = above;
1083		1121
1084	/* we set up values so that it could be inserted into	1122	/* we set up values so that it could be inserted into
1085	* the map, but we don't actually do that - it is up	1123	* the map, but we don't actually do that - it is up
1086	* to the caller to decide what we want to do.	1124	* to the caller to decide what we want to do.
1087	*/	1125	*/
1088	map = env->map;	1126	map = env->map;
1089	x = env->x;	1127	x = env->x;
1090	y = env->y;	1128	y = env->y;
		1129
		1130	// make sure cmov optimisation is applicable
		1131	*(above ? &above->below : &env->inv) = below;
		1132	*(below ? &below->above : &above ) = above; // &above is just a dummy
		1133
1091	above = 0;	1134	above = 0;
1092	below = 0;	1135	below = 0;
1093	env = 0;	1136	env = 0;
1094		1137
1095	/* NO_FIX_PLAYER is set when a great many changes are being	1138	if (pl && pl->is_player ())
1096	* made to players inventory. If set, avoiding the call
1097	* to save cpu time.
1098	*/	1139	{
1099	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1140	pl->contr->queue_stats_update ();
1100	otmp->update_stats ();	1141
		1142	if (glow_radius && pl->is_on_map ())
		1143	update_all_los (pl->map, pl->x, pl->y);
		1144	}
1101	}	1145	}
1102	else if (map)	1146	else if (map)
1103	{	1147	{
1104	if (type == PLAYER)
1105	{
1106	// leaving a spot always closes any open container on the ground
1107	if (container && !container->env)
1108	// this causes spurious floorbox updates, but it ensures
1109	// that the CLOSE event is being sent.
1110	close_container ();
1111
1112	--map->players;
1113	map->touch ();
1114	}
1115
1116	map->dirty = true;	1148	map->dirty = true;
1117	mapspace &ms = this->ms ();	1149	mapspace &ms = this->ms ();
1118		1150
		1151	if (object *pl = ms.player ())
		1152	{
		1153	if (is_player ())
		1154	{
		1155	if (!flag [FLAG_WIZPASS])
		1156	ms.smell = ++mapspace::smellcount; // remember the smell of the player
		1157
		1158	// leaving a spot always closes any open container on the ground
		1159	if (container && !container->env)
		1160	// this causes spurious floorbox updates, but it ensures
		1161	// that the CLOSE event is being sent.
		1162	close_container ();
		1163
		1164	--map->players;
		1165	map->touch ();
		1166	}
		1167	else if (pl->container_ () == this)
		1168	{
		1169	// removing a container should close it
		1170	close_container ();
		1171	}
		1172
		1173	esrv_del_item (pl->contr, count);
		1174	}
		1175
1119	/* link the object above us */	1176	/* link the object above us */
1120	if (above)	1177	// re-link, make sure compiler can easily use cmove
1121	above->below = below;	1178	*(above ? &above->below : &ms.top) = below;
1122	else	1179	*(below ? &below->above : &ms.bot) = above;
1123	ms.top = below; /* we were top, set new top */
1124
1125	/* Relink the object below us, if there is one */
1126	if (below)
1127	below->above = above;
1128	else
1129	{
1130	/* Nothing below, which means we need to relink map object for this space
1131	* use translated coordinates in case some oddness with map tiling is
1132	* evident
1133	*/
1134	if (GET_MAP_OB (map, x, y) != this)
1135	LOG (llevError, "remove_ob: GET_MAP_OB does not return object to be removed even though it appears to be on the bottom? %s\n", debug_desc ());
1136
1137	ms.bot = above; /* goes on above it. */
1138	}
1139		1180
1140	above = 0;	1181	above = 0;
1141	below = 0;	1182	below = 0;
1142		1183
		1184	ms.invalidate ();
		1185
1143	if (map->in_memory == MAP_SAVING)	1186	if (map->in_memory == MAP_SAVING)
1144	return;	1187	return;
1145		1188
1146	int check_walk_off = !flag [FLAG_NO_APPLY];	1189	int check_walk_off = !flag [FLAG_NO_APPLY];
1147		1190
1148	if (object *pl = ms.player ())	1191	if (object *pl = ms.player ())
1149	{	1192	{
1150	if (pl->container == this)	1193	if (pl->container_ () == this)
1151	/* If a container that the player is currently using somehow gets	1194	/* If a container that the player is currently using somehow gets
1152	* removed (most likely destroyed), update the player view	1195	* removed (most likely destroyed), update the player view
1153	* appropriately.	1196	* appropriately.
1154	*/	1197	*/
1155	pl->close_container ();	1198	pl->close_container ();
1156		1199
		1200	//TODO: the floorbox prev/next might need updating
		1201	//esrv_del_item (pl->contr, count);
		1202	//TODO: update floorbox to preserve ordering
		1203	if (pl->contr->ns)
1157	pl->contr->ns->floorbox_update ();	1204	pl->contr->ns->floorbox_update ();
1158	}	1205	}
1159		1206
		1207	if (check_walk_off)
1160	for (tmp = ms.bot; tmp; tmp = tmp->above)	1208	for (object *above, *tmp = ms.bot; tmp; tmp = above)
1161	{	1209	{
		1210	above = tmp->above;
		1211
1162	/* No point updating the players look faces if he is the object	1212	/* No point updating the players look faces if he is the object
1163	* being removed.	1213	* being removed.
1164	*/	1214	*/
1165		1215
1166	/* See if object moving off should effect something */	1216	/* See if object moving off should effect something */
1167	if (check_walk_off
1168	&& ((move_type & tmp->move_off)	1217	if ((move_type & tmp->move_off)
1169	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))	1218	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0)
1170	{
1171	move_apply (tmp, this, 0);	1219	move_apply (tmp, this, 0);
1172
1173	if (destroyed ())
1174	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1175	}	1220	}
1176		1221
1177	last = tmp;	1222	if (affects_los ())
1178	}
1179
1180	/* last == NULL if there are no objects on this space */
1181	//TODO: this makes little sense, why only update the topmost object?
1182	if (!last)
1183	map->at (x, y).flags_ = 0;
1184	else
1185	update_object (last, UP_OBJ_REMOVE);
1186
1187	if (flag [FLAG_BLOCKSVIEW] || glow_radius)
1188	update_all_los (map, x, y);	1223	update_all_los (map, x, y);
1189	}	1224	}
1190	}	1225	}
1191		1226
1192	/*	1227	/*
…		…
1216	esrv_update_item (UPD_NROF, pl, top);	1251	esrv_update_item (UPD_NROF, pl, top);
1217		1252
1218	op->weight = 0; // cancel the addition above	1253	op->weight = 0; // cancel the addition above
1219	op->carrying = 0; // must be 0 already	1254	op->carrying = 0; // must be 0 already
1220		1255
1221	op->destroy (1);	1256	op->destroy ();
1222		1257
1223	return top;	1258	return top;
1224	}	1259	}
1225		1260
1226	return 0;	1261	return 0;
…		…
1254	* job preparing multi-part monsters.	1289	* job preparing multi-part monsters.
1255	*/	1290	*/
1256	object *	1291	object *
1257	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)	1292	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1258	{	1293	{
		1294	op->remove ();
		1295
1259	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)	1296	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1260	{	1297	{
1261	tmp->x = x + tmp->arch->x;	1298	tmp->x = x + tmp->arch->x;
1262	tmp->y = y + tmp->arch->y;	1299	tmp->y = y + tmp->arch->y;
1263	}	1300	}
…		…
1286	* just 'op' otherwise	1323	* just 'op' otherwise
1287	*/	1324	*/
1288	object *	1325	object *
1289	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)	1326	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1290	{	1327	{
1291	assert (!op->flag [FLAG_FREED]);
1292
1293	object *top, *floor = NULL;
1294
1295	op->remove ();	1328	op->remove ();
		1329
		1330	if (m == &freed_map)//D TODO: remove soon
		1331	{//D
		1332	LOG (llevError | logBacktrace, "tries to insret object on freed objects map: %s", op->debug_desc ());//D
		1333	}//D
1296		1334
1297	/* Ideally, the caller figures this out. However, it complicates a lot	1335	/* Ideally, the caller figures this out. However, it complicates a lot
1298	* of areas of callers (eg, anything that uses find_free_spot would now	1336	* of areas of callers (eg, anything that uses find_free_spot would now
1299	* need extra work	1337	* need extra work
1300	*/	1338	*/
		1339	maptile *newmap = m;
1301	if (!xy_normalise (m, op->x, op->y))	1340	if (!xy_normalise (newmap, op->x, op->y))
1302	{	1341	{
1303	op->destroy ();	1342	op->head_ ()->destroy ();// remove head_ once all tail object destroyers found
1304	return 0;	1343	return 0;
1305	}	1344	}
1306		1345
1307	if (object *more = op->more)	1346	if (object *more = op->more)
1308	if (!insert_ob_in_map (more, m, originator, flag))	1347	if (!insert_ob_in_map (more, m, originator, flag))
1309	return 0;	1348	return 0;
1310		1349
1311	CLEAR_FLAG (op, FLAG_REMOVED);	1350	op->flag [FLAG_REMOVED] = false;
1312		1351	op->env = 0;
1313	op->map = m;	1352	op->map = newmap;
		1353
1314	mapspace &ms = op->ms ();	1354	mapspace &ms = op->ms ();
1315		1355
1316	/* this has to be done after we translate the coordinates.	1356	/* this has to be done after we translate the coordinates.
1317	*/	1357	*/
1318	if (op->nrof && !(flag & INS_NO_MERGE))	1358	if (op->nrof && !(flag & INS_NO_MERGE))
1319	for (object *tmp = ms.bot; tmp; tmp = tmp->above)	1359	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1320	if (object::can_merge (op, tmp))	1360	if (object::can_merge (op, tmp))
1321	{	1361	{
		1362	// TODO: we actually want to update tmp, not op,
		1363	// but some caller surely breaks when we return tmp
		1364	// from here :/
1322	op->nrof += tmp->nrof;	1365	op->nrof += tmp->nrof;
1323	tmp->destroy (1);	1366	tmp->destroy ();
1324	}	1367	}
1325		1368
1326	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1369	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1327	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1370	CLEAR_FLAG (op, FLAG_INV_LOCKED);
1328		1371
…		…
1335	{	1378	{
1336	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");	1379	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");
1337	abort ();	1380	abort ();
1338	}	1381	}
1339		1382
		1383	if (!originator->is_on_map ())
		1384	{
		1385	LOG (llevError, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map",
		1386	op->debug_desc (), originator->debug_desc ());
		1387	abort ();
		1388	}
		1389
1340	op->above = originator;	1390	op->above = originator;
1341	op->below = originator->below;	1391	op->below = originator->below;
1342
1343	if (op->below)
1344	op->below->above = op;
1345	else
1346	ms.bot = op;
1347
1348	/* since *below* originator, no need to update top */
1349	originator->below = op;	1392	originator->below = op;
		1393
		1394	*(op->below ? &op->below->above : &ms.bot) = op;
1350	}	1395	}
1351	else	1396	else
1352	{	1397	{
1353	top = ms.bot;	1398	object *floor = 0;
		1399	object *top = ms.top;
1354		1400
1355	/* If there are other objects, then */	1401	/* If there are other objects, then */
1356	if (top)	1402	if (top)
1357	{	1403	{
1358	object *last = 0;
1359
1360	/*	1404	/*
1361	* If there are multiple objects on this space, we do some trickier handling.	1405	* If there are multiple objects on this space, we do some trickier handling.
1362	* We've already dealt with merging if appropriate.	1406	* We've already dealt with merging if appropriate.
1363	* Generally, we want to put the new object on top. But if	1407	* Generally, we want to put the new object on top. But if
1364	* flag contains INS_ABOVE_FLOOR_ONLY, once we find the last	1408	* flag contains INS_ABOVE_FLOOR_ONLY, once we find the last
…		…
1367	* once we get to them. This reduces the need to traverse over all of	1411	* once we get to them. This reduces the need to traverse over all of
1368	* them when adding another one - this saves quite a bit of cpu time	1412	* them when adding another one - this saves quite a bit of cpu time
1369	* when lots of spells are cast in one area. Currently, it is presumed	1413	* when lots of spells are cast in one area. Currently, it is presumed
1370	* that flying non pickable objects are spell objects.	1414	* that flying non pickable objects are spell objects.
1371	*/	1415	*/
1372	for (top = ms.bot; top; top = top->above)	1416	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1373	{	1417	{
1374	if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))	1418	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) || QUERY_FLAG (tmp, FLAG_OVERLAY_FLOOR))
1375	floor = top;	1419	floor = tmp;
1376		1420
1377	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))	1421	if (QUERY_FLAG (tmp, FLAG_NO_PICK) && (tmp->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1378	{	1422	{
1379	/* We insert above top, so we want this object below this */	1423	/* We insert above top, so we want this object below this */
1380	top = top->below;	1424	top = tmp->below;
1381	break;	1425	break;
1382	}	1426	}
1383		1427
1384	last = top;	1428	top = tmp;
1385	}	1429	}
1386
1387	/* Don't want top to be NULL, so set it to the last valid object */
1388	top = last;
1389		1430
1390	/* We let update_position deal with figuring out what the space	1431	/* We let update_position deal with figuring out what the space
1391	* looks like instead of lots of conditions here.	1432	* looks like instead of lots of conditions here.
1392	* makes things faster, and effectively the same result.	1433	* makes things faster, and effectively the same result.
1393	*/	1434	*/
…		…
1400	*/	1441	*/
1401	if (!(flag & INS_ON_TOP)	1442	if (!(flag & INS_ON_TOP)
1402	&& ms.flags () & P_BLOCKSVIEW	1443	&& ms.flags () & P_BLOCKSVIEW
1403	&& (op->face && !faces [op->face].visibility))	1444	&& (op->face && !faces [op->face].visibility))
1404	{	1445	{
		1446	object *last;
		1447
1405	for (last = top; last != floor; last = last->below)	1448	for (last = top; last != floor; last = last->below)
1406	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1449	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1407	break;	1450	break;
1408		1451
1409	/* Check to see if we found the object that blocks view,	1452	/* Check to see if we found the object that blocks view,
…		…
1417	} /* If objects on this space */	1460	} /* If objects on this space */
1418		1461
1419	if (flag & INS_ABOVE_FLOOR_ONLY)	1462	if (flag & INS_ABOVE_FLOOR_ONLY)
1420	top = floor;	1463	top = floor;
1421		1464
1422	/* Top is the object that our object (op) is going to get inserted above.	1465	// insert object above top, or bottom-most if top = 0
1423	*/
1424
1425	/* First object on this space */
1426	if (!top)	1466	if (!top)
1427	{	1467	{
		1468	op->below = 0;
1428	op->above = ms.bot;	1469	op->above = ms.bot;
1429
1430	if (op->above)
1431	op->above->below = op;
1432
1433	op->below = 0;
1434	ms.bot = op;	1470	ms.bot = op;
		1471
		1472	*(op->above ? &op->above->below : &ms.top) = op;
1435	}	1473	}
1436	else	1474	else
1437	{ /* get inserted into the stack above top */	1475	{
1438	op->above = top->above;	1476	op->above = top->above;
1439
1440	if (op->above)
1441	op->above->below = op;	1477	top->above = op;
1442		1478
1443	op->below = top;	1479	op->below = top;
1444	top->above = op;	1480	*(op->above ? &op->above->below : &ms.top) = op;
1445	}	1481	}
		1482	}
1446		1483
1447	if (!op->above)	1484	if (op->is_player ())
1448	ms.top = op;
1449	} /* else not INS_BELOW_ORIGINATOR */
1450
1451	if (op->type == PLAYER)
1452	{	1485	{
1453	op->contr->do_los = 1;	1486	op->contr->do_los = 1;
1454	++op->map->players;	1487	++op->map->players;
1455	op->map->touch ();	1488	op->map->touch ();
1456	}	1489	}
1457		1490
1458	op->map->dirty = true;	1491	op->map->dirty = true;
1459		1492
1460	if (object *pl = ms.player ())	1493	if (object *pl = ms.player ())
		1494	//TODO: the floorbox prev/next might need updating
		1495	//esrv_send_item (pl, op);
		1496	//TODO: update floorbox to preserve ordering
		1497	if (pl->contr->ns)
1461	pl->contr->ns->floorbox_update ();	1498	pl->contr->ns->floorbox_update ();
1462		1499
1463	/* If this object glows, it may affect lighting conditions that are	1500	/* If this object glows, it may affect lighting conditions that are
1464	* visible to others on this map. But update_all_los is really	1501	* visible to others on this map. But update_all_los is really
1465	* an inefficient way to do this, as it means los for all players	1502	* an inefficient way to do this, as it means los for all players
1466	* on the map will get recalculated. The players could very well	1503	* on the map will get recalculated. The players could very well
1467	* be far away from this change and not affected in any way -	1504	* be far away from this change and not affected in any way -
1468	* this should get redone to only look for players within range,	1505	* this should get redone to only look for players within range,
1469	* or just updating the P_UPTODATE for spaces within this area	1506	* or just updating the P_UPTODATE for spaces within this area
1470	* of effect may be sufficient.	1507	* of effect may be sufficient.
1471	*/	1508	*/
1472	if (op->map->darkness && (op->glow_radius != 0))	1509	if (op->affects_los ())
		1510	{
		1511	op->ms ().invalidate ();
1473	update_all_los (op->map, op->x, op->y);	1512	update_all_los (op->map, op->x, op->y);
		1513	}
1474		1514
1475	/* updates flags (blocked, alive, no magic, etc) for this map space */	1515	/* updates flags (blocked, alive, no magic, etc) for this map space */
1476	update_object (op, UP_OBJ_INSERT);	1516	update_object (op, UP_OBJ_INSERT);
1477		1517
1478	INVOKE_OBJECT (INSERT, op);	1518	INVOKE_OBJECT (INSERT, op);
…		…
1485	* blocked() and wall() work properly), and these flags are updated by	1525	* blocked() and wall() work properly), and these flags are updated by
1486	* update_object().	1526	* update_object().
1487	*/	1527	*/
1488		1528
1489	/* if this is not the head or flag has been passed, don't check walk on status */	1529	/* if this is not the head or flag has been passed, don't check walk on status */
1490	if (!(flag & INS_NO_WALK_ON) && op->head_ () == op)	1530	if (!(flag & INS_NO_WALK_ON) && op->is_head ())
1491	{	1531	{
1492	if (check_move_on (op, originator))	1532	if (check_move_on (op, originator))
1493	return 0;	1533	return 0;
1494		1534
1495	/* If we are a multi part object, lets work our way through the check	1535	/* If we are a multi part object, lets work our way through the check
…		…
1506	/* this function inserts an object in the map, but if it	1546	/* this function inserts an object in the map, but if it
1507	* finds an object of its own type, it'll remove that one first.	1547	* finds an object of its own type, it'll remove that one first.
1508	* op is the object to insert it under: supplies x and the map.	1548	* op is the object to insert it under: supplies x and the map.
1509	*/	1549	*/
1510	void	1550	void
1511	replace_insert_ob_in_map (const char *arch_string, object *op)	1551	replace_insert_ob_in_map (shstr_tmp archname, object *op)
1512	{	1552	{
1513	/* first search for itself and remove any old instances */	1553	/* first search for itself and remove any old instances */
1514		1554
1515	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)	1555	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1516	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */	1556	if (tmp->arch->archname == archname) /* same archetype */
1517	tmp->destroy (1);	1557	tmp->destroy ();
1518		1558
1519	object *tmp = arch_to_object (archetype::find (arch_string));	1559	object *tmp = arch_to_object (archetype::find (archname));
1520		1560
1521	tmp->x = op->x;	1561	tmp->x = op->x;
1522	tmp->y = op->y;	1562	tmp->y = op->y;
1523		1563
1524	insert_ob_in_map (tmp, op->map, op, 0);	1564	insert_ob_in_map (tmp, op->map, op, 0);
…		…
1529	{	1569	{
1530	if (where->env)	1570	if (where->env)
1531	return where->env->insert (this);	1571	return where->env->insert (this);
1532	else	1572	else
1533	return where->map->insert (this, where->x, where->y, originator, flags);	1573	return where->map->insert (this, where->x, where->y, originator, flags);
		1574	}
		1575
		1576	// check whether we can put this into the map, respect max_volume, max_items
		1577	bool
		1578	object::can_drop_at (maptile *m, int x, int y, object *originator)
		1579	{
		1580	mapspace &ms = m->at (x, y);
		1581
		1582	int items = ms.items ();
		1583
		1584	if (!items // testing !items ensures we can drop at least one item
		1585	|| (items < m->max_items
		1586	&& ms.volume () < m->max_volume))
		1587	return true;
		1588
		1589	if (originator && originator->is_player ())
		1590	originator->contr->failmsg (format (
		1591	"No matter how hard you try, you just cannot put the %s here H<Try to remove some items from the floor first.>",
		1592	query_name ()
		1593	));
		1594
		1595	return false;
1534	}	1596	}
1535		1597
1536	/*	1598	/*
1537	* decrease(object, number) decreases a specified number from	1599	* decrease(object, number) decreases a specified number from
1538	* the amount of an object. If the amount reaches 0, the object	1600	* the amount of an object. If the amount reaches 0, the object
…		…
1546	if (!nr)	1608	if (!nr)
1547	return true;	1609	return true;
1548		1610
1549	nr = min (nr, nrof);	1611	nr = min (nr, nrof);
1550		1612
		1613	if (nrof > nr)
		1614	{
1551	nrof -= nr;	1615	nrof -= nr;
1552
1553	if (nrof)
1554	{
1555	adjust_weight (env, -weight * nr); // carrying == 0	1616	adjust_weight (env, -weight * max (1, nr)); // carrying == 0
1556		1617
1557	if (object *pl = visible_to ())	1618	if (object *pl = visible_to ())
1558	esrv_update_item (UPD_NROF, pl, this);	1619	esrv_update_item (UPD_NROF, pl, this);
1559		1620
1560	return true;	1621	return true;
1561	}	1622	}
1562	else	1623	else
1563	{	1624	{
1564	destroy (1);	1625	destroy ();
1565	return false;	1626	return false;
1566	}	1627	}
1567	}	1628	}
1568		1629
1569	/*	1630	/*
…		…
1586	}	1647	}
1587	else	1648	else
1588	{	1649	{
1589	decrease (nr);	1650	decrease (nr);
1590		1651
1591	object *op = object_create_clone (this);	1652	object *op = deep_clone ();
1592	op->nrof = nr;	1653	op->nrof = nr;
1593	return op;	1654	return op;
1594	}	1655	}
1595	}	1656	}
1596		1657
…		…
1646	if (object *pl = tmp->visible_to ())	1707	if (object *pl = tmp->visible_to ())
1647	esrv_update_item (UPD_NROF, pl, tmp);	1708	esrv_update_item (UPD_NROF, pl, tmp);
1648		1709
1649	adjust_weight (this, op->total_weight ());	1710	adjust_weight (this, op->total_weight ());
1650		1711
1651	op->destroy (1);	1712	op->destroy ();
1652	op = tmp;	1713	op = tmp;
1653	goto inserted;	1714	goto inserted;
1654	}	1715	}
1655		1716
1656	op->owner = 0; // it's his/hers now. period.	1717	op->owner = 0; // it's his/hers now. period.
…		…
1674		1735
1675	adjust_weight (this, op->total_weight ());	1736	adjust_weight (this, op->total_weight ());
1676		1737
1677	inserted:	1738	inserted:
1678	/* reset the light list and los of the players on the map */	1739	/* reset the light list and los of the players on the map */
1679	if (op->glow_radius && map && map->darkness)	1740	if (op->glow_radius && is_on_map ())
		1741	{
		1742	update_stats ();
1680	update_all_los (map, x, y);	1743	update_all_los (map, x, y);
1681		1744	}
		1745	else if (is_player ())
1682	// if this is a player's inventory, update stats	1746	// if this is a player's inventory, update stats
1683	if (type == PLAYER && !flag [FLAG_NO_FIX_PLAYER])	1747	contr->queue_stats_update ();
1684	update_stats ();
1685		1748
1686	INVOKE_OBJECT (INSERT, this);	1749	INVOKE_OBJECT (INSERT, this);
1687		1750
1688	return op;	1751	return op;
1689	}	1752	}
…		…
1709	* on top.	1772	* on top.
1710	*/	1773	*/
1711	int	1774	int
1712	check_move_on (object *op, object *originator)	1775	check_move_on (object *op, object *originator)
1713	{	1776	{
		1777	if (QUERY_FLAG (op, FLAG_NO_APPLY))
		1778	return 0;
		1779
1714	object *tmp;	1780	object *tmp;
1715	maptile *m = op->map;	1781	maptile *m = op->map;
1716	int x = op->x, y = op->y;	1782	int x = op->x, y = op->y;
1717		1783
1718	MoveType move_on, move_slow, move_block;	1784	mapspace &ms = m->at (x, y);
1719		1785
1720	if (QUERY_FLAG (op, FLAG_NO_APPLY))	1786	ms.update ();
1721	return 0;
1722		1787
1723	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);	1788	MoveType move_on = ms.move_on;
1724	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);	1789	MoveType move_slow = ms.move_slow;
1725	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);	1790	MoveType move_block = ms.move_block;
1726		1791
1727	/* if nothing on this space will slow op down or be applied,	1792	/* if nothing on this space will slow op down or be applied,
1728	* no need to do checking below. have to make sure move_type	1793	* no need to do checking below. have to make sure move_type
1729	* is set, as lots of objects don't have it set - we treat that	1794	* is set, as lots of objects don't have it set - we treat that
1730	* as walking.	1795	* as walking.
…		…
1741	return 0;	1806	return 0;
1742		1807
1743	/* The objects have to be checked from top to bottom.	1808	/* The objects have to be checked from top to bottom.
1744	* Hence, we first go to the top:	1809	* Hence, we first go to the top:
1745	*/	1810	*/
1746		1811	for (object *next, *tmp = ms.top; tmp; tmp = next)
1747	for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above)
1748	{
1749	/* Trim the search when we find the first other spell effect
1750	* this helps performance so that if a space has 50 spell objects,
1751	* we don't need to check all of them.
1752	*/
1753	if ((tmp->move_type & MOVE_FLY_LOW) && QUERY_FLAG (tmp, FLAG_NO_PICK))
1754	break;
1755	}	1812	{
		1813	next = tmp->below;
1756		1814
1757	for (; tmp; tmp = tmp->below)
1758	{
1759	if (tmp == op)	1815	if (tmp == op)
1760	continue; /* Can't apply yourself */	1816	continue; /* Can't apply yourself */
1761		1817
1762	/* Check to see if one of the movement types should be slowed down.	1818	/* Check to see if one of the movement types should be slowed down.
1763	* Second check makes sure that the movement types not being slowed	1819	* Second check makes sure that the movement types not being slowed
…		…
1768	if (!QUERY_FLAG (op, FLAG_WIZPASS))	1824	if (!QUERY_FLAG (op, FLAG_WIZPASS))
1769	{	1825	{
1770	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||	1826	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
1771	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))	1827	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1772	{	1828	{
1773
1774	float
1775	diff = tmp->move_slow_penalty * fabs (op->speed);	1829	float diff = tmp->move_slow_penalty * fabs (op->speed);
1776		1830
1777	if (op->type == PLAYER)	1831	if (op->is_player ())
1778	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||	1832	if ((tmp->flag [FLAG_IS_HILLY ] && find_skill_by_number (op, SK_CLIMBING)) ||
1779	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))	1833	(tmp->flag [FLAG_IS_WOODED] && find_skill_by_number (op, SK_WOODSMAN)))
1780	diff /= 4.0;	1834	diff /= 4.0;
1781		1835
1782	op->speed_left -= diff;	1836	op->speed_left -= diff;
1783	}	1837	}
1784	}	1838	}
…		…
1817	LOG (llevError, "Present_arch called outside map.\n");	1871	LOG (llevError, "Present_arch called outside map.\n");
1818	return NULL;	1872	return NULL;
1819	}	1873	}
1820		1874
1821	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)	1875	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1822	if (tmp->arch == at)	1876	if (tmp->arch->archname == at->archname)
1823	return tmp;	1877	return tmp;
1824		1878
1825	return NULL;	1879	return NULL;
1826	}	1880	}
1827		1881
…		…
1891	* The first matching object is returned, or NULL if none.	1945	* The first matching object is returned, or NULL if none.
1892	*/	1946	*/
1893	object *	1947	object *
1894	present_arch_in_ob (const archetype *at, const object *op)	1948	present_arch_in_ob (const archetype *at, const object *op)
1895	{	1949	{
1896	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)	1950	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1897	if (tmp->arch == at)	1951	if (tmp->arch->archname == at->archname)
1898	return tmp;	1952	return tmp;
1899		1953
1900	return NULL;	1954	return NULL;
1901	}	1955	}
1902		1956
…		…
1990	* head of the object should correspond for the entire object.	2044	* head of the object should correspond for the entire object.
1991	*/	2045	*/
1992	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))	2046	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
1993	continue;	2047	continue;
1994		2048
1995	if (ob->blocked (m, pos.x, pos.y))	2049	if (ob->blocked (pos.m, pos.x, pos.y))
1996	continue;	2050	continue;
1997		2051
1998	altern [index++] = i;	2052	altern [index++] = i;
1999	}	2053	}
2000		2054
…		…
2068	* there is capable of.	2122	* there is capable of.
2069	*/	2123	*/
2070	int	2124	int
2071	find_dir (maptile *m, int x, int y, object *exclude)	2125	find_dir (maptile *m, int x, int y, object *exclude)
2072	{	2126	{
2073	int i, max = SIZEOFFREE, mflags;	2127	int max = SIZEOFFREE, mflags;
2074
2075	sint16 nx, ny;
2076	object *tmp;
2077	maptile *mp;
2078
2079	MoveType blocked, move_type;	2128	MoveType move_type;
2080		2129
2081	if (exclude && exclude->head_ () != exclude)	2130	if (exclude && exclude->head_ () != exclude)
2082	{	2131	{
2083	exclude = exclude->head;	2132	exclude = exclude->head;
2084	move_type = exclude->move_type;	2133	move_type = exclude->move_type;
…		…
2087	{	2136	{
2088	/* If we don't have anything, presume it can use all movement types. */	2137	/* If we don't have anything, presume it can use all movement types. */
2089	move_type = MOVE_ALL;	2138	move_type = MOVE_ALL;
2090	}	2139	}
2091		2140
2092	for (i = 1; i < max; i++)	2141	for (int i = 1; i < max; i++)
2093	{	2142	{
2094	mp = m;	2143	mapxy pos (m, x, y);
2095	nx = x + freearr_x[i];	2144	pos.move (i);
2096	ny = y + freearr_y[i];
2097		2145
2098	mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);	2146	if (!pos.normalise ())
2099
2100	if (mflags & P_OUT_OF_MAP)
2101	max = maxfree[i];	2147	max = maxfree[i];
2102	else	2148	else
2103	{	2149	{
2104	mapspace &ms = mp->at (nx, ny);	2150	mapspace &ms = *pos;
2105		2151
2106	blocked = ms.move_block;
2107
2108	if ((move_type & blocked) == move_type)	2152	if ((move_type & ms.move_block) == move_type)
2109	max = maxfree[i];	2153	max = maxfree [i];
2110	else if (mflags & P_IS_ALIVE)	2154	else if (ms.flags () & P_IS_ALIVE)
2111	{	2155	{
2112	for (tmp = ms.bot; tmp; tmp = tmp->above)	2156	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
2113	if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)	2157	if ((tmp->flag [FLAG_MONSTER] || tmp->is_player ())
2114	&& (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))	2158	&& (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2115	break;
2116
2117	if (tmp)
2118	return freedir[i];	2159	return freedir [i];
2119	}	2160	}
2120	}	2161	}
2121	}	2162	}
2122		2163
2123	return 0;	2164	return 0;
…		…
2198	* This basically means that if direction is 15, then it could either go	2239	* This basically means that if direction is 15, then it could either go
2199	* direction 4, 14, or 16 to get back to where we are.	2240	* direction 4, 14, or 16 to get back to where we are.
2200	* Moved from spell_util.c to object.c with the other related direction	2241	* Moved from spell_util.c to object.c with the other related direction
2201	* functions.	2242	* functions.
2202	*/	2243	*/
2203	int reduction_dir[SIZEOFFREE][3] = {	2244	static const int reduction_dir[SIZEOFFREE][3] = {
2204	{0, 0, 0}, /* 0 */	2245	{0, 0, 0}, /* 0 */
2205	{0, 0, 0}, /* 1 */	2246	{0, 0, 0}, /* 1 */
2206	{0, 0, 0}, /* 2 */	2247	{0, 0, 0}, /* 2 */
2207	{0, 0, 0}, /* 3 */	2248	{0, 0, 0}, /* 3 */
2208	{0, 0, 0}, /* 4 */	2249	{0, 0, 0}, /* 4 */
…		…
2304	int	2345	int
2305	can_pick (const object *who, const object *item)	2346	can_pick (const object *who, const object *item)
2306	{	2347	{
2307	return /*QUERY_FLAG(who,FLAG_WIZ)|| */	2348	return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2308	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&	2349	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
2309	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3));	2350	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->is_player () || item->weight < who->weight / 3));
2310	}	2351	}
2311		2352
2312	/*	2353	/*
2313	* create clone from object to another	2354	* create clone from object to another
2314	*/	2355	*/
2315	object *	2356	object *
2316	object_create_clone (object *asrc)	2357	object::deep_clone ()
2317	{	2358	{
2318	object *dst = 0, *tmp, *src, *prev, *item;	2359	assert (("deep_clone called on non-head object", is_head ()));
2319		2360
2320	if (!asrc)	2361	object *dst = clone ();
2321	return 0;
2322		2362
2323	src = asrc->head_ ();	2363	object *prev = dst;
2324
2325	prev = 0;
2326	for (object *part = src; part; part = part->more)	2364	for (object *part = this->more; part; part = part->more)
2327	{	2365	{
2328	tmp = part->clone ();	2366	object *tmp = part->clone ();
2329	tmp->x -= src->x;
2330	tmp->y -= src->y;
2331
2332	if (!part->head)
2333	{
2334	dst = tmp;
2335	tmp->head = 0;
2336	}
2337	else
2338	tmp->head = dst;	2367	tmp->head = dst;
2339
2340	tmp->more = 0;
2341
2342	if (prev)
2343	prev->more = tmp;	2368	prev->more = tmp;
2344
2345	prev = tmp;	2369	prev = tmp;
2346	}	2370	}
2347		2371
2348	for (item = src->inv; item; item = item->below)	2372	for (object *item = inv; item; item = item->below)
2349	insert_ob_in_ob (object_create_clone (item), dst);	2373	insert_ob_in_ob (item->deep_clone (), dst);
2350		2374
2351	return dst;	2375	return dst;
2352	}	2376	}
2353		2377
2354	/* This returns the first object in who's inventory that	2378	/* This returns the first object in who's inventory that
…		…
2363	return tmp;	2387	return tmp;
2364		2388
2365	return 0;	2389	return 0;
2366	}	2390	}
2367		2391
2368	/* If ob has a field named key, return the link from the list,	2392	shstr_tmp
2369	* otherwise return NULL.	2393	object::kv_get (shstr_tmp key) const
2370	*
2371	* key must be a passed in shared string - otherwise, this won't
2372	* do the desired thing.
2373	*/
2374	key_value *
2375	get_ob_key_link (const object *ob, const char *key)
2376	{	2394	{
2377	for (key_value *link = ob->key_values; link; link = link->next)	2395	for (key_value *kv = key_values; kv; kv = kv->next)
2378	if (link->key == key)	2396	if (kv->key == key)
2379	return link;
2380
2381	return 0;
2382	}
2383
2384	/*
2385	* Returns the value of op has an extra_field for key, or NULL.
2386	*
2387	* The argument doesn't need to be a shared string.
2388	*
2389	* The returned string is shared.
2390	*/
2391	const char *
2392	get_ob_key_value (const object *op, const char *const key)
2393	{
2394	key_value *link;
2395	shstr_cmp canonical_key (key);
2396
2397	if (!canonical_key)
2398	{
2399	/* 1. There being a field named key on any object
2400	* implies there'd be a shared string to find.
2401	* 2. Since there isn't, no object has this field.
2402	* 3. Therefore, *this* object doesn't have this field.
2403	*/
2404	return 0;
2405	}
2406
2407	/* This is copied from get_ob_key_link() above -
2408	* only 4 lines, and saves the function call overhead.
2409	*/
2410	for (link = op->key_values; link; link = link->next)
2411	if (link->key == canonical_key)
2412	return link->value;	2397	return kv->value;
2413		2398
2414	return 0;	2399	return shstr ();
2415	}	2400	}
2416		2401
2417	/*	2402	void
2418	* Updates the canonical_key in op to value.	2403	object::kv_set (shstr_tmp key, shstr_tmp value)
2419	*
2420	* canonical_key is a shared string (value doesn't have to be).
2421	*
2422	* Unless add_key is TRUE, it won't add fields, only change the value of existing
2423	* keys.
2424	*
2425	* Returns TRUE on success.
2426	*/
2427	int
2428	set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key)
2429	{	2404	{
2430	key_value *field = NULL, *last = NULL;	2405	for (key_value *kv = key_values; kv; kv = kv->next)
2431		2406	if (kv->key == key)
2432	for (field = op->key_values; field != NULL; field = field->next)
2433	{
2434	if (field->key != canonical_key)
2435	{	2407	{
2436	last = field;	2408	kv->value = value;
2437	continue;	2409	return;
2438	}	2410	}
2439		2411
2440	if (value)	2412	key_value *kv = new key_value;
2441	field->value = value;	2413
2442	else	2414	kv->next = key_values;
		2415	kv->key = key;
		2416	kv->value = value;
		2417
		2418	key_values = kv;
		2419	}
		2420
		2421	void
		2422	object::kv_del (shstr_tmp key)
		2423	{
		2424	for (key_value **kvp = &key_values; *kvp; kvp = &(*kvp)->next)
		2425	if ((*kvp)->key == key)
2443	{	2426	{
2444	/* Basically, if the archetype has this key set,	2427	key_value *kv = *kvp;
2445	* we need to store the null value so when we save	2428	*kvp = (*kvp)->next;
2446	* it, we save the empty value so that when we load,	2429	delete kv;
2447	* we get this value back again.	2430	return;
2448	*/
2449	if (get_ob_key_link (op->arch, canonical_key))
2450	field->value = 0;
2451	else
2452	{
2453	if (last)
2454	last->next = field->next;
2455	else
2456	op->key_values = field->next;
2457
2458	delete field;
2459	}
2460	}	2431	}
2461	return TRUE;
2462	}
2463	/* IF we get here, key doesn't exist */
2464
2465	/* No field, we'll have to add it. */
2466
2467	if (!add_key)
2468	return FALSE;
2469
2470	/* There isn't any good reason to store a null
2471	* value in the key/value list. If the archetype has
2472	* this key, then we should also have it, so shouldn't
2473	* be here. If user wants to store empty strings,
2474	* should pass in ""
2475	*/
2476	if (value == NULL)
2477	return TRUE;
2478
2479	field = new key_value;
2480
2481	field->key = canonical_key;
2482	field->value = value;
2483	/* Usual prepend-addition. */
2484	field->next = op->key_values;
2485	op->key_values = field;
2486
2487	return TRUE;
2488	}
2489
2490	/*
2491	* Updates the key in op to value.
2492	*
2493	* If add_key is FALSE, this will only update existing keys,
2494	* and not add new ones.
2495	* In general, should be little reason FALSE is ever passed in for add_key
2496	*
2497	* Returns TRUE on success.
2498	*/
2499	int
2500	set_ob_key_value (object *op, const char *key, const char *value, int add_key)
2501	{
2502	shstr key_ (key);
2503
2504	return set_ob_key_value_s (op, key_, value, add_key);
2505	}	2432	}
2506		2433
2507	object::depth_iterator::depth_iterator (object *container)	2434	object::depth_iterator::depth_iterator (object *container)
2508	: iterator_base (container)	2435	: iterator_base (container)
2509	{	2436	{
…		…
2559	{	2486	{
2560	char flagdesc[512];	2487	char flagdesc[512];
2561	char info2[256 * 4];	2488	char info2[256 * 4];
2562	char *p = info;	2489	char *p = info;
2563		2490
2564	p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s,flags:[%s],type:%d}",	2491	p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s%s,flags:[%s],type:%d}",
2565	count,	2492	count,
2566	uuid.c_str (),	2493	uuid.c_str (),
2567	&name,	2494	&name,
2568	title ? "\",title:\"" : "",	2495	title ? ",title:\"" : "",
2569	title ? (const char *)title : "",	2496	title ? (const char *)title : "",
		2497	title ? "\"" : "",
2570	flag_desc (flagdesc, 512), type);	2498	flag_desc (flagdesc, 512), type);
2571		2499
2572	if (!this->flag[FLAG_REMOVED] && env)	2500	if (!flag[FLAG_REMOVED] && env)
2573	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2501	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2574		2502
2575	if (map)	2503	if (map)
2576	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);	2504	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2577		2505
…		…
2592	{	2520	{
2593	return map ? map->region (x, y)	2521	return map ? map->region (x, y)
2594	: region::default_region ();	2522	: region::default_region ();
2595	}	2523	}
2596		2524
2597	const materialtype_t *
2598	object::dominant_material () const
2599	{
2600	if (materialtype_t *mt = name_to_material (materialname))
2601	return mt;
2602
2603	return name_to_material (shstr_unknown);
2604	}
2605
2606	void	2525	void
2607	object::open_container (object *new_container)	2526	object::open_container (object *new_container)
2608	{	2527	{
2609	if (container == new_container)	2528	if (container == new_container)
2610	return;	2529	return;
2611		2530
2612	if (object *old_container = container)	2531	object *old_container = container;
		2532
		2533	if (old_container)
2613	{	2534	{
2614	if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))	2535	if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
2615	return;	2536	return;
2616		2537
2617	#if 0	2538	#if 0
…		…
2619	if (object *closer = old_container->inv)	2540	if (object *closer = old_container->inv)
2620	if (closer->type == CLOSE_CON)	2541	if (closer->type == CLOSE_CON)
2621	closer->destroy ();	2542	closer->destroy ();
2622	#endif	2543	#endif
2623		2544
		2545	// make sure the container is available
		2546	esrv_send_item (this, old_container);
		2547
2624	old_container->flag [FLAG_APPLIED] = false;	2548	old_container->flag [FLAG_APPLIED] = false;
2625	container = 0;	2549	container = 0;
2626		2550
		2551	// client needs item update to make it work, client bug requires this to be separate
2627	esrv_update_item (UPD_FLAGS, this, old_container);	2552	esrv_update_item (UPD_FLAGS, this, old_container);
		2553
2628	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));	2554	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", old_container->query_name ());
2629	play_sound (sound_find ("chest_close"));	2555	play_sound (sound_find ("chest_close"));
2630	}	2556	}
2631		2557
2632	if (new_container)	2558	if (new_container)
2633	{	2559	{
…		…
2643	closer->flag [FLAG_NO_MAP_SAVE] = 1;	2569	closer->flag [FLAG_NO_MAP_SAVE] = 1;
2644	new_container->insert (closer);	2570	new_container->insert (closer);
2645	}	2571	}
2646	#endif	2572	#endif
2647		2573
2648	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));	2574	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", new_container->query_name ());
		2575
		2576	// make sure the container is available, client bug requires this to be separate
		2577	esrv_send_item (this, new_container);
2649		2578
2650	new_container->flag [FLAG_APPLIED] = true;	2579	new_container->flag [FLAG_APPLIED] = true;
2651	container = new_container;	2580	container = new_container;
2652		2581
		2582	// client needs flag change
2653	esrv_update_item (UPD_FLAGS, this, new_container);	2583	esrv_update_item (UPD_FLAGS, this, new_container);
2654	esrv_send_inventory (this, new_container);	2584	esrv_send_inventory (this, new_container);
2655	play_sound (sound_find ("chest_open"));	2585	play_sound (sound_find ("chest_open"));
2656	}	2586	}
		2587	// else if (!old_container->env && contr && contr->ns)
		2588	// contr->ns->floorbox_reset ();
2657	}	2589	}
2658		2590
2659	object *	2591	object *
2660	object::force_find (const shstr name)	2592	object::force_find (shstr_tmp name)
2661	{	2593	{
2662	/* cycle through his inventory to look for the MARK we want to	2594	/* cycle through his inventory to look for the MARK we want to
2663	* place	2595	* place
2664	*/	2596	*/
2665	for (object *tmp = inv; tmp; tmp = tmp->below)	2597	for (object *tmp = inv; tmp; tmp = tmp->below)
…		…
2667	return splay (tmp);	2599	return splay (tmp);
2668		2600
2669	return 0;	2601	return 0;
2670	}	2602	}
2671		2603
		2604	//-GPL
		2605
2672	void	2606	void
		2607	object::force_set_timer (int duration)
		2608	{
		2609	this->duration = 1;
		2610	this->speed_left = -1.f;
		2611
		2612	this->set_speed (duration ? 1.f / duration : 0.f);
		2613	}
		2614
		2615	object *
2673	object::force_add (const shstr name, int duration)	2616	object::force_add (shstr_tmp name, int duration)
2674	{	2617	{
2675	if (object *force = force_find (name))	2618	if (object *force = force_find (name))
2676	force->destroy ();	2619	force->destroy ();
2677		2620
2678	object *force = get_archetype (FORCE_NAME);	2621	object *force = get_archetype (FORCE_NAME);
2679		2622
2680	force->slaying = name;	2623	force->slaying = name;
2681	force->stats.food = 1;	2624	force->force_set_timer (duration);
2682	force->speed_left = -1.f;
2683
2684	force->set_speed (duration ? 1.f / duration : 0.f);
2685	force->flag [FLAG_IS_USED_UP] = true;
2686	force->flag [FLAG_APPLIED] = true;	2625	force->flag [FLAG_APPLIED] = true;
2687		2626
2688	insert (force);	2627	return insert (force);
2689	}	2628	}
2690		2629
2691	void	2630	void
2692	object::play_sound (faceidx sound)	2631	object::play_sound (faceidx sound) const
2693	{	2632	{
2694	if (!sound)	2633	if (!sound)
2695	return;	2634	return;
2696		2635
2697	if (flag [FLAG_REMOVED])	2636	if (is_on_map ())
		2637	map->play_sound (sound, x, y);
		2638	else if (object *pl = in_player ())
		2639	pl->contr->play_sound (sound);
		2640	}
		2641
		2642	void
		2643	object::say_msg (const char *msg) const
		2644	{
		2645	if (is_on_map ())
		2646	map->say_msg (msg, x, y);
		2647	else if (object *pl = in_player ())
		2648	pl->contr->play_sound (sound);
		2649	}
		2650
		2651	void
		2652	object::make_noise ()
		2653	{
		2654	// we do not model noise in the map, so instead put
		2655	// a temporary light into the noise source
		2656	// could use the map instead, but that's less reliable for our
		2657	// goal, which is to make invisibility a bit harder to exploit
		2658
		2659	// currently only works sensibly for players
		2660	if (!is_player ())
2698	return;	2661	return;
2699		2662
2700	if (env)	2663	// find old force, or create new one
2701	{	2664	object *force = force_find (shstr_noise_force);
2702	if (object *pl = in_player ())	2665
2703	pl->contr->play_sound (sound);	2666	if (force)
2704	}	2667	force->speed_left = -1.f; // patch old speed up
2705	else	2668	else
2706	map->play_sound (sound, x, y);	2669	{
2707	}	2670	force = archetype::get (shstr_noise_force);
2708		2671
		2672	force->slaying = shstr_noise_force;
		2673	force->stats.food = 1;
		2674	force->speed_left = -1.f;
		2675
		2676	force->set_speed (1.f / 4.f);
		2677	force->flag [FLAG_IS_USED_UP] = true;
		2678	force->flag [FLAG_APPLIED] = true;
		2679
		2680	insert (force);
		2681	}
		2682	}
		2683

Diff Legend

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