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.218 by root, Wed Apr 23 07:25:54 2008 UTC vs.
Revision 1.304 by root, Tue Nov 10 16:29:20 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
		62	};
		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
64	};	69	};
65		70
66	static void	71	static void
67	write_uuid (uval64 skip, bool sync)	72	write_uuid (uval64 skip, bool sync)
68	{	73	{
…		…
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
647	/*
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		691
660	if (speed < 0)	692	if (speed < 0)
661	dst->speed_left -= rndm ();	693	dst->speed_left -= rndm ();
662		694
663	dst->set_speed (dst->speed);	695	dst->activate ();
664	}	696	}
665		697
666	void	698	void
667	object::instantiate ()	699	object::instantiate ()
668	{	700	{
…		…
685	object *	717	object *
686	object::clone ()	718	object::clone ()
687	{	719	{
688	object *neu = create ();	720	object *neu = create ();
689	copy_to (neu);	721	copy_to (neu);
		722	neu->map = map; // not copied by copy_to
690	return neu;	723	return neu;
691	}	724	}
692		725
693	/*	726	/*
694	* If an object with the IS_TURNABLE() flag needs to be turned due	727	* 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.	744	* This function needs to be called whenever the speed of an object changes.
712	*/	745	*/
713	void	746	void
714	object::set_speed (float speed)	747	object::set_speed (float speed)
715	{	748	{
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;	749	this->speed = speed;
723		750
724	if (has_active_speed ())	751	if (has_active_speed ())
725	activate ();	752	activate ();
726	else	753	else
…		…
745	* UP_OBJ_FACE: only the objects face has changed.	772	* UP_OBJ_FACE: only the objects face has changed.
746	*/	773	*/
747	void	774	void
748	update_object (object *op, int action)	775	update_object (object *op, int action)
749	{	776	{
750	if (op == NULL)	777	if (!op)
751	{	778	{
752	/* this should never happen */	779	/* this should never happen */
753	LOG (llevDebug, "update_object() called for NULL object.\n");	780	LOG (llevError | logBacktrace, "update_object() called for NULL object.\n");
754	return;	781	return;
755	}	782	}
756		783
757	if (op->env)	784	if (!op->is_on_map ())
758	{	785	{
759	/* Animation is currently handled by client, so nothing	786	/* Animation is currently handled by client, so nothing
760	* to do in this case.	787	* to do in this case.
761	*/	788	*/
762	return;	789	return;
763	}	790	}
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		791
771	/* make sure the object is within map boundaries */	792	/* 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)	793	if (op->x < 0 || op->x >= op->map->width || op->y < 0 || op->y >= op->map->height)
773	{	794	{
774	LOG (llevError, "update_object() called for object out of map!\n");	795	LOG (llevError, "update_object() called for object out of map!\n");
…		…
782		803
783	if (!(m.flags_ & P_UPTODATE))	804	if (!(m.flags_ & P_UPTODATE))
784	/* nop */;	805	/* nop */;
785	else if (action == UP_OBJ_INSERT)	806	else if (action == UP_OBJ_INSERT)
786	{	807	{
		808	#if 0
787	// this is likely overkill, TODO: revisit (schmorp)	809	// this is likely overkill, TODO: revisit (schmorp)
788	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))	810	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
789	|| (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))	811	|| (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))
790	|| (op->type == PLAYER && !(m.flags_ & P_PLAYER))	812	|| (op->is_player () && !(m.flags_ & P_PLAYER))
791	|| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))	813	|| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
792	|| (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))	814	|| (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))
793	|| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))	815	|| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))
794	|| (m.move_on | op->move_on ) != m.move_on	816	|| (m.move_on | op->move_on ) != m.move_on
795	|| (m.move_off | op->move_off ) != m.move_off	817	|| (m.move_off | op->move_off ) != m.move_off
796	|| (m.move_slow | op->move_slow) != m.move_slow	818	|| (m.move_slow | op->move_slow) != m.move_slow
797	/* This isn't perfect, but I don't expect a lot of objects to	819	/* This isn't perfect, but I don't expect a lot of objects to
798	* to have move_allow right now.	820	* have move_allow right now.
799	*/	821	*/
800	|| ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block	822	|| ((m.move_block | op->move_block) & ~op->move_allow) != m.move_block
		823	m.invalidate ();
		824	#else
801	|| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)	825	// the above is not strong enough a test to skip updating. los maybe? TODO (schmorp)
802	m.flags_ = 0;	826	m.invalidate ();
		827	#endif
803	}	828	}
804	/* if the object is being removed, we can't make intelligent	829	/* if the object is being removed, we can't make intelligent
805	* decisions, because remove_ob can't really pass the object	830	* decisions, because remove_ob can't really pass the object
806	* that is being removed.	831	* that is being removed.
807	*/	832	*/
808	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)	833	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
809	m.flags_ = 0;	834	m.invalidate ();
810	else if (action == UP_OBJ_FACE)	835	else if (action == UP_OBJ_FACE)
811	/* Nothing to do for that case */ ;	836	/* Nothing to do for that case */ ;
812	else	837	else
813	LOG (llevError, "update_object called with invalid action: %d\n", action);	838	LOG (llevError, "update_object called with invalid action: %d\n", action);
814		839
…		…
818		843
819	object::object ()	844	object::object ()
820	{	845	{
821	SET_FLAG (this, FLAG_REMOVED);	846	SET_FLAG (this, FLAG_REMOVED);
822		847
823	expmul = 1.0;	848	//expmul = 1.0; declared const for the time being
824	face = blank_face;	849	face = blank_face;
		850	material = MATERIAL_NULL;
825	}	851	}
826		852
827	object::~object ()	853	object::~object ()
828	{	854	{
829	unlink ();	855	unlink ();
…		…
858	/* If already on active list, don't do anything */	884	/* If already on active list, don't do anything */
859	if (active)	885	if (active)
860	return;	886	return;
861		887
862	if (has_active_speed ())	888	if (has_active_speed ())
		889	{
		890	if (flag [FLAG_FREED])
		891	LOG (llevError | logBacktrace, "BUG: tried to activate freed object %s\n", debug_desc ());//D
		892
863	actives.insert (this);	893	actives.insert (this);
		894	}
864	}	895	}
865		896
866	void	897	void
867	object::activate_recursive ()	898	object::activate_recursive ()
868	{	899	{
…		…
929	* drop on that space.	960	* drop on that space.
930	*/	961	*/
931	if (!drop_to_ground	962	if (!drop_to_ground
932	|| !map	963	|| !map
933	|| map->in_memory != MAP_ACTIVE	964	|| map->in_memory != MAP_ACTIVE
934	|| map->nodrop	965	|| map->no_drop
935	|| ms ().move_block == MOVE_ALL)	966	|| ms ().move_block == MOVE_ALL)
936	{	967	{
937	while (inv)	968	while (inv)
938	{
939	inv->destroy_inv (false);
940	inv->destroy ();	969	inv->destroy ();
941	}
942	}	970	}
943	else	971	else
944	{ /* Put objects in inventory onto this space */	972	{ /* Put objects in inventory onto this space */
945	while (inv)	973	while (inv)
946	{	974	{
…		…
950	|| op->flag [FLAG_NO_DROP]	978	|| op->flag [FLAG_NO_DROP]
951	|| op->type == RUNE	979	|| op->type == RUNE
952	|| op->type == TRAP	980	|| op->type == TRAP
953	|| op->flag [FLAG_IS_A_TEMPLATE]	981	|| op->flag [FLAG_IS_A_TEMPLATE]
954	|| op->flag [FLAG_DESTROY_ON_DEATH])	982	|| op->flag [FLAG_DESTROY_ON_DEATH])
955	op->destroy (true);	983	op->destroy ();
956	else	984	else
957	map->insert (op, x, y);	985	map->insert (op, x, y);
958	}	986	}
959	}	987	}
960	}	988	}
…		…
964	object *op = new object;	992	object *op = new object;
965	op->link ();	993	op->link ();
966	return op;	994	return op;
967	}	995	}
968		996
		997	static struct freed_map : maptile
		998	{
		999	freed_map ()
		1000	{
		1001	path = "<freed objects map>";
		1002	name = "/internal/freed_objects_map";
		1003	width = 3;
		1004	height = 3;
		1005	no_drop = 1;
		1006	no_reset = 1;
		1007
		1008	alloc ();
		1009	in_memory = MAP_ACTIVE;
		1010	}
		1011
		1012	~freed_map ()
		1013	{
		1014	destroy ();
		1015	}
		1016	} freed_map; // freed objects are moved here to avoid crashes
		1017
