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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.255 by root, Sun Aug 31 02:01:41 2008 UTC vs.
Revision 1.286 by root, Wed Sep 2 16:54:20 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
9	* it under the terms of the GNU General Public License as published by	9	* it under the terms of the GNU General Public License as published by
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_or_self ();
333		334
334	// the player itself is always on a map, so we will find him here	335	// the player itself is always on a map, so we will find him here
335	// even if our inv is in a player.	336	// even if our inv is in a player.
336	if (envest->is_on_map ())	337	if (envest->is_on_map ())
337	if (object *pl = envest->ms ().player ())	338	if (object *pl = envest->ms ().player ())
…		…
636	}	637	}
637		638
638	if (speed < 0)	639	if (speed < 0)
639	dst->speed_left -= rndm ();	640	dst->speed_left -= rndm ();
640		641
641	dst->set_speed (dst->speed);	642	dst->activate ();
642	}	643	}
643		644
644	void	645	void
645	object::instantiate ()	646	object::instantiate ()
646	{	647	{
…		…
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
…		…
791		792
792	object::object ()	793	object::object ()
793	{	794	{
794	SET_FLAG (this, FLAG_REMOVED);	795	SET_FLAG (this, FLAG_REMOVED);
795		796
796	expmul = 1.0;	797	//expmul = 1.0; declared const for the time being
797	face = blank_face;	798	face = blank_face;
798	}	799	}
799		800
800	object::~object ()	801	object::~object ()
801	{	802	{
…		…
831	/* If already on active list, don't do anything */	832	/* If already on active list, don't do anything */
832	if (active)	833	if (active)
833	return;	834	return;
834		835
835	if (has_active_speed ())	836	if (has_active_speed ())
		837	{
		838	if (flag [FLAG_FREED])
		839	LOG (llevError \| logBacktrace, "BUG: tried to activate freed object %s\n", debug_desc ());//D
		840
836	actives.insert (this);	841	actives.insert (this);
		842	}
837	}	843	}
838		844
839	void	845	void
840	object::activate_recursive ()	846	object::activate_recursive ()
841	{	847	{
…		…
906	\|\| map->in_memory != MAP_ACTIVE	912	\|\| map->in_memory != MAP_ACTIVE
907	\|\| map->no_drop	913	\|\| map->no_drop
908	\|\| ms ().move_block == MOVE_ALL)	914	\|\| ms ().move_block == MOVE_ALL)
909	{	915	{
910	while (inv)	916	while (inv)
911	inv->destroy (true);	917	inv->destroy ();
912	}	918	}
913	else	919	else
914	{ /* Put objects in inventory onto this space */	920	{ /* Put objects in inventory onto this space */
915	while (inv)	921	while (inv)
916	{	922	{
…		…
920	\|\| op->flag [FLAG_NO_DROP]	926	\|\| op->flag [FLAG_NO_DROP]
921	\|\| op->type == RUNE	927	\|\| op->type == RUNE
922	\|\| op->type == TRAP	928	\|\| op->type == TRAP
923	\|\| op->flag [FLAG_IS_A_TEMPLATE]	929	\|\| op->flag [FLAG_IS_A_TEMPLATE]
924	\|\| op->flag [FLAG_DESTROY_ON_DEATH])	930	\|\| op->flag [FLAG_DESTROY_ON_DEATH])
925	op->destroy (true);	931	op->destroy ();
926	else	932	else
927	map->insert (op, x, y);	933	map->insert (op, x, y);
928	}	934	}
929	}	935	}
930	}	936	}
…		…
959		965
960	void	966	void
961	object::do_destroy ()	967	object::do_destroy ()
962	{	968	{
963	if (flag [FLAG_IS_LINKED])	969	if (flag [FLAG_IS_LINKED])
964	remove_button_link (this);	970	remove_link ();
965		971
966	if (flag [FLAG_FRIENDLY])	972	if (flag [FLAG_FRIENDLY])
967	remove_friendly_object (this);	973	remove_friendly_object (this);
968		974
969	remove ();	975	remove ();
…		…
994	attacked_by = 0;	1000	attacked_by = 0;
995	current_weapon = 0;	1001	current_weapon = 0;
996	}	1002	}
997		1003
998	void	1004	void
999	object::destroy (bool destroy_inventory)	1005	object::destroy ()
1000	{	1006	{
1001	if (destroyed ())	1007	if (destroyed ())
1002	return;	1008	return;
1003		1009
1004	if (!is_head () && !head->destroyed ())	1010	if (!is_head () && !head->destroyed ())
1005	{	1011	{
1006	LOG (llevError \| logBacktrace, "tried to destroy the tail of an object");	1012	LOG (llevError \| logBacktrace, "tried to destroy the tail of an object");
1007	head->destroy (destroy_inventory);	1013	head->destroy ();
1008	return;	1014	return;
1009	}	1015	}
1010		1016
1011	destroy_inv (!destroy_inventory);	1017	destroy_inv (false);
1012		1018
1013	if (is_head ())	1019	if (is_head ())
1014	if (sound_destroy)	1020	if (sound_destroy)
1015	play_sound (sound_destroy);	1021	play_sound (sound_destroy);
1016	else if (flag [FLAG_MONSTER])	1022	else if (flag [FLAG_MONSTER])
…		…
1052	if (object *pl = visible_to ())	1058	if (object *pl = visible_to ())
1053	esrv_del_item (pl->contr, count);	1059	esrv_del_item (pl->contr, count);
1054	flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed	1060	flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed
1055		1061
1056	adjust_weight (env, -total_weight ());	1062	adjust_weight (env, -total_weight ());
		1063
		1064	object *pl = in_player ();
1057		1065
1058	/* we set up values so that it could be inserted into	1066	/* we set up values so that it could be inserted into
1059	* the map, but we don't actually do that - it is up	1067	* the map, but we don't actually do that - it is up
1060	* to the caller to decide what we want to do.	1068	* to the caller to decide what we want to do.
1061	*/	1069	*/
…		…
1073		1081
1074	/* NO_FIX_PLAYER is set when a great many changes are being	1082	/* NO_FIX_PLAYER is set when a great many changes are being
1075	* made to players inventory. If set, avoiding the call	1083	* made to players inventory. If set, avoiding the call
1076	* to save cpu time.	1084	* to save cpu time.
1077	*/	1085	*/
1078	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1086	if (pl)
		1087	if (pl->is_player () && (glow_radius \|\| !QUERY_FLAG (pl, FLAG_NO_FIX_PLAYER)))
		1088	{
1079	otmp->update_stats ();	1089	pl->update_stats ();
		1090
		1091	if (glow_radius && pl->is_on_map ())
		1092	update_all_los (pl->map, pl->x, pl->y);
		1093	}
1080	}	1094	}
1081	else if (map)	1095	else if (map)
1082	{	1096	{
1083	map->dirty = true;	1097	map->dirty = true;
1084	mapspace &ms = this->ms ();	1098	mapspace &ms = this->ms ();
1085		1099
1086	if (object *pl = ms.player ())	1100	if (object *pl = ms.player ())
1087	{	1101	{
1088	if (type == PLAYER) // this == pl(!)	1102	if (is_player ())
1089	{	1103	{
		1104	if (!flag [FLAG_WIZPASS])
		1105	ms.smell = ++mapspace::smellcount; // remember the smell of the player
		1106
1090	// leaving a spot always closes any open container on the ground	1107	// leaving a spot always closes any open container on the ground
1091	if (container && !container->env)	1108	if (container && !container->env)
1092	// this causes spurious floorbox updates, but it ensures	1109	// this causes spurious floorbox updates, but it ensures
1093	// that the CLOSE event is being sent.	1110	// that the CLOSE event is being sent.
1094	close_container ();	1111	close_container ();
…		…
1111	*(below ? &below->above : &ms.bot) = above;	1128	*(below ? &below->above : &ms.bot) = above;
1112		1129
1113	above = 0;	1130	above = 0;
1114	below = 0;	1131	below = 0;
1115		1132
1116	ms.flags_ = 0;	1133	ms.invalidate ();
1117		1134
1118	if (map->in_memory == MAP_SAVING)	1135	if (map->in_memory == MAP_SAVING)
1119	return;	1136	return;
1120		1137
1121	int check_walk_off = !flag [FLAG_NO_APPLY];	1138	int check_walk_off = !flag [FLAG_NO_APPLY];
…		…
1154	}	1171	}
1155		1172
1156	last = tmp;	1173	last = tmp;
1157	}	1174	}
1158		1175
1159	if (flag [FLAG_BLOCKSVIEW] \|\| glow_radius)	1176	if (affects_los ())
1160	update_all_los (map, x, y);	1177	update_all_los (map, x, y);
1161	}	1178	}
1162	}	1179	}
1163		1180
1164	/*	1181	/*
…		…
1188	esrv_update_item (UPD_NROF, pl, top);	1205	esrv_update_item (UPD_NROF, pl, top);
1189		1206
1190	op->weight = 0; // cancel the addition above	1207	op->weight = 0; // cancel the addition above
1191	op->carrying = 0; // must be 0 already	1208	op->carrying = 0; // must be 0 already
1192		1209
1193	op->destroy (1);	1210	op->destroy ();
1194		1211
1195	return top;	1212	return top;
1196	}	1213	}
1197		1214
1198	return 0;	1215	return 0;
…		…
1260	* just 'op' otherwise	1277	* just 'op' otherwise
1261	*/	1278	*/
1262	object *	1279	object *
1263	insert_ob_in_map (object op, maptile m, object *originator, int flag)	1280	insert_ob_in_map (object op, maptile m, object *originator, int flag)
1264	{	1281	{
1265	if (op->is_on_map ())
1266	{
1267	LOG (llevError, "insert_ob_in_map called for object already on map");
1268	abort ();
1269	}
1270
1271	if (op->env)
1272	{
1273	LOG (llevError, "insert_ob_in_map called for object in an inventory (proceeding)");
1274	op->remove ();	1282	op->remove ();
1275	}
1276		1283
1277	if (op->face && !face_info (op->face))//D TODO: remove soon	1284	if (m == &freed_map)//D TODO: remove soon
1278	{//D	1285	{//D
1279	LOG (llevError \| logBacktrace, "op->face out of bounds: %s", op->debug_desc ());//D	1286	LOG (llevError \| logBacktrace, "tries to insret object on freed objects map: %s", op->debug_desc ());//D
1280	op->face = 1;//D
1281	}//D	1287	}//D
1282		1288
1283	/* Ideally, the caller figures this out. However, it complicates a lot	1289	/* Ideally, the caller figures this out. However, it complicates a lot
1284	* of areas of callers (eg, anything that uses find_free_spot would now	1290	* of areas of callers (eg, anything that uses find_free_spot would now
1285	* need extra work	1291	* need extra work
1286	*/	1292	*/
		1293	maptile *newmap = m;
1287	if (!xy_normalise (m, op->x, op->y))	1294	if (!xy_normalise (newmap, op->x, op->y))
1288	{	1295	{
1289	op->head_ ()->destroy (1);// remove head_ once all tail object destroyers found	1296	op->head_ ()->destroy ();// remove head_ once all tail object destroyers found
1290	return 0;	1297	return 0;
1291	}	1298	}
1292		1299
1293	if (object *more = op->more)	1300	if (object *more = op->more)
1294	if (!insert_ob_in_map (more, m, originator, flag))	1301	if (!insert_ob_in_map (more, m, originator, flag))
1295	return 0;	1302	return 0;
1296		1303
1297	CLEAR_FLAG (op, FLAG_REMOVED);	1304	op->flag [FLAG_REMOVED] = false;
1298		1305	op->env = 0;
1299	op->map = m;	1306	op->map = newmap;
		1307
1300	mapspace &ms = op->ms ();	1308	mapspace &ms = op->ms ();
1301		1309
1302	/* this has to be done after we translate the coordinates.	1310	/* this has to be done after we translate the coordinates.
1303	*/	1311	*/
1304	if (op->nrof && !(flag & INS_NO_MERGE))	1312	if (op->nrof && !(flag & INS_NO_MERGE))
…		…
1307	{	1315	{
1308	// TODO: we actually want to update tmp, not op,	1316	// TODO: we actually want to update tmp, not op,
1309	// but some caller surely breaks when we return tmp	1317	// but some caller surely breaks when we return tmp
1310	// from here :/	1318	// from here :/
1311	op->nrof += tmp->nrof;	1319	op->nrof += tmp->nrof;
1312	tmp->destroy (1);	1320	tmp->destroy ();
1313	}	1321	}
1314		1322
1315	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1323	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1316	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1324	CLEAR_FLAG (op, FLAG_INV_LOCKED);
1317		1325
…		…
1325	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");	1333	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");
1326	abort ();	1334	abort ();
1327	}	1335	}
1328		1336
1329	if (!originator->is_on_map ())	1337	if (!originator->is_on_map ())
		1338	{
1330	LOG (llevDebug \| logBacktrace, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map",	1339	LOG (llevError, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map",
1331	op->debug_desc (), originator->debug_desc ());	1340	op->debug_desc (), originator->debug_desc ());
		1341	abort ();
		1342	}
