fixed song skipping in party modes

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/branches/1.0.1 Challenge MOD@2174 b956fd51-792f-4845-bead-9b4dfca2ff2c

2 files changed, 23 insertions, 11 deletions

diff --git a/Game/Code/Screens/UScreenSong.pas b/Game/Code/Screens/UScreenSong.pas
index 52e679b5..377106d4 100644
--- a/Game/Code/Screens/UScreenSong.pas
+++ b/Game/Code/Screens/UScreenSong.pas
@@ -2667,11 +2667,23 @@ begin
   if PartyMedley then

   begin

     if (Length(getVisibleMedleyArr(MinSource))<=0) then

-      SetLength(MedleyPlayed, 0);

+    begin

+      if (GetSongsSkipped()>0) then

+        SetLength(SkippedSongs, 0);

+

+      if (Length(getVisibleMedleyArr(MinSource))<=0) then

+        SetLength(MedleyPlayed, 0);

+    end;

   end else

   begin

     if (CatSongs.VisibleSongs-Length(PartyPlayed)<=0) then

-      SetLength(PartyPlayed, 0);

+    begin

+      if (GetSongsSkipped()>0) then

+        SetLength(SkippedSongs, 0);

+

+      if (CatSongs.VisibleSongs-Length(PartyPlayed)<=0) then

+        SetLength(PartyPlayed, 0);

+    end;

   end;

 

   Case PlaylistMan.Mode of

@@ -3158,8 +3170,8 @@ begin
     SetLength(SkippedSongs, Length(SkippedSongs)+1);

     SkippedSongs[Length(SkippedSongs)-1] := Interaction;

 

-    SetLength(PartyPlayed, Length(PartyPlayed)+1);

-    PartyPlayed[Length(PartyPlayed)-1] := Interaction;

+    //SetLength(PartyPlayed, Length(PartyPlayed)+1);

+    //PartyPlayed[Length(PartyPlayed)-1] := Interaction;

 

     SelectRandomSong;

     SetJoker;

@@ -3174,8 +3186,8 @@ begin
       SetLength(SkippedSongs, Length(SkippedSongs)+1);

       SkippedSongs[Length(SkippedSongs)-1] := Interaction;

 

-      SetLength(MedleyPlayed, Length(MedleyPlayed)+1);

-      MedleyPlayed[Length(MedleyPlayed)-1] := Interaction;

+      //SetLength(MedleyPlayed, Length(MedleyPlayed)+1);

+      //MedleyPlayed[Length(MedleyPlayed)-1] := Interaction;

 

       SelectRandomSong;

       SetJoker;

@@ -3192,8 +3204,8 @@ begin
       SetLength(SkippedSongs, Length(SkippedSongs)+1);

       SkippedSongs[Length(SkippedSongs)-1] := Interaction;

 

-      SetLength(MedleyPlayed, Length(MedleyPlayed)+1);

-      MedleyPlayed[Length(MedleyPlayed)-1] := Interaction;

+      //SetLength(MedleyPlayed, Length(MedleyPlayed)+1);

+      //MedleyPlayed[Length(MedleyPlayed)-1] := Interaction;

 

       SelectRandomSong;

       SetJoker;

@@ -3351,8 +3363,8 @@ begin
     AddSong(Interaction);

     PlaylistMedley.NumMedleySongs := Length(PlaylistMedley.Song);

 

-    SetLength(SkippedSongs, Length(SkippedSongs)+1);

-    SkippedSongs[Length(SkippedSongs)-1] := Interaction;

+    //SetLength(SkippedSongs, Length(SkippedSongs)+1);

+    //SkippedSongs[Length(SkippedSongs)-1] := Interaction;

 

     SetLength(MedleyPlayed, Length(MedleyPlayed)+1);

     MedleyPlayed[Length(MedleyPlayed)-1] := Interaction;

diff --git a/Game/Code/UltraStar.dpr b/Game/Code/UltraStar.dpr
index 872a6d92..01e07706 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 2010-03-04';

+  Version = 'UltraStar Deluxe v1.0.1a Challenge-MOD r7a 2010-03-06';

 

 var

   WndTitle: string;