From e762e48d6fbab7bd5137c369fa49df25ccd5369d Mon Sep 17 00:00:00 2001 From: jbzdarkid Date: Wed, 7 Nov 2018 08:41:20 -0800 Subject: Warnings clean because fml --- App/App.vcxproj | 4 ++ Source/Memory.cpp | 4 +- Source/Panel.cpp | 25 ++++---- Source/Panel.h | 1 - Source/Random.cpp | 2 +- Source/Randomizer.cpp | 48 +++++++-------- Source/Randomizer.h | 144 ++++++++++++++++++++++++++++++++++++++++++++- Source/RandomizerCore.cpp | 0 Source/RandomizerCore.h | 147 ---------------------------------------------- Source/Source.vcxproj | 6 +- Test/Temp.cpp | 2 +- Test/Test.vcxproj | 4 ++ 12 files changed, 196 insertions(+), 191 deletions(-) delete mode 100644 Source/RandomizerCore.cpp delete mode 100644 Source/RandomizerCore.h diff --git a/App/App.vcxproj b/App/App.vcxproj index e5d0f94..1633837 100644 --- a/App/App.vcxproj +++ b/App/App.vcxproj @@ -92,6 +92,7 @@ true ..\Source;%(AdditionalIncludeDirectories) stdcpp17 + true Windows @@ -109,6 +110,7 @@ stdcpp17 ..\Source;%(AdditionalIncludeDirectories) MultiThreadedDebug + true Windows @@ -127,6 +129,7 @@ true stdcpp17 ..\Source;%(AdditionalIncludeDirectories) + true Windows @@ -147,6 +150,7 @@ true stdcpp17 ..\Source;%(AdditionalIncludeDirectories) + true Windows diff --git a/Source/Memory.cpp b/Source/Memory.cpp index 168b4e2..0afeded 100644 --- a/Source/Memory.cpp +++ b/Source/Memory.cpp @@ -25,7 +25,7 @@ Memory::Memory(const std::string& processName) { // Next, get the process base address DWORD numModules; std::vector moduleList(1024); - EnumProcessModulesEx(_handle, &moduleList[0], moduleList.size(), &numModules, 3); + EnumProcessModulesEx(_handle, &moduleList[0], static_cast(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(message.length()), nullptr); std::cout << message.c_str() << std::endl; exit(EXIT_FAILURE); } diff --git a/Source/Panel.cpp b/Source/Panel.cpp index 14f803c..8642461 100644 --- a/Source/Panel.cpp +++ b/Source/Panel.cpp @@ -1,12 +1,13 @@ #include "Panel.h" #include "Random.h" #include "Memory.h" +#include "Randomizer.h" #include template int find(const std::vector &data, T search, size_t startIndex = 0) { for (size_t i=startIndex ; i(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(min + x * width_interval)); + intersections.push_back(static_cast(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(xPos)); + intersections.push_back(static_cast(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(intersectionFlags.size())); // This endpoint intersectionFlags.push_back(IntersectionFlags::IS_ENDPOINT); } diff --git a/Source/Panel.h b/Source/Panel.h index 4f3ab11..f4f4080 100644 --- a/Source/Panel.h +++ b/Source/Panel.h @@ -1,6 +1,5 @@ #pragma once #include "json.hpp" -#include "RandomizerCore.h" #include "Memory.h" class Decoration diff --git a/Source/Random.cpp b/Source/Random.cpp index d8f5eb2..d6e86a6 100644 --- a/Source/Random.cpp +++ b/Source/Random.cpp @@ -1,7 +1,7 @@ #include #include "Random.h" -int Random::s_seed = time(nullptr); // Seed from the time in milliseconds +int Random::s_seed = static_cast(time(nullptr)); // Seed from the time in milliseconds void Random::SetSeed(int seed) { s_seed = seed; diff --git a/Source/Randomizer.cpp b/Source/Randomizer.cpp index aaddf21..ce784be 100644 --- a/Source/Randomizer.cpp +++ b/Source/Randomizer.cpp @@ -21,7 +21,7 @@ template int find(const std::vector &data, T search, size_t startIndex = 0) { for (size_t i=startIndex ; i(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(0x09F94, POWER, {0.0, 0.0}); @@ -126,9 +126,9 @@ void Randomizer::RandomizeShadows() { std::vector 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(shadowsPanels[0], POWER, {0.0f, 0.0f}); @@ -142,7 +142,7 @@ void Randomizer::RandomizeTown() { void Randomizer::RandomizeMonastery() { std::vector 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 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 targets = {pillars[0] + 1}; @@ -188,8 +188,8 @@ void Randomizer::RandomizeMountain() { std::vector 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(pillars[0], POWER, {0.0f, 0.0f}); @@ -206,7 +206,7 @@ void Randomizer::RandomizeMountain() { void Randomizer::RandomizeChallenge() { std::vector 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 triple1Target = _memory->ReadPanelData(0x00C80, TARGET, 1); _memory->WritePanelData(0x00CA1, TARGET, triple1Target); _memory->WritePanelData(0x00CB9, TARGET, triple1Target); @@ -219,7 +219,7 @@ void Randomizer::RandomizeChallenge() { void Randomizer::RandomizeAudioLogs() { std::vector 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& panels, int flags) { void Randomizer::RandomizeRange(std::vector &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(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(startIndex), static_cast(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 &panels, int flags, size_t star void Randomizer::SwapPanels(int panel1, int panel2, int flags) { std::map 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; diff --git a/Source/Randomizer.h b/Source/Randomizer.h index c9603ac..fa7bc4c 100644 --- a/Source/Randomizer.h +++ b/Source/Randomizer.h @@ -1,5 +1,6 @@ #pragma once -#include "RandomizerCore.h" +#include "Memory.h" +#include 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 diff --git a/Source/RandomizerCore.cpp b/Source/RandomizerCore.cpp deleted file mode 100644 index e69de29..0000000 diff --git a/Source/RandomizerCore.h b/Source/RandomizerCore.h deleted file mode 100644 index 89560b6..0000000 --- a/Source/RandomizerCore.h +++ /dev/null @@ -1,147 +0,0 @@ -#pragma once -#include "Memory.h" -#include - -__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 diff --git a/Source/Source.vcxproj b/Source/Source.vcxproj index 8d13e00..545753d 100644 --- a/Source/Source.vcxproj +++ b/Source/Source.vcxproj @@ -91,6 +91,7 @@ WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions) true stdcpp17 + true Windows @@ -107,6 +108,7 @@ true stdcpp17 MultiThreadedDebug + true Windows @@ -124,6 +126,7 @@ WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions) true stdcpp17 + true Windows @@ -143,6 +146,7 @@ NDEBUG;_LIB;%(PreprocessorDefinitions) true stdcpp17 + true Windows @@ -158,14 +162,12 @@ - - diff --git a/Test/Temp.cpp b/Test/Temp.cpp index 3d589c1..14f3bbf 100644 --- a/Test/Temp.cpp +++ b/Test/Temp.cpp @@ -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); } diff --git a/Test/Test.vcxproj b/Test/Test.vcxproj index 75e22a9..a6d8f75 100644 --- a/Test/Test.vcxproj +++ b/Test/Test.vcxproj @@ -61,6 +61,7 @@ Level3 ..\Source;%(AdditionalIncludeDirectories) 4996 + true true @@ -79,6 +80,7 @@ Level3 ..\Source;%(AdditionalIncludeDirectories) 4996 + true true @@ -95,6 +97,7 @@ ProgramDatabase ..\Source;%(AdditionalIncludeDirectories) 4996 + true true @@ -113,6 +116,7 @@ ProgramDatabase ..\Source;%(AdditionalIncludeDirectories) 4996 + true true -- cgit 1.4.1