idk

Author: ToastexGD

src/core/checkpoint_system.cpp

@@ -323,7 +323,35 @@ class $modify(MacroPlayLayer, PlayLayer) {
                 ? (engine->activeTTR && engine->activeTTR->recordedFromStartPos)
                 : (engine->activeMacro && engine->activeMacro->recordedFromStartPos);
 
-            if (m_startPosObject && anchors && !anchors->empty()) {
+            float recStartX = engine->ttrMode
+                ? (engine->activeTTR ? engine->activeTTR->startPosX : 0.f)
+                : (engine->activeMacro ? engine->activeMacro->startPosX : 0.f);
+            float recStartY = engine->ttrMode
+                ? (engine->activeTTR ? engine->activeTTR->startPosY : 0.f)
+                : (engine->activeMacro ? engine->activeMacro->startPosY : 0.f);
+
+            bool startPosMatch = false;
+            if (m_startPosObject && recordedFromStartPos) {
+                float dx = m_startPosObject->getPositionX() - recStartX;
+                float dy = m_startPosObject->getPositionY() - recStartY;
+                startPosMatch = std::sqrt(dx * dx + dy * dy) < 50.0f;
+            }
+
+            if (m_startPosObject && startPosMatch) {
+                engine->tickOffset = 0;
+                engine->startPosActive = true;
+                if (anchors && !anchors->empty()) {
+                    engine->playbackAnchorIndex = findFirstAnchorAtTick(*anchors, 0);
+                } else {
+                    engine->playbackAnchorIndex = 0;
+                }
+                if (engine->ttrMode && engine->activeTTR) {
+                    engine->executeIndex = 0;
+                } else if (engine->activeMacro) {
+                    engine->executeIndex = 0;
+                }
+                engine->startPosWarning.clear();
+            } else if (m_startPosObject && anchors && !anchors->empty()) {
                 engine->tickOffset = computeStartPosOffset(this, *anchors);
                 engine->startPosActive = true;
                 engine->playbackAnchorIndex = findFirstAnchorAtTick(*anchors, engine->tickOffset);

src/hacks/physicsbypass.cpp

@@ -203,7 +203,8 @@ namespace {
             || engine.singleTickStep
             || engine.renderer.recording
             || !nearlyEqual(engine.runtimeTickRate(), ReplayEngine::kBaseTickRate, 0.01)
-            || !nearlyEqual(engine.gameSpeed, 1.0, 0.0001);
+            || !nearlyEqual(engine.gameSpeed, 1.0, 0.0001)
+            || Autoclicker::get()->enabled;
     }
 
     struct SimulationTimingController {
@@ -447,8 +448,17 @@ class $modify(PhysicsControlLayer, GJBaseGameLayer) {
                 engine->totalTickCount = static_cast<int>(std::min<int64_t>(total, std::numeric_limits<int>::max()));
             }
 
-            controller.tickAutoclickerSteps(this, *engine, steps);
-            GJBaseGameLayer::update(static_cast<float>(totalDelta));
+            auto* ac = Autoclicker::get();
+            if (ac->enabled && engine->engineMode != MODE_EXECUTE && steps > 1) {
+                for (int64_t i = 0; i < steps; ++i) {
+                    setExpectedTicks(1);
+                    controller.tickAutoclickerSteps(this, *engine, 1);
+                    GJBaseGameLayer::update(static_cast<float>(timestep));
+                }
+            } else {
+                controller.tickAutoclickerSteps(this, *engine, steps);
+                GJBaseGameLayer::update(static_cast<float>(totalDelta));
+            }
         }
 
         if (renderer.recording) {