diff options
author | Perttu Ahola <celeron55@gmail.com> | 2011-05-21 11:07:03 +0300 |
---|---|---|
committer | Perttu Ahola <celeron55@gmail.com> | 2011-05-21 11:07:03 +0300 |
commit | 969fbb189d16d87d26ceab29795644588fb90a32 (patch) | |
tree | a67a53a3ec9bd1afffda372587a9205d3ba8ef96 /src/game.cpp | |
parent | a8acf3c391b4dbdc4f4fd12b7a491a1c38dab337 (diff) | |
download | minetest-969fbb189d16d87d26ceab29795644588fb90a32.tar.gz minetest-969fbb189d16d87d26ceab29795644588fb90a32.tar.bz2 minetest-969fbb189d16d87d26ceab29795644588fb90a32.zip |
All textures are are now searched first from the directory specified by the texture_path setting.
Diffstat (limited to 'src/game.cpp')
-rw-r--r-- | src/game.cpp | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/src/game.cpp b/src/game.cpp index 69e673fa4..b1a804ae3 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -345,7 +345,7 @@ void draw_hotbar(video::IVideoDriver *driver, gui::IGUIFont *font, */ { video::ITexture *heart_texture = - driver->getTexture(porting::getDataPath("heart.png").c_str()); + driver->getTexture(getTexturePath("heart.png").c_str()); v2s32 p = pos + v2s32(0, -20); for(s32 i=0; i<halfheartcount/2; i++) { @@ -597,32 +597,32 @@ void update_skybox(video::IVideoDriver* driver, if(brightness >= 0.5) { skybox = smgr->addSkyBoxSceneNode( - driver->getTexture(porting::getDataPath("skybox2.png").c_str()), - driver->getTexture(porting::getDataPath("skybox3.png").c_str()), - driver->getTexture(porting::getDataPath("skybox1.png").c_str()), - driver->getTexture(porting::getDataPath("skybox1.png").c_str()), - driver->getTexture(porting::getDataPath("skybox1.png").c_str()), - driver->getTexture(porting::getDataPath("skybox1.png").c_str())); + driver->getTexture(getTexturePath("skybox2.png").c_str()), + driver->getTexture(getTexturePath("skybox3.png").c_str()), + driver->getTexture(getTexturePath("skybox1.png").c_str()), + driver->getTexture(getTexturePath("skybox1.png").c_str()), + driver->getTexture(getTexturePath("skybox1.png").c_str()), + driver->getTexture(getTexturePath("skybox1.png").c_str())); } else if(brightness >= 0.2) { skybox = smgr->addSkyBoxSceneNode( - driver->getTexture(porting::getDataPath("skybox2_dawn.png").c_str()), - driver->getTexture(porting::getDataPath("skybox3_dawn.png").c_str()), - driver->getTexture(porting::getDataPath("skybox1_dawn.png").c_str()), - driver->getTexture(porting::getDataPath("skybox1_dawn.png").c_str()), - driver->getTexture(porting::getDataPath("skybox1_dawn.png").c_str()), - driver->getTexture(porting::getDataPath("skybox1_dawn.png").c_str())); + driver->getTexture(getTexturePath("skybox2_dawn.png").c_str()), + driver->getTexture(getTexturePath("skybox3_dawn.png").c_str()), + driver->getTexture(getTexturePath("skybox1_dawn.png").c_str()), + driver->getTexture(getTexturePath("skybox1_dawn.png").c_str()), + driver->getTexture(getTexturePath("skybox1_dawn.png").c_str()), + driver->getTexture(getTexturePath("skybox1_dawn.png").c_str())); } else { skybox = smgr->addSkyBoxSceneNode( - driver->getTexture(porting::getDataPath("skybox2_night.png").c_str()), - driver->getTexture(porting::getDataPath("skybox3_night.png").c_str()), - driver->getTexture(porting::getDataPath("skybox1_night.png").c_str()), - driver->getTexture(porting::getDataPath("skybox1_night.png").c_str()), - driver->getTexture(porting::getDataPath("skybox1_night.png").c_str()), - driver->getTexture(porting::getDataPath("skybox1_night.png").c_str())); + driver->getTexture(getTexturePath("skybox2_night.png").c_str()), + driver->getTexture(getTexturePath("skybox3_night.png").c_str()), + driver->getTexture(getTexturePath("skybox1_night.png").c_str()), + driver->getTexture(getTexturePath("skybox1_night.png").c_str()), + driver->getTexture(getTexturePath("skybox1_night.png").c_str()), + driver->getTexture(getTexturePath("skybox1_night.png").c_str())); } } |