1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-30 02:15:32 +00:00

Merge remote-tracking branch 'miroslavr/master'

This commit is contained in:
Marc Zinnschlag 2015-02-23 20:53:44 +01:00
commit da9bd09a8c

View file

@ -17,7 +17,7 @@ namespace MWGui
{
JailScreen::JailScreen()
: WindowBase("openmw_jail_screen.layout"),
mTimeAdvancer(0.0125),
mTimeAdvancer(0.01),
mDays(1),
mFadeTimeRemaining(0)
{
@ -39,7 +39,7 @@ namespace MWGui
mFadeTimeRemaining = 0.5;
setVisible(false);
mProgressBar->setScrollRange(days*24+1);
mProgressBar->setScrollRange(100+1);
mProgressBar->setScrollPosition(0);
mProgressBar->setTrackSize(0);
}
@ -59,7 +59,7 @@ namespace MWGui
MWBase::Environment::get().getWorld()->teleportToClosestMarker(player, "prisonmarker");
setVisible(true);
mTimeAdvancer.run(mDays*24);
mTimeAdvancer.run(100);
}
}