diff options
author | Loïc Blot <nerzhul@users.noreply.github.com> | 2017-08-19 22:23:47 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-08-19 22:23:47 +0200 |
commit | 88b436e6a9c98af7215bd115e1b7a3f1a1db99d3 (patch) | |
tree | f07cdd7f93ca26b84192d7b89f7b952e603ba5cf /src/network/clientpackethandler.cpp | |
parent | 7528986e4449febead9b18b6118f0b096f7cf800 (diff) | |
download | dragonfireclient-88b436e6a9c98af7215bd115e1b7a3f1a1db99d3.tar.xz |
Code modernization: subfolders (#6283)
* Code modernization: subfolders
Modernize various code on subfolders client, network, script, threading, unittests, util
* empty function
* default constructor/destructor
* for range-based loops
* use emplace_back instead of push_back
* C++ STL header style
* Make connection.cpp readable in a pointed place + typo
Diffstat (limited to 'src/network/clientpackethandler.cpp')
-rw-r--r-- | src/network/clientpackethandler.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/network/clientpackethandler.cpp b/src/network/clientpackethandler.cpp index d06f8a94d..1d5a28277 100644 --- a/src/network/clientpackethandler.cpp +++ b/src/network/clientpackethandler.cpp @@ -221,7 +221,7 @@ void Client::handleCommand_AccessDenied(NetworkPacket* pkt) if (denyCode == SERVER_ACCESSDENIED_SHUTDOWN || denyCode == SERVER_ACCESSDENIED_CRASH) { *pkt >> m_access_denied_reason; - if (m_access_denied_reason == "") { + if (m_access_denied_reason.empty()) { m_access_denied_reason = accessDeniedStrings[denyCode]; } u8 reconnect; @@ -237,7 +237,7 @@ void Client::handleCommand_AccessDenied(NetworkPacket* pkt) // Until then (which may be never), this is outside // of the defined protocol. *pkt >> m_access_denied_reason; - if (m_access_denied_reason == "") { + if (m_access_denied_reason.empty()) { m_access_denied_reason = "Unknown"; } } @@ -683,7 +683,7 @@ void Client::handleCommand_AnnounceMedia(NetworkPacket* pkt) Strfnd sf(str); while(!sf.at_end()) { std::string baseurl = trim(sf.next(",")); - if (baseurl != "") + if (!baseurl.empty()) m_media_downloader->addRemoteServer(baseurl); } } @@ -1213,7 +1213,7 @@ void Client::handleCommand_HudSetParam(NetworkPacket* pkt) } else if (param == HUD_PARAM_HOTBAR_IMAGE) { // If value not empty verify image exists in texture source - if (value != "" && !getTextureSource()->isKnownSourceImage(value)) { + if (!value.empty() && !getTextureSource()->isKnownSourceImage(value)) { errorstream << "Server sent wrong Hud hotbar image (sent value: '" << value << "')" << std::endl; return; @@ -1222,7 +1222,7 @@ void Client::handleCommand_HudSetParam(NetworkPacket* pkt) } else if (param == HUD_PARAM_HOTBAR_SELECTED_IMAGE) { // If value not empty verify image exists in texture source - if (value != "" && !getTextureSource()->isKnownSourceImage(value)) { + if (!value.empty() && !getTextureSource()->isKnownSourceImage(value)) { errorstream << "Server sent wrong Hud hotbar selected image (sent value: '" << value << "')" << std::endl; return; |