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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.233 by root, Tue May 6 18:47:32 2008 UTC vs.
Revision 1.298 by root, Sun Nov 8 00:01:33 2009 UTC

…		…
1	/*	1	/*
2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.	2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.
3	*	3	*
4	* Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team	4	* Copyright (©) 2005,2006,2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5	* Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team	5	* Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team
6	* Copyright (©) 1992,2007 Frank Tore Johansen	6	* Copyright (©) 1992,2007 Frank Tore Johansen
7	*	7	*
8	* Deliantra is free software: you can redistribute it and/or modify	8	* Deliantra is free software: you can redistribute it and/or modify it under
9	* it under the terms of the GNU General Public License as published by	9	* the terms of the Affero GNU General Public License as published by the
10	* the Free Software Foundation, either version 3 of the License, or	10	* Free Software Foundation, either version 3 of the License, or (at your
11	* (at your option) any later version.	11	* option) any later version.
12	*	12	*
13	* This program is distributed in the hope that it will be useful,	13	* This program is distributed in the hope that it will be useful,
14	* but WITHOUT ANY WARRANTY; without even the implied warranty of	14	* but WITHOUT ANY WARRANTY; without even the implied warranty of
15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16	* GNU General Public License for more details.	16	* GNU General Public License for more details.
17	*	17	*
18	* You should have received a copy of the GNU General Public License	18	* You should have received a copy of the Affero GNU General Public License
19	* along with this program. If not, see <http://www.gnu.org/licenses/>.	19	* and the GNU General Public License along with this program. If not, see
		20	* <http://www.gnu.org/licenses/>.
20	*	21	*
21	* The authors can be reached via e-mail to <support@deliantra.net>	22	* The authors can be reached via e-mail to <support@deliantra.net>
22	*/	23	*/
23		24
24	#include <global.h>	25	#include <global.h>
32	#include <bitset>	33	#include <bitset>
33		34
34	UUID UUID::cur;	35	UUID UUID::cur;
35	static uint64_t seq_next_save;	36	static uint64_t seq_next_save;
36	static const uint64 UUID_GAP = 1<<19;	37	static const uint64 UUID_GAP = 1<<19;
		38	uint32_t mapspace::smellcount = 10000;
37		39
38	objectvec objects;	40	objectvec objects;
39	activevec actives;	41	activevec actives;
		42
		43	//+GPL
