Skip to content

Commit

Permalink
Remove the last arcade-specific preference
Browse files Browse the repository at this point in the history
Disqualification. Because disqualification is handled internally we can probably just rip it out entirely this way.
  • Loading branch information
poco0317 committed Mar 9, 2019
1 parent e33e1c5 commit 92819b3
Show file tree
Hide file tree
Showing 14 changed files with 1 addition and 33 deletions.
3 changes: 1 addition & 2 deletions Themes/Til Death/metrics.ini
Original file line number Diff line number Diff line change
Expand Up @@ -585,7 +585,7 @@ Fallback="ScreenOptionsSimpleService"
NextScreen=Branch.AfterInit()
PrevScreen=Branch.AfterInit()

LineNames="GameType,GraphicSound,KeyConfig,Theme,Arcade,InputOptions,SoundGraphics,Profiles,Network,Advanced"
LineNames="GameType,GraphicSound,KeyConfig,Theme,InputOptions,SoundGraphics,Profiles,Network,Advanced"

LineSync="gamecommand;screen,ScreenGameplaySyncMachine;name,Calibrate Machine Sync"
LineGameType="gamecommand;screen,ScreenSelectGame;name,Select Game"
Expand All @@ -594,7 +594,6 @@ LineTestInput="gamecommand;screen,ScreenTestInput;name,Test Input"
LineInput="gamecommand;screen,ScreenOptionsInput;name,Input Options"

