add buttons for switching the mode

Author: matcool

src/Replay.cpp

@@ -45,7 +45,7 @@ inline T bin_read(std::ifstream& stream) {
  */
 
 constexpr uint8_t format_ver = 2;
-constexpr const char format_magic[4] = {'R', 'P', 'L', 'Y'};
+constexpr const char* format_magic = "RPLY";
 
 void Replay::save(const std::string& path) {
 	std::ofstream file;

src/dllmain.cpp

@@ -8,12 +8,14 @@
 DWORD WINAPI thread_entry(void* module) {
 #ifdef _DEBUG
     AllocConsole();
-    static std::ofstream conout("CONOUT$", std::ios::out);
-    static std::ifstream conin("CONIN$", std::ios::in);
+    std::ofstream conout("CONOUT$", std::ios::out);
+    std::ifstream conin("CONIN$", std::ios::in);
     std::cout.rdbuf(conout.rdbuf());
     std::cin.rdbuf(conin.rdbuf());
 #endif
 
+    DisableThreadLibraryCalls(cast<HMODULE>(module));
+
     MH_Initialize();
 
     Hooks::init();

src/overlay_layer.cpp

@@ -71,6 +71,34 @@ bool OverlayLayer::init() {
     label->setPosition({win_size.width - 55, win_size.height - 85});
     addChild(label);
 
+    auto check_off_sprite = CCSprite::createWithSpriteFrameName("GJ_checkOff_001.png");
+    auto check_on_sprite = CCSprite::createWithSpriteFrameName("GJ_checkOn_001.png");
+
+    m_x_pos_toggle = gd::CCMenuItemToggler::create(check_off_sprite, check_on_sprite, this, menu_selector(OverlayLayer::on_x_pos));
+    m_x_pos_toggle->setPosition({win_size.width - 35, -120});
+    menu->addChild(m_x_pos_toggle);
+
+    m_frame_toggle = gd::CCMenuItemToggler::create(check_off_sprite, check_on_sprite, this, menu_selector(OverlayLayer::on_frame));
+    m_frame_toggle->setPosition({win_size.width - 35, -155});
+    menu->addChild(m_frame_toggle);
+
+    if (rs.get_default_type() == ReplayType::XPOS)
+        m_x_pos_toggle->toggle(true);
+    else
+        m_frame_toggle->toggle(true);
+
+    label = CCLabelBMFont::create("X Pos", "bigFont.fnt");
+    label->setAnchorPoint({1, 0.5});
+    label->setScale(0.8f);
+    label->setPosition({win_size.width - 55, win_size.height - 120});
+    addChild(label);
+
+    label = CCLabelBMFont::create("Frame", "bigFont.fnt");
+    label->setAnchorPoint({1, 0.5});
+    label->setScale(0.8f);
+    label->setPosition({win_size.width - 55, win_size.height - 155});
+    addChild(label);
+
     sprite = CCSprite::create("square02b_001.png");
     sprite->setColor({0, 0, 0});
     sprite->setOpacity(69);
@@ -113,7 +141,9 @@ void OverlayLayer::update_info_text() {
     auto& rs = ReplaySystem::get_instance();
     auto& replay = rs.get_replay();
     std::stringstream stream;
-    stream << "Current Replay:\nFPS: " << replay.get_fps() << "\nActions: " << replay.get_actions().size();
+    stream << "Current Replay:\nFPS: " << replay.get_fps();
+    stream << "\nActions: " << replay.get_actions().size();
+    stream << "\nMode: " << (replay.get_type() == ReplayType::XPOS ? "X Pos" : "Frame");
     m_replay_info->setString(stream.str().c_str());
 }
 
@@ -203,4 +233,16 @@ void OverlayLayer::on_load(CCObject*) {
 void OverlayLayer::keyBackClicked() {
     _update_default_fps();
     gd::FLAlertLayer::keyBackClicked();
+}
+
+void OverlayLayer::on_x_pos(CCObject*) {
+    m_x_pos_toggle->toggle(false);
+    m_frame_toggle->toggle(false);
+    ReplaySystem::get_instance().set_default_type(ReplayType::XPOS);
+}
+
+void OverlayLayer::on_frame(CCObject*) {
+    m_x_pos_toggle->toggle(false);
+    m_frame_toggle->toggle(false);
+    ReplaySystem::get_instance().set_default_type(ReplayType::FRAME);
 }

src/overlay_layer.hpp

@@ -4,6 +4,8 @@
 class OverlayLayer : public gd::FLAlertLayer, public CCTextFieldDelegate, public gd::FLAlertLayerProtocol {
     gd::CCTextInputNode* m_fps_input;
     CCLabelBMFont* m_replay_info;
+    gd::CCMenuItemToggler* m_x_pos_toggle;
+    gd::CCMenuItemToggler* m_frame_toggle;
 
     inline void _update_default_fps();
     void _handle_load_replay();
@@ -37,6 +39,9 @@ class OverlayLayer : public gd::FLAlertLayer, public CCTextFieldDelegate, public
     void on_save(CCObject*);
     void on_load(CCObject*);
 
+    void on_x_pos(CCObject*);
+    void on_frame(CCObject*);
+
     virtual void keyBackClicked();
     virtual void keyDown(enumKeyCodes key) {
         // keyDown overwrites keyBackClicked, how fun

src/replay_system.hpp

@@ -14,15 +14,15 @@ class ReplaySystem {
 
     Replay replay;
     RSState state = NOTHING;
-    ReplayType replay_type;
+    ReplayType default_type;
 
     size_t action_index = 0;
 
     PracticeFixes practice_fixes;
 
     bool frame_advance = false;
 
-    ReplaySystem() : default_fps(120.f), replay(default_fps), replay_type(replay.get_type()) {}
+    ReplaySystem() : default_fps(120.f), replay(default_fps), default_type(replay.get_type()) {}
 
     void _update_status_label();
 
@@ -37,6 +37,9 @@ class ReplaySystem {
     inline auto get_default_fps() { return default_fps; }
     inline void set_default_fps(float fps) { default_fps = fps; }
 
+    inline auto get_default_type() { return default_type; }
+    inline void set_default_type(ReplayType type) { default_type = type; }
+
     inline bool is_playing() { return state == PLAYING; }
     inline bool is_recording() { return state == RECORDING; }
 
@@ -48,7 +51,7 @@ class ReplaySystem {
     void toggle_recording() {
         state = is_recording() ? NOTHING : RECORDING;
         if (!is_recording()) frame_advance = false;
-        else replay = Replay(default_fps);
+        else replay = Replay(default_fps, default_type);
         frame_offset = 0;
         _update_status_label();
     }