Did Some Code Cleanup

Fixed some Bugs in Party Mode 
Added a Better Round Plugin Selection

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@89 b956fd51-792f-4845-bead-9b4dfca2ff2c

3 files changed, 9 insertions, 79 deletions

diff --git a/Game/Code/Screens/UScreenMain.pas b/Game/Code/Screens/UScreenMain.pas
index 5849341c..976c0e07 100644
--- a/Game/Code/Screens/UScreenMain.pas
+++ b/Game/Code/Screens/UScreenMain.pas
@@ -128,65 +128,8 @@ begin
         end;

       SDLK_M:

         begin

-          if (SDL_ModState = KMOD_LALT) then

-          begin

-            //Create Teams:

-            PartySession.Teams.NumTeams := 3;

-            //Team 1

-            PartySession.Teams.Teaminfo[0].Name := 'Team 1';

-            PartySession.Teams.Teaminfo[0].Score:= 0;

-            PartySession.Teams.Teaminfo[0].Joker := 3;

-            PartySession.Teams.Teaminfo[0].CurPlayer := 0;

-            PartySession.Teams.Teaminfo[0].NumPlayers := 2;

-            PartySession.Teams.Teaminfo[0].Playerinfo[0].Name := 'Player 1';

-            PartySession.Teams.Teaminfo[0].Playerinfo[0].TimesPlayed := 0;

-            PartySession.Teams.Teaminfo[0].Playerinfo[1].Name := 'Player 2';

-            PartySession.Teams.Teaminfo[0].Playerinfo[1].TimesPlayed := 0;

-

-            //Team 2

-            PartySession.Teams.Teaminfo[1].Name := 'Team 2';

-            PartySession.Teams.Teaminfo[1].Score:= 0;

-            PartySession.Teams.Teaminfo[1].Joker := 3;

-            PartySession.Teams.Teaminfo[1].CurPlayer := 0;

-            PartySession.Teams.Teaminfo[1].NumPlayers := 2;

-            PartySession.Teams.Teaminfo[1].Playerinfo[0].Name := 'Player 3';

-            PartySession.Teams.Teaminfo[1].Playerinfo[0].TimesPlayed := 0;

-            PartySession.Teams.Teaminfo[1].Playerinfo[1].Name := 'Player 4';

-            PartySession.Teams.Teaminfo[1].Playerinfo[1].TimesPlayed := 0;

-

-            //Team 3

-            PartySession.Teams.Teaminfo[2].Name := 'Team 3';

-            PartySession.Teams.Teaminfo[2].Score:= 0;

-            PartySession.Teams.Teaminfo[2].Joker := 3;

-            PartySession.Teams.Teaminfo[2].CurPlayer := 0;

-            PartySession.Teams.Teaminfo[2].NumPlayers := 2;

-            PartySession.Teams.Teaminfo[2].Playerinfo[0].Name := 'Player 5';

-            PartySession.Teams.Teaminfo[2].Playerinfo[0].TimesPlayed := 0;

-            PartySession.Teams.Teaminfo[2].Playerinfo[1].Name := 'Player 6';

-            PartySession.Teams.Teaminfo[2].Playerinfo[1].TimesPlayed := 0;

-

-            //Rounds:

-            SetLength (PartySession.Rounds, 3);

-            PartySession.Rounds[0].Plugin := 1;

-            PartySession.Rounds[0].Winner := 0;

-            PartySession.Rounds[1].Plugin := 0;

-            PartySession.Rounds[1].Winner := 0;

-            PartySession.Rounds[2].Plugin := 0;

-            PartySession.Rounds[2].Winner := 0;

-

-            //Start Party

-            PartySession.StartNewParty;

-            //Change Screen

-            Music.PlayStart;

-            FadeTo(@ScreenPartyNewRound);

-

-          end

-          else

-          begin

-            Music.PlayStart;

-            FadeTo(@ScreenPartyOptions);

-          end;

-

+          Music.PlayStart;

+          FadeTo(@ScreenPartyOptions);

         end;

 

       SDLK_RETURN:

diff --git a/Game/Code/Screens/UScreenPartyOptions.pas b/Game/Code/Screens/UScreenPartyOptions.pas
index 042e944f..1fd4da8f 100644
--- a/Game/Code/Screens/UScreenPartyOptions.pas
+++ b/Game/Code/Screens/UScreenPartyOptions.pas
@@ -95,7 +95,6 @@ begin
 

       SDLK_RETURN:

         begin

-

           //Save Difficulty

           Ini.Difficulty := SelectsS[SelectLevel].SelectedOption;

           Ini.SaveLevel;

@@ -106,6 +105,7 @@ begin
           PartySession.Teams.Teaminfo[0].NumPlayers := NumPlayer1+1;

           PartySession.Teams.Teaminfo[1].NumPlayers := NumPlayer2+1;

           PartySession.Teams.Teaminfo[2].NumPlayers := NumPlayer3+1;

+

           //Save Playlist

           PlaylistMan.Mode := Playlist;

           //If Category Selected Search Category ID

@@ -126,13 +126,10 @@ begin
           end

           else

             PlaylistMan.CurPlayList := Playlist2;

-          //Save Rounds + Random

-          SetLength (PartySession.Rounds, Rounds + 2);

-          For I := 0 to high (PartySession.Rounds) do

-          begin

-            PartySession.Rounds[I].Plugin := Random (Length(DLLMan.Plugins));

-            PartySession.Rounds[I].Winner := 0;

-          end;

+

+          //Start Party

+          PartySession.StartNewParty(Rounds + 2);

+

           Music.PlayStart;

           //Go to Player Screen

           FadeTo(@ScreenPartyPlayer);

@@ -155,10 +152,7 @@ begin
           end //Change Team3 Players visibility

           Else If (Interaction = 4) then

           begin

-            Case NumTeams of

-              0: SelectsS[7].Visible := False;

-              1: SelectsS[7].Visible := True;

-            end;

+              SelectsS[7].Visible := (NumTeams = 1);

           end;

         end;

       SDLK_LEFT:

@@ -173,10 +167,7 @@ begin
           end //Change Team3 Players visibility

           Else If (Interaction = 4) then

           begin

-            Case NumTeams of

-              0: SelectsS[7].Visible := False;

-              1: SelectsS[7].Visible := True;

-            end;

+            SelectsS[7].Visible := (NumTeams = 1);

           end;

         end;

     end;

diff --git a/Game/Code/Screens/UScreenPartyPlayer.pas b/Game/Code/Screens/UScreenPartyPlayer.pas
index 4fc43013..498514fb 100644
--- a/Game/Code/Screens/UScreenPartyPlayer.pas
+++ b/Game/Code/Screens/UScreenPartyPlayer.pas
@@ -87,10 +87,6 @@ begin
             PartySession.Teams.Teaminfo[I].Joker := Round (Length(PartySession.Rounds) * 0.85);

           end;

 

-

-          //Start Party

-          PartySession.StartNewParty;

-

           Music.PlayStart;

           FadeTo(@ScreenPartyNewRound);

         end;