From faf53d1dadd8e943d3cf3e4c4b1138b539ee55d4 Mon Sep 17 00:00:00 2001 From: brunzelchen Date: Thu, 18 Mar 2010 16:26:55 +0000 Subject: bugfix LoadFaultySongs; some editor changes; update of ffmpeg git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/branches/1.0.1 Challenge MOD@2204 b956fd51-792f-4845-bead-9b4dfca2ff2c --- Game/Code/Classes/UIni.pas | 6 ++-- Game/Code/Screens/UScreenEditSub.pas | 61 ++++++++++++++++++++++++++--------- Game/Code/UltraStar.dpr | 2 +- Game/Output/Languages/English.ini | 2 ++ Game/Output/Languages/German.ini | 2 ++ Game/Output/Languages/Italian.ini | 2 ++ Game/Output/acinerella.dll | Bin 6467603 -> 6486035 bytes 7 files changed, 56 insertions(+), 19 deletions(-) (limited to 'Game') diff --git a/Game/Code/Classes/UIni.pas b/Game/Code/Classes/UIni.pas index da0d0bea..3cfd2430 100644 --- a/Game/Code/Classes/UIni.pas +++ b/Game/Code/Classes/UIni.pas @@ -252,8 +252,8 @@ begin // Load faulty songs Tekst := IniFile.ReadString('Game', 'LoadFaultySongs', ILoadFaultySongs[0]); - for Pet := 0 to High(IDebug) do - if Tekst = IDebug[Pet] then Ini.LoadFaultySongs := Pet; + for Pet := 0 to High(ILoadFaultySongs) do + if Tekst = ILoadFaultySongs[Pet] then Ini.LoadFaultySongs := Pet; //if Ini.Debug = 1 then SongPath := 'E:\UltraStar 03\Songs\'; @@ -635,7 +635,7 @@ begin IniFile.WriteString('Game', 'Debug', Tekst); // Load faulty songs - Tekst := IDebug[Ini.Debug]; + Tekst := ILoadFaultySongs[Ini.LoadFaultySongs]; IniFile.WriteString('Game', 'LoadFaultySongs', Tekst); // Screens diff --git a/Game/Code/Screens/UScreenEditSub.pas b/Game/Code/Screens/UScreenEditSub.pas index 43720c8d..a0c89637 100644 --- a/Game/Code/Screens/UScreenEditSub.pas +++ b/Game/Code/Screens/UScreenEditSub.pas @@ -265,7 +265,11 @@ begin if SDL_ModState = 0 then begin // Insert start of sentece if AktNuta > 0 then + begin DivideSentence; + FixTimings; + Lyric.Selected := AktNuta; + end; end; if SDL_ModState = KMOD_LSHIFT then begin @@ -509,7 +513,11 @@ begin begin // Capitalize letter at the beginning of line if SDL_ModState = 0 then + begin LyricsCapitalize; + Text[TextDebug].Text := Language.Translate('EDITOR_CAPITALIZE_LETTER'); + Lyric.Selected := AktNuta; + end; // Correct spaces if SDL_ModState = KMOD_LSHIFT then @@ -586,6 +594,8 @@ begin begin // Fixes timings between sentences FixTimings; + Text[TextDebug].Text := Language.Translate('EDITOR_FIX_TIMINGS'); + Lyric.Selected := AktNuta; end; SDLK_F4: @@ -1482,7 +1492,6 @@ begin AktNuta := 0; Czesci[0].Czesc[Czesci[0].Akt].Nuta[AktNuta].Color := 2; Lyric.AddCzesc(Czesci[0].Akt); - end; procedure TScreenEditSub.JoinSentence; @@ -1550,7 +1559,7 @@ begin Czesci[0].Czesc[C].Nuta[AktNuta].Dlugosc; if (Czesci[0].Czesc[C].Nuta[AktNuta+1].Dlugosc>0) then - Czesci[0].Czesc[C].Nuta[AktNuta+1].Tekst := '~ ' + Czesci[0].Czesc[C].Nuta[AktNuta+1].Tekst := '~' else Czesci[0].Czesc[C].Nuta[AktNuta+1].Tekst := ' '; @@ -2446,13 +2455,37 @@ begin end; } end; + if(PlaySentence or PlaySentenceMidi) then begin + glColor4f(1, 0, 0, 1); + pos := AktBeat/ww*w; + br := 1; + + glbegin(gl_quads); + glVertex2f(x+pos, y); + glVertex2f(x+pos, y+h); + glVertex2f(x+pos+br, y+h); + glVertex2f(x+pos+br, y); + glEnd; + + start := Czesci[0].Czesc[Czesci[0].Akt].Nuta[0].Start; + end_ := Czesci[0].Czesc[Czesci[0].Akt].Nuta[Czesci[0].Czesc[Czesci[0].Akt].HighNut].Start+ + Czesci[0].Czesc[Czesci[0].Akt].Nuta[Czesci[0].Czesc[Czesci[0].Akt].HighNut].Dlugosc; + + pos := start/ww*w; + br := (end_-start)/ww*w; + glColor4f(0, 0, 0, 0.5); - pos := 0; - br := AktBeat/ww*w; - if (br>w) then - br := w; + + glEnable(GL_BLEND); + glbegin(gl_quads); + glVertex2f(x+pos, y); + glVertex2f(x+pos, y+h); + glVertex2f(x+pos+br, y+h); + glVertex2f(x+pos+br, y); + glEnd; + glDisable(GL_BLEND); end else begin glColor4f(1, 0, 0, 1); @@ -2460,16 +2493,14 @@ begin br := Czesci[0].Czesc[Czesci[0].Akt].Nuta[AktNuta].Dlugosc/ww*w; if (br<1) then br := 1; - end; - glEnable(GL_BLEND); - glbegin(gl_quads); - glVertex2f(x+pos, y); - glVertex2f(x+pos, y+h); - glVertex2f(x+pos+br, y+h); - glVertex2f(x+pos+br, y); - glEnd; - glDisable(GL_BLEND); + glbegin(gl_quads); + glVertex2f(x+pos, y); + glVertex2f(x+pos, y+h); + glVertex2f(x+pos+br, y+h); + glVertex2f(x+pos+br, y); + glEnd; + end; end; procedure TScreenEditSub.onHide; diff --git a/Game/Code/UltraStar.dpr b/Game/Code/UltraStar.dpr index 01e07706..ee158733 100644 --- a/Game/Code/UltraStar.dpr +++ b/Game/Code/UltraStar.dpr @@ -124,7 +124,7 @@ uses acinerella in 'lib\acinerella\acinerella.pas'; const - Version = 'UltraStar Deluxe v1.0.1a Challenge-MOD r7a 2010-03-06'; + Version = 'UltraStar Deluxe v1.0.1a Challenge-MOD r7b beta 2010-03-18'; var WndTitle: string; diff --git a/Game/Output/Languages/English.ini b/Game/Output/Languages/English.ini index 81074f1e..d8e44373 100644 --- a/Game/Output/Languages/English.ini +++ b/Game/Output/Languages/English.ini @@ -401,6 +401,8 @@ SCORE_LEGEND_SCROLL=Scroll ;new INFO_FILE_SAVED=File Saved ERROR_SAVE_FILE_FAILED=Error saving File +EDITOR_FIX_TIMINGS=Fixed timings +EDITOR_CAPITALIZE_LETTER=Capitalized letter at the beginning of line #### HelpPopup #### ;new diff --git a/Game/Output/Languages/German.ini b/Game/Output/Languages/German.ini index c80817b0..37b457b9 100644 --- a/Game/Output/Languages/German.ini +++ b/Game/Output/Languages/German.ini @@ -402,6 +402,8 @@ SCORE_LEGEND_SCROLL=Scrollen ;new INFO_FILE_SAVED=Datei gespeichert ERROR_SAVE_FILE_FAILED=Fehler beim Speichern +EDITOR_FIX_TIMINGS=Zeilenumbrüche/Timings korrigiert +EDITOR_CAPITALIZE_LETTER=Großschreibung am Zeilenanfang korrigiert #### HelpPopup #### ;new diff --git a/Game/Output/Languages/Italian.ini b/Game/Output/Languages/Italian.ini index 0c007acd..cd79a0cf 100644 --- a/Game/Output/Languages/Italian.ini +++ b/Game/Output/Languages/Italian.ini @@ -397,6 +397,8 @@ SCORE_LEGEND_SCROLL=Scorri ;new INFO_FILE_SAVED=File salvato ERROR_SAVE_FILE_FAILED=Errore salvataggio file +EDITOR_FIX_TIMINGS=Fixed timings +EDITOR_CAPITALIZE_LETTER=Capitalized letter at the beginning of line #### AdvancedOptions #### ;new diff --git a/Game/Output/acinerella.dll b/Game/Output/acinerella.dll index ab1fcad0..3e8b0bc9 100644 Binary files a/Game/Output/acinerella.dll and b/Game/Output/acinerella.dll differ -- cgit v1.2.3