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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.245 by root, Sun May 18 19:53:07 2008 UTC vs.
Revision 1.270 by root, Sat Dec 27 02:31:19 2008 UTC

…		…
186	\|\| ob1->speed != ob2->speed	186	\|\| ob1->speed != ob2->speed
187	\|\| ob1->value != ob2->value	187	\|\| ob1->value != ob2->value
188	\|\| ob1->name != ob2->name)	188	\|\| ob1->name != ob2->name)
189	return 0;	189	return 0;
190		190
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	191	/* Do not merge objects if nrof would overflow, assume nrof
196	* for unsigned overflow (2c), second part checks whether the result	192	* is always 0 .. 2*31-1 /
197	* would fit into a 32 bit signed int, which is often used to hold	193	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;	194	return 0;
202		195
203	/* If the objects have been identified, set the BEEN_APPLIED flag.	196	/* 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	197	* 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	198	* just can't ignore the been applied or identified flags, as they
…		…
239	\|\| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats)))	232	\|\| memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats)))
240	return 0;	233	return 0;
241		234
242	if ((ob1->flag ^ ob2->flag)	235	if ((ob1->flag ^ ob2->flag)
243	.reset (FLAG_INV_LOCKED)	236	.reset (FLAG_INV_LOCKED)
244	.reset (FLAG_CLIENT_SENT)
245	.reset (FLAG_REMOVED)	237	.reset (FLAG_REMOVED)
246	.any ())	238	.any ())
247	return 0;	239	return 0;
248		240
249	/* This is really a spellbook check - we should in general	241	/* This is really a spellbook check - we should in general
…		…
331	{	323	{
332	// see if we are in a container of sorts	324	// see if we are in a container of sorts
333	if (env)	325	if (env)
334	{	326	{
335	// the player inventory itself is always visible	327	// the player inventory itself is always visible
336	if (env->type == PLAYER)	328	if (env->is_player ())
337	return env;	329	return env;
338		330
339	// else a player could have our env open	331	// else a player could have our env open
340	object *envest = env->outer_env ();	332	object *envest = env->outer_env ();
341		333
…		…
349	else	341	else
350	{	342	{
351	// maybe there is a player standing on the same mapspace	343	// maybe there is a player standing on the same mapspace
352	// this will catch the case where "this" is a player	344	// this will catch the case where "this" is a player
353	if (object *pl = ms ().player ())	345	if (object *pl = ms ().player ())
		346	if ((!pl->container && pl->contr->ns && !pl->contr->ns->update_look)
354	if (!pl->container \|\| this == pl->container)	347	\|\| this == pl->container)
355	return pl;	348	return pl;
356	}	349	}
357	}	350	}
358		351
359	return 0;	352	return 0;
…		…
643	}	636	}
644		637
645	if (speed < 0)	638	if (speed < 0)
646	dst->speed_left -= rndm ();	639	dst->speed_left -= rndm ();
647		640
648	dst->set_speed (dst->speed);	641	dst->activate ();
649	}	642	}
650		643
651	void	644	void
652	object::instantiate ()	645	object::instantiate ()
653	{	646	{
…		…
765	else if (action == UP_OBJ_INSERT)	758	else if (action == UP_OBJ_INSERT)
766	{	759	{
767	// this is likely overkill, TODO: revisit (schmorp)	760	// this is likely overkill, TODO: revisit (schmorp)
768	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))	761	if ((QUERY_FLAG (op, FLAG_BLOCKSVIEW) && !(m.flags_ & P_BLOCKSVIEW))
769	\|\| (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))	762	\|\| (QUERY_FLAG (op, FLAG_NO_MAGIC) && !(m.flags_ & P_NO_MAGIC))
770	\|\| (op->type == PLAYER && !(m.flags_ & P_PLAYER))	763	\|\| (op->is_player () && !(m.flags_ & P_PLAYER))
771	\|\| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))	764	\|\| (op->type == SAFE_GROUND && !(m.flags_ & P_SAFE))
772	\|\| (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))	765	\|\| (QUERY_FLAG (op, FLAG_ALIVE) && !(m.flags_ & P_IS_ALIVE))
773	\|\| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))	766	\|\| (QUERY_FLAG (op, FLAG_DAMNED) && !(m.flags_ & P_NO_CLERIC))
774	\|\| (m.move_on \| op->move_on ) != m.move_on	767	\|\| (m.move_on \| op->move_on ) != m.move_on
775	\|\| (m.move_off \| op->move_off ) != m.move_off	768	\|\| (m.move_off \| op->move_off ) != m.move_off
776	\|\| (m.move_slow \| op->move_slow) != m.move_slow	769	\|\| (m.move_slow \| op->move_slow) != m.move_slow
777	/* This isn't perfect, but I don't expect a lot of objects to	770	/* This isn't perfect, but I don't expect a lot of objects to
778	* to have move_allow right now.	771	* have move_allow right now.
779	*/	772	*/
780	\|\| ((m.move_block \| op->move_block) & ~op->move_allow) != m.move_block	773	\|\| ((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)	774	\|\| 1) // the above is not strong enough a test to skip updating. los maybe? TODO (Schmorp)
782	m.flags_ = 0;	775	m.invalidate ();
783	}	776	}
784	/* if the object is being removed, we can't make intelligent	777	/* if the object is being removed, we can't make intelligent
785	* decisions, because remove_ob can't really pass the object	778	* decisions, because remove_ob can't really pass the object
786	* that is being removed.	779	* that is being removed.
787	*/	780	*/
788	else if (action == UP_OBJ_CHANGE \|\| action == UP_OBJ_REMOVE)	781	else if (action == UP_OBJ_CHANGE \|\| action == UP_OBJ_REMOVE)
789	m.flags_ = 0;	782	m.invalidate ();
790	else if (action == UP_OBJ_FACE)	783	else if (action == UP_OBJ_FACE)
791	/* Nothing to do for that case */ ;	784	/* Nothing to do for that case */ ;
792	else	785	else
793	LOG (llevError, "update_object called with invalid action: %d\n", action);	786	LOG (llevError, "update_object called with invalid action: %d\n", action);
794		787
…		…
836	object::activate ()	829	object::activate ()
837	{	830	{
838	/* If already on active list, don't do anything */	831	/* If already on active list, don't do anything */
839	if (active)	832	if (active)
840	return;	833	return;
		834
		835	if (has_active_speed () && flag [FLAG_FREED]) LOG (llevError \| logBacktrace, "BUG: tried to activate freed object %s\n", debug_desc ());//D
		836	if (has_active_speed () && flag [FLAG_DEBUG]) LOG (llevError \| logBacktrace, "BUG: tried to activate DEBUG object %s\n", debug_desc ());//D temp
841		837
842	if (has_active_speed ())	838	if (has_active_speed ())
843	actives.insert (this);	839	actives.insert (this);
844	}	840	}
845		841
…		…
913	\|\| map->in_memory != MAP_ACTIVE	909	\|\| map->in_memory != MAP_ACTIVE
914	\|\| map->no_drop	910	\|\| map->no_drop
915	\|\| ms ().move_block == MOVE_ALL)	911	\|\| ms ().move_block == MOVE_ALL)
916	{	912	{
917	while (inv)	913	while (inv)
918	{
919	inv->destroy_inv (false);
920	inv->destroy ();	914	inv->destroy ();
921	}
922	}	915	}
923	else	916	else
924	{ /* Put objects in inventory onto this space */	917	{ /* Put objects in inventory onto this space */
925	while (inv)	918	while (inv)
926	{	919	{
…		…
930	\|\| op->flag [FLAG_NO_DROP]	923	\|\| op->flag [FLAG_NO_DROP]
931	\|\| op->type == RUNE	924	\|\| op->type == RUNE
932	\|\| op->type == TRAP	925	\|\| op->type == TRAP
933	\|\| op->flag [FLAG_IS_A_TEMPLATE]	926	\|\| op->flag [FLAG_IS_A_TEMPLATE]
934	\|\| op->flag [FLAG_DESTROY_ON_DEATH])	927	\|\| op->flag [FLAG_DESTROY_ON_DEATH])
935	op->destroy (true);	928	op->destroy ();
936	else	929	else
937	map->insert (op, x, y);	930	map->insert (op, x, y);
938	}	931	}
939	}	932	}
940	}	933	}
…		…
1004	attacked_by = 0;	997	attacked_by = 0;
1005	current_weapon = 0;	998	current_weapon = 0;
1006	}	999	}
1007		1000
1008	void	1001	void
1009	object::destroy (bool destroy_inventory)	1002	object::destroy ()
1010	{	1003	{
1011	if (destroyed ())	1004	if (destroyed ())
1012	return;	1005	return;
1013		1006
1014	if (!is_head () && !head->destroyed ())	1007	if (!is_head () && !head->destroyed ())
1015	{	1008	{
1016	LOG (llevError \| logBacktrace, "tried to destroy the tail of an object");	1009	LOG (llevError \| logBacktrace, "tried to destroy the tail of an object");
1017	head->destroy (destroy_inventory);	1010	head->destroy ();
1018	return;	1011	return;
1019	}	1012	}
1020		1013
1021	destroy_inv (!destroy_inventory);	1014	destroy_inv (false);
1022		1015
1023	if (is_head ())	1016	if (is_head ())
1024	if (sound_destroy)	1017	if (sound_destroy)
1025	play_sound (sound_destroy);	1018	play_sound (sound_destroy);
1026	else if (flag [FLAG_MONSTER])	1019	else if (flag [FLAG_MONSTER])
…		…
1062	if (object *pl = visible_to ())	1055	if (object *pl = visible_to ())
1063	esrv_del_item (pl->contr, count);	1056	esrv_del_item (pl->contr, count);
1064	flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed	1057	flag [FLAG_REMOVED] = true; // hack around the issue of visible_to checking flag_removed
1065		1058
1066	adjust_weight (env, -total_weight ());	1059	adjust_weight (env, -total_weight ());
		1060
		1061	object *pl = in_player ();
1067		1062
1068	/* we set up values so that it could be inserted into	1063	/* we set up values so that it could be inserted into
1069	* the map, but we don't actually do that - it is up	1064	* the map, but we don't actually do that - it is up
1070	* to the caller to decide what we want to do.	1065	* to the caller to decide what we want to do.
1071	*/	1066	*/
…		…
1083		1078
1084	/* NO_FIX_PLAYER is set when a great many changes are being	1079	/* NO_FIX_PLAYER is set when a great many changes are being
1085	* made to players inventory. If set, avoiding the call	1080	* made to players inventory. If set, avoiding the call
1086	* to save cpu time.	1081	* to save cpu time.
1087	*/	1082	*/
1088	if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))	1083	if (pl)
		1084	if (pl->is_player () && (glow_radius \|\| !QUERY_FLAG (pl, FLAG_NO_FIX_PLAYER)))
		1085	{
1089	otmp->update_stats ();	1086	pl->update_stats ();
		1087
		1088	if (glow_radius && pl->is_on_map ())
		1089	update_all_los (pl->map, pl->x, pl->y);
		1090	}
