X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=platform%2Fwin32%2Fmain.c;h=eb55e0e08855e336dae1938b5100542c119db1fc;hb=6ee3a0f98a05b082fd626d8109f2098da650ae06;hp=17191e269deb2fed5c6b01dcfc02f5a5fe055aff;hpb=823b9004c44f2123da164a80d2644b34e3d1997b;p=picodrive.git

diff --git a/platform/win32/main.c b/platform/win32/main.c
index 17191e2..eb55e0e 100644
--- a/platform/win32/main.c
+++ b/platform/win32/main.c
@@ -107,7 +107,7 @@ static HBITMAP png2hb(const char *fname, int is_480)
 
   bmem = calloc(1, is_480 ? 480*240*3 : 320*240*3);
   if (bmem == NULL) return NULL;
-  ret = readpng(bmem, fname, is_480 ? READPNG_480_24 : READPNG_320_24);
+  ret = readpng(bmem, fname, READPNG_24, is_480 ? 480 : 320, 240);
   if (ret != 0) {
     free(bmem);
     return NULL;
@@ -131,7 +131,7 @@ static HBITMAP png2hb(const char *fname, int is_480)
 static void PrepareForROM(void)
 {
   unsigned char *rom_data = NULL;
-  int i, ret, show = PicoAHW & PAHW_PICO;
+  int i, ret, show = PicoIn.AHW & PAHW_PICO;
   
   PicoGetInternal(PI_ROM, (pint_ret_t *) &rom_data);
   EnableMenuItem(mmain, 2, MF_BYPOSITION|(show ? MF_ENABLED : MF_GRAYED));
@@ -565,8 +565,8 @@ void xxinit(void)
 {
   /* in_init() must go before config, config accesses in_ fwk */
   in_init();
-  pemu_prep_defconfig();
-  emu_read_config(0, 0);
+  emu_prep_defconfig();
+  emu_read_config(NULL, 0);
   config_readlrom(PicoConfigFile);
 
   plat_init();