mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-11-09 02:16:40 +00:00
Code Issues Releases Wiki Activity

Do not trigger levelup if rest was interrupted

Browse source
This commit is contained in:
scrawl 2014-05-22 11:08:36 +02:00
parent 18bba6bcec
commit c6c254d279
1 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
apps/openmw/mwgui/waitdialog.cpp
View file

@ -219,17 +219,8 @@ namespace MWGui
} }
if (mCurHour > mHours) if (mCurHour > mHours)
stopWaiting();
}
void WaitDialog::stopWaiting ()
{ {
MWBase::Environment::get().getWorld ()->getFader ()->fadeIn(0.2); stopWaiting();
mProgressBar.setVisible (false);
MWBase::Environment::get().getWindowManager()->removeGuiMode (GM_Rest);
MWBase::Environment::get().getWindowManager()->removeGuiMode (GM_RestBed);
mWaiting = false;
MWWorld::Ptr player = MWBase::Environment::get().getWorld()->getPlayerPtr(); MWWorld::Ptr player = MWBase::Environment::get().getWorld()->getPlayerPtr();
const MWMechanics::NpcStats &pcstats = MWWorld::Class::get(player).getNpcStats(player); const MWMechanics::NpcStats &pcstats = MWWorld::Class::get(player).getNpcStats(player);
@ -242,6 +233,16 @@ namespace MWGui
MWBase::Environment::get().getWindowManager()->pushGuiMode (GM_Levelup); MWBase::Environment::get().getWindowManager()->pushGuiMode (GM_Levelup);
} }
} }
}
void WaitDialog::stopWaiting ()
{
MWBase::Environment::get().getWorld ()->getFader ()->fadeIn(0.2);
mProgressBar.setVisible (false);
MWBase::Environment::get().getWindowManager()->removeGuiMode (GM_Rest);
MWBase::Environment::get().getWindowManager()->removeGuiMode (GM_RestBed);
mWaiting = false;
}
void WaitDialog::wakeUp () void WaitDialog::wakeUp ()