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

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

Diff Legend

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

Comparing deliantra/server/common/object.C (file contents): Revision 1.255 by root, Sun Aug 31 02:01:41 2008 UTC vs. Revision 1.293 by root, Wed Oct 21 00:44:39 2009 UTC

Diff Legend

Comparing deliantra/server/common/object.C (file contents):
Revision 1.255 by root, Sun Aug 31 02:01:41 2008 UTC vs.
Revision 1.293 by root, Wed Oct 21 00:44:39 2009 UTC