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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.259 by root, Mon Sep 29 10:32:50 2008 UTC vs.
Revision 1.300 by root, Mon Nov 9 03:08:23 2009 UTC

…		…
1	/*	1	/*
2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.	2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.
3	*	3	*
4	* Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team	4	* Copyright (©) 2005,2006,2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5	* Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team	5	* Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team
6	* Copyright (©) 1992,2007 Frank Tore Johansen	6	* Copyright (©) 1992,2007 Frank Tore Johansen
7	*	7	*
8	* Deliantra is free software: you can redistribute it and/or modify	8	* Deliantra is free software: you can redistribute it and/or modify it under
9	* it under the terms of the GNU General Public License as published by	9	* the terms of the Affero GNU General Public License as published by the
10	* the Free Software Foundation, either version 3 of the License, or	10	* Free Software Foundation, either version 3 of the License, or (at your
11	* (at your option) any later version.	11	* option) any later version.
12	*	12	*
13	* This program is distributed in the hope that it will be useful,	13	* This program is distributed in the hope that it will be useful,
14	* but WITHOUT ANY WARRANTY; without even the implied warranty of	14	* but WITHOUT ANY WARRANTY; without even the implied warranty of
15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16	* GNU General Public License for more details.	16	* GNU General Public License for more details.
17	*	17	*
18	* You should have received a copy of the GNU General Public License	18	* You should have received a copy of the Affero GNU General Public License
19	* along with this program. If not, see <http://www.gnu.org/licenses/>.	19	* and the GNU General Public License along with this program. If not, see
		20	* <http://www.gnu.org/licenses/>.
20	*	21	*
21	* The authors can be reached via e-mail to <support@deliantra.net>	22	* The authors can be reached via e-mail to <support@deliantra.net>
22	*/	23	*/
23		24
24	#include <global.h>	25	#include <global.h>
32	#include <bitset>	33	#include <bitset>
33		34
34	UUID UUID::cur;	35	UUID UUID::cur;
35	static uint64_t seq_next_save;	36	static uint64_t seq_next_save;
36	static const uint64 UUID_GAP = 1<<19;	37	static const uint64 UUID_GAP = 1<<19;
		38	uint32_t mapspace::smellcount = 10000;
37		39
38	objectvec objects;	40	objectvec objects;
39	activevec actives;	41	activevec actives;
		42
		43	//+GPL
