1
0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-25 15:35:23 +00:00

Merge remote-tracking branch 'scrawl/activation' into next

This commit is contained in:
Marc Zinnschlag 2013-03-14 20:08:53 +01:00
commit 0ec919dd36

View File

@ -180,12 +180,12 @@ namespace MWInput
break;
case A_Activate:
resetIdleTime();
activate();
if( MWBase::Environment::get().getWindowManager()->isGuiMode()
&& MWBase::Environment::get().getWindowManager()->getMode() == MWGui::GM_InterMessageBox ) {
// Pressing the activation key when a messagebox is prompting for "ok" will activate the ok button
MWBase::Environment::get().getWindowManager()->enterPressed();
}
activate();
break;
case A_Journal:
toggleJournal ();