diff options
| author | Andrei Karas <akaras@inbox.ru> | 2013-08-23 23:17:19 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2013-08-24 21:08:17 +0300 |
| commit | c88734cc2b8a0785c23531ce70bf703887aa0c4b (patch) | |
| tree | cdb4448b0bea29f9d9c61401ce91a00f92e2a5f5 /src/gui | |
| parent | d3994b21fda3e7d8ba417a382fc8f065a7bf1c52 (diff) | |
| download | manaverse-c88734cc2b8a0785c23531ce70bf703887aa0c4b.tar.gz manaverse-c88734cc2b8a0785c23531ce70bf703887aa0c4b.tar.bz2 manaverse-c88734cc2b8a0785c23531ce70bf703887aa0c4b.tar.xz manaverse-c88734cc2b8a0785c23531ce70bf703887aa0c4b.zip | |
remove most static methods from Client.
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/npcdialog.cpp | 10 | ||||
| -rw-r--r-- | src/gui/whoisonline.cpp | 4 | ||||
| -rw-r--r-- | src/gui/widgets/window.cpp | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/src/gui/npcdialog.cpp b/src/gui/npcdialog.cpp index 576db564b..bddbbaf46 100644 --- a/src/gui/npcdialog.cpp +++ b/src/gui/npcdialog.cpp @@ -291,7 +291,7 @@ void NpcDialog::action(const gcn::ActionEvent &event) { if (mActionState == NPC_ACTION_NEXT) { - if (!Client::limitPackets(PACKET_NPC_NEXT)) + if (!client->limitPackets(PACKET_NPC_NEXT)) return; nextDialog(); @@ -316,7 +316,7 @@ void NpcDialog::action(const gcn::ActionEvent &event) if (selectedIndex >= static_cast<int>(mItems.size()) || selectedIndex < 0 - || !Client::limitPackets(PACKET_NPC_INPUT)) + || !client->limitPackets(PACKET_NPC_INPUT)) { return; } @@ -329,14 +329,14 @@ void NpcDialog::action(const gcn::ActionEvent &event) } case NPC_INPUT_STRING: { - if (!Client::limitPackets(PACKET_NPC_INPUT)) + if (!client->limitPackets(PACKET_NPC_INPUT)) return; printText = mTextField->getText(); Net::getNpcHandler()->stringInput(mNpcId, printText); } case NPC_INPUT_INTEGER: { - if (!Client::limitPackets(PACKET_NPC_INPUT)) + if (!client->limitPackets(PACKET_NPC_INPUT)) return; printText = strprintf("%d", mIntField->getValue()); Net::getNpcHandler()->integerInput( @@ -344,7 +344,7 @@ void NpcDialog::action(const gcn::ActionEvent &event) } case NPC_INPUT_ITEM: { - if (!Client::limitPackets(PACKET_NPC_INPUT)) + if (!client->limitPackets(PACKET_NPC_INPUT)) return; const Item *const item = mInventory->getItem(0); diff --git a/src/gui/whoisonline.cpp b/src/gui/whoisonline.cpp index d454eb2f3..4b1c638ca 100644 --- a/src/gui/whoisonline.cpp +++ b/src/gui/whoisonline.cpp @@ -593,7 +593,7 @@ void WhoIsOnline::download() } else { - if (Client::limitPackets(PACKET_ONLINELIST)) + if (client->limitPackets(PACKET_ONLINELIST)) Net::getPlayerHandler()->requestOnlineList(); } } @@ -691,7 +691,7 @@ void WhoIsOnline::action(const gcn::ActionEvent &event) } else { - if (Client::limitPackets(PACKET_ONLINELIST)) + if (client->limitPackets(PACKET_ONLINELIST)) { mUpdateTimer = cur_time; Net::getPlayerHandler()->requestOnlineList(); diff --git a/src/gui/widgets/window.cpp b/src/gui/widgets/window.cpp index 485f875fc..38fd315fb 100644 --- a/src/gui/widgets/window.cpp +++ b/src/gui/widgets/window.cpp @@ -168,7 +168,7 @@ Window::~Window() if (gui) gui->removeDragged(this); - Client::windowRemoved(this); + client->windowRemoved(this); saveWindowState(); |