ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Matsuri sent me a cleanup of his previous patch. No changes in functionality. 

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1528 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
gigaherz 2009-07-16 03:34:30 +00:00
parent c2e49ba245
commit 63a01f76ac
4 changed files with 5 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/include/PS2Edefs.h
View File

@ -532,7 +532,7 @@ typedef void (CALLBACK* _GSprintf)(int timeout, char *fmt, ...);
typedef void (CALLBACK* _GSsetBaseMem)(void*); typedef void (CALLBACK* _GSsetBaseMem)(void*);
typedef void (CALLBACK* _GSsetGameCRC)(int, int); typedef void (CALLBACK* _GSsetGameCRC)(int, int);
typedef void (CALLBACK* _GSsetFrameSkip)(int frameskip); typedef void (CALLBACK* _GSsetFrameSkip)(int frameskip);
typedef void (CALLBACK* _GSsetFrameLimit)(int); typedef void (CALLBACK* _GSsetFrameLimit)(bool);
typedef int (CALLBACK* _GSsetupRecording)(int, void*); typedef int (CALLBACK* _GSsetupRecording)(int, void*);
typedef void (CALLBACK* _GSreset)(); typedef void (CALLBACK* _GSreset)();
typedef void (CALLBACK* _GSwriteCSR)(u32 value); typedef void (CALLBACK* _GSwriteCSR)(u32 value);

9
pcsx2/GS.cpp
View File

@ -208,14 +208,7 @@ s32 gsOpen()
} }
else else
{ {
if(curFrameLimit == PCSX2_FRAMELIMIT_NORMAL) GSsetFrameLimit(curFrameLimit != PCSX2_FRAMELIMIT_NORMAL);
{
GSsetFrameLimit(0);
}
else
{
GSsetFrameLimit(1);
}
} }
return !m_gsOpened; return !m_gsOpened;

9
pcsx2/Misc.cpp
View File

@ -507,14 +507,7 @@ void CycleFrameLimit(int dir)
} }
else else
{ {
if(newFrameLimit) GSsetFrameLimit(newFrameLimit);
{
GSsetFrameLimit(1);
}
else
{
GSsetFrameLimit(0);
}
} }
switch(newFrameLimit) { switch(newFrameLimit) {

11
plugins/GSdx/GS.cpp
View File

@ -301,16 +301,9 @@ EXPORT_C GSsetFrameSkip(int frameskip)
s_gs->SetFrameSkip(frameskip); s_gs->SetFrameSkip(frameskip);
} }
EXPORT_C GSsetFrameLimit(int limit) EXPORT_C GSsetFrameLimit(bool limit)
{ {
if(limit) s_gs->SetFrameLimit(limit);
{
s_gs->SetFrameLimit(1);
}
else
{
s_gs->SetFrameLimit(0);
}
} }
#ifdef _WINDOWS #ifdef _WINDOWS