mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-12-13 04:53:07 +00:00
Code Issues Releases Wiki Activity

remove some redundant code

Browse source
This commit is contained in:
greye 2012-08-10 21:03:46 +04:00
parent 38b06aee6c
commit 56c9c4dbd9
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
apps/openmw/mwworld/scene.cpp
View file

@ -140,19 +140,18 @@ namespace MWWorld
const ESM::Position& pos, const ESM::Position& pos,
bool adjustPlayerPos) bool adjustPlayerPos)
{ {
MWBase::Environment::get().getWorld()->getPlayer().setCell (cell);
bool hasWater = cell->cell->data.flags & cell->cell->HasWater; bool hasWater = cell->cell->data.flags & cell->cell->HasWater;
mPhysics->setCurrentWater(hasWater, cell->cell->water); mPhysics->setCurrentWater(hasWater, cell->cell->water);
MWBase::World *world = MWBase::Environment::get().getWorld(); MWBase::World *world = MWBase::Environment::get().getWorld();
MWWorld::Ptr player = world->getPlayer().getPlayer(); MWWorld::Ptr player = world->getPlayer().getPlayer();
world->getPlayer().setCell(cell);
if (adjustPlayerPos) { if (adjustPlayerPos) {
world->moveObject(player, pos.pos[0], pos.pos[1], pos.pos[2]); world->moveObject(player, pos.pos[0], pos.pos[1], pos.pos[2]);
world->rotateObject(player, pos.rot[0], pos.rot[1], pos.rot[2]); world->rotateObject(player, pos.rot[0], pos.rot[1], pos.rot[2]);
} }
world->getPlayer().setCell(cell);
MWMechanics::MechanicsManager *mechMgr = MWMechanics::MechanicsManager *mechMgr =
MWBase::Environment::get().getMechanicsManager(); MWBase::Environment::get().getMechanicsManager();