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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.253 by root, Sun Aug 17 22:46:26 2008 UTC vs.
Revision 1.284 by root, Sat Jun 27 08:35:03 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 ();
337		334
…		…
640	}	637	}
641		638
642	if (speed < 0)	639	if (speed < 0)
643	dst->speed_left -= rndm ();	640	dst->speed_left -= rndm ();
644		641
645	dst->set_speed (dst->speed);	642	dst->activate ();
646	}	643	}
647		644
648	void	645	void
649	object::instantiate ()	646	object::instantiate ()
650	{	647	{
…		…
762	else if (action == UP_OBJ_INSERT)	759	else if (action == UP_OBJ_INSERT)
763	{	760	{
764	// this is likely overkill, TODO: revisit (schmorp)	761	// this is likely overkill, TODO: revisit (schmorp)
765	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))	762	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
766	\|\| (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))	763	\|\| (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))
767	\|\| (op->type == PLAYER && !(m.flags_ & P_PLAYER))	764	\|\| (op->is_player () && !(m.flags_ & P_PLAYER))
768	\|\| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))	765	\|\| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
769	\|\| (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))	766	\|\| (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))
770	\|\| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))	767	\|\| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))
771	\|\| (m.move_on \| op->move_on ) != m.move_on	768	\|\| (m.move_on \| op->move_on ) != m.move_on
772	\|\| (m.move_off \| op->move_off ) != m.move_off	769	\|\| (m.move_off \| op->move_off ) != m.move_off
…		…
774	/* This isn't perfect, but I don't expect a lot of objects to	771	/* This isn't perfect, but I don't expect a lot of objects to
775	* have move_allow right now.	772	* have move_allow right now.
776	*/	773	*/
777	\|\| ((m.move_block \| op->move_block) & ~op->move_allow) != m.move_block	774	\|\| ((m.move_block \| op->move_block) & ~op->move_allow) != m.move_block
778	\|\| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)	775	\|\| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)
779	m.flags_ = 0;	776	m.invalidate ();
780	}	777	}
781	/* if the object is being removed, we can't make intelligent	778	/* if the object is being removed, we can't make intelligent
782	* decisions, because remove_ob can't really pass the object	779	* decisions, because remove_ob can't really pass the object
783	* that is being removed.	780	* that is being removed.
784	*/	781	*/
785	else if (action == UP_OBJ_CHANGE \|\| action == UP_OBJ_REMOVE)	782	else if (action == UP_OBJ_CHANGE \|\| action == UP_OBJ_REMOVE)
786	m.flags_ = 0;	783	m.invalidate ();
787	else if (action == UP_OBJ_FACE)	784	else if (action == UP_OBJ_FACE)
788	/* Nothing to do for that case */ ;	785	/* Nothing to do for that case */ ;
789	else	786	else
790	LOG (llevError, "update_object called with invalid action: %d\n", action);	787	LOG (llevError, "update_object called with invalid action: %d\n", action);
791		788
…		…
795		792
796	object::object ()	793	object::object ()
797	{	794	{
798	SET_FLAG (this, FLAG_REMOVED);	795	SET_FLAG (this, FLAG_REMOVED);
799		796
800	expmul = 1.0;	797	//expmul = 1.0; declared const for the time being
801	face = blank_face;	798	face = blank_face;
802	}	799	}
803		800
804	object::~object ()	801	object::~object ()
805	{	802	{
…		…
833	object::activate ()	830	object::activate ()
834	{	831	{
835	/* If already on active list, don't do anything */	832	/* If already on active list, don't do anything */
836	if (active)	833	if (active)
837	return;	834	return;
		835
		836	if (has_active_speed () && flag [FLAG_FREED]) LOG (llevError \| logBacktrace, "BUG: tried to activate freed object %s\n", debug_desc ());//D
		837	if (has_active_speed () && flag [FLAG_DEBUG]) LOG (llevError \| logBacktrace, "BUG: tried to activate DEBUG object %s\n", debug_desc ());//D temp
838		838
839	if (has_active_speed ())	839	if (has_active_speed ())
840	actives.insert (this);	840	actives.insert (this);
841	}	841	}
842		842
…		…
910	\|\| map->in_memory != MAP_ACTIVE	910	\|\| map->in_memory != MAP_ACTIVE
911	\|\| map->no_drop	911	\|\| map->no_drop
912	\|\| ms ().move_block == MOVE_ALL)	912	\|\| ms ().move_block == MOVE_ALL)
913	{	913	{
914	while (inv)	914	while (inv)
915	inv->destroy (true);	915	inv->destroy ();
916	}	916	}
917	else	917	else
918	{ /* Put objects in inventory onto this space */	918	{ /* Put objects in inventory onto this space */
919	while (inv)	919	while (inv)
920	{	920	{
…		…
924	\|\| op->flag [FLAG_NO_DROP]	924	\|\| op->flag [FLAG_NO_DROP]
925	\|\| op->type == RUNE	925	\|\| op->type == RUNE
926	\|\| op->type == TRAP	926	\|\| op->type == TRAP
927	\|\| op->flag [FLAG_IS_A_TEMPLATE]	927	\|\| op->flag [FLAG_IS_A_TEMPLATE]
928	\|\| op->flag [FLAG_DESTROY_ON_DEATH])	928	\|\| op->flag [FLAG_DESTROY_ON_DEATH])
929	op->destroy (true);	929	op->destroy ();
930	else	930	else
931	map->insert (op, x, y);	931	map->insert (op, x, y);
932	}	932	}
933	}	933	}
934	}	934	}
…		…
963		963
964	void	964	void
965	object::do_destroy ()	965	object::do_destroy ()
966	{	966	{
967	if (flag [FLAG_IS_LINKED])	967	if (flag [FLAG_IS_LINKED])
968	remove_button_link (this);	968	remove_link ();
969		969
970	if (flag [FLAG_FRIENDLY])	970	if (flag [FLAG_FRIENDLY])
971	remove_friendly_object (this);	971	remove_friendly_object (this);
972		972
973	remove ();	973	remove ();
…		…
998	attacked_by = 0;	998	attacked_by = 0;
999	current_weapon = 0;	999	current_weapon = 0;
1000	}	1000	}
1001		1001
1002	void	1002	void
1003	object::destroy (bool destroy_inventory)	1003	object::destroy ()
1004	{	1004	{
1005	if (destroyed ())	1005	if (destroyed ())
1006	return;	1006	return;
1007		1007
1008	if (!is_head () && !head->destroyed ())	1008	if (!is_head () && !head->destroyed ())
1009	{	1009	{
1010	LOG (llevError \| logBacktrace, "tried to destroy the tail of an object");	1010	LOG (llevError \| logBacktrace, "tried to destroy the tail of an object");
1011	head->destroy (destroy_inventory);	1011	head->destroy ();
1012	return;	1012	return;
1013	}	1013	}
1014		1014
1015	destroy_inv (!destroy_inventory);	1015	destroy_inv (false);
1016		1016
1017	if (is_head ())	1017	if (is_head ())
1018	if (sound_destroy)	1018	if (sound_destroy)
1019	play_sound (sound_destroy);	1019	play_sound (sound_destroy);
1020	else if (flag [FLAG_MONSTER])	1020	else if (flag [FLAG_MONSTER])
…		…
1056	if (object *pl = visible_to ())	1056	if (object *pl = visible_to ())
1057	esrv_del_item (pl->contr, count);	1057	esrv_del_item (pl->contr, count);
1058	flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed	1058	flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed
1059		1059
1060	adjust_weight (env, -total_weight ());	1060	adjust_weight (env, -total_weight ());
		1061
		1062	object *pl = in_player ();
1061		1063
1062	/* we set up values so that it could be inserted into	1064	/* we set up values so that it could be inserted into
1063	* the map, but we don't actually do that - it is up	1065	* the map, but we don't actually do that - it is up
1064	* to the caller to decide what we want to do.	1066	* to the caller to decide what we want to do.
1065	*/	1067	*/
…		…
1077		1079
1078	/* NO_FIX_PLAYER is set when a great many changes are being	1080	/* NO_FIX_PLAYER is set when a great many changes are being
1079	* made to players inventory. If set, avoiding the call	1081	* made to players inventory. If set, avoiding the call
1080	* to save cpu time.	1082	* to save cpu time.
1081	*/	1083	*/
1082	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1084	if (pl)
		1085	if (pl->is_player () && (glow_radius \|\| !QUERY_FLAG (pl, FLAG_NO_FIX_PLAYER)))
		1086	{
1083	otmp->update_stats ();	1087	pl->update_stats ();
		1088
		1089	if (glow_radius && pl->is_on_map ())
		1090	update_all_los (pl->map, pl->x, pl->y);
		1091	}
1084	}	1092	}
1085	else if (map)	1093	else if (map)
1086	{	1094	{
1087	map->dirty = true;	1095	map->dirty = true;
1088	mapspace &ms = this->ms ();	1096	mapspace &ms = this->ms ();
1089		1097
1090	if (object *pl = ms.player ())	1098	if (object *pl = ms.player ())
1091	{	1099	{
1092	if (type == PLAYER) // this == pl(!)	1100	if (is_player ())
1093	{	1101	{
		1102	if (!flag [FLAG_WIZPASS])
		1103	ms.smell = ++mapspace::smellcount; // remember the smell of the player
		1104
1094	// leaving a spot always closes any open container on the ground	1105	// leaving a spot always closes any open container on the ground
1095	if (container && !container->env)	1106	if (container && !container->env)
1096	// this causes spurious floorbox updates, but it ensures	1107	// this causes spurious floorbox updates, but it ensures
1097	// that the CLOSE event is being sent.	1108	// that the CLOSE event is being sent.
1098	close_container ();	1109	close_container ();
…		…
1115	*(below ? &below->above : &ms.bot) = above;	1126	*(below ? &below->above : &ms.bot) = above;
1116		1127
1117	above = 0;	1128	above = 0;
1118	below = 0;	1129	below = 0;
1119		1130
1120	ms.flags_ = 0;	1131	ms.invalidate ();
1121		1132
1122	if (map->in_memory == MAP_SAVING)	1133	if (map->in_memory == MAP_SAVING)
1123	return;	1134	return;
1124		1135
1125	int check_walk_off = !flag [FLAG_NO_APPLY];	1136	int check_walk_off = !flag [FLAG_NO_APPLY];
…		…
1158	}	1169	}
1159		1170
1160	last = tmp;	1171	last = tmp;
1161	}	1172	}
1162		1173
1163	if (flag [FLAG_BLOCKSVIEW] \|\| glow_radius)	1174	if (affects_los ())
1164	update_all_los (map, x, y);	1175	update_all_los (map, x, y);
1165	}	1176	}
1166	}	1177	}
1167		1178
1168	/*	1179	/*
…		…
1192	esrv_update_item (UPD_NROF, pl, top);	1203	esrv_update_item (UPD_NROF, pl, top);
1193		1204
1194	op->weight = 0; // cancel the addition above	1205	op->weight = 0; // cancel the addition above
1195	op->carrying = 0; // must be 0 already	1206	op->carrying = 0; // must be 0 already
1196		1207
1197	op->destroy (1);	1208	op->destroy ();
1198		1209
1199	return top;	1210	return top;
1200	}	1211	}
1201		1212
1202	return 0;	1213	return 0;
…		…
1264	* just 'op' otherwise	1275	* just 'op' otherwise
1265	*/	1276	*/
1266	object *	1277	object *
1267	insert_ob_in_map (object op, maptile m, object *originator, int flag)	1278	insert_ob_in_map (object op, maptile m, object *originator, int flag)
1268	{	1279	{
1269	if (op->is_on_map ())
1270	{
1271	LOG (llevError, "insert_ob_in_map called for object already on map");
1272	abort ();
1273	}
1274
1275	if (op->env)
1276	{
1277	LOG (llevError, "insert_ob_in_map called for object in an inventory (proceeding)");
1278	op->remove ();	1280	op->remove ();
1279	}
1280		1281
1281	if (op->face && !face_info (op->face))//D TODO: remove soon	1282	if (m == &freed_map)//D TODO: remove soon
1282	{//D	1283	{//D
1283	LOG (llevError \| logBacktrace, "op->face out of bounds: %s", op->debug_desc ());//D	1284	LOG (llevError \| logBacktrace, "tries to insret object on freed objects map: %s", op->debug_desc ());//D
1284	op->face = 1;//D
1285	}//D	1285	}//D
1286		1286
1287	/* Ideally, the caller figures this out. However, it complicates a lot	1287	/* Ideally, the caller figures this out. However, it complicates a lot
1288	* of areas of callers (eg, anything that uses find_free_spot would now	1288	* of areas of callers (eg, anything that uses find_free_spot would now
1289	* need extra work	1289	* need extra work
1290	*/	1290	*/
		1291	maptile *newmap = m;
1291	if (!xy_normalise (m, op->x, op->y))	1292	if (!xy_normalise (newmap, op->x, op->y))
1292	{	1293	{
1293	op->head_ ()->destroy (1);// remove head_ once all tail object destroyers found	1294	op->head_ ()->destroy ();// remove head_ once all tail object destroyers found
1294	return 0;	1295	return 0;
1295	}	1296	}
1296		1297
1297	if (object *more = op->more)	1298	if (object *more = op->more)
1298	if (!insert_ob_in_map (more, m, originator, flag))	1299	if (!insert_ob_in_map (more, m, originator, flag))
1299	return 0;	1300	return 0;
1300		1301
1301	CLEAR_FLAG (op, FLAG_REMOVED);	1302	op->flag [FLAG_REMOVED] = false;
1302		1303	op->env = 0;
1303	op->map = m;	1304	op->map = newmap;
		1305
1304	mapspace &ms = op->ms ();	1306	mapspace &ms = op->ms ();
1305		1307
1306	/* this has to be done after we translate the coordinates.	1308	/* this has to be done after we translate the coordinates.
1307	*/	1309	*/
1308	if (op->nrof && !(flag & INS_NO_MERGE))	1310	if (op->nrof && !(flag & INS_NO_MERGE))
…		…
1311	{	1313	{
1312	// TODO: we actually want to update tmp, not op,	1314	// TODO: we actually want to update tmp, not op,
1313	// but some caller surely breaks when we return tmp	1315	// but some caller surely breaks when we return tmp
1314	// from here :/	1316	// from here :/
1315	op->nrof += tmp->nrof;	1317	op->nrof += tmp->nrof;
1316	tmp->destroy (1);	1318	tmp->destroy ();
1317	}	1319	}
1318		1320
1319	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1321	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1320	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1322	CLEAR_FLAG (op, FLAG_INV_LOCKED);
1321		1323
…		…
1329	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");	1331	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");
1330	abort ();	1332	abort ();
1331	}	1333	}
1332		1334
1333	if (!originator->is_on_map ())	1335	if (!originator->is_on_map ())
		1336	{
1334	LOG (llevDebug \| logBacktrace, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map",	1337	LOG (llevError, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map",
1335	op->debug_desc (), originator->debug_desc ());	1338	op->debug_desc (), originator->debug_desc ());
		1339	abort ();
		1340	}
