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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.272 by root, Sat Dec 27 04:09:58 2008 UTC vs.
Revision 1.301 by root, Mon Nov 9 18:47:56 2009 UTC

…		…
1	/*	1	/*
2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.	2	* This file is part of Deliantra, the Roguelike Realtime MMORPG.
3	*	3	*
4	* Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team	4	* Copyright (©) 2005,2006,2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5	* Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team	5	* Copyright (©) 2001,2007 Mark Wedel & Crossfire Development Team
6	* Copyright (©) 1992,2007 Frank Tore Johansen	6	* Copyright (©) 1992,2007 Frank Tore Johansen
7	*	7	*
8	* Deliantra is free software: you can redistribute it and/or modify	8	* Deliantra is free software: you can redistribute it and/or modify it under
9	* it under the terms of the GNU General Public License as published by	9	* the terms of the Affero GNU General Public License as published by the
10	* the Free Software Foundation, either version 3 of the License, or	10	* Free Software Foundation, either version 3 of the License, or (at your
11	* (at your option) any later version.	11	* option) any later version.
12	*	12	*
13	* This program is distributed in the hope that it will be useful,	13	* This program is distributed in the hope that it will be useful,
14	* but WITHOUT ANY WARRANTY; without even the implied warranty of	14	* but WITHOUT ANY WARRANTY; without even the implied warranty of
15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	15	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16	* GNU General Public License for more details.	16	* GNU General Public License for more details.
17	*	17	*
18	* You should have received a copy of the GNU General Public License	18	* You should have received a copy of the Affero GNU General Public License
19	* along with this program. If not, see <http://www.gnu.org/licenses/>.	19	* and the GNU General Public License along with this program. If not, see
		20	* <http://www.gnu.org/licenses/>.
20	*	21	*
21	* The authors can be reached via e-mail to <support@deliantra.net>	22	* The authors can be reached via e-mail to <support@deliantra.net>
22	*/	23	*/
23		24
24	#include <global.h>	25	#include <global.h>
36	static const uint64 UUID_GAP = 1<<19;	37	static const uint64 UUID_GAP = 1<<19;
37	uint32_t mapspace::smellcount = 10000;	38	uint32_t mapspace::smellcount = 10000;
38		39
39	objectvec objects;	40	objectvec objects;
40	activevec actives;	41	activevec actives;
		42
		43	//+GPL
