jira:USDX-147

made backspace function as ESC for most screens

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

32 files changed, 67 insertions, 33 deletions

diff --git a/Game/Code/Screens/UScreenCredits.pas b/Game/Code/Screens/UScreenCredits.pas
index 0176e329..5e0530af 100644
--- a/Game/Code/Screens/UScreenCredits.pas
+++ b/Game/Code/Screens/UScreenCredits.pas
@@ -110,7 +110,8 @@ begin
   If (PressedDown) Then

   begin // Key Down

     case PressedKey of

-      SDLK_ESCAPE :

+      SDLK_ESCAPE,

+      SDLK_BACKSPACE :

         begin

           FadeTo(@ScreenMain);

           Music.PlayBack;

diff --git a/Game/Code/Screens/UScreenEdit.pas b/Game/Code/Screens/UScreenEdit.pas
index ac2964cd..b78df989 100644
--- a/Game/Code/Screens/UScreenEdit.pas
+++ b/Game/Code/Screens/UScreenEdit.pas
@@ -32,7 +32,8 @@ begin
         begin

           Result := false;

         end;

-      SDLK_ESCAPE :

+      SDLK_ESCAPE,

+      SDLK_BACKSPACE :

         begin

           Music.PlayBack;

           FadeTo(@ScreenMain);

diff --git a/Game/Code/Screens/UScreenEditConvert.pas b/Game/Code/Screens/UScreenEditConvert.pas
index f1e3ba32..b5803bf6 100644
--- a/Game/Code/Screens/UScreenEditConvert.pas
+++ b/Game/Code/Screens/UScreenEditConvert.pas
@@ -83,7 +83,8 @@ begin
           Result := false;

         end;

 

-      SDLK_ESCAPE:

+      SDLK_ESCAPE,

+      SDLK_BACKSPACE:

         begin

           MidiFile.StopPlaying;

           Music.PlayBack;

diff --git a/Game/Code/Screens/UScreenEditHeader.pas b/Game/Code/Screens/UScreenEditHeader.pas
index 35d7840f..8b883e3a 100644
--- a/Game/Code/Screens/UScreenEditHeader.pas
+++ b/Game/Code/Screens/UScreenEditHeader.pas
@@ -57,7 +57,8 @@ begin
         begin

           Result := false;

         end;

-      SDLK_ESCAPE :

+      SDLK_ESCAPE,

+      SDLK_BACKSPACE :

         begin

 //          Music.PlayBack;

 //          FadeTo(@MainScreen);

diff --git a/Game/Code/Screens/UScreenEditSub.pas b/Game/Code/Screens/UScreenEditSub.pas
index 2d9f127e..a105ec8b 100644
--- a/Game/Code/Screens/UScreenEditSub.pas
+++ b/Game/Code/Screens/UScreenEditSub.pas
@@ -94,7 +94,8 @@ begin
 

   If (PressedDown) then begin // Key Down

     case PressedKey of

-      SDLK_ESCAPE:

+      SDLK_ESCAPE,

+      SDLK_BACKSPACE:

         begin

           FadeTo(@ScreenSong);

         end;

diff --git a/Game/Code/Screens/UScreenLevel.pas b/Game/Code/Screens/UScreenLevel.pas
index fc343042..34fc87af 100644
--- a/Game/Code/Screens/UScreenLevel.pas
+++ b/Game/Code/Screens/UScreenLevel.pas
@@ -29,7 +29,8 @@ begin
           Result := false;

         end;

 

-      SDLK_ESCAPE :

+      SDLK_ESCAPE,

+      SDLK_BACKSPACE :

         begin

           Music.PlayBack;

           FadeTo(@ScreenName);

diff --git a/Game/Code/Screens/UScreenMain.pas b/Game/Code/Screens/UScreenMain.pas
index af27b9b1..e1f41554 100644
--- a/Game/Code/Screens/UScreenMain.pas
+++ b/Game/Code/Screens/UScreenMain.pas
@@ -53,7 +53,8 @@ begin
           Result := false;

         end;

 

-      SDLK_ESCAPE :

+      SDLK_ESCAPE,

+      SDLK_BACKSPACE :

         begin

           Result := False;

         end;

diff --git a/Game/Code/Screens/UScreenName.pas b/Game/Code/Screens/UScreenName.pas
index 0d98e944..15d037ca 100644
--- a/Game/Code/Screens/UScreenName.pas
+++ b/Game/Code/Screens/UScreenName.pas
@@ -153,7 +153,7 @@ begin
           Button[Interaction].Text[0].DeleteLastL;

         end;

 

-      SDLK_ESCAPE :

+      SDLK_ESCAPE,

         begin

           Ini.SaveNames;

           Music.PlayBack;

