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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.251 by root, Sun Jul 20 16:56:34 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] = {
…		…
186	\|\| ob1->speed != ob2->speed	187	\|\| ob1->speed != ob2->speed
187	\|\| ob1->value != ob2->value	188	\|\| ob1->value != ob2->value
188	\|\| ob1->name != ob2->name)	189	\|\| ob1->name != ob2->name)
189	return 0;	190	return 0;
190		191
191	/* Do not merge objects if nrof would overflow. First part checks	192	/* Do not merge objects if nrof would overflow, assume nrof
192	* for unsigned overflow (2c), second part checks whether the result	193	* is always 0 .. 2*31-1 /
193	* would fit into a 32 bit signed int, which is often used to hold	194	if (ob1->nrof > 0x7fffffff - ob2->nrof)
194	* nrof values.
195	*/
196	if (~ob1->nrof < ob2->nrof \|\| ob1->nrof + ob2->nrof > (1UL << 31))
197	return 0;	195	return 0;
198		196
199	/* If the objects have been identified, set the BEEN_APPLIED flag.	197	/* If the objects have been identified, set the BEEN_APPLIED flag.
200	* This is to the comparison of the flags below will be OK. We	198	* This is to the comparison of the flags below will be OK. We
201	* just can't ignore the been applied or identified flags, as they	199	* just can't ignore the been applied or identified flags, as they
…		…
235	\|\| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats)))	233	\|\| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats)))
236	return 0;	234	return 0;
237		235
238	if ((ob1->flag ^ ob2->flag)	236	if ((ob1->flag ^ ob2->flag)
239	.reset (FLAG_INV_LOCKED)	237	.reset (FLAG_INV_LOCKED)
240	.reset (FLAG_CLIENT_SENT)
241	.reset (FLAG_REMOVED)	238	.reset (FLAG_REMOVED)
242	.any ())	239	.any ())
243	return 0;	240	return 0;
244		241
245	/* This is really a spellbook check - we should in general	242	/* This is really a spellbook check - we should in general
…		…
327	{	324	{
328	// see if we are in a container of sorts	325	// see if we are in a container of sorts
329	if (env)	326	if (env)
330	{	327	{
331	// the player inventory itself is always visible	328	// the player inventory itself is always visible
332	if (env->type == PLAYER)	329	if (env->is_player ())
333	return env;	330	return env;
334		331
335	// else a player could have our env open	332	// else a player could have our env open
336	object *envest = env->outer_env ();	333	object *envest = env->outer_env_or_self ();
337		334
338	// 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
339	// even if our inv is in a player.	336	// even if our inv is in a player.
340	if (envest->is_on_map ())	337	if (envest->is_on_map ())
341	if (object *pl = envest->ms ().player ())	338	if (object *pl = envest->ms ().player ())
…		…
558	update_stats ();	555	update_stats ();
559		556
560	new_draw_info_format (NDI_UNIQUE, 0, this,	557	new_draw_info_format (NDI_UNIQUE, 0, this,
561	"You try to balance all your items at once, "	558	"You try to balance all your items at once, "
562	"but the %s is just too much for your body. "	559	"but the %s is just too much for your body. "
563	"[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);
564	return false;	562	return false;
565	}	563	}
566		564
567	//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);
568	}	566	}
…		…
640	}	638	}
641		639
642	if (speed < 0)	640	if (speed < 0)
643	dst->speed_left -= rndm ();	641	dst->speed_left -= rndm ();
644		642
645	dst->set_speed (dst->speed);	643	dst->activate ();
646	}	644	}
647		645
648	void	646	void
649	object::instantiate ()	647	object::instantiate ()
650	{	648	{
…		…
762	else if (action == UP_OBJ_INSERT)	760	else if (action == UP_OBJ_INSERT)
763	{	761	{
764	// this is likely overkill, TODO: revisit (schmorp)	762	// this is likely overkill, TODO: revisit (schmorp)
765	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))	763	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
766	\|\| (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))	764	\|\| (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))
767	\|\| (op->type == PLAYER && !(m.flags_ & P_PLAYER))	765	\|\| (op->is_player () && !(m.flags_ & P_PLAYER))
768	\|\| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))	766	\|\| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
769	\|\| (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))	767	\|\| (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))
770	\|\| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))	768	\|\| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))
771	\|\| (m.move_on \| op->move_on ) != m.move_on	769	\|\| (m.move_on \| op->move_on ) != m.move_on
772	\|\| (m.move_off \| op->move_off ) != m.move_off	770	\|\| (m.move_off \| op->move_off ) != m.move_off
773	\|\| (m.move_slow \| op->move_slow) != m.move_slow	771	\|\| (m.move_slow \| op->move_slow) != m.move_slow
774	/* 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
775	* to have move_allow right now.	773	* have move_allow right now.
776	*/	774	*/
777	\|\| ((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
778	\|\| 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)
779	m.flags_ = 0;	777	m.invalidate ();
780	}	778	}
781	/* if the object is being removed, we can't make intelligent	779	/* if the object is being removed, we can't make intelligent
782	* decisions, because remove_ob can't really pass the object	780	* decisions, because remove_ob can't really pass the object
783	* that is being removed.	781	* that is being removed.
784	*/	782	*/
785	else if (action == UP_OBJ_CHANGE \|\| action == UP_OBJ_REMOVE)	783	else if (action == UP_OBJ_CHANGE \|\| action == UP_OBJ_REMOVE)
786	m.flags_ = 0;	784	m.invalidate ();
787	else if (action == UP_OBJ_FACE)	785	else if (action == UP_OBJ_FACE)
788	/* Nothing to do for that case */ ;	786	/* Nothing to do for that case */ ;
789	else	787	else
790	LOG (llevError, "update_object called with invalid action: %d\n", action);	788	LOG (llevError, "update_object called with invalid action: %d\n", action);
791		789
…		…
795		793
796	object::object ()	794	object::object ()
797	{	795	{
798	SET_FLAG (this, FLAG_REMOVED);	796	SET_FLAG (this, FLAG_REMOVED);
799		797
800	expmul = 1.0;	798	//expmul = 1.0; declared const for the time being
801	face = blank_face;	799	face = blank_face;
802	}	800	}
803		801
804	object::~object ()	802	object::~object ()
805	{	803	{
…		…
835	/* If already on active list, don't do anything */	833	/* If already on active list, don't do anything */
836	if (active)	834	if (active)
837	return;	835	return;
838		836
839	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
840	actives.insert (this);	842	actives.insert (this);
		843	}
841	}	844	}
842		845
843	void	846	void
844	object::activate_recursive ()	847	object::activate_recursive ()
845	{	848	{
…		…
910	\|\| map->in_memory != MAP_ACTIVE	913	\|\| map->in_memory != MAP_ACTIVE
911	\|\| map->no_drop	914	\|\| map->no_drop
912	\|\| ms ().move_block == MOVE_ALL)	915	\|\| ms ().move_block == MOVE_ALL)
913	{	916	{
914	while (inv)	917	while (inv)
915	inv->destroy (true);	918	inv->destroy ();
916	}	919	}
917	else	920	else
918	{ /* Put objects in inventory onto this space */	921	{ /* Put objects in inventory onto this space */
919	while (inv)	922	while (inv)
920	{	923	{
…		…
924	\|\| op->flag [FLAG_NO_DROP]	927	\|\| op->flag [FLAG_NO_DROP]
925	\|\| op->type == RUNE	928	\|\| op->type == RUNE
926	\|\| op->type == TRAP	929	\|\| op->type == TRAP
927	\|\| op->flag [FLAG_IS_A_TEMPLATE]	930	\|\| op->flag [FLAG_IS_A_TEMPLATE]
928	\|\| op->flag [FLAG_DESTROY_ON_DEATH])	931	\|\| op->flag [FLAG_DESTROY_ON_DEATH])
929	op->destroy (true);	932	op->destroy ();
930	else	933	else
931	map->insert (op, x, y);	934	map->insert (op, x, y);
932	}	935	}
933	}	936	}
934	}	937	}
…		…
963		966
964	void	967	void
965	object::do_destroy ()	968	object::do_destroy ()
966	{	969	{
967	if (flag [FLAG_IS_LINKED])	970	if (flag [FLAG_IS_LINKED])
968	remove_button_link (this);	971	remove_link ();
969		972
970	if (flag [FLAG_FRIENDLY])	973	if (flag [FLAG_FRIENDLY])
971	remove_friendly_object (this);	974	remove_friendly_object (this);
972		975
973	remove ();	976	remove ();
…		…
998	attacked_by = 0;	1001	attacked_by = 0;
999	current_weapon = 0;	1002	current_weapon = 0;
1000	}	1003	}
1001		1004
1002	void	1005	void
1003	object::destroy (bool destroy_inventory)	1006	object::destroy ()
1004	{	1007	{
1005	if (destroyed ())	1008	if (destroyed ())
1006	return;	1009	return;
1007		1010
1008	if (!is_head () && !head->destroyed ())	1011	if (!is_head () && !head->destroyed ())
1009	{	1012	{
1010	LOG (llevError \| logBacktrace, "tried to destroy the tail of an object");	1013	LOG (llevError \| logBacktrace, "tried to destroy the tail of an object");
1011	head->destroy (destroy_inventory);	1014	head->destroy ();
1012	return;	1015	return;
1013	}	1016	}
1014		1017
1015	destroy_inv (!destroy_inventory);	1018	destroy_inv (false);
1016		1019
1017	if (is_head ())	1020	if (is_head ())
1018	if (sound_destroy)	1021	if (sound_destroy)
1019	play_sound (sound_destroy);	1022	play_sound (sound_destroy);
1020	else if (flag [FLAG_MONSTER])	1023	else if (flag [FLAG_MONSTER])
…		…
1056	if (object *pl = visible_to ())	1059	if (object *pl = visible_to ())
1057	esrv_del_item (pl->contr, count);	1060	esrv_del_item (pl->contr, count);
1058	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
1059		1062
1060	adjust_weight (env, -total_weight ());	1063	adjust_weight (env, -total_weight ());
		1064
		1065	object *pl = in_player ();
1061		1066
1062	/* we set up values so that it could be inserted into	1067	/* we set up values so that it could be inserted into
1063	* 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
1064	* to the caller to decide what we want to do.	1069	* to the caller to decide what we want to do.
1065	*/	1070	*/
…		…
1077		1082
1078	/* 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
1079	* made to players inventory. If set, avoiding the call	1084	* made to players inventory. If set, avoiding the call
1080	* to save cpu time.	1085	* to save cpu time.
1081	*/	1086	*/
1082	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	{
1083	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	}
1084	}	1095	}
1085	else if (map)	1096	else if (map)
1086	{	1097	{
1087	map->dirty = true;	1098	map->dirty = true;
1088	mapspace &ms = this->ms ();	1099	mapspace &ms = this->ms ();
1089		1100
1090	if (object *pl = ms.player ())	1101	if (object *pl = ms.player ())
1091	{	1102	{
1092	if (type == PLAYER) // this == pl(!)	1103	if (is_player ())
1093	{	1104	{
		1105	if (!flag [FLAG_WIZPASS])
		1106	ms.smell = ++mapspace::smellcount; // remember the smell of the player
		1107
1094	// leaving a spot always closes any open container on the ground	1108	// leaving a spot always closes any open container on the ground
1095	if (container && !container->env)	1109	if (container && !container->env)
1096	// this causes spurious floorbox updates, but it ensures	1110	// this causes spurious floorbox updates, but it ensures
1097	// that the CLOSE event is being sent.	1111	// that the CLOSE event is being sent.
1098	close_container ();	1112	close_container ();
…		…
1115	*(below ? &below->above : &ms.bot) = above;	1129	*(below ? &below->above : &ms.bot) = above;
1116		1130
1117	above = 0;	1131	above = 0;
1118	below = 0;	1132	below = 0;
1119		1133
		1134	ms.invalidate ();
		1135
1120	if (map->in_memory == MAP_SAVING)	1136	if (map->in_memory == MAP_SAVING)
1121	return;	1137	return;
1122		1138
1123	int check_walk_off = !flag [FLAG_NO_APPLY];	1139	int check_walk_off = !flag [FLAG_NO_APPLY];
1124		1140
…		…
1156	}	1172	}
1157		1173
1158	last = tmp;	1174	last = tmp;
1159	}	1175	}
1160		1176
1161	/* last == NULL if there are no objects on this space */	1177	if (affects_los ())
1162	//TODO: this makes little sense, why only update the topmost object?
1163	if (!last)
1164	map->at (x, y).flags_ = 0;
1165	else
1166	update_object (last, UP_OBJ_REMOVE);
1167
1168	if (flag [FLAG_BLOCKSVIEW] \|\| glow_radius)
1169	update_all_los (map, x, y);	1178	update_all_los (map, x, y);
1170	}	1179	}
1171	}	1180	}
1172		1181
1173	/*	1182	/*
…		…
1197	esrv_update_item (UPD_NROF, pl, top);	1206	esrv_update_item (UPD_NROF, pl, top);
1198		1207
1199	op->weight = 0; // cancel the addition above	1208	op->weight = 0; // cancel the addition above
1200	op->carrying = 0; // must be 0 already	1209	op->carrying = 0; // must be 0 already
1201		1210
1202	op->destroy (1);	1211	op->destroy ();
1203		1212
1204	return top;	1213	return top;
1205	}	1214	}
1206		1215
1207	return 0;	1216	return 0;
…		…
1269	* just 'op' otherwise	1278	* just 'op' otherwise
1270	*/	1279	*/
1271	object *	1280	object *
1272	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)
1273	{	1282	{
1274	if (op->is_on_map ())
1275	{
1276	LOG (llevError, "insert_ob_in_map called for object already on map");
1277	abort ();
1278	}
1279
1280	if (op->env)
1281	{
1282	LOG (llevError, "insert_ob_in_map called for object in an inventory (proceeding)");
1283	op->remove ();	1283	op->remove ();
1284	}
1285		1284
1286	if (op->face && !face_info (op->face))//D TODO: remove soon	1285	if (m == &freed_map)//D TODO: remove soon
1287	{//D	1286	{//D
1288	LOG (llevError \| logBacktrace, "op->face out of bounds: %s", op->debug_desc ());//D	1287	LOG (llevError \| logBacktrace, "tries to insret object on freed objects map: %s", op->debug_desc ());//D
1289	op->face = 1;//D
1290	}//D	1288	}//D
1291		1289
1292	/* Ideally, the caller figures this out. However, it complicates a lot	1290	/* Ideally, the caller figures this out. However, it complicates a lot
1293	* 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
1294	* need extra work	1292	* need extra work
1295	*/	1293	*/
		1294	maptile *newmap = m;
1296	if (!xy_normalise (m, op->x, op->y))	1295	if (!xy_normalise (newmap, op->x, op->y))
1297	{	1296	{
1298	op->head_ ()->destroy (1);// remove head_ once all tail object destroyers found	1297	op->head_ ()->destroy ();// remove head_ once all tail object destroyers found
1299	return 0;	1298	return 0;
1300	}	1299	}
1301		1300
1302	if (object *more = op->more)	1301	if (object *more = op->more)
1303	if (!insert_ob_in_map (more, m, originator, flag))	1302	if (!insert_ob_in_map (more, m, originator, flag))
1304	return 0;	1303	return 0;
1305		1304
1306	CLEAR_FLAG (op, FLAG_REMOVED);	1305	op->flag [FLAG_REMOVED] = false;
1307		1306	op->env = 0;
1308	op->map = m;	1307	op->map = newmap;
		1308
1309	mapspace &ms = op->ms ();	1309	mapspace &ms = op->ms ();
1310		1310
1311	/* this has to be done after we translate the coordinates.	1311	/* this has to be done after we translate the coordinates.
1312	*/	1312	*/
1313	if (op->nrof && !(flag & INS_NO_MERGE))	1313	if (op->nrof && !(flag & INS_NO_MERGE))
…		…
1316	{	1316	{
1317	// TODO: we actually want to update tmp, not op,	1317	// TODO: we actually want to update tmp, not op,
1318	// but some caller surely breaks when we return tmp	1318	// but some caller surely breaks when we return tmp
1319	// from here :/	1319	// from here :/
1320	op->nrof += tmp->nrof;	1320	op->nrof += tmp->nrof;
1321	tmp->destroy (1);	1321	tmp->destroy ();
1322	}	1322	}
1323		1323
1324	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 */
1325	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1325	CLEAR_FLAG (op, FLAG_INV_LOCKED);
1326		1326
…		…
1334	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");
1335	abort ();	1335	abort ();
1336	}	1336	}
1337		1337
1338	if (!originator->is_on_map ())	1338	if (!originator->is_on_map ())
		1339	{
1339	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",
1340	op->debug_desc (), originator->debug_desc ());	1341	op->debug_desc (), originator->debug_desc ());
		1342	abort ();
		1343	}
