Style cleanups throughout most of the code. Splitting function type from

the function names should no longer be around.

Signed-off-by: Ira Rice <irarice@gmail.com>

1 files changed, 8 insertions, 8 deletions

diff --git a/src/resources/monsterdb.cpp b/src/resources/monsterdb.cpp
index 7e2d7a1d..92009826 100644
--- a/src/resources/monsterdb.cpp
+++ b/src/resources/monsterdb.cpp
@@ -25,6 +25,7 @@
 #include "../log.h"
 
 #include "../utils/dtor.h"
+#include "../utils/gettext.h"
 #include "../utils/xml.h"
 
 namespace
@@ -34,23 +35,22 @@ namespace
     bool mLoaded = false;
 }
 
-void
-MonsterDB::load()
+void MonsterDB::load()
 {
     if (mLoaded)
         return;
 
     mUnknown.addSprite("error.xml");
-    mUnknown.setName("unnamed");
+    mUnknown.setName(_("unnamed"));
 
-    logger->log("Initializing monster database...");
+    logger->log(_("Initializing monster database..."));
 
     XML::Document doc("monsters.xml");
     xmlNodePtr rootNode = doc.rootNode();
 
     if (!rootNode || !xmlStrEqual(rootNode->name, BAD_CAST "monsters"))
     {
-        logger->error("Monster Database: Error while loading monster.xml!");
+        logger->error(_("Monster Database: Error while loading monster.xml!"));
     }
 
     //iterate <monster>s
@@ -81,7 +81,7 @@ MonsterDB::load()
         }
         else
         {
-            logger->log("MonsterDB: Unknown target cursor type \"%s\" for %s - using medium sized one",
+            logger->log(_("MonsterDB: Unknown target cursor type \"%s\" for %s - using medium sized one"),
                         targetCursor.c_str(), currentInfo->getName().c_str());
             currentInfo->setTargetCursorSize(Being::TC_MEDIUM);
         }
@@ -118,7 +118,7 @@ MonsterDB::load()
                 }
                 else
                 {
-                    logger->log("MonsterDB: Warning, sound effect %s for unknown event %s of monster %s",
+                    logger->log(_("MonsterDB: Warning, sound effect %s for unknown event %s of monster %s"),
                                 filename, event.c_str(), currentInfo->getName().c_str());
                 }
             }
@@ -156,7 +156,7 @@ const MonsterInfo &MonsterDB::get(int id)
 
     if (i == mMonsterInfos.end())
     {
-        logger->log("MonsterDB: Warning, unknown monster ID %d requested", id);
+        logger->log(_("MonsterDB: Warning, unknown monster ID %d requested"), id);
         return mUnknown;
     }
     else