oerkki/voxelands
oerkki
/
voxelands
2
1
Fork 1
Code Issues 19 Pull Requests Releases Activity

change texture_path setting to data_path

This commit is contained in:
darkrose 2013-05-15 20:20:49 +10:00
parent a91ce3bebe
commit 27cacee952
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/defaultsettings.cpp
View File

@ -67,7 +67,7 @@ void set_default_settings(Settings *settings)
settings->setDefault("smooth_lighting", "true");
settings->setDefault("frametime_graph", "false");
settings->setDefault("enable_texture_atlas", "true");
settings->setDefault("texture_path", "");
settings->setDefault("data_path", "");
settings->setDefault("video_driver", "opengl");
settings->setDefault("free_move", "false");
settings->setDefault("continuous_forward", "false");

12
src/tile.cpp
View File

@ -97,7 +97,7 @@ static std::string getImagePath(std::string path)
/*
Gets the path to a texture by first checking if the texture exists
in texture_path and if not, using the data path.
in data_path and if not, using the default data path.
Checks all supported extensions by replacing the original extension.
@ -115,13 +115,14 @@ std::string getTexturePath(const std::string &filename)
if(incache)
return fullpath;
std::string rel_path = std::string("textures")+DIR_DELIM+filename;
/*
Check from texture_path
Check from data_path /textures
*/
std::string texture_path = g_settings->get("texture_path");
if(texture_path != "")
std::string data_path = g_settings->get("data_path");
if(data_path != "")
{
std::string testpath = texture_path + DIR_DELIM + filename;
std::string testpath = data_path + DIR_DELIM + rel_path;
// Check all filename extensions. Returns "" if not found.
fullpath = getImagePath(testpath);
}
@ -131,7 +132,6 @@ std::string getTexturePath(const std::string &filename)
*/
if(fullpath == "")
{
std::string rel_path = std::string("textures")+DIR_DELIM+filename;
std::string testpath = porting::path_data + DIR_DELIM + rel_path;
// Check all filename extensions. Returns "" if not found.
fullpath = getImagePath(testpath);

2
src/tile.h
View File

@ -31,7 +31,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
/*
Gets the path to a texture by first checking if the texture exists
in texture_path and if not, using the data path.
in data_path and if not, using the default data path.
Checks all supported extensions by replacing the original extension.