[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.282 by root, Tue Feb 17 03:53:31 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
773	\|\| (m.move_slow \| op->move_slow) != m.move_slow	770	\|\| (m.move_slow \| op->move_slow) != m.move_slow
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	* to 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
…		…
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
		1131	ms.invalidate ();
		1132
1120	if (map->in_memory == MAP_SAVING)	1133	if (map->in_memory == MAP_SAVING)
1121	return;	1134	return;
1122		1135
1123	int check_walk_off = !flag [FLAG_NO_APPLY];	1136	int check_walk_off = !flag [FLAG_NO_APPLY];
1124		1137
…		…
1156	}	1169	}
1157		1170
1158	last = tmp;	1171	last = tmp;
1159	}	1172	}
1160		1173
1161	/* last == NULL if there are no objects on this space */	1174	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);	1175	update_all_los (map, x, y);
1170	}	1176	}
1171	}	1177	}
1172		1178
1173	/*	1179	/*
…		…
1197	esrv_update_item (UPD_NROF, pl, top);	1203	esrv_update_item (UPD_NROF, pl, top);
1198		1204
1199	op->weight = 0; // cancel the addition above	1205	op->weight = 0; // cancel the addition above
1200	op->carrying = 0; // must be 0 already	1206	op->carrying = 0; // must be 0 already
1201		1207
1202	op->destroy (1);	1208	op->destroy ();
1203		1209
1204	return top;	1210	return top;
1205	}	1211	}
1206		1212
1207	return 0;	1213	return 0;
…		…
1269	* just 'op' otherwise	1275	* just 'op' otherwise
1270	*/	1276	*/
1271	object *	1277	object *
1272	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)
1273	{	1279	{
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 ();	1280	op->remove ();
1284	}
1285		1281
1286	if (op->face && !face_info (op->face))//D TODO: remove soon	1282	if (m == &freed_map)//D TODO: remove soon
1287	{//D	1283	{//D
1288	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
1289	op->face = 1;//D
1290	}//D	1285	}//D
1291		1286
1292	/* Ideally, the caller figures this out. However, it complicates a lot	1287	/* 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	1288	* of areas of callers (eg, anything that uses find_free_spot would now
1294	* need extra work	1289	* need extra work
1295	*/	1290	*/
		1291	maptile *newmap = m;
1296	if (!xy_normalise (m, op->x, op->y))	1292	if (!xy_normalise (newmap, op->x, op->y))
1297	{	1293	{
1298	op->head_ ()->destroy (1);// remove head_ once all tail object destroyers found	1294	op->head_ ()->destroy ();// remove head_ once all tail object destroyers found
1299	return 0;	1295	return 0;
1300	}	1296	}
1301		1297
1302	if (object *more = op->more)	1298	if (object *more = op->more)
1303	if (!insert_ob_in_map (more, m, originator, flag))	1299	if (!insert_ob_in_map (more, m, originator, flag))
1304	return 0;	1300	return 0;
1305		1301
1306	CLEAR_FLAG (op, FLAG_REMOVED);	1302	CLEAR_FLAG (op, FLAG_REMOVED);
1307		1303
1308	op->map = m;	1304	op->map = newmap;
1309	mapspace &ms = op->ms ();	1305	mapspace &ms = op->ms ();
1310		1306
1311	/* this has to be done after we translate the coordinates.	1307	/* this has to be done after we translate the coordinates.
1312	*/	1308	*/
1313	if (op->nrof && !(flag & INS_NO_MERGE))	1309	if (op->nrof && !(flag & INS_NO_MERGE))
…		…
1316	{	1312	{
1317	// TODO: we actually want to update tmp, not op,	1313	// TODO: we actually want to update tmp, not op,
1318	// but some caller surely breaks when we return tmp	1314	// but some caller surely breaks when we return tmp
1319	// from here :/	1315	// from here :/
1320	op->nrof += tmp->nrof;	1316	op->nrof += tmp->nrof;
1321	tmp->destroy (1);	1317	tmp->destroy ();
1322	}	1318	}
1323		1319
1324	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1320	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1325	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1321	CLEAR_FLAG (op, FLAG_INV_LOCKED);
1326		1322
…		…
1334	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");	1330	LOG (llevError, "insert_ob_in_map called with INS_BELOW_ORIGINATOR when originator not on same space!\n");
1335	abort ();	1331	abort ();
1336	}	1332	}
1337		1333
1338	if (!originator->is_on_map ())	1334	if (!originator->is_on_map ())
		1335	{
1339	LOG (llevDebug \| logBacktrace, "insert_ob_in_map(%s) called with INS_BELOW_ORIGINATOR when originator '%s' not on map",	1336	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 ());	1337	op->debug_desc (), originator->debug_desc ());
		1338	abort ();
		1339	}