40		44
41	short freearr_x[SIZEOFFREE] = {	45	short freearr_x[SIZEOFFREE] = {
42	0,	46	0,
43	0, 1, 1, 1, 0, -1, -1, -1,	47	0, 1, 1, 1, 0, -1, -1, -1,
44	0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,	48	0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,
…		…
48	0,	52	0,
49	-1, -1, 0, 1, 1, 1, 0, -1,	53	-1, -1, 0, 1, 1, 1, 0, -1,
50	-2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2,	54	-2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2,
51	-3, -3, -3, -3, -2, -1, 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3	55	-3, -3, -3, -3, -2, -1, 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3
52	};	56	};
53	int maxfree[SIZEOFFREE] = {
54	0,
55	9, 10, 13, 14, 17, 18, 21, 22,
56	25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45, 48,
57	49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49
58	};
59	int freedir[SIZEOFFREE] = {	57	int freedir[SIZEOFFREE] = {
60	0,	58	0,
61	1, 2, 3, 4, 5, 6, 7, 8,	59	1, 2, 3, 4, 5, 6, 7, 8,
62	1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8,	60	1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8,
63	1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8	61	1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8
		62	};
		63
		64	static int maxfree[SIZEOFFREE] = {
		65	0,
		66	9, 10, 13, 14, 17, 18, 21, 22,
		67	25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45, 48,
		68	49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49
64	};	69	};
65		70
66	static void	71	static void
67	write_uuid (uval64 skip, bool sync)	72	write_uuid (uval64 skip, bool sync)
68	{	73	{
…		…
96		101
97	LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);	102	LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);
98	_exit (1);	103	_exit (1);
99	}	104	}
100		105
101	UUID::BUF buf;	106	char buf [UUID::MAX_LEN];
102	buf[0] = 0;	107	buf[0] = 0;
103	fgets (buf, sizeof (buf), fp);	108	fgets (buf, sizeof (buf), fp);
104		109
105	if (!UUID::cur.parse (buf))	110	if (!UUID::cur.parse (buf))
106	{	111	{
…		…
133		138
134	void	139	void
135	UUID::init ()	140	UUID::init ()
136	{	141	{
137	read_uuid ();	142	read_uuid ();
		143	}
		144
		145	bool
		146	UUID::parse (const char *s)
		147	{
		148	if (s++ != '<' \|\| s++ != '1' \|\| *s++ != '.')
		149	return false;
		150
		151	seq = 0;
		152
		153	while (*s != '>')
		154	{
		155	if (*s < '0')
		156	return false;
		157
		158	// this gives nice branchless code with gcc
		159	assert ('0' < 'a' && '0' == 48 && 'a' == 97);
		160	int digit = (s + (s & 0x40 ? 9 : 0)) & 15;
		161
		162	seq = (seq << 4) \| digit;
		163
		164	++s;
		165	}
		166
		167	return true;
		168	}
		169
		170	char *
		171	UUID::append (char *buf) const
		172	{
		173	*buf++ = '<';
		174	*buf++ = '1';
		175	*buf++ = '.';
		176
		177	uint64_t seq = this->seq;
		178	const int bits = 64;
		179	char nz = 0;
		180	static const char tohex [] = "0123456789abcdef";
		181
		182	// assert (len >= 3 + bits / 4 + 1 + 1);
		183	for (int i = bits / 4; --i; )
		184	{
		185	uint8_t digit = seq >> (bits - 4);
		186
		187	*buf = tohex [digit];
		188	nz \|= digit;
		189	buf += nz ? 1 : 0;
		190	seq <<= 4;
		191	}
		192
		193	// last digit is special - always emit
		194	uint8_t digit = seq >> (bits - 4);
		195	*buf++ = tohex [digit];
		196
		197	*buf++ = '>';
		198
		199	return buf;
		200	}
		201
		202	char *
		203	UUID::c_str () const
		204	{
		205	static char buf [MAX_LEN];
		206	*append (buf) = 0;
		207	return buf;
138	}	208	}
139		209
140	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */	210	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */
141	static bool	211	static bool
142	compare_ob_value_lists_one (const object wants, const object has)	212	compare_ob_value_lists_one (const object wants, const object has)
…		…
181	bool object::can_merge_slow (object ob1, object ob2)	251	bool object::can_merge_slow (object ob1, object ob2)
182	{	252	{
183	/* A couple quicksanity checks */	253	/* A couple quicksanity checks */
184	if (ob1 == ob2	254	if (ob1 == ob2
185	\|\| ob1->type != ob2->type	255	\|\| ob1->type != ob2->type
186	\|\| ob1->speed != ob2->speed	256	\|\| fabs (ob1->speed - ob2->speed) >= MIN_ACTIVE_SPEED
187	\|\| ob1->value != ob2->value	257	\|\| ob1->value != ob2->value
188	\|\| ob1->name != ob2->name)	258	\|\| ob1->name != ob2->name)
189	return 0;	259	return 0;
190		260
191	/* Do not merge objects if nrof would overflow, assume nrof	261	/* Do not merge objects if nrof would overflow, assume nrof
…		…
225	\|\| ob1->move_block != ob2->move_block	295	\|\| ob1->move_block != ob2->move_block
226	\|\| ob1->move_allow != ob2->move_allow	296	\|\| ob1->move_allow != ob2->move_allow
227	\|\| ob1->move_on != ob2->move_on	297	\|\| ob1->move_on != ob2->move_on
228	\|\| ob1->move_off != ob2->move_off	298	\|\| ob1->move_off != ob2->move_off
229	\|\| ob1->move_slow != ob2->move_slow	299	\|\| ob1->move_slow != ob2->move_slow
230	\|\| ob1->move_slow_penalty != ob2->move_slow_penalty	300	\|\| fabs (ob1->move_slow_penalty - ob2->move_slow_penalty) >= (1.f / 1024.f)
231	\|\| memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))	301	\|\| memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
232	\|\| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats)))	302	\|\| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats)))
233	return 0;	303	return 0;
234		304
235	if ((ob1->flag ^ ob2->flag)	305	if ((ob1->flag ^ ob2->flag)
…		…
323	{	393	{
324	// see if we are in a container of sorts	394	// see if we are in a container of sorts
325	if (env)	395	if (env)
326	{	396	{
327	// the player inventory itself is always visible	397	// the player inventory itself is always visible
328	if (env->type == PLAYER)	398	if (env->is_player ())
329	return env;	399	return env;
330		400
331	// else a player could have our env open	401	// else a player could have our env open
332	object *envest = env->outer_env ();	402	object *envest = env->outer_env_or_self ();
333		403
334	// the player itself is always on a map, so we will find him here	404	// the player itself is always on a map, so we will find him here
335	// even if our inv is in a player.	405	// even if our inv is in a player.
336	if (envest->is_on_map ())	406	if (envest->is_on_map ())
337	if (object *pl = envest->ms ().player ())	407	if (object *pl = envest->ms ().player ())
338	if (pl->container == env)	408	if (pl->container_ () == env)
339	return pl;	409	return pl;
340	}	410	}
341	else	411	else
342	{	412	{
343	// maybe there is a player standing on the same mapspace	413	// maybe there is a player standing on the same mapspace
344	// this will catch the case where "this" is a player	414	// this will catch the case where "this" is a player
345	if (object *pl = ms ().player ())	415	if (object *pl = ms ().player ())
346	if ((!pl->container && pl->contr->ns && !pl->contr->ns->update_look)	416	if ((pl->contr->ns && !pl->container_ () && !pl->contr->ns->update_look)
347	\|\| this == pl->container)	417	\|\| pl->container_ () == this)
348	return pl;	418	return pl;
349	}	419	}
350	}	420	}
351		421
352	return 0;	422	return 0;
…		…
430	object_freezer freezer;	500	object_freezer freezer;
431	op->write (freezer);	501	op->write (freezer);
432	return freezer.as_string ();	502	return freezer.as_string ();
433	}	503	}
434		504
435	/*	505	char *
436	* get_nearest_part(multi-object, object 2) returns the part of the	506	object::as_string ()
437	* multi-object 1 which is closest to the second object.
438	* If it's not a multi-object, it is returned.
439	*/
440	object *
441	get_nearest_part (object op, const object pl)
442	{	507	{
443	object tmp, closest;	508	return dump_object (this);
444	int last_dist, i;
445
446	if (!op->more)
447	return op;
448
449	for (last_dist = distance (op, pl), closest = op, tmp = op->more;
450	tmp;
451	tmp = tmp->more)
452	if ((i = distance (tmp, pl)) < last_dist)
453	closest = tmp, last_dist = i;
454
455	return closest;
456	}	509	}
457		510
458	/*	511	/*
459	* Returns the object which has the count-variable equal to the argument.	512	* Returns the object which has the count-variable equal to the argument.
460	* VERRRY slow.	513	* VERRRY slow.
…		…
554	update_stats ();	607	update_stats ();
555		608
556	new_draw_info_format (NDI_UNIQUE, 0, this,	609	new_draw_info_format (NDI_UNIQUE, 0, this,
557	"You try to balance all your items at once, "	610	"You try to balance all your items at once, "
558	"but the %s is just too much for your body. "	611	"but the %s is just too much for your body. "
559	"[You need to unapply some items first.]", &ob->name);	612	"[You need to unapply some items first - use the 'body' command to see "
		613	"how many items you cna wera on a specific body part.]", &ob->name);
560	return false;	614	return false;
561	}	615	}
562		616
563	//new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);	617	//new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);
564	}	618	}
…		…
690	* This function needs to be called whenever the speed of an object changes.	744	* This function needs to be called whenever the speed of an object changes.
691	*/	745	*/
692	void	746	void
693	object::set_speed (float speed)	747	object::set_speed (float speed)
694	{	748	{
695	if (flag [FLAG_FREED] && speed)
696	{
697	LOG (llevError, "Object %s is freed but has speed.\n", &name);
698	speed = 0;
699	}
700
701	this->speed = speed;	749	this->speed = speed;
702		750
703	if (has_active_speed ())	751	if (has_active_speed ())
704	activate ();	752	activate ();
705	else	753	else
…		…
755		803
756	if (!(m.flags_ & P_UPTODATE))	804	if (!(m.flags_ & P_UPTODATE))
757	/* nop */;	805	/* nop */;
758	else if (action == UP_OBJ_INSERT)	806	else if (action == UP_OBJ_INSERT)
759	{	807	{
		808	#if 0
760	// this is likely overkill, TODO: revisit (schmorp)	809	// this is likely overkill, TODO: revisit (schmorp)
761	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))	810	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
762	\|\| (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))	811	\|\| (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))
763	\|\| (op->type == PLAYER && !(m.flags_ & P_PLAYER))	812	\|\| (op->is_player () && !(m.flags_ & P_PLAYER))
764	\|\| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))	813	\|\| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
765	\|\| (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))	814	\|\| (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))
766	\|\| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))	815	\|\| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))
767	\|\| (m.move_on \| op->move_on ) != m.move_on	816	\|\| (m.move_on \| op->move_on ) != m.move_on
768	\|\| (m.move_off \| op->move_off ) != m.move_off	817	\|\| (m.move_off \| op->move_off ) != m.move_off
769	\|\| (m.move_slow \| op->move_slow) != m.move_slow	818	\|\| (m.move_slow \| op->move_slow) != m.move_slow
770	/* This isn't perfect, but I don't expect a lot of objects to	819	/* This isn't perfect, but I don't expect a lot of objects to
771	* have move_allow right now.	820	* have move_allow right now.
772	*/	821	*/
773	\|\| ((m.move_block \| op->move_block) & ~op->move_allow) != m.move_block	822	\|\| ((m.move_block \| op->move_block) & ~op->move_allow) != m.move_block
		823	m.invalidate ();
		824	#else
