2 files changed, 5 insertions, 5 deletions
diff --git a/src/resources/emotedb.cpp b/src/resources/emotedb.cpp
index 6a001078..00721ac4 100644
--- a/src/resources/emotedb.cpp
+++ b/src/resources/emotedb.cpp
@@ -45,7 +45,7 @@ void EmoteDB::load()
         unload();
 
     mUnknown.name = "unknown";
-    mUnknown.effect = 0;
+    mUnknown.effect = -1;
     mUnknown.sprite = new ImageSprite(
         ResourceManager::getInstance()->getImage("graphics/sprites/error.png"));
 
@@ -91,7 +91,7 @@ void EmoteDB::load()
         const int width = XML::getProperty(emoteNode, "width", 0);
         const int height = XML::getProperty(emoteNode, "height", 0);
 
-        if (imageName.empty() || !(width > 0) || !(height > 0))
+        if (imageName.empty() || width <= 0 || height <= 0)
         {
             logger->log("Emote Database: Warning: Emote with bad imageset values");
             delete currentEmote;
@@ -150,7 +150,7 @@ const Emote *EmoteDB::get(int id)
     }
 }
 
-const int &EmoteDB::getLast()
+int EmoteDB::getLast()
 {
     return mLastEmote;
 }
diff --git a/src/resources/emotedb.h b/src/resources/emotedb.h
index 1324fb7e..a1e991ec 100644
--- a/src/resources/emotedb.h
+++ b/src/resources/emotedb.h
@@ -48,9 +48,9 @@ namespace EmoteDB
 
     const Emote *get(int id);
 
-    const int &getLast();
+    int getLast();
 
     typedef Emotes::iterator EmotesIterator;
 }
 
-#endif
+#endif // EMOTE_DB_H