From ab6fd89c3715f2eef9ef5b839e2e345fb6ddc208 Mon Sep 17 00:00:00 2001
From: Nick Gasson <nick@nickg.me.uk>
Date: Mon, 2 Nov 2009 21:01:13 +0000
Subject: [PATCH] Re-enable game UI layout

---
 src/Game.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Game.cpp b/src/Game.cpp
index 7dc755a..6e739b1 100644
--- a/src/Game.cpp
+++ b/src/Game.cpp
@@ -131,7 +131,7 @@ Game::Game(IMapPtr aMap)
 
    myStatsPanel->setOrigin(5, 10);
 
-   //layout = gui::makeLayout("layouts/game.xml");
+   layout = gui::makeLayout("layouts/game.xml");
 }
 
 Game::~Game()
@@ -171,7 +171,7 @@ void Game::overlay() const
 {
    //myStatsPanel->render();
 
-   //layout->render();
+   layout->render();
 
    const int screenH = getGameWindow()->height();
    const int screenW = getGameWindow()->width();
@@ -190,8 +190,8 @@ void Game::update(IPickBufferPtr aPickBuffer, int aDelta)
    myThrottleMeter->setValue(train->controller()->throttle());
    myBrakeLabel->setVisible(train->controller()->brakeOn());
 
-   //layout->cast<gui::Label>("/status_wnd/speed_label").format(
-   //   "Speed: %.1lfmph", train->speed() * msToMPH);
+   layout->cast<gui::Label>("/status_wnd/speed_label").format(
+      "Speed: %.1lfmph", train->speed() * msToMPH);
    
    const double pressure = train->controller()->pressure();
    myPressureLabel->setText("Pressure: %.lfpsi", pressure);
-- 
2.39.2