diff options
| author | jbzdarkid <jbzdarkid@gmail.com> | 2019-11-25 21:13:11 -0800 |
|---|---|---|
| committer | jbzdarkid <jbzdarkid@gmail.com> | 2019-11-25 21:13:11 -0800 |
| commit | a0e7ec171d68a17f8bcaeb5d8f4af881c3510280 (patch) | |
| tree | 8481c89da8d6c57ff7256b40af26e205bcce0493 | |
| parent | ac83733b590f3c0750bea1de3556ceb24fa0a4b1 (diff) | |
| download | witness-tutorializer-a0e7ec171d68a17f8bcaeb5d8f4af881c3510280.tar.gz witness-tutorializer-a0e7ec171d68a17f8bcaeb5d8f4af881c3510280.tar.bz2 witness-tutorializer-a0e7ec171d68a17f8bcaeb5d8f4af881c3510280.zip | |
RM duplicate includes
| -rw-r--r-- | App/Main.cpp | 1 | ||||
| -rw-r--r-- | Source/ChallengeRandomizer.cpp | 1 | ||||
| -rw-r--r-- | Source/Puzzle.cpp | 1 | ||||
| -rw-r--r-- | Source/PuzzleSerializer.cpp | 4 | ||||
| -rw-r--r-- | Source/PuzzleSerializer.h | 1 | ||||
| -rw-r--r-- | Source/Randomizer.cpp | 1 | ||||
| -rw-r--r-- | Source/Randomizer2.cpp | 1 | ||||
| -rw-r--r-- | Source/Randomizer2Core.cpp | 1 | ||||
| -rw-r--r-- | Source/Solver.cpp | 1 | ||||
| -rw-r--r-- | Source/Validator.cpp | 1 | ||||
| -rw-r--r-- | Source/pch.h | 1 |
11 files changed, 1 insertions, 13 deletions
| diff --git a/App/Main.cpp b/App/Main.cpp index 4bd009a..7f15236 100644 --- a/App/Main.cpp +++ b/App/Main.cpp | |||
| @@ -17,7 +17,6 @@ | |||
| 17 | #define SPEED_UP_AUTOSCROLLERS 0x408 | 17 | #define SPEED_UP_AUTOSCROLLERS 0x408 |
| 18 | 18 | ||
| 19 | /* ------- Temp ------- */ | 19 | /* ------- Temp ------- */ |
| 20 | #include "Puzzle.h" | ||
| 21 | #include "Solver.h" | 20 | #include "Solver.h" |
| 22 | #include "PuzzleSerializer.h" | 21 | #include "PuzzleSerializer.h" |
| 23 | #include <sstream> | 22 | #include <sstream> |
| 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 @@ | |||
| 1 | #include "pch.h" | 1 | #include "pch.h" |
| 2 | #include "ChallengeRandomizer.h" | 2 | #include "ChallengeRandomizer.h" |
| 3 | #include "Memory.h" | ||
| 4 | 3 | ||
| 5 | // Modify an opcode to use RNG2 instead of main RNG | 4 | // Modify an opcode to use RNG2 instead of main RNG |
| 6 | void ChallengeRandomizer::AdjustRng(int offset) { | 5 | 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 @@ | |||
| 1 | #include "pch.h" | 1 | #include "pch.h" |
| 2 | #include "Puzzle.h" | 2 | #include "Puzzle.h" |
| 3 | #include "Memory.h" | ||
| 4 | 3 | ||
| 5 | Cell Puzzle::GetCell(int x, int y) const { | 4 | Cell Puzzle::GetCell(int x, int y) const { |
| 6 | x = Mod(x); | 5 | 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 @@ | |||
| 1 | #include "pch.h" | 1 | #include "pch.h" |
| 2 | #include "PuzzleSerializer.h" | 2 | #include "PuzzleSerializer.h" |
| 3 | #include "Memory.h" | ||
| 4 | |||
| 5 | #pragma warning (disable:26451) | ||
| 6 | #pragma warning (disable:26812) | ||
| 7 | 3 | ||
| 8 | PuzzleSerializer::PuzzleSerializer(const std::shared_ptr<Memory>& memory) : _memory(memory) {} | 4 | PuzzleSerializer::PuzzleSerializer(const std::shared_ptr<Memory>& memory) : _memory(memory) {} |
| 9 | 5 | ||
| 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 @@ | |||
| 1 | #pragma once | 1 | #pragma once |
| 2 | #include "Puzzle.h" | ||
| 3 | 2 | ||
| 4 | class PuzzleSerializer { | 3 | class PuzzleSerializer { |
| 5 | public: | 4 | 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: | |||
| 92 | * Random *rotation* of desert laser redirect? | 92 | * Random *rotation* of desert laser redirect? |
| 93 | */ | 93 | */ |
| 94 | #include "pch.h" | 94 | #include "pch.h" |
| 95 | #include "Memory.h" | ||
| 96 | #include "Randomizer.h" | 95 | #include "Randomizer.h" |
| 97 | #include "ChallengeRandomizer.h" | 96 | #include "ChallengeRandomizer.h" |
| 98 | #include "Panels.h" | 97 | #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 @@ | |||
| 2 | #include "Randomizer2.h" | 2 | #include "Randomizer2.h" |
| 3 | #include "PuzzleSerializer.h" | 3 | #include "PuzzleSerializer.h" |
| 4 | #include "Randomizer2Core.h" | 4 | #include "Randomizer2Core.h" |
| 5 | #include "Puzzle.h" | ||
| 6 | #include "Random.h" | 5 | #include "Random.h" |
| 7 | #include "Solver.h" | 6 | #include "Solver.h" |
| 8 | #include "Windows.h" | 7 | #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 @@ | |||
| 1 | #include "pch.h" | 1 | #include "pch.h" |
| 2 | #include "Randomizer2Core.h" | 2 | #include "Randomizer2Core.h" |
| 3 | #include "Puzzle.h" | ||
| 4 | #include "Random.h" | 3 | #include "Random.h" |
| 5 | 4 | ||
| 6 | std::vector<Pos> Randomizer2Core::CutEdges(const Puzzle& p, size_t numEdges) { | 5 | std::vector<Pos> 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 @@ | |||
| 1 | #include "pch.h" | 1 | #include "pch.h" |
| 2 | #include "Solver.h" | 2 | #include "Solver.h" |
| 3 | #include "Puzzle.h" | ||
| 4 | #include "Validator.h" | 3 | #include "Validator.h" |
| 5 | 4 | ||
| 6 | int Solver::MAX_SOLUTIONS = 10000; | 5 | 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 @@ | |||
| 1 | #include "pch.h" | 1 | #include "pch.h" |
| 2 | #include "Validator.h" | 2 | #include "Validator.h" |
| 3 | #include "Puzzle.h" | ||
| 4 | 3 | ||
| 5 | void Validator::Validate(Puzzle& p) { | 4 | void Validator::Validate(Puzzle& p) { |
| 6 | // console.log('Validating', puzzle); | 5 | // 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 @@ | |||
| 20 | #include <vector> | 20 | #include <vector> |
| 21 | 21 | ||
| 22 | #pragma warning (disable: 26451) // Potential arithmetic overflow | 22 | #pragma warning (disable: 26451) // Potential arithmetic overflow |
| 23 | #pragma warning (disable: 26812) // Unscoped enum type | ||
| 23 | 24 | ||
| 24 | #include "MemoryException.h" | 25 | #include "MemoryException.h" |
| 25 | #include "Memory.h" | 26 | #include "Memory.h" |