Cleanup before I dive further

1 files changed, 14 insertions, 2 deletions

@@ -8,7 +8,7 @@ public:
 
         void AdjustSpeed();
 
-        void ClearOffsets() {_core.ClearOffsets();}
+        void ClearOffsets() {_memory->ClearOffsets();}
 
 private:
 
@@ -29,5 +29,17 @@ private:
         void RandomizeChallenge();
         void RandomizeAudioLogs();
 
-        RandomizerCore _core;
+        void Randomize(std::vector<int>& panels, int flags);
+        void RandomizeRange(std::vector<int> &panels, int flags, size_t startIndex, size_t endIndex);
+        void SwapPanels(int panel1, int panel2, int flags);
+        void ReassignTargets(const std::vector<int>& panels, const std::vector<int>& order, std::vector<int> targets = {});
+        void ReassignNames(const std::vector<int>& panels, const std::vector<int>& order);
+
+        short ReadMetadata();
+        void WriteMetadata(short metadata);
+        int GetCurrentFrame();
+
+        std::shared_ptr<Memory> _memory = std::make_shared<Memory>("witness64_d3d11.exe");
+
+        friend class SwapTests_Shipwreck_Test;
 };