[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.288 by root, Sat Oct 3 22:36:08 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 ())
…		…
554	update_stats ();	555	update_stats ();
555		556
556	new_draw_info_format (NDI_UNIQUE, 0, this,	557	new_draw_info_format (NDI_UNIQUE, 0, this,
557	"You try to balance all your items at once, "	558	"You try to balance all your items at once, "
558	"but the %s is just too much for your body. "	559	"but the %s is just too much for your body. "
559	"[You need to unapply some items first.]", &ob->name);	560	"[You need to unapply some items first - use the 'body' command to see "
		561	"how many items you cna wera on a specific body part.]", &ob->name);
560	return false;	562	return false;
561	}	563	}
562		564
563	//new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);	565	//new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);
564	}	566	}
…		…
758	else if (action == UP_OBJ_INSERT)	760	else if (action == UP_OBJ_INSERT)
759	{	761	{
760	// this is likely overkill, TODO: revisit (schmorp)	762	// this is likely overkill, TODO: revisit (schmorp)
761	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))	763	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
762	\|\| (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))	764	\|\| (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))
763	\|\| (op->type == PLAYER && !(m.flags_ & P_PLAYER))	765	\|\| (op->is_player () && !(m.flags_ & P_PLAYER))
764	\|\| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))	766	\|\| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
765	\|\| (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))	767	\|\| (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))
766	\|\| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))	768	\|\| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))
767	\|\| (m.move_on \| op->move_on ) != m.move_on	769	\|\| (m.move_on \| op->move_on ) != m.move_on
768	\|\| (m.move_off \| op->move_off ) != m.move_off	770	\|\| (m.move_off \| op->move_off ) != m.move_off
…		…
770	/* This isn't perfect, but I don't expect a lot of objects to	772	/* This isn't perfect, but I don't expect a lot of objects to
771	* have move_allow right now.	773	* have move_allow right now.
772	*/	774	*/
773	\|\| ((m.move_block \| op->move_block) & ~op->move_allow) != m.move_block	775	\|\| ((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)	776	\|\| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)
775	m.flags_ = 0;	777	m.invalidate ();
776	}	778	}
777	/* if the object is being removed, we can't make intelligent	779	/* if the object is being removed, we can't make intelligent
778	* decisions, because remove_ob can't really pass the object	780	* decisions, because remove_ob can't really pass the object
779	* that is being removed.	781	* that is being removed.
780	*/	782	*/
781	else if (action == UP_OBJ_CHANGE \|\| action == UP_OBJ_REMOVE)	783	else if (action == UP_OBJ_CHANGE \|\| action == UP_OBJ_REMOVE)
782	m.flags_ = 0;	784	m.invalidate ();
783	else if (action == UP_OBJ_FACE)	785	else if (action == UP_OBJ_FACE)
784	/* Nothing to do for that case */ ;	786	/* Nothing to do for that case */ ;
785	else	787	else
786	LOG (llevError, "update_object called with invalid action: %d\n", action);	788	LOG (llevError, "update_object called with invalid action: %d\n", action);
787		789
…		…
791		793
792	object::object ()	794	object::object ()
793	{	795	{
794	SET_FLAG (this, FLAG_REMOVED);	796	SET_FLAG (this, FLAG_REMOVED);
795		797
796	expmul = 1.0;	798	//expmul = 1.0; declared const for the time being
797	face = blank_face;	799	face = blank_face;
798	}	800	}
799		801
800	object::~object ()	802	object::~object ()
801	{	803	{
…		…
830	{	832	{
831	/* If already on active list, don't do anything */	833	/* If already on active list, don't do anything */
832	if (active)	834	if (active)
833	return;	835	return;
834		836
835	if (has_active_speed () && flag [FLAG_FREED]) LOG (llevError \| logBacktrace, "BUG: tried to activate freed object %s\n", debug_desc ());//D
836	if (has_active_speed () && flag [FLAG_DEBUG]) LOG (llevError \| logBacktrace, "BUG: tried to activate DEBUG object %s\n", debug_desc ());//D temp
837
838	if (has_active_speed ())	837	if (has_active_speed ())
		838	{
		839	if (flag [FLAG_FREED])
		840	LOG (llevError \| logBacktrace, "BUG: tried to activate freed object %s\n", debug_desc ());//D
		841
839	actives.insert (this);	842	actives.insert (this);
		843	}
840	}	844	}
841		845
842	void	846	void
843	object::activate_recursive ()	847	object::activate_recursive ()
844	{	848	{
…		…
909	\|\| map->in_memory != MAP_ACTIVE	913	\|\| map->in_memory != MAP_ACTIVE
910	\|\| map->no_drop	914	\|\| map->no_drop
911	\|\| ms ().move_block == MOVE_ALL)	915	\|\| ms ().move_block == MOVE_ALL)
912	{	916	{
913	while (inv)	917	while (inv)
914	inv->destroy (true);	918	inv->destroy ();
915	}	919	}
916	else	920	else
917	{ /* Put objects in inventory onto this space */	921	{ /* Put objects in inventory onto this space */
918	while (inv)	922	while (inv)
919	{	923	{
…		…
923	\|\| op->flag [FLAG_NO_DROP]	927	\|\| op->flag [FLAG_NO_DROP]
924	\|\| op->type == RUNE	928	\|\| op->type == RUNE
925	\|\| op->type == TRAP	929	\|\| op->type == TRAP
926	\|\| op->flag [FLAG_IS_A_TEMPLATE]	930	\|\| op->flag [FLAG_IS_A_TEMPLATE]
927	\|\| op->flag [FLAG_DESTROY_ON_DEATH])	931	\|\| op->flag [FLAG_DESTROY_ON_DEATH])
928	op->destroy (true);	932	op->destroy ();
929	else	933	else
930	map->insert (op, x, y);	934	map->insert (op, x, y);
931	}	935	}
932	}	936	}
933	}	937	}
…		…
962		966
963	void	967	void
964	object::do_destroy ()	968	object::do_destroy ()
965	{	969	{
966	if (flag [FLAG_IS_LINKED])	970	if (flag [FLAG_IS_LINKED])
967	remove_button_link (this);	971	remove_link ();
968		972
969	if (flag [FLAG_FRIENDLY])	973	if (flag [FLAG_FRIENDLY])
970	remove_friendly_object (this);	974	remove_friendly_object (this);
971		975
972	remove ();	976	remove ();
…		…
983	x = 1;	987	x = 1;
984	y = 1;	988	y = 1;
985		989
986	if (more)	990	if (more)
987	{	991	{
988	more->destroy (true);	992	more->destroy ();
989	more = 0;	993	more = 0;
990	}	994	}
991		995
992	head = 0;	996	head = 0;
993		997
…		…
997	attacked_by = 0;	1001	attacked_by = 0;
998	current_weapon = 0;	1002	current_weapon = 0;
999	}	1003	}
1000		1004
1001	void	1005	void
1002	object::destroy (bool destroy_inventory)	1006	object::destroy ()
1003	{	1007	{
1004	if (destroyed ())	1008	if (destroyed ())
1005	return;	1009	return;
1006		1010
1007	if (!is_head () && !head->destroyed ())	1011	if (!is_head () && !head->destroyed ())
1008	{	1012	{
1009	LOG (llevError \| logBacktrace, "tried to destroy the tail of an object");	1013	LOG (llevError \| logBacktrace, "tried to destroy the tail of an object");
1010	head->destroy (destroy_inventory);	1014	head->destroy ();
1011	return;	1015	return;
1012	}	1016	}
1013		1017
1014	destroy_inv (!destroy_inventory);	1018	destroy_inv (false);
1015		1019
1016	if (is_head ())	1020	if (is_head ())
1017	if (sound_destroy)	1021	if (sound_destroy)
1018	play_sound (sound_destroy);	1022	play_sound (sound_destroy);
1019	else if (flag [FLAG_MONSTER])	1023	else if (flag [FLAG_MONSTER])
…		…
1055	if (object *pl = visible_to ())	1059	if (object *pl = visible_to ())
1056	esrv_del_item (pl->contr, count);	1060	esrv_del_item (pl->contr, count);
1057	flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed	1061	flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed
1058		1062
1059	adjust_weight (env, -total_weight ());	1063	adjust_weight (env, -total_weight ());
		1064
		1065	object *pl = in_player ();
1060		1066
1061	/* we set up values so that it could be inserted into	1067	/* we set up values so that it could be inserted into
1062	* the map, but we don't actually do that - it is up	1068	* the map, but we don't actually do that - it is up
1063	* to the caller to decide what we want to do.	1069	* to the caller to decide what we want to do.
1064	*/	1070	*/
…		…
1076		1082
1077	/* NO_FIX_PLAYER is set when a great many changes are being	1083	/* NO_FIX_PLAYER is set when a great many changes are being
1078	* made to players inventory. If set, avoiding the call	1084	* made to players inventory. If set, avoiding the call
1079	* to save cpu time.	1085	* to save cpu time.
1080	*/	1086	*/
1081	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1087	if (pl)
		1088	if (pl->is_player () && (glow_radius \|\| !QUERY_FLAG (pl, FLAG_NO_FIX_PLAYER)))
		1089	{
1082	otmp->update_stats ();	1090	pl->update_stats ();
		1091
		1092	if (glow_radius && pl->is_on_map ())
		1093	update_all_los (pl->map, pl->x, pl->y);
		1094	}
1083	}	1095	}
1084	else if (map)	1096	else if (map)
1085	{	1097	{
1086	map->dirty = true;	1098	map->dirty = true;
1087	mapspace &ms = this->ms ();	1099	mapspace &ms = this->ms ();
1088		1100
1089	if (object *pl = ms.player ())	1101	if (object *pl = ms.player ())
1090	{	1102	{
1091	if (type == PLAYER) // this == pl(!)	1103	if (is_player ())
1092	{	1104	{
		1105	if (!flag [FLAG_WIZPASS])
		1106	ms.smell = ++mapspace::smellcount; // remember the smell of the player
		1107
1093	// leaving a spot always closes any open container on the ground	1108	// leaving a spot always closes any open container on the ground
1094	if (container && !container->env)	1109	if (container && !container->env)
1095	// this causes spurious floorbox updates, but it ensures	1110	// this causes spurious floorbox updates, but it ensures
1096	// that the CLOSE event is being sent.	1111	// that the CLOSE event is being sent.
1097	close_container ();	1112	close_container ();
…		…
1114	*(below ? &below->above : &ms.bot) = above;	1129	*(below ? &below->above : &ms.bot) = above;
1115		1130
1116	above = 0;	1131	above = 0;
1117	below = 0;	1132	below = 0;
1118		1133
1119	ms.flags_ = 0;	1134	ms.invalidate ();
1120		1135
1121	if (map->in_memory == MAP_SAVING)	1136	if (map->in_memory == MAP_SAVING)
1122	return;	1137	return;
1123		1138
1124	int check_walk_off = !flag [FLAG_NO_APPLY];	1139	int check_walk_off = !flag [FLAG_NO_APPLY];
…		…
1157	}	1172	}
1158		1173
1159	last = tmp;	1174	last = tmp;
1160	}	1175	}
1161		1176
1162	if (flag [FLAG_BLOCKSVIEW] \|\| glow_radius)	1177	if (affects_los ())
1163	update_all_los (map, x, y);	1178	update_all_los (map, x, y);
1164	}	1179	}
1165	}	1180	}
1166		1181
1167	/*	1182	/*
…		…
1191	esrv_update_item (UPD_NROF, pl, top);	1206	esrv_update_item (UPD_NROF, pl, top);
1192		1207
1193	op->weight = 0; // cancel the addition above	1208	op->weight = 0; // cancel the addition above
1194	op->carrying = 0; // must be 0 already	1209	op->carrying = 0; // must be 0 already
1195		1210
1196	op->destroy (true);	1211	op->destroy ();
1197		1212
1198	return top;	1213	return top;
1199	}	1214	}
1200		1215
1201	return 0;	1216	return 0;
…		…
1263	* just 'op' otherwise	1278	* just 'op' otherwise
1264	*/	1279	*/
1265	object *	1280	object *
1266	insert_ob_in_map (object op, maptile m, object *originator, int flag)	1281	insert_ob_in_map (object op, maptile m, object *originator, int flag)
1267	{	1282	{
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 ();	1283	op->remove ();
1278	}
1279		1284
1280	if (m == &freed_map)//D TODO: remove soon	1285	if (m == &freed_map)//D TODO: remove soon
1281	{//D	1286	{//D
1282	LOG (llevError \| logBacktrace, "tries to insret object on freed objects map: %s", op->debug_desc ());//D	1287	LOG (llevError \| logBacktrace, "tries to insret object on freed objects map: %s", op->debug_desc ());//D
1283	}//D	1288	}//D
1284		1289
1285	/* Ideally, the caller figures this out. However, it complicates a lot	1290	/* 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	1291	* of areas of callers (eg, anything that uses find_free_spot would now
1287	* need extra work	1292	* need extra work
1288	*/	1293	*/
		1294	maptile *newmap = m;
1289	if (!xy_normalise (m, op->x, op->y))	1295	if (!xy_normalise (newmap, op->x, op->y))
1290	{	1296	{
1291	op->head_ ()->destroy (true);// remove head_ once all tail object destroyers found	1297	op->head_ ()->destroy ();// remove head_ once all tail object destroyers found
1292	return 0;	1298	return 0;
1293	}	1299	}
1294		1300
1295	if (object *more = op->more)	1301	if (object *more = op->more)
1296	if (!insert_ob_in_map (more, m, originator, flag))	1302	if (!insert_ob_in_map (more, m, originator, flag))
1297	return 0;	1303	return 0;
1298		1304
1299	CLEAR_FLAG (op, FLAG_REMOVED);	1305	op->flag [FLAG_REMOVED] = false;
1300		1306	op->env = 0;
1301	op->map = m;	1307	op->map = newmap;
		1308
1302	mapspace &ms = op->ms ();	1309	mapspace &ms = op->ms ();
1303		1310
1304	/* this has to be done after we translate the coordinates.	1311	/* this has to be done after we translate the coordinates.
1305	*/	1312	*/
1306	if (op->nrof && !(flag & INS_NO_MERGE))	1313	if (op->nrof && !(flag & INS_NO_MERGE))
…		…
1309	{	1316	{
1310	// TODO: we actually want to update tmp, not op,	1317	// TODO: we actually want to update tmp, not op,
1311	// but some caller surely breaks when we return tmp	1318	// but some caller surely breaks when we return tmp
1312	// from here :/	1319	// from here :/
1313	op->nrof += tmp->nrof;	1320	op->nrof += tmp->nrof;
1314	tmp->destroy (true);	1321	tmp->destroy ();
1315	}	1322	}
1316		1323
1317	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1324	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1318	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1325	CLEAR_FLAG (op, FLAG_INV_LOCKED);
1319		1326
…		…
1327	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");	1334	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");
1328	abort ();	1335	abort ();
1329	}	1336	}
1330		1337
1331	if (!originator->is_on_map ())	1338	if (!originator->is_on_map ())
		1339	{
1332	LOG (llevDebug \| logBacktrace, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map",	1340	LOG (llevError, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map",
1333	op->debug_desc (), originator->debug_desc ());	1341	op->debug_desc (), originator->debug_desc ());
		1342	abort ();
		1343	}
