Make external fails catchable.

1 files changed, 5 insertions, 4 deletions

diff --git a/crawl-ref/source/errors.cc b/crawl-ref/source/errors.cc
index b61a9eaf79..9fd3362872 100644
--- a/crawl-ref/source/errors.cc
+++ b/crawl-ref/source/errors.cc
@@ -9,6 +9,7 @@
 #include <string.h>
 
 #include "AppHdr.h"
+#include "errors.h"
 #include "libutil.h"
 #include "stuff.h"
 
@@ -19,8 +20,9 @@ void fail(const char *msg, ...)
     std::string buf = vmake_stringf(msg, args);
     va_end(args);
 
-    // TODO: throw an exception or sumthing here when expected
-    end(1, true, buf.c_str());
+    // Do we want to call end() right on when there's no one trying catching,
+    // or should we risk exception code mess things up?
+    throw ext_fail_exception(buf);
 }
 
 void sysfail(const char *msg, ...)
@@ -33,6 +35,5 @@ void sysfail(const char *msg, ...)
     buf += ": ";
     buf += strerror(errno);
 
-    // TODO: throw an exception or sumthing here when expected
-    end(1, true, buf.c_str());
+    throw ext_fail_exception(buf);
 }