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/main.h | 61 ------------------------------------------------------------- 1 file changed, 61 deletions(-) delete mode 100644 src/main.h (limited to 'src/main.h') diff --git a/src/main.h b/src/main.h deleted file mode 100644 index 191b41887..000000000 --- a/src/main.h +++ /dev/null @@ -1,61 +0,0 @@ -/* -Minetest -Copyright (C) 2013 celeron55, Perttu Ahola - -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU Lesser General Public License as published by -the Free Software Foundation; either version 2.1 of the License, or -(at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU Lesser General Public License for more details. - -You should have received a copy of the GNU Lesser General Public License along -with this program; if not, write to the Free Software Foundation, Inc., -51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -*/ - -#ifndef MAIN_HEADER -#define MAIN_HEADER - -#include - -// Settings -class Settings; -extern Settings *g_settings; -extern std::string g_settings_path; - -// Global profiler -class Profiler; -extern Profiler *g_profiler; - -// Menu clouds -class Clouds; -extern Clouds *g_menuclouds; - -// Scene manager used for menu clouds -namespace irr{namespace scene{class ISceneManager;}} -extern irr::scene::ISceneManager *g_menucloudsmgr; - -// Debug streams - -#include - -extern std::ostream *dout_con_ptr; -extern std::ostream *derr_con_ptr; -extern std::ostream *dout_client_ptr; -extern std::ostream *derr_client_ptr; -extern std::ostream *dout_server_ptr; -extern std::ostream *derr_server_ptr; - -#define dout_con (*dout_con_ptr) -#define derr_con (*derr_con_ptr) -#define dout_client (*dout_client_ptr) -#define derr_client (*derr_client_ptr) -#define dout_server (*dout_server_ptr) -#define derr_server (*derr_server_ptr) - -#endif - -- cgit v1.2.3