// internals
extern char lastLoadedGameName[2048];
extern uint8 Exit; // exit emu loop flag
+extern int FSkip;
void CloseGame(void);
FCEUGI *fceugi = NULL;
ENDCFGSTRUCT
};
-void SaveConfig(const char *name)
+static const char *skip_path(const char *path)
{
+ const char *p;
+ if (path == NULL) return NULL;
+ for (p = path+strlen(path)-1; p > path && *p != '/'; p--);
+ if (*p == '/') p++;
+ return p;
+}
+
+int SaveConfig(const char *llgn_path)
+{
+ const char *name = skip_path(llgn_path);
char tdir[2048];
+ int ret;
if (name)
sprintf(tdir,"%s"PSS"cfg"PSS"%s.cfg",BaseDirectory,name);
else sprintf(tdir,"%s"PSS"fceu2.cfg",BaseDirectory);
+ printf("saving cfg to %s ... ", tdir); fflush(stdout);
FCEUI_GetNTSCTH(&ntsctint, &ntschue);
- SaveFCEUConfig(tdir,fceuconfig);
+ ret=SaveFCEUConfig(tdir,fceuconfig);
+ printf(ret == 0 ? "done\n" : "failed\n");
+ return ret;
}
-static void LoadConfig(const char *name)
+static int LoadConfig(const char *llgn_path)
{
+ const char *name = skip_path(llgn_path);
char tdir[2048];
+ int ret;
if (name)
sprintf(tdir,"%s"PSS"cfg"PSS"%s.cfg",BaseDirectory,name);
else sprintf(tdir,"%s"PSS"fceu2.cfg",BaseDirectory);
+ printf("loading cfg from %s ... ", tdir); fflush(stdout);
FCEUI_GetNTSCTH(&ntsctint, &ntschue); /* Get default settings for if no config file exists. */
- LoadFCEUConfig(tdir,fceuconfig);
+ ret=LoadFCEUConfig(tdir,fceuconfig);
FCEUI_SetNTSCTH(ntsccol, ntsctint, ntschue);
+ printf(ret == 0 ? "done\n" : "failed\n");
+ return ret;
}
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;
{"-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},
}
FCEUI_SetRenderedLines(srendlinev[0],erendlinev[0],srendlinev[1],erendlinev[1]);
- FCEUI_SetSoundVolume(soundvol);
+ FCEUI_SetSoundVolume(80);
DoDriverArgs();
if(fcexp)
int CLImain(int argc, char *argv[])
{
- int last_arg_parsed;
+ int last_arg_parsed, ret;
/* TODO if(argc<=1)
{
ShowUsage(argv[0]);
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)
{
if (fceugi)
CloseGame();
+ ret=LoadConfig(lastLoadedGameName);
+ if (ret != 0)
+ {
+ LoadConfig(NULL);
+ }
+ FCEUI_SetEmuMode(Settings.accurate_mode);
fceugi=FCEUI_LoadGame(lastLoadedGameName);
if (fceugi)
{
char infostring[32];
- LoadConfig(lastLoadedGameName);
if (Settings.region_force)
FCEUI_SetVidSystem(Settings.region_force - 1);
ParseGI(fceugi);
{
switch(LoadGameLastError) {
default: strcpy(menuErrorMsg, "failed to load ROM"); break;
- case 2: strcpy(menuErrorMsg, "Can't find a ROM for movie"); break;
+ case 2: strcpy(menuErrorMsg, "Can't find a ROM for ips/movie"); break;
case 10: strcpy(menuErrorMsg, "FDS BIOS ROM is missing, read docs"); break;
case 11: strcpy(menuErrorMsg, "Error reading auxillary FDS file"); break;
}
}
}
+ gp2x_opt_update();
PrepareOtherInput();
- RefreshThrottleFPS();
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();
}
CloseGame();
SaveLLGN();
+ FCEUI_Kill();
DriverKill();
return 0;
}
static void DriverKill(void)
{
// SaveConfig(NULL); // done explicitly in menu now
- SetSignals(SIG_IGN);
+ SetSignals(SIG_DFL);
if(cpalette) free(cpalette);
cpalette=0;
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;
}