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

Merge remote-tracking branch 'miroslavr/master'

Browse source
This commit is contained in:
Marc Zinnschlag 2015-02-23 20:53:44 +01:00
commit da9bd09a8c
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
apps/openmw/mwgui/jailscreen.cpp
View file

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