From 41af9a81a57ebc3d39a7e5e744cdf67314a0c22c Mon Sep 17 00:00:00 2001 From: Lioncash Date: Sat, 2 Aug 2014 15:03:34 -0400 Subject: [PATCH] Core: Remove unused parameters in Movie --- Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp | 4 ++-- Source/Core/Core/Movie.cpp | 4 ++-- Source/Core/Core/Movie.h | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp b/Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp index e6c3e00a3b..1bcf7444bf 100644 --- a/Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp +++ b/Source/Core/Core/HW/WiimoteEmu/WiimoteEmu.cpp @@ -622,7 +622,7 @@ void Wiimote::Update() const ReportFeatures& rptf = reporting_mode_features[m_reporting_mode - WM_REPORT_CORE]; s8 rptf_size = rptf.size; - if (Movie::IsPlayingInput() && Movie::PlayWiimote(m_index, data, rptf, m_reg_ir.mode)) + if (Movie::IsPlayingInput() && Movie::PlayWiimote(m_index, data, rptf)) { if (rptf.core) m_status.buttons = *(wm_core*)(data + rptf.core); @@ -734,7 +734,7 @@ void Wiimote::Update() } if (!Movie::IsPlayingInput()) { - Movie::CheckWiimoteStatus(m_index, data, rptf, m_reg_ir.mode); + Movie::CheckWiimoteStatus(m_index, data, rptf); } // don't send a data report if auto reporting is off diff --git a/Source/Core/Core/Movie.cpp b/Source/Core/Core/Movie.cpp index a949627e93..7f7c208c7d 100644 --- a/Source/Core/Core/Movie.cpp +++ b/Source/Core/Core/Movie.cpp @@ -656,7 +656,7 @@ void RecordInput(GCPadStatus* PadStatus, int controllerID) g_totalBytes = g_currentByte; } -void CheckWiimoteStatus(int wiimote, u8 *data, const WiimoteEmu::ReportFeatures& rptf, int irMode) +void CheckWiimoteStatus(int wiimote, u8 *data, const WiimoteEmu::ReportFeatures& rptf) { u8* const coreData = rptf.core?(data+rptf.core):nullptr; u8* const accelData = rptf.accel?(data+rptf.accel):nullptr; @@ -1034,7 +1034,7 @@ void PlayController(GCPadStatus* PadStatus, int controllerID) CheckInputEnd(); } -bool PlayWiimote(int wiimote, u8 *data, const WiimoteEmu::ReportFeatures& rptf, int irMode) +bool PlayWiimote(int wiimote, u8 *data, const WiimoteEmu::ReportFeatures& rptf) { if (!IsPlayingInput() || !IsUsingWiimote(wiimote) || tmpInput == nullptr) return false; diff --git a/Source/Core/Core/Movie.h b/Source/Core/Core/Movie.h index 4df8e00ea8..c83438cc74 100644 --- a/Source/Core/Core/Movie.h +++ b/Source/Core/Core/Movie.h @@ -161,7 +161,7 @@ bool PlayInput(const std::string& filename); void LoadInput(const std::string& filename); void ReadHeader(); void PlayController(GCPadStatus* PadStatus, int controllerID); -bool PlayWiimote(int wiimote, u8* data, const struct WiimoteEmu::ReportFeatures& rptf, int irMode); +bool PlayWiimote(int wiimote, u8* data, const struct WiimoteEmu::ReportFeatures& rptf); void EndPlayInput(bool cont); void SaveRecording(const std::string& filename); void DoState(PointerWrap &p); @@ -169,7 +169,7 @@ void CheckMD5(); void GetMD5(); void Shutdown(); void CheckPadStatus(GCPadStatus* PadStatus, int controllerID); -void CheckWiimoteStatus(int wiimote, u8* data, const struct WiimoteEmu::ReportFeatures& rptf, int irMode); +void CheckWiimoteStatus(int wiimote, u8* data, const struct WiimoteEmu::ReportFeatures& rptf); std::string GetInputDisplay();