X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?p=fceu.git;a=blobdiff_plain;f=drivers%2Fgp2x%2Fmain.c;h=5926da78fd224405d57af238b3ce38f91f81a6e0;hp=caea8ccdc01be75cb6592411de3e850febd6b590;hb=7b356ee3dc5d7e54d9dc06c413f84380d1044441;hpb=21afaa365c97896da6ccbdd6540e20f2d2bb4990 diff --git a/drivers/gp2x/main.c b/drivers/gp2x/main.c index caea8cc..5926da7 100644 --- a/drivers/gp2x/main.c +++ b/drivers/gp2x/main.c @@ -39,17 +39,17 @@ #include "../common/cheat.h" #include "../../fce.h" +#include "../../cart.h" #include "dface.h" -// TODO! broken fs0, sram saves - void CleanSurface(void); // internals extern char lastLoadedGameName[2048]; extern uint8 Exit; // exit emu loop flag +extern int FSkip; void CloseGame(void); FCEUGI *fceugi = NULL; @@ -93,8 +93,8 @@ void FCEUD_PrintError(char *s) puts(s); } -static char *cpalette=0; -static void LoadCPalette(void) +char *cpalette=0; +void LoadCPalette(void) { char tmpp[192]; FILE *fp; @@ -102,6 +102,8 @@ static void LoadCPalette(void) if(!(fp=fopen(cpalette,"rb"))) { printf(" Error loading custom palette from file: %s\n",cpalette); + free(cpalette); + cpalette=0; return; } fread(tmpp,1,192,fp); @@ -165,7 +167,7 @@ static void LoadLLGN(void) static void SaveLLGN(void) { // save last loaded game name - if (lastLoadedGameName[0]) + if (lastLoadedGameName[0] && !(eoptions&EO_NOAUTOWRITE)) { char tdir[2048]; FILE *f; @@ -183,7 +185,7 @@ static void SaveLLGN(void) static void CreateDirs(void) { - char *subs[]={"fcs","snaps","gameinfo","sav","cheats","cfg"}; + char *subs[]={"fcs","snaps","gameinfo","sav","cheats","cfg","pal"}; char tdir[2048]; int x; @@ -214,12 +216,9 @@ static void CloseStuff(int signum) case SIGHUP:printf("Reach out and hang-up on someone.\n");break; case SIGPIPE:printf("The pipe has broken! Better watch out for floods...\n");break; case SIGSEGV:printf("Iyeeeeeeeee!!! A segmentation fault has occurred. Have a fluffy day.\n");break; - /* So much SIGBUS evil. */ - #ifdef SIGBUS #if(SIGBUS!=SIGSEGV) case SIGBUS:printf("I told you to be nice to the driver.\n");break; #endif - #endif case SIGFPE:printf("Those darn floating points. Ne'er know when they'll bite!\n");break; case SIGALRM:printf("Don't throw your clock at the meowing cats!\n");break; case SIGABRT:printf("Abort, Retry, Ignore, Fail?\n");break; @@ -252,13 +251,13 @@ static int DoArgs(int argc, char *argv[]) {"-input1",0,&inputa[0],0x4001},{"-input2",0,&inputa[1],0x4001}, {"-fcexp",0,&fcexp,0x4001}, - {"-gg",&docheckie[1],0,0}, - {"-no8lim",0,&eoptions,0x8001}, - {"-subase",0,&eoptions,0x8002}, + {"-gg",0,&eoptions,0x8000|EO_GG}, + {"-no8lim",0,&eoptions,0x8000|EO_NO8LIM}, {"-snapname",0,&eoptions,0x8000|EO_SNAPNAME}, {"-nofs",0,&eoptions,0x8000|EO_NOFOURSCORE}, {"-clipsides",0,&eoptions,0x8000|EO_CLIPSIDES}, {"-nothrottle",0,&eoptions,0x8000|EO_NOTHROTTLE}, + {"-noautowrite",0,&eoptions,0x8000|EO_NOAUTOWRITE}, {"-slstart",0,&srendlinev[0],0},{"-slend",0,&erendlinev[0],0}, {"-slstartp",0,&srendlinev[1],0},{"-slendp",0,&erendlinev[1],0}, {0,(void *)DriverArgs,0,0}, @@ -278,10 +277,8 @@ static int DoArgs(int argc, char *argv[]) } if(docheckie[0]) Settings.region_force=2; - if(docheckie[1]) - FCEUI_SetGameGenie(1); - FCEUI_DisableSpriteLimitation(1); - FCEUI_SaveExtraDataUnderBase(eoptions&2); + FCEUI_SetGameGenie(eoptions&EO_GG); + FCEUI_DisableSpriteLimitation(eoptions&EO_NO8LIM); FCEUI_SetSnapName(eoptions&EO_SNAPNAME); for(x=0;x<2;x++) @@ -290,10 +287,8 @@ static int DoArgs(int argc, char *argv[]) if(erendlinev[x]239) erendlinev[x]=239; } - printf("FCEUI_SetRenderedLines: %d, %d, %d, %d\n",srendlinev[0],erendlinev[0],srendlinev[1],erendlinev[1]); - printf("clip sides: %d\n", eoptions&EO_CLIPSIDES); FCEUI_SetRenderedLines(srendlinev[0],erendlinev[0],srendlinev[1],erendlinev[1]); - FCEUI_SetSoundVolume(soundvol); + FCEUI_SetSoundVolume(80); DoDriverArgs(); if(fcexp) @@ -360,11 +355,10 @@ int CLImain(int argc, char *argv[]) LoadConfig(NULL); last_arg_parsed=DoArgs(argc-1,&argv[1]); gp2x_opt_setup(); - gp2x_cpuclock_gamma_update(); LoadLLGN(); FCEUI_SetNTSCTH(ntsccol, ntsctint, ntschue); if(cpalette) - LoadCPalette(); // TODO + LoadCPalette(); if(InitSound()) inited|=1; @@ -393,10 +387,14 @@ int CLImain(int argc, char *argv[]) if (Settings.region_force) FCEUI_SetVidSystem(Settings.region_force - 1); ParseGI(fceugi); - //RefreshThrottleFPS(); InitOtherInput(); - GameInterface(GI_INFOSTRING, infostring); + if ((eoptions&EO_GG) && geniestage == 0) { + strcpy(infostring, "gg.rom is missing, GG disabled"); + eoptions&=~EO_GG; + FCEUI_SetGameGenie(0); + } else + GameInterface(GI_INFOSTRING, infostring); FCEU_DispMessage("%s", infostring); } else @@ -420,17 +418,19 @@ int CLImain(int argc, char *argv[]) } } + gp2x_opt_update(); PrepareOtherInput(); FCEUI_GetCurrentVidSystem(&srendline,&erendline); gp2x_video_changemode(Settings.scaling == 3 ? 15 : 8); switch (Settings.scaling & 3) { - case 0: gp2x_video_set_offs(0); gp2x_video_RGB_setscaling(0, 320, 240); break; - case 1: gp2x_video_set_offs(32); gp2x_video_RGB_setscaling(0, 256, 240); break; - case 2: gp2x_video_set_offs(32); gp2x_video_RGB_setscaling(srendline, 256, erendline-srendline); break; - case 3: gp2x_video_set_offs(32); gp2x_video_RGB_setscaling(0, 320, 240); break; + case 0: gp2x_video_set_offs(0); gp2x_video_RGB_setscaling(320, 240); break; + case 1: gp2x_video_set_offs(32); gp2x_video_RGB_setscaling(256, 240); break; + case 2: gp2x_video_set_offs(32+srendline*320); gp2x_video_RGB_setscaling(256, erendline-srendline); break; + case 3: gp2x_video_set_offs(32); gp2x_video_RGB_setscaling(320, 240); break; } CleanSurface(); gp2x_start_sound(Settings.sound_rate, 16, 0); + RefreshThrottleFPS(); FCEUI_Emulate(); } @@ -454,7 +454,10 @@ static int DriverInitialize(void) static void DriverKill(void) { // SaveConfig(NULL); // done explicitly in menu now - SetSignals(SIG_IGN); + SetSignals(SIG_DFL); + + if(cpalette) free(cpalette); + cpalette=0; if(inited&4) KillVideo(); @@ -465,11 +468,16 @@ static void DriverKill(void) void FCEUD_Update(uint8 *xbuf, int16 *Buffer, int Count) { - if(!Count && !(eoptions&EO_NOTHROTTLE)) + FCEUD_UpdateInput(); // must update input before blitting because of save confirmation stuff + BlitPrepare(xbuf == NULL); + if(!(eoptions&EO_NOTHROTTLE)) + { + if(Count) + WriteSound(Buffer,Count); SpeedThrottle(); - BlitScreen(xbuf); - if(Count && !(eoptions&EO_NOTHROTTLE)) - WriteSound(Buffer,Count); - FCEUD_UpdateInput(); + } + BlitScreen(xbuf == NULL); + // make sure last frame won't get skipped, because we need it for menu bg + if (Exit) FSkip=0; }