5 files changed, 31 insertions, 35 deletions

@@ -18,8 +18,8 @@ Memory::Memory(const std::string& processName) {
                 }
         }
         if (!_handle) {
-                std::cout << "Couldn't find " << processName.c_str() << ", is it open?" << std::endl;
-                exit(EXIT_FAILURE);
+                std::cerr << "Couldn't find " << processName.c_str() << ", is it open?" << std::endl;
+                throw std::exception("Unable to find process!");
         }
 
         // Next, get the process base address
@@ -27,19 +27,17 @@ Memory::Memory(const std::string& processName) {
         std::vector<HMODULE> moduleList(1024);
         EnumProcessModulesEx(_handle, &moduleList[0], static_cast<DWORD>(moduleList.size()), &numModules, 3);
 
-        std::string name(64, 0);
+        std::string name(64, '\0');
         for (DWORD i = 0; i < numModules / sizeof(HMODULE); i++) {
-                GetModuleBaseNameA(_handle, moduleList[i], &name[0], sizeof(name));
-
-                // TODO: Filling with 0s still yeilds name.size() == 64...
-                if (strcmp(processName.c_str(), name.c_str()) == 0) {
+                int length = GetModuleBaseNameA(_handle, moduleList[i], &name[0], static_cast<DWORD>(name.size()));
+                name.resize(length);
+                if (processName == name) {
                         _baseAddress = (uintptr_t)moduleList[i];
                         break;
                 }
         }
         if (_baseAddress == 0) {
-                std::cout << "Couldn't find the base process address!" << std::endl;
-                exit(EXIT_FAILURE);
+                throw std::exception("Couldn't find the base process address!");
         }
 }
 
@@ -47,11 +45,24 @@ Memory::~Memory() {
         CloseHandle(_handle);
 }
 
+int Memory::GetCurrentFrame()
+{
+        int SCRIPT_FRAMES;
+        if (GLOBALS == 0x5B28C0) {
+                SCRIPT_FRAMES = 0x5BE3B0;
+        } else if (GLOBALS == 0x62A080) {
+                SCRIPT_FRAMES = 0x63651C;
+        } else {
+                throw std::exception("Unknown value for Globals!");
+        }
+        return ReadData<int>({SCRIPT_FRAMES}, 1)[0];
+}
+
 void Memory::ThrowError() {
         std::string message(256, '\0');
-        FormatMessageA(4096, nullptr, GetLastError(), 1024, &message[0], static_cast<DWORD>(message.length()), nullptr);
-        std::cout << message.c_str() << std::endl;
-        exit(EXIT_FAILURE);
+        int length = FormatMessageA(4096, nullptr, GetLastError(), 1024, &message[0], static_cast<DWORD>(message.size()), nullptr);
+        message.resize(length);
+        throw std::exception(message.c_str());
 }
 
 void* Memory::ComputeOffset(std::vector<int> offsets)
@@ -19,6 +19,7 @@ public:
         Memory(const Memory& memory) = delete;
         Memory& operator=(const Memory& other) = delete;
 
+        int GetCurrentFrame();
 
         template <class T>
         std::vector<T> ReadArray(int panel, int offset, int size) {
@@ -40,6 +41,9 @@ public:
                 WriteData<T>({GLOBALS, 0x18, panel*8, offset}, data);
         }
 
+        void ClearOffsets() {_computedAddresses = std::map<uintptr_t, uintptr_t>();}
+
+private:
         template<class T>
         std::vector<T> ReadData(const std::vector<int>& offsets, size_t numItems) {
                 std::vector<T> data;
@@ -64,10 +68,6 @@ public:
                 ThrowError();
         }
 
-        void ClearOffsets() {_computedAddresses = std::map<uintptr_t, uintptr_t>();}
-
-private:
-
         void ThrowError();
 
         void* ComputeOffset(std::vector<int> offsets);
@@ -45,7 +45,7 @@ enum IntersectionFlags {
         IS_ENDPOINT = 0x1,
         IS_STARTPOINT = 0x2,
         IS_GAP = 0x10000,
-        HAS_DOT = 0x8,
+        HAS_DOT = 0x20,
         DOT_IS_BLUE = 0x100,
         DOT_IS_ORANGE = 0x200,
         DOT_IS_INVISIBLE = 0x1000,
@@ -5,7 +5,6 @@
  * FEATURES:
  * Start the game if it isn't running?
  * Stop swapping colors in desert
- * Look into valid panel swaps for keep walk-ons.
  * Randomize audio logs -- Hard, seem to be unloaded some times?
  * Swap sounds in jungle (along with panels) -- maybe impossible
  * Make orange 7 (all of oranges?) hard. Like big = hard. (See: HARD_MODE)
@@ -24,11 +23,11 @@ int find(const std::vector<T> &data, T search, size_t startIndex = 0) {
                 if (data[i] == search) return static_cast<int>(i);
         }
         std::cout << "Couldn't find " << search << " in data!" << std::endl;
-        exit(-1);
+        throw std::exception("Couldn't find value in data!");
 }
 
 bool Randomizer::GameIsRandomized() {
-        int currentFrame = GetCurrentFrame();
+        int currentFrame = _memory->GetCurrentFrame();
         if (currentFrame >= _lastRandomizedFrame) {
                 // Time went forwards, presumably we're still on the same save
                 _lastRandomizedFrame = currentFrame;
@@ -41,7 +40,7 @@ bool Randomizer::GameIsRandomized() {
 void Randomizer::Randomize()
 {
         if (GameIsRandomized()) return;  // Nice sanity check, but should be unnecessary (since Main checks anyways)
-        _lastRandomizedFrame = GetCurrentFrame();
+        _lastRandomizedFrame = _memory->GetCurrentFrame();
 
         // Content swaps -- must happen before squarePanels
         Randomize(upDownPanels, SWAP::LINES);
@@ -345,15 +344,3 @@ void Randomizer::ReassignNames(const std::vector<int>& panels, const std::vector
                 _memory->WritePanelData<int64_t>(panels[i], AUDIO_LOG_NAME, {names[order[i]]});
         }
 }
-
-short Randomizer::ReadMetadata() {
-        return _memory->ReadData<short>({GLOBALS + METADATA}, 1)[0];
-}
-
-void Randomizer::WriteMetadata(short metadata) {
-        return _memory->WriteData<short>({GLOBALS + METADATA}, {metadata});
-}
-
-int Randomizer::GetCurrentFrame() {
-        return _memory->ReadData<int>({SCRIPT_FRAMES}, 1)[0];
-}
@@ -117,7 +117,6 @@ private:
 #define AUDIO_LOG_NAME 0xC8
 #define OPEN_RATE 0xE8
 #define METADATA 0xF2 // sizeof(short)
-#define SCRIPT_FRAMES 0x5BE3B0
 #elif GLOBALS == 0x62A080
 #define PATH_COLOR 0xC0
 #define REFLECTION_PATH_COLOR 0xD0
@@ -183,5 +182,4 @@ private:
 #define AUDIO_LOG_NAME 0x0
 #define OPEN_RATE 0xE0
 #define METADATA 0x13A // sizeof(short)
-#define SCRIPT_FRAMES 0x63651C
 #endif
\ No newline at end of file