mirror of https://github.com/snes9xgit/snes9x.git
Only show if DisplayTime is enabled in settings
This commit is contained in:
parent
ed4804ce85
commit
d16c9775a9
1
gfx.cpp
1
gfx.cpp
|
@ -2046,6 +2046,7 @@ static void DisplayWatchedAddresses (void)
|
||||||
|
|
||||||
void S9xDisplayMessages (uint16 *screen, int ppl, int width, int height, int scale)
|
void S9xDisplayMessages (uint16 *screen, int ppl, int width, int height, int scale)
|
||||||
{
|
{
|
||||||
|
if (Settings.DisplayTime)
|
||||||
DisplayTime();
|
DisplayTime();
|
||||||
|
|
||||||
if (Settings.DisplayFrameRate)
|
if (Settings.DisplayFrameRate)
|
||||||
|
|
|
@ -165,6 +165,7 @@ int Snes9xConfig::load_defaults ()
|
||||||
Settings.AutoSaveDelay = 0;
|
Settings.AutoSaveDelay = 0;
|
||||||
Settings.SkipFrames = 0;
|
Settings.SkipFrames = 0;
|
||||||
Settings.Transparency = true;
|
Settings.Transparency = true;
|
||||||
|
Settings.DisplayTime = false;
|
||||||
Settings.DisplayFrameRate = false;
|
Settings.DisplayFrameRate = false;
|
||||||
Settings.SixteenBitSound = true;
|
Settings.SixteenBitSound = true;
|
||||||
Settings.Stereo = true;
|
Settings.Stereo = true;
|
||||||
|
@ -341,6 +342,7 @@ int Snes9xConfig::save_config_file ()
|
||||||
#undef z
|
#undef z
|
||||||
#define z "Emulation::"
|
#define z "Emulation::"
|
||||||
outbool (cf, z"EmulateTransparency", Settings.Transparency);
|
outbool (cf, z"EmulateTransparency", Settings.Transparency);
|
||||||
|
outbool (cf, z"DisplayTime", Settings.DisplayTime);
|
||||||
outbool (cf, z"DisplayFrameRate", Settings.DisplayFrameRate);
|
outbool (cf, z"DisplayFrameRate", Settings.DisplayFrameRate);
|
||||||
outbool (cf, z"DisplayPressedKeys", Settings.DisplayPressedKeys);
|
outbool (cf, z"DisplayPressedKeys", Settings.DisplayPressedKeys);
|
||||||
cf.SetInt (z"SpeedControlMethod", Settings.SkipFrames, "0: Time the frames to 50 or 60Hz, 1: Same, but skip frames if too slow, 2: Synchronize to the sound buffer, 3: Unlimited, except potentially by vsync");
|
cf.SetInt (z"SpeedControlMethod", Settings.SkipFrames, "0: Time the frames to 50 or 60Hz, 1: Same, but skip frames if too slow, 2: Synchronize to the sound buffer, 3: Unlimited, except potentially by vsync");
|
||||||
|
@ -570,6 +572,7 @@ int Snes9xConfig::load_config_file ()
|
||||||
#undef z
|
#undef z
|
||||||
#define z "Emulation::"
|
#define z "Emulation::"
|
||||||
inbool (z"EmulateTransparency", Settings.Transparency);
|
inbool (z"EmulateTransparency", Settings.Transparency);
|
||||||
|
inbool (z"DisplayTime", Settings.DisplayTime);
|
||||||
inbool (z"DisplayFrameRate", Settings.DisplayFrameRate);
|
inbool (z"DisplayFrameRate", Settings.DisplayFrameRate);
|
||||||
inbool (z"DisplayPressedKeys", Settings.DisplayPressedKeys);
|
inbool (z"DisplayPressedKeys", Settings.DisplayPressedKeys);
|
||||||
inint (z"SpeedControlMethod", Settings.SkipFrames);
|
inint (z"SpeedControlMethod", Settings.SkipFrames);
|
||||||
|
|
|
@ -607,6 +607,7 @@ void
|
||||||
Snes9xPreferences::move_settings_to_dialog ()
|
Snes9xPreferences::move_settings_to_dialog ()
|
||||||
{
|
{
|
||||||
set_check ("full_screen_on_open", config->full_screen_on_open);
|
set_check ("full_screen_on_open", config->full_screen_on_open);
|
||||||
|
set_check ("show_time", Settings.DisplayTime);
|
||||||
set_check ("show_frame_rate", Settings.DisplayFrameRate);
|
set_check ("show_frame_rate", Settings.DisplayFrameRate);
|
||||||
set_check ("show_pressed_keys", Settings.DisplayPressedKeys);
|
set_check ("show_pressed_keys", Settings.DisplayPressedKeys);
|
||||||
set_check ("change_display_resolution", config->change_display_resolution);
|
set_check ("change_display_resolution", config->change_display_resolution);
|
||||||
|
@ -823,6 +824,7 @@ Snes9xPreferences::get_settings_from_dialog ()
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
config->full_screen_on_open = get_check ("full_screen_on_open");
|
config->full_screen_on_open = get_check ("full_screen_on_open");
|
||||||
|
Settings.DisplayTime = get_check ("show_time");
|
||||||
Settings.DisplayFrameRate = get_check ("show_frame_rate");
|
Settings.DisplayFrameRate = get_check ("show_frame_rate");
|
||||||
Settings.DisplayPressedKeys = get_check ("show_pressed_keys");
|
Settings.DisplayPressedKeys = get_check ("show_pressed_keys");
|
||||||
config->scale_to_fit = get_check ("scale_to_fit");
|
config->scale_to_fit = get_check ("scale_to_fit");
|
||||||
|
|
|
@ -250,6 +250,7 @@ void S9xLoadConfigFiles (char **argv, int argc)
|
||||||
Settings.SupportHiRes = conf.GetBool("Display::HiRes", true);
|
Settings.SupportHiRes = conf.GetBool("Display::HiRes", true);
|
||||||
Settings.Transparency = conf.GetBool("Display::Transparency", true);
|
Settings.Transparency = conf.GetBool("Display::Transparency", true);
|
||||||
Settings.DisableGraphicWindows = !conf.GetBool("Display::GraphicWindows", true);
|
Settings.DisableGraphicWindows = !conf.GetBool("Display::GraphicWindows", true);
|
||||||
|
Settings.DisplayTime = conf.GetBool("Display::DisplayTime", false);
|
||||||
Settings.DisplayFrameRate = conf.GetBool("Display::DisplayFrameRate", false);
|
Settings.DisplayFrameRate = conf.GetBool("Display::DisplayFrameRate", false);
|
||||||
Settings.DisplayWatchedAddresses = conf.GetBool("Display::DisplayWatchedAddresses", false);
|
Settings.DisplayWatchedAddresses = conf.GetBool("Display::DisplayWatchedAddresses", false);
|
||||||
Settings.DisplayPressedKeys = conf.GetBool("Display::DisplayInput", false);
|
Settings.DisplayPressedKeys = conf.GetBool("Display::DisplayInput", false);
|
||||||
|
@ -368,6 +369,7 @@ void S9xUsage (void)
|
||||||
S9xMessage(S9X_INFO, S9X_USAGE, "");
|
S9xMessage(S9X_INFO, S9X_USAGE, "");
|
||||||
|
|
||||||
// DISPLAY OPTIONS
|
// DISPLAY OPTIONS
|
||||||
|
S9xMessage(S9X_INFO, S9X_USAGE, "-displaytime Display the time");
|
||||||
S9xMessage(S9X_INFO, S9X_USAGE, "-displayframerate Display the frame rate counter");
|
S9xMessage(S9X_INFO, S9X_USAGE, "-displayframerate Display the frame rate counter");
|
||||||
S9xMessage(S9X_INFO, S9X_USAGE, "-displaykeypress Display input of all controllers and peripherals");
|
S9xMessage(S9X_INFO, S9X_USAGE, "-displaykeypress Display input of all controllers and peripherals");
|
||||||
S9xMessage(S9X_INFO, S9X_USAGE, "-nohires (Not recommended) Disable support for hi-res and");
|
S9xMessage(S9X_INFO, S9X_USAGE, "-nohires (Not recommended) Disable support for hi-res and");
|
||||||
|
@ -539,6 +541,9 @@ char * S9xParseArgs (char **argv, int argc)
|
||||||
|
|
||||||
// DISPLAY OPTIONS
|
// DISPLAY OPTIONS
|
||||||
|
|
||||||
|
if (!strcasecmp(argv[i], "-displaytime"))
|
||||||
|
Settings.DisplayTime = TRUE;
|
||||||
|
else
|
||||||
if (!strcasecmp(argv[i], "-displayframerate"))
|
if (!strcasecmp(argv[i], "-displayframerate"))
|
||||||
Settings.DisplayFrameRate = TRUE;
|
Settings.DisplayFrameRate = TRUE;
|
||||||
else
|
else
|
||||||
|
|
1
snes9x.h
1
snes9x.h
|
@ -247,6 +247,7 @@ struct SSettings
|
||||||
uint8 BG_Forced;
|
uint8 BG_Forced;
|
||||||
bool8 DisableGraphicWindows;
|
bool8 DisableGraphicWindows;
|
||||||
|
|
||||||
|
bool8 DisplayTime;
|
||||||
bool8 DisplayFrameRate;
|
bool8 DisplayFrameRate;
|
||||||
bool8 DisplayWatchedAddresses;
|
bool8 DisplayWatchedAddresses;
|
||||||
bool8 DisplayPressedKeys;
|
bool8 DisplayPressedKeys;
|
||||||
|
|
|
@ -28,6 +28,7 @@ Mute = FALSE
|
||||||
HiRes = TRUE
|
HiRes = TRUE
|
||||||
Transparency = TRUE
|
Transparency = TRUE
|
||||||
GraphicWindows = TRUE
|
GraphicWindows = TRUE
|
||||||
|
DisplayTime = FALSE
|
||||||
DisplayFrameRate = FALSE
|
DisplayFrameRate = FALSE
|
||||||
DisplayWatchedAddresses = FALSE
|
DisplayWatchedAddresses = FALSE
|
||||||
DisplayInput = FALSE
|
DisplayInput = FALSE
|
||||||
|
|
Loading…
Reference in New Issue