mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-10-31 20:56:39 +00:00
Code Issues Releases Wiki Activity

removed default value for --start

Browse source
This commit is contained in:
Marc Zinnschlag 2013-11-16 12:08:00 +01:00
parent b3a7c8c098
commit 31ec973c9c
2 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
apps/openmw/engine.cpp
View file

@ -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);

2
apps/openmw/main.cpp
View file

@ -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(), "")