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

Fixed the GB and GBC BIOS options. 

Moved the Skip BIOS option to the Emulation menu.

git-svn-id: https://svn.code.sf.net/p/vbam/code/trunk@1396 a31d4220-a93d-0410-bf67-fe4944624d44
This commit is contained in:
skidau 2015-05-06 12:04:21 +00:00
parent 5439ebc913
commit f4909e2676
4 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/wx/cmdevents.cpp
View File

@ -2338,15 +2338,21 @@ EVT_HANDLER(SyncGameAudio, "Synchronize game to audio")
update_opts();
}
EVT_HANDLER(BootRomEn, "Use the specified BIOS file")
EVT_HANDLER(BootRomEn, "Use the specified BIOS file for GBA")
{
GetMenuOptionInt("BootRomEn", useBiosFileGBA, 1);
update_opts();
}
EVT_HANDLER(CBootRomEn, "Use the specified BIOS file for GBC")
EVT_HANDLER(BootRomGB, "Use the specified BIOS file for GB")
{
GetMenuOptionInt("CBootRomEn", useBiosFileGBC, 1);
GetMenuOptionInt("BootRomGB", useBiosFileGB, 1);
update_opts();
}
EVT_HANDLER(BootRomGBC, "Use the specified BIOS file for GBC")
{
GetMenuOptionInt("BootRomGBC", useBiosFileGBC, 1);
update_opts();
}

4
src/wx/opts.cpp
View File

@ -227,9 +227,9 @@ opt_desc opts[] = {
INTOPT ("preferences/skipSaveGameBattery", "", wxTRANSLATE("Do not overwrite native (battery) save when loading state"), skipSaveGameBattery, 0, 1),
INTOPT ("preferences/synchronize", "SyncGameAudio", wxTRANSLATE("Synchronize game to audio"), synchronize, 0, 1),
INTOPT ("preferences/throttle", "", wxTRANSLATE("Throttle game speed, even when accelerated (0-1000%, 0 = disabled)"), throttle, 0, 1000),
INTOPT ("preferences/useBiosFileGB", "", wxTRANSLATE("Use the specified BIOS file for GB"), useBiosFileGB, 0, 1),
INTOPT ("preferences/useBiosGB", "BootRomGB", wxTRANSLATE("Use the specified BIOS file for GB"), useBiosFileGB, 0, 1),
INTOPT ("preferences/useBiosGBA", "BootRomEn", wxTRANSLATE("Use the specified BIOS file"), useBiosFileGBA, 0, 1),
INTOPT ("preferences/useBiosGBC", "CBootRomEn", wxTRANSLATE("Use the specified BIOS file for GBC"), useBiosFileGBC, 0, 1),
INTOPT ("preferences/useBiosGBC", "BootRomGBC", wxTRANSLATE("Use the specified BIOS file for GBC"), useBiosFileGBC, 0, 1),
INTOPT ("preferences/vsync", "VSync", wxTRANSLATE("Wait for vertical sync"), vsync, 0, 1),
/// Sound

4
src/wx/panel.cpp
View File

@ -147,10 +147,10 @@ void GameArea::LoadGame(const wxString &name)
wxCharBuffer fnb;
if(gbCgbMode) {
use_bios = useBiosFileGBC;
fnb = biosFileNameGBC;
fnb = gopts.gbc_bios.mb_fn_str();
} else {
use_bios = useBiosFileGB;
fnb = biosFileNameGB;
fnb = gopts.gb_bios.mb_fn_str();
}
fn = fnb.data();
gbCPUInit(fn, use_bios);

14
src/wx/xrc/MainMenu.xrc
View File

@ -244,6 +244,10 @@
<checkable>1</checkable>
</object>
<object class="separator"/>
<object class="wxMenuItem" name="SkipIntro">
<label>_Skip BIOS</label>
<checkable>1</checkable>
</object>
<object class="wxMenuItem" name="ApplyPatches">
<label>_Auto IPS/UPS/IPF patch</label>
<checkable>1</checkable>
@ -406,10 +410,6 @@
<label>_Use BIOS file</label>
<checkable>1</checkable>
</object>
<object class="wxMenuItem" name="SkipIntro">
<label>_Skip BIOS</label>
<checkable>1</checkable>
</object>
</object>
<object class="wxMenu">
<label>_Game Boy</label>
@ -428,7 +428,11 @@
<label>_Save printouts as screen captures</label>
<checkable>1</checkable>
</object>
<object class="wxMenuItem" name="CBootRomEn">
<object class="wxMenuItem" name="BootRomGB">
<label>_Use GB BIOS file</label>
<checkable>1</checkable>
</object>
<object class="wxMenuItem" name="BootRomGBC">
<label>_Use GBC BIOS file</label>
<checkable>1</checkable>
</object>