UI portion of Spectator button implemented; no functionality yet

Author: Motobug

Source/Core/Core/Config/NetplaySettings.cpp

@@ -47,6 +47,7 @@ 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_SAVEDATA_LOAD{{System::Main, "NetPlay", "SyncSaves"}, true};

Source/Core/Core/Config/NetplaySettings.h

@@ -43,6 +43,7 @@ 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_SAVEDATA_LOAD;

Source/Core/Core/ConfigManager.h

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

Source/Core/Core/NetPlayClient.cpp

@@ -906,6 +906,7 @@ 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;
 
     for (auto slot : ExpansionInterface::SLOTS)

Source/Core/Core/NetPlayClient.h

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

Source/Core/Core/NetPlayProto.h

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

Source/Core/Core/NetPlayServer.cpp

@@ -1455,6 +1455,7 @@ 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);
 
   // Unload GameINI to restore things to normal
@@ -1601,6 +1602,7 @@ 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;
 
   for (auto slot : ExpansionInterface::SLOTS)

Source/Core/DolphinQt/NetPlay/NetPlayDialog.cpp

@@ -139,6 +139,7 @@ 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_splitter = new QSplitter(Qt::Horizontal);
   m_menu_bar = new QMenuBar(this);
@@ -266,8 +267,9 @@ void NetPlayDialog::CreateMainLayout()
   options_widget->addWidget(m_minimum_buffer_size_box, 0, 2, Qt::AlignVCenter);
   options_widget->addWidget(m_player_buffer_label, 0, 3, Qt::AlignVCenter);
   options_widget->addWidget(m_player_buffer_size_box, 0, 4, Qt::AlignVCenter);
-  options_widget->addWidget(m_brawlmusic_off, 0, 6, Qt::AlignVCenter);
-  options_widget->addWidget(m_quit_button, 0, 7, Qt::AlignVCenter | Qt::AlignRight);
+  options_widget->addWidget(m_is_spectator, 0, 6, Qt::AlignVCenter);
+  options_widget->addWidget(m_brawlmusic_off, 0, 7, Qt::AlignVCenter);
+  options_widget->addWidget(m_quit_button, 0, 8, Qt::AlignVCenter | Qt::AlignRight);
   options_widget->setColumnStretch(5, 1000);
 
   m_main_layout->addLayout(options_widget, 2, 0, 1, -1, Qt::AlignRight);
@@ -461,6 +463,14 @@ void NetPlayDialog::SendMessage(const std::string& msg)
       "");
 }
 
+bool NetPlayDialog::IsSpectator()
+{
+  std::optional<bool> is_spectator = RunOnObject(m_is_spectator, &QCheckBox::isChecked);
+  if (is_spectator)
+    return *is_spectator;
+  return false;
+}
+
 bool NetPlayDialog::IsMusicOff()
 {
   std::optional<bool> brawlmusic_off = RunOnObject(m_brawlmusic_off, &QCheckBox::isChecked);
@@ -903,6 +913,7 @@ 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);
   }
 
@@ -1190,6 +1201,7 @@ 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);
 
   m_minimum_buffer_size_box->setValue(minimum_buffer_size);
@@ -1209,6 +1221,7 @@ 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);
 
   const std::string network_mode = Config::Get(Config::NETPLAY_NETWORK_MODE);
@@ -1253,6 +1266,7 @@ 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());
 
   std::string network_mode;

Source/Core/DolphinQt/NetPlay/NetPlayDialog.h

@@ -79,6 +79,7 @@ class NetPlayDialog : public QDialog, public NetPlay::NetPlayUI
   void OnIndexRefreshFailed(const std::string error) override;
 
   bool IsRecording() override;
+  bool IsSpectator() override;
   bool IsMusicOff() override;
   std::shared_ptr<const UICommon::GameFile>
   FindGameFile(const NetPlay::SyncIdentifier& sync_identifier,
@@ -164,6 +165,7 @@ class NetPlayDialog : public QDialog, public NetPlay::NetPlayUI
   QAction* m_fixed_delay_action;
   QAction* m_hide_remote_gbas_action;
   QCheckBox* m_brawlmusic_off;
+  QCheckBox* m_is_spectator;
   QPushButton* m_quit_button;
   QSplitter* m_splitter;
   QActionGroup* m_network_mode_group;