From fd32e2a444eea5901fe604d55b9c25394efd8b55 Mon Sep 17 00:00:00 2001 From: Death Killer <884052+deathkiller@users.noreply.github.com> Date: Sun, 21 Apr 2024 23:39:31 +0200 Subject: [PATCH] Fixed build --- Sources/Shared/IO/FileSystem.h | 2 +- Sources/nCine/Input/JoyMapping.cpp | 24 ++++++++++++------------ 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Sources/Shared/IO/FileSystem.h b/Sources/Shared/IO/FileSystem.h index 6cdf045b..ce5de5b8 100644 --- a/Sources/Shared/IO/FileSystem.h +++ b/Sources/Shared/IO/FileSystem.h @@ -80,7 +80,7 @@ namespace Death { namespace IO { DEFINE_PRIVATE_ENUM_OPERATORS(EnumerationOptions); -// /** @brief The class that handles directory traversal, should be used as iterator */ + /** @brief The class that handles directory traversal, should be used as iterator */ class Directory { public: diff --git a/Sources/nCine/Input/JoyMapping.cpp b/Sources/nCine/Input/JoyMapping.cpp index 9edf0f02..0199f758 100644 --- a/Sources/nCine/Input/JoyMapping.cpp +++ b/Sources/nCine/Input/JoyMapping.cpp @@ -22,19 +22,19 @@ namespace nCine #if defined(DEATH_TARGET_ANDROID) constexpr AxisName AndroidAxisNameMapping[] = { - AxisName::LX, - AxisName::LY, - AxisName::RX, - AxisName::RY, - AxisName::LTRIGGER, - AxisName::RTRIGGER + AxisName::LeftX, + AxisName::LeftY, + AxisName::RightX, + AxisName::RightY, + AxisName::LeftTrigger, + AxisName::RightTrigger }; constexpr ButtonName AndroidDpadButtonNameMapping[] = { - ButtonName::DPAD_UP, - ButtonName::DPAD_RIGHT, - ButtonName::DPAD_DOWN, - ButtonName::DPAD_LEFT + ButtonName::Up, + ButtonName::Right, + ButtonName::Down, + ButtonName::Left }; #endif @@ -460,12 +460,12 @@ namespace nCine mapping.desc.axes[i].max = 1.0f; } - constexpr int AndroidButtonCount = (int)ButtonName::MISC1; + constexpr int AndroidButtonCount = (int)ButtonName::Misc1; for (int i = 0; i < AndroidButtonCount; i++) { mapping.desc.buttons[i] = (ButtonName)i; } for (int i = AndroidButtonCount; i < countof(mapping.desc.buttons); i++) { - mapping.desc.buttons[i] = ButtonName::UNKNOWN; + mapping.desc.buttons[i] = ButtonName::Unknown; } for (int i = 0; i < countof(AndroidDpadButtonNameMapping); i++) {