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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.254 by root, Sun Aug 31 01:17:11 2008 UTC vs.
Revision 1.292 by root, Mon Oct 19 21:48:49 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>
32	#include <bitset>	33	#include <bitset>
33		34
34	UUID UUID::cur;	35	UUID UUID::cur;
35	static uint64_t seq_next_save;	36	static uint64_t seq_next_save;
36	static const uint64 UUID_GAP = 1<<19;	37	static const uint64 UUID_GAP = 1<<19;
		38	uint32_t mapspace::smellcount = 10000;
37		39
38	objectvec objects;	40	objectvec objects;
39	activevec actives;	41	activevec actives;
40		42
41	short freearr_x[SIZEOFFREE] = {	43	short freearr_x[SIZEOFFREE] = {
…		…
232	\|\| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats)))	234	\|\| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats)))
233	return 0;	235	return 0;
234		236
235	if ((ob1->flag ^ ob2->flag)	237	if ((ob1->flag ^ ob2->flag)
236	.reset (FLAG_INV_LOCKED)	238	.reset (FLAG_INV_LOCKED)
237	.reset (FLAG_CLIENT_SENT)
238	.reset (FLAG_REMOVED)	239	.reset (FLAG_REMOVED)
239	.any ())	240	.any ())
240	return 0;	241	return 0;
241		242
242	/* This is really a spellbook check - we should in general	243	/* This is really a spellbook check - we should in general
…		…
324	{	325	{
325	// see if we are in a container of sorts	326	// see if we are in a container of sorts
326	if (env)	327	if (env)
327	{	328	{
328	// the player inventory itself is always visible	329	// the player inventory itself is always visible
329	if (env->type == PLAYER)	330	if (env->is_player ())
330	return env;	331	return env;
331		332
332	// else a player could have our env open	333	// else a player could have our env open
333	object *envest = env->outer_env ();	334	object *envest = env->outer_env_or_self ();
334		335
335	// the player itself is always on a map, so we will find him here	336	// the player itself is always on a map, so we will find him here
336	// even if our inv is in a player.	337	// even if our inv is in a player.
337	if (envest->is_on_map ())	338	if (envest->is_on_map ())
338	if (object *pl = envest->ms ().player ())	339	if (object *pl = envest->ms ().player ())
339	if (pl->container == env)	340	if (pl->container_ () == env)
340	return pl;	341	return pl;
341	}	342	}
342	else	343	else
343	{	344	{
344	// maybe there is a player standing on the same mapspace	345	// maybe there is a player standing on the same mapspace
345	// this will catch the case where "this" is a player	346	// this will catch the case where "this" is a player
346	if (object *pl = ms ().player ())	347	if (object *pl = ms ().player ())
347	if ((!pl->container && pl->contr->ns && !pl->contr->ns->update_look)	348	if ((pl->contr->ns && !pl->container_ () && !pl->contr->ns->update_look)
348	\|\| this == pl->container)	349	\|\| pl->container_ () == this)
349	return pl;	350	return pl;
350	}	351	}
351	}	352	}
352		353
353	return 0;	354	return 0;
…		…
429	return strdup ("[NULLOBJ]");	430	return strdup ("[NULLOBJ]");
430		431
431	object_freezer freezer;	432	object_freezer freezer;
432	op->write (freezer);	433	op->write (freezer);
433	return freezer.as_string ();	434	return freezer.as_string ();
		435	}
		436
		437	char *
		438	object::as_string ()
		439	{
		440	return dump_object (this);
434	}	441	}
435		442
436	/*	443	/*
437	* get_nearest_part(multi-object, object 2) returns the part of the	444	* get_nearest_part(multi-object, object 2) returns the part of the
438	* multi-object 1 which is closest to the second object.	445	* multi-object 1 which is closest to the second object.
…		…
555	update_stats ();	562	update_stats ();
556		563
557	new_draw_info_format (NDI_UNIQUE, 0, this,	564	new_draw_info_format (NDI_UNIQUE, 0, this,
558	"You try to balance all your items at once, "	565	"You try to balance all your items at once, "
559	"but the %s is just too much for your body. "	566	"but the %s is just too much for your body. "
560	"[You need to unapply some items first.]", &ob->name);	567	"[You need to unapply some items first - use the 'body' command to see "
		568	"how many items you cna wera on a specific body part.]", &ob->name);
561	return false;	569	return false;
562	}	570	}
563		571
564	//new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);	572	//new_draw_info_format (NDI_UNIQUE, 0, this, "You switch to your %s.", &ob->name);
565	}	573	}
…		…
637	}	645	}
638		646
639	if (speed < 0)	647	if (speed < 0)
640	dst->speed_left -= rndm ();	648	dst->speed_left -= rndm ();
641		649
642	dst->set_speed (dst->speed);	650	dst->activate ();
643	}	651	}
644		652
645	void	653	void
646	object::instantiate ()	654	object::instantiate ()
647	{	655	{
…		…
759	else if (action == UP_OBJ_INSERT)	767	else if (action == UP_OBJ_INSERT)
760	{	768	{
761	// this is likely overkill, TODO: revisit (schmorp)	769	// this is likely overkill, TODO: revisit (schmorp)
762	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))	770	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
763	\|\| (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))	771	\|\| (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))
764	\|\| (op->type == PLAYER && !(m.flags_ & P_PLAYER))	772	\|\| (op->is_player () && !(m.flags_ & P_PLAYER))
765	\|\| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))	773	\|\| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
766	\|\| (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))	774	\|\| (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))
767	\|\| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))	775	\|\| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))
768	\|\| (m.move_on \| op->move_on ) != m.move_on	776	\|\| (m.move_on \| op->move_on ) != m.move_on
769	\|\| (m.move_off \| op->move_off ) != m.move_off	777	\|\| (m.move_off \| op->move_off ) != m.move_off
…		…
771	/* This isn't perfect, but I don't expect a lot of objects to	779	/* This isn't perfect, but I don't expect a lot of objects to
772	* have move_allow right now.	780	* have move_allow right now.
773	*/	781	*/
774	\|\| ((m.move_block \| op->move_block) & ~op->move_allow) != m.move_block	782	\|\| ((m.move_block \| op->move_block) & ~op->move_allow) != m.move_block
775	\|\| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)	783	\|\| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)
776	m.flags_ = 0;	784	m.invalidate ();
777	}	785	}
778	/* if the object is being removed, we can't make intelligent	786	/* if the object is being removed, we can't make intelligent
779	* decisions, because remove_ob can't really pass the object	787	* decisions, because remove_ob can't really pass the object
780	* that is being removed.	788	* that is being removed.
781	*/	789	*/
782	else if (action == UP_OBJ_CHANGE \|\| action == UP_OBJ_REMOVE)	790	else if (action == UP_OBJ_CHANGE \|\| action == UP_OBJ_REMOVE)
783	m.flags_ = 0;	791	m.invalidate ();
784	else if (action == UP_OBJ_FACE)	792	else if (action == UP_OBJ_FACE)
785	/* Nothing to do for that case */ ;	793	/* Nothing to do for that case */ ;
786	else	794	else
787	LOG (llevError, "update_object called with invalid action: %d\n", action);	795	LOG (llevError, "update_object called with invalid action: %d\n", action);
788		796
…		…
792		800
793	object::object ()	801	object::object ()
794	{	802	{
795	SET_FLAG (this, FLAG_REMOVED);	803	SET_FLAG (this, FLAG_REMOVED);
796		804
797	expmul = 1.0;	805	//expmul = 1.0; declared const for the time being
798	face = blank_face;	806	face = blank_face;
799	}	807	}
800		808
801	object::~object ()	809	object::~object ()
802	{	810	{
…		…
832	/* If already on active list, don't do anything */	840	/* If already on active list, don't do anything */
833	if (active)	841	if (active)
834	return;	842	return;
835		843
836	if (has_active_speed ())	844	if (has_active_speed ())
		845	{
		846	if (flag [FLAG_FREED])
		847	LOG (llevError \| logBacktrace, "BUG: tried to activate freed object %s\n", debug_desc ());//D
		848
837	actives.insert (this);	849	actives.insert (this);
		850	}
838	}	851	}
839		852
840	void	853	void
841	object::activate_recursive ()	854	object::activate_recursive ()
842	{	855	{
…		…
907	\|\| map->in_memory != MAP_ACTIVE	920	\|\| map->in_memory != MAP_ACTIVE
908	\|\| map->no_drop	921	\|\| map->no_drop
909	\|\| ms ().move_block == MOVE_ALL)	922	\|\| ms ().move_block == MOVE_ALL)
910	{	923	{
911	while (inv)	924	while (inv)
912	inv->destroy (true);	925	inv->destroy ();
913	}	926	}
914	else	927	else
915	{ /* Put objects in inventory onto this space */	928	{ /* Put objects in inventory onto this space */
916	while (inv)	929	while (inv)
917	{	930	{
…		…
921	\|\| op->flag [FLAG_NO_DROP]	934	\|\| op->flag [FLAG_NO_DROP]
922	\|\| op->type == RUNE	935	\|\| op->type == RUNE
923	\|\| op->type == TRAP	936	\|\| op->type == TRAP
924	\|\| op->flag [FLAG_IS_A_TEMPLATE]	937	\|\| op->flag [FLAG_IS_A_TEMPLATE]
925	\|\| op->flag [FLAG_DESTROY_ON_DEATH])	938	\|\| op->flag [FLAG_DESTROY_ON_DEATH])
926	op->destroy (true);	939	op->destroy ();
927	else	940	else
928	map->insert (op, x, y);	941	map->insert (op, x, y);
929	}	942	}
930	}	943	}
931	}	944	}
…		…
960		973
961	void	974	void
962	object::do_destroy ()	975	object::do_destroy ()
963	{	976	{
964	if (flag [FLAG_IS_LINKED])	977	if (flag [FLAG_IS_LINKED])
965	remove_button_link (this);	978	remove_link ();
966		979
967	if (flag [FLAG_FRIENDLY])	980	if (flag [FLAG_FRIENDLY])
968	remove_friendly_object (this);	981	remove_friendly_object (this);
969		982
970	remove ();	983	remove ();
…		…
995	attacked_by = 0;	1008	attacked_by = 0;
996	current_weapon = 0;	1009	current_weapon = 0;
997	}	1010	}
998		1011
999	void	1012	void
1000	object::destroy (bool destroy_inventory)	1013	object::destroy ()
1001	{	1014	{
1002	if (destroyed ())	1015	if (destroyed ())
1003	return;	1016	return;
1004		1017
1005	if (!is_head () && !head->destroyed ())	1018	if (!is_head () && !head->destroyed ())
1006	{	1019	{
1007	LOG (llevError \| logBacktrace, "tried to destroy the tail of an object");	1020	LOG (llevError \| logBacktrace, "tried to destroy the tail of an object");
1008	head->destroy (destroy_inventory);	1021	head->destroy ();
1009	return;	1022	return;
1010	}	1023	}
1011		1024
1012	destroy_inv (!destroy_inventory);	1025	destroy_inv (false);
1013		1026
1014	if (is_head ())	1027	if (is_head ())
1015	if (sound_destroy)	1028	if (sound_destroy)
1016	play_sound (sound_destroy);	1029	play_sound (sound_destroy);
1017	else if (flag [FLAG_MONSTER])	1030	else if (flag [FLAG_MONSTER])
…		…
1053	if (object *pl = visible_to ())	1066	if (object *pl = visible_to ())
1054	esrv_del_item (pl->contr, count);	1067	esrv_del_item (pl->contr, count);
1055	flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed	1068	flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed
1056		1069
1057	adjust_weight (env, -total_weight ());	1070	adjust_weight (env, -total_weight ());
		1071
		1072	object *pl = in_player ();
1058		1073
1059	/* we set up values so that it could be inserted into	1074	/* we set up values so that it could be inserted into
1060	* the map, but we don't actually do that - it is up	1075	* the map, but we don't actually do that - it is up
1061	* to the caller to decide what we want to do.	1076	* to the caller to decide what we want to do.
1062	*/	1077	*/
…		…
1074		1089
1075	/* NO_FIX_PLAYER is set when a great many changes are being	1090	/* NO_FIX_PLAYER is set when a great many changes are being
1076	* made to players inventory. If set, avoiding the call	1091	* made to players inventory. If set, avoiding the call
1077	* to save cpu time.	1092	* to save cpu time.
1078	*/	1093	*/
1079	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1094	if (pl)
		1095	if (pl->is_player () && (glow_radius \|\| !QUERY_FLAG (pl, FLAG_NO_FIX_PLAYER)))
		1096	{
1080	otmp->update_stats ();	1097	pl->update_stats ();
		1098
		1099	if (glow_radius && pl->is_on_map ())
		1100	update_all_los (pl->map, pl->x, pl->y);
		1101	}
1081	}	1102	}
1082	else if (map)	1103	else if (map)
1083	{	1104	{
1084	map->dirty = true;	1105	map->dirty = true;
1085	mapspace &ms = this->ms ();	1106	mapspace &ms = this->ms ();
1086		1107
1087	if (object *pl = ms.player ())	1108	if (object *pl = ms.player ())
1088	{	1109	{
1089	if (type == PLAYER) // this == pl(!)	1110	if (is_player ())
1090	{	1111	{
		1112	if (!flag [FLAG_WIZPASS])
		1113	ms.smell = ++mapspace::smellcount; // remember the smell of the player
		1114
1091	// leaving a spot always closes any open container on the ground	1115	// leaving a spot always closes any open container on the ground
1092	if (container && !container->env)	1116	if (container && !container->env)
1093	// this causes spurious floorbox updates, but it ensures	1117	// this causes spurious floorbox updates, but it ensures
1094	// that the CLOSE event is being sent.	1118	// that the CLOSE event is being sent.
1095	close_container ();	1119	close_container ();
1096		1120
1097	--map->players;	1121	--map->players;
1098	map->touch ();	1122	map->touch ();
1099	}	1123	}
1100	else if (pl->container == this)	1124	else if (pl->container_ () == this)
1101	{	1125	{
1102	// removing a container should close it	1126	// removing a container should close it
1103	close_container ();	1127	close_container ();
1104	}	1128	}
1105		1129
…		…
1112	*(below ? &below->above : &ms.bot) = above;	1136	*(below ? &below->above : &ms.bot) = above;
1113		1137
1114	above = 0;	1138	above = 0;
1115	below = 0;	1139	below = 0;
1116		1140
1117	ms.flags_ = 0;	1141	ms.invalidate ();
1118		1142
1119	if (map->in_memory == MAP_SAVING)	1143	if (map->in_memory == MAP_SAVING)
1120	return;	1144	return;
1121		1145
1122	int check_walk_off = !flag [FLAG_NO_APPLY];	1146	int check_walk_off = !flag [FLAG_NO_APPLY];
1123		1147
1124	if (object *pl = ms.player ())	1148	if (object *pl = ms.player ())
1125	{	1149	{
1126	if (pl->container == this)	1150	if (pl->container_ () == this)
1127	/* If a container that the player is currently using somehow gets	1151	/* If a container that the player is currently using somehow gets
1128	* removed (most likely destroyed), update the player view	1152	* removed (most likely destroyed), update the player view
1129	* appropriately.	1153	* appropriately.
1130	*/	1154	*/
1131	pl->close_container ();	1155	pl->close_container ();
…		…
1155	}	1179	}
1156		1180
1157	last = tmp;	1181	last = tmp;
1158	}	1182	}
1159		1183
1160	if (flag [FLAG_BLOCKSVIEW] \|\| glow_radius)	1184	if (affects_los ())
1161	update_all_los (map, x, y);	1185	update_all_los (map, x, y);
1162	}	1186	}
1163	}	1187	}
1164		1188
1165	/*	1189	/*
…		…
1189	esrv_update_item (UPD_NROF, pl, top);	1213	esrv_update_item (UPD_NROF, pl, top);
1190		1214
1191	op->weight = 0; // cancel the addition above	1215	op->weight = 0; // cancel the addition above
1192	op->carrying = 0; // must be 0 already	1216	op->carrying = 0; // must be 0 already
1193		1217
1194	op->destroy (1);	1218	op->destroy ();
1195		1219
1196	return top;	1220	return top;
1197	}	1221	}
1198		1222
1199	return 0;	1223	return 0;
…		…
1261	* just 'op' otherwise	1285	* just 'op' otherwise
1262	*/	1286	*/
1263	object *	1287	object *
1264	insert_ob_in_map (object op, maptile m, object *originator, int flag)	1288	insert_ob_in_map (object op, maptile m, object *originator, int flag)
1265	{	1289	{
1266	if (op->is_on_map ())
1267	{
1268	LOG (llevError, "insert_ob_in_map called for object already on map");
1269	abort ();
1270	}
1271
1272	if (op->env)
1273	{
1274	LOG (llevError, "insert_ob_in_map called for object in an inventory (proceeding)");
1275	op->remove ();	1290	op->remove ();
1276	}
1277		1291
1278	if (op->face && !face_info (op->face))//D TODO: remove soon	1292	if (m == &freed_map)//D TODO: remove soon
1279	{//D	1293	{//D
1280	LOG (llevError \| logBacktrace, "op->face out of bounds: %s", op->debug_desc ());//D	1294	LOG (llevError \| logBacktrace, "tries to insret object on freed objects map: %s", op->debug_desc ());//D
1281	op->face = 1;//D
1282	}//D	1295	}//D
1283		1296
1284	/* Ideally, the caller figures this out. However, it complicates a lot	1297	/* Ideally, the caller figures this out. However, it complicates a lot
1285	* of areas of callers (eg, anything that uses find_free_spot would now	1298	* of areas of callers (eg, anything that uses find_free_spot would now
1286	* need extra work	1299	* need extra work
1287	*/	1300	*/
		1301	maptile *newmap = m;
1288	if (!xy_normalise (m, op->x, op->y))	1302	if (!xy_normalise (newmap, op->x, op->y))
1289	{	1303	{
1290	op->head_ ()->destroy (1);// remove head_ once all tail object destroyers found	1304	op->head_ ()->destroy ();// remove head_ once all tail object destroyers found
1291	return 0;	1305	return 0;
1292	}	1306	}
1293		1307
1294	if (object *more = op->more)	1308	if (object *more = op->more)
1295	if (!insert_ob_in_map (more, m, originator, flag))	1309	if (!insert_ob_in_map (more, m, originator, flag))
1296	return 0;	1310	return 0;
1297		1311
1298	CLEAR_FLAG (op, FLAG_REMOVED);	1312	op->flag [FLAG_REMOVED] = false;
1299		1313	op->env = 0;
1300	op->map = m;	1314	op->map = newmap;
		1315
1301	mapspace &ms = op->ms ();	1316	mapspace &ms = op->ms ();
1302		1317
1303	/* this has to be done after we translate the coordinates.	1318	/* this has to be done after we translate the coordinates.
1304	*/	1319	*/
1305	if (op->nrof && !(flag & INS_NO_MERGE))	1320	if (op->nrof && !(flag & INS_NO_MERGE))
…		…
1308	{	1323	{
1309	// TODO: we actually want to update tmp, not op,	1324	// TODO: we actually want to update tmp, not op,
1310	// but some caller surely breaks when we return tmp	1325	// but some caller surely breaks when we return tmp
1311	// from here :/	1326	// from here :/
1312	op->nrof += tmp->nrof;	1327	op->nrof += tmp->nrof;
1313	tmp->destroy (1);	1328	tmp->destroy ();
1314	}	1329	}
1315		1330
1316	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1331	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1317	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1332	CLEAR_FLAG (op, FLAG_INV_LOCKED);
1318		1333
…		…
1326	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");	1341	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");
1327	abort ();	1342	abort ();
1328	}	1343	}
1329		1344
1330	if (!originator->is_on_map ())	1345	if (!originator->is_on_map ())
		1346	{
1331	LOG (llevDebug \| logBacktrace, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map",	1347	LOG (llevError, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map",
1332	op->debug_desc (), originator->debug_desc ());	1348	op->debug_desc (), originator->debug_desc ());
		1349	abort ();
		1350	}
