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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.247 by root, Mon Jul 14 18:36:43 2008 UTC vs.
Revision 1.296 by root, Fri Nov 6 13:31:47 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	{
…		…
186	\|\| ob1->speed != ob2->speed	191	\|\| ob1->speed != ob2->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
…		…
235	\|\| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats)))	237	\|\| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats)))
236	return 0;	238	return 0;
237		239
238	if ((ob1->flag ^ ob2->flag)	240	if ((ob1->flag ^ ob2->flag)
239	.reset (FLAG_INV_LOCKED)	241	.reset (FLAG_INV_LOCKED)
240	.reset (FLAG_CLIENT_SENT)
241	.reset (FLAG_REMOVED)	242	.reset (FLAG_REMOVED)
242	.any ())	243	.any ())
243	return 0;	244	return 0;
244		245
245	/* This is really a spellbook check - we should in general	246	/* This is really a spellbook check - we should in general
…		…
327	{	328	{
328	// see if we are in a container of sorts	329	// see if we are in a container of sorts
329	if (env)	330	if (env)
330	{	331	{
331	// the player inventory itself is always visible	332	// the player inventory itself is always visible
332	if (env->type == PLAYER)	333	if (env->is_player ())
333	return env;	334	return env;
334		335
335	// else a player could have our env open	336	// else a player could have our env open
336	object *envest = env->outer_env ();	337	object *envest = env->outer_env_or_self ();
337		338
338	// 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
339	// even if our inv is in a player.	340	// even if our inv is in a player.
340	if (envest->is_on_map ())	341	if (envest->is_on_map ())
341	if (object *pl = envest->ms ().player ())	342	if (object *pl = envest->ms ().player ())
342	if (pl->container == env)	343	if (pl->container_ () == env)
343	return pl;	344	return pl;
344	}	345	}
345	else	346	else
346	{	347	{
347	// maybe there is a player standing on the same mapspace	348	// maybe there is a player standing on the same mapspace
348	// this will catch the case where "this" is a player	349	// this will catch the case where "this" is a player
349	if (object *pl = ms ().player ())	350	if (object *pl = ms ().player ())
350	if (!pl->container \|\| this == pl->container)	351	if ((pl->contr->ns && !pl->container_ () && !pl->contr->ns->update_look)
		352	\|\| pl->container_ () == this)
351	return pl;	353	return pl;
352	}	354	}
353	}	355	}
354		356
355	return 0;	357	return 0;
…		…
433	object_freezer freezer;	435	object_freezer freezer;
434	op->write (freezer);	436	op->write (freezer);
435	return freezer.as_string ();	437	return freezer.as_string ();
436	}	438	}
437		439
438	/*	440	char *
439	* get_nearest_part(multi-object, object 2) returns the part of the	441	object::as_string ()
440	* multi-object 1 which is closest to the second object.
441	* If it's not a multi-object, it is returned.
442	*/
443	object *
444	get_nearest_part (object op, const object pl)
445	{	442	{
446	object tmp, closest;	443	return dump_object (this);
447	int last_dist, i;
448
449	if (!op->more)
450	return op;
451
452	for (last_dist = distance (op, pl), closest = op, tmp = op->more;
453	tmp;
454	tmp = tmp->more)
455	if ((i = distance (tmp, pl)) < last_dist)
456	closest = tmp, last_dist = i;
457
458	return closest;
459	}	444	}
460		445
461	/*	446	/*
462	* 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.
463	* VERRRY slow.	448	* VERRRY slow.
…		…
557	update_stats ();	542	update_stats ();
558		543
559	new_draw_info_format (NDI_UNIQUE, 0, this,	544	new_draw_info_format (NDI_UNIQUE, 0, this,
560	"You try to balance all your items at once, "	545	"You try to balance all your items at once, "
561	"but the %s is just too much for your body. "	546	"but the %s is just too much for your body. "
562	"[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);
563	return false;	549	return false;
564	}	550	}
565		551
566	//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);
567	}	553	}
…		…
639	}	625	}
640		626
641	if (speed < 0)	627	if (speed < 0)
642	dst->speed_left -= rndm ();	628	dst->speed_left -= rndm ();
643		629
644	dst->set_speed (dst->speed);	630	dst->activate ();
645	}	631	}
646		632
647	void	633	void
648	object::instantiate ()	634	object::instantiate ()
649	{	635	{
…		…
761	else if (action == UP_OBJ_INSERT)	747	else if (action == UP_OBJ_INSERT)
762	{	748	{
763	// this is likely overkill, TODO: revisit (schmorp)	749	// this is likely overkill, TODO: revisit (schmorp)
764	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))	750	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
765	\|\| (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))	751	\|\| (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))
766	\|\| (op->type == PLAYER && !(m.flags_ & P_PLAYER))	752	\|\| (op->is_player () && !(m.flags_ & P_PLAYER))
767	\|\| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))	753	\|\| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
768	\|\| (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))	754	\|\| (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))
769	\|\| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))	755	\|\| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))
770	\|\| (m.move_on \| op->move_on ) != m.move_on	756	\|\| (m.move_on \| op->move_on ) != m.move_on
771	\|\| (m.move_off \| op->move_off ) != m.move_off	757	\|\| (m.move_off \| op->move_off ) != m.move_off
772	\|\| (m.move_slow \| op->move_slow) != m.move_slow	758	\|\| (m.move_slow \| op->move_slow) != m.move_slow
773	/* This isn't perfect, but I don't expect a lot of objects to	759	/* This isn't perfect, but I don't expect a lot of objects to
774	* to have move_allow right now.	760	* have move_allow right now.
775	*/	761	*/
776	\|\| ((m.move_block \| op->move_block) & ~op->move_allow) != m.move_block	762	\|\| ((m.move_block \| op->move_block) & ~op->move_allow) != m.move_block
777	\|\| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)	763	\|\| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)
778	m.flags_ = 0;	764	m.invalidate ();
779	}	765	}
780	/* if the object is being removed, we can't make intelligent	766	/* if the object is being removed, we can't make intelligent
781	* decisions, because remove_ob can't really pass the object	767	* decisions, because remove_ob can't really pass the object
782	* that is being removed.	768	* that is being removed.
783	*/	769	*/
784	else if (action == UP_OBJ_CHANGE \|\| action == UP_OBJ_REMOVE)	770	else if (action == UP_OBJ_CHANGE \|\| action == UP_OBJ_REMOVE)
785	m.flags_ = 0;	771	m.invalidate ();
786	else if (action == UP_OBJ_FACE)	772	else if (action == UP_OBJ_FACE)
787	/* Nothing to do for that case */ ;	773	/* Nothing to do for that case */ ;
788	else	774	else
789	LOG (llevError, "update_object called with invalid action: %d\n", action);	775	LOG (llevError, "update_object called with invalid action: %d\n", action);
790		776
…		…
794		780
795	object::object ()	781	object::object ()
796	{	782	{
797	SET_FLAG (this, FLAG_REMOVED);	783	SET_FLAG (this, FLAG_REMOVED);
798		784
799	expmul = 1.0;	785	//expmul = 1.0; declared const for the time being
800	face = blank_face;	786	face = blank_face;
801	}	787	}
802		788
803	object::~object ()	789	object::~object ()
804	{	790	{
…		…
834	/* If already on active list, don't do anything */	820	/* If already on active list, don't do anything */
835	if (active)	821	if (active)
836	return;	822	return;
837		823
838	if (has_active_speed ())	824	if (has_active_speed ())
		825	{
		826	if (flag [FLAG_FREED])
		827	LOG (llevError \| logBacktrace, "BUG: tried to activate freed object %s\n", debug_desc ());//D
		828
839	actives.insert (this);	829	actives.insert (this);
		830	}
840	}	831	}
841		832
842	void	833	void
843	object::activate_recursive ()	834	object::activate_recursive ()
844	{	835	{
…		…
909	\|\| map->in_memory != MAP_ACTIVE	900	\|\| map->in_memory != MAP_ACTIVE
910	\|\| map->no_drop	901	\|\| map->no_drop
911	\|\| ms ().move_block == MOVE_ALL)	902	\|\| ms ().move_block == MOVE_ALL)
912	{	903	{
913	while (inv)	904	while (inv)
914	{
915	inv->destroy_inv (false);
916	inv->destroy ();	905	inv->destroy ();
917	}
918	}	906	}
919	else	907	else
920	{ /* Put objects in inventory onto this space */	908	{ /* Put objects in inventory onto this space */
921	while (inv)	909	while (inv)
922	{	910	{
…		…
926	\|\| op->flag [FLAG_NO_DROP]	914	\|\| op->flag [FLAG_NO_DROP]
927	\|\| op->type == RUNE	915	\|\| op->type == RUNE
928	\|\| op->type == TRAP	916	\|\| op->type == TRAP
929	\|\| op->flag [FLAG_IS_A_TEMPLATE]	917	\|\| op->flag [FLAG_IS_A_TEMPLATE]
930	\|\| op->flag [FLAG_DESTROY_ON_DEATH])	918	\|\| op->flag [FLAG_DESTROY_ON_DEATH])
931	op->destroy (true);	919	op->destroy ();
932	else	920	else
933	map->insert (op, x, y);	921	map->insert (op, x, y);
934	}	922	}
935	}	923	}
936	}	924	}
…		…
965		953
966	void	954	void
967	object::do_destroy ()	955	object::do_destroy ()
968	{	956	{
969	if (flag [FLAG_IS_LINKED])	957	if (flag [FLAG_IS_LINKED])
970	remove_button_link (this);	958	remove_link ();
971		959
972	if (flag [FLAG_FRIENDLY])	960	if (flag [FLAG_FRIENDLY])
973	remove_friendly_object (this);	961	remove_friendly_object (this);
974		962
975	remove ();	963	remove ();
…		…
1000	attacked_by = 0;	988	attacked_by = 0;
1001	current_weapon = 0;	989	current_weapon = 0;
1002	}	990	}
1003		991
1004	void	992	void
1005	object::destroy (bool destroy_inventory)	993	object::destroy ()
1006	{	994	{
1007	if (destroyed ())	995	if (destroyed ())
1008	return;	996	return;
1009		997
1010	if (!is_head () && !head->destroyed ())	998	if (!is_head () && !head->destroyed ())
1011	{	999	{
1012	LOG (llevError \| logBacktrace, "tried to destroy the tail of an object");	1000	LOG (llevError \| logBacktrace, "tried to destroy the tail of an object");
1013	head->destroy (destroy_inventory);	1001	head->destroy ();
1014	return;	1002	return;
1015	}	1003	}
1016		1004
1017	destroy_inv (!destroy_inventory);	1005	destroy_inv (false);
1018		1006
1019	if (is_head ())	1007	if (is_head ())
1020	if (sound_destroy)	1008	if (sound_destroy)
1021	play_sound (sound_destroy);	1009	play_sound (sound_destroy);
1022	else if (flag [FLAG_MONSTER])	1010	else if (flag [FLAG_MONSTER])
…		…
1033	* the previous environment.	1021	* the previous environment.
1034	*/	1022	*/
1035	void	1023	void
1036	object::do_remove ()	1024	object::do_remove ()
1037	{	1025	{
1038	object tmp, last = 0;
1039	object *otmp;
1040
1041	if (flag [FLAG_REMOVED])	1026	if (flag [FLAG_REMOVED])
1042	return;	1027	return;
1043		1028
1044	INVOKE_OBJECT (REMOVE, this);	1029	INVOKE_OBJECT (REMOVE, this);
1045		1030
…		…
1058	if (object *pl = visible_to ())	1043	if (object *pl = visible_to ())
1059	esrv_del_item (pl->contr, count);	1044	esrv_del_item (pl->contr, count);
1060	flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed	1045	flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed
1061		1046
1062	adjust_weight (env, -total_weight ());	1047	adjust_weight (env, -total_weight ());
		1048
		1049	object *pl = in_player ();
1063		1050
1064	/* we set up values so that it could be inserted into	1051	/* we set up values so that it could be inserted into
1065	* the map, but we don't actually do that - it is up	1052	* the map, but we don't actually do that - it is up
1066	* to the caller to decide what we want to do.	1053	* to the caller to decide what we want to do.
1067	*/	1054	*/
…		…
1079		1066
1080	/* NO_FIX_PLAYER is set when a great many changes are being	1067	/* NO_FIX_PLAYER is set when a great many changes are being
1081	* made to players inventory. If set, avoiding the call	1068	* made to players inventory. If set, avoiding the call
1082	* to save cpu time.	1069	* to save cpu time.
1083	*/	1070	*/
1084	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1071	if (pl)
		1072	if (pl->is_player () && (glow_radius \|\| !QUERY_FLAG (pl, FLAG_NO_FIX_PLAYER)))
		1073	{
1085	otmp->update_stats ();	1074	pl->update_stats ();
		1075
		1076	if (glow_radius && pl->is_on_map ())
		1077	update_all_los (pl->map, pl->x, pl->y);
		1078	}
1086	}	1079	}
1087	else if (map)	1080	else if (map)
1088	{	1081	{
1089	map->dirty = true;	1082	map->dirty = true;
1090	mapspace &ms = this->ms ();	1083	mapspace &ms = this->ms ();
1091		1084
1092	if (object *pl = ms.player ())	1085	if (object *pl = ms.player ())
1093	{	1086	{
1094	if (type == PLAYER) // this == pl(!)	1087	if (is_player ())
1095	{	1088	{
		1089	if (!flag [FLAG_WIZPASS])
		1090	ms.smell = ++mapspace::smellcount; // remember the smell of the player
		1091
1096	// leaving a spot always closes any open container on the ground	1092	// leaving a spot always closes any open container on the ground
1097	if (container && !container->env)	1093	if (container && !container->env)
1098	// this causes spurious floorbox updates, but it ensures	1094	// this causes spurious floorbox updates, but it ensures
1099	// that the CLOSE event is being sent.	1095	// that the CLOSE event is being sent.
1100	close_container ();	1096	close_container ();
1101		1097
1102	--map->players;	1098	--map->players;
1103	map->touch ();	1099	map->touch ();
1104	}	1100	}
1105	else if (pl->container == this)	1101	else if (pl->container_ () == this)
1106	{	1102	{
1107	// removing a container should close it	1103	// removing a container should close it
1108	close_container ();	1104	close_container ();
1109	}	1105	}
1110		1106
…		…
1117	*(below ? &below->above : &ms.bot) = above;	1113	*(below ? &below->above : &ms.bot) = above;
1118		1114
1119	above = 0;	1115	above = 0;
1120	below = 0;	1116	below = 0;
1121		1117
		1118	ms.invalidate ();
		1119
1122	if (map->in_memory == MAP_SAVING)	1120	if (map->in_memory == MAP_SAVING)
1123	return;	1121	return;
1124		1122
1125	int check_walk_off = !flag [FLAG_NO_APPLY];	1123	int check_walk_off = !flag [FLAG_NO_APPLY];
1126		1124
1127	if (object *pl = ms.player ())	1125	if (object *pl = ms.player ())
1128	{	1126	{
1129	if (pl->container == this)	1127	if (pl->container_ () == this)
1130	/* If a container that the player is currently using somehow gets	1128	/* If a container that the player is currently using somehow gets
1131	* removed (most likely destroyed), update the player view	1129	* removed (most likely destroyed), update the player view
1132	* appropriately.	1130	* appropriately.
1133	*/	1131	*/
1134	pl->close_container ();	1132	pl->close_container ();
…		…
1138	//TODO: update floorbox to preserve ordering	1136	//TODO: update floorbox to preserve ordering
1139	if (pl->contr->ns)	1137	if (pl->contr->ns)
1140	pl->contr->ns->floorbox_update ();	1138	pl->contr->ns->floorbox_update ();
1141	}	1139	}
1142		1140
		1141	if (check_walk_off)
1143	for (tmp = ms.bot; tmp; tmp = tmp->above)	1142	for (object above, tmp = ms.bot; tmp; tmp = above)
1144	{	1143	{
		1144	above = tmp->above;
		1145
1145	/* No point updating the players look faces if he is the object	1146	/* No point updating the players look faces if he is the object
1146	* being removed.	1147	* being removed.
1147	*/	1148	*/
1148		1149
1149	/* See if object moving off should effect something */	1150	/* See if object moving off should effect something */
1150	if (check_walk_off
1151	&& ((move_type & tmp->move_off)	1151	if ((move_type & tmp->move_off)
1152	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))	1152	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0)
1153	{
1154	move_apply (tmp, this, 0);	1153	move_apply (tmp, this, 0);
1155
1156	if (destroyed ())
1157	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1158	}	1154	}
1159		1155
1160	last = tmp;	1156	if (affects_los ())
1161	}
1162
1163	/* last == NULL if there are no objects on this space */
1164	//TODO: this makes little sense, why only update the topmost object?
1165	if (!last)
1166	map->at (x, y).flags_ = 0;
1167	else
1168	update_object (last, UP_OBJ_REMOVE);
1169
1170	if (flag [FLAG_BLOCKSVIEW] \|\| glow_radius)
1171	update_all_los (map, x, y);	1157	update_all_los (map, x, y);
1172	}	1158	}
1173	}	1159	}
1174		1160
1175	/*	1161	/*
…		…
1199	esrv_update_item (UPD_NROF, pl, top);	1185	esrv_update_item (UPD_NROF, pl, top);
1200		1186
1201	op->weight = 0; // cancel the addition above	1187	op->weight = 0; // cancel the addition above
1202	op->carrying = 0; // must be 0 already	1188	op->carrying = 0; // must be 0 already
1203		1189
1204	op->destroy (1);	1190	op->destroy ();
1205		1191
1206	return top;	1192	return top;
1207	}	1193	}
1208		1194
1209	return 0;	1195	return 0;
…		…
1271	* just 'op' otherwise	1257	* just 'op' otherwise
1272	*/	1258	*/
1273	object *	1259	object *
1274	insert_ob_in_map (object op, maptile m, object *originator, int flag)	1260	insert_ob_in_map (object op, maptile m, object *originator, int flag)
1275	{	1261	{
1276	if (op->is_on_map ())
1277	{
1278	LOG (llevError, "insert_ob_in_map called for object already on map");
1279	abort ();
1280	}
1281
1282	if (op->env)
1283	{
1284	LOG (llevError, "insert_ob_in_map called for object in an inventory (proceeding)");
1285	op->remove ();	1262	op->remove ();
1286	}
1287		1263
1288	if (op->face && !face_info (op->face))//D TODO: remove soon	1264	if (m == &freed_map)//D TODO: remove soon
1289	{//D	1265	{//D
1290	LOG (llevError \| logBacktrace, "op->face out of bounds: %s", op->debug_desc ());//D	1266	LOG (llevError \| logBacktrace, "tries to insret object on freed objects map: %s", op->debug_desc ());//D
1291	op->face = 1;//D
1292	}//D	1267	}//D
1293		1268
1294	/* Ideally, the caller figures this out. However, it complicates a lot	1269	/* Ideally, the caller figures this out. However, it complicates a lot
1295	* of areas of callers (eg, anything that uses find_free_spot would now	1270	* of areas of callers (eg, anything that uses find_free_spot would now
1296	* need extra work	1271	* need extra work
1297	*/	1272	*/
		1273	maptile *newmap = m;
1298	if (!xy_normalise (m, op->x, op->y))	1274	if (!xy_normalise (newmap, op->x, op->y))
1299	{	1275	{
1300	op->head_ ()->destroy (1);// remove head_ once all tail object destroyers found	1276	op->head_ ()->destroy ();// remove head_ once all tail object destroyers found
1301	return 0;	1277	return 0;
1302	}	1278	}
1303		1279
1304	if (object *more = op->more)	1280	if (object *more = op->more)
1305	if (!insert_ob_in_map (more, m, originator, flag))	1281	if (!insert_ob_in_map (more, m, originator, flag))
1306	return 0;	1282	return 0;
1307		1283
1308	CLEAR_FLAG (op, FLAG_REMOVED);	1284	op->flag [FLAG_REMOVED] = false;
1309		1285	op->env = 0;
1310	op->map = m;	1286	op->map = newmap;
		1287
1311	mapspace &ms = op->ms ();	1288	mapspace &ms = op->ms ();
1312		1289
1313	/* this has to be done after we translate the coordinates.	1290	/* this has to be done after we translate the coordinates.
1314	*/	1291	*/
1315	if (op->nrof && !(flag & INS_NO_MERGE))	1292	if (op->nrof && !(flag & INS_NO_MERGE))
…		…
1318	{	1295	{
1319	// TODO: we actually want to update tmp, not op,	1296	// TODO: we actually want to update tmp, not op,
1320	// but some caller surely breaks when we return tmp	1297	// but some caller surely breaks when we return tmp
1321	// from here :/	1298	// from here :/
1322	op->nrof += tmp->nrof;	1299	op->nrof += tmp->nrof;
1323	tmp->destroy (1);	1300	tmp->destroy ();
1324	}	1301	}
1325		1302
1326	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1303	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1327	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1304	CLEAR_FLAG (op, FLAG_INV_LOCKED);
1328		1305
…		…
1336	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");	1313	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");
1337	abort ();	1314	abort ();
1338	}	1315	}
1339		1316
1340	if (!originator->is_on_map ())	1317	if (!originator->is_on_map ())
		1318	{
1341	LOG (llevDebug \| logBacktrace, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map",	1319	LOG (llevError, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map",
1342	op->debug_desc (), originator->debug_desc ());	1320	op->debug_desc (), originator->debug_desc ());
		1321	abort ();
		1322	}
