Made map non-resizable. Stopped emote spamming.

2 files changed, 11 insertions, 4 deletions

diff --git a/src/gui/minimap.cpp b/src/gui/minimap.cpp
index 174151c6..8fc4c9ff 100644
--- a/src/gui/minimap.cpp
+++ b/src/gui/minimap.cpp
@@ -47,7 +47,10 @@ Minimap::Minimap():
     setWindowName("MiniMap");
     mShow = config.getValue(getWindowName() + "Show", true);
     setDefaultSize(5, 25, 100, 100);
-    setResizable(true);
+    // set this to false as the minimap window size is changed
+    //depending on the map size
+    setResizable(false);
+
     setDefaultVisible(true);
     setSaveVisible(true);
 
@@ -98,7 +101,7 @@ void Minimap::setMap(Map *map)
 
         setMinWidth(mapWidth > titleWidth ? mapWidth : titleWidth);
         setMinHeight(mapHeight);
-        
+
         mWidthProportion = (float) mMapImage->getWidth() / map->getWidth();
         mHeightProportion = (float) mMapImage->getHeight() / map->getHeight();
 
@@ -190,7 +193,7 @@ void Minimap::draw(gcn::Graphics *graphics)
             default:
                 continue;
         }
-        
+
 
         const int offsetHeight = (int) ((dotSize - 1) * mHeightProportion);
         const int offsetWidth = (int) ((dotSize - 1) * mWidthProportion);
diff --git a/src/net/ea/beinghandler.cpp b/src/net/ea/beinghandler.cpp
index 4b61ec61..b6eab2c7 100644
--- a/src/net/ea/beinghandler.cpp
+++ b/src/net/ea/beinghandler.cpp
@@ -329,7 +329,11 @@ void BeingHandler::handleMessage(MessageIn &msg)
             }
 
             if (player_relations.hasPermission(dstBeing, PlayerRelation::EMOTE))
-                dstBeing->setEmote(msg.readInt8(), EMOTION_TIME);
+            {
+                // only set emote if one doesnt already exist
+                if (!dstBeing->mEmotion)
+                    dstBeing->setEmote(msg.readInt8(), EMOTION_TIME);
+            }
 
             break;