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

[Client] Turn CellController's cellsActive into a map instead of a deque

Browse source
This commit is contained in:
David Cernat 2017-04-07 05:52:07 +03:00
parent d829d219c3
commit e89265e469
3 changed files with 33 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
apps/openmw/mwmp/Cell.cpp
View file

@ -78,11 +78,14 @@ void Cell::initializeLocalActors()
{
MWWorld::Ptr ptr(&*listIter, 0);
std::string mapIndex = generateMapIndex(ptr);
localActors[mapIndex] = new LocalActor();
localActors[mapIndex]->cell = esmCell;
LocalActor *actor = new LocalActor();
actor->cell = esmCell;
ptr.getBase()->isLocalActor = true;
localActors[mapIndex]->setPtr(ptr);
actor->setPtr(ptr);
std::string mapIndex = generateMapIndex(ptr);
localActors[mapIndex] = actor;
LOG_APPEND(Log::LOG_INFO, "- Initialized LocalActor %s", mapIndex.c_str());
}
}
@ -112,13 +115,14 @@ void Cell::readCellFrame(mwmp::WorldEvent& worldEvent)
{
MWWorld::Ptr ptrFound = store->searchExact(worldObject.refId, worldObject.refNumIndex, worldObject.mpNum);
if (ptrFound)
{
dedicatedActors[mapIndex] = new DedicatedActor();
dedicatedActors[mapIndex]->cell = worldEvent.cell;
dedicatedActors[mapIndex]->setPtr(ptrFound);
LOG_APPEND(Log::LOG_INFO, "- Initialized DedicatedActor %s", mapIndex.c_str());
}
if (!ptrFound) return;
DedicatedActor *actor = new DedicatedActor();
actor->cell = worldEvent.cell;
actor->setPtr(ptrFound);
dedicatedActors[mapIndex] = actor;
LOG_APPEND(Log::LOG_INFO, "- Initialized DedicatedActor %s", mapIndex.c_str());
}
// If this now exists, set its details

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

@ -10,7 +10,7 @@
#include "LocalPlayer.hpp"
using namespace mwmp;
std::deque<mwmp::Cell *> CellController::cellsActive;
std::map<std::string, mwmp::Cell *> CellController::cellsActive;
mwmp::CellController::CellController()
{
@ -24,14 +24,14 @@ mwmp::CellController::~CellController()
void CellController::updateLocal()
{
for (std::deque<mwmp::Cell *>::iterator it = cellsActive.begin(); it != cellsActive.end();)
for (std::map<std::string, mwmp::Cell *>::iterator it = cellsActive.begin(); it != cellsActive.end();)
{
mwmp::Cell *mpCell = *it;
mwmp::Cell *mpCell = it->second;
if (!MWBase::Environment::get().getWorld()->isCellActive(mpCell->getCellStore()))
{
mpCell->uninitializeLocalActors();
it = cellsActive.erase(it);
cellsActive.erase(it++);
}
else
{
@ -49,42 +49,34 @@ void CellController::initializeCellLocal(const ESM::Cell& cell)
if (!cellStore) return;
mwmp::Cell *mpCell = new mwmp::Cell(cellStore);
LOG_MESSAGE_SIMPLE(Log::LOG_INFO, "Initialized mwmp::Cell %s", mpCell->getDescription().c_str());
mpCell->initializeLocalActors();
cellsActive.push_back(mpCell);
std::string mapIndex = mpCell->getDescription();
cellsActive[mapIndex] = mpCell;
}
void CellController::readCellFrame(mwmp::WorldEvent& worldEvent)
{
bool cellExisted = false;
std::string mapIndex = worldEvent.cell.getDescription();
// Check if this cell already exists
for (std::deque<mwmp::Cell *>::iterator it = cellsActive.begin(); it != cellsActive.end(); ++it)
{
mwmp::Cell *mpCell = *it;
if (worldEvent.cell.getDescription() == mpCell->getDescription())
{
mpCell->readCellFrame(worldEvent);
cellExisted = true;
break;
}
}
if (!cellExisted)
// If this key doesn't exist, create it
if (cellsActive.count(mapIndex) == 0)
{
MWWorld::CellStore *cellStore = getCell(worldEvent.cell);
if (!cellStore) return;
mwmp::Cell *mpCell = new mwmp::Cell(cellStore);
cellsActive[mapIndex] = mpCell;
}
LOG_MESSAGE_SIMPLE(Log::LOG_INFO, "Initialized mwmp::Cell %s", mpCell->getDescription().c_str());
cellsActive.push_back(mpCell);
mpCell->readCellFrame(worldEvent);
// If this now exists, send it the data
if (cellsActive.count(mapIndex) > 0)
{
cellsActive[mapIndex]->readCellFrame(worldEvent);
}
}

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

@ -27,7 +27,7 @@ namespace mwmp
void closeContainer(const MWWorld::Ptr& container);
private:
static std::deque<mwmp::Cell *> cellsActive;
static std::map<std::string, mwmp::Cell *> cellsActive;
};
}