40		44
41	short freearr_x[SIZEOFFREE] = {	45	short freearr_x[SIZEOFFREE] = {
42	0,	46	0,
43	0, 1, 1, 1, 0, -1, -1, -1,	47	0, 1, 1, 1, 0, -1, -1, -1,
44	0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,	48	0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,
…		…
48	0,	52	0,
49	-1, -1, 0, 1, 1, 1, 0, -1,	53	-1, -1, 0, 1, 1, 1, 0, -1,
50	-2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2,	54	-2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2,
51	-3, -3, -3, -3, -2, -1, 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3	55	-3, -3, -3, -3, -2, -1, 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3
52	};	56	};
53	int maxfree[SIZEOFFREE] = {
54	0,
55	9, 10, 13, 14, 17, 18, 21, 22,
56	25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45, 48,
57	49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49
58	};
59	int freedir[SIZEOFFREE] = {	57	int freedir[SIZEOFFREE] = {
60	0,	58	0,
61	1, 2, 3, 4, 5, 6, 7, 8,	59	1, 2, 3, 4, 5, 6, 7, 8,
62	1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8,	60	1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8,
63	1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8	61	1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8
		62	};
		63
		64	static int maxfree[SIZEOFFREE] = {
		65	0,
		66	9, 10, 13, 14, 17, 18, 21, 22,
		67	25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45, 48,
		68	49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49
64	};	69	};
65		70
66	static void	71	static void
67	write_uuid (uval64 skip, bool sync)	72	write_uuid (uval64 skip, bool sync)
68	{	73	{
…		…
181	bool object::can_merge_slow (object ob1, object ob2)	186	bool object::can_merge_slow (object ob1, object ob2)
182	{	187	{
183	/* A couple quicksanity checks */	188	/* A couple quicksanity checks */
184	if (ob1 == ob2	189	if (ob1 == ob2
185	\|\| ob1->type != ob2->type	190	\|\| ob1->type != ob2->type
186	\|\| ob1->speed != ob2->speed	191	\|\| fabs (ob1->speed - ob2->speed) >= MIN_ACTIVE_SPEED
187	\|\| ob1->value != ob2->value	192	\|\| ob1->value != ob2->value
188	\|\| ob1->name != ob2->name)	193	\|\| ob1->name != ob2->name)
189	return 0;	194	return 0;
190		195
191	/* Do not merge objects if nrof would overflow. First part checks	196	/* Do not merge objects if nrof would overflow, assume nrof
192	* for unsigned overflow (2c), second part checks whether the result	197	* is always 0 .. 2*31-1 /
193	* would fit into a 32 bit signed int, which is often used to hold	198	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;	199	return 0;
198		200
199	/* If the objects have been identified, set the BEEN_APPLIED flag.	201	/* 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	202	* 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	203	* just can't ignore the been applied or identified flags, as they
…		…
206	SET_FLAG (ob1, FLAG_BEEN_APPLIED);	208	SET_FLAG (ob1, FLAG_BEEN_APPLIED);
207		209
208	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))	210	if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))
209	SET_FLAG (ob2, FLAG_BEEN_APPLIED);	211	SET_FLAG (ob2, FLAG_BEEN_APPLIED);
210		212
211	if (ob1->arch->name != ob2->arch->name	213	if (ob1->arch->archname != ob2->arch->archname
212	\|\| ob1->name != ob2->name	214	\|\| ob1->name != ob2->name
213	\|\| ob1->title != ob2->title	215	\|\| ob1->title != ob2->title
214	\|\| ob1->msg != ob2->msg	216	\|\| ob1->msg != ob2->msg
215	\|\| ob1->weight != ob2->weight	217	\|\| ob1->weight != ob2->weight
216	\|\| ob1->attacktype != ob2->attacktype	218	\|\| ob1->attacktype != ob2->attacktype
217	\|\| ob1->magic != ob2->magic	219	\|\| ob1->magic != ob2->magic
218	\|\| ob1->slaying != ob2->slaying	220	\|\| ob1->slaying != ob2->slaying
219	\|\| ob1->skill != ob2->skill	221	\|\| ob1->skill != ob2->skill
220	\|\| ob1->value != ob2->value	222	\|\| ob1->value != ob2->value
221	\|\| ob1->animation_id != ob2->animation_id	223	\|\| ob1->animation_id != ob2->animation_id
		224	\|\| (ob1->face != ob2->face && !ob1->animation_id) // face and animation are dependent on each other
222	\|\| ob1->client_type != ob2->client_type	225	\|\| ob1->client_type != ob2->client_type
223	\|\| ob1->materialname != ob2->materialname	226	\|\| ob1->materialname != ob2->materialname
224	\|\| ob1->lore != ob2->lore	227	\|\| ob1->lore != ob2->lore
225	\|\| ob1->subtype != ob2->subtype	228	\|\| ob1->subtype != ob2->subtype
226	\|\| ob1->move_type != ob2->move_type	229	\|\| ob1->move_type != ob2->move_type
227	\|\| ob1->move_block != ob2->move_block	230	\|\| ob1->move_block != ob2->move_block
228	\|\| ob1->move_allow != ob2->move_allow	231	\|\| ob1->move_allow != ob2->move_allow
229	\|\| ob1->move_on != ob2->move_on	232	\|\| ob1->move_on != ob2->move_on
230	\|\| ob1->move_off != ob2->move_off	233	\|\| ob1->move_off != ob2->move_off
231	\|\| ob1->move_slow != ob2->move_slow	234	\|\| ob1->move_slow != ob2->move_slow
232	\|\| ob1->move_slow_penalty != ob2->move_slow_penalty	235	\|\| fabs (ob1->move_slow_penalty - ob2->move_slow_penalty) >= (1.f / 1024.f)
233	\|\| memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))	236	\|\| memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
234	\|\| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats)))	237	\|\| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats)))
235	return 0;	238	return 0;
236		239
237	if ((ob1->flag ^ ob2->flag)	240	if ((ob1->flag ^ ob2->flag)
238	.reset (FLAG_INV_LOCKED)	241	.reset (FLAG_INV_LOCKED)
239	.reset (FLAG_CLIENT_SENT)
240	.reset (FLAG_REMOVED)	242	.reset (FLAG_REMOVED)
241	.any ())	243	.any ())
242	return 0;	244	return 0;
243		245
244	/* This is really a spellbook check - we should in general	246	/* This is really a spellbook check - we should in general
…		…
326	{	328	{
327	// see if we are in a container of sorts	329	// see if we are in a container of sorts
328	if (env)	330	if (env)
329	{	331	{
330	// the player inventory itself is always visible	332	// the player inventory itself is always visible
331	if (env->type == PLAYER)	333	if (env->is_player ())
332	return env;	334	return env;
333		335
334	// else a player could have our env open	336	// else a player could have our env open
335	object *envest = env->outer_env ();	337	object *envest = env->outer_env_or_self ();
336		338
337	// the player itself is always on a map, so we will find him here	339	// the player itself is always on a map, so we will find him here
338	// even if our inv is in a player.	340	// even if our inv is in a player.
339	if (envest->is_on_map ())	341	if (envest->is_on_map ())
340	if (object *pl = envest->ms ().player ())	342	if (object *pl = envest->ms ().player ())
341	if (pl->container == env)	343	if (pl->container_ () == env)
342	return pl;	344	return pl;
343	}	345	}
344	else	346	else
345	{	347	{
346	// maybe there is a player standing on the same mapspace	348	// maybe there is a player standing on the same mapspace
347	// this will catch the case where "this" is a player	349	// this will catch the case where "this" is a player
348	if (object *pl = ms ().player ())	350	if (object *pl = ms ().player ())
349	if (!pl->container \|\| this == pl->container)	351	if ((pl->contr->ns && !pl->container_ () && !pl->contr->ns->update_look)
		352	\|\| pl->container_ () == this)
350	return pl;	353	return pl;
351	}	354	}
352	}	355	}
353		356
354	return 0;	357	return 0;
…		…
406	op->update_weight ();	409	op->update_weight ();
407		410
408	sum += op->total_weight ();	411	sum += op->total_weight ();
409	}	412	}
410		413
411	sum = weight_adjust (this, sum);	414	sum = weight_adjust_for (this, sum);
412		415
413	if (sum != carrying)	416	if (sum != carrying)
414	{	417	{
415	carrying = sum;	418	carrying = sum;
416		419
…		…
432	object_freezer freezer;	435	object_freezer freezer;
433	op->write (freezer);	436	op->write (freezer);
434	return freezer.as_string ();	437	return freezer.as_string ();
435	}	438	}
436		439
437	/*	440	char *
438	* get_nearest_part(multi-object, object 2) returns the part of the	441	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	{	442	{
445	object tmp, closest;	443	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	}	444	}
459		445
460	/*	446	/*
461	* Returns the object which has the count-variable equal to the argument.	447	* Returns the object which has the count-variable equal to the argument.
462	* VERRRY slow.	448	* VERRRY slow.
…		…
478	*/	464	*/
479	object *	465	object *
480	find_object_name (const char *str)	466	find_object_name (const char *str)
481	{	467	{
482	shstr_cmp str_ (str);	468	shstr_cmp str_ (str);
483	object *op;
484		469
		470	if (str_)
485	for_all_objects (op)	471	for_all_objects (op)
486	if (op->name == str_)	472	if (op->name == str_)
487	break;	473	return op;
488		474
489	return op;	475	return 0;
490	}	476	}
491		477
492	/*	478	/*
493	* Sets the owner and sets the skill and exp pointers to owner's current	479	* Sets the owner and sets the skill and exp pointers to owner's current
494	* skill and experience objects.	480	* skill and experience objects.
…		…
556	update_stats ();	542	update_stats ();
557		543
558	new_draw_info_format (NDI_UNIQUE, 0, this,	544	new_draw_info_format (NDI_UNIQUE, 0, this,
559	"You try to balance all your items at once, "	545	"You try to balance all your items at once, "
560	"but the %s is just too much for your body. "	546	"but the %s is just too much for your body. "
561	"[You need to unapply some items first.]", &ob->name);	547	"[You need to unapply some items first - use the 'body' command to see "
		548	"how many items you cna wera on a specific body part.]", &ob->name);
562	return false;	549	return false;
563	}	550	}
564		551
565	//new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);	552	//new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);
566	}	553	}
…		…
638	}	625	}
639		626
640	if (speed < 0)	627	if (speed < 0)
641	dst->speed_left -= rndm ();	628	dst->speed_left -= rndm ();
642		629
643	dst->set_speed (dst->speed);	630	dst->activate ();
644	}	631	}
645		632
646	void	633	void
647	object::instantiate ()	634	object::instantiate ()
648	{	635	{
…		…
692	* This function needs to be called whenever the speed of an object changes.	679	* This function needs to be called whenever the speed of an object changes.
693	*/	680	*/
694	void	681	void
695	object::set_speed (float speed)	682	object::set_speed (float speed)
696	{	683	{
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;	684	this->speed = speed;
704		685
705	if (has_active_speed ())	686	if (has_active_speed ())
706	activate ();	687	activate ();
707	else	688	else
…		…
757		738
758	if (!(m.flags_ & P_UPTODATE))	739	if (!(m.flags_ & P_UPTODATE))
759	/* nop */;	740	/* nop */;
760	else if (action == UP_OBJ_INSERT)	741	else if (action == UP_OBJ_INSERT)
761	{	742	{
		743	#if 0
762	// this is likely overkill, TODO: revisit (schmorp)	744	// this is likely overkill, TODO: revisit (schmorp)
763	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))	745	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
764	\|\| (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))	746	\|\| (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))
765	\|\| (op->type == PLAYER && !(m.flags_ & P_PLAYER))	747	\|\| (op->is_player () && !(m.flags_ & P_PLAYER))
766	\|\| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))	748	\|\| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
767	\|\| (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))	749	\|\| (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))
768	\|\| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))	750	\|\| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))
769	\|\| (m.move_on \| op->move_on ) != m.move_on	751	\|\| (m.move_on \| op->move_on ) != m.move_on
770	\|\| (m.move_off \| op->move_off ) != m.move_off	752	\|\| (m.move_off \| op->move_off ) != m.move_off
771	\|\| (m.move_slow \| op->move_slow) != m.move_slow	753	\|\| (m.move_slow \| op->move_slow) != m.move_slow
772	/* This isn't perfect, but I don't expect a lot of objects to	754	/* This isn't perfect, but I don't expect a lot of objects to
773	* to have move_allow right now.	755	* have move_allow right now.
774	*/	756	*/
775	\|\| ((m.move_block \| op->move_block) & ~op->move_allow) != m.move_block	757	\|\| ((m.move_block \| op->move_block) & ~op->move_allow) != m.move_block
		758	m.invalidate ();
		759	#else
776	\|\| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)	760	// the above is not strong enough a test to skip updating. los maybe? TODO (schmorp)
777	m.flags_ = 0;	761	m.invalidate ();
		762	#endif
