diff options
| author | brunzelchen <brunzelchen@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2010-02-21 14:24:37 +0000 |
|---|---|---|
| committer | brunzelchen <brunzelchen@b956fd51-792f-4845-bead-9b4dfca2ff2c> | 2010-02-21 14:24:37 +0000 |
| commit | 184a1662f1498203cec9551b0407a8908f6e5e49 (patch) | |
| tree | aa11b52d75d0458987b14e403089040e9cdb266b /Game | |
| parent | a213a0011fa6b09718e3363889cbb7c643e01da2 (diff) | |
| download | usdx-184a1662f1498203cec9551b0407a8908f6e5e49.tar.gz usdx-184a1662f1498203cec9551b0407a8908f6e5e49.tar.xz usdx-184a1662f1498203cec9551b0407a8908f6e5e49.zip | |
fixed choosing songs in "plugin" medley surprise
fixed deactivation of karaoke mode on MP3 loading
git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/branches/1.0.1 Challenge MOD@2134 b956fd51-792f-4845-bead-9b4dfca2ff2c
Diffstat (limited to 'Game')
| -rw-r--r-- | Game/Code/Classes/UMusic.pas | 3 | ||||
| -rw-r--r-- | Game/Code/Screens/UScreenSong.pas | 9 | ||||
| -rw-r--r-- | Game/Code/UltraStar.dpr | 2 |
3 files changed, 9 insertions, 5 deletions
diff --git a/Game/Code/Classes/UMusic.pas b/Game/Code/Classes/UMusic.pas index c4f80235..33e182e3 100644 --- a/Game/Code/Classes/UMusic.pas +++ b/Game/Code/Classes/UMusic.pas @@ -502,7 +502,7 @@ procedure TMusic.Rewind; begin
if Loaded then begin
// MediaPlayer.Position := 0;
-
+
end;
end;
@@ -521,6 +521,7 @@ procedure TMusic.Play; begin
if Loaded then begin
// MediaPlayer.Play;
+ DSP_VocalRemover:=0;
if Loop then BASS_ChannelPlay(Bass, True); // start from beginning... actually bass itself does not loop, nor does this TMusic Class
BASS_ChannelPlay(Bass, False); // for setting position before playing
end;
diff --git a/Game/Code/Screens/UScreenSong.pas b/Game/Code/Screens/UScreenSong.pas index bd4c7c87..001ff860 100644 --- a/Game/Code/Screens/UScreenSong.pas +++ b/Game/Code/Screens/UScreenSong.pas @@ -3131,11 +3131,14 @@ begin begin
for I := 0 to Length(CatSongs.Song) - 1 do
begin
- if CatSongs.Song[I].Visible and (CatSongs.Song[I].Medley.Source >= MinS) and not PartyPlayedMedley(I)
+ if (CatSongs.Song[I].Medley.Source >= MinS) and not PartyPlayedMedley(I)
and not SongSkipped(I) then
begin
- SetLength(res, Length(res)+1);
- res[Length(res)-1] := I;
+ if (PlaylistMan.Mode<>0) or ((PlaylistMan.Mode=0) and CatSongs.Song[I].Visible) then
+ begin
+ SetLength(res, Length(res)+1);
+ res[Length(res)-1] := I;
+ end;
end;
end;
end else
diff --git a/Game/Code/UltraStar.dpr b/Game/Code/UltraStar.dpr index f13bc474..b597ff95 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 r7 alpha 2010-02-19';
+ Version = 'UltraStar Deluxe v1.0.1a Challenge-MOD r7 alpha 2010-02-21';
var
WndTitle: string;
|