1341		1340
1342	op->above = originator;	1341	op->above = originator;
1343	op->below = originator->below;	1342	op->below = originator->below;
1344	originator->below = op;	1343	originator->below = op;
1345		1344
…		…
1431	op->below = top;	1430	op->below = top;
1432	*(op->above ? &op->above->below : &ms.top) = op;	1431	*(op->above ? &op->above->below : &ms.top) = op;
1433	}	1432	}
1434	}	1433	}
1435		1434
1436	if (op->type == PLAYER)	1435	if (op->is_player ())
1437	{	1436	{
1438	op->contr->do_los = 1;	1437	op->contr->do_los = 1;
1439	++op->map->players;	1438	++op->map->players;
1440	op->map->touch ();	1439	op->map->touch ();
1441	}	1440	}
…		…
1456	* be far away from this change and not affected in any way -	1455	* be far away from this change and not affected in any way -
1457	* this should get redone to only look for players within range,	1456	* this should get redone to only look for players within range,
1458	* or just updating the P_UPTODATE for spaces within this area	1457	* or just updating the P_UPTODATE for spaces within this area
1459	* of effect may be sufficient.	1458	* of effect may be sufficient.
1460	*/	1459	*/
1461	if (op->map->darkness && (op->glow_radius != 0))	1460	if (op->affects_los ())
		1461	{
		1462	op->ms ().invalidate ();
1462	update_all_los (op->map, op->x, op->y);	1463	update_all_los (op->map, op->x, op->y);
		1464	}
1463		1465
1464	/* updates flags (blocked, alive, no magic, etc) for this map space */	1466	/* updates flags (blocked, alive, no magic, etc) for this map space */
1465	update_object (op, UP_OBJ_INSERT);	1467	update_object (op, UP_OBJ_INSERT);
1466		1468
1467	INVOKE_OBJECT (INSERT, op);	1469	INVOKE_OBJECT (INSERT, op);
…		…
1495	/* this function inserts an object in the map, but if it	1497	/* 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.	1498	* 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.	1499	* op is the object to insert it under: supplies x and the map.
1498	*/	1500	*/
1499	void	1501	void
1500	replace_insert_ob_in_map (const char arch_string, object op)	1502	replace_insert_ob_in_map (shstr_tmp archname, object *op)
1501	{	1503	{
1502	/* first search for itself and remove any old instances */	1504	/* first search for itself and remove any old instances */
1503		1505
1504	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)	1506	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1505	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */	1507	if (tmp->arch->archname == archname) /* same archetype */
1506	tmp->destroy (1);	1508	tmp->destroy ();
1507		1509
1508	object *tmp = arch_to_object (archetype::find (arch_string));	1510	object *tmp = arch_to_object (archetype::find (archname));
1509		1511
1510	tmp->x = op->x;	1512	tmp->x = op->x;
1511	tmp->y = op->y;	1513	tmp->y = op->y;
1512		1514
1513	insert_ob_in_map (tmp, op->map, op, 0);	1515	insert_ob_in_map (tmp, op->map, op, 0);
…		…
1634	if (object *pl = tmp->visible_to ())	1636	if (object *pl = tmp->visible_to ())
1635	esrv_update_item (UPD_NROF, pl, tmp);	1637	esrv_update_item (UPD_NROF, pl, tmp);
1636		1638
1637	adjust_weight (this, op->total_weight ());	1639	adjust_weight (this, op->total_weight ());
1638		1640
1639	op->destroy (1);	1641	op->destroy ();
1640	op = tmp;	1642	op = tmp;
1641	goto inserted;	1643	goto inserted;
1642	}	1644	}
1643		1645
1644	op->owner = 0; // it's his/hers now. period.	1646	op->owner = 0; // it's his/hers now. period.
…		…
1662		1664
1663	adjust_weight (this, op->total_weight ());	1665	adjust_weight (this, op->total_weight ());
1664		1666
1665	inserted:	1667	inserted:
1666	/* reset the light list and los of the players on the map */	1668	/* reset the light list and los of the players on the map */
1667	if (op->glow_radius && map && map->darkness)	1669	if (op->glow_radius && is_on_map ())
		1670	{
		1671	update_stats ();
1668	update_all_los (map, x, y);	1672	update_all_los (map, x, y);
1669		1673	}
		1674	else if (is_player () && !flag [FLAG_NO_FIX_PLAYER])
