From ac83733b590f3c0750bea1de3556ceb24fa0a4b1 Mon Sep 17 00:00:00 2001 From: jbzdarkid Date: Mon, 25 Nov 2019 21:10:50 -0800 Subject: Using PCH to clean up includes --- Source/Randomizer.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'Source/Randomizer.cpp') diff --git a/Source/Randomizer.cpp b/Source/Randomizer.cpp index 1427f4d..e70cf44 100644 --- a/Source/Randomizer.cpp +++ b/Source/Randomizer.cpp @@ -91,14 +91,12 @@ Things to do for V2: * 20 challenges with 20 consecutive seeds * Random *rotation* of desert laser redirect? */ +#include "pch.h" #include "Memory.h" #include "Randomizer.h" #include "ChallengeRandomizer.h" #include "Panels.h" #include "Random.h" -#include -#include -#include template int find(const std::vector &data, T search, size_t startIndex = 0) { @@ -250,8 +248,8 @@ void Randomizer::RandomizeTown() { // Ensure that we open the gate before the final puzzle (by swapping) int panel3Index = find(randomOrder, 3); int panel4Index = find(randomOrder, 4); - randomOrder[min(panel3Index, panel4Index)] = 3; - randomOrder[max(panel3Index, panel4Index)] = 4; + randomOrder[std::min(panel3Index, panel4Index)] = 3; + randomOrder[std::max(panel3Index, panel4Index)] = 4; ReassignTargets(orchard, randomOrder); } -- cgit 1.4.1