mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-02-20 20:09:41 +00:00
Code Issues Releases Wiki Activity

[Client] Rename CellController's getCell() into getCellStore()

Browse source
This commit is contained in:
David Cernat 2017-04-10 17:30:57 +03:00
parent d14102716d
commit 69f820f3a0
4 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -64,7 +64,7 @@ void CellController::initializeCell(const ESM::Cell& cell)
// If this key doesn't exist, create it
if (cellsActive.count(mapIndex) == 0)
{
MWWorld::CellStore *cellStore = getCell(cell);
MWWorld::CellStore *cellStore = getCellStore(cell);
if (!cellStore) return;
@ -175,7 +175,7 @@ int CellController::getCellSize() const
return 8192;
}
MWWorld::CellStore *CellController::getCell(const ESM::Cell& cell)
MWWorld::CellStore *CellController::getCellStore(const ESM::Cell& cell)
{
MWWorld::CellStore *cellStore;

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

@ -37,7 +37,7 @@ namespace mwmp
std::string generateMapIndex(mwmp::BaseActor baseActor);
int getCellSize() const;
virtual MWWorld::CellStore *getCell(const ESM::Cell& cell);
virtual MWWorld::CellStore *getCellStore(const ESM::Cell& cell);
void openContainer(const MWWorld::Ptr& container, bool loot);
void closeContainer(const MWWorld::Ptr& container);

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

@ -677,7 +677,7 @@ void LocalPlayer::addJournalItems()
if (journalItem.type == JournalItem::ENTRY)
{
MWWorld::CellStore *ptrCellStore = Main::get().getCellController()->getCell(journalItem.actorCell);
MWWorld::CellStore *ptrCellStore = Main::get().getCellController()->getCellStore(journalItem.actorCell);
if (!ptrCellStore) continue;

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

@ -844,7 +844,7 @@ void Networking::processActorPacket(RakNet::Packet *packet)
{
case ID_ACTOR_LIST:
{
MWWorld::CellStore *ptrCellStore = Main::get().getCellController()->getCell(actorList.cell);
MWWorld::CellStore *ptrCellStore = Main::get().getCellController()->getCellStore(actorList.cell);
if (!ptrCellStore) return;
@ -902,7 +902,7 @@ void Networking::processWorldPacket(RakNet::Packet *packet)
{
case ID_CONTAINER:
{
MWWorld::CellStore *ptrCellStore = Main::get().getCellController()->getCell(worldEvent.cell);
MWWorld::CellStore *ptrCellStore = Main::get().getCellController()->getCellStore(worldEvent.cell);
if (!ptrCellStore) return;
@ -920,7 +920,7 @@ void Networking::processWorldPacket(RakNet::Packet *packet)
}
case ID_OBJECT_PLACE:
{
MWWorld::CellStore *ptrCellStore = Main::get().getCellController()->getCell(worldEvent.cell);
MWWorld::CellStore *ptrCellStore = Main::get().getCellController()->getCellStore(worldEvent.cell);
if (!ptrCellStore) return;
@ -931,7 +931,7 @@ void Networking::processWorldPacket(RakNet::Packet *packet)
}
case ID_OBJECT_DELETE:
{
MWWorld::CellStore *ptrCellStore = Main::get().getCellController()->getCell(worldEvent.cell);
MWWorld::CellStore *ptrCellStore = Main::get().getCellController()->getCellStore(worldEvent.cell);
if (!ptrCellStore) return;
@ -942,7 +942,7 @@ void Networking::processWorldPacket(RakNet::Packet *packet)
}
case ID_OBJECT_LOCK:
{
MWWorld::CellStore *ptrCellStore = Main::get().getCellController()->getCell(worldEvent.cell);
MWWorld::CellStore *ptrCellStore = Main::get().getCellController()->getCellStore(worldEvent.cell);
if (!ptrCellStore) return;
@ -953,7 +953,7 @@ void Networking::processWorldPacket(RakNet::Packet *packet)
}
case ID_OBJECT_UNLOCK:
{
MWWorld::CellStore *ptrCellStore = Main::get().getCellController()->getCell(worldEvent.cell);
MWWorld::CellStore *ptrCellStore = Main::get().getCellController()->getCellStore(worldEvent.cell);
if (!ptrCellStore) return;
@ -964,7 +964,7 @@ void Networking::processWorldPacket(RakNet::Packet *packet)
}
case ID_OBJECT_SCALE:
{
MWWorld::CellStore *ptrCellStore = Main::get().getCellController()->getCell(worldEvent.cell);
MWWorld::CellStore *ptrCellStore = Main::get().getCellController()->getCellStore(worldEvent.cell);
if (!ptrCellStore) return;
@ -975,7 +975,7 @@ void Networking::processWorldPacket(RakNet::Packet *packet)
}
case ID_OBJECT_MOVE:
{
MWWorld::CellStore *ptrCellStore = Main::get().getCellController()->getCell(worldEvent.cell);
MWWorld::CellStore *ptrCellStore = Main::get().getCellController()->getCellStore(worldEvent.cell);
if (!ptrCellStore) return;
@ -986,7 +986,7 @@ void Networking::processWorldPacket(RakNet::Packet *packet)
}
case ID_OBJECT_ROTATE:
{
MWWorld::CellStore *ptrCellStore = Main::get().getCellController()->getCell(worldEvent.cell);
MWWorld::CellStore *ptrCellStore = Main::get().getCellController()->getCellStore(worldEvent.cell);
if (!ptrCellStore) return;
@ -997,7 +997,7 @@ void Networking::processWorldPacket(RakNet::Packet *packet)
}
case ID_OBJECT_ANIM_PLAY:
{
MWWorld::CellStore *ptrCellStore = Main::get().getCellController()->getCell(worldEvent.cell);
MWWorld::CellStore *ptrCellStore = Main::get().getCellController()->getCellStore(worldEvent.cell);
if (!ptrCellStore) return;
@ -1008,7 +1008,7 @@ void Networking::processWorldPacket(RakNet::Packet *packet)
}
case ID_DOOR_STATE:
{
MWWorld::CellStore *ptrCellStore = Main::get().getCellController()->getCell(worldEvent.cell);
MWWorld::CellStore *ptrCellStore = Main::get().getCellController()->getCellStore(worldEvent.cell);
if (!ptrCellStore) return;
@ -1019,7 +1019,7 @@ void Networking::processWorldPacket(RakNet::Packet *packet)
}
case ID_SCRIPT_LOCAL_SHORT:
{
MWWorld::CellStore *ptrCellStore = Main::get().getCellController()->getCell(worldEvent.cell);
MWWorld::CellStore *ptrCellStore = Main::get().getCellController()->getCellStore(worldEvent.cell);
if (!ptrCellStore) return;
@ -1030,7 +1030,7 @@ void Networking::processWorldPacket(RakNet::Packet *packet)
}
case ID_SCRIPT_LOCAL_FLOAT:
{
MWWorld::CellStore *ptrCellStore = Main::get().getCellController()->getCell(worldEvent.cell);
MWWorld::CellStore *ptrCellStore = Main::get().getCellController()->getCellStore(worldEvent.cell);
if (!ptrCellStore) return;