diff options
| author | Andrei Karas <akaras@inbox.ru> | 2011-12-02 23:06:48 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2011-12-02 23:06:48 +0300 |
| commit | 5acadea119fc2a89e944dc9431e298e5e9544770 (patch) | |
| tree | 5199e73d8b924cb4ca3324f0f17a1a6696301d77 /src/gui | |
| parent | bf41736950d9e22be8b2b201dcd4833a50b26a99 (diff) | |
| download | manaplus-5acadea119fc2a89e944dc9431e298e5e9544770.tar.gz manaplus-5acadea119fc2a89e944dc9431e298e5e9544770.tar.bz2 manaplus-5acadea119fc2a89e944dc9431e298e5e9544770.tar.xz manaplus-5acadea119fc2a89e944dc9431e298e5e9544770.zip | |
Fix some issues after automatic code checking.
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/botcheckerwindow.cpp | 4 | ||||
| -rw-r--r-- | src/gui/widgets/chattab.cpp | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/src/gui/botcheckerwindow.cpp b/src/gui/botcheckerwindow.cpp index bff9ad31a..2043b4fe3 100644 --- a/src/gui/botcheckerwindow.cpp +++ b/src/gui/botcheckerwindow.cpp @@ -193,14 +193,14 @@ public: attackBot = true; // attacking but not talking more than 2 minutes - if (talk > 2 * 60 && talk > 2 * 60) + if (talk > 2 * 60) { talkBot = true; str += toString((talk) / 60) + " "; } // attacking but not moving more than 2 minutes - if (move > 2 * 60 && move > 2 * 60) + if (move > 2 * 60) { moveBot = true; str += toString((move) / 60); diff --git a/src/gui/widgets/chattab.cpp b/src/gui/widgets/chattab.cpp index 0a224605a..72af1b0b8 100644 --- a/src/gui/widgets/chattab.cpp +++ b/src/gui/widgets/chattab.cpp @@ -205,8 +205,7 @@ void ChatTab::chatLog(std::string line, Own own, // if configured, move magic messages log to debug chat tab if (localChatTab && this == localChatTab - && ((config.getBoolValue("showMagicInDebug") - && own == BY_PLAYER && tmp.text.length() > 1 + && ((config.getBoolValue("showMagicInDebug") && own == BY_PLAYER && tmp.text.length() > 1 && tmp.text.at(0) == '#' && tmp.text.at(1) != '#') || (config.getBoolValue("serverMsgInDebug") && (own == BY_SERVER |