X-Git-Url: http://gitweb.pgornicz.com/gitweb.cgi?a=blobdiff_plain;f=src%2Fmain.cpp;h=050aff7d3d9ea788a61fe498a99acf0fd584d0ed;hb=2b8199e7bd3d91d151cb54e1e7b04b1c8610ad9a;hp=e932742e7e1e86bc6338affcb077b65c46d4941f;hpb=4a0863f343fa6f68639759494e3c0f0ab8ae2a76;p=physics.git

diff --git a/src/main.cpp b/src/main.cpp
index e932742..050aff7 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -182,10 +182,14 @@ void updateFPSCounters()
 
         last_Second = tickCountMicro();
 
-#ifdef FPSUPS
-        cout << "ups:\t" << ups << endl;
-        cout << "fps:\t" << fps << endl;
-#endif
+        if(cfg::showFPS())
+        {
+            cout << "fps:\t" << fps << endl;
+        }
+        if(cfg::showUPS())
+        {
+            cout << "ups:\t" << ups << endl;
+        }
     }
 }
 
@@ -193,6 +197,7 @@ void handleInput()
 {
     input::update();
 
+    cfg::handleInput();
     game::handleInput();
 
     if(cfg::endGame())