778	}	763	}
779	/* if the object is being removed, we can't make intelligent	764	/* if the object is being removed, we can't make intelligent
780	* decisions, because remove_ob can't really pass the object	765	* decisions, because remove_ob can't really pass the object
781	* that is being removed.	766	* that is being removed.
782	*/	767	*/
783	else if (action == UP_OBJ_CHANGE \|\| action == UP_OBJ_REMOVE)	768	else if (action == UP_OBJ_CHANGE \|\| action == UP_OBJ_REMOVE)
784	m.flags_ = 0;	769	m.invalidate ();
785	else if (action == UP_OBJ_FACE)	770	else if (action == UP_OBJ_FACE)
786	/* Nothing to do for that case */ ;	771	/* Nothing to do for that case */ ;
787	else	772	else
788	LOG (llevError, "update_object called with invalid action: %d\n", action);	773	LOG (llevError, "update_object called with invalid action: %d\n", action);
789		774
…		…
793		778
794	object::object ()	779	object::object ()
795	{	780	{
796	SET_FLAG (this, FLAG_REMOVED);	781	SET_FLAG (this, FLAG_REMOVED);
797		782
798	expmul = 1.0;	783	//expmul = 1.0; declared const for the time being
799	face = blank_face;	784	face = blank_face;
800	}	785	}
801		786
802	object::~object ()	787	object::~object ()
803	{	788	{
…		…
833	/* If already on active list, don't do anything */	818	/* If already on active list, don't do anything */
834	if (active)	819	if (active)
835	return;	820	return;
836		821
837	if (has_active_speed ())	822	if (has_active_speed ())
		823	{
		824	if (flag [FLAG_FREED])
		825	LOG (llevError \| logBacktrace, "BUG: tried to activate freed object %s\n", debug_desc ());//D
		826
838	actives.insert (this);	827	actives.insert (this);
		828	}
839	}	829	}
840		830
841	void	831	void
842	object::activate_recursive ()	832	object::activate_recursive ()
843	{	833	{
…		…
904	* drop on that space.	894	* drop on that space.
905	*/	895	*/
906	if (!drop_to_ground	896	if (!drop_to_ground
907	\|\| !map	897	\|\| !map
908	\|\| map->in_memory != MAP_ACTIVE	898	\|\| map->in_memory != MAP_ACTIVE
909	\|\| map->nodrop	899	\|\| map->no_drop
910	\|\| ms ().move_block == MOVE_ALL)	900	\|\| ms ().move_block == MOVE_ALL)
911	{	901	{
912	while (inv)	902	while (inv)
913	{
914	inv->destroy_inv (false);
915	inv->destroy ();	903	inv->destroy ();
916	}
917	}	904	}
918	else	905	else
919	{ /* Put objects in inventory onto this space */	906	{ /* Put objects in inventory onto this space */
920	while (inv)	907	while (inv)
921	{	908	{
…		…
925	\|\| op->flag [FLAG_NO_DROP]	912	\|\| op->flag [FLAG_NO_DROP]
926	\|\| op->type == RUNE	913	\|\| op->type == RUNE
927	\|\| op->type == TRAP	914	\|\| op->type == TRAP
928	\|\| op->flag [FLAG_IS_A_TEMPLATE]	915	\|\| op->flag [FLAG_IS_A_TEMPLATE]
929	\|\| op->flag [FLAG_DESTROY_ON_DEATH])	916	\|\| op->flag [FLAG_DESTROY_ON_DEATH])
930	op->destroy (true);	917	op->destroy ();
931	else	918	else
932	map->insert (op, x, y);	919	map->insert (op, x, y);
933	}	920	}
934	}	921	}
935	}	922	}
…		…
943		930
944	static struct freed_map : maptile	931	static struct freed_map : maptile
945	{	932	{
946	freed_map ()	933	freed_map ()
947	{	934	{
948	path = "<freed objects map>";	935	path = "<freed objects map>";
949	name = "/internal/freed_objects_map";	936	name = "/internal/freed_objects_map";
950	width = 3;	937	width = 3;
951	height = 3;	938	height = 3;
952	nodrop = 1;	939	no_drop = 1;
		940	no_reset = 1;
953		941
954	alloc ();	942	alloc ();
955	in_memory = MAP_ACTIVE;	943	in_memory = MAP_ACTIVE;
956	}	944	}
957		945
…		…
963		951
964	void	952	void
965	object::do_destroy ()	953	object::do_destroy ()
966	{	954	{
967	if (flag [FLAG_IS_LINKED])	955	if (flag [FLAG_IS_LINKED])
968	remove_button_link (this);	956	remove_link ();
969		957
970	if (flag [FLAG_FRIENDLY])	958	if (flag [FLAG_FRIENDLY])
971	remove_friendly_object (this);	959	remove_friendly_object (this);
972		960
973	remove ();	961	remove ();
…		…
998	attacked_by = 0;	986	attacked_by = 0;
999	current_weapon = 0;	987	current_weapon = 0;
1000	}	988	}
1001		989
1002	void	990	void
1003	object::destroy (bool destroy_inventory)	991	object::destroy ()
1004	{	992	{
1005	if (destroyed ())	993	if (destroyed ())
1006	return;	994	return;
1007		995
1008	if (!is_head () && !head->destroyed ())	996	if (!is_head () && !head->destroyed ())
1009	{	997	{
1010	LOG (llevError \| logBacktrace, "tried to destroy the tail of an object");	998	LOG (llevError \| logBacktrace, "tried to destroy the tail of an object");
1011	head->destroy (destroy_inventory);	999	head->destroy ();
1012	return;	1000	return;
1013	}	1001	}
1014		1002
1015	destroy_inv (!destroy_inventory);	1003	destroy_inv (false);
1016		1004
1017	if (is_head ())	1005	if (is_head ())
1018	if (sound_destroy)	1006	if (sound_destroy)
1019	play_sound (sound_destroy);	1007	play_sound (sound_destroy);
1020	else if (flag [FLAG_MONSTER])	1008	else if (flag [FLAG_MONSTER])
…		…
1031	* the previous environment.	1019	* the previous environment.
1032	*/	1020	*/
1033	void	1021	void
1034	object::do_remove ()	1022	object::do_remove ()
1035	{	1023	{
1036	object tmp, last = 0;
1037	object *otmp;
1038
1039	if (flag [FLAG_REMOVED])	1024	if (flag [FLAG_REMOVED])
1040	return;	1025	return;
1041		1026
1042	INVOKE_OBJECT (REMOVE, this);	1027	INVOKE_OBJECT (REMOVE, this);
1043		1028
…		…
1057	esrv_del_item (pl->contr, count);	1042	esrv_del_item (pl->contr, count);
1058	flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed	1043	flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed
1059		1044
1060	adjust_weight (env, -total_weight ());	1045	adjust_weight (env, -total_weight ());
1061		1046
1062	*(above ? &above->below : &env->inv) = below;	1047	object *pl = in_player ();
1063
1064	if (below)
1065	below->above = above;
1066		1048
1067	/* we set up values so that it could be inserted into	1049	/* we set up values so that it could be inserted into
1068	* the map, but we don't actually do that - it is up	1050	* the map, but we don't actually do that - it is up
1069	* to the caller to decide what we want to do.	1051	* to the caller to decide what we want to do.
1070	*/	1052	*/
1071	map = env->map;	1053	map = env->map;
1072	x = env->x;	1054	x = env->x;
1073	y = env->y;	1055	y = env->y;
		1056
		1057	// make sure cmov optimisation is applicable
		1058	*(above ? &above->below : &env->inv) = below;
		1059	*(below ? &below->above : &above ) = above; // &above is just a dummy
		1060
1074	above = 0;	1061	above = 0;
1075	below = 0;	1062	below = 0;
1076	env = 0;	1063	env = 0;
1077		1064
1078	/* NO_FIX_PLAYER is set when a great many changes are being	1065	/* NO_FIX_PLAYER is set when a great many changes are being
1079	* made to players inventory. If set, avoiding the call	1066	* made to players inventory. If set, avoiding the call
1080	* to save cpu time.	1067	* to save cpu time.
1081	*/	1068	*/
1082	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1069	if (pl)
		1070	if (pl->is_player () && (glow_radius \|\| !QUERY_FLAG (pl, FLAG_NO_FIX_PLAYER)))
		1071	{
1083	otmp->update_stats ();	1072	pl->update_stats ();
		1073
		1074	if (glow_radius && pl->is_on_map ())
		1075	update_all_los (pl->map, pl->x, pl->y);
		1076	}
1084	}	1077	}
1085	else if (map)	1078	else if (map)
1086	{	1079	{
1087	map->dirty = true;	1080	map->dirty = true;
1088	mapspace &ms = this->ms ();	1081	mapspace &ms = this->ms ();
1089		1082
1090	if (object *pl = ms.player ())	1083	if (object *pl = ms.player ())
1091	{	1084	{
1092	if (type == PLAYER) // this == pl(!)	1085	if (is_player ())
1093	{	1086	{
		1087	if (!flag [FLAG_WIZPASS])
		1088	ms.smell = ++mapspace::smellcount; // remember the smell of the player
		1089
1094	// leaving a spot always closes any open container on the ground	1090	// leaving a spot always closes any open container on the ground
1095	if (container && !container->env)	1091	if (container && !container->env)
1096	// this causes spurious floorbox updates, but it ensures	1092	// this causes spurious floorbox updates, but it ensures
1097	// that the CLOSE event is being sent.	1093	// that the CLOSE event is being sent.
1098	close_container ();	1094	close_container ();
1099		1095
1100	--map->players;	1096	--map->players;
1101	map->touch ();	1097	map->touch ();
1102	}	1098	}
1103	else if (pl->container == this)	1099	else if (pl->container_ () == this)
1104	{	1100	{
1105	// removing a container should close it	1101	// removing a container should close it
1106	close_container ();	1102	close_container ();
1107	}	1103	}
1108		1104
1109	esrv_del_item (pl->contr, count);	1105	esrv_del_item (pl->contr, count);
1110	}	1106	}
1111		1107
1112	/* link the object above us */	1108	/* link the object above us */
1113	if (above)	1109	// re-link, make sure compiler can easily use cmove
1114	above->below = below;	1110	*(above ? &above->below : &ms.top) = below;
1115	else	1111	*(below ? &below->above : &ms.bot) = above;
1116	ms.top = below; /* we were top, set new top */
1117
1118	/* Relink the object below us, if there is one */
1119	if (below)
1120	below->above = above;
1121	else
1122	{
1123	/* Nothing below, which means we need to relink map object for this space
1124	* use translated coordinates in case some oddness with map tiling is
1125	* evident
1126	*/
1127	if (GET_MAP_OB (map, x, y) != this)
1128	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 ());
1129
1130	ms.bot = above; /* goes on above it. */
1131	}
1132		1112
1133	above = 0;	1113	above = 0;
1134	below = 0;	1114	below = 0;
1135		1115
		1116	ms.invalidate ();
		1117
1136	if (map->in_memory == MAP_SAVING)	1118	if (map->in_memory == MAP_SAVING)
1137	return;	1119	return;
1138		1120
1139	int check_walk_off = !flag [FLAG_NO_APPLY];	1121	int check_walk_off = !flag [FLAG_NO_APPLY];
1140		1122
1141	if (object *pl = ms.player ())	1123	if (object *pl = ms.player ())
1142	{	1124	{
1143	if (pl->container == this)	1125	if (pl->container_ () == this)
1144	/* If a container that the player is currently using somehow gets	1126	/* If a container that the player is currently using somehow gets
1145	* removed (most likely destroyed), update the player view	1127	* removed (most likely destroyed), update the player view
1146	* appropriately.	1128	* appropriately.
1147	*/	1129	*/
1148	pl->close_container ();	1130	pl->close_container ();
…		…
1152	//TODO: update floorbox to preserve ordering	1134	//TODO: update floorbox to preserve ordering
1153	if (pl->contr->ns)	1135	if (pl->contr->ns)
1154	pl->contr->ns->floorbox_update ();	1136	pl->contr->ns->floorbox_update ();
1155	}	1137	}
1156		1138
		1139	if (check_walk_off)
1157	for (tmp = ms.bot; tmp; tmp = tmp->above)	1140	for (object above, tmp = ms.bot; tmp; tmp = above)
1158	{	1141	{
		1142	above = tmp->above;
		1143
1159	/* No point updating the players look faces if he is the object	1144	/* No point updating the players look faces if he is the object
1160	* being removed.	1145	* being removed.
1161	*/	1146	*/
1162		1147
1163	/* See if object moving off should effect something */	1148	/* See if object moving off should effect something */
1164	if (check_walk_off
1165	&& ((move_type & tmp->move_off)	1149	if ((move_type & tmp->move_off)
1166	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))	1150	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0)
1167	{
1168	move_apply (tmp, this, 0);	1151	move_apply (tmp, this, 0);
1169
1170	if (destroyed ())
1171	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1172	}	1152	}
1173		1153
1174	last = tmp;	1154	if (affects_los ())
1175	}
1176
1177	/* last == NULL if there are no objects on this space */
1178	//TODO: this makes little sense, why only update the topmost object?
1179	if (!last)
1180	map->at (x, y).flags_ = 0;
1181	else
1182	update_object (last, UP_OBJ_REMOVE);
1183
1184	if (flag [FLAG_BLOCKSVIEW] \|\| glow_radius)
1185	update_all_los (map, x, y);	1155	update_all_los (map, x, y);
1186	}	1156	}
1187	}	1157	}
1188		1158
1189	/*	1159	/*
…		…
1213	esrv_update_item (UPD_NROF, pl, top);	1183	esrv_update_item (UPD_NROF, pl, top);
1214		1184
1215	op->weight = 0; // cancel the addition above	1185	op->weight = 0; // cancel the addition above
1216	op->carrying = 0; // must be 0 already	1186	op->carrying = 0; // must be 0 already
1217		1187
1218	op->destroy (1);	1188	op->destroy ();
1219		1189
1220	return top;	1190	return top;
1221	}	1191	}
1222		1192
1223	return 0;	1193	return 0;
…		…
1251	* job preparing multi-part monsters.	1221	* job preparing multi-part monsters.
1252	*/	1222	*/
1253	object *	1223	object *
1254	insert_ob_in_map_at (object op, maptile m, object *originator, int flag, int x, int y)	1224	insert_ob_in_map_at (object op, maptile m, object *originator, int flag, int x, int y)
1255	{	1225	{
		1226	op->remove ();
		1227
1256	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)	1228	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1257	{	1229	{
1258	tmp->x = x + tmp->arch->x;	1230	tmp->x = x + tmp->arch->x;
1259	tmp->y = y + tmp->arch->y;	1231	tmp->y = y + tmp->arch->y;
1260	}	1232	}
…		…
1283	* just 'op' otherwise	1255	* just 'op' otherwise
1284	*/	1256	*/
1285	object *	1257	object *
1286	insert_ob_in_map (object op, maptile m, object *originator, int flag)	1258	insert_ob_in_map (object op, maptile m, object *originator, int flag)
1287	{	1259	{
1288	assert (!op->flag [FLAG_FREED]);
1289
1290	op->remove ();	1260	op->remove ();
		1261
		1262	if (m == &freed_map)//D TODO: remove soon
		1263	{//D
		1264	LOG (llevError \| logBacktrace, "tries to insret object on freed objects map: %s", op->debug_desc ());//D
		1265	}//D
1291		1266
1292	/* Ideally, the caller figures this out. However, it complicates a lot	1267	/* Ideally, the caller figures this out. However, it complicates a lot
1293	* of areas of callers (eg, anything that uses find_free_spot would now	1268	* of areas of callers (eg, anything that uses find_free_spot would now
1294	* need extra work	1269	* need extra work
1295	*/	1270	*/
		1271	maptile *newmap = m;
1296	if (!xy_normalise (m, op->x, op->y))	1272	if (!xy_normalise (newmap, op->x, op->y))
1297	{	1273	{
1298	op->head_ ()->destroy (1);// remove head_ once all tail object destroyers found	1274	op->head_ ()->destroy ();// remove head_ once all tail object destroyers found
1299	return 0;	1275	return 0;
1300	}	1276	}
1301		1277
1302	if (object *more = op->more)	1278	if (object *more = op->more)
1303	if (!insert_ob_in_map (more, m, originator, flag))	1279	if (!insert_ob_in_map (more, m, originator, flag))
1304	return 0;	1280	return 0;
1305		1281
1306	CLEAR_FLAG (op, FLAG_REMOVED);	1282	op->flag [FLAG_REMOVED] = false;
1307		1283	op->env = 0;
1308	op->map = m;	1284	op->map = newmap;
		1285
1309	mapspace &ms = op->ms ();	1286	mapspace &ms = op->ms ();
1310		1287
1311	/* this has to be done after we translate the coordinates.	1288	/* this has to be done after we translate the coordinates.
1312	*/	1289	*/
1313	if (op->nrof && !(flag & INS_NO_MERGE))	1290	if (op->nrof && !(flag & INS_NO_MERGE))
1314	for (object *tmp = ms.bot; tmp; tmp = tmp->above)	1291	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1315	if (object::can_merge (op, tmp))	1292	if (object::can_merge (op, tmp))
1316	{	1293	{
1317	// TODO: we atcually want to update tmp, not op,	1294	// TODO: we actually want to update tmp, not op,
1318	// but some caller surely breaks when we return tmp	1295	// but some caller surely breaks when we return tmp
1319	// from here :/	1296	// from here :/
1320	op->nrof += tmp->nrof;	1297	op->nrof += tmp->nrof;
1321	tmp->destroy (1);	1298	tmp->destroy ();
1322	}	1299	}
1323		1300
1324	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1301	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1325	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1302	CLEAR_FLAG (op, FLAG_INV_LOCKED);
1326		1303
…		…
1333	{	1310	{
1334	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");	1311	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");
1335	abort ();	1312	abort ();
1336	}	1313	}
1337		1314
		1315	if (!originator->is_on_map ())
		1316	{
		1317	LOG (llevError, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map",
		1318	op->debug_desc (), originator->debug_desc ());
		1319	abort ();
		1320	}
		1321
1338	op->above = originator;	1322	op->above = originator;
1339	op->below = originator->below;	1323	op->below = originator->below;
1340
1341	if (op->below)
1342	op->below->above = op;
1343	else
1344	ms.bot = op;
1345
1346	/* since below originator, no need to update top */
1347	originator->below = op;	1324	originator->below = op;
		1325
		1326	*(op->below ? &op->below->above : &ms.bot) = op;
1348	}	1327	}
1349	else	1328	else
1350	{	1329	{
1351	object top, floor = NULL;	1330	object *floor = 0;
1352		1331	object *top = ms.top;
1353	top = ms.bot;
1354		1332
1355	/* If there are other objects, then */	1333	/* If there are other objects, then */
1356	if (top)	1334	if (top)
1357	{	1335	{
1358	object *last = 0;
1359
1360	/*	1336	/*
1361	* If there are multiple objects on this space, we do some trickier handling.	1337	* If there are multiple objects on this space, we do some trickier handling.
1362	* We've already dealt with merging if appropriate.	1338	* We've already dealt with merging if appropriate.
1363	* Generally, we want to put the new object on top. But if	1339	* Generally, we want to put the new object on top. But if
1364	* flag contains INS_ABOVE_FLOOR_ONLY, once we find the last	1340	* flag contains INS_ABOVE_FLOOR_ONLY, once we find the last
…		…
1367	* once we get to them. This reduces the need to traverse over all of	1343	* once we get to them. This reduces the need to traverse over all of
1368	* them when adding another one - this saves quite a bit of cpu time	1344	* them when adding another one - this saves quite a bit of cpu time
1369	* when lots of spells are cast in one area. Currently, it is presumed	1345	* when lots of spells are cast in one area. Currently, it is presumed
1370	* that flying non pickable objects are spell objects.	1346	* that flying non pickable objects are spell objects.
1371	*/	1347	*/
1372	for (top = ms.bot; top; top = top->above)	1348	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
1373	{	1349	{
1374	if (QUERY_FLAG (top, FLAG_IS_FLOOR) \|\| QUERY_FLAG (top, FLAG_OVERLAY_FLOOR))	1350	if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) \|\| QUERY_FLAG (tmp, FLAG_OVERLAY_FLOOR))
1375	floor = top;	1351	floor = tmp;
1376		1352
1377	if (QUERY_FLAG (top, FLAG_NO_PICK) && (top->move_type & (MOVE_FLY_LOW \| MOVE_FLY_HIGH)) && !QUERY_FLAG (top, FLAG_IS_FLOOR))	1353	if (QUERY_FLAG (tmp, FLAG_NO_PICK) && (tmp->move_type & (MOVE_FLY_LOW \| MOVE_FLY_HIGH)) && !QUERY_FLAG (tmp, FLAG_IS_FLOOR))
1378	{	1354	{
1379	/* We insert above top, so we want this object below this */	1355	/* We insert above top, so we want this object below this */
1380	top = top->below;	1356	top = tmp->below;
1381	break;	1357	break;
1382	}	1358	}
1383		1359
1384	last = top;	1360	top = tmp;
1385	}	1361	}
1386
1387	/* Don't want top to be NULL, so set it to the last valid object */
1388	top = last;
1389		1362
1390	/* We let update_position deal with figuring out what the space	1363	/* We let update_position deal with figuring out what the space
1391	* looks like instead of lots of conditions here.	1364	* looks like instead of lots of conditions here.
1392	* makes things faster, and effectively the same result.	1365	* makes things faster, and effectively the same result.
1393	*/	1366	*/
…		…
1400	*/	1373	*/
1401	if (!(flag & INS_ON_TOP)	1374	if (!(flag & INS_ON_TOP)
1402	&& ms.flags () & P_BLOCKSVIEW	1375	&& ms.flags () & P_BLOCKSVIEW
1403	&& (op->face && !faces [op->face].visibility))	1376	&& (op->face && !faces [op->face].visibility))
1404	{	1377	{
		1378	object *last;
		1379
1405	for (last = top; last != floor; last = last->below)	1380	for (last = top; last != floor; last = last->below)
1406	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))	1381	if (QUERY_FLAG (last, FLAG_BLOCKSVIEW) && (last->type != EXIT))
1407	break;	1382	break;
1408		1383
1409	/* Check to see if we found the object that blocks view,	1384	/* Check to see if we found the object that blocks view,
…		…
1417	} /* If objects on this space */	1392	} /* If objects on this space */
1418		1393
1419	if (flag & INS_ABOVE_FLOOR_ONLY)	1394	if (flag & INS_ABOVE_FLOOR_ONLY)
1420	top = floor;	1395	top = floor;
1421		1396
1422	/* Top is the object that our object (op) is going to get inserted above.	1397	// insert object above top, or bottom-most if top = 0
1423	*/
1424
1425	/* First object on this space */
1426	if (!top)	1398	if (!top)
1427	{	1399	{
		1400	op->below = 0;
1428	op->above = ms.bot;	1401	op->above = ms.bot;
1429
1430	if (op->above)
1431	op->above->below = op;
1432
1433	op->below = 0;
1434	ms.bot = op;	1402	ms.bot = op;
		1403
		1404	*(op->above ? &op->above->below : &ms.top) = op;
1435	}	1405	}
1436	else	1406	else
1437	{ /* get inserted into the stack above top */	1407	{
1438	op->above = top->above;	1408	op->above = top->above;
1439
1440	if (op->above)
1441	op->above->below = op;	1409	top->above = op;
1442		1410
1443	op->below = top;	1411	op->below = top;
1444	top->above = op;	1412	*(op->above ? &op->above->below : &ms.top) = op;
1445	}	1413	}
		1414	}
1446		1415
1447	if (!op->above)	1416	if (op->is_player ())
1448	ms.top = op;
1449	} /* else not INS_BELOW_ORIGINATOR */
1450
1451	if (op->type == PLAYER)
1452	{	1417	{
1453	op->contr->do_los = 1;	1418	op->contr->do_los = 1;
1454	++op->map->players;	1419	++op->map->players;
1455	op->map->touch ();	1420	op->map->touch ();
1456	}	1421	}
…		…
1471	* be far away from this change and not affected in any way -	1436	* be far away from this change and not affected in any way -
1472	* this should get redone to only look for players within range,	1437	* this should get redone to only look for players within range,
1473	* or just updating the P_UPTODATE for spaces within this area	1438	* or just updating the P_UPTODATE for spaces within this area
1474	* of effect may be sufficient.	1439	* of effect may be sufficient.
1475	*/	1440	*/
1476	if (op->map->darkness && (op->glow_radius != 0))	1441	if (op->affects_los ())
		1442	{
		1443	op->ms ().invalidate ();
1477	update_all_los (op->map, op->x, op->y);	1444	update_all_los (op->map, op->x, op->y);
		1445	}
