diff --git a/src/core/hle/kernel/k_thread.h b/src/core/hle/kernel/k_thread.h index e928cfebc9..62762531aa 100644 --- a/src/core/hle/kernel/k_thread.h +++ b/src/core/hle/kernel/k_thread.h @@ -539,7 +539,7 @@ public: } void ClearDpc(DpcFlag flag) { - this->GetStackParameters().dpc_flags &= ~static_cast(flag); + this->GetStackParameters().dpc_flags &= static_cast(~static_cast(flag)); } u8 GetDpc() const { diff --git a/src/core/hle/service/mii/mii_database.cpp b/src/core/hle/service/mii/mii_database.cpp index 3803e58e28..8dfcc207ab 100644 --- a/src/core/hle/service/mii/mii_database.cpp +++ b/src/core/hle/service/mii/mii_database.cpp @@ -112,7 +112,7 @@ void NintendoFigurineDatabase::CleanDatabase() { void NintendoFigurineDatabase::CorruptCrc() { crc = GenerateDatabaseCrc(); - crc = ~crc; + crc = static_cast(~crc); } Result NintendoFigurineDatabase::CheckIntegrity() { diff --git a/src/hid_core/resources/npad/npad_vibration.cpp b/src/hid_core/resources/npad/npad_vibration.cpp index f70876360f..330c21ea9d 100644 --- a/src/hid_core/resources/npad/npad_vibration.cpp +++ b/src/hid_core/resources/npad/npad_vibration.cpp @@ -39,7 +39,7 @@ Result NpadVibration::SetSettingsService( Result NpadVibration::SetVibrationMasterVolume(f32 master_volume) { std::scoped_lock lock{mutex}; - if (master_volume < 0.0f && master_volume > 1.0f) { + if (master_volume < 0.0f || master_volume > 1.0f) { return ResultVibrationStrengthOutOfRange; }