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

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Marc Zinnschlag 2015-11-23 18:17:36 +01:00
commit da856eed95
3 changed files with 0 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -53,7 +53,6 @@ namespace MWInput
, mInvertY (Settings::Manager::getBool("invert y axis", "Input")) , mInvertY (Settings::Manager::getBool("invert y axis", "Input"))
, mControlsDisabled(false) , mControlsDisabled(false)
, mCameraSensitivity (Settings::Manager::getFloat("camera sensitivity", "Input")) , mCameraSensitivity (Settings::Manager::getFloat("camera sensitivity", "Input"))
, mUISensitivity (Settings::Manager::getFloat("ui sensitivity", "Input"))
, mCameraYMultiplier (Settings::Manager::getFloat("camera y multiplier", "Input")) , mCameraYMultiplier (Settings::Manager::getFloat("camera y multiplier", "Input"))
, mPreviewPOVDelay(0.f) , mPreviewPOVDelay(0.f)
, mTimeIdle(0.f) , mTimeIdle(0.f)
@ -586,9 +585,6 @@ namespace MWInput
if (it->first == "Input" && it->second == "camera sensitivity") if (it->first == "Input" && it->second == "camera sensitivity")
mCameraSensitivity = Settings::Manager::getFloat("camera sensitivity", "Input"); mCameraSensitivity = Settings::Manager::getFloat("camera sensitivity", "Input");
if (it->first == "Input" && it->second == "ui sensitivity")
mUISensitivity = Settings::Manager::getFloat("ui sensitivity", "Input");
if (it->first == "Input" && it->second == "grab cursor") if (it->first == "Input" && it->second == "grab cursor")
mGrabCursor = Settings::Manager::getBool("grab cursor", "Input"); mGrabCursor = Settings::Manager::getBool("grab cursor", "Input");

1
apps/openmw/mwinput/inputmanagerimp.hpp
View file

@ -174,7 +174,6 @@ namespace MWInput
bool mControlsDisabled; bool mControlsDisabled;
float mCameraSensitivity; float mCameraSensitivity;
float mUISensitivity;
float mCameraYMultiplier; float mCameraYMultiplier;
float mPreviewPOVDelay; float mPreviewPOVDelay;
float mTimeIdle; float mTimeIdle;

2
files/settings-default.cfg
View file

@ -145,8 +145,6 @@ invert y axis = false
camera sensitivity = 1.0 camera sensitivity = 1.0
ui sensitivity = 1.0
camera y multiplier = 1.0 camera y multiplier = 1.0
always run = false always run = false