X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=src%2Fsky.cpp;h=01fb8ef860ed140e5d434d59139727c8ddbd71d8;hb=6c06330daf04ed1c390131755b64338ca7d79a7e;hp=ac8e2cbf6d512a698ed5bfbfcd4011a33a2d3719;hpb=0d1eedcccc8b83fd5f5a9a75389fe8ac97d2c697;p=dragonfireclient.git

diff --git a/src/sky.cpp b/src/sky.cpp
index ac8e2cbf6..01fb8ef86 100644
--- a/src/sky.cpp
+++ b/src/sky.cpp
@@ -4,13 +4,12 @@
 #include "ICameraSceneNode.h"
 #include "S3DVertex.h"
 #include "client/tile.h"
-#include "noise.h" // easeCurve
-#include "main.h" // g_profiler
+#include "noise.h"            // easeCurve
 #include "profiler.h"
-#include "util/numeric.h" // MYMIN
+#include "util/numeric.h"
 #include <cmath>
 #include "settings.h"
-#include "camera.h" // CameraModes
+#include "camera.h"           // CameraModes
 
 //! constructor
 Sky::Sky(scene::ISceneNode* parent, scene::ISceneManager* mgr, s32 id,
@@ -47,14 +46,14 @@ Sky::Sky(scene::ISceneNode* parent, scene::ISceneManager* mgr, s32 id,
 	m_materials[1].MaterialType = video::EMT_TRANSPARENT_ALPHA_CHANNEL;
 
 	m_materials[2] = mat;
-	m_materials[2].setTexture(0, tsrc->getTexture("sunrisebg.png"));
+	m_materials[2].setTexture(0, tsrc->getTextureForMesh("sunrisebg.png"));
 	m_materials[2].MaterialType = video::EMT_TRANSPARENT_ALPHA_CHANNEL;
 	//m_materials[2].MaterialType = video::EMT_TRANSPARENT_ADD_COLOR;
 
 	m_sun_texture = tsrc->isKnownSourceImage("sun.png") ?
-		tsrc->getTexture("sun.png") : NULL;
+		tsrc->getTextureForMesh("sun.png") : NULL;
 	m_moon_texture = tsrc->isKnownSourceImage("moon.png") ?
-		tsrc->getTexture("moon.png") : NULL;
+		tsrc->getTextureForMesh("moon.png") : NULL;
 	m_sun_tonemap = tsrc->isKnownSourceImage("sun_tonemap.png") ?
 		tsrc->getTexture("sun_tonemap.png") : NULL;
 	m_moon_tonemap = tsrc->isKnownSourceImage("moon_tonemap.png") ?