teamnwah
/
openmw-tes3coop
forked from mirror/openmw-tes3mp
2
0
Fork 1
Code Issues Pull Requests 1 Releases Wiki Activity

started making CellStore into a proper class; encapsulated mCell member

Browse Source
actorid
Marc Zinnschlag 11 years ago
parent 550e5eb686
commit 7693f712bc
28 changed files with 161 additions and 145 deletions
Show Stats Download Patch File Download Diff File

4
apps/openmw/mwdialogue/filter.cpp
Unescape Escape View File

@ -110,7 +110,7 @@ bool MWDialogue::Filter::testPlayer (const ESM::DialInfo& info) const
// check cell // check cell
if (!info.mCell.empty()) if (!info.mCell.empty())
if (!Misc::StringUtils::ciEqual(player.getCell()->mCell->mName, info.mCell)) if (!Misc::StringUtils::ciEqual(player.getCell()->getCell()->mName, info.mCell))
return false; return false;
return true; return true;
@ -445,7 +445,7 @@ bool MWDialogue::Filter::getSelectStructBoolean (const SelectWrapper& select) co
case SelectWrapper::Function_NotCell: case SelectWrapper::Function_NotCell:
return !Misc::StringUtils::ciEqual(mActor.getCell()->mCell->mName, select.getName()); return !Misc::StringUtils::ciEqual(mActor.getCell()->getCell()->mName, select.getName());
case SelectWrapper::Function_NotLocal: case SelectWrapper::Function_NotLocal:
{ {

2
apps/openmw/mwgui/mapwindow.cpp
Unescape Escape View File

@ -356,7 +356,7 @@ namespace MWGui
ESM::Position markedPosition; ESM::Position markedPosition;
MWBase::Environment::get().getWorld()->getPlayer().getMarkedPosition(markedCell, markedPosition); MWBase::Environment::get().getWorld()->getPlayer().getMarkedPosition(markedCell, markedPosition);
if (markedCell && markedCell->isExterior() == !mInterior if (markedCell && markedCell->isExterior() == !mInterior
&& (!mInterior || Misc::StringUtils::ciEqual(markedCell->mCell->mName, mPrefix))) && (!mInterior || Misc::StringUtils::ciEqual(markedCell->getCell()->mName, mPrefix)))
{ {
MarkerPosition markerPos; MarkerPosition markerPos;
MyGUI::IntPoint widgetPos = getMarkerPosition(markedPosition.pos[0], markedPosition.pos[1], markerPos); MyGUI::IntPoint widgetPos = getMarkerPosition(markedPosition.pos[0], markedPosition.pos[1], markerPos);

6
apps/openmw/mwgui/travelwindow.cpp
Unescape Escape View File

@ -109,7 +109,11 @@ namespace MWGui
int x,y; int x,y;
MWBase::Environment::get().getWorld()->positionToIndex(mPtr.get<ESM::NPC>()->mBase->mTransport[i].mPos.pos[0], MWBase::Environment::get().getWorld()->positionToIndex(mPtr.get<ESM::NPC>()->mBase->mTransport[i].mPos.pos[0],
mPtr.get<ESM::NPC>()->mBase->mTransport[i].mPos.pos[1],x,y); mPtr.get<ESM::NPC>()->mBase->mTransport[i].mPos.pos[1],x,y);
if(cellname == "") {cellname = MWBase::Environment::get().getWorld()->getExterior(x,y)->mCell->mName; interior= false;} if (cellname == "")
{
cellname = MWBase::Environment::get().getWorld()->getExterior(x,y)->getCell()->mName;
interior = false;
}
addDestination(cellname,mPtr.get<ESM::NPC>()->mBase->mTransport[i].mPos,interior); addDestination(cellname,mPtr.get<ESM::NPC>()->mBase->mTransport[i].mPos,interior);
} }

2
apps/openmw/mwgui/waitdialog.cpp
Unescape Escape View File

@ -129,7 +129,7 @@ namespace MWGui
MWWorld::Ptr player = world->getPlayerPtr(); MWWorld::Ptr player = world->getPlayerPtr();
if (mSleeping && player.getCell()->isExterior()) if (mSleeping && player.getCell()->isExterior())
{ {
std::string regionstr = player.getCell()->mCell->mRegion; std::string regionstr = player.getCell()->getCell()->mRegion;
if (!regionstr.empty()) if (!regionstr.empty())
{ {
const ESM::Region *region = world->getStore().get<ESM::Region>().find (regionstr); const ESM::Region *region = world->getStore().get<ESM::Region>().find (regionstr);

16
apps/openmw/mwgui/windowmanagerimp.cpp
Unescape Escape View File

@ -739,22 +739,22 @@ namespace MWGui
mMap->setCellName( name ); mMap->setCellName( name );
mHud->setCellName( name ); mHud->setCellName( name );
if (cell->mCell->isExterior()) if (cell->getCell()->isExterior())
{ {
if (!cell->mCell->mName.empty()) if (!cell->getCell()->mName.empty())
mMap->addVisitedLocation ("#{sCell=" + name + "}", cell->mCell->getGridX (), cell->mCell->getGridY ()); mMap->addVisitedLocation ("#{sCell=" + name + "}", cell->getCell()->getGridX (), cell->getCell()->getGridY ());
mMap->cellExplored(cell->mCell->getGridX(), cell->mCell->getGridY()); mMap->cellExplored (cell->getCell()->getGridX(), cell->getCell()->getGridY());
mMap->setCellPrefix("Cell"); mMap->setCellPrefix("Cell");
mHud->setCellPrefix("Cell"); mHud->setCellPrefix("Cell");
mMap->setActiveCell( cell->mCell->getGridX(), cell->mCell->getGridY() ); mMap->setActiveCell (cell->getCell()->getGridX(), cell->getCell()->getGridY());
mHud->setActiveCell( cell->mCell->getGridX(), cell->mCell->getGridY() ); mHud->setActiveCell (cell->getCell()->getGridX(), cell->getCell()->getGridY());
} }
else else
{ {
mMap->setCellPrefix( cell->mCell->mName ); mMap->setCellPrefix (cell->getCell()->mName );
mHud->setCellPrefix( cell->mCell->mName ); mHud->setCellPrefix (cell->getCell()->mName );
Ogre::Vector3 worldPos; Ogre::Vector3 worldPos;
if (!MWBase::Environment::get().getWorld()->findInteriorPositionInWorldSpace(cell, worldPos)) if (!MWBase::Environment::get().getWorld()->findInteriorPositionInWorldSpace(cell, worldPos))

10
apps/openmw/mwmechanics/aiactivate.cpp
Unescape Escape View File

@ -33,12 +33,12 @@ bool MWMechanics::AiActivate::execute (const MWWorld::Ptr& actor,float duration)
MWBase::World *world = MWBase::Environment::get().getWorld(); MWBase::World *world = MWBase::Environment::get().getWorld();
ESM::Position pos = actor.getRefData().getPosition(); ESM::Position pos = actor.getRefData().getPosition();
Movement &movement = actor.getClass().getMovementSettings(actor); Movement &movement = actor.getClass().getMovementSettings(actor);
const ESM::Cell *cell = actor.getCell()->mCell; const ESM::Cell *cell = actor.getCell()->getCell();
MWWorld::Ptr player = world->getPlayerPtr(); MWWorld::Ptr player = world->getPlayerPtr();
if(cell->mData.mX != player.getCell()->mCell->mData.mX) if(cell->mData.mX != player.getCell()->getCell()->mData.mX)
{ {
int sideX = sgn(cell->mData.mX - player.getCell()->mCell->mData.mX); int sideX = sgn(cell->mData.mX - player.getCell()->getCell()->mData.mX);
//check if actor is near the border of an inactive cell. If so, stop walking. //check if actor is near the border of an inactive cell. If so, stop walking.
if(sideX * (pos.pos[0] - cell->mData.mX*ESM::Land::REAL_SIZE) > if(sideX * (pos.pos[0] - cell->mData.mX*ESM::Land::REAL_SIZE) >
sideX * (ESM::Land::REAL_SIZE/2.0f - 200.0f)) sideX * (ESM::Land::REAL_SIZE/2.0f - 200.0f))
@ -47,9 +47,9 @@ bool MWMechanics::AiActivate::execute (const MWWorld::Ptr& actor,float duration)
return false; return false;
} }
} }
if(cell->mData.mY != player.getCell()->mCell->mData.mY) if(cell->mData.mY != player.getCell()->getCell()->mData.mY)
{ {
int sideY = sgn(cell->mData.mY - player.getCell()->mCell->mData.mY); int sideY = sgn(cell->mData.mY - player.getCell()->getCell()->mData.mY);
//check if actor is near the border of an inactive cell. If so, stop walking. //check if actor is near the border of an inactive cell. If so, stop walking.
if(sideY * (pos.pos[1] - cell->mData.mY*ESM::Land::REAL_SIZE) > if(sideY * (pos.pos[1] - cell->mData.mY*ESM::Land::REAL_SIZE) >
sideY * (ESM::Land::REAL_SIZE/2.0f - 200.0f)) sideY * (ESM::Land::REAL_SIZE/2.0f - 200.0f))

30
apps/openmw/mwmechanics/aicombat.cpp
Unescape Escape View File

@ -34,9 +34,9 @@ namespace
namespace MWMechanics namespace MWMechanics
{ {
AiCombat::AiCombat(const MWWorld::Ptr& actor) : AiCombat::AiCombat(const MWWorld::Ptr& actor) :
mTarget(actor), mTarget(actor),
mTimerAttack(0), mTimerAttack(0),
mTimerReact(0), mTimerReact(0),
mTimerCombatMove(0), mTimerCombatMove(0),
mFollowTarget(false), mFollowTarget(false),
mReadyToAttack(false), mReadyToAttack(false),
@ -77,7 +77,7 @@ namespace MWMechanics
if (zTurn(actor, Ogre::Degree(mTargetAngle))) if (zTurn(actor, Ogre::Degree(mTargetAngle)))
mRotate = false; mRotate = false;
} }
mTimerAttack -= duration; mTimerAttack -= duration;
actor.getClass().getCreatureStats(actor).setAttackingOrSpell(mStrike); actor.getClass().getCreatureStats(actor).setAttackingOrSpell(mStrike);
@ -105,7 +105,7 @@ namespace MWMechanics
//Also it seems that this time is different for slash/thrust/chop //Also it seems that this time is different for slash/thrust/chop
mTimerAttack = 0.35f * static_cast<float>(rand())/RAND_MAX; mTimerAttack = 0.35f * static_cast<float>(rand())/RAND_MAX;
mStrike = true; mStrike = true;
//say a provoking combat phrase //say a provoking combat phrase
if (actor.getClass().isNpc()) if (actor.getClass().isNpc())
{ {
@ -126,7 +126,7 @@ namespace MWMechanics
mTimerAttack = -attackPeriod; mTimerAttack = -attackPeriod;
mStrike = false; mStrike = false;
} }
const MWWorld::Class &cls = actor.getClass(); const MWWorld::Class &cls = actor.getClass();
const ESM::Weapon *weapon = NULL; const ESM::Weapon *weapon = NULL;
MWMechanics::WeaponType weaptype; MWMechanics::WeaponType weaptype;
@ -138,14 +138,14 @@ namespace MWMechanics
{ {
MWMechanics::DrawState_ state = actor.getClass().getCreatureStats(actor).getDrawState(); MWMechanics::DrawState_ state = actor.getClass().getCreatureStats(actor).getDrawState();
if (state == MWMechanics::DrawState_Spell || state == MWMechanics::DrawState_Nothing) if (state == MWMechanics::DrawState_Spell || state == MWMechanics::DrawState_Nothing)
actor.getClass().getNpcStats(actor).setDrawState(MWMechanics::DrawState_Weapon); actor.getClass().getNpcStats(actor).setDrawState(MWMechanics::DrawState_Weapon);
//Get weapon speed and range //Get weapon speed and range
MWWorld::ContainerStoreIterator weaponSlot = MWWorld::ContainerStoreIterator weaponSlot =
MWMechanics::getActiveWeapon(cls.getNpcStats(actor), cls.getInventoryStore(actor), &weaptype); MWMechanics::getActiveWeapon(cls.getNpcStats(actor), cls.getInventoryStore(actor), &weaptype);
if (weaptype == WeapType_HandToHand) if (weaptype == WeapType_HandToHand)
{ {
const MWWorld::Store<ESM::GameSetting> &gmst = const MWWorld::Store<ESM::GameSetting> &gmst =
MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>(); MWBase::Environment::get().getWorld()->getStore().get<ESM::GameSetting>();
weapRange = gmst.find("fHandToHandReach")->getFloat(); weapRange = gmst.find("fHandToHandReach")->getFloat();
} }
@ -246,12 +246,12 @@ namespace MWMechanics
mPathFinder.checkPathCompleted(pos.pos[0],pos.pos[1],pos.pos[2]); mPathFinder.checkPathCompleted(pos.pos[0],pos.pos[1],pos.pos[2]);
//try shortcut //try shortcut
if(vDir.length() < mPathFinder.getDistToNext(pos.pos[0],pos.pos[1],pos.pos[2]) && MWBase::Environment::get().getWorld()->getLOS(actor, mTarget)) if(vDir.length() < mPathFinder.getDistToNext(pos.pos[0],pos.pos[1],pos.pos[2]) && MWBase::Environment::get().getWorld()->getLOS(actor, mTarget))
mTargetAngle = Ogre::Radian( Ogre::Math::ACos(vDir.y / vDir.length()) * sgn(Ogre::Math::ASin(vDir.x / vDir.length())) ).valueDegrees(); mTargetAngle = Ogre::Radian( Ogre::Math::ACos(vDir.y / vDir.length()) * sgn(Ogre::Math::ASin(vDir.x / vDir.length())) ).valueDegrees();
else else
mTargetAngle = mPathFinder.getZAngleToNext(pos.pos[0], pos.pos[1]); mTargetAngle = mPathFinder.getZAngleToNext(pos.pos[0], pos.pos[1]);
mRotate = true; mRotate = true;
mMovement.mPosition[1] = 1; mMovement.mPosition[1] = 1;
mReadyToAttack = false; mReadyToAttack = false;
} }
@ -305,13 +305,13 @@ namespace MWMechanics
float dist = Ogre::Math::Abs((newPathTarget - currPathTarget).length()); float dist = Ogre::Math::Abs((newPathTarget - currPathTarget).length());
float targetPosThreshold; float targetPosThreshold;
bool isOutside = actor.getCell()->mCell->isExterior(); bool isOutside = actor.getCell()->getCell()->isExterior();
if (isOutside) if (isOutside)
targetPosThreshold = 300; targetPosThreshold = 300;
else else
targetPosThreshold = 100; targetPosThreshold = 100;
if(dist > targetPosThreshold) if(dist > targetPosThreshold)
{ {
//construct new path only if target has moved away more than on <targetPosThreshold> //construct new path only if target has moved away more than on <targetPosThreshold>
ESM::Position pos = actor.getRefData().getPosition(); ESM::Position pos = actor.getRefData().getPosition();
@ -328,7 +328,7 @@ namespace MWMechanics
PathFinder newPathFinder; PathFinder newPathFinder;
newPathFinder.buildPath(start, dest, actor.getCell(), isOutside); newPathFinder.buildPath(start, dest, actor.getCell(), isOutside);
//TO EXPLORE: //TO EXPLORE:
//maybe here is a mistake (?): PathFinder::getPathSize() returns number of grid points in the path, //maybe here is a mistake (?): PathFinder::getPathSize() returns number of grid points in the path,
//not the actual path length. Here we should know if the new path is actually more effective. //not the actual path length. Here we should know if the new path is actually more effective.
//if(pathFinder2.getPathSize() < mPathFinder.getPathSize()) //if(pathFinder2.getPathSize() < mPathFinder.getPathSize())
@ -391,7 +391,7 @@ void chooseBestAttack(const ESM::Weapon* weapon, MWMechanics::Movement &movement
int thrust = (weapon->mData.mThrust[0] + weapon->mData.mThrust[1])/2; int thrust = (weapon->mData.mThrust[0] + weapon->mData.mThrust[1])/2;
float total = slash + chop + thrust; float total = slash + chop + thrust;
float roll = static_cast<float>(rand())/RAND_MAX; float roll = static_cast<float>(rand())/RAND_MAX;
if(roll <= static_cast<float>(slash)/total) if(roll <= static_cast<float>(slash)/total)
{ {

22
apps/openmw/mwmechanics/aiescort.cpp
Unescape Escape View File

@ -86,25 +86,25 @@ namespace MWMechanics
MWWorld::Ptr player = MWBase::Environment::get().getWorld()->getPlayerPtr(); MWWorld::Ptr player = MWBase::Environment::get().getWorld()->getPlayerPtr();
ESM::Position pos = actor.getRefData().getPosition(); ESM::Position pos = actor.getRefData().getPosition();
bool cellChange = actor.getCell()->mCell->mData.mX != mCellX || actor.getCell()->mCell->mData.mY != mCellY; bool cellChange = actor.getCell()->getCell()->mData.mX != mCellX || actor.getCell()->getCell()->mData.mY != mCellY;
if(actor.getCell()->mCell->mData.mX != player.getCell()->mCell->mData.mX) if(actor.getCell()->getCell()->mData.mX != player.getCell()->getCell()->mData.mX)
{ {
int sideX = sgn(actor.getCell()->mCell->mData.mX - player.getCell()->mCell->mData.mX); int sideX = sgn(actor.getCell()->getCell()->mData.mX - player.getCell()->getCell()->mData.mX);
// Check if actor is near the border of an inactive cell. If so, pause walking. // Check if actor is near the border of an inactive cell. If so, pause walking.
if(sideX * (pos.pos[0] - actor.getCell()->mCell->mData.mX * ESM::Land::REAL_SIZE) > sideX * (ESM::Land::REAL_SIZE / if(sideX * (pos.pos[0] - actor.getCell()->getCell()->mData.mX * ESM::Land::REAL_SIZE) > sideX * (ESM::Land::REAL_SIZE /
2.0 - 200)) 2.0 - 200))
{ {
MWWorld::Class::get(actor).getMovementSettings(actor).mPosition[1] = 0; MWWorld::Class::get(actor).getMovementSettings(actor).mPosition[1] = 0;
return false; return false;
} }
} }
if(actor.getCell()->mCell->mData.mY != player.getCell()->mCell->mData.mY) if(actor.getCell()->getCell()->mData.mY != player.getCell()->getCell()->mData.mY)
{ {
int sideY = sgn(actor.getCell()->mCell->mData.mY - player.getCell()->mCell->mData.mY); int sideY = sgn(actor.getCell()->getCell()->mData.mY - player.getCell()->getCell()->mData.mY);
// Check if actor is near the border of an inactive cell. If so, pause walking. // Check if actor is near the border of an inactive cell. If so, pause walking.
if(sideY*(pos.pos[1] - actor.getCell()->mCell->mData.mY * ESM::Land::REAL_SIZE) > sideY * (ESM::Land::REAL_SIZE / if(sideY*(pos.pos[1] - actor.getCell()->getCell()->mData.mY * ESM::Land::REAL_SIZE) > sideY * (ESM::Land::REAL_SIZE /
2.0 - 200)) 2.0 - 200))
{ {
MWWorld::Class::get(actor).getMovementSettings(actor).mPosition[1] = 0; MWWorld::Class::get(actor).getMovementSettings(actor).mPosition[1] = 0;
return false; return false;
@ -114,8 +114,8 @@ namespace MWMechanics
if(!mPathFinder.isPathConstructed() || cellChange) if(!mPathFinder.isPathConstructed() || cellChange)
{ {
mCellX = actor.getCell()->mCell->mData.mX; mCellX = actor.getCell()->getCell()->mData.mX;
mCellY = actor.getCell()->mCell->mData.mY; mCellY = actor.getCell()->getCell()->mData.mY;
ESM::Pathgrid::Point dest; ESM::Pathgrid::Point dest;
dest.mX = mX; dest.mX = mX;

8
apps/openmw/mwmechanics/aifollow.cpp
Unescape Escape View File

@ -33,16 +33,16 @@ bool MWMechanics::AiFollow::execute (const MWWorld::Ptr& actor,float duration)
if((pos.pos[0]-mX)*(pos.pos[0]-mX) + if((pos.pos[0]-mX)*(pos.pos[0]-mX) +
(pos.pos[1]-mY)*(pos.pos[1]-mY) + (pos.pos[1]-mY)*(pos.pos[1]-mY) +
(pos.pos[2]-mZ)*(pos.pos[2]-mZ) < 100*100) (pos.pos[2]-mZ)*(pos.pos[2]-mZ) < 100*100)
{ {
if(actor.getCell()->isExterior()) if(actor.getCell()->isExterior())
{ {
if(mCellId == "") if(mCellId == "")
return true; return true;
} }
else else
{ {
if(mCellId == actor.getCell()->mCell->mName) if(mCellId == actor.getCell()->getCell()->mName)
return true; return true;
} }
} }
@ -67,7 +67,7 @@ bool MWMechanics::AiFollow::execute (const MWWorld::Ptr& actor,float duration)
{ {
ESM::Pathgrid::Point lastPos = mPathFinder.getPath().back(); ESM::Pathgrid::Point lastPos = mPathFinder.getPath().back();
if((dest.mX - lastPos.mX)*(dest.mX - lastPos.mX) if((dest.mX - lastPos.mX)*(dest.mX - lastPos.mX)
+(dest.mY - lastPos.mY)*(dest.mY - lastPos.mY) +(dest.mY - lastPos.mY)*(dest.mY - lastPos.mY)
+(dest.mZ - lastPos.mZ)*(dest.mZ - lastPos.mZ) +(dest.mZ - lastPos.mZ)*(dest.mZ - lastPos.mZ)
> 100*100) > 100*100)

10
apps/openmw/mwmechanics/aitravel.cpp
Unescape Escape View File

@ -36,12 +36,12 @@ namespace MWMechanics
MWBase::World *world = MWBase::Environment::get().getWorld(); MWBase::World *world = MWBase::Environment::get().getWorld();
ESM::Position pos = actor.getRefData().getPosition(); ESM::Position pos = actor.getRefData().getPosition();
Movement &movement = actor.getClass().getMovementSettings(actor); Movement &movement = actor.getClass().getMovementSettings(actor);
const ESM::Cell *cell = actor.getCell()->mCell; const ESM::Cell *cell = actor.getCell()->getCell();
MWWorld::Ptr player = world->getPlayerPtr(); MWWorld::Ptr player = world->getPlayerPtr();
if(cell->mData.mX != player.getCell()->mCell->mData.mX) if(cell->mData.mX != player.getCell()->getCell()->mData.mX)
{ {
int sideX = sgn(cell->mData.mX - player.getCell()->mCell->mData.mX); int sideX = sgn(cell->mData.mX - player.getCell()->getCell()->mData.mX);
//check if actor is near the border of an inactive cell. If so, stop walking. //check if actor is near the border of an inactive cell. If so, stop walking.
if(sideX * (pos.pos[0] - cell->mData.mX*ESM::Land::REAL_SIZE) > if(sideX * (pos.pos[0] - cell->mData.mX*ESM::Land::REAL_SIZE) >
sideX * (ESM::Land::REAL_SIZE/2.0f - 200.0f)) sideX * (ESM::Land::REAL_SIZE/2.0f - 200.0f))
@ -50,9 +50,9 @@ namespace MWMechanics
return false; return false;
} }
} }
if(cell->mData.mY != player.getCell()->mCell->mData.mY) if(cell->mData.mY != player.getCell()->getCell()->mData.mY)
{ {
int sideY = sgn(cell->mData.mY - player.getCell()->mCell->mData.mY); int sideY = sgn(cell->mData.mY - player.getCell()->getCell()->mData.mY);
//check if actor is near the border of an inactive cell. If so, stop walking. //check if actor is near the border of an inactive cell. If so, stop walking.
if(sideY * (pos.pos[1] - cell->mData.mY*ESM::Land::REAL_SIZE) > if(sideY * (pos.pos[1] - cell->mData.mY*ESM::Land::REAL_SIZE) >
sideY * (ESM::Land::REAL_SIZE/2.0f - 200.0f)) sideY * (ESM::Land::REAL_SIZE/2.0f - 200.0f))

10
apps/openmw/mwmechanics/aiwander.cpp
Unescape Escape View File

@ -103,10 +103,10 @@ namespace MWMechanics
if(!mStoredAvailableNodes) if(!mStoredAvailableNodes)
{ {
mStoredAvailableNodes = true; mStoredAvailableNodes = true;
mPathgrid = world->getStore().get<ESM::Pathgrid>().search(*actor.getCell()->mCell); mPathgrid = world->getStore().get<ESM::Pathgrid>().search(*actor.getCell()->getCell());
mCellX = actor.getCell()->mCell->mData.mX; mCellX = actor.getCell()->getCell()->mData.mX;
mCellY = actor.getCell()->mCell->mData.mY; mCellY = actor.getCell()->getCell()->mData.mY;
if(!mPathgrid) if(!mPathgrid)
mDistance = 0; mDistance = 0;
@ -117,7 +117,7 @@ namespace MWMechanics
{ {
mXCell = 0; mXCell = 0;
mYCell = 0; mYCell = 0;
if(actor.getCell()->mCell->isExterior()) if(actor.getCell()->getCell()->isExterior())
{ {
mXCell = mCellX * ESM::Land::REAL_SIZE; mXCell = mCellX * ESM::Land::REAL_SIZE;
mYCell = mCellY * ESM::Land::REAL_SIZE; mYCell = mCellY * ESM::Land::REAL_SIZE;
@ -157,7 +157,7 @@ namespace MWMechanics
mDistance = 0; mDistance = 0;
// Don't try to move if you are in a new cell (ie: positioncell command called) but still play idles. // Don't try to move if you are in a new cell (ie: positioncell command called) but still play idles.
if(mDistance && (mCellX != actor.getCell()->mCell->mData.mX || mCellY != actor.getCell()->mCell->mData.mY)) if(mDistance && (mCellX != actor.getCell()->getCell()->mData.mX || mCellY != actor.getCell()->getCell()->mData.mY))
mDistance = 0; mDistance = 0;
if(mChooseAction) if(mChooseAction)

8
apps/openmw/mwmechanics/pathfinding.cpp
Unescape Escape View File

@ -299,14 +299,14 @@ namespace MWMechanics
if(!allowShortcuts) if(!allowShortcuts)
{ {
const ESM::Pathgrid *pathGrid = const ESM::Pathgrid *pathGrid =
MWBase::Environment::get().getWorld()->getStore().get<ESM::Pathgrid>().search(*mCell->mCell); MWBase::Environment::get().getWorld()->getStore().get<ESM::Pathgrid>().search(*mCell->getCell());
float xCell = 0; float xCell = 0;
float yCell = 0; float yCell = 0;
if (mCell->isExterior()) if (mCell->isExterior())
{ {
xCell = mCell->mCell->mData.mX * ESM::Land::REAL_SIZE; xCell = mCell->getCell()->mData.mX * ESM::Land::REAL_SIZE;
yCell = mCell->mCell->mData.mY * ESM::Land::REAL_SIZE; yCell = mCell->getCell()->mData.mY * ESM::Land::REAL_SIZE;
} }
int startNode = getClosestPoint(pathGrid, startPoint.mX - xCell, startPoint.mY - yCell,startPoint.mZ); int startNode = getClosestPoint(pathGrid, startPoint.mX - xCell, startPoint.mY - yCell,startPoint.mZ);
int endNode = getClosestPoint(pathGrid, endPoint.mX - xCell, endPoint.mY - yCell, endPoint.mZ); int endNode = getClosestPoint(pathGrid, endPoint.mX - xCell, endPoint.mY - yCell, endPoint.mZ);
@ -393,7 +393,7 @@ namespace MWMechanics
{ {
std::list<ESM::Pathgrid::Point>::const_iterator oldStart = path.begin(); std::list<ESM::Pathgrid::Point>::const_iterator oldStart = path.begin();
std::list<ESM::Pathgrid::Point>::iterator iter = ++mPath.begin(); std::list<ESM::Pathgrid::Point>::iterator iter = ++mPath.begin();
if( (*iter).mX == oldStart->mX if( (*iter).mX == oldStart->mX
&& (*iter).mY == oldStart->mY && (*iter).mY == oldStart->mY
&& (*iter).mZ == oldStart->mZ && (*iter).mZ == oldStart->mZ

2
apps/openmw/mwmechanics/spellcasting.cpp
Unescape Escape View File

@ -503,7 +503,7 @@ namespace MWMechanics
MWBase::Environment::get().getWorld()->getPlayer().getMarkedPosition(markedCell, markedPosition); MWBase::Environment::get().getWorld()->getPlayer().getMarkedPosition(markedCell, markedPosition);
if (markedCell) if (markedCell)
{ {
MWWorld::ActionTeleport action(markedCell->isExterior() ? "" : markedCell->mCell->mName, MWWorld::ActionTeleport action(markedCell->isExterior() ? "" : markedCell->getCell()->mName,
markedPosition); markedPosition);
action.execute(target); action.execute(target);
} }

4
apps/openmw/mwrender/animation.cpp
Unescape Escape View File

@ -334,7 +334,7 @@ void Animation::addExtraLight(Ogre::SceneManager *sceneMgr, NifOgre::ObjectScene
)); ));
objlist->mControllers.push_back(Ogre::Controller<Ogre::Real>(src, dest, func)); objlist->mControllers.push_back(Ogre::Controller<Ogre::Real>(src, dest, func));
bool interior = !(mPtr.isInCell() && mPtr.getCell()->mCell->isExterior()); bool interior = !(mPtr.isInCell() && mPtr.getCell()->getCell()->isExterior());
bool quadratic = fallback->getFallbackBool("LightAttenuation_OutQuadInLin") ? bool quadratic = fallback->getFallbackBool("LightAttenuation_OutQuadInLin") ?
!interior : fallback->getFallbackBool("LightAttenuation_UseQuadratic"); !interior : fallback->getFallbackBool("LightAttenuation_UseQuadratic");
@ -1070,7 +1070,7 @@ bool Animation::allowSwitchViewMode() const
{ {
for (AnimStateMap::const_iterator stateiter = mStates.begin(); stateiter != mStates.end(); ++stateiter) for (AnimStateMap::const_iterator stateiter = mStates.begin(); stateiter != mStates.end(); ++stateiter)
{ {
if(stateiter->second.mPriority > MWMechanics::Priority_Movement if(stateiter->second.mPriority > MWMechanics::Priority_Movement
&& stateiter->second.mPriority < MWMechanics::Priority_Torch) && stateiter->second.mPriority < MWMechanics::Priority_Torch)
return false; return false;
} }

16
apps/openmw/mwrender/debugging.cpp
Unescape Escape View File

@ -230,22 +230,22 @@ void Debugging::togglePathgrid()
void Debugging::enableCellPathgrid(MWWorld::CellStore *store) void Debugging::enableCellPathgrid(MWWorld::CellStore *store)
{ {
const ESM::Pathgrid *pathgrid = const ESM::Pathgrid *pathgrid =
MWBase::Environment::get().getWorld()->getStore().get<ESM::Pathgrid>().search(*store->mCell); MWBase::Environment::get().getWorld()->getStore().get<ESM::Pathgrid>().search(*store->getCell());
if (!pathgrid) return; if (!pathgrid) return;
Vector3 cellPathGridPos(0, 0, 0); Vector3 cellPathGridPos(0, 0, 0);
if (store->mCell->isExterior()) if (store->getCell()->isExterior())
{ {
cellPathGridPos.x = store->mCell->mData.mX * ESM::Land::REAL_SIZE; cellPathGridPos.x = store->getCell()->mData.mX * ESM::Land::REAL_SIZE;
cellPathGridPos.y = store->mCell->mData.mY * ESM::Land::REAL_SIZE; cellPathGridPos.y = store->getCell()->mData.mY * ESM::Land::REAL_SIZE;
} }
SceneNode *cellPathGrid = mPathGridRoot->createChildSceneNode(cellPathGridPos); SceneNode *cellPathGrid = mPathGridRoot->createChildSceneNode(cellPathGridPos);
cellPathGrid->attachObject(createPathgridLines(pathgrid)); cellPathGrid->attachObject(createPathgridLines(pathgrid));
cellPathGrid->attachObject(createPathgridPoints(pathgrid)); cellPathGrid->attachObject(createPathgridPoints(pathgrid));
if (store->mCell->isExterior()) if (store->getCell()->isExterior())
{ {
mExteriorPathgridNodes[std::make_pair(store->mCell->getGridX(), store->mCell->getGridY())] = cellPathGrid; mExteriorPathgridNodes[std::make_pair(store->getCell()->getGridX(), store->getCell()->getGridY())] = cellPathGrid;
} }
else else
{ {
@ -256,10 +256,10 @@ void Debugging::enableCellPathgrid(MWWorld::CellStore *store)
void Debugging::disableCellPathgrid(MWWorld::CellStore *store) void Debugging::disableCellPathgrid(MWWorld::CellStore *store)
{ {
if (store->mCell->isExterior()) if (store->getCell()->isExterior())
{ {
ExteriorPathgridNodes::iterator it = ExteriorPathgridNodes::iterator it =
mExteriorPathgridNodes.find(std::make_pair(store->mCell->getGridX(), store->mCell->getGridY())); mExteriorPathgridNodes.find(std::make_pair(store->getCell()->getGridX(), store->getCell()->getGridY()));
if (it != mExteriorPathgridNodes.end()) if (it != mExteriorPathgridNodes.end())
{ {
destroyCellPathgridNode(it->second); destroyCellPathgridNode(it->second);

8
apps/openmw/mwrender/localmap.cpp
Unescape Escape View File

@ -115,8 +115,8 @@ void LocalMap::requestMap(MWWorld::CellStore* cell, float zMin, float zMax)
mCameraRotNode->setOrientation(Quaternion::IDENTITY); mCameraRotNode->setOrientation(Quaternion::IDENTITY);
mCellCamera->setOrientation(Quaternion(Ogre::Math::Cos(Ogre::Degree(0)/2.f), 0, 0, -Ogre::Math::Sin(Ogre::Degree(0)/2.f))); mCellCamera->setOrientation(Quaternion(Ogre::Math::Cos(Ogre::Degree(0)/2.f), 0, 0, -Ogre::Math::Sin(Ogre::Degree(0)/2.f)));
int x = cell->mCell->getGridX(); int x = cell->getCell()->getGridX();
int y = cell->mCell->getGridY(); int y = cell->getCell()->getGridY();
std::string name = "Cell_"+coordStr(x, y); std::string name = "Cell_"+coordStr(x, y);
@ -182,7 +182,7 @@ void LocalMap::requestMap(MWWorld::CellStore* cell,
const int segsX = std::ceil( length.x / sSize ); const int segsX = std::ceil( length.x / sSize );
const int segsY = std::ceil( length.y / sSize ); const int segsY = std::ceil( length.y / sSize );
mInteriorName = cell->mCell->mName; mInteriorName = cell->getCell()->mName;
for (int x=0; x<segsX; ++x) for (int x=0; x<segsX; ++x)
{ {
@ -192,7 +192,7 @@ void LocalMap::requestMap(MWWorld::CellStore* cell,
Vector2 newcenter = start + 4096; Vector2 newcenter = start + 4096;
render(newcenter.x - center.x, newcenter.y - center.y, zMin, zMax, sSize, sSize, render(newcenter.x - center.x, newcenter.y - center.y, zMin, zMax, sSize, sSize,
cell->mCell->mName + "_" + coordStr(x,y)); cell->getCell()->mName + "_" + coordStr(x,y));
} }
} }
} }

20
apps/openmw/mwrender/renderingmanager.cpp
Unescape Escape View File

@ -422,9 +422,9 @@ void RenderingManager::postRenderTargetUpdate(const RenderTargetEvent &evt)
void RenderingManager::waterAdded (MWWorld::CellStore *store) void RenderingManager::waterAdded (MWWorld::CellStore *store)
{ {
if(store->mCell->mData.mFlags & ESM::Cell::HasWater) if (store->getCell()->mData.mFlags & ESM::Cell::HasWater)
{ {
mWater->changeCell(store->mCell); mWater->changeCell (store->getCell());
mWater->setActive(true); mWater->setActive(true);
} }
else else
@ -501,9 +501,9 @@ bool RenderingManager::toggleRenderMode(int mode)
void RenderingManager::configureFog(MWWorld::CellStore &mCell) void RenderingManager::configureFog(MWWorld::CellStore &mCell)
{ {
Ogre::ColourValue color; Ogre::ColourValue color;
color.setAsABGR (mCell.mCell->mAmbi.mFog); color.setAsABGR (mCell.getCell()->mAmbi.mFog);
configureFog(mCell.mCell->mAmbi.mFogDensity, color); configureFog (mCell.getCell()->mAmbi.mFogDensity, color);
} }
void RenderingManager::configureFog(const float density, const Ogre::ColourValue& colour) void RenderingManager::configureFog(const float density, const Ogre::ColourValue& colour)
@ -553,8 +553,8 @@ void RenderingManager::setAmbientMode()
void RenderingManager::configureAmbient(MWWorld::CellStore &mCell) void RenderingManager::configureAmbient(MWWorld::CellStore &mCell)
{ {
if (mCell.mCell->mData.mFlags & ESM::Cell::Interior) if (mCell.getCell()->mData.mFlags & ESM::Cell::Interior)
mAmbientColor.setAsABGR (mCell.mCell->mAmbi.mAmbient); mAmbientColor.setAsABGR (mCell.getCell()->mAmbi.mAmbient);
setAmbientMode(); setAmbientMode();
// Create a "sun" that shines light downwards. It doesn't look // Create a "sun" that shines light downwards. It doesn't look
@ -564,10 +564,10 @@ void RenderingManager::configureAmbient(MWWorld::CellStore &mCell)
mSun = mRendering.getScene()->createLight(); mSun = mRendering.getScene()->createLight();
mSun->setType(Ogre::Light::LT_DIRECTIONAL); mSun->setType(Ogre::Light::LT_DIRECTIONAL);
} }
if (mCell.mCell->mData.mFlags & ESM::Cell::Interior) if (mCell.getCell()->mData.mFlags & ESM::Cell::Interior)
{ {
Ogre::ColourValue colour; Ogre::ColourValue colour;
colour.setAsABGR (mCell.mCell->mAmbi.mSunlight); colour.setAsABGR (mCell.getCell()->mAmbi.mSunlight);
mSun->setDiffuseColour (colour); mSun->setDiffuseColour (colour);
mSun->setDirection(0,-1,0); mSun->setDirection(0,-1,0);
} }
@ -650,12 +650,12 @@ void RenderingManager::setGlare(bool glare)
void RenderingManager::requestMap(MWWorld::CellStore* cell) void RenderingManager::requestMap(MWWorld::CellStore* cell)
{ {
if (cell->mCell->isExterior()) if (cell->getCell()->isExterior())
{ {
assert(mTerrain); assert(mTerrain);
Ogre::AxisAlignedBox dims = mObjects->getDimensions(cell); Ogre::AxisAlignedBox dims = mObjects->getDimensions(cell);
Ogre::Vector2 center(cell->mCell->getGridX() + 0.5, cell->mCell->getGridY() + 0.5); Ogre::Vector2 center (cell->getCell()->getGridX() + 0.5, cell->getCell()->getGridY() + 0.5);
dims.merge(mTerrain->getWorldBoundingBox(center)); dims.merge(mTerrain->getWorldBoundingBox(center));
if (dims.isFinite()) if (dims.isFinite())

10
apps/openmw/mwscript/cellextensions.cpp
Unescape Escape View File

@ -88,7 +88,7 @@ namespace MWScript
virtual void execute (Interpreter::Runtime& runtime) virtual void execute (Interpreter::Runtime& runtime)
{ {
bool interior = bool interior =
!MWBase::Environment::get().getWorld()->getPlayerPtr().getCell()->mCell->isExterior(); !MWBase::Environment::get().getWorld()->getPlayerPtr().getCell()->getCell()->isExterior();
runtime.push (interior ? 1 : 0); runtime.push (interior ? 1 : 0);
} }
@ -103,7 +103,7 @@ namespace MWScript
std::string name = runtime.getStringLiteral (runtime[0].mInteger); std::string name = runtime.getStringLiteral (runtime[0].mInteger);
runtime.pop(); runtime.pop();
const ESM::Cell *cell = MWBase::Environment::get().getWorld()->getPlayerPtr().getCell()->mCell; const ESM::Cell *cell = MWBase::Environment::get().getWorld()->getPlayerPtr().getCell()->getCell();
std::string current = cell->mName; std::string current = cell->mName;
@ -131,7 +131,7 @@ namespace MWScript
virtual void execute (Interpreter::Runtime& runtime) virtual void execute (Interpreter::Runtime& runtime)
{ {
MWWorld::CellStore *cell = MWBase::Environment::get().getWorld()->getPlayerPtr().getCell(); MWWorld::CellStore *cell = MWBase::Environment::get().getWorld()->getPlayerPtr().getCell();
if (cell->mCell->hasWater()) if (cell->getCell()->hasWater())
runtime.push (cell->mWaterLevel); runtime.push (cell->mWaterLevel);
else else
runtime.push (-std::numeric_limits<float>().max()); runtime.push (-std::numeric_limits<float>().max());
@ -148,7 +148,7 @@ namespace MWScript
MWWorld::CellStore *cell = MWBase::Environment::get().getWorld()->getPlayerPtr().getCell(); MWWorld::CellStore *cell = MWBase::Environment::get().getWorld()->getPlayerPtr().getCell();
if (cell->mCell->isExterior()) if (cell->getCell()->isExterior())
throw std::runtime_error("Can't set water level in exterior cell"); throw std::runtime_error("Can't set water level in exterior cell");
cell->mWaterLevel = level; cell->mWaterLevel = level;
@ -166,7 +166,7 @@ namespace MWScript
MWWorld::CellStore *cell = MWBase::Environment::get().getWorld()->getPlayerPtr().getCell(); MWWorld::CellStore *cell = MWBase::Environment::get().getWorld()->getPlayerPtr().getCell();
if (cell->mCell->isExterior()) if (cell->getCell()->isExterior())
throw std::runtime_error("Can't set water level in exterior cell"); throw std::runtime_error("Can't set water level in exterior cell");
cell->mWaterLevel +=level; cell->mWaterLevel +=level;

4
apps/openmw/mwsound/soundmanagerimp.cpp
Unescape Escape View File

@ -480,7 +480,7 @@ namespace MWSound
static float sTimePassed = 0.0; static float sTimePassed = 0.0;
MWBase::World *world = MWBase::Environment::get().getWorld(); MWBase::World *world = MWBase::Environment::get().getWorld();
const MWWorld::Ptr player = world->getPlayerPtr(); const MWWorld::Ptr player = world->getPlayerPtr();
const ESM::Cell *cell = player.getCell()->mCell; const ESM::Cell *cell = player.getCell()->getCell();
sTimePassed += duration; sTimePassed += duration;
if(!cell->isExterior() || sTimePassed < sTimeToNextEnvSound) if(!cell->isExterior() || sTimePassed < sTimeToNextEnvSound)
@ -548,7 +548,7 @@ namespace MWSound
MWWorld::Ptr player = MWWorld::Ptr player =
MWBase::Environment::get().getWorld()->getPlayerPtr(); MWBase::Environment::get().getWorld()->getPlayerPtr();
const ESM::Cell *cell = player.getCell()->mCell; const ESM::Cell *cell = player.getCell()->getCell();
Environment env = Env_Normal; Environment env = Env_Normal;
if((cell->mData.mFlags&cell->HasWater) && mListenerPos.z < cell->mWater) if((cell->mData.mFlags&cell->HasWater) && mListenerPos.z < cell->mWater)

2
apps/openmw/mwstate/statemanagerimp.cpp
Unescape Escape View File

@ -301,7 +301,7 @@ void MWState::StateManager::loadGame (const Character *character, const Slot *sl
MWWorld::Ptr ptr = MWBase::Environment::get().getWorld()->getPlayer().getPlayer(); MWWorld::Ptr ptr = MWBase::Environment::get().getWorld()->getPlayer().getPlayer();
ESM::CellId cellId = ptr.getCell()->mCell->getCellId(); ESM::CellId cellId = ptr.getCell()->getCell()->getCellId();
MWBase::Environment::get().getWorld()->changeToCell (cellId, ptr.getRefData().getPosition()); MWBase::Environment::get().getWorld()->changeToCell (cellId, ptr.getRefData().getPosition());
} }

4
apps/openmw/mwworld/cells.cpp
Unescape Escape View File

@ -83,8 +83,8 @@ bool MWWorld::Cells::hasState (const CellStore& cellStore) const
if (cellStore.mState==CellStore::State_Loaded) if (cellStore.mState==CellStore::State_Loaded)
return true; return true;
if (cellStore.mCell->mData.mFlags & ESM::Cell::Interior) if (cellStore.getCell()->mData.mFlags & ESM::Cell::Interior)
return cellStore.mCell->mData.mFlags & ESM::Cell::HasWater; return cellStore.getCell()->mData.mFlags & ESM::Cell::HasWater;
else else
return false; return false;
} }

5
apps/openmw/mwworld/cellstore.cpp
Unescape Escape View File

@ -145,6 +145,11 @@ namespace MWWorld
mWaterLevel = cell->mWater; mWaterLevel = cell->mWater;
} }
const ESM::Cell *CellStore::getCell() const
{
return mCell;
}
void CellStore::load (const MWWorld::ESMStore &store, std::vector<ESM::ESMReader> &esm) void CellStore::load (const MWWorld::ESMStore &store, std::vector<ESM::ESMReader> &esm)
{ {
if (mState!=State_Loaded) if (mState!=State_Loaded)

23
apps/openmw/mwworld/cellstore.hpp
Unescape Escape View File

@ -49,19 +49,26 @@ namespace MWWorld
} }
}; };
/// A storage struct for one single cell reference. /// \brief Mutable state of a cell
class CellStore class CellStore
{ {
public: public:
enum State enum State
{ {
State_Unloaded, State_Preloaded, State_Loaded State_Unloaded, State_Preloaded, State_Loaded
}; };
private:
const ESM::Cell *mCell;
public:
CellStore (const ESM::Cell *cell_);
CellStore (const ESM::Cell *cell_); const ESM::Cell *getCell() const;
const ESM::Cell *mCell;
State mState; State mState;
std::vector<std::string> mIds; std::vector<std::string> mIds;

2
apps/openmw/mwworld/physicssystem.cpp
Unescape Escape View File

@ -574,7 +574,7 @@ namespace MWWorld
for(;iter != mMovementQueue.end();iter++) for(;iter != mMovementQueue.end();iter++)
{ {
float waterlevel = -std::numeric_limits<float>::max(); float waterlevel = -std::numeric_limits<float>::max();
const ESM::Cell *cell = iter->first.getCell()->mCell; const ESM::Cell *cell = iter->first.getCell()->getCell();
if(cell->hasWater()) if(cell->hasWater())
waterlevel = cell->mWater; waterlevel = cell->mWater;

4
apps/openmw/mwworld/player.cpp
Unescape Escape View File

@ -191,7 +191,7 @@ namespace MWWorld
ESM::Player player; ESM::Player player;
mPlayer.save (player.mObject); mPlayer.save (player.mObject);
player.mCellId = mCellStore->mCell->getCellId(); player.mCellId = mCellStore->getCell()->getCellId();
player.mBirthsign = mSign; player.mBirthsign = mSign;
@ -203,7 +203,7 @@ namespace MWWorld
{ {
player.mHasMark = true; player.mHasMark = true;
player.mMarkedPosition = mMarkedPosition; player.mMarkedPosition = mMarkedPosition;
player.mMarkedCell = mMarkedCell->mCell->getCellId(); player.mMarkedCell = mMarkedCell->getCell()->getCellId();
} }
else else
player.mHasMark = false; player.mHasMark = false;

50
apps/openmw/mwworld/scene.cpp
Unescape Escape View File

@ -97,15 +97,15 @@ namespace MWWorld
} }
} }
if ((*iter)->mCell->isExterior()) if ((*iter)->getCell()->isExterior())
{ {
ESM::Land* land = ESM::Land* land =
MWBase::Environment::get().getWorld()->getStore().get<ESM::Land>().search( MWBase::Environment::get().getWorld()->getStore().get<ESM::Land>().search(
(*iter)->mCell->getGridX(), (*iter)->getCell()->getGridX(),
(*iter)->mCell->getGridY() (*iter)->getCell()->getGridY()
); );
if (land) if (land)
mPhysics->removeHeightField( (*iter)->mCell->getGridX(), (*iter)->mCell->getGridY() ); mPhysics->removeHeightField ((*iter)->getCell()->getGridX(), (*iter)->getCell()->getGridY());
} }
mRendering.removeCell(*iter); mRendering.removeCell(*iter);
@ -128,18 +128,18 @@ namespace MWWorld
float worldsize = ESM::Land::REAL_SIZE; float worldsize = ESM::Land::REAL_SIZE;
// Load terrain physics first... // Load terrain physics first...
if (cell->mCell->isExterior()) if (cell->getCell()->isExterior())
{ {
ESM::Land* land = ESM::Land* land =
MWBase::Environment::get().getWorld()->getStore().get<ESM::Land>().search( MWBase::Environment::get().getWorld()->getStore().get<ESM::Land>().search(
cell->mCell->getGridX(), cell->getCell()->getGridX(),
cell->mCell->getGridY() cell->getCell()->getGridY()
); );
if (land) { if (land) {
mPhysics->addHeightField ( mPhysics->addHeightField (
land->mLandData->mHeights, land->mLandData->mHeights,
cell->mCell->getGridX(), cell->getCell()->getGridX(),
cell->mCell->getGridY(), cell->getCell()->getGridY(),
0, 0,
worldsize / (verts-1), worldsize / (verts-1),
verts) verts)
@ -218,10 +218,10 @@ namespace MWWorld
int numUnload = 0; int numUnload = 0;
while (active!=mActiveCells.end()) while (active!=mActiveCells.end())
{ {
if ((*active)->mCell->isExterior()) if ((*active)->getCell()->isExterior())
{ {
if (std::abs (X-(*active)->mCell->getGridX())<=1 && if (std::abs (X-(*active)->getCell()->getGridX())<=1 &&
std::abs (Y-(*active)->mCell->getGridY())<=1) std::abs (Y-(*active)->getCell()->getGridY())<=1)
{ {
// keep cells within the new 3x3 grid // keep cells within the new 3x3 grid
++active; ++active;
@ -235,10 +235,10 @@ namespace MWWorld
active = mActiveCells.begin(); active = mActiveCells.begin();
while (active!=mActiveCells.end()) while (active!=mActiveCells.end())
{ {
if ((*active)->mCell->isExterior()) if ((*active)->getCell()->isExterior())
{ {
if (std::abs (X-(*active)->mCell->getGridX())<=1 && if (std::abs (X-(*active)->getCell()->getGridX())<=1 &&
std::abs (Y-(*active)->mCell->getGridY())<=1) std::abs (Y-(*active)->getCell()->getGridY())<=1)
{ {
// keep cells within the new 3x3 grid // keep cells within the new 3x3 grid
++active; ++active;
@ -257,10 +257,10 @@ namespace MWWorld
while (iter!=mActiveCells.end()) while (iter!=mActiveCells.end())
{ {
assert ((*iter)->mCell->isExterior()); assert ((*iter)->getCell()->isExterior());
if (x==(*iter)->mCell->getGridX() && if (x==(*iter)->getCell()->getGridX() &&
y==(*iter)->mCell->getGridY()) y==(*iter)->getCell()->getGridY())
break; break;
++iter; ++iter;
@ -280,10 +280,10 @@ namespace MWWorld
while (iter!=mActiveCells.end()) while (iter!=mActiveCells.end())
{ {
assert ((*iter)->mCell->isExterior()); assert ((*iter)->getCell()->isExterior());
if (x==(*iter)->mCell->getGridX() && if (x==(*iter)->getCell()->getGridX() &&
y==(*iter)->mCell->getGridY()) y==(*iter)->getCell()->getGridY())
break; break;
++iter; ++iter;
@ -302,10 +302,10 @@ namespace MWWorld
while (iter!=mActiveCells.end()) while (iter!=mActiveCells.end())
{ {
assert ((*iter)->mCell->isExterior()); assert ((*iter)->getCell()->isExterior());
if (X==(*iter)->mCell->getGridX() && if (X==(*iter)->getCell()->getGridX() &&
Y==(*iter)->mCell->getGridY()) Y==(*iter)->getCell()->getGridY())
break; break;
++iter; ++iter;
@ -407,7 +407,7 @@ namespace MWWorld
loadingListener->setProgressRange(refsToLoad); loadingListener->setProgressRange(refsToLoad);
// Load cell. // Load cell.
std::cout << "cellName: " << cell->mCell->mName << std::endl; std::cout << "cellName: " << cell->getCell()->mName << std::endl;
//Loading Interior loading text //Loading Interior loading text

4
apps/openmw/mwworld/weather.cpp
Unescape Escape View File

@ -664,7 +664,7 @@ void WeatherManager::changeWeather(const std::string& region, const unsigned int
mRegionOverrides[Misc::StringUtils::lowerCase(region)] = weather; mRegionOverrides[Misc::StringUtils::lowerCase(region)] = weather;
std::string playerRegion = MWBase::Environment::get().getWorld()->getPlayerPtr().getCell()->mCell->mRegion; std::string playerRegion = MWBase::Environment::get().getWorld()->getPlayerPtr().getCell()->getCell()->mRegion;
if (Misc::StringUtils::ciEqual(region, playerRegion)) if (Misc::StringUtils::ciEqual(region, playerRegion))
setWeather(weather); setWeather(weather);
} }
@ -695,7 +695,7 @@ void WeatherManager::switchToNextWeather(bool instantly)
MWBase::World* world = MWBase::Environment::get().getWorld(); MWBase::World* world = MWBase::Environment::get().getWorld();
if (world->isCellExterior() || world->isCellQuasiExterior()) if (world->isCellExterior() || world->isCellQuasiExterior())
{ {
std::string regionstr = Misc::StringUtils::lowerCase(world->getPlayerPtr().getCell()->mCell->mRegion); std::string regionstr = Misc::StringUtils::lowerCase(world->getPlayerPtr().getCell()->getCell()->mRegion);
if (mWeatherUpdateTime <= 0 || regionstr != mCurrentRegion) if (mWeatherUpdateTime <= 0 || regionstr != mCurrentRegion)
{ {

20
apps/openmw/mwworld/worldimp.cpp
Unescape Escape View File

@ -506,10 +506,10 @@ namespace MWWorld
if (!cell) if (!cell)
cell = mWorldScene->getCurrentCell(); cell = mWorldScene->getCurrentCell();
if (!cell->mCell->isExterior() || !cell->mCell->mName.empty()) if (!cell->getCell()->isExterior() || !cell->getCell()->mName.empty())
return cell->mCell->mName; return cell->getCell()->mName;
if (const ESM::Region* region = getStore().get<ESM::Region>().search (cell->mCell->mRegion)) if (const ESM::Region* region = getStore().get<ESM::Region>().search (cell->getCell()->mRegion))
return region->mName; return region->mName;
return getStore().get<ESM::GameSetting>().find ("sDefaultCellname")->mValue.getString(); return getStore().get<ESM::GameSetting>().find ("sDefaultCellname")->mValue.getString();
@ -946,11 +946,11 @@ namespace MWWorld
if (isPlayer) if (isPlayer)
{ {
if (!newCell.isExterior()) if (!newCell.isExterior())
changeToInteriorCell(Misc::StringUtils::lowerCase(newCell.mCell->mName), pos); changeToInteriorCell(Misc::StringUtils::lowerCase(newCell.getCell()->mName), pos);
else else
{ {
int cellX = newCell.mCell->getGridX(); int cellX = newCell.getCell()->getGridX();
int cellY = newCell.mCell->getGridY(); int cellY = newCell.getCell()->getGridY();
mWorldScene->changeCell(cellX, cellY, pos, false); mWorldScene->changeCell(cellX, cellY, pos, false);
} }
addContainerScripts (getPlayerPtr(), &newCell); addContainerScripts (getPlayerPtr(), &newCell);
@ -1465,7 +1465,7 @@ namespace MWWorld
CellStore *currentCell = mWorldScene->getCurrentCell(); CellStore *currentCell = mWorldScene->getCurrentCell();
if (currentCell) if (currentCell)
{ {
return currentCell->mCell->isExterior(); return currentCell->getCell()->isExterior();
} }
return false; return false;
} }
@ -1475,7 +1475,7 @@ namespace MWWorld
CellStore *currentCell = mWorldScene->getCurrentCell(); CellStore *currentCell = mWorldScene->getCurrentCell();
if (currentCell) if (currentCell)
{ {
if (!(currentCell->mCell->mData.mFlags & ESM::Cell::QuasiEx)) if (!(currentCell->getCell()->mData.mFlags & ESM::Cell::QuasiEx))
return false; return false;
else else
return true; return true;
@ -1757,7 +1757,7 @@ namespace MWWorld
bool bool
World::isUnderwater(const MWWorld::CellStore* cell, const Ogre::Vector3 &pos) const World::isUnderwater(const MWWorld::CellStore* cell, const Ogre::Vector3 &pos) const
{ {
if (!(cell->mCell->mData.mFlags & ESM::Cell::HasWater)) { if (!(cell->getCell()->mData.mFlags & ESM::Cell::HasWater)) {
return false; return false;
} }
return pos.z < cell->mWaterLevel; return pos.z < cell->mWaterLevel;
@ -1816,7 +1816,7 @@ namespace MWWorld
const OEngine::Physic::PhysicActor *physactor = mPhysEngine->getCharacter(refdata.getHandle()); const OEngine::Physic::PhysicActor *physactor = mPhysEngine->getCharacter(refdata.getHandle());
if((!physactor->getOnGround()&&physactor->getCollisionMode()) || isUnderwater(currentCell, playerPos)) if((!physactor->getOnGround()&&physactor->getCollisionMode()) || isUnderwater(currentCell, playerPos))
return 2; return 2;
if((currentCell->mCell->mData.mFlags&ESM::Cell::NoSleep) || if((currentCell->getCell()->mData.mFlags&ESM::Cell::NoSleep) ||
Class::get(player).getNpcStats(player).isWerewolf()) Class::get(player).getNpcStats(player).isWerewolf())
return 1; return 1;

Write Preview
Loading…
Cancel
Save