969	void	1018	void
970	object::do_destroy ()	1019	object::do_destroy ()
971	{	1020	{
972	if (flag [FLAG_IS_LINKED])	1021	if (flag [FLAG_IS_LINKED])
973	remove_button_link (this);	1022	remove_link ();
974		1023
975	if (flag [FLAG_FRIENDLY])	1024	if (flag [FLAG_FRIENDLY])
976	remove_friendly_object (this);	1025	remove_friendly_object (this);
977		1026
978	remove ();	1027	remove ();
…		…
983	unlink ();	1032	unlink ();
984		1033
985	flag [FLAG_FREED] = 1;	1034	flag [FLAG_FREED] = 1;
986		1035
987	// hack to ensure that freed objects still have a valid map	1036	// hack to ensure that freed objects still have a valid map
988	{
989	static maptile *freed_map; // freed objects are moved here to avoid crashes
990
991	if (!freed_map)
992	{
993	freed_map = new maptile;
994
995	freed_map->path = "<freed objects map>";
996	freed_map->name = "/internal/freed_objects_map";
997	freed_map->width = 3;
998	freed_map->height = 3;
999	freed_map->nodrop = 1;
1000
1001	freed_map->alloc ();
1002	freed_map->in_memory = MAP_ACTIVE;
1003	}
1004
1005	map = freed_map;	1037	map = &freed_map;
1006	x = 1;	1038	x = 1;
1007	y = 1;	1039	y = 1;
1008	}
1009		1040
1010	if (more)	1041	if (more)
1011	{	1042	{
1012	more->destroy ();	1043	more->destroy ();
1013	more = 0;	1044	more = 0;
…		…
1021	attacked_by = 0;	1052	attacked_by = 0;
1022	current_weapon = 0;	1053	current_weapon = 0;
1023	}	1054	}
1024		1055
1025	void	1056	void
1026	object::destroy (bool destroy_inventory)	1057	object::destroy ()
1027	{	1058	{
1028	if (destroyed ())	1059	if (destroyed ())
1029	return;	1060	return;
1030		1061
1031	destroy_inv (!destroy_inventory);	1062	if (!is_head () && !head->destroyed ())
		1063	{
		1064	LOG (llevError | logBacktrace, "tried to destroy the tail of an object");
		1065	head->destroy ();
		1066	return;
		1067	}
		1068
		1069	destroy_inv (false);
1032		1070
1033	if (is_head ())	1071	if (is_head ())
1034	if (sound_destroy)	1072	if (sound_destroy)
1035	play_sound (sound_destroy);	1073	play_sound (sound_destroy);
1036	else if (flag [FLAG_MONSTER])	1074	else if (flag [FLAG_MONSTER])
…		…
1047	* the previous environment.	1085	* the previous environment.
1048	*/	1086	*/
1049	void	1087	void
1050	object::do_remove ()	1088	object::do_remove ()
1051	{	1089	{
1052	object *tmp, *last = 0;
1053	object *otmp;
1054
1055	if (flag [FLAG_REMOVED])	1090	if (flag [FLAG_REMOVED])
1056	return;	1091	return;
1057		1092
1058	INVOKE_OBJECT (REMOVE, this);	1093	INVOKE_OBJECT (REMOVE, this);
1059
1060	if (object *pl = visible_to ())
1061	esrv_del_item (pl->contr, count);
1062		1094
1063	flag [FLAG_REMOVED] = true;	1095	flag [FLAG_REMOVED] = true;
1064		1096
1065	if (more)	1097	if (more)
1066	more->remove ();	1098	more->remove ();
…		…
1069	* In this case, the object to be removed is in someones	1101	* In this case, the object to be removed is in someones
1070	* inventory.	1102	* inventory.
1071	*/	1103	*/
1072	if (env)	1104	if (env)
1073	{	1105	{
		1106	flag [FLAG_REMOVED] = false; // hack around the issue of visible_to checking flag_removed
		1107	if (object *pl = visible_to ())
		1108	esrv_del_item (pl->contr, count);
		1109	flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed
		1110
1074	adjust_weight (env, -total_weight ());	1111	adjust_weight (env, -total_weight ());
1075		1112
1076	*(above ? &above->below : &env->inv) = below;	1113	object *pl = in_player ();
1077
1078	if (below)
1079	below->above = above;
1080		1114
1081	/* we set up values so that it could be inserted into	1115	/* we set up values so that it could be inserted into
1082	* the map, but we don't actually do that - it is up	1116	* the map, but we don't actually do that - it is up
1083	* to the caller to decide what we want to do.	1117	* to the caller to decide what we want to do.
1084	*/	1118	*/
1085	map = env->map;	1119	map = env->map;
1086	x = env->x;	1120	x = env->x;
1087	y = env->y;	1121	y = env->y;
		1122
		1123	// make sure cmov optimisation is applicable
		1124	*(above ? &above->below : &env->inv) = below;
		1125	*(below ? &below->above : &above ) = above; // &above is just a dummy
		1126
1088	above = 0;	1127	above = 0;
1089	below = 0;	1128	below = 0;
1090	env = 0;	1129	env = 0;
1091		1130
1092	/* NO_FIX_PLAYER is set when a great many changes are being	1131	/* NO_FIX_PLAYER is set when a great many changes are being
1093	* made to players inventory. If set, avoiding the call	1132	* made to players inventory. If set, avoiding the call
1094	* to save cpu time.	1133	* to save cpu time.
1095	*/	1134	*/
1096	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1135	if (pl)
		1136	if (pl->is_player () && (glow_radius || !QUERY_FLAG (pl, FLAG_NO_FIX_PLAYER)))
		1137	{
1097	otmp->update_stats ();	1138	pl->update_stats ();
		1139
		1140	if (glow_radius && pl->is_on_map ())
		1141	update_all_los (pl->map, pl->x, pl->y);
		1142	}
1098	}	1143	}
1099	else if (map)	1144	else if (map)
1100	{	1145	{
1101	if (type == PLAYER)
1102	{
1103	// leaving a spot always closes any open container on the ground
1104	if (container && !container->env)
1105	// this causes spurious floorbox updates, but it ensures
1106	// that the CLOSE event is being sent.
1107	close_container ();
1108
1109	--map->players;
1110	map->touch ();
1111	}
1112
1113	map->dirty = true;	1146	map->dirty = true;
1114	mapspace &ms = this->ms ();	1147	mapspace &ms = this->ms ();
1115		1148
		1149	if (object *pl = ms.player ())
		1150	{
		1151	if (is_player ())
		1152	{
		1153	if (!flag [FLAG_WIZPASS])
		1154	ms.smell = ++mapspace::smellcount; // remember the smell of the player
		1155
		1156	// leaving a spot always closes any open container on the ground
		1157	if (container && !container->env)
		1158	// this causes spurious floorbox updates, but it ensures
		1159	// that the CLOSE event is being sent.
		1160	close_container ();
		1161
		1162	--map->players;
		1163	map->touch ();
		1164	}
		1165	else if (pl->container_ () == this)
		1166	{
		1167	// removing a container should close it
		1168	close_container ();
		1169	}
		1170
		1171	esrv_del_item (pl->contr, count);
		1172	}
		1173
1116	/* link the object above us */	1174	/* link the object above us */
1117	if (above)	1175	// re-link, make sure compiler can easily use cmove
1118	above->below = below;	1176	*(above ? &above->below : &ms.top) = below;
1119	else	1177	*(below ? &below->above : &ms.bot) = above;
1120	ms.top = below; /* we were top, set new top */
1121
1122	/* Relink the object below us, if there is one */
1123	if (below)
1124	below->above = above;
1125	else
1126	{
1127	/* Nothing below, which means we need to relink map object for this space
1128	* use translated coordinates in case some oddness with map tiling is
1129	* evident
1130	*/
1131	if (GET_MAP_OB (map, x, y) != this)
1132	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 ());
1133
1134	ms.bot = above; /* goes on above it. */
1135	}
1136		1178
1137	above = 0;	1179	above = 0;
1138	below = 0;	1180	below = 0;
1139		1181
		1182	ms.invalidate ();
		1183
1140	if (map->in_memory == MAP_SAVING)	1184	if (map->in_memory == MAP_SAVING)
1141	return;	1185	return;
1142		1186
1143	int check_walk_off = !flag [FLAG_NO_APPLY];	1187	int check_walk_off = !flag [FLAG_NO_APPLY];
1144		1188
1145	if (object *pl = ms.player ())	1189	if (object *pl = ms.player ())
1146	{	1190	{
1147	if (pl->container == this)	1191	if (pl->container_ () == this)
1148	/* If a container that the player is currently using somehow gets	1192	/* If a container that the player is currently using somehow gets
1149	* removed (most likely destroyed), update the player view	1193	* removed (most likely destroyed), update the player view
1150	* appropriately.	1194	* appropriately.
1151	*/	1195	*/
1152	pl->close_container ();	1196	pl->close_container ();
1153		1197
1154	//TODO: the floorbox prev/next might need updating	1198	//TODO: the floorbox prev/next might need updating
1155	esrv_del_item (pl->contr, count);	1199	//esrv_del_item (pl->contr, count);
		1200	//TODO: update floorbox to preserve ordering
		1201	if (pl->contr->ns)
		1202	pl->contr->ns->floorbox_update ();
1156	}	1203	}
1157		1204
		1205	if (check_walk_off)
1158	for (tmp = ms.bot; tmp; tmp = tmp->above)	1206	for (object *above, *tmp = ms.bot; tmp; tmp = above)
1159	{	1207	{
		1208	above = tmp->above;
		1209
1160	/* No point updating the players look faces if he is the object	1210	/* No point updating the players look faces if he is the object
1161	* being removed.	1211	* being removed.
1162	*/	1212	*/
1163		1213
1164	/* See if object moving off should effect something */	1214	/* See if object moving off should effect something */
1165	if (check_walk_off
1166	&& ((move_type & tmp->move_off)	1215	if ((move_type & tmp->move_off)
1167	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))	1216	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0)
1168	{
1169	move_apply (tmp, this, 0);	1217	move_apply (tmp, this, 0);
1170
1171	if (destroyed ())
1172	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1173	}	1218	}
1174		1219
1175	last = tmp;	1220	if (affects_los ())
1176	}
1177
1178	/* last == NULL if there are no objects on this space */
1179	//TODO: this makes little sense, why only update the topmost object?
1180	if (!last)
1181	map->at (x, y).flags_ = 0;
1182	else
1183	update_object (last, UP_OBJ_REMOVE);
1184
1185	if (flag [FLAG_BLOCKSVIEW] || glow_radius)
1186	update_all_los (map, x, y);	1221	update_all_los (map, x, y);
1187	}	1222	}
1188	}	1223	}
1189		1224
1190	/*	1225	/*
…		…
1214	esrv_update_item (UPD_NROF, pl, top);	1249	esrv_update_item (UPD_NROF, pl, top);
1215		1250
1216	op->weight = 0; // cancel the addition above	1251	op->weight = 0; // cancel the addition above
1217	op->carrying = 0; // must be 0 already	1252	op->carrying = 0; // must be 0 already
1218		1253
1219	op->destroy (1);	1254	op->destroy ();
1220		1255
1221	return top;	1256	return top;
1222	}	1257	}
1223		1258
1224	return 0;	1259	return 0;
…		…
1252	* job preparing multi-part monsters.	1287	* job preparing multi-part monsters.
1253	*/	1288	*/
1254	object *	1289	object *
1255	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)	1290	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1256	{	1291	{
		1292	op->remove ();
		1293
1257	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)	1294	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1258	{	1295	{
1259	tmp->x = x + tmp->arch->x;	1296	tmp->x = x + tmp->arch->x;
1260	tmp->y = y + tmp->arch->y;	1297	tmp->y = y + tmp->arch->y;
1261	}	1298	}
…		…
1284	* just 'op' otherwise	1321	* just 'op' otherwise
1285	*/	1322	*/
1286	object *	1323	object *
1287	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)	1324	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1288	{	1325	{
1289	assert (!op->flag [FLAG_FREED]);
1290
1291	op->remove ();	1326	op->remove ();
		1327
		1328	if (m == &freed_map)//D TODO: remove soon
		1329	{//D
		1330	LOG (llevError | logBacktrace, "tries to insret object on freed objects map: %s", op->debug_desc ());//D
		1331	}//D
1292		1332
1293	/* Ideally, the caller figures this out. However, it complicates a lot	1333	/* Ideally, the caller figures this out. However, it complicates a lot
1294	* of areas of callers (eg, anything that uses find_free_spot would now	1334	* of areas of callers (eg, anything that uses find_free_spot would now
1295	* need extra work	1335	* need extra work
1296	*/	1336	*/
		1337	maptile *newmap = m;
1297	if (!xy_normalise (m, op->x, op->y))	1338	if (!xy_normalise (newmap, op->x, op->y))
1298	{	1339	{
1299	op->destroy (1);	1340	op->head_ ()->destroy ();// remove head_ once all tail object destroyers found
1300	return 0;	1341	return 0;
1301	}	1342	}
1302		1343
1303	if (object *more = op->more)	1344	if (object *more = op->more)
1304	if (!insert_ob_in_map (more, m, originator, flag))	1345	if (!insert_ob_in_map (more, m, originator, flag))
1305	return 0;	1346	return 0;
1306		1347
1307	CLEAR_FLAG (op, FLAG_REMOVED);	1348	op->flag [FLAG_REMOVED] = false;
1308		1349	op->env = 0;
1309	op->map = m;	1350	op->map = newmap;
		1351
1310	mapspace &ms = op->ms ();	1352	mapspace &ms = op->ms ();
1311		1353
1312	/* this has to be done after we translate the coordinates.	1354	/* this has to be done after we translate the coordinates.
1313	*/	1355	*/
1314	if (op->nrof && !(flag & INS_NO_MERGE))	1356	if (op->nrof && !(flag & INS_NO_MERGE))
1315	for (object *tmp = ms.bot; tmp; tmp = tmp->above)	1357	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1316	if (object::can_merge (op, tmp))	1358	if (object::can_merge (op, tmp))
1317	{	1359	{
1318	// TODO: we atcually want to update tmp, not op,	1360	// TODO: we actually want to update tmp, not op,
1319	// but some caller surely breaks when we return tmp	1361	// but some caller surely breaks when we return tmp
1320	// from here :/	1362	// from here :/
1321	op->nrof += tmp->nrof;	1363	op->nrof += tmp->nrof;
1322	tmp->destroy (1);	1364	tmp->destroy ();
1323	}	1365	}
1324		1366
1325	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1367	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1326	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1368	CLEAR_FLAG (op, FLAG_INV_LOCKED);
1327		1369
…		…
1334	{	1376	{
1335	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");	1377	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");
1336	abort ();	1378	abort ();
1337	}	1379	}
1338		1380
		1381	if (!originator->is_on_map ())
		1382	{
		1383	LOG (llevError, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map",
		1384	op->debug_desc (), originator->debug_desc ());
		1385	abort ();
		1386	}
		1387
1339	op->above = originator;	1388	op->above = originator;
1340	op->below = originator->below;	1389	op->below = originator->below;
1341
1342	if (op->below)
1343	op->below->above = op;
1344	else
1345	ms.bot = op;
1346
1347	/* since *below* originator, no need to update top */
1348	originator->below = op;	1390	originator->below = op;
		1391
		1392	*(op->below ? &op->below->above : &ms.bot) = op;
1349	}	1393	}
1350	else	1394	else
1351	{	1395	{
1352	object *top, *floor = NULL;	1396	object *floor = 0;
1353		1397	object *top = ms.top;
1354	top = ms.bot;
1355		1398
1356	/* If there are other objects, then */	1399	/* If there are other objects, then */
1357	if (top)	1400	if (top)
1358	{	1401	{
1359	object *last = 0;
1360
1361	/*	1402	/*
1362	* If there are multiple objects on this space, we do some trickier handling.	1403	* If there are multiple objects on this space, we do some trickier handling.
1363	* We've already dealt with merging if appropriate.	1404	* We've already dealt with merging if appropriate.
1364	* Generally, we want to put the new object on top. But if	1405	* Generally, we want to put the new object on top. But if
1365	* flag contains INS_ABOVE_FLOOR_ONLY, once we find the last	1406	* flag contains INS_ABOVE_FLOOR_ONLY, once we find the last
…		…
1368	* once we get to them. This reduces the need to traverse over all of	1409	* once we get to them. This reduces the need to traverse over all of
1369	* them when adding another one - this saves quite a bit of cpu time	1410	* them when adding another one - this saves quite a bit of cpu time
1370	* when lots of spells are cast in one area. Currently, it is presumed	1411	* when lots of spells are cast in one area. Currently, it is presumed
1371	* that flying non pickable objects are spell objects.	1412	* that flying non pickable objects are spell objects.
1372	*/	1413	*/
1373	for (top = ms.bot; top; top = top->above)	1414	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1374	{	1415	{
1375	if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))	1416	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) || QUERY_FLAG (tmp, FLAG_OVERLAY_FLOOR))
1376	floor = top;	1417	floor = tmp;
1377		1418
1378	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))	1419	if (QUERY_FLAG (tmp, FLAG_NO_PICK) && (tmp->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1379	{	1420	{
1380	/* We insert above top, so we want this object below this */	1421	/* We insert above top, so we want this object below this */
1381	top = top->below;	1422	top = tmp->below;
1382	break;	1423	break;
1383	}	1424	}
1384		1425
1385	last = top;	1426	top = tmp;
1386	}	1427	}
1387
1388	/* Don't want top to be NULL, so set it to the last valid object */
1389	top = last;
1390		1428
1391	/* We let update_position deal with figuring out what the space	1429	/* We let update_position deal with figuring out what the space
1392	* looks like instead of lots of conditions here.	1430	* looks like instead of lots of conditions here.
1393	* makes things faster, and effectively the same result.	1431	* makes things faster, and effectively the same result.
1394	*/	1432	*/
…		…
1401	*/	1439	*/
1402	if (!(flag & INS_ON_TOP)	1440	if (!(flag & INS_ON_TOP)
1403	&& ms.flags () & P_BLOCKSVIEW	1441	&& ms.flags () & P_BLOCKSVIEW
1404	&& (op->face && !faces [op->face].visibility))	1442	&& (op->face && !faces [op->face].visibility))
1405	{	1443	{
		1444	object *last;
		1445
1406	for (last = top; last != floor; last = last->below)	1446	for (last = top; last != floor; last = last->below)
1407	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1447	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1408	break;	1448	break;
1409		1449
1410	/* Check to see if we found the object that blocks view,	1450	/* Check to see if we found the object that blocks view,
…		…
1418	} /* If objects on this space */	1458	} /* If objects on this space */
1419		1459
1420	if (flag & INS_ABOVE_FLOOR_ONLY)	1460	if (flag & INS_ABOVE_FLOOR_ONLY)
1421	top = floor;	1461	top = floor;
1422		1462
1423	/* Top is the object that our object (op) is going to get inserted above.	1463	// insert object above top, or bottom-most if top = 0
1424	*/
1425
1426	/* First object on this space */
1427	if (!top)	1464	if (!top)
1428	{	1465	{
		1466	op->below = 0;
1429	op->above = ms.bot;	1467	op->above = ms.bot;
1430
1431	if (op->above)
1432	op->above->below = op;
1433
1434	op->below = 0;
1435	ms.bot = op;	1468	ms.bot = op;
		1469
		1470	*(op->above ? &op->above->below : &ms.top) = op;
1436	}	1471	}
1437	else	1472	else
1438	{ /* get inserted into the stack above top */	1473	{
1439	op->above = top->above;	1474	op->above = top->above;
1440
1441	if (op->above)
1442	op->above->below = op;	1475	top->above = op;
1443		1476
1444	op->below = top;	1477	op->below = top;
1445	top->above = op;	1478	*(op->above ? &op->above->below : &ms.top) = op;
1446	}	1479	}
		1480	}
1447		1481
1448	if (!op->above)	1482	if (op->is_player ())
1449	ms.top = op;
1450	} /* else not INS_BELOW_ORIGINATOR */
1451
1452	if (op->type == PLAYER)
1453	{	1483	{
1454	op->contr->do_los = 1;	1484	op->contr->do_los = 1;
1455	++op->map->players;	1485	++op->map->players;
1456	op->map->touch ();	1486	op->map->touch ();
1457	}	1487	}
1458		1488
1459	op->map->dirty = true;	1489	op->map->dirty = true;
1460		1490
1461	if (object *pl = ms.player ())	1491	if (object *pl = ms.player ())
1462	//TODO: the floorbox prev/next might need updating	1492	//TODO: the floorbox prev/next might need updating
1463	esrv_send_item (pl, op);	1493	//esrv_send_item (pl, op);
		1494	//TODO: update floorbox to preserve ordering
		1495	if (pl->contr->ns)
		1496	pl->contr->ns->floorbox_update ();
