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

[General] Sketch out sending of cell loading/unloading info in packets

Browse source
This commit is contained in:
David Cernat 2017-01-26 09:02:01 +02:00
parent 158d606477
commit 97aabf4a7d
5 changed files with 79 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1060,6 +1060,26 @@ void LocalPlayer::sendJournalIndex(const std::string& quest, int index)
Main::get().getNetworking()->getPlayerPacket(ID_GAME_JOURNAL)->Send(this);
}
void LocalPlayer::sendCellLoad(ESM::Cell cellLoaded)
{
cellLoadChanges.cells.clear();
cellLoadChanges.cells.push_back(cellLoaded);
cellLoadChanges.action = CellLoadChanges::LOAD;
Main::get().getNetworking()->getPlayerPacket(ID_PLAYER_CELL_LOAD)->Send(this);
}
void LocalPlayer::sendCellUnload(ESM::Cell cellUnloaded)
{
cellLoadChanges.cells.clear();
cellLoadChanges.cells.push_back(cellUnloaded);
cellLoadChanges.action = CellLoadChanges::UNLOAD;
Main::get().getNetworking()->getPlayerPacket(ID_PLAYER_CELL_LOAD)->Send(this);
}
void LocalPlayer::sendAttack(Attack::TYPE type)
{
MWMechanics::DrawState_ state = getPlayerPtr().getClass().getNpcStats(getPlayerPtr()).getDrawState();

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

@ -63,6 +63,8 @@ namespace mwmp
void sendSpellRemoval(const ESM::Spell &spell);
void sendJournalEntry(const std::string& id, int index, const MWWorld::Ptr& actor);
void sendJournalIndex(const std::string& id, int index);
void sendCellLoad(ESM::Cell cellLoaded);
void sendCellUnload(ESM::Cell cellUnloaded);
void sendAttack(Attack::TYPE type);
void prepareAttack(Attack::TYPE type, bool state);

13
apps/openmw/mwworld/scene.cpp
View file

@ -3,6 +3,9 @@
#include <limits>
#include <iostream>
#include "../mwmp/Main.hpp"
#include "../mwmp/LocalPlayer.hpp"
#include <components/loadinglistener/loadinglistener.hpp>
#include <components/misc/resourcehelpers.hpp>
#include <components/settings/settings.hpp>
@ -240,6 +243,11 @@ namespace MWWorld
MWBase::Environment::get().getSoundManager()->stopSound (*iter);
mActiveCells.erase(*iter);
// Added by tes3mp
//
// LocalPlayer has unloaded a cell, so send a packet with it
mwmp::Main::get().getLocalPlayer()->sendCellUnload(*(*iter)->getCell());
}
void Scene::loadCell (CellStore *cell, Loading::Listener* loadingListener, bool respawn)
@ -304,6 +312,11 @@ namespace MWWorld
if (!cell->isExterior() && !(cell->getCell()->mData.mFlags & ESM::Cell::QuasiEx))
mRendering.configureAmbient(cell->getCell());
// Added by tes3mp
//
// LocalPlayer has loaded a cell, so send a packet with it
mwmp::Main::get().getLocalPlayer()->sendCellLoad(*cell->getCell());
}
mPreloader->notifyLoaded(cell);

15
components/openmw-mp/Base/BasePlayer.hpp
View file

@ -94,6 +94,20 @@ namespace mwmp
int action; //0 - Clear and set in entirety, 1 - Add spell, 2 - Remove spell
};
struct CellLoadChanges
{
std::vector<ESM::Cell> cells;
unsigned int count;
enum ACTION_TYPE
{
LOAD = 0,
UNLOAD = 1
};
int action; // 0 - Load a cell, 1 - Unload a cell
};
class BasePlayer
{
public:
@ -143,6 +157,7 @@ namespace mwmp
InventoryChanges inventoryChanges;
SpellbookChanges spellbookChanges;
JournalChanges journalChanges;
CellLoadChanges cellLoadChanges;
bool consoleAllowed;
bool ignorePosPacket;
ESM::ActiveSpells activeSpells;

29
components/openmw-mp/Packets/Player/PacketPlayerCellLoad.cpp
View file

@ -12,4 +12,33 @@ mwmp::PacketPlayerCellLoad::PacketPlayerCellLoad(RakNet::RakPeerInterface *peer)
void mwmp::PacketPlayerCellLoad::Packet(RakNet::BitStream *bs, mwmp::BasePlayer *player, bool send)
{
PlayerPacket::Packet(bs, player, send);
RW(player->cellLoadChanges.action, send);
if (!send)
player->cellLoadChanges.cells.clear();
else
player->cellLoadChanges.count = (unsigned int)(player->cellLoadChanges.cells.size());
RW(player->cellLoadChanges.count, send);
for (unsigned int i = 0; i < player->cellLoadChanges.count; i++)
{
ESM::Cell cellLoaded;
if (send)
{
cellLoaded = player->cellLoadChanges.cells[i];
}
RW(cellLoaded.mData.mFlags, send);
RW(cellLoaded.mData.mX, send);
RW(cellLoaded.mData.mY, send);
RW(cellLoaded.mName, send);
if (!send)
{
player->cellLoadChanges.cells.push_back(cellLoaded);
}
}
}