1478		1446
1479	/* updates flags (blocked, alive, no magic, etc) for this map space */	1447	/* updates flags (blocked, alive, no magic, etc) for this map space */
1480	update_object (op, UP_OBJ_INSERT);	1448	update_object (op, UP_OBJ_INSERT);
1481		1449
1482	INVOKE_OBJECT (INSERT, op);	1450	INVOKE_OBJECT (INSERT, op);
…		…
1489	* blocked() and wall() work properly), and these flags are updated by	1457	* blocked() and wall() work properly), and these flags are updated by
1490	* update_object().	1458	* update_object().
1491	*/	1459	*/
1492		1460
1493	/* if this is not the head or flag has been passed, don't check walk on status */	1461	/* if this is not the head or flag has been passed, don't check walk on status */
1494	if (!(flag & INS_NO_WALK_ON) && op->head_ () == op)	1462	if (!(flag & INS_NO_WALK_ON) && op->is_head ())
1495	{	1463	{
1496	if (check_move_on (op, originator))	1464	if (check_move_on (op, originator))
1497	return 0;	1465	return 0;
1498		1466
1499	/* If we are a multi part object, lets work our way through the check	1467	/* If we are a multi part object, lets work our way through the check
…		…
1510	/* this function inserts an object in the map, but if it	1478	/* this function inserts an object in the map, but if it
1511	* finds an object of its own type, it'll remove that one first.	1479	* finds an object of its own type, it'll remove that one first.
1512	* op is the object to insert it under: supplies x and the map.	1480	* op is the object to insert it under: supplies x and the map.
1513	*/	1481	*/
1514	void	1482	void
1515	replace_insert_ob_in_map (const char arch_string, object op)	1483	replace_insert_ob_in_map (shstr_tmp archname, object *op)
1516	{	1484	{
1517	/* first search for itself and remove any old instances */	1485	/* first search for itself and remove any old instances */
1518		1486
1519	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)	1487	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1520	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */	1488	if (tmp->arch->archname == archname) /* same archetype */
1521	tmp->destroy (1);	1489	tmp->destroy ();
1522		1490
1523	object *tmp = arch_to_object (archetype::find (arch_string));	1491	object *tmp = arch_to_object (archetype::find (archname));
1524		1492
1525	tmp->x = op->x;	1493	tmp->x = op->x;
1526	tmp->y = op->y;	1494	tmp->y = op->y;
1527		1495
1528	insert_ob_in_map (tmp, op->map, op, 0);	1496	insert_ob_in_map (tmp, op->map, op, 0);
…		…
1550	if (!nr)	1518	if (!nr)
1551	return true;	1519	return true;
1552		1520
1553	nr = min (nr, nrof);	1521	nr = min (nr, nrof);
1554		1522
		1523	if (nrof > nr)
		1524	{
1555	nrof -= nr;	1525	nrof -= nr;
1556
1557	if (nrof)
1558	{
1559	adjust_weight (env, -weight * nr); // carrying == 0	1526	adjust_weight (env, -weight * max (1, nr)); // carrying == 0
1560		1527
1561	if (object *pl = visible_to ())	1528	if (object *pl = visible_to ())
1562	esrv_update_item (UPD_NROF, pl, this);	1529	esrv_update_item (UPD_NROF, pl, this);
1563		1530
1564	return true;	1531	return true;
1565	}	1532	}
1566	else	1533	else
1567	{	1534	{
1568	destroy (1);	1535	destroy ();
1569	return false;	1536	return false;
1570	}	1537	}
1571	}	1538	}
1572		1539
1573	/*	1540	/*
…		…
1650	if (object *pl = tmp->visible_to ())	1617	if (object *pl = tmp->visible_to ())
1651	esrv_update_item (UPD_NROF, pl, tmp);	1618	esrv_update_item (UPD_NROF, pl, tmp);
1652		1619
1653	adjust_weight (this, op->total_weight ());	1620	adjust_weight (this, op->total_weight ());
1654		1621
1655	op->destroy (1);	1622	op->destroy ();
1656	op = tmp;	1623	op = tmp;
1657	goto inserted;	1624	goto inserted;
1658	}	1625	}
1659		1626
1660	op->owner = 0; // it's his/hers now. period.	1627	op->owner = 0; // it's his/hers now. period.
…		…
1678		1645
1679	adjust_weight (this, op->total_weight ());	1646	adjust_weight (this, op->total_weight ());
1680		1647
1681	inserted:	1648	inserted:
1682	/* reset the light list and los of the players on the map */	1649	/* reset the light list and los of the players on the map */
1683	if (op->glow_radius && map && map->darkness)	1650	if (op->glow_radius && is_on_map ())
		1651	{
		1652	update_stats ();
1684	update_all_los (map, x, y);	1653	update_all_los (map, x, y);
1685		1654	}
		1655	else if (is_player () && !flag [FLAG_NO_FIX_PLAYER])
1686	// if this is a player's inventory, update stats	1656	// if this is a player's inventory, update stats
1687	if (type == PLAYER && !flag [FLAG_NO_FIX_PLAYER])
1688	update_stats ();	1657	update_stats ();
1689		1658
1690	INVOKE_OBJECT (INSERT, this);	1659	INVOKE_OBJECT (INSERT, this);
1691		1660
1692	return op;	1661	return op;
…		…
1713	* on top.	1682	* on top.
1714	*/	1683	*/
1715	int	1684	int
1716	check_move_on (object op, object originator)	1685	check_move_on (object op, object originator)
1717	{	1686	{
		1687	if (QUERY_FLAG (op, FLAG_NO_APPLY))
		1688	return 0;
		1689
1718	object *tmp;	1690	object *tmp;
1719	maptile *m = op->map;	1691	maptile *m = op->map;
1720	int x = op->x, y = op->y;	1692	int x = op->x, y = op->y;
1721		1693
1722	MoveType move_on, move_slow, move_block;	1694	mapspace &ms = m->at (x, y);
1723		1695
1724	if (QUERY_FLAG (op, FLAG_NO_APPLY))	1696	ms.update ();
1725	return 0;
1726		1697
1727	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);	1698	MoveType move_on = ms.move_on;
1728	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);	1699	MoveType move_slow = ms.move_slow;
1729	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);	1700	MoveType move_block = ms.move_block;
1730		1701
1731	/* if nothing on this space will slow op down or be applied,	1702	/* if nothing on this space will slow op down or be applied,
1732	* no need to do checking below. have to make sure move_type	1703	* no need to do checking below. have to make sure move_type
1733	* is set, as lots of objects don't have it set - we treat that	1704	* is set, as lots of objects don't have it set - we treat that
1734	* as walking.	1705	* as walking.
…		…
1745	return 0;	1716	return 0;
1746		1717
1747	/* The objects have to be checked from top to bottom.	1718	/* The objects have to be checked from top to bottom.
1748	* Hence, we first go to the top:	1719	* Hence, we first go to the top:
1749	*/	1720	*/
1750		1721	for (object next, tmp = ms.top; tmp; tmp = next)
1751	for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above)
1752	{
1753	/* Trim the search when we find the first other spell effect
1754	* this helps performance so that if a space has 50 spell objects,
1755	* we don't need to check all of them.
1756	*/
1757	if ((tmp->move_type & MOVE_FLY_LOW) && QUERY_FLAG (tmp, FLAG_NO_PICK))
1758	break;
1759	}	1722	{
		1723	next = tmp->below;
1760		1724
1761	for (; tmp; tmp = tmp->below)
1762	{
1763	if (tmp == op)	1725	if (tmp == op)
1764	continue; /* Can't apply yourself */	1726	continue; /* Can't apply yourself */
1765		1727
1766	/* Check to see if one of the movement types should be slowed down.	1728	/* Check to see if one of the movement types should be slowed down.
1767	* Second check makes sure that the movement types not being slowed	1729	* Second check makes sure that the movement types not being slowed
…		…
1772	if (!QUERY_FLAG (op, FLAG_WIZPASS))	1734	if (!QUERY_FLAG (op, FLAG_WIZPASS))
1773	{	1735	{
1774	if ((!op->move_type && tmp->move_slow & MOVE_WALK) \|\|	1736	if ((!op->move_type && tmp->move_slow & MOVE_WALK) \|\|
1775	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))	1737	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1776	{	1738	{
1777
1778	float
1779	diff = tmp->move_slow_penalty * fabs (op->speed);	1739	float diff = tmp->move_slow_penalty * fabs (op->speed);
1780		1740
1781	if (op->type == PLAYER)	1741	if (op->is_player ())
1782	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) \|\|	1742	if ((tmp->flag [FLAG_IS_HILLY ] && find_skill_by_number (op, SK_CLIMBING)) \|\|
1783	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))	1743	(tmp->flag [FLAG_IS_WOODED] && find_skill_by_number (op, SK_WOODSMAN)))
1784	diff /= 4.0;	1744	diff /= 4.0;
1785		1745
1786	op->speed_left -= diff;	1746	op->speed_left -= diff;
1787	}	1747	}
1788	}	1748	}
…		…
1994	* head of the object should correspond for the entire object.	1954	* head of the object should correspond for the entire object.
1995	*/	1955	*/
1996	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))	1956	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
1997	continue;	1957	continue;
1998		1958
1999	if (ob->blocked (m, pos.x, pos.y))	1959	if (ob->blocked (pos.m, pos.x, pos.y))
2000	continue;	1960	continue;
2001		1961
2002	altern [index++] = i;	1962	altern [index++] = i;
2003	}	1963	}
2004		1964
…		…
2072	* there is capable of.	2032	* there is capable of.
2073	*/	2033	*/
2074	int	2034	int
2075	find_dir (maptile m, int x, int y, object exclude)	2035	find_dir (maptile m, int x, int y, object exclude)
2076	{	2036	{
2077	int i, max = SIZEOFFREE, mflags;	2037	int max = SIZEOFFREE, mflags;
2078
2079	sint16 nx, ny;
2080	object *tmp;
2081	maptile *mp;
2082
2083	MoveType blocked, move_type;	2038	MoveType move_type;
2084		2039
2085	if (exclude && exclude->head_ () != exclude)	2040	if (exclude && exclude->head_ () != exclude)
2086	{	2041	{
2087	exclude = exclude->head;	2042	exclude = exclude->head;
2088	move_type = exclude->move_type;	2043	move_type = exclude->move_type;
…		…
2091	{	2046	{
2092	/* If we don't have anything, presume it can use all movement types. */	2047	/* If we don't have anything, presume it can use all movement types. */
2093	move_type = MOVE_ALL;	2048	move_type = MOVE_ALL;
2094	}	2049	}
2095		2050
2096	for (i = 1; i < max; i++)	2051	for (int i = 1; i < max; i++)
2097	{	2052	{
2098	mp = m;	2053	mapxy pos (m, x, y);
2099	nx = x + freearr_x[i];	2054	pos.move (i);
2100	ny = y + freearr_y[i];
2101		2055
2102	mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);	2056	if (!pos.normalise ())
2103
2104	if (mflags & P_OUT_OF_MAP)
2105	max = maxfree[i];	2057	max = maxfree[i];
2106	else	2058	else
2107	{	2059	{
2108	mapspace &ms = mp->at (nx, ny);	2060	mapspace &ms = *pos;
2109		2061
2110	blocked = ms.move_block;
2111
2112	if ((move_type & blocked) == move_type)	2062	if ((move_type & ms.move_block) == move_type)
2113	max = maxfree[i];	2063	max = maxfree [i];
2114	else if (mflags & P_IS_ALIVE)	2064	else if (ms.flags () & P_IS_ALIVE)
2115	{	2065	{
2116	for (tmp = ms.bot; tmp; tmp = tmp->above)	2066	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
2117	if ((tmp->flag [FLAG_MONSTER] \|\| tmp->type == PLAYER)	2067	if ((tmp->flag [FLAG_MONSTER] \|\| tmp->is_player ())
2118	&& (tmp != exclude \|\| (tmp->head_ () != tmp && tmp->head_ () != exclude)))	2068	&& (tmp != exclude \|\| (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2119	break;
2120
2121	if (tmp)
2122	return freedir[i];	2069	return freedir [i];
2123	}	2070	}
2124	}	2071	}
2125	}	2072	}
2126		2073
2127	return 0;	2074	return 0;
…		…
2202	* This basically means that if direction is 15, then it could either go	2149	* This basically means that if direction is 15, then it could either go
2203	* direction 4, 14, or 16 to get back to where we are.	2150	* direction 4, 14, or 16 to get back to where we are.
2204	* Moved from spell_util.c to object.c with the other related direction	2151	* Moved from spell_util.c to object.c with the other related direction
2205	* functions.	2152	* functions.
2206	*/	2153	*/
2207	int reduction_dir[SIZEOFFREE][3] = {	2154	static const int reduction_dir[SIZEOFFREE][3] = {
2208	{0, 0, 0}, /* 0 */	2155	{0, 0, 0}, /* 0 */
2209	{0, 0, 0}, /* 1 */	2156	{0, 0, 0}, /* 1 */
2210	{0, 0, 0}, /* 2 */	2157	{0, 0, 0}, /* 2 */
2211	{0, 0, 0}, /* 3 */	2158	{0, 0, 0}, /* 3 */
2212	{0, 0, 0}, /* 4 */	2159	{0, 0, 0}, /* 4 */
…		…
2308	int	2255	int
2309	can_pick (const object who, const object item)	2256	can_pick (const object who, const object item)
2310	{	2257	{
2311	return /QUERY_FLAG(who,FLAG_WIZ)\|\| /	2258	return /QUERY_FLAG(who,FLAG_WIZ)\|\| /
2312	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&	2259	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
2313	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER \|\| item->weight < who->weight / 3));	2260	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->is_player () \|\| item->weight < who->weight / 3));
2314	}	2261	}
2315		2262
2316	/*	2263	/*
2317	* create clone from object to another	2264	* create clone from object to another
2318	*/	2265	*/
…		…
2350	return tmp;	2297	return tmp;
2351		2298
2352	return 0;	2299	return 0;
2353	}	2300	}
2354		2301
2355	const shstr &	2302	shstr_tmp
2356	object::kv_get (const shstr &key) const	2303	object::kv_get (shstr_tmp key) const
2357	{	2304	{
2358	for (key_value *kv = key_values; kv; kv = kv->next)	2305	for (key_value *kv = key_values; kv; kv = kv->next)
2359	if (kv->key == key)	2306	if (kv->key == key)
2360	return kv->value;	2307	return kv->value;
2361		2308
2362	return shstr_null;	2309	return shstr ();
2363	}	2310	}
2364		2311
2365	void	2312	void
2366	object::kv_set (const shstr &key, const shstr &value)	2313	object::kv_set (shstr_tmp key, shstr_tmp value)
2367	{	2314	{
2368	for (key_value *kv = key_values; kv; kv = kv->next)	2315	for (key_value *kv = key_values; kv; kv = kv->next)
2369	if (kv->key == key)	2316	if (kv->key == key)
2370	{	2317	{
2371	kv->value = value;	2318	kv->value = value;
…		…
2380		2327
2381	key_values = kv;	2328	key_values = kv;
2382	}	2329	}
2383		2330
2384	void	2331	void
2385	object::kv_del (const shstr &key)	2332	object::kv_del (shstr_tmp key)
2386	{	2333	{
2387	for (key_value *kvp = &key_values; kvp; kvp = &(*kvp)->next)	2334	for (key_value *kvp = &key_values; kvp; kvp = &(*kvp)->next)
2388	if ((*kvp)->key == key)	2335	if ((*kvp)->key == key)
2389	{	2336	{
2390	key_value kv = kvp;	2337	key_value kv = kvp;
…		…
2449	{	2396	{
2450	char flagdesc[512];	2397	char flagdesc[512];
2451	char info2[256 * 4];	2398	char info2[256 * 4];
2452	char *p = info;	2399	char *p = info;
2453		2400
2454	p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s,flags:[%s],type:%d}",	2401	p += snprintf (p, 512, "{cnt:%d,uuid:%s,name:\"%s\"%s%s%s,flags:[%s],type:%d}",
2455	count,	2402	count,
2456	uuid.c_str (),	2403	uuid.c_str (),
2457	&name,	2404	&name,
2458	title ? "\",title:\"" : "",	2405	title ? ",title:\"" : "",
2459	title ? (const char *)title : "",	2406	title ? (const char *)title : "",
		2407	title ? "\"" : "",
2460	flag_desc (flagdesc, 512), type);	2408	flag_desc (flagdesc, 512), type);
2461		2409
2462	if (!flag[FLAG_REMOVED] && env)	2410	if (!flag[FLAG_REMOVED] && env)
2463	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));	2411	p += snprintf (p, 256, "(in %s)", env->debug_desc (info2));
2464		2412
…		…
2520	container = 0;	2468	container = 0;
2521		2469
2522	// client needs item update to make it work, client bug requires this to be separate	2470	// client needs item update to make it work, client bug requires this to be separate
2523	esrv_update_item (UPD_FLAGS, this, old_container);	2471	esrv_update_item (UPD_FLAGS, this, old_container);
2524		2472
2525	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));	2473	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", old_container->query_name ());
2526	play_sound (sound_find ("chest_close"));	2474	play_sound (sound_find ("chest_close"));
2527	}	2475	}
2528		2476
2529	if (new_container)	2477	if (new_container)
2530	{	2478	{
…		…
2540	closer->flag [FLAG_NO_MAP_SAVE] = 1;	2488	closer->flag [FLAG_NO_MAP_SAVE] = 1;
2541	new_container->insert (closer);	2489	new_container->insert (closer);
2542	}	2490	}
2543	#endif	2491	#endif
2544		2492
2545	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));	2493	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", new_container->query_name ());
2546		2494
2547	// make sure the container is available, client bug requires this to be separate	2495	// make sure the container is available, client bug requires this to be separate
2548	esrv_send_item (this, new_container);	2496	esrv_send_item (this, new_container);
2549		2497
2550	new_container->flag [FLAG_APPLIED] = true;	2498	new_container->flag [FLAG_APPLIED] = true;
…		…
2558	// else if (!old_container->env && contr && contr->ns)	2506	// else if (!old_container->env && contr && contr->ns)
2559	// contr->ns->floorbox_reset ();	2507	// contr->ns->floorbox_reset ();
2560	}	2508	}
2561		2509
2562	object *	2510	object *
2563	object::force_find (const shstr name)	2511	object::force_find (shstr_tmp name)
2564	{	2512	{
2565	/* cycle through his inventory to look for the MARK we want to	2513	/* cycle through his inventory to look for the MARK we want to
2566	* place	2514	* place
2567	*/	2515	*/
2568	for (object *tmp = inv; tmp; tmp = tmp->below)	2516	for (object *tmp = inv; tmp; tmp = tmp->below)
…		…
2570	return splay (tmp);	2518	return splay (tmp);
2571		2519
2572	return 0;	2520	return 0;
2573	}	2521	}
2574		2522
		2523	//-GPL
		2524
