From 5216cdc6569b9c7db80529ae9b4c00ea0d14abbc Mon Sep 17 00:00:00 2001 From: Bjørn Lindeijer Date: Sun, 15 Feb 2009 21:30:58 +0100 Subject: Fixed compiler warnings Comparison between signed and unsigned integer expressions. --- src/gui/char_select.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/gui') diff --git a/src/gui/char_select.cpp b/src/gui/char_select.cpp index 6e7548e8..9d5855ec 100644 --- a/src/gui/char_select.cpp +++ b/src/gui/char_select.cpp @@ -192,7 +192,7 @@ void CharSelectDialog::updatePlayerInfo() mNameLabel->setCaption(strprintf(_("Name: %s"), "")); mLevelLabel->setCaption(strprintf(_("Level: %d"), 0)); mJobLevelLabel->setCaption(strprintf(_("Job Level: %d"), 0)); - mMoneyLabel->setCaption(strprintf(_("Money: %d"), 0)); + mMoneyLabel->setCaption(strprintf(_("Money: %s"), "")); mNewDelCharButton->setCaption(_("New")); mSelectButton->setEnabled(false); } -- cgit v1.2.3-70-g09d2 From 4924e4a50ae31c30f783285f6e10ac3651c1e6e8 Mon Sep 17 00:00:00 2001 From: Bjørn Lindeijer Date: Mon, 16 Feb 2009 20:54:00 +0100 Subject: Fixed GUI opacity in SDL mode By using indexed instead of alpha-layered images, the GUI opacity can also be supported in software mode. --- data/graphics/gui/button.png | Bin 481 -> 360 bytes data/graphics/gui/button_disabled.png | Bin 358 -> 222 bytes data/graphics/gui/buttonhi.png | Bin 480 -> 360 bytes data/graphics/gui/buttonpress.png | Bin 424 -> 344 bytes data/graphics/gui/close_button.png | Bin 637 -> 471 bytes data/graphics/gui/deepbox.png | Bin 307 -> 219 bytes data/graphics/gui/default.png | Bin 1461 -> 832 bytes data/graphics/gui/hscroll_left_default.png | Bin 402 -> 339 bytes data/graphics/gui/hscroll_left_highlight.png | Bin 381 -> 300 bytes data/graphics/gui/hscroll_left_pressed.png | Bin 356 -> 323 bytes data/graphics/gui/hscroll_right_default.png | Bin 346 -> 325 bytes data/graphics/gui/hscroll_right_highlight.png | Bin 379 -> 330 bytes data/graphics/gui/hscroll_right_pressed.png | Bin 351 -> 325 bytes data/graphics/gui/item_shortcut_bgr.png | Bin 1366 -> 810 bytes data/graphics/gui/radioin.png | Bin 438 -> 460 bytes data/graphics/gui/radioout.png | Bin 346 -> 310 bytes data/graphics/gui/resize.png | Bin 518 -> 417 bytes data/graphics/gui/slider.png | Bin 615 -> 472 bytes data/graphics/gui/speech_bubble.png | Bin 2031 -> 1139 bytes data/graphics/gui/tab.png | Bin 427 -> 330 bytes data/graphics/gui/tabselected.png | Bin 407 -> 309 bytes data/graphics/gui/vscroll_blue.png | Bin 476 -> 338 bytes data/graphics/gui/vscroll_down_default.png | Bin 350 -> 330 bytes data/graphics/gui/vscroll_down_highlight.png | Bin 378 -> 339 bytes data/graphics/gui/vscroll_down_pressed.png | Bin 369 -> 333 bytes data/graphics/gui/vscroll_grey.png | Bin 452 -> 334 bytes data/graphics/gui/vscroll_red.png | Bin 471 -> 338 bytes data/graphics/gui/vscroll_up_default.png | Bin 359 -> 329 bytes data/graphics/gui/vscroll_up_highlight.png | Bin 381 -> 338 bytes data/graphics/gui/vscroll_up_pressed.png | Bin 345 -> 314 bytes src/gui/checkbox.cpp | 14 +++++--------- src/gui/progressbar.cpp | 11 +++++------ 32 files changed, 10 insertions(+), 15 deletions(-) (limited to 'src/gui') diff --git a/data/graphics/gui/button.png b/data/graphics/gui/button.png index ff50a908..77123707 100644 Binary files a/data/graphics/gui/button.png and b/data/graphics/gui/button.png differ diff --git a/data/graphics/gui/button_disabled.png b/data/graphics/gui/button_disabled.png index cb5a1b01..00cdb650 100644 Binary files a/data/graphics/gui/button_disabled.png and b/data/graphics/gui/button_disabled.png differ diff --git a/data/graphics/gui/buttonhi.png b/data/graphics/gui/buttonhi.png index da30f283..a308c6c0 100644 Binary files a/data/graphics/gui/buttonhi.png and b/data/graphics/gui/buttonhi.png differ diff --git a/data/graphics/gui/buttonpress.png b/data/graphics/gui/buttonpress.png index 4c45a45f..439634aa 100644 Binary files a/data/graphics/gui/buttonpress.png and b/data/graphics/gui/buttonpress.png differ diff --git a/data/graphics/gui/close_button.png b/data/graphics/gui/close_button.png index a0a6d144..4c0356fb 100644 Binary files a/data/graphics/gui/close_button.png and b/data/graphics/gui/close_button.png differ diff --git a/data/graphics/gui/deepbox.png b/data/graphics/gui/deepbox.png index 0980f57e..39ee2032 100644 Binary files a/data/graphics/gui/deepbox.png and b/data/graphics/gui/deepbox.png differ diff --git a/data/graphics/gui/default.png b/data/graphics/gui/default.png index 29353df8..93877ad8 100644 Binary files a/data/graphics/gui/default.png and b/data/graphics/gui/default.png differ diff --git a/data/graphics/gui/hscroll_left_default.png b/data/graphics/gui/hscroll_left_default.png index 6d21e7c0..eac8bc59 100644 Binary files a/data/graphics/gui/hscroll_left_default.png and b/data/graphics/gui/hscroll_left_default.png differ diff --git a/data/graphics/gui/hscroll_left_highlight.png b/data/graphics/gui/hscroll_left_highlight.png index 1dd79658..fa37f442 100644 Binary files a/data/graphics/gui/hscroll_left_highlight.png and b/data/graphics/gui/hscroll_left_highlight.png differ diff --git a/data/graphics/gui/hscroll_left_pressed.png b/data/graphics/gui/hscroll_left_pressed.png index 92478ec8..c893406a 100644 Binary files a/data/graphics/gui/hscroll_left_pressed.png and b/data/graphics/gui/hscroll_left_pressed.png differ diff --git a/data/graphics/gui/hscroll_right_default.png b/data/graphics/gui/hscroll_right_default.png index 94c0efeb..04bcec2f 100644 Binary files a/data/graphics/gui/hscroll_right_default.png and b/data/graphics/gui/hscroll_right_default.png differ diff --git a/data/graphics/gui/hscroll_right_highlight.png b/data/graphics/gui/hscroll_right_highlight.png index ef56538f..598f7f29 100644 Binary files a/data/graphics/gui/hscroll_right_highlight.png and b/data/graphics/gui/hscroll_right_highlight.png differ diff --git a/data/graphics/gui/hscroll_right_pressed.png b/data/graphics/gui/hscroll_right_pressed.png index 36cff58a..da9113d1 100644 Binary files a/data/graphics/gui/hscroll_right_pressed.png and b/data/graphics/gui/hscroll_right_pressed.png differ diff --git a/data/graphics/gui/item_shortcut_bgr.png b/data/graphics/gui/item_shortcut_bgr.png index 01f1643a..cdc12dd4 100644 Binary files a/data/graphics/gui/item_shortcut_bgr.png and b/data/graphics/gui/item_shortcut_bgr.png differ diff --git a/data/graphics/gui/radioin.png b/data/graphics/gui/radioin.png index 9034f469..de43c28a 100644 Binary files a/data/graphics/gui/radioin.png and b/data/graphics/gui/radioin.png differ diff --git a/data/graphics/gui/radioout.png b/data/graphics/gui/radioout.png index 4e088943..26287484 100644 Binary files a/data/graphics/gui/radioout.png and b/data/graphics/gui/radioout.png differ diff --git a/data/graphics/gui/resize.png b/data/graphics/gui/resize.png index 9890f83f..327787a0 100644 Binary files a/data/graphics/gui/resize.png and b/data/graphics/gui/resize.png differ diff --git a/data/graphics/gui/slider.png b/data/graphics/gui/slider.png index 32adf4f7..c0a3b6f2 100644 Binary files a/data/graphics/gui/slider.png and b/data/graphics/gui/slider.png differ diff --git a/data/graphics/gui/speech_bubble.png b/data/graphics/gui/speech_bubble.png index 3e678099..3f17af8c 100644 Binary files a/data/graphics/gui/speech_bubble.png and b/data/graphics/gui/speech_bubble.png differ diff --git a/data/graphics/gui/tab.png b/data/graphics/gui/tab.png index 71de8c8b..b277a5f8 100644 Binary files a/data/graphics/gui/tab.png and b/data/graphics/gui/tab.png differ diff --git a/data/graphics/gui/tabselected.png b/data/graphics/gui/tabselected.png index 98dd41c6..d84fabc7 100644 Binary files a/data/graphics/gui/tabselected.png and b/data/graphics/gui/tabselected.png differ diff --git a/data/graphics/gui/vscroll_blue.png b/data/graphics/gui/vscroll_blue.png index 295ca1a5..95708aba 100644 Binary files a/data/graphics/gui/vscroll_blue.png and b/data/graphics/gui/vscroll_blue.png differ diff --git a/data/graphics/gui/vscroll_down_default.png b/data/graphics/gui/vscroll_down_default.png index 4bf696b0..5c4c30cd 100644 Binary files a/data/graphics/gui/vscroll_down_default.png and b/data/graphics/gui/vscroll_down_default.png differ diff --git a/data/graphics/gui/vscroll_down_highlight.png b/data/graphics/gui/vscroll_down_highlight.png index a7459745..47c9d155 100644 Binary files a/data/graphics/gui/vscroll_down_highlight.png and b/data/graphics/gui/vscroll_down_highlight.png differ diff --git a/data/graphics/gui/vscroll_down_pressed.png b/data/graphics/gui/vscroll_down_pressed.png index e6238024..dfea0eb8 100644 Binary files a/data/graphics/gui/vscroll_down_pressed.png and b/data/graphics/gui/vscroll_down_pressed.png differ diff --git a/data/graphics/gui/vscroll_grey.png b/data/graphics/gui/vscroll_grey.png index 4d950a32..8bb4180e 100644 Binary files a/data/graphics/gui/vscroll_grey.png and b/data/graphics/gui/vscroll_grey.png differ diff --git a/data/graphics/gui/vscroll_red.png b/data/graphics/gui/vscroll_red.png index 0e50513c..bcc45c89 100644 Binary files a/data/graphics/gui/vscroll_red.png and b/data/graphics/gui/vscroll_red.png differ diff --git a/data/graphics/gui/vscroll_up_default.png b/data/graphics/gui/vscroll_up_default.png index c08a2b2a..2556998f 100644 Binary files a/data/graphics/gui/vscroll_up_default.png and b/data/graphics/gui/vscroll_up_default.png differ diff --git a/data/graphics/gui/vscroll_up_highlight.png b/data/graphics/gui/vscroll_up_highlight.png index 2f5ffade..3cbcd861 100644 Binary files a/data/graphics/gui/vscroll_up_highlight.png and b/data/graphics/gui/vscroll_up_highlight.png differ diff --git a/data/graphics/gui/vscroll_up_pressed.png b/data/graphics/gui/vscroll_up_pressed.png index 102bac86..8762d118 100644 Binary files a/data/graphics/gui/vscroll_up_pressed.png and b/data/graphics/gui/vscroll_up_pressed.png differ diff --git a/src/gui/checkbox.cpp b/src/gui/checkbox.cpp index 7a3e2fde..413c28d0 100644 --- a/src/gui/checkbox.cpp +++ b/src/gui/checkbox.cpp @@ -46,13 +46,10 @@ CheckBox::CheckBox(const std::string& caption, bool selected): checkBoxChecked = checkBox->getSubImage(9, 0, 9, 10); checkBoxDisabled = checkBox->getSubImage(18, 0, 9, 10); checkBoxDisabledChecked = checkBox->getSubImage(27, 0, 9, 10); - if (config.getValue("opengl", 0)) - { - checkBoxNormal->setAlpha(mAlpha); - checkBoxChecked->setAlpha(mAlpha); - checkBoxDisabled->setAlpha(mAlpha); - checkBoxDisabledChecked->setAlpha(mAlpha); - } + checkBoxNormal->setAlpha(mAlpha); + checkBoxChecked->setAlpha(mAlpha); + checkBoxDisabled->setAlpha(mAlpha); + checkBoxDisabledChecked->setAlpha(mAlpha); checkBox->decRef(); } @@ -88,8 +85,7 @@ void CheckBox::drawBox(gcn::Graphics* graphics) else box = checkBoxDisabled; - if (config.getValue("guialpha", 0.8) != mAlpha && - config.getValue("opengl", 0)) + if (config.getValue("guialpha", 0.8) != mAlpha) { mAlpha = config.getValue("guialpha", 0.8); checkBoxNormal->setAlpha(mAlpha); diff --git a/src/gui/progressbar.cpp b/src/gui/progressbar.cpp index 7463d4cc..bec86bb1 100644 --- a/src/gui/progressbar.cpp +++ b/src/gui/progressbar.cpp @@ -104,10 +104,7 @@ void ProgressBar::draw(gcn::Graphics *graphics) { if (config.getValue("guialpha", 0.8) != mAlpha) { - if (config.getValue("opengl", 0)) - mAlpha = config.getValue("guialpha", 0.8); - else - mAlpha = 1.0f; + mAlpha = config.getValue("guialpha", 0.8); for (int i = 0; i < 9; i++) { mBorder.grid[i]->setAlpha(mAlpha); @@ -120,7 +117,8 @@ void ProgressBar::draw(gcn::Graphics *graphics) const int alpha = (int)(mAlpha * 255.0f); // The bar - if (mProgress > 0) { + if (mProgress > 0) + { graphics->setColor(gcn::Color(mRed, mGreen, mBlue, alpha)); graphics->fillRectangle(gcn::Rectangle(4, 4, @@ -129,7 +127,8 @@ void ProgressBar::draw(gcn::Graphics *graphics) } // The label - if (!mText.empty()) { + if (!mText.empty()) + { gcn::Font *f = boldFont; const int textX = getWidth() / 2; const int textY = (getHeight() - f->getHeight()) / 2; -- cgit v1.2.3-70-g09d2 From d2c175c2d5fba8b78a45d70fbaf24d7b7afe7a3c Mon Sep 17 00:00:00 2001 From: Jared Adams Date: Mon, 16 Feb 2009 14:41:24 +0000 Subject: Fixed up NPC dialogs to behave more like eAthena expects. --- src/gui/npc_text.cpp | 19 +++++++++++-------- src/gui/npc_text.h | 3 ++- src/gui/npcintegerdialog.cpp | 2 +- src/gui/npclistdialog.cpp | 2 +- src/gui/npcstringdialog.cpp | 6 +++--- src/net/npchandler.cpp | 3 +-- src/npc.cpp | 4 ++-- 7 files changed, 21 insertions(+), 18 deletions(-) (limited to 'src/gui') diff --git a/src/gui/npc_text.cpp b/src/gui/npc_text.cpp index 88db46b3..ed75b76e 100644 --- a/src/gui/npc_text.cpp +++ b/src/gui/npc_text.cpp @@ -45,14 +45,15 @@ NpcTextDialog::NpcTextDialog(): mTextBox->setEditable(false); mTextBox->setOpaque(false); - scrollArea = new ScrollArea(mTextBox); - okButton = new Button(_("OK"), "ok", this); + mScrollArea = new ScrollArea(mTextBox); + mButton = new Button(_("OK"), "", this); + mButton->setActionEventId("ok"); - scrollArea->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_NEVER); - scrollArea->setVerticalScrollPolicy(gcn::ScrollArea::SHOW_ALWAYS); + mScrollArea->setHorizontalScrollPolicy(gcn::ScrollArea::SHOW_NEVER); + mScrollArea->setVerticalScrollPolicy(gcn::ScrollArea::SHOW_ALWAYS); - place(0, 0, scrollArea, 5).setPadding(3); - place(4, 1, okButton); + place(0, 0, mScrollArea, 5).setPadding(3); + place(4, 1, mButton); Layout &layout = getLayout(); layout.setRowHeight(0, Layout::AUTO_SET); @@ -64,7 +65,7 @@ NpcTextDialog::NpcTextDialog(): void NpcTextDialog::setText(const std::string &text) { mText = text; - mTextBox->setTextWrapped(mText, scrollArea->getWidth() - 15); + mTextBox->setTextWrapped(mText, mScrollArea->getWidth() - 15); } void NpcTextDialog::addText(const std::string &text) @@ -78,9 +79,11 @@ void NpcTextDialog::action(const gcn::ActionEvent &event) { setText(""); setVisible(false); + if (current_npc) current_npc->nextDialog(); - current_npc = 0; + + current_npc = NULL; } } diff --git a/src/gui/npc_text.h b/src/gui/npc_text.h index 1f2abd42..5e2ff118 100644 --- a/src/gui/npc_text.h +++ b/src/gui/npc_text.h @@ -80,8 +80,9 @@ class NpcTextDialog : public Window, public gcn::ActionListener private: gcn::Button *okButton; - gcn::ScrollArea *scrollArea; + gcn::ScrollArea *mScrollArea; TextBox *mTextBox; + gcn::Button *mButton; std::string mText; }; diff --git a/src/gui/npcintegerdialog.cpp b/src/gui/npcintegerdialog.cpp index 9db71d67..ea3398c9 100644 --- a/src/gui/npcintegerdialog.cpp +++ b/src/gui/npcintegerdialog.cpp @@ -100,7 +100,7 @@ void NpcIntegerDialog::action(const gcn::ActionEvent &event) { setVisible(false); current_npc->integerInput(mValueField->getValue()); - current_npc = 0; + current_npc = NULL; mValueField->reset(); } } diff --git a/src/gui/npclistdialog.cpp b/src/gui/npclistdialog.cpp index 59bf0716..81c33049 100644 --- a/src/gui/npclistdialog.cpp +++ b/src/gui/npclistdialog.cpp @@ -110,6 +110,6 @@ void NpcListDialog::action(const gcn::ActionEvent &event) setVisible(false); reset(); current_npc->dialogChoice(choice); - current_npc = 0; + current_npc = NULL; } } diff --git a/src/gui/npcstringdialog.cpp b/src/gui/npcstringdialog.cpp index 8d66d9bc..ef2de73a 100644 --- a/src/gui/npcstringdialog.cpp +++ b/src/gui/npcstringdialog.cpp @@ -24,12 +24,12 @@ #include "npcstringdialog.h" #include "textfield.h" +#include "widgets/layout.h" + #include "../npc.h" #include "../utils/gettext.h" -#include "widgets/layout.h" - NpcStringDialog::NpcStringDialog(): Window(_("NPC Text Request")) { @@ -65,7 +65,7 @@ void NpcStringDialog::action(const gcn::ActionEvent &event) setVisible(false); current_npc->stringInput(mValueField->getText()); - current_npc = 0; + current_npc = NULL; mValueField->setText(""); } diff --git a/src/net/npchandler.cpp b/src/net/npchandler.cpp index 8425a215..8ca529c8 100644 --- a/src/net/npchandler.cpp +++ b/src/net/npchandler.cpp @@ -79,8 +79,7 @@ void NPCHandler::handleMessage(MessageIn *msg) case SMSG_NPC_CLOSE: id = msg->readInt32(); - if (current_npc == dynamic_cast(beingManager->findBeing(id))) - current_npc = NULL; + current_npc = dynamic_cast(beingManager->findBeing(id)); break; case SMSG_NPC_NEXT: diff --git a/src/npc.cpp b/src/npc.cpp index c667e11e..3edb57a0 100644 --- a/src/npc.cpp +++ b/src/npc.cpp @@ -145,9 +145,9 @@ void NPC::stringInput(const std::string &value) { MessageOut outMsg(mNetwork); outMsg.writeInt16(CMSG_NPC_STR_RESPONSE); - outMsg.writeInt16(value.length() + 15); + outMsg.writeInt16(value.length() + 9); outMsg.writeInt32(mId); - outMsg.writeString(value, value.length() + 6); + outMsg.writeString(value, value.length()); outMsg.writeInt8(0); } -- cgit v1.2.3-70-g09d2 From 5964b89cbe0aa78768a6abfe37eafe70f50a3222 Mon Sep 17 00:00:00 2001 From: Ira Rice Date: Mon, 16 Feb 2009 16:45:56 -0700 Subject: Fixed a nasty crash that was only visible from the @help command. If the line's string was empty after trimming, the client would crash when trying to get a substring. Signed-off-by: Ira Rice --- src/gui/chat.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/gui') diff --git a/src/gui/chat.cpp b/src/gui/chat.cpp index b6fb7577..22126af3 100644 --- a/src/gui/chat.cpp +++ b/src/gui/chat.cpp @@ -117,12 +117,14 @@ void ChatWindow::chatLog(std::string line, int own, bool ignoreRecord) // Trim whitespace trim(line); + if (line.empty()) + return; + CHATLOG tmp; tmp.own = own; tmp.nick = ""; tmp.text = line; - std::string::size_type pos = line.find(" : "); if (pos != std::string::npos) { -- cgit v1.2.3-70-g09d2 From 31f2c0b41ccc6cfb857c45b23d5c9b1e0c1dc9ac Mon Sep 17 00:00:00 2001 From: Ira Rice Date: Mon, 16 Feb 2009 19:08:38 -0700 Subject: Trim whitespace from the beginning and end of whispers, as well as disallowing empty whispers and whispers to yourself, since both of those cases cause the server to report back stating that the player wasn't found (even if they are there, like yourself). Signed-off-by: Ira Rice --- src/gui/chat.cpp | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) (limited to 'src/gui') diff --git a/src/gui/chat.cpp b/src/gui/chat.cpp index 22126af3..a2ad102d 100644 --- a/src/gui/chat.cpp +++ b/src/gui/chat.cpp @@ -310,6 +310,11 @@ bool ChatWindow::isInputFocused() void ChatWindow::whisper(const std::string &nick, std::string msg) { + trim(msg); + + if (msg.empty()) + return; + std::string recvnick = ""; if (msg.substr(0, 1) == "\"") @@ -331,6 +336,22 @@ void ChatWindow::whisper(const std::string &nick, std::string msg) } } + std::string playerName = player_node->getName(); + std::string tempNick = recvnick; + + for (unsigned int i = 0; i < playerName.size(); i++) + { + playerName[i] = (char) tolower(playerName[i]); + } + + for (unsigned int i = 0; i < tempNick.size(); i++) + { + tempNick[i] = (char) tolower(tempNick[i]); + } + + if (tempNick.compare(playerName) == 0) + return; + MessageOut outMsg(mNetwork); outMsg.writeInt16(CMSG_CHAT_WHISPER); outMsg.writeInt16(msg.length() + 28); -- cgit v1.2.3-70-g09d2 From a40c16cac5356d18aa6fc3f4549ece152713cfe2 Mon Sep 17 00:00:00 2001 From: Ira Rice Date: Mon, 16 Feb 2009 19:19:12 -0700 Subject: Moved location of trim checking, since it really should be done after the recipient nickname is parsed out. Signed-off-by: Ira Rice --- src/gui/chat.cpp | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'src/gui') diff --git a/src/gui/chat.cpp b/src/gui/chat.cpp index a2ad102d..0e8810ac 100644 --- a/src/gui/chat.cpp +++ b/src/gui/chat.cpp @@ -310,11 +310,6 @@ bool ChatWindow::isInputFocused() void ChatWindow::whisper(const std::string &nick, std::string msg) { - trim(msg); - - if (msg.empty()) - return; - std::string recvnick = ""; if (msg.substr(0, 1) == "\"") @@ -336,6 +331,8 @@ void ChatWindow::whisper(const std::string &nick, std::string msg) } } + trim(msg); + std::string playerName = player_node->getName(); std::string tempNick = recvnick; @@ -349,7 +346,7 @@ void ChatWindow::whisper(const std::string &nick, std::string msg) tempNick[i] = (char) tolower(tempNick[i]); } - if (tempNick.compare(playerName) == 0) + if (tempNick.compare(playerName) == 0 || msg.empty()) return; MessageOut outMsg(mNetwork); -- cgit v1.2.3-70-g09d2