1 月之前 · 68035efe58
--- a/src/App/Osu/OsuBeatmap.cpp
+++ b/src/App/Osu/OsuBeatmap.cpp
@@ -1417,8 +1417,6 @@ void OsuBeatmap::restart(bool quick) {
 
         m_bIsRestartScheduledQuick = quick;
 
     } else if(m_bIsPaused)
 
         pause(false);
 
-
 
-    onRestart(quick);
 
 }
 
 
 
 void OsuBeatmap::actualRestart() {
@@ -1518,10 +1516,7 @@ void OsuBeatmap::pause(bool quitIfWaiting) {
 
             // pause menu is handled in the Osu class, a bit shit)
 
         m_bIsPaused = !m_bIsPaused;
 
 
 
-    if(m_bIsPaused)
 
-        onPaused(isFirstPause);
 
-    else
 
-        onUnpaused();
 
+    if(m_bIsPaused) onPaused(isFirstPause);
 
 
 
     // if we have failed, and the user early exits to the pause menu, stop the failing animation
 
     if(m_bFailed) anim->deleteExistingAnimation(&m_fFailAnim);
@@ -1557,8 +1552,6 @@ void OsuBeatmap::stop(bool quit) {
 
 
 
     unloadObjects();
 
 
 
-    onStop(quit);
 
-
 
     if(bancho.is_playing_a_multi_map()) {
 
         if(quit) {
 
             m_osu->onPlayEnd(true);
--- a/src/App/Osu/OsuBeatmap.h
+++ b/src/App/Osu/OsuBeatmap.h
@@ -231,12 +231,7 @@ class OsuBeatmap {
 
     virtual void onBeforeStop(bool quit) {
 
         ;
 
     }  // called before hitobjects are unloaded (quit = don't display ranking screen)
 
-    virtual void onStop(bool quit) {
 
-        ;
 
-    }  // called after hitobjects have been unloaded, but before Osu::onPlayEnd() (quit = don't display ranking screen)
 
     virtual void onPaused(bool first) { ; }
 
-    virtual void onUnpaused() { ; }
 
-    virtual void onRestart(bool quick) { ; }
 
 
 
     // internal
 
     bool canDraw();
--- a/src/App/Osu/OsuBeatmapStandard.cpp
+++ b/src/App/Osu/OsuBeatmapStandard.cpp
@@ -1247,8 +1247,6 @@ void OsuBeatmapStandard::onBeforeStop(bool quit) {
 
     debugLog("OsuBeatmapStandard::onBeforeStop() done.\n");
 
 }
 
 
 
-void OsuBeatmapStandard::onStop(bool quit) { debugLog("OsuBeatmapStandard::onStop()\n"); }
 
-
 
 void OsuBeatmapStandard::onPaused(bool first) {
 
     debugLog("OsuBeatmapStandard::onPaused()\n");
 
 
@@ -1259,10 +1257,6 @@ void OsuBeatmapStandard::onPaused(bool first) {
 
     }
 
 }
 
 
 
-void OsuBeatmapStandard::onUnpaused() { debugLog("OsuBeatmapStandard::onUnpaused()\n"); }
 
-
 
-void OsuBeatmapStandard::onRestart(bool quick) { debugLog("OsuBeatmapStandard::onRestart()\n"); }
 
-
 
 void OsuBeatmapStandard::updateAutoCursorPos() {
 
     m_vAutoCursorPos = m_vPlayfieldCenter;
 
     m_vAutoCursorPos.y *= 2.5f;  // start moving in offscreen from bottom
--- a/src/App/Osu/OsuBeatmapStandard.h
+++ b/src/App/Osu/OsuBeatmapStandard.h
@@ -108,10 +108,7 @@ class OsuBeatmapStandard : public OsuBeatmap {
 
     virtual void onLoad();
 
     virtual void onPlayStart();
 
     virtual void onBeforeStop(bool quit);
 
-    virtual void onStop(bool quit);
 
     virtual void onPaused(bool first);
 
-    virtual void onUnpaused();
 
-    virtual void onRestart(bool quick);
 
 
 
     void drawFollowPoints(Graphics *g);
 
     void drawHitObjects(Graphics *g);