piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-21 05:09:34 -06:00
Code Issues Packages Projects Releases Wiki Activity

Warp back to 5578. Sorry for the lost changes, please re-apply. Reason: 5579 is a complete disaster.

Browse Source 
Not only does it change tons of files to switch to a new and non-working (it doesn't parse my ini files, at least) ini parser, it also reshuffles a lot of code and removes a plugin. The latter part is fine, but doing these two major switches in one revision, one of which is broken, is completely unacceptable. I said to merge tiny changes, not massive reworkings.

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5589 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
hrydgard
2010-06-03 18:05:08 +00:00
parent 3236aa9e73
commit a3c96ac42c
118 changed files with 8868 additions and 2530 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
Source/Plugins/Plugin_VideoOGL/Src/Debugger/Debugger.cpp
View File

@ -68,7 +68,6 @@ void GFXDebuggerOGL::SaveSettings() const
IniFile file;
file.Load(File::GetUserPath(F_DEBUGGERCONFIG_IDX));
Section& vidwin = file["VideoWindow"];
// TODO: make this work when we close the entire program too, currently on total close we get
// weird values, perhaps because of some conflict with the rendering window
// TODO: get the screen resolution and make limits from that
@ -76,13 +75,13 @@ void GFXDebuggerOGL::SaveSettings() const
&& GetSize().GetWidth() < 1000
&& GetSize().GetHeight() < 1000)
{
vidwin.Set("x", GetPosition().x);
vidwin.Set("y", GetPosition().y);
vidwin.Set("w", GetSize().GetWidth());
vidwin.Set("h", GetSize().GetHeight());
file.Set("VideoWindow", "x", GetPosition().x);
file.Set("VideoWindow", "y", GetPosition().y);
file.Set("VideoWindow", "w", GetSize().GetWidth());
file.Set("VideoWindow", "h", GetSize().GetHeight());
}
vidwin.Set("WriteToFile", m_Check[0]->IsChecked());
file.Set("VideoWindow", "WriteToFile", m_Check[0]->IsChecked());
g_Config.iLog = bInfoLog ? CONF_LOG : 0;
g_Config.iLog |= bPrimLog ? CONF_PRIMLOG : 0;
@ -90,7 +89,7 @@ void GFXDebuggerOGL::SaveSettings() const
g_Config.iLog |= bSaveTargets ? CONF_SAVETARGETS : 0;
g_Config.iLog |= bSaveShaders ? CONF_SAVESHADERS : 0;
vidwin.Set("ConfBits", g_Config.iLog);
file.Set("VideoWindow", "ConfBits", g_Config.iLog);
file.Save(File::GetUserPath(F_DEBUGGERCONFIG_IDX));
}
@ -100,15 +99,14 @@ void GFXDebuggerOGL::LoadSettings()
IniFile file;
file.Load(File::GetUserPath(F_DEBUGGERCONFIG_IDX));
Section& vidwin = file["VideoWindow"];
int x = 100, y = 100, w = 100, h = 100;
vidwin.Get("x", &x, GetPosition().x);
vidwin.Get("y", &y, GetPosition().y);
vidwin.Get("w", &w, GetSize().GetWidth());
vidwin.Get("h", &h, GetSize().GetHeight());
file.Get("VideoWindow", "x", &x, GetPosition().x);
file.Get("VideoWindow", "y", &y, GetPosition().y);
file.Get("VideoWindow", "w", &w, GetSize().GetWidth());
file.Get("VideoWindow", "h", &h, GetSize().GetHeight());
SetSize(x, y, w, h);
vidwin.Get("ConfBits", &g_Config.iLog, 0);
file.Get("VideoWindow", "ConfBits", &g_Config.iLog, 0);
bInfoLog = (g_Config.iLog & CONF_LOG) ? true : false;
bPrimLog = (g_Config.iLog & CONF_PRIMLOG) ? true : false;
bSaveTextures = (g_Config.iLog & CONF_SAVETEXTURES) ? true : false;