X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fjaguar.cpp;h=2cf99dbb09f5e23146858d75d5781cfc4a6c5894;hb=2136446c0d38d00a651d3eb665ee564b18f94b28;hp=c4cdc94f6d297fe6207fb8f8c29a78ca92f2ef7e;hpb=f76326c730ec5ed013faffa37d655a376fbbc5bb;p=virtualjaguar

diff --git a/src/jaguar.cpp b/src/jaguar.cpp
index c4cdc94..2cf99db 100644
--- a/src/jaguar.cpp
+++ b/src/jaguar.cpp
@@ -1605,8 +1605,8 @@ void JaguarReset(void)
 //into it somewhere...
 //Also, have to change this here and in JaguarReadXX() currently
 	// Only use the system BIOS if it's available...! (it's always available now!)
-	if (vjs.useJaguarBIOS)
-		memcpy(jaguarMainRAM, &jagMemSpace[0xE00000], 8);
+	if (vjs.useJaguarBIOS && !vjs.hardwareTypeAlpine)
+		memcpy(jaguarMainRAM, jagMemSpace + 0xE00000, 8);
 	else
 		SET32(jaguarMainRAM, 4, jaguarRunAddress);
 
@@ -1817,7 +1817,8 @@ if (effect_start)
 		BUTCHExec(RISCCyclesPerScanline);
 //if (start_logging)
 //	WriteLog("About to execute GPU (%u)...\n", i);
-		GPUExec(RISCCyclesPerScanline);
+		if (vjs.GPUEnabled)
+			GPUExec(RISCCyclesPerScanline);
 
 		if (vjs.DSPEnabled)
 		{
@@ -1968,7 +1969,9 @@ void JaguarExecuteNew(void)
 //WriteLog("JEN: Time to next event (%u) is %f usec (%u RISC cycles)...\n", nextEvent, timeToNextEvent, USEC_TO_RISC_CYCLES(timeToNextEvent));
 
 		m68k_execute(USEC_TO_M68K_CYCLES(timeToNextEvent));
-		GPUExec(USEC_TO_RISC_CYCLES(timeToNextEvent));
+
+		if (vjs.GPUEnabled)
+			GPUExec(USEC_TO_RISC_CYCLES(timeToNextEvent));
 
 		if (vjs.DSPEnabled)
 		{