From fa68f4ad4b2f776af834f8209b51761f6c2ba125 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Tue, 16 Aug 2011 22:52:46 +0300
Subject: Show shop sign to other players only if shop is not empty.

---
 src/gui/shopwindow.cpp        | 9 +++++++++
 src/gui/shopwindow.h          | 2 ++
 src/gui/widgets/shopitems.cpp | 5 +++++
 src/gui/widgets/shopitems.h   | 2 ++
 src/localplayer.cpp           | 3 ++-
 5 files changed, 20 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/gui/shopwindow.cpp b/src/gui/shopwindow.cpp
index 68ea57314..4311a04d2 100644
--- a/src/gui/shopwindow.cpp
+++ b/src/gui/shopwindow.cpp
@@ -803,3 +803,12 @@ int ShopWindow::sumAmount(Item *shopItem)
     }
     return sum;
 }
+
+bool ShopWindow::isShopEmpty()
+{
+    if (!mBuyShopItems || !mSellShopItems)
+        return true;
+    if (mBuyShopItems->empty() && mSellShopItems->empty())
+        return true;
+    return false;
+}
diff --git a/src/gui/shopwindow.h b/src/gui/shopwindow.h
index e07803225..e3fd9a5ca 100644
--- a/src/gui/shopwindow.h
+++ b/src/gui/shopwindow.h
@@ -133,6 +133,8 @@ class ShopWindow : public Window, public gcn::ActionListener,
 
         bool checkFloodCounter(int &counterTime);
 
+        bool isShopEmpty();
+
     private:
         void startTrade();
 
diff --git a/src/gui/widgets/shopitems.cpp b/src/gui/widgets/shopitems.cpp
index c5bcd88c4..e15445b77 100644
--- a/src/gui/widgets/shopitems.cpp
+++ b/src/gui/widgets/shopitems.cpp
@@ -43,6 +43,11 @@ int ShopItems::getNumberOfElements()
     return static_cast<int>(mShopItems.size());
 }
 
+bool ShopItems::empty()
+{
+    return mShopItems.empty();
+}
+
 std::string ShopItems::getElementAt(int i)
 {
     if (i < 0 || static_cast<unsigned>(i) >= mShopItems.size()
diff --git a/src/gui/widgets/shopitems.h b/src/gui/widgets/shopitems.h
index abfcffb71..29d24cb64 100644
--- a/src/gui/widgets/shopitems.h
+++ b/src/gui/widgets/shopitems.h
@@ -76,6 +76,8 @@ class ShopItems : public gcn::ListModel
          */
         int getNumberOfElements();
 
+        bool empty();
+
         /**
          * Returns the name of item number i in the shop.
          *
diff --git a/src/localplayer.cpp b/src/localplayer.cpp
index 9f0a7c5f3..0dcf7e7c2 100644
--- a/src/localplayer.cpp
+++ b/src/localplayer.cpp
@@ -50,6 +50,7 @@
 #include "gui/okdialog.h"
 #include "gui/outfitwindow.h"
 #include "gui/palette.h"
+#include "gui/shopwindow.h"
 #include "gui/skilldialog.h"
 #include "gui/socialwindow.h"
 #include "gui/statuswindow.h"
@@ -344,7 +345,7 @@ void LocalPlayer::logic()
     if (mEnableAdvert && !mBlockAdvert && mAdvertTime < cur_time)
     {
         Uint8 smile = FLAG_SPECIAL;
-        if (mTradebot)
+        if (mTradebot && shopWindow && !shopWindow->isShopEmpty())
             smile += FLAG_SHOP;
 
         if (mAwayMode)
-- 
cgit v1.2.3-70-g09d2