cleanup

satisfactorymodding · Oct 25, 2019 · 35e4553 · 35e4553
1 parent ab38743
commit 35e4553
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 44 deletions.
diff --git a/SatisfactoryModLoader.vcxproj b/SatisfactoryModLoader.vcxproj
@@ -183,7 +183,6 @@
     <ClInclude Include="SatisfactoryModLoader\util\FString.h" />
     <ClInclude Include="SatisfactoryModLoader\util\json.hpp" />
     <ClInclude Include="SatisfactoryModLoader\util\JsonConfig.h" />
-    <ClInclude Include="SatisfactoryModLoader\util\Reflection.h" />
     <ClInclude Include="SatisfactoryModLoader\util\Utility.h" />
     <ClInclude Include="SatisfactoryModLoader\assets\SatisfactoryPakLoader.h" />
     <ClInclude Include="SatisfactorySDK\SDK.hpp" />
@@ -208,7 +207,6 @@
     <ClCompile Include="SatisfactoryModLoader\stdafx.cpp" />
     <ClCompile Include="SatisfactoryModLoader\util\EnvironmentValidity.cpp" />
     <ClCompile Include="SatisfactoryModLoader\util\FString.cpp" />
-    <ClCompile Include="SatisfactoryModLoader\util\Reflection.cpp" />
     <ClCompile Include="SatisfactoryModLoader\util\Utility.cpp" />
     <ClCompile Include="SatisfactoryModLoader\assets\SatisfactoryPakLoader.cpp" />
     <ClCompile Include="SatisfactorySDK\SDK\FG_Basic.cpp" />

diff --git a/SatisfactoryModLoader/SatisfactoryModLoader.cpp b/SatisfactoryModLoader/SatisfactoryModLoader.cpp
@@ -27,7 +27,6 @@
 #include <thread>
 #include <assets/AssetLoader.h>
 #include <util/Utility.h>
-#include <util/Reflection.h>
 #include <util/JsonConfig.h>
 #include <util/EnvironmentValidity.h>
 #include <mod/Hooks.h>

diff --git a/SatisfactoryModLoader/mod/Coremods.h b/SatisfactoryModLoader/mod/Coremods.h
@@ -11,6 +11,5 @@ namespace SML {
 		void startLoadingCoremods(const char* currentPath);
 
 		void loadCoremodsInternal(std::string path);
-
 	};
 };
diff --git a/SatisfactoryModLoader/mod/ModHandler.cpp b/SatisfactoryModLoader/mod/ModHandler.cpp
@@ -1,7 +1,6 @@
 #include <stdafx.h>
 #include <filesystem>
 #include <util/Utility.h>
-#include <util/Reflection.h>
 #include <SatisfactoryModLoader.h>
 #include "ModHandler.h"
 

diff --git a/SatisfactoryModLoader/util/FKey.h b/SatisfactoryModLoader/util/FKey.h
@@ -8,8 +8,7 @@ namespace SML {
 	namespace Objects {
 		struct ITextData {
 		public:
-			virtual ~ITextData()
-			{
+			virtual ~ITextData() {
 			}
 
 			/**

diff --git a/SatisfactoryModLoader/util/JsonConfig.h b/SatisfactoryModLoader/util/JsonConfig.h
@@ -4,6 +4,7 @@
 #include <fstream>
 #include <util/json.hpp>
 #include <direct.h>
+#include <SatisfactoryModLoader.h>
 
 using json = nlohmann::json;
 
@@ -12,7 +13,9 @@ namespace SML {
 		class JsonConfig {
 		public:
 			static void save(const std::string& name, const json& data, bool useDefaultPath = true) {
-				//info("Saving: " + name);
+				if (debugOutput) {
+					info("Saving config: " + name);
+				}
 
 				if (useDefaultPath) {
 					std::string stringpath = defaultPath;
@@ -36,7 +39,9 @@ namespace SML {
 				out.close();
 			}
 			static json load(const std::string& name, const json& defaultValues, bool useDefaultPath = true) {
-				//info("Loading: " + name);
+				if (debugOutput) {
+					info("Loading config: " + name);
+				}
 
 				if (!exists(name, useDefaultPath)) {
 					save(name, defaultValues, useDefaultPath);

diff --git a/SatisfactoryModLoader/util/Reflection.cpp b/SatisfactoryModLoader/util/Reflection.cpp
diff --git a/SatisfactoryModLoader/util/Reflection.h b/SatisfactoryModLoader/util/Reflection.h
-Original file line number
+Diff line change
@@ Expand Up / @@ -11,6 +11,5 @@ namespace SML { @@
     		void startLoadingCoremods(const char* currentPath);
     		void loadCoremodsInternal(std::string path);
     	};
     };