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

Implement drowning when knocked out underwater (Fixes #1228)

Browse source
This commit is contained in:
scrawl 2014-12-12 17:39:00 +01:00
parent d034a079e6
commit 60aa209144
3 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -869,13 +869,19 @@ namespace MWMechanics
void Actors::updateDrowning(const MWWorld::Ptr& ptr, float duration) void Actors::updateDrowning(const MWWorld::Ptr& ptr, float duration)
{ {
MWBase::World *world = MWBase::Environment::get().getWorld(); PtrControllerMap::iterator it = mActors.find(ptr);
if (it == mActors.end())
return;
CharacterController* ctrl = it->second;
NpcStats &stats = ptr.getClass().getNpcStats(ptr); NpcStats &stats = ptr.getClass().getNpcStats(ptr);
if(world->isSubmerged(ptr) && MWBase::World *world = MWBase::Environment::get().getWorld();
stats.getMagicEffects().get(ESM::MagicEffect::WaterBreathing).getMagnitude() == 0) bool knockedOutUnderwater = (ctrl->isKnockedOut() && world->isUnderwater(ptr.getCell(), Ogre::Vector3(ptr.getRefData().getPosition().pos)));
if((world->isSubmerged(ptr) || knockedOutUnderwater)
&& stats.getMagicEffects().get(ESM::MagicEffect::WaterBreathing).getMagnitude() == 0)
{ {
float timeLeft = 0.0f; float timeLeft = 0.0f;
if(stats.getFatigue().getCurrent() == 0) if(knockedOutUnderwater)
stats.setTimeToStartDrowning(0); stats.setTimeToStartDrowning(0);
else else
{ {

5
apps/openmw/mwmechanics/character.cpp
View file

@ -1840,4 +1840,9 @@ bool CharacterController::isReadyToBlock() const
return updateCarriedLeftVisible(mWeaponType); return updateCarriedLeftVisible(mWeaponType);
} }
bool CharacterController::isKnockedOut() const
{
return mHitState == CharState_KnockOut;
}
} }

1
apps/openmw/mwmechanics/character.hpp
View file

@ -228,6 +228,7 @@ public:
AiState& getAiState() { return mAiState; } AiState& getAiState() { return mAiState; }
bool isReadyToBlock() const; bool isReadyToBlock() const;
bool isKnockedOut() const;
}; };
void getWeaponGroup(WeaponType weaptype, std::string &group); void getWeaponGroup(WeaponType weaptype, std::string &group);