From 37dca8d7dfae1599cfadcafa94ed606f5fcf27fd Mon Sep 17 00:00:00 2001 From: Ivan Mogilko Date: Tue, 4 Mar 2025 21:27:48 +0300 Subject: [PATCH] FIX: std algorithms in Fingers (can't use const static member) --- Engine/ac/sys_events.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Engine/ac/sys_events.cpp b/Engine/ac/sys_events.cpp index 2e524cc6d2..2a21724e83 100644 --- a/Engine/ac/sys_events.cpp +++ b/Engine/ac/sys_events.cpp @@ -607,7 +607,7 @@ struct Fingers Fingers() { - std::fill(_fingers.begin(), _fingers.end(), NO_INDEX); + std::fill(_fingers.begin(), _fingers.end(), NO_INDEX_REF); } // store fingerId, return given finger index @@ -616,7 +616,7 @@ struct Fingers if (contains(fingerId)) return NO_INDEX; // invalid, fingerId already present - auto it = std::find(_fingers.begin(), _fingers.end(), NO_ID); + auto it = std::find(_fingers.begin(), _fingers.end(), NO_INDEX_REF); if (it == _fingers.end()) return NO_INDEX; // no slot for new finger @@ -637,13 +637,13 @@ struct Fingers { int idx = get_index(fingerId); assert(idx != NO_INDEX); - if (idx != NO_INDEX) { - _fingers[idx] = NO_ID; - } + if (idx != NO_INDEX) + _fingers[idx] = NO_INDEX; }; private: - const SDL_FingerID NO_ID = -1; // std::find reads by reference, can't be static + // std algorithms accept args by reference, can't be static + const SDL_FingerID NO_INDEX_REF = NO_INDEX; std::array _fingers {}; bool contains(SDL_FingerID fingerId) const