2575	void	2525	void
		2526	object::force_set_timer (int duration)
		2527	{
		2528	this->duration = 1;
		2529	this->speed_left = -1.f;
		2530
		2531	this->set_speed (duration ? 1.f / duration : 0.f);
		2532	}
		2533
		2534	object *
2576	object::force_add (const shstr name, int duration)	2535	object::force_add (shstr_tmp name, int duration)
2577	{	2536	{
2578	if (object *force = force_find (name))	2537	if (object *force = force_find (name))
2579	force->destroy ();	2538	force->destroy ();
2580		2539
2581	object *force = get_archetype (FORCE_NAME);	2540	object *force = get_archetype (FORCE_NAME);
2582		2541
2583	force->slaying = name;	2542	force->slaying = name;
2584	force->stats.food = 1;	2543	force->force_set_timer (duration);
2585	force->speed_left = -1.f;
2586
2587	force->set_speed (duration ? 1.f / duration : 0.f);
2588	force->flag [FLAG_IS_USED_UP] = true;
2589	force->flag [FLAG_APPLIED] = true;	2544	force->flag [FLAG_APPLIED] = true;
2590		2545
2591	insert (force);	2546	return insert (force);
2592	}	2547	}
2593		2548
2594	void	2549	void
2595	object::play_sound (faceidx sound)	2550	object::play_sound (faceidx sound) const
2596	{	2551	{
2597	if (!sound)	2552	if (!sound)
2598	return;	2553	return;
2599		2554
2600	if (flag [FLAG_REMOVED])	2555	if (is_on_map ())
		2556	map->play_sound (sound, x, y);
		2557	else if (object *pl = in_player ())
		2558	pl->contr->play_sound (sound);
		2559	}
		2560
		2561	void
		2562	object::say_msg (const char *msg) const
		2563	{
		2564	if (is_on_map ())
		2565	map->say_msg (msg, x, y);
		2566	else if (object *pl = in_player ())
		2567	pl->contr->play_sound (sound);
		2568	}
		2569
		2570	void
		2571	object::make_noise ()
		2572	{
		2573	// we do not model noise in the map, so instead put
		2574	// a temporary light into the noise source
		2575	// could use the map instead, but that's less reliable for our
		2576	// goal, which is to make invisibility a bit harder to exploit
		2577
		2578	// currently only works sensibly for players
		2579	if (!is_player ())
2601	return;	2580	return;
2602		2581
2603	if (env)	2582	// find old force, or create new one
2604	{	2583	object *force = force_find (shstr_noise_force);
2605	if (object *pl = in_player ())	2584
2606	pl->contr->play_sound (sound);	2585	if (force)
2607	}	2586	force->speed_left = -1.f; // patch old speed up
2608	else	2587	else
2609	map->play_sound (sound, x, y);	2588	{
2610	}	2589	force = archetype::get (shstr_noise_force);
2611		2590
		2591	force->slaying = shstr_noise_force;
		2592	force->stats.food = 1;
		2593	force->speed_left = -1.f;
		2594
		2595	force->set_speed (1.f / 4.f);
		2596	force->flag [FLAG_IS_USED_UP] = true;
		2597	force->flag [FLAG_APPLIED] = true;
		2598
		2599	insert (force);
		2600	}
		2601	}
		2602

Diff Legend

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

Comparing deliantra/server/common/object.C (file contents): Revision 1.233 by root, Tue May 6 18:47:32 2008 UTC vs. Revision 1.298 by root, Sun Nov 8 00:01:33 2009 UTC

Diff Legend

Comparing deliantra/server/common/object.C (file contents):
Revision 1.233 by root, Tue May 6 18:47:32 2008 UTC vs.
Revision 1.298 by root, Sun Nov 8 00:01:33 2009 UTC