rearrange globals

[picodrive.git] / platform / win32 / main.c

diff --git a/platform/win32/main.c b/platform/win32/main.c
index 85d153b..eb55e0e 100644 (file)
--- a/platform/win32/main.c
+++ b/platform/win32/main.c
@@ -107,7 +107,7 @@ static HBITMAP png2hb(const char *fname, int is_480)
 \r
   bmem = calloc(1, is_480 ? 480*240*3 : 320*240*3);\r
   if (bmem == NULL) return NULL;\r
-  ret = readpng(bmem, fname, is_480 ? READPNG_480_24 : READPNG_320_24);\r
+  ret = readpng(bmem, fname, READPNG_24, is_480 ? 480 : 320, 240);\r
   if (ret != 0) {\r
     free(bmem);\r
     return NULL;\r
@@ -131,7 +131,7 @@ static HBITMAP png2hb(const char *fname, int is_480)
 static void PrepareForROM(void)\r
 {\r
   unsigned char *rom_data = NULL;\r
-  int i, ret, show = PicoAHW & PAHW_PICO;\r
+  int i, ret, show = PicoIn.AHW & PAHW_PICO;\r
   \r
   PicoGetInternal(PI_ROM, (pint_ret_t *) &rom_data);\r
   EnableMenuItem(mmain, 2, MF_BYPOSITION|(show ? MF_ENABLED : MF_GRAYED));\r