mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-30 21:45:33 +00:00
Code Issues Releases Wiki Activity

Implement ID_OBJECT_MOVE and send it from ingame scripts

Browse source
This commit is contained in:
David Cernat 2016-10-25 14:07:00 +03:00
parent 0fb9b6eefb
commit 54ed9a7ab4
4 changed files with 80 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -698,8 +698,13 @@ void Networking::ProcessWorldPacket(RakNet::Packet *packet)
{ {
case ID_OBJECT_PLACE: case ID_OBJECT_PLACE:
{ {
MWWorld::ManualRef ref(MWBase::Environment::get().getWorld()->getStore(), event->cellRef.mRefID, 1); LOG_MESSAGE_SIMPLE(Log::LOG_WARN, "%s", "Received ID_OBJECT_PLACE");
LOG_APPEND(Log::LOG_WARN, "- cellRef: %s, %i\n- cell: %s",
event->cellRef.mRefID.c_str(),
event->cellRef.mRefNum.mIndex,
event->cell.getDescription().c_str());
MWWorld::ManualRef ref(MWBase::Environment::get().getWorld()->getStore(), event->cellRef.mRefID, 1);
MWBase::Environment::get().getWorld()->placeObject(ref.getPtr(), ptrCellStore, event->cellRef.mPos); MWBase::Environment::get().getWorld()->placeObject(ref.getPtr(), ptrCellStore, event->cellRef.mPos);
break; break;
@ -788,6 +793,27 @@ void Networking::ProcessWorldPacket(RakNet::Packet *packet)
break; break;
} }
case ID_OBJECT_MOVE:
{
LOG_MESSAGE_SIMPLE(Log::LOG_WARN, "%s", "Received ID_OBJECT_MOVE");
LOG_APPEND(Log::LOG_WARN, "- cellRef: %s, %i\n- cell: %s",
event->cellRef.mRefID.c_str(),
event->cellRef.mRefNum.mIndex,
event->cell.getDescription().c_str());
MWWorld::Ptr ptrFound = ptrCellStore->searchByRefNum(event->cellRef.mRefNum);
if (ptrFound)
{
LOG_MESSAGE_SIMPLE(Log::LOG_WARN, "Found %s, %i",
ptrFound.getCellRef().getRefId().c_str(),
ptrFound.getCellRef().getRefNum());
MWBase::Environment::get().getWorld()->moveObject(ptrFound, event->pos.pos[0], event->pos.pos[1], event->pos.pos[2]);
}
break;
}
case ID_DOOR_ACTIVATE: case ID_DOOR_ACTIVATE:
{ {
LOG_MESSAGE_SIMPLE(Log::LOG_WARN, "%s", "Received ID_DOOR_ACTIVATE"); LOG_MESSAGE_SIMPLE(Log::LOG_WARN, "%s", "Received ID_DOOR_ACTIVATE");

40
apps/openmw/mwscript/transformationextensions.cpp
View file

@ -633,12 +633,21 @@ namespace MWScript
float yr = ptr.getCellRef().getPosition().rot[1]; float yr = ptr.getCellRef().getPosition().rot[1];
float zr = ptr.getCellRef().getPosition().rot[2]; float zr = ptr.getCellRef().getPosition().rot[2];
// Added by tes3mp
mwmp::WorldEvent *event = mwmp::Main::get().getNetworking()->createWorldEvent();
event->cell = *ptr.getCell()->getCell();
event->cellRef.mRefID = ptr.getCellRef().getRefId();
event->cellRef.mRefNum = ptr.getCellRef().getRefNum();
event->pos.pos[0] = ptr.getCellRef().getPosition().pos[0];
event->pos.pos[1] = ptr.getCellRef().getPosition().pos[1];
event->pos.pos[2] = ptr.getCellRef().getPosition().pos[2];
mwmp::Main::get().getNetworking()->GetWorldPacket(ID_OBJECT_MOVE)->Send(event);
MWBase::Environment::get().getWorld()->rotateObject(ptr, xr, yr, zr); MWBase::Environment::get().getWorld()->rotateObject(ptr, xr, yr, zr);
dynamic_cast<MWScript::InterpreterContext&>(runtime.getContext()).updatePtr(ptr, dynamic_cast<MWScript::InterpreterContext&>(runtime.getContext()).updatePtr(ptr,
MWBase::Environment::get().getWorld()->moveObject(ptr, ptr.getCellRef().getPosition().pos[0], MWBase::Environment::get().getWorld()->moveObject(ptr, ptr.getCellRef().getPosition().pos[0],
ptr.getCellRef().getPosition().pos[1], ptr.getCellRef().getPosition().pos[2])); ptr.getCellRef().getPosition().pos[1], ptr.getCellRef().getPosition().pos[2]));
} }
}; };
@ -682,6 +691,21 @@ namespace MWScript
osg::Vec3f diff = ptr.getRefData().getBaseNode()->getAttitude() * posChange; osg::Vec3f diff = ptr.getRefData().getBaseNode()->getAttitude() * posChange;
osg::Vec3f worldPos(ptr.getRefData().getPosition().asVec3()); osg::Vec3f worldPos(ptr.getRefData().getPosition().asVec3());
worldPos += diff; worldPos += diff;
// Added by tes3mp
mwmp::WorldEvent *event = mwmp::Main::get().getNetworking()->createWorldEvent();
event->cell = *ptr.getCell()->getCell();
event->cellRef.mRefID = ptr.getCellRef().getRefId();
event->cellRef.mRefNum = ptr.getCellRef().getRefNum();
event->pos.pos[0] = worldPos.x();
event->pos.pos[1] = worldPos.y();
event->pos.pos[2] = worldPos.z();
mwmp::Main::get().getNetworking()->GetWorldPacket(ID_OBJECT_MOVE)->Send(event);
printf("Sending ID_OBJECT_MOVE about %s\n%i\n",
event->cellRef.mRefID.c_str(),
event->cellRef.mRefNum.mIndex);
MWBase::Environment::get().getWorld()->moveObject(ptr, worldPos.x(), worldPos.y(), worldPos.z()); MWBase::Environment::get().getWorld()->moveObject(ptr, worldPos.x(), worldPos.y(), worldPos.z());
} }
}; };
@ -720,6 +744,20 @@ namespace MWScript
} }
else else
throw std::runtime_error ("invalid movement axis: " + axis); throw std::runtime_error ("invalid movement axis: " + axis);
// Added by tes3mp
mwmp::WorldEvent *event = mwmp::Main::get().getNetworking()->createWorldEvent();
event->cell = *ptr.getCell()->getCell();
event->cellRef.mRefID = ptr.getCellRef().getRefId();
event->cellRef.mRefNum = ptr.getCellRef().getRefNum();
event->pos.pos[0] = updated.getRefData().getPosition().pos[0];
event->pos.pos[1] = updated.getRefData().getPosition().pos[1];
event->pos.pos[2] = updated.getRefData().getPosition().pos[2];
mwmp::Main::get().getNetworking()->GetWorldPacket(ID_OBJECT_MOVE)->Send(event);
printf("Sending ID_OBJECT_MOVE about %s\n%i\n",
event->cellRef.mRefID.c_str(),
event->cellRef.mRefNum.mIndex);
} }
}; };

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

@ -26,6 +26,8 @@ namespace mwmp
ESM::Cell cell; ESM::Cell cell;
ESM::CellRef cellRef; ESM::CellRef cellRef;
ESM::Position pos;
int state; int state;
int lockLevel; int lockLevel;
float scale; float scale;

12
components/openmw-mp/Packets/World/PacketObjectMove.cpp
View file

@ -11,4 +11,16 @@ PacketObjectMove::PacketObjectMove(RakNet::RakPeerInterface *peer) : WorldPacket
void PacketObjectMove::Packet(RakNet::BitStream *bs, WorldEvent *event, bool send) void PacketObjectMove::Packet(RakNet::BitStream *bs, WorldEvent *event, bool send)
{ {
WorldPacket::Packet(bs, event, send); WorldPacket::Packet(bs, event, send);
RW(event->cellRef.mRefID, send);
RW(event->cellRef.mRefNum.mIndex, send);
RW(event->cell.mData.mFlags, send);
RW(event->cell.mData.mX, send);
RW(event->cell.mData.mY, send);
RW(event->cell.mName, send);
RW(event->pos.pos[0], send);
RW(event->pos.pos[1], send);
RW(event->pos.pos[2], send);
} }