|
|
|
@ -816,7 +816,7 @@ namespace MWInput
|
|
|
|
|
|
|
|
|
|
setPlayerControlsEnabled(!guiMode);
|
|
|
|
|
|
|
|
|
|
//esc, to leave inital movie screen
|
|
|
|
|
//esc, to leave initial movie screen
|
|
|
|
|
OIS::KeyCode kc = mInputManager->sdl2OISKeyCode(SDLK_ESCAPE);
|
|
|
|
|
bool guiFocus = MyGUI::InputManager::getInstance().injectKeyPress(MyGUI::KeyCode::Enum(kc), 0);
|
|
|
|
|
setPlayerControlsEnabled(!guiFocus);
|
|
|
|
@ -843,7 +843,7 @@ namespace MWInput
|
|
|
|
|
else
|
|
|
|
|
mInputBinder->buttonReleased(deviceID, arg);
|
|
|
|
|
|
|
|
|
|
//to escape inital movie
|
|
|
|
|
//to escape initial movie
|
|
|
|
|
OIS::KeyCode kc = mInputManager->sdl2OISKeyCode(SDLK_ESCAPE);
|
|
|
|
|
setPlayerControlsEnabled(!MyGUI::InputManager::getInstance().injectKeyRelease(MyGUI::KeyCode::Enum(kc)));
|
|
|
|
|
}
|
|
|
|
@ -1236,11 +1236,11 @@ namespace MWInput
|
|
|
|
|
bool controlExists = mInputBinder->getChannel(i)->getControlsCount () != 0;
|
|
|
|
|
if (!controlExists)
|
|
|
|
|
{
|
|
|
|
|
int inital;
|
|
|
|
|
float initial;
|
|
|
|
|
if (defaultButtonBindings.find(i) != defaultButtonBindings.end())
|
|
|
|
|
inital = 0.0f;
|
|
|
|
|
else inital = 0.5f;
|
|
|
|
|
control = new ICS::Control(boost::lexical_cast<std::string>(i), false, true, inital, ICS::ICS_MAX, ICS::ICS_MAX);
|
|
|
|
|
initial = 0.0f;
|
|
|
|
|
else initial = 0.5f;
|
|
|
|
|
control = new ICS::Control(boost::lexical_cast<std::string>(i), false, true, initial, ICS::ICS_MAX, ICS::ICS_MAX);
|
|
|
|
|
mInputBinder->addControl(control);
|
|
|
|
|
control->attachChannel(mInputBinder->getChannel(i), ICS::Channel::DIRECT);
|
|
|
|
|
}
|
|
|
|
|