removed some redundancies; some more general cleanup

apps/openmw/mwstate/statemanagerimp.cpp

@@ -132,16 +132,13 @@ void MWState::StateManager::newGame (bool bypass)
 {
     cleanup();
 
-    MWBase::Environment::get().getWorld()->startNewGame (bypass);
-
     if (!bypass)
         MWBase::Environment::get().getWindowManager()->setNewGame (true);
-    else
-        MWBase::Environment::get().getWorld()->setGlobalInt ("chargenstate", -1);
-
 
     MWBase::Environment::get().getScriptManager()->getGlobalScripts().addStartup();
 
+    MWBase::Environment::get().getWorld()->startNewGame (bypass);
+
     mState = State_Running;
 }
 

apps/openmw/mwworld/worldimp.cpp

@@ -211,9 +211,9 @@ namespace MWWorld
             // set new game mark
             mGlobalVariables["chargenstate"].setInteger (1);
             mGlobalVariables["pcrace"].setInteger (3);
-
-            MWBase::Environment::get().getScriptManager()->getGlobalScripts().addStartup();
         }
+        else
+            mGlobalVariables["chargenstate"].setInteger (-1);
 
         if (bypass && !mStartCell.empty())
         {