diff --git a/Source/Project64-core/N64System/Interpreter/InterpreterOps.cpp b/Source/Project64-core/N64System/Interpreter/InterpreterOps.cpp index 2c49e28b8..80e77434f 100644 --- a/Source/Project64-core/N64System/Interpreter/InterpreterOps.cpp +++ b/Source/Project64-core/N64System/Interpreter/InterpreterOps.cpp @@ -2328,7 +2328,7 @@ void R4300iOp::COP1_S_CMP() } int32_t condition = ((m_Opcode.funct & 4) && less) | ((m_Opcode.funct & 2) && equal) | - ((m_Opcode.funct & 1) && unorded); + ((m_Opcode.funct & 1) && unorded); if (condition != 0) { @@ -2654,7 +2654,7 @@ void R4300iOp::COP1_D_CMP() } int32_t condition = ((m_Opcode.funct & 4) && less) | ((m_Opcode.funct & 2) && equal) | - ((m_Opcode.funct & 1) && unorded); + ((m_Opcode.funct & 1) && unorded); if (condition != 0) { diff --git a/Source/Project64-core/Settings.cpp b/Source/Project64-core/Settings.cpp index 1f5578145..f870e366f 100644 --- a/Source/Project64-core/Settings.cpp +++ b/Source/Project64-core/Settings.cpp @@ -5,11 +5,11 @@ #include "Settings/SettingType/SettingsType-ApplicationPath.h" #include "Settings/SettingType/SettingsType-GameSetting.h" #include "Settings/SettingType/SettingsType-GameSettingIndex.h" +#include "Settings/SettingType/SettingsType-RDB.h" #include "Settings/SettingType/SettingsType-RDBCpuType.h" #include "Settings/SettingType/SettingsType-RDBOnOff.h" #include "Settings/SettingType/SettingsType-RDBRamSize.h" #include "Settings/SettingType/SettingsType-RDBSaveChip.h" -#include "Settings/SettingType/SettingsType-RDB.h" #include "Settings/SettingType/SettingsType-RelativePath.h" #include "Settings/SettingType/SettingsType-RomDatabase.h" #include "Settings/SettingType/SettingsType-RomDatabaseIndex.h"