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.212 by root, Mon Apr 21 23:35:24 2008 UTC vs.
Revision 1.300 by root, Mon Nov 9 03:08:23 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->materialname != ob2->materialname
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
…		…
330		383
331	/* Everything passes, must be OK. */	384	/* Everything passes, must be OK. */
332	return 1;	385	return 1;
333	}	386	}
334		387
		388	// find player who can see this object
		389	object *
		390	object::visible_to () const
		391	{
		392	if (client_visible () && !flag [FLAG_REMOVED])
		393	{
		394	// see if we are in a container of sorts
		395	if (env)
		396	{
		397	// the player inventory itself is always visible
		398	if (env->is_player ())
		399	return env;
		400
		401	// else a player could have our env open
		402	object *envest = env->outer_env_or_self ();
		403
		404	// the player itself is always on a map, so we will find him here
		405	// even if our inv is in a player.
		406	if (envest->is_on_map ())
		407	if (object *pl = envest->ms ().player ())
		408	if (pl->container_ () == env)
		409	return pl;
		410	}
		411	else
		412	{
		413	// maybe there is a player standing on the same mapspace
		414	// this will catch the case where "this" is a player
		415	if (object *pl = ms ().player ())
		416	if ((pl->contr->ns && !pl->container_ () && !pl->contr->ns->update_look)
		417	|| pl->container_ () == this)
		418	return pl;
		419	}
		420	}
		421
		422	return 0;
		423	}
		424
