oss/luanti
oss/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-06-27 16:36:03 +00:00
Code Wiki Activity

Split settings into seperate source and header files

Browse source 
This also cleans up settings a bit
This commit is contained in:
ShadowNinja 2014-09-11 18:22:05 -04:00
parent 2ae5d3f3ab
commit 6bc4cad0ed
27 changed files with 996 additions and 941 deletions
Download patch file Download diff file Expand all files Collapse all files

33
src/environment.cpp
View file

@ -508,38 +508,29 @@ void ServerEnvironment::loadMeta()
// Open file and deserialize
std::ifstream is(path.c_str(), std::ios_base::binary);
if(is.good() == false)
{
infostream<<"ServerEnvironment::loadMeta(): Failed to open "
<<path<<std::endl;
if (!is.good()) {
infostream << "ServerEnvironment::loadMeta(): Failed to open "
<< path << std::endl;
throw SerializationError("Couldn't load env meta");
}
Settings args;
for(;;)
{
if(is.eof())
throw SerializationError
("ServerEnvironment::loadMeta(): EnvArgsEnd not found");
std::string line;
std::getline(is, line);
std::string trimmedline = trim(line);
if(trimmedline == "EnvArgsEnd")
break;
args.parseConfigLine(line);
if (!args.parseConfigLines(is, "EnvArgsEnd")) {
throw SerializationError("ServerEnvironment::loadMeta(): "
"EnvArgsEnd not found!");
}
try{
try {
m_game_time = args.getU64("game_time");
}catch(SettingNotFoundException &e){
} catch (SettingNotFoundException &e) {
// Getting this is crucial, otherwise timestamps are useless
throw SerializationError("Couldn't load env meta game_time");
}
try{
try {
m_time_of_day = args.getU64("time_of_day");
}catch(SettingNotFoundException &e){
} catch (SettingNotFoundException &e) {
// This is not as important
m_time_of_day = 9000;
}