Skip to content

Commit 1c1f3d9

Browse files
committed
Fix build.
1 parent 2507f15 commit 1c1f3d9

File tree

6 files changed

+13
-29
lines changed

6 files changed

+13
-29
lines changed

SerialPrograms/Source/PokemonSV/Programs/Farming/PokemonSV_BlueberryQuests.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1333,10 +1333,9 @@ void quest_auto_battle(
13331333

13341334
LetsGoEncounterBotStats stats;
13351335
LetsGoEncounterBotTracker tracker(
1336-
env, stream, context,
1336+
env, stream,
13371337
stats,
1338-
sensors.lets_go_kill,
1339-
BBQ_OPTIONS.LANGUAGE
1338+
sensors.lets_go_kill
13401339
);
13411340

13421341
uint64_t target_number = 10;

SerialPrograms/Source/PokemonSV/Programs/Farming/PokemonSV_MaterialFarmerTools.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -190,10 +190,9 @@ void run_material_farmer(
190190
env.logger(), console, context
191191
);
192192
LetsGoEncounterBotTracker encounter_tracker(
193-
env, console, context,
193+
env, console,
194194
stats,
195-
sensors.lets_go_kill,
196-
options.LANGUAGE
195+
sensors.lets_go_kill
197196
);
198197
WallClock start_time = current_time();
199198
WallClock last_sandwich_time = WallClock::min();

SerialPrograms/Source/PokemonSV/Programs/ShinyHunting/PokemonSV_LetsGoTools.cpp

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -152,17 +152,11 @@ void DiscontiguousTimeTracker::add_block(WallClock start, WallClock end){
152152

153153
LetsGoEncounterBotTracker::LetsGoEncounterBotTracker(
154154
ProgramEnvironment& env,
155-
VideoStream& stream, ProControllerContext& context,
155+
VideoStream& stream,
156156
LetsGoEncounterBotStats& stats,
157-
LetsGoKillSoundDetector& kill_sound,
158-
OCR::LanguageOCROption& language
157+
LetsGoKillSoundDetector& kill_sound
159158
)
160-
: m_env(env)
161-
, m_stream(stream)
162-
, m_context(context)
163-
, m_stats(stats)
164-
, m_kill_sound(kill_sound)
165-
, m_language(language)
159+
: m_kill_sound(kill_sound)
166160
{
167161
m_kill_sound.set_detected_callback([&](float){
168162
stream.log("Detected kill.");

SerialPrograms/Source/PokemonSV/Programs/ShinyHunting/PokemonSV_LetsGoTools.h

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -116,10 +116,9 @@ class LetsGoEncounterBotTracker{
116116
public:
117117
LetsGoEncounterBotTracker(
118118
ProgramEnvironment& env,
119-
VideoStream& stream, ProControllerContext& context,
119+
VideoStream& stream,
120120
LetsGoEncounterBotStats& stats,
121-
LetsGoKillSoundDetector& kill_sound,
122-
OCR::LanguageOCROption& language
121+
LetsGoKillSoundDetector& kill_sound
123122
);
124123

125124
void throw_if_no_sound(std::chrono::milliseconds min_duration = std::chrono::milliseconds(10000)) const{
@@ -152,12 +151,7 @@ class LetsGoEncounterBotTracker{
152151
}
153152

154153
private:
155-
ProgramEnvironment& m_env;
156-
VideoStream& m_stream;
157-
ProControllerContext& m_context;
158-
LetsGoEncounterBotStats& m_stats;
159154
LetsGoKillSoundDetector& m_kill_sound;
160-
OCR::LanguageOCROption& m_language;
161155

162156
EncounterRateTracker m_encounter_rate;
163157
EncounterFrequencies m_encounter_frequencies;

SerialPrograms/Source/PokemonSV/Programs/ShinyHunting/PokemonSV_ShinyHunt-AreaZeroPlatform.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -499,10 +499,9 @@ void ShinyHuntAreaZeroPlatform::program(SingleSwitchProgramEnvironment& env, Pro
499499
m_time_tracker = &time_tracker;
500500

501501
LetsGoEncounterBotTracker encounter_tracker(
502-
env, env.console, context,
502+
env, env.console,
503503
stats,
504-
sensors.lets_go_kill,
505-
LANGUAGE
504+
sensors.lets_go_kill
506505
);
507506
m_encounter_tracker = &encounter_tracker;
508507

SerialPrograms/Source/PokemonSV/Programs/ShinyHunting/PokemonSV_ShinyHunt-Scatterbug.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -178,10 +178,9 @@ void ShinyHuntScatterbug::program(SingleSwitchProgramEnvironment& env, ProContro
178178
m_battle_tracker = &battle_tracker;
179179

180180
LetsGoEncounterBotTracker encounter_tracker(
181-
env, env.console, context,
181+
env, env.console,
182182
stats,
183-
sensors.lets_go_kill,
184-
LANGUAGE
183+
sensors.lets_go_kill
185184
);
186185
m_encounter_tracker = &encounter_tracker;
187186

0 commit comments

Comments
 (0)