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

Send cell coordinates in tes3mp using mData instead of mCellId.mIndex

Browse source
This commit is contained in:
David Cernat 2016-10-23 16:55:30 +03:00
parent cbc132612a
commit 0a44bea91d
9 changed files with 20 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -393,13 +393,10 @@ void Networking::ProcessWorldPacket(RakNet::Packet *packet)
myPacket->Read(event); myPacket->Read(event);
LOG_APPEND(Log::LOG_WARN, "- cellRef: %s, %i\n- cell: %i, %i, %i, %s", LOG_APPEND(Log::LOG_WARN, "- cellRef: %s, %i\n- cell: %s",
event->cellRef.mRefID.c_str(), event->cellRef.mRefID.c_str(),
event->cellRef.mRefNum.mIndex, event->cellRef.mRefNum.mIndex,
event->cell.mData.mFlags, event->cell.getDescription().c_str());
event->cell.mCellId.mIndex.mX,
event->cell.mCellId.mIndex.mY,
event->cell.mName.c_str());
myPacket->Send(event, true); myPacket->Send(event, true);

8
apps/openmw-mp/Script/Functions/Translocations.cpp
View file

@ -108,8 +108,8 @@ void TranslocationFunctions::SetExterior(unsigned short pid, int x, int y) noexc
player->GetCell()->mData.mFlags &= ~ESM::Cell::Interior; player->GetCell()->mData.mFlags &= ~ESM::Cell::Interior;
} }
player->GetCell()->mCellId.mIndex.mX = x; player->GetCell()->mData.mX = x;
player->GetCell()->mCellId.mIndex.mY = y; player->GetCell()->mData.mY = y;
mwmp::Networking::Get().GetPlayerController()->GetPacket(ID_GAME_CELL)->Send(player, false); mwmp::Networking::Get().GetPlayerController()->GetPacket(ID_GAME_CELL)->Send(player, false);
} }
@ -118,14 +118,14 @@ int TranslocationFunctions::GetExteriorX(unsigned short pid) noexcept
{ {
Player *player; Player *player;
GET_PLAYER(pid, player,0); GET_PLAYER(pid, player,0);
return player->GetCell()->mCellId.mIndex.mX; return player->GetCell()->mData.mX;
} }
int TranslocationFunctions::GetExteriorY(unsigned short pid) noexcept int TranslocationFunctions::GetExteriorY(unsigned short pid) noexcept
{ {
Player *player; Player *player;
GET_PLAYER(pid, player,0); GET_PLAYER(pid, player,0);
return player->GetCell()->mCellId.mIndex.mY; return player->GetCell()->mData.mY;
} }
bool TranslocationFunctions::IsInExterior(unsigned short pid) noexcept bool TranslocationFunctions::IsInExterior(unsigned short pid) noexcept

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

@ -427,7 +427,7 @@ void DedicatedPlayer::updateCell()
MWWorld::CellStore *cellStore; MWWorld::CellStore *cellStore;
if (cell.isExterior() == 1) if (cell.isExterior() == 1)
cellStore = world->getExterior(cell.mCellId.mIndex.mX, cell.mCellId.mIndex.mY); cellStore = world->getExterior(cell.mData.mX, cell.mData.mY);
else if (!cell.mName.empty()) else if (!cell.mName.empty())
cellStore = world->getInterior(cell.mName); cellStore = world->getInterior(cell.mName);
// Go no further if cell data is invalid // Go no further if cell data is invalid

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

