mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-02-01 05:45:33 +00:00
Code Issues Releases Wiki Activity

Add function for converting feet to game units

Browse source
This commit is contained in:
scrawl 2014-01-01 23:34:18 +01:00
parent f6387d5979
commit 24aa743573
2 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
apps/openmw/mwworld/worldimp.cpp
View file

@ -1325,7 +1325,8 @@ namespace MWWorld
{ {
float telekinesisRangeBonus = float telekinesisRangeBonus =
mPlayer->getPlayer().getClass().getCreatureStats(mPlayer->getPlayer()).getMagicEffects() mPlayer->getPlayer().getClass().getCreatureStats(mPlayer->getPlayer()).getMagicEffects()
.get(ESM::MagicEffect::Telekinesis).mMagnitude * 22; .get(ESM::MagicEffect::Telekinesis).mMagnitude;
telekinesisRangeBonus = feetToGameUnits(telekinesisRangeBonus);
float activationDistance = getMaxActivationDistance() + telekinesisRangeBonus; float activationDistance = getMaxActivationDistance() + telekinesisRangeBonus;
@ -2396,8 +2397,7 @@ namespace MWWorld
if (!dist) if (!dist)
return; return;
// TODO: "1 foot" = 20 game units? dist = feetToGameUnits(dist);
dist *= 20;
AddDetectedReference functor (out, ptr, type, dist*dist); AddDetectedReference functor (out, ptr, type, dist*dist);
@ -2408,4 +2408,11 @@ namespace MWWorld
cellStore->forEach(functor); cellStore->forEach(functor);
} }
} }
float World::feetToGameUnits(float feet)
{
// Looks like there is no GMST for this. This factor was determined in experiments
// with the Telekinesis effect.
return feet * 22;
}
} }

2
apps/openmw/mwworld/worldimp.hpp
View file

@ -155,6 +155,8 @@ namespace MWWorld
/// Called when \a object is moved to an inactive cell /// Called when \a object is moved to an inactive cell
void objectLeftActiveCell (MWWorld::Ptr object, MWWorld::Ptr movedPtr); void objectLeftActiveCell (MWWorld::Ptr object, MWWorld::Ptr movedPtr);
float feetToGameUnits(float feet);
public: public:
World (OEngine::Render::OgreRenderer& renderer, World (OEngine::Render::OgreRenderer& renderer,