41		44
42	short freearr_x[SIZEOFFREE] = {	45	short freearr_x[SIZEOFFREE] = {
43	0,	46	0,
44	0, 1, 1, 1, 0, -1, -1, -1,	47	0, 1, 1, 1, 0, -1, -1, -1,
45	0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,	48	0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2, -2, -2, -2, -1,
…		…
49	0,	52	0,
50	-1, -1, 0, 1, 1, 1, 0, -1,	53	-1, -1, 0, 1, 1, 1, 0, -1,
51	-2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2,	54	-2, -2, -2, -1, 0, 1, 2, 2, 2, 2, 2, 1, 0, -1, -2, -2,
52	-3, -3, -3, -3, -2, -1, 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3	55	-3, -3, -3, -3, -2, -1, 0, 1, 2, 3, 3, 3, 3, 3, 3, 3, 2, 1, 0, -1, -2, -3, -3, -3
53	};	56	};
54	int maxfree[SIZEOFFREE] = {
55	0,
56	9, 10, 13, 14, 17, 18, 21, 22,
57	25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45, 48,
58	49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49
59	};
60	int freedir[SIZEOFFREE] = {	57	int freedir[SIZEOFFREE] = {
61	0,	58	0,
62	1, 2, 3, 4, 5, 6, 7, 8,	59	1, 2, 3, 4, 5, 6, 7, 8,
63	1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8,	60	1, 2, 2, 2, 3, 4, 4, 4, 5, 6, 6, 6, 7, 8, 8, 8,
64	1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8	61	1, 2, 2, 2, 2, 2, 3, 4, 4, 4, 4, 4, 5, 6, 6, 6, 6, 6, 7, 8, 8, 8, 8, 8
		62	};
		63
		64	static int maxfree[SIZEOFFREE] = {
		65	0,
		66	9, 10, 13, 14, 17, 18, 21, 22,
		67	25, 26, 27, 30, 31, 32, 33, 36, 37, 39, 39, 42, 43, 44, 45, 48,
		68	49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49, 49
65	};	69	};
66		70
67	static void	71	static void
68	write_uuid (uval64 skip, bool sync)	72	write_uuid (uval64 skip, bool sync)
69	{	73	{
…		…
97		101
98	LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);	102	LOG (llevError, "FATAL: cannot open %s for reading!\n", filename);
99	_exit (1);	103	_exit (1);
100	}	104	}
101		105
102	UUID::BUF buf;	106	char buf [UUID::MAX_LEN];
103	buf[0] = 0;	107	buf[0] = 0;
104	fgets (buf, sizeof (buf), fp);	108	fgets (buf, sizeof (buf), fp);
105		109
106	if (!UUID::cur.parse (buf))	110	if (!UUID::cur.parse (buf))
107	{	111	{
…		…
134		138
135	void	139	void
136	UUID::init ()	140	UUID::init ()
137	{	141	{
138	read_uuid ();	142	read_uuid ();
		143	}
		144
		145	bool
		146	UUID::parse (const char *s)
		147	{
		148	if (s++ != '<' \|\| s++ != '1' \|\| *s++ != '.')
		149	return false;
		150
		151	seq = 0;
		152
		153	while (*s != '>')
		154	{
		155	if (*s < '0')
		156	return false;
		157
		158	// this gives nice branchless code with gcc
		159	assert ('0' < 'a' && '0' == 48 && 'a' == 97);
		160	int digit = (s + (s & 0x40 ? 9 : 0)) & 15;
		161
		162	seq = (seq << 4) \| digit;
		163
		164	++s;
		165	}
		166
		167	return true;
		168	}
		169
		170	char *
		171	UUID::append (char *buf) const
		172	{
		173	*buf++ = '<';
		174	*buf++ = '1';
		175	*buf++ = '.';
		176
		177	uint64_t seq = this->seq;
		178	const int bits = 64;
		179	char nz = 0;
		180	static const char tohex [] = "0123456789abcdef";
		181
		182	// assert (len >= 3 + bits / 4 + 1 + 1);
		183	for (int i = bits / 4; --i; )
		184	{
		185	uint8_t digit = seq >> (bits - 4);
		186
		187	*buf = tohex [digit];
		188	nz \|= digit;
		189	buf += nz ? 1 : 0;
		190	seq <<= 4;
		191	}
		192
		193	// last digit is special - always emit
		194	uint8_t digit = seq >> (bits - 4);
		195	*buf++ = tohex [digit];
		196
		197	*buf++ = '>';
		198
		199	return buf;
		200	}
		201
		202	char *
		203	UUID::c_str () const
		204	{
		205	static char buf [MAX_LEN];
		206	*append (buf) = 0;
		207	return buf;
139	}	208	}
140		209
141	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */	210	/* Returns TRUE if every key_values in wants has a partner with the same value in has. */
142	static bool	211	static bool
143	compare_ob_value_lists_one (const object wants, const object has)	212	compare_ob_value_lists_one (const object wants, const object has)
…		…
182	bool object::can_merge_slow (object ob1, object ob2)	251	bool object::can_merge_slow (object ob1, object ob2)
183	{	252	{
184	/* A couple quicksanity checks */	253	/* A couple quicksanity checks */
185	if (ob1 == ob2	254	if (ob1 == ob2
186	\|\| ob1->type != ob2->type	255	\|\| ob1->type != ob2->type
187	\|\| ob1->speed != ob2->speed	256	\|\| fabs (ob1->speed - ob2->speed) >= MIN_ACTIVE_SPEED
188	\|\| ob1->value != ob2->value	257	\|\| ob1->value != ob2->value
189	\|\| ob1->name != ob2->name)	258	\|\| ob1->name != ob2->name)
190	return 0;	259	return 0;
191		260
192	/* Do not merge objects if nrof would overflow, assume nrof	261	/* Do not merge objects if nrof would overflow, assume nrof
…		…
226	\|\| ob1->move_block != ob2->move_block	295	\|\| ob1->move_block != ob2->move_block
227	\|\| ob1->move_allow != ob2->move_allow	296	\|\| ob1->move_allow != ob2->move_allow
228	\|\| ob1->move_on != ob2->move_on	297	\|\| ob1->move_on != ob2->move_on
229	\|\| ob1->move_off != ob2->move_off	298	\|\| ob1->move_off != ob2->move_off
230	\|\| ob1->move_slow != ob2->move_slow	299	\|\| ob1->move_slow != ob2->move_slow
231	\|\| ob1->move_slow_penalty != ob2->move_slow_penalty	300	\|\| fabs (ob1->move_slow_penalty - ob2->move_slow_penalty) >= (1.f / 1024.f)
232	\|\| memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))	301	\|\| memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
233	\|\| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats)))	302	\|\| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats)))
234	return 0;	303	return 0;
235		304
236	if ((ob1->flag ^ ob2->flag)	305	if ((ob1->flag ^ ob2->flag)
…		…
328	// the player inventory itself is always visible	397	// the player inventory itself is always visible
329	if (env->is_player ())	398	if (env->is_player ())
330	return env;	399	return env;
331		400
332	// else a player could have our env open	401	// else a player could have our env open
333	object *envest = env->outer_env ();	402	object *envest = env->outer_env_or_self ();
334		403
335	// 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
336	// even if our inv is in a player.	405	// even if our inv is in a player.
337	if (envest->is_on_map ())	406	if (envest->is_on_map ())
338	if (object *pl = envest->ms ().player ())	407	if (object *pl = envest->ms ().player ())
339	if (pl->container == env)	408	if (pl->container_ () == env)
340	return pl;	409	return pl;
341	}	410	}
342	else	411	else
343	{	412	{
344	// maybe there is a player standing on the same mapspace	413	// maybe there is a player standing on the same mapspace
345	// this will catch the case where "this" is a player	414	// this will catch the case where "this" is a player
346	if (object *pl = ms ().player ())	415	if (object *pl = ms ().player ())
347	if ((!pl->container && pl->contr->ns && !pl->contr->ns->update_look)	416	if ((pl->contr->ns && !pl->container_ () && !pl->contr->ns->update_look)
348	\|\| this == pl->container)	417	\|\| pl->container_ () == this)
349	return pl;	418	return pl;
350	}	419	}
351	}	420	}
352		421
353	return 0;	422	return 0;
…		…
431	object_freezer freezer;	500	object_freezer freezer;
432	op->write (freezer);	501	op->write (freezer);
433	return freezer.as_string ();	502	return freezer.as_string ();
434	}	503	}
435		504
436	/*	505	char *
437	* get_nearest_part(multi-object, object 2) returns the part of the	506	object::as_string ()
438	* multi-object 1 which is closest to the second object.
439	* If it's not a multi-object, it is returned.
440	*/
441	object *
442	get_nearest_part (object op, const object pl)
443	{	507	{
444	object tmp, closest;	508	return dump_object (this);
445	int last_dist, i;
446
447	if (!op->more)
448	return op;
449
450	for (last_dist = distance (op, pl), closest = op, tmp = op->more;
451	tmp;
452	tmp = tmp->more)
453	if ((i = distance (tmp, pl)) < last_dist)
454	closest = tmp, last_dist = i;
455
456	return closest;
457	}	509	}
458		510
459	/*	511	/*
460	* 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.
461	* VERRRY slow.	513	* VERRRY slow.
…		…
555	update_stats ();	607	update_stats ();
556		608
557	new_draw_info_format (NDI_UNIQUE, 0, this,	609	new_draw_info_format (NDI_UNIQUE, 0, this,
558	"You try to balance all your items at once, "	610	"You try to balance all your items at once, "
559	"but the %s is just too much for your body. "	611	"but the %s is just too much for your body. "
560	"[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);
561	return false;	614	return false;
562	}	615	}
563		616
564	//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);
565	}	618	}
…		…
691	* 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.
692	*/	745	*/
693	void	746	void
694	object::set_speed (float speed)	747	object::set_speed (float speed)
695	{	748	{
696	if (flag [FLAG_FREED] && speed)
697	{
698	LOG (llevError, "Object %s is freed but has speed.\n", &name);
699	speed = 0;
700	}
701
702	this->speed = speed;	749	this->speed = speed;
703		750
704	if (has_active_speed ())	751	if (has_active_speed ())
705	activate ();	752	activate ();
706	else	753	else
…		…
756		803
757	if (!(m.flags_ & P_UPTODATE))	804	if (!(m.flags_ & P_UPTODATE))
758	/* nop */;	805	/* nop */;
759	else if (action == UP_OBJ_INSERT)	806	else if (action == UP_OBJ_INSERT)
760	{	807	{
		808	#if 0
761	// this is likely overkill, TODO: revisit (schmorp)	809	// this is likely overkill, TODO: revisit (schmorp)
762	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))	810	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
763	\|\| (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))	811	\|\| (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))
764	\|\| (op->is_player () && !(m.flags_ & P_PLAYER))	812	\|\| (op->is_player () && !(m.flags_ & P_PLAYER))
765	\|\| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))	813	\|\| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
…		…
770	\|\| (m.move_slow \| op->move_slow) != m.move_slow	818	\|\| (m.move_slow \| op->move_slow) != m.move_slow
771	/* 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
772	* have move_allow right now.	820	* have move_allow right now.
773	*/	821	*/
774	\|\| ((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
775	\|\| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)
776	m.invalidate ();	823	m.invalidate ();
		824	#else
		825	// the above is not strong enough a test to skip updating. los maybe? TODO (schmorp)
		826	m.invalidate ();
		827	#endif
777	}	828	}
778	/* if the object is being removed, we can't make intelligent	829	/* if the object is being removed, we can't make intelligent
779	* decisions, because remove_ob can't really pass the object	830	* decisions, because remove_ob can't really pass the object
780	* that is being removed.	831	* that is being removed.
781	*/	832	*/
…		…
792		843
793	object::object ()	844	object::object ()
794	{	845	{
795	SET_FLAG (this, FLAG_REMOVED);	846	SET_FLAG (this, FLAG_REMOVED);
796		847
797	expmul = 1.0;	848	//expmul = 1.0; declared const for the time being
798	face = blank_face;	849	face = blank_face;
799	}	850	}
800		851
801	object::~object ()	852	object::~object ()
802	{	853	{
…		…
831	{	882	{
832	/* If already on active list, don't do anything */	883	/* If already on active list, don't do anything */
833	if (active)	884	if (active)
834	return;	885	return;
835		886
836	if (has_active_speed () && flag [FLAG_FREED]) LOG (llevError \| logBacktrace, "BUG: tried to activate freed object %s\n", debug_desc ());//D
837	if (has_active_speed () && flag [FLAG_DEBUG]) LOG (llevError \| logBacktrace, "BUG: tried to activate DEBUG object %s\n", debug_desc ());//D temp
838
839	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
840	actives.insert (this);	892	actives.insert (this);
		893	}
841	}	894	}
842		895
843	void	896	void
844	object::activate_recursive ()	897	object::activate_recursive ()
845	{	898	{
…		…
963		1016
964	void	1017	void
965	object::do_destroy ()	1018	object::do_destroy ()
966	{	1019	{
967	if (flag [FLAG_IS_LINKED])	1020	if (flag [FLAG_IS_LINKED])
968	remove_button_link (this);	1021	remove_link ();
969		1022
970	if (flag [FLAG_FRIENDLY])	1023	if (flag [FLAG_FRIENDLY])
971	remove_friendly_object (this);	1024	remove_friendly_object (this);
972		1025
973	remove ();	1026	remove ();
…		…
1031	* the previous environment.	1084	* the previous environment.
1032	*/	1085	*/
1033	void	1086	void
1034	object::do_remove ()	1087	object::do_remove ()
1035	{	1088	{
1036	object tmp, last = 0;
1037	object *otmp;
1038
1039	if (flag [FLAG_REMOVED])	1089	if (flag [FLAG_REMOVED])
1040	return;	1090	return;
1041		1091
1042	INVOKE_OBJECT (REMOVE, this);	1092	INVOKE_OBJECT (REMOVE, this);
1043		1093
…		…
1097		1147
1098	if (object *pl = ms.player ())	1148	if (object *pl = ms.player ())
1099	{	1149	{
1100	if (is_player ())	1150	if (is_player ())
1101	{	1151	{
		1152	if (!flag [FLAG_WIZPASS])
1102	ms.smell = ++mapspace::smellcount; // remember the smell of the player	1153	ms.smell = ++mapspace::smellcount; // remember the smell of the player
1103		1154
1104	// leaving a spot always closes any open container on the ground	1155	// leaving a spot always closes any open container on the ground
1105	if (container && !container->env)	1156	if (container && !container->env)
1106	// this causes spurious floorbox updates, but it ensures	1157	// this causes spurious floorbox updates, but it ensures
1107	// that the CLOSE event is being sent.	1158	// that the CLOSE event is being sent.
1108	close_container ();	1159	close_container ();
1109		1160
1110	--map->players;	1161	--map->players;
1111	map->touch ();	1162	map->touch ();
1112	}	1163	}
1113	else if (pl->container == this)	1164	else if (pl->container_ () == this)
1114	{	1165	{
1115	// removing a container should close it	1166	// removing a container should close it
1116	close_container ();	1167	close_container ();
1117	}	1168	}
1118		1169
…		…
1134		1185
1135	int check_walk_off = !flag [FLAG_NO_APPLY];	1186	int check_walk_off = !flag [FLAG_NO_APPLY];
1136		1187
1137	if (object *pl = ms.player ())	1188	if (object *pl = ms.player ())
1138	{	1189	{
1139	if (pl->container == this)	1190	if (pl->container_ () == this)
1140	/* If a container that the player is currently using somehow gets	1191	/* If a container that the player is currently using somehow gets
1141	* removed (most likely destroyed), update the player view	1192	* removed (most likely destroyed), update the player view
1142	* appropriately.	1193	* appropriately.
1143	*/	1194	*/
1144	pl->close_container ();	1195	pl->close_container ();
…		…
1148	//TODO: update floorbox to preserve ordering	1199	//TODO: update floorbox to preserve ordering
1149	if (pl->contr->ns)	1200	if (pl->contr->ns)
1150	pl->contr->ns->floorbox_update ();	1201	pl->contr->ns->floorbox_update ();
1151	}	1202	}
1152		1203
		1204	if (check_walk_off)
1153	for (tmp = ms.bot; tmp; tmp = tmp->above)	1205	for (object above, tmp = ms.bot; tmp; tmp = above)
1154	{	1206	{
		1207	above = tmp->above;
		1208
1155	/* 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
1156	* being removed.	1210	* being removed.
1157	*/	1211	*/
1158		1212
1159	/* See if object moving off should effect something */	1213	/* See if object moving off should effect something */
1160	if (check_walk_off
1161	&& ((move_type & tmp->move_off)	1214	if ((move_type & tmp->move_off)
1162	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))	1215	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0)
1163	{
1164	move_apply (tmp, this, 0);	1216	move_apply (tmp, this, 0);
1165
1166	if (destroyed ())
1167	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1168	}	1217	}
1169
1170	last = tmp;
1171	}
1172		1218
1173	if (affects_los ())	1219	if (affects_los ())
1174	update_all_los (map, x, y);	1220	update_all_los (map, x, y);
1175	}	1221	}
1176	}	1222	}
…		…
1285		1331
1286	/* Ideally, the caller figures this out. However, it complicates a lot	1332	/* Ideally, the caller figures this out. However, it complicates a lot
1287	* 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
1288	* need extra work	1334	* need extra work
1289	*/	1335	*/
		1336	maptile *newmap = m;
1290	if (!xy_normalise (m, op->x, op->y))	1337	if (!xy_normalise (newmap, op->x, op->y))
1291	{	1338	{
1292	op->head_ ()->destroy ();// remove head_ once all tail object destroyers found	1339	op->head_ ()->destroy ();// remove head_ once all tail object destroyers found
1293	return 0;	1340	return 0;
1294	}	1341	}
1295		1342
1296	if (object *more = op->more)	1343	if (object *more = op->more)
1297	if (!insert_ob_in_map (more, m, originator, flag))	1344	if (!insert_ob_in_map (more, m, originator, flag))
1298	return 0;	1345	return 0;
1299		1346
1300	CLEAR_FLAG (op, FLAG_REMOVED);	1347	op->flag [FLAG_REMOVED] = false;
1301		1348	op->env = 0;
1302	op->map = m;	1349	op->map = newmap;
		1350
1303	mapspace &ms = op->ms ();	1351	mapspace &ms = op->ms ();
1304		1352
1305	/* this has to be done after we translate the coordinates.	1353	/* this has to be done after we translate the coordinates.
1306	*/	1354	*/
1307	if (op->nrof && !(flag & INS_NO_MERGE))	1355	if (op->nrof && !(flag & INS_NO_MERGE))
…		…
1328	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");
1329	abort ();	1377	abort ();
1330	}	1378	}
1331		1379
1332	if (!originator->is_on_map ())	1380	if (!originator->is_on_map ())
		1381	{
1333	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",
1334	op->debug_desc (), originator->debug_desc ());	1383	op->debug_desc (), originator->debug_desc ());
		1384	abort ();
		1385	}
1335		1386
1336	op->above = originator;	1387	op->above = originator;
1337	op->below = originator->below;	1388	op->below = originator->below;
1338	originator->below = op;	1389	originator->below = op;
1339		1390
…		…
1471	* blocked() and wall() work properly), and these flags are updated by	1522	* blocked() and wall() work properly), and these flags are updated by
1472	* update_object().	1523	* update_object().
1473	*/	1524	*/
1474		1525
1475	/* 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 */
1476	if (!(flag & INS_NO_WALK_ON) && op->head_ () == op)	1527	if (!(flag & INS_NO_WALK_ON) && op->is_head ())
1477	{	1528	{
1478	if (check_move_on (op, originator))	1529	if (check_move_on (op, originator))
1479	return 0;	1530	return 0;
1480		1531
1481	/* 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
…		…
1492	/* this function inserts an object in the map, but if it	1543	/* this function inserts an object in the map, but if it
1493	* 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.
1494	* 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.
1495	*/	1546	*/
1496	void	1547	void
1497	replace_insert_ob_in_map (const char arch_string, object op)	1548	replace_insert_ob_in_map (shstr_tmp archname, object *op)
1498	{	1549	{
1499	/* first search for itself and remove any old instances */	1550	/* first search for itself and remove any old instances */
1500		1551
1501	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)	1552	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1502	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */	1553	if (tmp->arch->archname == archname) /* same archetype */
1503	tmp->destroy ();	1554	tmp->destroy ();
1504		1555
1505	object *tmp = arch_to_object (archetype::find (arch_string));	1556	object *tmp = arch_to_object (archetype::find (archname));
1506		1557
1507	tmp->x = op->x;	1558	tmp->x = op->x;
1508	tmp->y = op->y;	1559	tmp->y = op->y;
1509		1560
1510	insert_ob_in_map (tmp, op->map, op, 0);	1561	insert_ob_in_map (tmp, op->map, op, 0);
…		…
1515	{	1566	{
1516	if (where->env)	1567	if (where->env)
1517	return where->env->insert (this);	1568	return where->env->insert (this);
1518	else	1569	else
1519	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_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	return true;
		1585
		1586	if (originator && originator->is_player ())
		1587	originator->contr->failmsg (format (
		1588	"No matter how hard you try, you just cannot put the %s here H<Try to remove some items from the floor first.>",
		1589	query_name ()
		1590	));
		1591
		1592	return false;
1520	}	1593	}
1521		1594
1522	/*	1595	/*
1523	* decrease(object, number) decreases a specified number from	1596	* decrease(object, number) decreases a specified number from
1524	* the amount of an object. If the amount reaches 0, the object	1597	* the amount of an object. If the amount reaches 0, the object
…		…
1696	* on top.	1769	* on top.
1697	*/	1770	*/
1698	int	1771	int
1699	check_move_on (object op, object originator)	1772	check_move_on (object op, object originator)
1700	{	1773	{
		1774	if (QUERY_FLAG (op, FLAG_NO_APPLY))
		1775	return 0;
		1776
1701	object *tmp;	1777	object *tmp;
1702	maptile *m = op->map;	1778	maptile *m = op->map;
1703	int x = op->x, y = op->y;	1779	int x = op->x, y = op->y;
1704		1780
1705	MoveType move_on, move_slow, move_block;	1781	mapspace &ms = m->at (x, y);
1706		1782
1707	if (QUERY_FLAG (op, FLAG_NO_APPLY))	1783	ms.update ();
1708	return 0;
1709		1784
1710	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);	1785	MoveType move_on = ms.move_on;
1711	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);	1786	MoveType move_slow = ms.move_slow;
1712	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);	1787	MoveType move_block = ms.move_block;
1713		1788
1714	/* if nothing on this space will slow op down or be applied,	1789	/* if nothing on this space will slow op down or be applied,
1715	* no need to do checking below. have to make sure move_type	1790	* no need to do checking below. have to make sure move_type
1716	* is set, as lots of objects don't have it set - we treat that	1791	* is set, as lots of objects don't have it set - we treat that
1717	* as walking.	1792	* as walking.
…		…
1728	return 0;	1803	return 0;
1729		1804
1730	/* The objects have to be checked from top to bottom.	1805	/* The objects have to be checked from top to bottom.
1731	* Hence, we first go to the top:	1806	* Hence, we first go to the top:
1732	*/	1807	*/
1733		1808	for (object next, tmp = ms.top; tmp; tmp = next)
1734	for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above)
1735	{
1736	/* Trim the search when we find the first other spell effect
1737	* this helps performance so that if a space has 50 spell objects,
1738	* we don't need to check all of them.
1739	*/
1740	if ((tmp->move_type & MOVE_FLY_LOW) && QUERY_FLAG (tmp, FLAG_NO_PICK))
1741	break;
1742	}	1809	{
		1810	next = tmp->below;
1743		1811
1744	for (; tmp; tmp = tmp->below)
1745	{
1746	if (tmp == op)	1812	if (tmp == op)
1747	continue; /* Can't apply yourself */	1813	continue; /* Can't apply yourself */
1748		1814
1749	/* Check to see if one of the movement types should be slowed down.	1815	/* Check to see if one of the movement types should be slowed down.
1750	* Second check makes sure that the movement types not being slowed	1816	* Second check makes sure that the movement types not being slowed
…		…
1755	if (!QUERY_FLAG (op, FLAG_WIZPASS))	1821	if (!QUERY_FLAG (op, FLAG_WIZPASS))
1756	{	1822	{
1757	if ((!op->move_type && tmp->move_slow & MOVE_WALK) \|\|	1823	if ((!op->move_type && tmp->move_slow & MOVE_WALK) \|\|
1758	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))	1824	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1759	{	1825	{
1760
1761	float
1762	diff = tmp->move_slow_penalty * fabs (op->speed);	1826	float diff = tmp->move_slow_penalty * fabs (op->speed);
1763		1827
1764	if (op->is_player ())	1828	if (op->is_player ())
1765	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) \|\|	1829	if ((tmp->flag [FLAG_IS_HILLY ] && find_skill_by_number (op, SK_CLIMBING)) \|\|
1766	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))	1830	(tmp->flag [FLAG_IS_WOODED] && find_skill_by_number (op, SK_WOODSMAN)))
1767	diff /= 4.0;	1831	diff /= 4.0;
1768		1832
1769	op->speed_left -= diff;	1833	op->speed_left -= diff;
1770	}	1834	}
1771	}	1835	}
…		…
2055	* there is capable of.	2119	* there is capable of.
2056	*/	2120	*/
2057	int	2121	int
2058	find_dir (maptile m, int x, int y, object exclude)	2122	find_dir (maptile m, int x, int y, object exclude)
2059	{	2123	{
2060	int i, max = SIZEOFFREE, mflags;	2124	int max = SIZEOFFREE, mflags;
2061
2062	sint16 nx, ny;
2063	object *tmp;
2064	maptile *mp;
2065
2066	MoveType blocked, move_type;	2125	MoveType move_type;
2067		2126
2068	if (exclude && exclude->head_ () != exclude)	2127	if (exclude && exclude->head_ () != exclude)
2069	{	2128	{
2070	exclude = exclude->head;	2129	exclude = exclude->head;
2071	move_type = exclude->move_type;	2130	move_type = exclude->move_type;
…		…
2074	{	2133	{
2075	/* If we don't have anything, presume it can use all movement types. */	2134	/* If we don't have anything, presume it can use all movement types. */
2076	move_type = MOVE_ALL;	2135	move_type = MOVE_ALL;
2077	}	2136	}
2078		2137
2079	for (i = 1; i < max; i++)	2138	for (int i = 1; i < max; i++)
2080	{	2139	{
2081	mp = m;	2140	mapxy pos (m, x, y);
2082	nx = x + freearr_x[i];	2141	pos.move (i);
2083	ny = y + freearr_y[i];
2084		2142
2085	mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);	2143	if (!pos.normalise ())
2086
2087	if (mflags & P_OUT_OF_MAP)
2088	max = maxfree[i];	2144	max = maxfree[i];
2089	else	2145	else
2090	{	2146	{
2091	mapspace &ms = mp->at (nx, ny);	2147	mapspace &ms = *pos;
2092		2148
2093	blocked = ms.move_block;
2094
2095	if ((move_type & blocked) == move_type)	2149	if ((move_type & ms.move_block) == move_type)
2096	max = maxfree[i];	2150	max = maxfree [i];
2097	else if (mflags & P_IS_ALIVE)	2151	else if (ms.flags () & P_IS_ALIVE)
2098	{	2152	{
2099	for (tmp = ms.bot; tmp; tmp = tmp->above)	2153	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
2100	if ((tmp->flag [FLAG_MONSTER] \|\| tmp->is_player ())	2154	if ((tmp->flag [FLAG_MONSTER] \|\| tmp->is_player ())
2101	&& (tmp != exclude \|\| (tmp->head_ () != tmp && tmp->head_ () != exclude)))	2155	&& (tmp != exclude \|\| (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2102	break;
2103
2104	if (tmp)
2105	return freedir[i];	2156	return freedir [i];
2106	}	2157	}
2107	}	2158	}
2108	}	2159	}
2109		2160
2110	return 0;	2161	return 0;
…		…
2185	* This basically means that if direction is 15, then it could either go	2236	* This basically means that if direction is 15, then it could either go
2186	* direction 4, 14, or 16 to get back to where we are.	2237	* direction 4, 14, or 16 to get back to where we are.
2187	* Moved from spell_util.c to object.c with the other related direction	2238	* Moved from spell_util.c to object.c with the other related direction
2188	* functions.	2239	* functions.
2189	*/	2240	*/
2190	int reduction_dir[SIZEOFFREE][3] = {	2241	static const int reduction_dir[SIZEOFFREE][3] = {
2191	{0, 0, 0}, /* 0 */	2242	{0, 0, 0}, /* 0 */
2192	{0, 0, 0}, /* 1 */	2243	{0, 0, 0}, /* 1 */
2193	{0, 0, 0}, /* 2 */	2244	{0, 0, 0}, /* 2 */
2194	{0, 0, 0}, /* 3 */	2245	{0, 0, 0}, /* 3 */
2195	{0, 0, 0}, /* 4 */	2246	{0, 0, 0}, /* 4 */
…		…
2333	return tmp;	2384	return tmp;
2334		2385
2335	return 0;	2386	return 0;
2336	}	2387	}
2337		2388
2338	const shstr &	2389	shstr_tmp
2339	object::kv_get (const shstr &key) const	2390	object::kv_get (shstr_tmp key) const
2340	{	2391	{
2341	for (key_value *kv = key_values; kv; kv = kv->next)	2392	for (key_value *kv = key_values; kv; kv = kv->next)
2342	if (kv->key == key)	2393	if (kv->key == key)
2343	return kv->value;	2394	return kv->value;
2344		2395
2345	return shstr_null;	2396	return shstr ();
2346	}	2397	}
2347		2398
2348	void	2399	void
2349	object::kv_set (const shstr &key, const shstr &value)	2400	object::kv_set (shstr_tmp key, shstr_tmp value)
2350	{	2401	{
2351	for (key_value *kv = key_values; kv; kv = kv->next)	2402	for (key_value *kv = key_values; kv; kv = kv->next)
2352	if (kv->key == key)	2403	if (kv->key == key)
2353	{	2404	{
2354	kv->value = value;	2405	kv->value = value;
…		…
2363		2414
2364	key_values = kv;	2415	key_values = kv;
2365	}	2416	}
2366		2417
2367	void	2418	void
2368	object::kv_del (const shstr &key)	2419	object::kv_del (shstr_tmp key)
2369	{	2420	{
2370	for (key_value *kvp = &key_values; kvp; kvp = &(*kvp)->next)	2421	for (key_value *kvp = &key_values; kvp; kvp = &(*kvp)->next)
2371	if ((*kvp)->key == key)	2422	if ((*kvp)->key == key)
2372	{	2423	{
2373	key_value kv = kvp;	2424	key_value kv = kvp;
…		…
2504	container = 0;	2555	container = 0;
2505		2556
2506	// client needs item update to make it work, client bug requires this to be separate	2557	// client needs item update to make it work, client bug requires this to be separate
2507	esrv_update_item (UPD_FLAGS, this, old_container);	2558	esrv_update_item (UPD_FLAGS, this, old_container);
2508		2559
2509	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));	2560	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", old_container->query_name ());
2510	play_sound (sound_find ("chest_close"));	2561	play_sound (sound_find ("chest_close"));
2511	}	2562	}
2512		2563
2513	if (new_container)	2564	if (new_container)
2514	{	2565	{
…		…
2524	closer->flag [FLAG_NO_MAP_SAVE] = 1;	2575	closer->flag [FLAG_NO_MAP_SAVE] = 1;
2525	new_container->insert (closer);	2576	new_container->insert (closer);
2526	}	2577	}
2527	#endif	2578	#endif
2528		2579
2529	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));	2580	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", new_container->query_name ());
2530		2581
2531	// make sure the container is available, client bug requires this to be separate	2582	// make sure the container is available, client bug requires this to be separate
2532	esrv_send_item (this, new_container);	2583	esrv_send_item (this, new_container);
2533		2584
2534	new_container->flag [FLAG_APPLIED] = true;	2585	new_container->flag [FLAG_APPLIED] = true;
…		…
2542	// else if (!old_container->env && contr && contr->ns)	2593	// else if (!old_container->env && contr && contr->ns)
2543	// contr->ns->floorbox_reset ();	2594	// contr->ns->floorbox_reset ();
2544	}	2595	}
2545		2596
2546	object *	2597	object *
2547	object::force_find (const shstr name)	2598	object::force_find (shstr_tmp name)
2548	{	2599	{
2549	/* cycle through his inventory to look for the MARK we want to	2600	/* cycle through his inventory to look for the MARK we want to
2550	* place	2601	* place
2551	*/	2602	*/
2552	for (object *tmp = inv; tmp; tmp = tmp->below)	2603	for (object *tmp = inv; tmp; tmp = tmp->below)
…		…
2554	return splay (tmp);	2605	return splay (tmp);
2555		2606
2556	return 0;	2607	return 0;
2557	}	2608	}
2558		2609
		2610	//-GPL
		2611
		2612	void
		2613	object::force_set_timer (int duration)
		2614	{
		2615	this->duration = 1;
		2616	this->speed_left = -1.f;
		2617
		2618	this->set_speed (duration ? 1.f / duration : 0.f);
		2619	}
		2620
2559	object *	2621	object *
2560	object::force_add (const shstr name, int duration)	2622	object::force_add (shstr_tmp name, int duration)
2561	{	2623	{
2562	if (object *force = force_find (name))	2624	if (object *force = force_find (name))
2563	force->destroy ();	2625	force->destroy ();
2564		2626
2565	object *force = get_archetype (FORCE_NAME);	2627	object *force = get_archetype (FORCE_NAME);
2566		2628
2567	force->slaying = name;	2629	force->slaying = name;
2568	force->stats.food = 1;	2630	force->force_set_timer (duration);
2569	force->speed_left = -1.f;
2570
2571	force->set_speed (duration ? 1.f / duration : 0.f);
2572	force->flag [FLAG_IS_USED_UP] = true;
2573	force->flag [FLAG_APPLIED] = true;	2631	force->flag [FLAG_APPLIED] = true;
2574		2632
2575	return insert (force);	2633	return insert (force);
2576	}	2634	}
2577		2635
2578	void	2636	void
2579	object::play_sound (faceidx sound)	2637	object::play_sound (faceidx sound) const
2580	{	2638	{
2581	if (!sound)	2639	if (!sound)
2582	return;	2640	return;
2583		2641
2584	if (flag [FLAG_REMOVED])	2642	if (is_on_map ())
2585	return;
2586
2587	if (env)
2588	{
2589	if (object *pl = in_player ())
2590	pl->contr->play_sound (sound);
2591	}
2592	else
2593	map->play_sound (sound, x, y);	2643	map->play_sound (sound, x, y);
		2644	else if (object *pl = in_player ())
		2645	pl->contr->play_sound (sound);
		2646	}
		2647
		2648	void
		2649	object::say_msg (const char *msg) const
		2650	{
		2651	if (is_on_map ())
		2652	map->say_msg (msg, x, y);
		2653	else if (object *pl = in_player ())
		2654	pl->contr->play_sound (sound);
2594	}	2655	}
2595		2656
2596	void	2657	void
2597	object::make_noise ()	2658	object::make_noise ()
2598	{	2659	{

Diff Legend

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

Comparing deliantra/server/common/object.C (file contents): Revision 1.272 by root, Sat Dec 27 04:09:58 2008 UTC vs. Revision 1.301 by root, Mon Nov 9 18:47:56 2009 UTC

Diff Legend

Comparing deliantra/server/common/object.C (file contents):
Revision 1.272 by root, Sat Dec 27 04:09:58 2008 UTC vs.
Revision 1.301 by root, Mon Nov 9 18:47:56 2009 UTC