Remove dead Preferences

part 12312312
etternagame · Aug 22, 2020 · 780acf3 · 780acf3
1 parent d2e8d0d
commit 780acf3
Show file tree

Hide file tree

Showing 13 changed files with 2 additions and 36 deletions.
diff --git a/Themes/_fallback/Languages/de.ini b/Themes/_fallback/Languages/de.ini
@@ -342,7 +342,6 @@ BarDrain=BarDrain
 BatLives=BatLives
 Bookkeeping=Check coin drop statistics.
 Calibrate Machine Sync=Calibrate the audio synchronization.
-CelShadeModels=Choose if dancing characters are drawn with cel shading.
 Center Image=Center the image on your monitor.
 Characters=Characters
 Clear Bookkeeping Data=Clear all coin drop data.
@@ -946,7 +945,6 @@ Bookkeeping=Bookkeeping
 BPM changes=BPM changes
 Calibrate Machine Sync=Calibrate Audio Sync
 CPUSkill=CPU Skill
-CelShadeModels=Cel-shaded Models
 Center Image=Center Image
 Chaos=Chaos
 Characters=Charaktere

diff --git a/Themes/_fallback/Languages/en.ini b/Themes/_fallback/Languages/en.ini
@@ -391,7 +391,6 @@ BarDrain=BarDrain
 BatLives=BatLives
 Bookkeeping=Check coin drop statistics.
 Calibrate Machine Sync=Calibrate the audio synchronization.
-CelShadeModels=Choose if some stuff is drawn with cel shading.
 Center Image=Center the image on your monitor.
 Clear Bookkeeping Data=Clear all coin drop data.
 Clear Machine Edits=Save all step edits saved to this machine.
@@ -995,7 +994,6 @@ Bookkeeping=Bookkeeping
 BPM changes=BPM changes
 Calibrate Machine Sync=Calibrate Audio Sync
 CPUSkill=CPU Skill
-CelShadeModels=Cel-shaded Models
 Center Image=Center Image
 Chaos=Chaos
 Chart Name=Chart Name

diff --git a/Themes/_fallback/Languages/es.ini b/Themes/_fallback/Languages/es.ini
@@ -337,7 +337,6 @@ BarDrain=Drenado de barra.
 BatLives=Vidas de la batería.
 Bookkeeping=Mostrar estadísticas contables.
 Calibrate Machine Sync=Calibra la sincronización de audio.
-CelShadeModels=Elige si los personajes se dibujan con cel shading.
 Center Image=Centra la imagen a tu monitor.
 Characters=Personajes
 Clear Bookkeeping Data=Descartar todas las opciones contables.
@@ -927,7 +926,6 @@ Beat 0 Offset=Compensar ritmo 0
 Bookkeeping=Contabilidad
 Calibrate Machine Sync=Calibrar sincronización de audio
 CPUSkill=Habilidad de CPU
-CelShadeModels=Modelos cel-shading
 Center Image=Centrar imagen
 Chaos=Caos
 Characters=Personaje

diff --git a/Themes/_fallback/Languages/fr.ini b/Themes/_fallback/Languages/fr.ini
@@ -340,7 +340,6 @@ BarDrain=Draine de la Barre
 BatLives=Vie de la Pile
 Bookkeeping=Check coin drop statistics.
 Calibrate Machine Sync=Calibre la synchronization audio.
-CelShadeModels=Choose if dancing characters are drawn with cel shading.
 Center Image=Centre l'image sur votre moniteur.
 Characters=Personnage
 Clear Bookkeeping Data=Clear all coin drop data.
@@ -954,7 +953,6 @@ MaxTextureResolution=Résolution de&nbsp;Texture
 TextureColorDepth=Couleurs de&nbsp;Texture
 MovieColorDepth=Couleurs de Vidéo
 SmoothLines=SmoothLines
-CelShadeModels=Cel-shaded Models
 DelayedTextureDeletion=Garder les&nbsp;Textures En&nbsp;Mémoire
 RefreshRate=Vitesse de Rafraîchissement
 Vsync=Vsync

diff --git a/Themes/_fallback/Languages/ja.ini b/Themes/_fallback/Languages/ja.ini
@@ -470,7 +470,6 @@ ShowBeginnerHelper=Onにした状態でNovice譜面をプレイすると\nお手
 Theme=使用するテーマを選択します。\n必ずStepmania5用のテーマを使用して下さい。
 
 //メニュー→オプション→グラフィック・サウンド