1341		1344
1342	op->above = originator;	1345	op->above = originator;
1343	op->below = originator->below;	1346	op->below = originator->below;
1344	originator->below = op;	1347	originator->below = op;
1345		1348
…		…
1431	op->below = top;	1434	op->below = top;
1432	*(op->above ? &op->above->below : &ms.top) = op;	1435	*(op->above ? &op->above->below : &ms.top) = op;
1433	}	1436	}
1434	}	1437	}
1435		1438
1436	if (op->type == PLAYER)	1439	if (op->is_player ())
1437	{	1440	{
1438	op->contr->do_los = 1;	1441	op->contr->do_los = 1;
1439	++op->map->players;	1442	++op->map->players;
1440	op->map->touch ();	1443	op->map->touch ();
1441	}	1444	}
…		…
1456	* 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 -
1457	* this should get redone to only look for players within range,	1460	* this should get redone to only look for players within range,
1458	* or just updating the P_UPTODATE for spaces within this area	1461	* or just updating the P_UPTODATE for spaces within this area
1459	* of effect may be sufficient.	1462	* of effect may be sufficient.
1460	*/	1463	*/
1461	if (op->map->darkness && (op->glow_radius != 0))	1464	if (op->affects_los ())
		1465	{
		1466	op->ms ().invalidate ();
1462	update_all_los (op->map, op->x, op->y);	1467	update_all_los (op->map, op->x, op->y);
		1468	}
