Skip to content

Commit 7f03f33

Browse files
matcoolmatcool
committed
get_instance() -> get()
1 parent 51dccd5 commit 7f03f33

5 files changed

Lines changed: 32 additions & 32 deletions

File tree

‎src/hooks.cpp‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ bool g_disable_render = false;
1111
float g_left_over = 0.f;
1212

1313
void Hooks::CCScheduler_update(CCScheduler* self, float dt) {
14-
auto& rs = ReplaySystem::get_instance();
14+
auto& rs = ReplaySystem::get();
1515
if (rs.recorder.m_recording || rs.is_playing() || rs.is_recording() && gd::GameManager::sharedState()->getPlayLayer()) {
1616
const auto fps = rs.get_replay().get_fps();
1717
auto speedhack = self->getTimeScale();
@@ -45,7 +45,7 @@ void Hooks::CCScheduler_update(CCScheduler* self, float dt) {
4545
}
4646

4747
void Hooks::CCKeyboardDispatcher_dispatchKeyboardMSG(CCKeyboardDispatcher* self, int key, bool down) {
48-
auto& rs = ReplaySystem::get_instance();
48+
auto& rs = ReplaySystem::get();
4949
if (down) {
5050
auto play_layer = gd::GameManager::sharedState()->getPlayLayer();
5151
if (rs.is_recording() && play_layer) {
@@ -66,7 +66,7 @@ void Hooks::CCKeyboardDispatcher_dispatchKeyboardMSG(CCKeyboardDispatcher* self,
6666
float g_xpos_time = 0.f;
6767

6868
void Hooks::PlayLayer::update(gd::PlayLayer* self, float dt) {
69-
auto& rs = ReplaySystem::get_instance();
69+
auto& rs = ReplaySystem::get();
7070
if (rs.get_frame_advance()) return;
7171
if (rs.is_playing()) rs.handle_playing();
7272
if (rs.recorder.m_recording)
@@ -77,7 +77,7 @@ void Hooks::PlayLayer::update(gd::PlayLayer* self, float dt) {
7777

7878
bool _player_button_handler(bool hold, bool button) {
7979
if (gd::GameManager::sharedState()->getPlayLayer()) {
80-
auto& rs = ReplaySystem::get_instance();
80+
auto& rs = ReplaySystem::get();
8181
if (rs.is_playing()) return true;
8282
rs.record_action(hold, button);
8383
}
@@ -96,15 +96,15 @@ void Hooks::PlayLayer::releaseButton(gd::PlayLayer* self, int idk, bool button)
9696

9797
void Hooks::PlayLayer::resetLevel(gd::PlayLayer* self) {
9898
orig<&resetLevel>(self);
99-
auto& rs = ReplaySystem::get_instance();
99+
auto& rs = ReplaySystem::get();
100100
rs.on_reset();
101-
ReplaySystem::get_instance().recorder.update_song_offset(self);
101+
ReplaySystem::get().recorder.update_song_offset(self);
102102
}
103103

104104

105105
void Hooks::PlayLayer::pauseGame(gd::PlayLayer* self, bool idk) {
106106
auto addr = cast<void*>(gd::base + 0x20D43C);
107-
auto& rs = ReplaySystem::get_instance();
107+
auto& rs = ReplaySystem::get();
108108
if (rs.is_recording())
109109
rs.record_action(false, true, false);
110110

@@ -124,12 +124,12 @@ CCObject* Hooks::CheckpointObject_create() {
124124
}
125125

126126
void Hooks::PlayLayer::levelComplete(gd::PlayLayer* self) {
127-
ReplaySystem::get_instance().reset_state();
127+
ReplaySystem::get().reset_state();
128128
return orig<&levelComplete>(self);
129129
}
130130

131131
void _on_exit_level() {
132-
auto& rs = ReplaySystem::get_instance();
132+
auto& rs = ReplaySystem::get();
133133
rs.reset_state();
134134
}
135135

@@ -178,7 +178,7 @@ bool Hooks::PauseLayer_init(gd::PauseLayer* self) {
178178

179179
void _handle_activated_object(bool a, bool b, gd::GameObject* object) {
180180
auto play_layer = gd::GameManager::sharedState()->getPlayLayer();
181-
auto& rs = ReplaySystem::get_instance();
181+
auto& rs = ReplaySystem::get();
182182
if (play_layer && play_layer->m_isPracticeMode && rs.is_recording()) {
183183
if (object->m_hasBeenActivated && !a)
184184
rs.get_practice_fixes().add_activated_object(object);
@@ -214,7 +214,7 @@ void Hooks::PlayLayer::updateVisiblity(gd::PlayLayer* self) {
214214
}
215215

216216
void PauseLayer_onResume(gd::PauseLayer* self, CCObject* sender) {
217-
auto& rs = ReplaySystem::get_instance();
217+
auto& rs = ReplaySystem::get();
218218
if (rs.should_restart_next_time) {
219219
self->onRestart(nullptr);
220220
rs.should_restart_next_time = false;
@@ -225,7 +225,7 @@ void PauseLayer_onResume(gd::PauseLayer* self, CCObject* sender) {
225225
bool PlayLayer_init(gd::PlayLayer* self, gd::GJGameLevel* level) {
226226
if (!orig<&PlayLayer_init>(self, level)) return false;
227227

228-
ReplaySystem::get_instance().recorder.update_song_offset(self);
228+
ReplaySystem::get().recorder.update_song_offset(self);
229229

230230
return true;
231231
}

‎src/overlay_layer.cpp‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ bool OverlayLayer::init() {
1212
setZOrder(20);
1313

1414
auto win_size = CCDirector::sharedDirector()->getWinSize();
15-
auto& rs = ReplaySystem::get_instance();
15+
auto& rs = ReplaySystem::get();
1616

1717
auto menu = CCMenu::create();
1818
menu->setPosition({0, win_size.height});
@@ -193,7 +193,7 @@ bool OverlayLayer::init() {
193193
}
194194

195195
void OverlayLayer::update_info_text() {
196-
auto& rs = ReplaySystem::get_instance();
196+
auto& rs = ReplaySystem::get();
197197
auto& replay = rs.get_replay();
198198
std::stringstream stream;
199199
stream << "Current Replay:\nFPS: " << replay.get_fps();
@@ -205,12 +205,12 @@ void OverlayLayer::update_info_text() {
205205
void OverlayLayer::_update_default_fps() {
206206
auto text = m_fps_input->getString();
207207
if (text[0])
208-
ReplaySystem::get_instance().set_default_fps(std::stof(text));
208+
ReplaySystem::get().set_default_fps(std::stof(text));
209209
}
210210

211211
void OverlayLayer::FLAlert_Clicked(gd::FLAlertLayer* alert, bool btn2) {
212212
if (!btn2) {
213-
auto& rs = ReplaySystem::get_instance();
213+
auto& rs = ReplaySystem::get();
214214
int tag = alert->getTag();
215215
if (tag == 1) {
216216
rs.toggle_recording();
@@ -224,7 +224,7 @@ void OverlayLayer::FLAlert_Clicked(gd::FLAlertLayer* alert, bool btn2) {
224224

225225
void OverlayLayer::on_record(CCObject*) {
226226
_update_default_fps();
227-
auto& rs = ReplaySystem::get_instance();
227+
auto& rs = ReplaySystem::get();
228228
if (!rs.is_recording()) {
229229
if (rs.get_replay().get_actions().empty()) {
230230
rs.toggle_recording();
@@ -244,14 +244,14 @@ void OverlayLayer::on_record(CCObject*) {
244244
}
245245

246246
void OverlayLayer::on_play(CCObject*) {
247-
ReplaySystem::get_instance().toggle_playing();
247+
ReplaySystem::get().toggle_playing();
248248
}
249249

250250
void OverlayLayer::on_save(CCObject*) {
251251
nfdchar_t* path = nullptr;
252252
auto result = NFD_SaveDialog("replay", nullptr, &path);
253253
if (result == NFD_OKAY) {
254-
ReplaySystem::get_instance().get_replay().save(path);
254+
ReplaySystem::get().get_replay().save(path);
255255
gd::FLAlertLayer::create(nullptr, "Info", "Ok", nullptr, "Replay saved.")->show();
256256
free(path);
257257
}
@@ -261,15 +261,15 @@ void OverlayLayer::_handle_load_replay() {
261261
nfdchar_t* path = nullptr;
262262
auto result = NFD_OpenDialog("replay", nullptr, &path);
263263
if (result == NFD_OKAY) {
264-
ReplaySystem::get_instance().get_replay() = Replay::load(path);
264+
ReplaySystem::get().get_replay() = Replay::load(path);
265265
update_info_text();
266266
gd::FLAlertLayer::create(nullptr, "Info", "Ok", nullptr, "Replay loaded.")->show();
267267
free(path);
268268
}
269269
}
270270

271271
void OverlayLayer::on_load(CCObject*) {
272-
auto& rs = ReplaySystem::get_instance();
272+
auto& rs = ReplaySystem::get();
273273
if (rs.get_replay().get_actions().empty()) {
274274
_handle_load_replay();
275275
} else {
@@ -291,26 +291,26 @@ void OverlayLayer::keyBackClicked() {
291291
void OverlayLayer::on_x_pos(CCObject*) {
292292
m_x_pos_toggle->toggle(false);
293293
m_frame_toggle->toggle(false);
294-
ReplaySystem::get_instance().set_default_type(ReplayType::XPOS);
294+
ReplaySystem::get().set_default_type(ReplayType::XPOS);
295295
}
296296

297297
void OverlayLayer::on_frame(CCObject*) {
298298
m_x_pos_toggle->toggle(false);
299299
m_frame_toggle->toggle(false);
300-
ReplaySystem::get_instance().set_default_type(ReplayType::FRAME);
300+
ReplaySystem::get().set_default_type(ReplayType::FRAME);
301301
}
302302

303303
void OverlayLayer::on_toggle_real_time(CCObject* toggle_) {
304304
auto toggle = cast<gd::CCMenuItemToggler*>(toggle_);
305305
if (toggle != nullptr) {
306-
ReplaySystem::get_instance().real_time_mode = !toggle->isOn(); // why is it flipped
306+
ReplaySystem::get().real_time_mode = !toggle->isOn(); // why is it flipped
307307
}
308308
}
309309

310310
void OverlayLayer::on_toggle_showcase(CCObject* toggle_) {
311311
auto toggle = cast<gd::CCMenuItemToggler*>(toggle_);
312312
if (toggle != nullptr) {
313-
ReplaySystem::get_instance().showcase_mode = !toggle->isOn();
313+
ReplaySystem::get().showcase_mode = !toggle->isOn();
314314
}
315315
}
316316

‎src/practice_fixes.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@
22
#include "replay_system.hpp"
33

44
void CheckpointObjectMod::saveInfo() {
5-
auto& rs = ReplaySystem::get_instance();
5+
auto& rs = ReplaySystem::get();
66
m_checkpoint = rs.get_practice_fixes().create_checkpoint();
77
}
88

99
Checkpoint PracticeFixes::create_checkpoint() {
1010
auto play_layer = gd::GameManager::sharedState()->getPlayLayer();
1111
if (play_layer) {
12-
auto& rs = ReplaySystem::get_instance();
12+
auto& rs = ReplaySystem::get();
1313
return {
1414
CheckpointData::from_player(play_layer->m_player1),
1515
CheckpointData::from_player(play_layer->m_player2),

‎src/recorder_layer.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ bool RecorderLayer::init() {
3232

3333
const auto center = win_size / 2.f;
3434

35-
auto& rs = ReplaySystem::get_instance();
35+
auto& rs = ReplaySystem::get();
3636

3737
auto toggler = gd::CCMenuItemToggler::create(check_off_sprite, check_on_sprite, this, menu_selector(RecorderLayer::on_toggle_recorder));
3838
toggler->setPosition(top_left + ccp(30.f, -30.f));
@@ -185,7 +185,7 @@ void RecorderLayer::on_close(CCObject*) {
185185
}
186186

187187
void RecorderLayer::on_toggle_recorder(CCObject* obj) {
188-
auto& rs = ReplaySystem::get_instance();
188+
auto& rs = ReplaySystem::get();
189189
auto toggler = static_cast<gd::CCMenuItemToggler*>(obj);
190190
if (toggler->isOn()) {
191191
rs.recorder.stop();
@@ -206,9 +206,9 @@ void RecorderLayer::on_toggle_recorder(CCObject* obj) {
206206
}
207207

208208
void RecorderLayer::on_toggle_until_end(CCObject* obj) {
209-
ReplaySystem::get_instance().recorder.m_until_end = !static_cast<gd::CCMenuItemToggler*>(obj)->isOn();
209+
ReplaySystem::get().recorder.m_until_end = !static_cast<gd::CCMenuItemToggler*>(obj)->isOn();
210210
}
211211

212212
void RecorderLayer::on_toggle_include_audio(CCObject* obj) {
213-
ReplaySystem::get_instance().recorder.m_include_audio = !static_cast<gd::CCMenuItemToggler*>(obj)->isOn();
213+
ReplaySystem::get().recorder.m_include_audio = !static_cast<gd::CCMenuItemToggler*>(obj)->isOn();
214214
}

‎src/replay_system.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ class ReplaySystem {
2929

3030
unsigned frame_offset = 0;
3131
public:
32-
static auto& get_instance() {
32+
static auto& get() {
3333
static ReplaySystem instance;
3434
return instance;
3535
}

0 commit comments

Comments
 (0)