From 6490b535a3e2c3be10e1815a24152a4d10e98bed Mon Sep 17 00:00:00 2001
From: Celtic Minstrel <celtic.minstrel.ca@some.place>
Date: Fri, 4 Mar 2016 14:53:21 -0500
Subject: [PATCH] Tweak output of formula evaluation command prompt

---
 src/ai/formula/ai.cpp | 2 +-
 src/menu_events.cpp   | 5 +++--
 src/variant.cpp       | 1 -
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/ai/formula/ai.cpp b/src/ai/formula/ai.cpp
index cc2e7407a90f..9b9406d55929 100644
--- a/src/ai/formula/ai.cpp
+++ b/src/ai/formula/ai.cpp
@@ -128,7 +128,7 @@ void formula_ai::handle_exception(game_logic::formula_error& e, const std::strin
 
 void formula_ai::display_message(const std::string& msg) const
 {
-	resources::screen->get_chat_manager().add_chat_message(time(NULL), "fai", get_side(), msg,
+	resources::screen->get_chat_manager().add_chat_message(time(NULL), "wfl", get_side(), msg,
 				events::chat_handler::MESSAGE_PUBLIC, false);
 
 }
diff --git a/src/menu_events.cpp b/src/menu_events.cpp
index 72313a7b2b1d..f9421d084628 100644
--- a/src/menu_events.cpp
+++ b/src/menu_events.cpp
@@ -3067,9 +3067,10 @@ void menu_handler::do_ai_formula(const std::string& str,
 	int side_num, mouse_handler& /*mousehandler*/)
 {
 	try {
-		add_chat_message(time(NULL), _("ai"), 0, ai::manager::evaluate_command(side_num, str));
+		add_chat_message(time(NULL), _("wfl"), 0, ai::manager::evaluate_command(side_num, str));
+	} catch(game_logic::formula_error&) {
 	} catch(...) {
-		//add_chat_message(time(NULL), _("ai"), 0, "ERROR IN FORMULA");
+		add_chat_message(time(NULL), _("wfl"), 0, "UNKNOWN ERROR IN FORMULA");
 	}
 }
 
diff --git a/src/variant.cpp b/src/variant.cpp
index 5521a737fdc8..5890d16aea17 100644
--- a/src/variant.cpp
+++ b/src/variant.cpp
@@ -780,7 +780,6 @@ bool variant::operator==(const variant& v) const
 	}
 	}
 
-	assert(false);
 	return false;
 }