335	// adjust weight per container type ("of holding")	425	// adjust weight per container type ("of holding")
336	static sint32	426	static sint32
337	weight_adjust (object *op, sint32 weight)	427	weight_adjust_for (object *op, sint32 weight)
338	{	428	{
339	return op->type == CONTAINER	429	return op->type == CONTAINER
340	? lerp (weight, 0, 100, 0, 100 - op->stats.Str)	430	? lerp (weight, 0, 100, 0, 100 - op->stats.Str)
341	: weight;	431	: weight;
342	}	432	}
…		…
348	static void	438	static void
349	adjust_weight (object *op, sint32 weight)	439	adjust_weight (object *op, sint32 weight)
350	{	440	{
351	while (op)	441	while (op)
352	{	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
353	weight = weight_adjust (op, weight);	445	weight = weight_adjust_for (op, op->carrying)
		446	- weight_adjust_for (op, op->carrying - weight);
354		447
355	if (!weight)	448	if (!weight)
356	return;	449	return;
357		450
358	op->carrying += weight;	451	op->carrying += weight;
359		452
360	if (object *pl = op->visible_to ())	453	if (object *pl = op->visible_to ())
		454	if (pl != op) // player is handled lazily
361	esrv_update_item (UPD_WEIGHT, pl, op);	455	esrv_update_item (UPD_WEIGHT, pl, op);
362		456
363	op = op->env;	457	op = op->env;
364	}	458	}
365	}	459	}
366		460
…		…
380	op->update_weight ();	474	op->update_weight ();
381		475
382	sum += op->total_weight ();	476	sum += op->total_weight ();
383	}	477	}
384		478
385	sum = weight_adjust (this, sum);	479	sum = weight_adjust_for (this, sum);
386		480
387	if (sum != carrying)	481	if (sum != carrying)
388	{	482	{
389	carrying = sum;	483	carrying = sum;
390		484
391	if (object *pl = visible_to ())	485	if (object *pl = visible_to ())
		486	if (pl != this) // player is handled lazily
392	esrv_update_item (UPD_WEIGHT, pl, this);	487	esrv_update_item (UPD_WEIGHT, pl, this);
393	}	488	}
394	}	489	}
395		490
396	/*	491	/*
397	* Used by: Server DM commands: dumpbelow, dump. Some error messages.	492	* Used by: Server DM commands: dumpbelow, dump. Some error messages.
…		…
405	object_freezer freezer;	500	object_freezer freezer;
406	op->write (freezer);	501	op->write (freezer);
407	return freezer.as_string ();	502	return freezer.as_string ();
408	}	503	}
409		504
410	/*	505	char *
411	* get_nearest_part(multi-object, object 2) returns the part of the	506	object::as_string ()
412	* multi-object 1 which is closest to the second object.
413	* If it's not a multi-object, it is returned.
414	*/
415	object *
416	get_nearest_part (object *op, const object *pl)
417	{	507	{
418	object *tmp, *closest;	508	return dump_object (this);
419	int last_dist, i;
420
421	if (!op->more)
422	return op;
423
424	for (last_dist = distance (op, pl), closest = op, tmp = op->more;
425	tmp;
426	tmp = tmp->more)
427	if ((i = distance (tmp, pl)) < last_dist)
428	closest = tmp, last_dist = i;
429
430	return closest;
431	}	509	}
432		510
433	/*	511	/*
434	* 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.
435	* VERRRY slow.	513	* VERRRY slow.
…		…
451	*/	529	*/
452	object *	530	object *
453	find_object_name (const char *str)	531	find_object_name (const char *str)
454	{	532	{
455	shstr_cmp str_ (str);	533	shstr_cmp str_ (str);
456	object *op;
457		534
		535	if (str_)
458	for_all_objects (op)	536	for_all_objects (op)
459	if (op->name == str_)	537	if (op->name == str_)
460	break;	538	return op;
461		539
462	return op;	540	return 0;
463	}	541	}
464		542
465	/*	543	/*
466	* 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
467	* skill and experience objects.	545	* skill and experience objects.
…		…
529	update_stats ();	607	update_stats ();
530		608
531	new_draw_info_format (NDI_UNIQUE, 0, this,	609	new_draw_info_format (NDI_UNIQUE, 0, this,
532	"You try to balance all your items at once, "	610	"You try to balance all your items at once, "
533	"but the %s is just too much for your body. "	611	"but the %s is just too much for your body. "
534	"[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);
535	return false;	614	return false;
536	}	615	}
537		616
538	//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);
539	}	618	}
…		…
565	}	644	}
566		645
567	op->key_values = 0;	646	op->key_values = 0;
568	}	647	}
569		648
570	object &	649	/*
571	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)
572	{	659	{
573	bool is_freed = flag [FLAG_FREED];	660	dst->remove ();
574	bool is_removed = flag [FLAG_REMOVED];
575
576	*(object_copy *)this = src;	661	*(object_copy *)dst = *this;
577
578	flag [FLAG_FREED] = is_freed;
579	flag [FLAG_REMOVED] = is_removed;	662	dst->flag [FLAG_REMOVED] = true;
580		663
581	/* Copy over key_values, if any. */	664	/* Copy over key_values, if any. */
582	if (src.key_values)	665	if (key_values)
583	{	666	{
584	key_value *tail = 0;	667	key_value *tail = 0;
585	key_values = 0;	668	dst->key_values = 0;
586		669
587	for (key_value *i = src.key_values; i; i = i->next)	670	for (key_value *i = key_values; i; i = i->next)
588	{	671	{
589	key_value *new_link = new key_value;	672	key_value *new_link = new key_value;
590		673
591	new_link->next = 0;	674	new_link->next = 0;
592	new_link->key = i->key;	675	new_link->key = i->key;
593	new_link->value = i->value;	676	new_link->value = i->value;
594		677
595	/* Try and be clever here, too. */	678	/* Try and be clever here, too. */
596	if (!key_values)	679	if (!dst->key_values)
597	{	680	{
598	key_values = new_link;	681	dst->key_values = new_link;
599	tail = new_link;	682	tail = new_link;
600	}	683	}
601	else	684	else
602	{	685	{
603	tail->next = new_link;	686	tail->next = new_link;
604	tail = new_link;	687	tail = new_link;
605	}	688	}
606	}	689	}
607	}	690	}
608	}
609
610	/*
611	* copy_to first frees everything allocated by the dst object,
612	* and then copies the contents of itself into the second
613	* object, allocating what needs to be allocated. Basically, any
614	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
615	* if the first object is freed, the pointers in the new object
616	* will point at garbage.
617	*/
618	void
619	object::copy_to (object *dst)
620	{
621	*dst = *this;
622		691
623	if (speed < 0)	692	if (speed < 0)
624	dst->speed_left -= rndm ();	693	dst->speed_left -= rndm ();
625		694
626	dst->set_speed (dst->speed);	695	dst->activate ();
627	}	696	}
628		697
629	void	698	void
630	object::instantiate ()	699	object::instantiate ()
631	{	700	{
…		…
648	object *	717	object *
649	object::clone ()	718	object::clone ()
650	{	719	{
651	object *neu = create ();	720	object *neu = create ();
652	copy_to (neu);	721	copy_to (neu);
		722	neu->map = map; // not copied by copy_to
653	return neu;	723	return neu;
654	}	724	}
655		725
656	/*	726	/*
657	* 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
…		…
674	* 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.
675	*/	745	*/
676	void	746	void
677	object::set_speed (float speed)	747	object::set_speed (float speed)
678	{	748	{
679	if (flag [FLAG_FREED] && speed)
680	{
681	LOG (llevError, "Object %s is freed but has speed.\n", &name);
682	speed = 0;
683	}
684
685	this->speed = speed;	749	this->speed = speed;
686		750
687	if (has_active_speed ())	751	if (has_active_speed ())
688	activate ();	752	activate ();
689	else	753	else
…		…
708	* UP_OBJ_FACE: only the objects face has changed.	772	* UP_OBJ_FACE: only the objects face has changed.
709	*/	773	*/
710	void	774	void
711	update_object (object *op, int action)	775	update_object (object *op, int action)
712	{	776	{
713	if (op == NULL)	777	if (!op)
714	{	778	{
715	/* this should never happen */	779	/* this should never happen */
716	LOG (llevDebug, "update_object() called for NULL object.\n");	780	LOG (llevError | logBacktrace, "update_object() called for NULL object.\n");
717	return;	781	return;
718	}	782	}
719		783
720	if (op->env)	784	if (!op->is_on_map ())
721	{	785	{
722	/* Animation is currently handled by client, so nothing	786	/* Animation is currently handled by client, so nothing
723	* to do in this case.	787	* to do in this case.
724	*/	788	*/
725	return;	789	return;
726	}	790	}
727
728	/* If the map is saving, don't do anything as everything is
729	* going to get freed anyways.
730	*/
731	if (!op->map || op->map->in_memory == MAP_SAVING)
732	return;
733		791
734	/* make sure the object is within map boundaries */	792	/* make sure the object is within map boundaries */
735	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)
736	{	794	{
737	LOG (llevError, "update_object() called for object out of map!\n");	795	LOG (llevError, "update_object() called for object out of map!\n");
…		…
745		803
746	if (!(m.flags_ & P_UPTODATE))	804	if (!(m.flags_ & P_UPTODATE))
747	/* nop */;	805	/* nop */;
748	else if (action == UP_OBJ_INSERT)	806	else if (action == UP_OBJ_INSERT)
749	{	807	{
		808	#if 0
750	// this is likely overkill, TODO: revisit (schmorp)	809	// this is likely overkill, TODO: revisit (schmorp)
751	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))	810	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
752	|| (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))	811	|| (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))
753	|| (op->type == PLAYER && !(m.flags_ & P_PLAYER))	812	|| (op->is_player () && !(m.flags_ & P_PLAYER))
754	|| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))	813	|| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
755	|| (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))	814	|| (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))
756	|| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))	815	|| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))
757	|| (m.move_on | op->move_on ) != m.move_on	816	|| (m.move_on | op->move_on ) != m.move_on
758	|| (m.move_off | op->move_off ) != m.move_off	817	|| (m.move_off | op->move_off ) != m.move_off
759	|| (m.move_slow | op->move_slow) != m.move_slow	818	|| (m.move_slow | op->move_slow) != m.move_slow
760	/* 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
761	* to have move_allow right now.	820	* have move_allow right now.
762	*/	821	*/
763	|| ((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
764	|| 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)
765	m.flags_ = 0;	826	m.invalidate ();
		827	#endif
766	}	828	}
767	/* if the object is being removed, we can't make intelligent	829	/* if the object is being removed, we can't make intelligent
768	* decisions, because remove_ob can't really pass the object	830	* decisions, because remove_ob can't really pass the object
769	* that is being removed.	831	* that is being removed.
770	*/	832	*/
771	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)	833	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
772	m.flags_ = 0;	834	m.invalidate ();
773	else if (action == UP_OBJ_FACE)	835	else if (action == UP_OBJ_FACE)
774	/* Nothing to do for that case */ ;	836	/* Nothing to do for that case */ ;
775	else	837	else
776	LOG (llevError, "update_object called with invalid action: %d\n", action);	838	LOG (llevError, "update_object called with invalid action: %d\n", action);
777		839
…		…
781		843
782	object::object ()	844	object::object ()
783	{	845	{
784	SET_FLAG (this, FLAG_REMOVED);	846	SET_FLAG (this, FLAG_REMOVED);
785		847
786	expmul = 1.0;	848	//expmul = 1.0; declared const for the time being
787	face = blank_face;	849	face = blank_face;
788	}	850	}
789		851
790	object::~object ()	852	object::~object ()
791	{	853	{
…		…
821	/* If already on active list, don't do anything */	883	/* If already on active list, don't do anything */
822	if (active)	884	if (active)
823	return;	885	return;
824		886
825	if (has_active_speed ())	887	if (has_active_speed ())
		888	{
		889	if (flag [FLAG_FREED])
		890	LOG (llevError | logBacktrace, "BUG: tried to activate freed object %s\n", debug_desc ());//D
		891
826	actives.insert (this);	892	actives.insert (this);
		893	}
827	}	894	}
828		895
829	void	896	void
830	object::activate_recursive ()	897	object::activate_recursive ()
831	{	898	{
…		…
880	object::destroy_inv (bool drop_to_ground)	947	object::destroy_inv (bool drop_to_ground)
881	{	948	{
882	// need to check first, because the checks below might segfault	949	// need to check first, because the checks below might segfault
883	// as we might be on an invalid mapspace and crossfire code	950	// as we might be on an invalid mapspace and crossfire code
884	// is too buggy to ensure that the inventory is empty.	951	// is too buggy to ensure that the inventory is empty.
885	// corollary: if you create arrows etc. with stuff in tis inventory,	952	// corollary: if you create arrows etc. with stuff in its inventory,
886	// cf will crash below with off-map x and y	953	// cf will crash below with off-map x and y
887	if (!inv)	954	if (!inv)
888	return;	955	return;
889		956
890	/* Only if the space blocks everything do we not process -	957	/* Only if the space blocks everything do we not process -
…		…
892	* drop on that space.	959	* drop on that space.
893	*/	960	*/
894	if (!drop_to_ground	961	if (!drop_to_ground
895	|| !map	962	|| !map
896	|| map->in_memory != MAP_ACTIVE	963	|| map->in_memory != MAP_ACTIVE
897	|| map->nodrop	964	|| map->no_drop
898	|| ms ().move_block == MOVE_ALL)	965	|| ms ().move_block == MOVE_ALL)
899	{	966	{
900	while (inv)	967	while (inv)
901	{
902	inv->destroy_inv (drop_to_ground);
903	inv->destroy ();	968	inv->destroy ();
904	}
905	}	969	}
906	else	970	else
907	{ /* Put objects in inventory onto this space */	971	{ /* Put objects in inventory onto this space */
908	while (inv)	972	while (inv)
909	{	973	{
…		…
927	object *op = new object;	991	object *op = new object;
928	op->link ();	992	op->link ();
929	return op;	993	return op;
930	}	994	}
931		995
		996	static struct freed_map : maptile
		997	{
		998	freed_map ()
		999	{
		1000	path = "<freed objects map>";
		1001	name = "/internal/freed_objects_map";
		1002	width = 3;
		1003	height = 3;
		1004	no_drop = 1;
		1005	no_reset = 1;
		1006
		1007	alloc ();
		1008	in_memory = MAP_ACTIVE;
		1009	}
		1010
		1011	~freed_map ()
		1012	{
		1013	destroy ();
		1014	}
		1015	} freed_map; // freed objects are moved here to avoid crashes
		1016
932	void	1017	void
933	object::do_destroy ()	1018	object::do_destroy ()
934	{	1019	{
935	if (object *pl = visible_to ())
936	esrv_del_item (pl->contr, count);
937
938	attachable::do_destroy ();
939
940	if (flag [FLAG_IS_LINKED])	1020	if (flag [FLAG_IS_LINKED])
941	remove_button_link (this);	1021	remove_link ();
942		1022
943	if (flag [FLAG_FRIENDLY])	1023	if (flag [FLAG_FRIENDLY])
944	remove_friendly_object (this);	1024	remove_friendly_object (this);
945		1025
946	if (!flag [FLAG_REMOVED])
947	remove ();	1026	remove ();
948		1027
949	destroy_inv (true);	1028	attachable::do_destroy ();
950		1029
951	deactivate ();	1030	deactivate ();
952	unlink ();	1031	unlink ();
953		1032
954	flag [FLAG_FREED] = 1;	1033	flag [FLAG_FREED] = 1;
955		1034
956	// hack to ensure that freed objects still have a valid map	1035	// hack to ensure that freed objects still have a valid map
957	{
958	static maptile *freed_map; // freed objects are moved here to avoid crashes
959
960	if (!freed_map)
961	{
962	freed_map = new maptile;
963
964	freed_map->path = "<freed objects map>";
965	freed_map->name = "/internal/freed_objects_map";
966	freed_map->width = 3;
967	freed_map->height = 3;
968	freed_map->nodrop = 1;
969
970	freed_map->alloc ();
971	freed_map->in_memory = MAP_ACTIVE;
972	}
973
974	map = freed_map;	1036	map = &freed_map;
975	x = 1;	1037	x = 1;
976	y = 1;	1038	y = 1;
977	}
978		1039
979	if (more)	1040	if (more)
980	{	1041	{
981	more->destroy ();	1042	more->destroy ();
982	more = 0;	1043	more = 0;
…		…
990	attacked_by = 0;	1051	attacked_by = 0;
991	current_weapon = 0;	1052	current_weapon = 0;
992	}	1053	}
993		1054
994	void	1055	void
995	object::destroy (bool destroy_inventory)	1056	object::destroy ()
996	{	1057	{
997	if (destroyed ())	1058	if (destroyed ())
998	return;	1059	return;
999		1060
1000	if (destroy_inventory)	1061	if (!is_head () && !head->destroyed ())
		1062	{
		1063	LOG (llevError | logBacktrace, "tried to destroy the tail of an object");
		1064	head->destroy ();
		1065	return;
		1066	}
		1067
1001	destroy_inv (false);	1068	destroy_inv (false);
1002		1069
1003	if (is_head ())	1070	if (is_head ())
1004	if (sound_destroy)	1071	if (sound_destroy)
1005	play_sound (sound_destroy);	1072	play_sound (sound_destroy);
1006	else if (flag [FLAG_MONSTER])	1073	else if (flag [FLAG_MONSTER])
…		…
1017	* the previous environment.	1084	* the previous environment.
1018	*/	1085	*/
1019	void	1086	void
1020	object::do_remove ()	1087	object::do_remove ()
1021	{	1088	{
1022	object *tmp, *last = 0;	1089	if (flag [FLAG_REMOVED])
1023	object *otmp;
1024
1025	if (QUERY_FLAG (this, FLAG_REMOVED))
1026	return;	1090	return;
1027		1091
1028	SET_FLAG (this, FLAG_REMOVED);
1029	INVOKE_OBJECT (REMOVE, this);	1092	INVOKE_OBJECT (REMOVE, this);
		1093
		1094	flag [FLAG_REMOVED] = true;
1030		1095
1031	if (more)	1096	if (more)
1032	more->remove ();	1097	more->remove ();
1033		1098
1034	/*	1099	/*
1035	* In this case, the object to be removed is in someones	1100	* In this case, the object to be removed is in someones
1036	* inventory.	1101	* inventory.
1037	*/	1102	*/
1038	if (env)	1103	if (env)
1039	{	1104	{
		1105	flag [FLAG_REMOVED] = false; // hack around the issue of visible_to checking flag_removed
		1106	if (object *pl = visible_to ())
		1107	esrv_del_item (pl->contr, count);
		1108	flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed
		1109
1040	adjust_weight (env, -total_weight ());	1110	adjust_weight (env, -total_weight ());
1041		1111
1042	*(above ? &above->below : &env->inv) = below;	1112	object *pl = in_player ();
1043
1044	if (below)
1045	below->above = above;
1046		1113
1047	/* we set up values so that it could be inserted into	1114	/* we set up values so that it could be inserted into
1048	* the map, but we don't actually do that - it is up	1115	* the map, but we don't actually do that - it is up
1049	* to the caller to decide what we want to do.	1116	* to the caller to decide what we want to do.
1050	*/	1117	*/
1051	map = env->map;	1118	map = env->map;
1052	x = env->x;	1119	x = env->x;
1053	y = env->y;	1120	y = env->y;
		1121
		1122	// make sure cmov optimisation is applicable
		1123	*(above ? &above->below : &env->inv) = below;
		1124	*(below ? &below->above : &above ) = above; // &above is just a dummy
		1125
1054	above = 0;	1126	above = 0;
1055	below = 0;	1127	below = 0;
1056	env = 0;	1128	env = 0;
1057		1129
1058	/* NO_FIX_PLAYER is set when a great many changes are being	1130	/* NO_FIX_PLAYER is set when a great many changes are being
1059	* made to players inventory. If set, avoiding the call	1131	* made to players inventory. If set, avoiding the call
1060	* to save cpu time.	1132	* to save cpu time.
1061	*/	1133	*/
1062	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1134	if (pl)
		1135	if (pl->is_player () && (glow_radius || !QUERY_FLAG (pl, FLAG_NO_FIX_PLAYER)))
		1136	{
1063	otmp->update_stats ();	1137	pl->update_stats ();
		1138
		1139	if (glow_radius && pl->is_on_map ())
		1140	update_all_los (pl->map, pl->x, pl->y);
		1141	}
1064	}	1142	}
1065	else if (map)	1143	else if (map)
1066	{	1144	{
1067	if (type == PLAYER)
1068	{
1069	// leaving a spot always closes any open container on the ground
1070	if (container && !container->env)
1071	// this causes spurious floorbox updates, but it ensures
1072	// that the CLOSE event is being sent.
1073	close_container ();
1074
1075	--map->players;
1076	map->touch ();
1077	}
1078
1079	map->dirty = true;	1145	map->dirty = true;
1080	mapspace &ms = this->ms ();	1146	mapspace &ms = this->ms ();
1081		1147
		1148	if (object *pl = ms.player ())
		1149	{
		1150	if (is_player ())
		1151	{
		1152	if (!flag [FLAG_WIZPASS])
		1153	ms.smell = ++mapspace::smellcount; // remember the smell of the player
		1154
		1155	// leaving a spot always closes any open container on the ground
		1156	if (container && !container->env)
		1157	// this causes spurious floorbox updates, but it ensures
		1158	// that the CLOSE event is being sent.
		1159	close_container ();
		1160
		1161	--map->players;
		1162	map->touch ();
		1163	}
		1164	else if (pl->container_ () == this)
		1165	{
		1166	// removing a container should close it
		1167	close_container ();
		1168	}
		1169
		1170	esrv_del_item (pl->contr, count);
		1171	}
		1172
1082	/* link the object above us */	1173	/* link the object above us */
1083	if (above)	1174	// re-link, make sure compiler can easily use cmove
1084	above->below = below;	1175	*(above ? &above->below : &ms.top) = below;
1085	else	1176	*(below ? &below->above : &ms.bot) = above;
1086	ms.top = below; /* we were top, set new top */
1087
1088	/* Relink the object below us, if there is one */
1089	if (below)
1090	below->above = above;
1091	else
1092	{
1093	/* Nothing below, which means we need to relink map object for this space
1094	* use translated coordinates in case some oddness with map tiling is
1095	* evident
1096	*/
1097	if (GET_MAP_OB (map, x, y) != this)
1098	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 ());
1099
1100	ms.bot = above; /* goes on above it. */
1101	}
1102		1177
1103	above = 0;	1178	above = 0;
1104	below = 0;	1179	below = 0;
1105		1180
		1181	ms.invalidate ();
		1182
1106	if (map->in_memory == MAP_SAVING)	1183	if (map->in_memory == MAP_SAVING)
1107	return;	1184	return;
1108		1185
1109	int check_walk_off = !flag [FLAG_NO_APPLY];	1186	int check_walk_off = !flag [FLAG_NO_APPLY];
1110		1187
1111	if (object *pl = ms.player ())	1188	if (object *pl = ms.player ())
1112	{	1189	{
1113	if (pl->container == this)	1190	if (pl->container_ () == this)
1114	/* If a container that the player is currently using somehow gets	1191	/* If a container that the player is currently using somehow gets
1115	* removed (most likely destroyed), update the player view	1192	* removed (most likely destroyed), update the player view
1116	* appropriately.	1193	* appropriately.
1117	*/	1194	*/
1118	pl->close_container ();	1195	pl->close_container ();
1119		1196
		1197	//TODO: the floorbox prev/next might need updating
		1198	//esrv_del_item (pl->contr, count);
		1199	//TODO: update floorbox to preserve ordering
		1200	if (pl->contr->ns)
1120	pl->contr->ns->floorbox_update ();	1201	pl->contr->ns->floorbox_update ();
1121	}	1202	}
1122		1203
		1204	if (check_walk_off)
1123	for (tmp = ms.bot; tmp; tmp = tmp->above)	1205	for (object *above, *tmp = ms.bot; tmp; tmp = above)
1124	{	1206	{
		1207	above = tmp->above;
		1208
1125	/* No point updating the players look faces if he is the object	1209	/* No point updating the players look faces if he is the object
1126	* being removed.	1210	* being removed.
1127	*/	1211	*/
1128		1212
1129	/* See if object moving off should effect something */	1213	/* See if object moving off should effect something */
1130	if (check_walk_off
1131	&& ((move_type & tmp->move_off)	1214	if ((move_type & tmp->move_off)
1132	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))	1215	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0)
1133	{
1134	move_apply (tmp, this, 0);	1216	move_apply (tmp, this, 0);
1135
1136	if (destroyed ())
1137	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1138	}	1217	}
1139		1218
1140	last = tmp;	1219	if (affects_los ())
1141	}
1142
1143	/* last == NULL if there are no objects on this space */
1144	//TODO: this makes little sense, why only update the topmost object?
1145	if (!last)
1146	map->at (x, y).flags_ = 0;
1147	else
1148	update_object (last, UP_OBJ_REMOVE);
1149
1150	if (flag [FLAG_BLOCKSVIEW] || glow_radius)
1151	update_all_los (map, x, y);	1220	update_all_los (map, x, y);
1152	}	1221	}
1153	}	1222	}
1154		1223
1155	/*	1224	/*
…		…
1169	if (!top)	1238	if (!top)
1170	for (top = op; top && top->above; top = top->above)	1239	for (top = op; top && top->above; top = top->above)
1171	;	1240	;
1172		1241
1173	for (; top; top = top->below)	1242	for (; top; top = top->below)
1174	{
1175	if (top == op)
1176	continue;
1177
1178	if (object::can_merge (op, top))	1243	if (object::can_merge (op, top))
1179	{	1244	{
1180	top->nrof += op->nrof;	1245	top->nrof += op->nrof;
1181		1246
1182	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/	1247	if (object *pl = top->visible_to ())
1183	op->weight = 0; /* Don't want any adjustements now */	1248	esrv_update_item (UPD_NROF, pl, top);
		1249
		1250	op->weight = 0; // cancel the addition above
		1251	op->carrying = 0; // must be 0 already
		1252
1184	op->destroy ();	1253	op->destroy ();
		1254
1185	return top;	1255	return top;
1186	}	1256	}
1187	}
1188		1257
1189	return 0;	1258	return 0;
1190	}	1259	}
1191		1260
1192	void	1261	void
…		…
1217	* job preparing multi-part monsters.	1286	* job preparing multi-part monsters.
1218	*/	1287	*/
1219	object *	1288	object *
1220	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)	1289	insert_ob_in_map_at (object *op, maptile *m, object *originator, int flag, int x, int y)
1221	{	1290	{
		1291	op->remove ();
		1292
1222	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)	1293	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1223	{	1294	{
1224	tmp->x = x + tmp->arch->x;	1295	tmp->x = x + tmp->arch->x;
1225	tmp->y = y + tmp->arch->y;	1296	tmp->y = y + tmp->arch->y;
1226	}	1297	}
…		…
1249	* just 'op' otherwise	1320	* just 'op' otherwise
1250	*/	1321	*/
1251	object *	1322	object *
1252	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)	1323	insert_ob_in_map (object *op, maptile *m, object *originator, int flag)
1253	{	1324	{
1254	assert (!op->flag [FLAG_FREED]);
1255
1256	object *top, *floor = NULL;
1257
1258	op->remove ();	1325	op->remove ();
		1326
		1327	if (m == &freed_map)//D TODO: remove soon
		1328	{//D
		1329	LOG (llevError | logBacktrace, "tries to insret object on freed objects map: %s", op->debug_desc ());//D
		1330	}//D
1259		1331
1260	/* Ideally, the caller figures this out. However, it complicates a lot	1332	/* Ideally, the caller figures this out. However, it complicates a lot
1261	* of areas of callers (eg, anything that uses find_free_spot would now	1333	* of areas of callers (eg, anything that uses find_free_spot would now
1262	* need extra work	1334	* need extra work
1263	*/	1335	*/
		1336	maptile *newmap = m;
1264	if (!xy_normalise (m, op->x, op->y))	1337	if (!xy_normalise (newmap, op->x, op->y))
1265	{	1338	{
1266	op->destroy ();	1339	op->head_ ()->destroy ();// remove head_ once all tail object destroyers found
1267	return 0;	1340	return 0;
1268	}	1341	}
1269		1342
1270	if (object *more = op->more)	1343	if (object *more = op->more)
1271	if (!insert_ob_in_map (more, m, originator, flag))	1344	if (!insert_ob_in_map (more, m, originator, flag))
1272	return 0;	1345	return 0;
1273		1346
1274	CLEAR_FLAG (op, FLAG_REMOVED);	1347	op->flag [FLAG_REMOVED] = false;
1275		1348	op->env = 0;
1276	op->map = m;	1349	op->map = newmap;
		1350
1277	mapspace &ms = op->ms ();	1351	mapspace &ms = op->ms ();
1278		1352
1279	/* this has to be done after we translate the coordinates.	1353	/* this has to be done after we translate the coordinates.
1280	*/	1354	*/
1281	if (op->nrof && !(flag & INS_NO_MERGE))	1355	if (op->nrof && !(flag & INS_NO_MERGE))
1282	for (object *tmp = ms.bot; tmp; tmp = tmp->above)	1356	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1283	if (object::can_merge (op, tmp))	1357	if (object::can_merge (op, tmp))
1284	{	1358	{
		1359	// TODO: we actually want to update tmp, not op,
		1360	// but some caller surely breaks when we return tmp
		1361	// from here :/
1285	op->nrof += tmp->nrof;	1362	op->nrof += tmp->nrof;
1286	tmp->destroy (1);	1363	tmp->destroy ();
1287	}	1364	}
1288		1365
1289	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1366	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1290	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1367	CLEAR_FLAG (op, FLAG_INV_LOCKED);
1291		1368
…		…
1298	{	1375	{
1299	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");	1376	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");
1300	abort ();	1377	abort ();
1301	}	1378	}
1302		1379
		1380	if (!originator->is_on_map ())
		1381	{
		1382	LOG (llevError, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map",
		1383	op->debug_desc (), originator->debug_desc ());
		1384	abort ();
		1385	}
		1386
1303	op->above = originator;	1387	op->above = originator;
1304	op->below = originator->below;	1388	op->below = originator->below;
1305
1306	if (op->below)
1307	op->below->above = op;
1308	else
1309	ms.bot = op;
1310
1311	/* since *below* originator, no need to update top */
1312	originator->below = op;	1389	originator->below = op;
		1390
		1391	*(op->below ? &op->below->above : &ms.bot) = op;
1313	}	1392	}
1314	else	1393	else
1315	{	1394	{
1316	top = ms.bot;	1395	object *floor = 0;
		1396	object *top = ms.top;
1317		1397
1318	/* If there are other objects, then */	1398	/* If there are other objects, then */
1319	if (top)	1399	if (top)
1320	{	1400	{
1321	object *last = 0;
1322
1323	/*	1401	/*
1324	* If there are multiple objects on this space, we do some trickier handling.	1402	* If there are multiple objects on this space, we do some trickier handling.
1325	* We've already dealt with merging if appropriate.	1403	* We've already dealt with merging if appropriate.
1326	* Generally, we want to put the new object on top. But if	1404	* Generally, we want to put the new object on top. But if
1327	* flag contains INS_ABOVE_FLOOR_ONLY, once we find the last	1405	* flag contains INS_ABOVE_FLOOR_ONLY, once we find the last
…		…
1330	* once we get to them. This reduces the need to traverse over all of	1408	* once we get to them. This reduces the need to traverse over all of
1331	* them when adding another one - this saves quite a bit of cpu time	1409	* them when adding another one - this saves quite a bit of cpu time
1332	* when lots of spells are cast in one area. Currently, it is presumed	1410	* when lots of spells are cast in one area. Currently, it is presumed
1333	* that flying non pickable objects are spell objects.	1411	* that flying non pickable objects are spell objects.
1334	*/	1412	*/
1335	for (top = ms.bot; top; top = top->above)	1413	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1336	{	1414	{
1337	if (QUERY_FLAG (top, FLAG_IS_FLOOR) || QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))	1415	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) || QUERY_FLAG (tmp, FLAG_OVERLAY_FLOOR))
1338	floor = top;	1416	floor = tmp;
1339		1417
1340	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))	1418	if (QUERY_FLAG (tmp, FLAG_NO_PICK) && (tmp->move_type & (MOVE_FLY_LOW | MOVE_FLY_HIGH)) && !QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1341	{	1419	{
1342	/* We insert above top, so we want this object below this */	1420	/* We insert above top, so we want this object below this */
1343	top = top->below;	1421	top = tmp->below;
1344	break;	1422	break;
1345	}	1423	}
1346		1424
1347	last = top;	1425	top = tmp;
1348	}	1426	}
1349
1350	/* Don't want top to be NULL, so set it to the last valid object */
1351	top = last;
1352		1427
1353	/* We let update_position deal with figuring out what the space	1428	/* We let update_position deal with figuring out what the space
1354	* looks like instead of lots of conditions here.	1429	* looks like instead of lots of conditions here.
1355	* makes things faster, and effectively the same result.	1430	* makes things faster, and effectively the same result.
1356	*/	1431	*/
…		…
1363	*/	1438	*/
1364	if (!(flag & INS_ON_TOP)	1439	if (!(flag & INS_ON_TOP)
1365	&& ms.flags () & P_BLOCKSVIEW	1440	&& ms.flags () & P_BLOCKSVIEW
1366	&& (op->face && !faces [op->face].visibility))	1441	&& (op->face && !faces [op->face].visibility))
1367	{	1442	{
		1443	object *last;
		1444
1368	for (last = top; last != floor; last = last->below)	1445	for (last = top; last != floor; last = last->below)
1369	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1446	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1370	break;	1447	break;
1371		1448
1372	/* Check to see if we found the object that blocks view,	1449	/* Check to see if we found the object that blocks view,
…		…
1380	} /* If objects on this space */	1457	} /* If objects on this space */
1381		1458
1382	if (flag & INS_ABOVE_FLOOR_ONLY)	1459	if (flag & INS_ABOVE_FLOOR_ONLY)
1383	top = floor;	1460	top = floor;
1384		1461
1385	/* Top is the object that our object (op) is going to get inserted above.	1462	// insert object above top, or bottom-most if top = 0
1386	*/
1387
1388	/* First object on this space */
1389	if (!top)	1463	if (!top)
1390	{	1464	{
		1465	op->below = 0;
1391	op->above = ms.bot;	1466	op->above = ms.bot;
1392
1393	if (op->above)
1394	op->above->below = op;
1395
1396	op->below = 0;
1397	ms.bot = op;	1467	ms.bot = op;
		1468
		1469	*(op->above ? &op->above->below : &ms.top) = op;
1398	}	1470	}
1399	else	1471	else
1400	{ /* get inserted into the stack above top */	1472	{
1401	op->above = top->above;	1473	op->above = top->above;
1402
1403	if (op->above)
1404	op->above->below = op;	1474	top->above = op;
1405		1475
1406	op->below = top;	1476	op->below = top;
1407	top->above = op;	1477	*(op->above ? &op->above->below : &ms.top) = op;
1408	}	1478	}
		1479	}
1409		1480
1410	if (!op->above)	1481	if (op->is_player ())
1411	ms.top = op;
1412	} /* else not INS_BELOW_ORIGINATOR */
1413
1414	if (op->type == PLAYER)
1415	{	1482	{
1416	op->contr->do_los = 1;	1483	op->contr->do_los = 1;
1417	++op->map->players;	1484	++op->map->players;
1418	op->map->touch ();	1485	op->map->touch ();
1419	}	1486	}
1420		1487
1421	op->map->dirty = true;	1488	op->map->dirty = true;
1422		1489
1423	if (object *pl = ms.player ())	1490	if (object *pl = ms.player ())
		1491	//TODO: the floorbox prev/next might need updating
		1492	//esrv_send_item (pl, op);
		1493	//TODO: update floorbox to preserve ordering
		1494	if (pl->contr->ns)
1424	pl->contr->ns->floorbox_update ();	1495	pl->contr->ns->floorbox_update ();
1425		1496
1426	/* If this object glows, it may affect lighting conditions that are	1497	/* If this object glows, it may affect lighting conditions that are
1427	* visible to others on this map. But update_all_los is really	1498	* visible to others on this map. But update_all_los is really
1428	* an inefficient way to do this, as it means los for all players	1499	* an inefficient way to do this, as it means los for all players
1429	* on the map will get recalculated. The players could very well	1500	* on the map will get recalculated. The players could very well
1430	* be far away from this change and not affected in any way -	1501	* be far away from this change and not affected in any way -
1431	* this should get redone to only look for players within range,	1502	* this should get redone to only look for players within range,
1432	* or just updating the P_UPTODATE for spaces within this area	1503	* or just updating the P_UPTODATE for spaces within this area
1433	* of effect may be sufficient.	1504	* of effect may be sufficient.
1434	*/	1505	*/
1435	if (op->map->darkness && (op->glow_radius != 0))	1506	if (op->affects_los ())
		1507	{
		1508	op->ms ().invalidate ();
1436	update_all_los (op->map, op->x, op->y);	1509	update_all_los (op->map, op->x, op->y);
		1510	}
1437		1511
1438	/* updates flags (blocked, alive, no magic, etc) for this map space */	1512	/* updates flags (blocked, alive, no magic, etc) for this map space */
1439	update_object (op, UP_OBJ_INSERT);	1513	update_object (op, UP_OBJ_INSERT);
1440		1514
1441	INVOKE_OBJECT (INSERT, op);	1515	INVOKE_OBJECT (INSERT, op);
…		…
1448	* blocked() and wall() work properly), and these flags are updated by	1522	* blocked() and wall() work properly), and these flags are updated by
1449	* update_object().	1523	* update_object().
1450	*/	1524	*/
1451		1525
1452	/* if this is not the head or flag has been passed, don't check walk on status */	1526	/* if this is not the head or flag has been passed, don't check walk on status */
1453	if (!(flag & INS_NO_WALK_ON) && op->head_ () == op)	1527	if (!(flag & INS_NO_WALK_ON) && op->is_head ())
1454	{	1528	{
1455	if (check_move_on (op, originator))	1529	if (check_move_on (op, originator))
1456	return 0;	1530	return 0;
1457		1531
1458	/* If we are a multi part object, lets work our way through the check	1532	/* If we are a multi part object, lets work our way through the check
…		…
1469	/* this function inserts an object in the map, but if it	1543	/* this function inserts an object in the map, but if it
1470	* finds an object of its own type, it'll remove that one first.	1544	* finds an object of its own type, it'll remove that one first.
1471	* op is the object to insert it under: supplies x and the map.	1545	* op is the object to insert it under: supplies x and the map.
1472	*/	1546	*/
1473	void	1547	void
1474	replace_insert_ob_in_map (const char *arch_string, object *op)	1548	replace_insert_ob_in_map (shstr_tmp archname, object *op)
1475	{	1549	{
1476	/* first search for itself and remove any old instances */	1550	/* first search for itself and remove any old instances */
1477		1551
1478	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)	1552	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1479	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */	1553	if (tmp->arch->archname == archname) /* same archetype */
1480	tmp->destroy (1);	1554	tmp->destroy ();
1481		1555
1482	object *tmp = arch_to_object (archetype::find (arch_string));	1556	object *tmp = arch_to_object (archetype::find (archname));
1483		1557
1484	tmp->x = op->x;	1558	tmp->x = op->x;
1485	tmp->y = op->y;	1559	tmp->y = op->y;
1486		1560
1487	insert_ob_in_map (tmp, op->map, op, 0);	1561	insert_ob_in_map (tmp, op->map, op, 0);
…		…
1494	return where->env->insert (this);	1568	return where->env->insert (this);
1495	else	1569	else
1496	return where->map->insert (this, where->x, where->y, originator, flags);	1570	return where->map->insert (this, where->x, where->y, originator, flags);
1497	}	1571	}
1498		1572
1499	// find player who can see this object	1573	// check whether we can put this into the map, respect max_nrof, max_volume, max_items
1500	object *	1574	bool
1501	object::visible_to () const	1575	object::can_drop_at (maptile *m, int x, int y, object *originator)
1502	{	1576	{
1503	if (!flag [FLAG_REMOVED])	1577	mapspace &ms = m->at (x, y);
1504	{
1505	// see if we are in a container of sorts
1506	if (env)
1507	{
1508	// the player inventory itself is always visible
1509	if (env->type == PLAYER)
1510	return env;
1511		1578
1512	// else a player could have our env open	1579	int items = ms.items ();
1513	object *envest = env->outer_env ();
1514		1580
1515	// the player itself is always on a map, so we will find him here	1581	if (!items // testing !items ensures we can drop at least one item
1516	// even if our inv is in a player.	1582	|| (items < m->max_items
1517	if (envest->is_on_map ())	1583	&& ms.volume () < m->max_volume
1518	if (object *pl = envest->ms ().player ())	1584	&& nrof <= m->max_nrof))
1519	if (pl->container == env)	1585	return true;
1520	return pl;
1521	}
1522	else
1523	{
1524	// maybe there is a player standing on the same mapspace
1525	// this will catch the case where "this" is a player
1526	if (object *pl = ms ().player ())
1527	return pl;
1528	}
1529	}
1530		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
1531	return 0;	1593	return false;
1532	}	1594	}
1533		1595
1534	/*	1596	/*
1535	* decrease(object, number) decreases a specified number from	1597	* decrease(object, number) decreases a specified number from
1536	* 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
…		…
1544	if (!nr)	1606	if (!nr)
1545	return true;	1607	return true;
1546		1608
1547	nr = min (nr, nrof);	1609	nr = min (nr, nrof);
1548		1610
		1611	if (nrof > nr)
		1612	{
1549	nrof -= nr;	1613	nrof -= nr;
1550
1551	if (nrof)
1552	{
1553	adjust_weight (env, -weight * nr); // carrying == 0	1614	adjust_weight (env, -weight * max (1, nr)); // carrying == 0
1554		1615
1555	if (object *pl = visible_to ())	1616	if (object *pl = visible_to ())
1556	esrv_update_item (UPD_NROF, pl, this);	1617	esrv_update_item (UPD_NROF, pl, this);
1557		1618
1558	return true;	1619	return true;
1559	}	1620	}
1560	else	1621	else
1561	{	1622	{
1562	destroy (1);	1623	destroy ();
1563	return false;	1624	return false;
1564	}	1625	}
1565	}	1626	}
1566		1627
1567	/*	1628	/*
…		…
1584	}	1645	}
1585	else	1646	else
1586	{	1647	{
1587	decrease (nr);	1648	decrease (nr);
1588		1649
1589	object *op = object_create_clone (this);	1650	object *op = deep_clone ();
1590	op->nrof = nr;	1651	op->nrof = nr;
1591	return op;	1652	return op;
1592	}	1653	}
1593	}	1654	}
1594		1655
…		…
1638	if (object::can_merge (tmp, op))	1699	if (object::can_merge (tmp, op))
1639	{	1700	{
1640	/* return the original object and remove inserted object	1701	/* return the original object and remove inserted object
1641	(client needs the original object) */	1702	(client needs the original object) */
1642	tmp->nrof += op->nrof;	1703	tmp->nrof += op->nrof;
		1704
		1705	if (object *pl = tmp->visible_to ())
		1706	esrv_update_item (UPD_NROF, pl, tmp);
		1707
