Browse Source

Unlock osu_drain_kill

kiwec 2 months ago
parent
commit
405949e1a7
2 changed files with 5 additions and 1 deletions
  1. 4 1
      src/App/Osu/Beatmap.cpp
  2. 1 0
      src/App/Osu/Changelog.cpp

+ 4 - 1
src/App/Osu/Beatmap.cpp

@@ -163,7 +163,7 @@ ConVar osu_mod_suddendeath_restart("osu_mod_suddendeath_restart", false,
 ConVar osu_drain_type(
     "osu_drain_type", 2, FCVAR_LOCKED,
     "which hp drain algorithm to use (1 = None, 2 = osu!stable, 3 = osu!lazer 2020, 4 = osu!lazer 2018)");
-ConVar osu_drain_kill("osu_drain_kill", true, FCVAR_LOCKED, "whether to kill the player upon failing");
+ConVar osu_drain_kill("osu_drain_kill", true, FCVAR_DEFAULT, "whether to kill the player upon failing");
 ConVar osu_drain_kill_notification_duration(
     "osu_drain_kill_notification_duration", 1.0f, FCVAR_DEFAULT,
     "how long to display the \"You have failed, but you can keep playing!\" notification (0 = disabled)");
@@ -1206,6 +1206,9 @@ void Beatmap::fail() {
         anim->moveLinear(&m_fFailAnim, 0.0f, osu_fail_time.getFloat(),
                          true);  // trigger music slowdown and delayed menu, see update()
     } else if(!osu->getScore()->isDead()) {
+        debugLog("Disabling score submission due to death\n");
+        vanilla = false;
+
         anim->deleteExistingAnimation(&m_fHealth2);
         m_fHealth = 0.0;
         m_fHealth2 = 0.0f;

+ 1 - 0
src/App/Osu/Changelog.cpp

@@ -40,6 +40,7 @@ Changelog::Changelog() : ScreenBackable() {
     latest.changes.push_back("- FPS counter will now display worst frametime instead of current frametime");
     latest.changes.push_back("- Improved song browser performance");
     latest.changes.push_back("- Skins are now sorted alphabetically, ignoring meme characters");
+    latest.changes.push_back("- Unlocked osu_drain_kill convar");
     changelogs.push_back(latest);
 
     CHANGELOG v35_05;