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

[Server] Rename getCellByID() into getCellByName() to avoid confusion

Browse source
This commit is contained in:
David Cernat 2017-02-19 18:37:20 +02:00
parent 275dfaf05f
commit ee1ba1728e
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -81,10 +81,10 @@ Cell *CellController::getCellByXY(int x, int y)
return *it; return *it;
} }
Cell *CellController::getCellByID(std::string cellid) Cell *CellController::getCellByName(std::string cellName)
{ {
auto it = find_if(cells.begin(), cells.end(), [cellid](const Cell *c) { auto it = find_if(cells.begin(), cells.end(), [cellName](const Cell *c) {
return c->cell.mName == cellid; return c->cell.mName == cellName;
}); });
if (it == cells.end()) if (it == cells.end())
return nullptr; return nullptr;
@ -169,7 +169,7 @@ void CellController::update(Player *player)
LOG_MESSAGE_SIMPLE(Log::LOG_VERBOSE, "Player %s (%d) unloaded cell: %s", player->npc.mName, player->getId(), cell.cell.getDescription().c_str()); LOG_MESSAGE_SIMPLE(Log::LOG_VERBOSE, "Player %s (%d) unloaded cell: %s", player->npc.mName, player->getId(), cell.cell.getDescription().c_str());
Cell *c; Cell *c;
if (!cell.cell.isExterior()) if (!cell.cell.isExterior())
c = getCellByID(cell.cell.mName); c = getCellByName(cell.cell.mName);
else else
c = getCellByXY(cell.cell.getGridX(), cell.cell.getGridY()); c = getCellByXY(cell.cell.getGridX(), cell.cell.getGridY());

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

@ -35,7 +35,7 @@ public:
void deletePlayer(Player *player); void deletePlayer(Player *player);
Cell *getCellByXY(int x, int y); Cell *getCellByXY(int x, int y);
Cell *getCellByID(std::string cellid); Cell *getCellByName(std::string cellName);
void update(Player *player); void update(Player *player);