From ea60f9f78bac505a5aeeb4d34b927f04ec3121b3 Mon Sep 17 00:00:00 2001
From: Clyne Sullivan <tullivan99@gmail.com>
Date: Sat, 11 Feb 2017 11:24:52 -0500
Subject: world bg, other fixes

---
 include/error.hpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'include/error.hpp')

diff --git a/include/error.hpp b/include/error.hpp
index ef61c91..c435889 100644
--- a/include/error.hpp
+++ b/include/error.hpp
@@ -4,9 +4,12 @@
 #include <string>
 #include <iostream>
 
-inline void UserError(const std::string& why)
+#define UserError(w) _UserError(__FILE__, __LINE__, w)
+#define UserAssert(c, e) if (!(c)) { UserError(e); }
+
+inline void _UserError(const char* file, int line, const std::string& why)
 {
-	std::cout << "User error: " << why << "!\n";
+	std::cout << file << ':' << line << ": error: " << why << "!\n";
 	abort();
 }
 
-- 
cgit v1.2.3