aboutsummaryrefslogtreecommitdiff
path: root/frontend/main.c
diff options
context:
space:
mode:
authornotaz2011-01-12 13:40:20 +0200
committernotaz2011-01-16 00:03:33 +0200
commite6eb2066c0d198d793067caed47b670b691eb865 (patch)
treead7297568cf4c6be1c2682f5eb05a1d587f41e0c /frontend/main.c
parent796a91ef98cca649bc62710491e2681b2ba8be1c (diff)
downloadpcsx_rearmed-e6eb2066c0d198d793067caed47b670b691eb865.tar.gz
pcsx_rearmed-e6eb2066c0d198d793067caed47b670b691eb865.tar.bz2
pcsx_rearmed-e6eb2066c0d198d793067caed47b670b691eb865.zip
frontend: bios support
Diffstat (limited to 'frontend/main.c')
-rw-r--r--frontend/main.c14
1 files changed, 13 insertions, 1 deletions
diff --git a/frontend/main.c b/frontend/main.c
index 7b45983..52fa349 100644
--- a/frontend/main.c
+++ b/frontend/main.c
@@ -169,7 +169,7 @@ int main(int argc, char *argv[])
MAKE_PATH(Config.Mcd1, MEMCARD_DIR, "card1.mcd");
MAKE_PATH(Config.Mcd2, MEMCARD_DIR, "card2.mcd");
strcpy(Config.Bios, "HLE");
- strcpy(Config.BiosDir, "./");
+ strcpy(Config.BiosDir, "bios");
strcpy(Config.PluginsDir, "plugins");
strcpy(Config.Gpu, "builtin_gpu");
@@ -274,11 +274,23 @@ void StartGui() {
printf("StartGui\n");
}
+static void dummy_lace()
+{
+}
+
void SysReset() {
+ // rearmed hack: EmuReset() runs some code when real BIOS is used,
+ // but we usually do reset from menu while GPU is not open yet,
+ // so we need to prevent updateLace() call..
+ void *real_lace = GPU_updateLace;
+ GPU_updateLace = dummy_lace;
+
EmuReset();
// hmh core forgets this
CDR_stop();
+
+ GPU_updateLace = real_lace;
}
void SysClose() {