1343		1323
1344	op->above = originator;	1324	op->above = originator;
1345	op->below = originator->below;	1325	op->below = originator->below;
1346	originator->below = op;	1326	originator->below = op;
1347		1327
…		…
1433	op->below = top;	1413	op->below = top;
1434	*(op->above ? &op->above->below : &ms.top) = op;	1414	*(op->above ? &op->above->below : &ms.top) = op;
1435	}	1415	}
1436	}	1416	}
1437		1417
1438	if (op->type == PLAYER)	1418	if (op->is_player ())
1439	{	1419	{
1440	op->contr->do_los = 1;	1420	op->contr->do_los = 1;
1441	++op->map->players;	1421	++op->map->players;
1442	op->map->touch ();	1422	op->map->touch ();
1443	}	1423	}
…		…
1458	* be far away from this change and not affected in any way -	1438	* be far away from this change and not affected in any way -
1459	* this should get redone to only look for players within range,	1439	* this should get redone to only look for players within range,
1460	* or just updating the P_UPTODATE for spaces within this area	1440	* or just updating the P_UPTODATE for spaces within this area
1461	* of effect may be sufficient.	1441	* of effect may be sufficient.
1462	*/	1442	*/
1463	if (op->map->darkness && (op->glow_radius != 0))	1443	if (op->affects_los ())
		1444	{
		1445	op->ms ().invalidate ();
1464	update_all_los (op->map, op->x, op->y);	1446	update_all_los (op->map, op->x, op->y);
		1447	}
