From 31ec973c9c07ac54e5f57962d6597ddcee050e3f Mon Sep 17 00:00:00 2001
From: Marc Zinnschlag <marc@zpages.de>
Date: Sat, 16 Nov 2013 12:08:00 +0100
Subject: [PATCH] removed default value for --start

---
 apps/openmw/engine.cpp | 20 ++++++++++++++------
 apps/openmw/main.cpp   |  2 +-
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/apps/openmw/engine.cpp b/apps/openmw/engine.cpp
index 8a02c855a..cfb5522f1 100644
--- a/apps/openmw/engine.cpp
+++ b/apps/openmw/engine.cpp
@@ -424,12 +424,21 @@ void OMW::Engine::prepareEngine (Settings::Manager & settings)
     ESM::Position pos;
     MWBase::World *world = MWBase::Environment::get().getWorld();
 
-    if (world->findExteriorPosition(mCellName, pos)) {
-        world->changeToExteriorCell (pos);
+    if (!mCellName.empty())
+    {
+        if (world->findExteriorPosition(mCellName, pos)) {
+            world->changeToExteriorCell (pos);
+        }
+        else {
+            world->findInteriorPosition(mCellName, pos);
+            world->changeToInteriorCell (mCellName, pos);
+        }
     }
-    else {
-        world->findInteriorPosition(mCellName, pos);
-        world->changeToInteriorCell (mCellName, pos);
+    else
+    {
+        pos.pos[0] = pos.pos[1] = pos.pos[2] = 0;
+        pos.rot[0] = pos.rot[1] = pos.pos[2] = 0;
+        world->changeToExteriorCell (pos);
     }
 
     Ogre::FrameEvent event;
@@ -456,7 +465,6 @@ void OMW::Engine::prepareEngine (Settings::Manager & settings)
 
 void OMW::Engine::go()
 {
-    assert (!mCellName.empty());
     assert (!mContentFiles.empty());
     assert (!mOgre);
 
diff --git a/apps/openmw/main.cpp b/apps/openmw/main.cpp
index 2bdfb91c3..89613fda4 100644
--- a/apps/openmw/main.cpp
+++ b/apps/openmw/main.cpp
@@ -107,7 +107,7 @@ bool parseOptions (int argc, char** argv, OMW::Engine& engine, Files::Configurat
         ("resources", bpo::value<std::string>()->default_value("resources"),
             "set resources directory")
 
-        ("start", bpo::value<std::string>()->default_value("Beshara"),
+        ("start", bpo::value<std::string>()->default_value(""),
             "set initial cell")
 
         ("content", bpo::value<StringsVector>()->default_value(StringsVector(), "")