krageon
/
openmw-tes3coop
forked from teamnwah/openmw-tes3coop
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[General] Remove redundant code

Browse Source 
Remove BaseEvent::worldObjectCount
Remove BaseActor::count
Use foreach loops in packets and processors
Remove redundant "&" in CellController::get().getCell() calls
sol2-server-rewrite
Koncord 7 years ago
parent 585c24cee8
commit f35d35741e
18 changed files with 37 additions and 62 deletions
Show Stats Download Patch File Download Diff File

6
apps/openmw-mp/Cell.cpp
Unescape Escape View File

@ -15,7 +15,7 @@ using namespace std;
Cell::Cell(ESM::Cell cell) : cell(cell)
{
cellActorList.count = 0;
}
Cell::Iterator Cell::begin() const
@ -109,8 +109,6 @@ void Cell::readActorList(unsigned char packetID, const mwmp::BaseActorList *newA
else
cellActorList.baseActors.push_back(newActor);
}
cellActorList.count = cellActorList.baseActors.size();
}
bool Cell::containsActor(int refNumIndex, int mpNum)
@ -155,8 +153,6 @@ void Cell::removeActors(const mwmp::BaseActorList &newActorList)
if (!foundActor)
it++;
}
cellActorList.count = cellActorList.baseActors.size();
}
RakNet::RakNetGUID *Cell::getAuthority()

2
apps/openmw-mp/processors/actor/ProcessorActorAI.hpp
Unescape Escape View File

