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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.258 by root, Mon Sep 29 09:04:50 2008 UTC vs.
Revision 1.274 by root, Sun Dec 28 03:58:36 2008 UTC

…		…
32	#include <bitset>	32	#include <bitset>
33		33
34	UUID UUID::cur;	34	UUID UUID::cur;
35	static uint64_t seq_next_save;	35	static uint64_t seq_next_save;
36	static const uint64 UUID_GAP = 1<<19;	36	static const uint64 UUID_GAP = 1<<19;
		37	uint32_t mapspace::smellcount = 10000;
37		38
38	objectvec objects;	39	objectvec objects;
39	activevec actives;	40	activevec actives;
40		41
41	short freearr_x[SIZEOFFREE] = {	42	short freearr_x[SIZEOFFREE] = {
…		…
323	{	324	{
324	// see if we are in a container of sorts	325	// see if we are in a container of sorts
325	if (env)	326	if (env)
326	{	327	{
327	// the player inventory itself is always visible	328	// the player inventory itself is always visible
328	if (env->type == PLAYER)	329	if (env->is_player ())
329	return env;	330	return env;
330		331
331	// else a player could have our env open	332	// else a player could have our env open
332	object *envest = env->outer_env ();	333	object *envest = env->outer_env ();
333		334
…		…
758	else if (action == UP_OBJ_INSERT)	759	else if (action == UP_OBJ_INSERT)
759	{	760	{
760	// this is likely overkill, TODO: revisit (schmorp)	761	// this is likely overkill, TODO: revisit (schmorp)
761	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))	762	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
762	\|\| (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))	763	\|\| (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))
763	\|\| (op->type == PLAYER && !(m.flags_ & P_PLAYER))	764	\|\| (op->is_player () && !(m.flags_ & P_PLAYER))
764	\|\| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))	765	\|\| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
765	\|\| (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))	766	\|\| (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))
766	\|\| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))	767	\|\| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))
767	\|\| (m.move_on \| op->move_on ) != m.move_on	768	\|\| (m.move_on \| op->move_on ) != m.move_on
768	\|\| (m.move_off \| op->move_off ) != m.move_off	769	\|\| (m.move_off \| op->move_off ) != m.move_off
…		…
770	/* This isn't perfect, but I don't expect a lot of objects to	771	/* This isn't perfect, but I don't expect a lot of objects to
771	* have move_allow right now.	772	* have move_allow right now.
772	*/	773	*/
773	\|\| ((m.move_block \| op->move_block) & ~op->move_allow) != m.move_block	774	\|\| ((m.move_block \| op->move_block) & ~op->move_allow) != m.move_block
774	\|\| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)	775	\|\| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)
775	m.flags_ = 0;	776	m.invalidate ();
776	}	777	}
777	/* if the object is being removed, we can't make intelligent	778	/* if the object is being removed, we can't make intelligent
778	* decisions, because remove_ob can't really pass the object	779	* decisions, because remove_ob can't really pass the object
779	* that is being removed.	780	* that is being removed.
780	*/	781	*/
781	else if (action == UP_OBJ_CHANGE \|\| action == UP_OBJ_REMOVE)	782	else if (action == UP_OBJ_CHANGE \|\| action == UP_OBJ_REMOVE)
782	m.flags_ = 0;	783	m.invalidate ();
783	else if (action == UP_OBJ_FACE)	784	else if (action == UP_OBJ_FACE)
784	/* Nothing to do for that case */ ;	785	/* Nothing to do for that case */ ;
785	else	786	else
786	LOG (llevError, "update_object called with invalid action: %d\n", action);	787	LOG (llevError, "update_object called with invalid action: %d\n", action);
787		788
…		…
909	\|\| map->in_memory != MAP_ACTIVE	910	\|\| map->in_memory != MAP_ACTIVE
910	\|\| map->no_drop	911	\|\| map->no_drop
911	\|\| ms ().move_block == MOVE_ALL)	912	\|\| ms ().move_block == MOVE_ALL)
912	{	913	{
913	while (inv)	914	while (inv)
914	inv->destroy (true);	915	inv->destroy ();
915	}	916	}
916	else	917	else
917	{ /* Put objects in inventory onto this space */	918	{ /* Put objects in inventory onto this space */
918	while (inv)	919	while (inv)
919	{	920	{
…		…
923	\|\| op->flag [FLAG_NO_DROP]	924	\|\| op->flag [FLAG_NO_DROP]
924	\|\| op->type == RUNE	925	\|\| op->type == RUNE
925	\|\| op->type == TRAP	926	\|\| op->type == TRAP
926	\|\| op->flag [FLAG_IS_A_TEMPLATE]	927	\|\| op->flag [FLAG_IS_A_TEMPLATE]
927	\|\| op->flag [FLAG_DESTROY_ON_DEATH])	928	\|\| op->flag [FLAG_DESTROY_ON_DEATH])
928	op->destroy (true);	929	op->destroy ();
929	else	930	else
930	map->insert (op, x, y);	931	map->insert (op, x, y);
931	}	932	}
932	}	933	}
933	}	934	}
…		…
983	x = 1;	984	x = 1;
984	y = 1;	985	y = 1;
985		986
986	if (more)	987	if (more)
987	{	988	{
988	more->destroy (true);	989	more->destroy ();
989	more = 0;	990	more = 0;
990	}	991	}
991		992
992	head = 0;	993	head = 0;
993		994
…		…
997	attacked_by = 0;	998	attacked_by = 0;
998	current_weapon = 0;	999	current_weapon = 0;
999	}	1000	}
1000		1001
1001	void	1002	void
1002	object::destroy (bool destroy_inventory)	1003	object::destroy ()
1003	{	1004	{
1004	if (destroyed ())	1005	if (destroyed ())
1005	return;	1006	return;
1006		1007
1007	if (!is_head () && !head->destroyed ())	1008	if (!is_head () && !head->destroyed ())
1008	{	1009	{
1009	LOG (llevError \| logBacktrace, "tried to destroy the tail of an object");	1010	LOG (llevError \| logBacktrace, "tried to destroy the tail of an object");
1010	head->destroy (destroy_inventory);	1011	head->destroy ();
1011	return;	1012	return;
1012	}	1013	}
1013		1014
1014	destroy_inv (!destroy_inventory);	1015	destroy_inv (false);
1015		1016
1016	if (is_head ())	1017	if (is_head ())
1017	if (sound_destroy)	1018	if (sound_destroy)
1018	play_sound (sound_destroy);	1019	play_sound (sound_destroy);
1019	else if (flag [FLAG_MONSTER])	1020	else if (flag [FLAG_MONSTER])
…		…
1055	if (object *pl = visible_to ())	1056	if (object *pl = visible_to ())
1056	esrv_del_item (pl->contr, count);	1057	esrv_del_item (pl->contr, count);
1057	flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed	1058	flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed
1058		1059
1059	adjust_weight (env, -total_weight ());	1060	adjust_weight (env, -total_weight ());
		1061
		1062	object *pl = in_player ();
1060		1063
1061	/* we set up values so that it could be inserted into	1064	/* we set up values so that it could be inserted into
1062	* the map, but we don't actually do that - it is up	1065	* the map, but we don't actually do that - it is up
1063	* to the caller to decide what we want to do.	1066	* to the caller to decide what we want to do.
1064	*/	1067	*/
…		…
1076		1079
1077	/* NO_FIX_PLAYER is set when a great many changes are being	1080	/* NO_FIX_PLAYER is set when a great many changes are being
1078	* made to players inventory. If set, avoiding the call	1081	* made to players inventory. If set, avoiding the call
1079	* to save cpu time.	1082	* to save cpu time.
1080	*/	1083	*/
1081	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1084	if (pl)
		1085	if (pl->is_player () && (glow_radius \|\| !QUERY_FLAG (pl, FLAG_NO_FIX_PLAYER)))
		1086	{
1082	otmp->update_stats ();	1087	pl->update_stats ();
		1088
		1089	if (glow_radius && pl->is_on_map ())
		1090	update_all_los (pl->map, pl->x, pl->y);
		1091	}
1083	}	1092	}
1084	else if (map)	1093	else if (map)
1085	{	1094	{
1086	map->dirty = true;	1095	map->dirty = true;
1087	mapspace &ms = this->ms ();	1096	mapspace &ms = this->ms ();
1088		1097
1089	if (object *pl = ms.player ())	1098	if (object *pl = ms.player ())
1090	{	1099	{
1091	if (type == PLAYER) // this == pl(!)	1100	if (is_player ())
1092	{	1101	{
		1102	if (!flag [FLAG_WIZPASS])
		1103	ms.smell = ++mapspace::smellcount; // remember the smell of the player
		1104
1093	// leaving a spot always closes any open container on the ground	1105	// leaving a spot always closes any open container on the ground
1094	if (container && !container->env)	1106	if (container && !container->env)
1095	// this causes spurious floorbox updates, but it ensures	1107	// this causes spurious floorbox updates, but it ensures
1096	// that the CLOSE event is being sent.	1108	// that the CLOSE event is being sent.
1097	close_container ();	1109	close_container ();
…		…
1114	*(below ? &below->above : &ms.bot) = above;	1126	*(below ? &below->above : &ms.bot) = above;
1115		1127
1116	above = 0;	1128	above = 0;
1117	below = 0;	1129	below = 0;
1118		1130
1119	ms.flags_ = 0;	1131	ms.invalidate ();
1120		1132
1121	if (map->in_memory == MAP_SAVING)	1133	if (map->in_memory == MAP_SAVING)
1122	return;	1134	return;
1123		1135
1124	int check_walk_off = !flag [FLAG_NO_APPLY];	1136	int check_walk_off = !flag [FLAG_NO_APPLY];
…		…
1157	}	1169	}
1158		1170
1159	last = tmp;	1171	last = tmp;
1160	}	1172	}
1161		1173
1162	if (flag [FLAG_BLOCKSVIEW] \|\| glow_radius)	1174	if (affects_los ())
1163	update_all_los (map, x, y);	1175	update_all_los (map, x, y);
1164	}	1176	}
1165	}	1177	}
1166		1178
1167	/*	1179	/*
…		…
1191	esrv_update_item (UPD_NROF, pl, top);	1203	esrv_update_item (UPD_NROF, pl, top);
1192		1204
1193	op->weight = 0; // cancel the addition above	1205	op->weight = 0; // cancel the addition above
1194	op->carrying = 0; // must be 0 already	1206	op->carrying = 0; // must be 0 already
1195		1207
1196	op->destroy (true);	1208	op->destroy ();
1197		1209
1198	return top;	1210	return top;
1199	}	1211	}
1200		1212
1201	return 0;	1213	return 0;
…		…
1263	* just 'op' otherwise	1275	* just 'op' otherwise
1264	*/	1276	*/
1265	object *	1277	object *
1266	insert_ob_in_map (object op, maptile m, object *originator, int flag)	1278	insert_ob_in_map (object op, maptile m, object *originator, int flag)
1267	{	1279	{
1268	if (op->is_on_map ())
1269	{
1270	LOG (llevError, "insert_ob_in_map called for object already on map");
1271	abort ();
1272	}
1273
1274	if (op->env)
1275	{
1276	LOG (llevError, "insert_ob_in_map called for object in an inventory (proceeding)");
1277	op->remove ();	1280	op->remove ();
1278	}
1279		1281
1280	if (m == &freed_map)//D TODO: remove soon	1282	if (m == &freed_map)//D TODO: remove soon
1281	{//D	1283	{//D
1282	LOG (llevError \| logBacktrace, "tries to insret object on freed objects map: %s", op->debug_desc ());//D	1284	LOG (llevError \| logBacktrace, "tries to insret object on freed objects map: %s", op->debug_desc ());//D
1283	}//D	1285	}//D
1284		1286
1285	/* Ideally, the caller figures this out. However, it complicates a lot	1287	/* Ideally, the caller figures this out. However, it complicates a lot
1286	* of areas of callers (eg, anything that uses find_free_spot would now	1288	* of areas of callers (eg, anything that uses find_free_spot would now
1287	* need extra work	1289	* need extra work
1288	*/	1290	*/
		1291	maptile *newmap = m;
1289	if (!xy_normalise (m, op->x, op->y))	1292	if (!xy_normalise (newmap, op->x, op->y))
1290	{	1293	{
1291	op->head_ ()->destroy (true);// remove head_ once all tail object destroyers found	1294	op->head_ ()->destroy ();// remove head_ once all tail object destroyers found
1292	return 0;	1295	return 0;
1293	}	1296	}
1294		1297
1295	if (object *more = op->more)	1298	if (object *more = op->more)
1296	if (!insert_ob_in_map (more, m, originator, flag))	1299	if (!insert_ob_in_map (more, m, originator, flag))
1297	return 0;	1300	return 0;
1298		1301
1299	CLEAR_FLAG (op, FLAG_REMOVED);	1302	CLEAR_FLAG (op, FLAG_REMOVED);
1300		1303
1301	op->map = m;	1304	op->map = newmap;
1302	mapspace &ms = op->ms ();	1305	mapspace &ms = op->ms ();
1303		1306
1304	/* this has to be done after we translate the coordinates.	1307	/* this has to be done after we translate the coordinates.
1305	*/	1308	*/
1306	if (op->nrof && !(flag & INS_NO_MERGE))	1309	if (op->nrof && !(flag & INS_NO_MERGE))
…		…
1309	{	1312	{
1310	// TODO: we actually want to update tmp, not op,	1313	// TODO: we actually want to update tmp, not op,
1311	// but some caller surely breaks when we return tmp	1314	// but some caller surely breaks when we return tmp
1312	// from here :/	1315	// from here :/
1313	op->nrof += tmp->nrof;	1316	op->nrof += tmp->nrof;
1314	tmp->destroy (true);	1317	tmp->destroy ();
1315	}	1318	}
1316		1319
1317	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1320	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1318	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1321	CLEAR_FLAG (op, FLAG_INV_LOCKED);
1319		1322
…		…
1424	op->below = top;	1427	op->below = top;
1425	*(op->above ? &op->above->below : &ms.top) = op;	1428	*(op->above ? &op->above->below : &ms.top) = op;
1426	}	1429	}
1427	}	1430	}
1428		1431
1429	if (op->type == PLAYER)	1432	if (op->is_player ())
1430	{	1433	{
1431	op->contr->do_los = 1;	1434	op->contr->do_los = 1;
1432	++op->map->players;	1435	++op->map->players;
1433	op->map->touch ();	1436	op->map->touch ();
1434	}	1437	}
…		…
1449	* be far away from this change and not affected in any way -	1452	* be far away from this change and not affected in any way -
1450	* this should get redone to only look for players within range,	1453	* this should get redone to only look for players within range,
1451	* or just updating the P_UPTODATE for spaces within this area	1454	* or just updating the P_UPTODATE for spaces within this area
1452	* of effect may be sufficient.	1455	* of effect may be sufficient.
1453	*/	1456	*/
1454	if (op->map->darkness && (op->glow_radius != 0))	1457	if (op->affects_los ())
		1458	{
		1459	op->ms ().invalidate ();
1455	update_all_los (op->map, op->x, op->y);	1460	update_all_los (op->map, op->x, op->y);
		1461	}
