From c89d1cf072f4ac34cfb35eadd8c9890b3de1b922 Mon Sep 17 00:00:00 2001 From: Perttu Ahola Date: Sat, 10 Mar 2012 15:56:24 +0200 Subject: Initial directory structure rework --- src/tile.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/tile.cpp') diff --git a/src/tile.cpp b/src/tile.cpp index c39a65511..5ef469944 100644 --- a/src/tile.cpp +++ b/src/tile.cpp @@ -132,8 +132,9 @@ std::string getTexturePath(const std::string &filename) */ if(fullpath == "") { - std::string rel_path = std::string("clienttextures")+DIR_DELIM+filename; - std::string testpath = porting::path_data + DIR_DELIM + rel_path; + std::string rel_path = std::string("client") + + DIR_DELIM + "textures" + DIR_DELIM + filename; + std::string testpath = porting::path_share + DIR_DELIM + rel_path; // Check all filename extensions. Returns "" if not found. fullpath = getImagePath(testpath); } @@ -997,7 +998,7 @@ void TextureSource::buildMainAtlas(class IGameDef *gamedef) /* Write image to file so that it can be inspected */ - /*std::string atlaspath = porting::path_userdata + /*std::string atlaspath = porting::path_user + DIR_DELIM + "generated_texture_atlas.png"; infostream<<"Removing and writing texture atlas for inspection to " <