1090	}	1091	}
1091	else if (map)	1092	else if (map)
1092	{	1093	{
1093	map->dirty = true;	1094	map->dirty = true;
1094	mapspace &ms = this->ms ();	1095	mapspace &ms = this->ms ();
1095		1096
1096	if (object *pl = ms.player ())	1097	if (object *pl = ms.player ())
1097	{	1098	{
1098	if (type == PLAYER) // this == pl(!)	1099	if (is_player ())
1099	{	1100	{
		1101	ms.smell = pticks; // remember the smell of the player
		1102
1100	// leaving a spot always closes any open container on the ground	1103	// leaving a spot always closes any open container on the ground
1101	if (container && !container->env)	1104	if (container && !container->env)
1102	// this causes spurious floorbox updates, but it ensures	1105	// this causes spurious floorbox updates, but it ensures
1103	// that the CLOSE event is being sent.	1106	// that the CLOSE event is being sent.
1104	close_container ();	1107	close_container ();
…		…
1121	*(below ? &below->above : &ms.bot) = above;	1124	*(below ? &below->above : &ms.bot) = above;
1122		1125
1123	above = 0;	1126	above = 0;
1124	below = 0;	1127	below = 0;
1125		1128
		1129	ms.invalidate ();
		1130
1126	if (map->in_memory == MAP_SAVING)	1131	if (map->in_memory == MAP_SAVING)
1127	return;	1132	return;
1128		1133
1129	int check_walk_off = !flag [FLAG_NO_APPLY];	1134	int check_walk_off = !flag [FLAG_NO_APPLY];
1130		1135
…		…
1162	}	1167	}
1163		1168
1164	last = tmp;	1169	last = tmp;
1165	}	1170	}
1166		1171
1167	/* last == NULL if there are no objects on this space */	1172	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);	1173	update_all_los (map, x, y);
1176	}	1174	}
1177	}	1175	}
1178		1176
1179	/*	1177	/*
…		…
1203	esrv_update_item (UPD_NROF, pl, top);	1201	esrv_update_item (UPD_NROF, pl, top);
1204		1202
1205	op->weight = 0; // cancel the addition above	1203	op->weight = 0; // cancel the addition above
1206	op->carrying = 0; // must be 0 already	1204	op->carrying = 0; // must be 0 already
1207		1205
1208	op->destroy (1);	1206	op->destroy ();
1209		1207
1210	return top;	1208	return top;
1211	}	1209	}
1212		1210
1213	return 0;	1211	return 0;
…		…
1275	* just 'op' otherwise	1273	* just 'op' otherwise
1276	*/	1274	*/
1277	object *	1275	object *
1278	insert_ob_in_map (object op, maptile m, object *originator, int flag)	1276	insert_ob_in_map (object op, maptile m, object *originator, int flag)
1279	{	1277	{
1280	if (op->is_on_map ())
1281	{
1282	LOG (llevError, "insert_ob_in_map called for object already on map");
1283	abort ();
1284	}
1285
1286	if (op->env)
1287	{
1288	LOG (llevError, "insert_ob_in_map called for object in an inventory (proceeding)");
1289	op->remove ();	1278	op->remove ();
1290	}
1291		1279
1292	if (op->face && !face_info (op->face))//D TODO: remove soon	1280	if (m == &freed_map)//D TODO: remove soon
1293	{//D	1281	{//D
1294	LOG (llevError \| logBacktrace, "op->face out of bounds: %s", op->debug_desc ());//D	1282	LOG (llevError \| logBacktrace, "tries to insret object on freed objects map: %s", op->debug_desc ());//D
1295	op->face = 1;//D
1296	}//D	1283	}//D
1297		1284
1298	/* Ideally, the caller figures this out. However, it complicates a lot	1285	/* Ideally, the caller figures this out. However, it complicates a lot
1299	* of areas of callers (eg, anything that uses find_free_spot would now	1286	* of areas of callers (eg, anything that uses find_free_spot would now
1300	* need extra work	1287	* need extra work
1301	*/	1288	*/
1302	if (!xy_normalise (m, op->x, op->y))	1289	if (!xy_normalise (m, op->x, op->y))
1303	{	1290	{
1304	op->head_ ()->destroy (1);// remove head_ once all tail object destroyers found	1291	op->head_ ()->destroy ();// remove head_ once all tail object destroyers found
1305	return 0;	1292	return 0;
1306	}	1293	}
1307		1294
1308	if (object *more = op->more)	1295	if (object *more = op->more)
1309	if (!insert_ob_in_map (more, m, originator, flag))	1296	if (!insert_ob_in_map (more, m, originator, flag))
…		…
1322	{	1309	{
1323	// TODO: we actually want to update tmp, not op,	1310	// TODO: we actually want to update tmp, not op,
1324	// but some caller surely breaks when we return tmp	1311	// but some caller surely breaks when we return tmp
1325	// from here :/	1312	// from here :/
1326	op->nrof += tmp->nrof;	1313	op->nrof += tmp->nrof;
1327	tmp->destroy (1);	1314	tmp->destroy ();
1328	}	1315	}
1329		1316
1330	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */	1317	CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1331	CLEAR_FLAG (op, FLAG_INV_LOCKED);	1318	CLEAR_FLAG (op, FLAG_INV_LOCKED);
1332		1319
…		…
1437	op->below = top;	1424	op->below = top;
1438	*(op->above ? &op->above->below : &ms.top) = op;	1425	*(op->above ? &op->above->below : &ms.top) = op;
1439	}	1426	}
1440	}	1427	}
1441		1428
1442	if (op->type == PLAYER)	1429	if (op->is_player ())
1443	{	1430	{
1444	op->contr->do_los = 1;	1431	op->contr->do_los = 1;
1445	++op->map->players;	1432	++op->map->players;
1446	op->map->touch ();	1433	op->map->touch ();
1447	}	1434	}
…		…
1462	* be far away from this change and not affected in any way -	1449	* be far away from this change and not affected in any way -
1463	* this should get redone to only look for players within range,	1450	* this should get redone to only look for players within range,
1464	* or just updating the P_UPTODATE for spaces within this area	1451	* or just updating the P_UPTODATE for spaces within this area
1465	* of effect may be sufficient.	1452	* of effect may be sufficient.
1466	*/	1453	*/
1467	if (op->map->darkness && (op->glow_radius != 0))	1454	if (op->affects_los ())
		1455	{
		1456	op->ms ().invalidate ();
1468	update_all_los (op->map, op->x, op->y);	1457	update_all_los (op->map, op->x, op->y);
		1458	}