1643	adjust_weight (this, op->total_weight ());	1708	adjust_weight (this, op->total_weight ());
1644		1709
1645	op->destroy (1);	1710	op->destroy ();
1646	op = tmp;	1711	op = tmp;
1647	goto inserted;	1712	goto inserted;
1648	}	1713	}
1649		1714
1650	op->owner = 0; // it's his/hers now. period.	1715	op->owner = 0; // it's his/hers now. period.
…		…
1661		1726
1662	inv = op;	1727	inv = op;
1663		1728
1664	op->flag [FLAG_REMOVED] = 0;	1729	op->flag [FLAG_REMOVED] = 0;
1665		1730
		1731	if (object *pl = op->visible_to ())
		1732	esrv_send_item (pl, op);
		1733
1666	adjust_weight (this, op->total_weight ());	1734	adjust_weight (this, op->total_weight ());
1667		1735
1668	inserted:	1736	inserted:
1669	/* 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 */
1670	if (op->glow_radius && map && map->darkness)	1738	if (op->glow_radius && is_on_map ())
		1739	{
		1740	update_stats ();
1671	update_all_los (map, x, y);	1741	update_all_los (map, x, y);
1672		1742	}
1673	if (object *otmp = in_player ())	1743	else if (is_player () && !flag [FLAG_NO_FIX_PLAYER])
1674	if (otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1744	// if this is a player's inventory, update stats
1675	otmp->update_stats ();	1745	update_stats ();
1676		1746
1677	INVOKE_OBJECT (INSERT, this);	1747	INVOKE_OBJECT (INSERT, this);
1678		1748
1679	return op;	1749	return op;
1680	}	1750	}
…		…
1700	* on top.	1770	* on top.
1701	*/	1771	*/
1702	int	1772	int
1703	check_move_on (object *op, object *originator)	1773	check_move_on (object *op, object *originator)
1704	{	1774	{
		1775	if (QUERY_FLAG (op, FLAG_NO_APPLY))
		1776	return 0;
		1777
1705	object *tmp;	1778	object *tmp;
1706	maptile *m = op->map;	1779	maptile *m = op->map;
1707	int x = op->x, y = op->y;	1780	int x = op->x, y = op->y;
1708		1781
1709	MoveType move_on, move_slow, move_block;	1782	mapspace &ms = m->at (x, y);
1710		1783
1711	if (QUERY_FLAG (op, FLAG_NO_APPLY))	1784	ms.update ();
1712	return 0;
1713		1785
1714	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);	1786	MoveType move_on = ms.move_on;
1715	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);	1787	MoveType move_slow = ms.move_slow;
1716	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);	1788	MoveType move_block = ms.move_block;
1717		1789
1718	/* 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,
1719	* 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
1720	* 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
1721	* as walking.	1793	* as walking.
…		…
1732	return 0;	1804	return 0;
1733		1805
1734	/* The objects have to be checked from top to bottom.	1806	/* The objects have to be checked from top to bottom.
1735	* Hence, we first go to the top:	1807	* Hence, we first go to the top:
1736	*/	1808	*/
1737		1809	for (object *next, *tmp = ms.top; tmp; tmp = next)
1738	for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above)
1739	{
1740	/* Trim the search when we find the first other spell effect
1741	* this helps performance so that if a space has 50 spell objects,
1742	* we don't need to check all of them.
1743	*/
1744	if ((tmp->move_type & MOVE_FLY_LOW) && QUERY_FLAG (tmp, FLAG_NO_PICK))
1745	break;
1746	}	1810	{
		1811	next = tmp->below;
1747		1812
1748	for (; tmp; tmp = tmp->below)
1749	{
1750	if (tmp == op)	1813	if (tmp == op)
1751	continue; /* Can't apply yourself */	1814	continue; /* Can't apply yourself */
1752		1815
1753	/* 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.
1754	* Second check makes sure that the movement types not being slowed	1817	* Second check makes sure that the movement types not being slowed
…		…
1759	if (!QUERY_FLAG (op, FLAG_WIZPASS))	1822	if (!QUERY_FLAG (op, FLAG_WIZPASS))
1760	{	1823	{
1761	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||	1824	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
1762	((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))
1763	{	1826	{
1764
1765	float
1766	diff = tmp->move_slow_penalty * fabs (op->speed);	1827	float diff = tmp->move_slow_penalty * fabs (op->speed);
1767		1828
1768	if (op->type == PLAYER)	1829	if (op->is_player ())
1769	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)) ||
1770	(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)))
1771	diff /= 4.0;	1832	diff /= 4.0;
1772		1833
1773	op->speed_left -= diff;	1834	op->speed_left -= diff;
1774	}	1835	}
1775	}	1836	}
…		…
1808	LOG (llevError, "Present_arch called outside map.\n");	1869	LOG (llevError, "Present_arch called outside map.\n");
1809	return NULL;	1870	return NULL;
1810	}	1871	}
1811		1872
1812	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)
1813	if (tmp->arch == at)	1874	if (tmp->arch->archname == at->archname)
1814	return tmp;	1875	return tmp;
1815		1876
1816	return NULL;	1877	return NULL;
1817	}	1878	}
1818		1879
…		…
1882	* The first matching object is returned, or NULL if none.	1943	* The first matching object is returned, or NULL if none.
1883	*/	1944	*/
1884	object *	1945	object *
1885	present_arch_in_ob (const archetype *at, const object *op)	1946	present_arch_in_ob (const archetype *at, const object *op)
1886	{	1947	{
1887	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)	1948	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1888	if (tmp->arch == at)	1949	if (tmp->arch->archname == at->archname)
1889	return tmp;	1950	return tmp;
1890		1951
1891	return NULL;	1952	return NULL;
1892	}	1953	}
1893		1954
…		…
1981	* head of the object should correspond for the entire object.	2042	* head of the object should correspond for the entire object.
1982	*/	2043	*/
1983	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))	2044	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
1984	continue;	2045	continue;
1985		2046
1986	if (ob->blocked (m, pos.x, pos.y))	2047	if (ob->blocked (pos.m, pos.x, pos.y))
1987	continue;	2048	continue;
1988		2049
1989	altern [index++] = i;	2050	altern [index++] = i;
1990	}	2051	}
1991		2052
…		…
2059	* there is capable of.	2120	* there is capable of.
2060	*/	2121	*/
2061	int	2122	int
2062	find_dir (maptile *m, int x, int y, object *exclude)	2123	find_dir (maptile *m, int x, int y, object *exclude)
2063	{	2124	{
2064	int i, max = SIZEOFFREE, mflags;	2125	int max = SIZEOFFREE, mflags;
2065
2066	sint16 nx, ny;
2067	object *tmp;
2068	maptile *mp;
2069
2070	MoveType blocked, move_type;	2126	MoveType move_type;
2071		2127
2072	if (exclude && exclude->head_ () != exclude)	2128	if (exclude && exclude->head_ () != exclude)
2073	{	2129	{
2074	exclude = exclude->head;	2130	exclude = exclude->head;
2075	move_type = exclude->move_type;	2131	move_type = exclude->move_type;
…		…
2078	{	2134	{
2079	/* 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. */
2080	move_type = MOVE_ALL;	2136	move_type = MOVE_ALL;
2081	}	2137	}
2082		2138
2083	for (i = 1; i < max; i++)	2139	for (int i = 1; i < max; i++)
2084	{	2140	{
2085	mp = m;	2141	mapxy pos (m, x, y);
2086	nx = x + freearr_x[i];	2142	pos.move (i);
2087	ny = y + freearr_y[i];
2088		2143
2089	mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);	2144	if (!pos.normalise ())
2090
2091	if (mflags & P_OUT_OF_MAP)
2092	max = maxfree[i];	2145	max = maxfree[i];
2093	else	2146	else
2094	{	2147	{
2095	mapspace &ms = mp->at (nx, ny);	2148	mapspace &ms = *pos;
2096		2149
2097	blocked = ms.move_block;
2098
2099	if ((move_type & blocked) == move_type)	2150	if ((move_type & ms.move_block) == move_type)
2100	max = maxfree[i];	2151	max = maxfree [i];
2101	else if (mflags & P_IS_ALIVE)	2152	else if (ms.flags () & P_IS_ALIVE)
2102	{	2153	{
2103	for (tmp = ms.bot; tmp; tmp = tmp->above)	2154	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
2104	if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)	2155	if ((tmp->flag [FLAG_MONSTER] || tmp->is_player ())
2105	&& (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))	2156	&& (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2106	break;
2107
2108	if (tmp)
2109	return freedir[i];	2157	return freedir [i];
2110	}	2158	}
2111	}	2159	}
2112	}	2160	}
2113		2161
2114	return 0;	2162	return 0;
…		…
2189	* 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
2190	* 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.
2191	* 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
2192	* functions.	2240	* functions.
2193	*/	2241	*/
2194	int reduction_dir[SIZEOFFREE][3] = {	2242	static const int reduction_dir[SIZEOFFREE][3] = {
2195	{0, 0, 0}, /* 0 */	2243	{0, 0, 0}, /* 0 */
2196	{0, 0, 0}, /* 1 */	2244	{0, 0, 0}, /* 1 */
2197	{0, 0, 0}, /* 2 */	2245	{0, 0, 0}, /* 2 */
2198	{0, 0, 0}, /* 3 */	2246	{0, 0, 0}, /* 3 */
2199	{0, 0, 0}, /* 4 */	2247	{0, 0, 0}, /* 4 */
…		…
2295	int	2343	int
2296	can_pick (const object *who, const object *item)	2344	can_pick (const object *who, const object *item)
2297	{	2345	{
2298	return /*QUERY_FLAG(who,FLAG_WIZ)|| */	2346	return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2299	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&	2347	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
2300	!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));
2301	}	2349	}
2302		2350
2303	/*	2351	/*
2304	* create clone from object to another	2352	* create clone from object to another
2305	*/	2353	*/
2306	object *	2354	object *
2307	object_create_clone (object *asrc)	2355	object::deep_clone ()
2308	{	2356	{
2309	object *dst = 0, *tmp, *src, *prev, *item;	2357	assert (("deep_clone called on non-head object", is_head ()));
2310		2358
2311	if (!asrc)	2359	object *dst = clone ();
2312	return 0;
2313		2360
2314	src = asrc->head_ ();	2361	object *prev = dst;
2315
2316	prev = 0;
2317	for (object *part = src; part; part = part->more)	2362	for (object *part = this->more; part; part = part->more)
2318	{	2363	{
2319	tmp = part->clone ();	2364	object *tmp = part->clone ();
2320	tmp->x -= src->x;
2321	tmp->y -= src->y;
2322
2323	if (!part->head)
2324	{
2325	dst = tmp;
2326	tmp->head = 0;
2327	}
2328	else
2329	tmp->head = dst;	2365	tmp->head = dst;
2330
2331	tmp->more = 0;
2332
2333	if (prev)
2334	prev->more = tmp;	2366	prev->more = tmp;
2335
2336	prev = tmp;	2367	prev = tmp;
2337	}	2368	}
2338		2369
2339	for (item = src->inv; item; item = item->below)	2370	for (object *item = inv; item; item = item->below)
2340	insert_ob_in_ob (object_create_clone (item), dst);	2371	insert_ob_in_ob (item->deep_clone (), dst);
2341		2372
2342	return dst;	2373	return dst;
2343	}	2374	}
2344		2375
2345	/* This returns the first object in who's inventory that	2376	/* This returns the first object in who's inventory that
…		…
2354	return tmp;	2385	return tmp;
2355		2386
2356	return 0;	2387	return 0;
2357	}	2388	}
2358		2389
2359	/* If ob has a field named key, return the link from the list,	2390	shstr_tmp
2360	* otherwise return NULL.	2391	object::kv_get (shstr_tmp key) const
2361	*
2362	* key must be a passed in shared string - otherwise, this won't
2363	* do the desired thing.
2364	*/
2365	key_value *
2366	get_ob_key_link (const object *ob, const char *key)
2367	{	2392	{
2368	for (key_value *link = ob->key_values; link; link = link->next)	2393	for (key_value *kv = key_values; kv; kv = kv->next)
2369	if (link->key == key)	2394	if (kv->key == key)
2370	return link;
2371
2372	return 0;
2373	}
2374
2375	/*
2376	* Returns the value of op has an extra_field for key, or NULL.
2377	*
2378	* The argument doesn't need to be a shared string.
2379	*
2380	* The returned string is shared.
2381	*/
2382	const char *
2383	get_ob_key_value (const object *op, const char *const key)
2384	{
2385	key_value *link;
2386	shstr_cmp canonical_key (key);
2387
2388	if (!canonical_key)
2389	{
2390	/* 1. There being a field named key on any object
2391	* implies there'd be a shared string to find.
2392	* 2. Since there isn't, no object has this field.
2393	* 3. Therefore, *this* object doesn't have this field.
2394	*/
2395	return 0;
2396	}
2397
2398	/* This is copied from get_ob_key_link() above -
2399	* only 4 lines, and saves the function call overhead.
2400	*/
2401	for (link = op->key_values; link; link = link->next)
2402	if (link->key == canonical_key)
2403	return link->value;	2395	return kv->value;
2404		2396
2405	return 0;	2397	return shstr ();
2406	}	2398	}
2407		2399
2408	/*	2400	void
2409	* Updates the canonical_key in op to value.	2401	object::kv_set (shstr_tmp key, shstr_tmp value)
2410	*
2411	* canonical_key is a shared string (value doesn't have to be).
2412	*
2413	* Unless add_key is TRUE, it won't add fields, only change the value of existing
2414	* keys.
2415	*
2416	* Returns TRUE on success.
2417	*/
2418	int
2419	set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key)
2420	{	2402	{
2421	key_value *field = NULL, *last = NULL;	2403	for (key_value *kv = key_values; kv; kv = kv->next)
2422		2404	if (kv->key == key)
2423	for (field = op->key_values; field != NULL; field = field->next)
2424	{
2425	if (field->key != canonical_key)
2426	{	2405	{
2427	last = field;	2406	kv->value = value;
2428	continue;	2407	return;
2429	}	2408	}
2430		2409
2431	if (value)	2410	key_value *kv = new key_value;
2432	field->value = value;	2411
2433	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)
2434	{	2424	{
2435	/* Basically, if the archetype has this key set,	2425	key_value *kv = *kvp;
2436	* we need to store the null value so when we save	2426	*kvp = (*kvp)->next;
2437	* it, we save the empty value so that when we load,	2427	delete kv;
2438	* we get this value back again.	2428	return;
2439	*/
2440	if (get_ob_key_link (op->arch, canonical_key))
2441	field->value = 0;
2442	else
2443	{
2444	if (last)
2445	last->next = field->next;
2446	else
2447	op->key_values = field->next;
2448
2449	delete field;
2450	}
2451	}	2429	}
2452	return TRUE;
2453	}
2454	/* IF we get here, key doesn't exist */
2455
2456	/* No field, we'll have to add it. */
2457
2458	if (!add_key)
2459	return FALSE;
2460
2461	/* There isn't any good reason to store a null
2462	* value in the key/value list. If the archetype has
2463	* this key, then we should also have it, so shouldn't
2464	* be here. If user wants to store empty strings,
2465	* should pass in ""
2466	*/
2467	if (value == NULL)
2468	return TRUE;
2469
2470	field = new key_value;
2471
2472	field->key = canonical_key;
2473	field->value = value;
2474	/* Usual prepend-addition. */
2475	field->next = op->key_values;
2476	op->key_values = field;
2477
2478	return TRUE;
2479	}
2480
2481	/*
2482	* Updates the key in op to value.
2483	*
2484	* If add_key is FALSE, this will only update existing keys,
2485	* and not add new ones.
2486	* In general, should be little reason FALSE is ever passed in for add_key
2487	*
2488	* Returns TRUE on success.
2489	*/
2490	int
2491	set_ob_key_value (object *op, const char *key, const char *value, int add_key)
2492	{
2493	shstr key_ (key);
2494
2495	return set_ob_key_value_s (op, key_, value, add_key);
2496	}	2430	}
2497		2431
2498	object::depth_iterator::depth_iterator (object *container)	2432	object::depth_iterator::depth_iterator (object *container)
2499	: iterator_base (container)	2433	: iterator_base (container)
2500	{	2434	{
…		…
2550	{	2484	{
2551	char flagdesc[512];	2485	char flagdesc[512];
2552	char info2[256 * 4];	2486	char info2[256 * 4];
2553	char *p = info;	2487	char *p = info;
2554		2488
2555	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}",
2556	count,	2490	count,
2557	uuid.c_str (),	2491	uuid.c_str (),
2558	&name,	2492	&name,
2559	title ? "\",title:\"" : "",	2493	title ? ",title:\"" : "",
2560	title ? (const char *)title : "",	2494	title ? (const char *)title : "",
		2495	title ? "\"" : "",
2561	flag_desc (flagdesc, 512), type);	2496	flag_desc (flagdesc, 512), type);
2562		2497
2563	if (!this->flag[FLAG_REMOVED] && env)	2498	if (!flag[FLAG_REMOVED] && env)
2564	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2499	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2565		2500
2566	if (map)	2501	if (map)
2567	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);	2502	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2568		2503
…		…
2598	object::open_container (object *new_container)	2533	object::open_container (object *new_container)
2599	{	2534	{
2600	if (container == new_container)	2535	if (container == new_container)
2601	return;	2536	return;
2602		2537
2603	if (object *old_container = container)	2538	object *old_container = container;
		2539
		2540	if (old_container)
2604	{	2541	{
2605	if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))	2542	if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
2606	return;	2543	return;
2607		2544
2608	#if 0	2545	#if 0
…		…
2610	if (object *closer = old_container->inv)	2547	if (object *closer = old_container->inv)
2611	if (closer->type == CLOSE_CON)	2548	if (closer->type == CLOSE_CON)
2612	closer->destroy ();	2549	closer->destroy ();
2613	#endif	2550	#endif
2614		2551
		2552	// make sure the container is available
		2553	esrv_send_item (this, old_container);
		2554
2615	old_container->flag [FLAG_APPLIED] = 0;	2555	old_container->flag [FLAG_APPLIED] = false;
2616	container = 0;	2556	container = 0;
2617		2557
		2558	// client needs item update to make it work, client bug requires this to be separate
2618	esrv_update_item (UPD_FLAGS, this, old_container);	2559	esrv_update_item (UPD_FLAGS, this, old_container);
		2560
2619	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));	2561	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", old_container->query_name ());
2620	play_sound (sound_find ("chest_close"));	2562	play_sound (sound_find ("chest_close"));
2621	}	2563	}
2622		2564
2623	if (new_container)	2565	if (new_container)
2624	{	2566	{
…		…
2634	closer->flag [FLAG_NO_MAP_SAVE] = 1;	2576	closer->flag [FLAG_NO_MAP_SAVE] = 1;
2635	new_container->insert (closer);	2577	new_container->insert (closer);
2636	}	2578	}
2637	#endif	2579	#endif
2638		2580
2639	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));	2581	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", new_container->query_name ());
2640		2582
		2583	// make sure the container is available, client bug requires this to be separate
		2584	esrv_send_item (this, new_container);
		2585
