remove some dead code from ScreenGameplay, change the default 'Select' keyboard mappi...

diff --git a/src/GameManager.cpp b/src/GameManager.cpp
index 98c6c48..4120c67 100755 (executable)
--- a/src/GameManager.cpp
+++ b/src/GameManager.cpp
@@ -152,7 +152,6 @@ Game g_Games[NUM_GAMES] =
                        GAME_BUTTON_COIN,               // MENU_BUTTON_COIN
                        GAME_BUTTON_OPERATOR,           // MENU_BUTTON_OPERATOR
                },
-               /* Adding default mappings for Select -- Vyhd */
                {       // m_iDefaultKeyboardKey
                        {       // PLAYER_1
                                KEY_DEL,                        // GAME_BUTTON_MENULEFT
@@ -160,7 +159,7 @@ Game g_Games[NUM_GAMES] =
                                KEY_HOME,                       // GAME_BUTTON_MENUUP
                                KEY_END,                        // GAME_BUTTON_MENUDOWN
                                KEY_ENTER,                      // GAME_BUTTON_START
-                               KEY_RSHIFT,                     // GAME_BUTTON_SELECT
+                               KEY_SLASH,                      // GAME_BUTTON_SELECT
                                KEY_ESC,                        // GAME_BUTTON_BACK
                                KEY_F1,                         // GAME_BUTTON_COIN
                                KEY_SCRLLOCK,                   // GAME_BUTTON_OPERATOR

diff --git a/src/ScreenGameplay.cpp b/src/ScreenGameplay.cpp
index 28a6d10..1e6a9c6 100755 (executable)
--- a/src/ScreenGameplay.cpp
+++ b/src/ScreenGameplay.cpp
@@ -1348,20 +1348,6 @@ void ScreenGameplay::UpdateSongPosition( float fDeltaTime )
 \r
        float fSecondsTotal = fSeconds+fAdjust; \r
 \r
-       // give a bit of leeway - ITG's R23 feature cuts off at 2:10 instead of 2:00, so add 10 to the limit\r
-       // UPDATE: made obsolete with the new custom song system\r
-       /*\r
-       if (m_bSongIsCustom && (PREFSMAN->m_iCustomMaxSeconds > 0) && fSecondsTotal > MAX_CUSTOM_LENGTH )\r
-       {\r
-               LOG->Warn( "Custom songs time limit of %f seconds exceeded (%f seconds); ending early.",\r
-                       MAX_CUSTOM_LENGTH, fSecondsTotal );\r
-\r
-                m_pSoundMusic->StopPlaying();\r
-                m_soundAssistTick.StopPlaying(); // Stop any queued assist ticks.\r
-               m_SongFinished.StartTransitioning( SM_NotesEnded );\r
-       }\r
-       */\r
-\r
        GAMESTATE->UpdateSongPosition( fSecondsTotal, GAMESTATE->m_pCurSong->m_Timing, tm+fAdjust );\r
 }\r
 \r