Final fixes and cleanup from rebase

shiiion · Nov 4, 2024 · f7029d6 · f7029d6
1 parent 8ec41cf
commit f7029d6
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 4 deletions.
diff --git a/Source/Core/Core/PowerPC/MMU.cpp b/Source/Core/Core/PowerPC/MMU.cpp
@@ -35,6 +35,7 @@
 #include "Common/BitUtils.h"
 #include "Common/CommonTypes.h"
 #include "Common/Logging/Log.h"
+#include "common/FloatUtils.h"
 
 #include "Core/Core.h"
 #include "Core/HW/CPU.h"
@@ -1739,11 +1740,11 @@ void WriteU64SwapFromJit(MMU& mmu, u64 var, u32 address)
 
 // Additional junk for my sanity
 float MMU::Read_F32(u32 address) {
-  return Common::BitCast<float>(Read_U32(address));
+  return std::bit_cast<float>(Read_U32(address));
 }
 
 void MMU::Write_F32(float var, u32 address) {
-  u32 uvar = Common::BitCast<u32>(var);
+  u32 uvar = std::bit_cast<u32>(var);
   Write_U32(uvar, address);
 }
 }  // namespace PowerPC
diff --git a/Source/Core/Core/PowerPC/PowerPC.h b/Source/Core/Core/PowerPC/PowerPC.h
@@ -237,8 +237,6 @@ struct PowerPCState
   void UpdateFPRFSingle(float fvalue);
 };
 
-typedef void(*vm_call)(PowerPCState&, u32);
-
 #ifdef _M_X86_64
 #ifdef __GNUC__
 #pragma GCC diagnostic push

diff --git a/Source/Core/DolphinQt/MainWindow.cpp b/Source/Core/DolphinQt/MainWindow.cpp
@@ -609,6 +609,20 @@ void MainWindow::ConnectMenuBar()
   connect(m_menu_bar, &MenuBar::OpenCVarsMenu, this, &MainWindow::OpenCVarsMenu);
 }
 
+void MainWindow::OpenCVarsMenu()
+{
+  if (m_cvars_window != nullptr)
+  {
+    delete m_cvars_window;
+    m_cvars_window = nullptr;
+  }
+  m_cvars_window = new CVarsWindow(this);
+
+  m_cvars_window->show();
+  m_cvars_window->raise();
+  m_cvars_window->activateWindow();
+}
+
 void MainWindow::ConnectHotkeys()
 {
   connect(m_hotkey_scheduler, &HotkeyScheduler::Open, this, &MainWindow::Open);