c++17 fixes, creating needed files

4 files changed, 22 insertions, 0 deletions

diff --git a/src/brice.cpp b/src/brice.cpp
index 638c02f..8cbd9bb 100644
--- a/src/brice.cpp
+++ b/src/brice.cpp
@@ -61,6 +61,8 @@ namespace game {
 	}
 
 	void briceLoad(void) {
+		if (!fileExists("brice.dat"))
+			briceClear();
 		auto data = readFile("brice.dat");
 
 		if (data.empty()) {
diff --git a/src/common.cpp b/src/common.cpp
index f2e7a2b..b3b8ec4 100644
--- a/src/common.cpp
+++ b/src/common.cpp
@@ -123,3 +123,16 @@ std::vector<std::string> readFileA(const std::string& path)
 	return lines;
 }
 
+void copyFile(const std::string& to, const std::string& from)
+{
+	std::ifstream src (from, std::ios::binary);
+	std::ofstream dst (to, std::ios::binary);
+	dst << src.rdbuf();
+}
+
+bool fileExists(const std::string& file)
+{
+	std::ifstream f (file);
+	return f.good();
+}
+
diff --git a/src/config.cpp b/src/config.cpp
index 0bbb400..f236dc8 100644
--- a/src/config.cpp
+++ b/src/config.cpp
@@ -1,6 +1,7 @@
 #include <config.hpp>
 
 #include <ui.hpp>
+#include <fileio.hpp>
 
 #include <SDL2/SDL_mixer.h>
 
@@ -26,6 +27,9 @@ namespace game {
 		std::string fontFamily;
 
 		void read(void) {
+			if (!fileExists("config/settings.xml"))
+				copyFile("config/settings.xml", "config/settings.xml.example");
+
 			xml.LoadFile("config/settings.xml");
 			auto exml = xml.FirstChildElement("screen");
 
diff --git a/src/tinyxml2.cpp b/src/tinyxml2.cpp
index 096ff5b..d765357 100755
--- a/src/tinyxml2.cpp
+++ b/src/tinyxml2.cpp
@@ -409,14 +409,17 @@ void XMLUtil::ConvertUTF32ToUTF8(unsigned long input, char* output, int* length)
             --output;

             *output = (char)((input | BYTE_MARK) & BYTE_MASK);

             input >>= 6;

+	    [[fallthrough]];

         case 3:

             --output;

             *output = (char)((input | BYTE_MARK) & BYTE_MASK);

             input >>= 6;

+	    [[fallthrough]];

         case 2:

             --output;

             *output = (char)((input | BYTE_MARK) & BYTE_MASK);

             input >>= 6;

+	    [[fallthrough]];

         case 1:

             --output;

             *output = (char)(input | FIRST_BYTE_MARK[*length]);