@ -308,11 +308,11 @@ void LocalPlayer::updateCell(bool forceUpdate)
} }
else if (ptrCell->isExterior()) else if (ptrCell->isExterior())
{ {
if (ptrCell->mCellId.mIndex.mX != GetCell()->mCellId.mIndex.mX) if (ptrCell->mData.mX != GetCell()->mData.mX)
{ {
shouldUpdate = true; shouldUpdate = true;
} }
else if (ptrCell->mCellId.mIndex.mY != GetCell()->mCellId.mIndex.mY) else if (ptrCell->mData.mY != GetCell()->mData.mY)
{ {
shouldUpdate = true; shouldUpdate = true;
} }
@ -613,8 +613,8 @@ void LocalPlayer::setCell()
world->getPlayer().setTeleported(true); world->getPlayer().setTeleported(true);
int x = GetCell()->mCellId.mIndex.mX; int x = GetCell()->mData.mX;
int y = GetCell()->mCellId.mIndex.mY; int y = GetCell()->mData.mY;
if (GetCell()->isExterior()) if (GetCell()->isExterior())
{ {

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

@ -661,10 +661,7 @@ void Networking::ProcessWorldPacket(RakNet::Packet *packet)
LOG_APPEND(Log::LOG_WARN, "- cellRef: %s, %i\n- cell: %i, %i, %i, %s", LOG_APPEND(Log::LOG_WARN, "- cellRef: %s, %i\n- cell: %i, %i, %i, %s",
event->cellRef.mRefID.c_str(), event->cellRef.mRefID.c_str(),
event->cellRef.mRefNum.mIndex, event->cellRef.mRefNum.mIndex,
event->cell.mData.mFlags, event->cell.getDescription().c_str());
event->cell.mCellId.mIndex.mX,
event->cell.mCellId.mIndex.mY,
event->cell.mName.c_str());
MWWorld::Ptr ptrFound = ptrCellStore->searchByRefNum(event->cellRef.mRefNum); MWWorld::Ptr ptrFound = ptrCellStore->searchByRefNum(event->cellRef.mRefNum);

7
apps/openmw/mwworld/actiontake.cpp
View file

@ -29,13 +29,10 @@ namespace MWWorld
event->cellRef.mRefNum = getTarget().getCellRef().getRefNum(); event->cellRef.mRefNum = getTarget().getCellRef().getRefNum();
mwmp::Main::get().getNetworking()->GetWorldPacket(ID_WORLD_OBJECT_DELETE)->Send(event); mwmp::Main::get().getNetworking()->GetWorldPacket(ID_WORLD_OBJECT_DELETE)->Send(event);
printf("Sending ID_WORLD_OBJECT_DELETE about\n- cellRef: %s, %i\n- cell: %i, %i, %i, %s", printf("Sending ID_WORLD_OBJECT_DELETE about\n- cellRef: %s, %i\n- cell: %s",
event->cellRef.mRefID.c_str(), event->cellRef.mRefID.c_str(),
event->cellRef.mRefNum.mIndex, event->cellRef.mRefNum.mIndex,
event->cell.mData.mFlags, event->cell.getDescription().c_str());
event->cell.mCellId.mIndex.mX,
event->cell.mCellId.mIndex.mY,
event->cell.mName.c_str());
MWBase::Environment::get().getWorld()->deleteObject (getTarget()); MWBase::Environment::get().getWorld()->deleteObject (getTarget());
} }

6
components/openmw-mp/Packets/Player/PacketCell.cpp
View file

@ -18,9 +18,7 @@ void mwmp::PacketCell::Packet(RakNet::BitStream *bs, mwmp::BasePlayer *player, b
PlayerPacket::Packet(bs, player, send); PlayerPacket::Packet(bs, player, send);
RW(player->GetCell()->mData.mFlags, send); RW(player->GetCell()->mData.mFlags, send);
RW(player->GetCell()->mData.mX, send);
RW(player->GetCell()->mCellId.mIndex.mX, send); RW(player->GetCell()->mData.mY, send);
RW(player->GetCell()->mCellId.mIndex.mY, send);
RW(player->GetCell()->mName, send); RW(player->GetCell()->mName, send);
} }

4
components/openmw-mp/Packets/World/PacketObjectDelete.cpp
View file

@ -16,7 +16,7 @@ void PacketObjectDelete::Packet(RakNet::BitStream *bs, WorldEvent *event, bool s
RW(event->cellRef.mRefNum.mIndex, send); RW(event->cellRef.mRefNum.mIndex, send);
RW(event->cell.mData.mFlags, send); RW(event->cell.mData.mFlags, send);
RW(event->cell.mCellId.mIndex.mX, send); RW(event->cell.mData.mX, send);
RW(event->cell.mCellId.mIndex.mY, send); RW(event->cell.mData.mY, send);
RW(event->cell.mName, send); RW(event->cell.mName, send);
} }

4
components/openmw-mp/Packets/World/PacketObjectPlace.cpp
View file

@ -17,7 +17,7 @@ void PacketObjectPlace::Packet(RakNet::BitStream *bs, WorldEvent *event, bool se
RW(event->cellRef.mPos, send); RW(event->cellRef.mPos, send);
RW(event->cell.mData.mFlags, send); RW(event->cell.mData.mFlags, send);
RW(event->cell.mCellId.mIndex.mX, send); RW(event->cell.mData.mX, send);
RW(event->cell.mCellId.mIndex.mY, send); RW(event->cell.mData.mY, send);
RW(event->cell.mName, send); RW(event->cell.mName, send);
} }