1336		1341
1337	op->above = originator;	1342	op->above = originator;
1338	op->below = originator->below;	1343	op->below = originator->below;
1339	originator->below = op;	1344	originator->below = op;
1340		1345
…		…
1426	op->below = top;	1431	op->below = top;
1427	*(op->above ? &op->above->below : &ms.top) = op;	1432	*(op->above ? &op->above->below : &ms.top) = op;
1428	}	1433	}
1429	}	1434	}
1430		1435
1431	if (op->type == PLAYER)	1436	if (op->is_player ())
1432	{	1437	{
1433	op->contr->do_los = 1;	1438	op->contr->do_los = 1;
1434	++op->map->players;	1439	++op->map->players;
1435	op->map->touch ();	1440	op->map->touch ();
1436	}	1441	}
…		…
1451	* be far away from this change and not affected in any way -	1456	* be far away from this change and not affected in any way -
1452	* this should get redone to only look for players within range,	1457	* this should get redone to only look for players within range,
1453	* or just updating the P_UPTODATE for spaces within this area	1458	* or just updating the P_UPTODATE for spaces within this area
1454	* of effect may be sufficient.	1459	* of effect may be sufficient.
1455	*/	1460	*/
1456	if (op->map->darkness && (op->glow_radius != 0))	1461	if (op->affects_los ())
		1462	{
		1463	op->ms ().invalidate ();
1457	update_all_los (op->map, op->x, op->y);	1464	update_all_los (op->map, op->x, op->y);
		1465	}
