mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-07-23 14:19:46 -06:00
Warp back to 5578. Sorry for the lost changes, please re-apply. Reason: 5579 is a complete disaster.
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:
@ -129,23 +129,21 @@ void CMemoryWindow::Save(IniFile& _IniFile) const
|
||||
// Prevent these bad values that can happen after a crash or hanging
|
||||
if(GetPosition().x != -32000 && GetPosition().y != -32000)
|
||||
{
|
||||
Section& memwin = _IniFile["MemoryWindow"];
|
||||
memwin.Set("x", GetPosition().x);
|
||||
memwin.Set("y", GetPosition().y);
|
||||
memwin.Set("w", GetSize().GetWidth());
|
||||
memwin.Set("h", GetSize().GetHeight());
|
||||
_IniFile.Set("MemoryWindow", "x", GetPosition().x);
|
||||
_IniFile.Set("MemoryWindow", "y", GetPosition().y);
|
||||
_IniFile.Set("MemoryWindow", "w", GetSize().GetWidth());
|
||||
_IniFile.Set("MemoryWindow", "h", GetSize().GetHeight());
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
void CMemoryWindow::Load(IniFile& _IniFile)
|
||||
{
|
||||
int x, y, w, h;
|
||||
Section& memwin = _IniFile["MemoryWindow"];
|
||||
memwin.Get("x", &x, GetPosition().x);
|
||||
memwin.Get("y", &y, GetPosition().y);
|
||||
memwin.Get("w", &w, GetSize().GetWidth());
|
||||
memwin.Get("h", &h, GetSize().GetHeight());
|
||||
int x,y,w,h;
|
||||
_IniFile.Get("MemoryWindow", "x", &x, GetPosition().x);
|
||||
_IniFile.Get("MemoryWindow", "y", &y, GetPosition().y);
|
||||
_IniFile.Get("MemoryWindow", "w", &w, GetSize().GetWidth());
|
||||
_IniFile.Get("MemoryWindow", "h", &h, GetSize().GetHeight());
|
||||
SetSize(x, y, w, h);
|
||||
}
|
||||
|
||||
@ -324,12 +322,12 @@ void CMemoryWindow::onSearch(wxCommandEvent& event) {
|
||||
//memview->cu
|
||||
wxString rawData=valbox->GetValue();
|
||||
std::vector<u8> Dest;//May need a better name
|
||||
size_t size=0;
|
||||
u32 size=0;
|
||||
int pad=rawData.size()%2;//If it's uneven
|
||||
unsigned long i=0;
|
||||
long count=0;
|
||||
char copy[3]={0};
|
||||
size_t newsize=0;
|
||||
long newsize=0;
|
||||
unsigned char *tmp2=0;
|
||||
char* tmpstr=0;
|
||||
switch (chkHex->GetValue()){
|
||||
|
Reference in New Issue
Block a user