Minor Changes

shiiion · Aug 23, 2020 · ffdb8ef · ffdb8ef
1 parent 9c04042
commit ffdb8ef
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 14 deletions.
diff --git a/Source/Core/Common/Version.cpp b/Source/Core/Common/Version.cpp
@@ -19,7 +19,7 @@ namespace Common
 #endif
 
 const std::string primehack_ver = "1.0.1";
-const std::string scm_rev_str = "PrimeHack Pre-Release [v"+primehack_ver+"]";
+const std::string scm_rev_str = "PrimeHack Release [v"+primehack_ver+"]";
 
 const std::string scm_rev_git_str = SCM_REV_STR;
 const std::string scm_desc_str = SCM_DESC_STR;

diff --git a/Source/Core/Core/PrimeHack/Mods/FpsControls.cpp b/Source/Core/Core/PrimeHack/Mods/FpsControls.cpp
@@ -203,7 +203,7 @@ void FpsControls::run_mod_mp2(Region region) {
     writef32(87.0896f, tweak_player_address + 0x180);
   }
 
-  u32 ball_state = read32(mp2_static.cplayer_ptr_address + 0x374);
+  u32 ball_state = read32(cplayer_address + 0x374);
 
   if (ball_state != 1 && ball_state != 2)
     writef32(calculate_yaw_vel(), cplayer_address + 0x178);
@@ -333,7 +333,7 @@ void FpsControls::run_mod_mp3() {
   write32(0, rtoc_gun_damp);
   writef32(pitch, cplayer_address + 0x784);
 
-  u32 ball_state = read32(mp3_static.cplayer_ptr_address + 0x358);
+  u32 ball_state = read32(cplayer_address + 0x358);
 
   if (ball_state != 1 && ball_state != 2)
     writef32(calculate_yaw_vel(), cplayer_address + 0x174);

diff --git a/Source/Core/DolphinQt/Config/Graphics/PrimeWidget.cpp b/Source/Core/DolphinQt/Config/Graphics/PrimeWidget.cpp
@@ -137,24 +137,13 @@ void PrimeWidget::ConnectWidgets()
       m_manual_arm_position->setEnabled(checked); 
       PrimeWidget::ArmPositionModeChanged(m_manual_arm_position->isChecked());
     });
-  connect(m_toggle_secondaryFX, &QCheckBox::clicked, this,
-    [=](bool checked)
-    {
-      if (Core::GetState() != Core::State::Uninitialized) {
-        if (m_toggle_secondaryFX->isChecked())
-          m_toggle_secondaryFX->setEnabled(false);
-      }
-    });
   connect(&Settings::Instance(), &Settings::EmulationStateChanged, this,
     [=](Core::State state)
     {
       if (state != Core::State::Uninitialized) {
-        if (prime::GetEnableSecondaryGunFX())
-          m_toggle_secondaryFX->setEnabled(false);
           m_toggle_culling->setEnabled(true);
       }
       else {
-        m_toggle_secondaryFX->setEnabled(true);
         if (prime::GetFov() > 96) {
           m_toggle_culling->setEnabled(false);
           m_toggle_culling->setChecked(true);