mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-10-06 21:26:35 +00:00
Code Issues Releases Wiki Activity

[Server] Use lowCamelCase in Cell

Browse source
This commit is contained in:
Koncord 2017-02-19 16:07:44 +08:00
parent 08f78e21c1
commit bbc062de62
3 changed files with 29 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
apps/openmw-mp/Cell.cpp
View file

@ -9,7 +9,7 @@
using namespace std; using namespace std;
void Cell::AddPlayer(Player *player) void Cell::addPlayer(Player *player)
{ {
auto it = find(player->cells.begin(), player->cells.end(), this); auto it = find(player->cells.begin(), player->cells.end(), this);
if(it == player->cells.end()) if(it == player->cells.end())
@ -17,7 +17,7 @@ void Cell::AddPlayer(Player *player)
players.push_back(player); players.push_back(player);
} }
void Cell::RemovePlayer(Player *player) void Cell::removePlayer(Player *player)
{ {
for(Iterator it = players.begin(); it != players.end(); it++) for(Iterator it = players.begin(); it != players.end(); it++)
{ {
@ -51,24 +51,24 @@ CellController::~CellController()
CellController *CellController::sThis = nullptr; CellController *CellController::sThis = nullptr;
void CellController::Create() void CellController::create()
{ {
sThis = new CellController; sThis = new CellController;
} }
void CellController::Destroy() void CellController::destroy()
{ {
assert(sThis); assert(sThis);
delete sThis; delete sThis;
sThis = nullptr; sThis = nullptr;
} }
CellController *CellController::Get() CellController *CellController::get()
{ {
return sThis; return sThis;
} }
Cell *CellController::GetCellByXY(int x, int y) Cell *CellController::getCellByXY(int x, int y)
{ {
auto it = find_if(cells.begin(), cells.end(), [x, y](const Cell *c) { auto it = find_if(cells.begin(), cells.end(), [x, y](const Cell *c) {
return c->cell.mData.mX == x && c->cell.mData.mY == y; return c->cell.mData.mX == x && c->cell.mData.mY == y;
@ -78,7 +78,7 @@ Cell *CellController::GetCellByXY(int x, int y)
return *it; return *it;
} }
Cell *CellController::GetCellByID(std::string cellid) Cell *CellController::getCellByID(std::string cellid)
{ {
auto it = find_if(cells.begin(), cells.end(), [cellid](const Cell *c) { auto it = find_if(cells.begin(), cells.end(), [cellid](const Cell *c) {
return c->cell.mName == cellid; return c->cell.mName == cellid;
@ -88,7 +88,7 @@ Cell *CellController::GetCellByID(std::string cellid)
return *it; return *it;
} }
Cell *CellController::AddCell(ESM::Cell cellData) Cell *CellController::addCell(ESM::Cell cellData)
{ {
LOG_MESSAGE_SIMPLE(Log::LOG_INFO, "Loaded cells: %d", cells.size()); LOG_MESSAGE_SIMPLE(Log::LOG_INFO, "Loaded cells: %d", cells.size());
@ -110,7 +110,7 @@ Cell *CellController::AddCell(ESM::Cell cellData)
} }
void CellController::RemoveCell(Cell *cell) void CellController::removeCell(Cell *cell)
{ {
if(cell == nullptr) if(cell == nullptr)
return; return;
@ -126,10 +126,10 @@ void CellController::RemoveCell(Cell *cell)
} }
} }
void CellController::RemovePlayer(Cell *cell, Player *player) void CellController::removePlayer(Cell *cell, Player *player)
{ {
cell->RemovePlayer(player); cell->removePlayer(player);
if(cell->players.empty()) if(cell->players.empty())
{ {
@ -145,20 +145,20 @@ void CellController::update(Player *player)
{ {
if(cell.type == mwmp::CellState::LOAD) if(cell.type == mwmp::CellState::LOAD)
{ {
Cell *c = AddCell(cell.cell); Cell *c = addCell(cell.cell);
c->AddPlayer(player); c->addPlayer(player);
} }
else else
{ {
LOG_MESSAGE_SIMPLE(Log::LOG_INFO, "Unload cell: %d %d %s", cell.cell.mData.mX, cell.cell.mData.mY, cell.cell.mName.c_str()); LOG_MESSAGE_SIMPLE(Log::LOG_INFO, "Unload cell: %d %d %s", cell.cell.mData.mX, cell.cell.mData.mY, cell.cell.mName.c_str());
Cell *c; Cell *c;
if(!cell.cell.isExterior()) if(!cell.cell.isExterior())
c = GetCellByID(cell.cell.mName); c = getCellByID(cell.cell.mName);
else else
c = GetCellByXY(cell.cell.getGridX(), cell.cell.getGridY()); c = getCellByXY(cell.cell.getGridX(), cell.cell.getGridY());
if(c != nullptr) if(c != nullptr)
RemovePlayer(c, player); removePlayer(c, player);
} }
} }
} }

20
apps/openmw-mp/Cell.hpp
View file

@ -21,20 +21,20 @@ private:
CellController(CellController&); // not used CellController(CellController&); // not used
public: public:
static void Create(); static void create();
static void Destroy(); static void destroy();
static CellController *Get(); static CellController *get();
public: public:
typedef std::deque<Cell*> TContainer; typedef std::deque<Cell*> TContainer;
typedef TContainer::iterator TIter; typedef TContainer::iterator TIter;
Cell * AddCell(ESM::Cell cell); Cell * addCell(ESM::Cell cell);
void RemoveCell(Cell *); void removeCell(Cell *);
void RemovePlayer(Cell *cell, Player *player); void removePlayer(Cell *cell, Player *player);
Cell *GetCellByXY(int x, int y); Cell *getCellByXY(int x, int y);
Cell *GetCellByID(std::string cellid); Cell *getCellByID(std::string cellid);
void update(Player *player); void update(Player *player);
@ -51,8 +51,8 @@ public:
typedef std::deque<Player*> TPlayers; typedef std::deque<Player*> TPlayers;
typedef TPlayers::iterator Iterator; typedef TPlayers::iterator Iterator;
void AddPlayer(Player *player); void addPlayer(Player *player);
void RemovePlayer(Player *player); void removePlayer(Player *player);
TPlayers getPlayers(); TPlayers getPlayers();
private: private:

6
apps/openmw-mp/Networking.cpp
View file

@ -30,7 +30,7 @@ Networking::Networking(RakNet::RakPeerInterface *peer)
this->peer = peer; this->peer = peer;
players = Players::getPlayers(); players = Players::getPlayers();
CellController::Create(); CellController::create();
playerController = new PlayerPacketController(peer); playerController = new PlayerPacketController(peer);
worldController = new WorldPacketController(peer); worldController = new WorldPacketController(peer);
@ -49,7 +49,7 @@ Networking::~Networking()
{ {
Script::Call<Script::CallbackIdentity("OnServerExit")>(false); Script::Call<Script::CallbackIdentity("OnServerExit")>(false);
CellController::Destroy(); CellController::destroy();
sThis = 0; sThis = 0;
delete playerController; delete playerController;
@ -185,7 +185,7 @@ void Networking::processPlayerPacket(RakNet::Packet *packet)
myPacket->Read(player); myPacket->Read(player);
CellController::Get()->update(player); CellController::get()->update(player);
Script::Call<Script::CallbackIdentity("OnPlayerCellState")>(player->getId()); Script::Call<Script::CallbackIdentity("OnPlayerCellState")>(player->getId());