sdl: fix link error related to use of variable turbo in movie.cpp, and add --fourscore for fourscore emulation (since the way this is submitted to the core emulator changed within the past year and sdl's method was out of date)
This commit is contained in:
parent
4e3f25c906
commit
8586ec1e40
|
@ -195,6 +195,8 @@ InitConfig()
|
||||||
// video playback
|
// video playback
|
||||||
config->addOption("playmov", "SDL.Movie", "");
|
config->addOption("playmov", "SDL.Movie", "");
|
||||||
config->addOption("subtitles", "SDL.SubtitleDisplay", 1);
|
config->addOption("subtitles", "SDL.SubtitleDisplay", 1);
|
||||||
|
|
||||||
|
config->addOption("fourscore", "SDL.FourScore", 0);
|
||||||
|
|
||||||
#ifdef _S9XLUA_H
|
#ifdef _S9XLUA_H
|
||||||
// load lua script
|
// load lua script
|
||||||
|
|
|
@ -54,6 +54,8 @@ extern double g_fpsScale;
|
||||||
|
|
||||||
extern bool MaxSpeed;
|
extern bool MaxSpeed;
|
||||||
|
|
||||||
|
bool turbo = false;
|
||||||
|
|
||||||
int CloseGame(void);
|
int CloseGame(void);
|
||||||
|
|
||||||
static int inited=0;
|
static int inited=0;
|
||||||
|
@ -103,6 +105,7 @@ char *DriverUsage="\
|
||||||
--fcmconvert f Converts fcm movie file f to fm2.\n\
|
--fcmconvert f Converts fcm movie file f to fm2.\n\
|
||||||
--ripsubs f Converts movie's subtitles to srt\n\
|
--ripsubs f Converts movie's subtitles to srt\n\
|
||||||
--subtitles {0,1} Enables subtitle display\n\
|
--subtitles {0,1} Enables subtitle display\n\
|
||||||
|
--fourscore {0,1} Enables fourscore emulation\n\
|
||||||
--no-config {0,1} Don't change the config file";
|
--no-config {0,1} Don't change the config file";
|
||||||
|
|
||||||
/* Moved network options out while netplay is broken.
|
/* Moved network options out while netplay is broken.
|
||||||
|
@ -276,6 +279,12 @@ DriverInitialize(FCEUGI *gi)
|
||||||
if(InitJoysticks())
|
if(InitJoysticks())
|
||||||
inited|=2;
|
inited|=2;
|
||||||
|
|
||||||
|
int fourscore=0;
|
||||||
|
g_config->getOption("SDL.FourScore", &fourscore);
|
||||||
|
eoptions &= ~EO_FOURSCORE;
|
||||||
|
if(fourscore)
|
||||||
|
eoptions |= EO_FOURSCORE;
|
||||||
|
|
||||||
InitInputInterface();
|
InitInputInterface();
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue