diff options
| author | Perttu Ahola <celeron55@gmail.com> | 2012-02-28 21:47:15 +0200 |
|---|---|---|
| committer | Perttu Ahola <celeron55@gmail.com> | 2012-02-28 21:47:15 +0200 |
| commit | 14a71590c361b5417938c79e53879bbb931949f3 (patch) | |
| tree | 8b804b44d5ff12e1af9aeb6b2491f929ac22cbe9 /src/tile.cpp | |
| parent | a5f6d65c3788da7811c5655110cc6deb95f20999 (diff) | |
| parent | 806f10524f6a2cdcc1f15e12b9991ad726876d27 (diff) | |
| download | minetest-14a71590c361b5417938c79e53879bbb931949f3.tar.gz minetest-14a71590c361b5417938c79e53879bbb931949f3.tar.bz2 minetest-14a71590c361b5417938c79e53879bbb931949f3.zip | |
Merge remote-tracking branch 'jn/random-fixes'
Diffstat (limited to 'src/tile.cpp')
| -rw-r--r-- | src/tile.cpp | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/src/tile.cpp b/src/tile.cpp index bc4c49cb1..c39a65511 100644 --- a/src/tile.cpp +++ b/src/tile.cpp @@ -1023,15 +1023,9 @@ video::IImage* generate_image_from_scratch(std::string name, char separator = '^'; // Find last meta separator in name - s32 last_separator_position = -1; - for(s32 i=name.size()-1; i>=0; i--) - { - if(name[i] == separator) - { - last_separator_position = i; - break; - } - } + s32 last_separator_position = name.find_last_of(separator); + //if(last_separator_position == std::npos) + // last_separator_position = -1; /*infostream<<"generate_image_from_scratch(): " <<"last_separator_position="<<last_separator_position @@ -1489,8 +1483,6 @@ bool generate_image(std::string part_of_name, video::IImage *& baseimg, if(rtt == NULL) { - errorstream<<"generate_image(): render to texture failed." - " Creating fallback image"<<std::endl; baseimg = generate_image_from_scratch( imagename_top, device, sourcecache); return true; |