1469		1459
1470	/* updates flags (blocked, alive, no magic, etc) for this map space */	1460	/* updates flags (blocked, alive, no magic, etc) for this map space */
1471	update_object (op, UP_OBJ_INSERT);	1461	update_object (op, UP_OBJ_INSERT);
1472		1462
1473	INVOKE_OBJECT (INSERT, op);	1463	INVOKE_OBJECT (INSERT, op);
…		…
1507	{	1497	{
1508	/* first search for itself and remove any old instances */	1498	/* first search for itself and remove any old instances */
1509		1499
1510	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)	1500	for (object *tmp = op->ms ().bot; tmp; tmp = tmp->above)
1511	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */	1501	if (!strcmp (tmp->arch->archname, arch_string)) /* same archetype */
1512	tmp->destroy (1);	1502	tmp->destroy ();
1513		1503
1514	object *tmp = arch_to_object (archetype::find (arch_string));	1504	object *tmp = arch_to_object (archetype::find (arch_string));
1515		1505
1516	tmp->x = op->x;	1506	tmp->x = op->x;
1517	tmp->y = op->y;	1507	tmp->y = op->y;
…		…
1541	if (!nr)	1531	if (!nr)
1542	return true;	1532	return true;
1543		1533
1544	nr = min (nr, nrof);	1534	nr = min (nr, nrof);
1545		1535
		1536	if (nrof > nr)
		1537	{
1546	nrof -= nr;	1538	nrof -= nr;
1547
1548	if (nrof)
1549	{
1550	adjust_weight (env, -weight * nr); // carrying == 0	1539	adjust_weight (env, -weight * max (1, nr)); // carrying == 0
1551		1540
1552	if (object *pl = visible_to ())	1541	if (object *pl = visible_to ())
1553	esrv_update_item (UPD_NROF, pl, this);	1542	esrv_update_item (UPD_NROF, pl, this);
1554		1543
1555	return true;	1544	return true;
1556	}	1545	}
1557	else	1546	else
1558	{	1547	{
1559	destroy (1);	1548	destroy ();
1560	return false;	1549	return false;
1561	}	1550	}
1562	}	1551	}
1563		1552
1564	/*	1553	/*
…		…
1641	if (object *pl = tmp->visible_to ())	1630	if (object *pl = tmp->visible_to ())
1642	esrv_update_item (UPD_NROF, pl, tmp);	1631	esrv_update_item (UPD_NROF, pl, tmp);
1643		1632
1644	adjust_weight (this, op->total_weight ());	1633	adjust_weight (this, op->total_weight ());
1645		1634
1646	op->destroy (1);	1635	op->destroy ();
1647	op = tmp;	1636	op = tmp;
1648	goto inserted;	1637	goto inserted;
1649	}	1638	}
1650		1639
1651	op->owner = 0; // it's his/hers now. period.	1640	op->owner = 0; // it's his/hers now. period.
…		…
1669		1658
1670	adjust_weight (this, op->total_weight ());	1659	adjust_weight (this, op->total_weight ());
1671		1660
1672	inserted:	1661	inserted:
1673	/* reset the light list and los of the players on the map */	1662	/* reset the light list and los of the players on the map */
1674	if (op->glow_radius && map && map->darkness)	1663	if (op->glow_radius && is_on_map ())
		1664	{
		1665	update_stats ();
1675	update_all_los (map, x, y);	1666	update_all_los (map, x, y);
1676		1667	}
		1668	else if (is_player () && !flag [FLAG_NO_FIX_PLAYER])
