Selectring joystick support now enables parallel joystick support automatically. Selecting Tetris selects the default Tetris, too

games/config.in

@@ -2,11 +2,13 @@ mainmenu_option next_comment
 comment "Games"
 
 mainmenu_option next_comment
-comment "Tetris"
-dep_bool "Tetris Core (please select at least one of the below, too)" GAME_TETRIS_CORE $JOYSTICK_SUPPORT $RANDOM_SUPPORT
-dep_bool "Standard Tetris"     GAME_TETRIS           $GAME_TETRIS_CORE
-dep_bool "Bastard Tetris"      GAME_BASTET           $GAME_TETRIS_CORE
-dep_bool "First Person Tetris" GAME_TETRIS_FP        $GAME_TETRIS_CORE
+dep_bool_menu "Tetris" GAME_TETRIS_CORE y $JOYSTICK_SUPPORT
+if [ "$GAME_TETRIS_CORE" = "y" ]; then
+   GAME_TETRIS=y
+   dep_bool "Standard Tetris"     GAME_TETRIS           $GAME_TETRIS_CORE
+   dep_bool "Bastard Tetris"      GAME_BASTET           $GAME_TETRIS_CORE
+   dep_bool "First Person Tetris" GAME_TETRIS_FP        $GAME_TETRIS_CORE
+fi
 endmenu
 
 dep_bool "space invaders"      GAME_SPACE_INVADERS   $JOYSTICK_SUPPORT $RANDOM_SUPPORT

joystick/config.in

@@ -1,16 +1,19 @@
 dep_bool_menu "joystick support" JOYSTICK_SUPPORT y
 
+if [ "$JOYSTICK_SUPPORT" = "y" ]; then
+PARALLEL_JOYSTICK_SUPPORT=y
 ###################### Parallel joystick menu #################################
-dep_bool_menu "parallel joystick support" PARALLEL_JOYSTICK_SUPPORT y
+   dep_bool_menu "parallel joystick support" PARALLEL_JOYSTICK_SUPPORT y
 
-choice 'Pin up'			\
+   if [ "$PARALLEL_JOYSTICK_SUPPORT" = "y" ]; then
+      choice 'Pin up'			\
          "PINA  PINA \
           PINB  PINB \
           PINC  PINC \
           PIND  PIND" \
          'PINB' JOYSTICK_PIN_UP
 
-choice 'Bit up'			\
+      choice 'Bit up'			\
          "Bit0 0 \
           Bit1 1 \
           Bit2 2 \
@@ -21,14 +24,14 @@ choice 'Bit up'			\
           Bit7 7" \
          'Bit0' JOYSTICK_BIT_UP
 
-choice 'Pin down'			\
+      choice 'Pin down'			\
          "PINA  PINA \
           PINB  PINB \
           PINC  PINC \
           PIND  PIND" \
          'PINB' JOYSTICK_PIN_DOWN
 
-choice 'Bit down'			\
+      choice 'Bit down'			\
          "Bit0 0 \
           Bit1 1 \
           Bit2 2 \
@@ -39,14 +42,14 @@ choice 'Bit down'			\
           Bit7 7" \
          'Bit1' JOYSTICK_BIT_DOWN
 
-choice 'Pin left'			\
+      choice 'Pin left'			\
          "PINA  PINA \
           PINB  PINB \
           PINC  PINC \
           PIND  PIND" \
          'PINB' JOYSTICK_PIN_LEFT
 
-choice 'Bit left'			\
+      choice 'Bit left'			\
          "Bit0 0 \
           Bit1 1 \
           Bit2 2 \
@@ -57,14 +60,14 @@ choice 'Bit left'			\
           Bit7 7" \
          'Bit2' JOYSTICK_BIT_LEFT
 
-choice 'Pin right'			\
+      choice 'Pin right'			\
          "PINA  PINA \
           PINB  PINB \
           PINC  PINC \
           PIND  PIND" \
          'PINB' JOYSTICK_PIN_RIGHT
 
-choice 'Bit right'			\
+      choice 'Bit right'			\
          "Bit0 0 \
           Bit1 1 \
           Bit2 2 \
@@ -75,14 +78,14 @@ choice 'Bit right'			\
           Bit7 7" \
          'Bit3' JOYSTICK_BIT_RIGHT
 
-choice 'Pin fire'			\
+      choice 'Pin fire'			\
          "PINA  PINA \
           PINB  PINB \
           PINC  PINC \
           PIND  PIND" \
          'PIND' JOYSTICK_PIN_FIRE
 
-choice 'Bit fire'			\
+      choice 'Bit fire'			\
          "Bit0 0 \
           Bit1 1 \
           Bit2 2 \
@@ -92,36 +95,37 @@ choice 'Bit fire'			\
           Bit6 6 \
           Bit7 7" \
          'Bit3' JOYSTICK_BIT_FIRE
+   fi
 
-endmenu
+   endmenu
 ###############################################################################
 
 ###################### NES-Pad menu #################################
-dep_bool_menu "nes-pad support" NES_PAD_SUPPORT y
+   dep_bool_menu "nes-pad support" NES_PAD_SUPPORT y
 
-choice 'Port clk'			\
+   if [ "$NES_PAD_SUPPORT" = "y" ]; then
+      choice 'Port clk'			\
          "PORTA  PORTA \
           PORTB  PORTB \
           PORTC  PORTC \
           PORTD  PORTD" \
          'PORTB' NES_PAD_PORT_CLK
 
-choice 'Port ds'			\
+      choice 'Port ds'			\
          "PORTA  PORTA \
           PORTB  PORTB \
           PORTC  PORTC \
           PORTD  PORTD" \
          'PORTB' NES_PAD_PORT_PL 
 
-choice 'Pin pl'			\
+      choice 'Pin pl'			\
          "PORTA  PORTA \
           PORTB  PORTB \
           PORTC  PORTC \
           PORTD  PORTD" \
          'PORTB' NES_PAD_PORT_DS
 
-
-choice 'Bit clk'			\
+      choice 'Bit clk'			\
          "Bit0 0 \
           Bit1 1 \
           Bit2 2 \
@@ -132,7 +136,7 @@ choice 'Bit clk'			\
           Bit7 7" \
          'Bit0' NES_PAD_BIT_CLK
 
-choice 'Bit pl'			\
+      choice 'Bit pl'			\
          "Bit0 0 \
           Bit1 1 \
           Bit2 2 \
@@ -143,7 +147,7 @@ choice 'Bit pl'			\
           Bit7 7" \
          'Bit1' NES_PAD_BIT_PL
 
-choice 'Bit ds'			\
+      choice 'Bit ds'			\
          "Bit0 0 \
           Bit1 1 \
           Bit2 2 \
@@ -154,9 +158,11 @@ choice 'Bit ds'			\
           Bit7 7" \
          'Bit2' NES_PAD_BIT_DS
 
+   fi
 
-endmenu
+   endmenu
 ###############################################################################
 
+fi
 
 endmenu