Merge pull request #15 from c0des1ayr/main

Add new setting to set a custom music loop point
tariq-nasheed · Jul 14, 2024 · 5bbb9c1 · 5bbb9c1
2 parents ba78583 + 61df69b
commit 5bbb9c1
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 4 deletions.
diff --git a/src/hypermania/HyperManiaVariables.h b/src/hypermania/HyperManiaVariables.h
@@ -83,6 +83,7 @@ typedef struct {
 	bool32 twoHeavensMode; // set to true to enable "Two Heavens mode" letting you choose between turning super OR hyper with the latter form consuming rings at a faster rate
 	bool32 enableHyperMusic; // set to true to enable hyper music (duhhh!!!!!)
 	bool32 superTailsOnly; // set to enable vanilla S3&K super tails logic (hyper tails = super tails, can't turn super tails with chaos emeralds)
+	int32 hyperMusicLoopPoint; // set when changing the Hyper track (defaults to 423801)
 } HM_Config;
 
 typedef struct {

diff --git a/src/hypermania/ModConfig.h b/src/hypermania/ModConfig.h
@@ -15,8 +15,9 @@ typedef struct {
 	float screenFlashFactor; // set to control intensity of screen flashes, with 1.0 being full intensity and 0.0 disabling flashes
 	bool32 twoHeavensMode; // set to true to enable "Two Heavens mode" letting you choose between turning super OR hyper with the latter form consuming rings at a faster rate
 	bool32 enableHyperMusic; // set to true to enable hyper music (duhhh!!!!!)
+	int32 hyperMusicLoopPoint; // set when changing the Hyper track (defaults to 423801)
 } ModConfig_t;
 
 extern ModConfig_t ModConfig;
 
-#endif //! MOD_CONFIG_H
+#endif //! MOD_CONFIG_H
diff --git a/src/hypermania/dllmain.c b/src/hypermania/dllmain.c
@@ -111,6 +111,7 @@ void InitModAPI() {
 	HM_globals->config.GSWitemBoxes = Mod.GetSettingsBool("", "Config:GSWitemBoxes", true);
 	HM_globals->config.JEAjank = Mod.GetSettingsBool("", "Config:JEAjank", false);
 	HM_globals->config.superTailsOnly = Mod.GetSettingsBool("", "Config:superTailsOnly", false);
+	HM_globals->config.hyperMusicLoopPoint = Mod.GetSettingsInteger("", "Config:hyperMusicLoopPoint", 423801);
 	Mod.SetSettingsInteger("Config:hyperStyle", HM_globals->config.hyperStyle);
 	Mod.SetSettingsBool("Config:hyperFlashDropDash", HM_globals->config.hyperFlashDropDash);
 	Mod.SetSettingsBool("Config:hyperFlashForwarding", HM_globals->config.hyperFlashForwarding);
@@ -121,6 +122,7 @@ void InitModAPI() {
 	Mod.SetSettingsBool("Config:GSWitemBoxes", HM_globals->config.GSWitemBoxes);
 	Mod.SetSettingsBool("Config:JEAjank", HM_globals->config.JEAjank);
 	Mod.SetSettingsBool("Config:superTailsOnly", HM_globals->config.superTailsOnly);
+	Mod.SetSettingsInteger("Config:hyperMusicLoopPoint", HM_globals->config.hyperMusicLoopPoint);
 	Mod.SaveSettings();
 
 	// Boilerplate ---------------------------------------------------------

diff --git a/src/hypermania/mod/Global/Player.c b/src/hypermania/mod/Global/Player.c
@@ -348,10 +348,10 @@ void Player_Update_OVERLOAD() {
 	}
 
 	// music handling ------------------------------------------------------
-	if (!ERZStart && HM_globals->config.enableHyperMusic && Music->trackLoops[TRACK_SUPER] != 423801 &&
+	if (!ERZStart && HM_globals->config.enableHyperMusic && Music->trackLoops[TRACK_SUPER] != HM_globals->config.hyperMusicLoopPoint &&
 	(Music->activeTrack == TRACK_SUPER || !HM_globals->config.twoHeavensMode)) {
 #if MANIA_USE_PLUS
-		Music_SetMusicTrack("Hyper.ogg", TRACK_SUPER, 423801);
+		Music_SetMusicTrack("Hyper.ogg", TRACK_SUPER, HM_globals->config.hyperMusicLoopPoint);
 		if (Music->activeTrack == TRACK_SUPER) Music_PlayJingle(TRACK_SUPER);
 #else
 		//Music_TransitionTrack(TRACK_HYPER, 1.0);
@@ -691,4 +691,4 @@ int32 Player_GetIndexFromID(int32 ID) {
 #endif
 	}
 	return index;
-}
+}
diff --git a/src/release-files/modSettings.ini b/src/release-files/modSettings.ini
@@ -9,3 +9,4 @@ hyperFlashForwarding = N
 hyperStyle = 0
 screenFlashFactor = 1.000000
 twoHeavensMode = N
+hyperMusicLoopPoint = 423801