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/client | |
| 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/client')
| -rw-r--r-- | src/client/tile.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/client/tile.cpp b/src/client/tile.cpp index 995526ea8..7a9bc0159 100644 --- a/src/client/tile.cpp +++ b/src/client/tile.cpp @@ -31,7 +31,7 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "mesh.h" #include "log.h" #include "gamedef.h" -#include "strfnd.h" +#include "util/strfnd.h" #include "util/string.h" // for parseColorString() #include "imagefilters.h" #include "guiscalingfilter.h" @@ -1242,7 +1242,7 @@ bool TextureSource::generateImagePart(std::string part_of_name, baseimg = driver->createImage(video::ECF_A8R8G8B8, dim); baseimg->fill(video::SColor(0,0,0,0)); } - while (sf.atend() == false) { + while (sf.at_end() == false) { u32 x = stoi(sf.next(",")); u32 y = stoi(sf.next("=")); std::string filename = sf.next(":"); |