diff --git a/Game/Code/Screens/UScreenOpen.pas b/Game/Code/Screens/UScreenOpen.pas
index af984a21..cd97bd37 100644
--- a/Game/Code/Screens/UScreenOpen.pas
+++ b/Game/Code/Screens/UScreenOpen.pas
@@ -52,7 +52,8 @@ begin
             end;

         end;

 

-      SDLK_ESCAPE:

+      SDLK_ESCAPE,

+      SDLK_BACKSPACE:

         begin

           //Empty Filename and go to last Screen

             FileName := '';

diff --git a/Game/Code/Screens/UScreenOptions.pas b/Game/Code/Screens/UScreenOptions.pas
index 02d42568..55e4f88c 100644
--- a/Game/Code/Screens/UScreenOptions.pas
+++ b/Game/Code/Screens/UScreenOptions.pas
@@ -31,7 +31,8 @@ begin
         begin

           Result := false;

         end;

-      SDLK_ESCAPE:

+      SDLK_ESCAPE,

+      SDLK_BACKSPACE:

         begin

           Ini.Save;

           Music.PlayBack;

diff --git a/Game/Code/Screens/UScreenOptionsAdvanced.pas b/Game/Code/Screens/UScreenOptionsAdvanced.pas
index 9cac8c5e..8422e2b1 100644
--- a/Game/Code/Screens/UScreenOptionsAdvanced.pas
+++ b/Game/Code/Screens/UScreenOptionsAdvanced.pas
@@ -27,7 +27,8 @@ begin
         begin

           Result := false;

         end;

-      SDLK_ESCAPE :

+      SDLK_ESCAPE,

+      SDLK_BACKSPACE :

         begin

           Ini.Save;

           Music.PlayBack;

diff --git a/Game/Code/Screens/UScreenOptionsGame.pas b/Game/Code/Screens/UScreenOptionsGame.pas
index 8712decc..238f63c0 100644
--- a/Game/Code/Screens/UScreenOptionsGame.pas
+++ b/Game/Code/Screens/UScreenOptionsGame.pas
@@ -29,7 +29,8 @@ begin
         begin

           Result := false;

         end;

-      SDLK_ESCAPE :

+      SDLK_ESCAPE,

+      SDLK_BACKSPACE :

         begin

           Music.PlayBack;

           RefreshSongs;

diff --git a/Game/Code/Screens/UScreenOptionsGraphics.pas b/Game/Code/Screens/UScreenOptionsGraphics.pas
index c0641fc2..e45d37bc 100644
--- a/Game/Code/Screens/UScreenOptionsGraphics.pas
+++ b/Game/Code/Screens/UScreenOptionsGraphics.pas
@@ -27,7 +27,8 @@ begin
         begin

           Result := false;

         end;

-      SDLK_ESCAPE:

+      SDLK_ESCAPE,

+      SDLK_BACKSPACE:

         begin

           Ini.Save;

           Music.PlayBack;

diff --git a/Game/Code/Screens/UScreenOptionsLyrics.pas b/Game/Code/Screens/UScreenOptionsLyrics.pas
index f4044933..75d54d47 100644
--- a/Game/Code/Screens/UScreenOptionsLyrics.pas
+++ b/Game/Code/Screens/UScreenOptionsLyrics.pas
@@ -27,7 +27,8 @@ begin
         begin

           Result := false;

         end;

-      SDLK_ESCAPE :

+      SDLK_ESCAPE,

+      SDLK_BACKSPACE :

         begin

           Ini.Save;

           Music.PlayBack;

diff --git a/Game/Code/Screens/UScreenOptionsRecord.pas b/Game/Code/Screens/UScreenOptionsRecord.pas
index b005492a..2ff989fa 100644
--- a/Game/Code/Screens/UScreenOptionsRecord.pas
+++ b/Game/Code/Screens/UScreenOptionsRecord.pas
@@ -32,7 +32,8 @@ begin
         begin

           Result := false;

         end;

-      SDLK_ESCAPE, SDLK_BACKSPACE:

+      SDLK_ESCAPE,

+      SDLK_BACKSPACE:

         begin

           Ini.Save;

           Music.PlayBack;

diff --git a/Game/Code/Screens/UScreenOptionsSound.pas b/Game/Code/Screens/UScreenOptionsSound.pas
index fb04ab64..ba4af6da 100644
--- a/Game/Code/Screens/UScreenOptionsSound.pas
+++ b/Game/Code/Screens/UScreenOptionsSound.pas
@@ -27,7 +27,8 @@ begin
         begin

           Result := false;

         end;

-      SDLK_ESCAPE :

+      SDLK_ESCAPE,

+      SDLK_BACKSPACE :

         begin

           Ini.Save;

           Music.PlayBack;

