From 17b1546dc1694b5419287c7b7d8c5e86a39e83e3 Mon Sep 17 00:00:00 2001
From: Pieter van der Kloet <pvdkloet@gmail.com>
Date: Fri, 10 Feb 2012 19:17:49 +0100
Subject: [PATCH] Changed the way screenshots are created (Bug #191)

---
 apps/openmw/engine.cpp               | 22 ++++++++++++++++++++++
 apps/openmw/engine.hpp               |  3 +++
 apps/openmw/mwinput/inputmanager.cpp | 15 +--------------
 3 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/apps/openmw/engine.cpp b/apps/openmw/engine.cpp
index ee3a6181ae..3579977b04 100644
--- a/apps/openmw/engine.cpp
+++ b/apps/openmw/engine.cpp
@@ -462,6 +462,28 @@ void OMW::Engine::activate()
     }
 }
 
+void OMW::Engine::screenshot()
+{
+    // Count screenshots.
+    int shotCount = 0;
+
+    const std::string screenshotPath = mCfgMgr.getLocalConfigPath().string();
+
+    // Find the first unused filename with a do-while
+    std::ostringstream stream;
+    do
+    {
+        // Reset the stream
+        stream.str("");
+        stream.clear();
+
+        stream << screenshotPath << "screenshot" << std::setw(3) << std::setfill('0') << shotCount++ << ".png";
+
+    } while (boost::filesystem::exists(stream.str()));
+
+    mOgre->screenshot(stream.str());
+}
+
 void OMW::Engine::setCompileAll (bool all)
 {
     mCompileAll = all;
diff --git a/apps/openmw/engine.hpp b/apps/openmw/engine.hpp
index 02d108f0ab..88eea728e9 100644
--- a/apps/openmw/engine.hpp
+++ b/apps/openmw/engine.hpp
@@ -152,6 +152,9 @@ namespace OMW
             /// Activate the focussed object.
             void activate();
 
+            /// Write screenshot to file.
+            void screenshot();
+
             /// Compile all scripts (excludign dialogue scripts) at startup?
             void setCompileAll (bool all);
 
diff --git a/apps/openmw/mwinput/inputmanager.cpp b/apps/openmw/mwinput/inputmanager.cpp
index e0c819a71a..a5d590b856 100644
--- a/apps/openmw/mwinput/inputmanager.cpp
+++ b/apps/openmw/mwinput/inputmanager.cpp
@@ -83,27 +83,14 @@ namespace MWInput
     MWGui::WindowManager &windows;
     OMW::Engine& mEngine;
 
-    // Count screenshots.
-    int shotCount;
-
 
    /* InputImpl Methods */
 
-    // Write screenshot to file.
     void screenshot()
     {
-
-      // Find the first unused filename with a do-while
-      char buf[50];
-      do
-      {
-        snprintf(buf, 50, "screenshot%03d.png", shotCount++);
-      } while (boost::filesystem::exists(buf));
-
-      ogre.screenshot(buf);
+        mEngine.screenshot();
     }
 
-
     /* toggleInventory() is called when the user presses the button to toggle the inventory screen. */
     void toggleInventory()
     {