diff --git a/common/include/PS2Edefs.h b/common/include/PS2Edefs.h index 76c0fc17e5..368d234f02 100644 --- a/common/include/PS2Edefs.h +++ b/common/include/PS2Edefs.h @@ -532,7 +532,7 @@ typedef void (CALLBACK* _GSprintf)(int timeout, char *fmt, ...); typedef void (CALLBACK* _GSsetBaseMem)(void*); typedef void (CALLBACK* _GSsetGameCRC)(int, int); typedef void (CALLBACK* _GSsetFrameSkip)(int frameskip); -typedef void (CALLBACK* _GSsetFrameLimit)(int); +typedef void (CALLBACK* _GSsetFrameLimit)(bool); typedef int (CALLBACK* _GSsetupRecording)(int, void*); typedef void (CALLBACK* _GSreset)(); typedef void (CALLBACK* _GSwriteCSR)(u32 value); diff --git a/pcsx2/GS.cpp b/pcsx2/GS.cpp index 66e7398e7e..ab6aa68427 100644 --- a/pcsx2/GS.cpp +++ b/pcsx2/GS.cpp @@ -208,14 +208,7 @@ s32 gsOpen() } else { - if(curFrameLimit == PCSX2_FRAMELIMIT_NORMAL) - { - GSsetFrameLimit(0); - } - else - { - GSsetFrameLimit(1); - } + GSsetFrameLimit(curFrameLimit != PCSX2_FRAMELIMIT_NORMAL); } return !m_gsOpened; diff --git a/pcsx2/Misc.cpp b/pcsx2/Misc.cpp index 18c3c3dfba..dab17662ac 100644 --- a/pcsx2/Misc.cpp +++ b/pcsx2/Misc.cpp @@ -507,14 +507,7 @@ void CycleFrameLimit(int dir) } else { - if(newFrameLimit) - { - GSsetFrameLimit(1); - } - else - { - GSsetFrameLimit(0); - } + GSsetFrameLimit(newFrameLimit); } switch(newFrameLimit) { diff --git a/plugins/GSdx/GS.cpp b/plugins/GSdx/GS.cpp index 2f90e72415..70d4362ff7 100644 --- a/plugins/GSdx/GS.cpp +++ b/plugins/GSdx/GS.cpp @@ -301,16 +301,9 @@ EXPORT_C GSsetFrameSkip(int frameskip) s_gs->SetFrameSkip(frameskip); } -EXPORT_C GSsetFrameLimit(int limit) +EXPORT_C GSsetFrameLimit(bool limit) { - if(limit) - { - s_gs->SetFrameLimit(1); - } - else - { - s_gs->SetFrameLimit(0); - } + s_gs->SetFrameLimit(limit); } #ifdef _WINDOWS