1458		1466
1459	/* updates flags (blocked, alive, no magic, etc) for this map space */	1467	/* updates flags (blocked, alive, no magic, etc) for this map space */
1460	update_object (op, UP_OBJ_INSERT);	1468	update_object (op, UP_OBJ_INSERT);
1461		1469
1462	INVOKE_OBJECT (INSERT, op);	1470	INVOKE_OBJECT (INSERT, op);
…		…
1490	/* this function inserts an object in the map, but if it	1498	/* this function inserts an object in the map, but if it
1491	* finds an object of its own type, it'll remove that one first.	1499	* finds an object of its own type, it'll remove that one first.
1492	* op is the object to insert it under: supplies x and the map.	1500	* op is the object to insert it under: supplies x and the map.
1493	*/	1501	*/
1494	void	1502	void
1495	replace_insert_ob_in_map (const char arch_string, object op)	1503	replace_insert_ob_in_map (shstr_tmp archname, object *op)
1496	{	1504	{
1497	/* first search for itself and remove any old instances */	1505	/* first search for itself and remove any old instances */
1498		1506
1499	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)	1507	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1500	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */	1508	if (tmp->arch->archname == archname) /* same archetype */
1501	tmp->destroy (1);	1509	tmp->destroy ();
1502		1510
1503	object *tmp = arch_to_object (archetype::find (arch_string));	1511	object *tmp = arch_to_object (archetype::find (archname));
1504		1512
1505	tmp->x = op->x;	1513	tmp->x = op->x;
1506	tmp->y = op->y;	1514	tmp->y = op->y;
1507		1515
1508	insert_ob_in_map (tmp, op->map, op, 0);	1516	insert_ob_in_map (tmp, op->map, op, 0);
…		…
1629	if (object *pl = tmp->visible_to ())	1637	if (object *pl = tmp->visible_to ())
1630	esrv_update_item (UPD_NROF, pl, tmp);	1638	esrv_update_item (UPD_NROF, pl, tmp);
1631		1639
1632	adjust_weight (this, op->total_weight ());	1640	adjust_weight (this, op->total_weight ());
1633		1641
1634	op->destroy (1);	1642	op->destroy ();
1635	op = tmp;	1643	op = tmp;
1636	goto inserted;	1644	goto inserted;
1637	}	1645	}
1638		1646
1639	op->owner = 0; // it's his/hers now. period.	1647	op->owner = 0; // it's his/hers now. period.
…		…
1657		1665
1658	adjust_weight (this, op->total_weight ());	1666	adjust_weight (this, op->total_weight ());
1659		1667
1660	inserted:	1668	inserted:
1661	/* reset the light list and los of the players on the map */	1669	/* reset the light list and los of the players on the map */
1662	if (op->glow_radius && map && map->darkness)	1670	if (op->glow_radius && is_on_map ())
		1671	{
		1672	update_stats ();
1663	update_all_los (map, x, y);	1673	update_all_los (map, x, y);
1664		1674	}
		1675	else if (is_player () && !flag [FLAG_NO_FIX_PLAYER])