1332		1343
1333	op->above = originator;	1344	op->above = originator;
1334	op->below = originator->below;	1345	op->below = originator->below;
1335	originator->below = op;	1346	originator->below = op;
1336		1347
…		…
1422	op->below = top;	1433	op->below = top;
1423	*(op->above ? &op->above->below : &ms.top) = op;	1434	*(op->above ? &op->above->below : &ms.top) = op;
1424	}	1435	}
1425	}	1436	}
1426		1437
1427	if (op->type == PLAYER)	1438	if (op->is_player ())
1428	{	1439	{
1429	op->contr->do_los = 1;	1440	op->contr->do_los = 1;
1430	++op->map->players;	1441	++op->map->players;
1431	op->map->touch ();	1442	op->map->touch ();
1432	}	1443	}
…		…
1447	* be far away from this change and not affected in any way -	1458	* be far away from this change and not affected in any way -
1448	* this should get redone to only look for players within range,	1459	* this should get redone to only look for players within range,
1449	* or just updating the P_UPTODATE for spaces within this area	1460	* or just updating the P_UPTODATE for spaces within this area
1450	* of effect may be sufficient.	1461	* of effect may be sufficient.
1451	*/	1462	*/
1452	if (op->map->darkness && (op->glow_radius != 0))	1463	if (op->affects_los ())
		1464	{
		1465	op->ms ().invalidate ();
1453	update_all_los (op->map, op->x, op->y);	1466	update_all_los (op->map, op->x, op->y);
		1467	}