LineTheme="gamecommand;screen,ScreenOptionsTheme;name,Theme Options"
LineArcade="gamecommand;screen,ScreenOptionsArcade;name,Arcade Options"
LineAppearance="gamecommand;screen,ScreenAppearanceOptions;name,Appearance Options"
LineBGFit="gamecommand;screen,ScreenSetBGFit;name,Set BG Fit Mode"
LineGraphicSound="gamecommand;screen,ScreenOptionsGraphicsSound;name,Graphics/Sound Options"
Expand Down
2 changes: 0 additions & 2 deletions Themes/_fallback/Languages/de.ini
Original file line number Diff line number Diff line change
Expand Up @@ -372,7 +372,6 @@ DisplayAspectRatio=Change the width-to-height ratio of graphics in the game. Mos
DisplayColorDepth=Choose the color depth of the window. This option may not take effect in windowed mode.
DisplayResolution=Choose the output resolution. A higher resolution will show more detail, but requires a faster video card.
Display Options=HG-Einpassungs-, Erscheinungsbild- and Benutzer-Oberfläche-Optionen.
Disqualification=If turned off, players cannot be disqualified from scoring.
EasterEggs=Enable or disable some special easter eggs.
Edit Courses=Edit Courses
Edit Courses/Mods=Edit Courses/Mods
Expand Down Expand Up @@ -1006,7 +1005,6 @@ DisplayAspectRatio=Seitenverhältnis
DisplayColorDepth=Farbtiefe
DisplayResolution=Auflösung
Display Options=Anzeige-Optionen
Disqualification=Disqualifizierung
Duration seconds=Duration seconds
EasterEggs=Easter Eggs
Edit Songs/Steps=Edit Songs/Steps
Expand Down
2 changes: 0 additions & 2 deletions Themes/_fallback/Languages/en.ini
Original file line number Diff line number Diff line change
Expand Up @@ -378,7 +378,6 @@ DisplayAspectRatio=Change the width-to-height ratio of graphics in the game. Mos
DisplayColorDepth=Choose the color depth of the window. This option may not take effect in windowed mode.
DisplayResolution=Choose the output resolution. A higher resolution will show more detail, but requires a faster video card.
Display Options=BGFit, Appearance and UI options.
Disqualification=If turned off, players cannot be disqualified from scoring.
EasterEggs=Enable or disable some special easter eggs.
Edit Songs/Steps=Edit Songs/Steps
Practice Songs/Steps=Practice Songs/Steps
Expand Down Expand Up @@ -1004,7 +1003,6 @@ DisplayAspectRatio=Aspect Ratio
DisplayColorDepth=Display Color
DisplayResolution=Display Resolution
Display Options=Display Options
Disqualification=Disqualification
Duration seconds=Duration seconds
EasterEggs=Easter Eggs
Edit Songs/Steps=Edit Songs/Steps
Expand Down
2 changes: 0 additions & 2 deletions Themes/_fallback/Languages/es.ini
Original file line number Diff line number Diff line change
Expand Up @@ -515,7 +515,6 @@ BackgroundFitMode=Cambia la forma en que se escalan los fondos para ajustarse a
CoinMode=CASA: Las opciones se muestran en la pantalla de título. PAGAR: las opciones se ocultan y debes insertar monedas. PARTIDAS GRATIS: las opciones se ocultan y se puede jugar sin monedas.
CoinModeNoHome=En PAGAR debes insertar monedas antes de unirte. En GRATIS puedes jugar sin insertar monedas.
ComboContinuesBetweenSongs=Si se enciende, el combo no se reiniciará a 0 tras cada canción.
Disqualification=Si se apaga, los jugadores no se descalifican de la puntuación.
EditRecordModeLeadIn=Ajusta el tiempo de entrada antes de iniciar una grabación.
FailOffForFirstStageEasy=Si se activa, la primera fase desactiva la pantalla de Fallo en Fácil.
FailOffInBeginner=Si se activa, el modo principiante siempre desactiva la pantalla de Fallo.
Expand Down Expand Up @@ -1232,7 +1231,6 @@ Add Mod=Añadir mod
AllowMultipleHighScoreWithSameName=Modo competitivo
BackgroundFitMode=Ajuste de fondos
ComboContinuesBetweenSongs=Continuar combo
Disqualification=Descalificación
EditRecordModeLeadIn=Entrada récord
FailOffForFirstStageEasy=Fallo desactivado en fase 1 fácil
FailOffInBeginner=Fallo apagado principiante
Expand Down
2 changes: 0 additions & 2 deletions Themes/_fallback/Languages/fr.ini
Original file line number Diff line number Diff line change
Expand Up @@ -370,7 +370,6 @@ DisplayAspectRatio=Change the width-to-height ratio of graphics in the game. Mos
DisplayColorDepth=Choose the color depth of the window. This option may not take effect in windowed mode.
Display Options=BGFit, Apparence et options de l'IU.
DisplayResolution=Choose the output resolution. A higher resolution will show more detail, but requires a faster video card.
Disqualification=If turned off, players cannot be disqualified from scoring.
EasterEggs=Enable or disable some special easter eggs.
Edit Courses=Modifier des Parcours
Edit Courses/Mods=Modifier des Parcours/Mods
Expand Down Expand Up @@ -930,7 +929,6 @@ Premium=Premium
EventMode=Mode Évènement
AllowMultipleHighScoreWithSameName=Mode Compétition
ComboContinuesBetweenSongs=Continuer le Combo
Disqualification=Disqualification
FailOffForFirstStageEasy=1er Stage Facile
FailOffInBeginner=Perdre en Débutant
LockCourseDifficulties=Difficulté Verrouillée
Expand Down
2 changes: 0 additions & 2 deletions Themes/_fallback/Languages/ja.ini
Original file line number Diff line number Diff line change
Expand Up @@ -451,7 +451,6 @@ ComboContinuesBetweenSongs=&oq;On&cq;に設定すると、コンボカウント
CoinMode=&oq;Home&cq;に設定すると、タイトル画面にメニューが表示されます。\n&oq;Free Play&cq;に設定すると、メニューは表示されません。
CoinModeNoHome=FREEに設定すると、クレジットを投入せずにプレイすることができます。
CoinsPerCredit=&oq;Coin Mode&cq;がPayに設定されている場合の、\n1クレジットに相当するコイン枚数を設定します。
Disqualification=&oq;On&cq;に設定すると、一部のプレイオプションを設定してプレイする時\nスコアが記録されなくなります。
EventMode=&oq;On&cq;に設定すると、設定曲数プレイしても終わらなくなりますが\nExtraステージに進出することもできなくなります。
FailOffForFirstStageEasy=&oq;On&cq;に設定すると、イベントモードがOffの場合1ステージ目で\nEasy譜面でゲージが0になってもゲームオーバーにならなくなります。
FailOffInBeginner=&oq;On&cq;に設定すると、イベントモードがOffの場合で\nBeginner譜面でゲージが0になってもゲームオーバーにならなくなります。
Expand Down Expand Up @@ -1078,7 +1077,6 @@ DisplayAspectRatio=Aspect Ratio
DisplayColorDepth=Display Color
DisplayResolution=Display Resolution
Display Options=Display Options
Disqualification=Disqualification
Duration seconds=Duration seconds
EasterEggs=Easter Eggs
Edit Songs/Steps=Edit Songs/Steps
Expand Down
2 changes: 0 additions & 2 deletions Themes/_fallback/Languages/nl.ini
Original file line number Diff line number Diff line change
Expand Up @@ -371,7 +371,6 @@ Difficulty=
DisplayAspectRatio=Verander de breedte-hoogte ratio van het beeld. De meeste moderne schermen zijn 16:9 of 16:10.
DisplayColorDepth=Kies de kleurdiepte van het scherm. Deze optie werkt alleen bij volledig scherm mode.
DisplayResolution=Kies de uitvoerresolutie. Een hogere resolutie laat meer detail zien maar vereist een snellere videokaart.
Disqualification=Als dit uit staat kunnen spelers niet gediskwalificeerd worden met scoren.
EasterEggs=Zet een aantal speciale easter eggs aan of uit.
Edit Courses/Mods=Wijzig Parkoers/Mods
Edit Courses=Wijzig Parkoers
Expand Down Expand Up @@ -986,7 +985,6 @@ Display BPM=Laat BPM Zien
DisplayAspectRatio=Aspect Ratio
DisplayColorDepth=Schermkleur
DisplayResolution=Schermresolutie
Disqualification=Diskwalificatie
Duration seconds=Duur seconden
EasterEggs=Easter Eggs
Edit BPM change=Wijzig BPM-veranderingen
Expand Down
2 changes: 0 additions & 2 deletions Themes/_fallback/Languages/pl.ini
Original file line number Diff line number Diff line change
Expand Up @@ -370,7 +370,6 @@ Difficulty=
DisplayAspectRatio=Pozwala na ustawienie proporcji ekranu zastosowanego w monitorze, w celu uniknięcia deformacji wyświetlanej grafiki.
DisplayColorDepth=Głębia odwzorowania przestrzeni kolorów. Może nie działać w trybie okienkowym.
DisplayResolution=Rozdzielczość ekranu. Wyższa rozdzielczość wyświetla dokładniejszy obraz, ale wymaga szybszej karty graficznej.
Disqualification=Jeśli wyłączona, gracze nie mogą być wykluczeni z punktacji.
EasterEggs=Włącza lub wyłącza ukryte w programie niespodzianki.
EditRecordModeLeadIn=Set the amount of lead-in time before recording starts.
Edit Courses=Edycja Maratonów
Expand Down Expand Up @@ -985,7 +984,6 @@ Display BPM=Pokaż BPM
DisplayAspectRatio=Proporcje Ekranu
DisplayColorDepth=Głębia Kolorów Ekranu
DisplayResolution=Rozdzielczość Ekranu
Disqualification=Dyskwalifkacja
Duration seconds=okres sekund
EasterEggs=Niespodzianki
Edit Songs/Steps=Edycja Piosenek
Expand Down
2 changes: 0 additions & 2 deletions Themes/_fallback/Languages/zh.ini
Original file line number Diff line number Diff line change
Expand Up @@ -392,7 +392,6 @@ DisplayAspectRatio=選擇畫面比例, 一般選擇為16:9或16:10, 古早的則
DisplayColorDepth=選擇遊戲色深,對視窗模式無效.
DisplayResolution=選擇解析度.
Display Options=背景,外觀與UI的設定.
Disqualification=是否設定特定遊戲選項選擇後系統不會紀錄玩家分數.
EasterEggs=選擇彩蛋(連續擊中指定PERFECT以上COMBO數).
Edit Courses=製作或編輯組曲.
Edit Courses/Mods=特效組曲.
Expand Down Expand Up @@ -1032,7 +1031,6 @@ DisplayAspectRatio=縱橫比
DisplayColorDepth=顏色質量
DisplayResolution=解析度
Display Options=顯示設定
Disqualification=記分無效
Duration seconds=持續時間
EasterEggs=彩蛋
Edit Songs/Steps=編輯歌曲/譜面
Expand Down
8 changes: 0 additions & 8 deletions Themes/_fallback/metrics.ini
Original file line number Diff line number Diff line change
Expand Up @@ -2457,14 +2457,6 @@ Line6="conf,MusicWheelSwitchSpeed"
Line7="conf,InputDebounceTime"
Line8="conf,AxisFix"

