From 89d3f4c2bee3aeacedd33cb6ee5570a05bf61a37 Mon Sep 17 00:00:00 2001
From: Drew DeVault <sir@cmpwn.com>
Date: Wed, 2 Nov 2016 19:37:52 -0400
Subject: [PATCH] Import enum from old osu

---
 osu.Game/Configuration/OsuConfigManager.cs | 274 ++++++++++++---------
 osu.Game/OsuGame.cs                        |   2 +-
 2 files changed, 154 insertions(+), 122 deletions(-)

diff --git a/osu.Game/Configuration/OsuConfigManager.cs b/osu.Game/Configuration/OsuConfigManager.cs
index 59f1dabf21..7738d4a982 100644
--- a/osu.Game/Configuration/OsuConfigManager.cs
+++ b/osu.Game/Configuration/OsuConfigManager.cs
@@ -14,7 +14,7 @@ namespace osu.Game.Configuration
         {
             Set(OsuConfig.Width, 1366, 640);
             Set(OsuConfig.Height, 768, 480);
-            Set(OsuConfig.MouseSensitivity, 1.0);
+            Set(OsuConfig.MouseSpeed, 1.0);
 
             Set(OsuConfig.Username, string.Empty);
             Set(OsuConfig.Password, string.Empty);
@@ -22,7 +22,7 @@ namespace osu.Game.Configuration
 
             Set(OsuConfig.PlayMode, PlayMode.Osu);
 
-            Set(OsuConfig.VolumeGlobal, 0.8, 0, 1);
+            Set(OsuConfig.VolumeUniversal, 0.8, 0, 1);
             Set(OsuConfig.VolumeMusic, 1.0, 0, 1);
             Set(OsuConfig.VolumeEffect, 1.0, 0, 1);
         }
