summaryrefslogtreecommitdiffstats
path: root/src/graphics
diff options
context:
space:
mode:
authorkrzys-h <krzys_h@interia.pl>2014-10-27 21:15:14 +0100
committerkrzys-h <krzys_h@interia.pl>2014-10-27 21:15:14 +0100
commitd6e88a07b08585d6a6f151d34a07d8bca78711ea (patch)
tree1c3f385d0883ef3db787d91e6f11edd8323ebc03 /src/graphics
parent990ecf729038baa995fd7d58d17aceecce343d4b (diff)
downloadcolobot-d6e88a07b08585d6a6f151d34a07d8bca78711ea.tar.gz
colobot-d6e88a07b08585d6a6f151d34a07d8bca78711ea.tar.bz2
colobot-d6e88a07b08585d6a6f151d34a07d8bca78711ea.zip
Support for %lvl% in TerrainInitTextures + cleanup
cleanup: * Removed CProfile::SetUserPath (unused) * Removed CProfile::GetUserBasedPath (unused) * Removed CProfile::CopyFileToTemp (i have no idea why it even existed) * Removed CopyFileListToTemp (it did the same as CopyFileToTemp but for multiple files, wasn't even fully implemented)
Diffstat (limited to 'src/graphics')
-rw-r--r--src/graphics/engine/terrain.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/graphics/engine/terrain.cpp b/src/graphics/engine/terrain.cpp
index 21d7446..b58685b 100644
--- a/src/graphics/engine/terrain.cpp
+++ b/src/graphics/engine/terrain.cpp
@@ -123,7 +123,8 @@ bool CTerrain::InitTextures(const std::string& baseName, int* table, int dx, int
m_useMaterials = false;
m_texBaseName = baseName;
- size_t pos = baseName.find('.');
+ size_t pos = baseName.rfind('.');
+ if(pos < baseName.find_last_of('/')) pos = std::string::npos; // If last . is not a part of filename (some directory, possibly . or ..)
if (pos == std::string::npos)
{