Reduced dependency on json-related hacks

1 files changed, 1 insertions, 5 deletions

diff --git a/src/entry.h b/src/entry.h
index c745097..efc402b 100644
--- a/src/entry.h
+++ b/src/entry.h
@@ -10,9 +10,6 @@ namespace creature {
 namespace entry {
     class Entry;
 
-    // Set up default text generation
-    std::string genText(const Entry& e, const creature::Creature& c);
-    
     class Entry : public Jsonable {
         public:
             static std::shared_ptr<Entry> create(const nlohmann::json& data);
@@ -23,8 +20,7 @@ namespace entry {
             virtual std::string getText(void) const {return text;}
             void setText(std::string t) {text = t;}
             virtual std::string getText(const creature::Creature& c) const {
-                //return genText(*this, c);
-                return genText(*this, c) + ": " + getText();
+                return getName() + " (" + getType() + "): " + getText();
             }
 
             virtual nlohmann::json toJson(void) const {