Cleaned up and simplified the code relating to the fps display

apps/openmw/engine.cpp

@@ -113,17 +113,10 @@ bool OMW::Engine::frameRenderingQueued (const Ogre::FrameEvent& evt)
         }
 
         // update GUI
-        if(mFpsLevel == 1)
+        Ogre::RenderWindow* window = mOgre->getWindow();
-        {
+        mEnvironment.mWindowManager->wmUpdateFps(window->getLastFPS(),
-            mEnvironment.mWindowManager->wmSetFPS(mOgre->getFPS());
+                                                 window->getTriangleCount(),
-        }
+                                                 window->getBatchCount());
-        else if(mFpsLevel == 2) //detailed
-        {
-            Ogre::RenderWindow* window = mOgre->getWindow();
-            mEnvironment.mWindowManager->wmSetDetailedFPS(window->getLastFPS(),
-                                                          window->getTriangleCount(),
-                                                          window->getBatchCount());
-        }
 
         mEnvironment.mWindowManager->onFrame(mEnvironment.mFrameDuration);
 

apps/openmw/mwgui/window_manager.hpp

@@ -205,8 +205,7 @@ namespace MWGui
 
     MyGUI::Gui* getGui() const { return gui; }
 
-    void wmSetFPS(float fps) { mFPS = fps; }
+    void wmUpdateFps(float fps, size_t triangleCount, size_t batchCount)
-    void wmSetDetailedFPS(float fps, size_t triangleCount, size_t batchCount)
     {
         mFPS = fps;
         mTriangleCount = triangleCount;