Moved rumbling setting to generic options menu

Author: Semphris

src/supertux/menu/multiplayer_menu.cpp

@@ -30,11 +30,6 @@ MultiplayerMenu::MultiplayerMenu()
   auto& automanage_item = add_toggle(-1, _("Auto-manage Players"), &g_config->multiplayer_auto_manage_players);
   automanage_item.set_help(_("Automatically add and remove players when controllers are plugged or unplugged"));
 
-  auto& buzz_item = add_toggle(-1, _("Enable Rumbling Controllers"), &g_config->multiplayer_buzz_controllers);
-  buzz_item.set_help(_("Enable vibrating the game controllers.") + " " + _("This feature is currently only used in the options menu."));
-  // ^ Separated both translation strings so the latter can be removed if it is
-  // no longer true, without requiring a new round of translating
-
   add_submenu(_("Manage Players"), MenuStorage::MULTIPLAYER_PLAYERS_MENU);
 
   add_hl();

src/supertux/menu/options_menu.cpp

@@ -68,6 +68,7 @@ enum OptionsMenuIDs {
   MNID_MUSIC,
   MNID_SOUND_VOLUME,
   MNID_MUSIC_VOLUME,
+  MNID_RUMBLING,
   MNID_DEVELOPER_MODE,
   MNID_CHRISTMAS_MODE,
   MNID_TRANSITIONS,
@@ -403,6 +404,11 @@ OptionsMenu::OptionsMenu(bool complete) :
     add_inactive( _("Music (disabled)"));
   }
 
+  // Separated both translation strings so the latter can be removed if it is
+  // no longer true, without requiring a new round of translating
+  add_toggle(MNID_RUMBLING, _("Enable Rumbling Controllers"), &g_config->multiplayer_buzz_controllers)
+    .set_help(_("Enable vibrating the game controllers.") + " " + _("This feature is currently only used in the multiplayer options menu."));
+
   add_submenu(_("Setup Keyboard"), MenuStorage::KEYBOARD_MENU)
     .set_help(_("Configure key-action mappings"));