aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Game/Code/Classes/UDraw.pas11
-rw-r--r--Game/Code/Classes/UIni.pas36
-rw-r--r--Game/Code/Classes/UThemes.pas8
-rw-r--r--Game/Code/Menu/UDisplay.pas40
-rw-r--r--Game/Code/Screens/UScreenOptionsAdvanced.pas4
-rw-r--r--Game/Code/Screens/UScreenSing.pas5
-rw-r--r--Languages/English.ini4
-rw-r--r--Languages/German.ini4
-rw-r--r--Languages/readme.txt4
-rw-r--r--Themes/Deluxe.ini8
10 files changed, 69 insertions, 55 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');
diff --git a/Game/Code/Menu/UDisplay.pas b/Game/Code/Menu/UDisplay.pas
index b6489c70..3f6e70da 100644
--- a/Game/Code/Menu/UDisplay.pas
+++ b/Game/Code/Menu/UDisplay.pas
@@ -15,6 +15,7 @@ type
Fade: Real;
// fade-mod
doFade: Boolean;
+ canFade: Boolean;
myFade: integer;
lastTime: Cardinal;
pTexData : Pointer;
@@ -37,42 +38,51 @@ var
implementation
-uses UGraphic, UTime, Graphics, Jpeg, UPliki, UTexture;
+uses UGraphic, UTime, Graphics, Jpeg, UPliki, UTexture, UIni;
constructor TDisplay.Create;
begin
inherited Create;
// fade mod
myfade:=0;
- doFade:=True;
+
+ if Ini.ScreenFade=1 then
+ doFade:=True
+ else
+ doFade:=False;
+
+ canFade:=True;
// generate texture for fading between screens
GetMem(pTexData, 1024*1024*3);
if pTexData <> NIL then
begin
glGenTextures(1, pTex);
- if glGetError <> GL_NO_ERROR then doFade := False;
+ if glGetError <> GL_NO_ERROR then canFade := False;
glBindTexture(GL_TEXTURE_2D, pTex);
- if glGetError <> GL_NO_ERROR then doFade := False;
+ if glGetError <> GL_NO_ERROR then canFade := False;
glTexImage2D(GL_TEXTURE_2D, 0, 3, 1024, 1024, 0, GL_RGB, GL_UNSIGNED_BYTE, pTexData);
- if glGetError <> GL_NO_ERROR then doFade := False;
+ if glGetError <> GL_NO_ERROR then canFade := False;
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
- if glGetError <> GL_NO_ERROR then doFade := False;
+ if glGetError <> GL_NO_ERROR then canFade := False;
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
- if glGetError <> GL_NO_ERROR then doFade := False;
+ if glGetError <> GL_NO_ERROR then canFade := False;
FreeMem(pTexData);
end
else
begin
- doFade:=False;
+ canFade:=False;
end;
- if not doFade then showmessage('Fehler beim Initialisieren der Fading-Textur... Fading deaktiviert');
+ if not canFade then begin
+ showmessage('Fehler beim Initialisieren der Fading-Textur... Fading deaktiviert');
+ doFade:=False;
+ end
// end
end;
// fade mod
destructor TDisplay.Destroy;
begin
- if doFade then
+ if canFade then
glDeleteTextures(1,@pTex);
inherited Destroy;
end;
@@ -113,11 +123,15 @@ begin
Result := ActualScreen.Draw;
// fade mod
myfade:=0;
+ if (Ini.ScreenFade=1) and canFade then
+ doFade:=True
+ else if Ini.ScreenFade=0 then
+ doFade:=False;
// end
end
else
begin
- if doFade then
+ if doFade and canFade then
begin
// fade mod
//Create Fading texture if we're just starting
@@ -128,7 +142,7 @@ begin
glCopyTexImage2D(GL_TEXTURE_2D, 0, GL_RGB, 0, 0, 1024, 1024, 0);
if glGetError <> GL_NO_ERROR then
begin
- doFade := False;
+ canFade := False;
showmessage('Fehler beim Kopieren der Fade-Textur... Fading deaktiviert');
end;
NextScreen.onShow;
@@ -167,7 +181,7 @@ begin
glDisable(GL_BLEND);
glDisable(GL_TEXTURE_2D);
end;
- if (myfade > 40) or (not doFade) then begin // fade out complete...
+ if (myfade > 40) or (not doFade) or (not canFade) then begin // fade out complete...
myFade:=0;
ActualScreen.onHide; // nop... whatever
ActualScreen.ShowFinish:=False;
diff --git a/Game/Code/Screens/UScreenOptionsAdvanced.pas b/Game/Code/Screens/UScreenOptionsAdvanced.pas
index 7904a284..ed3bc164 100644
--- a/Game/Code/Screens/UScreenOptionsAdvanced.pas
+++ b/Game/Code/Screens/UScreenOptionsAdvanced.pas
@@ -74,8 +74,8 @@ begin
AddText(Theme.OptionsAdvanced.Text[I]);
AddSelect(Theme.OptionsAdvanced.SelectLoadAnimation, Ini.LoadAnimation, ILoadAnimation);
- AddSelect(Theme.OptionsAdvanced.SelectEffectPerfect, Ini.EffectPerfect, IEffectPerfect);
- AddSelect(Theme.OptionsAdvanced.SelectEffectGolden, Ini.EffectGolden, IEffectGolden);
+ AddSelect(Theme.OptionsAdvanced.SelectScreenFade, Ini.ScreenFade, IScreenFade);
+ AddSelect(Theme.OptionsAdvanced.SelectEffectSing, Ini.EffectSing, IEffectSing);
AddSelect(Theme.OptionsAdvanced.SelectLineBonus, Ini.LineBonus, ILineBonus);
AddSelectSlide(Theme.OptionsAdvanced.SelectOnSongClick, Ini.OnSongClick, IOnSongClick);
AddSelect(Theme.OptionsAdvanced.SelectAskbeforeDel, Ini.AskbeforeDel, IAskbeforeDel);
diff --git a/Game/Code/Screens/UScreenSing.pas b/Game/Code/Screens/UScreenSing.pas
index e4fd7add..29ea5c8b 100644
--- a/Game/Code/Screens/UScreenSing.pas
+++ b/Game/Code/Screens/UScreenSing.pas
@@ -1115,7 +1115,7 @@ begin
//PhrasenBonus - Line Bonus Mod End// }
//PerfectLineTwinkle Mod (effect) Pt.1
- If (Ini.EffectPerfect>=1) then
+ If (Ini.EffectSing=1) then
begin
if A >= 8 then Player[I].LastSentencePerfect := True
else Player[I].LastSentencePerfect := False;
@@ -1128,7 +1128,8 @@ begin
end;
//PerfectLineTwinkle Mod (effect) Pt.2
- GoldenRec.SpawnPerfectLineTwinkle;
+ if Ini.EffectSing=1 then
+ GoldenRec.SpawnPerfectLineTwinkle;
//PerfectLineTwinkle Mod end
end;
diff --git a/Languages/English.ini b/Languages/English.ini
index 3b7f7404..de30266a 100644
--- a/Languages/English.ini
+++ b/Languages/English.ini
@@ -55,8 +55,8 @@ SING_OPTIONS_RECORD_CHANNELL=Left channel
SING_OPTIONS_RECORD_CHANNELR=Right channel
SING_OPTIONS_ADVANCED_DESC=advanced options
-SING_OPTIONS_ADVANCED_EFFECTGOLDEN=Golden Notes effect
-SING_OPTIONS_ADVANCED_EFFECTPERFECT=Perfect Notes effect
+SING_OPTIONS_ADVANCED_EFFECTSING=Sing Effects
+SING_OPTIONS_ADVANCED_SCREENFADE=Screen Fading
SING_OPTIONS_ADVANCED_LOADANIMATION=Load Animation
SING_OPTIONS_ADVANCED_ASKBEFOREDEL=Savety Questions
SING_OPTIONS_ADVANCED_LINEBONUS=Line Bonus
diff --git a/Languages/German.ini b/Languages/German.ini
index 601128b1..81d9c7ef 100644
--- a/Languages/German.ini
+++ b/Languages/German.ini
@@ -63,8 +63,8 @@ SING_OPTIONS_RECORD_CHANNELL=Linker Kanal
SING_OPTIONS_RECORD_CHANNELR=Rechter Kanal
SING_OPTIONS_ADVANCED_DESC=Erweiterte Optionen
-SING_OPTIONS_ADVANCED_EFFECTGOLDEN=Goldene Noten Effekt
-SING_OPTIONS_ADVANCED_EFFECTPERFECT=Perfekte Noten Effekt
+SING_OPTIONS_ADVANCED_EFFECTSING=Sing Effekte
+SING_OPTIONS_ADVANCED_SCREENFADE=Bildschirm Fade
SING_OPTIONS_ADVANCED_LOADANIMATION=Lade Animation
SING_OPTIONS_ADVANCED_ASKBEFOREDEL=Sicherheitsabfragen
SING_OPTIONS_ADVANCED_LINEBONUS=Phrasen Bonus
diff --git a/Languages/readme.txt b/Languages/readme.txt
index a9be1885..3a19fa29 100644
--- a/Languages/readme.txt
+++ b/Languages/readme.txt
@@ -7,8 +7,8 @@ SING_MENU=Main Menu
#Advanced Options Screen
SING_OPTIONS_ADVANCED=advanced
SING_OPTIONS_ADVANCED_DESC=advanced options
-SING_OPTIONS_ADVANCED_EFFECTGOLDEN=Golden Notes effect
-SING_OPTIONS_ADVANCED_EFFECTPERFECT=Perfect Notes effect
+SING_OPTIONS_ADVANCED_EFFECTSING=Singscreen effects
+SING_OPTIONS_ADVANCED_SCREENFADE=Screen Fading
SING_OPTIONS_ADVANCED_LOADANIMATION=Load Animation
SING_OPTIONS_ADVANCED_ASKBEFOREDEL=Savety Questions
SING_OPTIONS_ADVANCED_LINEBONUS=Line Bonus
diff --git a/Themes/Deluxe.ini b/Themes/Deluxe.ini
index 0c6d916c..66dd3b8e 100644
--- a/Themes/Deluxe.ini
+++ b/Themes/Deluxe.ini
@@ -3196,10 +3196,10 @@ SBGDColor = Gray
STColor = White
STDColor = GrayDark
-[OptionsAdvancedSelectEffectPerfect]
+[OptionsAdvancedSelectScreenFade]
Tex =MainBar
TexSBG =MainBar
-Text =SING_OPTIONS_ADVANCED_EFFECTPERFECT
+Text =SING_OPTIONS_ADVANCED_SCREENFADE
X = 40
Y = 170
W = 230
@@ -3216,10 +3216,10 @@ SBGDColor = Gray
STColor = White
STDColor = GrayDark
-[OptionsAdvancedSelectEffectGolden]
+[OptionsAdvancedSelectEffectSing]
Tex =MainBar
TexSBG =MainBar
-Text =SING_OPTIONS_ADVANCED_EFFECTGOLDEN
+Text =SING_OPTIONS_ADVANCED_EFFECTSING
X = 40
Y = 240
W = 230
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-15 19:43:55 +0000