Fixed the "one Song too much" Bug

Added 2 Error Messages:
When Opening Sing or Party: No Songs Loaded
When Opening Party: No Plugins loaded
Added Messages to Language File

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

5 files changed, 34 insertions, 15 deletions

diff --git a/Game/Code/Classes/USongs.pas b/Game/Code/Classes/USongs.pas
index 0a319370..4b49127c 100644
--- a/Game/Code/Classes/USongs.pas
+++ b/Game/Code/Classes/USongs.pas
@@ -110,7 +110,7 @@ begin
   BrowseDir(SongPath);

 

   //Set Correct SongArray Length

-  SetLength(Song, BrowsePos + 1);

+  SetLength(Song, BrowsePos);

 //  if Ini.Debug = 1 then BrowseDir('D:\Extract\Songs\');

 end;

 

diff --git a/Game/Code/Screens/UScreenMain.pas b/Game/Code/Screens/UScreenMain.pas
index 6fd458d7..47a79496 100644
--- a/Game/Code/Screens/UScreenMain.pas
+++ b/Game/Code/Screens/UScreenMain.pas
@@ -93,22 +93,35 @@ begin
       SDLK_RETURN:

         begin

           //Solo

-          if (Interaction = 0) and (Length(Songs.Song) >= 1) then begin

-            Music.PlayStart;

-            if (Ini.Players >= 0) and (Ini.Players <= 3) then PlayersPlay := Ini.Players + 1;

-            if (Ini.Players = 4) then PlayersPlay := 6;

-

-            ScreenName.Goto_SingScreen := False;

-            FadeTo(@ScreenName);

+          if (Interaction = 0) then

+          begin

+            if (Length(Songs.Song) >= 1) then

+            begin

+              Music.PlayStart;

+              if (Ini.Players >= 0) and (Ini.Players <= 3) then PlayersPlay := Ini.Players + 1;

+              if (Ini.Players = 4) then PlayersPlay := 6;

+

+              ScreenName.Goto_SingScreen := False;

+              FadeTo(@ScreenName);

+            end

+            else //show error message

+              ScreenPopupError.ShowPopup(Language.Translate('ERROR_NO_SONGS'));

           end;

 

           //Multi

           if Interaction = 1 then begin

-            if (Ini.Players >= 1) AND (Length(DLLMan.Plugins)>=1) then

+            if (Length(Songs.Song) >= 1) then

             begin

-              Music.PlayStart;

-              FadeTo(@ScreenPartyOptions);

-            end;

+              if (Length(DLLMan.Plugins)>=1) then

+              begin

+                Music.PlayStart;

+                FadeTo(@ScreenPartyOptions);

+              end

+              else //show error message, No Plugins Loaded

+              ScreenPopupError.ShowPopup(Language.Translate('ERROR_NO_PLUGINS'));

+            end

+            else //show error message, No Songs Loaded

+              ScreenPopupError.ShowPopup(Language.Translate('ERROR_NO_SONGS'));

           end;

 

           //Stats

diff --git a/Languages/English.ini b/Languages/English.ini
index 311d17a4..9a9c3975 100644
--- a/Languages/English.ini
+++ b/Languages/English.ini
@@ -279,4 +279,6 @@ STAT_DESC_BANDS_REVERSED=Least popular Bands
 STAT_FORMAT_BANDS=%0:s \n %1:dx Sung

 

 MSG_QUIT_USDX=Really leave\n\nUltraStar?

-MSG_END_PARTY=Really end\n\nParty Mode?
\ No newline at end of file
+MSG_END_PARTY=Really end\n\nParty Mode?

+ERROR_NO_SONGS=Error: \n No Songs \n loaded

+ERROR_NO_PLUGINS=Error: \n No Plugins \n loaded
\ No newline at end of file
diff --git a/Languages/German.ini b/Languages/German.ini
index 75b4afed..9e66e276 100644
--- a/Languages/German.ini
+++ b/Languages/German.ini
@@ -279,4 +279,6 @@ STAT_DESC_BANDS_REVERSED=Unbeliebteste Bands
 STAT_FORMAT_BANDS=%0:s \n Gesungene Songs: %1:d

 

 MSG_QUIT_USDX=UltraStar\n\nwirklich\n\nverlassen?

-MSG_END_PARTY=Party Modus\n\nbeenden?
\ No newline at end of file
+MSG_END_PARTY=Party Modus\n\nbeenden?

+ERROR_NO_SONGS=Fehler: \n Keine Songs \n vorhanden

+ERROR_NO_PLUGINS=Fehler: \n Keine Plugins \n vorhanden
\ No newline at end of file
diff --git a/Languages/readme.txt b/Languages/readme.txt
index 29148a94..52f3f966 100644
--- a/Languages/readme.txt
+++ b/Languages/readme.txt
@@ -159,4 +159,6 @@ STAT_FORMAT_BANDS=%0:s \n %1:dx Sung
 

 #Messages for Popup Message Boxes

 MSG_QUIT_USDX=Leave UltraStar?

-MSG_END_PARTY=End Party Mode?
\ No newline at end of file
+MSG_END_PARTY=End Party Mode?

+ERROR_NO_SONGS=Error: \n No Songs \n loaded

+ERROR_NO_PLUGINS=Error: \n No Plugins \n loaded
\ No newline at end of file