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

Revert the bit of r326 that I believe was actually causing the Linux issues. (Should negate the need for 354 & 355.) 

git-svn-id: http://pcsx2-playground.googlecode.com/svn/trunk@356 a6443dda-0b58-4228-96e9-037be469359c
This commit is contained in:
arcum42 2008-11-21 10:57:05 +00:00 committed by Gregory Hainaut
parent 13d179b70a
commit ed4492fd63
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
pcsx2/Linux/Pref.cpp
View File

@ -97,6 +97,10 @@ int LoadConfig() {
GetValue("USB", Config.USB);
GetValue("FW", Config.FW);
GetValuel("Patch", Config.Patch);
#ifdef PCSX2_DEVBUILD
GetValuel("varLog", varLog);
#endif
GetValuel("Options", Config.Options);
GetValuel("Hacks", Config.Hacks);
@ -105,22 +109,18 @@ int LoadConfig() {
GetValuel("Fixes", Config.GameFixes);
GetValuel("CustomFps", Config.CustomFps);
GetValuel("CustomFrameskip", Config.CustomFrameSkip);
GetValuel("CustomConsecutiveFrames", Config.CustomConsecutiveFrames);
GetValuel("CustomConsecutiveSkip", Config.CustomConsecutiveSkip);
// Note - Must get these values last.
GetValuel("sseMXCSR", LinuxsseMXCSR);
GetValuel("sseVUMXCSR", LinuxsseVUMXCSR);
Config.sseMXCSR = LinuxsseMXCSR;
Config.sseVUMXCSR = LinuxsseVUMXCSR;
GetValuel("Patch", Config.Patch);
GetValuel("CustomFps", Config.CustomFps);
GetValuel("CustomFrameskip", Config.CustomFrameSkip);
GetValuel("CustomConsecutiveFrames", Config.CustomConsecutiveFrames);
GetValuel("CustomConsecutiveSkip", Config.CustomConsecutiveSkip);
#ifdef PCSX2_DEVBUILD
GetValuel("varLog", varLog);
#endif
free(data);
@ -169,9 +169,6 @@ void SaveConfig() {
SetValuel("Hacks", Config.Hacks);
SetValuel("Fixes", Config.GameFixes);
SetValuel("sseMXCSR", Config.sseMXCSR);
SetValuel("sseVUMXCSR", Config.sseVUMXCSR);
SetValuel("Patch", Config.Patch);
SetValuel("CustomFps", Config.CustomFps);
@ -179,6 +176,9 @@ void SaveConfig() {
SetValuel("CustomConsecutiveFrames", Config.CustomConsecutiveFrames);
SetValuel("CustomConsecutiveSkip", Config.CustomConsecutiveSkip);
SetValuel("sseMXCSR", Config.sseMXCSR);
SetValuel("sseVUMXCSR", Config.sseVUMXCSR);
#ifdef PCSX2_DEVBUILD
SetValuel("varLog", varLog);
#endif

4
pcsx2/Misc.h
View File

@ -123,8 +123,8 @@ typedef struct {
int Hacks;
int GameFixes;
int CustomFrameSkip;
u8 CustomConsecutiveFrames;
u8 CustomConsecutiveSkip;
int CustomConsecutiveFrames;
int CustomConsecutiveSkip;
u32 sseMXCSR;
u32 sseVUMXCSR;
} PcsxConfig;