[ViewVC] Diff of: cvs/deliantra/server/common/object.C

Comparing deliantra/server/common/object.C (file contents):
Revision 1.239 by root, Wed May 7 13:38:16 2008 UTC vs.
Revision 1.316 by root, Sun Mar 28 02:53:46 2010 UTC

…		…
1	/*	1	/*
2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.	2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.
3	*	3	*
4	* Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team	4	* Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5	* Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team	5	* Copyright (©) 2001 Mark Wedel & Crossfire Development Team
6	* Copyright (©) 1992,2007 Frank Tore Johansen	6	* Copyright (©) 1992 Frank Tore Johansen
7	*	7	*
8	* Deliantra is free software: you can redistribute it and/or modify	8	* Deliantra is free software: you can redistribute it and/or modify it under
9	* it under the terms of the GNU General Public License as published by	9	* the terms of the Affero GNU General Public License as published by the
10	* the Free Software Foundation, either version 3 of the License, or	10	* Free Software Foundation, either version 3 of the License, or (at your
11	* (at your option) any later version.	11	* option) any later version.
12	*	12	*
13	* This program is distributed in the hope that it will be useful,	13	* This program is distributed in the hope that it will be useful,
14	* but WITHOUT ANY WARRANTY; without even the implied warranty of	14	* but WITHOUT ANY WARRANTY; without even the implied warranty of
15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16	* GNU General Public License for more details.	16	* GNU General Public License for more details.
17	*	17	*
18	* You should have received a copy of the GNU General Public License	18	* You should have received a copy of the Affero GNU General Public License
19	* along with this program. If not, see <http://www.gnu.org/licenses/>.	19	* and the GNU General Public License along with this program. If not, see
		20	* <http://www.gnu.org/licenses/>.
20	*	21	*
21	* The authors can be reached via e-mail to <support@deliantra.net>	22	* The authors can be reached via e-mail to <support@deliantra.net>
22	*/	23	*/
23		24
24	#include <global.h>	25	#include <global.h>
25	#include <stdio.h>	26	#include <stdio.h>
26	#include <sys/types.h>	27	#include <sys/types.h>
27	#include <sys/uio.h>	28	#include <sys/uio.h>
28	#include <object.h>	29	#include <object.h>
29	#include <sproto.h>	30	#include <sproto.h>
30	#include <loader.h>
31		31
32	#include <bitset>	32	#include <bitset>
33		33
34	UUID UUID::cur;	34	UUID UUID::cur;
35	static uint64_t seq_next_save;	35	static uint64_t seq_next_save;
36	static const uint64 UUID_GAP = 1<<19;	36	static const uint64 UUID_GAP = 1<<19;
		37	uint32_t mapspace::smellcount = 10000;
37		38
38	objectvec objects;	39	objectvec objects;
39	activevec actives;	40	activevec actives;
		41
		42	//+GPL
40		43
41	short freearr_x[SIZEOFFREE] = {	44	short freearr_x[SIZEOFFREE] = {
42	0,	45	0,
43	0, 1, 1, 1, 0, -1, -1, -1,	46	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,	47	0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,
48	0,	51	0,
49	-1, -1, 0, 1, 1, 1, 0, -1,	52	-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,	53	-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	54	-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	};	55	};
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] = {	56	int freedir[SIZEOFFREE] = {
60	0,	57	0,
61	1, 2, 3, 4, 5, 6, 7, 8,	58	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,	59	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	60	1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8
64	};	61	};
65		62
		63	static int maxfree[SIZEOFFREE] = {
		64	0,
		65	9, 10, 13, 14, 17, 18, 21, 22,
		66	25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45, 48,
		67	49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49
		68	};
		69
