diff options
| author | ShadowNinja <shadowninja@minetest.net> | 2016-03-19 12:08:24 -0400 |
|---|---|---|
| committer | ShadowNinja <shadowninja@minetest.net> | 2016-03-19 21:27:57 -0400 |
| commit | 93887043d9443ba6627fea68921994d0f1896517 (patch) | |
| tree | 7199a98377b19afc01517ab795bc4d6dfa073130 /src/network/clientpackethandler.cpp | |
| parent | eb7db21d50f866d1e847d7556f83995294a7e54f (diff) | |
| download | minetest-93887043d9443ba6627fea68921994d0f1896517.tar.gz minetest-93887043d9443ba6627fea68921994d0f1896517.tar.bz2 minetest-93887043d9443ba6627fea68921994d0f1896517.zip | |
Clean up Strfnd
Changes:
* Fix indentation.
* Pass strings by const reference.
* Merge Strfnd and WStrfnd into one class instead of copying them.
* Remove trailing spaces.
* Fix variable names.
* Move to util.
* Other miscellaneous style fixes.
Diffstat (limited to 'src/network/clientpackethandler.cpp')
| -rw-r--r-- | src/network/clientpackethandler.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/network/clientpackethandler.cpp b/src/network/clientpackethandler.cpp index 28d147d38..0498f4048 100644 --- a/src/network/clientpackethandler.cpp +++ b/src/network/clientpackethandler.cpp @@ -28,7 +28,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "nodedef.h" #include "serialization.h" #include "server.h" -#include "strfnd.h" +#include "util/strfnd.h" #include "network/clientopcodes.h" #include "util/serialize.h" #include "util/srp.h" @@ -641,7 +641,7 @@ void Client::handleCommand_AnnounceMedia(NetworkPacket* pkt) *pkt >> str; Strfnd sf(str); - while(!sf.atend()) { + while(!sf.at_end()) { std::string baseurl = trim(sf.next(",")); if (baseurl != "") m_media_downloader->addRemoteServer(baseurl); |