diff options
Diffstat (limited to 'Game')
| -rw-r--r-- | Game/Code/Classes/UFiles.pas | 15 | ||||
| -rw-r--r-- | Game/Code/Screens/UScreenPartyOptionsM2.pas | 6 |
2 files changed, 8 insertions, 13 deletions
diff --git a/Game/Code/Classes/UFiles.pas b/Game/Code/Classes/UFiles.pas index 6e552f40..35c8a850 100644 --- a/Game/Code/Classes/UFiles.pas +++ b/Game/Code/Classes/UFiles.pas @@ -645,7 +645,7 @@ var medley: boolean;
begin
- Result := false;
+ Result := true;
bt := -32000;
if(AktSong.Medley.Source = msTag) then
@@ -664,7 +664,7 @@ begin begin
Log.LogError('Song ' + AktSong.Path + AktSong.Filename + ' has no lines?');
if (Ini.LoadFaultySongs=0) then
- Exit;
+ Result := false;
end;
for line := 0 to numLines - 1 do
@@ -675,7 +675,7 @@ begin begin
Log.LogError('Sentence ' + IntToStr(line+1) + ' in song ' + AktSong.Path + AktSong.Filename + ' has no notes?');
if (Ini.LoadFaultySongs=0) then
- Exit;
+ Result := false;
end;
if(bt>Czesci[p].Czesc[line].Start) then
@@ -683,7 +683,7 @@ begin Log.LogError('Beat error in sentence ' + IntToStr(line+1) + ', on beat ' + IntToStr(Czesci[p].Czesc[line].Start) +
' in song ' + AktSong.Path + AktSong.Filename);
if (Ini.LoadFaultySongs=0) then
- Exit;
+ Result := false;
end;
bt := Czesci[p].Czesc[line].Start;
@@ -694,7 +694,7 @@ begin Log.LogError('Beat error in sentence ' + IntToStr(line+1) + ', on beat ' + IntToStr(Czesci[p].Czesc[line].Nuta[note].Start) +
' in song ' + AktSong.Path + AktSong.Filename);
if (Ini.LoadFaultySongs=0) then
- Exit;
+ Result := false;
end;
bt := Czesci[p].Czesc[line].Nuta[note].Start;
@@ -727,14 +727,13 @@ begin begin
Log.LogError('Error MedleyStartBeat: no corresponding note start (beat) in song ' + AktSong.Path + AktSong.Filename);
if (Ini.LoadFaultySongs=0) then
- Exit;
+ Result := false;
end else if(medley and not foundMedleyEnd) then
begin
Log.LogError('Error MedleyEndBeat: no corresponding note start+length in song ' + AktSong.Path + AktSong.Filename);
if (Ini.LoadFaultySongs=0) then
- Exit;
+ Result := false;
end;
- Result := true;
end;
diff --git a/Game/Code/Screens/UScreenPartyOptionsM2.pas b/Game/Code/Screens/UScreenPartyOptionsM2.pas index 186983a1..465fb5b0 100644 --- a/Game/Code/Screens/UScreenPartyOptionsM2.pas +++ b/Game/Code/Screens/UScreenPartyOptionsM2.pas @@ -717,11 +717,7 @@ begin PluginList[Len].TimesPlayed := 0;
PluginList[Len].Medley := false;
PluginList[Len].MedleySurprise := false;
-
- if I=ID_DUELL then
- PluginList[Len].Selected := true
- else
- PluginList[Len].Selected := false;
+ PluginList[Len].Selected := true;
PluginList[Len].Name := Language.Translate(DLLMan.Plugins[I].Name);
PluginList[Len].Desc := Language.Translate(DLLMan.Plugins[I].PluginDesc);
|