X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=inline;f=platform%2Fwin32%2FGenaDrive%2FEmu.cpp;h=75f6f69842d46947fd286b6577fde3e8cfccb7bf;hb=03a265e5ebabff7adbb4f97387f81e9b0428dbee;hp=4e5bc95055886d889ed52d472d7ed239c14e2d4a;hpb=4b2b67ebc7fc6205c6589243b9c9a0a172a97ebb;p=picodrive.git diff --git a/platform/win32/GenaDrive/Emu.cpp b/platform/win32/GenaDrive/Emu.cpp index 4e5bc95..75f6f69 100644 --- a/platform/win32/GenaDrive/Emu.cpp +++ b/platform/win32/GenaDrive/Emu.cpp @@ -2,9 +2,7 @@ #include "app.h" unsigned short *EmuScreen=NULL; -extern "C" unsigned short *framebuff=NULL; -int EmuWidth=0,EmuHeight=0; -static int frame=0; +int EmuWidth=320,EmuHeight=224; static int EmuScan(unsigned int num, void *sdata); unsigned char *PicoDraw2FB = NULL; @@ -18,10 +16,9 @@ int EmuInit() EmuWidth=320; EmuHeight=224; len=EmuWidth*EmuHeight; len<<=1; EmuScreen=(unsigned short *)malloc(len); if (EmuScreen==NULL) return 1; - framebuff=(unsigned short *)malloc((8+320)*(8+224+8)*2); + PicoDraw2FB=(unsigned char *)malloc((8+320)*(8+224+8)*2); memset(EmuScreen,0,len); - PicoDraw2FB = (unsigned char *)framebuff; PicoDrawSetColorFormat(1); PicoScan=EmuScan; @@ -32,7 +29,7 @@ void EmuExit() { //RomFree(); free(EmuScreen); EmuScreen=NULL; // Deallocate screen - free(framebuff); + free(PicoDraw2FB); EmuWidth=EmuHeight=0; PicoExit(); @@ -69,8 +66,9 @@ int EmuFrame() PicoPad[0]=input; - frame++; - PsndOut=(short *)DSoundNext; PicoFrame(); PsndOut=NULL; + PsndOut=(short *)DSoundNext; + PicoFrame(); + //PsndOut=NULL; return 0; }