aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorb1indy <b1indy@b956fd51-792f-4845-bead-9b4dfca2ff2c>2007-07-25 12:45:29 +0000
committerb1indy <b1indy@b956fd51-792f-4845-bead-9b4dfca2ff2c>2007-07-25 12:45:29 +0000
commita04ca2dc4762bde3d9a0549b15b7b573427adf61 (patch)
treea0c7709ee726546afc7700559027030c5ef41a10
parentb3b3858fe2b3e76374a288cfff60a945bd964c10 (diff)
downloadusdx-a04ca2dc4762bde3d9a0549b15b7b573427adf61.tar.gz
usdx-a04ca2dc4762bde3d9a0549b15b7b573427adf61.tar.xz
usdx-a04ca2dc4762bde3d9a0549b15b7b573427adf61.zip
fixed some minor glitches in the credits screen (transparent texture was not totally transparent, which could be seen with now working transparency in trunk)
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/branches/1.0x@330 b956fd51-792f-4845-bead-9b4dfca2ff2c
-rw-r--r--Game/Code/Screens/UScreenCredits.pas21
-rw-r--r--Game/Graphics/outro-esc.pngbin82249 -> 75369 bytes
2 files changed, 10 insertions, 11 deletions
diff --git a/Game/Code/Screens/UScreenCredits.pas b/Game/Code/Screens/UScreenCredits.pas
index b69c17aa..7e91ee3b 100644
--- a/Game/Code/Screens/UScreenCredits.pas
+++ b/Game/Code/Screens/UScreenCredits.pas
@@ -15,7 +15,7 @@ type
Credits_Time: Cardinal;
Credits_Alpha: Cardinal;
CTime: Cardinal;
- CTime_hold: array of Cardinal;
+ CTime_hold: Cardinal;
ESC_Alpha: Integer;
credits_entry_tex: TTexture;
@@ -115,12 +115,12 @@ begin
FadeTo(@ScreenMain);
Music.PlayBack;
end;
- SDLK_SPACE:
+{ SDLK_SPACE:
begin
setlength(CTime_hold,length(CTime_hold)+1);
CTime_hold[high(CTime_hold)]:=CTime;
end;
-
+}
end;//esac
end; //fi
end;
@@ -169,11 +169,9 @@ begin
Credits_X := 580;
deluxe_slidein := 0;
Credits_Alpha := 0;
- //Music.SetLoop(true); Loop looped ned, so ne scheisse
Music.Open(soundpath + 'wome-credits-tune.mp3'); //danke kleinster liebster weeeetüüüüü!!
-// Music.Play;
CTime:=0;
- setlength(CTime_hold,0);
+// setlength(CTime_hold,0);
end;
procedure TScreenCredits.onHide;
@@ -220,7 +218,7 @@ begin
inc(CurrentScrollEnd);
end;
end;
- // timing hack
+{ // timing hack
X:=5;
SetFontStyle (2);
SetFontItalic(False);
@@ -231,7 +229,7 @@ begin
SetFontPos (500, X);
glPrint (Addr(visibleText[0]));
X:=X+20;
- end;
+ end;}
end;
procedure Start3D;
@@ -285,6 +283,7 @@ Data := Music.GetFFTData;
begin
Credits_Time := T;
inc(CTime);
+ inc(CTime_hold);
Credits_X := Credits_X-2;
if (CRDTS_Stage=InitialDelay) and (CTime=Timings[0]) then
begin
@@ -1008,16 +1007,16 @@ Data := Music.GetFFTData;
if (CRDTS_Stage=Outro) then
begin
if CTime=Timings[20] then begin
- CTime:=0;
+ CTime_hold:=0;
Music.Stop;
Music.Open(soundpath + 'credits-outro-tune.mp3');
Music.Play;
Music.SetVolume(20);
Music.SetLoop(True);
end;
- if CTime > 231 then begin
+ if CTime_hold > 231 then begin
Music.Play;
- Ctime:=0;
+ Ctime_hold:=0;
end;
glClearColor(0,0,0,0);
glClear(GL_COLOR_BUFFER_BIT or GL_DEPTH_BUFFER_BIT);
diff --git a/Game/Graphics/outro-esc.png b/Game/Graphics/outro-esc.png
index 16ca2158..01ce735a 100644
--- a/Game/Graphics/outro-esc.png
+++ b/Game/Graphics/outro-esc.png
Binary files differ