second round of refactoring; moving configuration handling out of main function

game/main.cpp

@@ -4,31 +4,16 @@
 #include <fstream>
 
 #include <boost/program_options.hpp>
-#include <boost/filesystem.hpp>
 
 #include "engine.hpp"
 
 using namespace std;
 
-void maintest (boost::filesystem::path dataDir, const std::string& cellName,
-    std::string master)
-{
-    assert (!dataDir.empty());
-  
-    OMW::Engine engine;
-
-    engine.setDataDir (dataDir);
-
-    engine.setCell (cellName);
-
-    engine.addMaster (master);
+/// Parse command line options and openmw.cfg file (if one exists). Results are directly
+/// written to \a engine.
+/// \return Run OpenMW?
 
-    engine.go();
-}
-
-int main(int argc, char**argv)
-{
-  try
+bool parseOptions (int argc, char**argv, OMW::Engine& engine)
 {
     boost::program_options::options_description desc (
         "Syntax: openmw <options>\nAllowed options");
@@ -58,11 +43,23 @@ int main(int argc, char**argv)
     if (variables.count ("help"))
     {
         std::cout << desc << std::endl;
+        return false;
     }
-    else
+
+    engine.setDataDir (variables["data"].as<std::string>());
+    engine.setCell (variables["start"].as<std::string>());
+    engine.addMaster (variables["master"].as<std::string>());
+}
+
+int main(int argc, char**argv)
+{
+    try
     {
-      maintest (variables["data"].as<std::string>(), variables["start"].as<std::string>(),
-        variables["master"].as<std::string>());
+        OMW::Engine engine;
+    
+        if (parseOptions (argc, argv, engine))
+        {
+            engine.go();
         }
     }
     catch(exception &e)
@@ -70,5 +67,6 @@ int main(int argc, char**argv)
         cout << "\nERROR: " << e.what() << endl;
         return 1;
     }
+  
     return 0;
 }