diff options
| author | Perttu Ahola <celeron55@gmail.com> | 2011-10-12 13:53:38 +0300 |
|---|---|---|
| committer | Perttu Ahola <celeron55@gmail.com> | 2011-10-12 13:53:38 +0300 |
| commit | 9e46cbf7ea512330f35d0f2ede0c7c0c085c7cf4 (patch) | |
| tree | f937a97b67b5ecd0ee65ed9a845e6e4a640bb629 /src/tile.cpp | |
| parent | b60b58b627f078faba002401d300b522e0077efc (diff) | |
| download | minetest-9e46cbf7ea512330f35d0f2ede0c7c0c085c7cf4.tar.gz minetest-9e46cbf7ea512330f35d0f2ede0c7c0c085c7cf4.tar.bz2 minetest-9e46cbf7ea512330f35d0f2ede0c7c0c085c7cf4.zip | |
Header file tweaking; mainly for speed
Diffstat (limited to 'src/tile.cpp')
| -rw-r--r-- | src/tile.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/tile.cpp b/src/tile.cpp index 73f2a85ea..ac5965e9f 100644 --- a/src/tile.cpp +++ b/src/tile.cpp @@ -22,6 +22,8 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "main.h" // for g_settings #include "filesys.h" #include "utility.h" +#include "settings.h" +#include <ICameraSceneNode.h> /* A cache from texture name to texture path @@ -112,7 +114,7 @@ std::string getTexturePath(const std::string &filename) /* Check from texture_path */ - std::string texture_path = g_settings.get("texture_path"); + std::string texture_path = g_settings->get("texture_path"); if(texture_path != "") { std::string testpath = texture_path + '/' + filename; @@ -157,7 +159,7 @@ TextureSource::TextureSource(IrrlichtDevice *device): m_name_to_id[""] = 0; // Build main texture atlas - if(g_settings.getBool("enable_texture_atlas")) + if(g_settings->getBool("enable_texture_atlas")) buildMainAtlas(); else dstream<<"INFO: Not building texture atlas."<<std::endl; |