From 9527984dbcfc0a6cc7aa0470430cb6c3aa4103ba Mon Sep 17 00:00:00 2001 From: Craig Robbins Date: Wed, 1 Apr 2015 23:01:28 +1000 Subject: Move globals from main.cpp to more sane locations Move debug streams to log.cpp|h Move GUI-related globals to clientlauncher Move g_settings and g_settings_path to settings.cpp|h Move g_menuclouds to clouds.cpp|h Move g_profiler to profiler.cpp|h --- src/settings.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/settings.h') diff --git a/src/settings.h b/src/settings.h index 48708f6cc..d43ad6a20 100644 --- a/src/settings.h +++ b/src/settings.h @@ -31,6 +31,10 @@ with this program; if not, write to the Free Software Foundation, Inc., class Settings; struct NoiseParams; +// Global objects +extern Settings *g_settings; +extern std::string g_settings_path; + /** function type to register a changed callback */ typedef void (*setting_changed_callback)(const std::string, void*); -- cgit v1.2.3