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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.243 by root, Sat May 17 00:17:02 2008 UTC vs.
Revision 1.272 by root, Sat Dec 27 04:09:58 2008 UTC

…		…
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	// some objects are unmergable
192	if (!ob1->nrof \|\| !ob2->nrof)
193	return 0;
194
195	/* Do not merge objects if nrof would overflow. First part checks	192	/* Do not merge objects if nrof would overflow, assume nrof
196	* for unsigned overflow (2c), second part checks whether the result	193	* is always 0 .. 2*31-1 /
197	* would fit into a 32 bit signed int, which is often used to hold	194	if (ob1->nrof > 0x7fffffff - ob2->nrof)
198	* nrof values.
199	*/
200	if (~ob1->nrof < ob2->nrof \|\| ob1->nrof + ob2->nrof > (1UL << 31))
201	return 0;	195	return 0;
202		196
203	/* If the objects have been identified, set the BEEN_APPLIED flag.	197	/* If the objects have been identified, set the BEEN_APPLIED flag.
204	* 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
205	* 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
…		…
239	\|\| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats)))	233	\|\| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats)))
240	return 0;	234	return 0;
241		235
242	if ((ob1->flag ^ ob2->flag)	236	if ((ob1->flag ^ ob2->flag)
243	.reset (FLAG_INV_LOCKED)	237	.reset (FLAG_INV_LOCKED)
244	.reset (FLAG_CLIENT_SENT)
245	.reset (FLAG_REMOVED)	238	.reset (FLAG_REMOVED)
246	.any ())	239	.any ())
247	return 0;	240	return 0;
248		241
249	/* This is really a spellbook check - we should in general	242	/* This is really a spellbook check - we should in general
…		…
331	{	324	{
332	// see if we are in a container of sorts	325	// see if we are in a container of sorts
333	if (env)	326	if (env)
334	{	327	{
335	// the player inventory itself is always visible	328	// the player inventory itself is always visible
336	if (env->type == PLAYER)	329	if (env->is_player ())
337	return env;	330	return env;
338		331
339	// else a player could have our env open	332	// else a player could have our env open
340	object *envest = env->outer_env ();	333	object *envest = env->outer_env ();
341		334
…		…
349	else	342	else
350	{	343	{
351	// maybe there is a player standing on the same mapspace	344	// maybe there is a player standing on the same mapspace
352	// this will catch the case where "this" is a player	345	// this will catch the case where "this" is a player
353	if (object *pl = ms ().player ())	346	if (object *pl = ms ().player ())
		347	if ((!pl->container && pl->contr->ns && !pl->contr->ns->update_look)
354	if (!pl->container \|\| this == pl->container)	348	\|\| this == pl->container)
355	return pl;	349	return pl;
356	}	350	}
357	}	351	}
358		352
359	return 0;	353	return 0;
…		…
643	}	637	}
644		638
645	if (speed < 0)	639	if (speed < 0)
646	dst->speed_left -= rndm ();	640	dst->speed_left -= rndm ();
647		641
648	dst->set_speed (dst->speed);	642	dst->activate ();
649	}	643	}
650		644
651	void	645	void
652	object::instantiate ()	646	object::instantiate ()
653	{	647	{
…		…
765	else if (action == UP_OBJ_INSERT)	759	else if (action == UP_OBJ_INSERT)
766	{	760	{
767	// this is likely overkill, TODO: revisit (schmorp)	761	// this is likely overkill, TODO: revisit (schmorp)
768	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))	762	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
769	\|\| (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))	763	\|\| (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))
770	\|\| (op->type == PLAYER && !(m.flags_ & P_PLAYER))	764	\|\| (op->is_player () && !(m.flags_ & P_PLAYER))
771	\|\| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))	765	\|\| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
772	\|\| (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))	766	\|\| (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))
773	\|\| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))	767	\|\| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))
774	\|\| (m.move_on \| op->move_on ) != m.move_on	768	\|\| (m.move_on \| op->move_on ) != m.move_on
775	\|\| (m.move_off \| op->move_off ) != m.move_off	769	\|\| (m.move_off \| op->move_off ) != m.move_off
776	\|\| (m.move_slow \| op->move_slow) != m.move_slow	770	\|\| (m.move_slow \| op->move_slow) != m.move_slow
777	/* 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
778	* to have move_allow right now.	772	* have move_allow right now.
779	*/	773	*/
780	\|\| ((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
781	\|\| 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)
782	m.flags_ = 0;	776	m.invalidate ();
783	}	777	}
784	/* if the object is being removed, we can't make intelligent	778	/* if the object is being removed, we can't make intelligent
785	* decisions, because remove_ob can't really pass the object	779	* decisions, because remove_ob can't really pass the object
786	* that is being removed.	780	* that is being removed.
787	*/	781	*/
788	else if (action == UP_OBJ_CHANGE \|\| action == UP_OBJ_REMOVE)	782	else if (action == UP_OBJ_CHANGE \|\| action == UP_OBJ_REMOVE)
789	m.flags_ = 0;	783	m.invalidate ();
790	else if (action == UP_OBJ_FACE)	784	else if (action == UP_OBJ_FACE)
791	/* Nothing to do for that case */ ;	785	/* Nothing to do for that case */ ;
792	else	786	else
793	LOG (llevError, "update_object called with invalid action: %d\n", action);	787	LOG (llevError, "update_object called with invalid action: %d\n", action);
794		788
…		…
836	object::activate ()	830	object::activate ()
837	{	831	{
838	/* If already on active list, don't do anything */	832	/* If already on active list, don't do anything */
839	if (active)	833	if (active)
840	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
841		838
842	if (has_active_speed ())	839	if (has_active_speed ())
843	actives.insert (this);	840	actives.insert (this);
844	}	841	}
845		842
…		…
913	\|\| map->in_memory != MAP_ACTIVE	910	\|\| map->in_memory != MAP_ACTIVE
914	\|\| map->no_drop	911	\|\| map->no_drop
915	\|\| ms ().move_block == MOVE_ALL)	912	\|\| ms ().move_block == MOVE_ALL)
916	{	913	{
917	while (inv)	914	while (inv)
918	{
919	inv->destroy_inv (false);
920	inv->destroy ();	915	inv->destroy ();
921	}
922	}	916	}
923	else	917	else
924	{ /* Put objects in inventory onto this space */	918	{ /* Put objects in inventory onto this space */
925	while (inv)	919	while (inv)
926	{	920	{
…		…
930	\|\| op->flag [FLAG_NO_DROP]	924	\|\| op->flag [FLAG_NO_DROP]
931	\|\| op->type == RUNE	925	\|\| op->type == RUNE
932	\|\| op->type == TRAP	926	\|\| op->type == TRAP
933	\|\| op->flag [FLAG_IS_A_TEMPLATE]	927	\|\| op->flag [FLAG_IS_A_TEMPLATE]
934	\|\| op->flag [FLAG_DESTROY_ON_DEATH])	928	\|\| op->flag [FLAG_DESTROY_ON_DEATH])
935	op->destroy (true);	929	op->destroy ();
936	else	930	else
937	map->insert (op, x, y);	931	map->insert (op, x, y);
938	}	932	}
939	}	933	}
940	}	934	}
…		…
1004	attacked_by = 0;	998	attacked_by = 0;
1005	current_weapon = 0;	999	current_weapon = 0;
1006	}	1000	}
1007		1001
1008	void	1002	void
1009	object::destroy (bool destroy_inventory)	1003	object::destroy ()
1010	{	1004	{
1011	if (destroyed ())	1005	if (destroyed ())
1012	return;	1006	return;
1013		1007
1014	if (!is_head () && !head->destroyed ())	1008	if (!is_head () && !head->destroyed ())
1015	{	1009	{
1016	LOG (llevError \| logBacktrace, "tried to destroy the tail of an object");	1010	LOG (llevError \| logBacktrace, "tried to destroy the tail of an object");
1017	head->destroy (destroy_inventory);	1011	head->destroy ();
1018	return;	1012	return;
1019	}	1013	}
1020		1014
1021	destroy_inv (!destroy_inventory);	1015	destroy_inv (false);
1022		1016
1023	if (is_head ())	1017	if (is_head ())
1024	if (sound_destroy)	1018	if (sound_destroy)
1025	play_sound (sound_destroy);	1019	play_sound (sound_destroy);
1026	else if (flag [FLAG_MONSTER])	1020	else if (flag [FLAG_MONSTER])
…		…
1062	if (object *pl = visible_to ())	1056	if (object *pl = visible_to ())
1063	esrv_del_item (pl->contr, count);	1057	esrv_del_item (pl->contr, count);
1064	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
1065		1059
1066	adjust_weight (env, -total_weight ());	1060	adjust_weight (env, -total_weight ());
		1061
		1062	object *pl = in_player ();
1067		1063
1068	/* we set up values so that it could be inserted into	1064	/* we set up values so that it could be inserted into
1069	* 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
1070	* to the caller to decide what we want to do.	1066	* to the caller to decide what we want to do.
1071	*/	1067	*/
…		…
1083		1079
1084	/* 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
1085	* made to players inventory. If set, avoiding the call	1081	* made to players inventory. If set, avoiding the call
1086	* to save cpu time.	1082	* to save cpu time.
1087	*/	1083	*/
1088	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	{
1089	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	}
1090	}	1092	}
1091	else if (map)	1093	else if (map)
1092	{	1094	{
1093	map->dirty = true;	1095	map->dirty = true;
1094	mapspace &ms = this->ms ();	1096	mapspace &ms = this->ms ();
1095		1097
1096	if (object *pl = ms.player ())	1098	if (object *pl = ms.player ())
1097	{	1099	{
1098	if (type == PLAYER) // this == pl(!)	1100	if (is_player ())
1099	{	1101	{
		1102	ms.smell = ++mapspace::smellcount; // remember the smell of the player
		1103
1100	// leaving a spot always closes any open container on the ground	1104	// leaving a spot always closes any open container on the ground
1101	if (container && !container->env)	1105	if (container && !container->env)
1102	// this causes spurious floorbox updates, but it ensures	1106	// this causes spurious floorbox updates, but it ensures
1103	// that the CLOSE event is being sent.	1107	// that the CLOSE event is being sent.
1104	close_container ();	1108	close_container ();
…		…
1121	*(below ? &below->above : &ms.bot) = above;	1125	*(below ? &below->above : &ms.bot) = above;
1122		1126
1123	above = 0;	1127	above = 0;
1124	below = 0;	1128	below = 0;
1125		1129
		1130	ms.invalidate ();
		1131
1126	if (map->in_memory == MAP_SAVING)	1132	if (map->in_memory == MAP_SAVING)
1127	return;	1133	return;
1128		1134
1129	int check_walk_off = !flag [FLAG_NO_APPLY];	1135	int check_walk_off = !flag [FLAG_NO_APPLY];
1130		1136
…		…
1162	}	1168	}
1163		1169
1164	last = tmp;	1170	last = tmp;
1165	}	1171	}
1166		1172
1167	/* last == NULL if there are no objects on this space */	1173	if (affects_los ())
1168	//TODO: this makes little sense, why only update the topmost object?
1169	if (!last)
1170	map->at (x, y).flags_ = 0;
1171	else
1172	update_object (last, UP_OBJ_REMOVE);
1173
1174	if (flag [FLAG_BLOCKSVIEW] \|\| glow_radius)
1175	update_all_los (map, x, y);	1174	update_all_los (map, x, y);
1176	}	1175	}
1177	}	1176	}
1178		1177
1179	/*	1178	/*
…		…
1203	esrv_update_item (UPD_NROF, pl, top);	1202	esrv_update_item (UPD_NROF, pl, top);
1204		1203
1205	op->weight = 0; // cancel the addition above	1204	op->weight = 0; // cancel the addition above
1206	op->carrying = 0; // must be 0 already	1205	op->carrying = 0; // must be 0 already
1207		1206
1208	op->destroy (1);	1207	op->destroy ();
1209		1208
1210	return top;	1209	return top;
1211	}	1210	}
1212		1211
1213	return 0;	1212	return 0;
…		…
1241	* job preparing multi-part monsters.	1240	* job preparing multi-part monsters.
1242	*/	1241	*/
1243	object *	1242	object *
1244	insert_ob_in_map_at (object op, maptile m, object *originator, int flag, int x, int y)	1243	insert_ob_in_map_at (object op, maptile m, object *originator, int flag, int x, int y)
1245	{	1244	{
		1245	op->remove ();
		1246
1246	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)	1247	for (object *tmp = op->head_ (); tmp; tmp = tmp->more)
1247	{	1248	{
1248	tmp->x = x + tmp->arch->x;	1249	tmp->x = x + tmp->arch->x;
1249	tmp->y = y + tmp->arch->y;	1250	tmp->y = y + tmp->arch->y;
1250	}	1251	}
…		…
1275	object *	1276	object *
1276	insert_ob_in_map (object op, maptile m, object *originator, int flag)	1277	insert_ob_in_map (object op, maptile m, object *originator, int flag)
1277	{	1278	{
1278	op->remove ();	1279	op->remove ();
1279		1280
		1281	if (m == &freed_map)//D TODO: remove soon
		1282	{//D
		1283	LOG (llevError \| logBacktrace, "tries to insret object on freed objects map: %s", op->debug_desc ());//D
		1284	}//D
		1285
1280	/* Ideally, the caller figures this out. However, it complicates a lot	1286	/* Ideally, the caller figures this out. However, it complicates a lot
1281	* of areas of callers (eg, anything that uses find_free_spot would now	1287	* of areas of callers (eg, anything that uses find_free_spot would now
1282	* need extra work	1288	* need extra work
1283	*/	1289	*/
1284	if (!xy_normalise (m, op->x, op->y))	1290	if (!xy_normalise (m, op->x, op->y))
1285	{	1291	{
1286	op->head_ ()->destroy (1);// remove head_ once all tail object destroyers found	1292	op->head_ ()->destroy ();// remove head_ once all tail object destroyers found
1287	return 0;	1293	return 0;
1288	}	1294	}
1289		1295
1290	if (object *more = op->more)	1296	if (object *more = op->more)
1291	if (!insert_ob_in_map (more, m, originator, flag))	1297	if (!insert_ob_in_map (more, m, originator, flag))
…		…
1304	{	1310	{
1305	// TODO: we actually want to update tmp, not op,	1311	// TODO: we actually want to update tmp, not op,
1306	// but some caller surely breaks when we return tmp	1312	// but some caller surely breaks when we return tmp
1307	// from here :/	1313	// from here :/
1308	op->nrof += tmp->nrof;	1314	op->nrof += tmp->nrof;
1309	tmp->destroy (1);	1315	tmp->destroy ();
1310	}	1316	}
1311		1317
1312	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1318	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1313	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1319	CLEAR_FLAG (op, FLAG_INV_LOCKED);
1314		1320
…		…
1419	op->below = top;	1425	op->below = top;
1420	*(op->above ? &op->above->below : &ms.top) = op;	1426	*(op->above ? &op->above->below : &ms.top) = op;
1421	}	1427	}
1422	}	1428	}
1423		1429
1424	if (op->type == PLAYER)	1430	if (op->is_player ())
1425	{	1431	{
1426	op->contr->do_los = 1;	1432	op->contr->do_los = 1;
1427	++op->map->players;	1433	++op->map->players;
1428	op->map->touch ();	1434	op->map->touch ();
1429	}	1435	}
…		…
1444	* be far away from this change and not affected in any way -	1450	* be far away from this change and not affected in any way -
1445	* this should get redone to only look for players within range,	1451	* this should get redone to only look for players within range,
1446	* or just updating the P_UPTODATE for spaces within this area	1452	* or just updating the P_UPTODATE for spaces within this area
1447	* of effect may be sufficient.	1453	* of effect may be sufficient.
1448	*/	1454	*/
1449	if (op->map->darkness && (op->glow_radius != 0))	1455	if (op->affects_los ())
		1456	{
		1457	op->ms ().invalidate ();
1450	update_all_los (op->map, op->x, op->y);	1458	update_all_los (op->map, op->x, op->y);
		1459	}
