4 files changed, 19 insertions, 13 deletions

@@ -62,18 +62,21 @@ uintptr_t Memory::ComputeOffset(std::vector<int> offsets)
         int final_offset = offsets.back();
         offsets.pop_back();
 
-        auto search = _computedOffsets.find(offsets);
-        if (search != std::end(_computedOffsets)) {
-                return search->second + final_offset;
-        }
-
         uintptr_t cumulativeAddress = _baseAddress;
         for (int offset : offsets) {
                 cumulativeAddress += offset;
-                if (!ReadProcessMemory(_handle, (LPVOID)cumulativeAddress, &cumulativeAddress, sizeof(uintptr_t), NULL)) {
-                        ThrowError();
+
+                auto search = _computedAddresses.find(cumulativeAddress);
+                if (search == std::end(_computedAddresses)) {
+                        // If the address is not yet computed, then compute it.
+                        uintptr_t computedAddress = 0;
+                        if (!ReadProcessMemory(_handle, (LPVOID)cumulativeAddress, &computedAddress, sizeof(uintptr_t), NULL)) {
+                                ThrowError();
+                        }
+                        _computedAddresses[cumulativeAddress] = computedAddress;
                 }
+
+                cumulativeAddress = _computedAddresses[cumulativeAddress];
         }
-        _computedOffsets[offsets] = cumulativeAddress;
         return cumulativeAddress + final_offset;
 }
@@ -47,7 +47,7 @@ private:
 
         uintptr_t ComputeOffset(std::vector<int> offsets);
 
-        std::map<std::vector<int>, uintptr_t> _computedOffsets;
+        std::map<uintptr_t, uintptr_t> _computedAddresses;
         uintptr_t _baseAddress;
         HANDLE _handle;
 };
\ No newline at end of file
@@ -101,10 +101,10 @@ std::vector<int> upDownPanels = {
 
 // Note: Some of these (non-controls) are duplicated elsewhere
 std::vector<int> leftForwardRightPanels = {
-        0x00075, // Symmetry Island Colored Dots 3
-        0x288EA, // UTM Perspective 1
-        0x288FC, // UTM Perspective 2
-        0x289E7, // UTM Perspective 3
+//      0x00075, // Symmetry Island Colored Dots 3
+//      0x288EA, // UTM Perspective 1
+//      0x288FC, // UTM Perspective 2
+//      0x289E7, // UTM Perspective 3
 
         0x17DD1, // Treehouse Left Orange 9
         0x17CE3, // Treehouse Right Orange 4
@@ -1,4 +1,7 @@
 /*
+ * BUGS:
+ * Treehouse pivots *should* work, but I need to not copy style_flags.
+   This seems to cause crashes when pivots appear elsewhere in the world.
  * FEATURES:
  * SWAP_TARGETS should still require the full panel sequence (and have ways to prevent softlocks?)
  ** Think about: Jungle