mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-02-24 18:39:59 +00:00
Code Issues Projects Releases Wiki Activity

Avoid zero division

Browse Source
This commit is contained in:
Andrei Kortunov 2019-09-18 10:21:25 +04:00
parent 8c4acc69c4
commit 3ebbe14a62
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
apps/openmw/mwmechanics/actors.cpp
View File

@ -774,6 +774,9 @@ namespace MWMechanics
if (visitor.mRemainingTime > 0) if (visitor.mRemainingTime > 0)
{ {
double timeScale = MWBase::Environment::get().getWorld()->getTimeScaleFactor(); double timeScale = MWBase::Environment::get().getWorld()->getTimeScaleFactor();
if(timeScale == 0.0)
timeScale = 1;
restoreHours = std::max(0.0, hours - visitor.mRemainingTime * timeScale / 3600.f); restoreHours = std::max(0.0, hours - visitor.mRemainingTime * timeScale / 3600.f);
} }
else if (visitor.mRemainingTime == -1) else if (visitor.mRemainingTime == -1)
@ -1935,7 +1938,11 @@ namespace MWMechanics
void Actors::rest(double hours, bool sleep) void Actors::rest(double hours, bool sleep)
{ {
float duration = hours * 3600.f / MWBase::Environment::get().getWorld()->getTimeScaleFactor(); float duration = hours * 3600.f;
float timeScale = MWBase::Environment::get().getWorld()->getTimeScaleFactor();
if (timeScale != 0.f)
duration /= timeScale;
const MWWorld::Ptr player = MWBase::Environment::get().getWorld()->getPlayerPtr(); const MWWorld::Ptr player = MWBase::Environment::get().getWorld()->getPlayerPtr();
const osg::Vec3f playerPos = player.getRefData().getPosition().asVec3(); const osg::Vec3f playerPos = player.getRefData().getPosition().asVec3();