krageon/openmw-tes3coop
1
0
Fork 0
forked from teamnwah/openmw-tes3coop
Code Issues Pull requests Releases Wiki Activity

removed some redundancies; some more general cleanup

Browse source
This commit is contained in:
Marc Zinnschlag 2014-07-25 12:23:18 +02:00
parent d0654f3ade
commit af54bb9623
2 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
apps/openmw/mwstate/statemanagerimp.cpp
View file

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

4
apps/openmw/mwworld/worldimp.cpp
View file

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