Merge branch 'master' of github.com:teamfisk/TacticalZ

# Conflicts: # resources/Schema/Entities/Player.xml # src/Engine/Network/Server.cpp
2016-01-24 21:21:51 +01:00
parent 382eff169f d4797b0808
commit 0c56a05144
72 changed files with 3182 additions and 436 deletions
@@ -32,10 +32,10 @@ public:
    };
    struct FailedLoadingException : public std::exception
    {
-        virtual const char* what() const throw()
-        {
-            return "Resource is failed to load.";
-        }
+        FailedLoadingException(char const* const _Message)
+            : std::exception(_Message)
+        { }
+        FailedLoadingException() :std::exception("Resource failed to load.") { };
    };

 	// Pretend that this is a pure virtual function that you have to implement