1465		1448
1466	/* updates flags (blocked, alive, no magic, etc) for this map space */	1449	/* updates flags (blocked, alive, no magic, etc) for this map space */
1467	update_object (op, UP_OBJ_INSERT);	1450	update_object (op, UP_OBJ_INSERT);
1468		1451
1469	INVOKE_OBJECT (INSERT, op);	1452	INVOKE_OBJECT (INSERT, op);
…		…
1476	* blocked() and wall() work properly), and these flags are updated by	1459	* blocked() and wall() work properly), and these flags are updated by
1477	* update_object().	1460	* update_object().
1478	*/	1461	*/
1479		1462
1480	/* if this is not the head or flag has been passed, don't check walk on status */	1463	/* if this is not the head or flag has been passed, don't check walk on status */
1481	if (!(flag & INS_NO_WALK_ON) && op->head_ () == op)	1464	if (!(flag & INS_NO_WALK_ON) && op->is_head ())
1482	{	1465	{
1483	if (check_move_on (op, originator))	1466	if (check_move_on (op, originator))
1484	return 0;	1467	return 0;
1485		1468
1486	/* If we are a multi part object, lets work our way through the check	1469	/* If we are a multi part object, lets work our way through the check
…		…
1497	/* this function inserts an object in the map, but if it	1480	/* this function inserts an object in the map, but if it
1498	* finds an object of its own type, it'll remove that one first.	1481	* finds an object of its own type, it'll remove that one first.
1499	* op is the object to insert it under: supplies x and the map.	1482	* op is the object to insert it under: supplies x and the map.
1500	*/	1483	*/
1501	void	1484	void
1502	replace_insert_ob_in_map (const char arch_string, object op)	1485	replace_insert_ob_in_map (shstr_tmp archname, object *op)
1503	{	1486	{
1504	/* first search for itself and remove any old instances */	1487	/* first search for itself and remove any old instances */
1505		1488
1506	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)	1489	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1507	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */	1490	if (tmp->arch->archname == archname) /* same archetype */
1508	tmp->destroy (1);	1491	tmp->destroy ();
1509		1492
1510	object *tmp = arch_to_object (archetype::find (arch_string));	1493	object *tmp = arch_to_object (archetype::find (archname));
1511		1494
1512	tmp->x = op->x;	1495	tmp->x = op->x;
1513	tmp->y = op->y;	1496	tmp->y = op->y;
1514		1497
1515	insert_ob_in_map (tmp, op->map, op, 0);	1498	insert_ob_in_map (tmp, op->map, op, 0);
…		…
1537	if (!nr)	1520	if (!nr)
1538	return true;	1521	return true;
1539		1522
1540	nr = min (nr, nrof);	1523	nr = min (nr, nrof);
1541		1524
		1525	if (nrof > nr)
		1526	{
1542	nrof -= nr;	1527	nrof -= nr;
1543
1544	if (nrof)
1545	{
1546	adjust_weight (env, -weight * max (1, nr)); // carrying == 0	1528	adjust_weight (env, -weight * max (1, nr)); // carrying == 0
1547		1529
1548	if (object *pl = visible_to ())	1530	if (object *pl = visible_to ())
1549	esrv_update_item (UPD_NROF, pl, this);	1531	esrv_update_item (UPD_NROF, pl, this);
1550		1532
1551	return true;	1533	return true;
1552	}	1534	}
1553	else	1535	else
1554	{	1536	{
1555	destroy (1);	1537	destroy ();
1556	return false;	1538	return false;
1557	}	1539	}
1558	}	1540	}
1559		1541
1560	/*	1542	/*
…		…
1637	if (object *pl = tmp->visible_to ())	1619	if (object *pl = tmp->visible_to ())
1638	esrv_update_item (UPD_NROF, pl, tmp);	1620	esrv_update_item (UPD_NROF, pl, tmp);
1639		1621
1640	adjust_weight (this, op->total_weight ());	1622	adjust_weight (this, op->total_weight ());
1641		1623
1642	op->destroy (1);	1624	op->destroy ();
1643	op = tmp;	1625	op = tmp;
1644	goto inserted;	1626	goto inserted;
1645	}	1627	}
1646		1628
1647	op->owner = 0; // it's his/hers now. period.	1629	op->owner = 0; // it's his/hers now. period.
…		…
1665		1647
1666	adjust_weight (this, op->total_weight ());	1648	adjust_weight (this, op->total_weight ());
1667		1649
1668	inserted:	1650	inserted:
1669	/* reset the light list and los of the players on the map */	1651	/* reset the light list and los of the players on the map */
1670	if (op->glow_radius && map && map->darkness)	1652	if (op->glow_radius && is_on_map ())
		1653	{
		1654	update_stats ();
1671	update_all_los (map, x, y);	1655	update_all_los (map, x, y);
1672		1656	}
		1657	else if (is_player () && !flag [FLAG_NO_FIX_PLAYER])
1673	// if this is a player's inventory, update stats	1658	// if this is a player's inventory, update stats
1674	if (type == PLAYER && !flag [FLAG_NO_FIX_PLAYER])
1675	update_stats ();	1659	update_stats ();
1676		1660
1677	INVOKE_OBJECT (INSERT, this);	1661	INVOKE_OBJECT (INSERT, this);
1678		1662
1679	return op;	1663	return op;
…		…
1700	* on top.	1684	* on top.
1701	*/	1685	*/
1702	int	1686	int
1703	check_move_on (object op, object originator)	1687	check_move_on (object op, object originator)
1704	{	1688	{
		1689	if (QUERY_FLAG (op, FLAG_NO_APPLY))
		1690	return 0;
		1691
1705	object *tmp;	1692	object *tmp;
1706	maptile *m = op->map;	1693	maptile *m = op->map;
1707	int x = op->x, y = op->y;	1694	int x = op->x, y = op->y;
1708		1695
1709	MoveType move_on, move_slow, move_block;	1696	mapspace &ms = m->at (x, y);
1710		1697
1711	if (QUERY_FLAG (op, FLAG_NO_APPLY))	1698	ms.update ();
1712	return 0;
1713		1699
1714	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);	1700	MoveType move_on = ms.move_on;
1715	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);	1701	MoveType move_slow = ms.move_slow;
1716	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);	1702	MoveType move_block = ms.move_block;
1717		1703
1718	/* if nothing on this space will slow op down or be applied,	1704	/* if nothing on this space will slow op down or be applied,
1719	* no need to do checking below. have to make sure move_type	1705	* no need to do checking below. have to make sure move_type
1720	* is set, as lots of objects don't have it set - we treat that	1706	* is set, as lots of objects don't have it set - we treat that
1721	* as walking.	1707	* as walking.
…		…
1732	return 0;	1718	return 0;
1733		1719
1734	/* The objects have to be checked from top to bottom.	1720	/* The objects have to be checked from top to bottom.
1735	* Hence, we first go to the top:	1721	* Hence, we first go to the top:
1736	*/	1722	*/
1737		1723	for (object next, tmp = ms.top; tmp; tmp = next)
1738	for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above)
1739	{
1740	/* Trim the search when we find the first other spell effect
1741	* this helps performance so that if a space has 50 spell objects,
1742	* we don't need to check all of them.
1743	*/
1744	if ((tmp->move_type & MOVE_FLY_LOW) && QUERY_FLAG (tmp, FLAG_NO_PICK))
1745	break;
1746	}	1724	{
		1725	next = tmp->below;
1747		1726
1748	for (; tmp; tmp = tmp->below)
1749	{
1750	if (tmp == op)	1727	if (tmp == op)
1751	continue; /* Can't apply yourself */	1728	continue; /* Can't apply yourself */
1752		1729
1753	/* Check to see if one of the movement types should be slowed down.	1730	/* Check to see if one of the movement types should be slowed down.
1754	* Second check makes sure that the movement types not being slowed	1731	* Second check makes sure that the movement types not being slowed
…		…
1759	if (!QUERY_FLAG (op, FLAG_WIZPASS))	1736	if (!QUERY_FLAG (op, FLAG_WIZPASS))
1760	{	1737	{
1761	if ((!op->move_type && tmp->move_slow & MOVE_WALK) \|\|	1738	if ((!op->move_type && tmp->move_slow & MOVE_WALK) \|\|
1762	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))	1739	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1763	{	1740	{
1764
1765	float
1766	diff = tmp->move_slow_penalty * fabs (op->speed);	1741	float diff = tmp->move_slow_penalty * fabs (op->speed);
1767		1742
1768	if (op->type == PLAYER)	1743	if (op->is_player ())
1769	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) \|\|	1744	if ((tmp->flag [FLAG_IS_HILLY ] && find_skill_by_number (op, SK_CLIMBING)) \|\|
1770	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))	1745	(tmp->flag [FLAG_IS_WOODED] && find_skill_by_number (op, SK_WOODSMAN)))
1771	diff /= 4.0;	1746	diff /= 4.0;
1772		1747
1773	op->speed_left -= diff;	1748	op->speed_left -= diff;
1774	}	1749	}
1775	}	1750	}
…		…
1981	* head of the object should correspond for the entire object.	1956	* head of the object should correspond for the entire object.
1982	*/	1957	*/
1983	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))	1958	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
1984	continue;	1959	continue;
1985		1960
1986	if (ob->blocked (m, pos.x, pos.y))	1961	if (ob->blocked (pos.m, pos.x, pos.y))
1987	continue;	1962	continue;
1988		1963
1989	altern [index++] = i;	1964	altern [index++] = i;
1990	}	1965	}
1991		1966
…		…
2059	* there is capable of.	2034	* there is capable of.
2060	*/	2035	*/
2061	int	2036	int
2062	find_dir (maptile m, int x, int y, object exclude)	2037	find_dir (maptile m, int x, int y, object exclude)
2063	{	2038	{
2064	int i, max = SIZEOFFREE, mflags;	2039	int max = SIZEOFFREE, mflags;
2065
2066	sint16 nx, ny;
2067	object *tmp;
2068	maptile *mp;
2069
2070	MoveType blocked, move_type;	2040	MoveType move_type;
2071		2041
2072	if (exclude && exclude->head_ () != exclude)	2042	if (exclude && exclude->head_ () != exclude)
2073	{	2043	{
2074	exclude = exclude->head;	2044	exclude = exclude->head;
2075	move_type = exclude->move_type;	2045	move_type = exclude->move_type;
…		…
2078	{	2048	{
2079	/* If we don't have anything, presume it can use all movement types. */	2049	/* If we don't have anything, presume it can use all movement types. */
2080	move_type = MOVE_ALL;	2050	move_type = MOVE_ALL;
2081	}	2051	}
2082		2052
2083	for (i = 1; i < max; i++)	2053	for (int i = 1; i < max; i++)
2084	{	2054	{
2085	mp = m;	2055	mapxy pos (m, x, y);
2086	nx = x + freearr_x[i];	2056	pos.move (i);
2087	ny = y + freearr_y[i];
2088		2057
2089	mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);	2058	if (!pos.normalise ())
2090
2091	if (mflags & P_OUT_OF_MAP)
2092	max = maxfree[i];	2059	max = maxfree[i];
2093	else	2060	else
2094	{	2061	{
2095	mapspace &ms = mp->at (nx, ny);	2062	mapspace &ms = *pos;
2096		2063
2097	blocked = ms.move_block;
2098
2099	if ((move_type & blocked) == move_type)	2064	if ((move_type & ms.move_block) == move_type)
2100	max = maxfree[i];	2065	max = maxfree [i];
2101	else if (mflags & P_IS_ALIVE)	2066	else if (ms.flags () & P_IS_ALIVE)
2102	{	2067	{
2103	for (tmp = ms.bot; tmp; tmp = tmp->above)	2068	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
2104	if ((tmp->flag [FLAG_MONSTER] \|\| tmp->type == PLAYER)	2069	if ((tmp->flag [FLAG_MONSTER] \|\| tmp->is_player ())
2105	&& (tmp != exclude \|\| (tmp->head_ () != tmp && tmp->head_ () != exclude)))	2070	&& (tmp != exclude \|\| (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2106	break;
2107
2108	if (tmp)
2109	return freedir[i];	2071	return freedir [i];
2110	}	2072	}
2111	}	2073	}
2112	}	2074	}
2113		2075
2114	return 0;	2076	return 0;
…		…
2189	* This basically means that if direction is 15, then it could either go	2151	* This basically means that if direction is 15, then it could either go
2190	* direction 4, 14, or 16 to get back to where we are.	2152	* direction 4, 14, or 16 to get back to where we are.
2191	* Moved from spell_util.c to object.c with the other related direction	2153	* Moved from spell_util.c to object.c with the other related direction
2192	* functions.	2154	* functions.
2193	*/	2155	*/
2194	int reduction_dir[SIZEOFFREE][3] = {	2156	static const int reduction_dir[SIZEOFFREE][3] = {
2195	{0, 0, 0}, /* 0 */	2157	{0, 0, 0}, /* 0 */
2196	{0, 0, 0}, /* 1 */	2158	{0, 0, 0}, /* 1 */
2197	{0, 0, 0}, /* 2 */	2159	{0, 0, 0}, /* 2 */
2198	{0, 0, 0}, /* 3 */	2160	{0, 0, 0}, /* 3 */
2199	{0, 0, 0}, /* 4 */	2161	{0, 0, 0}, /* 4 */
…		…
2295	int	2257	int
2296	can_pick (const object who, const object item)	2258	can_pick (const object who, const object item)
2297	{	2259	{
2298	return /QUERY_FLAG(who,FLAG_WIZ)\|\| /	2260	return /QUERY_FLAG(who,FLAG_WIZ)\|\| /
2299	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&	2261	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
2300	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER \|\| item->weight < who->weight / 3));	2262	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->is_player () \|\| item->weight < who->weight / 3));
2301	}	2263	}
2302		2264
2303	/*	2265	/*
2304	* create clone from object to another	2266	* create clone from object to another
2305	*/	2267	*/
…		…
2337	return tmp;	2299	return tmp;
2338		2300
2339	return 0;	2301	return 0;
2340	}	2302	}
2341		2303
2342	const shstr &	2304	shstr_tmp
2343	object::kv_get (const shstr &key) const	2305	object::kv_get (shstr_tmp key) const
2344	{	2306	{
2345	for (key_value *kv = key_values; kv; kv = kv->next)	2307	for (key_value *kv = key_values; kv; kv = kv->next)
2346	if (kv->key == key)	2308	if (kv->key == key)
2347	return kv->value;	2309	return kv->value;
2348		2310
2349	return shstr_null;	2311	return shstr ();
2350	}	2312	}
2351		2313
2352	void	2314	void
2353	object::kv_set (const shstr &key, const shstr &value)	2315	object::kv_set (shstr_tmp key, shstr_tmp value)
2354	{	2316	{
2355	for (key_value *kv = key_values; kv; kv = kv->next)	2317	for (key_value *kv = key_values; kv; kv = kv->next)
2356	if (kv->key == key)	2318	if (kv->key == key)
2357	{	2319	{
2358	kv->value = value;	2320	kv->value = value;
…		…
2367		2329
2368	key_values = kv;	2330	key_values = kv;
2369	}	2331	}
2370		2332
2371	void	2333	void
2372	object::kv_del (const shstr &key)	2334	object::kv_del (shstr_tmp key)
2373	{	2335	{
2374	for (key_value *kvp = &key_values; kvp; kvp = &(*kvp)->next)	2336	for (key_value *kvp = &key_values; kvp; kvp = &(*kvp)->next)
2375	if ((*kvp)->key == key)	2337	if ((*kvp)->key == key)
2376	{	2338	{
2377	key_value kv = kvp;	2339	key_value kv = kvp;
…		…
2508	container = 0;	2470	container = 0;
2509		2471
2510	// client needs item update to make it work, client bug requires this to be separate	2472	// client needs item update to make it work, client bug requires this to be separate
2511	esrv_update_item (UPD_FLAGS, this, old_container);	2473	esrv_update_item (UPD_FLAGS, this, old_container);
2512		2474
2513	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));	2475	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", old_container->query_name ());
2514	play_sound (sound_find ("chest_close"));	2476	play_sound (sound_find ("chest_close"));
2515	}	2477	}
2516		2478
2517	if (new_container)	2479	if (new_container)
2518	{	2480	{
…		…
2528	closer->flag [FLAG_NO_MAP_SAVE] = 1;	2490	closer->flag [FLAG_NO_MAP_SAVE] = 1;
2529	new_container->insert (closer);	2491	new_container->insert (closer);
2530	}	2492	}
2531	#endif	2493	#endif
2532		2494
2533	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));	2495	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", new_container->query_name ());
2534		2496
2535	// make sure the container is available, client bug requires this to be separate	2497	// make sure the container is available, client bug requires this to be separate
2536	esrv_send_item (this, new_container);	2498	esrv_send_item (this, new_container);
2537		2499
2538	new_container->flag [FLAG_APPLIED] = true;	2500	new_container->flag [FLAG_APPLIED] = true;
…		…
2546	// else if (!old_container->env && contr && contr->ns)	2508	// else if (!old_container->env && contr && contr->ns)
2547	// contr->ns->floorbox_reset ();	2509	// contr->ns->floorbox_reset ();
2548	}	2510	}
2549		2511
2550	object *	2512	object *
2551	object::force_find (const shstr name)	2513	object::force_find (shstr_tmp name)
2552	{	2514	{
2553	/* cycle through his inventory to look for the MARK we want to	2515	/* cycle through his inventory to look for the MARK we want to
2554	* place	2516	* place
2555	*/	2517	*/
2556	for (object *tmp = inv; tmp; tmp = tmp->below)	2518	for (object *tmp = inv; tmp; tmp = tmp->below)
…		…
2558	return splay (tmp);	2520	return splay (tmp);
2559		2521
2560	return 0;	2522	return 0;
2561	}	2523	}
2562		2524
		2525	//-GPL
		2526
