about summary refs log tree commit diff stats
path: root/Source/Randomizer.h
diff options
context:
space:
mode:
authorjbzdarkid <jbzdarkid@gmail.com>2021-09-11 10:40:27 -0700
committerJoseph Blackman <joblac@microsoft.com>2021-09-11 10:46:37 -0700
commit810a2745b407f8b3fe3cbe7bb344847b7a5a1cad (patch)
tree8896a842da6db0fdcb20a092f3cff3c2f1512730 /Source/Randomizer.h
parentb8d472ff024ad5b13dfe0c33ae10d5fdf8a2c4cc (diff)
downloadwitness-tutorializer-810a2745b407f8b3fe3cbe7bb344847b7a5a1cad.tar.gz
witness-tutorializer-810a2745b407f8b3fe3cbe7bb344847b7a5a1cad.tar.bz2
witness-tutorializer-810a2745b407f8b3fe3cbe7bb344847b7a5a1cad.zip
Fix a bug where re-randomization could cause inconsistency
Closes #8.

Co-authored-by: Star Rauchenberger <fefferburbia@gmail.com>

# Conflicts:
#	App/Version.h
#	Source/Randomizer.h
Diffstat (limited to 'Source/Randomizer.h')
-rw-r--r--Source/Randomizer.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/Source/Randomizer.h b/Source/Randomizer.h index bd8895b..a416c98 100644 --- a/Source/Randomizer.h +++ b/Source/Randomizer.h
@@ -11,7 +11,7 @@ public:
11 void PreventSnipes(); 11 void PreventSnipes();
12 12
13 enum SWAP { 13 enum SWAP {
14 NONE = 0, 14 // NONE = 0,
15 TARGETS = 1, 15 TARGETS = 1,
16 LINES = 2, 16 LINES = 2,
17 AUDIO_NAMES = 4, 17 AUDIO_NAMES = 4,
@@ -36,7 +36,8 @@ private:
36 void RandomizeAudioLogs(); 36 void RandomizeAudioLogs();
37 37
38 void Randomize(std::vector<int>& panels, int flags); 38 void Randomize(std::vector<int>& panels, int flags);
39 void RandomizeRange(std::vector<int> &panels, int flags, size_t startIndex, size_t endIndex); 39 void Shuffle(std::vector<int>&order, size_t startIndex, size_t endIndex);
40 void RandomizeRange(std::vector<int> panels, int flags, size_t startIndex, size_t endIndex);
40 void SwapPanels(int panel1, int panel2, int flags); 41 void SwapPanels(int panel1, int panel2, int flags);
41 void ReassignTargets(const std::vector<int>& panels, const std::vector<int>& order, std::vector<int> targets = {}); 42 void ReassignTargets(const std::vector<int>& panels, const std::vector<int>& order, std::vector<int> targets = {});
42 void ReassignNames(const std::vector<int>& panels, const std::vector<int>& order); 43 void ReassignNames(const std::vector<int>& panels, const std::vector<int>& order);