mirrors/dolphin
0
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-06-01 16:02:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

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_VideoDX9/Src/Debugger/Debugger.cpp
View file

@ -77,8 +77,7 @@ void GFXDebuggerDX9::SaveSettings() const
{
IniFile file;
file.Load(File::GetUserPath(F_DEBUGGERCONFIG_IDX));
Section& videowindow = 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
@ -86,13 +85,13 @@ void GFXDebuggerDX9::SaveSettings() const
&& GetSize().GetWidth() < 1000
&& GetSize().GetHeight() < 1000)
{
videowindow.Set("x", GetPosition().x);
videowindow.Set("y", GetPosition().y);
videowindow.Set("w", GetSize().GetWidth());
videowindow.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());
}
videowindow.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;
@ -100,7 +99,7 @@ void GFXDebuggerDX9::SaveSettings() const
//g_Config.iLog |= bSaveTargets ? CONF_SAVETARGETS : 0;
//g_Config.iLog |= bSaveShaders ? CONF_SAVESHADERS : 0;
//videowindow.Set("ConfBits", g_Config.iLog);
//file.Set("VideoWindow", "ConfBits", g_Config.iLog);
file.Save(File::GetUserPath(F_DEBUGGERCONFIG_IDX));
}
@ -110,12 +109,11 @@ void GFXDebuggerDX9::LoadSettings()
IniFile file;
file.Load(File::GetUserPath(F_DEBUGGERCONFIG_IDX));
Section& videowindow = file["VideoWindow"];
int x = 100, y = 100, w = 100, h = 100;
videowindow.Get("x", &x, GetPosition().x);
videowindow.Get("y", &y, GetPosition().y);
videowindow.Get("w", &w, GetSize().GetWidth());
videowindow.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);
//file.Get("VideoWindow", "ConfBits", &g_Config.iLog, 0);