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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.273 by root, Sat Dec 27 04:15:56 2008 UTC vs.
Revision 1.295 by root, Fri Nov 6 13:03:34 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	{
…		…
328	// the player inventory itself is always visible	332	// the player inventory itself is always visible
329	if (env->is_player ())	333	if (env->is_player ())
330	return env;	334	return env;
331		335
332	// else a player could have our env open	336	// else a player could have our env open
333	object *envest = env->outer_env ();	337	object *envest = env->outer_env_or_self ();
334		338
335	// 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
336	// even if our inv is in a player.	340	// even if our inv is in a player.
337	if (envest->is_on_map ())	341	if (envest->is_on_map ())
338	if (object *pl = envest->ms ().player ())	342	if (object *pl = envest->ms ().player ())
339	if (pl->container == env)	343	if (pl->container_ () == env)
340	return pl;	344	return pl;
341	}	345	}
342	else	346	else
343	{	347	{
344	// maybe there is a player standing on the same mapspace	348	// maybe there is a player standing on the same mapspace
345	// this will catch the case where "this" is a player	349	// this will catch the case where "this" is a player
346	if (object *pl = ms ().player ())	350	if (object *pl = ms ().player ())
347	if ((!pl->container && pl->contr->ns && !pl->contr->ns->update_look)	351	if ((pl->contr->ns && !pl->container_ () && !pl->contr->ns->update_look)
348	\|\| this == pl->container)	352	\|\| pl->container_ () == this)
349	return pl;	353	return pl;
350	}	354	}
351	}	355	}
352		356
353	return 0;	357	return 0;
…		…
431	object_freezer freezer;	435	object_freezer freezer;
432	op->write (freezer);	436	op->write (freezer);
433	return freezer.as_string ();	437	return freezer.as_string ();
434	}	438	}
435		439
		440	char *
		441	object::as_string ()
		442	{
		443	return dump_object (this);
		444	}
		445
