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.209 by root, Mon Apr 21 06:35:26 2008 UTC vs.
Revision 1.301 by root, Mon Nov 9 18:47:56 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>
25	#include <stdio.h>	26	#include <stdio.h>
26	#include <sys/types.h>	27	#include <sys/types.h>
27	#include <sys/uio.h>	28	#include <sys/uio.h>
28	#include <object.h>	29	#include <object.h>
29	#include <funcpoint.h>
30	#include <sproto.h>	30	#include <sproto.h>
31	#include <loader.h>	31	#include <loader.h>
32		32
33	#include <bitset>	33	#include <bitset>
34		34
35	UUID UUID::cur;	35	UUID UUID::cur;
36	static uint64_t seq_next_save;	36	static uint64_t seq_next_save;
37	static const uint64 UUID_GAP = 1<<19;	37	static const uint64 UUID_GAP = 1<<19;
		38	uint32_t mapspace::smellcount = 10000;
38		39
39	objectvec objects;	40	objectvec objects;
40	activevec actives;	41	activevec actives;
		42
		43	//+GPL
41		44
42	short freearr_x[SIZEOFFREE] = {	45	short freearr_x[SIZEOFFREE] = {
43	0,	46	0,
44	0, 1, 1, 1, 0, -1, -1, -1,	47	0, 1, 1, 1, 0, -1, -1, -1,
45	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,
…		…
49	0,	52	0,
50	-1, -1, 0, 1, 1, 1, 0, -1,	53	-1, -1, 0, 1, 1, 1, 0, -1,
51	-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,
52	-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
53	};	56	};
54	int maxfree[SIZEOFFREE] = {
55	0,
56	9, 10, 13, 14, 17, 18, 21, 22,
57	25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45, 48,
58	49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49
59	};
60	int freedir[SIZEOFFREE] = {	57	int freedir[SIZEOFFREE] = {
61	0,	58	0,
62	1, 2, 3, 4, 5, 6, 7, 8,	59	1, 2, 3, 4, 5, 6, 7, 8,
63	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,
64	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
65	};	69	};
66		70
67	static void	71	static void
68	write_uuid (uval64 skip, bool sync)	72	write_uuid (uval64 skip, bool sync)
69	{	73	{
…		…
97		101
98	LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);	102	LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);
99	_exit (1);	103	_exit (1);
100	}	104	}
101		105
102	UUID::BUF buf;	106	char buf [UUID::MAX_LEN];
103	buf[0] = 0;	107	buf[0] = 0;
104	fgets (buf, sizeof (buf), fp);	108	fgets (buf, sizeof (buf), fp);
105		109
106	if (!UUID::cur.parse (buf))	110	if (!UUID::cur.parse (buf))
107	{	111	{
…		…
134		138
135	void	139	void
136	UUID::init ()	140	UUID::init ()
137	{	141	{
138	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;
139	}	208	}
140		209
141	/* 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. */
142	static bool	211	static bool
143	compare_ob_value_lists_one (const object *wants, const object *has)	212	compare_ob_value_lists_one (const object *wants, const object *has)
144	{	213	{
145	key_value *wants_field;
146
147	/* 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
148	* 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
149	* different structure or at least keep the lists sorted...	216	* different structure or at least keep the lists sorted...
150	*/	217	*/
151		218
152	/* For each field in wants, */	219	/* For each field in wants, */
153	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)
154	{	221	if (has->kv_get (kv->key) != kv->value)
155	key_value *has_field;	222	return false;
156
157	/* Look for a field in has with the same key. */
158	has_field = get_ob_key_link (has, wants_field->key);
159
160	if (!has_field)
161	return 0; /* No field with that name. */
162
163	/* Found the matching field. */
164	if (has_field->value != wants_field->value)
165	return 0; /* Values don't match, so this half of the comparison is false. */
166
167	/* If we get here, we found a match. Now for the next field in wants. */
168	}
169		223
170	/* 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. */
171	return 1;	225	return true;
172	}	226	}
173		227
174	/* Returns TRUE if ob1 has the same key_values as ob2. */	228	/* Returns TRUE if ob1 has the same key_values as ob2. */
175	static bool	229	static bool
176	compare_ob_value_lists (const object *ob1, const object *ob2)	230	compare_ob_value_lists (const object *ob1, const object *ob2)
177	{	231	{
178	/* 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,
179	* so we need to run the comparison *twice*. :(	233	* so we need to run the comparison *twice*. :(
180	*/	234	*/
181	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);
182	}	237	}
183		238
184	/* 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
185	* they can be merged together.	240	* they can be merged together.
186	*	241	*
…		…
196	bool object::can_merge_slow (object *ob1, object *ob2)	251	bool object::can_merge_slow (object *ob1, object *ob2)
197	{	252	{
198	/* A couple quicksanity checks */	253	/* A couple quicksanity checks */
199	if (ob1 == ob2	254	if (ob1 == ob2
200	|| ob1->type != ob2->type	255	|| ob1->type != ob2->type
201	|| ob1->speed != ob2->speed	256	|| fabs (ob1->speed - ob2->speed) >= MIN_ACTIVE_SPEED
202	|| ob1->value != ob2->value	257	|| ob1->value != ob2->value
203	|| ob1->name != ob2->name)	258	|| ob1->name != ob2->name)
204	return 0;	259	return 0;
205		260
206	/* Do not merge objects if nrof would overflow. First part checks	261	/* Do not merge objects if nrof would overflow, assume nrof
207	* for unsigned overflow (2c), second part checks whether the result	262	* is always 0 .. 2**31-1 */
208	* would fit into a 32 bit signed int, which is often used to hold	263	if (ob1->nrof > 0x7fffffff - ob2->nrof)
209	* nrof values.
210	*/
211	if (~ob1->nrof < ob2->nrof || ob1->nrof + ob2->nrof > (1UL << 31))
212	return 0;	264	return 0;
213		265
214	/* If the objects have been identified, set the BEEN_APPLIED flag.	266	/* If the objects have been identified, set the BEEN_APPLIED flag.
215	* 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
216	* 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
…		…
221	SET_FLAG (ob1, FLAG_BEEN_APPLIED);	273	SET_FLAG (ob1, FLAG_BEEN_APPLIED);
222		274
223	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))	275	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))
224	SET_FLAG (ob2, FLAG_BEEN_APPLIED);	276	SET_FLAG (ob2, FLAG_BEEN_APPLIED);
225		277
226	if (ob1->arch->name != ob2->arch->name	278	if (ob1->arch->archname != ob2->arch->archname
227	|| ob1->name != ob2->name	279	|| ob1->name != ob2->name
228	|| ob1->title != ob2->title	280	|| ob1->title != ob2->title
229	|| ob1->msg != ob2->msg	281	|| ob1->msg != ob2->msg
230	|| ob1->weight != ob2->weight	282	|| ob1->weight != ob2->weight
231	|| ob1->attacktype != ob2->attacktype	283	|| ob1->attacktype != ob2->attacktype
232	|| ob1->magic != ob2->magic	284	|| ob1->magic != ob2->magic
233	|| ob1->slaying != ob2->slaying	285	|| ob1->slaying != ob2->slaying
234	|| ob1->skill != ob2->skill	286	|| ob1->skill != ob2->skill
235	|| ob1->value != ob2->value	287	|| ob1->value != ob2->value
236	|| 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
237	|| ob1->client_type != ob2->client_type	290	|| ob1->client_type != ob2->client_type
238	|| ob1->materialname != ob2->materialname	291	|| ob1->materialname != ob2->materialname
239	|| ob1->lore != ob2->lore	292	|| ob1->lore != ob2->lore
240	|| ob1->subtype != ob2->subtype	293	|| ob1->subtype != ob2->subtype
241	|| ob1->move_type != ob2->move_type	294	|| ob1->move_type != ob2->move_type
242	|| ob1->move_block != ob2->move_block	295	|| ob1->move_block != ob2->move_block
243	|| ob1->move_allow != ob2->move_allow	296	|| ob1->move_allow != ob2->move_allow
244	|| ob1->move_on != ob2->move_on	297	|| ob1->move_on != ob2->move_on
245	|| ob1->move_off != ob2->move_off	298	|| ob1->move_off != ob2->move_off
246	|| ob1->move_slow != ob2->move_slow	299	|| ob1->move_slow != ob2->move_slow
247	|| ob1->move_slow_penalty != ob2->move_slow_penalty	300	|| fabs (ob1->move_slow_penalty - ob2->move_slow_penalty) >= (1.f / 1024.f)
248	|| memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))	301	|| memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
249	|| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats)))	302	|| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats)))
250	return 0;	303	return 0;
251		304
252	if ((ob1->flag ^ ob2->flag)	305	if ((ob1->flag ^ ob2->flag)
253	.reset (FLAG_INV_LOCKED)	306	.reset (FLAG_INV_LOCKED)
254	.reset (FLAG_CLIENT_SENT)
255	.reset (FLAG_REMOVED)	307	.reset (FLAG_REMOVED)
256	.any ())	308	.any ())
257	return 0;	309	return 0;
258		310
259	/* This is really a spellbook check - we should in general	311	/* This is really a spellbook check - we should in general
…		…
331		383
332	/* Everything passes, must be OK. */	384	/* Everything passes, must be OK. */
333	return 1;	385	return 1;
334	}	386	}
335		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
336	// adjust weight per container type ("of holding")	425	// adjust weight per container type ("of holding")
337	static sint32	426	static sint32
338	weight_adjust (object *op, sint32 weight)	427	weight_adjust_for (object *op, sint32 weight)
339	{	428	{
340	return op->type == CONTAINER	429	return op->type == CONTAINER
341	? lerp (weight, 0, 100, 0, 100 - op->stats.Str)	430	? lerp (weight, 0, 100, 0, 100 - op->stats.Str)
342	: weight;	431	: weight;
343	}	432	}
…		…
349	static void	438	static void
350	adjust_weight (object *op, sint32 weight)	439	adjust_weight (object *op, sint32 weight)
351	{	440	{
352	while (op)	441	while (op)
353	{	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
354	weight = weight_adjust (op, weight);	445	weight = weight_adjust_for (op, op->carrying)
		446	- weight_adjust_for (op, op->carrying - weight);
		447
		448	if (!weight)
		449	return;
355		450
356	op->carrying += weight;	451	op->carrying += weight;
		452
		453	if (object *pl = op->visible_to ())
		454	if (pl != op) // player is handled lazily
		455	esrv_update_item (UPD_WEIGHT, pl, op);
		456
357	op = op->env;	457	op = op->env;
358	}	458	}
359	}	459	}
360		460
361	/*	461	/*
…		…
374	op->update_weight ();	474	op->update_weight ();
375		475
376	sum += op->total_weight ();	476	sum += op->total_weight ();
377	}	477	}
378		478
379	carrying = weight_adjust (this, sum);	479	sum = weight_adjust_for (this, sum);
		480
		481	if (sum != carrying)
		482	{
		483	carrying = sum;
		484
		485	if (object *pl = visible_to ())
		486	if (pl != this) // player is handled lazily
		487	esrv_update_item (UPD_WEIGHT, pl, this);
		488	}
380	}	489	}
381		490
382	/*	491	/*
383	* Used by: Server DM commands: dumpbelow, dump. Some error messages.	492	* Used by: Server DM commands: dumpbelow, dump. Some error messages.
384	*/	493	*/
…		…
391	object_freezer freezer;	500	object_freezer freezer;
392	op->write (freezer);	501	op->write (freezer);
393	return freezer.as_string ();	502	return freezer.as_string ();
394	}	503	}
395		504
396	/*	505	char *
397	* get_nearest_part(multi-object, object 2) returns the part of the	506	object::as_string ()
398	* multi-object 1 which is closest to the second object.
399	* If it's not a multi-object, it is returned.
400	*/
401	object *
402	get_nearest_part (object *op, const object *pl)
403	{	507	{
404	object *tmp, *closest;	508	return dump_object (this);
405	int last_dist, i;
406
407	if (!op->more)
408	return op;
409
410	for (last_dist = distance (op, pl), closest = op, tmp = op->more;
411	tmp;
412	tmp = tmp->more)
413	if ((i = distance (tmp, pl)) < last_dist)
414	closest = tmp, last_dist = i;
415
416	return closest;
417	}	509	}
418		510
419	/*	511	/*
420	* 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.
421	* VERRRY slow.	513	* VERRRY slow.
…		…
437	*/	529	*/
438	object *	530	object *
439	find_object_name (const char *str)	531	find_object_name (const char *str)
440	{	532	{
441	shstr_cmp str_ (str);	533	shstr_cmp str_ (str);
442	object *op;
443		534
		535	if (str_)
444	for_all_objects (op)	536	for_all_objects (op)
445	if (op->name == str_)	537	if (op->name == str_)
446	break;	538	return op;
447		539
448	return op;	540	return 0;
449	}	541	}
450		542
451	/*	543	/*
452	* 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
453	* skill and experience objects.	545	* skill and experience objects.
…		…
515	update_stats ();	607	update_stats ();
516		608
517	new_draw_info_format (NDI_UNIQUE, 0, this,	609	new_draw_info_format (NDI_UNIQUE, 0, this,
518	"You try to balance all your items at once, "	610	"You try to balance all your items at once, "
519	"but the %s is just too much for your body. "	611	"but the %s is just too much for your body. "
520	"[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);
521	return false;	614	return false;
522	}	615	}
523		616
524	//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);
525	}	618	}
…		…
551	}	644	}
552		645
553	op->key_values = 0;	646	op->key_values = 0;
554	}	647	}
555		648
556	object &	649	/*
557	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)
558	{	659	{
559	bool is_freed = flag [FLAG_FREED];	660	dst->remove ();
560	bool is_removed = flag [FLAG_REMOVED];
561
562	*(object_copy *)this = src;	661	*(object_copy *)dst = *this;
563
564	flag [FLAG_FREED] = is_freed;
565	flag [FLAG_REMOVED] = is_removed;	662	dst->flag [FLAG_REMOVED] = true;
566		663
567	/* Copy over key_values, if any. */	664	/* Copy over key_values, if any. */
568	if (src.key_values)	665	if (key_values)
569	{	666	{
570	key_value *tail = 0;	667	key_value *tail = 0;
571	key_values = 0;	668	dst->key_values = 0;
572		669
573	for (key_value *i = src.key_values; i; i = i->next)	670	for (key_value *i = key_values; i; i = i->next)
574	{	671	{
575	key_value *new_link = new key_value;	672	key_value *new_link = new key_value;
576		673
577	new_link->next = 0;	674	new_link->next = 0;
578	new_link->key = i->key;	675	new_link->key = i->key;
579	new_link->value = i->value;	676	new_link->value = i->value;
580		677
581	/* Try and be clever here, too. */	678	/* Try and be clever here, too. */
582	if (!key_values)	679	if (!dst->key_values)
583	{	680	{
584	key_values = new_link;	681	dst->key_values = new_link;
585	tail = new_link;	682	tail = new_link;
586	}	683	}
587	else	684	else
588	{	685	{
589	tail->next = new_link;	686	tail->next = new_link;
590	tail = new_link;	687	tail = new_link;
591	}	688	}
592	}	689	}
593	}	690	}
594	}
595
596	/*
597	* copy_to first frees everything allocated by the dst object,
598	* and then copies the contents of itself into the second
599	* object, allocating what needs to be allocated. Basically, any
600	* data that is malloc'd needs to be re-malloc/copied. Otherwise,
601	* if the first object is freed, the pointers in the new object
602	* will point at garbage.
603	*/
604	void
605	object::copy_to (object *dst)
606	{
607	*dst = *this;
608		691
609	if (speed < 0)	692	if (speed < 0)
610	dst->speed_left -= rndm ();	693	dst->speed_left -= rndm ();
611		694
612	dst->set_speed (dst->speed);	695	dst->activate ();
613	}	696	}
614		697
615	void	698	void
616	object::instantiate ()	699	object::instantiate ()
617	{	700	{
…		…
634	object *	717	object *
635	object::clone ()	718	object::clone ()
636	{	719	{
637	object *neu = create ();	720	object *neu = create ();
638	copy_to (neu);	721	copy_to (neu);
		722	neu->map = map; // not copied by copy_to
639	return neu;	723	return neu;
640	}	724	}
641		725
642	/*	726	/*
643	* 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
…		…
660	* 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.
661	*/	745	*/
662	void	746	void
663	object::set_speed (float speed)	747	object::set_speed (float speed)
664	{	748	{
665	if (flag [FLAG_FREED] && speed)
666	{
667	LOG (llevError, "Object %s is freed but has speed.\n", &name);
668	speed = 0;
669	}
670
671	this->speed = speed;	749	this->speed = speed;
672		750
673	if (has_active_speed ())	751	if (has_active_speed ())
674	activate ();	752	activate ();
675	else	753	else
…		…
694	* UP_OBJ_FACE: only the objects face has changed.	772	* UP_OBJ_FACE: only the objects face has changed.
695	*/	773	*/
696	void	774	void
697	update_object (object *op, int action)	775	update_object (object *op, int action)
698	{	776	{
699	if (op == NULL)	777	if (!op)
700	{	778	{
701	/* this should never happen */	779	/* this should never happen */
702	LOG (llevDebug, "update_object() called for NULL object.\n");	780	LOG (llevError | logBacktrace, "update_object() called for NULL object.\n");
703	return;	781	return;
704	}	782	}
705		783
706	if (op->env)	784	if (!op->is_on_map ())
707	{	785	{
708	/* Animation is currently handled by client, so nothing	786	/* Animation is currently handled by client, so nothing
709	* to do in this case.	787	* to do in this case.
710	*/	788	*/
711	return;	789	return;
712	}	790	}
713
714	/* If the map is saving, don't do anything as everything is
715	* going to get freed anyways.
716	*/
717	if (!op->map || op->map->in_memory == MAP_SAVING)
718	return;
719		791
720	/* make sure the object is within map boundaries */	792	/* make sure the object is within map boundaries */
721	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)
722	{	794	{
723	LOG (llevError, "update_object() called for object out of map!\n");	795	LOG (llevError, "update_object() called for object out of map!\n");
…		…
731		803
732	if (!(m.flags_ & P_UPTODATE))	804	if (!(m.flags_ & P_UPTODATE))
733	/* nop */;	805	/* nop */;
734	else if (action == UP_OBJ_INSERT)	806	else if (action == UP_OBJ_INSERT)
735	{	807	{
		808	#if 0
736	// this is likely overkill, TODO: revisit (schmorp)	809	// this is likely overkill, TODO: revisit (schmorp)
737	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))	810	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
738	|| (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))	811	|| (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))
739	|| (op->type == PLAYER && !(m.flags_ & P_PLAYER))	812	|| (op->is_player () && !(m.flags_ & P_PLAYER))
740	|| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))	813	|| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
741	|| (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))	814	|| (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))
742	|| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))	815	|| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))
743	|| (m.move_on | op->move_on ) != m.move_on	816	|| (m.move_on | op->move_on ) != m.move_on
744	|| (m.move_off | op->move_off ) != m.move_off	817	|| (m.move_off | op->move_off ) != m.move_off
745	|| (m.move_slow | op->move_slow) != m.move_slow	818	|| (m.move_slow | op->move_slow) != m.move_slow
746	/* 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
747	* to have move_allow right now.	820	* have move_allow right now.
748	*/	821	*/
749	|| ((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
750	|| 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)
751	m.flags_ = 0;	826	m.invalidate ();
		827	#endif
752	}	828	}
753	/* if the object is being removed, we can't make intelligent	829	/* if the object is being removed, we can't make intelligent
754	* decisions, because remove_ob can't really pass the object	830	* decisions, because remove_ob can't really pass the object
755	* that is being removed.	831	* that is being removed.
756	*/	832	*/
757	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)	833	else if (action == UP_OBJ_CHANGE || action == UP_OBJ_REMOVE)
758	m.flags_ = 0;	834	m.invalidate ();
759	else if (action == UP_OBJ_FACE)	835	else if (action == UP_OBJ_FACE)
760	/* Nothing to do for that case */ ;	836	/* Nothing to do for that case */ ;
761	else	837	else
762	LOG (llevError, "update_object called with invalid action: %d\n", action);	838	LOG (llevError, "update_object called with invalid action: %d\n", action);
763		839
…		…
767		843
768	object::object ()	844	object::object ()
769	{	845	{
770	SET_FLAG (this, FLAG_REMOVED);	846	SET_FLAG (this, FLAG_REMOVED);
771		847
772	expmul = 1.0;	848	//expmul = 1.0; declared const for the time being
773	face = blank_face;	849	face = blank_face;
774	}	850	}
775		851
776	object::~object ()	852	object::~object ()
777	{	853	{
…		…
807	/* If already on active list, don't do anything */	883	/* If already on active list, don't do anything */
808	if (active)	884	if (active)
809	return;	885	return;
810		886
811	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
812	actives.insert (this);	892	actives.insert (this);
		893	}
813	}	894	}
814		895
815	void	896	void
816	object::activate_recursive ()	897	object::activate_recursive ()
817	{	898	{
…		…
866	object::destroy_inv (bool drop_to_ground)	947	object::destroy_inv (bool drop_to_ground)
867	{	948	{
868	// need to check first, because the checks below might segfault	949	// need to check first, because the checks below might segfault
869	// as we might be on an invalid mapspace and crossfire code	950	// as we might be on an invalid mapspace and crossfire code
870	// is too buggy to ensure that the inventory is empty.	951	// is too buggy to ensure that the inventory is empty.
871	// corollary: if you create arrows etc. with stuff in tis inventory,	952	// corollary: if you create arrows etc. with stuff in its inventory,
872	// cf will crash below with off-map x and y	953	// cf will crash below with off-map x and y
873	if (!inv)	954	if (!inv)
874	return;	955	return;
875		956
876	/* Only if the space blocks everything do we not process -	957	/* Only if the space blocks everything do we not process -
…		…
878	* drop on that space.	959	* drop on that space.
879	*/	960	*/
880	if (!drop_to_ground	961	if (!drop_to_ground
881	|| !map	962	|| !map
882	|| map->in_memory != MAP_ACTIVE	963	|| map->in_memory != MAP_ACTIVE
883	|| map->nodrop	964	|| map->no_drop
884	|| ms ().move_block == MOVE_ALL)	965	|| ms ().move_block == MOVE_ALL)
885	{	966	{
886	while (inv)	967	while (inv)
887	{
888	inv->destroy_inv (drop_to_ground);
889	inv->destroy ();	968	inv->destroy ();
890	}
891	}	969	}
892	else	970	else
893	{ /* Put objects in inventory onto this space */	971	{ /* Put objects in inventory onto this space */
894	while (inv)	972	while (inv)
895	{	973	{
…		…
913	object *op = new object;	991	object *op = new object;
914	op->link ();	992	op->link ();
915	return op;	993	return op;
916	}	994	}
917		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
918	void	1017	void
919	object::do_destroy ()	1018	object::do_destroy ()
920	{	1019	{
921	attachable::do_destroy ();
922
923	if (flag [FLAG_IS_LINKED])	1020	if (flag [FLAG_IS_LINKED])
924	remove_button_link (this);	1021	remove_link ();
925		1022
926	if (flag [FLAG_FRIENDLY])	1023	if (flag [FLAG_FRIENDLY])
927	remove_friendly_object (this);	1024	remove_friendly_object (this);
928		1025
929	if (!flag [FLAG_REMOVED])
930	remove ();	1026	remove ();
931		1027
932	destroy_inv (true);	1028	attachable::do_destroy ();
933		1029
934	deactivate ();	1030	deactivate ();
935	unlink ();	1031	unlink ();
936		1032
937	flag [FLAG_FREED] = 1;	1033	flag [FLAG_FREED] = 1;
938		1034
939	// hack to ensure that freed objects still have a valid map	1035	// hack to ensure that freed objects still have a valid map
940	{
941	static maptile *freed_map; // freed objects are moved here to avoid crashes
942
943	if (!freed_map)
944	{
945	freed_map = new maptile;
946
947	freed_map->path = "<freed objects map>";
948	freed_map->name = "/internal/freed_objects_map";
949	freed_map->width = 3;
950	freed_map->height = 3;
951	freed_map->nodrop = 1;
952
953	freed_map->alloc ();
954	freed_map->in_memory = MAP_ACTIVE;
955	}
956
957	map = freed_map;	1036	map = &freed_map;
958	x = 1;	1037	x = 1;
959	y = 1;	1038	y = 1;
960	}
961		1039
962	if (more)	1040	if (more)
963	{	1041	{
964	more->destroy ();	1042	more->destroy ();
965	more = 0;	1043	more = 0;
…		…
973	attacked_by = 0;	1051	attacked_by = 0;
974	current_weapon = 0;	1052	current_weapon = 0;
975	}	1053	}
976		1054
977	void	1055	void
978	object::destroy (bool destroy_inventory)	1056	object::destroy ()
979	{	1057	{
980	if (destroyed ())	1058	if (destroyed ())
981	return;	1059	return;
982		1060
983	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
984	destroy_inv (false);	1068	destroy_inv (false);
985		1069
986	if (is_head ())	1070	if (is_head ())
987	if (sound_destroy)	1071	if (sound_destroy)
988	play_sound (sound_destroy);	1072	play_sound (sound_destroy);
989	else if (flag [FLAG_MONSTER])	1073	else if (flag [FLAG_MONSTER])
…		…
1000	* the previous environment.	1084	* the previous environment.
1001	*/	1085	*/
1002	void	1086	void
1003	object::do_remove ()	1087	object::do_remove ()
1004	{	1088	{
1005	object *tmp, *last = 0;	1089	if (flag [FLAG_REMOVED])
1006	object *otmp;
1007
1008	if (QUERY_FLAG (this, FLAG_REMOVED))
1009	return;	1090	return;
1010		1091
1011	SET_FLAG (this, FLAG_REMOVED);
1012	INVOKE_OBJECT (REMOVE, this);	1092	INVOKE_OBJECT (REMOVE, this);
		1093
		1094	flag [FLAG_REMOVED] = true;
1013		1095
1014	if (more)	1096	if (more)
1015	more->remove ();	1097	more->remove ();
1016		1098
1017	/*	1099	/*
1018	* In this case, the object to be removed is in someones	1100	* In this case, the object to be removed is in someones
1019	* inventory.	1101	* inventory.
1020	*/	1102	*/
1021	if (env)	1103	if (env)
1022	{	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
1023	adjust_weight (env, -total_weight ());	1110	adjust_weight (env, -total_weight ());
1024		1111
1025	*(above ? &above->below : &env->inv) = below;	1112	object *pl = in_player ();
1026
1027	if (below)
1028	below->above = above;
1029		1113
1030	/* we set up values so that it could be inserted into	1114	/* we set up values so that it could be inserted into
1031	* 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
1032	* to the caller to decide what we want to do.	1116	* to the caller to decide what we want to do.
1033	*/	1117	*/
1034	map = env->map;	1118	map = env->map;
1035	x = env->x;	1119	x = env->x;
1036	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
1037	above = 0;	1126	above = 0;
1038	below = 0;	1127	below = 0;
1039	env = 0;	1128	env = 0;
1040		1129
1041	/* 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
1042	* made to players inventory. If set, avoiding the call	1131	* made to players inventory. If set, avoiding the call
1043	* to save cpu time.	1132	* to save cpu time.
1044	*/	1133	*/
1045	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	{
1046	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	}
1047	}	1142	}
1048	else if (map)	1143	else if (map)
1049	{	1144	{
1050	if (type == PLAYER)
1051	{
1052	// leaving a spot always closes any open container on the ground
1053	if (container && !container->env)
1054	// this causes spurious floorbox updates, but it ensures
1055	// that the CLOSE event is being sent.
1056	close_container ();
1057
1058	--map->players;
1059	map->touch ();
1060	}
1061
1062	map->dirty = true;	1145	map->dirty = true;
1063	mapspace &ms = this->ms ();	1146	mapspace &ms = this->ms ();
1064		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
1065	/* link the object above us */	1173	/* link the object above us */
1066	if (above)	1174	// re-link, make sure compiler can easily use cmove
1067	above->below = below;	1175	*(above ? &above->below : &ms.top) = below;
1068	else	1176	*(below ? &below->above : &ms.bot) = above;
1069	ms.top = below; /* we were top, set new top */
1070
1071	/* Relink the object below us, if there is one */
1072	if (below)
1073	below->above = above;
1074	else
1075	{
1076	/* Nothing below, which means we need to relink map object for this space
1077	* use translated coordinates in case some oddness with map tiling is
1078	* evident
1079	*/
1080	if (GET_MAP_OB (map, x, y) != this)
1081	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 ());
1082
1083	ms.bot = above; /* goes on above it. */
1084	}
1085		1177
1086	above = 0;	1178	above = 0;
1087	below = 0;	1179	below = 0;
1088		1180
		1181	ms.invalidate ();
		1182
1089	if (map->in_memory == MAP_SAVING)	1183	if (map->in_memory == MAP_SAVING)
1090	return;	1184	return;
1091		1185
1092	int check_walk_off = !flag [FLAG_NO_APPLY];	1186	int check_walk_off = !flag [FLAG_NO_APPLY];
1093		1187
1094	if (object *pl = ms.player ())	1188	if (object *pl = ms.player ())
1095	{	1189	{
1096	if (pl->container == this)	1190	if (pl->container_ () == this)
1097	/* If a container that the player is currently using somehow gets	1191	/* If a container that the player is currently using somehow gets
1098	* removed (most likely destroyed), update the player view	1192	* removed (most likely destroyed), update the player view
1099	* appropriately.	1193	* appropriately.
1100	*/	1194	*/
1101	pl->close_container ();	1195	pl->close_container ();
1102		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)
1103	pl->contr->ns->floorbox_update ();	1201	pl->contr->ns->floorbox_update ();
1104	}	1202	}
1105		1203
		1204	if (check_walk_off)
1106	for (tmp = ms.bot; tmp; tmp = tmp->above)	1205	for (object *above, *tmp = ms.bot; tmp; tmp = above)
1107	{	1206	{
		1207	above = tmp->above;
		1208
1108	/* 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
1109	* being removed.	1210	* being removed.
1110	*/	1211	*/
1111		1212
1112	/* See if object moving off should effect something */	1213	/* See if object moving off should effect something */
1113	if (check_walk_off
1114	&& ((move_type & tmp->move_off)	1214	if ((move_type & tmp->move_off)
1115	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))	1215	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0)
1116	{
1117	move_apply (tmp, this, 0);	1216	move_apply (tmp, this, 0);
1118
1119	if (destroyed ())
1120	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1121	}	1217	}
1122		1218
1123	last = tmp;	1219	if (affects_los ())
1124	}
1125
1126	/* last == NULL if there are no objects on this space */
1127	//TODO: this makes little sense, why only update the topmost object?
1128	if (!last)
1129	map->at (x, y).flags_ = 0;
1130	else
1131	update_object (last, UP_OBJ_REMOVE);
1132
1133	if (flag [FLAG_BLOCKSVIEW] || glow_radius)
1134	update_all_los (map, x, y);	1220	update_all_los (map, x, y);
1135	}	1221	}
1136	}	1222	}
1137		1223
1138	/*	1224	/*
…		…
1152	if (!top)	1238	if (!top)
1153	for (top = op; top && top->above; top = top->above)	1239	for (top = op; top && top->above; top = top->above)
1154	;	1240	;
1155		1241
1156	for (; top; top = top->below)	1242	for (; top; top = top->below)
1157	{
1158	if (top == op)
1159	continue;
1160
1161	if (object::can_merge (op, top))	1243	if (object::can_merge (op, top))
1162	{	1244	{
1163	top->nrof += op->nrof;	1245	top->nrof += op->nrof;
1164		1246
1165	/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/	1247	if (object *pl = top->visible_to ())
1166	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
1167	op->destroy ();	1253	op->destroy ();
		1254
1168	return top;	1255	return top;
1169	}	1256	}
1170	}
1171		1257
1172	return 0;	1258	return 0;
1173	}	1259	}
1174		1260
1175	void	1261	void
…		…
1200	* job preparing multi-part monsters.	1286	* job preparing multi-part monsters.
1201	*/	1287	*/
1202	object *	1288	object *
1203	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)
1204	{	1290	{
		1291	op->remove ();
		1292
1205	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)	1293	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1206	{	1294	{
1207	tmp->x = x + tmp->arch->x;	1295	tmp->x = x + tmp->arch->x;
1208	tmp->y = y + tmp->arch->y;	1296	tmp->y = y + tmp->arch->y;
1209	}	1297	}
…		…
1232	* just 'op' otherwise	1320	* just 'op' otherwise
1233	*/	1321	*/
1234	object *	1322	object *
1235	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)
1236	{	1324	{
1237	assert (!op->flag [FLAG_FREED]);
1238
1239	object *top, *floor = NULL;
1240
1241	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
1242		1331
1243	/* Ideally, the caller figures this out. However, it complicates a lot	1332	/* Ideally, the caller figures this out. However, it complicates a lot
1244	* 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
1245	* need extra work	1334	* need extra work
1246	*/	1335	*/
		1336	maptile *newmap = m;
1247	if (!xy_normalise (m, op->x, op->y))	1337	if (!xy_normalise (newmap, op->x, op->y))
1248	{	1338	{
1249	op->destroy ();	1339	op->head_ ()->destroy ();// remove head_ once all tail object destroyers found
1250	return 0;	1340	return 0;
1251	}	1341	}
1252		1342
1253	if (object *more = op->more)	1343	if (object *more = op->more)
1254	if (!insert_ob_in_map (more, m, originator, flag))	1344	if (!insert_ob_in_map (more, m, originator, flag))
1255	return 0;	1345	return 0;
1256		1346
1257	CLEAR_FLAG (op, FLAG_REMOVED);	1347	op->flag [FLAG_REMOVED] = false;
1258		1348	op->env = 0;
1259	op->map = m;	1349	op->map = newmap;
		1350
1260	mapspace &ms = op->ms ();	1351	mapspace &ms = op->ms ();
1261		1352
1262	/* this has to be done after we translate the coordinates.	1353	/* this has to be done after we translate the coordinates.
1263	*/	1354	*/
1264	if (op->nrof && !(flag & INS_NO_MERGE))	1355	if (op->nrof && !(flag & INS_NO_MERGE))
1265	for (object *tmp = ms.bot; tmp; tmp = tmp->above)	1356	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1266	if (object::can_merge (op, tmp))	1357	if (object::can_merge (op, tmp))
1267	{	1358	{
		1359	// TODO: we actually want to update tmp, not op,
		1360	// but some caller surely breaks when we return tmp
		1361	// from here :/
1268	op->nrof += tmp->nrof;	1362	op->nrof += tmp->nrof;
1269	tmp->destroy (1);	1363	tmp->destroy ();
1270	}	1364	}
1271		1365
1272	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 */
1273	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1367	CLEAR_FLAG (op, FLAG_INV_LOCKED);
1274		1368
…		…
1281	{	1375	{
1282	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");
1283	abort ();	1377	abort ();
1284	}	1378	}
1285		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
1286	op->above = originator;	1387	op->above = originator;
1287	op->below = originator->below;	1388	op->below = originator->below;
1288
1289	if (op->below)
1290	op->below->above = op;
1291	else
1292	ms.bot = op;
1293
1294	/* since *below* originator, no need to update top */
1295	originator->below = op;	1389	originator->below = op;
		1390
		1391	*(op->below ? &op->below->above : &ms.bot) = op;
1296	}	1392	}
1297	else	1393	else
1298	{	1394	{
1299	top = ms.bot;	1395	object *floor = 0;
		1396	object *top = ms.top;
1300		1397
1301	/* If there are other objects, then */	1398	/* If there are other objects, then */
1302	if (top)	1399	if (top)
1303	{	1400	{
1304	object *last = 0;
1305
1306	/*	1401	/*
1307	* 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.
1308	* We've already dealt with merging if appropriate.	1403	* We've already dealt with merging if appropriate.
1309	* 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
1310	* flag contains INS_ABOVE_FLOOR_ONLY, once we find the last	1405	* flag contains INS_ABOVE_FLOOR_ONLY, once we find the last
…		…
1313	* 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
1314	* 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
1315	* 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
1316	* that flying non pickable objects are spell objects.	1411	* that flying non pickable objects are spell objects.
1317	*/	1412	*/
1318	for (top = ms.bot; top; top = top->above)	1413	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1319	{	1414	{
1320	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))
1321	floor = top;	1416	floor = tmp;
1322		1417
1323	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))
1324	{	1419	{
1325	/* We insert above top, so we want this object below this */	1420	/* We insert above top, so we want this object below this */
1326	top = top->below;	1421	top = tmp->below;
1327	break;	1422	break;
1328	}	1423	}
1329		1424
1330	last = top;	1425	top = tmp;
1331	}	1426	}
1332
1333	/* Don't want top to be NULL, so set it to the last valid object */
1334	top = last;
1335		1427
1336	/* We let update_position deal with figuring out what the space	1428	/* We let update_position deal with figuring out what the space
1337	* looks like instead of lots of conditions here.	1429	* looks like instead of lots of conditions here.
1338	* makes things faster, and effectively the same result.	1430	* makes things faster, and effectively the same result.
1339	*/	1431	*/
…		…
1346	*/	1438	*/
1347	if (!(flag & INS_ON_TOP)	1439	if (!(flag & INS_ON_TOP)
1348	&& ms.flags () & P_BLOCKSVIEW	1440	&& ms.flags () & P_BLOCKSVIEW
1349	&& (op->face && !faces [op->face].visibility))	1441	&& (op->face && !faces [op->face].visibility))
1350	{	1442	{
		1443	object *last;
		1444
1351	for (last = top; last != floor; last = last->below)	1445	for (last = top; last != floor; last = last->below)
1352	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1446	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1353	break;	1447	break;
1354		1448
1355	/* Check to see if we found the object that blocks view,	1449	/* Check to see if we found the object that blocks view,
…		…
1363	} /* If objects on this space */	1457	} /* If objects on this space */
1364		1458
1365	if (flag & INS_ABOVE_FLOOR_ONLY)	1459	if (flag & INS_ABOVE_FLOOR_ONLY)
1366	top = floor;	1460	top = floor;
1367		1461
1368	/* 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
1369	*/
1370
1371	/* First object on this space */
1372	if (!top)	1463	if (!top)
1373	{	1464	{
		1465	op->below = 0;
1374	op->above = ms.bot;	1466	op->above = ms.bot;
1375
1376	if (op->above)
1377	op->above->below = op;
1378
1379	op->below = 0;
1380	ms.bot = op;	1467	ms.bot = op;
		1468
		1469	*(op->above ? &op->above->below : &ms.top) = op;
1381	}	1470	}
1382	else	1471	else
1383	{ /* get inserted into the stack above top */	1472	{
1384	op->above = top->above;	1473	op->above = top->above;
1385
1386	if (op->above)
1387	op->above->below = op;	1474	top->above = op;
1388		1475
1389	op->below = top;	1476	op->below = top;
1390	top->above = op;	1477	*(op->above ? &op->above->below : &ms.top) = op;
1391	}	1478	}
		1479	}
1392		1480
1393	if (!op->above)	1481	if (op->is_player ())
1394	ms.top = op;
1395	} /* else not INS_BELOW_ORIGINATOR */
1396
1397	if (op->type == PLAYER)
1398	{	1482	{
1399	op->contr->do_los = 1;	1483	op->contr->do_los = 1;
1400	++op->map->players;	1484	++op->map->players;
1401	op->map->touch ();	1485	op->map->touch ();
1402	}	1486	}
1403		1487
1404	op->map->dirty = true;	1488	op->map->dirty = true;
1405		1489
1406	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)
1407	pl->contr->ns->floorbox_update ();	1495	pl->contr->ns->floorbox_update ();
1408		1496
1409	/* If this object glows, it may affect lighting conditions that are	1497	/* If this object glows, it may affect lighting conditions that are
1410	* 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
1411	* 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
1412	* on the map will get recalculated. The players could very well	1500	* on the map will get recalculated. The players could very well
1413	* 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 -
1414	* this should get redone to only look for players within range,	1502	* this should get redone to only look for players within range,
1415	* or just updating the P_UPTODATE for spaces within this area	1503	* or just updating the P_UPTODATE for spaces within this area
1416	* of effect may be sufficient.	1504	* of effect may be sufficient.
1417	*/	1505	*/
1418	if (op->map->darkness && (op->glow_radius != 0))	1506	if (op->affects_los ())
		1507	{
		1508	op->ms ().invalidate ();
1419	update_all_los (op->map, op->x, op->y);	1509	update_all_los (op->map, op->x, op->y);
		1510	}
1420		1511
1421	/* updates flags (blocked, alive, no magic, etc) for this map space */	1512	/* updates flags (blocked, alive, no magic, etc) for this map space */
1422	update_object (op, UP_OBJ_INSERT);	1513	update_object (op, UP_OBJ_INSERT);
1423		1514
1424	INVOKE_OBJECT (INSERT, op);	1515	INVOKE_OBJECT (INSERT, op);
…		…
1431	* blocked() and wall() work properly), and these flags are updated by	1522	* blocked() and wall() work properly), and these flags are updated by
1432	* update_object().	1523	* update_object().
1433	*/	1524	*/
1434		1525
1435	/* 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 */
1436	if (!(flag & INS_NO_WALK_ON) && op->head_ () == op)	1527	if (!(flag & INS_NO_WALK_ON) && op->is_head ())
1437	{	1528	{
1438	if (check_move_on (op, originator))	1529	if (check_move_on (op, originator))
1439	return 0;	1530	return 0;
1440		1531
1441	/* 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
…		…
1452	/* this function inserts an object in the map, but if it	1543	/* this function inserts an object in the map, but if it
1453	* 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.
1454	* 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.
1455	*/	1546	*/
1456	void	1547	void
1457	replace_insert_ob_in_map (const char *arch_string, object *op)	1548	replace_insert_ob_in_map (shstr_tmp archname, object *op)
1458	{	1549	{
1459	/* first search for itself and remove any old instances */	1550	/* first search for itself and remove any old instances */
1460		1551
1461	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)	1552	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1462	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */	1553	if (tmp->arch->archname == archname) /* same archetype */
1463	tmp->destroy (1);	1554	tmp->destroy ();
1464		1555
1465	object *tmp = arch_to_object (archetype::find (arch_string));	1556	object *tmp = arch_to_object (archetype::find (archname));
1466		1557
1467	tmp->x = op->x;	1558	tmp->x = op->x;
1468	tmp->y = op->y;	1559	tmp->y = op->y;
1469		1560
1470	insert_ob_in_map (tmp, op->map, op, 0);	1561	insert_ob_in_map (tmp, op->map, op, 0);
…		…
1477	return where->env->insert (this);	1568	return where->env->insert (this);
1478	else	1569	else
1479	return where->map->insert (this, where->x, where->y, originator, flags);	1570	return where->map->insert (this, where->x, where->y, originator, flags);
1480	}	1571	}
1481		1572
1482	// find player who can see this object	1573	// check whether we can put this into the map, respect max_volume, max_items
1483	static object *	1574	bool
1484	visible_to (object *op)	1575	object::can_drop_at (maptile *m, int x, int y, object *originator)
1485	{	1576	{
1486	if (!op->flag [FLAG_REMOVED])	1577	mapspace &ms = m->at (x, y);
1487	{
1488	// see if we are in a container of sorts
1489	if (object *env = op->env)
1490	{
1491	// the player inventory itself is always visible
1492	if (env->type == PLAYER)
1493	return env;
1494		1578
1495	// else a player could have our env open	1579	int items = ms.items ();
1496	env = env->outer_env ();
1497		1580
1498	// 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
1499	// even if our inv is in a player.	1582	|| (items < m->max_items
1500	if (env->is_on_map ())	1583	&& ms.volume () < m->max_volume))
1501	if (object *pl = env->ms ().player ())	1584	return true;
1502	if (pl->container == op->env)
1503	return pl;
1504	}
1505	else
1506	{
1507	// maybe there is a player standing on the same mapspace
1508	if (object *pl = env->ms ().player ())
1509	return pl;
1510	}
1511	}
1512		1585
		1586	if (originator && originator->is_player ())
		1587	originator->contr->failmsg (format (
		1588	"No matter how hard you try, you just cannot put the %s here H<Try to remove some items from the floor first.>",
		1589	query_name ()
		1590	));
		1591
1513	return 0;	1592	return false;
1514	}	1593	}
1515		1594
1516	/*	1595	/*
1517	* decrease(object, number) decreases a specified number from	1596	* decrease(object, number) decreases a specified number from
1518	* the amount of an object. If the amount reaches 0, the object	1597	* the amount of an object. If the amount reaches 0, the object
…		…
1521	* Return value: 'op' if something is left, NULL if the amount reached 0	1600	* Return value: 'op' if something is left, NULL if the amount reached 0
1522	*/	1601	*/
1523	bool	1602	bool
1524	object::decrease (sint32 nr)	1603	object::decrease (sint32 nr)
1525	{	1604	{
		1605	if (!nr)
		1606	return true;
		1607
1526	nr = min (nr, nrof);	1608	nr = min (nr, nrof);
1527		1609
1528	if (!nr)	1610	if (nrof > nr)
1529	return 1;	1611	{
1530
1531	nrof -= nr;	1612	nrof -= nr;
1532
1533	object *visible = visible_to (this);
1534
1535	if (nrof)
1536	{
1537	adjust_weight (env, -weight * nr); // carrying == 0	1613	adjust_weight (env, -weight * max (1, nr)); // carrying == 0
1538		1614
1539	if (visible)	1615	if (object *pl = visible_to ())
1540	esrv_send_item (visible, this);	1616	esrv_update_item (UPD_NROF, pl, this);
1541		1617
1542	return 1;	1618	return true;
1543	}	1619	}
1544	else	1620	else
1545	{	1621	{
1546	if (visible)
1547	esrv_del_item (visible->contr, count);
1548
1549	this->destroy (1);	1622	destroy ();
1550	return 0;	1623	return false;
1551	}	1624	}
1552	}	1625	}
1553		1626
1554	/*	1627	/*
1555	* get_split_ob(ob,nr) splits up ob into two parts. The part which	1628	* split(ob,nr) splits up ob into two parts. The part which
1556	* is returned contains nr objects, and the remaining parts contains	1629	* is returned contains nr objects, and the remaining parts contains
1557	* the rest (or is removed and freed if that number is 0).	1630	* the rest (or is removed and returned if that number is 0).
1558	* On failure, NULL is returned, and the reason put into the	1631	* On failure, NULL is returned.
1559	* global static errmsg array.
1560	*/	1632	*/
1561	object *	1633	object *
1562	object::split (sint32 nr)	1634	object::split (sint32 nr)
1563	{	1635	{
		1636	int have = number_of ();
		1637
1564	if (nrof < nr)	1638	if (have < nr)
1565	return 0;	1639	return 0;
1566	else if (nrof == nr)	1640	else if (have == nr)
1567	{	1641	{
1568	remove ();	1642	remove ();
1569	return this;	1643	return this;
1570	}	1644	}
1571	else	1645	else
1572	{	1646	{
1573	decrease (nr);	1647	decrease (nr);
1574		1648
1575	object *op = object_create_clone (this);	1649	object *op = deep_clone ();
1576	op->nrof = nr;	1650	op->nrof = nr;
1577	return op;	1651	return op;
1578	}	1652	}
1579	}
1580
1581	//TODO: remove, but semantics differs from split_nr
1582	object *
1583	get_split_ob (object *orig_ob, uint32 nr)
1584	{
1585	if (orig_ob->nrof < nr)
1586	{
1587	sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1588	return 0;
1589	}
1590
1591	return orig_ob->split (nr);
1592	}	1653	}
1593		1654
1594	object *	1655	object *
1595	insert_ob_in_ob (object *op, object *where)	1656	insert_ob_in_ob (object *op, object *where)
1596	{	1657	{
…		…
1637	if (object::can_merge (tmp, op))	1698	if (object::can_merge (tmp, op))
1638	{	1699	{
1639	/* return the original object and remove inserted object	1700	/* return the original object and remove inserted object
1640	(client needs the original object) */	1701	(client needs the original object) */
1641	tmp->nrof += op->nrof;	1702	tmp->nrof += op->nrof;
		1703
		1704	if (object *pl = tmp->visible_to ())
		1705	esrv_update_item (UPD_NROF, pl, tmp);
		1706
		1707	adjust_weight (this, op->total_weight ());
		1708
1642	op->destroy (1);	1709	op->destroy ();
1643	op = tmp;	1710	op = tmp;
1644	goto inserted;	1711	goto inserted;
1645	}	1712	}
1646		1713
1647	op->owner = 0; // it's his/hers now. period.	1714	op->owner = 0; // it's his/hers now. period.
…		…
1658		1725
1659	inv = op;	1726	inv = op;
1660		1727
1661	op->flag [FLAG_REMOVED] = 0;	1728	op->flag [FLAG_REMOVED] = 0;
1662		1729
		1730	if (object *pl = op->visible_to ())
		1731	esrv_send_item (pl, op);
		1732
1663	adjust_weight (this, op->total_weight ());	1733	adjust_weight (this, op->total_weight ());
1664		1734
1665	inserted:	1735	inserted:
1666	/* reset the light list and los of the players on the map */	1736	/* reset the light list and los of the players on the map */
1667	if (op->glow_radius && map && map->darkness)	1737	if (op->glow_radius && is_on_map ())
		1738	{
		1739	update_stats ();
1668	update_all_los (map, x, y);	1740	update_all_los (map, x, y);
1669		1741	}
1670	if (object *otmp = in_player ())	1742	else if (is_player () && !flag [FLAG_NO_FIX_PLAYER])
1671	if (otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1743	// if this is a player's inventory, update stats
1672	otmp->update_stats ();	1744	update_stats ();
1673		1745
1674	INVOKE_OBJECT (INSERT, this);	1746	INVOKE_OBJECT (INSERT, this);
1675		1747
1676	return op;	1748	return op;
1677	}	1749	}
…		…
1697	* on top.	1769	* on top.
1698	*/	1770	*/
1699	int	1771	int
1700	check_move_on (object *op, object *originator)	1772	check_move_on (object *op, object *originator)
1701	{	1773	{
		1774	if (QUERY_FLAG (op, FLAG_NO_APPLY))
		1775	return 0;
		1776
1702	object *tmp;	1777	object *tmp;
1703	maptile *m = op->map;	1778	maptile *m = op->map;
1704	int x = op->x, y = op->y;	1779	int x = op->x, y = op->y;
1705		1780
1706	MoveType move_on, move_slow, move_block;	1781	mapspace &ms = m->at (x, y);
1707		1782
1708	if (QUERY_FLAG (op, FLAG_NO_APPLY))	1783	ms.update ();
1709	return 0;
1710		1784
1711	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);	1785	MoveType move_on = ms.move_on;
1712	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);	1786	MoveType move_slow = ms.move_slow;
1713	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);	1787	MoveType move_block = ms.move_block;
1714		1788
1715	/* if nothing on this space will slow op down or be applied,	1789	/* if nothing on this space will slow op down or be applied,
1716	* no need to do checking below. have to make sure move_type	1790	* no need to do checking below. have to make sure move_type
1717	* is set, as lots of objects don't have it set - we treat that	1791	* is set, as lots of objects don't have it set - we treat that
1718	* as walking.	1792	* as walking.
…		…
1729	return 0;	1803	return 0;
1730		1804
1731	/* The objects have to be checked from top to bottom.	1805	/* The objects have to be checked from top to bottom.
1732	* Hence, we first go to the top:	1806	* Hence, we first go to the top:
1733	*/	1807	*/
1734		1808	for (object *next, *tmp = ms.top; tmp; tmp = next)
1735	for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above)
1736	{
1737	/* Trim the search when we find the first other spell effect
1738	* this helps performance so that if a space has 50 spell objects,
1739	* we don't need to check all of them.
1740	*/
1741	if ((tmp->move_type & MOVE_FLY_LOW) && QUERY_FLAG (tmp, FLAG_NO_PICK))
1742	break;
1743	}	1809	{
		1810	next = tmp->below;
1744		1811
1745	for (; tmp; tmp = tmp->below)
1746	{
1747	if (tmp == op)	1812	if (tmp == op)
1748	continue; /* Can't apply yourself */	1813	continue; /* Can't apply yourself */
1749		1814
1750	/* Check to see if one of the movement types should be slowed down.	1815	/* Check to see if one of the movement types should be slowed down.
1751	* Second check makes sure that the movement types not being slowed	1816	* Second check makes sure that the movement types not being slowed
…		…
1756	if (!QUERY_FLAG (op, FLAG_WIZPASS))	1821	if (!QUERY_FLAG (op, FLAG_WIZPASS))
1757	{	1822	{
1758	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||	1823	if ((!op->move_type && tmp->move_slow & MOVE_WALK) ||
1759	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))	1824	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1760	{	1825	{
1761
1762	float
1763	diff = tmp->move_slow_penalty * fabs (op->speed);	1826	float diff = tmp->move_slow_penalty * fabs (op->speed);
1764		1827
1765	if (op->type == PLAYER)	1828	if (op->is_player ())
1766	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) ||	1829	if ((tmp->flag [FLAG_IS_HILLY ] && find_skill_by_number (op, SK_CLIMBING)) ||
1767	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))	1830	(tmp->flag [FLAG_IS_WOODED] && find_skill_by_number (op, SK_WOODSMAN)))
1768	diff /= 4.0;	1831	diff /= 4.0;
1769		1832
1770	op->speed_left -= diff;	1833	op->speed_left -= diff;
1771	}	1834	}
1772	}	1835	}
…		…
1805	LOG (llevError, "Present_arch called outside map.\n");	1868	LOG (llevError, "Present_arch called outside map.\n");
1806	return NULL;	1869	return NULL;
1807	}	1870	}
1808		1871
1809	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)	1872	for (object *tmp = m->at (x, y).bot; tmp; tmp = tmp->above)
1810	if (tmp->arch == at)	1873	if (tmp->arch->archname == at->archname)
1811	return tmp;	1874	return tmp;
1812		1875
1813	return NULL;	1876	return NULL;
1814	}	1877	}
1815		1878
…		…
1879	* The first matching object is returned, or NULL if none.	1942	* The first matching object is returned, or NULL if none.
1880	*/	1943	*/
1881	object *	1944	object *
1882	present_arch_in_ob (const archetype *at, const object *op)	1945	present_arch_in_ob (const archetype *at, const object *op)
1883	{	1946	{
1884	for (object *tmp = op->inv; tmp != NULL; tmp = tmp->below)	1947	for (object *tmp = op->inv; tmp; tmp = tmp->below)
1885	if (tmp->arch == at)	1948	if (tmp->arch->archname == at->archname)
1886	return tmp;	1949	return tmp;
1887		1950
1888	return NULL;	1951	return NULL;
1889	}	1952	}
1890		1953
…		…
1978	* head of the object should correspond for the entire object.	2041	* head of the object should correspond for the entire object.
1979	*/	2042	*/
1980	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))	2043	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
1981	continue;	2044	continue;
1982		2045
1983	if (ob->blocked (m, pos.x, pos.y))	2046	if (ob->blocked (pos.m, pos.x, pos.y))
1984	continue;	2047	continue;
1985		2048
1986	altern [index++] = i;	2049	altern [index++] = i;
1987	}	2050	}
1988		2051
…		…
2056	* there is capable of.	2119	* there is capable of.
2057	*/	2120	*/
2058	int	2121	int
2059	find_dir (maptile *m, int x, int y, object *exclude)	2122	find_dir (maptile *m, int x, int y, object *exclude)
2060	{	2123	{
2061	int i, max = SIZEOFFREE, mflags;	2124	int max = SIZEOFFREE, mflags;
2062
2063	sint16 nx, ny;
2064	object *tmp;
2065	maptile *mp;
2066
2067	MoveType blocked, move_type;	2125	MoveType move_type;
2068		2126
2069	if (exclude && exclude->head_ () != exclude)	2127	if (exclude && exclude->head_ () != exclude)
2070	{	2128	{
2071	exclude = exclude->head;	2129	exclude = exclude->head;
2072	move_type = exclude->move_type;	2130	move_type = exclude->move_type;
…		…
2075	{	2133	{
2076	/* If we don't have anything, presume it can use all movement types. */	2134	/* If we don't have anything, presume it can use all movement types. */
2077	move_type = MOVE_ALL;	2135	move_type = MOVE_ALL;
2078	}	2136	}
2079		2137
2080	for (i = 1; i < max; i++)	2138	for (int i = 1; i < max; i++)
2081	{	2139	{
2082	mp = m;	2140	mapxy pos (m, x, y);
2083	nx = x + freearr_x[i];	2141	pos.move (i);
2084	ny = y + freearr_y[i];
2085		2142
2086	mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);	2143	if (!pos.normalise ())
2087
2088	if (mflags & P_OUT_OF_MAP)
2089	max = maxfree[i];	2144	max = maxfree[i];
2090	else	2145	else
2091	{	2146	{
2092	mapspace &ms = mp->at (nx, ny);	2147	mapspace &ms = *pos;
2093		2148
2094	blocked = ms.move_block;
2095
2096	if ((move_type & blocked) == move_type)	2149	if ((move_type & ms.move_block) == move_type)
2097	max = maxfree[i];	2150	max = maxfree [i];
2098	else if (mflags & P_IS_ALIVE)	2151	else if (ms.flags () & P_IS_ALIVE)
2099	{	2152	{
2100	for (tmp = ms.bot; tmp; tmp = tmp->above)	2153	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
2101	if ((tmp->flag [FLAG_MONSTER] || tmp->type == PLAYER)	2154	if ((tmp->flag [FLAG_MONSTER] || tmp->is_player ())
2102	&& (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))	2155	&& (tmp != exclude || (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2103	break;
2104
2105	if (tmp)
2106	return freedir[i];	2156	return freedir [i];
2107	}	2157	}
2108	}	2158	}
2109	}	2159	}
2110		2160
2111	return 0;	2161	return 0;
…		…
2186	* This basically means that if direction is 15, then it could either go	2236	* This basically means that if direction is 15, then it could either go
2187	* direction 4, 14, or 16 to get back to where we are.	2237	* direction 4, 14, or 16 to get back to where we are.
2188	* Moved from spell_util.c to object.c with the other related direction	2238	* Moved from spell_util.c to object.c with the other related direction
2189	* functions.	2239	* functions.
2190	*/	2240	*/
2191	int reduction_dir[SIZEOFFREE][3] = {	2241	static const int reduction_dir[SIZEOFFREE][3] = {
2192	{0, 0, 0}, /* 0 */	2242	{0, 0, 0}, /* 0 */
2193	{0, 0, 0}, /* 1 */	2243	{0, 0, 0}, /* 1 */
2194	{0, 0, 0}, /* 2 */	2244	{0, 0, 0}, /* 2 */
2195	{0, 0, 0}, /* 3 */	2245	{0, 0, 0}, /* 3 */
2196	{0, 0, 0}, /* 4 */	2246	{0, 0, 0}, /* 4 */
…		…
2292	int	2342	int
2293	can_pick (const object *who, const object *item)	2343	can_pick (const object *who, const object *item)
2294	{	2344	{
2295	return /*QUERY_FLAG(who,FLAG_WIZ)|| */	2345	return /*QUERY_FLAG(who,FLAG_WIZ)|| */
2296	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&	2346	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
2297	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER || item->weight < who->weight / 3));	2347	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->is_player () || item->weight < who->weight / 3));
2298	}	2348	}
2299		2349
2300	/*	2350	/*
2301	* create clone from object to another	2351	* create clone from object to another
2302	*/	2352	*/
2303	object *	2353	object *
2304	object_create_clone (object *asrc)	2354	object::deep_clone ()
2305	{	2355	{
2306	object *dst = 0, *tmp, *src, *prev, *item;	2356	assert (("deep_clone called on non-head object", is_head ()));
2307		2357
2308	if (!asrc)	2358	object *dst = clone ();
2309	return 0;
2310		2359
2311	src = asrc->head_ ();	2360	object *prev = dst;
2312
2313	prev = 0;
2314	for (object *part = src; part; part = part->more)	2361	for (object *part = this->more; part; part = part->more)
2315	{	2362	{
2316	tmp = part->clone ();	2363	object *tmp = part->clone ();
2317	tmp->x -= src->x;
2318	tmp->y -= src->y;
2319
2320	if (!part->head)
2321	{
2322	dst = tmp;
2323	tmp->head = 0;
2324	}
2325	else
2326	tmp->head = dst;	2364	tmp->head = dst;
2327
2328	tmp->more = 0;
2329
2330	if (prev)
2331	prev->more = tmp;	2365	prev->more = tmp;
2332
2333	prev = tmp;	2366	prev = tmp;
2334	}	2367	}
2335		2368
2336	for (item = src->inv; item; item = item->below)	2369	for (object *item = inv; item; item = item->below)
2337	insert_ob_in_ob (object_create_clone (item), dst);	2370	insert_ob_in_ob (item->deep_clone (), dst);
2338		2371
2339	return dst;	2372	return dst;
2340	}	2373	}
2341		2374
2342	/* This returns the first object in who's inventory that	2375	/* This returns the first object in who's inventory that
…		…
2351	return tmp;	2384	return tmp;
2352		2385
2353	return 0;	2386	return 0;
2354	}	2387	}
2355		2388
2356	/* If ob has a field named key, return the link from the list,	2389	shstr_tmp
2357	* otherwise return NULL.	2390	object::kv_get (shstr_tmp key) const
2358	*
2359	* key must be a passed in shared string - otherwise, this won't
2360	* do the desired thing.
2361	*/
2362	key_value *
2363	get_ob_key_link (const object *ob, const char *key)
2364	{	2391	{
2365	for (key_value *link = ob->key_values; link; link = link->next)	2392	for (key_value *kv = key_values; kv; kv = kv->next)
2366	if (link->key == key)	2393	if (kv->key == key)
2367	return link;
2368
2369	return 0;
2370	}
2371
2372	/*
2373	* Returns the value of op has an extra_field for key, or NULL.
2374	*
2375	* The argument doesn't need to be a shared string.
2376	*
2377	* The returned string is shared.
2378	*/
2379	const char *
2380	get_ob_key_value (const object *op, const char *const key)
2381	{
2382	key_value *link;
2383	shstr_cmp canonical_key (key);
2384
2385	if (!canonical_key)
2386	{
2387	/* 1. There being a field named key on any object
2388	* implies there'd be a shared string to find.
2389	* 2. Since there isn't, no object has this field.
2390	* 3. Therefore, *this* object doesn't have this field.
2391	*/
2392	return 0;
2393	}
2394
2395	/* This is copied from get_ob_key_link() above -
2396	* only 4 lines, and saves the function call overhead.
2397	*/
2398	for (link = op->key_values; link; link = link->next)
2399	if (link->key == canonical_key)
2400	return link->value;	2394	return kv->value;
2401		2395
2402	return 0;	2396	return shstr ();
2403	}	2397	}
2404		2398
2405	/*	2399	void
2406	* Updates the canonical_key in op to value.	2400	object::kv_set (shstr_tmp key, shstr_tmp value)
2407	*
2408	* canonical_key is a shared string (value doesn't have to be).
2409	*
2410	* Unless add_key is TRUE, it won't add fields, only change the value of existing
2411	* keys.
2412	*
2413	* Returns TRUE on success.
2414	*/
2415	int
2416	set_ob_key_value_s (object *op, const shstr & canonical_key, const char *value, int add_key)
2417	{	2401	{
2418	key_value *field = NULL, *last = NULL;	2402	for (key_value *kv = key_values; kv; kv = kv->next)
2419		2403	if (kv->key == key)
2420	for (field = op->key_values; field != NULL; field = field->next)
2421	{
2422	if (field->key != canonical_key)
2423	{	2404	{
2424	last = field;	2405	kv->value = value;
2425	continue;	2406	return;
2426	}	2407	}
2427		2408
2428	if (value)	2409	key_value *kv = new key_value;
2429	field->value = value;	2410
2430	else	2411	kv->next = key_values;
		2412	kv->key = key;
		2413	kv->value = value;
		2414
		2415	key_values = kv;
		2416	}
		2417
		2418	void
		2419	object::kv_del (shstr_tmp key)
		2420	{
		2421	for (key_value **kvp = &key_values; *kvp; kvp = &(*kvp)->next)
		2422	if ((*kvp)->key == key)
2431	{	2423	{
2432	/* Basically, if the archetype has this key set,	2424	key_value *kv = *kvp;
2433	* we need to store the null value so when we save	2425	*kvp = (*kvp)->next;
2434	* it, we save the empty value so that when we load,	2426	delete kv;
2435	* we get this value back again.	2427	return;
2436	*/
2437	if (get_ob_key_link (op->arch, canonical_key))
2438	field->value = 0;
2439	else
2440	{
2441	if (last)
2442	last->next = field->next;
2443	else
2444	op->key_values = field->next;
2445
2446	delete field;
2447	}
2448	}	2428	}
2449	return TRUE;
2450	}
2451	/* IF we get here, key doesn't exist */
2452
2453	/* No field, we'll have to add it. */
2454
2455	if (!add_key)
2456	return FALSE;
2457
2458	/* There isn't any good reason to store a null
2459	* value in the key/value list. If the archetype has
2460	* this key, then we should also have it, so shouldn't
2461	* be here. If user wants to store empty strings,
2462	* should pass in ""
2463	*/
2464	if (value == NULL)
2465	return TRUE;
2466
2467	field = new key_value;
2468
2469	field->key = canonical_key;
2470	field->value = value;
2471	/* Usual prepend-addition. */
2472	field->next = op->key_values;
2473	op->key_values = field;
2474
2475	return TRUE;
2476	}
2477
2478	/*
2479	* Updates the key in op to value.
2480	*
2481	* If add_key is FALSE, this will only update existing keys,
2482	* and not add new ones.
2483	* In general, should be little reason FALSE is ever passed in for add_key
2484	*
2485	* Returns TRUE on success.
2486	*/
2487	int
2488	set_ob_key_value (object *op, const char *key, const char *value, int add_key)
2489	{
2490	shstr key_ (key);
2491
2492	return set_ob_key_value_s (op, key_, value, add_key);
2493	}	2429	}
2494		2430
2495	object::depth_iterator::depth_iterator (object *container)	2431	object::depth_iterator::depth_iterator (object *container)
2496	: iterator_base (container)	2432	: iterator_base (container)
2497	{	2433	{
…		…
2547	{	2483	{
2548	char flagdesc[512];	2484	char flagdesc[512];
2549	char info2[256 * 4];	2485	char info2[256 * 4];
2550	char *p = info;	2486	char *p = info;
2551		2487
2552	p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s,flags:[%s],type:%d}",	2488	p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s%s,flags:[%s],type:%d}",
2553	count,	2489	count,
2554	uuid.c_str (),	2490	uuid.c_str (),
2555	&name,	2491	&name,
2556	title ? "\",title:\"" : "",	2492	title ? ",title:\"" : "",
2557	title ? (const char *)title : "",	2493	title ? (const char *)title : "",
		2494	title ? "\"" : "",
2558	flag_desc (flagdesc, 512), type);	2495	flag_desc (flagdesc, 512), type);
2559		2496
2560	if (!this->flag[FLAG_REMOVED] && env)	2497	if (!flag[FLAG_REMOVED] && env)
2561	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2498	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2562		2499
2563	if (map)	2500	if (map)
2564	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);	2501	p += snprintf (p, 256, "(on %s@%d+%d)", &map->path, x, y);
2565		2502
…		…
2595	object::open_container (object *new_container)	2532	object::open_container (object *new_container)
2596	{	2533	{
2597	if (container == new_container)	2534	if (container == new_container)
2598	return;	2535	return;
2599		2536
2600	if (object *old_container = container)	2537	object *old_container = container;
		2538
		2539	if (old_container)
2601	{	2540	{
2602	if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))	2541	if (INVOKE_OBJECT (CLOSE, old_container, ARG_OBJECT (this)))
2603	return;	2542	return;
2604		2543
2605	#if 0	2544	#if 0
…		…
2607	if (object *closer = old_container->inv)	2546	if (object *closer = old_container->inv)
2608	if (closer->type == CLOSE_CON)	2547	if (closer->type == CLOSE_CON)
2609	closer->destroy ();	2548	closer->destroy ();
2610	#endif	2549	#endif
2611		2550
		2551	// make sure the container is available
		2552	esrv_send_item (this, old_container);
		2553
2612	old_container->flag [FLAG_APPLIED] = 0;	2554	old_container->flag [FLAG_APPLIED] = false;
2613	container = 0;	2555	container = 0;
2614		2556
		2557	// client needs item update to make it work, client bug requires this to be separate
2615	esrv_update_item (UPD_FLAGS, this, old_container);	2558	esrv_update_item (UPD_FLAGS, this, old_container);
		2559
2616	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));	2560	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", old_container->query_name ());
2617	play_sound (sound_find ("chest_close"));	2561	play_sound (sound_find ("chest_close"));
2618	}	2562	}
2619		2563
2620	if (new_container)	2564	if (new_container)
2621	{	2565	{
…		…
2631	closer->flag [FLAG_NO_MAP_SAVE] = 1;	2575	closer->flag [FLAG_NO_MAP_SAVE] = 1;
2632	new_container->insert (closer);	2576	new_container->insert (closer);
2633	}	2577	}
2634	#endif	2578	#endif
2635		2579
2636	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));	2580	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", new_container->query_name ());
2637		2581
		2582	// make sure the container is available, client bug requires this to be separate
		2583	esrv_send_item (this, new_container);
		2584
