Replaced hardcoded environment values by appropriate define

diff --git a/Source/Objects.cpp b/Source/Objects.cpp
index 1a974be750cfb5be564aa5b80f619375a6c4c268..6f98ead6d536f158581f024dd1d652e439708c07 100644 (file)
--- a/Source/Objects.cpp
+++ b/Source/Objects.cpp
@@ -160,7 +160,7 @@ void Objects::Draw()
                                     roty[i] = -10;
                             }
                             if (type[i] == treetrunktype || type[i] == treeleavestype) {
-                                if (type[i] == treetrunktype || environment == 2) {
+                                if (type[i] == treetrunktype || environment == desertenvironment) {
                                     messedwith[i] -= multiplier;
                                     if (rotxvel[i] || rotx[i]) {
                                         if (rotx[i] > 0) rotxvel[i] -= multiplier * 8 * fabs(rotx[i]);

diff --git a/Source/Skybox.cpp b/Source/Skybox.cpp
index 0797722026b6d0b4672f33cbc3e1d3bd7658227d..327db69ac4f90212f542ea52560ed3660e0ae33c 100644 (file)
--- a/Source/Skybox.cpp
+++ b/Source/Skybox.cpp
@@ -50,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);