Memory / Main are now cleaned up

2 files changed, 36 insertions, 21 deletions

@@ -7,9 +7,6 @@
 #undef PROCESSENTRY32
 #undef Process32Next
 
-Memory::Memory() {
-}
-
 [[nodiscard]]
 bool Memory::Initialize(const std::wstring& processName) {
         // First, get the handle of the process
@@ -48,23 +45,40 @@ bool Memory::Initialize(const std::wstring& processName) {
     return true;
 }
 
-Memory::~Memory() {
-    if (_handle != nullptr) {
-            CloseHandle(_handle);
+ProcStatus Memory::Heartbeat(const std::wstring& processName) {
+    if (!_handle && !Initialize(processName)) {
+        // Couldn't initialize, definitely not running
+        return ProcStatus::NotRunning;
+    }
+
+    DWORD exitCode = 0;
+    GetExitCodeProcess(_handle, &exitCode);
+    if (exitCode != STILL_ACTIVE) {
+        // Process has exited, clean up.
+        _computedAddresses.clear();
+        _handle = NULL;
+        return ProcStatus::NotRunning;
     }
-}
 
-int Memory::GetCurrentFrame() {
-        int SCRIPT_FRAMES;
+    int currentFrame = 0x7FFFFFFF;
         if (GLOBALS == 0x5B28C0) {
-                SCRIPT_FRAMES = 0x5BE3B0;
+        currentFrame = ReadData<int>({0x5BE3B0}, 1)[0];
         } else if (GLOBALS == 0x62D0A0) {
-                SCRIPT_FRAMES = 0x63954C;
+        currentFrame = ReadData<int>({0x63954C}, 1)[0];
         } else {
         assert(false);
-        return 0x7FFFFFFF;
         }
-        return ReadData<int>({SCRIPT_FRAMES}, 1)[0];
+    if (currentFrame < 80) return ProcStatus::NewGame;
+
+    // TODO: Some way to return ProcStatus::Randomized vs ProcStatus::NotRandomized vs ProcStatus::DeRandomized;
+
+    return ProcStatus::Running;
+}
+
+Memory::~Memory() {
+    if (_handle != nullptr) {
+            CloseHandle(_handle);
+    }
 }
 
 void Memory::AddSigScan(const std::vector<byte>& scanBytes, const std::function<void(int index)>& scanFunc)
@@ -7,21 +7,25 @@
 // #define GLOBALS 0x5B28C0
 #define GLOBALS 0x62D0A0
 
+enum class ProcStatus {
+    NotRunning,
+    Running,
+    NewGame
+};
+
 // https://github.com/erayarslan/WriteProcessMemory-Example
 // http://stackoverflow.com/q/32798185
 // http://stackoverflow.com/q/36018838
 // http://stackoverflow.com/q/1387064
 class Memory {
 public:
-        Memory();
-        bool Initialize(const std::wstring& processName);
+        Memory() = default;
+    ProcStatus Heartbeat(const std::wstring& processName);
         ~Memory();
 
         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) {
                 return ReadData<T>({GLOBALS, 0x18, panel*8, offset, 0}, size);
@@ -48,9 +52,6 @@ public:
 private:
         template<class T>
         std::vector<T> ReadData(const std::vector<int>& offsets, size_t numItems) {
-        if (GetExitCodeProcess(_process) != STILL_ACTIVE) {
-            // Signal error, somehow
-        }
                 std::vector<T> data;
                 data.resize(numItems);
                 for (int i=0; i<5; i++) {
@@ -73,8 +74,8 @@ private:
                 ThrowError();
         }
 
+        bool Initialize(const std::wstring& processName);
         void ThrowError();
-
         void* ComputeOffset(std::vector<int> offsets);
 
         std::map<uintptr_t, uintptr_t> _computedAddresses;