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

applied patches by jlaukkanen 

Import Pro Action Replay Snapshots
Compilation error when no_xaudio2
Focus Lost in cheat dialogue MFC
This commit is contained in:
squall-leonhart 2010-10-24 05:14:52 +00:00
parent 4a74120570
commit 3aa925ea22
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/win32/VBA.cpp
View File

@ -1015,7 +1015,12 @@ void systemMessage(int number, const char *defaultMsg, ...)
va_start(valist, defaultMsg); va_start(valist, defaultMsg);
buffer.FormatV(msg, valist); buffer.FormatV(msg, valist);
AfxGetApp()->m_pMainWnd->MessageBox(buffer, winResLoadString(IDS_ERROR), MB_OK|MB_ICONERROR); CWnd *win = AfxGetApp()->GetMainWnd();
if (win)
win = win->GetLastActivePopup(); // possible modal dialog
if (!win)
win = AfxGetApp()->m_pMainWnd;
win->MessageBox(buffer, winResLoadString(IDS_ERROR), MB_OK|MB_ICONERROR);
va_end(valist); va_end(valist);
} }
@ -1377,8 +1382,11 @@ void VBA::loadSettings()
renderMethod = OPENGL; renderMethod = OPENGL;
} }
#endif #endif
#ifndef NO_XAUDIO2
audioAPI = (AUDIO_API)regQueryDwordValue( "audioAPI", XAUDIO2 ); audioAPI = (AUDIO_API)regQueryDwordValue( "audioAPI", XAUDIO2 );
#else
audioAPI = (AUDIO_API)regQueryDwordValue( "audioAPI", DIRECTSOUND );
#endif
if( ( audioAPI != DIRECTSOUND ) if( ( audioAPI != DIRECTSOUND )
#ifndef NO_OAL #ifndef NO_OAL
&& ( audioAPI != OPENAL_SOUND ) && ( audioAPI != OPENAL_SOUND )

4
src/win32/VBA.rc
View File

@ -1687,7 +1687,7 @@ BEGIN
BEGIN BEGIN
MENUITEM "&Battery file...", ID_FILE_IMPORT_BATTERYFILE MENUITEM "&Battery file...", ID_FILE_IMPORT_BATTERYFILE
MENUITEM "Gameshark &code file...", ID_FILE_IMPORT_GAMESHARKCODEFILE MENUITEM "Gameshark &code file...", ID_FILE_IMPORT_GAMESHARKCODEFILE
MENUITEM "&Gameshark Snapshot...", ID_FILE_IMPORT_GAMESHARKSNAPSHOT MENUITEM "&Gameshark/Pro Action Replay Snapshot...", ID_FILE_IMPORT_GAMESHARKSNAPSHOT
END END
POPUP "Export" POPUP "Export"
BEGIN BEGIN
@ -2225,7 +2225,7 @@ BEGIN
IDS_LOADED_CHEATS "Loaded cheats" IDS_LOADED_CHEATS "Loaded cheats"
IDS_ERROR_DISP_COLOR "Unsupported display setting for color depth: %d bits. \nWindows desktop must be in either 16-bit, 24-bit or 32-bit mode for this program to work in window mode." IDS_ERROR_DISP_COLOR "Unsupported display setting for color depth: %d bits. \nWindows desktop must be in either 16-bit, 24-bit or 32-bit mode for this program to work in window mode."
IDS_ADD_GSA_CODE "Add GameSharkAdvance code" IDS_ADD_GSA_CODE "Add GameSharkAdvance code"
IDS_FILTER_SPS "Gameshark Snapshot_*.SPS__" IDS_FILTER_SPS "GS & PAC Snapshots (*.SPS;*.XPS)_*.SPS;*.XPS__"
IDS_SELECT_SNAPSHOT_FILE "Select snapshot file" IDS_SELECT_SNAPSHOT_FILE "Select snapshot file"
IDS_FILTER_SAV "Battery file_*.SAV_Flash save_*.DAT__" IDS_FILTER_SAV "Battery file_*.SAV_Flash save_*.DAT__"
IDS_SELECT_BATTERY_FILE "Select battery file" IDS_SELECT_BATTERY_FILE "Select battery file"