Allow specifying an offset to the next instruction when calling Patte…

…rnSearchResult::abs() method
danielkrupinski · May 30, 2024 · e6385fc · e6385fc
1 parent e99390f
commit e6385fc
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/Source/MemoryPatterns/Linux/ClientPatternsLinux.h b/Source/MemoryPatterns/Linux/ClientPatternsLinux.h
@@ -82,10 +82,6 @@ struct ClientPatterns {
 
     [[nodiscard]] cs2::CCSPlayerController** localPlayerController() const noexcept
     {
-        // fixme: add support for abs(offset)
-        const auto result = patternFinders.clientPatternFinder("48 83 3D ? ? ? ? ? 0F 95 C0 C3"_pat).add(3).abs().template as<std::byte*>();
-        if (result)
-            return reinterpret_cast<cs2::CCSPlayerController**>(result + 1);
-        return nullptr;
+        return patternFinders.clientPatternFinder("48 83 3D ? ? ? ? ? 0F 95 C0 C3"_pat).add(3).abs(5).template as<cs2::CCSPlayerController**>();
     }
 };
diff --git a/Source/MemorySearch/PatternSearchResult.h b/Source/MemorySearch/PatternSearchResult.h
@@ -29,14 +29,15 @@ class PatternSearchResult {
         return *this;
     }
 
-    [[nodiscard]] GenericPointer abs() const noexcept
+    [[nodiscard]] GenericPointer abs(std::size_t offsetToNextInstruction = 4) const noexcept
     {
         if (base) {
             using OffsetType = std::int32_t;
             OffsetType offset;
+            assert(offsetToNextInstruction >= sizeof(OffsetType));
             assert(foundPatternBytes.size() - extraOffset >= sizeof(OffsetType));
             std::memcpy(&offset, foundPatternBytes.data() + extraOffset, sizeof(OffsetType));
-            return base.as<const std::byte*>() + patternFoundOffset + extraOffset + sizeof(OffsetType) + offset;
+            return base.as<const std::byte*>() + patternFoundOffset + extraOffset + offsetToNextInstruction + offset;
         }
         return {};
     }