X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fexceptions.h;h=abd8c68ae31ee9b0917eb8fd529e6b826a425f16;hb=f6912f4241a2dd13d987d27a073a3b76faf2cb7d;hp=458fb50b1b7090db65e11f88da49984d450c0339;hpb=22e186b4aa88b585e71500c4e9a03bf69b0b6191;p=dragonfireclient.git

diff --git a/src/exceptions.h b/src/exceptions.h
index 458fb50b1..abd8c68ae 100644
--- a/src/exceptions.h
+++ b/src/exceptions.h
@@ -21,136 +21,129 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #define EXCEPTIONS_HEADER
 
 #include <exception>
+#include <string>
+
 
 class BaseException : public std::exception
 {
 public:
-	BaseException(const char *s)
+	BaseException(const std::string &s) throw()
 	{
 		m_s = s;
 	}
+	~BaseException() throw() {}
 	virtual const char * what() const throw()
 	{
-		return m_s;
+		return m_s.c_str();
 	}
-	const char *m_s;
+protected:
+	std::string m_s;
 };
 
-class AsyncQueuedException : public BaseException
-{
+class AsyncQueuedException : public BaseException {
 public:
-	AsyncQueuedException(const char *s):
-		BaseException(s)
-	{}
+	AsyncQueuedException(const std::string &s): BaseException(s) {}
 };
 
-class NotImplementedException : public BaseException
-{
+class NotImplementedException : public BaseException {
 public:
-	NotImplementedException(const char *s):
-		BaseException(s)
-	{}
+	NotImplementedException(const std::string &s): BaseException(s) {}
 };
 
-class AlreadyExistsException : public BaseException
-{
+class AlreadyExistsException : public BaseException {
 public:
-	AlreadyExistsException(const char *s):
-		BaseException(s)
-	{}
+	AlreadyExistsException(const std::string &s): BaseException(s) {}
 };
 
-class VersionMismatchException : public BaseException
-{
+class VersionMismatchException : public BaseException {
 public:
-	VersionMismatchException(const char *s):
-		BaseException(s)
-	{}
+	VersionMismatchException(const std::string &s): BaseException(s) {}
 };
 
-class FileNotGoodException : public BaseException
-{
+class FileNotGoodException : public BaseException {
 public:
-	FileNotGoodException(const char *s):
-		BaseException(s)
-	{}
+	FileNotGoodException(const std::string &s): BaseException(s) {}
 };
 
-class SerializationError : public BaseException
-{
+class SerializationError : public BaseException {
 public:
-	SerializationError(const char *s):
-		BaseException(s)
-	{}
+	SerializationError(const std::string &s): BaseException(s) {}
 };
 
-class LoadError : public BaseException
-{
+class LoadError : public BaseException {
 public:
-	LoadError(const char *s):
-		BaseException(s)
-	{}
+	LoadError(const std::string &s): BaseException(s) {}
 };
 
-class ContainerFullException : public BaseException
-{
+class ContainerFullException : public BaseException {
 public:
-	ContainerFullException(const char *s):
-		BaseException(s)
-	{}
+	ContainerFullException(const std::string &s): BaseException(s) {}
 };
 
-class SettingNotFoundException : public BaseException
-{
+class SettingNotFoundException : public BaseException {
 public:
-	SettingNotFoundException(const char *s):
-		BaseException(s)
-	{}
+	SettingNotFoundException(const std::string &s): BaseException(s) {}
 };
 
-class InvalidFilenameException : public BaseException
-{
+class InvalidFilenameException : public BaseException {
 public:
-	InvalidFilenameException(const char *s):
-		BaseException(s)
-	{}
+	InvalidFilenameException(const std::string &s): BaseException(s) {}
 };
 
-class ProcessingLimitException : public BaseException
-{
+class ProcessingLimitException : public BaseException {
 public:
-	ProcessingLimitException(const char *s):
-		BaseException(s)
-	{}
+	ProcessingLimitException(const std::string &s): BaseException(s) {}
 };
 
-class CommandLineError : public BaseException
-{
+class CommandLineError : public BaseException {
 public:
-	CommandLineError(const char *s):
-		BaseException(s)
-	{}
+	CommandLineError(const std::string &s): BaseException(s) {}
 };
 
-class ItemNotFoundException : public BaseException
-{
+class ItemNotFoundException : public BaseException {
 public:
-	ItemNotFoundException(const char *s):
-		BaseException(s)
-	{}
+	ItemNotFoundException(const std::string &s): BaseException(s) {}
+};
+
+class ServerError : public BaseException {
+public:
+	ServerError(const std::string &s): BaseException(s) {}
+};
+
+// Only used on Windows (SEH)
+class FatalSystemException : public BaseException {
+public:
+	FatalSystemException(const std::string &s): BaseException(s) {}
+};
+
+class ClientStateError : public BaseException {
+public:
+	ClientStateError(std::string s): BaseException(s) {}
 };
 
 /*
 	Some "old-style" interrupts:
 */
 
+class InvalidNoiseParamsException : public BaseException {
+public:
+	InvalidNoiseParamsException():
+		BaseException("One or more noise parameters were invalid or require "
+			"too much memory")
+	{}
+
+	InvalidNoiseParamsException(const std::string &s):
+		BaseException(s)
+	{}
+};
+
 class InvalidPositionException : public BaseException
 {
 public:
 	InvalidPositionException():
 		BaseException("Somebody tried to get/set something in a nonexistent position.")
 	{}
-	InvalidPositionException(const char *s):
+	InvalidPositionException(const std::string &s):
 		BaseException(s)
 	{}
 };