mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-04-09 21:44:54 +00:00
Code Issues Projects Releases Wiki Activity

removed --new-game switch

Browse Source
This commit is contained in:
Marc Zinnschlag 2013-11-16 11:36:32 +01:00
parent 7a4b604376
commit b3a7c8c098
3 changed files with 9 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
apps/openmw/engine.cpp
View File

@ -138,7 +138,6 @@ OMW::Engine::Engine(Files::ConfigurationManager& configurationManager)
: mOgre (0) : mOgre (0)
, mFpsLevel(0) , mFpsLevel(0)
, mVerboseScripts (false) , mVerboseScripts (false)
, mNewGame (false)
, mSkipMenu (false) , mSkipMenu (false)
, mUseSound (true) , mUseSound (true)
, mCompileAll (false) , mCompileAll (false)
@ -278,11 +277,6 @@ void OMW::Engine::setScriptsVerbosity(bool scriptsVerbosity)
mVerboseScripts = scriptsVerbosity; mVerboseScripts = scriptsVerbosity;
} }
void OMW::Engine::setNewGame(bool newGame)
{
mNewGame = newGame;
}
void OMW::Engine::setSkipMenu (bool skipMenu) void OMW::Engine::setSkipMenu (bool skipMenu)
{ {
mSkipMenu = skipMenu; mSkipMenu = skipMenu;
@ -395,10 +389,6 @@ void OMW::Engine::prepareEngine (Settings::Manager & settings)
input->setPlayer(&mEnvironment.getWorld()->getPlayer()); input->setPlayer(&mEnvironment.getWorld()->getPlayer());
window->initUI(); window->initUI();
if (mNewGame)
// still redundant work here: recreate CharacterCreation(),
// double update visibility etc.
window->setNewGame(true);
window->renderWorldMap(); window->renderWorldMap();
//Load translation data //Load translation data
@ -430,8 +420,6 @@ void OMW::Engine::prepareEngine (Settings::Manager & settings)
mechanics->buildPlayer(); mechanics->buildPlayer();
window->updatePlayer(); window->updatePlayer();
if (!mNewGame)
{
// load cell // load cell
ESM::Position pos; ESM::Position pos;
MWBase::World *world = MWBase::Environment::get().getWorld(); MWBase::World *world = MWBase::Environment::get().getWorld();
@ -443,9 +431,6 @@ void OMW::Engine::prepareEngine (Settings::Manager & settings)
world->findInteriorPosition(mCellName, pos); world->findInteriorPosition(mCellName, pos);
world->changeToInteriorCell (mCellName, pos); world->changeToInteriorCell (mCellName, pos);
} }
}
else
mEnvironment.getWorld()->startNewGame();
Ogre::FrameEvent event; Ogre::FrameEvent event;
event.timeSinceLastEvent = 0; event.timeSinceLastEvent = 0;

4
apps/openmw/engine.hpp
View File

@ -71,7 +71,6 @@ namespace OMW
std::vector<std::string> mContentFiles; std::vector<std::string> mContentFiles;
int mFpsLevel; int mFpsLevel;
bool mVerboseScripts; bool mVerboseScripts;
bool mNewGame;
bool mSkipMenu; bool mSkipMenu;
bool mUseSound; bool mUseSound;
bool mCompileAll; bool mCompileAll;
@ -150,9 +149,6 @@ namespace OMW
/// Disable or enable all sounds /// Disable or enable all sounds
void setSoundUsage(bool soundUsage); void setSoundUsage(bool soundUsage);
/// Start as a new game.
void setNewGame(bool newGame);
void setSkipMenu (bool skipMenu); void setSkipMenu (bool skipMenu);
/// Initialise and enter main loop. /// Initialise and enter main loop.

4
apps/openmw/main.cpp
View File

@ -131,9 +131,6 @@ bool parseOptions (int argc, char** argv, OMW::Engine& engine, Files::Configurat
("script-run", bpo::value<std::string>()->default_value(""), ("script-run", bpo::value<std::string>()->default_value(""),
"select a file containing a list of console commands that is executed on startup") "select a file containing a list of console commands that is executed on startup")
("new-game", bpo::value<bool>()->implicit_value(true)
->default_value(false), "activate char gen/new game mechanics")
("skip-menu", bpo::value<bool>()->implicit_value(true) ("skip-menu", bpo::value<bool>()->implicit_value(true)
->default_value(false), "skip main menu on game startup") ->default_value(false), "skip main menu on game startup")
@ -225,7 +222,6 @@ bool parseOptions (int argc, char** argv, OMW::Engine& engine, Files::Configurat
// startup-settings // startup-settings
engine.setCell(variables["start"].as<std::string>()); engine.setCell(variables["start"].as<std::string>());
engine.setNewGame(variables["new-game"].as<bool>());
engine.setSkipMenu (variables["skip-menu"].as<bool>()); engine.setSkipMenu (variables["skip-menu"].as<bool>());
// other settings // other settings