mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-02-06 12:45:34 +00:00
Code Issues Releases Wiki Activity

Do not load (0,0) on new game

Browse source
This commit is contained in:
scrawl 2014-05-19 14:09:16 +02:00
parent 6f03694d50
commit 6bd0bbb8df
4 changed files with 36 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
apps/openmw/mwscript/cellextensions.cpp
View file

@ -104,6 +104,11 @@ namespace MWScript
std::string name = runtime.getStringLiteral (runtime[0].mInteger); std::string name = runtime.getStringLiteral (runtime[0].mInteger);
runtime.pop(); runtime.pop();
if (!MWBase::Environment::get().getWorld()->getPlayerPtr().isInCell())
{
runtime.push(0);
return;
}
const ESM::Cell *cell = MWBase::Environment::get().getWorld()->getPlayerPtr().getCell()->getCell(); const ESM::Cell *cell = MWBase::Environment::get().getWorld()->getPlayerPtr().getCell()->getCell();
std::string current = cell->mName; std::string current = cell->mName;

3
apps/openmw/mwscript/transformationextensions.cpp
View file

@ -271,7 +271,7 @@ namespace MWScript
{ {
MWWorld::Ptr ptr = R()(runtime); MWWorld::Ptr ptr = R()(runtime);
if (!ptr.isInCell()) if (ptr.getContainerStore())
return; return;
if (ptr.getRefData().getHandle() == "player") if (ptr.getRefData().getHandle() == "player")
@ -308,6 +308,7 @@ namespace MWScript
if(store) if(store)
{ {
MWBase::Environment::get().getWorld()->moveObject(ptr,store,x,y,z); MWBase::Environment::get().getWorld()->moveObject(ptr,store,x,y,z);
ptr = MWWorld::Ptr(ptr.getBase(), store);
float ax = Ogre::Radian(ptr.getRefData().getPosition().rot[0]).valueDegrees(); float ax = Ogre::Radian(ptr.getRefData().getPosition().rot[0]).valueDegrees();
float ay = Ogre::Radian(ptr.getRefData().getPosition().rot[1]).valueDegrees(); float ay = Ogre::Radian(ptr.getRefData().getPosition().rot[1]).valueDegrees();
if(ptr.getTypeName() == typeid(ESM::NPC).name())//some morrowind oddity if(ptr.getTypeName() == typeid(ESM::NPC).name())//some morrowind oddity

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

@ -136,8 +136,6 @@ void MWState::StateManager::newGame (bool bypass)
else else
MWBase::Environment::get().getWorld()->setGlobalInt ("chargenstate", -1); MWBase::Environment::get().getWorld()->setGlobalInt ("chargenstate", -1);
MWBase::Environment::get().getScriptManager()->getGlobalScripts().addStartup();
mState = State_Running; mState = State_Running;
} }

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

@ -6,7 +6,8 @@
#else #else
#include <tr1/unordered_map> #include <tr1/unordered_map>
#endif #endif
#include "../mwbase/scriptmanager.hpp"
#include "../mwscript/globalscripts.hpp"
#include <OgreSceneNode.h> #include <OgreSceneNode.h>
#include <libs/openengine/bullet/trace.h> #include <libs/openengine/bullet/trace.h>
@ -188,6 +189,18 @@ namespace MWWorld
MWBase::Environment::get().getWindowManager()->updatePlayer(); MWBase::Environment::get().getWindowManager()->updatePlayer();
if (!bypass)
{
// FIXME: should be set to 1, but the sound manager won't pause newly started sounds
mPlayIntro = 2;
// set new game mark
mGlobalVariables["chargenstate"].setInteger (1);
mGlobalVariables["pcrace"].setInteger (3);
MWBase::Environment::get().getScriptManager()->getGlobalScripts().addStartup();
}
if (bypass && !mStartCell.empty()) if (bypass && !mStartCell.empty())
{ {
ESM::Position pos; ESM::Position pos;
@ -204,8 +217,10 @@ namespace MWWorld
} }
else else
{ {
/// \todo if !bypass, do not add player location to global map for the duration of one for (int i=0; i<5; ++i)
/// frame MWBase::Environment::get().getScriptManager()->getGlobalScripts().run();
if (!getPlayerPtr().isInCell())
{
ESM::Position pos; ESM::Position pos;
const int cellSize = 8192; const int cellSize = 8192;
pos.pos[0] = cellSize/2; pos.pos[0] = cellSize/2;
@ -216,15 +231,6 @@ namespace MWWorld
pos.rot[2] = 0; pos.rot[2] = 0;
mWorldScene->changeToExteriorCell(pos); mWorldScene->changeToExteriorCell(pos);
} }
if (!bypass)
{
// FIXME: should be set to 1, but the sound manager won't pause newly started sounds
mPlayIntro = 2;
// set new game mark
mGlobalVariables["chargenstate"].setInteger (1);
mGlobalVariables["pcrace"].setInteger (3);
} }
// we don't want old weather to persist on a new game // we don't want old weather to persist on a new game
@ -938,7 +944,7 @@ namespace MWWorld
Ogre::Vector3 vec(x, y, z); Ogre::Vector3 vec(x, y, z);
CellStore *currCell = ptr.getCell(); CellStore *currCell = ptr.isInCell() ? ptr.getCell() : NULL;
bool isPlayer = ptr == mPlayer->getPlayer(); bool isPlayer = ptr == mPlayer->getPlayer();
bool haveToMove = isPlayer || mWorldScene->isCellActive(*currCell); bool haveToMove = isPlayer || mWorldScene->isCellActive(*currCell);