12 files changed, 196 insertions, 191 deletions

@@ -92,6 +92,7 @@
       <ConformanceMode>true</ConformanceMode>
       <AdditionalIncludeDirectories>..\Source;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <LanguageStandard>stdcpp17</LanguageStandard>
+      <TreatWarningAsError>true</TreatWarningAsError>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -109,6 +110,7 @@
       <LanguageStandard>stdcpp17</LanguageStandard>
       <AdditionalIncludeDirectories>..\Source;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <TreatWarningAsError>true</TreatWarningAsError>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -127,6 +129,7 @@
       <ConformanceMode>true</ConformanceMode>
       <LanguageStandard>stdcpp17</LanguageStandard>
       <AdditionalIncludeDirectories>..\Source;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <TreatWarningAsError>true</TreatWarningAsError>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -147,6 +150,7 @@
       <ConformanceMode>true</ConformanceMode>
       <LanguageStandard>stdcpp17</LanguageStandard>
       <AdditionalIncludeDirectories>..\Source;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <TreatWarningAsError>true</TreatWarningAsError>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -25,7 +25,7 @@ Memory::Memory(const std::string& processName) {
         // Next, get the process base address
         DWORD numModules;
         std::vector<HMODULE> moduleList(1024);
-        EnumProcessModulesEx(_handle, &moduleList[0], moduleList.size(), &numModules, 3);
+        EnumProcessModulesEx(_handle, &moduleList[0], static_cast<DWORD>(moduleList.size()), &numModules, 3);
 
         std::string name(64, 0);
         for (DWORD i = 0; i < numModules / sizeof(HMODULE); i++) {
@@ -49,7 +49,7 @@ Memory::~Memory() {
 
 void Memory::ThrowError() {
         std::string message(256, '\0');
-        FormatMessageA(4096, nullptr, GetLastError(), 1024, &message[0], message.length(), nullptr);
+        FormatMessageA(4096, nullptr, GetLastError(), 1024, &message[0], static_cast<DWORD>(message.length()), nullptr);
         std::cout << message.c_str() << std::endl;
         exit(EXIT_FAILURE);
 }
@@ -1,12 +1,13 @@
 #include "Panel.h"
 #include "Random.h"
 #include "Memory.h"
+#include "Randomizer.h"
 #include <sstream>
 
 template <class T>
 int 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;
+                if (data[i] == search) return static_cast<int>(i);
         }
         return -1;
 }
@@ -167,8 +168,8 @@ void Panel::WriteIntersections(int id) {
 
         for (int y=0; y<_height; y++) {
                 for (int x=0; x<_width; x++) {
-                        intersections.push_back(min + x * width_interval);
-                        intersections.push_back(min + y * height_interval);
+                        intersections.push_back(static_cast<float>(min + x * width_interval));
+                        intersections.push_back(static_cast<float>(min + y * height_interval));
                         int flags = 0;
                         if (find(_startpoints, {x, y}) != -1) flags |= IntersectionFlags::IS_STARTPOINT;
                         intersectionFlags.push_back(flags);
@@ -184,22 +185,22 @@ void Panel::WriteIntersections(int id) {
         }
 
         for (Endpoint endpoint : _endpoints) {
-                float xPos = min + endpoint.GetX() * width_interval;
-                float yPos = min + endpoint.GetY() * height_interval;
+                double xPos = min + endpoint.GetX() * width_interval;
+                double yPos = min + endpoint.GetY() * height_interval;
                 if (endpoint.GetDir()== Endpoint::Direction::LEFT) {
-                        xPos -= .05f;
+                        xPos -= .05;
                 } else if (endpoint.GetDir() == Endpoint::Direction::RIGHT) {
-                        xPos += .05f;
+                        xPos += .05;
                 } else if (endpoint.GetDir() == Endpoint::Direction::UP) {
-                        yPos += .05f; // Y position goes from 0 (bottom) to 1 (top), so this is reversed.
+                        yPos += .05; // Y position goes from 0 (bottom) to 1 (top), so this is reversed.
                 } else if (endpoint.GetDir() == Endpoint::Direction::DOWN) {
-                        yPos -= .05f;
+                        yPos -= .05;
                 }
-                intersections.push_back(xPos);
-                intersections.push_back(yPos);
+                intersections.push_back(static_cast<float>(xPos));
+                intersections.push_back(static_cast<float>(yPos));
 
                 connections.first.push_back(endpoint.GetY() * _width + endpoint.GetX()); // Target to connect to
-                connections.second.push_back(intersectionFlags.size()); // This endpoint
+                connections.second.push_back(static_cast<int>(intersectionFlags.size())); // This endpoint
                 intersectionFlags.push_back(IntersectionFlags::IS_ENDPOINT);
         }
 
@@ -1,6 +1,5 @@
 #pragma once
 #include "json.hpp"
-#include "RandomizerCore.h"
 #include "Memory.h"
 
 class Decoration
@@ -1,7 +1,7 @@
 #include <chrono>
 #include "Random.h"
 
-int Random::s_seed = time(nullptr); // Seed from the time in milliseconds
+int Random::s_seed = static_cast<int>(time(nullptr)); // Seed from the time in milliseconds
 
 void Random::SetSeed(int seed) {
         s_seed = seed;
@@ -21,7 +21,7 @@
 template <class T>
 int 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;
+                if (data[i] == search) return static_cast<int>(i);
         }
         std::cout << "Couldn't find " << search << " in data!" << std::endl;
         exit(-1);
@@ -44,10 +44,10 @@ void Randomizer::Randomize()
         _lastRandomizedFrame = GetCurrentFrame();
 
         // Content swaps -- must happen before squarePanels
-        Randomize(upDownPanels, SWAP_LINES);
-        Randomize(leftForwardRightPanels, SWAP_LINES);
+        Randomize(upDownPanels, SWAP::LINES);
+        Randomize(leftForwardRightPanels, SWAP::LINES);
 
-        Randomize(squarePanels, SWAP_LINES);
+        Randomize(squarePanels, SWAP::LINES);
 
         // Individual area modifications
         RandomizeTutorial();
@@ -88,7 +88,7 @@ void Randomizer::RandomizeSymmetry() {
 }
 
 void Randomizer::RandomizeDesert() {
-        Randomize(desertPanels, SWAP_LINES);
+        Randomize(desertPanels, SWAP::LINES);
 
         // Turn off desert surface 8
         _memory->WritePanelData<float>(0x09F94, POWER, {0.0, 0.0});
@@ -126,9 +126,9 @@ void Randomizer::RandomizeShadows() {
 
         std::vector<int> randomOrder(shadowsPanels.size(), 0);
         std::iota(randomOrder.begin(), randomOrder.end(), 0);
-        RandomizeRange(randomOrder, SWAP_NONE, 0, 8); // Tutorial
-        RandomizeRange(randomOrder, SWAP_NONE, 8, 16); // Avoid
-        RandomizeRange(randomOrder, SWAP_NONE, 16, 21); // Follow
+        RandomizeRange(randomOrder, SWAP::NONE, 0, 8); // Tutorial
+        RandomizeRange(randomOrder, SWAP::NONE, 8, 16); // Avoid
+        RandomizeRange(randomOrder, SWAP::NONE, 16, 21); // Follow
         ReassignTargets(shadowsPanels, randomOrder);
         // Turn off original starting panel
         _memory->WritePanelData<float>(shadowsPanels[0], POWER, {0.0f, 0.0f});
@@ -142,7 +142,7 @@ void Randomizer::RandomizeTown() {
 void Randomizer::RandomizeMonastery() {
         std::vector<int> randomOrder(monasteryPanels.size(), 0);
         std::iota(randomOrder.begin(), randomOrder.end(), 0);
-        RandomizeRange(randomOrder, SWAP_NONE, 3, 9); // Outer 2 & 3, Inner 1-4
+        RandomizeRange(randomOrder, SWAP::NONE, 3, 9); // Outer 2 & 3, Inner 1-4
         ReassignTargets(monasteryPanels, randomOrder);
 }
 
@@ -152,10 +152,10 @@ void Randomizer::RandomizeBunker() {
         // Randomize Tutorial 2-Advanced Tutorial 4 + Glass 1
         // Tutorial 1 cannot be randomized, since no other panel can start on
         // Glass 1 will become door + glass 1, due to the targetting system
-        RandomizeRange(randomOrder, SWAP_NONE, 1, 10);
+        RandomizeRange(randomOrder, SWAP::NONE, 1, 10);
         // Randomize Glass 1-3 into everything after the door/glass 1
         const size_t glass1Index = find(randomOrder, 9);
-        RandomizeRange(randomOrder, SWAP_NONE, glass1Index + 1, 12);
+        RandomizeRange(randomOrder, SWAP::NONE, glass1Index + 1, 12);
         ReassignTargets(bunkerPanels, randomOrder);
 }
 
@@ -163,8 +163,8 @@ void Randomizer::RandomizeJungle() {
         std::vector<int> randomOrder(junglePanels.size(), 0);
         std::iota(randomOrder.begin(), randomOrder.end(), 0);
         // Waves 1 cannot be randomized, since no other panel can start on
-        RandomizeRange(randomOrder, SWAP_NONE, 1, 7); // Waves 2-7
-        RandomizeRange(randomOrder, SWAP_NONE, 8, 13); // Pitches 1-6
+        RandomizeRange(randomOrder, SWAP::NONE, 1, 7); // Waves 2-7
+        RandomizeRange(randomOrder, SWAP::NONE, 8, 13); // Pitches 1-6
         ReassignTargets(junglePanels, randomOrder);
 }
 
@@ -175,8 +175,8 @@ void Randomizer::RandomizeSwamp() {
 
 void Randomizer::RandomizeMountain() {
         // Randomize lasers & some of mountain
-        Randomize(lasers, SWAP_TARGETS);
-        Randomize(mountainMultipanel, SWAP_LINES);
+        Randomize(lasers, SWAP::TARGETS);
+        Randomize(mountainMultipanel, SWAP::LINES);
 
         // Randomize final pillars order
         std::vector<int> targets = {pillars[0] + 1};
@@ -188,8 +188,8 @@ void Randomizer::RandomizeMountain() {
 
         std::vector<int> randomOrder(pillars.size(), 0);
         std::iota(randomOrder.begin(), randomOrder.end(), 0);
-        RandomizeRange(randomOrder, SWAP_NONE, 0, 4); // Left Pillars 1-4
-        RandomizeRange(randomOrder, SWAP_NONE, 5, 9); // Right Pillars 1-4
+        RandomizeRange(randomOrder, SWAP::NONE, 0, 4); // Left Pillars 1-4
+        RandomizeRange(randomOrder, SWAP::NONE, 5, 9); // Right Pillars 1-4
         ReassignTargets(pillars, randomOrder, targets);
         // Turn off original starting panels
         _memory->WritePanelData<float>(pillars[0], POWER, {0.0f, 0.0f});
@@ -206,7 +206,7 @@ void Randomizer::RandomizeMountain() {
 void Randomizer::RandomizeChallenge() {
         std::vector<int> randomOrder(challengePanels.size(), 0);
         std::iota(randomOrder.begin(), randomOrder.end(), 0);
-        RandomizeRange(randomOrder, SWAP_NONE, 1, 9); // Easy maze - Triple 2
+        RandomizeRange(randomOrder, SWAP::NONE, 1, 9); // Easy maze - Triple 2
         std::vector<int> triple1Target = _memory->ReadPanelData<int>(0x00C80, TARGET, 1);
         _memory->WritePanelData<int>(0x00CA1, TARGET, triple1Target);
         _memory->WritePanelData<int>(0x00CB9, TARGET, triple1Target);
@@ -219,7 +219,7 @@ void Randomizer::RandomizeChallenge() {
 void Randomizer::RandomizeAudioLogs() {
         std::vector<int> randomOrder(audiologs.size(), 0);
         std::iota(randomOrder.begin(), randomOrder.end(), 0);
-        Randomize(randomOrder, SWAP_NONE);
+        Randomize(randomOrder, SWAP::NONE);
         ReassignNames(audiologs, randomOrder);
 }
 
@@ -231,9 +231,9 @@ void Randomizer::Randomize(std::vector<int>& panels, int flags) {
 void Randomizer::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();
+        if (endIndex >= panels.size()) endIndex = static_cast<int>(panels.size());
         for (size_t i = endIndex-1; i > startIndex; i--) {
-                const size_t target = Random::RandInt(startIndex, i);
+                const int target = Random::RandInt(static_cast<int>(startIndex), static_cast<int>(i));
                 if (i != target) {
                         // std::cout << "Swapping panels " << std::hex << panels[i] << " and " << std::hex << panels[target] << std::endl;
                         SwapPanels(panels[i], panels[target], flags);
@@ -245,13 +245,13 @@ void Randomizer::RandomizeRange(std::vector<int> &panels, int flags, size_t star
 void Randomizer::SwapPanels(int panel1, int panel2, int flags) {
         std::map<int, int> offsets;
 
-        if (flags & SWAP_TARGETS) {
+        if (flags & SWAP::TARGETS) {
                 offsets[TARGET] = sizeof(int);
         }
-        if (flags & SWAP_AUDIO_NAMES) {
+        if (flags & SWAP::AUDIO_NAMES) {
                 offsets[AUDIO_LOG_NAME] = sizeof(void*);
         }
-        if (flags & SWAP_LINES) {
+        if (flags & SWAP::LINES) {
                 offsets[PATH_COLOR] = 16;
                 offsets[REFLECTION_PATH_COLOR] = 16;
                 offsets[DOT_COLOR] = 16;
@@ -1,5 +1,6 @@
 #pragma once
-#include "RandomizerCore.h"
+#include "Memory.h"
+#include <memory>
 
 class Randomizer {
 public:
@@ -10,6 +11,13 @@ public:
 
         void ClearOffsets() {_memory->ClearOffsets();}
 
+        enum SWAP {
+                NONE = 0,
+                TARGETS = 1,
+                LINES = 2,
+                AUDIO_NAMES = 4,
+        };
+
 private:
 
         int _lastRandomizedFrame = 1 << 30;
@@ -43,3 +51,137 @@ private:
 
         friend class SwapTests_Shipwreck_Test;
 };
+
+#if GLOBALS == 0x5B28C0
+#define PATH_COLOR 0xC8
+#define REFLECTION_PATH_COLOR 0xD8
+#define DOT_COLOR 0xF8
+#define ACTIVE_COLOR 0x108
+#define BACKGROUND_REGION_COLOR 0x118
+#define SUCCESS_COLOR_A 0x128
+#define SUCCESS_COLOR_B 0x138
+#define STROBE_COLOR_A 0x148
+#define STROBE_COLOR_B 0x158
+#define ERROR_COLOR 0x168
+#define PATTERN_POINT_COLOR 0x188
+#define PATTERN_POINT_COLOR_A 0x198
+#define PATTERN_POINT_COLOR_B 0x1A8
+#define SYMBOL_A 0x1B8
+#define SYMBOL_B 0x1C8
+#define SYMBOL_C 0x1D8
+#define SYMBOL_D 0x1E8
+#define SYMBOL_E 0x1F8
+#define PUSH_SYMBOL_COLORS 0x208
+#define OUTER_BACKGROUND 0x20C
+#define OUTER_BACKGROUND_MODE 0x21C
+#define TRACED_EDGES 0x230
+#define AUDIO_PREFIX 0x278
+#define POWER 0x2A8
+#define TARGET 0x2BC
+#define IS_CYLINDER 0x2FC
+#define CYLINDER_Z0 0x300
+#define CYLINDER_Z1 0x304
+#define CYLINDER_RADIUS 0x308
+#define CURSOR_SPEED_SCALE 0x358
+#define NEEDS_REDRAW 0x384
+#define SPECULAR_ADD 0x398
+#define SPECULAR_POWER 0x39C
+#define PATH_WIDTH_SCALE 0x3A4
+#define STARTPOINT_SCALE 0x3A8
+#define NUM_DOTS 0x3B8
+#define NUM_CONNECTIONS 0x3BC
+#define MAX_BROADCAST_DISTANCE 0x3C0
+#define DOT_POSITIONS 0x3C8
+#define DOT_FLAGS 0x3D0
+#define DOT_CONNECTION_A 0x3D8
+#define DOT_CONNECTION_B 0x3E0
+#define DECORATIONS 0x420
+#define DECORATION_FLAGS 0x428
+#define DECORATION_COLORS 0x430
+#define NUM_DECORATIONS 0x438
+#define REFLECTION_DATA 0x440
+#define GRID_SIZE_X 0x448
+#define GRID_SIZE_Y 0x44C
+#define STYLE_FLAGS 0x450
+#define SEQUENCE_LEN 0x45C
+#define SEQUENCE 0x460
+#define DOT_SEQUENCE_LEN 0x468
+#define DOT_SEQUENCE 0x470
+#define DOT_SEQUENCE_LEN_REFLECTION 0x478
+#define DOT_SEQUENCE_REFLECTION 0x480
+#define NUM_COLORED_REGIONS 0x4A0
+#define COLORED_REGIONS 0x4A8
+#define PANEL_TARGET 0x4B0
+#define SPECULAR_TEXTURE 0x4D8
+#define CABLE_TARGET_2 0xD8
+#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
+#define DOT_COLOR 0xF0
+#define ACTIVE_COLOR 0x100
+#define BACKGROUND_REGION_COLOR 0x110
+#define SUCCESS_COLOR_A 0x120
+#define SUCCESS_COLOR_B 0x130
+#define STROBE_COLOR_A 0x140
+#define STROBE_COLOR_B 0x150
+#define ERROR_COLOR 0x160
+#define PATTERN_POINT_COLOR 0x180
+#define PATTERN_POINT_COLOR_A 0x190
+#define PATTERN_POINT_COLOR_B 0x1A0
+#define SYMBOL_A 0x1B0
+#define SYMBOL_B 0x1C0
+#define SYMBOL_C 0x1D0
+#define SYMBOL_D 0x1E0
+#define SYMBOL_E 0x1F0
+#define PUSH_SYMBOL_COLORS 0x200
+#define OUTER_BACKGROUND 0x204
+#define OUTER_BACKGROUND_MODE 0x214
+#define TRACED_EDGES 0x228
+#define AUDIO_PREFIX 0x270
+#define POWER 0x2A0
+#define TARGET 0x2B4
+#define IS_CYLINDER 0x2F4
+#define CYLINDER_Z0 0x2F8
+#define CYLINDER_Z1 0x2FC
+#define CYLINDER_RADIUS 0x300
+#define CURSOR_SPEED_SCALE 0x350
+#define NEEDS_REDRAW 0x37C
+#define SPECULAR_ADD 0x38C
+#define SPECULAR_POWER 0x390
+#define PATH_WIDTH_SCALE 0x39C
+#define STARTPOINT_SCALE 0x3A0
+#define NUM_DOTS 0x3B4
+#define NUM_CONNECTIONS 0x3B8
+#define MAX_BROADCAST_DISTANCE 0x3BC
+#define DOT_POSITIONS 0x3C0
+#define DOT_FLAGS 0x3C8
+#define DOT_CONNECTION_A 0x3D0
+#define DOT_CONNECTION_B 0x3D8
+#define DECORATIONS 0x418
+#define DECORATION_FLAGS 0x420
+#define DECORATION_COLORS 0x428
+#define NUM_DECORATIONS 0x430
+#define REFLECTION_DATA 0x438
+#define GRID_SIZE_X 0x440
+#define GRID_SIZE_Y 0x444
+#define STYLE_FLAGS 0x448
+#define SEQUENCE_LEN 0x454
+#define SEQUENCE 0x458
+#define DOT_SEQUENCE_LEN 0x460
+#define DOT_SEQUENCE 0x468
+#define DOT_SEQUENCE_LEN_REFLECTION 0x470
+#define DOT_SEQUENCE_REFLECTION 0x478
+#define NUM_COLORED_REGIONS 0x498
+#define COLORED_REGIONS 0x4A0
+#define PANEL_TARGET 0x4A8
+#define SPECULAR_TEXTURE 0x4D0
+#define CABLE_TARGET_2 0xD0
+#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
@@ -1,147 +0,0 @@
-#pragma once
-#include "Memory.h"
-#include <memory>
-
-__declspec(selectany) int SWAP_NONE = 0x0;
-__declspec(selectany) int SWAP_TARGETS = 0x1;
-__declspec(selectany) int SWAP_LINES = 0x2;
-__declspec(selectany) int SWAP_AUDIO_NAMES = 0x4;
-
-class RandomizerCore
-{
-public:
-};
-
-#if GLOBALS == 0x5B28C0
-#define PATH_COLOR 0xC8
-#define REFLECTION_PATH_COLOR 0xD8
-#define DOT_COLOR 0xF8
-#define ACTIVE_COLOR 0x108
-#define BACKGROUND_REGION_COLOR 0x118
-#define SUCCESS_COLOR_A 0x128
-#define SUCCESS_COLOR_B 0x138
-#define STROBE_COLOR_A 0x148
-#define STROBE_COLOR_B 0x158
-#define ERROR_COLOR 0x168
-#define PATTERN_POINT_COLOR 0x188
-#define PATTERN_POINT_COLOR_A 0x198
-#define PATTERN_POINT_COLOR_B 0x1A8
-#define SYMBOL_A 0x1B8
-#define SYMBOL_B 0x1C8
-#define SYMBOL_C 0x1D8
-#define SYMBOL_D 0x1E8
-#define SYMBOL_E 0x1F8
-#define PUSH_SYMBOL_COLORS 0x208
-#define OUTER_BACKGROUND 0x20C
-#define OUTER_BACKGROUND_MODE 0x21C
-#define TRACED_EDGES 0x230
-#define AUDIO_PREFIX 0x278
-#define POWER 0x2A8
-#define TARGET 0x2BC
-#define IS_CYLINDER 0x2FC
-#define CYLINDER_Z0 0x300
-#define CYLINDER_Z1 0x304
-#define CYLINDER_RADIUS 0x308
-#define CURSOR_SPEED_SCALE 0x358
-#define NEEDS_REDRAW 0x384
-#define SPECULAR_ADD 0x398
-#define SPECULAR_POWER 0x39C
-#define PATH_WIDTH_SCALE 0x3A4
-#define STARTPOINT_SCALE 0x3A8
-#define NUM_DOTS 0x3B8
-#define NUM_CONNECTIONS 0x3BC
-#define MAX_BROADCAST_DISTANCE 0x3C0
-#define DOT_POSITIONS 0x3C8
-#define DOT_FLAGS 0x3D0
-#define DOT_CONNECTION_A 0x3D8
-#define DOT_CONNECTION_B 0x3E0
-#define DECORATIONS 0x420
-#define DECORATION_FLAGS 0x428
-#define DECORATION_COLORS 0x430
-#define NUM_DECORATIONS 0x438
-#define REFLECTION_DATA 0x440
-#define GRID_SIZE_X 0x448
-#define GRID_SIZE_Y 0x44C
-#define STYLE_FLAGS 0x450
-#define SEQUENCE_LEN 0x45C
-#define SEQUENCE 0x460
-#define DOT_SEQUENCE_LEN 0x468
-#define DOT_SEQUENCE 0x470
-#define DOT_SEQUENCE_LEN_REFLECTION 0x478
-#define DOT_SEQUENCE_REFLECTION 0x480
-#define NUM_COLORED_REGIONS 0x4A0
-#define COLORED_REGIONS 0x4A8
-#define PANEL_TARGET 0x4B0
-#define SPECULAR_TEXTURE 0x4D8
-#define CABLE_TARGET_2 0xD8
-#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
-#define DOT_COLOR 0xF0
-#define ACTIVE_COLOR 0x100
-#define BACKGROUND_REGION_COLOR 0x110
-#define SUCCESS_COLOR_A 0x120
-#define SUCCESS_COLOR_B 0x130
-#define STROBE_COLOR_A 0x140
-#define STROBE_COLOR_B 0x150
-#define ERROR_COLOR 0x160
-#define PATTERN_POINT_COLOR 0x180
-#define PATTERN_POINT_COLOR_A 0x190
-#define PATTERN_POINT_COLOR_B 0x1A0
-#define SYMBOL_A 0x1B0
-#define SYMBOL_B 0x1C0
-#define SYMBOL_C 0x1D0
-#define SYMBOL_D 0x1E0
-#define SYMBOL_E 0x1F0
-#define PUSH_SYMBOL_COLORS 0x200
-#define OUTER_BACKGROUND 0x204
-#define OUTER_BACKGROUND_MODE 0x214
-#define TRACED_EDGES 0x228
-#define AUDIO_PREFIX 0x270
-#define POWER 0x2A0
-#define TARGET 0x2B4
-#define IS_CYLINDER 0x2F4
-#define CYLINDER_Z0 0x2F8
-#define CYLINDER_Z1 0x2FC
-#define CYLINDER_RADIUS 0x300
-#define CURSOR_SPEED_SCALE 0x350
-#define NEEDS_REDRAW 0x37C
-#define SPECULAR_ADD 0x38C
-#define SPECULAR_POWER 0x390
-#define PATH_WIDTH_SCALE 0x39C
-#define STARTPOINT_SCALE 0x3A0
-#define NUM_DOTS 0x3B4
-#define NUM_CONNECTIONS 0x3B8
-#define MAX_BROADCAST_DISTANCE 0x3BC
-#define DOT_POSITIONS 0x3C0
-#define DOT_FLAGS 0x3C8
-#define DOT_CONNECTION_A 0x3D0
-#define DOT_CONNECTION_B 0x3D8
-#define DECORATIONS 0x418
-#define DECORATION_FLAGS 0x420
-#define DECORATION_COLORS 0x428
-#define NUM_DECORATIONS 0x430
-#define REFLECTION_DATA 0x438
-#define GRID_SIZE_X 0x440
-#define GRID_SIZE_Y 0x444
-#define STYLE_FLAGS 0x448
-#define SEQUENCE_LEN 0x454
-#define SEQUENCE 0x458
-#define DOT_SEQUENCE_LEN 0x460
-#define DOT_SEQUENCE 0x468
-#define DOT_SEQUENCE_LEN_REFLECTION 0x470
-#define DOT_SEQUENCE_REFLECTION 0x478
-#define NUM_COLORED_REGIONS 0x498
-#define COLORED_REGIONS 0x4A0
-#define PANEL_TARGET 0x4A8
-#define SPECULAR_TEXTURE 0x4D0
-#define CABLE_TARGET_2 0xD0
-#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
@@ -91,6 +91,7 @@
       <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
       <LanguageStandard>stdcpp17</LanguageStandard>
+      <TreatWarningAsError>true</TreatWarningAsError>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -107,6 +108,7 @@
       <ConformanceMode>true</ConformanceMode>
       <LanguageStandard>stdcpp17</LanguageStandard>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <TreatWarningAsError>true</TreatWarningAsError>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -124,6 +126,7 @@
       <PreprocessorDefinitions>WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
       <LanguageStandard>stdcpp17</LanguageStandard>
+      <TreatWarningAsError>true</TreatWarningAsError>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -143,6 +146,7 @@
       <PreprocessorDefinitions>NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
       <LanguageStandard>stdcpp17</LanguageStandard>
+      <TreatWarningAsError>true</TreatWarningAsError>
     </ClCompile>
     <Link>
       <SubSystem>Windows</SubSystem>
@@ -158,14 +162,12 @@
     <ClInclude Include="Panels.h" />
     <ClInclude Include="Random.h" />
     <ClInclude Include="Randomizer.h" />
-    <ClInclude Include="RandomizerCore.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="Memory.cpp" />
     <ClCompile Include="Panel.cpp" />
     <ClCompile Include="Random.cpp" />
     <ClCompile Include="Randomizer.cpp" />
-    <ClCompile Include="RandomizerCore.cpp" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
@@ -9,6 +9,6 @@ GTEST_TEST(SwapTests, Shipwreck) {
         int bu1 = 0x6;
         int td1 = 0x5D;
 
-        randomizer.SwapPanels(si1, td1, SWAP_LINES);
+        randomizer.SwapPanels(si1, td1, Randomizer::SWAP::LINES);
 
 }
@@ -61,6 +61,7 @@
       <WarningLevel>Level3</WarningLevel>
       <AdditionalIncludeDirectories>..\Source;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <DisableSpecificWarnings>4996</DisableSpecificWarnings>
+      <TreatWarningAsError>true</TreatWarningAsError>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -79,6 +80,7 @@
       <WarningLevel>Level3</WarningLevel>
       <AdditionalIncludeDirectories>..\Source;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <DisableSpecificWarnings>4996</DisableSpecificWarnings>
+      <TreatWarningAsError>true</TreatWarningAsError>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -95,6 +97,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <AdditionalIncludeDirectories>..\Source;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <DisableSpecificWarnings>4996</DisableSpecificWarnings>
+      <TreatWarningAsError>true</TreatWarningAsError>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>
@@ -113,6 +116,7 @@
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <AdditionalIncludeDirectories>..\Source;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <DisableSpecificWarnings>4996</DisableSpecificWarnings>
+      <TreatWarningAsError>true</TreatWarningAsError>
     </ClCompile>
     <Link>
       <GenerateDebugInformation>true</GenerateDebugInformation>