2638	new_container->flag [FLAG_APPLIED] = 1;	2585	new_container->flag [FLAG_APPLIED] = true;
2639	container = new_container;	2586	container = new_container;
2640		2587
		2588	// client needs flag change
2641	esrv_update_item (UPD_FLAGS, this, new_container);	2589	esrv_update_item (UPD_FLAGS, this, new_container);
2642	esrv_send_inventory (this, new_container);	2590	esrv_send_inventory (this, new_container);
2643	play_sound (sound_find ("chest_open"));	2591	play_sound (sound_find ("chest_open"));
2644	}	2592	}
		2593	// else if (!old_container->env && contr && contr->ns)
		2594	// contr->ns->floorbox_reset ();
2645	}	2595	}
2646		2596
2647	object *	2597	object *
2648	object::force_find (const shstr name)	2598	object::force_find (shstr_tmp name)
2649	{	2599	{
2650	/* cycle through his inventory to look for the MARK we want to	2600	/* cycle through his inventory to look for the MARK we want to
2651	* place	2601	* place
2652	*/	2602	*/
2653	for (object *tmp = inv; tmp; tmp = tmp->below)	2603	for (object *tmp = inv; tmp; tmp = tmp->below)
…		…
2655	return splay (tmp);	2605	return splay (tmp);
2656		2606
2657	return 0;	2607	return 0;
2658	}	2608	}
2659		2609
		2610	//-GPL
		2611
