From a0e7ec171d68a17f8bcaeb5d8f4af881c3510280 Mon Sep 17 00:00:00 2001 From: jbzdarkid Date: Mon, 25 Nov 2019 21:13:11 -0800 Subject: RM duplicate includes --- Source/ChallengeRandomizer.cpp | 1 - Source/Puzzle.cpp | 1 - Source/PuzzleSerializer.cpp | 4 ---- Source/PuzzleSerializer.h | 1 - Source/Randomizer.cpp | 1 - Source/Randomizer2.cpp | 1 - Source/Randomizer2Core.cpp | 1 - Source/Solver.cpp | 1 - Source/Validator.cpp | 1 - Source/pch.h | 1 + 10 files changed, 1 insertion(+), 12 deletions(-) (limited to 'Source') diff --git a/Source/ChallengeRandomizer.cpp b/Source/ChallengeRandomizer.cpp index b497564..976374e 100644 --- a/Source/ChallengeRandomizer.cpp +++ b/Source/ChallengeRandomizer.cpp @@ -1,6 +1,5 @@ #include "pch.h" #include "ChallengeRandomizer.h" -#include "Memory.h" // Modify an opcode to use RNG2 instead of main RNG void ChallengeRandomizer::AdjustRng(int offset) { diff --git a/Source/Puzzle.cpp b/Source/Puzzle.cpp index 15352ed..f0664c7 100644 --- a/Source/Puzzle.cpp +++ b/Source/Puzzle.cpp @@ -1,6 +1,5 @@ #include "pch.h" #include "Puzzle.h" -#include "Memory.h" Cell Puzzle::GetCell(int x, int y) const { x = Mod(x); diff --git a/Source/PuzzleSerializer.cpp b/Source/PuzzleSerializer.cpp index 33f6da6..29bd648 100644 --- a/Source/PuzzleSerializer.cpp +++ b/Source/PuzzleSerializer.cpp @@ -1,9 +1,5 @@ #include "pch.h" #include "PuzzleSerializer.h" -#include "Memory.h" - -#pragma warning (disable:26451) -#pragma warning (disable:26812) PuzzleSerializer::PuzzleSerializer(const std::shared_ptr& memory) : _memory(memory) {} diff --git a/Source/PuzzleSerializer.h b/Source/PuzzleSerializer.h index e1ee3e8..7f1a988 100644 --- a/Source/PuzzleSerializer.h +++ b/Source/PuzzleSerializer.h @@ -1,5 +1,4 @@ #pragma once -#include "Puzzle.h" class PuzzleSerializer { public: diff --git a/Source/Randomizer.cpp b/Source/Randomizer.cpp index e70cf44..01d1e2e 100644 --- a/Source/Randomizer.cpp +++ b/Source/Randomizer.cpp @@ -92,7 +92,6 @@ Things to do for V2: * Random *rotation* of desert laser redirect? */ #include "pch.h" -#include "Memory.h" #include "Randomizer.h" #include "ChallengeRandomizer.h" #include "Panels.h" diff --git a/Source/Randomizer2.cpp b/Source/Randomizer2.cpp index 4f0bad0..4968666 100644 --- a/Source/Randomizer2.cpp +++ b/Source/Randomizer2.cpp @@ -2,7 +2,6 @@ #include "Randomizer2.h" #include "PuzzleSerializer.h" #include "Randomizer2Core.h" -#include "Puzzle.h" #include "Random.h" #include "Solver.h" #include "Windows.h" diff --git a/Source/Randomizer2Core.cpp b/Source/Randomizer2Core.cpp index 89294ef..401743f 100644 --- a/Source/Randomizer2Core.cpp +++ b/Source/Randomizer2Core.cpp @@ -1,6 +1,5 @@ #include "pch.h" #include "Randomizer2Core.h" -#include "Puzzle.h" #include "Random.h" std::vector Randomizer2Core::CutEdges(const Puzzle& p, size_t numEdges) { diff --git a/Source/Solver.cpp b/Source/Solver.cpp index e09cba2..ac660a2 100644 --- a/Source/Solver.cpp +++ b/Source/Solver.cpp @@ -1,6 +1,5 @@ #include "pch.h" #include "Solver.h" -#include "Puzzle.h" #include "Validator.h" int Solver::MAX_SOLUTIONS = 10000; diff --git a/Source/Validator.cpp b/Source/Validator.cpp index cb0ffa8..3001790 100644 --- a/Source/Validator.cpp +++ b/Source/Validator.cpp @@ -1,6 +1,5 @@ #include "pch.h" #include "Validator.h" -#include "Puzzle.h" void Validator::Validate(Puzzle& p) { // console.log('Validating', puzzle); diff --git a/Source/pch.h b/Source/pch.h index d431d61..9e39f33 100644 --- a/Source/pch.h +++ b/Source/pch.h @@ -20,6 +20,7 @@ #include #pragma warning (disable: 26451) // Potential arithmetic overflow +#pragma warning (disable: 26812) // Unscoped enum type #include "MemoryException.h" #include "Memory.h" -- cgit 1.4.1