1451		1460
1452	/* updates flags (blocked, alive, no magic, etc) for this map space */	1461	/* updates flags (blocked, alive, no magic, etc) for this map space */
1453	update_object (op, UP_OBJ_INSERT);	1462	update_object (op, UP_OBJ_INSERT);
1454		1463
1455	INVOKE_OBJECT (INSERT, op);	1464	INVOKE_OBJECT (INSERT, op);
…		…
1489	{	1498	{
1490	/* first search for itself and remove any old instances */	1499	/* first search for itself and remove any old instances */
1491		1500
1492	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)	1501	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1493	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */	1502	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */
1494	tmp->destroy (1);	1503	tmp->destroy ();
1495		1504
1496	object *tmp = arch_to_object (archetype::find (arch_string));	1505	object *tmp = arch_to_object (archetype::find (arch_string));
1497		1506
1498	tmp->x = op->x;	1507	tmp->x = op->x;
1499	tmp->y = op->y;	1508	tmp->y = op->y;
…		…
1523	if (!nr)	1532	if (!nr)
1524	return true;	1533	return true;
1525		1534
1526	nr = min (nr, nrof);	1535	nr = min (nr, nrof);
1527		1536
		1537	if (nrof > nr)
		1538	{
1528	nrof -= nr;	1539	nrof -= nr;
1529
1530	if (nrof)
1531	{
1532	adjust_weight (env, -weight * nr); // carrying == 0	1540	adjust_weight (env, -weight * max (1, nr)); // carrying == 0
1533		1541
1534	if (object *pl = visible_to ())	1542	if (object *pl = visible_to ())
1535	esrv_update_item (UPD_NROF, pl, this);	1543	esrv_update_item (UPD_NROF, pl, this);
1536		1544
1537	return true;	1545	return true;
1538	}	1546	}
1539	else	1547	else
1540	{	1548	{
1541	destroy (1);	1549	destroy ();
1542	return false;	1550	return false;
1543	}	1551	}
1544	}	1552	}
1545		1553
1546	/*	1554	/*
…		…
1623	if (object *pl = tmp->visible_to ())	1631	if (object *pl = tmp->visible_to ())
1624	esrv_update_item (UPD_NROF, pl, tmp);	1632	esrv_update_item (UPD_NROF, pl, tmp);
1625		1633
1626	adjust_weight (this, op->total_weight ());	1634	adjust_weight (this, op->total_weight ());
1627		1635
1628	op->destroy (1);	1636	op->destroy ();
1629	op = tmp;	1637	op = tmp;
1630	goto inserted;	1638	goto inserted;
1631	}	1639	}
1632		1640
1633	op->owner = 0; // it's his/hers now. period.	1641	op->owner = 0; // it's his/hers now. period.
…		…
1651		1659
1652	adjust_weight (this, op->total_weight ());	1660	adjust_weight (this, op->total_weight ());
1653		1661
1654	inserted:	1662	inserted:
1655	/* reset the light list and los of the players on the map */	1663	/* reset the light list and los of the players on the map */
1656	if (op->glow_radius && map && map->darkness)	1664	if (op->glow_radius && is_on_map ())
		1665	{
		1666	update_stats ();
1657	update_all_los (map, x, y);	1667	update_all_los (map, x, y);
1658		1668	}
		1669	else if (is_player () && !flag [FLAG_NO_FIX_PLAYER])
