BRNSystems/minetest
1
0
Fork 0
forked from Mirrorlandia_minetest/minetest
Code Pull Requests 1 Activity

ServerEnvironment::loadDefaultMeta: Loading default meta is only possible for ServerEnv itself

Browse Source
This commit is contained in:
Loic Blot 2018-03-16 08:52:42 +01:00
parent 858c95630f
commit 95ce5583a9
No known key found for this signature in database
GPG Key ID: EFAA458E8C153987
3 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/server.cpp
View File

@ -274,13 +274,7 @@ Server::Server(
// Register us to receive map edit events // Register us to receive map edit events
servermap->addEventReceiver(this); servermap->addEventReceiver(this);
// If file exists, load environment metadata
if (fs::PathExists(m_path_world + DIR_DELIM "env_meta.txt")) {
infostream << "Server: Loading environment metadata" << std::endl;
m_env->loadMeta(); m_env->loadMeta();
} else {
m_env->loadDefaultMeta();
}
m_liquid_transform_every = g_settings->getFloat("liquid_update"); m_liquid_transform_every = g_settings->getFloat("liquid_update");
m_max_chatmessage_length = g_settings->getU16("chat_message_max_size"); m_max_chatmessage_length = g_settings->getU16("chat_message_max_size");

13
src/serverenvironment.cpp
View File

@ -614,6 +614,16 @@ void ServerEnvironment::saveMeta()
void ServerEnvironment::loadMeta() void ServerEnvironment::loadMeta()
{ {
// If file doesn't exist, load default environment metadata
if (!fs::PathExists(m_path_world + DIR_DELIM "env_meta.txt")) {
infostream << "ServerEnvironment: Loading default environment metadata"
<< std::endl;
loadDefaultMeta();
return;
}
infostream << "ServerEnvironment: Loading environment metadata" << std::endl;
std::string path = m_path_world + DIR_DELIM "env_meta.txt"; std::string path = m_path_world + DIR_DELIM "env_meta.txt";
// Open file and deserialize // Open file and deserialize
@ -664,6 +674,9 @@ void ServerEnvironment::loadMeta()
args.getU64("day_count") : 0; args.getU64("day_count") : 0;
} }
/**
* called if env_meta.txt doesn't exist (e.g. new world)
*/
void ServerEnvironment::loadDefaultMeta() void ServerEnvironment::loadDefaultMeta()
{ {
m_lbm_mgr.loadIntroductionTimes("", m_server, m_game_time); m_lbm_mgr.loadIntroductionTimes("", m_server, m_game_time);

8
src/serverenvironment.h
View File

@ -232,9 +232,6 @@ public:
*/ */
void saveMeta(); void saveMeta();
void loadMeta(); void loadMeta();
// to be called instead of loadMeta if
// env_meta.txt doesn't exist (e.g. new world)
void loadDefaultMeta();
u32 addParticleSpawner(float exptime); u32 addParticleSpawner(float exptime);
u32 addParticleSpawner(float exptime, u16 attached_id); u32 addParticleSpawner(float exptime, u16 attached_id);
@ -371,6 +368,11 @@ public:
const Settings &cmd_args); const Settings &cmd_args);
private: private:
/**
* called if env_meta.txt doesn't exist (e.g. new world)
*/
void loadDefaultMeta();
static PlayerDatabase *openPlayerDatabase(const std::string &name, static PlayerDatabase *openPlayerDatabase(const std::string &name,
const std::string &savedir, const Settings &conf); const std::string &savedir, const Settings &conf);
/* /*