Michael 2 سال پیش
والد
کامیت
06541211d5
2فایلهای تغییر یافته به همراه3 افزوده شده و 3 حذف شده
  1. 2 2
      client/eventsSDL/InputSourceTouch.cpp
  2. 1 1
      client/eventsSDL/InputSourceTouch.h

+ 2 - 2
client/eventsSDL/InputSourceTouch.cpp

@@ -39,7 +39,7 @@ InputSourceTouch::InputSourceTouch()
 	params.useRelativeMode = settings["general"]["userRelativePointer"].Bool();
 	params.relativeModeSpeedFactor = settings["general"]["relativePointerSpeedMultiplier"].Float();
 	params.longTouchTimeMilliseconds = settings["general"]["longTouchTimeMilliseconds"].Float();
-	params.hapticFeedback = settings["general"]["hapticFeedback"].Bool();
+	params.hapticFeedbackEnabled = settings["general"]["hapticFeedback"].Bool();
 
 	if (params.useRelativeMode)
 		state = TouchState::RELATIVE_MODE;
@@ -298,7 +298,7 @@ void InputSourceTouch::emitPinchEvent(const SDL_TouchFingerEvent & tfinger)
 }
 
 void InputSourceTouch::hapticFeedback() {
-	if(hapticFeedback)
+	if(hapticFeedbackEnabled)
 #if defined(VCMI_ANDROID)
 		CAndroidVMHelper vmHelper;
 		vmHelper.callStaticVoidMethod(CAndroidVMHelper::NATIVE_METHODS_DEFAULT_CLASS, "hapticFeedback");

+ 1 - 1
client/eventsSDL/InputSourceTouch.h

@@ -80,7 +80,7 @@ struct TouchInputParameters
 
 	bool useRelativeMode = false;
 
-	bool hapticFeedback = false;
+	bool hapticFeedbackEnabled = false;
 };
 
 /// Class that handles touchscreen input from SDL events