From 7ee656d31524f4820b362a31fc6bc1fe0988c0dc Mon Sep 17 00:00:00 2001 From: whiteshark0 Date: Mon, 28 May 2007 18:58:08 +0000 Subject: Changed Text Spacing for a better look SelectLoadingAnimation in ScreenAdvanced hidden, because it is useless atm Changed Theme to fit the new Textspacing Fixed some Language entrys git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@232 b956fd51-792f-4845-bead-9b4dfca2ff2c --- Game/Code/Menu/UMenuText.pas | 5 +++- Game/Code/Screens/UScreenOptionsAdvanced.pas | 15 ++++++++--- Languages/English.ini | 18 +++++-------- Languages/German.ini | 38 ++++++++++++++-------------- Themes/Deluxe.ini | 34 ++++++++++++------------- 5 files changed, 58 insertions(+), 52 deletions(-) diff --git a/Game/Code/Menu/UMenuText.pas b/Game/Code/Menu/UMenuText.pas index 4cb48cad..5b035f51 100644 --- a/Game/Code/Menu/UMenuText.pas +++ b/Game/Code/Menu/UMenuText.pas @@ -276,7 +276,10 @@ begin SetFontPos(X2, Y2); glPrint(PChar(Text2)); - Y2 := Y2 + Size * 1.7; + {if Size >= 10 then + Y2 := Y2 + Size * 2.8 + else} + Y2 := Y2 + Size * 2.15; end; SetFontStyle(0); // reset to default diff --git a/Game/Code/Screens/UScreenOptionsAdvanced.pas b/Game/Code/Screens/UScreenOptionsAdvanced.pas index 4c3356d0..9cac8c5e 100644 --- a/Game/Code/Screens/UScreenOptionsAdvanced.pas +++ b/Game/Code/Screens/UScreenOptionsAdvanced.pas @@ -35,7 +35,9 @@ begin end; SDLK_RETURN: begin - if SelInteraction = 7 then begin + //SelectLoadAnimation Hidden because it is useless atm + //if SelInteraction = 7 then begin + if SelInteraction = 6 then begin Ini.Save; Music.PlayBack; FadeTo(@ScreenOptions); @@ -47,14 +49,18 @@ begin InteractPrev; SDLK_RIGHT: begin - if (SelInteraction >= 0) and (SelInteraction <= 6) then begin + //SelectLoadAnimation Hidden because it is useless atm + //if (SelInteraction >= 0) and (SelInteraction <= 6) then begin + if (SelInteraction >= 0) and (SelInteraction <= 5) then begin Music.PlayOption; InteractInc; end; end; SDLK_LEFT: begin - if (SelInteraction >= 0) and (SelInteraction <= 6) then begin + //SelectLoadAnimation Hidden because it is useless atm + //if (SelInteraction >= 0) and (SelInteraction <= 6) then begin + if (SelInteraction >= 0) and (SelInteraction <= 5) then begin Music.PlayOption; InteractDec; end; @@ -71,7 +77,8 @@ begin LoadFromTheme(Theme.OptionsAdvanced); - AddSelect(Theme.OptionsAdvanced.SelectLoadAnimation, Ini.LoadAnimation, ILoadAnimation); + //SelectLoadAnimation Hidden because it is useless atm + //AddSelect(Theme.OptionsAdvanced.SelectLoadAnimation, Ini.LoadAnimation, ILoadAnimation); AddSelect(Theme.OptionsAdvanced.SelectScreenFade, Ini.ScreenFade, IScreenFade); AddSelect(Theme.OptionsAdvanced.SelectEffectSing, Ini.EffectSing, IEffectSing); AddSelect(Theme.OptionsAdvanced.SelectLineBonus, Ini.LineBonus, ILineBonus); diff --git a/Languages/English.ini b/Languages/English.ini index 2a2dcd75..01ef2cb2 100644 --- a/Languages/English.ini +++ b/Languages/English.ini @@ -89,7 +89,7 @@ SING_OPTIONS_ADVANCED_ASKBEFOREDEL=Savety Questions SING_OPTIONS_ADVANCED_LINEBONUS=Line Bonus SING_OPTIONS_ADVANCED_COUNT_HOW_OFTEN_SUNG= SING_OPTIONS_ADVANCED_ONSONGCLICK=after Song Select -SING_OPTIONS_ADVANCED_PARTYPOPUP=Auto Party-Menue +SING_OPTIONS_ADVANCED_PARTYPOPUP=Auto PartyMenu SING_LEGEND_SELECT=select SING_LEGEND_NAVIGATE=navigate @@ -218,10 +218,6 @@ PARTY_ROUND_DESC=next players to the mics PARTY_ROUND_WHEREAMI=Party Next Round PARTY_ROUND_LEGEND_CONTINUE=start round -PARTY_SONG_WHEREAMI=Party Song-Selection -PARTY_SONG_LEGEND_CONTINUE=sing -PARTY_SONG_MENU=party menu - PARTY_SCORE_DESC=score of the last round PARTY_SCORE_WHEREAMI=Party Points @@ -257,7 +253,7 @@ STAT_MAIN_WHEREAMI=Statistics STAT_OVERVIEW_INTRO=%0:s Statistics. \n Last Reset at %2:.2d.%1:.2d.%3:d STAT_OVERVIEW_SONG=%0:d Songs(%3:d with Video), whereof %1:d already were played and %2:d were not played yet.\n The most popular Song is %5:s from %4:s. -STAT_OVERVIEW_PLAYER=Since the last Reset there were/was %0:d different Player(s).\n The Best Player is %1:s with an average Score of %2:d Points.\n %3:s did the highest Score with %4:d Points. +STAT_OVERVIEW_PLAYER=Since the last Reset there were/was %0:d different Player(s).\n The best Player is %1:s with an average Score of %2:d Points.\n %3:s did the highest Score with %4:d Points. STAT_DETAIL=Statistics STAT_DETAIL_WHEREAMI=Detail Statistics @@ -285,8 +281,8 @@ STAT_FORMAT_BANDS=%0:s \n %1:dx Sung MSG_ERROR_TITLE=Error MSG_QUESTION_TITLE=Question -MSG_QUIT_USDX=Really leave\n\nUltraStar? -MSG_END_PARTY=Really end\n\nParty Mode? -ERROR_NO_SONGS=No Songs \n\n loaded. -ERROR_NO_PLUGINS=No Plugins \n\n loaded. -ERROR_CORRUPT_SONG=Song could not be \n\n loaded. \ No newline at end of file +MSG_QUIT_USDX=Really leave UltraStar? +MSG_END_PARTY=Really end Party Mode? +ERROR_NO_SONGS=No Songs loaded +ERROR_NO_PLUGINS=No Plugins loaded +ERROR_CORRUPT_SONG=Song could not be loaded. \ No newline at end of file diff --git a/Languages/German.ini b/Languages/German.ini index 981be27a..41802135 100644 --- a/Languages/German.ini +++ b/Languages/German.ini @@ -6,12 +6,12 @@ SING_SING=Singen SING_SING_DESC=Singen SING_MULTI=Party -SING_MULTI_DESC=Ein rundenbasierendes Teamspiel spielen +SING_MULTI_DESC=Ein runden basierendes Teamspiel spielen SING_TOOLS=Tools SING_STATS=Statistiken -SING_STATS_DESC=Die Statisiken anschauen +SING_STATS_DESC=Die Statistiken anschauen SING_EDITOR=Editor SING_EDITOR_DESC=Mach deinen eigenen Song @@ -58,7 +58,7 @@ SING_OPTIONS_SOUND_DESC=Einstellungen f SING_OPTIONS_SOUND_MIC_BOOST=Mic Anhebung SING_OPTIONS_SOUND_CLICK_ASSIST=Click-Assistent SING_OPTIONS_SOUND_BEAT_CLICK=Beat-Click -SING_OPTIONS_SOUND_THRESHOLD=Rauschsperre +SING_OPTIONS_SOUND_THRESHOLD=Rauschunterdr. SING_OPTIONS_SOUND_TWO_PLAYERS_MODE=2-Spieler-Modus SING_OPTIONS_LYRICS_WHEREAMI=Optionen Lyrics @@ -74,7 +74,7 @@ SING_OPTIONS_THEMES_SKIN=Skin SING_OPTIONS_THEMES_COLOR=Farbe SING_OPTIONS_RECORD_WHEREAMI=Optionen Aufnahme -SING_OPTIONS_RECORD_DESC=Einstellungen für die Microfone +SING_OPTIONS_RECORD_DESC=Einstellungen für die Mikrofone SING_OPTIONS_RECORD_CARD=Soundkarte SING_OPTIONS_RECORD_INPUT=Eingang SING_OPTIONS_RECORD_CHANNELL=Linker Kanal @@ -87,7 +87,7 @@ SING_OPTIONS_ADVANCED_SCREENFADE=Bildschirm Fade SING_OPTIONS_ADVANCED_LOADANIMATION=Lade Animation SING_OPTIONS_ADVANCED_ASKBEFOREDEL=Sicherheitsabfr. SING_OPTIONS_ADVANCED_LINEBONUS=Phrasen Bonus -SING_OPTIONS_ADVANCED_COUNT_HOW_OFTEN_SUNG=Wie oft gesungen mitzählen +SING_OPTIONS_ADVANCED_COUNT_HOW_OFTEN_SUNG=Wie oft gesungen mit zählen SING_OPTIONS_ADVANCED_ONSONGCLICK=nach Song-Wahl SING_OPTIONS_ADVANCED_PARTYPOPUP=Auto Party-Menü @@ -214,7 +214,7 @@ PARTY_PLAYER_WHEREAMI=Party Spielernamen PARTY_PLAYER_ENTER_NAME=Namen eingeben PARTY_PLAYER_LEGEND_CONTINUE=Party-Spiel starten -PARTY_ROUND_DESC=Die nächsten Spieler an die Micros! +PARTY_ROUND_DESC=Die nächsten Spieler an die Mikros! PARTY_ROUND_WHEREAMI=Party nächste Runde PARTY_ROUND_LEGEND_CONTINUE=Runde starten @@ -227,7 +227,7 @@ PARTY_SCORE_WHEREAMI=Party Punkte PARTY_WIN_DESC=Gewinner des Partyspiels. PARTY_WIN_WHEREAMI=Party Gewinner -PARTY_WIN_LEGEND_CONTINUE=zurück zum Hauptmenue +PARTY_WIN_LEGEND_CONTINUE=zurück zum Hauptmenü PARTY_ROUND=Runde PARTY_ROUND_WINNER=Sieger @@ -240,13 +240,13 @@ PARTY_SCORE_WINS=%s PARTY_SCORE_WINS2=hat gewonnen! PLUGIN_HDL_NAME=Balken halten -PLUGIN_HDL_DESC=Halte die Bewertugnsanzeige im angezeigten Bereich +PLUGIN_HDL_DESC=Halte die Bewertungsanzeige im angezeigten Bereich PLUGIN_UNTIL5000_NAME=Bis 5000 PLUGIN_UNTIL5000_DESC=Wer zuerst 5000 Punkte hat gewinnt. PLUGIN_DUELL_NAME=Duell -PLUGIN_DUELL_DESC=Normales Spiel. Höchste Punkzahl gewinnt. +PLUGIN_DUELL_DESC=Normales Spiel. Höchste Punktzahl gewinnt. PLUGIN_BLIND_NAME=Blind Mode PLUGIN_BLIND_DESC=Erreiche Blind die höchste Punktzahl. @@ -257,23 +257,23 @@ STAT_MAIN_WHEREAMI=Statistiken STAT_OVERVIEW_INTRO=%0:s Statistiken. \n Letzter Reset am %1:.2d.%2:.2d.%3:d STAT_OVERVIEW_SONG=%0:d Songs(%3:d mit Video), davon wurden %1:d schon einmal gesungen und %2:d noch nicht. \n Der am häufigsten gesungene Song ist %5:s von %4:s. -STAT_OVERVIEW_PLAYER=Seit dem letzten Reset haben %0:d verschiedene Spieler gesungen. \n Der Beste Spieler ist %1:s mit einer Score von %2:d Punkten. \n Die höchste Punktzahl, %4:d, wurde von %3:s erreicht. +STAT_OVERVIEW_PLAYER=Seit dem letzten Reset haben %0:d verschiedene Spieler gesungen. \n Der beste Spieler ist %1:s mit %2:d Punkten. \n Die höchste Punktzahl, %4:d, wurde von %3:s erreicht. STAT_DETAIL=Statistiken -STAT_DETAIL_WHEREAMI=Detailierte Statistiken +STAT_DETAIL_WHEREAMI=Detaillierte Statistiken STAT_NEXT=Nächste Seite STAT_PREV=Vorherige Seite STAT_REVERSE=Umkehren STAT_PAGE=Seite %0:d von %1:d \n (%2:d von %3:d Einträgen) -STAT_DESC_SCORES=HighScores -STAT_DESC_SCORES_REVERSED=LowScores +STAT_DESC_SCORES=Highscores +STAT_DESC_SCORES_REVERSED=Lowscores STAT_FORMAT_SCORES=%0:s - %1:d [%2:s] \n (%3:s - %4:s) STAT_DESC_SINGERS=Beste Sänger STAT_DESC_SINGERS_REVERSED=Schlechteste Sänger -STAT_FORMAT_SINGERS=%0:s \n Durchschnittliche Score: %1:d +STAT_FORMAT_SINGERS=%0:s \n Durchschnittliche Punktzahl: %1:d STAT_DESC_SONGS=Beliebteste Songs STAT_DESC_SONGS_REVERSED=Unbeliebteste Songs @@ -285,8 +285,8 @@ STAT_FORMAT_BANDS=%0:s \n Gesungene Songs: %1:d MSG_ERROR_TITLE=Fehler MSG_QUESTION_TITLE=Frage -MSG_QUIT_USDX=UltraStar \n\n wirklich\n\nverlassen? -MSG_END_PARTY=Party Modus \n\n beenden? -ERROR_NO_SONGS=Keine Songs \n\n vorhanden. -ERROR_NO_PLUGINS=Keine Plugins \n\n vorhanden. -ERROR_CORRUPT_SONG=Song konnte nicht \n\n geladen werden. \ No newline at end of file +MSG_QUIT_USDX=UltraStar wirklich verlassen? +MSG_END_PARTY=Party Modus beenden? +ERROR_NO_SONGS=Keine Songs vorhanden. +ERROR_NO_PLUGINS=Keine Plugins vorhanden. +ERROR_CORRUPT_SONG=Song konnte nicht geladen werden. \ No newline at end of file diff --git a/Themes/Deluxe.ini b/Themes/Deluxe.ini index d1785a3c..eb124f0b 100644 --- a/Themes/Deluxe.ini +++ b/Themes/Deluxe.ini @@ -7250,9 +7250,9 @@ Reflection=0 [StatMainButtonSongsText1] X =95 -Y =10 +Y =13 Font=0 -Size=9 +Size=8 Align=1 Text=STAT_DESC_SONGS Color=White @@ -7271,9 +7271,9 @@ Reflection=0 [StatMainButtonBandsText1] X =95 -Y =10 +Y =13 Font=0 -Size=9 +Size=8 Align=1 Text=STAT_DESC_BANDS Color=White @@ -7536,7 +7536,7 @@ X = 546 Y = 98 Color= Black Font = 0 -Size = 6 +Size = 5 Align=2 Text= @@ -7545,7 +7545,7 @@ X = 45 Y = 122 Color=White Font = 0 -Size = 8 +Size = 7 Text=Stat1 [StatDetailTextList2] @@ -7553,7 +7553,7 @@ X = 45 Y = 160 Color=White Font = 0 -Size = 8 +Size = 7 Text=Stat2 [StatDetailTextList3] @@ -7561,7 +7561,7 @@ X = 45 Y = 198 Color=White Font = 0 -Size = 8 +Size = 7 Text= [StatDetailTextList4] @@ -7569,7 +7569,7 @@ X = 45 Y = 236 Color=White Font = 0 -Size = 8 +Size = 7 Text= [StatDetailTextList5] @@ -7577,7 +7577,7 @@ X = 45 Y = 274 Color=White Font = 0 -Size = 8 +Size = 7 Text= [StatDetailTextList6] @@ -7585,7 +7585,7 @@ X = 45 Y = 312 Color=White Font = 0 -Size = 8 +Size = 7 Text= [StatDetailTextList7] @@ -7593,7 +7593,7 @@ X = 45 Y = 350 Color=White Font = 0 -Size = 8 +Size = 7 Text= [StatDetailTextList8] @@ -7601,7 +7601,7 @@ X = 45 Y = 388 Color=White Font = 0 -Size = 8 +Size = 7 Text= [StatDetailTextList9] @@ -7609,7 +7609,7 @@ X = 45 Y = 426 Color=White Font = 0 -Size = 8 +Size = 7 Text= [StatDetailTextList10] @@ -7617,7 +7617,7 @@ X = 45 Y = 464 Color=White Font = 0 -Size = 8 +Size = 7 Text= [StatDetailStatic1] @@ -7787,7 +7787,7 @@ Z=1 [CheckPopupText] X =400 Y =180 -W =300 +W =280 Color=White Font =0 Size =12 @@ -7868,7 +7868,7 @@ Z=1 [ErrorPopupText] X =400 Y =180 -W =300 +W =280 Color=White Font =0 Size =12 -- cgit v1.2.3