teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity

read gamecontrollerdb file location from settings file

Browse source
This commit is contained in:
Digmaster 2014-12-09 14:37:32 -06:00
parent a7a211860a
commit bb6ed06a4e
4 changed files with 18 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -135,8 +135,8 @@ namespace MWInput
mInputManager->setControllerEventCallback(this); mInputManager->setControllerEventCallback(this);
std::string file = userFileExists ? userFile : ""; std::string file = userFileExists ? userFile : "";
mInputBinder = new ICS::InputControlSystem(file, true, this, NULL, A_Last); std::string controllerdb = Settings::Manager::getString("gamecontrollerdb file", "Input");
mInputBinder = new ICS::InputControlSystem(file, true, this, NULL, controllerdb, A_Last);
adjustMouseRegion (window->getWidth(), window->getHeight()); adjustMouseRegion (window->getWidth(), window->getHeight());
loadKeyDefaults(); loadKeyDefaults();

21
extern/oics/ICSInputControlSystem.cpp vendored
View file

@ -30,7 +30,7 @@ namespace ICS
{ {
InputControlSystem::InputControlSystem(std::string file, bool active InputControlSystem::InputControlSystem(std::string file, bool active
, DetectingBindingListener* detectingBindingListener , DetectingBindingListener* detectingBindingListener
, InputControlSystemLog* log, size_t channelCount) , InputControlSystemLog* log, std::string controllerdb, size_t channelCount)
: mFileName(file) : mFileName(file)
, mDetectingBindingListener(detectingBindingListener) , mDetectingBindingListener(detectingBindingListener)
, mDetectingBindingControl(NULL) , mDetectingBindingControl(NULL)
@ -279,14 +279,17 @@ namespace ICS
//Load controller mappings //Load controller mappings
#if SDL_VERSION_ATLEAST(2,0,2) #if SDL_VERSION_ATLEAST(2,0,2)
int res = SDL_GameControllerAddMappingsFromFile("resources/gamecontrollerdb.txt"); if(!controllerdb.empty())
if(res == -1) {
{ int res = SDL_GameControllerAddMappingsFromFile(controllerdb.c_str());
ICS_LOG(std::string("Error loading controller bindings: ")+SDL_GetError()); if(res == -1)
} {
else ICS_LOG(std::string("Error loading controller bindings: ")+SDL_GetError());
{ }
ICS_LOG(std::string("Loaded ")+boost::lexical_cast<std::string>(res)+" Game controller bindings"); else
{
ICS_LOG(std::string("Loaded ")+boost::lexical_cast<std::string>(res)+" Game controller bindings");
}
} }
#endif #endif

3
extern/oics/ICSInputControlSystem.h vendored
View file

@ -74,7 +74,8 @@ namespace ICS
InputControlSystem(std::string file = "", bool active = true InputControlSystem(std::string file = "", bool active = true
, DetectingBindingListener* detectingBindingListener = NULL , DetectingBindingListener* detectingBindingListener = NULL
, InputControlSystemLog* log = NULL, size_t channelCount = 16); , InputControlSystemLog* log = NULL, std::string controllerdb = ""
, size_t channelCount = 16);
~InputControlSystem(); ~InputControlSystem();
std::string getFileName(){ return mFileName; }; std::string getFileName(){ return mFileName; };

2
files/settings-default.cfg
View file

@ -181,6 +181,8 @@ always run = false
allow third person zoom = false allow third person zoom = false
gamecontrollerdb file = resources/gamecontrollerdb.txt
[Game] [Game]
# Always use the most powerful attack when striking with a weapon (chop, slash or thrust) # Always use the most powerful attack when striking with a weapon (chop, slash or thrust)
best attack = false best attack = false