66	static void	70	static void
67	write_uuid (uval64 skip, bool sync)	71	write_uuid (uval64 skip, bool sync)
68	{	72	{
69	CALL_BEGIN (2);	73	CALL_BEGIN (2);
70	CALL_ARG_SV (newSVval64 (skip));	74	CALL_ARG_SV (newSVval64 (skip));
…		…
72	CALL_CALL ("cf::write_uuid", G_DISCARD);	76	CALL_CALL ("cf::write_uuid", G_DISCARD);
73	CALL_END;	77	CALL_END;
74	}	78	}
75		79
76	static void	80	static void
77	read_uuid (void)	81	read_uuid ()
78	{	82	{
79	char filename[MAX_BUF];	83	char filename[MAX_BUF];
80		84
81	sprintf (filename, "%s/uuid", settings.localdir);	85	sprintf (filename, "%s/uuid", settings.localdir);
82		86
…		…
96		100
97	LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);	101	LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);
98	_exit (1);	102	_exit (1);
99	}	103	}
100		104
101	UUID::BUF buf;	105	char buf [UUID::MAX_LEN];
102	buf[0] = 0;	106	buf[0] = 0;
103	fgets (buf, sizeof (buf), fp);	107	fgets (buf, sizeof (buf), fp);
104		108
105	if (!UUID::cur.parse (buf))	109	if (!UUID::cur.parse (buf))
106	{	110	{
…		…
133		137
134	void	138	void
135	UUID::init ()	139	UUID::init ()
136	{	140	{
137	read_uuid ();	141	read_uuid ();
		142	}
		143
		144	bool
		145	UUID::parse (const char *s)
		146	{
		147	if (s++ != '<' \|\| s++ != '1' \|\| *s++ != '.')
		148	return false;
		149
		150	seq = 0;
		151
		152	while (*s != '>')
		153	{
		154	if (*s < '0')
		155	return false;
		156
		157	// this gives nice branchless code with gcc
		158	assert ('0' < 'a' && '0' == 48 && 'a' == 97);
		159	int digit = (s + (s & 0x40 ? 9 : 0)) & 15;
		160
		161	seq = (seq << 4) \| digit;
		162
		163	++s;
		164	}
		165
		166	return true;
		167	}
		168
		169	char *
		170	UUID::append (char *buf) const
		171	{
		172	*buf++ = '<';
		173	*buf++ = '1';
		174	*buf++ = '.';
		175
		176	uint64_t seq = this->seq;
		177	const int bits = 64;
		178	char nz = 0;
		179	static const char tohex [] = "0123456789abcdef";
		180
		181	// assert (len >= 3 + bits / 4 + 1 + 1);
		182	for (int i = bits / 4; --i; )
		183	{
		184	uint8_t digit = seq >> (bits - 4);
		185
		186	*buf = tohex [digit];
		187	nz \|= digit;
		188	buf += nz ? 1 : 0;
		189	seq <<= 4;
		190	}
		191
		192	// last digit is special - always emit
		193	uint8_t digit = seq >> (bits - 4);
		194	*buf++ = tohex [digit];
		195
		196	*buf++ = '>';
		197
		198	return buf;
		199	}
		200
		201	char *
		202	UUID::c_str () const
		203	{
		204	static char buf [MAX_LEN];
		205	*append (buf) = 0;
		206	return buf;
138	}	207	}
139		208
140	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */	209	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */
141	static bool	210	static bool
142	compare_ob_value_lists_one (const object wants, const object has)	211	compare_ob_value_lists_one (const object wants, const object has)
…		…
178	* Improvements made with merge: Better checking on potion, and also	247	* Improvements made with merge: Better checking on potion, and also
179	* check weight	248	* check weight
180	*/	249	*/
181	bool object::can_merge_slow (object ob1, object ob2)	250	bool object::can_merge_slow (object ob1, object ob2)
182	{	251	{
183	/* A couple quicksanity checks */	252	/* A couple quick sanity checks */
184	if (ob1 == ob2	253	if (ob1 == ob2
185	\|\| ob1->type != ob2->type	254	\|\| ob1->type != ob2->type
186	\|\| ob1->speed != ob2->speed
187	\|\| ob1->value != ob2->value	255	\|\| ob1->value != ob2->value
188	\|\| ob1->name != ob2->name)	256	\|\| ob1->name != ob2->name
		257	\|\| fabs (ob1->speed - ob2->speed) >= MIN_ACTIVE_SPEED)
189	return 0;	258	return 0;
190		259
191	/* Do not merge objects if nrof would overflow. First part checks	260	/* Do not merge objects if nrof would overflow, assume nrof
192	* for unsigned overflow (2c), second part checks whether the result	261	* is always 0 .. 2*31-1 /
193	* would fit into a 32 bit signed int, which is often used to hold	262	if (ob1->nrof > 0x7fffffff - ob2->nrof)
194	* nrof values.
195	*/
196	if (~ob1->nrof < ob2->nrof \|\| ob1->nrof + ob2->nrof > (1UL << 31))
197	return 0;	263	return 0;
198		264
199	/* If the objects have been identified, set the BEEN_APPLIED flag.	265	/* If the objects have been identified, set the BEEN_APPLIED flag.
200	* This is to the comparison of the flags below will be OK. We	266	* This is to the comparison of the flags below will be OK. We
201	* just can't ignore the been applied or identified flags, as they	267	* just can't ignore the been applied or identified flags, as they
…		…
206	SET_FLAG (ob1, FLAG_BEEN_APPLIED);	272	SET_FLAG (ob1, FLAG_BEEN_APPLIED);
207		273
208	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))	274	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))
209	SET_FLAG (ob2, FLAG_BEEN_APPLIED);	275	SET_FLAG (ob2, FLAG_BEEN_APPLIED);
210		276
211	if (ob1->arch->name != ob2->arch->name	277	if (ob1->arch->archname != ob2->arch->archname
212	\|\| ob1->name != ob2->name	278	\|\| ob1->name != ob2->name
213	\|\| ob1->title != ob2->title	279	\|\| ob1->title != ob2->title
214	\|\| ob1->msg != ob2->msg	280	\|\| ob1->msg != ob2->msg
215	\|\| ob1->weight != ob2->weight	281	\|\| ob1->weight != ob2->weight
216	\|\| ob1->attacktype != ob2->attacktype	282	\|\| ob1->attacktype != ob2->attacktype
217	\|\| ob1->magic != ob2->magic	283	\|\| ob1->magic != ob2->magic
218	\|\| ob1->slaying != ob2->slaying	284	\|\| ob1->slaying != ob2->slaying
219	\|\| ob1->skill != ob2->skill	285	\|\| ob1->skill != ob2->skill
220	\|\| ob1->value != ob2->value	286	\|\| ob1->value != ob2->value
221	\|\| ob1->animation_id != ob2->animation_id	287	\|\| ob1->animation_id != ob2->animation_id
		288	\|\| (ob1->face != ob2->face && !ob1->animation_id) // face and animation are dependend on each other
222	\|\| ob1->client_type != ob2->client_type	289	\|\| ob1->client_type != ob2->client_type
223	\|\| ob1->materialname != ob2->materialname	290	\|\| ob1->material != ob2->material
224	\|\| ob1->lore != ob2->lore	291	\|\| ob1->lore != ob2->lore
225	\|\| ob1->subtype != ob2->subtype	292	\|\| ob1->subtype != ob2->subtype
226	\|\| ob1->move_type != ob2->move_type	293	\|\| ob1->move_type != ob2->move_type
227	\|\| ob1->move_block != ob2->move_block	294	\|\| ob1->move_block != ob2->move_block
228	\|\| ob1->move_allow != ob2->move_allow	295	\|\| ob1->move_allow != ob2->move_allow
229	\|\| ob1->move_on != ob2->move_on	296	\|\| ob1->move_on != ob2->move_on
230	\|\| ob1->move_off != ob2->move_off	297	\|\| ob1->move_off != ob2->move_off
231	\|\| ob1->move_slow != ob2->move_slow	298	\|\| ob1->move_slow != ob2->move_slow
232	\|\| ob1->move_slow_penalty != ob2->move_slow_penalty	299	\|\| fabs (ob1->move_slow_penalty - ob2->move_slow_penalty) >= (1.f / 1024.f)
233	\|\| memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))	300	\|\| memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
234	\|\| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats)))	301	\|\| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats)))
235	return 0;	302	return 0;
236		303
237	if ((ob1->flag ^ ob2->flag)	304	if ((ob1->flag ^ ob2->flag)
238	.reset (FLAG_INV_LOCKED)	305	.reset (FLAG_INV_LOCKED)
239	.reset (FLAG_CLIENT_SENT)
240	.reset (FLAG_REMOVED)	306	.reset (FLAG_REMOVED)
241	.any ())	307	.any ())
242	return 0;	308	return 0;
243		309
244	/* This is really a spellbook check - we should in general	310	/* This is really a spellbook check - we should in general
…		…
326	{	392	{
327	// see if we are in a container of sorts	393	// see if we are in a container of sorts
328	if (env)	394	if (env)
329	{	395	{
330	// the player inventory itself is always visible	396	// the player inventory itself is always visible
331	if (env->type == PLAYER)	397	if (env->is_player ())
332	return env;	398	return env;
333		399
334	// else a player could have our env open	400	// else a player could have our env open
335	object *envest = env->outer_env ();	401	object *envest = env->outer_env_or_self ();
336		402
337	// the player itself is always on a map, so we will find him here	403	// the player itself is always on a map, so we will find him here
338	// even if our inv is in a player.	404	// even if our inv is in a player.
339	if (envest->is_on_map ())	405	if (envest->is_on_map ())
340	if (object *pl = envest->ms ().player ())	406	if (object *pl = envest->ms ().player ())
341	if (pl->container == env)	407	if (pl->container_ () == env)
342	return pl;	408	return pl;
343	}	409	}
344	else	410	else
345	{	411	{
346	// maybe there is a player standing on the same mapspace	412	// maybe there is a player standing on the same mapspace
347	// this will catch the case where "this" is a player	413	// this will catch the case where "this" is a player
348	if (object *pl = ms ().player ())	414	if (object *pl = ms ().player ())
349	if (!pl->container \|\| this == pl->container)	415	if ((pl->contr->ns && !pl->container_ () && !pl->contr->ns->update_look)
		416	\|\| pl->container_ () == this)
350	return pl;	417	return pl;
351	}	418	}
352	}	419	}
353		420
354	return 0;	421	return 0;
…		…
432	object_freezer freezer;	499	object_freezer freezer;
433	op->write (freezer);	500	op->write (freezer);
434	return freezer.as_string ();	501	return freezer.as_string ();
435	}	502	}
436		503
437	/*	504	char *
438	* get_nearest_part(multi-object, object 2) returns the part of the	505	object::as_string ()
439	* multi-object 1 which is closest to the second object.
440	* If it's not a multi-object, it is returned.
441	*/
442	object *
443	get_nearest_part (object op, const object pl)
444	{	506	{
445	object tmp, closest;	507	return dump_object (this);
446	int last_dist, i;
447
448	if (!op->more)
449	return op;
450
451	for (last_dist = distance (op, pl), closest = op, tmp = op->more;
452	tmp;
453	tmp = tmp->more)
454	if ((i = distance (tmp, pl)) < last_dist)
455	closest = tmp, last_dist = i;
456
457	return closest;
458	}	508	}
459		509
460	/*	510	/*
461	* Returns the object which has the count-variable equal to the argument.	511	* Returns the object which has the count-variable equal to the argument.
462	* VERRRY slow.	512	* VERRRY slow.
…		…
470		520
471	return 0;	521	return 0;
472	}	522	}
473		523
474	/*	524	/*
		525	* Returns the object which has the uuid equal to the argument.
		526	* MOAR VERRRY slow.
		527	*/
		528
		529	object *
		530	find_object_uuid (UUID i)
		531	{
		532	for_all_objects (op)
		533	if (op->uuid == i)
		534	return op;
		535
		536	return 0;
		537	}
		538
		539	/*
475	* Returns the first object which has a name equal to the argument.	540	* Returns the first object which has a name equal to the argument.
476	* Used only by the patch command, but not all that useful.	541	* Used only by the patch command, but not all that useful.
477	* Enables features like "patch <name-of-other-player> food 999"	542	* Enables features like "patch <name-of-other-player> food 999"
478	*/	543	*/
479	object *	544	object *
480	find_object_name (const char *str)	545	find_object_name (const char *str)
481	{	546	{
482	shstr_cmp str_ (str);	547	shstr_cmp str_ (str);
483	object *op;
484		548
		549	if (str_)
485	for_all_objects (op)	550	for_all_objects (op)
486	if (op->name == str_)	551	if (op->name == str_)
487	break;	552	return op;
488		553
489	return op;	554	return 0;
490	}	555	}
491		556
492	/*	557	/*
493	* Sets the owner and sets the skill and exp pointers to owner's current	558	* Sets the owner and sets the skill and exp pointers to owner's current
494	* skill and experience objects.	559	* skill and experience objects.
…		…
549	{	614	{
550	// now check wether any body locations became invalid, in which case	615	// now check wether any body locations became invalid, in which case
551	// we cannot apply the weapon at the moment.	616	// we cannot apply the weapon at the moment.
552	for (int i = 0; i < NUM_BODY_LOCATIONS; ++i)	617	for (int i = 0; i < NUM_BODY_LOCATIONS; ++i)
553	if (slot[i].used < 0)	618	if (slot[i].used < 0)
554	{	619	{
		620	if (chosen_skill)
		621	chosen_skill->flag [FLAG_APPLIED] = false;
		622
555	current_weapon = chosen_skill = 0;	623	current_weapon = chosen_skill = 0;
556	update_stats ();	624	update_stats ();
557		625
558	new_draw_info_format (NDI_UNIQUE, 0, this,	626	new_draw_info_format (NDI_UNIQUE, 0, this,
559	"You try to balance all your items at once, "	627	"You try to balance all your items at once, "
560	"but the %s is just too much for your body. "	628	"but the %s is just too much for your body. "
561	"[You need to unapply some items first.]", &ob->name);	629	"[You need to unapply some items first - use the 'body' command to see "
		630	"how many items you can wear on a specific body part.]", &ob->name);
562	return false;	631	return false;
563	}	632	}
564		633
565	//new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);	634	//new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);
566	}	635	}
…		…
635	tail = new_link;	704	tail = new_link;
636	}	705	}
637	}	706	}
638	}	707	}
639		708
640	if (speed < 0)	709	dst->activate ();
641	dst->speed_left -= rndm ();
642
643	dst->set_speed (dst->speed);
644	}	710	}
645		711
646	void	712	void
647	object::instantiate ()	713	object::instantiate ()
648	{	714	{
649	if (!uuid.seq) // HACK	715	if (!uuid.seq) // HACK
650	uuid = UUID::gen ();	716	uuid = UUID::gen ();
651		717
		718	// TODO: unclean state changes, should nt be done in copy_to AND instantiate
		719	if (flag [FLAG_RANDOM_SPEED] && speed)
		720	speed_left = - speed - rndm (); // TODO animation
		721	else
652	speed_left = -0.1f;	722	speed_left = -1.;
		723
653	/* copy the body_info to the body_used - this is only really	724	/* copy the body_info to the body_used - this is only really
654	* need for monsters, but doesn't hurt to do it for everything.	725	* need for monsters, but doesn't hurt to do it for everything.
655	* by doing so, when a monster is created, it has good starting	726	* by doing so, when a monster is created, it has good starting
656	* values for the body_used info, so when items are created	727	* values for the body_used info, so when items are created
657	* for it, they can be properly equipped.	728	* for it, they can be properly equipped.
…		…
665	object *	736	object *
666	object::clone ()	737	object::clone ()
667	{	738	{
668	object *neu = create ();	739	object *neu = create ();
669	copy_to (neu);	740	copy_to (neu);
		741
		742	// TODO: unclean state changes, should not be done in clone AND instantiate
		743	if (neu->flag [FLAG_RANDOM_SPEED] && neu->speed)
		744	neu->speed_left = - neu->speed - rndm (); // TODO animation
		745
670	neu->map = map; // not copied by copy_to	746	neu->map = map; // not copied by copy_to
671	return neu;	747	return neu;
672	}	748	}
673		749
674	/*	750	/*
…		…
692	* This function needs to be called whenever the speed of an object changes.	768	* This function needs to be called whenever the speed of an object changes.
693	*/	769	*/
694	void	770	void
695	object::set_speed (float speed)	771	object::set_speed (float speed)
696	{	772	{
697	if (flag [FLAG_FREED] && speed)
698	{
699	LOG (llevError, "Object %s is freed but has speed.\n", &name);
700	speed = 0;
701	}
702
703	this->speed = speed;	773	this->speed = speed;
704		774
705	if (has_active_speed ())	775	if (has_active_speed ())
706	activate ();	776	activate ();
707	else	777	else
…		…
757		827
758	if (!(m.flags_ & P_UPTODATE))	828	if (!(m.flags_ & P_UPTODATE))
759	/* nop */;	829	/* nop */;
760	else if (action == UP_OBJ_INSERT)	830	else if (action == UP_OBJ_INSERT)
761	{	831	{
		832	#if 0
762	// this is likely overkill, TODO: revisit (schmorp)	833	// this is likely overkill, TODO: revisit (schmorp)
763	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))	834	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
764	\|\| (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))	835	\|\| (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))
765	\|\| (op->type == PLAYER && !(m.flags_ & P_PLAYER))	836	\|\| (op->is_player () && !(m.flags_ & P_PLAYER))
766	\|\| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))	837	\|\| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
767	\|\| (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))	838	\|\| (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))
768	\|\| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))	839	\|\| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))
769	\|\| (m.move_on \| op->move_on ) != m.move_on	840	\|\| (m.move_on \| op->move_on ) != m.move_on
770	\|\| (m.move_off \| op->move_off ) != m.move_off	841	\|\| (m.move_off \| op->move_off ) != m.move_off
771	\|\| (m.move_slow \| op->move_slow) != m.move_slow	842	\|\| (m.move_slow \| op->move_slow) != m.move_slow
772	/* This isn't perfect, but I don't expect a lot of objects to	843	/* This isn't perfect, but I don't expect a lot of objects to
773	* to have move_allow right now.	844	* have move_allow right now.
774	*/	845	*/
775	\|\| ((m.move_block \| op->move_block) & ~op->move_allow) != m.move_block	846	\|\| ((m.move_block \| op->move_block) & ~op->move_allow) != m.move_block
		847	m.invalidate ();
		848	#else
