From 163f739acef3d7d9a05a640c635efe38dee60a22 Mon Sep 17 00:00:00 2001 From: duncathan Date: Wed, 24 Jun 2026 16:07:40 -0600 Subject: [PATCH] hide OSD by default in RANDOMIZER mode also makes it easier to adjust the default settings at compile time, in general --- src/include/settings.hpp | 58 ++++++++++++++++++++++++++++------------ 1 file changed, 41 insertions(+), 17 deletions(-) diff --git a/src/include/settings.hpp b/src/include/settings.hpp index 2b37bd8..d1ee338 100644 --- a/src/include/settings.hpp +++ b/src/include/settings.hpp @@ -2,29 +2,53 @@ #include +// whether to display the on-screen display by default +#define OSD_DEFAULT true + +// whether to display the loads by default +#define LOADS_DEFAULT false + +// whether to display the items in the monitor window by default +#define MONITOR_DEFAULT true + +// whether to display the memory window by default +#define MEMORY_DEFAULT false + +// whether to display the inputs by default +#define INPUT_DEFAULT true + #ifdef DEBUG -#define DEBUG_TRUE true -#else -#define DEBUG_TRUE false +#undef LOADS_DEFAULT +#define LOADS_DEFAULT true #endif -struct Settings { - bool OSD_show : 1 {true}; - bool OSD_showFrameTime : 1 {false}; - bool OSD_showMemoryInfo : 1 {false}; - bool OSD_showMemoryGraph : 1 {false}; - bool OSD_showInput : 1 {true}; - bool OSD_showVelocity : 1 {true}; - bool OSD_showRotationalVelocity : 1 {false}; - bool OSD_showPos : 1 {true}; - bool OSD_showIGT : 1 {true}; - bool OSD_showCurrentRoomTime : 1 {true}; - bool OSD_showPreviousRoomTime : 1 {true}; - bool OSD_showLoads : 1 {DEBUG_TRUE}; - bool OSD_showJumpState : 1 {false}; +#ifdef RANDOMIZER +#undef OSD_DEFAULT +#define OSD_DEFAULT false +#endif +struct Settings { + bool OSD_show : 1 {OSD_DEFAULT}; + bool OSD_showFrameTime : 1 {MONITOR_DEFAULT && false}; + bool OSD_showMemoryInfo : 1 {MEMORY_DEFAULT && false}; + bool OSD_showMemoryGraph : 1 {MEMORY_DEFAULT && false}; + bool OSD_showInput : 1 {INPUT_DEFAULT}; + bool OSD_showVelocity : 1 {MONITOR_DEFAULT && true}; + bool OSD_showRotationalVelocity : 1 {MONITOR_DEFAULT && false}; + bool OSD_showPos : 1 {MONITOR_DEFAULT && true}; + bool OSD_showIGT : 1 {MONITOR_DEFAULT && true}; + bool OSD_showCurrentRoomTime : 1 {MONITOR_DEFAULT && true}; + bool OSD_showPreviousRoomTime : 1 {MONITOR_DEFAULT && true}; + bool OSD_showLoads : 1 {LOADS_DEFAULT}; + bool OSD_showJumpState : 1 {MONITOR_DEFAULT && false}; bool RNG_lockSeed{false}; }; extern Settings SETTINGS; + +#undef OSD_DEFAULT +#undef LOADS_DEFAULT +#undef MONITOR_DEFAULT +#undef MEMORY_DEFAULT +#undef INPUT_DEFAULT