mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-06-20 00:41:33 +00:00
Code Issues Releases Wiki Activity

Merge pull request #2232 from elsid/fix_div_by_zero

Browse source 
Do not scale duration when timescale is zero
This commit is contained in:
Bret Curtis 2019-03-09 18:06:53 +01:00 committed by GitHub
commit 947bf880df
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
View file

@ -290,7 +290,9 @@ namespace MWMechanics
void MechanicsManager::advanceTime (float duration) void MechanicsManager::advanceTime (float duration)
{ {
// Uses ingame time, but scaled to real time // Uses ingame time, but scaled to real time
duration /= MWBase::Environment::get().getWorld()->getTimeScaleFactor(); const float timeScaleFactor = MWBase::Environment::get().getWorld()->getTimeScaleFactor();
if (timeScaleFactor != 0.0f)
duration /= timeScaleFactor;
MWWorld::Ptr player = getPlayer(); MWWorld::Ptr player = getPlayer();
player.getClass().getInventoryStore(player).rechargeItems(duration); player.getClass().getInventoryStore(player).rechargeItems(duration);
} }