1464		1497
1465	/* If this object glows, it may affect lighting conditions that are	1498	/* If this object glows, it may affect lighting conditions that are
1466	* visible to others on this map. But update_all_los is really	1499	* visible to others on this map. But update_all_los is really
1467	* an inefficient way to do this, as it means los for all players	1500	* an inefficient way to do this, as it means los for all players
1468	* on the map will get recalculated. The players could very well	1501	* on the map will get recalculated. The players could very well
1469	* be far away from this change and not affected in any way -	1502	* be far away from this change and not affected in any way -
1470	* this should get redone to only look for players within range,	1503	* this should get redone to only look for players within range,
1471	* or just updating the P_UPTODATE for spaces within this area	1504	* or just updating the P_UPTODATE for spaces within this area
1472	* of effect may be sufficient.	1505	* of effect may be sufficient.
1473	*/	1506	*/
1474	if (op->map->darkness && (op->glow_radius != 0))	1507	if (op->affects_los ())
		1508	{
		1509	op->ms ().invalidate ();
1475	update_all_los (op->map, op->x, op->y);	1510	update_all_los (op->map, op->x, op->y);
		1511	}
1476		1512
1477	/* updates flags (blocked, alive, no magic, etc) for this map space */	1513	/* updates flags (blocked, alive, no magic, etc) for this map space */
1478	update_object (op, UP_OBJ_INSERT);	1514	update_object (op, UP_OBJ_INSERT);
1479		1515
1480	INVOKE_OBJECT (INSERT, op);	1516	INVOKE_OBJECT (INSERT, op);
…		…
1487	* blocked() and wall() work properly), and these flags are updated by	1523	* blocked() and wall() work properly), and these flags are updated by
1488	* update_object().	1524	* update_object().
1489	*/	1525	*/
1490		1526
1491	/* if this is not the head or flag has been passed, don't check walk on status */	1527	/* if this is not the head or flag has been passed, don't check walk on status */
1492	if (!(flag & INS_NO_WALK_ON) && op->head_ () == op)	1528	if (!(flag & INS_NO_WALK_ON) && op->is_head ())
1493	{	1529	{
1494	if (check_move_on (op, originator))	1530	if (check_move_on (op, originator))
1495	return 0;	1531	return 0;
1496		1532
1497	/* If we are a multi part object, lets work our way through the check	1533	/* If we are a multi part object, lets work our way through the check
…		…
1508	/* this function inserts an object in the map, but if it	1544	/* this function inserts an object in the map, but if it
1509	* finds an object of its own type, it'll remove that one first.	1545	* finds an object of its own type, it'll remove that one first.
1510	* op is the object to insert it under: supplies x and the map.	1546	* op is the object to insert it under: supplies x and the map.
1511	*/	1547	*/
1512	void	1548	void
1513	replace_insert_ob_in_map (const char *arch_string, object *op)	1549	replace_insert_ob_in_map (shstr_tmp archname, object *op)
1514	{	1550	{
1515	/* first search for itself and remove any old instances */	1551	/* first search for itself and remove any old instances */
1516		1552
1517	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)	1553	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1518	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */	1554	if (tmp->arch->archname == archname) /* same archetype */
1519	tmp->destroy (1);	1555	tmp->destroy ();
1520		1556
1521	object *tmp = arch_to_object (archetype::find (arch_string));	1557	object *tmp = arch_to_object (archetype::find (archname));
1522		1558
1523	tmp->x = op->x;	1559	tmp->x = op->x;
1524	tmp->y = op->y;	1560	tmp->y = op->y;
1525		1561
1526	insert_ob_in_map (tmp, op->map, op, 0);	1562	insert_ob_in_map (tmp, op->map, op, 0);
…		…
1531	{	1567	{
1532	if (where->env)	1568	if (where->env)
1533	return where->env->insert (this);	1569	return where->env->insert (this);
1534	else	1570	else
1535	return where->map->insert (this, where->x, where->y, originator, flags);	1571	return where->map->insert (this, where->x, where->y, originator, flags);
		1572	}
		1573
		1574	// check whether we can put this into the map, respect max_volume, max_items
		1575	bool
		1576	object::can_drop_at (maptile *m, int x, int y, object *originator)
		1577	{
		1578	mapspace &ms = m->at (x, y);
		1579
		1580	int items = ms.items ();
		1581
		1582	if (!items // testing !items ensures we can drop at least one item
		1583	|| (items < m->max_items
		1584	&& ms.volume () < m->max_volume))
		1585	return true;
		1586
		1587	if (originator && originator->is_player ())
		1588	originator->contr->failmsg (format (
		1589	"No matter how hard you try, you just cannot put the %s here H<Try to remove some items from the floor first.>",
		1590	query_name ()
		1591	));
		1592
		1593	return false;
1536	}	1594	}
1537		1595
1538	/*	1596	/*
1539	* decrease(object, number) decreases a specified number from	1597	* decrease(object, number) decreases a specified number from
1540	* the amount of an object. If the amount reaches 0, the object	1598	* the amount of an object. If the amount reaches 0, the object
…		…
1548	if (!nr)	1606	if (!nr)
1549	return true;	1607	return true;
1550		1608
1551	nr = min (nr, nrof);	1609	nr = min (nr, nrof);
1552		1610
		1611	if (nrof > nr)
		1612	{
1553	nrof -= nr;	1613	nrof -= nr;
1554
1555	if (nrof)
1556	{
1557	adjust_weight (env, -weight * nr); // carrying == 0	1614	adjust_weight (env, -weight * max (1, nr)); // carrying == 0
1558		1615
1559	if (object *pl = visible_to ())	1616	if (object *pl = visible_to ())
1560	esrv_update_item (UPD_NROF, pl, this);	1617	esrv_update_item (UPD_NROF, pl, this);
1561		1618
1562	return true;	1619	return true;
1563	}	1620	}
1564	else	1621	else
1565	{	1622	{
1566	destroy (1);	1623	destroy ();
1567	return false;	1624	return false;
1568	}	1625	}
1569	}	1626	}
1570		1627
1571	/*	1628	/*
…		…
1588	}	1645	}
1589	else	1646	else
1590	{	1647	{
1591	decrease (nr);	1648	decrease (nr);
1592		1649
1593	object *op = object_create_clone (this);	1650	object *op = deep_clone ();
1594	op->nrof = nr;	1651	op->nrof = nr;
1595	return op;	1652	return op;
1596	}	1653	}
1597	}	1654	}
1598		1655
…		…
1648	if (object *pl = tmp->visible_to ())	1705	if (object *pl = tmp->visible_to ())
1649	esrv_update_item (UPD_NROF, pl, tmp);	1706	esrv_update_item (UPD_NROF, pl, tmp);
1650		1707
1651	adjust_weight (this, op->total_weight ());	1708	adjust_weight (this, op->total_weight ());
1652		1709
1653	op->destroy (1);	1710	op->destroy ();
1654	op = tmp;	1711	op = tmp;
1655	goto inserted;	1712	goto inserted;
1656	}	1713	}
1657		1714
1658	op->owner = 0; // it's his/hers now. period.	1715	op->owner = 0; // it's his/hers now. period.
…		…
1676		1733
1677	adjust_weight (this, op->total_weight ());	1734	adjust_weight (this, op->total_weight ());
1678		1735
1679	inserted:	1736	inserted:
1680	/* reset the light list and los of the players on the map */	1737	/* reset the light list and los of the players on the map */
1681	if (op->glow_radius && map && map->darkness)	1738	if (op->glow_radius && is_on_map ())
		1739	{
		1740	update_stats ();
1682	update_all_los (map, x, y);	1741	update_all_los (map, x, y);
1683		1742	}
		1743	else if (is_player () && !flag [FLAG_NO_FIX_PLAYER])
1684	// if this is a player's inventory, update stats	1744	// if this is a player's inventory, update stats
1685	if (type == PLAYER && !flag [FLAG_NO_FIX_PLAYER])
1686	update_stats ();	1745	update_stats ();
1687		1746
1688	INVOKE_OBJECT (INSERT, this);	1747	INVOKE_OBJECT (INSERT, this);
1689		1748
1690	return op;	1749	return op;
…		…
1711	* on top.	1770	* on top.
1712	*/	1771	*/
1713	int	1772	int
1714	check_move_on (object *op, object *originator)	1773	check_move_on (object *op, object *originator)
1715	{	1774	{
		1775	if (QUERY_FLAG (op, FLAG_NO_APPLY))
		1776	return 0;
		1777
1716	object *tmp;	1778	object *tmp;
1717	maptile *m = op->map;	1779	maptile *m = op->map;
1718	int x = op->x, y = op->y;	1780	int x = op->x, y = op->y;
1719		1781
1720	MoveType move_on, move_slow, move_block;	1782	mapspace &ms = m->at (x, y);
1721		1783
1722	if (QUERY_FLAG (op, FLAG_NO_APPLY))	1784	ms.update ();
1723	return 0;
1724		1785
1725	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);	1786	MoveType move_on = ms.move_on;
1726	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);	1787	MoveType move_slow = ms.move_slow;
1727	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);	1788	MoveType move_block = ms.move_block;
1728		1789
1729	/* if nothing on this space will slow op down or be applied,	1790	/* if nothing on this space will slow op down or be applied,
1730	* no need to do checking below. have to make sure move_type	1791	* no need to do checking below. have to make sure move_type
1731	* is set, as lots of objects don't have it set - we treat that	1792	* is set, as lots of objects don't have it set - we treat that
1732	* as walking.	1793	* as walking.
…		…
1743	return 0;	1804	return 0;
1744		1805
1745	/* The objects have to be checked from top to bottom.	1806	/* The objects have to be checked from top to bottom.
1746	* Hence, we first go to the top:	1807	* Hence, we first go to the top:
1747	*/	1808	*/
1748		1809	for (object *next, *tmp = ms.top; tmp; tmp = next)
1749	for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above)
1750	{
1751	/* Trim the search when we find the first other spell effect
1752	* this helps performance so that if a space has 50 spell objects,
1753	* we don't need to check all of them.
1754	*/
1755	if ((tmp->move_type & MOVE_FLY_LOW) && QUERY_FLAG (tmp, FLAG_NO_PICK))
1756	break;
1757	}	1810	{
		1811	next = tmp->below;
1758		1812
1759	for (; tmp; tmp = tmp->below)
1760	{
1761	if (tmp == op)	1813	if (tmp == op)
1762	continue; /* Can't apply yourself */	1814	continue; /* Can't apply yourself */
1763		1815
1764	/* Check to see if one of the movement types should be slowed down.	1816	/* Check to see if one of the movement types should be slowed down.
1765	* Second check makes sure that the movement types not being slowed	1817	* Second check makes sure that the movement types not being slowed
…		…
1770	if (!QUERY_FLAG (op, FLAG_WIZPASS))	1822	if (!QUERY_FLAG (op, FLAG_WIZPASS))
1771	{	1823	{
1772	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||	1824	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
1773	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))	1825	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1774	{	1826	{
1775
1776	float
1777	diff = tmp->move_slow_penalty * fabs (op->speed);	1827	float diff = tmp->move_slow_penalty * fabs (op->speed);
1778		1828
1779	if (op->type == PLAYER)	1829	if (op->is_player ())
1780	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||	1830	if ((tmp->flag [FLAG_IS_HILLY ] && find_skill_by_number (op, SK_CLIMBING)) ||
1781	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))	1831	(tmp->flag [FLAG_IS_WOODED] && find_skill_by_number (op, SK_WOODSMAN)))
1782	diff /= 4.0;	1832	diff /= 4.0;
1783		1833
1784	op->speed_left -= diff;	1834	op->speed_left -= diff;
1785	}	1835	}
1786	}	1836	}
…		…
1819	LOG (llevError, "Present_arch called outside map.\n");	1869	LOG (llevError, "Present_arch called outside map.\n");
1820	return NULL;	1870	return NULL;
1821	}	1871	}
1822		1872
1823	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)	1873	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1824	if (tmp->arch == at)	1874	if (tmp->arch->archname == at->archname)
1825	return tmp;	1875	return tmp;
1826		1876
1827	return NULL;	1877	return NULL;
1828	}	1878	}
1829		1879
…		…
1893	* The first matching object is returned, or NULL if none.	1943	* The first matching object is returned, or NULL if none.
1894	*/	1944	*/
1895	object *	1945	object *
1896	present_arch_in_ob (const archetype *at, const object *op)	1946	present_arch_in_ob (const archetype *at, const object *op)
1897	{	1947	{
1898	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)	1948	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1899	if (tmp->arch == at)	1949	if (tmp->arch->archname == at->archname)
1900	return tmp;	1950	return tmp;
1901		1951
1902	return NULL;	1952	return NULL;
1903	}	1953	}
1904		1954
…		…
1992	* head of the object should correspond for the entire object.	2042	* head of the object should correspond for the entire object.
1993	*/	2043	*/
1994	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))	2044	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
1995	continue;	2045	continue;
1996		2046
1997	if (ob->blocked (m, pos.x, pos.y))	2047	if (ob->blocked (pos.m, pos.x, pos.y))
1998	continue;	2048	continue;
1999		2049
2000	altern [index++] = i;	2050	altern [index++] = i;
2001	}	2051	}
2002		2052
…		…
2070	* there is capable of.	2120	* there is capable of.
2071	*/	2121	*/
2072	int	2122	int
2073	find_dir (maptile *m, int x, int y, object *exclude)	2123	find_dir (maptile *m, int x, int y, object *exclude)
2074	{	2124	{
2075	int i, max = SIZEOFFREE, mflags;	2125	int max = SIZEOFFREE, mflags;
2076
2077	sint16 nx, ny;
2078	object *tmp;
2079	maptile *mp;
2080
2081	MoveType blocked, move_type;	2126	MoveType move_type;
2082		2127
2083	if (exclude && exclude->head_ () != exclude)	2128	if (exclude && exclude->head_ () != exclude)
2084	{	2129	{
2085	exclude = exclude->head;	2130	exclude = exclude->head;
2086	move_type = exclude->move_type;	2131	move_type = exclude->move_type;
…		…
2089	{	2134	{
2090	/* If we don't have anything, presume it can use all movement types. */	2135	/* If we don't have anything, presume it can use all movement types. */
2091	move_type = MOVE_ALL;	2136	move_type = MOVE_ALL;
2092	}	2137	}
2093		2138
2094	for (i = 1; i < max; i++)	2139	for (int i = 1; i < max; i++)
2095	{	2140	{
2096	mp = m;	2141	mapxy pos (m, x, y);
2097	nx = x + freearr_x[i];	2142	pos.move (i);
2098	ny = y + freearr_y[i];
2099		2143
2100	mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);	2144	if (!pos.normalise ())
2101
2102	if (mflags & P_OUT_OF_MAP)
2103	max = maxfree[i];	2145	max = maxfree[i];
2104	else	2146	else
2105	{	2147	{
2106	mapspace &ms = mp->at (nx, ny);	2148	mapspace &ms = *pos;
2107		2149
2108	blocked = ms.move_block;
2109
2110	if ((move_type & blocked) == move_type)	2150	if ((move_type & ms.move_block) == move_type)
2111	max = maxfree[i];	2151	max = maxfree [i];
2112	else if (mflags & P_IS_ALIVE)	2152	else if (ms.flags () & P_IS_ALIVE)
2113	{	2153	{
2114	for (tmp = ms.bot; tmp; tmp = tmp->above)	2154	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
2115	if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)	2155	if ((tmp->flag [FLAG_MONSTER] || tmp->is_player ())
2116	&& (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))	2156	&& (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2117	break;
2118
2119	if (tmp)
2120	return freedir[i];	2157	return freedir [i];
2121	}	2158	}
2122	}	2159	}
2123	}	2160	}
2124		2161
2125	return 0;	2162	return 0;
…		…
2200	* This basically means that if direction is 15, then it could either go	2237	* This basically means that if direction is 15, then it could either go
2201	* direction 4, 14, or 16 to get back to where we are.	2238	* direction 4, 14, or 16 to get back to where we are.
2202	* Moved from spell_util.c to object.c with the other related direction	2239	* Moved from spell_util.c to object.c with the other related direction
2203	* functions.	2240	* functions.
2204	*/	2241	*/
2205	int reduction_dir[SIZEOFFREE][3] = {	2242	static const int reduction_dir[SIZEOFFREE][3] = {
2206	{0, 0, 0}, /* 0 */	2243	{0, 0, 0}, /* 0 */
2207	{0, 0, 0}, /* 1 */	2244	{0, 0, 0}, /* 1 */
2208	{0, 0, 0}, /* 2 */	2245	{0, 0, 0}, /* 2 */
2209	{0, 0, 0}, /* 3 */	2246	{0, 0, 0}, /* 3 */
2210	{0, 0, 0}, /* 4 */	2247	{0, 0, 0}, /* 4 */
…		…
2306	int	2343	int
2307	can_pick (const object *who, const object *item)	2344	can_pick (const object *who, const object *item)
2308	{	2345	{
2309	return /*QUERY_FLAG(who,FLAG_WIZ)|| */	2346	return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2310	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&	2347	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
2311	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3));	2348	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->is_player () || item->weight < who->weight / 3));
2312	}	2349	}
2313		2350
2314	/*	2351	/*
2315	* create clone from object to another	2352	* create clone from object to another
2316	*/	2353	*/
2317	object *	2354	object *
2318	object_create_clone (object *asrc)	2355	object::deep_clone ()
2319	{	2356	{
2320	object *dst = 0, *tmp, *src, *prev, *item;	2357	assert (("deep_clone called on non-head object", is_head ()));
2321		2358
2322	if (!asrc)	2359	object *dst = clone ();
2323	return 0;
2324		2360
2325	src = asrc->head_ ();	2361	object *prev = dst;
2326
2327	prev = 0;
2328	for (object *part = src; part; part = part->more)	2362	for (object *part = this->more; part; part = part->more)
2329	{	2363	{
2330	tmp = part->clone ();	2364	object *tmp = part->clone ();
2331	tmp->x -= src->x;
2332	tmp->y -= src->y;
2333
2334	if (!part->head)
2335	{
2336	dst = tmp;
2337	tmp->head = 0;
2338	}
2339	else
2340	tmp->head = dst;	2365	tmp->head = dst;
2341
2342	tmp->more = 0;
2343
2344	if (prev)
2345	prev->more = tmp;	2366	prev->more = tmp;
2346
2347	prev = tmp;	2367	prev = tmp;
2348	}	2368	}
2349		2369
2350	for (item = src->inv; item; item = item->below)	2370	for (object *item = inv; item; item = item->below)
2351	insert_ob_in_ob (object_create_clone (item), dst);	2371	insert_ob_in_ob (item->deep_clone (), dst);
2352		2372
2353	return dst;	2373	return dst;
2354	}	2374	}
2355		2375
2356	/* This returns the first object in who's inventory that	2376	/* This returns the first object in who's inventory that
…		…
2365	return tmp;	2385	return tmp;
2366		2386
2367	return 0;	2387	return 0;
2368	}	2388	}
2369		2389
2370	/* If ob has a field named key, return the link from the list,	2390	shstr_tmp
2371	* otherwise return NULL.	2391	object::kv_get (shstr_tmp key) const
2372	*
2373	* key must be a passed in shared string - otherwise, this won't
2374	* do the desired thing.
2375	*/
2376	key_value *
2377	get_ob_key_link (const object *ob, const char *key)
2378	{	2392	{
2379	for (key_value *link = ob->key_values; link; link = link->next)	2393	for (key_value *kv = key_values; kv; kv = kv->next)
2380	if (link->key == key)	2394	if (kv->key == key)
2381	return link;
2382
2383	return 0;
2384	}
2385
2386	/*
2387	* Returns the value of op has an extra_field for key, or NULL.
2388	*
2389	* The argument doesn't need to be a shared string.
2390	*
2391	* The returned string is shared.
2392	*/
2393	const char *
2394	get_ob_key_value (const object *op, const char *const key)
2395	{
2396	key_value *link;
2397	shstr_cmp canonical_key (key);
2398
2399	if (!canonical_key)
2400	{
2401	/* 1. There being a field named key on any object
2402	* implies there'd be a shared string to find.
2403	* 2. Since there isn't, no object has this field.
2404	* 3. Therefore, *this* object doesn't have this field.
2405	*/
2406	return 0;
2407	}
2408
2409	/* This is copied from get_ob_key_link() above -
2410	* only 4 lines, and saves the function call overhead.
2411	*/
2412	for (link = op->key_values; link; link = link->next)
2413	if (link->key == canonical_key)
2414	return link->value;	2395	return kv->value;
2415		2396
2416	return 0;	2397	return shstr ();
2417	}	2398	}
2418		2399
2419	/*	2400	void
2420	* Updates the canonical_key in op to value.	2401	object::kv_set (shstr_tmp key, shstr_tmp value)
2421	*
2422	* canonical_key is a shared string (value doesn't have to be).
2423	*
2424	* Unless add_key is TRUE, it won't add fields, only change the value of existing
2425	* keys.
2426	*
2427	* Returns TRUE on success.
2428	*/
2429	int
2430	set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key)
2431	{	2402	{
2432	key_value *field = NULL, *last = NULL;	2403	for (key_value *kv = key_values; kv; kv = kv->next)
2433		2404	if (kv->key == key)
2434	for (field = op->key_values; field != NULL; field = field->next)
2435	{
2436	if (field->key != canonical_key)
2437	{	2405	{
2438	last = field;	2406	kv->value = value;
2439	continue;	2407	return;
2440	}	2408	}
2441		2409
2442	if (value)	2410	key_value *kv = new key_value;
2443	field->value = value;	2411
2444	else	2412	kv->next = key_values;
		2413	kv->key = key;
		2414	kv->value = value;
		2415
		2416	key_values = kv;
		2417	}
		2418
		2419	void
		2420	object::kv_del (shstr_tmp key)
		2421	{
		2422	for (key_value **kvp = &key_values; *kvp; kvp = &(*kvp)->next)
		2423	if ((*kvp)->key == key)
2445	{	2424	{
2446	/* Basically, if the archetype has this key set,	2425	key_value *kv = *kvp;
2447	* we need to store the null value so when we save	2426	*kvp = (*kvp)->next;
2448	* it, we save the empty value so that when we load,	2427	delete kv;
2449	* we get this value back again.	2428	return;
2450	*/
2451	if (get_ob_key_link (op->arch, canonical_key))
2452	field->value = 0;
2453	else
2454	{
2455	if (last)
2456	last->next = field->next;
2457	else
2458	op->key_values = field->next;
2459
2460	delete field;
2461	}
2462	}	2429	}
2463	return TRUE;
2464	}
2465	/* IF we get here, key doesn't exist */
2466
2467	/* No field, we'll have to add it. */
2468
2469	if (!add_key)
2470	return FALSE;
2471
2472	/* There isn't any good reason to store a null
2473	* value in the key/value list. If the archetype has
2474	* this key, then we should also have it, so shouldn't
2475	* be here. If user wants to store empty strings,
2476	* should pass in ""
2477	*/
2478	if (value == NULL)
2479	return TRUE;
2480
2481	field = new key_value;
2482
2483	field->key = canonical_key;
2484	field->value = value;
2485	/* Usual prepend-addition. */
2486	field->next = op->key_values;
2487	op->key_values = field;
2488
2489	return TRUE;
2490	}
2491
2492	/*
2493	* Updates the key in op to value.
2494	*
2495	* If add_key is FALSE, this will only update existing keys,
2496	* and not add new ones.
2497	* In general, should be little reason FALSE is ever passed in for add_key
2498	*
2499	* Returns TRUE on success.
2500	*/
2501	int
2502	set_ob_key_value (object *op, const char *key, const char *value, int add_key)
2503	{
2504	shstr key_ (key);
2505
2506	return set_ob_key_value_s (op, key_, value, add_key);
2507	}	2430	}
2508		2431
2509	object::depth_iterator::depth_iterator (object *container)	2432	object::depth_iterator::depth_iterator (object *container)
2510	: iterator_base (container)	2433	: iterator_base (container)
2511	{	2434	{
…		…
2561	{	2484	{
2562	char flagdesc[512];	2485	char flagdesc[512];
2563	char info2[256 * 4];	2486	char info2[256 * 4];
2564	char *p = info;	2487	char *p = info;
2565		2488
2566	p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s,flags:[%s],type:%d}",	2489	p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s%s,flags:[%s],type:%d}",
2567	count,	2490	count,
2568	uuid.c_str (),	2491	uuid.c_str (),
2569	&name,	2492	&name,
2570	title ? "\",title:\"" : "",	2493	title ? ",title:\"" : "",
2571	title ? (const char *)title : "",	2494	title ? (const char *)title : "",
		2495	title ? "\"" : "",
2572	flag_desc (flagdesc, 512), type);	2496	flag_desc (flagdesc, 512), type);
2573		2497
2574	if (!flag[FLAG_REMOVED] && env)	2498	if (!flag[FLAG_REMOVED] && env)
2575	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2499	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2576		2500
…		…
2594	{	2518	{
2595	return map ? map->region (x, y)	2519	return map ? map->region (x, y)
2596	: region::default_region ();	2520	: region::default_region ();
2597	}	2521	}
2598		2522
2599	const materialtype_t *
2600	object::dominant_material () const
2601	{
2602	if (materialtype_t *mt = name_to_material (materialname))
2603	return mt;
2604
2605	return name_to_material (shstr_unknown);
2606	}
2607
2608	void	2523	void
2609	object::open_container (object *new_container)	2524	object::open_container (object *new_container)
2610	{	2525	{
2611	if (container == new_container)	2526	if (container == new_container)
2612	return;	2527	return;
2613		2528
2614	if (object *old_container = container)	2529	object *old_container = container;
		2530
		2531	if (old_container)
2615	{	2532	{
2616	if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))	2533	if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
2617	return;	2534	return;
2618		2535
2619	#if 0	2536	#if 0
…		…
2621	if (object *closer = old_container->inv)	2538	if (object *closer = old_container->inv)
2622	if (closer->type == CLOSE_CON)	2539	if (closer->type == CLOSE_CON)
2623	closer->destroy ();	2540	closer->destroy ();
2624	#endif	2541	#endif
2625		2542
		2543	// make sure the container is available
		2544	esrv_send_item (this, old_container);
		2545
2626	old_container->flag [FLAG_APPLIED] = false;	2546	old_container->flag [FLAG_APPLIED] = false;
2627	container = 0;	2547	container = 0;
2628		2548
		2549	// client needs item update to make it work, client bug requires this to be separate
2629	esrv_update_item (UPD_FLAGS, this, old_container);	2550	esrv_update_item (UPD_FLAGS, this, old_container);
		2551
2630	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));	2552	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", old_container->query_name ());
2631	play_sound (sound_find ("chest_close"));	2553	play_sound (sound_find ("chest_close"));
2632	}	2554	}
2633		2555
2634	if (new_container)	2556	if (new_container)
2635	{	2557	{
…		…
2645	closer->flag [FLAG_NO_MAP_SAVE] = 1;	2567	closer->flag [FLAG_NO_MAP_SAVE] = 1;
2646	new_container->insert (closer);	2568	new_container->insert (closer);
2647	}	2569	}
2648	#endif	2570	#endif
2649		2571
2650	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));	2572	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", new_container->query_name ());
		2573
		2574	// make sure the container is available, client bug requires this to be separate
		2575	esrv_send_item (this, new_container);
