X-Git-Url: https://git.jsancho.org/?a=blobdiff_plain;f=Source%2FSkybox.cpp;h=8fcc9671e5fbb9b8466e7eb9b93723982239a204;hb=bdabd9d4a53be2fa9d90f900f7e5949d2f0ef75c;hp=065edb971179eddd9ac583c90469cff5a03aa7e7;hpb=cd043e3f9e26c2b3406b40a354c2840941e9db7f;p=lugaru.git

diff --git a/Source/Skybox.cpp b/Source/Skybox.cpp
index 065edb9..8fcc967 100644
--- a/Source/Skybox.cpp
+++ b/Source/Skybox.cpp
@@ -1,5 +1,6 @@
 /*
 Copyright (C) 2003, 2010 - Wolfire Games
+Copyright (C) 2010-2016 - Lugaru contributors (see AUTHORS file)
 
 This file is part of Lugaru.
 
@@ -28,15 +29,15 @@ extern float skyboxr;
 extern float skyboxg;
 extern float skyboxb;
 
-void SkyBox::load (const char *ffront, const char *fleft, const char *fback,
-                   const char *fright, const char *fup,   const char *fdown)
+void SkyBox::load (const std::string& ffront, const std::string& fleft, const std::string& fback,
+                   const std::string& fright, const std::string& fup,   const std::string& fdown)
 {
-    front.load(ffront, true, false);
-    left.load(fleft, true, false);
-    back.load(fback, true, false);
-    right.load(fright, true, false);
-    up.load(fup, true, false);
-    down.load(fdown, true, false);
+    front.load(ffront, true);
+    left.load(fleft, true);
+    back.load(fback, true);
+    right.load(fright, true);
+    up.load(fup, true);
+    down.load(fdown, true);
 }
 
 void SkyBox::draw()
@@ -49,12 +50,12 @@ void SkyBox::draw()
     M[13] = 0;
     M[14] = 0;
     glLoadMatrixf(M);
-    if (environment == 2)
+    if (environment == desertenvironment) {
         glScalef(1 + blurness / 1000, 1, 1 + blurness / 1000);
-    if (environment != 2)
-        glColor3f(.85 * skyboxr, .85 * skyboxg, .95 * skyboxb);
-    else
         glColor3f(1 * skyboxr, .95 * skyboxg, .95 * skyboxb);
+    } else {
+        glColor3f(.85 * skyboxr, .85 * skyboxg, .95 * skyboxb);
+    }
 
     if (!skyboxtexture) {
         glDisable(GL_TEXTURE_2D);