6 files changed, 56 insertions, 50 deletions

@@ -47,30 +47,28 @@ Memory::~Memory() {
         CloseHandle(_handle);
 }
 
-// Private methods:
-
 void Memory::ThrowError() {
         std::string message(256, '\0');
-        FormatMessageA(4096, NULL, GetLastError(), 1024, &message[0], static_cast<DWORD>(message.length()), NULL);
+        FormatMessageA(4096, nullptr, GetLastError(), 1024, &message[0], static_cast<DWORD>(message.length()), nullptr);
         std::cout << message.c_str() << std::endl;
         exit(EXIT_FAILURE);
 }
 
-uintptr_t Memory::ComputeOffset(std::vector<int> offsets)
+void* Memory::ComputeOffset(std::vector<int> offsets)
 {
         // Leave off the last offset, since it will be either read/write, and may not be of type unitptr_t.
         int final_offset = offsets.back();
         offsets.pop_back();
 
         uintptr_t cumulativeAddress = _baseAddress;
-        for (int offset : offsets) {
+        for (const int offset : offsets) {
                 cumulativeAddress += offset;
 
-                auto search = _computedAddresses.find(cumulativeAddress);
+                const auto search = _computedAddresses.find(cumulativeAddress);
                 if (search == std::end(_computedAddresses)) {
                         // If the address is not yet computed, then compute it.
                         uintptr_t computedAddress = 0;
-                        if (!ReadProcessMemory(_handle, (LPVOID)cumulativeAddress, &computedAddress, sizeof(uintptr_t), NULL)) {
+                        if (!ReadProcessMemory(_handle, reinterpret_cast<LPVOID>(cumulativeAddress), &computedAddress, sizeof(uintptr_t), NULL)) {
                                 ThrowError();
                         }
                         _computedAddresses[cumulativeAddress] = computedAddress;
@@ -78,5 +76,5 @@ uintptr_t Memory::ComputeOffset(std::vector<int> offsets)
 
                 cumulativeAddress = _computedAddresses[cumulativeAddress];
         }
-        return cumulativeAddress + final_offset;
+        return reinterpret_cast<void*>(cumulativeAddress + final_offset);
 }
@@ -2,9 +2,6 @@
 #include <vector>
 #include <map>
 #include <windows.h>
-#include <thread>
-#include <chrono>
-using namespace std::chrono_literals;
 
 // https://github.com/erayarslan/WriteProcessMemory-Example
 // http://stackoverflow.com/q/32798185
@@ -16,16 +13,18 @@ public:
         Memory(const std::string& processName);
         ~Memory();
 
+        Memory(const Memory& memory) = delete;
+        Memory& operator=(const Memory& other) = delete;
+
         template<class T>
-        std::vector<T> ReadData(const std::vector<int>& offsets, int numItems) {
+        std::vector<T> ReadData(const std::vector<int>& offsets, size_t numItems) {
                 std::vector<T> data;
                 data.resize(numItems);
                 for (int i=0; i<5; i++) {
-                        if (ReadProcessMemory(_handle, (LPVOID)ComputeOffset(offsets), &data[0], sizeof(T) * numItems, NULL))
+                        if (ReadProcessMemory(_handle, ComputeOffset(offsets), &data[0], sizeof(T) * numItems, nullptr))
                         {
                                 return data;
                         }
-                        // std::this_thread::sleep_for(10ms);
                 }
                 ThrowError();
                 return {};
@@ -34,10 +33,9 @@ public:
         template <class T>
         void WriteData(const std::vector<int>& offsets, const std::vector<T>& data) {
                 for (int i=0; i<5; i++) {
-                        if (WriteProcessMemory(_handle, (LPVOID)ComputeOffset(offsets), &data[0], sizeof(T) * data.size(), NULL)) {
+                        if (WriteProcessMemory(_handle, ComputeOffset(offsets), &data[0], sizeof(T) * data.size(), nullptr)) {
                                 return;
                         }
-                        // std::this_thread::sleep_for(10ms);
                 }
                 ThrowError();
         }
@@ -45,9 +43,9 @@ public:
 private:
         void ThrowError();
 
-        uintptr_t ComputeOffset(std::vector<int> offsets);
+        void* ComputeOffset(std::vector<int> offsets);
 
         std::map<uintptr_t, uintptr_t> _computedAddresses;
-        uintptr_t _baseAddress;
-        HANDLE _handle;
+        uintptr_t _baseAddress = 0;
+        HANDLE _handle = nullptr;
 };
\ No newline at end of file
@@ -2,7 +2,7 @@
 #include <vector>
 
 // Some of these (the puzzle ones) are duplicated elsewhere
-std::vector<int> lasers = {
+const std::vector<int> lasers = {
         0x0360D, // Symmetry
         0x03615, // Swamp
         0x09DE0, // Bunker
@@ -18,7 +18,7 @@ std::vector<int> lasers = {
 };
 
 // Note: Some of these (non-desert) are duplicated elsewhere
-std::vector<int> burnablePanels = {
+const std::vector<int> burnablePanels = {
         0x17D9C, // Treehouse Yellow 7
         0x17DC2, // Treehouse Yellow 8
         0x17DC4, // Treehouse Yellow 9
@@ -63,7 +63,7 @@ std::vector<int> burnablePanels = {
 
 // Note: Some of these (non-controls) are duplicated elsewhere
 // TODO: Gave up
-std::vector<int> leftRightPanels = {
+const std::vector<int> leftRightPanels = {
         0x01A54, // Glass Factory Entry
         0x00086, // Glass Factory Vertical Symmetry 1
         0x00087, // Glass Factory Vertical Symmetry 2
@@ -77,7 +77,7 @@ std::vector<int> leftRightPanels = {
 };
 
 // Note: Some of these (non-controls) are duplicated elsewhere
-std::vector<int> upDownPanels = {
+const std::vector<int> upDownPanels = {
         0x0008D, // Glass Factory Rotational Symmetry 1
         0x00081, // Glass Factory Rotational Symmetry 2
         0x00083, // Glass Factory Rotational Symmetry 3
@@ -100,7 +100,7 @@ std::vector<int> upDownPanels = {
 };
 
 // Note: Some of these (non-controls) are duplicated elsewhere
-std::vector<int> leftForwardRightPanels = {
+const std::vector<int> leftForwardRightPanels = {
 //      0x00075, // Symmetry Island Colored Dots 3
 //      0x288EA, // UTM Perspective 1
 //      0x288FC, // UTM Perspective 2
@@ -112,7 +112,7 @@ std::vector<int> leftForwardRightPanels = {
         0x17E52, // Treehouse Green 4
 };
 
-std::vector<int> pillars = {
+const std::vector<int> pillars = {
         0x0383D, // Mountain 3 Left Pillar 1
         0x0383F, // Mountain 3 Left Pillar 2
         0x03859, // Mountain 3 Left Pillar 3
@@ -126,7 +126,7 @@ std::vector<int> pillars = {
 //      0x1C319, // Challenge Right Pillar
 };
 
-std::vector<int> mountainMultipanel = {
+const std::vector<int> mountainMultipanel = {
         0x09FCC, // Mountain 2 Multipanel 1
         0x09FCE, // Mountain 2 Multipanel 2
         0x09FCF, // Mountain 2 Multipanel 3
@@ -135,7 +135,7 @@ std::vector<int> mountainMultipanel = {
         0x09FD2, // Mountain 2 Multipanel 6
 };
 
-std::vector<int> squarePanels = {
+const std::vector<int> squarePanels = {
         0x00064, // Tutorial Straight
         0x00182, // Tutorial Bend
         0x0A3B2, // Tutorial Back Right
@@ -453,7 +453,7 @@ std::vector<int> squarePanels = {
         0x09E85, // Tunnels Town Shortcut
 };
 
-std::vector<int> shadowsPanels = {
+const std::vector<int> shadowsPanels = {
         0x198B5, // Shadows Tutorial 1
         0x198BD, // Shadows Tutorial 2
         0x198BF, // Shadows Tutorial 3
@@ -478,7 +478,7 @@ std::vector<int> shadowsPanels = {
         0x19650, // Shadows Laser
 };
 
-std::vector<int> monasteryPanels = {
+const std::vector<int> monasteryPanels = {
         0x00B10, // Monastery Left Door
         0x00290, // Monastery Exterior 1
         0x00C92, // Monastery Right Door
@@ -493,7 +493,7 @@ std::vector<int> monasteryPanels = {
         0x17CA4, // Monastery Laser
 };
 
-std::vector<int> bunkerPanels = {
+const std::vector<int> bunkerPanels = {
         0x09F7D, // Bunker Tutorial 1
         0x09FDC, // Bunker Tutorial 2
         0x09FF7, // Bunker Tutorial 3
@@ -514,7 +514,7 @@ std::vector<int> bunkerPanels = {
         0x0A079, // Bunker Elevator
 };
 
-std::vector<int> junglePanels = {
+const std::vector<int> junglePanels = {
         0x002C4, // Jungle Waves 1
         0x00767, // Jungle Waves 2
         0x002C6, // Jungle Waves 3
@@ -533,7 +533,7 @@ std::vector<int> junglePanels = {
 };
 
 // There might be something to do with these, I haven't decided yet.
-std::vector<int> nothingPanels = {
+const std::vector<int> nothingPanels = {
 // Doors & Shortcuts & Shortcut doors & Door controls
         0x0C339, // Desert Surface Door
         0x0A249, // Desert Pond Exit Door
@@ -1,5 +1,6 @@
 /*
  * BUGS:
+ * Shipwreck vault fails, possibly because of dot_reflection?
  * Treehouse pivots *should* work, but I need to not copy style_flags.
    This seems to cause crashes when pivots appear elsewhere in the world.
  * FEATURES:
@@ -17,23 +18,26 @@
 #include <string>
 #include <iostream>
 #include <numeric>
+#include <chrono>
 
 template <class T>
-int find(const std::vector<T> &data, T search, int startIndex = 0) {
-        for (int i=startIndex ; i<data.size(); i++) {
+size_t find(const std::vector<T> &data, T search, size_t startIndex = 0) {
+        for (size_t i=startIndex ; i<data.size(); i++) {
                 if (data[i] == search) return i;
         }
-        return -1;
+        std::cout << "Couldn't find " << search << " in data!" << std::endl;
+        exit(-1);
 }
 
 int main(int argc, char** argv)
 {
+        
         WitnessRandomizer randomizer = WitnessRandomizer();
 
         if (argc == 2) {
                 srand(atoi(argv[1])); // Seed from the command line
         } else {
-                int seed = time(0) % (1 << 16); // Seed from the time in milliseconds
+                int seed = time(nullptr) % (1 << 16); // Seed from the time in milliseconds
                 std::cout << "Selected seed: " << seed << std::endl;
                 srand(seed);
         }
@@ -71,7 +75,7 @@ int main(int argc, char** argv)
         // Glass 1 will become door + glass 1, due to the targetting system
         randomizer.RandomizeRange(randomOrder, SWAP_NONE, 1, 10);
         // Randomize Glass 1-3 into everything after the door
-        int glassDoorIndex = find(randomOrder, 9) + 1;
+        const size_t glassDoorIndex = find(randomOrder, 9) + 1;
         randomizer.RandomizeRange(randomOrder, SWAP_NONE, glassDoorIndex, 12);
         randomizer.ReassignTargets(bunkerPanels, randomOrder);
 
@@ -121,17 +125,17 @@ WitnessRandomizer::WitnessRandomizer()
         WritePanelData<float>(0x002C2, CURSOR_SPEED_SCALE, {1.0});
 }
 
-void WitnessRandomizer::Randomize(std::vector<int> &panels, int flags) {
+void WitnessRandomizer::Randomize(const std::vector<int>& panels, int flags) {
         return RandomizeRange(panels, flags, 0, panels.size());
 }
 
 // Range is [start, end)
-void WitnessRandomizer::RandomizeRange(std::vector<int> &panels, int flags, size_t startIndex, size_t endIndex) {
+void WitnessRandomizer::RandomizeRange(std::vector<int> panels, int flags, size_t startIndex, size_t endIndex) {
         if (panels.size() == 0) return;
         if (startIndex >= endIndex) return;
         if (endIndex >= panels.size()) endIndex = panels.size();
         for (size_t i = endIndex-1; i > startIndex+1; i--) {
-                size_t target = rand() % (i - startIndex) + startIndex;
+                const size_t target = rand() % (i - startIndex) + startIndex;
                 if (i != target) {
                         // std::cout << "Swapping panels " << std::hex << panels[i] << " and " << std::hex << panels[target] << std::endl;
                         SwapPanels(panels[i], panels[target], flags);
@@ -215,17 +219,17 @@ void WitnessRandomizer::SwapPanels(int panel1, int panel2, int flags) {
 }
 
 void WitnessRandomizer::ReassignTargets(const std::vector<int>& panels, const std::vector<int>& order) {
+        // This list is offset by 1, so the target of the Nth panel is in position N (aka the N+1th element)
+        // The first panel may not have a wire to power it, so we use the panel ID itself.
         std::vector<int> targetToActivatePanel = {panels[0] + 1};
-        for (int panel : panels) {
+        for (const int panel : panels) {
                 int target = ReadPanelData<int>(panel, TARGET, 1)[0];
                 targetToActivatePanel.push_back(target);
         }
 
-        for (int i=0; i<order.size() - 1; i++) {
-                // order[i+1] is the target panel
-                // order[i+1] - 1 is the (real) panel before the target panel
-                // targets[order[i+1] - 1] is the (real) target which will activate the target panel
-                int panelTarget = targetToActivatePanel[order[i+1]];
+        for (size_t i=0; i<order.size() - 1; i++) {
+                // Set the target of order[i] to order[i+1], using the "real" target as determined above.
+                const int panelTarget = targetToActivatePanel[order[i+1]];
                 WritePanelData<int>(panels[order[i]], TARGET, {panelTarget});
         }
 }
@@ -12,13 +12,13 @@ class WitnessRandomizer {
 public:
         WitnessRandomizer();
 
-        void Randomize(std::vector<int> &panels, int flags);
-        void RandomizeRange(std::vector<int> &panels, int flags, size_t startIndex, size_t endIndex);
+        void Randomize(const 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);
 
         template <class T>
-        std::vector<T> ReadPanelData(int panel, int offset, int size) {
+        std::vector<T> ReadPanelData(int panel, int offset, size_t size) {
                 return _memory.ReadData<T>({GLOBALS, 0x18, panel*8, offset}, size);
         }
 
@@ -81,6 +81,8 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
+    <CodeAnalysisRuleSet>NativeRecommendedRules.ruleset</CodeAnalysisRuleSet>
+    <RunCodeAnalysis>true</RunCodeAnalysis>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
@@ -134,7 +136,7 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <ClCompile>
-      <PrecompiledHeader>Use</PrecompiledHeader>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
       <WarningLevel>Level3</WarningLevel>
       <Optimization>MaxSpeed</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
@@ -143,6 +145,10 @@
       <PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
       <PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
+      <LanguageStandard>stdcpp17</LanguageStandard>
+      <EnablePREfast>true</EnablePREfast>
+      <TreatWarningAsError>true</TreatWarningAsError>
+      <DisableSpecificWarnings>26451</DisableSpecificWarnings>
     </ClCompile>
     <Link>
       <SubSystem>Console</SubSystem>