5 files changed, 87 insertions, 25 deletions

@@ -6,12 +6,16 @@
 #undef PROCESSENTRY32
 #undef Process32Next
 
-Memory::Memory(const std::string& processName) {
+Memory::Memory() {
+}
+
+[[nodiscard]]
+bool Memory::Initialize(const std::wstring& processName) {
         // First, get the handle of the process
-        PROCESSENTRY32 entry;
+        PROCESSENTRY32W entry;
         entry.dwSize = sizeof(entry);
         HANDLE snapshot = CreateToolhelp32Snapshot(TH32CS_SNAPPROCESS, 0);
-        while (Process32Next(snapshot, &entry)) {
+        while (Process32NextW(snapshot, &entry)) {
                 if (processName == entry.szExeFile) {
                         _handle = OpenProcess(PROCESS_ALL_ACCESS, FALSE, entry.th32ProcessID);
                         break;
@@ -19,7 +23,7 @@ Memory::Memory(const std::string& processName) {
         }
         if (!_handle) {
                 std::cerr << "Couldn't find " << processName.c_str() << ", is it open?" << std::endl;
-                throw std::exception("Unable to find process!");
+        return false;
         }
 
         // Next, get the process base address
@@ -27,9 +31,9 @@ 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::wstring name(64, '\0');
         for (DWORD i = 0; i < numModules / sizeof(HMODULE); i++) {
-                int length = GetModuleBaseNameA(_handle, moduleList[i], &name[0], static_cast<DWORD>(name.size()));
+                int length = GetModuleBaseNameW(_handle, moduleList[i], &name[0], static_cast<DWORD>(name.size()));
                 name.resize(length);
                 if (processName == name) {
                         _baseAddress = (uintptr_t)moduleList[i];
@@ -37,12 +41,16 @@ Memory::Memory(const std::string& processName) {
                 }
         }
         if (_baseAddress == 0) {
-                throw std::exception("Couldn't find the base process address!");
+        std::cerr << "Couldn't locate base address" << std::endl;
+        return false;
         }
+    return true;
 }
 
 Memory::~Memory() {
-        CloseHandle(_handle);
+    if (_handle != nullptr) {
+            CloseHandle(_handle);
+    }
 }
 
 int Memory::GetCurrentFrame()
@@ -14,7 +14,8 @@
 class Memory
 {
 public:
-        Memory(const std::string& processName);
+        Memory();
+        bool Initialize(const std::wstring& processName);
         ~Memory();
 
         Memory(const Memory& memory) = delete;
@@ -1,4 +1,67 @@
 /*
+Things to do for V2:
+- Better interface design. It's way too simplistic, take (some) notes from talos.
+  - Seed: [   ] (Randomize)
+  ?? Challenge
+
+  - [] Prevent speedrun snipes // Shadows, Swamp, Town, Quarry stairs
+  - [] Speed up various autoscrollers // Swamp platforms, Desert/Mountain elevators, Desert rotating panels
+
+  (Additional required panels)
+  - [] Desert 8
+  - [] Pond 5
+  - [] Both keep halves
+  - [] Town lattice requires stars door // and stars door will be randomized
+
+  (Debug version only)
+  - [] Noclip
+  - [] Noclip speed
+
+
+- Really randomize panels. Sorted by ROI
+  - Random with style
+    - Tutorial
+    - Mountain 1 orange, green, blue, purple
+    - Mountain 2 multipanel
+    - Mountain 3 pillars
+    - Laser areas (Glass Factory, Symmetry, Quarry, Treehouse, Swamp, Keep pressure plates, Town 25 dots)
+    - (low) Discarded panels
+    - (low) Tutorials // Dots, Stones, Swamp
+
+  - Keep Hedges become like hedges 4, intersection between path and panel
+  - Keep Pressure plates: Random with style
+
+  - No idea how to randomize:
+    - Symmetry transparent
+    - Desert
+    - Shadows
+    - Town (lattice, RGB area, snipes, triple)
+    - Monastery
+    - Jungle
+    - Bunker
+    - UTM
+    - Mountain 2 rainbow
+    - Challenge
+
+- Any RNG rerolls should be based on previous seed so that everyone can go to next seed easily
+
+- Stability. Duh. I need to clearly define the ownership between the randomizer and the game.
+
+- Challenge should have some way to 'reroll every run'
+- Challenge should not turn off after time limit?
+- Challenge triangles should not turn off
+
+
+
+
+*/
+
+
+
+
+
+
+/*
  * Try to wire up both keep halves
  * Wire up both halves of symmetry laser
  * Turn off floating panel in desert
@@ -45,7 +45,7 @@ private:
         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);
 
-        std::shared_ptr<Memory> _memory = std::make_shared<Memory>("witness64_d3d11.exe");
+        std::shared_ptr<Memory> _memory = std::make_shared<Memory>(L"witness64_d3d11.exe");
 
         friend class SwapTests_Shipwreck_Test;
 };
@@ -23,32 +23,32 @@
     <ProjectGuid>{6B5DF051-A51A-48CB-8ACD-C6FAD726019F}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>Source</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
@@ -157,20 +157,10 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <ClInclude Include="ChallengeRandomizer.h" />
-    <ClInclude Include="json.hpp" />
     <ClInclude Include="Memory.h" />
-    <ClInclude Include="Panel.h" />
-    <ClInclude Include="Panels.h" />
-    <ClInclude Include="Random.h" />
-    <ClInclude Include="Randomizer.h" />
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="ChallengeRandomizer.cpp" />
     <ClCompile Include="Memory.cpp" />
-    <ClCompile Include="Panel.cpp" />
-    <ClCompile Include="Random.cpp" />
-    <ClCompile Include="Randomizer.cpp" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">