1454		1468
1455	/* updates flags (blocked, alive, no magic, etc) for this map space */	1469	/* updates flags (blocked, alive, no magic, etc) for this map space */
1456	update_object (op, UP_OBJ_INSERT);	1470	update_object (op, UP_OBJ_INSERT);
1457		1471
1458	INVOKE_OBJECT (INSERT, op);	1472	INVOKE_OBJECT (INSERT, op);
…		…
1486	/* this function inserts an object in the map, but if it	1500	/* this function inserts an object in the map, but if it
1487	* finds an object of its own type, it'll remove that one first.	1501	* finds an object of its own type, it'll remove that one first.
1488	* op is the object to insert it under: supplies x and the map.	1502	* op is the object to insert it under: supplies x and the map.
1489	*/	1503	*/
1490	void	1504	void
1491	replace_insert_ob_in_map (const char arch_string, object op)	1505	replace_insert_ob_in_map (shstr_tmp archname, object *op)
1492	{	1506	{
1493	/* first search for itself and remove any old instances */	1507	/* first search for itself and remove any old instances */
1494		1508
1495	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)	1509	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1496	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */	1510	if (tmp->arch->archname == archname) /* same archetype */
1497	tmp->destroy (1);	1511	tmp->destroy ();
1498		1512
1499	object *tmp = arch_to_object (archetype::find (arch_string));	1513	object *tmp = arch_to_object (archetype::find (archname));
1500		1514
1501	tmp->x = op->x;	1515	tmp->x = op->x;
1502	tmp->y = op->y;	1516	tmp->y = op->y;
1503		1517
1504	insert_ob_in_map (tmp, op->map, op, 0);	1518	insert_ob_in_map (tmp, op->map, op, 0);
…		…
1625	if (object *pl = tmp->visible_to ())	1639	if (object *pl = tmp->visible_to ())
1626	esrv_update_item (UPD_NROF, pl, tmp);	1640	esrv_update_item (UPD_NROF, pl, tmp);
1627		1641
1628	adjust_weight (this, op->total_weight ());	1642	adjust_weight (this, op->total_weight ());
1629		1643
1630	op->destroy (1);	1644	op->destroy ();
1631	op = tmp;	1645	op = tmp;
1632	goto inserted;	1646	goto inserted;
1633	}	1647	}
1634		1648
1635	op->owner = 0; // it's his/hers now. period.	1649	op->owner = 0; // it's his/hers now. period.
…		…
1653		1667
1654	adjust_weight (this, op->total_weight ());	1668	adjust_weight (this, op->total_weight ());
1655		1669
1656	inserted:	1670	inserted:
1657	/* reset the light list and los of the players on the map */	1671	/* reset the light list and los of the players on the map */
1658	if (op->glow_radius && map && map->darkness)	1672	if (op->glow_radius && is_on_map ())
		1673	{
		1674	update_stats ();
1659	update_all_los (map, x, y);	1675	update_all_los (map, x, y);
1660		1676	}
		1677	else if (is_player () && !flag [FLAG_NO_FIX_PLAYER])