@@ -34,127 +34,159 @@ namespace osu.Game.Configuration
 
     enum OsuConfig
     {
-        // General
-        //  Sign in
-        Username,
-        Password,
-        //  Language
-        Language,
-        PreferOriginalForMetadata,
-        AlternativeChatFont,
-        //  Updates
-        ReleaseStream,
-        // Graphics
-        //  Renderer
-        FrameLimiter,
-        FPSCounter,
-        ReduceDroppedFrames,
-        DetectPerformanceIssues,
-        //  Layout
-        Width,
-        Height,
-        EnableFullscreen,
-        EnableLetterboxing,
-        HorizontalPosition,
-        VerticalPosition,
-        //  Detail settings
-        EnableSnakingSliders,
-        EnableBackgroundVideo,
-        EnableStoryboards,
-        EnableComboBursts,
-        EnableHitLighting,
-        EnableShaders,
-        EnableSofteningFilter,
-        ScreenshotFormat,
-        //  Main menu
-        EnableMenuSnow,
-        EnableMenuParallax,
-        EnableMenuTips,
-        EnableInterfaceVoices,
-        EnableOsuMusicTheme,
-        //  Song select
-        EnableSongSelectThumbnails,
-        // Gameplay
-        //  General
-        BackgroundDim,
-        ProgressDisplay,
-        ScoreMeterType,
-        ScoreMeterSize,
-        AlwaysShowKeyOverlay,
-        ShowFirstHiddenApproachCircle,
-        ScaleManiaScrollSpeed,
-        RememberManiaScrollSpeed,
-        //  Song select
-        SongSelectMinimumStars,
-        SongSelectMaximumStars,
-        // Audio
-        //  Devices
-        OutputDevice,
-        //  Volume
-        VolumeGlobal,
+        // New osu:
+        PlayMode,
+        Token,
+        // Imported from old osu:
+        BeatmapDirectory,
+        VolumeUniversal,
         VolumeEffect,
         VolumeMusic,
-        IgnoreBeatmapHitsounds,
-        //  Offset
-        UniversalOffset,
-        // Skin
-        SelectedSkin,
-        IgnoreBeatmapSkins,
-        UseSkinAudioSamples,
-        UseTaikoSkin,
-        UseSkinCursor,
+        AllowPublicInvites,
+        AutoChatHide,
+        AutomaticDownload,
+        AutomaticDownloadNoVideo,
+        BlockNonFriendPM,
+        Bloom,
+        BloomSoftening,
+        BossKeyFirstActivation,
+        ChatAudibleHighlight,
+        ChatChannels,
+        ChatFilter,
+        ChatHighlightName,
+        ChatMessageNotification,
+        ChatLastChannel,
+        ChatRemoveForeign,
+        ChatSortMode,
+        ComboBurst,
+        ComboFire,
+        ComboFireHeight,
+        ConfirmExit,
+        AutoSendNowPlaying,
         CursorSize,
-        EnableAutomaticCursorSize,
-        // Input
-        //  Mouse
-        MouseSensitivity,
-        EnableRawInput,
-        EnableMapRawInputToWindow,
-        MouseConfinementMode,
-        DisableMouseWheelInPlay,
-        DisableMouseButtonsInPlay,
-        EnableCursorRipples,
-        //  Keyboard
-        // TODO
-        //  Other
-        UseOSTabletSupport,
-        EnableWiimoteDrumSupport,
-        // Editor
-        EnableEditorBackgroundVideo,
-        EnableEditorDefaultSkin,
-        EnableEditorSnakingSliders,
-        EnableEditorHitAnimations,
-        EnableEditorFollowPoints,
-        EnableEditorStacking,
-        // Online
-        //  Alerts and Privacy
-        EnableChatTicker,
-        HideChatDuringPlay,
-        EnableNotifyOnMention,
-        EnableSoundOnMention,
-        EnableChatNotifications,
-        EnableCitySharing,
-        EnableSpectators,
-        AutoLinkBeatmapsToSpectators,
-        ShowNotificationsDuringPlay,
-        ShowFriendOnlineStatusNotifications,
-        AllowAnyMultiplayerInvites,
-        //  Integration
-        EnableYahooIntegration,
-        EnableMSNLiveIntegration,
-        AutoStartOsuDirect,
-        PreferNoVideo,
-        //  In-game chat
-        EnableWordFilter,
-        EnableForeignFilter,
-        EnablePrivateMessageLog,
-        BlockStrangerPrivateMessages,
-        ChatIgnoreList,
-        ChatHighlightList,
-        // Maintenance
-        // (no persisted options)
-        // Misc (not mapped to user-visible options)
-        Token,
-        PlayMode,
+        AutomaticCursorSizing,
+        DimLevel,
+        Display,
+        DisplayCityLocation,
+        DistanceSpacingEnabled,
+        EditorTip,
+        VideoEditor,
+        EditorDefaultSkin,
+        EditorSnakingSliders,
+        EditorHitAnimations,
+        EditorFollowPoints,
+        EditorStacking,
+        ForceSliderRendering,
+        FpsCounter,
+        FrameTimeDisplay,
+        GuideTips,
+        CursorRipple,
+        HighlightWords,
+        HighResolution,
+        HitLighting,
+        IgnoreBarline,
+        IgnoreBeatmapSamples,
+        IgnoreBeatmapSkins,
+        IgnoreList,
+        KeyOverlay,
+        Language,
+        LastPlayMode,
+        AllowNowPlayingHighlights,
+        LastVersion,
+        LastVersionPermissionsFailed,
+        LoadSubmittedThread,
+        LobbyPlayMode,
+        ShowInterface,
+        ShowInterfaceDuringRelax,
+        LobbyShowExistingOnly,
+        LobbyShowFriendsOnly,
+        LobbyShowFull,
+        LobbyShowInProgress,
+        LobbyShowPassworded,
+        LogPrivateMessages,
+        LowResolution,
+        ManiaSpeed,
+        UsePerBeatmapManiaSpeed,
+        ManiaSpeedBPMScale,
+        MenuTip,
+        MouseDisableButtons,
+        MouseDisableWheel,
+        MouseSpeed,
+        Offset,
+        ScoreMeterScale,
+        DistanceSpacing,
+        EditorBeatDivisor,
+        EditorGridSize,
+        EditorGridSizeDesign,
+        Height,
+        Width,
+        HeightFullscreen,
+        CustomFrameLimit,
+        WidthFullscreen,
+        MsnIntegration,
+        MyPcSucks,
+        NotifyFriends,
+        NotifySubmittedThread,
+        PopupDuringGameplay,
+        ProgressBarType,
+        RankType,
+        RefreshRate,
+        OverrideRefreshRate,
+        ScaleMode,
+        ScoreboardVisible,
+        ScoreMeter,
+        ScreenshotId,
+        MenuSnow,
+        MenuTriangles,
+        SongSelectThumbnails,
+        ScreenshotFormat,
+        ShowReplayComments,
+        ShowSpectators,
+        ShowStoryboard,
+        Skin,
+        SkinSamples,
+        SkipTablet,
+        SnakingSliders,
+        Tablet,
+        UpdatePending,
+        UserFilter,
+        UseSkinCursor,
+        UseTaikoSkin,
+        Video,
+        Wiimote,
+        YahooIntegration,
+        ForceFrameFlush,
+        DetectPerformanceIssues,
+        Fullscreen,
+        MenuMusic,
+        MenuVoice,
+        MenuParallax,
+        RawInput,
+        AbsoluteToOsuWindow,
+        ConfineMouse,
+        ShowMenuTips,
+        HiddenShowFirstApproach,
+        ComboColourSliderBall,
+        AlternativeChatFont,
+        Password,
+        Username,
+        DisplayStarsMaximum,
+        DisplayStarsMinimum,
+        AudioDevice,
+        ReleaseStream,
+        UpdateFailCount,
+        SavePassword,
+        SaveUsername,
+        TreeSortMode,
+        TreeSortMode2,
+        Letterboxing,
+        LetterboxPositionX,
+        LetterboxPositionY,
+        FrameSync,
+        ShowUnicode,
+        PermanentSongInfo,
+        Ticker,
+        CompatibilityContext,
+        CanForceOptimusCompatibility,
     }
 }
diff --git a/osu.Game/OsuGame.cs b/osu.Game/OsuGame.cs
index af078395df..7f14c6c942 100644
--- a/osu.Game/OsuGame.cs
+++ b/osu.Game/OsuGame.cs
@@ -61,7 +61,7 @@ namespace osu.Game
                 Schedule(delegate { Beatmaps.Import(args); });
 
             //attach our bindables to the audio subsystem.
-            Audio.Volume.Weld(Config.GetBindable<double>(OsuConfig.VolumeGlobal));
+            Audio.Volume.Weld(Config.GetBindable<double>(OsuConfig.VolumeUniversal));
             Audio.VolumeSample.Weld(Config.GetBindable<double>(OsuConfig.VolumeEffect));
             Audio.VolumeTrack.Weld(Config.GetBindable<double>(OsuConfig.VolumeMusic));