Finish migrating to new mem handling. Make carthw db external.

[picodrive.git] / platform / pandora / emu.c

diff --git a/platform/pandora/emu.c b/platform/pandora/emu.c
index a9a2119..af3474a 100644 (file)
--- a/platform/pandora/emu.c
+++ b/platform/pandora/emu.c
@@ -186,7 +186,6 @@ static void draw_pico_ptr(void)
 \r
 static int EmuScanBegin16(unsigned int num)\r
 {\r
-       if (!(Pico.video.reg[1]&8)) num += 8;\r
        DrawLineDest = (unsigned short *)g_screen_ptr + num*800 + 800/2 - 320/2;\r
        //int w = (Pico.video.reg[12]&1) ? 320 : 256;\r
        //DrawLineDest = (unsigned short *)g_screen_ptr + num*w;\r
@@ -204,7 +203,6 @@ static int EmuScanEnd16(unsigned int num)
        int sh = Pico.video.reg[0xC]&8;\r
        int len, mask = 0xff;\r
 \r
-       if (!(Pico.video.reg[1]&8)) num += 8;\r
        pd=(unsigned short *)g_screen_ptr + num*800*2 + 800/2 - 320*2/2;\r
 \r
        if (Pico.m.dirtyPal)\r
@@ -255,7 +253,7 @@ static void blit(const char *fps, const char *notice)
                        // gp2x_video_setpalette(localPal, 0x40);\r
                }\r
                // a hack for VR\r
-               if (PicoRead16Hook == PicoSVPRead16)\r
+               if (PicoAHW & PAHW_SVP)\r
                        memset32((int *)(PicoDraw2FB+328*8+328*223), 0xe0e0e0e0, 328);\r
                // do actual copy\r
                vidCpyM2((unsigned char *)g_screen_ptr+g_screen_width*8, PicoDraw2FB+328*8);\r