2660	void	2612	void
		2613	object::force_set_timer (int duration)
		2614	{
		2615	this->duration = 1;
		2616	this->speed_left = -1.f;
		2617
		2618	this->set_speed (duration ? 1.f / duration : 0.f);
		2619	}
		2620
		2621	object *
2661	object::force_add (const shstr name, int duration)	2622	object::force_add (shstr_tmp name, int duration)
2662	{	2623	{
2663	if (object *force = force_find (name))	2624	if (object *force = force_find (name))
2664	force->destroy ();	2625	force->destroy ();
2665		2626
2666	object *force = get_archetype (FORCE_NAME);	2627	object *force = get_archetype (FORCE_NAME);
2667		2628
2668	force->slaying = name;	2629	force->slaying = name;
2669	force->stats.food = 1;	2630	force->force_set_timer (duration);
2670	force->speed_left = -1.f;
2671
2672	force->set_speed (duration ? 1.f / duration : 0.f);
2673	force->flag [FLAG_IS_USED_UP] = true;
2674	force->flag [FLAG_APPLIED] = true;	2631	force->flag [FLAG_APPLIED] = true;
2675		2632
2676	insert (force);	2633	return insert (force);
2677	}	2634	}
2678		2635
2679	void	2636	void
2680	object::play_sound (faceidx sound)	2637	object::play_sound (faceidx sound) const
2681	{	2638	{
2682	if (!sound)	2639	if (!sound)
2683	return;	2640	return;
2684		2641
2685	if (flag [FLAG_REMOVED])	2642	if (is_on_map ())
		2643	map->play_sound (sound, x, y);
		2644	else if (object *pl = in_player ())
		2645	pl->contr->play_sound (sound);
		2646	}
		2647
		2648	void
		2649	object::say_msg (const char *msg) const
		2650	{
		2651	if (is_on_map ())
		2652	map->say_msg (msg, x, y);
		2653	else if (object *pl = in_player ())
		2654	pl->contr->play_sound (sound);
		2655	}
		2656
		2657	void
		2658	object::make_noise ()
		2659	{
		2660	// we do not model noise in the map, so instead put
		2661	// a temporary light into the noise source
		2662	// could use the map instead, but that's less reliable for our
		2663	// goal, which is to make invisibility a bit harder to exploit
		2664
		2665	// currently only works sensibly for players
		2666	if (!is_player ())
2686	return;	2667	return;
2687		2668
2688	if (env)	2669	// find old force, or create new one
2689	{	2670	object *force = force_find (shstr_noise_force);
2690	if (object *pl = in_player ())	2671
2691	pl->contr->play_sound (sound);	2672	if (force)
2692	}	2673	force->speed_left = -1.f; // patch old speed up
2693	else	2674	else
2694	map->play_sound (sound, x, y);	2675	{
2695	}	2676	force = archetype::get (shstr_noise_force);
2696		2677
		2678	force->slaying = shstr_noise_force;
		2679	force->stats.food = 1;
		2680	force->speed_left = -1.f;
		2681
		2682	force->set_speed (1.f / 4.f);
		2683	force->flag [FLAG_IS_USED_UP] = true;
		2684	force->flag [FLAG_APPLIED] = true;
		2685
		2686	insert (force);
		2687	}
		2688	}
		2689

Diff Legend

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