774	\|\| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)	825	// the above is not strong enough a test to skip updating. los maybe? TODO (schmorp)
775	m.flags_ = 0;	826	m.invalidate ();
		827	#endif
776	}	828	}
777	/* if the object is being removed, we can't make intelligent	829	/* if the object is being removed, we can't make intelligent
778	* decisions, because remove_ob can't really pass the object	830	* decisions, because remove_ob can't really pass the object
779	* that is being removed.	831	* that is being removed.
780	*/	832	*/
781	else if (action == UP_OBJ_CHANGE \|\| action == UP_OBJ_REMOVE)	833	else if (action == UP_OBJ_CHANGE \|\| action == UP_OBJ_REMOVE)
782	m.flags_ = 0;	834	m.invalidate ();
783	else if (action == UP_OBJ_FACE)	835	else if (action == UP_OBJ_FACE)
784	/* Nothing to do for that case */ ;	836	/* Nothing to do for that case */ ;
785	else	837	else
786	LOG (llevError, "update_object called with invalid action: %d\n", action);	838	LOG (llevError, "update_object called with invalid action: %d\n", action);
787		839
…		…
791		843
792	object::object ()	844	object::object ()
793	{	845	{
794	SET_FLAG (this, FLAG_REMOVED);	846	SET_FLAG (this, FLAG_REMOVED);
795		847
796	expmul = 1.0;	848	//expmul = 1.0; declared const for the time being
797	face = blank_face;	849	face = blank_face;
798	}	850	}
799		851
800	object::~object ()	852	object::~object ()
801	{	853	{
…		…
830	{	882	{
831	/* If already on active list, don't do anything */	883	/* If already on active list, don't do anything */
832	if (active)	884	if (active)
833	return;	885	return;
834		886
835	if (has_active_speed () && flag [FLAG_FREED]) LOG (llevError \| logBacktrace, "BUG: tried to activate freed object %s\n", debug_desc ());//D
836	if (has_active_speed () && flag [FLAG_DEBUG]) LOG (llevError \| logBacktrace, "BUG: tried to activate DEBUG object %s\n", debug_desc ());//D temp
837
838	if (has_active_speed ())	887	if (has_active_speed ())
		888	{
		889	if (flag [FLAG_FREED])
		890	LOG (llevError \| logBacktrace, "BUG: tried to activate freed object %s\n", debug_desc ());//D
		891
839	actives.insert (this);	892	actives.insert (this);
		893	}
840	}	894	}
841		895
842	void	896	void
843	object::activate_recursive ()	897	object::activate_recursive ()
844	{	898	{
…		…
962		1016
963	void	1017	void
964	object::do_destroy ()	1018	object::do_destroy ()
965	{	1019	{
966	if (flag [FLAG_IS_LINKED])	1020	if (flag [FLAG_IS_LINKED])
967	remove_button_link (this);	1021	remove_link ();
968		1022
969	if (flag [FLAG_FRIENDLY])	1023	if (flag [FLAG_FRIENDLY])
970	remove_friendly_object (this);	1024	remove_friendly_object (this);
971		1025
972	remove ();	1026	remove ();
…		…
997	attacked_by = 0;	1051	attacked_by = 0;
998	current_weapon = 0;	1052	current_weapon = 0;
999	}	1053	}
1000		1054
1001	void	1055	void
1002	object::destroy (bool destroy_inventory)	1056	object::destroy ()
1003	{	1057	{
1004	if (destroyed ())	1058	if (destroyed ())
1005	return;	1059	return;
1006		1060
1007	if (!is_head () && !head->destroyed ())	1061	if (!is_head () && !head->destroyed ())
1008	{	1062	{
1009	LOG (llevError \| logBacktrace, "tried to destroy the tail of an object");	1063	LOG (llevError \| logBacktrace, "tried to destroy the tail of an object");
1010	head->destroy (destroy_inventory);	1064	head->destroy ();
1011	return;	1065	return;
1012	}	1066	}
1013		1067
1014	destroy_inv (!destroy_inventory);	1068	destroy_inv (false);
1015		1069
1016	if (is_head ())	1070	if (is_head ())
1017	if (sound_destroy)	1071	if (sound_destroy)
1018	play_sound (sound_destroy);	1072	play_sound (sound_destroy);
1019	else if (flag [FLAG_MONSTER])	1073	else if (flag [FLAG_MONSTER])
…		…
1030	* the previous environment.	1084	* the previous environment.
1031	*/	1085	*/
1032	void	1086	void
1033	object::do_remove ()	1087	object::do_remove ()
1034	{	1088	{
1035	object tmp, last = 0;
1036	object *otmp;
1037
1038	if (flag [FLAG_REMOVED])	1089	if (flag [FLAG_REMOVED])
1039	return;	1090	return;
1040		1091
1041	INVOKE_OBJECT (REMOVE, this);	1092	INVOKE_OBJECT (REMOVE, this);
1042		1093
…		…
1055	if (object *pl = visible_to ())	1106	if (object *pl = visible_to ())
1056	esrv_del_item (pl->contr, count);	1107	esrv_del_item (pl->contr, count);
1057	flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed	1108	flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed
1058		1109
1059	adjust_weight (env, -total_weight ());	1110	adjust_weight (env, -total_weight ());
		1111
		1112	object *pl = in_player ();
1060		1113
1061	/* we set up values so that it could be inserted into	1114	/* we set up values so that it could be inserted into
1062	* the map, but we don't actually do that - it is up	1115	* the map, but we don't actually do that - it is up
1063	* to the caller to decide what we want to do.	1116	* to the caller to decide what we want to do.
1064	*/	1117	*/
…		…
1076		1129
1077	/* NO_FIX_PLAYER is set when a great many changes are being	1130	/* NO_FIX_PLAYER is set when a great many changes are being
1078	* made to players inventory. If set, avoiding the call	1131	* made to players inventory. If set, avoiding the call
1079	* to save cpu time.	1132	* to save cpu time.
1080	*/	1133	*/
1081	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1134	if (pl)
		1135	if (pl->is_player () && (glow_radius \|\| !QUERY_FLAG (pl, FLAG_NO_FIX_PLAYER)))
		1136	{
1082	otmp->update_stats ();	1137	pl->update_stats ();
		1138
		1139	if (glow_radius && pl->is_on_map ())
		1140	update_all_los (pl->map, pl->x, pl->y);
		1141	}
1083	}	1142	}
1084	else if (map)	1143	else if (map)
1085	{	1144	{
1086	map->dirty = true;	1145	map->dirty = true;
1087	mapspace &ms = this->ms ();	1146	mapspace &ms = this->ms ();
1088		1147
1089	if (object *pl = ms.player ())	1148	if (object *pl = ms.player ())
1090	{	1149	{
1091	if (type == PLAYER) // this == pl(!)	1150	if (is_player ())
1092	{	1151	{
		1152	if (!flag [FLAG_WIZPASS])
		1153	ms.smell = ++mapspace::smellcount; // remember the smell of the player
		1154
1093	// leaving a spot always closes any open container on the ground	1155	// leaving a spot always closes any open container on the ground
1094	if (container && !container->env)	1156	if (container && !container->env)
1095	// this causes spurious floorbox updates, but it ensures	1157	// this causes spurious floorbox updates, but it ensures
1096	// that the CLOSE event is being sent.	1158	// that the CLOSE event is being sent.
1097	close_container ();	1159	close_container ();
1098		1160
1099	--map->players;	1161	--map->players;
1100	map->touch ();	1162	map->touch ();
1101	}	1163	}
1102	else if (pl->container == this)	1164	else if (pl->container_ () == this)
1103	{	1165	{
1104	// removing a container should close it	1166	// removing a container should close it
1105	close_container ();	1167	close_container ();
1106	}	1168	}
1107		1169
…		…
1114	*(below ? &below->above : &ms.bot) = above;	1176	*(below ? &below->above : &ms.bot) = above;
1115		1177
1116	above = 0;	1178	above = 0;
1117	below = 0;	1179	below = 0;
1118		1180
1119	ms.flags_ = 0;	1181	ms.invalidate ();
1120		1182
1121	if (map->in_memory == MAP_SAVING)	1183	if (map->in_memory == MAP_SAVING)
1122	return;	1184	return;
1123		1185
1124	int check_walk_off = !flag [FLAG_NO_APPLY];	1186	int check_walk_off = !flag [FLAG_NO_APPLY];
1125		1187
1126	if (object *pl = ms.player ())	1188	if (object *pl = ms.player ())
1127	{	1189	{
1128	if (pl->container == this)	1190	if (pl->container_ () == this)
1129	/* If a container that the player is currently using somehow gets	1191	/* If a container that the player is currently using somehow gets
1130	* removed (most likely destroyed), update the player view	1192	* removed (most likely destroyed), update the player view
1131	* appropriately.	1193	* appropriately.
1132	*/	1194	*/
1133	pl->close_container ();	1195	pl->close_container ();
…		…
1137	//TODO: update floorbox to preserve ordering	1199	//TODO: update floorbox to preserve ordering
1138	if (pl->contr->ns)	1200	if (pl->contr->ns)
1139	pl->contr->ns->floorbox_update ();	1201	pl->contr->ns->floorbox_update ();
1140	}	1202	}
1141		1203
		1204	if (check_walk_off)
1142	for (tmp = ms.bot; tmp; tmp = tmp->above)	1205	for (object above, tmp = ms.bot; tmp; tmp = above)
1143	{	1206	{
		1207	above = tmp->above;
		1208
1144	/* No point updating the players look faces if he is the object	1209	/* No point updating the players look faces if he is the object
1145	* being removed.	1210	* being removed.
1146	*/	1211	*/
1147		1212
1148	/* See if object moving off should effect something */	1213	/* See if object moving off should effect something */
1149	if (check_walk_off
1150	&& ((move_type & tmp->move_off)	1214	if ((move_type & tmp->move_off)
1151	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))	1215	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0)
1152	{
1153	move_apply (tmp, this, 0);	1216	move_apply (tmp, this, 0);
1154
1155	if (destroyed ())
1156	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1157	}	1217	}
1158		1218
1159	last = tmp;	1219	if (affects_los ())
1160	}
1161
1162	if (flag [FLAG_BLOCKSVIEW] \|\| glow_radius)
1163	update_all_los (map, x, y);	1220	update_all_los (map, x, y);
1164	}	1221	}
1165	}	1222	}
1166		1223
1167	/*	1224	/*
…		…
1263	* just 'op' otherwise	1320	* just 'op' otherwise
1264	*/	1321	*/
1265	object *	1322	object *
1266	insert_ob_in_map (object op, maptile m, object *originator, int flag)	1323	insert_ob_in_map (object op, maptile m, object *originator, int flag)
1267	{	1324	{
1268	if (op->is_on_map ())
1269	{
1270	LOG (llevError, "insert_ob_in_map called for object already on map");
1271	abort ();
1272	}
1273
1274	if (op->env)
1275	{
1276	LOG (llevError, "insert_ob_in_map called for object in an inventory (proceeding)");
1277	op->remove ();	1325	op->remove ();
1278	}
1279		1326
1280	if (m == &freed_map)//D TODO: remove soon	1327	if (m == &freed_map)//D TODO: remove soon
1281	{//D	1328	{//D
1282	LOG (llevError \| logBacktrace, "tries to insret object on freed objects map: %s", op->debug_desc ());//D	1329	LOG (llevError \| logBacktrace, "tries to insret object on freed objects map: %s", op->debug_desc ());//D
1283	}//D	1330	}//D
1284		1331
1285	/* Ideally, the caller figures this out. However, it complicates a lot	1332	/* Ideally, the caller figures this out. However, it complicates a lot
1286	* of areas of callers (eg, anything that uses find_free_spot would now	1333	* of areas of callers (eg, anything that uses find_free_spot would now
1287	* need extra work	1334	* need extra work
1288	*/	1335	*/
		1336	maptile *newmap = m;
1289	if (!xy_normalise (m, op->x, op->y))	1337	if (!xy_normalise (newmap, op->x, op->y))
1290	{	1338	{
1291	op->head_ ()->destroy ();// remove head_ once all tail object destroyers found	1339	op->head_ ()->destroy ();// remove head_ once all tail object destroyers found
1292	return 0;	1340	return 0;
1293	}	1341	}
1294		1342
1295	if (object *more = op->more)	1343	if (object *more = op->more)
1296	if (!insert_ob_in_map (more, m, originator, flag))	1344	if (!insert_ob_in_map (more, m, originator, flag))
1297	return 0;	1345	return 0;
1298		1346
1299	CLEAR_FLAG (op, FLAG_REMOVED);	1347	op->flag [FLAG_REMOVED] = false;
1300		1348	op->env = 0;
1301	op->map = m;	1349	op->map = newmap;
		1350
1302	mapspace &ms = op->ms ();	1351	mapspace &ms = op->ms ();
1303		1352
1304	/* this has to be done after we translate the coordinates.	1353	/* this has to be done after we translate the coordinates.
1305	*/	1354	*/
1306	if (op->nrof && !(flag & INS_NO_MERGE))	1355	if (op->nrof && !(flag & INS_NO_MERGE))
…		…
1327	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");	1376	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");
1328	abort ();	1377	abort ();
1329	}	1378	}
1330		1379
1331	if (!originator->is_on_map ())	1380	if (!originator->is_on_map ())
		1381	{
1332	LOG (llevDebug \| logBacktrace, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map",	1382	LOG (llevError, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map",
1333	op->debug_desc (), originator->debug_desc ());	1383	op->debug_desc (), originator->debug_desc ());
		1384	abort ();
		1385	}
1334		1386
1335	op->above = originator;	1387	op->above = originator;
1336	op->below = originator->below;	1388	op->below = originator->below;
1337	originator->below = op;	1389	originator->below = op;
1338		1390
…		…
1424	op->below = top;	1476	op->below = top;
1425	*(op->above ? &op->above->below : &ms.top) = op;	1477	*(op->above ? &op->above->below : &ms.top) = op;
1426	}	1478	}
1427	}	1479	}
1428		1480
1429	if (op->type == PLAYER)	1481	if (op->is_player ())
1430	{	1482	{
1431	op->contr->do_los = 1;	1483	op->contr->do_los = 1;
1432	++op->map->players;	1484	++op->map->players;
1433	op->map->touch ();	1485	op->map->touch ();
1434	}	1486	}
…		…
1449	* be far away from this change and not affected in any way -	1501	* be far away from this change and not affected in any way -
1450	* this should get redone to only look for players within range,	1502	* this should get redone to only look for players within range,
1451	* or just updating the P_UPTODATE for spaces within this area	1503	* or just updating the P_UPTODATE for spaces within this area
1452	* of effect may be sufficient.	1504	* of effect may be sufficient.
1453	*/	1505	*/
1454	if (op->map->darkness && (op->glow_radius != 0))	1506	if (op->affects_los ())
		1507	{
		1508	op->ms ().invalidate ();
1455	update_all_los (op->map, op->x, op->y);	1509	update_all_los (op->map, op->x, op->y);
		1510	}
