clean a bit

Author: BlueWitherer

src/hooks/PlayLayer/ForceLevels.cpp

@@ -26,13 +26,13 @@ static auto const oCongreg = Option::create(THIS_ID_CONGREG)
                                  ->setOnline(true)
                                  ->autoRegister();
 
-static bool trySwitchToLevel(PlayLayer* pl, PlayerObject* player, GameObject* killer, std::shared_ptr<jumpscares::DownloadDelegate> delegate, int chance, int rng, bool dontCreateObjects, bool useReplay) {
+static bool trySwitchToLevel(PlayLayer* pl, std::shared_ptr<jumpscares::DownloadDelegate> delegate, int chance, int rng, bool dontCreateObjects, bool useReplay) {
     if (rng > chance) {
         log::debug("{} jumpscare not triggered {}", delegate->getLevelName(), chance);
         return false;
     };
 
-    jumpscares::switchToLevel(pl, delegate, player, killer, dontCreateObjects, useReplay);
+    jumpscares::switchToLevel(pl, delegate, dontCreateObjects, useReplay);
 
     return true;
 };
@@ -54,7 +54,7 @@ class $modify(GriefPlayLayer, PlayLayer) {
         if (p1 == m_anticheatSpike && !p0->m_isDead) return;
 
         int rng = randng::fast();
-        trySwitchToLevel(this, p0, p1, jumpscares::get::grief(), f->chance, rng, f->dontCreateObjects, m_useReplay);
+        trySwitchToLevel(this, jumpscares::get::grief(), f->chance, rng, f->dontCreateObjects, m_useReplay);
     };
 };
 
@@ -75,6 +75,6 @@ class $modify(CongregationPlayLayer, PlayLayer) {
         if (p1 == m_anticheatSpike && !p0->m_isDead) return;
 
         int rng = randng::fast();
-        trySwitchToLevel(this, p0, p1, jumpscares::get::congregation(), f->chance, rng, f->dontCreateObjects, m_useReplay);
+        trySwitchToLevel(this, jumpscares::get::congregation(), f->chance, rng, f->dontCreateObjects, m_useReplay);
     };
 };

src/util/Jumpscares.hpp

@@ -54,7 +54,7 @@ namespace horrible {
                 std::shared_ptr<DownloadDelegate> congregation();
             };
 
-            void switchToLevel(PlayLayer* pl, std::shared_ptr<DownloadDelegate> delegate, PlayerObject* player, GameObject* killer, bool dontCreateObjects, bool useReplay);
+            void switchToLevel(PlayLayer* pl, std::shared_ptr<DownloadDelegate> delegate, bool dontCreateObjects, bool useReplay);
 
             void downloadLevelAsync(std::shared_ptr<DownloadDelegate> delegate);
 

src/util/src/Jumpscares.cpp

@@ -134,7 +134,7 @@ GJSearchObject* jumpscares::createLevelSearchObject(int levelID) {
     return GJSearchObject::create(SearchType::Type19, numToString(levelID));
 };
 
-void jumpscares::switchToLevel(PlayLayer* pl, std::shared_ptr<DownloadDelegate> delegate, PlayerObject* player, GameObject* killer, bool dontCreateObjects, bool useReplay) {
+void jumpscares::switchToLevel(PlayLayer* pl, std::shared_ptr<DownloadDelegate> delegate, bool dontCreateObjects, bool useReplay) {
     if (!delegate) {
         delegate = JumpscareDelegateManager::get()->getDownloadDelegate().lock();
 
@@ -154,9 +154,6 @@ void jumpscares::switchToLevel(PlayLayer* pl, std::shared_ptr<DownloadDelegate>
 
         log::debug("Destroying player and exiting current level for {}", delegate->getLevelName());
 
-        pl->destroyPlayer(player, killer);
-        pl->onExit();
-
         if (!targetLevel->m_levelNotDownloaded) {
             log::warn("Switching to {} level ({})", delegate->getLevelName(), delegate->getLevelID());
 

src/util/ui/src/RandomAd.cpp

@@ -52,13 +52,13 @@ bool RandomAd::init() {
             "Play!",
             "bigFont.fnt",
             themes::getButtonSquareSprite(theme)),
-        [playBtnLoading](Button* sender) {
+        [loading = WeakRef(playBtnLoading)](Button* sender) {
             sender->setVisible(false);
-            playBtnLoading->setVisible(true);
+            if (auto load = loading.lock()) load.take()->setVisible(true);
 
             if (auto pl = PlayLayer::get()) {
                 log::info("Switching from ad to Congregation jumpscare");
-                jumpscares::switchToLevel(pl, jumpscares::get::congregation(), nullptr, nullptr, false, false);
+                jumpscares::switchToLevel(pl, jumpscares::get::congregation(), false, false);
             } else {
                 log::error("Player not in a level");
             };