1 files changed, 107 insertions, 104 deletions

diff --git a/src/gui/popupmenu.cpp b/src/gui/popupmenu.cpp
index 6c0e6ad6..be5252f7 100644
--- a/src/gui/popupmenu.cpp
+++ b/src/gui/popupmenu.cpp
@@ -29,6 +29,7 @@
 #include "windowcontainer.h"
 
 #include "../being.h"
+#include "../beingmanager.h"
 #include "../floor_item.h"
 #include "../item.h"
 #include "../localplayer.h"
@@ -47,7 +48,7 @@ extern std::string tradePartnerName;
 
 PopupMenu::PopupMenu():
     Window(),
-    mBeing(NULL),
+    mBeingId(0),
     mFloorItem(NULL),
     mItem(NULL)
 {
@@ -65,57 +66,57 @@ PopupMenu::PopupMenu():
 
 void PopupMenu::showPopup(int x, int y, Being *being)
 {
-    mBeing = being;
+    mBeingId = being->getId();
     mBrowserBox->clearRows();
 
-    switch (mBeing->getType())
+    switch (being->getType())
     {
-	case Being::PLAYER:
-	    {
-		// Players can be traded with. Later also attack, follow and
-		// add as buddy will be options in this menu.
-		const std::string &name = mBeing->getName();
-		mBrowserBox->addRow(strprintf(_("@@trade|Trade With %s@@"), name.c_str()));
-		mBrowserBox->addRow(strprintf(_("@@attack|Attack %s@@"), name.c_str()));
-
-		mBrowserBox->addRow("##3---");
-
-		switch (player_relations.getRelation(name)) {
-		case PlayerRelation::NEUTRAL:
-		    mBrowserBox->addRow(strprintf(_("@@friend|Befriend %s@@"), name.c_str()));
-
-		case PlayerRelation::FRIEND:
-		    mBrowserBox->addRow(strprintf(_("@@disregard|Disregard %s@@"), name.c_str()));
-		    mBrowserBox->addRow(strprintf(_("@@ignore|Ignore %s@@"), name.c_str()));
-		    break;
-
-		case PlayerRelation::DISREGARDED:
-		    mBrowserBox->addRow(strprintf(_("@@unignore|Un-Ignore %s@@"), name.c_str()));
-		    mBrowserBox->addRow(strprintf(_("@@ignore|Completely ignore %s@@"), name.c_str()));
-		    break;
-
-		case PlayerRelation::IGNORED:
-		    mBrowserBox->addRow(strprintf(_("@@unignore|Un-Ignore %s@@"), name.c_str()));
-		    break;
-		}
-
-		//mBrowserBox->addRow(_("@@follow|Follow ") + name + "@@");
-		//mBrowserBox->addRow(_("@@buddy|Add ") + name + " to Buddy List@@");
-
-		mBrowserBox->addRow("##3---");
-		mBrowserBox->addRow(strprintf(_("@@party-invite|Invite %s to party@@"), name.c_str()));
-	    }
-	    break;
-
-	case Being::NPC:
-	    // NPCs can be talked to (single option, candidate for removal
-	    // unless more options would be added)
-	    mBrowserBox->addRow(_("@@talk|Talk To NPC@@"));
-	    break;
-
-	default:
-	    /* Other beings aren't interesting... */
-	    break;
+        case Being::PLAYER:
+            {
+                // Players can be traded with. Later also attack, follow and
+                // add as buddy will be options in this menu.
+                const std::string &name = being->getName();
+                mBrowserBox->addRow(strprintf(_("@@trade|Trade With %s@@"), name.c_str()));
+                mBrowserBox->addRow(strprintf(_("@@attack|Attack %s@@"), name.c_str()));
+
+                mBrowserBox->addRow("##3---");
+
+                switch (player_relations.getRelation(name)) {
+                    case PlayerRelation::NEUTRAL:
+                        mBrowserBox->addRow(strprintf(_("@@friend|Befriend %s@@"), name.c_str()));
+
+                    case PlayerRelation::FRIEND:
+                        mBrowserBox->addRow(strprintf(_("@@disregard|Disregard %s@@"), name.c_str()));
+                        mBrowserBox->addRow(strprintf(_("@@ignore|Ignore %s@@"), name.c_str()));
+                        break;
+
+                    case PlayerRelation::DISREGARDED:
+                        mBrowserBox->addRow(strprintf(_("@@unignore|Un-Ignore %s@@"), name.c_str()));
+                        mBrowserBox->addRow(strprintf(_("@@ignore|Completely ignore %s@@"), name.c_str()));
+                        break;
+
+                    case PlayerRelation::IGNORED:
+                        mBrowserBox->addRow(strprintf(_("@@unignore|Un-Ignore %s@@"), name.c_str()));
+                        break;
+                }
+
+                //mBrowserBox->addRow(_("@@follow|Follow ") + name + "@@");
+                //mBrowserBox->addRow(_("@@buddy|Add ") + name + " to Buddy List@@");
+
+                mBrowserBox->addRow("##3---");
+                mBrowserBox->addRow(strprintf(_("@@party-invite|Invite %s to party@@"), name.c_str()));
+            }
+            break;
+
+        case Being::NPC:
+            // NPCs can be talked to (single option, candidate for removal
+            // unless more options would be added)
+            mBrowserBox->addRow(_("@@talk|Talk To NPC@@"));
+            break;
+
+        default:
+            /* Other beings aren't interesting... */
+            break;
     }
 
     //browserBox->addRow("@@look|Look To@@");
@@ -143,58 +144,60 @@ void PopupMenu::showPopup(int x, int y, FloorItem *floorItem)
 
 void PopupMenu::handleLink(const std::string& link)
 {
+    Being *being = beingManager->findBeing(mBeingId);
+
     // Talk To action
     if (link == "talk" &&
-	mBeing != NULL &&
-	mBeing->getType() == Being::NPC &&
-	current_npc == 0)
+        being != NULL &&
+        being->getType() == Being::NPC &&
+        current_npc == 0)
     {
-	dynamic_cast<NPC*>(mBeing)->talk();
+        dynamic_cast<NPC*>(being)->talk();
     }
 
     // Trade action
     else if (link == "trade" &&
-	     mBeing != NULL &&
-	     mBeing->getType() == Being::PLAYER)
+             being != NULL &&
+             being->getType() == Being::PLAYER)
     {
-	player_node->trade(mBeing);
-	tradePartnerName = mBeing->getName();
+        player_node->trade(being);
+        tradePartnerName = being->getName();
     }
 
     // Attack action
     else if (link == "attack" &&
-	     mBeing != NULL &&
-	     mBeing->getType() == Being::PLAYER)
+             being != NULL &&
+             being->getType() == Being::PLAYER)
     {
-	player_node->attack(mBeing, true);
+        player_node->attack(being, true);
     }
 
     else if (link == "unignore" &&
-	     mBeing != NULL &&
-	     mBeing->getType() == Being::PLAYER)
+             being != NULL &&
+             being->getType() == Being::PLAYER)
     {
-	player_relations.setRelation(mBeing->getName(), PlayerRelation::NEUTRAL);
+        player_relations.setRelation(being->getName(), PlayerRelation::NEUTRAL);
     }
 
     else if (link == "ignore" &&
-	     mBeing != NULL &&
-	     mBeing->getType() == Being::PLAYER)
+             being != NULL &&
+             being->getType() == Being::PLAYER)
     {
-	player_relations.setRelation(mBeing->getName(), PlayerRelation::IGNORED);
+        player_relations.setRelation(being->getName(), PlayerRelation::IGNORED);
     }
 
     else if (link == "disregard" &&
-	     mBeing != NULL &&
-	     mBeing->getType() == Being::PLAYER)
+             being != NULL &&
+             being->getType() == Being::PLAYER)
     {
-	player_relations.setRelation(mBeing->getName(), PlayerRelation::DISREGARDED);
+        player_relations.setRelation(being->getName(), PlayerRelation::DISREGARDED);
     }
 
     else if (link == "friend" &&
-	     mBeing != NULL &&
-	     mBeing->getType() == Being::PLAYER)
+             being != NULL &&
+             being->getType() == Being::PLAYER)
     {
-	player_relations.setRelation(mBeing->getName(), PlayerRelation::FRIEND);
+        player_relations.setRelation(being->getName(), PlayerRelation::FRIEND);
     }
 
     /*
@@ -205,18 +208,18 @@ void PopupMenu::handleLink(const std::string& link)
 
     /*
     // Add Buddy action
-    else if ((link == "buddy") && mBeing != NULL && mBeing->isPlayer())
+    else if ((link == "buddy") && being != NULL && being->isPlayer())
     {
-	if (!buddyWindow->isVisible())
-	    buddyWindow->setVisible(true);
+        if (!buddyWindow->isVisible())
+            buddyWindow->setVisible(true);
 
-	buddyWindow->addBuddy(mBeing->getName());
+        buddyWindow->addBuddy(being->getName());
     }*/
 
     // Pick Up Floor Item action
     else if ((link == "pickup") && mFloorItem != NULL)
     {
-	player_node->pickUp(mFloorItem);
+        player_node->pickUp(mFloorItem);
     }
 
     // Look To action
