diff options
| author | brunzelchen <brunzelchen@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2010-07-04 15:16:46 +0000 |
|---|---|---|
| committer | brunzelchen <brunzelchen@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2010-07-04 15:16:46 +0000 |
| commit | 6731fad709d6ae924c15b0781d8debadaaf4840c (patch) | |
| tree | 5180e4509f5328feb65bf73994a2e3a8ed18a316 /src/screens | |
| parent | 5cd178c47df571c1ff04fe08fa09c8ac3add4e67 (diff) | |
| download | usdx-6731fad709d6ae924c15b0781d8debadaaf4840c.tar.gz usdx-6731fad709d6ae924c15b0781d8debadaaf4840c.tar.xz usdx-6731fad709d6ae924c15b0781d8debadaaf4840c.zip | |
- divide ScreenW by 2 in modi list if screens=2 and fullscreen (UIni)
- fixed crash after singing (with screens=2)
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2572 b956fd51-792f-4845-bead-9b4dfca2ff2c
Diffstat (limited to 'src/screens')
| -rw-r--r-- | src/screens/UScreenSing.pas | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/screens/UScreenSing.pas b/src/screens/UScreenSing.pas index 3e0d8078..b0318072 100644 --- a/src/screens/UScreenSing.pas +++ b/src/screens/UScreenSing.pas @@ -230,8 +230,8 @@ begin //Sound[0].BufferLong Finish; + FadeOut := true; AudioPlayback.PlaySound(SoundLib.Back); - FadeTo(@ScreenScore); end; SDLK_SPACE: @@ -884,7 +884,7 @@ begin end else begin - if (not FadeOut) then + if (not FadeOut) and (Screens=1) or (ScreenAct=2) then begin Finish; FadeOut := true; @@ -942,7 +942,8 @@ begin SetFontItalic(false); - Party.CallAfterSing; + if not FadeOut then + Party.CallAfterSing; end; procedure TScreenSing.OnSentenceEnd(SentenceIndex: cardinal); |