-CelShadeModels=ダンサーのテクスチャをセルシェーディングで表現します。
 DelayedTextureDeletion=&oq;On&cq;にするとテクスチャをメモリ上に保持します。\nメモリに512MB以上余裕がない場合は使用しないで下さい。
 DisplayAspectRatio=このプログラムのアスペクト比を設定します。\nお使いのディスプレイに合わせて選択してください。
 DisplayColorDepth=ウインドウモードでの色深度を設定します。
@@ -1018,7 +1017,6 @@ Bookkeeping=Bookkeeping
 BPM changes=BPM changes
 Calibrate Machine Sync=Calibrate Audio Sync
 CPUSkill=CPU Skill
-CelShadeModels=Cel-shaded Models
 Center Image=Center Image
 Chaos=Chaos
 Characters=Characters

diff --git a/Themes/_fallback/Languages/nl.ini b/Themes/_fallback/Languages/nl.ini
@@ -340,7 +340,6 @@ BarDrain=BalkDrain
 BatLives=BatLevens
 Bookkeeping=Bekijk de ingeworpen muntstatistieken.
 Calibrate Machine Sync=Stel de geluidssynchronisatie af.
-CelShadeModels=Kies of de dansende karakters getekend worden met cel shading.
 Center Image=Centreer het beeld op je monitor.
 Center1Player=Zet dit aan om de speler in het midden te zetten in 1 speler mode.
 Characters=Karakters
@@ -929,7 +928,6 @@ Beat 0 Offset=Ritme 0 Offset
 Bookkeeping=Boekhouding
 CPUSkill=CPU Bekwaamheid
 Calibrate Machine Sync=Kalibreer Synchronisatie Geluid
-CelShadeModels=Cel-shaded Modellen
 Center Image=Centreer beeld
 Center1Player=Zet 1 Speler In Het Midden
 Chaos=Chaos

diff --git a/Themes/_fallback/Languages/pl.ini b/Themes/_fallback/Languages/pl.ini
@@ -340,7 +340,6 @@ BarDrain=Zużycie Energii
 BatLives=Ilość pasków baterii
 Bookkeeping=Statystyka rzuconych żetonów/monet/kredytów.
 Calibrate Machine Sync=Kalibracja synchronizacji dźwięku.
-CelShadeModels=Decyduje czy Postacie Tańczące w tle są generowane z użyciem algorytmu Cel Shading. 
 Center Image=Centrowanie obrazu monitora.
 Characters=Tańczące Postacie
 Clear Bookkeeping Data=Zerowanie statystyk wrzuconych żetonów/monet/kredytów.
@@ -930,7 +929,6 @@ Beat 0 Offset=Beat 0 Offset
 Bookkeeping=Statystyka
 Calibrate Machine Sync=Kalibracja Synchronizacji Dźwięku
 CPUSkill=Poziom CPU
-CelShadeModels=Modele Cel-shaded
 Center Image=Centrowanie Obrazu
 Chaos=Chaos
 Characters=Tancerze

diff --git a/Themes/_fallback/Languages/zh.ini b/Themes/_fallback/Languages/zh.ini
@@ -381,7 +381,6 @@ BarDrain=扣血強度設定.
 BatLives=電池數量設定.
 Bookkeeping=瀏覽投幣歷史紀錄.
 Calibrate Machine Sync=機器同步校準設定.
-CelShadeModels=選擇是否將3D角色用卡通方式著色.
 Center Image=調整畫面中心設定.
 Characters=3D角色顯示方式.
 Clear Bookkeeping Data=清除投幣歷史紀錄.
@@ -983,7 +982,6 @@ Bookkeeping=投幣數量統計
 BPM changes=BPM變更
 Calibrate Machine Sync=同歩校準
 CPUSkill=CPU技能
-CelShadeModels=卡通模型
 Center Image=圖像校正
 Chaos=變化程度
 Characters=背景3D角色

diff --git a/Themes/_fallback/base._ini b/Themes/_fallback/base._ini
@@ -2462,7 +2462,7 @@ Line32="conf,HiddenSongs"
 
 [ScreenOptionsGraphicsSound]
 Fallback="ScreenOptionsServiceChild"
-LineNames="1,2,3,4,5,6,7,8,9,10,11,12,13,14,17,18,19"
+LineNames="1,2,3,4,5,6,7,8,9,11,12,13,14,17,18,19"
 Line1="conf,Windowed"
 Line2="conf,DisplayResolution"
 Line3="conf,DisplayAspectRatio"
@@ -2472,7 +2472,6 @@ Line6="conf,MaxTextureResolution"
 Line7="conf,TextureColorDepth"
 Line8="conf,MovieColorDepth"
 Line9="conf,SmoothLines"
-Line10="conf,CelShadeModels"
 Line11="conf,DelayedTextureDeletion"
 Line12="conf,RefreshRate"
 Line13="conf,Vsync"