1456		1462
1457	/* updates flags (blocked, alive, no magic, etc) for this map space */	1463	/* updates flags (blocked, alive, no magic, etc) for this map space */
1458	update_object (op, UP_OBJ_INSERT);	1464	update_object (op, UP_OBJ_INSERT);
1459		1465
1460	INVOKE_OBJECT (INSERT, op);	1466	INVOKE_OBJECT (INSERT, op);
…		…
1494	{	1500	{
1495	/* first search for itself and remove any old instances */	1501	/* first search for itself and remove any old instances */
1496		1502
1497	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)	1503	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1498	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */	1504	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */
1499	tmp->destroy (true);	1505	tmp->destroy ();
1500		1506
1501	object *tmp = arch_to_object (archetype::find (arch_string));	1507	object *tmp = arch_to_object (archetype::find (arch_string));
1502		1508
1503	tmp->x = op->x;	1509	tmp->x = op->x;
1504	tmp->y = op->y;	1510	tmp->y = op->y;
…		…
1627	if (object *pl = tmp->visible_to ())	1633	if (object *pl = tmp->visible_to ())
1628	esrv_update_item (UPD_NROF, pl, tmp);	1634	esrv_update_item (UPD_NROF, pl, tmp);
1629		1635
1630	adjust_weight (this, op->total_weight ());	1636	adjust_weight (this, op->total_weight ());
1631		1637
1632	op->destroy (true);	1638	op->destroy ();
1633	op = tmp;	1639	op = tmp;
1634	goto inserted;	1640	goto inserted;
1635	}	1641	}
1636		1642
1637	op->owner = 0; // it's his/hers now. period.	1643	op->owner = 0; // it's his/hers now. period.
…		…
1655		1661
1656	adjust_weight (this, op->total_weight ());	1662	adjust_weight (this, op->total_weight ());
1657		1663
1658	inserted:	1664	inserted:
1659	/* reset the light list and los of the players on the map */	1665	/* reset the light list and los of the players on the map */
1660	if (op->glow_radius && map && map->darkness)	1666	if (op->glow_radius && is_on_map ())
		1667	{
		1668	update_stats ();
1661	update_all_los (map, x, y);	1669	update_all_los (map, x, y);
1662		1670	}
		1671	else if (is_player () && !flag [FLAG_NO_FIX_PLAYER])