2651		2576
2652	new_container->flag [FLAG_APPLIED] = true;	2577	new_container->flag [FLAG_APPLIED] = true;
2653	container = new_container;	2578	container = new_container;
2654		2579
		2580	// client needs flag change
2655	esrv_update_item (UPD_FLAGS, this, new_container);	2581	esrv_update_item (UPD_FLAGS, this, new_container);
2656	esrv_send_inventory (this, new_container);	2582	esrv_send_inventory (this, new_container);
2657	play_sound (sound_find ("chest_open"));	2583	play_sound (sound_find ("chest_open"));
2658	}	2584	}
		2585	// else if (!old_container->env && contr && contr->ns)
		2586	// contr->ns->floorbox_reset ();
2659	}	2587	}
2660		2588
2661	object *	2589	object *
2662	object::force_find (const shstr name)	2590	object::force_find (shstr_tmp name)
2663	{	2591	{
2664	/* cycle through his inventory to look for the MARK we want to	2592	/* cycle through his inventory to look for the MARK we want to
2665	* place	2593	* place
2666	*/	2594	*/
2667	for (object *tmp = inv; tmp; tmp = tmp->below)	2595	for (object *tmp = inv; tmp; tmp = tmp->below)
…		…
2669	return splay (tmp);	2597	return splay (tmp);
2670		2598
2671	return 0;	2599	return 0;
2672	}	2600	}
2673		2601
		2602	//-GPL
		2603