2563	void	2527	void
		2528	object::force_set_timer (int duration)
		2529	{
		2530	this->duration = 1;
		2531	this->speed_left = -1.f;
		2532
		2533	this->set_speed (duration ? 1.f / duration : 0.f);
		2534	}
		2535
		2536	object *
2564	object::force_add (const shstr name, int duration)	2537	object::force_add (shstr_tmp name, int duration)
2565	{	2538	{
2566	if (object *force = force_find (name))	2539	if (object *force = force_find (name))
2567	force->destroy ();	2540	force->destroy ();
2568		2541
2569	object *force = get_archetype (FORCE_NAME);	2542	object *force = get_archetype (FORCE_NAME);
2570		2543
2571	force->slaying = name;	2544	force->slaying = name;
2572	force->stats.food = 1;	2545	force->force_set_timer (duration);
2573	force->speed_left = -1.f;
2574
2575	force->set_speed (duration ? 1.f / duration : 0.f);
2576	force->flag [FLAG_IS_USED_UP] = true;
2577	force->flag [FLAG_APPLIED] = true;	2546	force->flag [FLAG_APPLIED] = true;
2578		2547
2579	insert (force);	2548	return insert (force);
2580	}	2549	}
2581		2550
2582	void	2551	void
2583	object::play_sound (faceidx sound)	2552	object::play_sound (faceidx sound) const
2584	{	2553	{
2585	if (!sound)	2554	if (!sound)
2586	return;	2555	return;
2587		2556
2588	if (flag [FLAG_REMOVED])	2557	if (is_on_map ())
		2558	map->play_sound (sound, x, y);
		2559	else if (object *pl = in_player ())
		2560	pl->contr->play_sound (sound);
		2561	}
		2562
		2563	void
		2564	object::say_msg (const char *msg) const
		2565	{
		2566	if (is_on_map ())
		2567	map->say_msg (msg, x, y);
		2568	else if (object *pl = in_player ())
		2569	pl->contr->play_sound (sound);
		2570	}
		2571
		2572	void
		2573	object::make_noise ()
		2574	{
		2575	// we do not model noise in the map, so instead put
		2576	// a temporary light into the noise source
		2577	// could use the map instead, but that's less reliable for our
		2578	// goal, which is to make invisibility a bit harder to exploit
		2579
		2580	// currently only works sensibly for players
		2581	if (!is_player ())
2589	return;	2582	return;
2590		2583
2591	if (env)	2584	// find old force, or create new one
2592	{	2585	object *force = force_find (shstr_noise_force);
2593	if (object *pl = in_player ())	2586
2594	pl->contr->play_sound (sound);	2587	if (force)
2595	}	2588	force->speed_left = -1.f; // patch old speed up
2596	else	2589	else
2597	map->play_sound (sound, x, y);	2590	{
2598	}	2591	force = archetype::get (shstr_noise_force);
2599		2592
		2593	force->slaying = shstr_noise_force;
		2594	force->stats.food = 1;
		2595	force->speed_left = -1.f;
		2596
		2597	force->set_speed (1.f / 4.f);
		2598	force->flag [FLAG_IS_USED_UP] = true;
		2599	force->flag [FLAG_APPLIED] = true;
		2600
		2601	insert (force);
		2602	}
		2603	}
		2604

Diff Legend

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

Comparing deliantra/server/common/object.C (file contents): Revision 1.247 by root, Mon Jul 14 18:36:43 2008 UTC vs. Revision 1.296 by root, Fri Nov 6 13:31:47 2009 UTC

Diff Legend

Comparing deliantra/server/common/object.C (file contents):
Revision 1.247 by root, Mon Jul 14 18:36:43 2008 UTC vs.
Revision 1.296 by root, Fri Nov 6 13:31:47 2009 UTC