backup changes

Author: RayDeeUx

src/Manager.hpp

@@ -25,7 +25,10 @@ class Manager {
 
 	bool hasPRNTSCRN = false;
 	bool hasNextKeyWhenLoaded = false;
+	bool deathAnimationsFromZilko = false;
+
 	bool addedNextKeyWhenLabel = false;
+	int selectedDeathAnimation = -1;
 
 	float lastDeathPercent = -10.f;
 

src/MenuLayer.cpp

@@ -23,6 +23,7 @@ class $modify(MyMenuLayer, MenuLayer) {
 		manager->completedJDDNCheck = true;
 		manager->hasNextKeyWhenLoaded = Loader::get()->isModLoaded("alphalaneous.next_key_when");
 		manager->hasPRNTSCRN = Loader::get()->isModLoaded("ninxout.prntscrn");
+		manager->deathAnimationsFromZilko = Loader::get()->isModLoaded("zilko.death_animations");
 		return true;
 	}
 };

src/PlayLayer.cpp

@@ -60,6 +60,11 @@ class $modify(MyPlayLayer, PlayLayer) {
 
 		return CCEaseElasticOut::create(action, easingRate);
 	}
+	void setupHasCompleted() {
+		PlayLayer::setupHasCompleted();
+		if (!manager->deathAnimationsFromZilko) return;
+		manager->selectedDeathAnimation = Loader::get()->getLoadedMod("zilko.death_animations")->getSavedValue<int64_t>("selected-animation");
+	}
 	void resetLevel() {
 		PlayLayer::resetLevel();
 		manager->addedNextKeyWhenLabel = false;
@@ -150,11 +155,6 @@ class $modify(MyPlayLayer, PlayLayer) {
 		bool isFromZilkoMod = false;
 		const bool isNewBest = MyPlayLayer::didPlayerDieAtNewBest();
 
-		if (CCNode* deathAnim = this->getChildByID("zilko.death_animations/death-animation"); deathAnim && deathAnim->getTag() == 23) {
-			if (CCNode* crl = deathAnim->getChildByID("reward-layer"); crl && getModBool("currencyLayer")) crl->setVisible(false);
-			newBestNodeProbably = deathAnim->getChildByID("container");
-			isFromZilkoMod = true;
-		}
 		for (int i = static_cast<int>(getChildrenCount() - 1); i >= 0; i--) {
 			// NEW [good]: int i = getChildrenCount() - 1; i >= 0; i--
 			// ORIG [bad]: int i = getChildrenCount(); i-- > 0;
@@ -173,9 +173,14 @@ class $modify(MyPlayLayer, PlayLayer) {
 			if (theLastCCNode->getZOrder() != 100) continue;
 			if (theLastCCNode->getChildrenCount() < 2) continue;
 			if (getModBool("noVisibleNewBest")) return theLastCCNode->setVisible(false);
-			if (!isFromZilkoMod) newBestNodeProbably = theLastCCNode;
+			if (!manager->deathAnimationsFromZilko) newBestNodeProbably = theLastCCNode;
 			else theLastCCNode->setVisible(false);
-			break;
+			if (newBestNodeProbably) break;
+			if (manager->deathAnimationsFromZilko && theLastCCNode->getID() == "zilko.death_animations/death-animation" && theLastCCNode->getTag() == 23) {
+				if (CCNode* crl = theLastCCNode->getChildByID("reward-layer"); crl && getModBool("currencyLayer")) crl->setVisible(false);
+				newBestNodeProbably = theLastCCNode->getChildByID("container");
+				isFromZilkoMod = true;
+			}
 		}
 
 		if (!newBestNodeProbably || newBestNodeProbably->getUserObject("modified-already"_spr)) return;