cmon bro so close

RayDeeUx · RayDeeUx · commit 915c486daca0 · 2026-01-20T16:33:45.000-05:00
diff --git a/src/EditorPauseLayer.cpp b/src/EditorPauseLayer.cpp
@@ -6,7 +6,7 @@ using namespace geode::prelude;
 
 class $modify(MenuLoopEPLHook, EditorPauseLayer) {
 	void iHateHookingMultipleThingsToGetSomethingDone() {
-		SongManager::get().setComingFromGJBGL(true);
+		SongManager::get().setPauseSongPositionTracking(true);
 		if (Utils::getBool("randomizeWhenExitingEditor")) SongManager::get().pickRandomSong();
 		else SongManager::get().setShouldRestoreMenuLoopPoint(!Utils::getBool("randomizeWhenExitingEditor") && Utils::getBool("restoreWhenExitingEditor"));
 	}
diff --git a/src/FMODAudioEngine.cpp b/src/FMODAudioEngine.cpp
@@ -12,7 +12,7 @@ class $modify(MenuLoopFMODHook, FMODAudioEngine) {
 	void update(float dt) {
 		FMODAudioEngine::update(dt);
 		SongManager& songManager = SongManager::get();
-		if (songManager.getComingFromGJBGL() || GJBaseGameLayer::get() || VANILLA_GD_MENU_LOOP_DISABLED) {
+		if (songManager.getPauseSongPositionTracking() || GJBaseGameLayer::get() || VANILLA_GD_MENU_LOOP_DISABLED) {
 			if (stupidAccmulatorTooLazyToPutElsewhere != 0) stupidAccmulatorTooLazyToPutElsewhere = 0;
 			return;
 		}
diff --git a/src/GJBaseGameLayer.cpp b/src/GJBaseGameLayer.cpp
@@ -5,14 +5,13 @@
 class $modify(MenuLoopGJBGLHook, GJBaseGameLayer) {
 	struct Fields {
 		~Fields() {
-			SongManager::get().setComingFromGJBGL(false);
+			SongManager::get().setPauseSongPositionTracking(false);
 		}
 	};
 	bool init() {
-		SongManager::get().setComingFromGJBGL(false);
 		if (!GJBaseGameLayer::init()) return false;
 		SongManager::get().setShouldRestoreMenuLoopPoint(false);
-		SongManager::get().setComingFromGJBGL(true);
+		SongManager::get().setPauseSongPositionTracking(true);
 		if (!Utils::getBool("playlistMode")) return true;
 		const auto fmod = FMODAudioEngine::get();
 		if (!fmod) return true;
diff --git a/src/GameManager.cpp b/src/GameManager.cpp
@@ -18,14 +18,14 @@ class $modify(MenuLoopGMHook, GameManager) {
 		const geode::Mod* colon = songManager.getColonMenuLoopStartTime();
 		if (colon && colon->getSettingValue<bool>("enable")) return;
 		if (!songManager.getShouldRestoreMenuLoopPoint()) return;
-		log::info("songManager.getComingFromGJBGL(): {}", songManager.getComingFromGJBGL());
-		log::info("songManager.getComingFromGJBGL(): {}", songManager.getComingFromGJBGL());
-		log::info("songManager.getComingFromGJBGL(): {}", songManager.getComingFromGJBGL());
-		log::info("songManager.getComingFromGJBGL(): {}", songManager.getComingFromGJBGL());
-		log::info("songManager.getComingFromGJBGL(): {}", songManager.getComingFromGJBGL());
-		log::info("songManager.getComingFromGJBGL(): {}", songManager.getComingFromGJBGL());
-		log::info("songManager.getComingFromGJBGL(): {}", songManager.getComingFromGJBGL());
-		log::info("songManager.getComingFromGJBGL(): {}", songManager.getComingFromGJBGL());
+		log::info("songManager.getPauseSongPositionTracking(): {}", songManager.getPauseSongPositionTracking());
+		log::info("songManager.getPauseSongPositionTracking(): {}", songManager.getPauseSongPositionTracking());
+		log::info("songManager.getPauseSongPositionTracking(): {}", songManager.getPauseSongPositionTracking());
+		log::info("songManager.getPauseSongPositionTracking(): {}", songManager.getPauseSongPositionTracking());
+		log::info("songManager.getPauseSongPositionTracking(): {}", songManager.getPauseSongPositionTracking());
+		log::info("songManager.getPauseSongPositionTracking(): {}", songManager.getPauseSongPositionTracking());
+		log::info("songManager.getPauseSongPositionTracking(): {}", songManager.getPauseSongPositionTracking());
+		log::info("songManager.getPauseSongPositionTracking(): {}", songManager.getPauseSongPositionTracking());
 		log::info("oldTrack: {}", oldTrack);
 		log::info("oldTrack: {}", oldTrack);
 		log::info("oldTrack: {}", oldTrack);
@@ -57,10 +57,10 @@ class $modify(MenuLoopGMHook, GameManager) {
 		log::info("songManager.getLastMenuLoopPosition(): {}", songManager.getLastMenuLoopPosition());
 		log::info("songManager.getLastMenuLoopPosition(): {}", songManager.getLastMenuLoopPosition());
 		log::info("songManager.getLastMenuLoopPosition(): {}", songManager.getLastMenuLoopPosition());
-		if (oldTrack == fmod->getActiveMusic(0) && !songManager.getComingFromGJBGL()) return; // NOTE: THIS LINE CAN CAUSE ISSUES WHEN MENU LOOP AND LEVEL'S MOST RECENTLY PLAYED SONG ARE THE SAME
+		if (oldTrack == fmod->getActiveMusic(0) && !songManager.getPauseSongPositionTracking()) return; // NOTE: THIS LINE CAN CAUSE ISSUES WHEN MENU LOOP AND LEVEL'S MOST RECENTLY PLAYED SONG ARE THE SAME
 		songManager.restoreLastMenuLoopPosition();
 		songManager.setShouldRestoreMenuLoopPoint(false);
-		songManager.setComingFromGJBGL(false);
+		songManager.setPauseSongPositionTracking(false);
 	}
 	void encodeDataTo(DS_Dictionary* p0) {
 		SongManager& songManager = SongManager::get();
diff --git a/src/PlayLayer.cpp b/src/PlayLayer.cpp
@@ -6,7 +6,7 @@ using namespace geode::prelude;
 
 class $modify(MenuLoopPLHook, PlayLayer) {
 	void onQuit() {
-		SongManager::get().setComingFromGJBGL(true);
+		SongManager::get().setPauseSongPositionTracking(true);
 		if (Utils::getBool("randomizeWhenExitingLevel")) SongManager::get().pickRandomSong();
 		else SongManager::get().setShouldRestoreMenuLoopPoint(!Utils::getBool("randomizeWhenExitingLevel") && Utils::getBool("restoreWhenExitingLevel"));
 
diff --git a/src/SongManager.cpp b/src/SongManager.cpp
@@ -266,7 +266,7 @@ void SongManager::restoreLastMenuLoopPosition() {
 	if (!songManager.getShouldRestoreMenuLoopPoint()) return;
 	FMODAudioEngine::get()->setMusicTimeMS(songManager.getLastMenuLoopPosition(), false, 0);
 	songManager.setShouldRestoreMenuLoopPoint(false);
-	songManager.setComingFromGJBGL(false);
+	songManager.setPauseSongPositionTracking(false);
 }
 
 void SongManager::setShouldRestoreMenuLoopPoint(const bool value) {
@@ -301,11 +301,11 @@ bool SongManager::getVibecodedVentilla() const {
 	return m_vibecodedVentilla;
 }
 
-void SongManager::setComingFromGJBGL(const bool value) {
+void SongManager::setPauseSongPositionTracking(const bool value) {
 	m_comingFromGJBGL = value;
 }
 
-bool SongManager::getComingFromGJBGL() const {
+bool SongManager::getPauseSongPositionTracking() const {
 	return m_comingFromGJBGL;
 }
 
diff --git a/src/SongManager.hpp b/src/SongManager.hpp
@@ -92,8 +92,8 @@ class SongManager {
 	geode::Mod* getColonMenuLoopStartTime() const;
 	void setVibecodedVentilla(const bool);
 	bool getVibecodedVentilla() const;
-	void setComingFromGJBGL(const bool);
-	bool getComingFromGJBGL() const;
+	void setPauseSongPositionTracking(const bool);
+	bool getPauseSongPositionTracking() const;
 	void setFinishedCalculatingSongLengths(const bool);
 	bool getFinishedCalculatingSongLengths() const;
 
diff --git a/src/ui/SongControlMenu.cpp b/src/ui/SongControlMenu.cpp
@@ -353,18 +353,22 @@ void SongControlMenu::onSkipBkwdButton(CCObject*) {
 	const std::string& currSong = songManager.getCurrentSong();
 	if (fmod->getActiveMusic(0) != currSong || !songManager.getSongToSongDataEntries().contains(currSong)) return;
 
+	songManager.setPauseSongPositionTracking(true);
 	const int fullLength = songManager.getSongToSongDataEntries().find(songManager.getCurrentSong())->second.songLength;
 	const int lastPosition = songManager.getLastMenuLoopPosition();
 
 	if ((lastPosition - 5000) < 0) {
 		if (songManager.getConstantShuffleMode()) {
 			fmod->getActiveMusicChannel(0)->setPosition(0, FMOD_TIMEUNIT_MS);
 		} else if (fullLength > 0 && fullLength < std::numeric_limits<unsigned int>::max()) {
-			fmod->getActiveMusicChannel(0)->setPosition(((((lastPosition % fullLength) + fullLength) % fullLength) - (5000 % fullLength) + fullLength) % fullLength, FMOD_TIMEUNIT_MS);
+			const int newPosition = ((((lastPosition % fullLength) + fullLength) % fullLength) - (5000 % fullLength) + fullLength) % fullLength;
+			fmod->getActiveMusicChannel(0)->setPosition(newPosition, FMOD_TIMEUNIT_MS);
+			songManager.setLastMenuLoopPosition(newPosition);
 		}
 	} else {
 		fmod->getActiveMusicChannel(0)->setPosition(lastPosition - 5000, FMOD_TIMEUNIT_MS);
 	}
+	songManager.setPauseSongPositionTracking(false);
 }
 
 void SongControlMenu::onSkipFwrdButton(CCObject*) {
@@ -378,16 +382,20 @@ void SongControlMenu::onSkipFwrdButton(CCObject*) {
 	const int fullLength = songManager.getSongToSongDataEntries().find(songManager.getCurrentSong())->second.songLength;
 	const int lastPosition = songManager.getLastMenuLoopPosition();
 
+	songManager.setPauseSongPositionTracking(true);
 	if ((lastPosition + 5000) > fullLength) {
 		if (songManager.getConstantShuffleMode()) {
 			SongControl::shuffleSong();
 			SongControlMenu::updateCurrentLabel();
 		} else if (fullLength > 0 && fullLength < std::numeric_limits<unsigned int>::max()) {
-			fmod->getActiveMusicChannel(0)->setPosition(((((lastPosition % fullLength) + fullLength) % fullLength) + (5000 % fullLength)) % fullLength, FMOD_TIMEUNIT_MS);
+			const int newPosition = ((((lastPosition % fullLength) + fullLength) % fullLength) + (5000 % fullLength)) % fullLength;
+			fmod->getActiveMusicChannel(0)->setPosition(newPosition, FMOD_TIMEUNIT_MS);
+			songManager.setLastMenuLoopPosition(newPosition);
 		}
 	} else {
 		fmod->getActiveMusicChannel(0)->setPosition(lastPosition + 5000, FMOD_TIMEUNIT_MS);
 	}
+	songManager.setPauseSongPositionTracking(false);
 }
 
 void SongControlMenu::updateCurrentLabel() {

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ using namespace geode::prelude;`
`6`	`6`
`7`	`7`	`class $modify(MenuLoopEPLHook, EditorPauseLayer) {`
`8`	`8`	`void iHateHookingMultipleThingsToGetSomethingDone() {`
`9`		`- SongManager::get().setComingFromGJBGL(true);`
	`9`	`+ SongManager::get().setPauseSongPositionTracking(true);`
`10`	`10`	`if (Utils::getBool("randomizeWhenExitingEditor")) SongManager::get().pickRandomSong();`
`11`	`11`	`else SongManager::get().setShouldRestoreMenuLoopPoint(!Utils::getBool("randomizeWhenExitingEditor") && Utils::getBool("restoreWhenExitingEditor"));`
`12`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ class $modify(MenuLoopFMODHook, FMODAudioEngine) {`
`12`	`12`	`void update(float dt) {`
`13`	`13`	`FMODAudioEngine::update(dt);`
`14`	`14`	`SongManager& songManager = SongManager::get();`
`15`		`- if (songManager.getComingFromGJBGL() \|\| GJBaseGameLayer::get() \|\| VANILLA_GD_MENU_LOOP_DISABLED) {`
	`15`	`+ if (songManager.getPauseSongPositionTracking() \|\| GJBaseGameLayer::get() \|\| VANILLA_GD_MENU_LOOP_DISABLED) {`
`16`	`16`	`if (stupidAccmulatorTooLazyToPutElsewhere != 0) stupidAccmulatorTooLazyToPutElsewhere = 0;`
`17`	`17`	`return;`
`18`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -266,7 +266,7 @@ void SongManager::restoreLastMenuLoopPosition() {`
`266`	`266`	`if (!songManager.getShouldRestoreMenuLoopPoint()) return;`
`267`	`267`	`FMODAudioEngine::get()->setMusicTimeMS(songManager.getLastMenuLoopPosition(), false, 0);`
`268`	`268`	`songManager.setShouldRestoreMenuLoopPoint(false);`
`269`		`- songManager.setComingFromGJBGL(false);`
	`269`	`+ songManager.setPauseSongPositionTracking(false);`
`270`	`270`	`}`
`271`	`271`
`272`	`272`	`void SongManager::setShouldRestoreMenuLoopPoint(const bool value) {`
`@@ -301,11 +301,11 @@ bool SongManager::getVibecodedVentilla() const {`
`301`	`301`	`return m_vibecodedVentilla;`
`302`	`302`	`}`
`303`	`303`
`304`		`-void SongManager::setComingFromGJBGL(const bool value) {`
	`304`	`+void SongManager::setPauseSongPositionTracking(const bool value) {`
`305`	`305`	`m_comingFromGJBGL = value;`
`306`	`306`	`}`
`307`	`307`
`308`		`-bool SongManager::getComingFromGJBGL() const {`
	`308`	`+bool SongManager::getPauseSongPositionTracking() const {`
`309`	`309`	`return m_comingFromGJBGL;`
`310`	`310`	`}`
`311`	`311`