From beccaf9c93dcbab557d4b2fe6845a424f4f47e32 Mon Sep 17 00:00:00 2001 From: f1fth_freed0m Date: Mon, 17 Mar 2008 09:26:32 +0000 Subject: Staves now can be turned of in Options git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@961 b956fd51-792f-4845-bead-9b4dfca2ff2c --- Game/Code/Classes/UDraw.pas | 6 +++--- Game/Code/Classes/UIni.pas | 10 +++++++++- Game/Code/Classes/UThemes.pas | 2 ++ Game/Code/Screens/UScreenOptionsLyrics.pas | 7 ++++--- Languages/English.ini | 1 + Languages/German.ini | 1 + Themes/Classic.ini | 22 +++++++++++++++++++++- Themes/Deluxe.ini | 22 +++++++++++++++++++++- 8 files changed, 62 insertions(+), 9 deletions(-) diff --git a/Game/Code/Classes/UDraw.pas b/Game/Code/Classes/UDraw.pas index b3fee6fa..7523c10f 100644 --- a/Game/Code/Classes/UDraw.pas +++ b/Game/Code/Classes/UDraw.pas @@ -605,16 +605,16 @@ begin //eoa TimeBar mod // rysuje paski pod nutami - if PlayersPlay = 1 then + if (PlayersPlay = 1) and (Ini.NoteLines = 1) then SingDrawNoteLines(Nr.Left + 10*ScreenX, Skin_P2_NotesB - 105, Nr.Right + 10*ScreenX, 15); - if (PlayersPlay = 2) or (PlayersPlay = 4) then + if ((PlayersPlay = 2) or (PlayersPlay = 4)) and (Ini.NoteLines = 1) then begin SingDrawNoteLines(Nr.Left + 10*ScreenX, Skin_P1_NotesB - 105, Nr.Right + 10*ScreenX, 15); SingDrawNoteLines(Nr.Left + 10*ScreenX, Skin_P2_NotesB - 105, Nr.Right + 10*ScreenX, 15); end; - if (PlayersPlay = 3) or (PlayersPlay = 6) then begin + if ((PlayersPlay = 3) or (PlayersPlay = 6)) and (Ini.NoteLines = 1) then begin SingDrawNoteLines(Nr.Left + 10*ScreenX, 120, Nr.Right + 10*ScreenX, 12); SingDrawNoteLines(Nr.Left + 10*ScreenX, 245, Nr.Right + 10*ScreenX, 12); SingDrawNoteLines(Nr.Left + 10*ScreenX, 370, Nr.Right + 10*ScreenX, 12); diff --git a/Game/Code/Classes/UIni.pas b/Game/Code/Classes/UIni.pas index 5330f45f..292a485a 100644 --- a/Game/Code/Classes/UIni.pas +++ b/Game/Code/Classes/UIni.pas @@ -76,6 +76,7 @@ type LyricsFont: integer; LyricsEffect: integer; Solmization: integer; + NoteLines: integer; // Themes Theme: integer; @@ -165,6 +166,7 @@ const ILyricsFont: array[0..2] of string = ('Plain', 'OLine1', 'OLine2'); ILyricsEffect: array[0..4] of string = ('Simple', 'Zoom', 'Slide', 'Ball', 'Shift'); ISolmization: array[0..3] of string = ('Off', 'Euro', 'Jap', 'American'); + INoteLines: array[0..1] of string = ('Off', 'On'); IColor: array[0..8] of string = ('Blue', 'Green', 'Pink', 'Red', 'Violet', 'Orange', 'Yellow', 'Brown', 'Black'); @@ -598,7 +600,10 @@ begin // Solmization Solmization := GetArrayIndex(ISolmization, IniFile.ReadString('Lyrics', 'Solmization', ISolmization[0])); - + + // NoteLines + NoteLines := GetArrayIndex(INoteLines, IniFile.ReadString('Lyrics', 'NoteLines', INoteLines[1])); + // Theme SetLength(ITheme, 0); Log.LogStatus('Searching for Theme : ' + ThemePath + '*.ini', 'Theme'); @@ -768,6 +773,9 @@ begin // Solmization IniFile.WriteString('Lyrics', 'Solmization', ISolmization[Solmization]); + // NoteLines + IniFile.WriteString('Lyrics', 'NoteLines', INoteLines[NoteLines]); + // Theme IniFile.WriteString('Themes', 'Theme', ITheme[Theme]); diff --git a/Game/Code/Classes/UThemes.pas b/Game/Code/Classes/UThemes.pas index 0eb3627f..d6041946 100644 --- a/Game/Code/Classes/UThemes.pas +++ b/Game/Code/Classes/UThemes.pas @@ -415,6 +415,7 @@ type SelectLyricsFont: TThemeSelect; SelectLyricsEffect: TThemeSelectSlide; SelectSolmization: TThemeSelect; + SelectNoteLines: TThemeSelect; ButtonExit: TThemeButton; end; @@ -1173,6 +1174,7 @@ begin ThemeLoadSelect(OptionsLyrics.SelectLyricsFont, 'OptionsLyricsSelectLyricsFont'); ThemeLoadSelectSlide(OptionsLyrics.SelectLyricsEffect, 'OptionsLyricsSelectLyricsEffect'); ThemeLoadSelect(OptionsLyrics.SelectSolmization, 'OptionsLyricsSelectSolmization'); + ThemeLoadSelect(OptionsLyrics.SelectNoteLines, 'OptionsLyricsSelectNoteLines'); ThemeLoadButton(OptionsLyrics.ButtonExit, 'OptionsLyricsButtonExit'); // Options Themes diff --git a/Game/Code/Screens/UScreenOptionsLyrics.pas b/Game/Code/Screens/UScreenOptionsLyrics.pas index 648795a3..68af74c1 100644 --- a/Game/Code/Screens/UScreenOptionsLyrics.pas +++ b/Game/Code/Screens/UScreenOptionsLyrics.pas @@ -39,7 +39,7 @@ begin end; SDLK_RETURN: begin - if SelInteraction = 3 then begin + if SelInteraction = 4 then begin Ini.Save; AudioPlayback.PlaySound(SoundLib.Back); FadeTo(@ScreenOptions); @@ -51,14 +51,14 @@ begin InteractPrev; SDLK_RIGHT: begin - if (SelInteraction >= 0) and (SelInteraction <= 2) then begin + if (SelInteraction >= 0) and (SelInteraction <= 3) then begin AudioPlayback.PlaySound(SoundLib.Option); InteractInc; end; end; SDLK_LEFT: begin - if (SelInteraction >= 0) and (SelInteraction <= 2) then begin + if (SelInteraction >= 0) and (SelInteraction <= 3) then begin AudioPlayback.PlaySound(SoundLib.Option); InteractDec; end; @@ -78,6 +78,7 @@ begin AddSelect(Theme.OptionsLyrics.SelectLyricsFont, Ini.LyricsFont, ILyricsFont); AddSelectSlide(Theme.OptionsLyrics.SelectLyricsEffect, Ini.LyricsEffect, ILyricsEffect); AddSelect(Theme.OptionsLyrics.SelectSolmization, Ini.Solmization, ISolmization); + AddSelect(Theme.OptionsLyrics.SelectNoteLines, Ini.NoteLines, INoteLines); AddButton(Theme.OptionsLyrics.ButtonExit); diff --git a/Languages/English.ini b/Languages/English.ini index 500b16a4..6c910dc4 100644 --- a/Languages/English.ini +++ b/Languages/English.ini @@ -68,6 +68,7 @@ SING_OPTIONS_LYRICS_DESC=lyrics settings SING_OPTIONS_LYRICS_FONT=Font SING_OPTIONS_LYRICS_EFFECT=Effect SING_OPTIONS_LYRICS_SOLMIZATION=Solmization +SING_OPTIONS_LYRICS_NOTELINES=Staves SING_OPTIONS_THEMES_WHEREAMI=Options Themes SING_OPTIONS_THEMES_DESC=theme and skin settings diff --git a/Languages/German.ini b/Languages/German.ini index f5f5e0c6..211ca91d 100644 --- a/Languages/German.ini +++ b/Languages/German.ini @@ -68,6 +68,7 @@ SING_OPTIONS_LYRICS_DESC=Einstellungen f SING_OPTIONS_LYRICS_FONT=Schriftart SING_OPTIONS_LYRICS_EFFECT=Effekt SING_OPTIONS_LYRICS_SOLMIZATION=Solmisation +SING_OPTIONS_LYRICS_NOTELINES=Notenlinien SING_OPTIONS_THEMES_WHEREAMI=Optionen Themes SING_OPTIONS_THEMES_DESC=Einstellungen für Theme und Skin diff --git a/Themes/Classic.ini b/Themes/Classic.ini index 83de3473..6987e31a 100644 --- a/Themes/Classic.ini +++ b/Themes/Classic.ini @@ -3296,11 +3296,31 @@ SBGDColor = Gray STColor = White STDColor = GrayDark -[OptionsLyricsButtonExit] +[OptionsLyricsSelectNoteLines] +Tex =MainBar +TexSBG =SelectBG +Text =SING_OPTIONS_LYRICS_NOTELINES X = 40 Y = 250 W = 230 H = 70 +SkipX = 50 + +Color = ColorDark +DColor = Gray +TColor = White +TDColor = White +SBGTex =MainBar +SBGColor = ColorDark +SBGDColor = Gray +STColor = White +STDColor = GrayDark + +[OptionsLyricsButtonExit] +X = 40 +Y = 305 +W = 230 +H = 70 Tex =MainBar Color = ColorDark DColor = Gray diff --git a/Themes/Deluxe.ini b/Themes/Deluxe.ini index 76a83551..4861bab2 100644 --- a/Themes/Deluxe.ini +++ b/Themes/Deluxe.ini @@ -3586,11 +3586,31 @@ SBGDColor = Gray STColor = White STDColor = GrayDark -[OptionsLyricsButtonExit] +[OptionsLyricsSelectNoteLines] +Tex =MainBar +TexSBG =SelectBG +Text =SING_OPTIONS_LYRICS_NOTELINES X = 40 Y = 250 W = 230 H = 70 +SkipX = 50 + +Color = ColorDark +DColor = Gray +TColor = White +TDColor = White +SBGTex =MainBar +SBGColor = ColorDark +SBGDColor = Gray +STColor = White +STDColor = GrayDark + +[OptionsLyricsButtonExit] +X = 40 +Y = 305 +W = 230 +H = 70 Tex =MainBar Color = ColorDark DColor = Gray -- cgit v1.2.3