Merge pull request #4 from ilikepizza107/master

Add Spectator Checkbox

Author: ilikepizza107

Source/Core/Core/BootManager.cpp

@@ -96,6 +96,7 @@ bool BootCore(Core::System& system, std::unique_ptr<BootParameters> boot,
     Config::AddLayer(ConfigLoaders::GenerateNetPlayConfigLoader(*netplay_settings));
     StartUp.bCopyWiiSaveNetplay = netplay_settings->savedata_load;
     StartUp.bBrawlMusicOff = netplay_settings->brawlmusic_off;
+    StartUp.bIsSpectator = netplay_settings->is_spectator;
   }
 
   // Override out-of-region languages/countries to prevent games from crashing or behaving oddly

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;
 
@@ -148,6 +148,7 @@ enum class MessageID : u8
   ChunkedDataComplete = 0x44,
   ChunkedDataAbort = 0x45,
 
+  PadSpectator = 0x5F,
   PadData = 0x60,
   PadMapping = 0x61,
   PadBufferMinimum = 0x62,

Source/Core/Core/NetPlayServer.cpp

@@ -797,6 +797,47 @@ unsigned int NetPlayServer::OnData(sf::Packet& packet, Client& player)
   }
   break;
 
+  case MessageID::PadSpectator:
+  {
+    bool spectator;
+    packet >> spectator;
+
+    auto padmap = GetPadMapping();
+  
+    int player_port = -1;
+    for (int i = 0; i < (int)padmap.size(); i++)
+    {
+      if (padmap[i] == player.pid)
+      {
+        player_port = i;
+        break;
+      }
+    }
+
+    if (spectator)
+    {
+      if (player_port != -1)
+        padmap[player_port] = 0;
+    }
+    else
+    {
+      bool assigned = false;
+      for (int i = 0; i < (int)padmap.size(); i++)
+      {
+        if (padmap[i] == 0)
+        {
+          padmap[i] = player.pid;
+          assigned = true;
+          break;
+        }
+      }
+    }
+
+    this->SetPadMapping(padmap);
+  }
+  break;
+
+
   case MessageID::PadData:
   {
     // if this is pad data from the last game still being received, ignore it
@@ -1455,8 +1496,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 +1643,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);
 
@@ -267,10 +267,10 @@ 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, 5, Qt::AlignVCenter);
   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);
+  options_widget->setColumnStretch(7, 1000);
 
   m_main_layout->addLayout(options_widget, 2, 0, 1, -1, Qt::AlignRight);
   m_main_layout->setRowStretch(1, 1000);
@@ -405,6 +405,8 @@ void NetPlayDialog::ConnectWidgets()
   connect(m_start_button, &QPushButton::clicked, this, &NetPlayDialog::OnStart);
   connect(m_quit_button, &QPushButton::clicked, this, &NetPlayDialog::reject);
 
+  connect(m_is_spectator, &QCheckBox::toggled, this, &NetPlayDialog::IsSpectatorEnabled); 
+
   connect(m_game_button, &QPushButton::clicked, [this] {
     GameListDialog gld(m_game_list_model, this);
     SetQWidgetWindowDecorations(&gld);
@@ -493,6 +495,17 @@ void NetPlayDialog::OnChat()
   });
 }
 
+void NetPlayDialog::IsSpectatorEnabled(bool enabled)
+{
+  auto client = Settings::Instance().GetNetPlayClient();
+  if (!client)
+    return;
+  sf::Packet packet;
+  packet << static_cast<u8>(NetPlay::MessageID::PadSpectator);
+  packet << enabled;
+  client->SendAsync(std::move(packet));
+}
+
 void NetPlayDialog::OnIndexAdded(bool success, const std::string error)
 {
   DisplayMessage(success ? tr("Successfully added to the NetPlay index") :
@@ -913,8 +926,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 +1214,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 +1234,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 +1279,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,9 @@ 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;
+  void IsSpectatorEnabled(bool enabled);
   std::shared_ptr<const UICommon::GameFile>
   FindGameFile(const NetPlay::SyncIdentifier& sync_identifier,
                NetPlay::SyncIdentifierComparison* found = nullptr) override;