[ScreenOptionsArcade]
Fallback="ScreenOptionsServiceChild"
NextScreen="ScreenOptionsService"
PrevScreen="ScreenOptionsService"
# stuff tied to arcade features
LineNames="9"
Line9="conf,Disqualification"

[ScreenOptionsTheme]
Fallback="ScreenOptionsServiceChild"

Expand Down
3 changes: 0 additions & 3 deletions src/GameState.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1147,9 +1147,6 @@ GameState::ApplyStageModifiers(PlayerNumber pn, const RString& sModifiers)
bool
GameState::CurrentOptionsDisqualifyPlayer(PlayerNumber pn)
{
if (!PREFSMAN->m_bDisqualification)
return false;

if (!IsHumanPlayer(pn))
return false;

Expand Down
2 changes: 0 additions & 2 deletions src/PlayerStageStats.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -854,8 +854,6 @@ PlayerStageStats::GetPercentageOfTaps(TapNoteScore tns) const
bool
PlayerStageStats::IsDisqualified() const
{
if (!PREFSMAN->m_bDisqualification)
return false;
return m_bDisqualified;
}

Expand Down
1 change: 0 additions & 1 deletion src/PrefsManager.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,6 @@ PrefsManager::PrefsManager()
, m_MinTNSToHideNotes("MinTNSToHideNotes", TNS_W3)
, m_ShowSongOptions("ShowSongOptions", Maybe_NO)
, m_fMinPercentToSaveScores("MinPercentToSaveScores", -1.0f)
, m_bDisqualification("Disqualification", false)
, m_ShowDancingCharacters("ShowDancingCharacters", SDC_Off)
, m_fGlobalOffsetSeconds("GlobalOffsetSeconds", 0)
, m_sLanguage("Language", "")
Expand Down
1 change: 0 additions & 1 deletion src/PrefsManager.h
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,6 @@ class PrefsManager

Preference<Maybe> m_ShowSongOptions;
Preference<float> m_fMinPercentToSaveScores;
Preference<bool> m_bDisqualification;
Preference<ShowDancingCharacters> m_ShowDancingCharacters;
Preference<float> m_fGlobalOffsetSeconds;
Preference<RString> m_sLanguage;
Expand Down

0 comments on commit 92819b3

Please sign in to comment.