1333		1351
1334	op->above = originator;	1352	op->above = originator;
1335	op->below = originator->below;	1353	op->below = originator->below;
1336	originator->below = op;	1354	originator->below = op;
1337		1355
…		…
1423	op->below = top;	1441	op->below = top;
1424	*(op->above ? &op->above->below : &ms.top) = op;	1442	*(op->above ? &op->above->below : &ms.top) = op;
1425	}	1443	}
1426	}	1444	}
1427		1445
1428	if (op->type == PLAYER)	1446	if (op->is_player ())
1429	{	1447	{
1430	op->contr->do_los = 1;	1448	op->contr->do_los = 1;
1431	++op->map->players;	1449	++op->map->players;
1432	op->map->touch ();	1450	op->map->touch ();
1433	}	1451	}
…		…
1448	* be far away from this change and not affected in any way -	1466	* be far away from this change and not affected in any way -
1449	* this should get redone to only look for players within range,	1467	* this should get redone to only look for players within range,
1450	* or just updating the P_UPTODATE for spaces within this area	1468	* or just updating the P_UPTODATE for spaces within this area
1451	* of effect may be sufficient.	1469	* of effect may be sufficient.
1452	*/	1470	*/
1453	if (op->map->darkness && (op->glow_radius != 0))	1471	if (op->affects_los ())
		1472	{
		1473	op->ms ().invalidate ();
1454	update_all_los (op->map, op->x, op->y);	1474	update_all_los (op->map, op->x, op->y);
		1475	}
