From 23bf5028a3314e41c9e21bbe7b8f22878d3554d8 Mon Sep 17 00:00:00 2001 From: brunzelchen Date: Fri, 8 Oct 2010 18:32:37 +0000 Subject: - fix: display sung notes again - less mp3 gain for menu sounds (-15db) git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/branches/1.0.1 Challenge MOD@2641 b956fd51-792f-4845-bead-9b4dfca2ff2c --- Game/Code/Classes/UDraw.pas | 33 +-------------------- Game/Code/Classes/UMain.pas | 4 ++- Game/Output/Sounds/Applause.mp3 | Bin 59794 -> 59968 bytes Game/Output/Sounds/Common back.mp3 | Bin 23431 -> 23637 bytes Game/Output/Sounds/Common start.mp3 | Bin 23431 -> 23637 bytes Game/Output/Sounds/credits-outro-tune.mp3 | Bin 156212 -> 156418 bytes Game/Output/Sounds/dismissed.mp3 | Bin 5433 -> 5639 bytes Game/Output/Sounds/menu swoosh.mp3 | Bin 5246 -> 5246 bytes Game/Output/Sounds/option change col.mp3 | Bin 3734 -> 3734 bytes Game/Output/Sounds/rimshot022b.mp3 | Bin 2090 -> 2296 bytes .../Output/Sounds/select music change music 50.mp3 | Bin 17580 -> 17786 bytes Game/Output/Sounds/select music change music.mp3 | Bin 8565 -> 8565 bytes Game/Output/Sounds/wome-credits-tune.mp3 | Bin 1682311 -> 1682517 bytes 13 files changed, 4 insertions(+), 33 deletions(-) diff --git a/Game/Code/Classes/UDraw.pas b/Game/Code/Classes/UDraw.pas index c304cc0a..162164d6 100644 --- a/Game/Code/Classes/UDraw.pas +++ b/Game/Code/Classes/UDraw.pas @@ -269,14 +269,6 @@ begin begin st := Czesci[CP].Czesc[Czesci[CP].Akt].StartNote; end_ := Czesci[CP].Czesc[Czesci[CP].Akt].Koniec; - {if AktSong.isDuet and (Length(Czesci[(CP+1) mod 2].Czesc[Czesci[CP].Akt].Nuta)>0)then - begin - if (Czesci[(CP+1) mod 2].Czesc[Czesci[CP].Akt].Koniec > end_) then - end_ := Czesci[(CP+1) mod 2].Czesc[Czesci[CP].Akt].Koniec; - - if (Czesci[(CP+1) mod 2].Czesc[Czesci[CP].Akt].StartNote < st) then - st := Czesci[(CP+1) mod 2].Czesc[Czesci[CP].Akt].StartNote; - end;} end; glColor4f(1, 1, 1, Alpha); @@ -377,14 +369,6 @@ begin begin st := Czesci[CP].Czesc[Czesci[CP].Akt].StartNote; end_ := Czesci[CP].Czesc[Czesci[CP].Akt].Koniec; - {if AktSong.isDuet and (Length(Czesci[(CP+1) mod 2].Czesc[Czesci[CP].Akt].Nuta)>0)then - begin - if (Czesci[(CP+1) mod 2].Czesc[Czesci[CP].Akt].Koniec > end_) then - end_ := Czesci[(CP+1) mod 2].Czesc[Czesci[CP].Akt].Koniec; - - if (Czesci[(CP+1) mod 2].Czesc[Czesci[CP].Akt].StartNote < st) then - st := Czesci[(CP+1) mod 2].Czesc[Czesci[CP].Akt].StartNote; - end; } end; glEnable(GL_TEXTURE_2D); @@ -408,9 +392,8 @@ begin end else begin NotesH2 := int(NotesH * 0.65); - end; //if + end; - // if True then Rec.Top := Y - (Ton-Czesci[CP].Czesc[Czesci[CP].Akt].BaseNote)*Space/2 - NotesH2; Rec.Bottom := Rec.Top + 2 *NotesH2; @@ -432,9 +415,6 @@ begin if Rec.Right <= Rec.Left then Rec.Right := Rec.Left; - -// glColor3f(R, G, B); -// glBindTexture(GL_TEXTURE_2D, Tex_MidGray.TexNum); glBindTexture(GL_TEXTURE_2D, Tex_Mid[NrGracza+1].TexNum); glBegin(GL_QUADS); glTexCoord2f(0, 0); glVertex2f(Rec.Left, Rec.Top); @@ -455,20 +435,9 @@ begin glTexCoord2f(1, 0); glVertex2f(Rec.Right, Rec.Top); glEnd; - - - //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.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 - - //Star animation counter - //inc(Starfr); - //Starfr := Starfr mod 128; GoldenRec.SavePerfectNotePos(Rec.Left, Rec.Top); - { SingDrawStar(Rec.Left+2, Rec.Top+4, A);} end; end; // with end; // for diff --git a/Game/Code/Classes/UMain.pas b/Game/Code/Classes/UMain.pas index 9b472528..4e0ffef4 100644 --- a/Game/Code/Classes/UMain.pas +++ b/Game/Code/Classes/UMain.pas @@ -612,6 +612,7 @@ begin // Half size Notes Patch NoteHit := false; + AktTon := Sound[CP].Ton; Range := 2 - Ini.Difficulty; if (abs(Czesci[P].Czesc[S].Nuta[Pet].Ton - Sound[CP].Ton) <= Range) or @@ -790,7 +791,8 @@ begin // Half size Notes Patch NoteHit := false; - + AktTon := Sound[CP].Ton; + Range := 2 - Ini.Difficulty; if (abs(Czesci[P].Czesc[S].Nuta[Pet].Ton - Sound[CP].Ton) <= Range) or DEBUG_NOTE_HIT then diff --git a/Game/Output/Sounds/Applause.mp3 b/Game/Output/Sounds/Applause.mp3 index 8c7f78bb..d5eeb881 100644 Binary files a/Game/Output/Sounds/Applause.mp3 and b/Game/Output/Sounds/Applause.mp3 differ diff --git a/Game/Output/Sounds/Common back.mp3 b/Game/Output/Sounds/Common back.mp3 index 34354740..232c075c 100644 Binary files a/Game/Output/Sounds/Common back.mp3 and b/Game/Output/Sounds/Common back.mp3 differ diff --git a/Game/Output/Sounds/Common start.mp3 b/Game/Output/Sounds/Common start.mp3 index 34354740..232c075c 100644 Binary files a/Game/Output/Sounds/Common start.mp3 and b/Game/Output/Sounds/Common start.mp3 differ diff --git a/Game/Output/Sounds/credits-outro-tune.mp3 b/Game/Output/Sounds/credits-outro-tune.mp3 index fc23561c..e7bcd442 100644 Binary files a/Game/Output/Sounds/credits-outro-tune.mp3 and b/Game/Output/Sounds/credits-outro-tune.mp3 differ diff --git a/Game/Output/Sounds/dismissed.mp3 b/Game/Output/Sounds/dismissed.mp3 index f478e7a3..b45e6546 100644 Binary files a/Game/Output/Sounds/dismissed.mp3 and b/Game/Output/Sounds/dismissed.mp3 differ diff --git a/Game/Output/Sounds/menu swoosh.mp3 b/Game/Output/Sounds/menu swoosh.mp3 index 1025a86f..c22e89f6 100644 Binary files a/Game/Output/Sounds/menu swoosh.mp3 and b/Game/Output/Sounds/menu swoosh.mp3 differ diff --git a/Game/Output/Sounds/option change col.mp3 b/Game/Output/Sounds/option change col.mp3 index c2fcb43b..f0fa86d5 100644 Binary files a/Game/Output/Sounds/option change col.mp3 and b/Game/Output/Sounds/option change col.mp3 differ diff --git a/Game/Output/Sounds/rimshot022b.mp3 b/Game/Output/Sounds/rimshot022b.mp3 index 9f49bab4..0694432b 100644 Binary files a/Game/Output/Sounds/rimshot022b.mp3 and b/Game/Output/Sounds/rimshot022b.mp3 differ diff --git a/Game/Output/Sounds/select music change music 50.mp3 b/Game/Output/Sounds/select music change music 50.mp3 index ade19a70..cb470a34 100644 Binary files a/Game/Output/Sounds/select music change music 50.mp3 and b/Game/Output/Sounds/select music change music 50.mp3 differ diff --git a/Game/Output/Sounds/select music change music.mp3 b/Game/Output/Sounds/select music change music.mp3 index 86a7218d..21bdaaa0 100644 Binary files a/Game/Output/Sounds/select music change music.mp3 and b/Game/Output/Sounds/select music change music.mp3 differ diff --git a/Game/Output/Sounds/wome-credits-tune.mp3 b/Game/Output/Sounds/wome-credits-tune.mp3 index 564e8d6f..8e3b227e 100644 Binary files a/Game/Output/Sounds/wome-credits-tune.mp3 and b/Game/Output/Sounds/wome-credits-tune.mp3 differ -- cgit v1.2.3