1456		1511
1457	/* updates flags (blocked, alive, no magic, etc) for this map space */	1512	/* updates flags (blocked, alive, no magic, etc) for this map space */
1458	update_object (op, UP_OBJ_INSERT);	1513	update_object (op, UP_OBJ_INSERT);
1459		1514
1460	INVOKE_OBJECT (INSERT, op);	1515	INVOKE_OBJECT (INSERT, op);
…		…
1467	* blocked() and wall() work properly), and these flags are updated by	1522	* blocked() and wall() work properly), and these flags are updated by
1468	* update_object().	1523	* update_object().
1469	*/	1524	*/
1470		1525
1471	/* if this is not the head or flag has been passed, don't check walk on status */	1526	/* if this is not the head or flag has been passed, don't check walk on status */
1472	if (!(flag & INS_NO_WALK_ON) && op->head_ () == op)	1527	if (!(flag & INS_NO_WALK_ON) && op->is_head ())
1473	{	1528	{
1474	if (check_move_on (op, originator))	1529	if (check_move_on (op, originator))
1475	return 0;	1530	return 0;
1476		1531
1477	/* If we are a multi part object, lets work our way through the check	1532	/* If we are a multi part object, lets work our way through the check
…		…
1488	/* this function inserts an object in the map, but if it	1543	/* this function inserts an object in the map, but if it
1489	* finds an object of its own type, it'll remove that one first.	1544	* finds an object of its own type, it'll remove that one first.
1490	* op is the object to insert it under: supplies x and the map.	1545	* op is the object to insert it under: supplies x and the map.
1491	*/	1546	*/
1492	void	1547	void
1493	replace_insert_ob_in_map (const char arch_string, object op)	1548	replace_insert_ob_in_map (shstr_tmp archname, object *op)
1494	{	1549	{
1495	/* first search for itself and remove any old instances */	1550	/* first search for itself and remove any old instances */
1496		1551
1497	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)	1552	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1498	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */	1553	if (tmp->arch->archname == archname) /* same archetype */
1499	tmp->destroy ();	1554	tmp->destroy ();
1500		1555
1501	object *tmp = arch_to_object (archetype::find (arch_string));	1556	object *tmp = arch_to_object (archetype::find (archname));
1502		1557
1503	tmp->x = op->x;	1558	tmp->x = op->x;
1504	tmp->y = op->y;	1559	tmp->y = op->y;
1505		1560
1506	insert_ob_in_map (tmp, op->map, op, 0);	1561	insert_ob_in_map (tmp, op->map, op, 0);
…		…
1511	{	1566	{
1512	if (where->env)	1567	if (where->env)
1513	return where->env->insert (this);	1568	return where->env->insert (this);
1514	else	1569	else
1515	return where->map->insert (this, where->x, where->y, originator, flags);	1570	return where->map->insert (this, where->x, where->y, originator, flags);
		1571	}
		1572
		1573	// check whether we can put this into the map, respect max_nrof, max_volume, max_items
		1574	bool
		1575	object::can_drop_at (maptile m, int x, int y, object originator)
		1576	{
		1577	mapspace &ms = m->at (x, y);
		1578
		1579	int items = ms.items ();
		1580
		1581	if (!items // testing !items ensures we can drop at least one item
		1582	\|\| (items < m->max_items
		1583	&& ms.volume () < m->max_volume
		1584	&& nrof <= m->max_nrof))
		1585	return true;
		1586
		1587	if (originator && originator->is_player ())
		1588	originator->contr->failmsg (format (
		1589	"No matter how hard you try, you just cannot put the %s here H<Try to remove some items from the floor first.>",
		1590	query_name ()
		1591	));
		1592
		1593	return false;
1516	}	1594	}
1517		1595
1518	/*	1596	/*
1519	* decrease(object, number) decreases a specified number from	1597	* decrease(object, number) decreases a specified number from
1520	* the amount of an object. If the amount reaches 0, the object	1598	* the amount of an object. If the amount reaches 0, the object
…		…
1655		1733
1656	adjust_weight (this, op->total_weight ());	1734	adjust_weight (this, op->total_weight ());
1657		1735
1658	inserted:	1736	inserted:
1659	/* reset the light list and los of the players on the map */	1737	/* reset the light list and los of the players on the map */
1660	if (op->glow_radius && map && map->darkness)	1738	if (op->glow_radius && is_on_map ())
		1739	{
		1740	update_stats ();
1661	update_all_los (map, x, y);	1741	update_all_los (map, x, y);
1662		1742	}
		1743	else if (is_player () && !flag [FLAG_NO_FIX_PLAYER])
1663	// if this is a player's inventory, update stats	1744	// if this is a player's inventory, update stats
1664	if (type == PLAYER && !flag [FLAG_NO_FIX_PLAYER])
1665	update_stats ();	1745	update_stats ();
1666		1746
1667	INVOKE_OBJECT (INSERT, this);	1747	INVOKE_OBJECT (INSERT, this);
1668		1748
1669	return op;	1749	return op;
…		…
1690	* on top.	1770	* on top.
1691	*/	1771	*/
1692	int	1772	int
1693	check_move_on (object op, object originator)	1773	check_move_on (object op, object originator)
1694	{	1774	{
		1775	if (QUERY_FLAG (op, FLAG_NO_APPLY))
		1776	return 0;
		1777
1695	object *tmp;	1778	object *tmp;
1696	maptile *m = op->map;	1779	maptile *m = op->map;
1697	int x = op->x, y = op->y;	1780	int x = op->x, y = op->y;
1698		1781
1699	MoveType move_on, move_slow, move_block;	1782	mapspace &ms = m->at (x, y);
1700		1783
1701	if (QUERY_FLAG (op, FLAG_NO_APPLY))	1784	ms.update ();
1702	return 0;
1703		1785
1704	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);	1786	MoveType move_on = ms.move_on;
1705	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);	1787	MoveType move_slow = ms.move_slow;
1706	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);	1788	MoveType move_block = ms.move_block;
1707		1789
1708	/* if nothing on this space will slow op down or be applied,	1790	/* if nothing on this space will slow op down or be applied,
1709	* no need to do checking below. have to make sure move_type	1791	* no need to do checking below. have to make sure move_type
1710	* is set, as lots of objects don't have it set - we treat that	1792	* is set, as lots of objects don't have it set - we treat that
1711	* as walking.	1793	* as walking.
…		…
1722	return 0;	1804	return 0;
1723		1805
1724	/* The objects have to be checked from top to bottom.	1806	/* The objects have to be checked from top to bottom.
1725	* Hence, we first go to the top:	1807	* Hence, we first go to the top:
1726	*/	1808	*/
1727		1809	for (object next, tmp = ms.top; tmp; tmp = next)
1728	for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above)
1729	{
1730	/* Trim the search when we find the first other spell effect
1731	* this helps performance so that if a space has 50 spell objects,
1732	* we don't need to check all of them.
1733	*/
1734	if ((tmp->move_type & MOVE_FLY_LOW) && QUERY_FLAG (tmp, FLAG_NO_PICK))
1735	break;
1736	}	1810	{
		1811	next = tmp->below;
1737		1812
1738	for (; tmp; tmp = tmp->below)
1739	{
1740	if (tmp == op)	1813	if (tmp == op)
1741	continue; /* Can't apply yourself */	1814	continue; /* Can't apply yourself */
1742		1815
1743	/* Check to see if one of the movement types should be slowed down.	1816	/* Check to see if one of the movement types should be slowed down.
1744	* Second check makes sure that the movement types not being slowed	1817	* Second check makes sure that the movement types not being slowed
…		…
1749	if (!QUERY_FLAG (op, FLAG_WIZPASS))	1822	if (!QUERY_FLAG (op, FLAG_WIZPASS))
1750	{	1823	{
1751	if ((!op->move_type && tmp->move_slow & MOVE_WALK) \|\|	1824	if ((!op->move_type && tmp->move_slow & MOVE_WALK) \|\|
1752	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))	1825	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1753	{	1826	{
1754
1755	float
1756	diff = tmp->move_slow_penalty * fabs (op->speed);	1827	float diff = tmp->move_slow_penalty * fabs (op->speed);
1757		1828
1758	if (op->type == PLAYER)	1829	if (op->is_player ())
1759	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) \|\|	1830	if ((tmp->flag [FLAG_IS_HILLY ] && find_skill_by_number (op, SK_CLIMBING)) \|\|
1760	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))	1831	(tmp->flag [FLAG_IS_WOODED] && find_skill_by_number (op, SK_WOODSMAN)))
1761	diff /= 4.0;	1832	diff /= 4.0;
1762		1833
1763	op->speed_left -= diff;	1834	op->speed_left -= diff;
1764	}	1835	}
1765	}	1836	}
…		…
1971	* head of the object should correspond for the entire object.	2042	* head of the object should correspond for the entire object.
1972	*/	2043	*/
1973	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))	2044	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
1974	continue;	2045	continue;
1975		2046
1976	if (ob->blocked (m, pos.x, pos.y))	2047	if (ob->blocked (pos.m, pos.x, pos.y))
1977	continue;	2048	continue;
1978		2049
1979	altern [index++] = i;	2050	altern [index++] = i;
1980	}	2051	}
1981		2052
…		…
2049	* there is capable of.	2120	* there is capable of.
2050	*/	2121	*/
2051	int	2122	int
2052	find_dir (maptile m, int x, int y, object exclude)	2123	find_dir (maptile m, int x, int y, object exclude)
2053	{	2124	{
2054	int i, max = SIZEOFFREE, mflags;	2125	int max = SIZEOFFREE, mflags;
2055
2056	sint16 nx, ny;
2057	object *tmp;
2058	maptile *mp;
2059
2060	MoveType blocked, move_type;	2126	MoveType move_type;
2061		2127
2062	if (exclude && exclude->head_ () != exclude)	2128	if (exclude && exclude->head_ () != exclude)
2063	{	2129	{
2064	exclude = exclude->head;	2130	exclude = exclude->head;
2065	move_type = exclude->move_type;	2131	move_type = exclude->move_type;
…		…
2068	{	2134	{
2069	/* If we don't have anything, presume it can use all movement types. */	2135	/* If we don't have anything, presume it can use all movement types. */
2070	move_type = MOVE_ALL;	2136	move_type = MOVE_ALL;
2071	}	2137	}
2072		2138
2073	for (i = 1; i < max; i++)	2139	for (int i = 1; i < max; i++)
2074	{	2140	{
2075	mp = m;	2141	mapxy pos (m, x, y);
2076	nx = x + freearr_x[i];	2142	pos.move (i);
2077	ny = y + freearr_y[i];
2078		2143
2079	mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);	2144	if (!pos.normalise ())
2080
2081	if (mflags & P_OUT_OF_MAP)
2082	max = maxfree[i];	2145	max = maxfree[i];
2083	else	2146	else
2084	{	2147	{
2085	mapspace &ms = mp->at (nx, ny);	2148	mapspace &ms = *pos;
2086		2149
2087	blocked = ms.move_block;
2088
2089	if ((move_type & blocked) == move_type)	2150	if ((move_type & ms.move_block) == move_type)
2090	max = maxfree[i];	2151	max = maxfree [i];
2091	else if (mflags & P_IS_ALIVE)	2152	else if (ms.flags () & P_IS_ALIVE)
2092	{	2153	{
2093	for (tmp = ms.bot; tmp; tmp = tmp->above)	2154	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
2094	if ((tmp->flag [FLAG_MONSTER] \|\| tmp->type == PLAYER)	2155	if ((tmp->flag [FLAG_MONSTER] \|\| tmp->is_player ())
2095	&& (tmp != exclude \|\| (tmp->head_ () != tmp && tmp->head_ () != exclude)))	2156	&& (tmp != exclude \|\| (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2096	break;
2097
2098	if (tmp)
2099	return freedir[i];	2157	return freedir [i];
2100	}	2158	}
2101	}	2159	}
2102	}	2160	}
2103		2161
2104	return 0;	2162	return 0;
…		…
2179	* This basically means that if direction is 15, then it could either go	2237	* This basically means that if direction is 15, then it could either go
2180	* direction 4, 14, or 16 to get back to where we are.	2238	* direction 4, 14, or 16 to get back to where we are.
2181	* Moved from spell_util.c to object.c with the other related direction	2239	* Moved from spell_util.c to object.c with the other related direction
2182	* functions.	2240	* functions.
2183	*/	2241	*/
2184	int reduction_dir[SIZEOFFREE][3] = {	2242	static const int reduction_dir[SIZEOFFREE][3] = {
2185	{0, 0, 0}, /* 0 */	2243	{0, 0, 0}, /* 0 */
2186	{0, 0, 0}, /* 1 */	2244	{0, 0, 0}, /* 1 */
2187	{0, 0, 0}, /* 2 */	2245	{0, 0, 0}, /* 2 */
2188	{0, 0, 0}, /* 3 */	2246	{0, 0, 0}, /* 3 */
2189	{0, 0, 0}, /* 4 */	2247	{0, 0, 0}, /* 4 */
…		…
2285	int	2343	int
2286	can_pick (const object who, const object item)	2344	can_pick (const object who, const object item)
2287	{	2345	{
2288	return /QUERY_FLAG(who,FLAG_WIZ)\|\| /	2346	return /QUERY_FLAG(who,FLAG_WIZ)\|\| /
2289	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&	2347	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
2290	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER \|\| item->weight < who->weight / 3));	2348	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->is_player () \|\| item->weight < who->weight / 3));
2291	}	2349	}
2292		2350
2293	/*	2351	/*
2294	* create clone from object to another	2352	* create clone from object to another
2295	*/	2353	*/
…		…
2327	return tmp;	2385	return tmp;
2328		2386
2329	return 0;	2387	return 0;
2330	}	2388	}
2331		2389
2332	const shstr &	2390	shstr_tmp
2333	object::kv_get (const shstr &key) const	2391	object::kv_get (shstr_tmp key) const
2334	{	2392	{
2335	for (key_value *kv = key_values; kv; kv = kv->next)	2393	for (key_value *kv = key_values; kv; kv = kv->next)
2336	if (kv->key == key)	2394	if (kv->key == key)
2337	return kv->value;	2395	return kv->value;
2338		2396
2339	return shstr_null;	2397	return shstr ();
2340	}	2398	}
2341		2399
2342	void	2400	void
2343	object::kv_set (const shstr &key, const shstr &value)	2401	object::kv_set (shstr_tmp key, shstr_tmp value)
2344	{	2402	{
2345	for (key_value *kv = key_values; kv; kv = kv->next)	2403	for (key_value *kv = key_values; kv; kv = kv->next)
2346	if (kv->key == key)	2404	if (kv->key == key)
2347	{	2405	{
2348	kv->value = value;	2406	kv->value = value;
…		…
2357		2415
2358	key_values = kv;	2416	key_values = kv;
2359	}	2417	}
2360		2418
2361	void	2419	void
2362	object::kv_del (const shstr &key)	2420	object::kv_del (shstr_tmp key)
2363	{	2421	{
2364	for (key_value *kvp = &key_values; kvp; kvp = &(*kvp)->next)	2422	for (key_value *kvp = &key_values; kvp; kvp = &(*kvp)->next)
2365	if ((*kvp)->key == key)	2423	if ((*kvp)->key == key)
2366	{	2424	{
2367	key_value kv = kvp;	2425	key_value kv = kvp;
…		…
2498	container = 0;	2556	container = 0;
2499		2557
2500	// client needs item update to make it work, client bug requires this to be separate	2558	// client needs item update to make it work, client bug requires this to be separate
2501	esrv_update_item (UPD_FLAGS, this, old_container);	2559	esrv_update_item (UPD_FLAGS, this, old_container);
2502		2560
2503	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));	2561	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", old_container->query_name ());
2504	play_sound (sound_find ("chest_close"));	2562	play_sound (sound_find ("chest_close"));
2505	}	2563	}
2506		2564
2507	if (new_container)	2565	if (new_container)
2508	{	2566	{
…		…
2518	closer->flag [FLAG_NO_MAP_SAVE] = 1;	2576	closer->flag [FLAG_NO_MAP_SAVE] = 1;
2519	new_container->insert (closer);	2577	new_container->insert (closer);
2520	}	2578	}
2521	#endif	2579	#endif
2522		2580
2523	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));	2581	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", new_container->query_name ());
2524		2582
2525	// make sure the container is available, client bug requires this to be separate	2583	// make sure the container is available, client bug requires this to be separate
2526	esrv_send_item (this, new_container);	2584	esrv_send_item (this, new_container);
2527		2585
2528	new_container->flag [FLAG_APPLIED] = true;	2586	new_container->flag [FLAG_APPLIED] = true;
…		…
2536	// else if (!old_container->env && contr && contr->ns)	2594	// else if (!old_container->env && contr && contr->ns)
2537	// contr->ns->floorbox_reset ();	2595	// contr->ns->floorbox_reset ();
2538	}	2596	}
2539		2597
2540	object *	2598	object *
2541	object::force_find (const shstr name)	2599	object::force_find (shstr_tmp name)
2542	{	2600	{
2543	/* cycle through his inventory to look for the MARK we want to	2601	/* cycle through his inventory to look for the MARK we want to
2544	* place	2602	* place
2545	*/	2603	*/
2546	for (object *tmp = inv; tmp; tmp = tmp->below)	2604	for (object *tmp = inv; tmp; tmp = tmp->below)
…		…
2548	return splay (tmp);	2606	return splay (tmp);
2549		2607
2550	return 0;	2608	return 0;
2551	}	2609	}
2552		2610
		2611	//-GPL
		2612
