eliminate texrels (wip)

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

diff --git a/platform/gp2x/emu.c b/platform/gp2x/emu.c
index 74bcbcb..7e91361 100644 (file)
--- a/platform/gp2x/emu.c
+++ b/platform/gp2x/emu.c
@@ -30,7 +30,7 @@
 #include <pico/pico_int.h>\r
 #include <pico/patch.h>\r
 #include <pico/sound/mix.h>\r
-#include <zlib/zlib.h>\r
+#include <zlib.h>\r
 \r
 #ifdef BENCHMARK\r
 #define OSD_FPS_X 220\r
@@ -128,21 +128,6 @@ static void osd_text8(int x, int y, const char *text)
        emu_text_out8(x, y, text);\r
 }\r
 \r
-static void osd_text16(int x, int y, const char *text)\r
-{\r
-       int len = strlen(text)*8;\r
-       int *p, i, h, offs;\r
-\r
-       len = (len+1) >> 1;\r
-       for (h = 0; h < 8; h++) {\r
-               offs = (x + g_screen_width * (y+h)) & ~1;\r
-               p = (int *) ((short *)g_screen_ptr + offs);\r
-               for (i = len; i; i--, p++)\r
-                       *p = (*p >> 2) & 0x39e7;\r
-       }\r
-       emu_text_out16(x, y, text);\r
-}\r
-\r
 static void osd_text8_rot(int x, int y, const char *text)\r
 {\r
        int len = strlen(text) * 8;\r
@@ -325,7 +310,7 @@ static int make_local_pal_md(int fast_mode)
                localPal[0xf0] = 0x00ffffff;\r
                pallen = 0x100;\r
        }\r
-       else if (rendstatus & PDRAW_SONIC_MODE) { // mid-frame palette changes\r
+       else if (Pico.est.rendstatus & PDRAW_SONIC_MODE) { // mid-frame palette changes\r
                bgr444_to_rgb32(localPal+0x40, HighPal);\r
                bgr444_to_rgb32(localPal+0x80, HighPal+0x40);\r
        }\r
@@ -540,7 +525,7 @@ static void vid_reset_mode(void)
        PicoDrawSetCallbacks(emu_scan_begin, emu_scan_end);\r
 \r
        if (is_16bit_mode())\r
-               osd_text = (currentConfig.EmuOpt & EOPT_WIZ_TEAR_FIX) ? osd_text16_rot : osd_text16;\r
+               osd_text = (currentConfig.EmuOpt & EOPT_WIZ_TEAR_FIX) ? osd_text16_rot : emu_osd_text16;\r
        else\r
                osd_text = (currentConfig.EmuOpt & EOPT_WIZ_TEAR_FIX) ? osd_text8_rot : osd_text8;\r
 \r