diff options
| author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2005-06-19 21:48:49 +0000 |
|---|---|---|
| committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2005-06-19 21:48:49 +0000 |
| commit | 5ccd40564e9524420056a1423209a3066d6db657 (patch) | |
| tree | 5abbb5b9326105d19a693207171de88186c2161d /src/gui/popupmenu.cpp | |
| parent | 9db14810dd0387f1fa63a4e3bba9b05947bd5d9f (diff) | |
| download | mana-5ccd40564e9524420056a1423209a3066d6db657.tar.gz mana-5ccd40564e9524420056a1423209a3066d6db657.tar.bz2 mana-5ccd40564e9524420056a1423209a3066d6db657.tar.xz mana-5ccd40564e9524420056a1423209a3066d6db657.zip | |
Mostly indenting fixes and corrected path for OpenGL font version.
Diffstat (limited to 'src/gui/popupmenu.cpp')
| -rw-r--r-- | src/gui/popupmenu.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/gui/popupmenu.cpp b/src/gui/popupmenu.cpp index 911ed6dd..247bb2ce 100644 --- a/src/gui/popupmenu.cpp +++ b/src/gui/popupmenu.cpp @@ -32,7 +32,7 @@ PopupMenu::PopupMenu(): { setResizable(false); setTitleBarHeight(0); - + browserBox = new BrowserBox(); browserBox->setPosition(4, 4); browserBox->setHighlightMode(BrowserBox::BACKGROUND); @@ -52,7 +52,7 @@ PopupMenu::~PopupMenu() delete being; delete floorItem; } - + void PopupMenu::setVisible(bool visible) { if (visible == false) @@ -63,10 +63,10 @@ void PopupMenu::setVisible(bool visible) } setPosition(screen->w, screen->h); } - + mVisible = visible; } - + void PopupMenu::showPopup(int mx, int my) { being = findNode(mx, my); @@ -74,7 +74,7 @@ void PopupMenu::showPopup(int mx, int my) mX = mx; mY = mY; browserBox->clearRows(); - + if (being) { if (being->isMonster()) @@ -106,7 +106,7 @@ void PopupMenu::showPopup(int mx, int my) //browserBox->addRow("@@look|Look To@@"); browserBox->addRow("##3---"); browserBox->addRow("@@cancel|Cancel@@"); - + setContentSize(browserBox->getWidth() + 8, browserBox->getHeight() + 8); mx = (mx - camera_x) * 32 + 25; my = (my - camera_y) * 32 + 25; @@ -148,7 +148,7 @@ void PopupMenu::handleLink(const std::string& link) attack(being); } } - + // Talk To action else if ((link == "talk") && being && being->isNpc() && (current_npc == 0)) @@ -176,10 +176,10 @@ void PopupMenu::handleLink(const std::string& link) // Add Buddy action else if ((link == "buddy") && being && being->isPlayer()) { - if(!buddyWindow->isVisible()) + if (!buddyWindow->isVisible()) buddyWindow->setVisible(true); - - buddyWindow->addBuddy(being->name); + + buddyWindow->addBuddy(being->name); } // Pick Up Floor Item action |