2674	void	2604	void
		2605	object::force_set_timer (int duration)
		2606	{
		2607	this->duration = 1;
		2608	this->speed_left = -1.f;
		2609
		2610	this->set_speed (duration ? 1.f / duration : 0.f);
		2611	}
		2612
		2613	object *
2675	object::force_add (const shstr name, int duration)	2614	object::force_add (shstr_tmp name, int duration)
2676	{	2615	{
2677	if (object *force = force_find (name))	2616	if (object *force = force_find (name))
2678	force->destroy ();	2617	force->destroy ();
2679		2618
2680	object *force = get_archetype (FORCE_NAME);	2619	object *force = get_archetype (FORCE_NAME);
2681		2620
2682	force->slaying = name;	2621	force->slaying = name;
2683	force->stats.food = 1;	2622	force->force_set_timer (duration);
2684	force->speed_left = -1.f;
2685
2686	force->set_speed (duration ? 1.f / duration : 0.f);
2687	force->flag [FLAG_IS_USED_UP] = true;
2688	force->flag [FLAG_APPLIED] = true;	2623	force->flag [FLAG_APPLIED] = true;
2689		2624
2690	insert (force);	2625	return insert (force);
2691	}	2626	}
2692		2627
2693	void	2628	void
2694	object::play_sound (faceidx sound)	2629	object::play_sound (faceidx sound) const
2695	{	2630	{
2696	if (!sound)	2631	if (!sound)
2697	return;	2632	return;
2698		2633
2699	if (flag [FLAG_REMOVED])	2634	if (is_on_map ())
		2635	map->play_sound (sound, x, y);
		2636	else if (object *pl = in_player ())
		2637	pl->contr->play_sound (sound);
		2638	}
		2639
		2640	void
		2641	object::say_msg (const char *msg) const
		2642	{
		2643	if (is_on_map ())
		2644	map->say_msg (msg, x, y);
		2645	else if (object *pl = in_player ())
		2646	pl->contr->play_sound (sound);
		2647	}
		2648
		2649	void
		2650	object::make_noise ()
		2651	{
		2652	// we do not model noise in the map, so instead put
		2653	// a temporary light into the noise source
		2654	// could use the map instead, but that's less reliable for our
		2655	// goal, which is to make invisibility a bit harder to exploit
		2656
		2657	// currently only works sensibly for players
		2658	if (!is_player ())
2700	return;	2659	return;
2701		2660
2702	if (env)	2661	// find old force, or create new one
2703	{	2662	object *force = force_find (shstr_noise_force);
2704	if (object *pl = in_player ())	2663
2705	pl->contr->play_sound (sound);	2664	if (force)
2706	}	2665	force->speed_left = -1.f; // patch old speed up
2707	else	2666	else
2708	map->play_sound (sound, x, y);	2667	{
2709	}	2668	force = archetype::get (shstr_noise_force);
2710		2669
		2670	force->slaying = shstr_noise_force;
		2671	force->stats.food = 1;
		2672	force->speed_left = -1.f;
		2673
		2674	force->set_speed (1.f / 4.f);
		2675	force->flag [FLAG_IS_USED_UP] = true;
		2676	force->flag [FLAG_APPLIED] = true;
		2677
		2678	insert (force);
		2679	}
		2680	}
		2681

Diff Legend

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