mnemonics: misc cleanup

Pass relevant information to the base class instead of overwriting
default values later, use objects instead of pointers to objects
to avoid having to new objects unnecessarily.

1 files changed, 3 insertions, 8 deletions

diff --git a/src/mnemonics/english.h b/src/mnemonics/english.h
index 703c7780c..e6cfa8951 100644
--- a/src/mnemonics/english.h
+++ b/src/mnemonics/english.h
@@ -49,9 +49,7 @@ namespace Language
   class English: public Base

   {

   public:

-    English()

-    {

-      word_list = new std::vector<std::string>({

+    English(): Base("English", std::vector<std::string>({

         "abbey",

         "abducts",

         "ability",

@@ -1678,11 +1676,8 @@ namespace Language
         "zombie",

         "zones",

         "zoom"

-      });

-      unique_prefix_length = 3;

-      word_map = new std::unordered_map<std::string, uint32_t>;

-      trimmed_word_map = new std::unordered_map<std::string, uint32_t>;

-      language_name = "English";

+      }), 3)

+    {

       populate_maps();

     }

   };