From e971053730e1f52df155bb4db6b7175c443397b7 Mon Sep 17 00:00:00 2001 From: Nick Gasson Date: Sun, 19 Jul 2009 14:35:42 +0100 Subject: [PATCH] Tidy up for first proper release --- src/Building.cpp | 2 -- src/Editor.cpp | 11 ++++++++++- src/Engine.cpp | 1 - src/Game.cpp | 8 ++++---- src/Resource.cpp | 4 +--- 5 files changed, 15 insertions(+), 11 deletions(-) diff --git a/src/Building.cpp b/src/Building.cpp index 6f0c61c..92de197 100644 --- a/src/Building.cpp +++ b/src/Building.cpp @@ -47,8 +47,6 @@ Building::Building(IResourcePtr aRes) void Building::text(const string& localName, const string& aString) { - debug() << "text " << localName << " = " << aString; - if (localName == "name") myName = aString; else if (localName == "model") diff --git a/src/Editor.cpp b/src/Editor.cpp index 2ca420d..1abb520 100644 --- a/src/Editor.cpp +++ b/src/Editor.cpp @@ -102,6 +102,9 @@ namespace { Fl_Menu_Button* theToolMenu; Fl_Button* theSaveButton; + Fl_Button* theBldNextButton; + Fl_Button* theBldPrevButton; + Fl_Button* theBldRotateButton; ModelViewer* theModelViewer; Editor* theEditor = NULL; @@ -132,8 +135,14 @@ void addEditorGUI() theToolMenu->label("Track"); theModelViewer = new ModelViewer(0, 40, panelW, 200); + + theBldPrevButton = new Fl_Button(0, 240, 60, 25, "Prev"); + + theBldNextButton = new Fl_Button(60, 240, 60, 25, "Next"); + + theBldRotateButton = new Fl_Button(120, 240, 60, 25, "Rotate"); - theSaveButton = new Fl_Button(0, 248, panelW, 25, "Save"); + theSaveButton = new Fl_Button(0, 273, panelW, 25, "Save"); theSaveButton->callback(onSaveClick); } diff --git a/src/Engine.cpp b/src/Engine.cpp index 77333ed..d31f25b 100644 --- a/src/Engine.cpp +++ b/src/Engine.cpp @@ -201,7 +201,6 @@ void Engine::actOn(Action anAction) switch (anAction) { case BRAKE_TOGGLE: isBrakeOn = !isBrakeOn; - debug() << "Brake is" << (isBrakeOn ? "" : " not") << " on"; break; case SHOVEL_COAL: myFireTemp += 10.0; diff --git a/src/Game.cpp b/src/Game.cpp index bf1003c..f5ad73c 100644 --- a/src/Game.cpp +++ b/src/Game.cpp @@ -97,17 +97,17 @@ Game::Game(IMapPtr aMap) myCoalMeter = makeFuelMeter(stdFont, "Coal", make_tuple(0.1f, 0.1f, 0.1f)); - myStatsPanel->addChild(myCoalMeter); + //myStatsPanel->addChild(myCoalMeter); myWaterMeter = makeFuelMeter(stdFont, "Water", make_tuple(0.1f, 0.1f, 0.8f)); - myStatsPanel->addChild(myWaterMeter); + //myStatsPanel->addChild(myWaterMeter); myTempLabel = makeLabel(stdFont, "Temp"); - myStatsPanel->addChild(myTempLabel); + //myStatsPanel->addChild(myTempLabel); myPressureLabel = makeLabel(stdFont, "Pressure"); - myStatsPanel->addChild(myPressureLabel); + //myStatsPanel->addChild(myPressureLabel); myBrakeLabel = makeLabel(stdFont, "Brake on"); myBrakeLabel->setColour(1.0f, 0.0f, 0.0f); diff --git a/src/Resource.cpp b/src/Resource.cpp index db8e1f2..4a164eb 100644 --- a/src/Resource.cpp +++ b/src/Resource.cpp @@ -96,7 +96,7 @@ namespace { void addResourceDir(const char* aClass, const path& aPath) { - debug() << "Add " << aClass << " from " << aPath; + debug() << "Adding " << aPath << " to " << aClass << " class"; const path xmlFile = aPath / (aPath.filename() + ".xml"); @@ -112,8 +112,6 @@ namespace { for (const char** p = classes; *p != NULL; ++p) { if (exists(aPath / *p)) { - debug() << "Adding class " << *p; - for (directory_iterator it(aPath / *p); it != directory_iterator(); ++it) if (is_directory(it->status())) -- 2.39.2