The-Homebrew-Cloud/dolphin
2
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-02-03 11:32:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Linux: Fix so there isn't a trace/breakpoint trap when you get a panicalert and got the mem card reader to work

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@236 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Sonicadvance1 2008-08-17 18:29:20 +00:00
parent 3ccc46a67e
commit e3f3a7a41d
4 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/Common/Src/Common.cpp
View File

@ -52,7 +52,7 @@ void PanicAlert(const char* format, ...)
//#error Do a messagebox! //#error Do a messagebox!
vprintf(format, args); vprintf(format, args);
printf("\n"); printf("\n");
asm ("int $3") ; // asm ("int $3") ;
#endif #endif
} }

24
Source/Core/DolphinWX/src/MemcardManager.cpp
View File

@ -101,10 +101,10 @@ void CMemcardManager::OnPathChange(wxFileDirPickerEvent& event)
switch(event.GetId()) switch(event.GetId())
{ {
case ID_MEMCARD1PATH: case ID_MEMCARD1PATH:
LoadMemcard1(event.GetPath()); LoadMemcard1(event.GetPath().mb_str());
break; break;
case ID_MEMCARD2PATH: case ID_MEMCARD2PATH:
LoadMemcard2(event.GetPath()); LoadMemcard2(event.GetPath().mb_str());
break; break;
default: default:
break; break;
@ -175,10 +175,10 @@ void CMemcardManager::LoadMemcard1(const char *card1)
if(!memoryCard1->GetComment2(i,comment2)) comment2[0]=0; if(!memoryCard1->GetComment2(i,comment2)) comment2[0]=0;
// Add to list control // Add to list control
int index = m_Memcard1List->InsertItem(i, "row"); int index = m_Memcard1List->InsertItem(i, wxString::FromAscii("row"));
m_Memcard1List->SetItem(index, 0, fileName); m_Memcard1List->SetItem(index, 0, wxString::FromAscii(fileName));
m_Memcard1List->SetItem(index, 1, comment1); m_Memcard1List->SetItem(index, 1, wxString::FromAscii(comment1));
m_Memcard1List->SetItem(index, 2, comment2); m_Memcard1List->SetItem(index, 2, wxString::FromAscii(comment2));
} }
m_Memcard1List->Show(); m_Memcard1List->Show();
} }
@ -188,7 +188,7 @@ void CMemcardManager::LoadMemcard1(const char *card1)
char tmp[128]; char tmp[128];
sprintf(tmp, "Unable to load %s", card1); sprintf(tmp, "Unable to load %s", card1);
long item = m_Memcard1List->InsertItem(0, tmp); long item = m_Memcard1List->InsertItem(0, wxString::FromAscii(tmp));
m_Memcard1List->SetItemFont(item, *wxITALIC_FONT); m_Memcard1List->SetItemFont(item, *wxITALIC_FONT);
m_Memcard1List->SetColumnWidth(item, wxLIST_AUTOSIZE); m_Memcard1List->SetColumnWidth(item, wxLIST_AUTOSIZE);
@ -227,10 +227,10 @@ void CMemcardManager::LoadMemcard2(const char *card2)
if(!memoryCard2->GetComment1(i,comment1)) comment1[0]=0; if(!memoryCard2->GetComment1(i,comment1)) comment1[0]=0;
if(!memoryCard2->GetComment2(i,comment2)) comment2[0]=0; if(!memoryCard2->GetComment2(i,comment2)) comment2[0]=0;
int index = m_Memcard2List->InsertItem(i, "row"); int index = m_Memcard2List->InsertItem(i, wxString::FromAscii("row"));
m_Memcard2List->SetItem(index, 0, fileName); m_Memcard2List->SetItem(index, 0, wxString::FromAscii(fileName));
m_Memcard2List->SetItem(index, 1, comment1); m_Memcard2List->SetItem(index, 1, wxString::FromAscii(comment1));
m_Memcard2List->SetItem(index, 2, comment2); m_Memcard2List->SetItem(index, 2, wxString::FromAscii(comment2));
} }
m_Memcard2List->Show(); m_Memcard2List->Show();
} }
@ -240,7 +240,7 @@ void CMemcardManager::LoadMemcard2(const char *card2)
char tmp[128]; char tmp[128];
sprintf(tmp, "Unable to load %s", card2); sprintf(tmp, "Unable to load %s", card2);
long item = m_Memcard2List->InsertItem(0, tmp); long item = m_Memcard2List->InsertItem(0, wxString::FromAscii(tmp));
m_Memcard2List->SetItemFont(item, *wxITALIC_FONT); m_Memcard2List->SetItemFont(item, *wxITALIC_FONT);
m_Memcard2List->SetColumnWidth(item, wxLIST_AUTOSIZE); m_Memcard2List->SetColumnWidth(item, wxLIST_AUTOSIZE);

5
Source/Core/DolphinWX/src/MemoryCards/GCMemcard.cpp
View File

@ -1,8 +1,11 @@
// gcmc.cpp: define el punto de entrada de la aplicación de consola. // gcmc.cpp: define el punto de entrada de la aplicación de consola.
// //
#ifdef _WIN32
#include "stdafx.h" #include "stdafx.h"
#endif
#include <assert.h> #include <assert.h>
#include <memory.h>
#include <stdio.h>
#include "GCMemcard.h" #include "GCMemcard.h"

2
Source/Core/DolphinWX/src/SConscript
View File

@ -9,6 +9,8 @@ files = ["BootManager.cpp",
"Globals.cpp", "Globals.cpp",
"ISOFile.cpp", "ISOFile.cpp",
"Main.cpp", "Main.cpp",
"MemcardManager.cpp",
"MemoryCards/GCMemcard.cpp",
# "MainNoGUI.cpp", # "MainNoGUI.cpp",
"PluginManager.cpp", "PluginManager.cpp",
"PluginOptions.cpp", "PluginOptions.cpp",