From d91175682702c639582bc2ed5cef69943060a4c1 Mon Sep 17 00:00:00 2001
From: Michael <13953785+Laserlicht@users.noreply.github.com>
Date: Sat, 8 Jul 2023 21:02:03 +0200
Subject: [PATCH] changes from code review

---
 client/eventsSDL/InputSourceTouch.cpp | 14 ++++++--------
 client/ios/utils.mm                   |  5 ++---
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/client/eventsSDL/InputSourceTouch.cpp b/client/eventsSDL/InputSourceTouch.cpp
index 314fff09e..8e627ac27 100644
--- a/client/eventsSDL/InputSourceTouch.cpp
+++ b/client/eventsSDL/InputSourceTouch.cpp
@@ -22,10 +22,9 @@
 #include "../gui/MouseButton.h"
 #include "../gui/WindowHandler.h"
 
-#ifdef VCMI_ANDROID
+#if defined(VCMI_ANDROID)
 #include "../../lib/CAndroidVMHelper.h"
-#endif
-#ifdef VCMI_IOS
+#elif defined(VCMI_IOS)
 #include "../ios/utils.h"
 #endif
 
@@ -299,12 +298,11 @@ void InputSourceTouch::emitPinchEvent(const SDL_TouchFingerEvent & tfinger)
 }
 
 void InputSourceTouch::hapticFeedback() {
-	if(hapticFeedbackEnabled) {
+	if(params.hapticFeedbackEnabled) {
 #if defined(VCMI_ANDROID)
-		CAndroidVMHelper vmHelper;
-		vmHelper.callStaticVoidMethod(CAndroidVMHelper::NATIVE_METHODS_DEFAULT_CLASS, "hapticFeedback");
-#endif
-#if defined(VCMI_IOS)
+        CAndroidVMHelper vmHelper;
+        vmHelper.callStaticVoidMethod(CAndroidVMHelper::NATIVE_METHODS_DEFAULT_CLASS, "hapticFeedback");
+#elif defined(VCMI_IOS)
     	iOS_utils::hapticFeedback();
 #endif
 	}
diff --git a/client/ios/utils.mm b/client/ios/utils.mm
index 643fa8bae..42cca084e 100644
--- a/client/ios/utils.mm
+++ b/client/ios/utils.mm
@@ -46,8 +46,7 @@ void hideLoadingIndicator()
 
 void hapticFeedback()
 {
-	UIImpactFeedbackGenerator *hapticGen = [[UIImpactFeedbackGenerator alloc] initWithStyle:(UIImpactFeedbackStyleLight)];
-	[hapticGen impactOccurred];
-	hapticGen = NULL;
+    auto hapticGen = [[UIImpactFeedbackGenerator alloc] initWithStyle:UIImpactFeedbackStyleLight];
+    [hapticGen impactOccurred];
 }
 }