//int lineCycles=(488-SekCyclesLeft)&0x1ff;\r
d&=1; d^=1;\r
if(!d) {\r
- // hack: detect a nasty situation where Z80 was enabled and disabled in the same 68k timeslice (Golden Axe III)\r
- // if((PicoOpt&4) && Pico.m.z80Run==1) z80_run(20); // FIXME: movies\r
- z80stopCycle = SekCyclesDone();\r
- //z80ExtraCycles += (lineCycles>>1)-(lineCycles>>5); // only meaningful in PicoFrameHints()\r
+ // this is for a nasty situation where Z80 was enabled and disabled in the same 68k timeslice (Golden Axe III)\r
+ if (Pico.m.z80Run) {\r
+ int lineCycles=(488-SekCyclesLeft)&0x1ff;\r
+ z80stopCycle = SekCyclesDone();\r
+ lineCycles=(lineCycles>>1)-(lineCycles>>5);\r
+ z80_run(lineCycles);\r
+ }\r
} else {\r
z80startCycle = SekCyclesDone();\r
//if(Pico.m.scanline != -1)\r
- //z80ExtraCycles -= (lineCycles>>1)-(lineCycles>>5)+16;\r
}\r
dprintf("set_zrun: %02x [%i|%i] @%06x", d, Pico.m.scanline, SekCyclesDone(), /*mz80GetRegisterValue(NULL, 0),*/ SekPc);\r
Pico.m.z80Run=(u8)d; return;\r
\r
\r
// -----------------------------------------------------------------\r
-int PicoMemInit()\r
+void PicoMemSetup()\r
{\r
#ifdef EMU_C68K\r
// Setup memory callbacks:\r
PicoCpu.write16=PicoWrite16;\r
PicoCpu.write32=PicoWrite32;\r
#endif\r
- return 0;\r
}\r
\r
#ifdef EMU_A68K\r