1455		1476
1456	/* updates flags (blocked, alive, no magic, etc) for this map space */	1477	/* updates flags (blocked, alive, no magic, etc) for this map space */
1457	update_object (op, UP_OBJ_INSERT);	1478	update_object (op, UP_OBJ_INSERT);
1458		1479
1459	INVOKE_OBJECT (INSERT, op);	1480	INVOKE_OBJECT (INSERT, op);
…		…
1466	* blocked() and wall() work properly), and these flags are updated by	1487	* blocked() and wall() work properly), and these flags are updated by
1467	* update_object().	1488	* update_object().
1468	*/	1489	*/
1469		1490
1470	/* if this is not the head or flag has been passed, don't check walk on status */	1491	/* if this is not the head or flag has been passed, don't check walk on status */
1471	if (!(flag & INS_NO_WALK_ON) && op->head_ () == op)	1492	if (!(flag & INS_NO_WALK_ON) && op->is_head ())
1472	{	1493	{
1473	if (check_move_on (op, originator))	1494	if (check_move_on (op, originator))
1474	return 0;	1495	return 0;
1475		1496
1476	/* If we are a multi part object, lets work our way through the check	1497	/* If we are a multi part object, lets work our way through the check
…		…
1487	/* this function inserts an object in the map, but if it	1508	/* this function inserts an object in the map, but if it
1488	* finds an object of its own type, it'll remove that one first.	1509	* finds an object of its own type, it'll remove that one first.
1489	* op is the object to insert it under: supplies x and the map.	1510	* op is the object to insert it under: supplies x and the map.
1490	*/	1511	*/
1491	void	1512	void
1492	replace_insert_ob_in_map (const char arch_string, object op)	1513	replace_insert_ob_in_map (shstr_tmp archname, object *op)
1493	{	1514	{
1494	/* first search for itself and remove any old instances */	1515	/* first search for itself and remove any old instances */
1495		1516
1496	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)	1517	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1497	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */	1518	if (tmp->arch->archname == archname) /* same archetype */
1498	tmp->destroy (1);	1519	tmp->destroy ();
1499		1520
1500	object *tmp = arch_to_object (archetype::find (arch_string));	1521	object *tmp = arch_to_object (archetype::find (archname));
1501		1522
1502	tmp->x = op->x;	1523	tmp->x = op->x;
1503	tmp->y = op->y;	1524	tmp->y = op->y;
1504		1525
1505	insert_ob_in_map (tmp, op->map, op, 0);	1526	insert_ob_in_map (tmp, op->map, op, 0);
…		…
1626	if (object *pl = tmp->visible_to ())	1647	if (object *pl = tmp->visible_to ())
1627	esrv_update_item (UPD_NROF, pl, tmp);	1648	esrv_update_item (UPD_NROF, pl, tmp);
1628		1649
1629	adjust_weight (this, op->total_weight ());	1650	adjust_weight (this, op->total_weight ());
1630		1651
1631	op->destroy (1);	1652	op->destroy ();
1632	op = tmp;	1653	op = tmp;
1633	goto inserted;	1654	goto inserted;
1634	}	1655	}
1635		1656
1636	op->owner = 0; // it's his/hers now. period.	1657	op->owner = 0; // it's his/hers now. period.
…		…
1654		1675
1655	adjust_weight (this, op->total_weight ());	1676	adjust_weight (this, op->total_weight ());
1656		1677
1657	inserted:	1678	inserted:
1658	/* reset the light list and los of the players on the map */	1679	/* reset the light list and los of the players on the map */
1659	if (op->glow_radius && map && map->darkness)	1680	if (op->glow_radius && is_on_map ())
		1681	{
		1682	update_stats ();
1660	update_all_los (map, x, y);	1683	update_all_los (map, x, y);
1661		1684	}
		1685	else if (is_player () && !flag [FLAG_NO_FIX_PLAYER])
1662	// if this is a player's inventory, update stats	1686	// if this is a player's inventory, update stats
1663	if (type == PLAYER && !flag [FLAG_NO_FIX_PLAYER])
1664	update_stats ();	1687	update_stats ();
1665		1688
1666	INVOKE_OBJECT (INSERT, this);	1689	INVOKE_OBJECT (INSERT, this);
1667		1690
1668	return op;	1691	return op;
…		…
1689	* on top.	1712	* on top.
1690	*/	1713	*/
1691	int	1714	int
1692	check_move_on (object op, object originator)	1715	check_move_on (object op, object originator)
1693	{	1716	{
		1717	if (QUERY_FLAG (op, FLAG_NO_APPLY))
		1718	return 0;
		1719
1694	object *tmp;	1720	object *tmp;
1695	maptile *m = op->map;	1721	maptile *m = op->map;
1696	int x = op->x, y = op->y;	1722	int x = op->x, y = op->y;
1697		1723
1698	MoveType move_on, move_slow, move_block;	1724	mapspace &ms = m->at (x, y);
1699		1725
1700	if (QUERY_FLAG (op, FLAG_NO_APPLY))	1726	ms.update ();
1701	return 0;
1702		1727
1703	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);	1728	MoveType move_on = ms.move_on;
1704	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);	1729	MoveType move_slow = ms.move_slow;
1705	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);	1730	MoveType move_block = ms.move_block;
1706		1731
1707	/* if nothing on this space will slow op down or be applied,	1732	/* if nothing on this space will slow op down or be applied,
1708	* no need to do checking below. have to make sure move_type	1733	* no need to do checking below. have to make sure move_type
1709	* is set, as lots of objects don't have it set - we treat that	1734	* is set, as lots of objects don't have it set - we treat that
1710	* as walking.	1735	* as walking.
…		…
1721	return 0;	1746	return 0;
1722		1747
1723	/* The objects have to be checked from top to bottom.	1748	/* The objects have to be checked from top to bottom.
1724	* Hence, we first go to the top:	1749	* Hence, we first go to the top:
1725	*/	1750	*/
1726		1751	for (object next, tmp = ms.top; tmp; tmp = next)
1727	for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above)
1728	{
1729	/* Trim the search when we find the first other spell effect
1730	* this helps performance so that if a space has 50 spell objects,
1731	* we don't need to check all of them.
1732	*/
1733	if ((tmp->move_type & MOVE_FLY_LOW) && QUERY_FLAG (tmp, FLAG_NO_PICK))
1734	break;
1735	}	1752	{
		1753	next = tmp->below;
1736		1754
1737	for (; tmp; tmp = tmp->below)
1738	{
1739	if (tmp == op)	1755	if (tmp == op)
1740	continue; /* Can't apply yourself */	1756	continue; /* Can't apply yourself */
1741		1757
1742	/* Check to see if one of the movement types should be slowed down.	1758	/* Check to see if one of the movement types should be slowed down.
1743	* Second check makes sure that the movement types not being slowed	1759	* Second check makes sure that the movement types not being slowed
…		…
1748	if (!QUERY_FLAG (op, FLAG_WIZPASS))	1764	if (!QUERY_FLAG (op, FLAG_WIZPASS))
1749	{	1765	{
1750	if ((!op->move_type && tmp->move_slow & MOVE_WALK) \|\|	1766	if ((!op->move_type && tmp->move_slow & MOVE_WALK) \|\|
1751	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))	1767	((op->move_type & tmp->move_slow) && (op->move_type & ~tmp->move_slow & ~tmp->move_block) == 0))
1752	{	1768	{
1753
1754	float
1755	diff = tmp->move_slow_penalty * fabs (op->speed);	1769	float diff = tmp->move_slow_penalty * fabs (op->speed);
1756		1770
1757	if (op->type == PLAYER)	1771	if (op->is_player ())
1758	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) \|\|	1772	if ((tmp->flag [FLAG_IS_HILLY ] && find_skill_by_number (op, SK_CLIMBING)) \|\|
1759	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))	1773	(tmp->flag [FLAG_IS_WOODED] && find_skill_by_number (op, SK_WOODSMAN)))
1760	diff /= 4.0;	1774	diff /= 4.0;
1761		1775
1762	op->speed_left -= diff;	1776	op->speed_left -= diff;
1763	}	1777	}
1764	}	1778	}
…		…
1970	* head of the object should correspond for the entire object.	1984	* head of the object should correspond for the entire object.
1971	*/	1985	*/
1972	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))	1986	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
1973	continue;	1987	continue;
1974		1988
1975	if (ob->blocked (m, pos.x, pos.y))	1989	if (ob->blocked (pos.m, pos.x, pos.y))
1976	continue;	1990	continue;
1977		1991
1978	altern [index++] = i;	1992	altern [index++] = i;
1979	}	1993	}
1980		1994
…		…
2048	* there is capable of.	2062	* there is capable of.
2049	*/	2063	*/
2050	int	2064	int
2051	find_dir (maptile m, int x, int y, object exclude)	2065	find_dir (maptile m, int x, int y, object exclude)
2052	{	2066	{
2053	int i, max = SIZEOFFREE, mflags;	2067	int max = SIZEOFFREE, mflags;
2054
2055	sint16 nx, ny;
2056	object *tmp;
2057	maptile *mp;
2058
2059	MoveType blocked, move_type;	2068	MoveType move_type;
2060		2069
2061	if (exclude && exclude->head_ () != exclude)	2070	if (exclude && exclude->head_ () != exclude)
2062	{	2071	{
2063	exclude = exclude->head;	2072	exclude = exclude->head;
2064	move_type = exclude->move_type;	2073	move_type = exclude->move_type;
…		…
2067	{	2076	{
2068	/* If we don't have anything, presume it can use all movement types. */	2077	/* If we don't have anything, presume it can use all movement types. */
2069	move_type = MOVE_ALL;	2078	move_type = MOVE_ALL;
2070	}	2079	}
2071		2080
2072	for (i = 1; i < max; i++)	2081	for (int i = 1; i < max; i++)
2073	{	2082	{
2074	mp = m;	2083	mapxy pos (m, x, y);
2075	nx = x + freearr_x[i];	2084	pos.move (i);
2076	ny = y + freearr_y[i];
2077		2085
2078	mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);	2086	if (!pos.normalise ())
2079
2080	if (mflags & P_OUT_OF_MAP)
2081	max = maxfree[i];	2087	max = maxfree[i];
2082	else	2088	else
2083	{	2089	{
2084	mapspace &ms = mp->at (nx, ny);	2090	mapspace &ms = *pos;
2085		2091
2086	blocked = ms.move_block;
2087
2088	if ((move_type & blocked) == move_type)	2092	if ((move_type & ms.move_block) == move_type)
2089	max = maxfree[i];	2093	max = maxfree [i];
2090	else if (mflags & P_IS_ALIVE)	2094	else if (ms.flags () & P_IS_ALIVE)
2091	{	2095	{
2092	for (tmp = ms.bot; tmp; tmp = tmp->above)	2096	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
2093	if ((tmp->flag [FLAG_MONSTER] \|\| tmp->type == PLAYER)	2097	if ((tmp->flag [FLAG_MONSTER] \|\| tmp->is_player ())
2094	&& (tmp != exclude \|\| (tmp->head_ () != tmp && tmp->head_ () != exclude)))	2098	&& (tmp != exclude \|\| (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2095	break;
2096
2097	if (tmp)
2098	return freedir[i];	2099	return freedir [i];
2099	}	2100	}
2100	}	2101	}
2101	}	2102	}
2102		2103
2103	return 0;	2104	return 0;
…		…
2178	* This basically means that if direction is 15, then it could either go	2179	* This basically means that if direction is 15, then it could either go
2179	* direction 4, 14, or 16 to get back to where we are.	2180	* direction 4, 14, or 16 to get back to where we are.
2180	* Moved from spell_util.c to object.c with the other related direction	2181	* Moved from spell_util.c to object.c with the other related direction
2181	* functions.	2182	* functions.
2182	*/	2183	*/
2183	int reduction_dir[SIZEOFFREE][3] = {	2184	const int reduction_dir[SIZEOFFREE][3] = {
2184	{0, 0, 0}, /* 0 */	2185	{0, 0, 0}, /* 0 */
2185	{0, 0, 0}, /* 1 */	2186	{0, 0, 0}, /* 1 */
2186	{0, 0, 0}, /* 2 */	2187	{0, 0, 0}, /* 2 */
2187	{0, 0, 0}, /* 3 */	2188	{0, 0, 0}, /* 3 */
2188	{0, 0, 0}, /* 4 */	2189	{0, 0, 0}, /* 4 */
…		…
2284	int	2285	int
2285	can_pick (const object who, const object item)	2286	can_pick (const object who, const object item)
2286	{	2287	{
2287	return /QUERY_FLAG(who,FLAG_WIZ)\|\| /	2288	return /QUERY_FLAG(who,FLAG_WIZ)\|\| /
2288	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&	2289	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
2289	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER \|\| item->weight < who->weight / 3));	2290	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->is_player () \|\| item->weight < who->weight / 3));
2290	}	2291	}
2291		2292
2292	/*	2293	/*
2293	* create clone from object to another	2294	* create clone from object to another
2294	*/	2295	*/
…		…
2326	return tmp;	2327	return tmp;
2327		2328
2328	return 0;	2329	return 0;
2329	}	2330	}
2330		2331
2331	const shstr &	2332	shstr_tmp
2332	object::kv_get (const shstr &key) const	2333	object::kv_get (shstr_tmp key) const
2333	{	2334	{
2334	for (key_value *kv = key_values; kv; kv = kv->next)	2335	for (key_value *kv = key_values; kv; kv = kv->next)
2335	if (kv->key == key)	2336	if (kv->key == key)
2336	return kv->value;	2337	return kv->value;
2337		2338
2338	return shstr_null;	2339	return shstr ();
2339	}	2340	}
2340		2341
2341	void	2342	void
2342	object::kv_set (const shstr &key, const shstr &value)	2343	object::kv_set (shstr_tmp key, shstr_tmp value)
2343	{	2344	{
2344	for (key_value *kv = key_values; kv; kv = kv->next)	2345	for (key_value *kv = key_values; kv; kv = kv->next)
2345	if (kv->key == key)	2346	if (kv->key == key)
2346	{	2347	{
2347	kv->value = value;	2348	kv->value = value;
…		…
2356		2357
2357	key_values = kv;	2358	key_values = kv;
2358	}	2359	}
2359		2360
2360	void	2361	void
2361	object::kv_del (const shstr &key)	2362	object::kv_del (shstr_tmp key)
2362	{	2363	{
2363	for (key_value *kvp = &key_values; kvp; kvp = &(*kvp)->next)	2364	for (key_value *kvp = &key_values; kvp; kvp = &(*kvp)->next)
2364	if ((*kvp)->key == key)	2365	if ((*kvp)->key == key)
2365	{	2366	{
2366	key_value kv = kvp;	2367	key_value kv = kvp;
…		…
2497	container = 0;	2498	container = 0;
2498		2499
2499	// client needs item update to make it work, client bug requires this to be separate	2500	// client needs item update to make it work, client bug requires this to be separate
2500	esrv_update_item (UPD_FLAGS, this, old_container);	2501	esrv_update_item (UPD_FLAGS, this, old_container);
2501		2502
2502	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));	2503	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", old_container->query_name ());
2503	play_sound (sound_find ("chest_close"));	2504	play_sound (sound_find ("chest_close"));
2504	}	2505	}
2505		2506
2506	if (new_container)	2507	if (new_container)
2507	{	2508	{
…		…
2517	closer->flag [FLAG_NO_MAP_SAVE] = 1;	2518	closer->flag [FLAG_NO_MAP_SAVE] = 1;
2518	new_container->insert (closer);	2519	new_container->insert (closer);
2519	}	2520	}
2520	#endif	2521	#endif
2521		2522
2522	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));	2523	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", new_container->query_name ());
2523		2524
2524	// make sure the container is available, client bug requires this to be separate	2525	// make sure the container is available, client bug requires this to be separate
2525	esrv_send_item (this, new_container);	2526	esrv_send_item (this, new_container);
2526		2527
2527	new_container->flag [FLAG_APPLIED] = true;	2528	new_container->flag [FLAG_APPLIED] = true;
…		…
2535	// else if (!old_container->env && contr && contr->ns)	2536	// else if (!old_container->env && contr && contr->ns)
2536	// contr->ns->floorbox_reset ();	2537	// contr->ns->floorbox_reset ();
2537	}	2538	}
2538		2539
2539	object *	2540	object *
2540	object::force_find (const shstr name)	2541	object::force_find (shstr_tmp name)
2541	{	2542	{
2542	/* cycle through his inventory to look for the MARK we want to	2543	/* cycle through his inventory to look for the MARK we want to
2543	* place	2544	* place
2544	*/	2545	*/
2545	for (object *tmp = inv; tmp; tmp = tmp->below)	2546	for (object *tmp = inv; tmp; tmp = tmp->below)
…		…
2548		2549
2549	return 0;	2550	return 0;
2550	}	2551	}
2551		2552
2552	void	2553	void
		2554	object::force_set_timer (int duration)
		2555	{
		2556	this->duration = 1;
		2557	this->speed_left = -1.f;
		2558
		2559	this->set_speed (duration ? 1.f / duration : 0.f);
		2560	}
		2561
		2562	object *
