add option to disable demo puppet stuff when teleporting

fruityloops1 · Apr 13, 2022 · e42d9c9 · e42d9c9
1 parent bb23c22
commit e42d9c9
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/include/fl/ui/ui.h b/include/fl/ui/ui.h
@@ -64,6 +64,7 @@ namespace ui {
         bool alwaysWarp = false;
         bool disableAutoSave = false;
         bool skipBowser = false;
+        bool disablePuppet = false;
 
         bool isModeDiverOrJungleGymRom = false;
         bool isModeDiverRom = false;

diff --git a/source/fl/ui/p_options.cpp b/source/fl/ui/p_options.cpp
@@ -8,4 +8,5 @@ void fl::ui::options::update(PracticeUI& ui)
     ui.toggle("Always Enable Warps", ui.alwaysWarp);
     ui.toggle("Disable Autosaving", ui.disableAutoSave);
     ui.toggle("Cloud Kingdom Bowser Skip", ui.skipBowser);
+    ui.toggle("Disable teleport puppet", ui.disablePuppet);
 }
diff --git a/source/fl/ui/ui.cpp b/source/fl/ui/ui.cpp
@@ -24,7 +24,9 @@ void fl::ui::PracticeUI::loadPosition(PlayerActorHakoniwa& player)
     if (hack)
         move = hack;
 
-    if (!hack)
+    if (disablePuppet && !hack)
+        al::offCollide(&player);
+    else if (!hack)
         player.startDemoPuppetable();
     else
         al::offCollide(hack);
@@ -34,7 +36,9 @@ void fl::ui::PracticeUI::loadPosition(PlayerActorHakoniwa& player)
         al::updatePoseQuat(move, savedQuat);
     al::setVelocityZero(move);
 
-    if (!hack)
+    if (disablePuppet && !hack)
+        al::onCollide(&player);
+    else if (!hack)
         player.endDemoPuppetable();
     else
         al::onCollide(hack);