v1.1.1

Author: CattoDev

src/GatoBot.cpp

@@ -32,11 +32,17 @@ GatoBot* GatoBot::sharedState() {
 }
 
 bool GatoBot::FFmpegInstalled() {
-    auto utils = CCFileUtils::sharedFileUtils();
+    /*auto utils = CCFileUtils::sharedFileUtils();
 
     // what is bro cooking :skull:
     auto path = utils->fullPathForFilename("ffmpeg.exe", false);
-    return strcmp(path.c_str(), "ffmpeg.exe");
+    return strcmp(path.c_str(), "ffmpeg.exe");*/
+
+    WCHAR buffer[MAX_PATH];
+    GetModuleFileNameW(GetModuleHandleA(nullptr), buffer, MAX_PATH);
+    const auto path = std::filesystem::path(buffer).parent_path() / "ffmpeg.exe";
+
+    return std::filesystem::exists(path);
 }
 
 int GatoBot::getCurrentFPS() {

src/GatoBot.hpp

@@ -159,6 +159,7 @@ class GatoBot {
 
     void handleFrame(gd::PlayLayer*);
     void handleCheckpoint(gd::PlayLayer*);
+    void handleClick(gd::GJBaseGameLayer*, bool, ButtonType);
 
     void saveReplay(std::string& filepath);
     void loadReplay(std::string data);

src/Record.cpp

@@ -133,4 +133,17 @@ void GatoBot::saveReplay(std::string& filePath) {
 
     // done
     saveFile.close();
+}
+
+void GatoBot::handleClick(gd::GJBaseGameLayer* self, bool rightSide, ButtonType btnType) {
+    bool twoPlayer = MBO(bool, self->m_pLevelSettings, 0xFA);
+
+    bool playerIsDead = MBO(bool, self, 0x39C);
+
+    if(status == Recording && !playerIsDead) {
+        if(MBO(bool, self, 0x2A9) && !rightSide && twoPlayer)
+            queuedBtnP2 = btnType;
+
+        else queuedBtnP1 = btnType;
+    }
 }

src/main.cpp

@@ -145,32 +145,14 @@ void(__thiscall* GJBaseGameLayer_pushButtonO)(gd::GJBaseGameLayer*, int, bool);
 void __fastcall GJBaseGameLayer_pushButtonH(gd::GJBaseGameLayer* self, uintptr_t, int button, bool rightSide) {
     GJBaseGameLayer_pushButtonO(self, button, rightSide);
 
-    auto bot = GatoBot::sharedState();
-
-    if(bot->status == Recording && !MBO(bool, self, 0x39C)) {
-        bool twoPlayer = MBO(bool, self->m_pLevelSettings, 0xFA);
-
-        if(MBO(bool, self, 0x2A9) && !rightSide && twoPlayer)
-            bot->queuedBtnP2 = Pressed;
-
-        else bot->queuedBtnP1 = Pressed;
-    }
+    GatoBot::sharedState()->handleClick(self, rightSide, Pressed);
 }
 
 void(__thiscall* GJBaseGameLayer_releaseButtonO)(gd::GJBaseGameLayer*, int, bool);
 void __fastcall GJBaseGameLayer_releaseButtonH(gd::GJBaseGameLayer* self, uintptr_t, int button, bool rightSide) {
     GJBaseGameLayer_releaseButtonO(self, button, rightSide);
 
-    auto bot = GatoBot::sharedState();
-
-    if(bot->status == Recording && !MBO(bool, self, 0x39C)) {
-        bool twoPlayer = MBO(bool, self->m_pLevelSettings, 0xFA);
-
-        if(MBO(bool, self, 0x2A9) && !rightSide && twoPlayer)
-            bot->queuedBtnP2 = Released;
-
-        else bot->queuedBtnP1 = Released;
-    }
+    GatoBot::sharedState()->handleClick(self, rightSide, Released);
 }
 
 void(__thiscall* UILayer_onCheckO)(gd::UILayer*, CCObject*);
@@ -239,6 +221,8 @@ void __fastcall PlayLayer_resetLevelH(gd::PlayLayer* self, uintptr_t) {
             }
 
             // jump?
+            // MBO(bool, self, 0x2A9) && !rightSide && twoPlayer
+
             if(bot->levelFrames.back().player1.isHolding != MBO(bool, self->m_pPlayer1, 0x611)) {
                 if(MBO(bool, self->m_pPlayer1, 0x611)) {
                     bot->levelFrames.back().player1.action = Pressed;
@@ -250,7 +234,7 @@ void __fastcall PlayLayer_resetLevelH(gd::PlayLayer* self, uintptr_t) {
                 }
             }
 
-            if(bot->levelFrames.back().player2.isHolding != MBO(bool, self->m_pPlayer2, 0x611)) {
+            if(bot->levelFrames.back().player2.isHolding != MBO(bool, self->m_pPlayer2, 0x611) && (MBO(bool, self, 0x2A9) && !MBO(bool, self->m_pPlayer2, 0x611) && MBO(bool, self->m_pLevelSettings, 0xFA))) {
                 if(MBO(bool, self->m_pPlayer2, 0x611)) {
                     bot->levelFrames.back().player2.action = Pressed;
                     bot->levelFrames.back().player2.isHolding = true;