diff options
Diffstat (limited to 'Game/Code/Classes')
| -rw-r--r-- | Game/Code/Classes/UDraw.pas | 11 | ||||
| -rw-r--r-- | Game/Code/Classes/UIni.pas | 36 | ||||
| -rw-r--r-- | Game/Code/Classes/UThemes.pas | 8 |
3 files changed, 27 insertions, 28 deletions
diff --git a/Game/Code/Classes/UDraw.pas b/Game/Code/Classes/UDraw.pas index e2c01b4b..7eaddac4 100644 --- a/Game/Code/Classes/UDraw.pas +++ b/Game/Code/Classes/UDraw.pas @@ -48,7 +48,7 @@ var StarfrG: integer;
-
+
//SingBar Mod
TickOld: cardinal;
TickOld2:cardinal;
@@ -216,7 +216,7 @@ begin if not FreeStyle then begin
- if Ini.EffectGolden = 0 then
+ if Ini.EffectSing = 0 then
// If Golden note Effect of then Change not Color
begin
case Wartosc of
@@ -270,7 +270,7 @@ begin glEnd;
// Golden Star Patch
- if (Wartosc = 2) AND (Ini.EffectGolden=1) then
+ if (Wartosc = 2) AND (Ini.EffectSing=1) then
begin
GoldenRec.SaveGoldenStarsRec(GoldenStarPos, Rec.Top, Rec.Right, Rec.Bottom);
end;
@@ -379,7 +379,7 @@ var //Rec.Right := X + (Start+Dlugosc-Czesci[0].Czesc[Czesci[0].Akt].StartNote) * TempR - NotesW - 0.5 + 10*ScreenX;
//if (Start+Dlugosc-1 = Czas.AktBeatD) then
- if Perfect and (Ini.EffectPerfect=1) then begin
+ if Perfect and (Ini.EffectSing=1) then begin
// A := sqrt((1+sin(Music.Position * 3))/2);
A := 1 - 2*(Czas.Teraz - GetTimeFromBeat(Start+Dlugosc));
if not (Start+Dlugosc-1 = Czas.AktBeatD) then
@@ -387,7 +387,6 @@ var //Star animation counter
//inc(Starfr);
//Starfr := Starfr mod 128;
-
GoldenRec.SavePerfectNotePos(Rec.Left, Rec.Top);
{ SingDrawStar(Rec.Left+2, Rec.Top+4, A);}
end;
@@ -431,7 +430,7 @@ var // passing on NrGracza... hope this is really something like the player-number, not only
// some kind of weird index into a colour-table
- if (Ini.EffectGolden=1) then
+ if (Ini.EffectSing=1) then
GoldenRec.GoldenNoteTwinkle(Rec.Top,Rec.Bottom,Rec.Right, NrGracza);
end; // if
end;
diff --git a/Game/Code/Classes/UIni.pas b/Game/Code/Classes/UIni.pas index d5589ea3..cafbc912 100644 --- a/Game/Code/Classes/UIni.pas +++ b/Game/Code/Classes/UIni.pas @@ -58,8 +58,8 @@ type // Advanced
LoadAnimation: integer;
- EffectPerfect: integer;
- EffectGolden: integer;
+ EffectSing: integer;
+ ScreenFade: integer;
AskbeforeDel: integer;
OnSongClick: integer;
LineBonus: integer;
@@ -135,8 +135,8 @@ const // Advanced
ILoadAnimation: array[0..1] of string = ('Off', 'On');
- IEffectPerfect: array[0..1] of string = ('Off', 'On');
- IEffectGolden: array[0..1] of string = ('Off', 'On');
+ IEffectSing: array[0..1] of string = ('Off', 'On');
+ IScreenFade: array [0..1] of String =('Off', 'On');
IAskbeforeDel: array[0..1] of string = ('Off', 'On');
IOnSongClick: array[0..2] of string = ('Sing', 'Select Players', 'Open Menu');
ILineBonus: array[0..2] of string = ('Off', 'At Score', 'At Notes');
@@ -430,15 +430,15 @@ begin for Pet := 0 to High(ILoadAnimation) do
if Tekst = ILoadAnimation[Pet] then Ini.LoadAnimation := Pet;
- // EffectPerfect
- Tekst := IniFile.ReadString('Advanced', 'EffectPerfect', 'On');
- for Pet := 0 to High(IEffectPerfect) do
- if Tekst = IEffectPerfect[Pet] then Ini.EffectPerfect := Pet;
+ // ScreenFade
+ Tekst := IniFile.ReadString('Advanced', 'ScreenFade', 'On');
+ for Pet := 0 to High(IScreenFade) do
+ if Tekst = IScreenFade[Pet] then Ini.ScreenFade := Pet;
- // EffectGolden
- Tekst := IniFile.ReadString('Advanced', 'EffectGolden', 'On');
- for Pet := 0 to High(IEffectGolden) do
- if Tekst = IEffectGolden[Pet] then Ini.EffectGolden := Pet;
+ // EffectSing
+ Tekst := IniFile.ReadString('Advanced', 'EffectSing', 'On');
+ for Pet := 0 to High(IEffectSing) do
+ if Tekst = IEffectSing[Pet] then Ini.EffectSing := Pet;
// AskbeforeDel
Tekst := IniFile.ReadString('Advanced', 'AskbeforeDel', 'On');
@@ -618,13 +618,13 @@ begin Tekst := ILoadAnimation[Ini.LoadAnimation];
IniFile.WriteString('Advanced', 'LoadAnimation', Tekst);
- //EffectPerfect
- Tekst := IEffectPerfect[Ini.EffectPerfect];
- IniFile.WriteString('Advanced', 'EffectPerfect', Tekst);
+ //EffectSing
+ Tekst := IEffectSing[Ini.EffectSing];
+ IniFile.WriteString('Advanced', 'EffectSing', Tekst);
- //EffectGolden
- Tekst := IEffectGolden[Ini.EffectGolden];
- IniFile.WriteString('Advanced', 'EffectGolden', Tekst);
+ //ScreenFade
+ Tekst := IScreenFade[Ini.ScreenFade];
+ IniFile.WriteString('Advanced', 'ScreenFade', Tekst);
//AskbeforeDel
Tekst := IAskbeforeDel[Ini.AskbeforeDel];
diff --git a/Game/Code/Classes/UThemes.pas b/Game/Code/Classes/UThemes.pas index 51b454ca..6837d17f 100644 --- a/Game/Code/Classes/UThemes.pas +++ b/Game/Code/Classes/UThemes.pas @@ -402,8 +402,8 @@ type TThemeOptionsAdvanced = class(TThemeBasic)
SelectLoadAnimation: TThemeSelect;
- SelectEffectPerfect: TThemeSelect;
- SelectEffectGolden: TThemeSelect;
+ SelectEffectSing: TThemeSelect;
+ SelectScreenFade: TThemeSelect;
SelectLineBonus: TThemeSelect;
SelectAskbeforeDel: TThemeSelect;
SelectOnSongClick: TThemeSelectSlide;
@@ -1052,8 +1052,8 @@ begin ThemeLoadBasic(OptionsAdvanced, 'OptionsAdvanced');
ThemeLoadSelect (OptionsAdvanced.SelectLoadAnimation, 'OptionsAdvancedSelectLoadAnimation');
- ThemeLoadSelect (OptionsAdvanced.SelectEffectPerfect, 'OptionsAdvancedSelectEffectPerfect');
- ThemeLoadSelect (OptionsAdvanced.SelectEffectGolden, 'OptionsAdvancedSelectEffectGolden');
+ ThemeLoadSelect (OptionsAdvanced.SelectScreenFade, 'OptionsAdvancedSelectScreenFade');
+ ThemeLoadSelect (OptionsAdvanced.SelectEffectSing, 'OptionsAdvancedSelectEffectSing');
ThemeLoadSelect (OptionsAdvanced.SelectLineBonus, 'OptionsAdvancedSelectLineBonus');
ThemeLoadSelectSlide (OptionsAdvanced.SelectOnSongClick, 'OptionsAdvancedSelectSlideOnSongClick');
ThemeLoadSelect (OptionsAdvanced.SelectAskbeforeDel, 'OptionsAdvancedSelectAskbeforeDel');
|