1661	// if this is a player's inventory, update stats	1678	// if this is a player's inventory, update stats
1662	if (type == PLAYER && !flag [FLAG_NO_FIX_PLAYER])
1663	update_stats ();	1679	update_stats ();
1664		1680
1665	INVOKE_OBJECT (INSERT, this);	1681	INVOKE_OBJECT (INSERT, this);
1666		1682
1667	return op;	1683	return op;
…		…
1751	{	1767	{
1752		1768
1753	float	1769	float
1754	diff = tmp->move_slow_penalty * fabs (op->speed);	1770	diff = tmp->move_slow_penalty * fabs (op->speed);
1755		1771
1756	if (op->type == PLAYER)	1772	if (op->is_player ())
1757	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) \|\|	1773	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) \|\|
1758	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))	1774	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))
1759	diff /= 4.0;	1775	diff /= 4.0;
1760		1776
1761	op->speed_left -= diff;	1777	op->speed_left -= diff;
…		…
1969	* head of the object should correspond for the entire object.	1985	* head of the object should correspond for the entire object.
1970	*/	1986	*/
1971	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))	1987	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
1972	continue;	1988	continue;
1973		1989
1974	if (ob->blocked (m, pos.x, pos.y))	1990	if (ob->blocked (pos.m, pos.x, pos.y))
1975	continue;	1991	continue;
1976		1992
1977	altern [index++] = i;	1993	altern [index++] = i;
1978	}	1994	}
1979		1995
…		…
2047	* there is capable of.	2063	* there is capable of.
2048	*/	2064	*/
2049	int	2065	int
2050	find_dir (maptile m, int x, int y, object exclude)	2066	find_dir (maptile m, int x, int y, object exclude)
2051	{	2067	{
2052	int i, max = SIZEOFFREE, mflags;	2068	int max = SIZEOFFREE, mflags;
2053
2054	sint16 nx, ny;
2055	object *tmp;
2056	maptile *mp;
2057
2058	MoveType blocked, move_type;	2069	MoveType move_type;
2059		2070
2060	if (exclude && exclude->head_ () != exclude)	2071	if (exclude && exclude->head_ () != exclude)
2061	{	2072	{
2062	exclude = exclude->head;	2073	exclude = exclude->head;
2063	move_type = exclude->move_type;	2074	move_type = exclude->move_type;
…		…
2066	{	2077	{
2067	/* If we don't have anything, presume it can use all movement types. */	2078	/* If we don't have anything, presume it can use all movement types. */
2068	move_type = MOVE_ALL;	2079	move_type = MOVE_ALL;
2069	}	2080	}
2070		2081
2071	for (i = 1; i < max; i++)	2082	for (int i = 1; i < max; i++)
2072	{	2083	{
2073	mp = m;	2084	mapxy pos (m, x, y);
2074	nx = x + freearr_x[i];	2085	pos.move (i);
2075	ny = y + freearr_y[i];
2076		2086
2077	mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);	2087	if (!pos.normalise ())
2078
2079	if (mflags & P_OUT_OF_MAP)
2080	max = maxfree[i];	2088	max = maxfree[i];
2081	else	2089	else
2082	{	2090	{
2083	mapspace &ms = mp->at (nx, ny);	2091	mapspace &ms = *pos;
2084		2092
2085	blocked = ms.move_block;
2086
2087	if ((move_type & blocked) == move_type)	2093	if ((move_type & ms.move_block) == move_type)
2088	max = maxfree[i];	2094	max = maxfree [i];
2089	else if (mflags & P_IS_ALIVE)	2095	else if (ms.flags () & P_IS_ALIVE)
2090	{	2096	{
2091	for (tmp = ms.bot; tmp; tmp = tmp->above)	2097	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
2092	if ((tmp->flag [FLAG_MONSTER] \|\| tmp->type == PLAYER)	2098	if ((tmp->flag [FLAG_MONSTER] \|\| tmp->is_player ())
2093	&& (tmp != exclude \|\| (tmp->head_ () != tmp && tmp->head_ () != exclude)))	2099	&& (tmp != exclude \|\| (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2094	break;
2095
2096	if (tmp)
2097	return freedir[i];	2100	return freedir [i];
2098	}	2101	}
2099	}	2102	}
2100	}	2103	}
2101		2104
2102	return 0;	2105	return 0;
…		…
2177	* This basically means that if direction is 15, then it could either go	2180	* This basically means that if direction is 15, then it could either go
2178	* direction 4, 14, or 16 to get back to where we are.	2181	* direction 4, 14, or 16 to get back to where we are.
2179	* Moved from spell_util.c to object.c with the other related direction	2182	* Moved from spell_util.c to object.c with the other related direction
2180	* functions.	2183	* functions.
2181	*/	2184	*/
2182	int reduction_dir[SIZEOFFREE][3] = {	2185	const int reduction_dir[SIZEOFFREE][3] = {
2183	{0, 0, 0}, /* 0 */	2186	{0, 0, 0}, /* 0 */
2184	{0, 0, 0}, /* 1 */	2187	{0, 0, 0}, /* 1 */
2185	{0, 0, 0}, /* 2 */	2188	{0, 0, 0}, /* 2 */
2186	{0, 0, 0}, /* 3 */	2189	{0, 0, 0}, /* 3 */
2187	{0, 0, 0}, /* 4 */	2190	{0, 0, 0}, /* 4 */
…		…
2283	int	2286	int
2284	can_pick (const object who, const object item)	2287	can_pick (const object who, const object item)
2285	{	2288	{
2286	return /QUERY_FLAG(who,FLAG_WIZ)\|\| /	2289	return /QUERY_FLAG(who,FLAG_WIZ)\|\| /
2287	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&	2290	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
2288	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER \|\| item->weight < who->weight / 3));	2291	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->is_player () \|\| item->weight < who->weight / 3));
2289	}	2292	}
2290		2293
2291	/*	2294	/*
2292	* create clone from object to another	2295	* create clone from object to another
2293	*/	2296	*/
…		…
2325	return tmp;	2328	return tmp;
2326		2329
2327	return 0;	2330	return 0;
2328	}	2331	}
2329		2332
2330	const shstr &	2333	shstr_tmp
2331	object::kv_get (const shstr &key) const	2334	object::kv_get (shstr_tmp key) const
2332	{	2335	{
2333	for (key_value *kv = key_values; kv; kv = kv->next)	2336	for (key_value *kv = key_values; kv; kv = kv->next)
2334	if (kv->key == key)	2337	if (kv->key == key)
2335	return kv->value;	2338	return kv->value;
2336		2339
2337	return shstr_null;	2340	return shstr ();
2338	}	2341	}
2339		2342
2340	void	2343	void
2341	object::kv_set (const shstr &key, const shstr &value)	2344	object::kv_set (shstr_tmp key, shstr_tmp value)
2342	{	2345	{
2343	for (key_value *kv = key_values; kv; kv = kv->next)	2346	for (key_value *kv = key_values; kv; kv = kv->next)
2344	if (kv->key == key)	2347	if (kv->key == key)
2345	{	2348	{
2346	kv->value = value;	2349	kv->value = value;
…		…
2355		2358
2356	key_values = kv;	2359	key_values = kv;
2357	}	2360	}
2358		2361
2359	void	2362	void
2360	object::kv_del (const shstr &key)	2363	object::kv_del (shstr_tmp key)
2361	{	2364	{
2362	for (key_value *kvp = &key_values; kvp; kvp = &(*kvp)->next)	2365	for (key_value *kvp = &key_values; kvp; kvp = &(*kvp)->next)
2363	if ((*kvp)->key == key)	2366	if ((*kvp)->key == key)
2364	{	2367	{
2365	key_value kv = kvp;	2368	key_value kv = kvp;
…		…
2496	container = 0;	2499	container = 0;
2497		2500
2498	// client needs item update to make it work, client bug requires this to be separate	2501	// client needs item update to make it work, client bug requires this to be separate
2499	esrv_update_item (UPD_FLAGS, this, old_container);	2502	esrv_update_item (UPD_FLAGS, this, old_container);
2500		2503
2501	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));	2504	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", old_container->query_name ());
2502	play_sound (sound_find ("chest_close"));	2505	play_sound (sound_find ("chest_close"));
2503	}	2506	}
2504		2507
2505	if (new_container)	2508	if (new_container)
2506	{	2509	{
…		…
2516	closer->flag [FLAG_NO_MAP_SAVE] = 1;	2519	closer->flag [FLAG_NO_MAP_SAVE] = 1;
2517	new_container->insert (closer);	2520	new_container->insert (closer);
2518	}	2521	}
2519	#endif	2522	#endif
2520		2523
2521	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));	2524	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", new_container->query_name ());
2522		2525
2523	// make sure the container is available, client bug requires this to be separate	2526	// make sure the container is available, client bug requires this to be separate
2524	esrv_send_item (this, new_container);	2527	esrv_send_item (this, new_container);
2525		2528
2526	new_container->flag [FLAG_APPLIED] = true;	2529	new_container->flag [FLAG_APPLIED] = true;
…		…
2534	// else if (!old_container->env && contr && contr->ns)	2537	// else if (!old_container->env && contr && contr->ns)
2535	// contr->ns->floorbox_reset ();	2538	// contr->ns->floorbox_reset ();
2536	}	2539	}
2537		2540
2538	object *	2541	object *
2539	object::force_find (const shstr name)	2542	object::force_find (shstr_tmp name)
2540	{	2543	{
2541	/* cycle through his inventory to look for the MARK we want to	2544	/* cycle through his inventory to look for the MARK we want to
2542	* place	2545	* place
2543	*/	2546	*/
2544	for (object *tmp = inv; tmp; tmp = tmp->below)	2547	for (object *tmp = inv; tmp; tmp = tmp->below)
…		…
2546	return splay (tmp);	2549	return splay (tmp);
2547		2550
2548	return 0;	2551	return 0;
2549	}	2552	}
2550		2553
2551	void	2554	object *
2552	object::force_add (const shstr name, int duration)	2555	object::force_add (shstr_tmp name, int duration)
2553	{	2556	{
2554	if (object *force = force_find (name))	2557	if (object *force = force_find (name))
2555	force->destroy ();	2558	force->destroy ();
2556		2559
2557	object *force = get_archetype (FORCE_NAME);	2560	object *force = get_archetype (FORCE_NAME);
…		…
2562		2565
2563	force->set_speed (duration ? 1.f / duration : 0.f);	2566	force->set_speed (duration ? 1.f / duration : 0.f);
2564	force->flag [FLAG_IS_USED_UP] = true;	2567	force->flag [FLAG_IS_USED_UP] = true;
2565	force->flag [FLAG_APPLIED] = true;	2568	force->flag [FLAG_APPLIED] = true;
2566		2569
2567	insert (force);	2570	return insert (force);
2568	}	2571	}
2569		2572
2570	void	2573	void
2571	object::play_sound (faceidx sound)	2574	object::play_sound (faceidx sound) const
2572	{	2575	{
2573	if (!sound)	2576	if (!sound)
2574	return;	2577	return;
2575		2578
2576	if (flag [FLAG_REMOVED])	2579	if (is_on_map ())
		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);
		2592	}
		2593
		2594	void
		2595	object::make_noise ()
		2596	{
		2597	// we do not model noise in the map, so instead put
		2598	// a temporary light into the noise source
		2599	// could use the map instead, but that's less reliable for our
		2600	// goal, which is to make invisibility a bit harder to exploit
		2601
		2602	// currently only works sensibly for players
		2603	if (!is_player ())
2577	return;	2604	return;
2578		2605
2579	if (env)	2606	// find old force, or create new one
2580	{	2607	object *force = force_find (shstr_noise_force);
2581	if (object *pl = in_player ())	2608
2582	pl->contr->play_sound (sound);	2609	if (force)
2583	}	2610	force->speed_left = -1.f; // patch old speed up
2584	else	2611	else
2585	map->play_sound (sound, x, y);	2612	{
2586	}	2613	force = archetype::get (shstr_noise_force);
2587		2614
		2615	force->slaying = shstr_noise_force;
		2616	force->stats.food = 1;
		2617	force->speed_left = -1.f;
		2618
		2619	force->set_speed (1.f / 4.f);
		2620	force->flag [FLAG_IS_USED_UP] = true;
		2621	force->flag [FLAG_APPLIED] = true;
		2622
		2623	insert (force);
		2624	}
		2625	}
		2626

Diff Legend

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

Comparing deliantra/server/common/object.C (file contents): Revision 1.255 by root, Sun Aug 31 02:01:41 2008 UTC vs. Revision 1.286 by root, Wed Sep 2 16:54:20 2009 UTC

Diff Legend

Comparing deliantra/server/common/object.C (file contents):
Revision 1.255 by root, Sun Aug 31 02:01:41 2008 UTC vs.
Revision 1.286 by root, Wed Sep 2 16:54:20 2009 UTC