I already know my own name...and i dont want to trade with myself.

2 files changed, 4 insertions, 0 deletions

diff --git a/src/engine.cpp b/src/engine.cpp
index 6c28d1c2..73ee30b1 100644
--- a/src/engine.cpp
+++ b/src/engine.cpp
@@ -351,11 +351,13 @@ void Engine::draw()
                             being->text_x + 3, being->text_y - 90);
                 }
 
+                if (being != player_node) {
                 graphics->setFont(speechFont);
                 graphics->drawText(being->getName(),
                                    being->text_x + 15, being->text_y + 30,
                                    gcn::Graphics::CENTER);
                 graphics->setFont(gui->getFont());
+                }
                 break;
 
                 // Draw a NPC
diff --git a/src/game.cpp b/src/game.cpp
index 4616e811..31b82b67 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -667,11 +667,13 @@ void do_input()
                         // Player default: trade
                         case Being::PLAYER:
                         {
+                            if (target != player_node) {
                             MessageOut outMsg;
                             outMsg.writeShort(0x00e4);
                             outMsg.writeLong(target->getId());
                             writeSet(6);
                             tradePartnerName = target->getName();
+                            }
                         }
                             break;