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

small fixes 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1623 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
nakeee 2008-12-22 10:47:37 +00:00
parent a7c4697d22
commit ac825114c8
4 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_fs.cpp
View File

@ -48,7 +48,8 @@ bool CWII_IPC_HLE_Device_fs::Open(u32 _CommandAddress, u32 _Mode)
{ {
// clear tmp folder // clear tmp folder
{ {
std::string WiiTempFolder = File::GetUserDirectory() + FULL_WII_USER_DIR + std::string("tmp"); // std::string WiiTempFolder = File::GetUserDirectory() + FULL_WII_USER_DIR + std::string("tmp");
std::string WiiTempFolder = FULL_WII_USER_DIR + std::string("tmp");
File::DeleteDirRecursively(WiiTempFolder.c_str()); File::DeleteDirRecursively(WiiTempFolder.c_str());
File::CreateDir(WiiTempFolder.c_str()); File::CreateDir(WiiTempFolder.c_str());
} }

3
Source/Plugins/Plugin_VideoOGL/Src/SDLWindow.cpp
View File

@ -107,8 +107,7 @@ SDLWindow::SDLWindow(int _iwidth, int _iheight) {
//init sdl video //init sdl video
if (SDL_Init(SDL_INIT_VIDEO) < 0) { if (SDL_Init(SDL_INIT_VIDEO) < 0) {
PanicAlert("Failed to init SDL"); PanicAlert("Failed to init SDL: %s", SDL_GetError());
//TODO : Display an error message
SDL_Quit(); SDL_Quit();
// return NULL; // return NULL;
} }

4
Source/Plugins/Plugin_VideoOGL/Src/X11Window.cpp
View File

@ -57,7 +57,9 @@ X11Window::X11Window(int _iwidth, int _iheight) {
GLX_GREEN_SIZE, 8, GLX_GREEN_SIZE, 8,
GLX_BLUE_SIZE, 8, GLX_BLUE_SIZE, 8,
GLX_DEPTH_SIZE, 24, GLX_DEPTH_SIZE, 24,
GLX_SAMPLE_BUFFERS_ARB, g_Config.iMultisampleMode, GLX_SAMPLES_ARB, 1, None }; GLX_SAMPLE_BUFFERS_ARB,
g_Config.iMultisampleMode,
GLX_SAMPLES_ARB, 1, None };
dpy = XOpenDisplay(0); dpy = XOpenDisplay(0);
g_VideoInitialize.pWindowHandle = (HWND)dpy; g_VideoInitialize.pWindowHandle = (HWND)dpy;
screen = DefaultScreen(dpy); screen = DefaultScreen(dpy);

4
Source/Plugins/Plugin_nJoy_Testing/Src/nJoy.cpp
View File

@ -42,6 +42,10 @@ CONTROLLER_STATE joystate[4];
CONTROLLER_MAPPING joysticks[4]; CONTROLLER_MAPPING joysticks[4];
bool emulator_running = FALSE; bool emulator_running = FALSE;
// TODO: fix this dirty hack to stop missing symbols
void __Log(int log, const char *format, ...) {}
void __Logv(int log, int v, const char *format, ...) {}
// Handle to window // Handle to window
HWND m_hWnd; HWND m_hWnd;