1670	// if this is a player's inventory, update stats	1675	// if this is a player's inventory, update stats
1671	if (type == PLAYER && !flag [FLAG_NO_FIX_PLAYER])
1672	update_stats ();	1676	update_stats ();
1673		1677
1674	INVOKE_OBJECT (INSERT, this);	1678	INVOKE_OBJECT (INSERT, this);
1675		1679
1676	return op;	1680	return op;
…		…
1760	{	1764	{
1761		1765
1762	float	1766	float
1763	diff = tmp->move_slow_penalty * fabs (op->speed);	1767	diff = tmp->move_slow_penalty * fabs (op->speed);
1764		1768
1765	if (op->type == PLAYER)	1769	if (op->is_player ())
1766	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) \|\|	1770	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) \|\|
1767	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))	1771	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))
1768	diff /= 4.0;	1772	diff /= 4.0;
1769		1773
1770	op->speed_left -= diff;	1774	op->speed_left -= diff;
…		…
1978	* head of the object should correspond for the entire object.	1982	* head of the object should correspond for the entire object.
1979	*/	1983	*/
1980	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))	1984	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
1981	continue;	1985	continue;
1982		1986
1983	if (ob->blocked (m, pos.x, pos.y))	1987	if (ob->blocked (pos.m, pos.x, pos.y))
1984	continue;	1988	continue;
1985		1989
1986	altern [index++] = i;	1990	altern [index++] = i;
1987	}	1991	}
1988		1992
…		…
2056	* there is capable of.	2060	* there is capable of.
2057	*/	2061	*/
2058	int	2062	int
2059	find_dir (maptile m, int x, int y, object exclude)	2063	find_dir (maptile m, int x, int y, object exclude)
2060	{	2064	{
2061	int i, max = SIZEOFFREE, mflags;	2065	int max = SIZEOFFREE, mflags;
2062
2063	sint16 nx, ny;
2064	object *tmp;
2065	maptile *mp;
2066
2067	MoveType blocked, move_type;	2066	MoveType move_type;
2068		2067
2069	if (exclude && exclude->head_ () != exclude)	2068	if (exclude && exclude->head_ () != exclude)
2070	{	2069	{
2071	exclude = exclude->head;	2070	exclude = exclude->head;
2072	move_type = exclude->move_type;	2071	move_type = exclude->move_type;
…		…
2075	{	2074	{
2076	/* If we don't have anything, presume it can use all movement types. */	2075	/* If we don't have anything, presume it can use all movement types. */
2077	move_type = MOVE_ALL;	2076	move_type = MOVE_ALL;
2078	}	2077	}
2079		2078
2080	for (i = 1; i < max; i++)	2079	for (int i = 1; i < max; i++)
2081	{	2080	{
2082	mp = m;	2081	mapxy pos (m, x, y);
2083	nx = x + freearr_x[i];	2082	pos.move (i);
2084	ny = y + freearr_y[i];
2085		2083
2086	mflags = get_map_flags (m, &mp, nx, ny, &nx, &ny);	2084	if (!pos.normalise ())
2087
2088	if (mflags & P_OUT_OF_MAP)
2089	max = maxfree[i];	2085	max = maxfree[i];
2090	else	2086	else
2091	{	2087	{
2092	mapspace &ms = mp->at (nx, ny);	2088	mapspace &ms = *pos;
2093		2089
2094	blocked = ms.move_block;
2095
2096	if ((move_type & blocked) == move_type)	2090	if ((move_type & ms.move_block) == move_type)
2097	max = maxfree[i];	2091	max = maxfree [i];
2098	else if (mflags & P_IS_ALIVE)	2092	else if (ms.flags () & P_IS_ALIVE)
2099	{	2093	{
2100	for (tmp = ms.bot; tmp; tmp = tmp->above)	2094	for (object *tmp = ms.bot; tmp; tmp = tmp->above)
2101	if ((tmp->flag [FLAG_MONSTER] \|\| tmp->type == PLAYER)	2095	if ((tmp->flag [FLAG_MONSTER] \|\| tmp->is_player ())
2102	&& (tmp != exclude \|\| (tmp->head_ () != tmp && tmp->head_ () != exclude)))	2096	&& (tmp != exclude \|\| (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2103	break;
2104
2105	if (tmp)
2106	return freedir[i];	2097	return freedir [i];
2107	}	2098	}
2108	}	2099	}
2109	}	2100	}
2110		2101
2111	return 0;	2102	return 0;
…		…
2186	* This basically means that if direction is 15, then it could either go	2177	* 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.	2178	* 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	2179	* Moved from spell_util.c to object.c with the other related direction
2189	* functions.	2180	* functions.
2190	*/	2181	*/
2191	int reduction_dir[SIZEOFFREE][3] = {	2182	const int reduction_dir[SIZEOFFREE][3] = {
2192	{0, 0, 0}, /* 0 */	2183	{0, 0, 0}, /* 0 */
2193	{0, 0, 0}, /* 1 */	2184	{0, 0, 0}, /* 1 */
2194	{0, 0, 0}, /* 2 */	2185	{0, 0, 0}, /* 2 */
2195	{0, 0, 0}, /* 3 */	2186	{0, 0, 0}, /* 3 */
2196	{0, 0, 0}, /* 4 */	2187	{0, 0, 0}, /* 4 */
…		…
2292	int	2283	int
2293	can_pick (const object who, const object item)	2284	can_pick (const object who, const object item)
2294	{	2285	{
2295	return /QUERY_FLAG(who,FLAG_WIZ)\|\| /	2286	return /QUERY_FLAG(who,FLAG_WIZ)\|\| /
2296	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&	2287	(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));	2288	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->is_player () \|\| item->weight < who->weight / 3));
2298	}	2289	}
2299		2290
2300	/*	2291	/*
2301	* create clone from object to another	2292	* create clone from object to another
2302	*/	2293	*/
…		…
2334	return tmp;	2325	return tmp;
2335		2326
2336	return 0;	2327	return 0;
2337	}	2328	}
2338		2329
2339	const shstr &	2330	shstr_tmp
2340	object::kv_get (const shstr &key) const	2331	object::kv_get (shstr_tmp key) const
2341	{	2332	{
2342	for (key_value *kv = key_values; kv; kv = kv->next)	2333	for (key_value *kv = key_values; kv; kv = kv->next)
2343	if (kv->key == key)	2334	if (kv->key == key)
2344	return kv->value;	2335	return kv->value;
2345		2336
2346	return shstr_null;	2337	return shstr ();
2347	}	2338	}
2348		2339
2349	void	2340	void
2350	object::kv_set (const shstr &key, const shstr &value)	2341	object::kv_set (shstr_tmp key, shstr_tmp value)
2351	{	2342	{
2352	for (key_value *kv = key_values; kv; kv = kv->next)	2343	for (key_value *kv = key_values; kv; kv = kv->next)
2353	if (kv->key == key)	2344	if (kv->key == key)
2354	{	2345	{
2355	kv->value = value;	2346	kv->value = value;
…		…
2364		2355
2365	key_values = kv;	2356	key_values = kv;
2366	}	2357	}
2367		2358
2368	void	2359	void
2369	object::kv_del (const shstr &key)	2360	object::kv_del (shstr_tmp key)
2370	{	2361	{
2371	for (key_value *kvp = &key_values; kvp; kvp = &(*kvp)->next)	2362	for (key_value *kvp = &key_values; kvp; kvp = &(*kvp)->next)
2372	if ((*kvp)->key == key)	2363	if ((*kvp)->key == key)
2373	{	2364	{
2374	key_value kv = kvp;	2365	key_value kv = kvp;
…		…
2505	container = 0;	2496	container = 0;
2506		2497
2507	// client needs item update to make it work, client bug requires this to be separate	2498	// client needs item update to make it work, client bug requires this to be separate
2508	esrv_update_item (UPD_FLAGS, this, old_container);	2499	esrv_update_item (UPD_FLAGS, this, old_container);
2509		2500
2510	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", query_name (old_container));	2501	new_draw_info_format (NDI_UNIQUE, 0, this, "You close %s.", old_container->query_name ());
2511	play_sound (sound_find ("chest_close"));	2502	play_sound (sound_find ("chest_close"));
2512	}	2503	}
2513		2504
2514	if (new_container)	2505	if (new_container)
2515	{	2506	{
…		…
2525	closer->flag [FLAG_NO_MAP_SAVE] = 1;	2516	closer->flag [FLAG_NO_MAP_SAVE] = 1;
2526	new_container->insert (closer);	2517	new_container->insert (closer);
2527	}	2518	}
2528	#endif	2519	#endif
2529		2520
2530	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", query_name (new_container));	2521	new_draw_info_format (NDI_UNIQUE, 0, this, "You open %s.", new_container->query_name ());
2531		2522
2532	// make sure the container is available, client bug requires this to be separate	2523	// make sure the container is available, client bug requires this to be separate
2533	esrv_send_item (this, new_container);	2524	esrv_send_item (this, new_container);
2534		2525
2535	new_container->flag [FLAG_APPLIED] = true;	2526	new_container->flag [FLAG_APPLIED] = true;
…		…
2543	// else if (!old_container->env && contr && contr->ns)	2534	// else if (!old_container->env && contr && contr->ns)
2544	// contr->ns->floorbox_reset ();	2535	// contr->ns->floorbox_reset ();
2545	}	2536	}
2546		2537
2547	object *	2538	object *
2548	object::force_find (const shstr name)	2539	object::force_find (shstr_tmp name)
2549	{	2540	{
2550	/* cycle through his inventory to look for the MARK we want to	2541	/* cycle through his inventory to look for the MARK we want to
2551	* place	2542	* place
2552	*/	2543	*/
2553	for (object *tmp = inv; tmp; tmp = tmp->below)	2544	for (object *tmp = inv; tmp; tmp = tmp->below)
…		…
2555	return splay (tmp);	2546	return splay (tmp);
2556		2547
2557	return 0;	2548	return 0;
2558	}	2549	}
2559		2550
2560	void	2551	object *
2561	object::force_add (const shstr name, int duration)	2552	object::force_add (shstr_tmp name, int duration)
2562	{	2553	{
2563	if (object *force = force_find (name))	2554	if (object *force = force_find (name))
2564	force->destroy ();	2555	force->destroy ();
2565		2556
2566	object *force = get_archetype (FORCE_NAME);	2557	object *force = get_archetype (FORCE_NAME);
…		…
2571		2562
2572	force->set_speed (duration ? 1.f / duration : 0.f);	2563	force->set_speed (duration ? 1.f / duration : 0.f);
2573	force->flag [FLAG_IS_USED_UP] = true;	2564	force->flag [FLAG_IS_USED_UP] = true;
2574	force->flag [FLAG_APPLIED] = true;	2565	force->flag [FLAG_APPLIED] = true;
2575		2566
2576	insert (force);	2567	return insert (force);
2577	}	2568	}
2578		2569
2579	void	2570	void
2580	object::play_sound (faceidx sound)	2571	object::play_sound (faceidx sound) const
2581	{	2572	{
2582	if (!sound)	2573	if (!sound)
2583	return;	2574	return;
2584		2575
2585	if (flag [FLAG_REMOVED])	2576	if (is_on_map ())
		2577	map->play_sound (sound, x, y);
		2578	else if (object *pl = in_player ())
		2579	pl->contr->play_sound (sound);
		2580	}
		2581
		2582	void
		2583	object::say_msg (const char *msg) const
		2584	{
		2585	if (is_on_map ())
		2586	map->say_msg (msg, x, y);
		2587	else if (object *pl = in_player ())
		2588	pl->contr->play_sound (sound);
		2589	}
		2590
		2591	void
		2592	object::make_noise ()
		2593	{
		2594	// we do not model noise in the map, so instead put
		2595	// a temporary light into the noise source
		2596	// could use the map instead, but that's less reliable for our
		2597	// goal, which is to make invisibility a bit harder to exploit
		2598
		2599	// currently only works sensibly for players
		2600	if (!is_player ())
2586	return;	2601	return;
2587		2602
2588	if (env)	2603	// find old force, or create new one
2589	{	2604	object *force = force_find (shstr_noise_force);
2590	if (object *pl = in_player ())	2605
2591	pl->contr->play_sound (sound);	2606	if (force)
2592	}	2607	force->speed_left = -1.f; // patch old speed up
2593	else	2608	else
2594	map->play_sound (sound, x, y);	2609	{
2595	}	2610	force = archetype::get (shstr_noise_force);
2596		2611
		2612	force->slaying = shstr_noise_force;
		2613	force->stats.food = 1;
		2614	force->speed_left = -1.f;
		2615
		2616	force->set_speed (1.f / 4.f);
		2617	force->flag [FLAG_IS_USED_UP] = true;
		2618	force->flag [FLAG_APPLIED] = true;
		2619
		2620	insert (force);
		2621	}
		2622	}
		2623

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.282 by root, Tue Feb 17 03:53:31 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.282 by root, Tue Feb 17 03:53:31 2009 UTC