1334		1344
1335	op->above = originator;	1345	op->above = originator;
1336	op->below = originator->below;	1346	op->below = originator->below;
1337	originator->below = op;	1347	originator->below = op;
1338		1348
…		…
1424	op->below = top;	1434	op->below = top;
1425	*(op->above ? &op->above->below : &ms.top) = op;	1435	*(op->above ? &op->above->below : &ms.top) = op;
1426	}	1436	}
1427	}	1437	}
1428		1438
1429	if (op->type == PLAYER)	1439	if (op->is_player ())
1430	{	1440	{
1431	op->contr->do_los = 1;	1441	op->contr->do_los = 1;
1432	++op->map->players;	1442	++op->map->players;
1433	op->map->touch ();	1443	op->map->touch ();
1434	}	1444	}
…		…
1449	* be far away from this change and not affected in any way -	1459	* be far away from this change and not affected in any way -
1450	* this should get redone to only look for players within range,	1460	* this should get redone to only look for players within range,
1451	* or just updating the P_UPTODATE for spaces within this area	1461	* or just updating the P_UPTODATE for spaces within this area
1452	* of effect may be sufficient.	1462	* of effect may be sufficient.
1453	*/	1463	*/
1454	if (op->map->darkness && (op->glow_radius != 0))	1464	if (op->affects_los ())
		1465	{
		1466	op->ms ().invalidate ();
1455	update_all_los (op->map, op->x, op->y);	1467	update_all_los (op->map, op->x, op->y);
		1468	}
