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

Send CellId in ID_WORLD_OBJECT_DELETE

Browse source
This commit is contained in:
David Cernat 2016-10-22 18:44:13 +03:00
parent 2e57e25675
commit 103b1e3f72
4 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -633,7 +633,7 @@ void Networking::ProcessWorldPacket(RakNet::Packet *packet)
WorldPacket *myPacket = worldController.GetPacket(packet->data[0]);
WorldEvent *event = new WorldEvent(id);
MWWorld::CellStore *ptrCellStore = MWBase::Environment::get().getWorld()->getPlayerPtr().getCell();
MWWorld::CellStore *ptrCellStore = MWBase::Environment::get().getWorld()->getCell(event->cellId);
switch (packet->data[0])
{

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

@ -8,6 +8,8 @@
#include "../mwbase/windowmanager.hpp"
#include "../mwbase/mechanicsmanager.hpp"
#include "../mwworld/cellstore.hpp"
#include "class.hpp"
#include "containerstore.hpp"
@ -23,8 +25,8 @@ namespace MWWorld
// Added by tes3mp
mwmp::WorldEvent *event = mwmp::Main::get().getNetworking()->createWorldEvent();
event->cellRef.blank();
event->cellId = getTarget().getCell()->getCell()->getCellId();
event->cellRef.mRefID = getTarget().getCellRef().getRefId();
event->cellRef.mRefNum = getTarget().getCellRef().getRefNum();
mwmp::Main::get().getNetworking()->GetWorldPacket(ID_WORLD_OBJECT_DELETE)->Send(event);

3
components/openmw-mp/Base/WorldEvent.hpp
View file

@ -1,6 +1,7 @@
#ifndef OPENMW_WORLDEVENT_HPP
#define OPENMW_WORLDEVENT_HPP
#include <components/esm/cellid.hpp>
#include <components/esm/cellref.hpp>
#include <RakNetTypes.h>
@ -21,6 +22,8 @@ namespace mwmp
}
RakNet::RakNetGUID guid;
ESM::CellId cellId;
ESM::CellRef cellRef;
};
}

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

@ -14,4 +14,9 @@ void PacketObjectDelete::Packet(RakNet::BitStream *bs, WorldEvent *event, bool s
RW(event->cellRef.mRefID, send);
RW(event->cellRef.mRefNum, send);
RW(event->cellId.mPaged, send);
RW(event->cellId.mIndex.mX, send);
RW(event->cellId.mIndex.mY, send);
RW(event->cellId.mWorldspace, send);
}