1665	// if this is a player's inventory, update stats	1676	// if this is a player's inventory, update stats
1666	if (type == PLAYER && !flag [FLAG_NO_FIX_PLAYER])
1667	update_stats ();	1677	update_stats ();
1668		1678
1669	INVOKE_OBJECT (INSERT, this);	1679	INVOKE_OBJECT (INSERT, this);
1670		1680
1671	return op;	1681	return op;
…		…
1755	{	1765	{
1756		1766
1757	float	1767	float
1758	diff = tmp->move_slow_penalty * fabs (op->speed);	1768	diff = tmp->move_slow_penalty * fabs (op->speed);
1759		1769
1760	if (op->type == PLAYER)	1770	if (op->is_player ())
1761	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) \|\|	1771	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) \|\|
1762	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))	1772	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))
1763	diff /= 4.0;	1773	diff /= 4.0;
1764		1774
1765	op->speed_left -= diff;	1775	op->speed_left -= diff;
…		…
1973	* head of the object should correspond for the entire object.	1983	* head of the object should correspond for the entire object.
1974	*/	1984	*/
1975	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))	1985	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
1976	continue;	1986	continue;
1977		1987
1978	if (ob->blocked (m, pos.x, pos.y))	1988	if (ob->blocked (pos.m, pos.x, pos.y))
1979	continue;	1989	continue;
1980		1990
1981	altern [index++] = i;	1991	altern [index++] = i;
1982	}	1992	}
1983		1993
…		…
2051	* there is capable of.	2061	* there is capable of.
2052	*/	2062	*/
2053	int	2063	int
2054	find_dir (maptile m, int x, int y, object exclude)	2064	find_dir (maptile m, int x, int y, object exclude)
2055	{	2065	{
2056	int i, max = SIZEOFFREE, mflags;	2066	int max = SIZEOFFREE, mflags;
2057
2058	sint16 nx, ny;
2059	object *tmp;
2060	maptile *mp;
2061
2062	MoveType blocked, move_type;	2067	MoveType move_type;
2063		2068
2064	if (exclude && exclude->head_ () != exclude)	2069	if (exclude && exclude->head_ () != exclude)
2065	{	2070	{
2066	exclude = exclude->head;	2071	exclude = exclude->head;
2067	move_type = exclude->move_type;	2072	move_type = exclude->move_type;
…		…
2070	{	2075	{
2071	/* If we don't have anything, presume it can use all movement types. */	2076	/* If we don't have anything, presume it can use all movement types. */
2072	move_type = MOVE_ALL;	2077	move_type = MOVE_ALL;
2073	}	2078	}
2074		2079
2075	for (i = 1; i < max; i++)	2080	for (int i = 1; i < max; i++)
2076	{	2081	{
2077	mp = m;	2082	mapxy pos (m, x, y);
2078	nx = x + freearr_x[i];	2083	pos.move (i);
2079	ny = y + freearr_y[i];
2080		2084
2081	mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);	2085	if (!pos.normalise ())
2082
2083	if (mflags & P_OUT_OF_MAP)
2084	max = maxfree[i];	2086	max = maxfree[i];
2085	else	2087	else
2086	{	2088	{
2087	mapspace &ms = mp->at (nx, ny);	2089	mapspace &ms = *pos;
2088		2090
2089	blocked = ms.move_block;
2090
2091	if ((move_type & blocked) == move_type)	2091	if ((move_type & ms.move_block) == move_type)
2092	max = maxfree[i];	2092	max = maxfree [i];
2093	else if (mflags & P_IS_ALIVE)	2093	else if (ms.flags () & P_IS_ALIVE)
2094	{	2094	{
2095	for (tmp = ms.bot; tmp; tmp = tmp->above)	2095	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
2096	if ((tmp->flag [FLAG_MONSTER] \|\| tmp->type == PLAYER)	2096	if ((tmp->flag [FLAG_MONSTER] \|\| tmp->is_player ())
2097	&& (tmp != exclude \|\| (tmp->head_ () != tmp && tmp->head_ () != exclude)))	2097	&& (tmp != exclude \|\| (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2098	break;
2099
2100	if (tmp)
2101	return freedir[i];	2098	return freedir [i];
2102	}	2099	}
2103	}	2100	}
2104	}	2101	}
2105		2102
2106	return 0;	2103	return 0;
…		…
2181	* This basically means that if direction is 15, then it could either go	2178	* This basically means that if direction is 15, then it could either go
2182	* direction 4, 14, or 16 to get back to where we are.	2179	* direction 4, 14, or 16 to get back to where we are.
2183	* Moved from spell_util.c to object.c with the other related direction	2180	* Moved from spell_util.c to object.c with the other related direction
2184	* functions.	2181	* functions.
2185	*/	2182	*/
2186	int reduction_dir[SIZEOFFREE][3] = {	2183	const int reduction_dir[SIZEOFFREE][3] = {
2187	{0, 0, 0}, /* 0 */	2184	{0, 0, 0}, /* 0 */
2188	{0, 0, 0}, /* 1 */	2185	{0, 0, 0}, /* 1 */
2189	{0, 0, 0}, /* 2 */	2186	{0, 0, 0}, /* 2 */
2190	{0, 0, 0}, /* 3 */	2187	{0, 0, 0}, /* 3 */
2191	{0, 0, 0}, /* 4 */	2188	{0, 0, 0}, /* 4 */
…		…
2287	int	2284	int
2288	can_pick (const object who, const object item)	2285	can_pick (const object who, const object item)
2289	{	2286	{
2290	return /QUERY_FLAG(who,FLAG_WIZ)\|\| /	2287	return /QUERY_FLAG(who,FLAG_WIZ)\|\| /
2291	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&	2288	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
2292	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER \|\| item->weight < who->weight / 3));	2289	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->is_player () \|\| item->weight < who->weight / 3));
2293	}	2290	}
2294		2291
2295	/*	2292	/*
2296	* create clone from object to another	2293	* create clone from object to another
2297	*/	2294	*/
…		…
2329	return tmp;	2326	return tmp;
2330		2327
2331	return 0;	2328	return 0;
2332	}	2329	}
2333		2330
2334	const shstr &	2331	shstr_tmp
2335	object::kv_get (const shstr &key) const	2332	object::kv_get (shstr_tmp key) const
2336	{	2333	{
2337	for (key_value *kv = key_values; kv; kv = kv->next)	2334	for (key_value *kv = key_values; kv; kv = kv->next)
2338	if (kv->key == key)	2335	if (kv->key == key)
2339	return kv->value;	2336	return kv->value;
2340		2337
2341	return shstr_null;	2338	return shstr ();
2342	}	2339	}
2343		2340
2344	void	2341	void
2345	object::kv_set (const shstr &key, const shstr &value)	2342	object::kv_set (shstr_tmp key, shstr_tmp value)
2346	{	2343	{
2347	for (key_value *kv = key_values; kv; kv = kv->next)	2344	for (key_value *kv = key_values; kv; kv = kv->next)
2348	if (kv->key == key)	2345	if (kv->key == key)
2349	{	2346	{
2350	kv->value = value;	2347	kv->value = value;
…		…
2359		2356
2360	key_values = kv;	2357	key_values = kv;
2361	}	2358	}
2362		2359
2363	void	2360	void
2364	object::kv_del (const shstr &key)	2361	object::kv_del (shstr_tmp key)
2365	{	2362	{
2366	for (key_value *kvp = &key_values; kvp; kvp = &(*kvp)->next)	2363	for (key_value *kvp = &key_values; kvp; kvp = &(*kvp)->next)
2367	if ((*kvp)->key == key)	2364	if ((*kvp)->key == key)
2368	{	2365	{
2369	key_value kv = kvp;	2366	key_value kv = kvp;
…		…
2500	container = 0;	2497	container = 0;
2501		2498
2502	// client needs item update to make it work, client bug requires this to be separate	2499	// client needs item update to make it work, client bug requires this to be separate
2503	esrv_update_item (UPD_FLAGS, this, old_container);	2500	esrv_update_item (UPD_FLAGS, this, old_container);
2504		2501
2505	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));	2502	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", old_container->query_name ());
2506	play_sound (sound_find ("chest_close"));	2503	play_sound (sound_find ("chest_close"));
2507	}	2504	}
2508		2505
2509	if (new_container)	2506	if (new_container)
2510	{	2507	{
…		…
2520	closer->flag [FLAG_NO_MAP_SAVE] = 1;	2517	closer->flag [FLAG_NO_MAP_SAVE] = 1;
2521	new_container->insert (closer);	2518	new_container->insert (closer);
2522	}	2519	}
2523	#endif	2520	#endif
2524		2521
2525	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));	2522	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", new_container->query_name ());
2526		2523
2527	// make sure the container is available, client bug requires this to be separate	2524	// make sure the container is available, client bug requires this to be separate
2528	esrv_send_item (this, new_container);	2525	esrv_send_item (this, new_container);
2529		2526
2530	new_container->flag [FLAG_APPLIED] = true;	2527	new_container->flag [FLAG_APPLIED] = true;
…		…
2538	// else if (!old_container->env && contr && contr->ns)	2535	// else if (!old_container->env && contr && contr->ns)
2539	// contr->ns->floorbox_reset ();	2536	// contr->ns->floorbox_reset ();
2540	}	2537	}
2541		2538
2542	object *	2539	object *
2543	object::force_find (const shstr name)	2540	object::force_find (shstr_tmp name)
2544	{	2541	{
2545	/* cycle through his inventory to look for the MARK we want to	2542	/* cycle through his inventory to look for the MARK we want to
2546	* place	2543	* place
2547	*/	2544	*/
2548	for (object *tmp = inv; tmp; tmp = tmp->below)	2545	for (object *tmp = inv; tmp; tmp = tmp->below)
…		…
2550	return splay (tmp);	2547	return splay (tmp);
2551		2548
2552	return 0;	2549	return 0;
2553	}	2550	}
2554		2551
2555	void	2552	object *
2556	object::force_add (const shstr name, int duration)	2553	object::force_add (shstr_tmp name, int duration)
2557	{	2554	{
2558	if (object *force = force_find (name))	2555	if (object *force = force_find (name))
2559	force->destroy ();	2556	force->destroy ();
2560		2557
2561	object *force = get_archetype (FORCE_NAME);	2558	object *force = get_archetype (FORCE_NAME);
…		…
2566		2563
2567	force->set_speed (duration ? 1.f / duration : 0.f);	2564	force->set_speed (duration ? 1.f / duration : 0.f);
2568	force->flag [FLAG_IS_USED_UP] = true;	2565	force->flag [FLAG_IS_USED_UP] = true;
2569	force->flag [FLAG_APPLIED] = true;	2566	force->flag [FLAG_APPLIED] = true;
2570		2567
2571	insert (force);	2568	return insert (force);
2572	}	2569	}
2573		2570
2574	void	2571	void
2575	object::play_sound (faceidx sound)	2572	object::play_sound (faceidx sound) const
2576	{	2573	{
2577	if (!sound)	2574	if (!sound)
2578	return;	2575	return;
2579		2576
2580	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 ())
2581	return;	2602	return;
2582		2603
2583	if (env)	2604	// find old force, or create new one
2584	{	2605	object *force = force_find (shstr_noise_force);
2585	if (object *pl = in_player ())	2606
2586	pl->contr->play_sound (sound);	2607	if (force)
2587	}	2608	force->speed_left = -1.f; // patch old speed up
2588	else	2609	else
2589	map->play_sound (sound, x, y);	2610	{
2590	}	2611	force = archetype::get (shstr_noise_force);
2591		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.253 by root, Sun Aug 17 22:46:26 2008 UTC vs. Revision 1.284 by root, Sat Jun 27 08:35:03 2009 UTC

Diff Legend

Comparing deliantra/server/common/object.C (file contents):
Revision 1.253 by root, Sun Aug 17 22:46:26 2008 UTC vs.
Revision 1.284 by root, Sat Jun 27 08:35:03 2009 UTC