1456		1469
1457	/* updates flags (blocked, alive, no magic, etc) for this map space */	1470	/* updates flags (blocked, alive, no magic, etc) for this map space */
1458	update_object (op, UP_OBJ_INSERT);	1471	update_object (op, UP_OBJ_INSERT);
1459		1472
1460	INVOKE_OBJECT (INSERT, op);	1473	INVOKE_OBJECT (INSERT, op);
…		…
1467	* blocked() and wall() work properly), and these flags are updated by	1480	* blocked() and wall() work properly), and these flags are updated by
1468	* update_object().	1481	* update_object().
1469	*/	1482	*/
1470		1483
1471	/* if this is not the head or flag has been passed, don't check walk on status */	1484	/* if this is not the head or flag has been passed, don't check walk on status */
1472	if (!(flag & INS_NO_WALK_ON) && op->head_ () == op)	1485	if (!(flag & INS_NO_WALK_ON) && op->is_head ())
1473	{	1486	{
1474	if (check_move_on (op, originator))	1487	if (check_move_on (op, originator))
1475	return 0;	1488	return 0;
1476		1489
1477	/* If we are a multi part object, lets work our way through the check	1490	/* If we are a multi part object, lets work our way through the check
…		…
1488	/* this function inserts an object in the map, but if it	1501	/* this function inserts an object in the map, but if it
1489	* finds an object of its own type, it'll remove that one first.	1502	* finds an object of its own type, it'll remove that one first.
1490	* op is the object to insert it under: supplies x and the map.	1503	* op is the object to insert it under: supplies x and the map.
1491	*/	1504	*/
1492	void	1505	void
1493	replace_insert_ob_in_map (const char arch_string, object op)	1506	replace_insert_ob_in_map (shstr_tmp archname, object *op)
1494	{	1507	{
1495	/* first search for itself and remove any old instances */	1508	/* first search for itself and remove any old instances */
1496		1509
1497	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)	1510	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1498	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */	1511	if (tmp->arch->archname == archname) /* same archetype */
1499	tmp->destroy (true);	1512	tmp->destroy ();
1500		1513
1501	object *tmp = arch_to_object (archetype::find (arch_string));	1514	object *tmp = arch_to_object (archetype::find (archname));
1502		1515
1503	tmp->x = op->x;	1516	tmp->x = op->x;
1504	tmp->y = op->y;	1517	tmp->y = op->y;
1505		1518
1506	insert_ob_in_map (tmp, op->map, op, 0);	1519	insert_ob_in_map (tmp, op->map, op, 0);
…		…
1627	if (object *pl = tmp->visible_to ())	1640	if (object *pl = tmp->visible_to ())
1628	esrv_update_item (UPD_NROF, pl, tmp);	1641	esrv_update_item (UPD_NROF, pl, tmp);
1629		1642
1630	adjust_weight (this, op->total_weight ());	1643	adjust_weight (this, op->total_weight ());
1631		1644
1632	op->destroy (true);	1645	op->destroy ();
1633	op = tmp;	1646	op = tmp;
1634	goto inserted;	1647	goto inserted;
1635	}	1648	}
1636		1649
1637	op->owner = 0; // it's his/hers now. period.	1650	op->owner = 0; // it's his/hers now. period.
…		…
1655		1668
1656	adjust_weight (this, op->total_weight ());	1669	adjust_weight (this, op->total_weight ());
1657		1670
1658	inserted:	1671	inserted:
1659	/* reset the light list and los of the players on the map */	1672	/* reset the light list and los of the players on the map */
1660	if (op->glow_radius && map && map->darkness)	1673	if (op->glow_radius && is_on_map ())
		1674	{
		1675	update_stats ();
1661	update_all_los (map, x, y);	1676	update_all_los (map, x, y);
1662		1677	}
		1678	else if (is_player () && !flag [FLAG_NO_FIX_PLAYER])
1663	// if this is a player's inventory, update stats	1679	// if this is a player's inventory, update stats
1664	if (type == PLAYER && !flag [FLAG_NO_FIX_PLAYER])
1665	update_stats ();	1680	update_stats ();
1666		1681
1667	INVOKE_OBJECT (INSERT, this);	1682	INVOKE_OBJECT (INSERT, this);
1668		1683
1669	return op;	1684	return op;
…		…
1690	* on top.	1705	* on top.
1691	*/	1706	*/
1692	int	1707	int
1693	check_move_on (object op, object originator)	1708	check_move_on (object op, object originator)
1694	{	1709	{
		1710	if (QUERY_FLAG (op, FLAG_NO_APPLY))
		1711	return 0;
		1712
1695	object *tmp;	1713	object *tmp;
1696	maptile *m = op->map;	1714	maptile *m = op->map;
1697	int x = op->x, y = op->y;	1715	int x = op->x, y = op->y;
1698		1716
1699	MoveType move_on, move_slow, move_block;	1717	mapspace &ms = m->at (x, y);
1700		1718
1701	if (QUERY_FLAG (op, FLAG_NO_APPLY))	1719	ms.update ();
1702	return 0;
1703		1720
1704	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);	1721	MoveType move_on = ms.move_on;
1705	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);	1722	MoveType move_slow = ms.move_slow;
1706	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);	1723	MoveType move_block = ms.move_block;
1707		1724
1708	/* if nothing on this space will slow op down or be applied,	1725	/* if nothing on this space will slow op down or be applied,
1709	* no need to do checking below. have to make sure move_type	1726	* no need to do checking below. have to make sure move_type
1710	* is set, as lots of objects don't have it set - we treat that	1727	* is set, as lots of objects don't have it set - we treat that
1711	* as walking.	1728	* as walking.
…		…
1722	return 0;	1739	return 0;
1723		1740
1724	/* The objects have to be checked from top to bottom.	1741	/* The objects have to be checked from top to bottom.
1725	* Hence, we first go to the top:	1742	* Hence, we first go to the top:
1726	*/	1743	*/
1727		1744	for (object next, tmp = ms.top; tmp; tmp = next)
1728	for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above)
1729	{
1730	/* Trim the search when we find the first other spell effect
1731	* this helps performance so that if a space has 50 spell objects,
1732	* we don't need to check all of them.
1733	*/
1734	if ((tmp->move_type & MOVE_FLY_LOW) && QUERY_FLAG (tmp, FLAG_NO_PICK))
1735	break;
1736	}	1745	{
		1746	next = tmp->below;
1737		1747
1738	for (; tmp; tmp = tmp->below)
1739	{
1740	if (tmp == op)	1748	if (tmp == op)
1741	continue; /* Can't apply yourself */	1749	continue; /* Can't apply yourself */
1742		1750
1743	/* Check to see if one of the movement types should be slowed down.	1751	/* Check to see if one of the movement types should be slowed down.
1744	* Second check makes sure that the movement types not being slowed	1752	* Second check makes sure that the movement types not being slowed
…		…
1749	if (!QUERY_FLAG (op, FLAG_WIZPASS))	1757	if (!QUERY_FLAG (op, FLAG_WIZPASS))
1750	{	1758	{
1751	if ((!op->move_type && tmp->move_slow & MOVE_WALK) \|\|	1759	if ((!op->move_type && tmp->move_slow & MOVE_WALK) \|\|
1752	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))	1760	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1753	{	1761	{
1754
1755	float
1756	diff = tmp->move_slow_penalty * fabs (op->speed);	1762	float diff = tmp->move_slow_penalty * fabs (op->speed);
1757		1763
1758	if (op->type == PLAYER)	1764	if (op->is_player ())
1759	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) \|\|	1765	if ((tmp->flag [FLAG_IS_HILLY ] && find_skill_by_number (op, SK_CLIMBING)) \|\|
1760	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))	1766	(tmp->flag [FLAG_IS_WOODED] && find_skill_by_number (op, SK_WOODSMAN)))
1761	diff /= 4.0;	1767	diff /= 4.0;
1762		1768
1763	op->speed_left -= diff;	1769	op->speed_left -= diff;
1764	}	1770	}
1765	}	1771	}
…		…
1971	* head of the object should correspond for the entire object.	1977	* head of the object should correspond for the entire object.
1972	*/	1978	*/
1973	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))	1979	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
1974	continue;	1980	continue;
1975		1981
1976	if (ob->blocked (m, pos.x, pos.y))	1982	if (ob->blocked (pos.m, pos.x, pos.y))
1977	continue;	1983	continue;
1978		1984
1979	altern [index++] = i;	1985	altern [index++] = i;
1980	}	1986	}
1981		1987
…		…
2049	* there is capable of.	2055	* there is capable of.
2050	*/	2056	*/
2051	int	2057	int
2052	find_dir (maptile m, int x, int y, object exclude)	2058	find_dir (maptile m, int x, int y, object exclude)
2053	{	2059	{
2054	int i, max = SIZEOFFREE, mflags;	2060	int max = SIZEOFFREE, mflags;
2055
2056	sint16 nx, ny;
2057	object *tmp;
2058	maptile *mp;
2059
2060	MoveType blocked, move_type;	2061	MoveType move_type;
2061		2062
2062	if (exclude && exclude->head_ () != exclude)	2063	if (exclude && exclude->head_ () != exclude)
2063	{	2064	{
2064	exclude = exclude->head;	2065	exclude = exclude->head;
2065	move_type = exclude->move_type;	2066	move_type = exclude->move_type;
…		…
2068	{	2069	{
2069	/* If we don't have anything, presume it can use all movement types. */	2070	/* If we don't have anything, presume it can use all movement types. */
2070	move_type = MOVE_ALL;	2071	move_type = MOVE_ALL;
2071	}	2072	}
2072		2073
2073	for (i = 1; i < max; i++)	2074	for (int i = 1; i < max; i++)
2074	{	2075	{
2075	mp = m;	2076	mapxy pos (m, x, y);
2076	nx = x + freearr_x[i];	2077	pos.move (i);
2077	ny = y + freearr_y[i];
2078		2078
2079	mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);	2079	if (!pos.normalise ())
2080
2081	if (mflags & P_OUT_OF_MAP)
2082	max = maxfree[i];	2080	max = maxfree[i];
2083	else	2081	else
2084	{	2082	{
2085	mapspace &ms = mp->at (nx, ny);	2083	mapspace &ms = *pos;
2086		2084
2087	blocked = ms.move_block;
2088
2089	if ((move_type & blocked) == move_type)	2085	if ((move_type & ms.move_block) == move_type)
2090	max = maxfree[i];	2086	max = maxfree [i];
2091	else if (mflags & P_IS_ALIVE)	2087	else if (ms.flags () & P_IS_ALIVE)
2092	{	2088	{
2093	for (tmp = ms.bot; tmp; tmp = tmp->above)	2089	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
2094	if ((tmp->flag [FLAG_MONSTER] \|\| tmp->type == PLAYER)	2090	if ((tmp->flag [FLAG_MONSTER] \|\| tmp->is_player ())
2095	&& (tmp != exclude \|\| (tmp->head_ () != tmp && tmp->head_ () != exclude)))	2091	&& (tmp != exclude \|\| (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2096	break;
2097
2098	if (tmp)
2099	return freedir[i];	2092	return freedir [i];
2100	}	2093	}
2101	}	2094	}
2102	}	2095	}
2103		2096
2104	return 0;	2097	return 0;
…		…
2179	* This basically means that if direction is 15, then it could either go	2172	* This basically means that if direction is 15, then it could either go
2180	* direction 4, 14, or 16 to get back to where we are.	2173	* direction 4, 14, or 16 to get back to where we are.
2181	* Moved from spell_util.c to object.c with the other related direction	2174	* Moved from spell_util.c to object.c with the other related direction
2182	* functions.	2175	* functions.
2183	*/	2176	*/
2184	int reduction_dir[SIZEOFFREE][3] = {	2177	const int reduction_dir[SIZEOFFREE][3] = {
2185	{0, 0, 0}, /* 0 */	2178	{0, 0, 0}, /* 0 */
2186	{0, 0, 0}, /* 1 */	2179	{0, 0, 0}, /* 1 */
2187	{0, 0, 0}, /* 2 */	2180	{0, 0, 0}, /* 2 */
2188	{0, 0, 0}, /* 3 */	2181	{0, 0, 0}, /* 3 */
2189	{0, 0, 0}, /* 4 */	2182	{0, 0, 0}, /* 4 */
…		…
2285	int	2278	int
2286	can_pick (const object who, const object item)	2279	can_pick (const object who, const object item)
2287	{	2280	{
2288	return /QUERY_FLAG(who,FLAG_WIZ)\|\| /	2281	return /QUERY_FLAG(who,FLAG_WIZ)\|\| /
2289	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&	2282	(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));	2283	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->is_player () \|\| item->weight < who->weight / 3));
2291	}	2284	}
2292		2285
2293	/*	2286	/*
2294	* create clone from object to another	2287	* create clone from object to another
2295	*/	2288	*/
…		…
2327	return tmp;	2320	return tmp;
2328		2321
2329	return 0;	2322	return 0;
2330	}	2323	}
2331		2324
2332	const shstr &	2325	shstr_tmp
2333	object::kv_get (const shstr &key) const	2326	object::kv_get (shstr_tmp key) const
2334	{	2327	{
2335	for (key_value *kv = key_values; kv; kv = kv->next)	2328	for (key_value *kv = key_values; kv; kv = kv->next)
2336	if (kv->key == key)	2329	if (kv->key == key)
2337	return kv->value;	2330	return kv->value;
2338		2331
2339	return shstr_null;	2332	return shstr ();
2340	}	2333	}
2341		2334
2342	void	2335	void
2343	object::kv_set (const shstr &key, const shstr &value)	2336	object::kv_set (shstr_tmp key, shstr_tmp value)
2344	{	2337	{
2345	for (key_value *kv = key_values; kv; kv = kv->next)	2338	for (key_value *kv = key_values; kv; kv = kv->next)
2346	if (kv->key == key)	2339	if (kv->key == key)
2347	{	2340	{
2348	kv->value = value;	2341	kv->value = value;
…		…
2357		2350
2358	key_values = kv;	2351	key_values = kv;
2359	}	2352	}
2360		2353
2361	void	2354	void
2362	object::kv_del (const shstr &key)	2355	object::kv_del (shstr_tmp key)
2363	{	2356	{
2364	for (key_value *kvp = &key_values; kvp; kvp = &(*kvp)->next)	2357	for (key_value *kvp = &key_values; kvp; kvp = &(*kvp)->next)
2365	if ((*kvp)->key == key)	2358	if ((*kvp)->key == key)
2366	{	2359	{
2367	key_value kv = kvp;	2360	key_value kv = kvp;
…		…
2486		2479
2487	#if 0	2480	#if 0
2488	// remove the "Close old_container" object.	2481	// remove the "Close old_container" object.
2489	if (object *closer = old_container->inv)	2482	if (object *closer = old_container->inv)
2490	if (closer->type == CLOSE_CON)	2483	if (closer->type == CLOSE_CON)
2491	closer->destroy (true);	2484	closer->destroy ();
2492	#endif	2485	#endif
2493		2486
2494	// make sure the container is available	2487	// make sure the container is available
2495	esrv_send_item (this, old_container);	2488	esrv_send_item (this, old_container);
2496		2489
…		…
2498	container = 0;	2491	container = 0;
2499		2492
2500	// client needs item update to make it work, client bug requires this to be separate	2493	// client needs item update to make it work, client bug requires this to be separate
2501	esrv_update_item (UPD_FLAGS, this, old_container);	2494	esrv_update_item (UPD_FLAGS, this, old_container);
2502		2495
2503	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));	2496	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", old_container->query_name ());
2504	play_sound (sound_find ("chest_close"));	2497	play_sound (sound_find ("chest_close"));
2505	}	2498	}
2506		2499
2507	if (new_container)	2500	if (new_container)
2508	{	2501	{
…		…
2518	closer->flag [FLAG_NO_MAP_SAVE] = 1;	2511	closer->flag [FLAG_NO_MAP_SAVE] = 1;
2519	new_container->insert (closer);	2512	new_container->insert (closer);
2520	}	2513	}
2521	#endif	2514	#endif
2522		2515
2523	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));	2516	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", new_container->query_name ());
2524		2517
2525	// make sure the container is available, client bug requires this to be separate	2518	// make sure the container is available, client bug requires this to be separate
2526	esrv_send_item (this, new_container);	2519	esrv_send_item (this, new_container);
2527		2520
2528	new_container->flag [FLAG_APPLIED] = true;	2521	new_container->flag [FLAG_APPLIED] = true;
…		…
2536	// else if (!old_container->env && contr && contr->ns)	2529	// else if (!old_container->env && contr && contr->ns)
2537	// contr->ns->floorbox_reset ();	2530	// contr->ns->floorbox_reset ();
2538	}	2531	}
2539		2532
2540	object *	2533	object *
2541	object::force_find (const shstr name)	2534	object::force_find (shstr_tmp name)
2542	{	2535	{
2543	/* cycle through his inventory to look for the MARK we want to	2536	/* cycle through his inventory to look for the MARK we want to
2544	* place	2537	* place
2545	*/	2538	*/
2546	for (object *tmp = inv; tmp; tmp = tmp->below)	2539	for (object *tmp = inv; tmp; tmp = tmp->below)
…		…
2548	return splay (tmp);	2541	return splay (tmp);
2549		2542
2550	return 0;	2543	return 0;
2551	}	2544	}
2552		2545
2553	void	2546	object *
2554	object::force_add (const shstr name, int duration)	2547	object::force_add (shstr_tmp name, int duration)
2555	{	2548	{
2556	if (object *force = force_find (name))	2549	if (object *force = force_find (name))
2557	force->destroy (true);	2550	force->destroy ();
2558		2551
2559	object *force = get_archetype (FORCE_NAME);	2552	object *force = get_archetype (FORCE_NAME);
2560		2553
2561	force->slaying = name;	2554	force->slaying = name;
2562	force->stats.food = 1;	2555	force->stats.food = 1;
…		…
2564		2557
2565	force->set_speed (duration ? 1.f / duration : 0.f);	2558	force->set_speed (duration ? 1.f / duration : 0.f);
2566	force->flag [FLAG_IS_USED_UP] = true;	2559	force->flag [FLAG_IS_USED_UP] = true;
2567	force->flag [FLAG_APPLIED] = true;	2560	force->flag [FLAG_APPLIED] = true;
2568		2561
2569	insert (force);	2562	return insert (force);
2570	}	2563	}
2571		2564
2572	void	2565	void
2573	object::play_sound (faceidx sound)	2566	object::play_sound (faceidx sound) const
2574	{	2567	{
2575	if (!sound)	2568	if (!sound)
2576	return;	2569	return;
2577		2570
2578	if (flag [FLAG_REMOVED])	2571	if (is_on_map ())
		2572	map->play_sound (sound, x, y);
		2573	else if (object *pl = in_player ())
		2574	pl->contr->play_sound (sound);
		2575	}
		2576
		2577	void
		2578	object::say_msg (const char *msg) const
		2579	{
		2580	if (is_on_map ())
		2581	map->say_msg (msg, x, y);
		2582	else if (object *pl = in_player ())
		2583	pl->contr->play_sound (sound);
		2584	}
		2585
		2586	void
		2587	object::make_noise ()
		2588	{
		2589	// we do not model noise in the map, so instead put
		2590	// a temporary light into the noise source
		2591	// could use the map instead, but that's less reliable for our
		2592	// goal, which is to make invisibility a bit harder to exploit
		2593
		2594	// currently only works sensibly for players
		2595	if (!is_player ())
2579	return;	2596	return;
2580		2597
2581	if (env)	2598	// find old force, or create new one
2582	{	2599	object *force = force_find (shstr_noise_force);
2583	if (object *pl = in_player ())	2600
2584	pl->contr->play_sound (sound);	2601	if (force)
2585	}	2602	force->speed_left = -1.f; // patch old speed up
2586	else	2603	else
2587	map->play_sound (sound, x, y);	2604	{
2588	}	2605	force = archetype::get (shstr_noise_force);
2589		2606
		2607	force->slaying = shstr_noise_force;
		2608	force->stats.food = 1;
		2609	force->speed_left = -1.f;
		2610
		2611	force->set_speed (1.f / 4.f);
		2612	force->flag [FLAG_IS_USED_UP] = true;
		2613	force->flag [FLAG_APPLIED] = true;
		2614
		2615	insert (force);
		2616	}
		2617	}
		2618

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.288 by root, Sat Oct 3 22:36:08 2009 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.288 by root, Sat Oct 3 22:36:08 2009 UTC