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

Warning fix

Browse source
This commit is contained in:
scrawl 2015-03-03 11:23:50 +01:00
parent f09cbfb167
commit a8cb4e807b
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
apps/openmw/mwinput/inputmanagerimp.cpp
View file

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

2
components/config/launchersettings.hpp
View file

@ -17,7 +17,7 @@ namespace Config
/// \return names of all Content Lists in the launcher's .cfg file. /// \return names of all Content Lists in the launcher's .cfg file.
QStringList getContentLists(); QStringList getContentLists();
/// Set initally selected content list to match values from openmw.cfg, creating if necessary /// Set initially selected content list to match values from openmw.cfg, creating if necessary
void setContentList(const GameSettings& gameSettings); void setContentList(const GameSettings& gameSettings);
/// Create a Content List (or replace if it already exists) /// Create a Content List (or replace if it already exists)