Reading debug mode from config again, but command line option overrides it

[lugaru.git] / Source / Skybox.cpp

diff --git a/Source/Skybox.cpp b/Source/Skybox.cpp
index cb9505e61f6590ec896a631a463f05033c07fc79..8fcc9671e5fbb9b8466e7eb9b93723982239a204 100644 (file)
--- a/Source/Skybox.cpp
+++ b/Source/Skybox.cpp
@@ -1,22 +1,21 @@
 /*
 Copyright (C) 2003, 2010 - Wolfire Games
+Copyright (C) 2010-2016 - Lugaru contributors (see AUTHORS file)
 
 This file is part of Lugaru.
 
-Lugaru is free software; you can redistribute it and/or
-modify it under the terms of the GNU General Public License
-as published by the Free Software Foundation; either version 2
-of the License, or (at your option) any later version.
+Lugaru is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
 
-This program is distributed in the hope that it will be useful,
+Lugaru is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-See the GNU General Public License for more details.
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+along with Lugaru.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "Skybox.h"
@@ -30,19 +29,18 @@ 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()
+void SkyBox::draw()
 {
     static float size = viewdistance / 4;
     glPushMatrix();
@@ -52,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);