only enable AutoDisplayMessages if display framerate or clock is on

This commit is contained in:
Daryl Borth 2019-11-03 10:43:06 -07:00
parent 1e5802f35f
commit d7739e797e
2 changed files with 2 additions and 1 deletions

View File

@ -515,7 +515,7 @@ DefaultSettings ()
Settings.SkipFrames = AUTO_FRAMERATE; Settings.SkipFrames = AUTO_FRAMERATE;
Settings.TurboSkipFrames = 19; Settings.TurboSkipFrames = 19;
Settings.DisplayFrameRate = false; Settings.DisplayFrameRate = false;
Settings.AutoDisplayMessages = true; Settings.AutoDisplayMessages = false;
Settings.InitialInfoStringTimeout = 200; // # frames to display messages for Settings.InitialInfoStringTimeout = 200; // # frames to display messages for
Settings.DisplayTime = false; Settings.DisplayTime = false;

View File

@ -521,6 +521,7 @@ int main(int argc, char *argv[])
ScreenshotRequested = 0; ScreenshotRequested = 0;
SwitchAudioMode(0); SwitchAudioMode(0);
Settings.AutoDisplayMessages = (Settings.DisplayFrameRate || Settings.DisplayTime ? true : false);
Settings.MultiPlayer5Master = (GCSettings.Controller == CTRL_PAD4 ? true : false); Settings.MultiPlayer5Master = (GCSettings.Controller == CTRL_PAD4 ? true : false);
Settings.SuperScopeMaster = (GCSettings.Controller == CTRL_SCOPE ? true : false); Settings.SuperScopeMaster = (GCSettings.Controller == CTRL_SCOPE ? true : false);
Settings.MouseMaster = (GCSettings.Controller == CTRL_MOUSE ? true : false); Settings.MouseMaster = (GCSettings.Controller == CTRL_MOUSE ? true : false);