From 9b25edfe24395fdee2ad06c85a0f9c0a6117aaa8 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Tue, 16 Sep 2014 23:56:49 +0300
Subject: Remove getter for adminHandler.
---
src/gui/popups/popupmenu.cpp | 14 +++++++-------
src/gui/windows/buydialog.cpp | 2 +-
2 files changed, 8 insertions(+), 8 deletions(-)
(limited to 'src/gui')
diff --git a/src/gui/popups/popupmenu.cpp b/src/gui/popups/popupmenu.cpp
index 6298b7b14..00b19ee38 100644
--- a/src/gui/popups/popupmenu.cpp
+++ b/src/gui/popups/popupmenu.cpp
@@ -1319,7 +1319,7 @@ void PopupMenu::handleLink(const std::string &link,
(being->getType() == ActorType::Player ||
being->getType() == ActorType::Monster))
{
- Net::getAdminHandler()->kick(being->getId());
+ adminHandler->kick(being->getId());
}
else if (link == "chat close" && mTab)
{
@@ -1339,7 +1339,7 @@ void PopupMenu::handleLink(const std::string &link,
{
if (Game::instance())
{
- Net::getAdminHandler()->warp(Game::instance()->getCurrentMapName(),
+ adminHandler->warp(Game::instance()->getCurrentMapName(),
mMapItem->getX(), mMapItem->getY());
}
}
@@ -1347,7 +1347,7 @@ void PopupMenu::handleLink(const std::string &link,
{
if (Game::instance())
{
- Net::getAdminHandler()->warp(Game::instance()->getCurrentMapName(),
+ adminHandler->warp(Game::instance()->getCurrentMapName(),
mX, mY);
}
}
@@ -1784,19 +1784,19 @@ void PopupMenu::handleLink(const std::string &link,
}
else if (link == "goto" && !mNick.empty())
{
- Net::getAdminHandler()->gotoName(mNick);
+ adminHandler->gotoName(mNick);
}
else if (link == "recall" && !mNick.empty())
{
- Net::getAdminHandler()->recallName(mNick);
+ adminHandler->recallName(mNick);
}
else if (link == "revive" && !mNick.empty())
{
- Net::getAdminHandler()->reviveName(mNick);
+ adminHandler->reviveName(mNick);
}
else if (link == "ipcheck" && !mNick.empty())
{
- Net::getAdminHandler()->ipcheckName(mNick);
+ adminHandler->ipcheckName(mNick);
}
else if (link == "gm" && !mNick.empty())
{
diff --git a/src/gui/windows/buydialog.cpp b/src/gui/windows/buydialog.cpp
index ce22252a0..c09044f7b 100644
--- a/src/gui/windows/buydialog.cpp
+++ b/src/gui/windows/buydialog.cpp
@@ -434,7 +434,7 @@ void BuyDialog::action(const ActionEvent &event)
if (mNpcId == -2)
{
const ShopItem *const item = mShopItems->at(selectedItem);
- Net::getAdminHandler()->createItems(item->getId(),
+ adminHandler->createItems(item->getId(),
mAmountItems, item->getColor());
}
else if (mNpcId != -1)
--
cgit v1.2.3-70-g09d2