some dumb fixes

FireMario211 · Jun 8, 2024 · d94164d · d94164d
1 parent e240ae2
commit d94164d
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 20 deletions.
diff --git a/.github/workflows/build-noimgui.yml b/.github/workflows/build-noimgui.yml
@@ -32,6 +32,7 @@ jobs:
           build-config: 'RelWithDebInfo'
           export-pdb: true
           combine: true
+          sdk: 'nightly'
           target: ${{ matrix.config.target }}
 
   package:

diff --git a/build-android.sh b/build-android.sh
@@ -19,6 +19,6 @@ cmake -DCMAKE_TOOLCHAIN_FILE=$NDK/build/cmake/android.toolchain.cmake -DANDROID_
 cmake --build build-android/$ABI --config RelWithDebInfo
 if [[ $ABI == "arm64-v8a" ]] ;then
     echo "pushing"
-    adb push ./build-android/arm64-v8a/firee.PrismMenu.geode /sdcard/Android/media/com.geode.launcher/game/geode/mods
+    adb push ./build-android/arm64-v8a/firee.prism.geode /sdcard/Android/media/com.geode.launcher/game/geode/mods
 fi
 done
diff --git a/changelog.md b/changelog.md
@@ -3,7 +3,7 @@
     - Added Ukrainian translations (Thank you Lancelot!)
     - Added CBF warning 
     - Added Custom Object Bypass (Only on Windows)
-    - Fixed Noclip Accuracy from going to the negatives.
+    - Fixed Noclip Accuracy from going to the negatives. (On Windows)
     - Temporarily removed No Pulse
     - Removed Anticheat Bypass (since its useless now)
     - (hopefully) Fix issues with Android on playing back a macro.

diff --git a/resources/hacks/creator.json b/resources/hacks/creator.json
@@ -62,7 +62,8 @@
             ]
         },
         "type": "bool",
-        "save": false
+        "save": false,
+        "platforms": ["win"]
     },
     {
 	    "name": "No (C) Mark",

diff --git a/resources/hacks/settings.json b/resources/hacks/settings.json
@@ -46,8 +46,7 @@
         "name": "Menu Keybind",
         "desc": "The keybind for opening the Prism Menu UI!",
         "type": "char",
-        "default": "[Tab]",
-        "platforms": ["win", "mac"]
+        "default": "[Tab]"
     },
     {
         "name": "Button Position X",

diff --git a/src/Hacks/Quartz.cpp b/src/Hacks/Quartz.cpp
@@ -819,11 +819,7 @@ class $modify(QuartzPlayLayer, PlayLayer) {
         });
         if (input_player != m_fields->player_frames.end()) {
             m_fields->bot_frame = input_player->frame;
-            #ifdef GEODE_IS_WINDOWS
             m_gameState.m_currentProgress = m_fields->bot_frame;
-            #else
-            m_gameState.m_currentProgress = m_fields->bot_frame * 1000;
-            #endif
             if (input_player2 != m_fields->player_frames.end()) {
                 UpdatePlayer(m_player2, *input_player2);
                 GJBaseGameLayer::handleButton(input_player2->isHolding, input_player2->buttonHold, true);
@@ -859,11 +855,7 @@ class $modify(QuartzPlayLayer, PlayLayer) {
         });
         if (input_player != m_fields->player_frames.end()) {
             m_fields->bot_frame = input_player->frame;
-#ifdef GEODE_IS_WINDOWS
             m_gameState.m_currentProgress = m_fields->bot_frame;
-#else
-            m_gameState.m_currentProgress = m_fields->bot_frame * 1000;
-#endif
             if (input_player2 != m_fields->player_frames.end()) {
                 UpdatePlayer(m_player2, *input_player2);
                 GJBaseGameLayer::handleButton(input_player2->isHolding, input_player2->buttonHold, true);
@@ -1060,11 +1052,7 @@ class $modify(GJBaseGameLayer) {
                     }
                 } else {*/
                     ///playLayer->m_fields->bot_frame += addDt;
-                    #ifdef GEODE_IS_WINDOWS 
                     playLayer->m_fields->bot_frame = m_gameState.m_currentProgress;
-                    #else
-                    playLayer->m_fields->bot_frame = m_gameState.m_currentProgress / 1000;
-                    #endif 
                 //}
                 if (Hacks::isHackEnabled("Fixed FPS")) {
                     dt = fixedDt;

diff --git a/src/main.cpp b/src/main.cpp
@@ -59,13 +59,16 @@ bool restoreOldFiles() {
 
     if (std::filesystem::exists(oldSave) && std::filesystem::is_directory(oldSave)) {
         log::debug("AIR DETECTED. copying files from firee.PrismMenu to firee.prism");
-        // 3. Copy files from save_backup to saveDir
         std::filesystem::copy(oldSave, currentSave, std::filesystem::copy_options::overwrite_existing | std::filesystem::copy_options::recursive);
 
-        // 4. Rename save_backup to save_backup.complete
         std::filesystem::path newBackupDir = parentDir / (oldSave.filename().string() + ".old");
-        std::filesystem::rename(oldSave, newBackupDir);
 
+#ifdef GEODE_IS_ANDROID // stupid android and their "OH YOU DONT HAVE PERMISSION TO RENAME"
+        std::filesystem::copy(oldSave, newBackupDir, std::filesystem::copy_options::recursive);
+        std::filesystem::remove_all(oldSave);
+#else 
+        std::filesystem::rename(oldSave, newBackupDir);
+#endif
         return true;
     } else {
         // assuming new instance