From 1cad9871174728c15abbdb71ee5cbe2cf03ccf0c Mon Sep 17 00:00:00 2001
From: jbzdarkid <jbzdarkid@gmail.com>
Date: Wed, 7 Nov 2018 08:27:09 -0800
Subject: Cleanup before I dive further

---
 Source/Randomizer.h | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

(limited to 'Source/Randomizer.h')

diff --git a/Source/Randomizer.h b/Source/Randomizer.h
index ea05975..c9603ac 100644
--- a/Source/Randomizer.h
+++ b/Source/Randomizer.h
@@ -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;
 };
-- 
cgit 1.4.1