diff --git a/Game/Code/Screens/UScreenOptionsThemes.pas b/Game/Code/Screens/UScreenOptionsThemes.pas
index b73693c1..7c804274 100644
--- a/Game/Code/Screens/UScreenOptionsThemes.pas
+++ b/Game/Code/Screens/UScreenOptionsThemes.pas
@@ -30,7 +30,8 @@ begin
         begin

           Result := false;

         end;

-      SDLK_ESCAPE :

+      SDLK_ESCAPE,

+      SDLK_BACKSPACE :

         begin

           Ini.Save;

           Music.PlayBack;

diff --git a/Game/Code/Screens/UScreenPartyNewRound.pas b/Game/Code/Screens/UScreenPartyNewRound.pas
index f084ee10..f0f800da 100644
--- a/Game/Code/Screens/UScreenPartyNewRound.pas
+++ b/Game/Code/Screens/UScreenPartyNewRound.pas
@@ -83,7 +83,8 @@ begin
           Result := false;

         end;

 

-      SDLK_ESCAPE :

+      SDLK_ESCAPE,

+      SDLK_BACKSPACE :

         begin

           Music.PlayBack;

           CheckFadeTo(@ScreenMain,'MSG_END_PARTY');

diff --git a/Game/Code/Screens/UScreenPartyOptions.pas b/Game/Code/Screens/UScreenPartyOptions.pas
index 49cc8c53..91611d34 100644
--- a/Game/Code/Screens/UScreenPartyOptions.pas
+++ b/Game/Code/Screens/UScreenPartyOptions.pas
@@ -55,7 +55,8 @@ begin
           Result := false;

         end;

 

-      SDLK_ESCAPE :

+      SDLK_ESCAPE,

+      SDLK_BACKSPACE :

         begin

           Music.PlayBack;

           FadeTo(@ScreenMain);

diff --git a/Game/Code/Screens/UScreenPartyScore.pas b/Game/Code/Screens/UScreenPartyScore.pas
index 5c632356..b4e8c8e3 100644
--- a/Game/Code/Screens/UScreenPartyScore.pas
+++ b/Game/Code/Screens/UScreenPartyScore.pas
@@ -53,7 +53,8 @@ begin
           Result := false;

         end;

 

-      SDLK_ESCAPE :

+      SDLK_ESCAPE,

+      SDLK_BACKSPACE :

         begin

           Music.PlayStart;

           if (PartySession.CurRound < High(PartySession.Rounds)) then

diff --git a/Game/Code/Screens/UScreenPartyWin.pas b/Game/Code/Screens/UScreenPartyWin.pas
index 76d0420f..e73c1a0e 100644
--- a/Game/Code/Screens/UScreenPartyWin.pas
+++ b/Game/Code/Screens/UScreenPartyWin.pas
@@ -46,7 +46,8 @@ begin
           Result := false;

         end;

 

-      SDLK_ESCAPE :

+      SDLK_ESCAPE,

+      SDLK_BACKSPACE :

         begin

           Music.PlayStart;

           FadeTo(@ScreenMain);

diff --git a/Game/Code/Screens/UScreenPopup.pas b/Game/Code/Screens/UScreenPopup.pas
index 2a789e42..f583eb90 100644
--- a/Game/Code/Screens/UScreenPopup.pas
+++ b/Game/Code/Screens/UScreenPopup.pas
@@ -53,7 +53,8 @@ begin
           Result := false;

         end;

 

-      SDLK_ESCAPE :

+      SDLK_ESCAPE,

+      SDLK_BACKSPACE :

         begin

           Display.CheckOK:=False;

           Display.NextScreenWithCheck:=NIL;

@@ -159,7 +160,8 @@ begin
           Result := false;

         end;

 

-      SDLK_ESCAPE :

+      SDLK_ESCAPE,

+      SDLK_BACKSPACE :

         begin

           Visible:=False;

           Result := false;

diff --git a/Game/Code/Screens/UScreenScore.pas b/Game/Code/Screens/UScreenScore.pas
index f3f255b2..0a80381d 100644
--- a/Game/Code/Screens/UScreenScore.pas
+++ b/Game/Code/Screens/UScreenScore.pas
@@ -64,7 +64,8 @@ begin
           Result := false;

         end;

 

-      SDLK_ESCAPE :

+      SDLK_ESCAPE,

+      SDLK_BACKSPACE :

         begin

           if (not Fadeout) then begin

 //            Music.StopShuffle;

diff --git a/Game/Code/Screens/UScreenSing.pas b/Game/Code/Screens/UScreenSing.pas
index 2ba7522f..5409d9a9 100644
--- a/Game/Code/Screens/UScreenSing.pas
+++ b/Game/Code/Screens/UScreenSing.pas
@@ -103,7 +103,8 @@ begin
           

           Result := false;

         end;

-      SDLK_ESCAPE :

+      SDLK_ESCAPE,