@ -16,7 +16,7 @@ namespace mwmp
void Do(ActorPacket &packet, const std::shared_ptr<Player> &player, BaseActorList &actorList) override
{
// Send only to players who have the cell loaded
Cell *serverCell = CellController::get().getCell(&actorList.cell);
Cell *serverCell = CellController::get().getCell(actorList.cell);
if (serverCell != nullptr && *serverCell->getAuthority() == actorList.guid)
serverCell->sendToLoaded(&packet, &actorList);

2
apps/openmw-mp/processors/actor/ProcessorActorAnimFlags.hpp
Unescape Escape View File

@ -16,7 +16,7 @@ namespace mwmp
void Do(ActorPacket &packet, const std::shared_ptr<Player> &player, BaseActorList &actorList) override
{
// Send only to players who have the cell loaded
Cell *serverCell = CellController::get().getCell(&actorList.cell);
Cell *serverCell = CellController::get().getCell(actorList.cell);
if (serverCell != nullptr && *serverCell->getAuthority() == actorList.guid)
serverCell->sendToLoaded(&packet, &actorList);

2
apps/openmw-mp/processors/actor/ProcessorActorAnimPlay.hpp
Unescape Escape View File

@ -16,7 +16,7 @@ namespace mwmp
void Do(ActorPacket &packet, const std::shared_ptr<Player> &player, BaseActorList &actorList) override
{
// Send only to players who have the cell loaded
Cell *serverCell = CellController::get().getCell(&actorList.cell);
Cell *serverCell = CellController::get().getCell(actorList.cell);
if (serverCell != nullptr && *serverCell->getAuthority() == actorList.guid)
serverCell->sendToLoaded(&packet, &actorList);

2
apps/openmw-mp/processors/actor/ProcessorActorAttack.hpp
Unescape Escape View File

@ -16,7 +16,7 @@ namespace mwmp
void Do(ActorPacket &packet, const std::shared_ptr<Player> &player, BaseActorList &actorList) override
{
// Send only to players who have the cell loaded
Cell *serverCell = CellController::get().getCell(&actorList.cell);
Cell *serverCell = CellController::get().getCell(actorList.cell);
if (serverCell != nullptr && *serverCell->getAuthority() == actorList.guid)
serverCell->sendToLoaded(&packet, &actorList);

4
apps/openmw-mp/processors/actor/ProcessorActorCellChange.hpp
Unescape Escape View File

@ -15,11 +15,11 @@ namespace mwmp
void Do(ActorPacket &packet, const std::shared_ptr<Player> &player, BaseActorList &actorList) override
{
Cell *serverCell = CellController::get().getCell(&actorList.cell);
Cell *serverCell = CellController::get().getCell(actorList.cell);
if (serverCell != nullptr && *serverCell->getAuthority() == actorList.guid)
{
serverCell->removeActors(&actorList);
serverCell->removeActors(actorList);
std::vector<std::shared_ptr<Actor>> actors;

2
apps/openmw-mp/processors/actor/ProcessorActorDeath.hpp
Unescape Escape View File

@ -16,7 +16,7 @@ namespace mwmp
void Do(ActorPacket &packet, const std::shared_ptr<Player> &player, BaseActorList &actorList) override
{
// Send only to players who have the cell loaded
Cell *serverCell = CellController::get().getCell(&actorList.cell);
Cell *serverCell = CellController::get().getCell(actorList.cell);
if (serverCell != nullptr && *serverCell->getAuthority() == actorList.guid)
serverCell->sendToLoaded(&packet, &actorList);

2
apps/openmw-mp/processors/actor/ProcessorActorPosition.hpp
Unescape Escape View File

@ -16,7 +16,7 @@ namespace mwmp
void Do(ActorPacket &packet, const std::shared_ptr<Player> &player, BaseActorList &actorList) override
{
// Send only to players who have the cell loaded
Cell *serverCell = CellController::get().getCell(&actorList.cell);
Cell *serverCell = CellController::get().getCell(actorList.cell);
if (serverCell != nullptr && *serverCell->getAuthority() == actorList.guid)
{

2
apps/openmw-mp/processors/actor/ProcessorActorSpeech.hpp
Unescape Escape View File

@ -16,7 +16,7 @@ namespace mwmp
void Do(ActorPacket &packet, const std::shared_ptr<Player> &player, BaseActorList &actorList) override
{
// Send only to players who have the cell loaded
Cell *serverCell = CellController::get().getCell(&actorList.cell);
Cell *serverCell = CellController::get().getCell(actorList.cell);
if (serverCell != nullptr && *serverCell->getAuthority() == actorList.guid)
serverCell->sendToLoaded(&packet, &actorList);

2
apps/openmw-mp/processors/actor/ProcessorActorStatsDynamic.hpp
Unescape Escape View File

@ -16,7 +16,7 @@ namespace mwmp
void Do(ActorPacket &packet, const std::shared_ptr<Player> &player, BaseActorList &actorList) override
{
// Send only to players who have the cell loaded
Cell *serverCell = CellController::get().getCell(&actorList.cell);
Cell *serverCell = CellController::get().getCell(actorList.cell);
if (serverCell != nullptr && *serverCell->getAuthority() == actorList.guid)
{

4
apps/openmw-mp/processors/world/ProcessorContainer.hpp
Unescape Escape View File

@ -23,9 +23,9 @@ namespace mwmp
// Until we have a timestamp-based system, send packets pertaining to more
// than one container (i.e. replies to server requests for container contents)
// only to players who have the container's cell loaded
if (event.action == BaseEvent::SET && event.worldObjectCount > 1)
if (event.action == BaseEvent::SET && event.worldObjects.size() > 1)
{
Cell *serverCell = CellController::get().getCell(&event.cell);
Cell *serverCell = CellController::get().getCell(event.cell);
if (serverCell != nullptr)
serverCell->sendToLoaded(&packet, &event);

6
apps/openmw-mp/processors/world/ProcessorObjectPlace.hpp
Unescape Escape View File

@ -18,10 +18,8 @@ namespace mwmp
{
LOG_MESSAGE_SIMPLE(Log::LOG_INFO, "Received %s from %s", strPacketID.c_str(), player->npc.mName.c_str());
for (unsigned int i = 0; i < event.worldObjectCount; i++)
{
event.worldObjects.at(i).mpNum = mwmp::Networking::getPtr()->incrementMpNum();
}
for (auto & object : event.worldObjects)
object.mpNum = mwmp::Networking::getPtr()->incrementMpNum();
// Send this packet back to the original sender with the mpNum generation from above,
// then send it to the other players

6
apps/openmw-mp/processors/world/ProcessorObjectSpawn.hpp
Unescape Escape View File

@ -18,10 +18,8 @@ namespace mwmp
{
LOG_MESSAGE_SIMPLE(Log::LOG_INFO, "Received %s from %s", strPacketID.c_str(), player->npc.mName.c_str());
for (unsigned int i = 0; i < event.worldObjectCount; i++)
{
event.worldObjects.at(i).mpNum = mwmp::Networking::getPtr()->incrementMpNum();
}
for (auto & object : event.worldObjects)
object.mpNum = mwmp::Networking::getPtr()->incrementMpNum();
// Send this packet back to the original sender with the mpNum generation from above,
// then send it to the other players

2
components/openmw-mp/Base/BaseActor.hpp
Unescape Escape View File

@ -59,8 +59,6 @@ namespace mwmp
std::vector<std::shared_ptr<BaseActor>> baseActors;
unsigned int count;
ESM::Cell cell;
unsigned char action; // 0 - Clear and set in entirety, 1 - Add item, 2 - Remove item, 3 - Request items

1
components/openmw-mp/Base/BaseEvent.hpp
Unescape Escape View File

@ -82,7 +82,6 @@ namespace mwmp
RakNet::RakNetGUID guid;
std::vector<WorldObject> worldObjects;
unsigned int worldObjectCount;
ESM::Cell cell;

29
components/openmw-mp/Packets/Actor/ActorPacket.cpp
Unescape Escape View File

@ -25,23 +25,13 @@ void ActorPacket::Packet(RakNet::BitStream *bs, bool send)
if (!PacketHeader(bs, send))
return;
BaseActor *actor;
for (unsigned int i = 0; i < actorList->count; i++)
for(auto &actor : actorList->baseActors)
{
if (send)
actor = actorList->baseActors.at(i).get();
else
actor = new BaseActor();
RW(actor->refNumIndex, send);
RW(actor->mpNum, send);
Actor(*actor, send);
if (!send)
actorList->baseActors.push_back(std::shared_ptr<BaseActor>(actor));
}
}
bool ActorPacket::PacketHeader(RakNet::BitStream *bs, bool send)
@ -51,14 +41,19 @@ bool ActorPacket::PacketHeader(RakNet::BitStream *bs, bool send)
RW(actorList->cell.mData, send, true);
RW(actorList->cell.mName, send, true);
uint32_t actorCount;
if (send)
actorList->count = (unsigned int)(actorList->baseActors.size());
else
actorList->baseActors.clear();
actorCount = (uint32_t)(actorList->baseActors.size());
RW(actorCount, send);
RW(actorList->count, send);
if(!send)
{
actorList->baseActors.clear();
actorList->baseActors.resize(actorCount, std::make_shared<BaseActor>());
}
if (actorList->count > maxActors)
if (actorCount > maxActors)
{
actorList->isValid = false;
return false;

12
components/openmw-mp/Packets/Actor/PacketActorList.cpp
Unescape Escape View File

@ -15,15 +15,8 @@ void PacketActorList::Packet(RakNet::BitStream *bs, bool send)
RW(actorList->action, send);
BaseActor *actor;
for (unsigned int i = 0; i < actorList->count; i++)
for(auto &actor : actorList->baseActors)
{
if (send)
actor = actorList->baseActors.at(i).get();
else
actor = new BaseActor();
RW(actor->refId, send);
RW(actor->refNumIndex, send);
RW(actor->mpNum, send);
@ -33,8 +26,5 @@ void PacketActorList::Packet(RakNet::BitStream *bs, bool send)
actorList->isValid = false;
return;
}
if (!send)
actorList->baseActors.push_back(std::shared_ptr<BaseActor>(actor));
}
}

13
components/openmw-mp/Packets/World/WorldPacket.cpp
Unescape Escape View File

@ -36,14 +36,14 @@ bool WorldPacket::PacketHeader(RakNet::BitStream *bs, bool send)
{
BasePacket::Packet(bs, send);
uint32_t worldObjectCount;
if (send)
event->worldObjectCount = (unsigned int)(event->worldObjects.size());
else
event->worldObjects.clear();
worldObjectCount = (uint32_t) (event->worldObjects.size());
RW(event->worldObjectCount, send);
RW(worldObjectCount, send);
if (event->worldObjectCount > maxObjects)
if (worldObjectCount > maxObjects)
{
event->isValid = false;
return false;
@ -51,7 +51,8 @@ bool WorldPacket::PacketHeader(RakNet::BitStream *bs, bool send)
if (!send)
{
event->worldObjects.resize(event->worldObjectCount);
event->worldObjects.clear();
event->worldObjects.resize(worldObjectCount);
}
if (hasCellData)

Write Preview
Loading…
Cancel
Save