FAME integration finished, some adjustments of CPU core stuff

[picodrive.git] / Pico / VideoPort.c

diff --git a/Pico/VideoPort.c b/Pico/VideoPort.c
index cc1583a..ffbda06 100644 (file)
--- a/Pico/VideoPort.c
+++ b/Pico/VideoPort.c
@@ -337,7 +337,7 @@ PICO_INTERNAL_ASM void PicoVideoWrite(unsigned int a,unsigned short d)
     else\r
     {\r
       // preliminary FIFO emulation for Chaos Engine, The (E)\r
-      if(!(pvid->status&8) && (pvid->reg[1]&0x40) && Pico.m.scanline!=-1) // active display, accurate mode?\r
+      if(!(pvid->status&8) && (pvid->reg[1]&0x40) && Pico.m.scanline!=-1 && !(PicoOpt&0x10000)) // active display, accurate mode?\r
       {\r
         pvid->status&=~0x200; // FIFO no longer empty\r
         pvid->lwrite_cnt++;\r
@@ -382,7 +382,7 @@ PICO_INTERNAL_ASM void PicoVideoWrite(unsigned int a,unsigned short d)
         if(num < 2) {\r
 #ifdef EMU_C68K\r
           // hack: make sure we do not touch the irq line if Cyclone is just about to take the IRQ\r
-          if (PicoCpu.irq <= (PicoCpu.srh&7)) {\r
+          if (PicoCpuCM68k.irq <= (PicoCpuCM68k.srh&7)) {\r
 #endif\r
             int lines, pints;\r
             lines = (pvid->reg[1] & 0x20) | (pvid->reg[0] & 0x10);\r
@@ -392,7 +392,7 @@ PICO_INTERNAL_ASM void PicoVideoWrite(unsigned int a,unsigned short d)
             else SekInterrupt(0);\r
 #ifdef EMU_C68K\r
             // adjust cycles for Cyclone so it would take the int "in time"\r
-            if(PicoCpu.irq) {\r
+            if(PicoCpuCM68k.irq) {\r
               SekEndRun(24);\r
             }\r
           }\r