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

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.294 by root, Thu Nov 5 15:43:21 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.294 by root, Thu Nov 5 15:43:21 2009 UTC