2553	void	2613	void
		2614	object::force_set_timer (int duration)
		2615	{
		2616	this->duration = 1;
		2617	this->speed_left = -1.f;
		2618
		2619	this->set_speed (duration ? 1.f / duration : 0.f);
		2620	}
		2621
		2622	object *
2554	object::force_add (const shstr name, int duration)	2623	object::force_add (shstr_tmp name, int duration)
2555	{	2624	{
2556	if (object *force = force_find (name))	2625	if (object *force = force_find (name))
2557	force->destroy ();	2626	force->destroy ();
2558		2627
2559	object *force = get_archetype (FORCE_NAME);	2628	object *force = get_archetype (FORCE_NAME);
2560		2629
2561	force->slaying = name;	2630	force->slaying = name;
2562	force->stats.food = 1;	2631	force->force_set_timer (duration);
2563	force->speed_left = -1.f;
2564
2565	force->set_speed (duration ? 1.f / duration : 0.f);
2566	force->flag [FLAG_IS_USED_UP] = true;
2567	force->flag [FLAG_APPLIED] = true;	2632	force->flag [FLAG_APPLIED] = true;
2568		2633
2569	insert (force);	2634	return insert (force);
2570	}	2635	}
2571		2636
2572	void	2637	void
2573	object::play_sound (faceidx sound)	2638	object::play_sound (faceidx sound) const
2574	{	2639	{
2575	if (!sound)	2640	if (!sound)
2576	return;	2641	return;
2577		2642
2578	if (flag [FLAG_REMOVED])	2643	if (is_on_map ())
		2644	map->play_sound (sound, x, y);
		2645	else if (object *pl = in_player ())
		2646	pl->contr->play_sound (sound);
		2647	}
		2648
		2649	void
		2650	object::say_msg (const char *msg) const
		2651	{
		2652	if (is_on_map ())
		2653	map->say_msg (msg, x, y);
		2654	else if (object *pl = in_player ())
		2655	pl->contr->play_sound (sound);
		2656	}
		2657
		2658	void
		2659	object::make_noise ()
		2660	{
		2661	// we do not model noise in the map, so instead put
		2662	// a temporary light into the noise source
		2663	// could use the map instead, but that's less reliable for our
		2664	// goal, which is to make invisibility a bit harder to exploit
		2665
		2666	// currently only works sensibly for players
		2667	if (!is_player ())
2579	return;	2668	return;
2580		2669
2581	if (env)	2670	// find old force, or create new one
2582	{	2671	object *force = force_find (shstr_noise_force);
2583	if (object *pl = in_player ())	2672
2584	pl->contr->play_sound (sound);	2673	if (force)
2585	}	2674	force->speed_left = -1.f; // patch old speed up
2586	else	2675	else
2587	map->play_sound (sound, x, y);	2676	{
2588	}	2677	force = archetype::get (shstr_noise_force);
2589		2678
		2679	force->slaying = shstr_noise_force;
		2680	force->stats.food = 1;
		2681	force->speed_left = -1.f;
		2682
		2683	force->set_speed (1.f / 4.f);
		2684	force->flag [FLAG_IS_USED_UP] = true;
		2685	force->flag [FLAG_APPLIED] = true;
		2686
		2687	insert (force);
		2688	}
		2689	}
		2690

Diff Legend

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

Comparing deliantra/server/common/object.C (file contents): Revision 1.259 by root, Mon Sep 29 10:32:50 2008 UTC vs. Revision 1.300 by root, Mon Nov 9 03:08:23 2009 UTC

Diff Legend

Comparing deliantra/server/common/object.C (file contents):
Revision 1.259 by root, Mon Sep 29 10:32:50 2008 UTC vs.
Revision 1.300 by root, Mon Nov 9 03:08:23 2009 UTC