diff --git a/Themes/_fallback/metrics.ini b/Themes/_fallback/metrics.ini
@@ -2245,7 +2245,7 @@ Line21="conf,Center1Player"
 Fallback="ScreenOptionsServiceChild"
 NextScreen="ScreenOptionsService"
 PrevScreen="ScreenOptionsService"
-LineNames="1,2,3,RefreshRate,FSType,4,5,6,7,8,9,10,11,13,FNR,14,17,19,20"
+LineNames="1,2,3,RefreshRate,FSType,4,5,6,7,8,9,11,13,FNR,14,17,19,20"
 Line1="lua,ConfDisplayMode()"
 Line2="lua,ConfAspectRatio()"
 Line3="lua,ConfDisplayResolution()"
@@ -2257,7 +2257,6 @@ Line6="conf,MaxTextureResolution"
 Line7="conf,TextureColorDepth"
 Line8="conf,MovieColorDepth"
 Line9="conf,SmoothLines"
-Line10="conf,CelShadeModels"
 Line11="conf,DelayedTextureDeletion"
 Line12="conf,RefreshRate"
 Line13="conf,Vsync"

diff --git a/src/Etterna/Screen/Options/ScreenOptionsMasterPrefs.cpp b/src/Etterna/Screen/Options/ScreenOptionsMasterPrefs.cpp
@@ -941,7 +941,6 @@ InitializeConfOptions()
 	ADD(ConfOption("MovieColorDepth", MovieColorDepth, "16bit", "32bit"));
 	ADD(ConfOption("DelayedTextureDeletion", MovePref<bool>, "Off", "On"));
 	g_ConfOptions.back().m_iEffects = OPT_APPLY_GRAPHICS;
-	ADD(ConfOption("CelShadeModels", MovePref<bool>, "Off", "On"));
 	ADD(ConfOption("SmoothLines", MovePref<bool>, "Off", "On"));
 	g_ConfOptions.back().m_iEffects = OPT_APPLY_GRAPHICS;
 	ADD(ConfOption("RefreshRate",

diff --git a/src/Etterna/Singletons/PrefsManager.cpp b/src/Etterna/Singletons/PrefsManager.cpp
@@ -152,10 +152,6 @@ PrefsManager::PrefsManager()
   ,
 
   m_fLifeDifficultyScale("LifeDifficultyScale", 1.0f)
-  ,
-
-  m_iRegenComboAfterMiss("RegenComboAfterMiss", 5)
-  , m_iMaxRegenComboAfterMiss("MaxRegenComboAfterMiss", 5)
   , // this was 10 by default in SM3.95 -dguzek
   m_bDelayedBack("DelayedBack", false)
   , m_AllowHoldForOptions("AllowHoldForOptions", true)
@@ -183,9 +179,6 @@ PrefsManager::PrefsManager()
   , m_iCenterImageTranslateY("CenterImageTranslateY", 0)
   , m_fCenterImageAddWidth("CenterImageAddWidth", 0)
   , m_fCenterImageAddHeight("CenterImageAddHeight", 0)
-  , m_bCelShadeModels("CelShadeModels", false)
-  , // Work-In-Progress.. disable by default.
-  m_bPreferredSortUsesGroups("PreferredSortUsesGroups", true)
   , EnablePitchRates("EnablePitchRates", true)
   , LiftsOnOsuHolds("LiftsOnOsuHolds", false)
   , m_bEasterEggs("EasterEggs", true)

diff --git a/src/Etterna/Singletons/PrefsManager.h b/src/Etterna/Singletons/PrefsManager.h
@@ -160,12 +160,6 @@ class PrefsManager
 
 	Preference<float> m_fLifeDifficultyScale;
 
-	// Whoever added these: Please add a comment saying what they do. -Chris
-	Preference<int> m_iRegenComboAfterMiss;	   // combo that must be met after a
-											   // Miss to regen life
-	Preference<int> m_iMaxRegenComboAfterMiss; // caps RegenComboAfterMiss if
-											   // multiple Misses occur in rapid
-											   // succession
 	Preference<bool> m_bDelayedBack;
 	Preference<bool> m_AllowHoldForOptions;
 	Preference<bool> m_bShowInstructions;
@@ -191,8 +185,6 @@ class PrefsManager
 	Preference<int> m_iCenterImageTranslateY;
 	Preference<int> m_fCenterImageAddWidth;
 	Preference<int> m_fCenterImageAddHeight;
-	Preference<bool> m_bCelShadeModels;
-	Preference<bool> m_bPreferredSortUsesGroups;
 	Preference<bool> EnablePitchRates;
 	Preference<bool> LiftsOnOsuHolds;
 	Preference<bool> m_bEasterEggs;