2641	new_container->flag [FLAG_APPLIED] = 1;	2586	new_container->flag [FLAG_APPLIED] = true;
2642	container = new_container;	2587	container = new_container;
2643		2588
		2589	// client needs flag change
2644	esrv_update_item (UPD_FLAGS, this, new_container);	2590	esrv_update_item (UPD_FLAGS, this, new_container);
2645	esrv_send_inventory (this, new_container);	2591	esrv_send_inventory (this, new_container);
2646	play_sound (sound_find ("chest_open"));	2592	play_sound (sound_find ("chest_open"));
2647	}	2593	}
		2594	// else if (!old_container->env && contr && contr->ns)
		2595	// contr->ns->floorbox_reset ();
2648	}	2596	}
2649		2597
2650	object *	2598	object *
2651	object::force_find (const shstr name)	2599	object::force_find (shstr_tmp name)
2652	{	2600	{
2653	/* cycle through his inventory to look for the MARK we want to	2601	/* cycle through his inventory to look for the MARK we want to
2654	* place	2602	* place
2655	*/	2603	*/
2656	for (object *tmp = inv; tmp; tmp = tmp->below)	2604	for (object *tmp = inv; tmp; tmp = tmp->below)
…		…
2658	return splay (tmp);	2606	return splay (tmp);
2659		2607
2660	return 0;	2608	return 0;
2661	}	2609	}
2662		2610
		2611	//-GPL
		2612
