|
|
@ -166,12 +166,12 @@ namespace MWInput
|
|
|
|
|
|
|
|
|
|
|
|
void InputManager::setPlayerControlsEnabled(bool enabled)
|
|
|
|
void InputManager::setPlayerControlsEnabled(bool enabled)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
int nPlayerChannels = 17;
|
|
|
|
int nPlayerChannels = 18;
|
|
|
|
int playerChannels[] = {A_Activate, A_AutoMove, A_AlwaysRun, A_ToggleWeapon,
|
|
|
|
int playerChannels[] = {A_Activate, A_AutoMove, A_AlwaysRun, A_ToggleWeapon,
|
|
|
|
A_ToggleSpell, A_Rest, A_QuickKey1, A_QuickKey2,
|
|
|
|
A_ToggleSpell, A_Rest, A_QuickKey1, A_QuickKey2,
|
|
|
|
A_QuickKey3, A_QuickKey4, A_QuickKey5, A_QuickKey6,
|
|
|
|
A_QuickKey3, A_QuickKey4, A_QuickKey5, A_QuickKey6,
|
|
|
|
A_QuickKey7, A_QuickKey8, A_QuickKey9, A_QuickKey10,
|
|
|
|
A_QuickKey7, A_QuickKey8, A_QuickKey9, A_QuickKey10,
|
|
|
|
A_Use};
|
|
|
|
A_Use, A_Journal};
|
|
|
|
|
|
|
|
|
|
|
|
for(int i = 0; i < nPlayerChannels; i++) {
|
|
|
|
for(int i = 0; i < nPlayerChannels; i++) {
|
|
|
|
int pc = playerChannels[i];
|
|
|
|
int pc = playerChannels[i];
|
|
|
@ -1031,6 +1031,7 @@ namespace MWInput
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else if(MWBase::Environment::get().getWindowManager()->containsMode(MWGui::GM_Journal))
|
|
|
|
else if(MWBase::Environment::get().getWindowManager()->containsMode(MWGui::GM_Journal))
|
|
|
|
{
|
|
|
|
{
|
|
|
|
|
|
|
|
MWBase::Environment::get().getSoundManager()->playSound ("book close", 1.0, 1.0);
|
|
|
|
MWBase::Environment::get().getWindowManager()->removeGuiMode(MWGui::GM_Journal);
|
|
|
|
MWBase::Environment::get().getWindowManager()->removeGuiMode(MWGui::GM_Journal);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|