X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FErrorHandler.cc;h=d027956f046b597819218cb72f1d74b04f6be51d;hp=66a488e7166fe50c45f09fcb0f446885b80cb991;hb=c78934a448d0126709fccec3d5a636b3baa87da4;hpb=e495074443d9fd7bc16137084cf9de3d031b75c4

diff --git a/src/ErrorHandler.cc b/src/ErrorHandler.cc
index 66a488e..d027956 100644
--- a/src/ErrorHandler.cc
+++ b/src/ErrorHandler.cc
@@ -1,87 +1,77 @@
 
-/*******************************************************************************
-
- Copyright (c) 2009, Charles McGarvey
- All rights reserved.
- 
- Redistribution   and   use  in  source  and  binary  forms,  with  or  without
- modification, are permitted provided that the following conditions are met:
- 
-   * Redistributions  of  source  code  must retain the above copyright notice,
-     this list of conditions and the following disclaimer.
-   * Redistributions  in binary form must reproduce the above copyright notice,
-     this  list of conditions and the following disclaimer in the documentation
-     and/or other materials provided with the distribution.
- 
- THIS  SOFTWARE  IS  PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND  ANY  EXPRESS  OR  IMPLIED  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED.  IN  NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- FOR  ANY  DIRECT,  INDIRECT,  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES  (INCLUDING,  BUT  NOT  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES;  LOSS  OF  USE,  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED  AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR  TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-*******************************************************************************/
+/*]  Copyright (c) 2009-2010, Charles McGarvey  [**************************
+**]  All rights reserved.
+*
+* vi:ts=4 sw=4 tw=75
+*
+* Distributable under the terms and conditions of the 2-clause BSD license;
+* see the file COPYING for a complete text of the license.
+*
+**************************************************************************/
 
 #include <sstream>
 
 #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:
-			str += "An error occurred while trying to set up the video mode.";
+		case Mf::Error::SDL_VIDEOMODE:
+			str += "An error occurred while trying to set up the graphics.";
 			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();
 }
 
-
-/** vim: set ts=4 sw=4 tw=80: *************************************************/
-