#include "ErrorHandler.hh"
-std::string getErrorString(const Mf::Exception& e)
+std::string getErrorString(const Mf::Error& error)
{
std::string str;
- switch(e.code())
+ switch(error.code())
{
- case Mf::ErrorCode::FASTEVENTS_INIT:
- case Mf::ErrorCode::SDL_INIT:
+ case Mf::Error::ALC_INIT:
+ str += "An error occurred during OpenAL initialization: ";
+ str += error.what();
+ return str;
+
+ case Mf::Error::FASTEVENTS_INIT:
+ case Mf::Error::SDL_INIT:
str += "An error occurred during SDL initialization: ";
- str += e.what();
+ str += error.what();
return str;
- case Mf::ErrorCode::FILE_NOT_FOUND:
+ case Mf::Error::FILE_NOT_FOUND:
str += "A required file (";
- str += e.what();
+ str += error.what();
str += ") could not be found.";
return str;
- case Mf::ErrorCode::RESOURCE_NOT_FOUND:
+ case Mf::Error::OPENAL_INIT:
+ str += "The audio library returned an error: ";
+ str += error.what();
+ return str;
+
+ case Mf::Error::RESOURCE_NOT_FOUND:
str += "A required resource (";
- str += e.what();
+ str += error.what();
str += ") could not be found.";
return str;
- case Mf::ErrorCode::SCRIPT_ERROR:
+ case Mf::Error::SCRIPT_ERROR:
str += "An error occurred in a script: ";
- str == e.what();
+ str == error.what();
return str;
- case Mf::ErrorCode::SDL_VIDEOMODE:
+ case Mf::Error::SDL_VIDEOMODE:
str += "An error occurred while trying to set up the video mode.";
return str;
- case Mf::ErrorCode::UNKNOWN_AUDIO_FORMAT:
+ case Mf::Error::UNKNOWN_AUDIO_FORMAT:
str += "An error occurred while trying to load an audio file, ";
- str += e.what();
+ str += error.what();
str += ".";
return str;
- case Mf::ErrorCode::UNKNOWN_IMAGE_FORMAT:
+ case Mf::Error::UNKNOWN_IMAGE_FORMAT:
str += "An error occurred while trying to load an image file, ";
- str += e.what();
+ str += error.what();
str += ".";
return str;
}
std::ostringstream stream;
- stream << "An unknown error (code " << e.code() << ") occurred.";
+ stream << "An unknown error (code " << error.code() << ") occurred.";
return stream.str();
}