mirror of
https://github.com/minetest/minetest.git
synced 2024-09-27 15:00:30 +02:00
Some globals (un-)init fixes
This commit is contained in:
parent
2af5191070
commit
d8190e1c5f
|
@ -47,11 +47,6 @@ gui::IGUIEnvironment *guienv = nullptr;
|
||||||
gui::IGUIStaticText *guiroot = nullptr;
|
gui::IGUIStaticText *guiroot = nullptr;
|
||||||
MainMenuManager g_menumgr;
|
MainMenuManager g_menumgr;
|
||||||
|
|
||||||
bool isMenuActive()
|
|
||||||
{
|
|
||||||
return g_menumgr.menuCount() != 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Passed to menus to allow disconnecting and exiting
|
// Passed to menus to allow disconnecting and exiting
|
||||||
MainGameCallback *g_gamecallback = nullptr;
|
MainGameCallback *g_gamecallback = nullptr;
|
||||||
|
|
||||||
|
@ -74,13 +69,20 @@ ClientLauncher::~ClientLauncher()
|
||||||
{
|
{
|
||||||
delete input;
|
delete input;
|
||||||
|
|
||||||
delete receiver;
|
|
||||||
|
|
||||||
delete g_fontengine;
|
delete g_fontengine;
|
||||||
|
g_fontengine = nullptr;
|
||||||
delete g_gamecallback;
|
delete g_gamecallback;
|
||||||
|
g_gamecallback = nullptr;
|
||||||
|
|
||||||
|
guiroot = nullptr;
|
||||||
|
guienv = nullptr;
|
||||||
|
assert(g_menumgr.menuCount() == 0);
|
||||||
|
|
||||||
delete m_rendering_engine;
|
delete m_rendering_engine;
|
||||||
|
|
||||||
|
// delete event receiver only after all Irrlicht stuff is gone
|
||||||
|
delete receiver;
|
||||||
|
|
||||||
#if USE_SOUND
|
#if USE_SOUND
|
||||||
g_sound_manager_singleton.reset();
|
g_sound_manager_singleton.reset();
|
||||||
#endif
|
#endif
|
||||||
|
@ -103,10 +105,8 @@ bool ClientLauncher::run(GameStartData &start_data, const Settings &cmd_args)
|
||||||
g_sound_manager_singleton = createSoundManagerSingleton();
|
g_sound_manager_singleton = createSoundManagerSingleton();
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
if (!init_engine()) {
|
if (!init_engine())
|
||||||
errorstream << "Could not initialize game engine." << std::endl;
|
|
||||||
return false;
|
return false;
|
||||||
}
|
|
||||||
|
|
||||||
if (!m_rendering_engine->get_video_driver()) {
|
if (!m_rendering_engine->get_video_driver()) {
|
||||||
errorstream << "Could not initialize video driver." << std::endl;
|
errorstream << "Could not initialize video driver." << std::endl;
|
||||||
|
@ -129,7 +129,6 @@ bool ClientLauncher::run(GameStartData &start_data, const Settings &cmd_args)
|
||||||
init_guienv(guienv);
|
init_guienv(guienv);
|
||||||
|
|
||||||
g_fontengine = new FontEngine(guienv);
|
g_fontengine = new FontEngine(guienv);
|
||||||
FATAL_ERROR_IF(!g_fontengine, "Font engine creation failed.");
|
|
||||||
|
|
||||||
// Create the menu clouds
|
// Create the menu clouds
|
||||||
// This is only global so it can be used by RenderingEngine::draw_load_screen().
|
// This is only global so it can be used by RenderingEngine::draw_load_screen().
|
||||||
|
@ -301,8 +300,12 @@ void ClientLauncher::init_args(GameStartData &start_data, const Settings &cmd_ar
|
||||||
bool ClientLauncher::init_engine()
|
bool ClientLauncher::init_engine()
|
||||||
{
|
{
|
||||||
receiver = new MyEventReceiver();
|
receiver = new MyEventReceiver();
|
||||||
m_rendering_engine = new RenderingEngine(receiver);
|
try {
|
||||||
return m_rendering_engine->get_raw_device() != nullptr;
|
m_rendering_engine = new RenderingEngine(receiver);
|
||||||
|
} catch (std::exception &e) {
|
||||||
|
errorstream << e.what() << std::endl;
|
||||||
|
}
|
||||||
|
return !!m_rendering_engine;
|
||||||
}
|
}
|
||||||
|
|
||||||
void ClientLauncher::init_input()
|
void ClientLauncher::init_input()
|
||||||
|
|
|
@ -33,6 +33,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
|
||||||
#include "camera.h" // CameraModes
|
#include "camera.h" // CameraModes
|
||||||
#include "collision.h"
|
#include "collision.h"
|
||||||
#include "content_cso.h"
|
#include "content_cso.h"
|
||||||
|
#include "clientobject.h"
|
||||||
#include "environment.h"
|
#include "environment.h"
|
||||||
#include "itemdef.h"
|
#include "itemdef.h"
|
||||||
#include "localplayer.h"
|
#include "localplayer.h"
|
||||||
|
@ -218,14 +219,15 @@ private:
|
||||||
};
|
};
|
||||||
|
|
||||||
// Prototype
|
// Prototype
|
||||||
TestCAO proto_TestCAO(NULL, NULL);
|
static TestCAO proto_TestCAO(nullptr, nullptr);
|
||||||
|
|
||||||
TestCAO::TestCAO(Client *client, ClientEnvironment *env):
|
TestCAO::TestCAO(Client *client, ClientEnvironment *env):
|
||||||
ClientActiveObject(0, client, env),
|
ClientActiveObject(0, client, env),
|
||||||
m_node(NULL),
|
m_node(NULL),
|
||||||
m_position(v3f(0,10*BS,0))
|
m_position(v3f(0,10*BS,0))
|
||||||
{
|
{
|
||||||
ClientActiveObject::registerType(getType(), create);
|
if (!client)
|
||||||
|
ClientActiveObject::registerType(getType(), create);
|
||||||
}
|
}
|
||||||
|
|
||||||
std::unique_ptr<ClientActiveObject> TestCAO::create(Client *client, ClientEnvironment *env)
|
std::unique_ptr<ClientActiveObject> TestCAO::create(Client *client, ClientEnvironment *env)
|
||||||
|
@ -322,8 +324,6 @@ void TestCAO::processMessage(const std::string &data)
|
||||||
GenericCAO
|
GenericCAO
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "clientobject.h"
|
|
||||||
|
|
||||||
GenericCAO::GenericCAO(Client *client, ClientEnvironment *env):
|
GenericCAO::GenericCAO(Client *client, ClientEnvironment *env):
|
||||||
ClientActiveObject(0, client, env)
|
ClientActiveObject(0, client, env)
|
||||||
{
|
{
|
||||||
|
@ -2082,4 +2082,4 @@ void GenericCAO::updateMeshCulling()
|
||||||
}
|
}
|
||||||
|
|
||||||
// Prototype
|
// Prototype
|
||||||
GenericCAO proto_GenericCAO(NULL, NULL);
|
static GenericCAO proto_GenericCAO(nullptr, nullptr);
|
||||||
|
|
|
@ -27,16 +27,14 @@ with this program; if not, write to the Free Software Foundation, Inc.,
|
||||||
#include "irrlicht_changes/CGUITTFont.h"
|
#include "irrlicht_changes/CGUITTFont.h"
|
||||||
#include "util/numeric.h" // rangelim
|
#include "util/numeric.h" // rangelim
|
||||||
|
|
||||||
/** maximum size distance for getting a "similar" font size */
|
|
||||||
#define MAX_FONT_SIZE_OFFSET 10
|
|
||||||
|
|
||||||
/** reference to access font engine, has to be initialized by main */
|
/** reference to access font engine, has to be initialized by main */
|
||||||
FontEngine* g_fontengine = NULL;
|
FontEngine *g_fontengine = nullptr;
|
||||||
|
|
||||||
/** callback to be used on change of font size setting */
|
/** callback to be used on change of font size setting */
|
||||||
static void font_setting_changed(const std::string &name, void *userdata)
|
static void font_setting_changed(const std::string &name, void *userdata)
|
||||||
{
|
{
|
||||||
g_fontengine->readSettings();
|
if (g_fontengine)
|
||||||
|
g_fontengine->readSettings();
|
||||||
}
|
}
|
||||||
|
|
||||||
/******************************************************************************/
|
/******************************************************************************/
|
||||||
|
@ -226,7 +224,7 @@ gui::IGUIFont *FontEngine::initFont(const FontSpec &spec)
|
||||||
u16 divisible_by = g_settings->getU16(setting_prefix + "font_size_divisible_by");
|
u16 divisible_by = g_settings->getU16(setting_prefix + "font_size_divisible_by");
|
||||||
if (divisible_by > 1) {
|
if (divisible_by > 1) {
|
||||||
size = std::max<u32>(
|
size = std::max<u32>(
|
||||||
std::round((double)size / divisible_by) * divisible_by, divisible_by);
|
std::round((float)size / divisible_by) * divisible_by, divisible_by);
|
||||||
}
|
}
|
||||||
|
|
||||||
sanity_check(size != 0);
|
sanity_check(size != 0);
|
||||||
|
|
|
@ -29,12 +29,12 @@ with this program; if not, write to the Free Software Foundation, Inc.,
|
||||||
* converting textures back into images repeatedly, and some don't even
|
* converting textures back into images repeatedly, and some don't even
|
||||||
* allow it at all.
|
* allow it at all.
|
||||||
*/
|
*/
|
||||||
std::map<io::path, video::IImage *> g_imgCache;
|
static std::map<io::path, video::IImage *> g_imgCache;
|
||||||
|
|
||||||
/* Maintain a static cache of all pre-scaled textures. These need to be
|
/* Maintain a static cache of all pre-scaled textures. These need to be
|
||||||
* cleared as well when the cached images.
|
* cleared as well when the cached images.
|
||||||
*/
|
*/
|
||||||
std::map<io::path, video::ITexture *> g_txrCache;
|
static std::map<io::path, video::ITexture *> g_txrCache;
|
||||||
|
|
||||||
/* Manually insert an image into the cache, useful to avoid texture-to-image
|
/* Manually insert an image into the cache, useful to avoid texture-to-image
|
||||||
* conversion whenever we can intercept it.
|
* conversion whenever we can intercept it.
|
||||||
|
|
|
@ -355,12 +355,11 @@ const KeyPress CancelKey("KEY_CANCEL");
|
||||||
*/
|
*/
|
||||||
|
|
||||||
// A simple cache for quicker lookup
|
// A simple cache for quicker lookup
|
||||||
std::unordered_map<std::string, KeyPress> g_key_setting_cache;
|
static std::unordered_map<std::string, KeyPress> g_key_setting_cache;
|
||||||
|
|
||||||
KeyPress getKeySetting(const char *settingname)
|
KeyPress getKeySetting(const char *settingname)
|
||||||
{
|
{
|
||||||
std::unordered_map<std::string, KeyPress>::iterator n;
|
auto n = g_key_setting_cache.find(settingname);
|
||||||
n = g_key_setting_cache.find(settingname);
|
|
||||||
if (n != g_key_setting_cache.end())
|
if (n != g_key_setting_cache.end())
|
||||||
return n->second;
|
return n->second;
|
||||||
|
|
||||||
|
|
|
@ -253,8 +253,11 @@ RenderingEngine::RenderingEngine(IEventReceiver *receiver)
|
||||||
|
|
||||||
RenderingEngine::~RenderingEngine()
|
RenderingEngine::~RenderingEngine()
|
||||||
{
|
{
|
||||||
|
sanity_check(s_singleton == this);
|
||||||
|
|
||||||
core.reset();
|
core.reset();
|
||||||
m_device->closeDevice();
|
m_device->closeDevice();
|
||||||
|
m_device->drop();
|
||||||
s_singleton = nullptr;
|
s_singleton = nullptr;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -278,10 +281,7 @@ void RenderingEngine::removeMesh(const scene::IMesh* mesh)
|
||||||
void RenderingEngine::cleanupMeshCache()
|
void RenderingEngine::cleanupMeshCache()
|
||||||
{
|
{
|
||||||
auto mesh_cache = m_device->getSceneManager()->getMeshCache();
|
auto mesh_cache = m_device->getSceneManager()->getMeshCache();
|
||||||
while (mesh_cache->getMeshCount() != 0) {
|
mesh_cache->clear();
|
||||||
if (scene::IAnimatedMesh *mesh = mesh_cache->getMeshByIndex(0))
|
|
||||||
mesh_cache->removeMesh(mesh);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
bool RenderingEngine::setupTopLevelWindow()
|
bool RenderingEngine::setupTopLevelWindow()
|
||||||
|
|
|
@ -46,7 +46,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
|
||||||
/*
|
/*
|
||||||
A cache from shader name to shader path
|
A cache from shader name to shader path
|
||||||
*/
|
*/
|
||||||
MutexedMap<std::string, std::string> g_shadername_to_path_cache;
|
static MutexedMap<std::string, std::string> g_shadername_to_path_cache;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
Gets the path to a shader by first checking if the file
|
Gets the path to a shader by first checking if the file
|
||||||
|
|
|
@ -191,7 +191,7 @@ private:
|
||||||
scene::IMesh *m_cube;
|
scene::IMesh *m_cube;
|
||||||
};
|
};
|
||||||
|
|
||||||
ExtrusionMeshCache *g_extrusion_mesh_cache = NULL;
|
static ExtrusionMeshCache *g_extrusion_mesh_cache = nullptr;
|
||||||
|
|
||||||
|
|
||||||
WieldMeshSceneNode::WieldMeshSceneNode(scene::ISceneManager *mgr, s32 id, bool lighting):
|
WieldMeshSceneNode::WieldMeshSceneNode(scene::ISceneManager *mgr, s32 id, bool lighting):
|
||||||
|
|
|
@ -70,7 +70,7 @@ enum EmergeAction {
|
||||||
EMERGE_GENERATED,
|
EMERGE_GENERATED,
|
||||||
};
|
};
|
||||||
|
|
||||||
const static std::string emergeActionStrs[] = {
|
constexpr const char *emergeActionStrs[] = {
|
||||||
"cancelled",
|
"cancelled",
|
||||||
"errored",
|
"errored",
|
||||||
"from_memory",
|
"from_memory",
|
||||||
|
|
|
@ -26,10 +26,10 @@ with this program; if not, write to the Free Software Foundation, Inc.,
|
||||||
class BaseException : public std::exception
|
class BaseException : public std::exception
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
BaseException(const std::string &s) throw(): m_s(s) {}
|
BaseException(const std::string &s) noexcept: m_s(s) {}
|
||||||
~BaseException() throw() = default;
|
~BaseException() throw() = default;
|
||||||
|
|
||||||
virtual const char * what() const throw()
|
virtual const char * what() const noexcept
|
||||||
{
|
{
|
||||||
return m_s.c_str();
|
return m_s.c_str();
|
||||||
}
|
}
|
||||||
|
|
|
@ -80,7 +80,7 @@ public:
|
||||||
return mm && mm->preprocessEvent(event);
|
return mm && mm->preprocessEvent(event);
|
||||||
}
|
}
|
||||||
|
|
||||||
u32 menuCount()
|
size_t menuCount() const
|
||||||
{
|
{
|
||||||
return m_stack.size();
|
return m_stack.size();
|
||||||
}
|
}
|
||||||
|
@ -95,12 +95,16 @@ public:
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// FIXME: why isn't this private?
|
||||||
std::list<gui::IGUIElement*> m_stack;
|
std::list<gui::IGUIElement*> m_stack;
|
||||||
};
|
};
|
||||||
|
|
||||||
extern MainMenuManager g_menumgr;
|
extern MainMenuManager g_menumgr;
|
||||||
|
|
||||||
extern bool isMenuActive();
|
static inline bool isMenuActive()
|
||||||
|
{
|
||||||
|
return g_menumgr.menuCount() != 0;
|
||||||
|
}
|
||||||
|
|
||||||
class MainGameCallback : public IGameCallback
|
class MainGameCallback : public IGameCallback
|
||||||
{
|
{
|
||||||
|
@ -138,7 +142,8 @@ public:
|
||||||
keyconfig_changed = true;
|
keyconfig_changed = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
void showOpenURLDialog(const std::string &url) override {
|
void showOpenURLDialog(const std::string &url) override
|
||||||
|
{
|
||||||
show_open_url_dialog = url;
|
show_open_url_dialog = url;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1098,7 +1098,7 @@ enum NetProtoCompressionMode {
|
||||||
NETPROTO_COMPRESSION_NONE = 0,
|
NETPROTO_COMPRESSION_NONE = 0,
|
||||||
};
|
};
|
||||||
|
|
||||||
const static std::string accessDeniedStrings[SERVER_ACCESSDENIED_MAX] = {
|
constexpr const char *accessDeniedStrings[SERVER_ACCESSDENIED_MAX] = {
|
||||||
"Invalid password",
|
"Invalid password",
|
||||||
"Your client sent something the server didn't expect. Try reconnecting or updating your client.",
|
"Your client sent something the server didn't expect. Try reconnecting or updating your client.",
|
||||||
"The server is running in simple singleplayer mode. You cannot connect.",
|
"The server is running in simple singleplayer mode. You cannot connect.",
|
||||||
|
|
|
@ -115,7 +115,7 @@ static TestAuthDatabase g_test_instance;
|
||||||
void TestAuthDatabase::runTests(IGameDef *gamedef)
|
void TestAuthDatabase::runTests(IGameDef *gamedef)
|
||||||
{
|
{
|
||||||
// fixed directory, for persistence
|
// fixed directory, for persistence
|
||||||
thread_local const std::string test_dir = getTestTempDirectory();
|
const std::string test_dir = getTestTempDirectory();
|
||||||
|
|
||||||
// Each set of tests is run twice for each database type:
|
// Each set of tests is run twice for each database type:
|
||||||
// one where we reuse the same AuthDatabase object (to test local caching),
|
// one where we reuse the same AuthDatabase object (to test local caching),
|
||||||
|
|
|
@ -36,7 +36,7 @@ public:
|
||||||
void testFlagDesc();
|
void testFlagDesc();
|
||||||
|
|
||||||
static const char *config_text_before;
|
static const char *config_text_before;
|
||||||
static const std::string config_text_after;
|
static const char *config_text_after;
|
||||||
};
|
};
|
||||||
|
|
||||||
static TestSettings g_test_instance;
|
static TestSettings g_test_instance;
|
||||||
|
@ -76,7 +76,7 @@ const char *TestSettings::config_text_before =
|
||||||
"zoop = true\n"
|
"zoop = true\n"
|
||||||
"[dummy_eof_end_tag]\n";
|
"[dummy_eof_end_tag]\n";
|
||||||
|
|
||||||
const std::string TestSettings::config_text_after =
|
const char *TestSettings::config_text_after =
|
||||||
u8"leet = 1337\n"
|
u8"leet = 1337\n"
|
||||||
"leetleet = 13371337\n"
|
"leetleet = 13371337\n"
|
||||||
"leetleet_neg = -13371337\n"
|
"leetleet_neg = -13371337\n"
|
||||||
|
|
|
@ -31,6 +31,7 @@ std::string QuicktuneValue::getString()
|
||||||
}
|
}
|
||||||
return "<invalid type>";
|
return "<invalid type>";
|
||||||
}
|
}
|
||||||
|
|
||||||
void QuicktuneValue::relativeAdd(float amount)
|
void QuicktuneValue::relativeAdd(float amount)
|
||||||
{
|
{
|
||||||
switch(type){
|
switch(type){
|
||||||
|
@ -48,24 +49,16 @@ void QuicktuneValue::relativeAdd(float amount)
|
||||||
|
|
||||||
static std::map<std::string, QuicktuneValue> g_values;
|
static std::map<std::string, QuicktuneValue> g_values;
|
||||||
static std::vector<std::string> g_names;
|
static std::vector<std::string> g_names;
|
||||||
std::mutex *g_mutex = NULL;
|
static std::mutex g_mutex;
|
||||||
|
|
||||||
static void makeMutex()
|
const std::vector<std::string> &getQuicktuneNames()
|
||||||
{
|
|
||||||
if(!g_mutex){
|
|
||||||
g_mutex = new std::mutex();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
std::vector<std::string> getQuicktuneNames()
|
|
||||||
{
|
{
|
||||||
return g_names;
|
return g_names;
|
||||||
}
|
}
|
||||||
|
|
||||||
QuicktuneValue getQuicktuneValue(const std::string &name)
|
QuicktuneValue getQuicktuneValue(const std::string &name)
|
||||||
{
|
{
|
||||||
makeMutex();
|
MutexAutoLock lock(g_mutex);
|
||||||
MutexAutoLock lock(*g_mutex);
|
|
||||||
std::map<std::string, QuicktuneValue>::iterator i = g_values.find(name);
|
std::map<std::string, QuicktuneValue>::iterator i = g_values.find(name);
|
||||||
if(i == g_values.end()){
|
if(i == g_values.end()){
|
||||||
QuicktuneValue val;
|
QuicktuneValue val;
|
||||||
|
@ -77,17 +70,15 @@ QuicktuneValue getQuicktuneValue(const std::string &name)
|
||||||
|
|
||||||
void setQuicktuneValue(const std::string &name, const QuicktuneValue &val)
|
void setQuicktuneValue(const std::string &name, const QuicktuneValue &val)
|
||||||
{
|
{
|
||||||
makeMutex();
|
MutexAutoLock lock(g_mutex);
|
||||||
MutexAutoLock lock(*g_mutex);
|
|
||||||
g_values[name] = val;
|
g_values[name] = val;
|
||||||
g_values[name].modified = true;
|
g_values[name].modified = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
void updateQuicktuneValue(const std::string &name, QuicktuneValue &val)
|
void updateQuicktuneValue(const std::string &name, QuicktuneValue &val)
|
||||||
{
|
{
|
||||||
makeMutex();
|
MutexAutoLock lock(g_mutex);
|
||||||
MutexAutoLock lock(*g_mutex);
|
auto i = g_values.find(name);
|
||||||
std::map<std::string, QuicktuneValue>::iterator i = g_values.find(name);
|
|
||||||
if(i == g_values.end()){
|
if(i == g_values.end()){
|
||||||
g_values[name] = val;
|
g_values[name] = val;
|
||||||
g_names.push_back(name);
|
g_names.push_back(name);
|
||||||
|
|
|
@ -74,7 +74,7 @@ struct QuicktuneValue
|
||||||
void relativeAdd(float amount);
|
void relativeAdd(float amount);
|
||||||
};
|
};
|
||||||
|
|
||||||
std::vector<std::string> getQuicktuneNames();
|
const std::vector<std::string> &getQuicktuneNames();
|
||||||
QuicktuneValue getQuicktuneValue(const std::string &name);
|
QuicktuneValue getQuicktuneValue(const std::string &name);
|
||||||
void setQuicktuneValue(const std::string &name, const QuicktuneValue &val);
|
void setQuicktuneValue(const std::string &name, const QuicktuneValue &val);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user