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

Don't send packets for floating objects

Browse source
This commit is contained in:
David Cernat 2016-10-25 16:30:31 +03:00
parent b1051255e0
commit cc40b85034
1 changed files with 28 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -570,18 +570,23 @@ namespace MWScript
float az = ptr.getRefData().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.rot[0] = axis == "x" ? ax + rotation : ax;
event->pos.rot[1] = axis == "y" ? ay + rotation : ay;
event->pos.rot[2] = axis == "z" ? az + rotation : az;
mwmp::Main::get().getNetworking()->GetWorldPacket(ID_OBJECT_ROTATE)->Send(event);
//
// Only send packet for objects that don't have the spammy Float script
if (!Misc::StringUtils::ciEqual(ptr.getClass().getScript(ptr), "Float"))
{
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.rot[0] = axis == "x" ? ax + rotation : ax;
event->pos.rot[1] = axis == "y" ? ay + rotation : ay;
event->pos.rot[2] = axis == "z" ? az + rotation : az;
mwmp::Main::get().getNetworking()->GetWorldPacket(ID_OBJECT_ROTATE)->Send(event);
printf("Sending ID_OBJECT_ROTATE about %s\n%i\n",
event->cellRef.mRefID.c_str(),
event->cellRef.mRefNum.mIndex);
printf("Sending ID_OBJECT_ROTATE about %s\n%i\n",
event->cellRef.mRefID.c_str(),
event->cellRef.mRefNum.mIndex);
}
if (axis == "x")
MWBase::Environment::get().getWorld()->rotateObject(ptr,ax+rotation,ay,az);
@ -662,13 +667,18 @@ namespace MWScript
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 = ptr.getCellRef().getPosition();
mwmp::Main::get().getNetworking()->GetWorldPacket(ID_OBJECT_ROTATE)->Send(event);
mwmp::Main::get().getNetworking()->GetWorldPacket(ID_OBJECT_MOVE)->Send(event);
//
// Only send packet for objects that don't have the spammy Float script
if (!Misc::StringUtils::ciEqual(ptr.getClass().getScript(ptr), "Float"))
{
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 = ptr.getCellRef().getPosition();
mwmp::Main::get().getNetworking()->GetWorldPacket(ID_OBJECT_ROTATE)->Send(event);
mwmp::Main::get().getNetworking()->GetWorldPacket(ID_OBJECT_MOVE)->Send(event);
}
MWBase::Environment::get().getWorld()->rotateObject(ptr, xr, yr, zr);