diff options
| author | Andrei Karas <akaras@inbox.ru> | 2015-05-05 20:58:21 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2015-05-05 20:58:21 +0300 |
| commit | a87db81b6b7551a248e31e2850577aefda092538 (patch) | |
| tree | f47c20512183113face758cf58ec71369c82806c /src/gui/windows/shopwindow.cpp | |
| parent | 92c019dad798f1a84c5d3e8e8331a885f6458133 (diff) | |
| download | mv-a87db81b6b7551a248e31e2850577aefda092538.tar.gz mv-a87db81b6b7551a248e31e2850577aefda092538.tar.bz2 mv-a87db81b6b7551a248e31e2850577aefda092538.tar.xz mv-a87db81b6b7551a248e31e2850577aefda092538.zip | |
Replace most bools usage in playerinfo to strong typed bools.
Diffstat (limited to 'src/gui/windows/shopwindow.cpp')
| -rw-r--r-- | src/gui/windows/shopwindow.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/gui/windows/shopwindow.cpp b/src/gui/windows/shopwindow.cpp index 529b8131e..ca82c03c1 100644 --- a/src/gui/windows/shopwindow.cpp +++ b/src/gui/windows/shopwindow.cpp @@ -865,9 +865,11 @@ void ShopWindow::showList(const std::string &nick, std::string data) void ShopWindow::processRequest(const std::string &nick, std::string data, const int mode) { - if (!localPlayer || !mTradeNick.empty() || PlayerInfo::isTrading() - || !actorManager - || !actorManager->findBeingByName(nick, ActorType::Player)) + if (!localPlayer || + !mTradeNick.empty() || + PlayerInfo::isTrading() == Trading_true || + !actorManager || + !actorManager->findBeingByName(nick, ActorType::Player)) { return; } |