1 files changed, 41 insertions, 28 deletions

diff --git a/src/gui/popupmenu.cpp b/src/gui/popupmenu.cpp
index 02be3055..7627c1ad 100644
--- a/src/gui/popupmenu.cpp
+++ b/src/gui/popupmenu.cpp
@@ -1,9 +1,8 @@
 /*
- *  Aethyra
+ *  The Mana World
  *  Copyright (C) 2004  The Mana World Development Team
  *
- *  This file is part of Aethyra based on original code
- *  from The Mana World.
+ *  This file is part of The Mana World.
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -57,7 +56,7 @@ PopupMenu::PopupMenu():
     setTitleBarHeight(0);
     setShowTitle(false);
 
-    mBrowserBox = new BrowserBox();
+    mBrowserBox = new BrowserBox;
     mBrowserBox->setPosition(4, 4);
     mBrowserBox->setHighlightMode(BrowserBox::BACKGROUND);
     mBrowserBox->setOpaque(false);
@@ -83,22 +82,22 @@ void PopupMenu::showPopup(int x, int y, Being *being)
                 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;
+                    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 + "@@");
@@ -148,42 +147,55 @@ void PopupMenu::handleLink(const std::string& link)
     Being *being = beingManager->findBeing(mBeingId);
 
     // Talk To action
-    if (link == "talk" && being && being->getType() == Being::NPC &&
+    if (link == "talk" &&
+        being &&
+        being->getType() == Being::NPC &&
         current_npc == 0)
     {
         dynamic_cast<NPC*>(being)->talk();
     }
 
     // Trade action
-    else if (link == "trade" && being && being->getType() == Being::PLAYER)
+    else if (link == "trade" &&
+             being &&
+             being->getType() == Being::PLAYER)
     {
         player_node->trade(being);
         tradePartnerName = being->getName();
     }
 
     // Attack action
-    else if (link == "attack" && being && being->getType() == Being::PLAYER)
+    else if (link == "attack" &&
+             being &&
+             being->getType() == Being::PLAYER)
     {
         player_node->attack(being, true);
     }
 
-    else if (link == "unignore" && being && being->getType() == Being::PLAYER)
+    else if (link == "unignore" &&
+             being &&
+             being->getType() == Being::PLAYER)
     {
         player_relations.setRelation(being->getName(), PlayerRelation::NEUTRAL);
     }
 
-    else if (link == "ignore" && being && being->getType() == Being::PLAYER)
+    else if (link == "ignore" &&
+             being &&
+             being->getType() == Being::PLAYER)
     {
         player_relations.setRelation(being->getName(), PlayerRelation::IGNORED);
     }
 
-    else if (link == "disregard" && being &&
+    else if (link == "disregard" &&
+             being &&
              being->getType() == Being::PLAYER)
     {
         player_relations.setRelation(being->getName(), PlayerRelation::DISREGARDED);
     }
 
-    else if (link == "friend" && being && being->getType() == Being::PLAYER)
+    else if (link == "friend" &&
+             being &&
+             being->getType() == Being::PLAYER)
     {
         player_relations.setRelation(being->getName(), PlayerRelation::FRIEND);
     }
@@ -244,7 +256,8 @@ void PopupMenu::handleLink(const std::string& link)
     {
         new ItemAmountWindow(AMOUNT_ITEM_DROP, inventoryWindow, mItem);
     }
-    else if (link == "party-invite" && being &&
+    else if (link == "party-invite" &&
+             being &&
              being->getType() == Being::PLAYER)
     {
         MessageOut outMsg(player_node->getNetwork());