1677	// if this is a player's inventory, update stats	1669	// if this is a player's inventory, update stats
1678	if (type == PLAYER && !flag [FLAG_NO_FIX_PLAYER])
1679	update_stats ();	1670	update_stats ();
1680		1671
1681	INVOKE_OBJECT (INSERT, this);	1672	INVOKE_OBJECT (INSERT, this);
1682		1673
1683	return op;	1674	return op;
…		…
1767	{	1758	{
1768		1759
1769	float	1760	float
1770	diff = tmp->move_slow_penalty * fabs (op->speed);	1761	diff = tmp->move_slow_penalty * fabs (op->speed);
1771		1762
1772	if (op->type == PLAYER)	1763	if (op->is_player ())
1773	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) \|\|	1764	if ((QUERY_FLAG (tmp, FLAG_IS_HILLY) && find_skill_by_number (op, SK_CLIMBING)) \|\|
1774	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))	1765	(QUERY_FLAG (tmp, FLAG_IS_WOODED) && find_skill_by_number (op, SK_WOODSMAN)))
1775	diff /= 4.0;	1766	diff /= 4.0;
1776		1767
1777	op->speed_left -= diff;	1768	op->speed_left -= diff;
…		…
1985	* head of the object should correspond for the entire object.	1976	* head of the object should correspond for the entire object.
1986	*/	1977	*/
1987	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))	1978	if (OB_TYPE_MOVE_BLOCK (ob, ms.move_block))
1988	continue;	1979	continue;
1989		1980
1990	if (ob->blocked (m, pos.x, pos.y))	1981	if (ob->blocked (pos.m, pos.x, pos.y))
1991	continue;	1982	continue;
1992		1983
1993	altern [index++] = i;	1984	altern [index++] = i;
1994	}	1985	}
1995		1986
…		…
2103	if ((move_type & blocked) == move_type)	2094	if ((move_type & blocked) == move_type)
2104	max = maxfree[i];	2095	max = maxfree[i];
2105	else if (mflags & P_IS_ALIVE)	2096	else if (mflags & P_IS_ALIVE)
2106	{	2097	{
2107	for (tmp = ms.bot; tmp; tmp = tmp->above)	2098	for (tmp = ms.bot; tmp; tmp = tmp->above)
2108	if ((tmp->flag [FLAG_MONSTER] \|\| tmp->type == PLAYER)	2099	if ((tmp->flag [FLAG_MONSTER] \|\| tmp->is_player ())
2109	&& (tmp != exclude \|\| (tmp->head_ () != tmp && tmp->head_ () != exclude)))	2100	&& (tmp != exclude \|\| (tmp->head_ () != tmp && tmp->head_ () != exclude)))
2110	break;	2101	break;
2111		2102
2112	if (tmp)	2103	if (tmp)
2113	return freedir[i];	2104	return freedir[i];
…		…
2299	int	2290	int
2300	can_pick (const object who, const object item)	2291	can_pick (const object who, const object item)
2301	{	2292	{
2302	return /QUERY_FLAG(who,FLAG_WIZ)\|\| /	2293	return /QUERY_FLAG(who,FLAG_WIZ)\|\| /
2303	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&	2294	(item->weight > 0 && !QUERY_FLAG (item, FLAG_NO_PICK) &&
2304	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->type == PLAYER \|\| item->weight < who->weight / 3));	2295	!QUERY_FLAG (item, FLAG_ALIVE) && !item->invisible && (who->is_player () \|\| item->weight < who->weight / 3));
2305	}	2296	}
2306		2297
2307	/*	2298	/*
2308	* create clone from object to another	2299	* create clone from object to another
2309	*/	2300	*/
…		…
2562	return splay (tmp);	2553	return splay (tmp);
2563		2554
2564	return 0;	2555	return 0;
2565	}	2556	}
2566		2557
2567	void	2558	object *
2568	object::force_add (const shstr name, int duration)	2559	object::force_add (const shstr name, int duration)
2569	{	2560	{
2570	if (object *force = force_find (name))	2561	if (object *force = force_find (name))
2571	force->destroy ();	2562	force->destroy ();
2572		2563
…		…
2578		2569
2579	force->set_speed (duration ? 1.f / duration : 0.f);	2570	force->set_speed (duration ? 1.f / duration : 0.f);
2580	force->flag [FLAG_IS_USED_UP] = true;	2571	force->flag [FLAG_IS_USED_UP] = true;
2581	force->flag [FLAG_APPLIED] = true;	2572	force->flag [FLAG_APPLIED] = true;
2582		2573
2583	insert (force);	2574	return insert (force);
2584	}	2575	}
2585		2576
2586	void	2577	void
2587	object::play_sound (faceidx sound)	2578	object::play_sound (faceidx sound)
2588	{	2579	{
…		…
2599	}	2590	}
2600	else	2591	else
2601	map->play_sound (sound, x, y);	2592	map->play_sound (sound, x, y);
2602	}	2593	}
2603		2594
		2595	void
		2596	object::make_noise ()
		2597	{
		2598	// we do not model noise in the map, so instead put
		2599	// a temporary light into the noise source
		2600	// could use the map instead, but that's less reliable for our
		2601	// goal, which is to make invisibility a bit harder to exploit
		2602
		2603	// currently only works sensibly for players
		2604	if (!is_player ())
		2605	return;
		2606
		2607	// find old force, or create new one
		2608	object *force = force_find (shstr_noise_force);
		2609
		2610	if (force)
		2611	force->speed_left = -1.f; // patch old speed up
		2612	else
		2613	{
		2614	force = archetype::get (shstr_noise_force);
		2615
		2616	force->slaying = shstr_noise_force;
		2617	force->stats.food = 1;
		2618	force->speed_left = -1.f;
		2619
		2620	force->set_speed (1.f / 4.f);
		2621	force->flag [FLAG_IS_USED_UP] = true;
		2622	force->flag [FLAG_APPLIED] = true;
		2623
		2624	insert (force);
		2625	}
		2626	}
		2627

Diff Legend

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

Comparing deliantra/server/common/object.C (file contents): Revision 1.245 by root, Sun May 18 19:53:07 2008 UTC vs. Revision 1.270 by root, Sat Dec 27 02:31:19 2008 UTC

Diff Legend

Comparing deliantra/server/common/object.C (file contents):
Revision 1.245 by root, Sun May 18 19:53:07 2008 UTC vs.
Revision 1.270 by root, Sat Dec 27 02:31:19 2008 UTC