mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-03-30 09:36:43 +00:00
Code Issues Releases Wiki Activity

Removed initial check form setSneak

Browse source 
It wasn’t needed.
This commit is contained in:
Jeffrey Haines 2014-05-03 13:16:07 -04:00
parent 05e326bdc3
commit e1e23447f2
2 changed files with 11 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
apps/openmw/mwmechanics/actors.cpp
View file

@ -728,18 +728,16 @@ namespace MWMechanics
{ {
const MWWorld::ESMStore& esmStore = MWBase::Environment::get().getWorld()->getStore(); const MWWorld::ESMStore& esmStore = MWBase::Environment::get().getWorld()->getStore();
int radius = esmStore.get<ESM::GameSetting>().find("fSneakUseDist")->getInt(); int radius = esmStore.get<ESM::GameSetting>().find("fSneakUseDist")->getInt();
bool seen = false;
// am I close enough to the player?
if (Ogre::Vector3(ptr.getRefData().getPosition().pos).squaredDistance(Ogre::Vector3(player.getRefData().getPosition().pos))
<= radius * radius )
{
bool seen = false; // unseen
if ( !MWBase::Environment::get().getMechanicsManager()->awarenessCheck(player, ptr)
&& !MWBase::Environment::get().getWorld()->getLOS(player, ptr) )
seen = true; // seen
MWBase::Environment::get().getWindowManager()->setSneakVisibility(seen); // am I close enough and can I see the player?
} if ( (Ogre::Vector3(ptr.getRefData().getPosition().pos).squaredDistance(Ogre::Vector3(player.getRefData().getPosition().pos)) <= radius*radius)
&& MWBase::Environment::get().getMechanicsManager()->awarenessCheck(player, ptr)
&& MWBase::Environment::get().getWorld()->getLOS(player, ptr))
seen = true;
MWBase::Environment::get().getWindowManager()->setSneakVisibility(seen);
} }
} }

24
apps/openmw/mwworld/player.cpp
View file

@ -132,28 +132,8 @@ namespace MWWorld
MWWorld::Ptr ptr = getPlayer(); MWWorld::Ptr ptr = getPlayer();
ptr.getClass().getCreatureStats(ptr).setMovementFlag(MWMechanics::CreatureStats::Flag_Sneak, sneak); ptr.getClass().getCreatureStats(ptr).setMovementFlag(MWMechanics::CreatureStats::Flag_Sneak, sneak);
if (sneak) if(!sneak)
{ MWBase::Environment::get().getWindowManager()->setSneakVisibility(false);
const MWWorld::ESMStore& esmStore = MWBase::Environment::get().getWorld()->getStore();
// Find all the actors who might be able to see the player
std::vector<MWWorld::Ptr> neighbors;
MWBase::Environment::get().getMechanicsManager()->getActorsInRange( Ogre::Vector3(ptr.getRefData().getPosition().pos),
esmStore.get<ESM::GameSetting>().find("fSneakUseDist")->getInt(), neighbors);
for (std::vector<MWWorld::Ptr>::iterator it = neighbors.begin(); it != neighbors.end(); ++it)
{
if (*it == ptr) // not the player
continue;
if ( MWBase::Environment::get().getMechanicsManager()->awarenessCheck(ptr, *it) )
{
MWBase::Environment::get().getWindowManager()->setSneakVisibility(false);
break;
}
}
if (neighbors.empty())
MWBase::Environment::get().getWindowManager()->setSneakVisibility(true);
}
} }
void Player::yaw(float yaw) void Player::yaw(float yaw)