776	\|\| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)	849	// the above is not strong enough a test to skip updating. los maybe? TODO (schmorp)
777	m.flags_ = 0;	850	m.invalidate ();
		851	#endif
778	}	852	}
779	/* if the object is being removed, we can't make intelligent	853	/* if the object is being removed, we can't make intelligent
780	* decisions, because remove_ob can't really pass the object	854	* decisions, because remove_ob can't really pass the object
781	* that is being removed.	855	* that is being removed.
782	*/	856	*/
783	else if (action == UP_OBJ_CHANGE \|\| action == UP_OBJ_REMOVE)	857	else if (action == UP_OBJ_CHANGE \|\| action == UP_OBJ_REMOVE)
784	m.flags_ = 0;	858	m.invalidate ();
785	else if (action == UP_OBJ_FACE)	859	else if (action == UP_OBJ_FACE)
786	/* Nothing to do for that case */ ;	860	/* Nothing to do for that case */ ;
787	else	861	else
788	LOG (llevError, "update_object called with invalid action: %d\n", action);	862	LOG (llevError, "update_object called with invalid action: %d\n", action);
789		863
…		…
793		867
794	object::object ()	868	object::object ()
795	{	869	{
796	SET_FLAG (this, FLAG_REMOVED);	870	SET_FLAG (this, FLAG_REMOVED);
797		871
798	expmul = 1.0;	872	//expmul = 1.0; declared const for the time being
799	face = blank_face;	873	face = blank_face;
		874	material = MATERIAL_NULL;
800	}	875	}
801		876
802	object::~object ()	877	object::~object ()
803	{	878	{
804	unlink ();	879	unlink ();
…		…
833	/* If already on active list, don't do anything */	908	/* If already on active list, don't do anything */
834	if (active)	909	if (active)
835	return;	910	return;
836		911
837	if (has_active_speed ())	912	if (has_active_speed ())
		913	{
		914	if (flag [FLAG_FREED])
		915	LOG (llevError \| logBacktrace, "BUG: tried to activate freed object %s\n", debug_desc ());//D
		916
838	actives.insert (this);	917	actives.insert (this);
		918	}
839	}	919	}
840		920
841	void	921	void
842	object::activate_recursive ()	922	object::activate_recursive ()
843	{	923	{
…		…
908	\|\| map->in_memory != MAP_ACTIVE	988	\|\| map->in_memory != MAP_ACTIVE
909	\|\| map->no_drop	989	\|\| map->no_drop
910	\|\| ms ().move_block == MOVE_ALL)	990	\|\| ms ().move_block == MOVE_ALL)
911	{	991	{
912	while (inv)	992	while (inv)
913	{
914	inv->destroy_inv (false);
915	inv->destroy ();	993	inv->destroy ();
916	}
917	}	994	}
918	else	995	else
919	{ /* Put objects in inventory onto this space */	996	{ /* Put objects in inventory onto this space */
920	while (inv)	997	while (inv)
921	{	998	{
…		…
925	\|\| op->flag [FLAG_NO_DROP]	1002	\|\| op->flag [FLAG_NO_DROP]
926	\|\| op->type == RUNE	1003	\|\| op->type == RUNE
927	\|\| op->type == TRAP	1004	\|\| op->type == TRAP
928	\|\| op->flag [FLAG_IS_A_TEMPLATE]	1005	\|\| op->flag [FLAG_IS_A_TEMPLATE]
929	\|\| op->flag [FLAG_DESTROY_ON_DEATH])	1006	\|\| op->flag [FLAG_DESTROY_ON_DEATH])
930	op->destroy (true);	1007	op->destroy ();
931	else	1008	else
932	map->insert (op, x, y);	1009	map->insert (op, x, y);
933	}	1010	}
934	}	1011	}
935	}	1012	}
…		…
964		1041
965	void	1042	void
966	object::do_destroy ()	1043	object::do_destroy ()
967	{	1044	{
968	if (flag [FLAG_IS_LINKED])	1045	if (flag [FLAG_IS_LINKED])
969	remove_button_link (this);	1046	remove_link ();
970		1047
971	if (flag [FLAG_FRIENDLY])	1048	if (flag [FLAG_FRIENDLY])
972	remove_friendly_object (this);	1049	remove_friendly_object (this);
973		1050
974	remove ();	1051	remove ();
…		…
999	attacked_by = 0;	1076	attacked_by = 0;
1000	current_weapon = 0;	1077	current_weapon = 0;
1001	}	1078	}
1002		1079
1003	void	1080	void
1004	object::destroy (bool destroy_inventory)	1081	object::destroy ()
1005	{	1082	{
1006	if (destroyed ())	1083	if (destroyed ())
1007	return;	1084	return;
1008		1085
1009	if (!is_head () && !head->destroyed ())	1086	if (!is_head () && !head->destroyed ())
1010	{	1087	{
1011	LOG (llevError \| logBacktrace, "tried to destroy the tail of an object");	1088	LOG (llevError \| logBacktrace, "tried to destroy the tail of an object");
1012	head->destroy (destroy_inventory);	1089	head->destroy ();
1013	return;	1090	return;
1014	}	1091	}
1015		1092
1016	destroy_inv (!destroy_inventory);	1093	destroy_inv (false);
1017		1094
1018	if (is_head ())	1095	if (is_head ())
1019	if (sound_destroy)	1096	if (sound_destroy)
1020	play_sound (sound_destroy);	1097	play_sound (sound_destroy);
1021	else if (flag [FLAG_MONSTER])	1098	else if (flag [FLAG_MONSTER])
…		…
1032	* the previous environment.	1109	* the previous environment.
1033	*/	1110	*/
1034	void	1111	void
1035	object::do_remove ()	1112	object::do_remove ()
1036	{	1113	{
1037	object tmp, last = 0;
1038	object *otmp;
1039
1040	if (flag [FLAG_REMOVED])	1114	if (flag [FLAG_REMOVED])
1041	return;	1115	return;
1042		1116
1043	INVOKE_OBJECT (REMOVE, this);	1117	INVOKE_OBJECT (REMOVE, this);
1044		1118
…		…
1057	if (object *pl = visible_to ())	1131	if (object *pl = visible_to ())
1058	esrv_del_item (pl->contr, count);	1132	esrv_del_item (pl->contr, count);
1059	flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed	1133	flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed
1060		1134
1061	adjust_weight (env, -total_weight ());	1135	adjust_weight (env, -total_weight ());
		1136
		1137	object *pl = in_player ();
1062		1138
1063	/* we set up values so that it could be inserted into	1139	/* we set up values so that it could be inserted into
1064	* the map, but we don't actually do that - it is up	1140	* the map, but we don't actually do that - it is up
1065	* to the caller to decide what we want to do.	1141	* to the caller to decide what we want to do.
1066	*/	1142	*/
…		…
1074		1150
1075	above = 0;	1151	above = 0;
1076	below = 0;	1152	below = 0;
1077	env = 0;	1153	env = 0;
1078		1154
1079	/* NO_FIX_PLAYER is set when a great many changes are being	1155	if (pl && pl->is_player ())
1080	* made to players inventory. If set, avoiding the call
1081	* to save cpu time.
1082	*/	1156	{
1083	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1157	pl->contr->queue_stats_update ();
1084	otmp->update_stats ();	1158
		1159	if (glow_radius && pl->is_on_map ())
		1160	update_all_los (pl->map, pl->x, pl->y);
		1161	}
1085	}	1162	}
1086	else if (map)	1163	else if (map)
1087	{	1164	{
1088	map->dirty = true;	1165	map->dirty = true;
1089	mapspace &ms = this->ms ();	1166	mapspace &ms = this->ms ();
1090		1167
1091	if (object *pl = ms.player ())	1168	if (object *pl = ms.player ())
1092	{	1169	{
1093	if (type == PLAYER) // this == pl(!)	1170	if (is_player ())
1094	{	1171	{
		1172	if (!flag [FLAG_WIZPASS])
		1173	ms.smell = ++mapspace::smellcount; // remember the smell of the player
		1174
1095	// leaving a spot always closes any open container on the ground	1175	// leaving a spot always closes any open container on the ground
1096	if (container && !container->env)	1176	if (container && !container->env)
1097	// this causes spurious floorbox updates, but it ensures	1177	// this causes spurious floorbox updates, but it ensures
1098	// that the CLOSE event is being sent.	1178	// that the CLOSE event is being sent.
1099	close_container ();	1179	close_container ();
1100		1180
1101	--map->players;	1181	--map->players;
1102	map->touch ();	1182	map->touch ();
1103	}	1183	}
1104	else if (pl->container == this)	1184	else if (pl->container_ () == this)
1105	{	1185	{
1106	// removing a container should close it	1186	// removing a container should close it
1107	close_container ();	1187	close_container ();
1108	}	1188	}
1109		1189
…		…
1116	*(below ? &below->above : &ms.bot) = above;	1196	*(below ? &below->above : &ms.bot) = above;
1117		1197
1118	above = 0;	1198	above = 0;
1119	below = 0;	1199	below = 0;
1120		1200
		1201	ms.invalidate ();
		1202
1121	if (map->in_memory == MAP_SAVING)	1203	if (map->in_memory == MAP_SAVING)
1122	return;	1204	return;
1123		1205
1124	int check_walk_off = !flag [FLAG_NO_APPLY];	1206	int check_walk_off = !flag [FLAG_NO_APPLY];
1125		1207
1126	if (object *pl = ms.player ())	1208	if (object *pl = ms.player ())
1127	{	1209	{
1128	if (pl->container == this)	1210	if (pl->container_ () == this)
1129	/* If a container that the player is currently using somehow gets	1211	/* If a container that the player is currently using somehow gets
1130	* removed (most likely destroyed), update the player view	1212	* removed (most likely destroyed), update the player view
1131	* appropriately.	1213	* appropriately.
1132	*/	1214	*/
1133	pl->close_container ();	1215	pl->close_container ();
…		…
1137	//TODO: update floorbox to preserve ordering	1219	//TODO: update floorbox to preserve ordering
1138	if (pl->contr->ns)	1220	if (pl->contr->ns)
1139	pl->contr->ns->floorbox_update ();	1221	pl->contr->ns->floorbox_update ();
1140	}	1222	}
1141		1223
		1224	if (check_walk_off)
1142	for (tmp = ms.bot; tmp; tmp = tmp->above)	1225	for (object above, tmp = ms.bot; tmp; tmp = above)
1143	{	1226	{
		1227	above = tmp->above;
		1228
1144	/* No point updating the players look faces if he is the object	1229	/* No point updating the players look faces if he is the object
1145	* being removed.	1230	* being removed.
1146	*/	1231	*/
1147		1232
1148	/* See if object moving off should effect something */	1233	/* See if object moving off should effect something */
1149	if (check_walk_off
1150	&& ((move_type & tmp->move_off)	1234	if ((move_type & tmp->move_off)
1151	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))	1235	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0)
1152	{
1153	move_apply (tmp, this, 0);	1236	move_apply (tmp, this, 0);
1154
1155	if (destroyed ())
1156	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1157	}	1237	}
1158		1238
1159	last = tmp;	1239	if (affects_los ())
1160	}
1161
1162	/* last == NULL if there are no objects on this space */
1163	//TODO: this makes little sense, why only update the topmost object?
1164	if (!last)
1165	map->at (x, y).flags_ = 0;
1166	else
1167	update_object (last, UP_OBJ_REMOVE);
1168
1169	if (flag [FLAG_BLOCKSVIEW] \|\| glow_radius)
1170	update_all_los (map, x, y);	1240	update_all_los (map, x, y);
1171	}	1241	}
1172	}	1242	}
1173		1243
1174	/*	1244	/*
…		…
1198	esrv_update_item (UPD_NROF, pl, top);	1268	esrv_update_item (UPD_NROF, pl, top);
1199		1269
1200	op->weight = 0; // cancel the addition above	1270	op->weight = 0; // cancel the addition above
1201	op->carrying = 0; // must be 0 already	1271	op->carrying = 0; // must be 0 already
1202		1272
1203	op->destroy (1);	1273	op->destroy ();
1204		1274
1205	return top;	1275	return top;
1206	}	1276	}
1207		1277
1208	return 0;	1278	return 0;
…		…
1216		1286
1217	object *prev = this;	1287	object *prev = this;
1218		1288
1219	for (archetype at = (archetype )arch->more; at; at = (archetype *)at->more)	1289	for (archetype at = (archetype )arch->more; at; at = (archetype *)at->more)
1220	{	1290	{
1221	object *op = arch_to_object (at);	1291	object *op = at->instance ();
1222		1292
1223	op->name = name;	1293	op->name = name;
1224	op->name_pl = name_pl;	1294	op->name_pl = name_pl;
1225	op->title = title;	1295	op->title = title;
1226		1296
…		…
1236	* job preparing multi-part monsters.	1306	* job preparing multi-part monsters.
1237	*/	1307	*/
1238	object *	1308	object *
1239	insert_ob_in_map_at (object op, maptile m, object *originator, int flag, int x, int y)	1309	insert_ob_in_map_at (object op, maptile m, object *originator, int flag, int x, int y)
1240	{	1310	{
		1311	op->remove ();
		1312
1241	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)	1313	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1242	{	1314	{
1243	tmp->x = x + tmp->arch->x;	1315	tmp->x = x + tmp->arch->x;
1244	tmp->y = y + tmp->arch->y;	1316	tmp->y = y + tmp->arch->y;
1245	}	1317	}
…		…
1262	* Passing 0 for flag gives proper default values, so flag really only needs	1334	* Passing 0 for flag gives proper default values, so flag really only needs
1263	* to be set if special handling is needed.	1335	* to be set if special handling is needed.
1264	*	1336	*
1265	* Return value:	1337	* Return value:
1266	* new object if 'op' was merged with other object	1338	* new object if 'op' was merged with other object
1267	* NULL if 'op' was destroyed	1339	* NULL if there was an error (destroyed, blocked etc.)
1268	* just 'op' otherwise	1340	* just 'op' otherwise
1269	*/	1341	*/
1270	object *	1342	object *
1271	insert_ob_in_map (object op, maptile m, object *originator, int flag)	1343	insert_ob_in_map (object op, maptile m, object *originator, int flag)
1272	{	1344	{
1273	op->remove ();	1345	op->remove ();
		1346
		1347	if (m == &freed_map)//D TODO: remove soon
		1348	{//D
		1349	LOG (llevError \| logBacktrace, "tries to insret object on freed objects map: %s", op->debug_desc ());//D
		1350	}//D
1274		1351
1275	/* Ideally, the caller figures this out. However, it complicates a lot	1352	/* Ideally, the caller figures this out. However, it complicates a lot
1276	* of areas of callers (eg, anything that uses find_free_spot would now	1353	* of areas of callers (eg, anything that uses find_free_spot would now
1277	* need extra work	1354	* need extra work
1278	*/	1355	*/
		1356	maptile *newmap = m;
1279	if (!xy_normalise (m, op->x, op->y))	1357	if (!xy_normalise (newmap, op->x, op->y))
1280	{	1358	{
1281	op->head_ ()->destroy (1);// remove head_ once all tail object destroyers found	1359	op->head_ ()->destroy ();// remove head_ once all tail object destroyers found
1282	return 0;	1360	return 0;
1283	}	1361	}
1284		1362
1285	if (object *more = op->more)	1363	if (object *more = op->more)
1286	if (!insert_ob_in_map (more, m, originator, flag))	1364	if (!insert_ob_in_map (more, m, originator, flag))
1287	return 0;	1365	return 0;
1288		1366
1289	CLEAR_FLAG (op, FLAG_REMOVED);	1367	op->flag [FLAG_REMOVED] = false;
1290		1368	op->env = 0;
1291	op->map = m;	1369	op->map = newmap;
		1370
1292	mapspace &ms = op->ms ();	1371	mapspace &ms = op->ms ();
1293		1372
1294	/* this has to be done after we translate the coordinates.	1373	/* this has to be done after we translate the coordinates.
1295	*/	1374	*/
1296	if (op->nrof && !(flag & INS_NO_MERGE))	1375	if (op->nrof && !(flag & INS_NO_MERGE))
…		…
1299	{	1378	{
1300	// TODO: we actually want to update tmp, not op,	1379	// TODO: we actually want to update tmp, not op,
1301	// but some caller surely breaks when we return tmp	1380	// but some caller surely breaks when we return tmp
1302	// from here :/	1381	// from here :/
1303	op->nrof += tmp->nrof;	1382	op->nrof += tmp->nrof;
1304	tmp->destroy (1);	1383	tmp->destroy ();
1305	}	1384	}
1306		1385
1307	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1386	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1308	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1387	CLEAR_FLAG (op, FLAG_INV_LOCKED);
1309		1388
1310	if (!QUERY_FLAG (op, FLAG_ALIVE))	1389	if (!QUERY_FLAG (op, FLAG_ALIVE))
1311	CLEAR_FLAG (op, FLAG_NO_STEAL);	1390	CLEAR_FLAG (op, FLAG_NO_STEAL);
1312		1391
1313	if (flag & INS_BELOW_ORIGINATOR)	1392	if (flag & INS_BELOW_ORIGINATOR)
1314	{	1393	{
1315	if (originator->map != op->map \|\| originator->x != op->x \|\| originator->y != op->y \|\| !originator->is_on_map ())	1394	if (originator->map != op->map \|\| originator->x != op->x \|\| originator->y != op->y)
1316	{	1395	{
1317	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");	1396	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");
		1397	abort ();
		1398	}
		1399
		1400	if (!originator->is_on_map ())
		1401	{
		1402	LOG (llevError, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map",
		1403	op->debug_desc (), originator->debug_desc ());
1318	abort ();	1404	abort ();
1319	}	1405	}
1320		1406
1321	op->above = originator;	1407	op->above = originator;
1322	op->below = originator->below;	1408	op->below = originator->below;
…		…
1391	} /* If objects on this space */	1477	} /* If objects on this space */
1392		1478
1393	if (flag & INS_ABOVE_FLOOR_ONLY)	1479	if (flag & INS_ABOVE_FLOOR_ONLY)
1394	top = floor;	1480	top = floor;
1395		1481
1396	/* Top is the object that our object (op) is going to get inserted above.	1482	// insert object above top, or bottom-most if top = 0
1397	*/
1398
1399	/* no top found, insert at bottom */
1400	if (!top)	1483	if (!top)
1401	{	1484	{
1402	op->below = 0;	1485	op->below = 0;
1403	op->above = ms.bot;	1486	op->above = ms.bot;
1404	ms.bot = op;	1487	ms.bot = op;
1405		1488
1406	*(op->above ? &op->above->below : &ms.top) = op;	1489	*(op->above ? &op->above->below : &ms.top) = op;
1407	}	1490	}
1408	else	1491	else
1409	{ /* get inserted into the stack above top */	1492	{
1410	op->above = top->above;	1493	op->above = top->above;
1411	top->above = op;	1494	top->above = op;
1412		1495
1413	op->below = top;	1496	op->below = top;
1414	*(op->above ? &op->above->below : &ms.top) = op;	1497	*(op->above ? &op->above->below : &ms.top) = op;
1415	}	1498	}
1416	} /* else not INS_BELOW_ORIGINATOR */	1499	}
1417		1500
1418	if (op->type == PLAYER)	1501	if (op->is_player ())
1419	{	1502	{
1420	op->contr->do_los = 1;	1503	op->contr->do_los = 1;
1421	++op->map->players;	1504	++op->map->players;
1422	op->map->touch ();	1505	op->map->touch ();
1423	}	1506	}
…		…
1438	* be far away from this change and not affected in any way -	1521	* be far away from this change and not affected in any way -
1439	* this should get redone to only look for players within range,	1522	* this should get redone to only look for players within range,
1440	* or just updating the P_UPTODATE for spaces within this area	1523	* or just updating the P_UPTODATE for spaces within this area
1441	* of effect may be sufficient.	1524	* of effect may be sufficient.
1442	*/	1525	*/
1443	if (op->map->darkness && (op->glow_radius != 0))	1526	if (op->affects_los ())
		1527	{
		1528	op->ms ().invalidate ();
1444	update_all_los (op->map, op->x, op->y);	1529	update_all_los (op->map, op->x, op->y);
		1530	}
1445		1531
1446	/* updates flags (blocked, alive, no magic, etc) for this map space */	1532	/* updates flags (blocked, alive, no magic, etc) for this map space */
1447	update_object (op, UP_OBJ_INSERT);	1533	update_object (op, UP_OBJ_INSERT);
1448		1534
1449	INVOKE_OBJECT (INSERT, op);	1535	INVOKE_OBJECT (INSERT, op);
…		…
1456	* blocked() and wall() work properly), and these flags are updated by	1542	* blocked() and wall() work properly), and these flags are updated by
1457	* update_object().	1543	* update_object().
1458	*/	1544	*/
1459		1545
1460	/* if this is not the head or flag has been passed, don't check walk on status */	1546	/* if this is not the head or flag has been passed, don't check walk on status */
1461	if (!(flag & INS_NO_WALK_ON) && op->head_ () == op)	1547	if (!(flag & INS_NO_WALK_ON) && op->is_head ())
1462	{	1548	{
1463	if (check_move_on (op, originator))	1549	if (check_move_on (op, originator))
1464	return 0;	1550	return 0;
1465		1551
1466	/* If we are a multi part object, lets work our way through the check	1552	/* If we are a multi part object, lets work our way through the check
…		…
1477	/* this function inserts an object in the map, but if it	1563	/* this function inserts an object in the map, but if it
1478	* finds an object of its own type, it'll remove that one first.	1564	* finds an object of its own type, it'll remove that one first.
1479	* op is the object to insert it under: supplies x and the map.	1565	* op is the object to insert it under: supplies x and the map.
1480	*/	1566	*/
1481	void	1567	void
1482	replace_insert_ob_in_map (const char arch_string, object op)	1568	replace_insert_ob_in_map (shstr_tmp archname, object *op)
1483	{	1569	{
1484	/* first search for itself and remove any old instances */	1570	/* first search for itself and remove any old instances */
1485		1571
1486	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)	1572	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1487	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */	1573	if (tmp->arch->archname == archname) /* same archetype */
1488	tmp->destroy (1);	1574	tmp->destroy ();
1489		1575
1490	object *tmp = arch_to_object (archetype::find (arch_string));	1576	object *tmp = archetype::find (archname)->instance ();
1491		1577
1492	tmp->x = op->x;	1578	tmp->x = op->x;
1493	tmp->y = op->y;	1579	tmp->y = op->y;
1494		1580
1495	insert_ob_in_map (tmp, op->map, op, 0);	1581	insert_ob_in_map (tmp, op->map, op, 0);
…		…
1500	{	1586	{
1501	if (where->env)	1587	if (where->env)
1502	return where->env->insert (this);	1588	return where->env->insert (this);
1503	else	1589	else
1504	return where->map->insert (this, where->x, where->y, originator, flags);	1590	return where->map->insert (this, where->x, where->y, originator, flags);
		1591	}
		1592
		1593	// check whether we can put this into the map, respect max_volume, max_items
		1594	bool
		1595	object::can_drop_at (maptile m, int x, int y, object originator)
		1596	{
		1597	mapspace &ms = m->at (x, y);
		1598
		1599	int items = ms.items ();
		1600
		1601	if (!items // testing !items ensures we can drop at least one item
		1602	\|\| (items < m->max_items
		1603	&& ms.volume () < m->max_volume))
		1604	return true;
		1605
		1606	if (originator && originator->is_player ())
		1607	originator->contr->failmsg (format (
		1608	"No matter how hard you try, you just cannot put the %s here H<Try to remove some items from the floor first.>",
		1609	query_name ()
		1610	));
		1611
		1612	return false;
1505	}	1613	}
1506		1614
1507	/*	1615	/*
1508	* decrease(object, number) decreases a specified number from	1616	* decrease(object, number) decreases a specified number from
1509	* the amount of an object. If the amount reaches 0, the object	1617	* the amount of an object. If the amount reaches 0, the object
…		…
1517	if (!nr)	1625	if (!nr)
1518	return true;	1626	return true;
1519		1627
1520	nr = min (nr, nrof);	1628	nr = min (nr, nrof);
1521		1629
		1630	if (nrof > nr)
		1631	{
1522	nrof -= nr;	1632	nrof -= nr;
1523
1524	if (nrof)
1525	{
1526	adjust_weight (env, -weight * nr); // carrying == 0	1633	adjust_weight (env, -weight * max (1, nr)); // carrying == 0
1527		1634
1528	if (object *pl = visible_to ())	1635	if (object *pl = visible_to ())
1529	esrv_update_item (UPD_NROF, pl, this);	1636	esrv_update_item (UPD_NROF, pl, this);
1530		1637
1531	return true;	1638	return true;
1532	}	1639	}
1533	else	1640	else
1534	{	1641	{
1535	destroy (1);	1642	destroy ();
1536	return false;	1643	return false;
1537	}	1644	}
1538	}	1645	}
1539		1646
1540	/*	1647	/*
…		…
1617	if (object *pl = tmp->visible_to ())	1724	if (object *pl = tmp->visible_to ())
1618	esrv_update_item (UPD_NROF, pl, tmp);	1725	esrv_update_item (UPD_NROF, pl, tmp);
1619		1726
1620	adjust_weight (this, op->total_weight ());	1727	adjust_weight (this, op->total_weight ());
1621		1728
1622	op->destroy (1);	1729	op->destroy ();
1623	op = tmp;	1730	op = tmp;
1624	goto inserted;	1731	goto inserted;
1625	}	1732	}
1626		1733
1627	op->owner = 0; // it's his/hers now. period.	1734	op->owner = 0; // it's his/hers now. period.
…		…
1645		1752
1646	adjust_weight (this, op->total_weight ());	1753	adjust_weight (this, op->total_weight ());
1647		1754
1648	inserted:	1755	inserted:
1649	/* reset the light list and los of the players on the map */	1756	/* reset the light list and los of the players on the map */
1650	if (op->glow_radius && map && map->darkness)	1757	if (op->glow_radius && is_on_map ())
		1758	{
		1759	update_stats ();
1651	update_all_los (map, x, y);	1760	update_all_los (map, x, y);
1652		1761	}
		1762	else if (is_player ())
1653	// if this is a player's inventory, update stats	1763	// if this is a player's inventory, update stats
1654	if (type == PLAYER && !flag [FLAG_NO_FIX_PLAYER])	1764	contr->queue_stats_update ();
1655	update_stats ();
1656		1765
1657	INVOKE_OBJECT (INSERT, this);	1766	INVOKE_OBJECT (INSERT, this);
1658		1767
1659	return op;	1768	return op;
1660	}	1769	}
…		…
1680	* on top.	1789	* on top.
1681	*/	1790	*/
1682	int	1791	int
1683	check_move_on (object op, object originator)	1792	check_move_on (object op, object originator)
1684	{	1793	{
		1794	if (QUERY_FLAG (op, FLAG_NO_APPLY))
		1795	return 0;
		1796
1685	object *tmp;	1797	object *tmp;
1686	maptile *m = op->map;	1798	maptile *m = op->map;
1687	int x = op->x, y = op->y;	1799	int x = op->x, y = op->y;
1688		1800
1689	MoveType move_on, move_slow, move_block;	1801	mapspace &ms = m->at (x, y);
1690		1802
1691	if (QUERY_FLAG (op, FLAG_NO_APPLY))	1803	ms.update ();
1692	return 0;
1693		1804
1694	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);	1805	MoveType move_on = ms.move_on;
1695	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);	1806	MoveType move_slow = ms.move_slow;
1696	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);	1807	MoveType move_block = ms.move_block;
1697		1808
1698	/* if nothing on this space will slow op down or be applied,	1809	/* if nothing on this space will slow op down or be applied,
1699	* no need to do checking below. have to make sure move_type	1810	* no need to do checking below. have to make sure move_type
1700	* is set, as lots of objects don't have it set - we treat that	1811	* is set, as lots of objects don't have it set - we treat that
1701	* as walking.	1812	* as walking.
…		…
1712	return 0;	1823	return 0;
1713		1824
1714	/* The objects have to be checked from top to bottom.	1825	/* The objects have to be checked from top to bottom.
1715	* Hence, we first go to the top:	1826	* Hence, we first go to the top:
1716	*/	1827	*/
1717		1828	for (object next, tmp = ms.top; tmp; tmp = next)
1718	for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above)
1719	{
1720	/* Trim the search when we find the first other spell effect
1721	* this helps performance so that if a space has 50 spell objects,
1722	* we don't need to check all of them.
1723	*/
1724	if ((tmp->move_type & MOVE_FLY_LOW) && QUERY_FLAG (tmp, FLAG_NO_PICK))
1725	break;
1726	}	1829	{
		1830	next = tmp->below;
1727		1831
1728	for (; tmp; tmp = tmp->below)
1729	{
1730	if (tmp == op)	1832	if (tmp == op)
1731	continue; /* Can't apply yourself */	1833	continue; /* Can't apply yourself */
1732		1834
1733	/* Check to see if one of the movement types should be slowed down.	1835	/* Check to see if one of the movement types should be slowed down.
1734	* Second check makes sure that the movement types not being slowed	1836	* Second check makes sure that the movement types not being slowed
…		…
1739	if (!QUERY_FLAG (op, FLAG_WIZPASS))	1841	if (!QUERY_FLAG (op, FLAG_WIZPASS))
1740	{	1842	{
1741	if ((!op->move_type && tmp->move_slow & MOVE_WALK) \|\|	1843	if ((!op->move_type && tmp->move_slow & MOVE_WALK) \|\|
1742	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))	1844	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1743	{	1845	{
1744
1745	float
1746	diff = tmp->move_slow_penalty * fabs (op->speed);	1846	float diff = tmp->move_slow_penalty * fabs (op->speed);
1747		1847
1748	if (op->type == PLAYER)	1848	if (op->is_player ())
1749	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) \|\|	1849	if ((tmp->flag [FLAG_IS_HILLY ] && find_skill_by_number (op, SK_CLIMBING)) \|\|
1750	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))	1850	(tmp->flag [FLAG_IS_WOODED] && find_skill_by_number (op, SK_WOODSMAN)))
1751	diff /= 4.0;	1851	diff /= 4.0;
1752		1852
1753	op->speed_left -= diff;	1853	op->speed_left -= diff;
1754	}	1854	}
1755	}	1855	}
…		…
1961	* head of the object should correspond for the entire object.	2061	* head of the object should correspond for the entire object.
1962	*/	2062	*/
1963	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))	2063	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
1964	continue;	2064	continue;
1965		2065
1966	if (ob->blocked (m, pos.x, pos.y))	2066	if (ob->blocked (pos.m, pos.x, pos.y))
1967	continue;	2067	continue;
1968		2068
1969	altern [index++] = i;	2069	altern [index++] = i;
1970	}	2070	}
1971		2071
…		…
2039	* there is capable of.	2139	* there is capable of.
2040	*/	2140	*/
2041	int	2141	int
2042	find_dir (maptile m, int x, int y, object exclude)	2142	find_dir (maptile m, int x, int y, object exclude)
2043	{	2143	{
2044	int i, max = SIZEOFFREE, mflags;	2144	int max = SIZEOFFREE, mflags;
2045
2046	sint16 nx, ny;
2047	object *tmp;
2048	maptile *mp;
2049
2050	MoveType blocked, move_type;	2145	MoveType move_type;
2051		2146
2052	if (exclude && exclude->head_ () != exclude)	2147	if (exclude && exclude->head_ () != exclude)
2053	{	2148	{
2054	exclude = exclude->head;	2149	exclude = exclude->head;
2055	move_type = exclude->move_type;	2150	move_type = exclude->move_type;
…		…
2058	{	2153	{
2059	/* If we don't have anything, presume it can use all movement types. */	2154	/* If we don't have anything, presume it can use all movement types. */
2060	move_type = MOVE_ALL;	2155	move_type = MOVE_ALL;
2061	}	2156	}
2062		2157
2063	for (i = 1; i < max; i++)	2158	for (int i = 1; i < max; i++)
2064	{	2159	{
2065	mp = m;	2160	mapxy pos (m, x, y);
2066	nx = x + freearr_x[i];	2161	pos.move (i);
2067	ny = y + freearr_y[i];
2068		2162
2069	mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);	2163	if (!pos.normalise ())
2070
2071	if (mflags & P_OUT_OF_MAP)
2072	max = maxfree[i];	2164	max = maxfree[i];
2073	else	2165	else
2074	{	2166	{
2075	mapspace &ms = mp->at (nx, ny);	2167	mapspace &ms = *pos;
2076		2168
2077	blocked = ms.move_block;
2078
2079	if ((move_type & blocked) == move_type)	2169	if ((move_type & ms.move_block) == move_type)
2080	max = maxfree[i];	2170	max = maxfree [i];
2081	else if (mflags & P_IS_ALIVE)	2171	else if (ms.flags () & P_IS_ALIVE)
2082	{	2172	{
2083	for (tmp = ms.bot; tmp; tmp = tmp->above)	2173	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
2084	if ((tmp->flag [FLAG_MONSTER] \|\| tmp->type == PLAYER)	2174	if ((tmp->flag [FLAG_MONSTER] \|\| tmp->is_player ())
2085	&& (tmp != exclude \|\| (tmp->head_ () != tmp && tmp->head_ () != exclude)))	2175	&& (tmp != exclude \|\| (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2086	break;
2087
2088	if (tmp)
2089	return freedir[i];	2176	return freedir [i];
2090	}	2177	}
2091	}	2178	}
2092	}	2179	}
2093		2180
2094	return 0;	2181	return 0;
…		…
2169	* This basically means that if direction is 15, then it could either go	2256	* This basically means that if direction is 15, then it could either go
2170	* direction 4, 14, or 16 to get back to where we are.	2257	* direction 4, 14, or 16 to get back to where we are.
2171	* Moved from spell_util.c to object.c with the other related direction	2258	* Moved from spell_util.c to object.c with the other related direction
2172	* functions.	2259	* functions.
2173	*/	2260	*/
2174	int reduction_dir[SIZEOFFREE][3] = {	2261	static const int reduction_dir[SIZEOFFREE][3] = {
2175	{0, 0, 0}, /* 0 */	2262	{0, 0, 0}, /* 0 */
2176	{0, 0, 0}, /* 1 */	2263	{0, 0, 0}, /* 1 */
2177	{0, 0, 0}, /* 2 */	2264	{0, 0, 0}, /* 2 */
2178	{0, 0, 0}, /* 3 */	2265	{0, 0, 0}, /* 3 */
2179	{0, 0, 0}, /* 4 */	2266	{0, 0, 0}, /* 4 */
…		…
2275	int	2362	int
2276	can_pick (const object who, const object item)	2363	can_pick (const object who, const object item)
2277	{	2364	{
2278	return /QUERY_FLAG(who,FLAG_WIZ)\|\| /	2365	return /QUERY_FLAG(who,FLAG_WIZ)\|\| /
2279	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&	2366	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
2280	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER \|\| item->weight < who->weight / 3));	2367	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->is_player () \|\| item->weight < who->weight / 3));
2281	}	2368	}
2282		2369
2283	/*	2370	/*
2284	* create clone from object to another	2371	* create clone from object to another
2285	*/	2372	*/
…		…
2317	return tmp;	2404	return tmp;
2318		2405
2319	return 0;	2406	return 0;
2320	}	2407	}
2321		2408
2322	const shstr &	2409	shstr_tmp
2323	object::kv_get (const shstr &key) const	2410	object::kv_get (shstr_tmp key) const
2324	{	2411	{
2325	for (key_value *kv = key_values; kv; kv = kv->next)	2412	for (key_value *kv = key_values; kv; kv = kv->next)
2326	if (kv->key == key)	2413	if (kv->key == key)
2327	return kv->value;	2414	return kv->value;
2328		2415
2329	return shstr_null;	2416	return shstr ();
2330	}	2417	}
2331		2418
2332	void	2419	void
2333	object::kv_set (const shstr &key, const shstr &value)	2420	object::kv_set (shstr_tmp key, shstr_tmp value)
2334	{	2421	{
2335	for (key_value *kv = key_values; kv; kv = kv->next)	2422	for (key_value *kv = key_values; kv; kv = kv->next)
2336	if (kv->key == key)	2423	if (kv->key == key)
2337	{	2424	{
2338	kv->value = value;	2425	kv->value = value;
…		…
2347		2434
2348	key_values = kv;	2435	key_values = kv;
2349	}	2436	}
2350		2437
2351	void	2438	void
2352	object::kv_del (const shstr &key)	2439	object::kv_del (shstr_tmp key)
2353	{	2440	{
2354	for (key_value *kvp = &key_values; kvp; kvp = &(*kvp)->next)	2441	for (key_value *kvp = &key_values; kvp; kvp = &(*kvp)->next)
2355	if ((*kvp)->key == key)	2442	if ((*kvp)->key == key)
2356	{	2443	{
2357	key_value kv = kvp;	2444	key_value kv = kvp;
…		…
2416	{	2503	{
2417	char flagdesc[512];	2504	char flagdesc[512];
2418	char info2[256 * 4];	2505	char info2[256 * 4];
2419	char *p = info;	2506	char *p = info;
2420		2507
2421	p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s,flags:[%s],type:%d}",	2508	p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s%s,flags:[%s],type:%d}",
2422	count,	2509	count,
2423	uuid.c_str (),	2510	uuid.c_str (),
2424	&name,	2511	&name,
2425	title ? "\",title:\"" : "",	2512	title ? ",title:\"" : "",
2426	title ? (const char *)title : "",	2513	title ? (const char *)title : "",
		2514	title ? "\"" : "",
2427	flag_desc (flagdesc, 512), type);	2515	flag_desc (flagdesc, 512), type);
2428		2516
2429	if (!flag[FLAG_REMOVED] && env)	2517	if (!flag[FLAG_REMOVED] && env)
2430	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2518	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2431		2519
…		…
2447	struct region *	2535	struct region *
2448	object::region () const	2536	object::region () const
2449	{	2537	{
2450	return map ? map->region (x, y)	2538	return map ? map->region (x, y)
2451	: region::default_region ();	2539	: region::default_region ();
2452	}
2453
2454	const materialtype_t *
2455	object::dominant_material () const
2456	{
2457	if (materialtype_t *mt = name_to_material (materialname))
2458	return mt;
2459
2460	return name_to_material (shstr_unknown);
2461	}	2540	}
2462		2541
2463	void	2542	void
2464	object::open_container (object *new_container)	2543	object::open_container (object *new_container)
2465	{	2544	{
…		…
2487	container = 0;	2566	container = 0;
2488		2567
2489	// client needs item update to make it work, client bug requires this to be separate	2568	// client needs item update to make it work, client bug requires this to be separate
2490	esrv_update_item (UPD_FLAGS, this, old_container);	2569	esrv_update_item (UPD_FLAGS, this, old_container);
2491		2570
2492	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));	2571	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", old_container->query_name ());
2493	play_sound (sound_find ("chest_close"));	2572	play_sound (sound_find ("chest_close"));
2494	}	2573	}
2495		2574
2496	if (new_container)	2575	if (new_container)
2497	{	2576	{
…		…
2501	// TODO: this does not seem to serve any purpose anymore?	2580	// TODO: this does not seem to serve any purpose anymore?
2502	#if 0	2581	#if 0
2503	// insert the "Close Container" object.	2582	// insert the "Close Container" object.
2504	if (archetype *closer = new_container->other_arch)	2583	if (archetype *closer = new_container->other_arch)
2505	{	2584	{
2506	object *closer = arch_to_object (new_container->other_arch);	2585	object *closer = new_container->other_arch->instance ();
2507	closer->flag [FLAG_NO_MAP_SAVE] = 1;	2586	closer->flag [FLAG_NO_MAP_SAVE] = 1;
2508	new_container->insert (closer);	2587	new_container->insert (closer);
2509	}	2588	}
2510	#endif	2589	#endif
2511		2590
2512	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));	2591	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", new_container->query_name ());
2513		2592
2514	// make sure the container is available, client bug requires this to be separate	2593	// make sure the container is available, client bug requires this to be separate
2515	esrv_send_item (this, new_container);	2594	esrv_send_item (this, new_container);
2516		2595
2517	new_container->flag [FLAG_APPLIED] = true;	2596	new_container->flag [FLAG_APPLIED] = true;
…		…
2525	// else if (!old_container->env && contr && contr->ns)	2604	// else if (!old_container->env && contr && contr->ns)
2526	// contr->ns->floorbox_reset ();	2605	// contr->ns->floorbox_reset ();
2527	}	2606	}
2528		2607
2529	object *	2608	object *
2530	object::force_find (const shstr name)	2609	object::force_find (shstr_tmp name)
2531	{	2610	{
2532	/* cycle through his inventory to look for the MARK we want to	2611	/* cycle through his inventory to look for the MARK we want to
2533	* place	2612	* place
2534	*/	2613	*/
2535	for (object *tmp = inv; tmp; tmp = tmp->below)	2614	for (object *tmp = inv; tmp; tmp = tmp->below)
…		…
2537	return splay (tmp);	2616	return splay (tmp);
2538		2617
2539	return 0;	2618	return 0;
2540	}	2619	}
2541		2620
		2621	//-GPL
		2622
2542	void	2623	void
		2624	object::force_set_timer (int duration)
		2625	{
		2626	this->duration = 1;
		2627	this->speed_left = -1.f;
		2628
		2629	this->set_speed (duration ? 1.f / duration : 0.f);
		2630	}
		2631
		2632	object *
2543	object::force_add (const shstr name, int duration)	2633	object::force_add (shstr_tmp name, int duration)
2544	{	2634	{
2545	if (object *force = force_find (name))	2635	if (object *force = force_find (name))
2546	force->destroy ();	2636	force->destroy ();
2547		2637
2548	object *force = get_archetype (FORCE_NAME);	2638	object *force = get_archetype (FORCE_NAME);
2549		2639
2550	force->slaying = name;	2640	force->slaying = name;
2551	force->stats.food = 1;	2641	force->force_set_timer (duration);
2552	force->speed_left = -1.f;
2553
2554	force->set_speed (duration ? 1.f / duration : 0.f);
2555	force->flag [FLAG_IS_USED_UP] = true;
2556	force->flag [FLAG_APPLIED] = true;	2642	force->flag [FLAG_APPLIED] = true;
2557		2643
2558	insert (force);	2644	return insert (force);
2559	}	2645	}
2560		2646
2561	void	2647	void
2562	object::play_sound (faceidx sound)	2648	object::play_sound (faceidx sound) const
2563	{	2649	{
2564	if (!sound)	2650	if (!sound)
2565	return;	2651	return;
2566		2652
2567	if (flag [FLAG_REMOVED])	2653	if (is_on_map ())
		2654	map->play_sound (sound, x, y);
		2655	else if (object *pl = in_player ())
		2656	pl->contr->play_sound (sound);
		2657	}
		2658
		2659	void
		2660	object::say_msg (const char *msg) const
		2661	{
		2662	if (is_on_map ())
		2663	map->say_msg (msg, x, y);
		2664	else if (object *pl = in_player ())
		2665	pl->contr->play_sound (sound);
		2666	}
		2667
		2668	void
		2669	object::make_noise ()
		2670	{
		2671	// we do not model noise in the map, so instead put
		2672	// a temporary light into the noise source
		2673	// could use the map instead, but that's less reliable for our
		2674	// goal, which is to make invisibility a bit harder to exploit
		2675
		2676	// currently only works sensibly for players
		2677	if (!is_player ())
2568	return;	2678	return;
2569		2679
2570	if (env)	2680	// find old force, or create new one
2571	{	2681	object *force = force_find (shstr_noise_force);
2572	if (object *pl = in_player ())	2682
2573	pl->contr->play_sound (sound);	2683	if (force)
2574	}	2684	force->speed_left = -1.f; // patch old speed up
2575	else	2685	else
2576	map->play_sound (sound, x, y);	2686	{
2577	}	2687	force = archetype::get (shstr_noise_force);
2578		2688
		2689	force->slaying = shstr_noise_force;
		2690	force->stats.food = 1;
		2691	force->speed_left = -1.f;
		2692
		2693	force->set_speed (1.f / 4.f);
		2694	force->flag [FLAG_IS_USED_UP] = true;
		2695	force->flag [FLAG_APPLIED] = true;
		2696
		2697	insert (force);
		2698	}
		2699	}
		2700
		2701	void object::change_move_type (MoveType mt)
		2702	{
		2703	if (move_type == mt)
		2704	return;
		2705
		2706	if (is_on_map ())
		2707	{
		2708	// we are on the map, so handle move_on/off effects
		2709	remove ();
		2710	move_type = mt;
		2711	map->insert (this, x, y, this);
		2712	}
		2713	else
		2714	move_type = mt;
		2715	}
		2716

Diff Legend

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

Comparing deliantra/server/common/object.C (file contents): Revision 1.239 by root, Wed May 7 13:38:16 2008 UTC vs. Revision 1.316 by root, Sun Mar 28 02:53:46 2010 UTC

Diff Legend

Comparing deliantra/server/common/object.C (file contents):
Revision 1.239 by root, Wed May 7 13:38:16 2008 UTC vs.
Revision 1.316 by root, Sun Mar 28 02:53:46 2010 UTC