436	/*	446	/*
437	* get_nearest_part(multi-object, object 2) returns the part of the	447	* get_nearest_part(multi-object, object 2) returns the part of the
438	* multi-object 1 which is closest to the second object.	448	* multi-object 1 which is closest to the second object.
439	* If it's not a multi-object, it is returned.	449	* If it's not a multi-object, it is returned.
440	*/	450	*/
441	object *	451	static object *
442	get_nearest_part (object op, const object pl)	452	get_nearest_part (object op, const object pl)
443	{	453	{
444	object tmp, closest;	454	object tmp, closest;
445	int last_dist, i;	455	int last_dist, i;
446		456
…		…
555	update_stats ();	565	update_stats ();
556		566
557	new_draw_info_format (NDI_UNIQUE, 0, this,	567	new_draw_info_format (NDI_UNIQUE, 0, this,
558	"You try to balance all your items at once, "	568	"You try to balance all your items at once, "
559	"but the %s is just too much for your body. "	569	"but the %s is just too much for your body. "
560	"[You need to unapply some items first.]", &ob->name);	570	"[You need to unapply some items first - use the 'body' command to see "
		571	"how many items you cna wera on a specific body part.]", &ob->name);
561	return false;	572	return false;
562	}	573	}
563		574
564	//new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);	575	//new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);
565	}	576	}
…		…
792		803
793	object::object ()	804	object::object ()
794	{	805	{
795	SET_FLAG (this, FLAG_REMOVED);	806	SET_FLAG (this, FLAG_REMOVED);
796		807
797	expmul = 1.0;	808	//expmul = 1.0; declared const for the time being
798	face = blank_face;	809	face = blank_face;
799	}	810	}
800		811
801	object::~object ()	812	object::~object ()
802	{	813	{
…		…
831	{	842	{
832	/* If already on active list, don't do anything */	843	/* If already on active list, don't do anything */
833	if (active)	844	if (active)
834	return;	845	return;
835		846
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 ())	847	if (has_active_speed ())
		848	{
		849	if (flag [FLAG_FREED])
		850	LOG (llevError \| logBacktrace, "BUG: tried to activate freed object %s\n", debug_desc ());//D
		851
840	actives.insert (this);	852	actives.insert (this);
		853	}
841	}	854	}
842		855
843	void	856	void
844	object::activate_recursive ()	857	object::activate_recursive ()
845	{	858	{
…		…
963		976
964	void	977	void
965	object::do_destroy ()	978	object::do_destroy ()
966	{	979	{
967	if (flag [FLAG_IS_LINKED])	980	if (flag [FLAG_IS_LINKED])
968	remove_button_link (this);	981	remove_link ();
969		982
970	if (flag [FLAG_FRIENDLY])	983	if (flag [FLAG_FRIENDLY])
971	remove_friendly_object (this);	984	remove_friendly_object (this);
972		985
973	remove ();	986	remove ();
…		…
1031	* the previous environment.	1044	* the previous environment.
1032	*/	1045	*/
1033	void	1046	void
1034	object::do_remove ()	1047	object::do_remove ()
1035	{	1048	{
1036	object tmp, last = 0;
1037	object *otmp;
1038
1039	if (flag [FLAG_REMOVED])	1049	if (flag [FLAG_REMOVED])
1040	return;	1050	return;
1041		1051
1042	INVOKE_OBJECT (REMOVE, this);	1052	INVOKE_OBJECT (REMOVE, this);
1043		1053
…		…
1109	close_container ();	1119	close_container ();
1110		1120
1111	--map->players;	1121	--map->players;
1112	map->touch ();	1122	map->touch ();
1113	}	1123	}
1114	else if (pl->container == this)	1124	else if (pl->container_ () == this)
1115	{	1125	{
1116	// removing a container should close it	1126	// removing a container should close it
1117	close_container ();	1127	close_container ();
1118	}	1128	}
1119		1129
…		…
1135		1145
1136	int check_walk_off = !flag [FLAG_NO_APPLY];	1146	int check_walk_off = !flag [FLAG_NO_APPLY];
1137		1147
1138	if (object *pl = ms.player ())	1148	if (object *pl = ms.player ())
1139	{	1149	{
1140	if (pl->container == this)	1150	if (pl->container_ () == this)
1141	/* If a container that the player is currently using somehow gets	1151	/* If a container that the player is currently using somehow gets
1142	* removed (most likely destroyed), update the player view	1152	* removed (most likely destroyed), update the player view
1143	* appropriately.	1153	* appropriately.
1144	*/	1154	*/
1145	pl->close_container ();	1155	pl->close_container ();
…		…
1149	//TODO: update floorbox to preserve ordering	1159	//TODO: update floorbox to preserve ordering
1150	if (pl->contr->ns)	1160	if (pl->contr->ns)
1151	pl->contr->ns->floorbox_update ();	1161	pl->contr->ns->floorbox_update ();
1152	}	1162	}
1153		1163
		1164	if (check_walk_off)
1154	for (tmp = ms.bot; tmp; tmp = tmp->above)	1165	for (object above, tmp = ms.bot; tmp; tmp = above)
1155	{	1166	{
		1167	above = tmp->above;
		1168
1156	/* No point updating the players look faces if he is the object	1169	/* No point updating the players look faces if he is the object
1157	* being removed.	1170	* being removed.
1158	*/	1171	*/
1159		1172
1160	/* See if object moving off should effect something */	1173	/* See if object moving off should effect something */
1161	if (check_walk_off
1162	&& ((move_type & tmp->move_off)	1174	if ((move_type & tmp->move_off)
1163	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0))	1175	&& (move_type & ~tmp->move_off & ~tmp->move_block) == 0)
1164	{
1165	move_apply (tmp, this, 0);	1176	move_apply (tmp, this, 0);
1166
1167	if (destroyed ())
1168	LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
1169	}	1177	}
1170
1171	last = tmp;
1172	}
1173		1178
1174	if (affects_los ())	1179	if (affects_los ())
1175	update_all_los (map, x, y);	1180	update_all_los (map, x, y);
1176	}	1181	}
1177	}	1182	}
…		…
1286		1291
1287	/* Ideally, the caller figures this out. However, it complicates a lot	1292	/* Ideally, the caller figures this out. However, it complicates a lot
1288	* of areas of callers (eg, anything that uses find_free_spot would now	1293	* of areas of callers (eg, anything that uses find_free_spot would now
1289	* need extra work	1294	* need extra work
1290	*/	1295	*/
		1296	maptile *newmap = m;
1291	if (!xy_normalise (m, op->x, op->y))	1297	if (!xy_normalise (newmap, op->x, op->y))
1292	{	1298	{
1293	op->head_ ()->destroy ();// remove head_ once all tail object destroyers found	1299	op->head_ ()->destroy ();// remove head_ once all tail object destroyers found
1294	return 0;	1300	return 0;
1295	}	1301	}
1296		1302
1297	if (object *more = op->more)	1303	if (object *more = op->more)
1298	if (!insert_ob_in_map (more, m, originator, flag))	1304	if (!insert_ob_in_map (more, m, originator, flag))
1299	return 0;	1305	return 0;
1300		1306
1301	CLEAR_FLAG (op, FLAG_REMOVED);	1307	op->flag [FLAG_REMOVED] = false;
1302		1308	op->env = 0;
1303	op->map = m;	1309	op->map = newmap;
		1310
1304	mapspace &ms = op->ms ();	1311	mapspace &ms = op->ms ();
1305		1312
1306	/* this has to be done after we translate the coordinates.	1313	/* this has to be done after we translate the coordinates.
1307	*/	1314	*/
1308	if (op->nrof && !(flag & INS_NO_MERGE))	1315	if (op->nrof && !(flag & INS_NO_MERGE))
…		…
1329	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");	1336	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");
1330	abort ();	1337	abort ();
1331	}	1338	}
1332		1339
1333	if (!originator->is_on_map ())	1340	if (!originator->is_on_map ())
		1341	{
1334	LOG (llevDebug \| logBacktrace, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map",	1342	LOG (llevError, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map",
1335	op->debug_desc (), originator->debug_desc ());	1343	op->debug_desc (), originator->debug_desc ());
		1344	abort ();
		1345	}
