immibis
/
colobot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added joystick settings in colobot.ini

master
krzys-h 2015-07-10 10:25:31 +02:00
parent 7e41e9fe23
commit 20a367783b
2 changed files with 29 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/app/input.cpp
View File

@ -30,6 +30,7 @@
#include <sstream>
#include <boost/lexical_cast.hpp>
template<> CInput* CSingleton<CInput>::m_instance = nullptr;
@ -313,6 +314,15 @@ void CInput::SaveKeyBindings()
CProfile::GetInstancePointer()->SetStringProperty("Keybindings", keyTable[static_cast<InputSlot>(i)], key.str());
}
for (int i = 0; i < JOY_AXIS_SLOT_MAX; i++)
{
JoyAxisBinding b = GetJoyAxisBinding(static_cast<JoyAxisSlot>(i));
CProfile::GetInstancePointer()->SetIntProperty("Setup", "JoystickAxisBinding"+boost::lexical_cast<std::string>(i), b.axis);
CProfile::GetInstancePointer()->SetIntProperty("Setup", "JoystickAxisInvert"+boost::lexical_cast<std::string>(i), b.invert);
}
CProfile::GetInstancePointer()->SetFloatProperty("Setup", "JoystickDeadzone", GetJoystickDeadzone());
}
void CInput::LoadKeyBindings()
@ -333,6 +343,23 @@ void CInput::LoadKeyBindings()
SetInputBinding(static_cast<InputSlot>(i), b);
}
for (int i = 0; i < JOY_AXIS_SLOT_MAX; i++)
{
JoyAxisBinding b;
if (!CProfile::GetInstancePointer()->GetIntProperty("Setup", "JoystickAxisBinding"+boost::lexical_cast<std::string>(i), b.axis))
continue;
int x = 0;
CProfile::GetInstancePointer()->GetIntProperty("Setup", "JoystickAxisInvert"+boost::lexical_cast<std::string>(i), x); // If doesn't exist, use default (0)
b.invert = (x != 0);
SetJoyAxisBinding(static_cast<JoyAxisSlot>(i), b);
}
float deadzone;
if (CProfile::GetInstancePointer()->GetFloatProperty("Setup", "JoystickDeadzone", deadzone))
SetJoystickDeadzone(deadzone);
}
InputSlot CInput::SearchKeyById(std::string id)

4
src/app/input.h
View File

@ -97,7 +97,7 @@ public:
Math::Point GetMousePos() const;
//! Sets the default input bindings (key and axes)
//! Sets the default input bindings (keys and joystick axes)
void SetDefaultInputBindings();
//! Management of input bindings
@ -130,7 +130,7 @@ public:
//! Seeks a InputSlot by id. Returns INPUT_SLOT_MAX if not found
InputSlot SearchKeyById(std::string name);
//! Returns string describing keys to pressed
//! Returns string describing keys to be pressed
//@{
std::string GetKeysString(InputBinding binding);
std::string GetKeysString(InputSlot slot);