Follow up to dcbb2df

* Adjusted the checks to one-line. * Corrected the map-server from spitting out an error for the achievements import file.
rathena · Aug 9, 2017 · ac1cf04 · ac1cf04 · CairoLee · Aug 9, 2017
1 parent dcbb2df
commit ac1cf04
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/3rdparty/yaml-cpp/src/parse.cpp b/3rdparty/yaml-cpp/src/parse.cpp
@@ -31,7 +31,7 @@ Node Load(std::istream& input) {
 
 Node LoadFile(const std::string& filename) {
   std::ifstream fin(filename.c_str());
-  if (fin.bad()) {
+  if (!fin || fin.bad()) {
     throw BadFile();
   }
   return Load(fin);

diff --git a/db/import-tmpl/achievement_db.yml b/db/import-tmpl/achievement_db.yml
@@ -76,3 +76,5 @@
 ###########################################################################
 # Score - Achievement points that are given on completion.
 ###########################################################################
+
+Achievements:
diff --git a/src/common/yamlwrapper.cpp b/src/common/yamlwrapper.cpp
@@ -45,9 +45,7 @@ yamlwrapper* yaml_load_file(const char* file_name) {
 
 	try {
 		node = YAML::LoadFile(file_name);
-		if (!node.IsDefined())
-			return NULL;
-		if (node.IsNull())
+		if (!node.IsDefined() || node.IsNull())
 			return NULL;
 	} catch (YAML::ParserException &e) {
 		ShowError("YAML Exception Caught: %s\n", e.what());