1336		1346
1337	op->above = originator;	1347	op->above = originator;
1338	op->below = originator->below;	1348	op->below = originator->below;
1339	originator->below = op;	1349	originator->below = op;
1340		1350
…		…
1472	* blocked() and wall() work properly), and these flags are updated by	1482	* blocked() and wall() work properly), and these flags are updated by
1473	* update_object().	1483	* update_object().
1474	*/	1484	*/
1475		1485
1476	/* if this is not the head or flag has been passed, don't check walk on status */	1486	/* if this is not the head or flag has been passed, don't check walk on status */
1477	if (!(flag & INS_NO_WALK_ON) && op->head_ () == op)	1487	if (!(flag & INS_NO_WALK_ON) && op->is_head ())
1478	{	1488	{
1479	if (check_move_on (op, originator))	1489	if (check_move_on (op, originator))
1480	return 0;	1490	return 0;
1481		1491
1482	/* If we are a multi part object, lets work our way through the check	1492	/* If we are a multi part object, lets work our way through the check
…		…
1493	/* this function inserts an object in the map, but if it	1503	/* this function inserts an object in the map, but if it
1494	* finds an object of its own type, it'll remove that one first.	1504	* finds an object of its own type, it'll remove that one first.
1495	* op is the object to insert it under: supplies x and the map.	1505	* op is the object to insert it under: supplies x and the map.
1496	*/	1506	*/
1497	void	1507	void
1498	replace_insert_ob_in_map (const char arch_string, object op)	1508	replace_insert_ob_in_map (shstr_tmp archname, object *op)
1499	{	1509	{
1500	/* first search for itself and remove any old instances */	1510	/* first search for itself and remove any old instances */
1501		1511
1502	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)	1512	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1503	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */	1513	if (tmp->arch->archname == archname) /* same archetype */
1504	tmp->destroy ();	1514	tmp->destroy ();
1505		1515
1506	object *tmp = arch_to_object (archetype::find (arch_string));	1516	object *tmp = arch_to_object (archetype::find (archname));
1507		1517
1508	tmp->x = op->x;	1518	tmp->x = op->x;
1509	tmp->y = op->y;	1519	tmp->y = op->y;
1510		1520
1511	insert_ob_in_map (tmp, op->map, op, 0);	1521	insert_ob_in_map (tmp, op->map, op, 0);
…		…
1697	* on top.	1707	* on top.
1698	*/	1708	*/
1699	int	1709	int
1700	check_move_on (object op, object originator)	1710	check_move_on (object op, object originator)
1701	{	1711	{
		1712	if (QUERY_FLAG (op, FLAG_NO_APPLY))
		1713	return 0;
		1714
1702	object *tmp;	1715	object *tmp;
1703	maptile *m = op->map;	1716	maptile *m = op->map;
1704	int x = op->x, y = op->y;	1717	int x = op->x, y = op->y;
1705		1718
1706	MoveType move_on, move_slow, move_block;	1719	mapspace &ms = m->at (x, y);
1707		1720
1708	if (QUERY_FLAG (op, FLAG_NO_APPLY))	1721	ms.update ();
1709	return 0;
1710		1722
1711	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);	1723	MoveType move_on = ms.move_on;
1712	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);	1724	MoveType move_slow = ms.move_slow;
1713	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);	1725	MoveType move_block = ms.move_block;
1714		1726
1715	/* if nothing on this space will slow op down or be applied,	1727	/* if nothing on this space will slow op down or be applied,
1716	* no need to do checking below. have to make sure move_type	1728	* no need to do checking below. have to make sure move_type
1717	* is set, as lots of objects don't have it set - we treat that	1729	* is set, as lots of objects don't have it set - we treat that
1718	* as walking.	1730	* as walking.
…		…
1729	return 0;	1741	return 0;
1730		1742
1731	/* The objects have to be checked from top to bottom.	1743	/* The objects have to be checked from top to bottom.
1732	* Hence, we first go to the top:	1744	* Hence, we first go to the top:
1733	*/	1745	*/
1734		1746	for (object next, tmp = ms.top; tmp; tmp = next)
1735	for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above)
1736	{
1737	/* Trim the search when we find the first other spell effect
1738	* this helps performance so that if a space has 50 spell objects,
1739	* we don't need to check all of them.
1740	*/
1741	if ((tmp->move_type & MOVE_FLY_LOW) && QUERY_FLAG (tmp, FLAG_NO_PICK))
1742	break;
1743	}	1747	{
		1748	next = tmp->below;
1744		1749
1745	for (; tmp; tmp = tmp->below)
1746	{
1747	if (tmp == op)	1750	if (tmp == op)
1748	continue; /* Can't apply yourself */	1751	continue; /* Can't apply yourself */
1749		1752
1750	/* Check to see if one of the movement types should be slowed down.	1753	/* Check to see if one of the movement types should be slowed down.
1751	* Second check makes sure that the movement types not being slowed	1754	* Second check makes sure that the movement types not being slowed
…		…
1756	if (!QUERY_FLAG (op, FLAG_WIZPASS))	1759	if (!QUERY_FLAG (op, FLAG_WIZPASS))
1757	{	1760	{
1758	if ((!op->move_type && tmp->move_slow & MOVE_WALK) \|\|	1761	if ((!op->move_type && tmp->move_slow & MOVE_WALK) \|\|
1759	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))	1762	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1760	{	1763	{
1761
1762	float
1763	diff = tmp->move_slow_penalty * fabs (op->speed);	1764	float diff = tmp->move_slow_penalty * fabs (op->speed);
1764		1765
1765	if (op->is_player ())	1766	if (op->is_player ())
1766	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) \|\|	1767	if ((tmp->flag [FLAG_IS_HILLY ] && find_skill_by_number (op, SK_CLIMBING)) \|\|
1767	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))	1768	(tmp->flag [FLAG_IS_WOODED] && find_skill_by_number (op, SK_WOODSMAN)))
1768	diff /= 4.0;	1769	diff /= 4.0;
1769		1770
1770	op->speed_left -= diff;	1771	op->speed_left -= diff;
1771	}	1772	}
1772	}	1773	}
…		…
2056	* there is capable of.	2057	* there is capable of.
2057	*/	2058	*/
2058	int	2059	int
2059	find_dir (maptile m, int x, int y, object exclude)	2060	find_dir (maptile m, int x, int y, object exclude)
2060	{	2061	{
2061	int i, max = SIZEOFFREE, mflags;	2062	int max = SIZEOFFREE, mflags;
2062
2063	sint16 nx, ny;
2064	object *tmp;
2065	maptile *mp;
2066
2067	MoveType blocked, move_type;	2063	MoveType move_type;
2068		2064
2069	if (exclude && exclude->head_ () != exclude)	2065	if (exclude && exclude->head_ () != exclude)
2070	{	2066	{
2071	exclude = exclude->head;	2067	exclude = exclude->head;
2072	move_type = exclude->move_type;	2068	move_type = exclude->move_type;
…		…
2075	{	2071	{
2076	/* If we don't have anything, presume it can use all movement types. */	2072	/* If we don't have anything, presume it can use all movement types. */
2077	move_type = MOVE_ALL;	2073	move_type = MOVE_ALL;
2078	}	2074	}
2079		2075
2080	for (i = 1; i < max; i++)	2076	for (int i = 1; i < max; i++)
2081	{	2077	{
2082	mp = m;	2078	mapxy pos (m, x, y);
2083	nx = x + freearr_x[i];	2079	pos.move (i);
2084	ny = y + freearr_y[i];
2085		2080
2086	mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);	2081	if (!pos.normalise ())
2087
2088	if (mflags & P_OUT_OF_MAP)
2089	max = maxfree[i];	2082	max = maxfree[i];
2090	else	2083	else
2091	{	2084	{
2092	mapspace &ms = mp->at (nx, ny);	2085	mapspace &ms = *pos;
2093		2086
2094	blocked = ms.move_block;
2095
2096	if ((move_type & blocked) == move_type)	2087	if ((move_type & ms.move_block) == move_type)
2097	max = maxfree[i];	2088	max = maxfree [i];
2098	else if (mflags & P_IS_ALIVE)	2089	else if (ms.flags () & P_IS_ALIVE)
2099	{	2090	{
2100	for (tmp = ms.bot; tmp; tmp = tmp->above)	2091	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
2101	if ((tmp->flag [FLAG_MONSTER] \|\| tmp->is_player ())	2092	if ((tmp->flag [FLAG_MONSTER] \|\| tmp->is_player ())
2102	&& (tmp != exclude \|\| (tmp->head_ () != tmp && tmp->head_ () != exclude)))	2093	&& (tmp != exclude \|\| (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2103	break;
2104
2105	if (tmp)
2106	return freedir[i];	2094	return freedir [i];
2107	}	2095	}
2108	}	2096	}
2109	}	2097	}
2110		2098
2111	return 0;	2099	return 0;
…		…
2186	* This basically means that if direction is 15, then it could either go	2174	* This basically means that if direction is 15, then it could either go
2187	* direction 4, 14, or 16 to get back to where we are.	2175	* direction 4, 14, or 16 to get back to where we are.
2188	* Moved from spell_util.c to object.c with the other related direction	2176	* Moved from spell_util.c to object.c with the other related direction
2189	* functions.	2177	* functions.
2190	*/	2178	*/
2191	int reduction_dir[SIZEOFFREE][3] = {	2179	static const int reduction_dir[SIZEOFFREE][3] = {
2192	{0, 0, 0}, /* 0 */	2180	{0, 0, 0}, /* 0 */
2193	{0, 0, 0}, /* 1 */	2181	{0, 0, 0}, /* 1 */
2194	{0, 0, 0}, /* 2 */	2182	{0, 0, 0}, /* 2 */
2195	{0, 0, 0}, /* 3 */	2183	{0, 0, 0}, /* 3 */
2196	{0, 0, 0}, /* 4 */	2184	{0, 0, 0}, /* 4 */
…		…
2334	return tmp;	2322	return tmp;
2335		2323
2336	return 0;	2324	return 0;
2337	}	2325	}
2338		2326
2339	const shstr &	2327	shstr_tmp
2340	object::kv_get (const shstr &key) const	2328	object::kv_get (shstr_tmp key) const
2341	{	2329	{
2342	for (key_value *kv = key_values; kv; kv = kv->next)	2330	for (key_value *kv = key_values; kv; kv = kv->next)
2343	if (kv->key == key)	2331	if (kv->key == key)
2344	return kv->value;	2332	return kv->value;
2345		2333
2346	return shstr_null;	2334	return shstr ();
2347	}	2335	}
2348		2336
2349	void	2337	void
2350	object::kv_set (const shstr &key, const shstr &value)	2338	object::kv_set (shstr_tmp key, shstr_tmp value)
2351	{	2339	{
2352	for (key_value *kv = key_values; kv; kv = kv->next)	2340	for (key_value *kv = key_values; kv; kv = kv->next)
2353	if (kv->key == key)	2341	if (kv->key == key)
2354	{	2342	{
2355	kv->value = value;	2343	kv->value = value;
…		…
2364		2352
2365	key_values = kv;	2353	key_values = kv;
2366	}	2354	}
2367		2355
2368	void	2356	void
2369	object::kv_del (const shstr &key)	2357	object::kv_del (shstr_tmp key)
2370	{	2358	{
2371	for (key_value *kvp = &key_values; kvp; kvp = &(*kvp)->next)	2359	for (key_value *kvp = &key_values; kvp; kvp = &(*kvp)->next)
2372	if ((*kvp)->key == key)	2360	if ((*kvp)->key == key)
2373	{	2361	{
2374	key_value kv = kvp;	2362	key_value kv = kvp;
…		…
2505	container = 0;	2493	container = 0;
2506		2494
2507	// client needs item update to make it work, client bug requires this to be separate	2495	// client needs item update to make it work, client bug requires this to be separate
2508	esrv_update_item (UPD_FLAGS, this, old_container);	2496	esrv_update_item (UPD_FLAGS, this, old_container);
2509		2497
2510	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));	2498	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", old_container->query_name ());
2511	play_sound (sound_find ("chest_close"));	2499	play_sound (sound_find ("chest_close"));
2512	}	2500	}
2513		2501
2514	if (new_container)	2502	if (new_container)
2515	{	2503	{
…		…
2525	closer->flag [FLAG_NO_MAP_SAVE] = 1;	2513	closer->flag [FLAG_NO_MAP_SAVE] = 1;
2526	new_container->insert (closer);	2514	new_container->insert (closer);
2527	}	2515	}
2528	#endif	2516	#endif
2529		2517
2530	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));	2518	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", new_container->query_name ());
2531		2519
2532	// make sure the container is available, client bug requires this to be separate	2520	// make sure the container is available, client bug requires this to be separate
2533	esrv_send_item (this, new_container);	2521	esrv_send_item (this, new_container);
2534		2522
2535	new_container->flag [FLAG_APPLIED] = true;	2523	new_container->flag [FLAG_APPLIED] = true;
…		…
2543	// else if (!old_container->env && contr && contr->ns)	2531	// else if (!old_container->env && contr && contr->ns)
2544	// contr->ns->floorbox_reset ();	2532	// contr->ns->floorbox_reset ();
2545	}	2533	}
2546		2534
2547	object *	2535	object *
2548	object::force_find (const shstr name)	2536	object::force_find (shstr_tmp name)
2549	{	2537	{
2550	/* cycle through his inventory to look for the MARK we want to	2538	/* cycle through his inventory to look for the MARK we want to
2551	* place	2539	* place
2552	*/	2540	*/
2553	for (object *tmp = inv; tmp; tmp = tmp->below)	2541	for (object *tmp = inv; tmp; tmp = tmp->below)
…		…
2555	return splay (tmp);	2543	return splay (tmp);
2556		2544
2557	return 0;	2545	return 0;
2558	}	2546	}
2559		2547
		2548	//-GPL
		2549
		2550	void
		2551	object::force_set_timer (int duration)
		2552	{
		2553	this->duration = 1;
		2554	this->speed_left = -1.f;
		2555
		2556	this->set_speed (duration ? 1.f / duration : 0.f);
		2557	}
		2558
2560	object *	2559	object *
2561	object::force_add (const shstr name, int duration)	2560	object::force_add (shstr_tmp name, int duration)
2562	{	2561	{
2563	if (object *force = force_find (name))	2562	if (object *force = force_find (name))
2564	force->destroy ();	2563	force->destroy ();
2565		2564
2566	object *force = get_archetype (FORCE_NAME);	2565	object *force = get_archetype (FORCE_NAME);
2567		2566
2568	force->slaying = name;	2567	force->slaying = name;
2569	force->stats.food = 1;	2568	force->force_set_timer (duration);
2570	force->speed_left = -1.f;
2571
2572	force->set_speed (duration ? 1.f / duration : 0.f);
2573	force->flag [FLAG_IS_USED_UP] = true;
2574	force->flag [FLAG_APPLIED] = true;	2569	force->flag [FLAG_APPLIED] = true;
2575		2570
2576	return insert (force);	2571	return insert (force);
2577	}	2572	}
2578		2573
2579	void	2574	void
2580	object::play_sound (faceidx sound)	2575	object::play_sound (faceidx sound) const
2581	{	2576	{
2582	if (!sound)	2577	if (!sound)
2583	return;	2578	return;
2584		2579
2585	if (flag [FLAG_REMOVED])	2580	if (is_on_map ())
2586	return;
2587
2588	if (env)
2589	{
2590	if (object *pl = in_player ())
2591	pl->contr->play_sound (sound);
2592	}
2593	else
2594	map->play_sound (sound, x, y);	2581	map->play_sound (sound, x, y);
		2582	else if (object *pl = in_player ())
		2583	pl->contr->play_sound (sound);
		2584	}
		2585
		2586	void
		2587	object::say_msg (const char *msg) const
		2588	{
		2589	if (is_on_map ())
		2590	map->say_msg (msg, x, y);
		2591	else if (object *pl = in_player ())
		2592	pl->contr->play_sound (sound);
2595	}	2593	}
2596		2594
2597	void	2595	void
2598	object::make_noise ()	2596	object::make_noise ()
2599	{	2597	{

Diff Legend

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

Comparing deliantra/server/common/object.C (file contents): Revision 1.273 by root, Sat Dec 27 04:15:56 2008 UTC vs. Revision 1.295 by root, Fri Nov 6 13:03:34 2009 UTC

Diff Legend

Comparing deliantra/server/common/object.C (file contents):
Revision 1.273 by root, Sat Dec 27 04:15:56 2008 UTC vs.
Revision 1.295 by root, Fri Nov 6 13:03:34 2009 UTC