@@ -226,51 +229,51 @@ void PopupMenu::handleLink(const std::string& link)
 
     else if (link == "use")
     {
-	assert(mItem);
-	if (mItem->isEquipment())
-	{
-	    if (mItem->isEquipped())
-	    {
-		player_node->unequipItem(mItem);
-	    }
-	    else
-	    {
-		player_node->equipItem(mItem);
-	    }
-	}
-	else
-	{
-	    player_node->useItem(mItem);
-	}
+        assert(mItem);
+        if (mItem->isEquipment())
+        {
+            if (mItem->isEquipped())
+            {
+                player_node->unequipItem(mItem);
+            }
+            else
+            {
+                player_node->equipItem(mItem);
+            }
+        }
+        else
+        {
+            player_node->useItem(mItem);
+        }
     }
 
     else if (link == "chat")
     {
-	chatWindow->addItemText(mItem->getInfo().getName());
+        chatWindow->addItemText(mItem->getInfo().getName());
     }
 
     else if (link == "drop")
     {
-	new ItemAmountWindow(AMOUNT_ITEM_DROP, inventoryWindow, mItem);
+        new ItemAmountWindow(AMOUNT_ITEM_DROP, inventoryWindow, mItem);
     }
     else if (link == "party-invite" &&
-	     mBeing != NULL &&
-	     mBeing->getType() == Being::PLAYER)
+             being != NULL &&
+             being->getType() == Being::PLAYER)
     {
-	MessageOut outMsg(player_node->getNetwork());
-	outMsg.writeInt16(CMSG_PARTY_INVITE);
-	outMsg.writeInt32(mBeing->getId());
+        MessageOut outMsg(player_node->getNetwork());
+        outMsg.writeInt16(CMSG_PARTY_INVITE);
+        outMsg.writeInt32(being->getId());
     }
 
     // Unknown actions
     else
     {
-	std::cout << link << std::endl;
+        std::cout << link << std::endl;
     }
 
     setVisible(false);
 
-    mBeing = NULL;
+    mBeingId = 0;
     mFloorItem = NULL;
     mItem = NULL;
 }
@@ -303,9 +306,9 @@ void PopupMenu::showPopup(int x, int y)
 {
     setContentSize(mBrowserBox->getWidth() + 8, mBrowserBox->getHeight() + 8);
     if (windowContainer->getWidth() < (x + getWidth() + 5))
-	x = windowContainer->getWidth() - getWidth();
+        x = windowContainer->getWidth() - getWidth();
     if (windowContainer->getHeight() < (y + getHeight() + 5))
-	y = windowContainer->getHeight() - getHeight();
+        y = windowContainer->getHeight() - getHeight();
     setPosition(x, y);
     setVisible(true);
     requestMoveToTop();