From e8f93364049f4fe3d0dfd02efd41aa4f4571c8a9 Mon Sep 17 00:00:00 2001
From: Nick Gasson <nickg@pc022.cs.york.ac.uk>
Date: Fri, 5 Jun 2009 15:19:39 +0100
Subject: [PATCH] A few small naming changes

---
 src/Game.cpp | 14 +++++++-------
 src/Game.hpp |  6 +++---
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/Game.cpp b/src/Game.cpp
index 35f3c63..7761995 100644
--- a/src/Game.cpp
+++ b/src/Game.cpp
@@ -798,8 +798,8 @@ void Game::Display()
 }
 
 FuelMeter::FuelMeter()
-   : fuelMeterImage_("images/fuelmeter.png"),
-     fuelBarTexture_(LoadTexture("images/fuelbar.png")),
+   : fuelMeterImage("images/fuelmeter.png"),
+     fuelBarTexture(LoadTexture("images/fuelbar.png")),
      fuel(0), maxfuel(1)
 {
    
@@ -814,7 +814,7 @@ void FuelMeter::Display()
    glEnable(GL_BLEND);
    glDisable(GL_DEPTH_TEST);
    glColor3f(1.0f, 1.0f, 1.0f);
-   glBindTexture(GL_TEXTURE_2D, fuelBarTexture_->GetGLTexture());
+   glBindTexture(GL_TEXTURE_2D, fuelBarTexture->GetGLTexture());
    glLoadIdentity();
    glBegin(GL_QUADS);
      glTexCoord2f(1.0f-texsize, 1.0f);
@@ -827,9 +827,9 @@ void FuelMeter::Display()
      glVertex2i(opengl.GetWidth()-fbsize-10, FUELBAR_Y + 32);
    glEnd();
 
-   int draw_x = opengl.GetWidth() - fuelMeterImage_.GetWidth() - 10;
+   int draw_x = opengl.GetWidth() - fuelMeterImage.GetWidth() - 10;
    int draw_y = FUELBAR_Y;
-   fuelMeterImage_.Draw(draw_x, draw_y);
+   fuelMeterImage.Draw(draw_x, draw_y);
 }
 
 void FuelMeter::Refuel(int howmuch)
@@ -850,7 +850,7 @@ bool FuelMeter::OutOfFuel() const
 }
 
 SpeedMeter::SpeedMeter(Ship* ship)
-   : speedMeterImage_("images/speedmeter.png"),
+   : speedMeterImage("images/speedmeter.png"),
      ship(ship)
 {
    speedbar.x = 12;
@@ -878,7 +878,7 @@ void SpeedMeter::Display()
 
    OpenGL::GetInstance().Draw(&speedbar);
 
-   speedMeterImage_.Draw(10, 40);
+   speedMeterImage.Draw(10, 40);
 }
 
 bool SpeedMeter::SafeLandingSpeed() const
diff --git a/src/Game.hpp b/src/Game.hpp
index 839391b..b7c294f 100644
--- a/src/Game.hpp
+++ b/src/Game.hpp
@@ -55,8 +55,8 @@ public:
    int GetFuel() const { return fuel; }
    
 private:
-   Image fuelMeterImage_;
-   Texture* fuelBarTexture_;
+   Image fuelMeterImage;
+   Texture* fuelBarTexture;
 
    static const int FUELBAR_Y;
    
@@ -72,7 +72,7 @@ public:
    void Display();
 
 private:
-   Image speedMeterImage_;
+   Image speedMeterImage;
 
    static const float LAND_SPEED;
    
-- 
2.39.2