+      SDLK_BACKSPACE :

         begin

           //Record Sound Hack:

           //Sound[0].BufferLong

diff --git a/Game/Code/Screens/UScreenSingModi.pas b/Game/Code/Screens/UScreenSingModi.pas
index 0b9ab893..32526a07 100644
--- a/Game/Code/Screens/UScreenSingModi.pas
+++ b/Game/Code/Screens/UScreenSingModi.pas
@@ -73,7 +73,8 @@ begin
   If (PressedDown) Then

   begin // Key Down

     case PressedKey of

-      SDLK_ESCAPE :

+      SDLK_ESCAPE,

+      SDLK_BACKSPACE :

         begin

           Finish;

           Music.PlayBack;

diff --git a/Game/Code/Screens/UScreenSong.pas b/Game/Code/Screens/UScreenSong.pas
index 3221f21e..5b807bb0 100644
--- a/Game/Code/Screens/UScreenSong.pas
+++ b/Game/Code/Screens/UScreenSong.pas
@@ -268,7 +268,8 @@ begin
         begin

           Result := false;

         end;

-      SDLK_ESCAPE :

+      SDLK_ESCAPE,

+      SDLK_BACKSPACE :

         begin

         if (Mode = 0) then

         begin

diff --git a/Game/Code/Screens/UScreenSongJumpto.pas b/Game/Code/Screens/UScreenSongJumpto.pas
index 7103257d..f26b5367 100644
--- a/Game/Code/Screens/UScreenSongJumpto.pas
+++ b/Game/Code/Screens/UScreenSongJumpto.pas
@@ -61,7 +61,9 @@ begin
           end;

         end;

 

-      SDLK_RETURN, SDLK_ESCAPE:

+      SDLK_RETURN,

+      SDLK_BACKSPACE,

+      SDLK_ESCAPE:

         begin

           Visible := False;

           Music.PlayBack;

diff --git a/Game/Code/Screens/UScreenSongMenu.pas b/Game/Code/Screens/UScreenSongMenu.pas
index 06b8f183..5e1841c6 100644
--- a/Game/Code/Screens/UScreenSongMenu.pas
+++ b/Game/Code/Screens/UScreenSongMenu.pas
@@ -73,7 +73,8 @@ begin
           Result := false;

         end;

 

-      SDLK_ESCAPE :

+      SDLK_ESCAPE,

+      SDLK_BACKSPACE :

         begin

           Music.PlayBack;

           Visible := False;

diff --git a/Game/Code/Screens/UScreenStatDetail.pas b/Game/Code/Screens/UScreenStatDetail.pas
index 1461a9da..324ad185 100644
--- a/Game/Code/Screens/UScreenStatDetail.pas
+++ b/Game/Code/Screens/UScreenStatDetail.pas
@@ -47,7 +47,8 @@ begin
         begin

           Result := false;

         end;

-      SDLK_ESCAPE:

+      SDLK_ESCAPE,

+      SDLK_BACKSPACE:

         begin

           Music.PlayBack;

           FadeTo(@ScreenStatMain);

diff --git a/Game/Code/Screens/UScreenStatMain.pas b/Game/Code/Screens/UScreenStatMain.pas
index b3907d41..d00552fd 100644
--- a/Game/Code/Screens/UScreenStatMain.pas
+++ b/Game/Code/Screens/UScreenStatMain.pas
@@ -34,7 +34,8 @@ begin
         begin

           Result := false;

         end;

-      SDLK_ESCAPE:

+      SDLK_ESCAPE,

+      SDLK_BACKSPACE:

         begin

           Ini.Save;

           Music.PlayBack;

diff --git a/Game/Code/Screens/UScreenTop5.pas b/Game/Code/Screens/UScreenTop5.pas
index 57c61aa7..3b555bd0 100644
--- a/Game/Code/Screens/UScreenTop5.pas
+++ b/Game/Code/Screens/UScreenTop5.pas
@@ -37,7 +37,9 @@ begin
           Result := false;

         end;

 

-      SDLK_ESCAPE, SDLK_RETURN:

+      SDLK_ESCAPE,

+      SDLK_BACKSPACE,

+      SDLK_RETURN:

         begin

           if (not Fadeout) then begin

             FadeTo(@ScreenSong);

diff --git a/Game/Code/Screens/UScreenWelcome.pas b/Game/Code/Screens/UScreenWelcome.pas
index 79fcc2c4..35e159f8 100644
--- a/Game/Code/Screens/UScreenWelcome.pas
+++ b/Game/Code/Screens/UScreenWelcome.pas
@@ -25,7 +25,8 @@ begin
   Result := true;

   If (PressedDown) Then begin

     case PressedKey of

-      SDLK_ESCAPE :

+      SDLK_ESCAPE,

+      SDLK_BACKSPACE :

         begin

           Result := False;

         end;