* Committing some cleanups by Doener

* Fixed some compiler warnings
* Restored a USE_OPENGL check around OpenGL headers
* Fixed error about FALSE not being defined
* Fixed issue with font to become speechFont when the latter is not installed

1 files changed, 4 insertions, 3 deletions

diff --git a/src/gui/chargedialog.cpp b/src/gui/chargedialog.cpp
index 726e73ff..25f4297e 100644
--- a/src/gui/chargedialog.cpp
+++ b/src/gui/chargedialog.cpp
@@ -46,7 +46,7 @@ void ChargeDialog::action(const std::string& eventId)
 }
 
 // update the dialog
-void ChargeDialog::draw(gcn::Graphics *graphics)
+void ChargeDialog::logic()
 {
     // calculate time since the last attack was made
     char_info->lastAttackTime += .01; // this a hack until someone explains
@@ -54,6 +54,7 @@ void ChargeDialog::draw(gcn::Graphics *graphics)
     if(char_info->lastAttackTime > 1){char_info->lastAttackTime=1;}
     
     // reset the progress bar to display accurate time since attack
-    progBar->setProgress(char_info->lastAttackTime); 
-    Window::draw(graphics);
+    progBar->setProgress(char_info->lastAttackTime);
+
+    Window::logic();
 }