From 669717268201197412c69df36e65883b0af6fac8 Mon Sep 17 00:00:00 2001 From: jbzdarkid Date: Mon, 5 Nov 2018 10:06:37 -0800 Subject: Tests work now, + other cleanup --- App/App.ico | Bin 46227 -> 0 bytes App/App.vcxproj | 32 +++++++++++--------------------- App/App.vcxproj.filters | 43 ------------------------------------------- App/Main.cpp | 30 +++++++++++++++--------------- App/small.ico | Bin 46227 -> 0 bytes 5 files changed, 26 insertions(+), 79 deletions(-) delete mode 100644 App/App.ico delete mode 100644 App/App.vcxproj.filters delete mode 100644 App/small.ico (limited to 'App') diff --git a/App/App.ico b/App/App.ico deleted file mode 100644 index b3ec03b..0000000 Binary files a/App/App.ico and /dev/null differ diff --git a/App/App.vcxproj b/App/App.vcxproj index b17f7a6..fbcb337 100644 --- a/App/App.vcxproj +++ b/App/App.vcxproj @@ -20,11 +20,10 @@ 15.0 - {CED79182-F36B-4D07-AD0E-249C15BFAD73} + {235D27F1-9907-489B-8D58-636A0C5CD079} Win32Proj App 10.0.17134.0 - App @@ -82,7 +81,6 @@ false - WitnessRandomizer @@ -92,9 +90,8 @@ true WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) true - true + C:\Users\localhost\Documents\GitHub\WitnessRandomizer\Source;%(AdditionalIncludeDirectories) stdcpp17 - MultiThreadedDebug Windows @@ -104,15 +101,14 @@ NotUsing - Level2 + Level3 Disabled true _DEBUG;_WINDOWS;%(PreprocessorDefinitions) true - true stdcpp17 + C:\Users\localhost\Documents\GitHub\WitnessRandomizer\Source;%(AdditionalIncludeDirectories) MultiThreadedDebug - C:\Users\localhost\Documents\GitHub\witness-randomizer\Source;%(AdditionalIncludeDirectories) Windows @@ -129,10 +125,8 @@ true WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) true - true - EditAndContinue stdcpp17 - MultiThreaded + C:\Users\localhost\Documents\GitHub\WitnessRandomizer\Source;%(AdditionalIncludeDirectories) Windows @@ -144,18 +138,15 @@ NotUsing - Level2 + Level3 MaxSpeed true true true NDEBUG;_WINDOWS;%(PreprocessorDefinitions) true - true stdcpp17 - None - MultiThreaded - C:\Users\localhost\Documents\GitHub\witness-randomizer\Source;%(AdditionalIncludeDirectories) + C:\Users\localhost\Documents\GitHub\WitnessRandomizer\Source;%(AdditionalIncludeDirectories) Windows @@ -165,6 +156,7 @@ + @@ -174,11 +166,9 @@ - - - - - + + {6b5df051-a51a-48cb-8acd-c6fad726019f} + diff --git a/App/App.vcxproj.filters b/App/App.vcxproj.filters deleted file mode 100644 index 26b3d34..0000000 --- a/App/App.vcxproj.filters +++ /dev/null @@ -1,43 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hh;hpp;hxx;hm;inl;inc;ipp;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - - - Header Files - - - - - Source Files - - - - - Resource Files - - - - - Resource Files - - - Resource Files - - - - - - \ No newline at end of file diff --git a/App/Main.cpp b/App/Main.cpp index ce0e550..48cb93d 100644 --- a/App/Main.cpp +++ b/App/Main.cpp @@ -3,9 +3,9 @@ #include -#include "Randomizer.h" #include "Version.h" #include "Random.h" +#include "Randomizer.h" #include "Panel.h" #define IDC_RANDOMIZE 0x401 @@ -18,8 +18,8 @@ #define IDC_DUMP 0x408 HWND hwndSeed, hwndRandomize; -// int panel = 0x18AF; -int panel = 0x33D4; +int panel = 0x18AF; +// int panel = 0x33D4; std::shared_ptr _panel; LRESULT CALLBACK WndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) @@ -53,16 +53,16 @@ LRESULT CALLBACK WndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) wasSeedRandomlyGenerated = false; } - Randomizer randomizer; - short metadata = randomizer.Randomize(seed); - if (metadata & 0x1) break; // Was already randomized + Randomizer randomizer; + short metadata = randomizer.Randomize(seed); + if (metadata & 0x1) break; // Was already randomized - std::wstring seedString = std::to_wstring(seed); - SetWindowText(hwndSeed, seedString.c_str()); - if (IsDlgButtonChecked(hwnd, IDC_TOGGLESPEED)) { - randomizer.AdjustSpeed(); - } - SetWindowText(hwndRandomize, L"Randomized!"); + std::wstring seedString = std::to_wstring(seed); + SetWindowText(hwndSeed, seedString.c_str()); + if (IsDlgButtonChecked(hwnd, IDC_TOGGLESPEED)) { + randomizer.AdjustSpeed(); + } + SetWindowText(hwndRandomize, L"Randomized!"); break; } case IDC_READ: @@ -75,7 +75,7 @@ LRESULT CALLBACK WndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) _panel->Write(panel); break; case IDC_DUMP: - _panel->Serialize(); + // _panel->Serialize(); break; } } @@ -113,7 +113,7 @@ int APIENTRY wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpCmd WS_TABSTOP | WS_VISIBLE | WS_CHILD | SS_LEFT, 10, 15, 90, 16, hwnd, NULL, hInstance, NULL); hwndSeed = CreateWindow(MSFTEDIT_CLASS, L"", - WS_TABSTOP | WS_VISIBLE | WS_CHILD | WS_BORDER, + WS_TABSTOP | WS_VISIBLE | WS_CHILD | WS_BORDER, 100, 10, 50, 26, hwnd, NULL, hInstance, NULL); hwndRandomize = CreateWindow(L"BUTTON", L"Randomize", WS_TABSTOP | WS_VISIBLE | WS_CHILD | BS_DEFPUSHBUTTON, @@ -176,7 +176,7 @@ int APIENTRY wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpCmd CreateWindow(L"STATIC", L"Prevent sniping certain puzzles", WS_TABSTOP | WS_VISIBLE | WS_CHILD | SS_LEFT, 27, 50, 205, 16, hwnd, NULL, hInstance, NULL); - + */ ShowWindow(hwnd, nCmdShow); diff --git a/App/small.ico b/App/small.ico deleted file mode 100644 index b3ec03b..0000000 Binary files a/App/small.ico and /dev/null differ -- cgit 1.4.1