1663	// if this is a player's inventory, update stats	1672	// if this is a player's inventory, update stats
1664	if (type == PLAYER && !flag [FLAG_NO_FIX_PLAYER])
1665	update_stats ();	1673	update_stats ();
1666		1674
1667	INVOKE_OBJECT (INSERT, this);	1675	INVOKE_OBJECT (INSERT, this);
1668		1676
1669	return op;	1677	return op;
…		…
1753	{	1761	{
1754		1762
1755	float	1763	float
1756	diff = tmp->move_slow_penalty * fabs (op->speed);	1764	diff = tmp->move_slow_penalty * fabs (op->speed);
1757		1765
1758	if (op->type == PLAYER)	1766	if (op->is_player ())
1759	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) \|\|	1767	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) \|\|
1760	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))	1768	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))
1761	diff /= 4.0;	1769	diff /= 4.0;
1762		1770
1763	op->speed_left -= diff;	1771	op->speed_left -= diff;
…		…
1971	* head of the object should correspond for the entire object.	1979	* head of the object should correspond for the entire object.
1972	*/	1980	*/
1973	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))	1981	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
1974	continue;	1982	continue;
1975		1983
1976	if (ob->blocked (m, pos.x, pos.y))	1984	if (ob->blocked (pos.m, pos.x, pos.y))
1977	continue;	1985	continue;
1978		1986
1979	altern [index++] = i;	1987	altern [index++] = i;
1980	}	1988	}
1981		1989
…		…
2089	if ((move_type & blocked) == move_type)	2097	if ((move_type & blocked) == move_type)
2090	max = maxfree[i];	2098	max = maxfree[i];
2091	else if (mflags & P_IS_ALIVE)	2099	else if (mflags & P_IS_ALIVE)
2092	{	2100	{
2093	for (tmp = ms.bot; tmp; tmp = tmp->above)	2101	for (tmp = ms.bot; tmp; tmp = tmp->above)
2094	if ((tmp->flag [FLAG_MONSTER] \|\| tmp->type == PLAYER)	2102	if ((tmp->flag [FLAG_MONSTER] \|\| tmp->is_player ())
2095	&& (tmp != exclude \|\| (tmp->head_ () != tmp && tmp->head_ () != exclude)))	2103	&& (tmp != exclude \|\| (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2096	break;	2104	break;
2097		2105
2098	if (tmp)	2106	if (tmp)
2099	return freedir[i];	2107	return freedir[i];
…		…
2285	int	2293	int
2286	can_pick (const object who, const object item)	2294	can_pick (const object who, const object item)
2287	{	2295	{
2288	return /QUERY_FLAG(who,FLAG_WIZ)\|\| /	2296	return /QUERY_FLAG(who,FLAG_WIZ)\|\| /
2289	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&	2297	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
2290	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER \|\| item->weight < who->weight / 3));	2298	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->is_player () \|\| item->weight < who->weight / 3));
2291	}	2299	}
2292		2300
2293	/*	2301	/*
2294	* create clone from object to another	2302	* create clone from object to another
2295	*/	2303	*/
…		…
2486		2494
2487	#if 0	2495	#if 0
2488	// remove the "Close old_container" object.	2496	// remove the "Close old_container" object.
2489	if (object *closer = old_container->inv)	2497	if (object *closer = old_container->inv)
2490	if (closer->type == CLOSE_CON)	2498	if (closer->type == CLOSE_CON)
2491	closer->destroy (true);	2499	closer->destroy ();
2492	#endif	2500	#endif
2493		2501
2494	// make sure the container is available	2502	// make sure the container is available
2495	esrv_send_item (this, old_container);	2503	esrv_send_item (this, old_container);
2496		2504
…		…
2548	return splay (tmp);	2556	return splay (tmp);
2549		2557
2550	return 0;	2558	return 0;
2551	}	2559	}
2552		2560
2553	void	2561	object *
2554	object::force_add (const shstr name, int duration)	2562	object::force_add (const shstr name, int duration)
2555	{	2563	{
2556	if (object *force = force_find (name))	2564	if (object *force = force_find (name))
2557	force->destroy (true);	2565	force->destroy ();
2558		2566
2559	object *force = get_archetype (FORCE_NAME);	2567	object *force = get_archetype (FORCE_NAME);
2560		2568
2561	force->slaying = name;	2569	force->slaying = name;
2562	force->stats.food = 1;	2570	force->stats.food = 1;
…		…
2564		2572
2565	force->set_speed (duration ? 1.f / duration : 0.f);	2573	force->set_speed (duration ? 1.f / duration : 0.f);
2566	force->flag [FLAG_IS_USED_UP] = true;	2574	force->flag [FLAG_IS_USED_UP] = true;
2567	force->flag [FLAG_APPLIED] = true;	2575	force->flag [FLAG_APPLIED] = true;
2568		2576
2569	insert (force);	2577	return insert (force);
2570	}	2578	}
2571		2579
2572	void	2580	void
2573	object::play_sound (faceidx sound)	2581	object::play_sound (faceidx sound)
2574	{	2582	{
…		…
2585	}	2593	}
2586	else	2594	else
2587	map->play_sound (sound, x, y);	2595	map->play_sound (sound, x, y);
2588	}	2596	}
2589		2597
		2598	void
		2599	object::make_noise ()
		2600	{
		2601	// we do not model noise in the map, so instead put
		2602	// a temporary light into the noise source
		2603	// could use the map instead, but that's less reliable for our
		2604	// goal, which is to make invisibility a bit harder to exploit
		2605
		2606	// currently only works sensibly for players
		2607	if (!is_player ())
		2608	return;
		2609
		2610	// find old force, or create new one
		2611	object *force = force_find (shstr_noise_force);
		2612
		2613	if (force)
		2614	force->speed_left = -1.f; // patch old speed up
		2615	else
		2616	{
		2617	force = archetype::get (shstr_noise_force);
		2618
		2619	force->slaying = shstr_noise_force;
		2620	force->stats.food = 1;
		2621	force->speed_left = -1.f;
		2622
		2623	force->set_speed (1.f / 4.f);
		2624	force->flag [FLAG_IS_USED_UP] = true;
		2625	force->flag [FLAG_APPLIED] = true;
		2626
		2627	insert (force);
		2628	}
		2629	}
		2630

Diff Legend

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

Comparing deliantra/server/common/object.C (file contents): Revision 1.258 by root, Mon Sep 29 09:04:50 2008 UTC vs. Revision 1.274 by root, Sun Dec 28 03:58:36 2008 UTC

Diff Legend

Comparing deliantra/server/common/object.C (file contents):
Revision 1.258 by root, Mon Sep 29 09:04:50 2008 UTC vs.
Revision 1.274 by root, Sun Dec 28 03:58:36 2008 UTC