From 60bc39c2754c121fc791524898c7706d41aa7510 Mon Sep 17 00:00:00 2001
From: Nick Gasson <nick@nickg.me.uk>
Date: Sun, 8 Jun 2008 17:57:57 +0100
Subject: [PATCH] Make surface a bit more bumpy

---
 src/OpenGL.hpp  | 3 ---
 src/Surface.cpp | 4 ++++
 src/Surface.hpp | 8 ++++----
 3 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/OpenGL.hpp b/src/OpenGL.hpp
index 43e193e..976b808 100644
--- a/src/OpenGL.hpp
+++ b/src/OpenGL.hpp
@@ -108,9 +108,6 @@ public:
 
    int GetWidth() const { return screen_width; }
    int GetHeight() const { return screen_height; }
-
-   void SelectTexture(GLuint uTexture);
-   void ClearColour(float r, float g, float b);
   
    bool IsTextureSizeSupported(int width, int height, int ncols=4,
                                GLenum format=GL_RGBA);
diff --git a/src/Surface.cpp b/src/Surface.cpp
index 5e0ea3b..2881ddb 100644
--- a/src/Surface.cpp
+++ b/src/Surface.cpp
@@ -18,6 +18,10 @@
 #include "Surface.hpp"
 #include "LoadOnce.hpp"
 
+const int Surface::VARIANCE = 65;     // Bumpyness of landscape
+const int Surface::MAX_SURFACE_HEIGHT = 300;
+const int Surface::SURFACE_SIZE = 20;
+
 Texture *Surface::surfTexture[Surface::NUM_SURF_TEX];
 
 Surface::Surface(Viewport *v)
diff --git a/src/Surface.hpp b/src/Surface.hpp
index a4a1fe2..dae5940 100644
--- a/src/Surface.hpp
+++ b/src/Surface.hpp
@@ -33,10 +33,10 @@ public:
    bool CheckCollisions(Ship &ship, LandingPadList &pads, int *padIndex);
    void Display();
 
-   static const int NUM_SURF_TEX = 5;  // Number of available surface textures
-   static const int SURFACE_SIZE = 20;
-   static const int MAX_SURFACE_HEIGHT = 300;
-   static const int VARIANCE = 50;     // Bumpyness of landscape
+   static const int NUM_SURF_TEX = 5;   // Number of available surface textures
+   static const int SURFACE_SIZE;
+   static const int MAX_SURFACE_HEIGHT;
+   static const int VARIANCE;
    
 private:
    static Texture *surfTexture[NUM_SURF_TEX];
-- 
2.39.2