diff options
| author | jaybinks <jaybinks@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2007-10-25 06:59:28 +0000 |
|---|---|---|
| committer | jaybinks <jaybinks@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2007-10-25 06:59:28 +0000 |
| commit | 9a144f3cc3b9fbed5b07ffc3a05c5449d638d3ae (patch) | |
| tree | a64ee8fce70b5f7fba115d2b30109c4f3deea621 /Game/Code/Screens | |
| parent | cdf2eb843e60cb4712080430a9f43f8e68e26069 (diff) | |
| download | usdx-9a144f3cc3b9fbed5b07ffc3a05c5449d638d3ae.tar.gz usdx-9a144f3cc3b9fbed5b07ffc3a05c5449d638d3ae.tar.xz usdx-9a144f3cc3b9fbed5b07ffc3a05c5449d638d3ae.zip | |
minor changes and fixes for USDX on linux.
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@526 b956fd51-792f-4845-bead-9b4dfca2ff2c
Diffstat (limited to 'Game/Code/Screens')
| -rw-r--r-- | Game/Code/Screens/UScreenScore.pas | 8 | ||||
| -rw-r--r-- | Game/Code/Screens/UScreenSing.pas | 3 |
2 files changed, 9 insertions, 2 deletions
diff --git a/Game/Code/Screens/UScreenScore.pas b/Game/Code/Screens/UScreenScore.pas index c53e8b32..97d31541 100644 --- a/Game/Code/Screens/UScreenScore.pas +++ b/Game/Code/Screens/UScreenScore.pas @@ -521,6 +521,7 @@ var BarStartPosX : Single; R,G,B : real; + lTmp : real; begin MaxHeight := Static[StaticBackLevel[PlayerNumber + 1]].Texture.H; @@ -544,7 +545,12 @@ begin // quadratic easing out - decelerating to zero velocity // -end_position * current_time * ( current_time - 2 ) + start_postion - NewHeight := (-Height2Reach * RaiseStep * (RaiseStep - 20) + BarStartPosY) / RaiseSmoothness; + lTmp := (-Height2Reach * RaiseStep * (RaiseStep - 20) + BarStartPosY); + if ( RaiseSmoothness > 0 ) AND + ( lTmp > 0 ) then + begin + NewHeight := lTmp / RaiseSmoothness; + end; end else begin diff --git a/Game/Code/Screens/UScreenSing.pas b/Game/Code/Screens/UScreenSing.pas index 542326d2..8cba8f36 100644 --- a/Game/Code/Screens/UScreenSing.pas +++ b/Game/Code/Screens/UScreenSing.pas @@ -425,7 +425,8 @@ begin // AktSong.GAP := AktSong.GAP + 40 {4096 = 100ms for buffer} + 20 {microphone} + 60000 / AktSong.BPM[0].BPM / 2; // temporary until UMain will be fixed // set movie - if (AktSong.Video <> '') and FileExists(AktSong.Path + AktSong.Video) then begin + if (AktSong.Video <> '') and FileExists(AktSong.Path + AktSong.Video) then + begin (* OpenSmpeg(AktSong.Path + AktSong.Video); SkipSmpeg(AktSong.VideoGAP + AktSong.Start);*) |