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

[Client] Add CellController::isSameCell() and use it in LocalPlayer

Browse source
This commit is contained in:
David Cernat 2017-04-23 12:41:13 +03:00
parent d1df9dde14
commit 87ada3e763
3 changed files with 17 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
apps/openmw/mwmp/CellController.cpp
View file

@ -302,6 +302,18 @@ MWWorld::CellStore *CellController::getCellStore(const ESM::Cell& cell)
return cellStore;
}
bool CellController::isSameCell(const ESM::Cell& cell, const ESM::Cell& otherCell)
{
if (cell.isExterior() && otherCell.isExterior())
{
if (cell.mData.mX == otherCell.mData.mX && cell.mData.mY == otherCell.mData.mY)
return true;
}
else if (Misc::StringUtils::ciEqual(cell.mName, otherCell.mName))
return true;
return false;
}
void CellController::openContainer(const MWWorld::Ptr &container, bool loot)
{

2
apps/openmw/mwmp/CellController.hpp
View file

@ -54,6 +54,8 @@ namespace mwmp
virtual MWWorld::CellStore *getCellStore(const ESM::Cell& cell);
bool isSameCell(const ESM::Cell& cell, const ESM::Cell& otherCell);
void openContainer(const MWWorld::Ptr& container, bool loot);
void closeContainer(const MWWorld::Ptr& container);

30
apps/openmw/mwmp/LocalPlayer.cpp
View file

@ -336,34 +336,10 @@ void LocalPlayer::updateCell(bool forceUpdate)
const ESM::Cell *ptrCell = MWBase::Environment::get().getWorld()->getPlayerPtr().getCell()->getCell();
bool cellChanged = false;
// Send a packet to server to update this LocalPlayer's cell if:
// 1) forceUpdate is true
// 2) The LocalPlayer's cell name does not equal the World Player's cell name
// 3) The LocalPlayer's exterior cell coordinates do not equal the World Player's
// exterior cell coordinates
if (forceUpdate)
// If the LocalPlayer's Ptr cell is different from the LocalPlayer's packet cell, proceed
if (forceUpdate || !Main::get().getCellController()->isSameCell(*ptrCell, cell))
{
cellChanged = true;
}
else if (!Misc::StringUtils::ciEqual(ptrCell->mName, cell.mName))
{
cellChanged = true;
}
else if (ptrCell->isExterior())
{
if (ptrCell->mData.mX != cell.mData.mX)
{
cellChanged = true;
}
else if (ptrCell->mData.mY != cell.mData.mY)
{
cellChanged = true;
}
}
if (cellChanged)
{
LOG_MESSAGE_SIMPLE(Log::LOG_INFO, "Sending ID_PLAYER_CELL_CHANGE to server");
LOG_MESSAGE_SIMPLE(Log::LOG_INFO, "Sending ID_PLAYER_CELL_CHANGE about LocalPlayer to server");
LOG_APPEND(Log::LOG_INFO, "- Moved from %s to %s", cell.getDescription().c_str(), ptrCell->getDescription().c_str());