Swap spectator and music off lines for my sanity

Author: ilikepizza107

Source/Core/Core/Config/NetplaySettings.cpp

@@ -47,8 +47,8 @@ const Info<u32> NETPLAY_MINIMUM_BUFFER_SIZE{{System::Main, "NetPlay", "MinimumBu
 const Info<u32> NETPLAY_PLAYER_BUFFER_SIZE{{System::Main, "NetPlay", "PlayerBufferSize"}, 2};
 const Info<u32> NETPLAY_CLIENT_BUFFER_SIZE{{System::Main, "NetPlay", "BufferSizeClient"}, 1};
 
-const Info<bool> NETPLAY_IS_SPECTATOR{{System::Main, "NetPlay", "IsSpectator"}, false};
 const Info<bool> NETPLAY_BRAWL_MUSIC_OFF{{System::Main, "NetPlay", "BrawlMusicOff"}, false};
+const Info<bool> NETPLAY_IS_SPECTATOR{{System::Main, "NetPlay", "IsSpectator"}, false};
 
 const Info<bool> NETPLAY_SAVEDATA_LOAD{{System::Main, "NetPlay", "SyncSaves"}, true};
 const Info<bool> NETPLAY_SAVEDATA_WRITE{{System::Main, "NetPlay", "WriteSaveData"}, false};

Source/Core/Core/Config/NetplaySettings.h

@@ -43,8 +43,8 @@ extern const Info<u32> NETPLAY_MINIMUM_BUFFER_SIZE;
 extern const Info<u32> NETPLAY_PLAYER_BUFFER_SIZE;
 extern const Info<u32> NETPLAY_CLIENT_BUFFER_SIZE;
 
-extern const Info<bool> NETPLAY_IS_SPECTATOR;
 extern const Info<bool> NETPLAY_BRAWL_MUSIC_OFF;
+extern const Info<bool> NETPLAY_IS_SPECTATOR;
 
 extern const Info<bool> NETPLAY_SAVEDATA_LOAD;
 extern const Info<bool> NETPLAY_SAVEDATA_WRITE;

Source/Core/Core/ConfigManager.h

@@ -50,8 +50,8 @@ struct SConfig
   bool bJITNoBlockLinking = false;
 
   bool bCopyWiiSaveNetplay = true;
-  bool bIsSpectator = true;
   bool bBrawlMusicOff = true;
+  bool bIsSpectator = true;
 
   DiscIO::Region m_region;
 

Source/Core/Core/NetPlayClient.cpp

@@ -906,8 +906,8 @@ void NetPlayClient::OnStartGame(sf::Packet& packet)
     packet >> m_net_settings.allow_sd_writes;
     packet >> m_net_settings.oc_enable;
     packet >> m_net_settings.oc_factor;
-	packet >> m_net_settings.is_spectator;
     packet >> m_net_settings.brawlmusic_off;
+    packet >> m_net_settings.is_spectator;
 
     for (auto slot : ExpansionInterface::SLOTS)
       packet >> m_net_settings.exi_device[slot];

Source/Core/Core/NetPlayClient.h

@@ -76,8 +76,8 @@ class NetPlayUI
   virtual void OnTtlDetermined(u8 ttl) = 0;
 
   virtual bool IsRecording() = 0;
-  virtual bool IsSpectator() = 0;
   virtual bool IsMusicOff() = 0;
+  virtual bool IsSpectator() = 0;
   virtual std::shared_ptr<const UICommon::GameFile>
   FindGameFile(const SyncIdentifier& sync_identifier,
                SyncIdentifierComparison* found = nullptr) = 0;

Source/Core/Core/NetPlayProto.h

@@ -47,8 +47,8 @@ struct NetSettings
   bool allow_sd_writes = false;
   bool oc_enable = false;
   float oc_factor = 0;
-  bool is_spectator = false;
   bool brawlmusic_off = false;
+  bool is_spectator = false;
   Common::EnumMap<ExpansionInterface::EXIDeviceType, ExpansionInterface::MAX_SLOT> exi_device{};
   int memcard_size_override = -1;
 

Source/Core/Core/NetPlayServer.cpp

@@ -1455,8 +1455,8 @@ bool NetPlayServer::SetupNetSettings()
   settings.golf_mode = Config::Get(Config::NETPLAY_NETWORK_MODE) == "golf";
   settings.use_fma = DoAllPlayersHaveHardwareFMA();
   settings.hide_remote_gbas = Config::Get(Config::NETPLAY_HIDE_REMOTE_GBAS);
-  settings.is_spectator = Config::Get(Config::NETPLAY_IS_SPECTATOR);
   settings.brawlmusic_off = Config::Get(Config::NETPLAY_BRAWL_MUSIC_OFF);
+  settings.is_spectator = Config::Get(Config::NETPLAY_IS_SPECTATOR);
 
   // Unload GameINI to restore things to normal
   Config::RemoveLayer(Config::LayerType::GlobalGame);
@@ -1602,8 +1602,8 @@ bool NetPlayServer::StartGame()
   spac << m_settings.allow_sd_writes;
   spac << m_settings.oc_enable;
   spac << m_settings.oc_factor;
-  spac << m_settings.is_spectator;
   spac << m_settings.brawlmusic_off;
+  spac << m_settings.is_spectator;
 
   for (auto slot : ExpansionInterface::SLOTS)
     spac << static_cast<int>(m_settings.exi_device[slot]);

Source/Core/DolphinQt/NetPlay/NetPlayDialog.cpp

@@ -139,8 +139,8 @@ void NetPlayDialog::CreateMainLayout()
   m_player_buffer_size_box = new QSpinBox;
   m_player_buffer_label = new QLabel(tr("Player Buffer:"));
   m_quit_button = new QPushButton(tr("Quit"));
-  m_is_spectator = new QCheckBox(tr("Spectator"));
   m_brawlmusic_off = new QCheckBox(tr("Client Side Music Off"));
+  m_is_spectator = new QCheckBox(tr("Spectator"));
   m_splitter = new QSplitter(Qt::Horizontal);
   m_menu_bar = new QMenuBar(this);
 
@@ -913,8 +913,8 @@ void NetPlayDialog::SetOptionsEnabled(bool enabled)
     m_host_input_authority_action->setEnabled(enabled);
     m_golf_mode_action->setEnabled(enabled);
     m_fixed_delay_action->setEnabled(enabled);
-	m_is_spectator->setEnabled(enabled);
     m_brawlmusic_off->setEnabled(enabled);
+    m_is_spectator->setEnabled(enabled);
   }
 
   m_record_input_action->setEnabled(enabled);
@@ -1201,8 +1201,8 @@ void NetPlayDialog::LoadSettings()
   const bool strict_settings_sync = Config::Get(Config::NETPLAY_STRICT_SETTINGS_SYNC);
   const bool golf_mode_overlay = Config::Get(Config::NETPLAY_GOLF_MODE_OVERLAY);
   const bool hide_remote_gbas = Config::Get(Config::NETPLAY_HIDE_REMOTE_GBAS);
-  const bool is_spectator = Config::Get(Config::NETPLAY_IS_SPECTATOR);
   const bool brawlmusic_off = Config::Get(Config::NETPLAY_BRAWL_MUSIC_OFF);
+  const bool is_spectator = Config::Get(Config::NETPLAY_IS_SPECTATOR);
 
   m_minimum_buffer_size_box->setValue(minimum_buffer_size);
   m_player_buffer_size_box->setValue(player_buffer_size);
@@ -1221,8 +1221,8 @@ void NetPlayDialog::LoadSettings()
   m_golf_mode_overlay_action->setChecked(golf_mode_overlay);
   m_hide_remote_gbas_action->setChecked(hide_remote_gbas);
 
-  m_is_spectator->setChecked(is_spectator);
   m_brawlmusic_off->setChecked(brawlmusic_off);
+  m_is_spectator->setChecked(is_spectator);
 
   const std::string network_mode = Config::Get(Config::NETPLAY_NETWORK_MODE);
 
@@ -1266,8 +1266,8 @@ void NetPlayDialog::SaveSettings()
   Config::SetBase(Config::NETPLAY_STRICT_SETTINGS_SYNC, m_strict_settings_sync_action->isChecked());
   Config::SetBase(Config::NETPLAY_GOLF_MODE_OVERLAY, m_golf_mode_overlay_action->isChecked());
   Config::SetBase(Config::NETPLAY_HIDE_REMOTE_GBAS, m_hide_remote_gbas_action->isChecked());
-  Config::SetBase(Config::NETPLAY_IS_SPECTATOR, m_is_spectator->isChecked());
   Config::SetBase(Config::NETPLAY_BRAWL_MUSIC_OFF, m_brawlmusic_off->isChecked());
+  Config::SetBase(Config::NETPLAY_IS_SPECTATOR, m_is_spectator->isChecked());
 
   std::string network_mode;
   if (m_fixed_delay_action->isChecked())

Source/Core/DolphinQt/NetPlay/NetPlayDialog.h

@@ -79,8 +79,8 @@ class NetPlayDialog : public QDialog, public NetPlay::NetPlayUI
   void OnIndexRefreshFailed(const std::string error) override;
 
   bool IsRecording() override;
-  bool IsSpectator() override;
   bool IsMusicOff() override;
+  bool IsSpectator() override;
   std::shared_ptr<const UICommon::GameFile>
   FindGameFile(const NetPlay::SyncIdentifier& sync_identifier,
                NetPlay::SyncIdentifierComparison* found = nullptr) override;