diff options
| author | David Athay <ko2fan@gmail.com> | 2008-06-17 16:52:44 +0000 |
|---|---|---|
| committer | David Athay <ko2fan@gmail.com> | 2008-06-17 16:52:44 +0000 |
| commit | 6d0785dc58aeba42f8cc5a1cb339749753f474c6 (patch) | |
| tree | 437ab0fbdbc04bee44e2ae3c47f5b6641efe1479 | |
| parent | 061f0dd698c40afa367db8b129c5ae319e92aade (diff) | |
| download | mana-6d0785dc58aeba42f8cc5a1cb339749753f474c6.tar.gz mana-6d0785dc58aeba42f8cc5a1cb339749753f474c6.tar.bz2 mana-6d0785dc58aeba42f8cc5a1cb339749753f474c6.tar.xz mana-6d0785dc58aeba42f8cc5a1cb339749753f474c6.zip | |
#333 Suppress 'trade with X cancelled' messages for ignored players.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | src/net/tradehandler.cpp | 8 | ||||
| -rw-r--r-- | tmw.cbp | 10 |
3 files changed, 21 insertions, 2 deletions
@@ -1,3 +1,8 @@ +2008-06-17 Fate <fate.tmw@googlemail.com> + + * src/net/tradehandler.cpp: bug #333: Suppress `trade with X cancelled' + messages for ignored players. + 2008-06-16 Fate <fate.tmw@googlemail.com> * player_relations.h: Allow whispers by default. diff --git a/src/net/tradehandler.cpp b/src/net/tradehandler.cpp index af000b3b..9599fa9d 100644 --- a/src/net/tradehandler.cpp +++ b/src/net/tradehandler.cpp @@ -125,8 +125,12 @@ void TradeHandler::handleMessage(MessageIn *msg) tradeWindow->setVisible(true); break; case 4: // Trade cancelled - chatWindow->chatLog("Trade with " + tradePartnerName + - " cancelled", BY_SERVER); + if (player_relations.hasPermission(tradePartnerName, + PlayerRelation::SPEECH_LOG)) + chatWindow->chatLog("Trade with " + tradePartnerName + + " cancelled", BY_SERVER); + // otherwise ignore silently + tradeWindow->setVisible(false); player_node->setTrading(false); break; @@ -162,6 +162,8 @@ <Unit filename="src/gui/passwordfield.h" /> <Unit filename="src/gui/playerbox.cpp" /> <Unit filename="src/gui/playerbox.h" /> + <Unit filename="src/gui/popup_box.cpp" /> + <Unit filename="src/gui/popup_box.h" /> <Unit filename="src/gui/popupmenu.cpp" /> <Unit filename="src/gui/popupmenu.h" /> <Unit filename="src/gui/progressbar.cpp" /> @@ -182,6 +184,8 @@ <Unit filename="src/gui/setup_joystick.h" /> <Unit filename="src/gui/setup_keyboard.cpp" /> <Unit filename="src/gui/setup_keyboard.h" /> + <Unit filename="src/gui/setup_players.cpp" /> + <Unit filename="src/gui/setup_players.h" /> <Unit filename="src/gui/setup_video.cpp" /> <Unit filename="src/gui/setup_video.h" /> <Unit filename="src/gui/setuptab.h" /> @@ -197,6 +201,10 @@ <Unit filename="src/gui/status.h" /> <Unit filename="src/gui/tabbedcontainer.cpp" /> <Unit filename="src/gui/tabbedcontainer.h" /> + <Unit filename="src/gui/table.cpp" /> + <Unit filename="src/gui/table.h" /> + <Unit filename="src/gui/table_model.cpp" /> + <Unit filename="src/gui/table_model.h" /> <Unit filename="src/gui/textbox.cpp" /> <Unit filename="src/gui/textbox.h" /> <Unit filename="src/gui/textfield.cpp" /> @@ -286,6 +294,8 @@ <Unit filename="src/particleemitter.h" /> <Unit filename="src/player.cpp" /> <Unit filename="src/player.h" /> + <Unit filename="src/player_relations.cpp" /> + <Unit filename="src/player_relations.h" /> <Unit filename="src/properties.h" /> <Unit filename="src/resources/action.cpp" /> <Unit filename="src/resources/action.h" /> |