1659	// if this is a player's inventory, update stats	1670	// if this is a player's inventory, update stats
1660	if (type == PLAYER && !flag [FLAG_NO_FIX_PLAYER])
1661	update_stats ();	1671	update_stats ();
1662		1672
1663	INVOKE_OBJECT (INSERT, this);	1673	INVOKE_OBJECT (INSERT, this);
1664		1674
1665	return op;	1675	return op;
…		…
1749	{	1759	{
1750		1760
1751	float	1761	float
1752	diff = tmp->move_slow_penalty * fabs (op->speed);	1762	diff = tmp->move_slow_penalty * fabs (op->speed);
1753		1763
1754	if (op->type == PLAYER)	1764	if (op->is_player ())
1755	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) \|\|	1765	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) \|\|
1756	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))	1766	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))
1757	diff /= 4.0;	1767	diff /= 4.0;
1758		1768
1759	op->speed_left -= diff;	1769	op->speed_left -= diff;
…		…
1967	* head of the object should correspond for the entire object.	1977	* head of the object should correspond for the entire object.
1968	*/	1978	*/
1969	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))	1979	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
1970	continue;	1980	continue;
1971		1981
1972	if (ob->blocked (m, pos.x, pos.y))	1982	if (ob->blocked (pos.m, pos.x, pos.y))
1973	continue;	1983	continue;
1974		1984
1975	altern [index++] = i;	1985	altern [index++] = i;
1976	}	1986	}
1977		1987
…		…
2085	if ((move_type & blocked) == move_type)	2095	if ((move_type & blocked) == move_type)
2086	max = maxfree[i];	2096	max = maxfree[i];
2087	else if (mflags & P_IS_ALIVE)	2097	else if (mflags & P_IS_ALIVE)
2088	{	2098	{
2089	for (tmp = ms.bot; tmp; tmp = tmp->above)	2099	for (tmp = ms.bot; tmp; tmp = tmp->above)
2090	if ((tmp->flag [FLAG_MONSTER] \|\| tmp->type == PLAYER)	2100	if ((tmp->flag [FLAG_MONSTER] \|\| tmp->is_player ())
2091	&& (tmp != exclude \|\| (tmp->head_ () != tmp && tmp->head_ () != exclude)))	2101	&& (tmp != exclude \|\| (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2092	break;	2102	break;
2093		2103
2094	if (tmp)	2104	if (tmp)
2095	return freedir[i];	2105	return freedir[i];
…		…
2281	int	2291	int
2282	can_pick (const object who, const object item)	2292	can_pick (const object who, const object item)
2283	{	2293	{
2284	return /QUERY_FLAG(who,FLAG_WIZ)\|\| /	2294	return /QUERY_FLAG(who,FLAG_WIZ)\|\| /
2285	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&	2295	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
2286	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER \|\| item->weight < who->weight / 3));	2296	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->is_player () \|\| item->weight < who->weight / 3));
2287	}	2297	}
2288		2298
2289	/*	2299	/*
2290	* create clone from object to another	2300	* create clone from object to another
2291	*/	2301	*/
…		…
2544	return splay (tmp);	2554	return splay (tmp);
2545		2555
2546	return 0;	2556	return 0;
2547	}	2557	}
2548		2558
2549	void	2559	object *
2550	object::force_add (const shstr name, int duration)	2560	object::force_add (const shstr name, int duration)
2551	{	2561	{
2552	if (object *force = force_find (name))	2562	if (object *force = force_find (name))
2553	force->destroy ();	2563	force->destroy ();
2554		2564
…		…
2560		2570
2561	force->set_speed (duration ? 1.f / duration : 0.f);	2571	force->set_speed (duration ? 1.f / duration : 0.f);
2562	force->flag [FLAG_IS_USED_UP] = true;	2572	force->flag [FLAG_IS_USED_UP] = true;
2563	force->flag [FLAG_APPLIED] = true;	2573	force->flag [FLAG_APPLIED] = true;
2564		2574
2565	insert (force);	2575	return insert (force);
2566	}	2576	}
2567		2577
2568	void	2578	void
2569	object::play_sound (faceidx sound)	2579	object::play_sound (faceidx sound)
2570	{	2580	{
…		…
2581	}	2591	}
2582	else	2592	else
2583	map->play_sound (sound, x, y);	2593	map->play_sound (sound, x, y);
2584	}	2594	}
2585		2595
		2596	void
		2597	object::make_noise ()
		2598	{
		2599	// we do not model noise in the map, so instead put
		2600	// a temporary light into the noise source
		2601	// could use the map instead, but that's less reliable for our
		2602	// goal, which is to make invisibility a bit harder to exploit
		2603
		2604	// currently only works sensibly for players
		2605	if (!is_player ())
		2606	return;
		2607
		2608	// find old force, or create new one
		2609	object *force = force_find (shstr_noise_force);
		2610
		2611	if (force)
		2612	force->speed_left = -1.f; // patch old speed up
		2613	else
		2614	{
		2615	force = archetype::get (shstr_noise_force);
		2616
		2617	force->slaying = shstr_noise_force;
		2618	force->stats.food = 1;
		2619	force->speed_left = -1.f;
		2620
		2621	force->set_speed (1.f / 4.f);
		2622	force->flag [FLAG_IS_USED_UP] = true;
		2623	force->flag [FLAG_APPLIED] = true;
		2624
		2625	insert (force);
		2626	}
		2627	}
		2628

Diff Legend

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

Comparing deliantra/server/common/object.C (file contents): Revision 1.243 by root, Sat May 17 00:17:02 2008 UTC vs. Revision 1.272 by root, Sat Dec 27 04:09:58 2008 UTC

Diff Legend

Comparing deliantra/server/common/object.C (file contents):
Revision 1.243 by root, Sat May 17 00:17:02 2008 UTC vs.
Revision 1.272 by root, Sat Dec 27 04:09:58 2008 UTC