2663	void	2613	void
		2614	object::force_set_timer (int duration)
		2615	{
		2616	this->duration = 1;
		2617	this->speed_left = -1.f;
		2618
		2619	this->set_speed (duration ? 1.f / duration : 0.f);
		2620	}
		2621
		2622	object *
2664	object::force_add (const shstr name, int duration)	2623	object::force_add (shstr_tmp name, int duration)
2665	{	2624	{
2666	if (object *force = force_find (name))	2625	if (object *force = force_find (name))
2667	force->destroy ();	2626	force->destroy ();
2668		2627
2669	object *force = get_archetype (FORCE_NAME);	2628	object *force = get_archetype (FORCE_NAME);
2670		2629
2671	force->slaying = name;	2630	force->slaying = name;
2672	force->stats.food = 1;	2631	force->force_set_timer (duration);
2673	force->speed_left = -1.f;
2674
2675	force->set_speed (duration ? 1.f / duration : 0.f);
2676	force->flag [FLAG_IS_USED_UP] = true;
2677	force->flag [FLAG_APPLIED] = true;	2632	force->flag [FLAG_APPLIED] = true;
2678		2633
2679	insert (force);	2634	return insert (force);
2680	}	2635	}
2681		2636
2682	void	2637	void
2683	object::play_sound (faceidx sound)	2638	object::play_sound (faceidx sound) const
2684	{	2639	{
2685	if (!sound)	2640	if (!sound)
2686	return;	2641	return;
2687		2642
2688	if (flag [FLAG_REMOVED])	2643	if (is_on_map ())
		2644	map->play_sound (sound, x, y);
		2645	else if (object *pl = in_player ())
		2646	pl->contr->play_sound (sound);
		2647	}
		2648
		2649	void
		2650	object::say_msg (const char *msg) const
		2651	{
		2652	if (is_on_map ())
		2653	map->say_msg (msg, x, y);
		2654	else if (object *pl = in_player ())
		2655	pl->contr->play_sound (sound);
		2656	}
		2657
		2658	void
		2659	object::make_noise ()
		2660	{
		2661	// we do not model noise in the map, so instead put
		2662	// a temporary light into the noise source
		2663	// could use the map instead, but that's less reliable for our
		2664	// goal, which is to make invisibility a bit harder to exploit
		2665
		2666	// currently only works sensibly for players
		2667	if (!is_player ())
2689	return;	2668	return;
2690		2669
2691	if (env)	2670	// find old force, or create new one
2692	{	2671	object *force = force_find (shstr_noise_force);
2693	if (object *pl = in_player ())	2672
2694	pl->contr->play_sound (sound);	2673	if (force)
2695	}	2674	force->speed_left = -1.f; // patch old speed up
2696	else	2675	else
2697	map->play_sound (sound, x, y);	2676	{
2698	}	2677	force = archetype::get (shstr_noise_force);
2699		2678
		2679	force->slaying = shstr_noise_force;
		2680	force->stats.food = 1;
		2681	force->speed_left = -1.f;
		2682
		2683	force->set_speed (1.f / 4.f);
		2684	force->flag [FLAG_IS_USED_UP] = true;
		2685	force->flag [FLAG_APPLIED] = true;
		2686
		2687	insert (force);
		2688	}
		2689	}
		2690

Diff Legend

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