From 26df132b0c74d12f22c10d7dd1acb7a376609b4a Mon Sep 17 00:00:00 2001
From: Death Killer <884052+deathkiller@users.noreply.github.com>
Date: Sun, 5 Nov 2023 22:58:51 +0100
Subject: [PATCH] Version 2.2.0

---
 CMakeLists.txt                                         | 2 +-
 Sources/Common.h                                       | 2 +-
 Sources/Resources.rc                                   | 8 ++++----
 Sources/nCine/Backends/Android/AndroidInputManager.cpp | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index de9cb1e7..cd0fd511 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -10,7 +10,7 @@ set(NCINE_APP_DESCRIPTION "Open-source reimplementation of Jazz Jackrabbit 2")
 set(NCINE_APP_DESCRIPTION_FULL "Jazz² Resurrection is reimplementation of the game Jazz Jackrabbit 2 released in 1998. Supports various versions of the game (Shareware Demo, Holiday Hare '98, The Secret Files and Christmas Chronicles). Also, it partially supports some features of JJ2+ extension and MLLE.\n\nFurther information can be found here: http://deat.tk/jazz2/")
 set(NCINE_APP_VENDOR "Dan R.")
 set(NCINE_REVERSE_DNS "jazz2.resurrection")
-set(NCINE_VERSION "2.1.0")
+set(NCINE_VERSION "2.2.0")
 
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake)
 get_filename_component(PARENT_SOURCE_DIR ${CMAKE_SOURCE_DIR} DIRECTORY)
diff --git a/Sources/Common.h b/Sources/Common.h
index e57d37da..3a8e01bb 100644
--- a/Sources/Common.h
+++ b/Sources/Common.h
@@ -8,7 +8,7 @@
 #	define NCINE_APP_NAME "Jazz² Resurrection"
 #endif
 #if !defined(NCINE_VERSION)
-#	define NCINE_VERSION "2.1.0"
+#	define NCINE_VERSION "2.2.0"
 #endif
 #if !defined(NCINE_LINUX_PACKAGE)
 #	define NCINE_LINUX_PACKAGE NCINE_APP_NAME
diff --git a/Sources/Resources.rc b/Sources/Resources.rc
index 6172ddb2..6c877c22 100644
--- a/Sources/Resources.rc
+++ b/Sources/Resources.rc
@@ -4,8 +4,8 @@
 LANGUAGE LANG_NEUTRAL, SUBLANG_DEFAULT
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 2, 1, 0, 0
- PRODUCTVERSION 2, 1, 0, 0
+ FILEVERSION 2, 2, 0, 0
+ PRODUCTVERSION 2, 2, 0, 0
  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
  FILEFLAGS VS_FF_DEBUG
@@ -21,12 +21,12 @@ VS_VERSION_INFO VERSIONINFO
 		BLOCK "000004b0"
 		{
 			VALUE "CompanyName", "Dan R."
-			VALUE "FileVersion", "2.1.0.0"
+			VALUE "FileVersion", "2.2.0.0"
 			VALUE "InternalName", "Jazz2"
 			VALUE "LegalCopyright", "© 2016-2023 Dan R."
 			VALUE "OriginalFilename", "Jazz2.exe"
 			VALUE "ProductName", "Jazz² Resurrection"
-			VALUE "ProductVersion", "2.1.0.0"
+			VALUE "ProductVersion", "2.2.0.0"
 			VALUE "FileDescription", "Jazz² Resurrection: Open-source reimplementation of Jazz Jackrabbit 2"
 		}
 	}
diff --git a/Sources/nCine/Backends/Android/AndroidInputManager.cpp b/Sources/nCine/Backends/Android/AndroidInputManager.cpp
index 2827d6f5..c79feb91 100644
--- a/Sources/nCine/Backends/Android/AndroidInputManager.cpp
+++ b/Sources/nCine/Backends/Android/AndroidInputManager.cpp
@@ -857,7 +857,7 @@ namespace nCine
 			LOGI("Device (%d, %d) - Axes%s", deviceId, joyId, deviceInfoString);
 #endif
 			if (numAxes >= 4) {
-				// Android sometimes returns strange range for the first axis, all other axes are fine
+				// Android sometimes returns strange range for the first two axes, all other axes are fine
 				if (std::abs(joyState.axesMinValues_[0]) < 0.01f && joyState.axesRangeValues_[0] > 128.0f &&
 					std::abs(joyState.axesMinValues_[1]) < 0.01f && joyState.axesRangeValues_[1] > 128.0f &&
 					joyState.axesMinValues_[2] == -1.0f && joyState.axesRangeValues_[2] == 2.0f &&