2553	object::force_add (const shstr name, int duration)	2563	object::force_add (shstr_tmp name, int duration)
2554	{	2564	{
2555	if (object *force = force_find (name))	2565	if (object *force = force_find (name))
2556	force->destroy ();	2566	force->destroy ();
2557		2567
2558	object *force = get_archetype (FORCE_NAME);	2568	object *force = get_archetype (FORCE_NAME);
2559		2569
2560	force->slaying = name;	2570	force->slaying = name;
2561	force->stats.food = 1;
2562	force->speed_left = -1.f;
2563		2571
2564	force->set_speed (duration ? 1.f / duration : 0.f);	2572	force->force_set_timer (duration);
2565	force->flag [FLAG_IS_USED_UP] = true;	2573
2566	force->flag [FLAG_APPLIED] = true;	2574	force->flag [FLAG_APPLIED] = true;
2567		2575
2568	insert (force);	2576	return insert (force);
2569	}	2577	}
2570		2578
2571	void	2579	void
2572	object::play_sound (faceidx sound)	2580	object::play_sound (faceidx sound) const
2573	{	2581	{
2574	if (!sound)	2582	if (!sound)
2575	return;	2583	return;
2576		2584
2577	if (flag [FLAG_REMOVED])	2585	if (is_on_map ())
		2586	map->play_sound (sound, x, y);
		2587	else if (object *pl = in_player ())
		2588	pl->contr->play_sound (sound);
		2589	}
		2590
		2591	void
		2592	object::say_msg (const char *msg) const
		2593	{
		2594	if (is_on_map ())
		2595	map->say_msg (msg, x, y);
		2596	else if (object *pl = in_player ())
		2597	pl->contr->play_sound (sound);
		2598	}
		2599
		2600	void
		2601	object::make_noise ()
		2602	{
		2603	// we do not model noise in the map, so instead put
		2604	// a temporary light into the noise source
		2605	// could use the map instead, but that's less reliable for our
		2606	// goal, which is to make invisibility a bit harder to exploit
		2607
		2608	// currently only works sensibly for players
		2609	if (!is_player ())
2578	return;	2610	return;
2579		2611
2580	if (env)	2612	// find old force, or create new one
2581	{	2613	object *force = force_find (shstr_noise_force);
2582	if (object *pl = in_player ())	2614
2583	pl->contr->play_sound (sound);	2615	if (force)
2584	}	2616	force->speed_left = -1.f; // patch old speed up
2585	else	2617	else
2586	map->play_sound (sound, x, y);	2618	{
2587	}	2619	force = archetype::get (shstr_noise_force);
2588		2620
		2621	force->slaying = shstr_noise_force;
		2622	force->stats.food = 1;
		2623	force->speed_left = -1.f;
		2624
		2625	force->set_speed (1.f / 4.f);
		2626	force->flag [FLAG_IS_USED_UP] = true;
		2627	force->flag [FLAG_APPLIED] = true;
		2628
		2629	insert (force);
		2630	}
		2631	}
		2632

Diff Legend

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

Comparing deliantra/server/common/object.C (file contents): Revision 1.254 by root, Sun Aug 31 01:17:11 2008 UTC vs. Revision 1.292 by root, Mon Oct 19 21:48:49 2009 UTC

Diff Legend

Comparing deliantra/server/common/object.C (file contents):
Revision 1.254 by root, Sun Aug 31 01:17:11 2008 UTC vs.
Revision 1.292 by root, Mon Oct 19 21:48:49 2009 UTC