1463		1469
1464	/* updates flags (blocked, alive, no magic, etc) for this map space */	1470	/* updates flags (blocked, alive, no magic, etc) for this map space */
1465	update_object (op, UP_OBJ_INSERT);	1471	update_object (op, UP_OBJ_INSERT);
1466		1472
1467	INVOKE_OBJECT (INSERT, op);	1473	INVOKE_OBJECT (INSERT, op);
…		…
1474	* blocked() and wall() work properly), and these flags are updated by	1480	* blocked() and wall() work properly), and these flags are updated by
1475	* update_object().	1481	* update_object().
1476	*/	1482	*/
1477		1483
1478	/* 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 */
1479	if (!(flag & INS_NO_WALK_ON) && op->head_ () == op)	1485	if (!(flag & INS_NO_WALK_ON) && op->is_head ())
1480	{	1486	{
1481	if (check_move_on (op, originator))	1487	if (check_move_on (op, originator))
1482	return 0;	1488	return 0;
1483		1489
1484	/* 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
…		…
1495	/* this function inserts an object in the map, but if it	1501	/* this function inserts an object in the map, but if it
1496	* 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.
1497	* 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.
1498	*/	1504	*/
1499	void	1505	void
1500	replace_insert_ob_in_map (const char arch_string, object op)	1506	replace_insert_ob_in_map (shstr_tmp archname, object *op)
1501	{	1507	{
1502	/* first search for itself and remove any old instances */	1508	/* first search for itself and remove any old instances */
1503		1509
1504	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)	1510	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1505	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */	1511	if (tmp->arch->archname == archname) /* same archetype */
1506	tmp->destroy (1);	1512	tmp->destroy ();
1507		1513
1508	object *tmp = arch_to_object (archetype::find (arch_string));	1514	object *tmp = arch_to_object (archetype::find (archname));
1509		1515
1510	tmp->x = op->x;	1516	tmp->x = op->x;
1511	tmp->y = op->y;	1517	tmp->y = op->y;
1512		1518
1513	insert_ob_in_map (tmp, op->map, op, 0);	1519	insert_ob_in_map (tmp, op->map, op, 0);
…		…
1634	if (object *pl = tmp->visible_to ())	1640	if (object *pl = tmp->visible_to ())
1635	esrv_update_item (UPD_NROF, pl, tmp);	1641	esrv_update_item (UPD_NROF, pl, tmp);
1636		1642
1637	adjust_weight (this, op->total_weight ());	1643	adjust_weight (this, op->total_weight ());
1638		1644
1639	op->destroy (1);	1645	op->destroy ();
1640	op = tmp;	1646	op = tmp;
1641	goto inserted;	1647	goto inserted;
1642	}	1648	}
1643		1649
1644	op->owner = 0; // it's his/hers now. period.	1650	op->owner = 0; // it's his/hers now. period.
…		…
1662		1668
1663	adjust_weight (this, op->total_weight ());	1669	adjust_weight (this, op->total_weight ());
1664		1670
1665	inserted:	1671	inserted:
1666	/* 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 */
1667	if (op->glow_radius && map && map->darkness)	1673	if (op->glow_radius && is_on_map ())
		1674	{
		1675	update_stats ();
1668	update_all_los (map, x, y);	1676	update_all_los (map, x, y);
1669		1677	}
		1678	else if (is_player () && !flag [FLAG_NO_FIX_PLAYER])
1670	// if this is a player's inventory, update stats	1679	// if this is a player's inventory, update stats
1671	if (type == PLAYER && !flag [FLAG_NO_FIX_PLAYER])
1672	update_stats ();	1680	update_stats ();
1673		1681
1674	INVOKE_OBJECT (INSERT, this);	1682	INVOKE_OBJECT (INSERT, this);
1675		1683
1676	return op;	1684	return op;
…		…
1697	* on top.	1705	* on top.
1698	*/	1706	*/
1699	int	1707	int
1700	check_move_on (object op, object originator)	1708	check_move_on (object op, object originator)
1701	{	1709	{
		1710	if (QUERY_FLAG (op, FLAG_NO_APPLY))
		1711	return 0;
		1712
1702	object *tmp;	1713	object *tmp;
1703	maptile *m = op->map;	1714	maptile *m = op->map;
1704	int x = op->x, y = op->y;	1715	int x = op->x, y = op->y;
1705		1716
1706	MoveType move_on, move_slow, move_block;	1717	mapspace &ms = m->at (x, y);
1707		1718
1708	if (QUERY_FLAG (op, FLAG_NO_APPLY))	1719	ms.update ();
1709	return 0;
1710		1720
1711	move_on = GET_MAP_MOVE_ON (op->map, op->x, op->y);	1721	MoveType move_on = ms.move_on;
1712	move_slow = GET_MAP_MOVE_SLOW (op->map, op->x, op->y);	1722	MoveType move_slow = ms.move_slow;
1713	move_block = GET_MAP_MOVE_BLOCK (op->map, op->x, op->y);	1723	MoveType move_block = ms.move_block;
1714		1724
1715	/* 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,
1716	* 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
1717	* 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
1718	* as walking.	1728	* as walking.
…		…
1729	return 0;	1739	return 0;
1730		1740
1731	/* The objects have to be checked from top to bottom.	1741	/* The objects have to be checked from top to bottom.
1732	* Hence, we first go to the top:	1742	* Hence, we first go to the top:
1733	*/	1743	*/
1734		1744	for (object next, tmp = ms.top; tmp; tmp = next)
1735	for (tmp = op->ms ().bot; tmp && tmp->above; tmp = tmp->above)
1736	{
1737	/* Trim the search when we find the first other spell effect
1738	* this helps performance so that if a space has 50 spell objects,
1739	* we don't need to check all of them.
1740	*/
1741	if ((tmp->move_type & MOVE_FLY_LOW) && QUERY_FLAG (tmp, FLAG_NO_PICK))
1742	break;
1743	}	1745	{
		1746	next = tmp->below;
1744		1747
1745	for (; tmp; tmp = tmp->below)
1746	{
1747	if (tmp == op)	1748	if (tmp == op)
1748	continue; /* Can't apply yourself */	1749	continue; /* Can't apply yourself */
1749		1750
1750	/* 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.
1751	* Second check makes sure that the movement types not being slowed	1752	* Second check makes sure that the movement types not being slowed
…		…
1756	if (!QUERY_FLAG (op, FLAG_WIZPASS))	1757	if (!QUERY_FLAG (op, FLAG_WIZPASS))
1757	{	1758	{
1758	if ((!op->move_type && tmp->move_slow & MOVE_WALK) \|\|	1759	if ((!op->move_type && tmp->move_slow & MOVE_WALK) \|\|
1759	((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))
1760	{	1761	{
1761
1762	float
1763	diff = tmp->move_slow_penalty * fabs (op->speed);	1762	float diff = tmp->move_slow_penalty * fabs (op->speed);
1764		1763
1765	if (op->type == PLAYER)	1764	if (op->is_player ())
1766	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)) \|\|
1767	(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)))
1768	diff /= 4.0;	1767	diff /= 4.0;
1769		1768
1770	op->speed_left -= diff;	1769	op->speed_left -= diff;
1771	}	1770	}
1772	}	1771	}
…		…
1978	* head of the object should correspond for the entire object.	1977	* head of the object should correspond for the entire object.
1979	*/	1978	*/
1980	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))	1979	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
1981	continue;	1980	continue;
1982		1981
1983	if (ob->blocked (m, pos.x, pos.y))	1982	if (ob->blocked (pos.m, pos.x, pos.y))
1984	continue;	1983	continue;
1985		1984
1986	altern [index++] = i;	1985	altern [index++] = i;
1987	}	1986	}
1988		1987
…		…
2056	* there is capable of.	2055	* there is capable of.
2057	*/	2056	*/
2058	int	2057	int
2059	find_dir (maptile m, int x, int y, object exclude)	2058	find_dir (maptile m, int x, int y, object exclude)
2060	{	2059	{
2061	int i, max = SIZEOFFREE, mflags;	2060	int max = SIZEOFFREE, mflags;
2062
2063	sint16 nx, ny;
2064	object *tmp;
2065	maptile *mp;
2066
2067	MoveType blocked, move_type;	2061	MoveType move_type;
2068		2062
2069	if (exclude && exclude->head_ () != exclude)	2063	if (exclude && exclude->head_ () != exclude)
2070	{	2064	{
2071	exclude = exclude->head;	2065	exclude = exclude->head;
2072	move_type = exclude->move_type;	2066	move_type = exclude->move_type;
…		…
2075	{	2069	{
2076	/* 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. */
2077	move_type = MOVE_ALL;	2071	move_type = MOVE_ALL;
2078	}	2072	}
2079		2073
2080	for (i = 1; i < max; i++)	2074	for (int i = 1; i < max; i++)
2081	{	2075	{
2082	mp = m;	2076	mapxy pos (m, x, y);
2083	nx = x + freearr_x[i];	2077	pos.move (i);
2084	ny = y + freearr_y[i];
2085		2078
2086	mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);	2079	if (!pos.normalise ())
2087
2088	if (mflags & P_OUT_OF_MAP)
2089	max = maxfree[i];	2080	max = maxfree[i];
2090	else	2081	else
2091	{	2082	{
2092	mapspace &ms = mp->at (nx, ny);	2083	mapspace &ms = *pos;
2093		2084
2094	blocked = ms.move_block;
2095
2096	if ((move_type & blocked) == move_type)	2085	if ((move_type & ms.move_block) == move_type)
2097	max = maxfree[i];	2086	max = maxfree [i];
2098	else if (mflags & P_IS_ALIVE)	2087	else if (ms.flags () & P_IS_ALIVE)
2099	{	2088	{
2100	for (tmp = ms.bot; tmp; tmp = tmp->above)	2089	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
2101	if ((tmp->flag [FLAG_MONSTER] \|\| tmp->type == PLAYER)	2090	if ((tmp->flag [FLAG_MONSTER] \|\| tmp->is_player ())
2102	&& (tmp != exclude \|\| (tmp->head_ () != tmp && tmp->head_ () != exclude)))	2091	&& (tmp != exclude \|\| (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2103	break;
2104
2105	if (tmp)
2106	return freedir[i];	2092	return freedir [i];
2107	}	2093	}
2108	}	2094	}
2109	}	2095	}
2110		2096
2111	return 0;	2097	return 0;
…		…
2186	* 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
2187	* 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.
2188	* 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
2189	* functions.	2175	* functions.
2190	*/	2176	*/
2191	int reduction_dir[SIZEOFFREE][3] = {	2177	const int reduction_dir[SIZEOFFREE][3] = {
2192	{0, 0, 0}, /* 0 */	2178	{0, 0, 0}, /* 0 */
2193	{0, 0, 0}, /* 1 */	2179	{0, 0, 0}, /* 1 */
2194	{0, 0, 0}, /* 2 */	2180	{0, 0, 0}, /* 2 */
2195	{0, 0, 0}, /* 3 */	2181	{0, 0, 0}, /* 3 */
2196	{0, 0, 0}, /* 4 */	2182	{0, 0, 0}, /* 4 */
…		…
2292	int	2278	int
2293	can_pick (const object who, const object item)	2279	can_pick (const object who, const object item)
2294	{	2280	{
2295	return /QUERY_FLAG(who,FLAG_WIZ)\|\| /	2281	return /QUERY_FLAG(who,FLAG_WIZ)\|\| /
2296	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&	2282	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
2297	!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));
2298	}	2284	}
2299		2285
2300	/*	2286	/*
2301	* create clone from object to another	2287	* create clone from object to another
2302	*/	2288	*/
…		…
2334	return tmp;	2320	return tmp;
2335		2321
2336	return 0;	2322	return 0;
2337	}	2323	}
2338		2324
2339	const shstr &	2325	shstr_tmp
2340	object::kv_get (const shstr &key) const	2326	object::kv_get (shstr_tmp key) const
2341	{	2327	{
2342	for (key_value *kv = key_values; kv; kv = kv->next)	2328	for (key_value *kv = key_values; kv; kv = kv->next)
2343	if (kv->key == key)	2329	if (kv->key == key)
2344	return kv->value;	2330	return kv->value;
2345		2331
2346	return shstr_null;	2332	return shstr ();
2347	}	2333	}
2348		2334
2349	void	2335	void
2350	object::kv_set (const shstr &key, const shstr &value)	2336	object::kv_set (shstr_tmp key, shstr_tmp value)
2351	{	2337	{
2352	for (key_value *kv = key_values; kv; kv = kv->next)	2338	for (key_value *kv = key_values; kv; kv = kv->next)
2353	if (kv->key == key)	2339	if (kv->key == key)
2354	{	2340	{
2355	kv->value = value;	2341	kv->value = value;
…		…
2364		2350
2365	key_values = kv;	2351	key_values = kv;
2366	}	2352	}
2367		2353
2368	void	2354	void
2369	object::kv_del (const shstr &key)	2355	object::kv_del (shstr_tmp key)
2370	{	2356	{
2371	for (key_value *kvp = &key_values; kvp; kvp = &(*kvp)->next)	2357	for (key_value *kvp = &key_values; kvp; kvp = &(*kvp)->next)
2372	if ((*kvp)->key == key)	2358	if ((*kvp)->key == key)
2373	{	2359	{
2374	key_value kv = kvp;	2360	key_value kv = kvp;
…		…
2505	container = 0;	2491	container = 0;
2506		2492
2507	// 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
2508	esrv_update_item (UPD_FLAGS, this, old_container);	2494	esrv_update_item (UPD_FLAGS, this, old_container);
2509		2495
2510	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 ());
2511	play_sound (sound_find ("chest_close"));	2497	play_sound (sound_find ("chest_close"));
2512	}	2498	}
2513		2499
2514	if (new_container)	2500	if (new_container)
2515	{	2501	{
…		…
2525	closer->flag [FLAG_NO_MAP_SAVE] = 1;	2511	closer->flag [FLAG_NO_MAP_SAVE] = 1;
2526	new_container->insert (closer);	2512	new_container->insert (closer);
2527	}	2513	}
2528	#endif	2514	#endif
2529		2515
2530	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 ());
2531		2517
2532	// 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
2533	esrv_send_item (this, new_container);	2519	esrv_send_item (this, new_container);
2534		2520
2535	new_container->flag [FLAG_APPLIED] = true;	2521	new_container->flag [FLAG_APPLIED] = true;
…		…
2543	// else if (!old_container->env && contr && contr->ns)	2529	// else if (!old_container->env && contr && contr->ns)
2544	// contr->ns->floorbox_reset ();	2530	// contr->ns->floorbox_reset ();
2545	}	2531	}
2546		2532
2547	object *	2533	object *
2548	object::force_find (const shstr name)	2534	object::force_find (shstr_tmp name)
2549	{	2535	{
2550	/* 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
2551	* place	2537	* place
2552	*/	2538	*/
2553	for (object *tmp = inv; tmp; tmp = tmp->below)	2539	for (object *tmp = inv; tmp; tmp = tmp->below)
…		…
2555	return splay (tmp);	2541	return splay (tmp);
2556		2542
2557	return 0;	2543	return 0;
2558	}	2544	}
2559		2545
2560	void	2546	object *
2561	object::force_add (const shstr name, int duration)	2547	object::force_add (shstr_tmp name, int duration)
2562	{	2548	{
2563	if (object *force = force_find (name))	2549	if (object *force = force_find (name))
2564	force->destroy ();	2550	force->destroy ();
2565		2551
2566	object *force = get_archetype (FORCE_NAME);	2552	object *force = get_archetype (FORCE_NAME);
…		…
2571		2557
2572	force->set_speed (duration ? 1.f / duration : 0.f);	2558	force->set_speed (duration ? 1.f / duration : 0.f);
2573	force->flag [FLAG_IS_USED_UP] = true;	2559	force->flag [FLAG_IS_USED_UP] = true;
2574	force->flag [FLAG_APPLIED] = true;	2560	force->flag [FLAG_APPLIED] = true;
2575		2561
2576	insert (force);	2562	return insert (force);
2577	}	2563	}
2578		2564
2579	void	2565	void
2580	object::play_sound (faceidx sound)	2566	object::play_sound (faceidx sound) const
2581	{	2567	{
2582	if (!sound)	2568	if (!sound)
2583	return;	2569	return;
2584		2570
2585	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 ())
2586	return;	2596	return;
2587		2597
2588	if (env)	2598	// find old force, or create new one
2589	{	2599	object *force = force_find (shstr_noise_force);
2590	if (object *pl = in_player ())	2600
2591	pl->contr->play_sound (sound);	2601	if (force)
2592	}	2602	force->speed_left = -1.f; // patch old speed up
2593	else	2603	else
2594	map->play_sound (sound, x, y);	2604	{
2595	}	2605	force = archetype::get (shstr_noise_force);
2596		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.251 by root, Sun Jul 20 16:56:34 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.251 by root, Sun Jul 20 16:56:34 2008 UTC vs.
Revision 1.288 by root, Sat Oct 3 22:36:08 2009 UTC