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

[Server] Add script functions for getting world object placement info

Browse source
This commit is contained in:
David Cernat 2017-01-29 15:29:40 +02:00
parent 27ac314cb1
commit 2c5cc82f49
3 changed files with 36 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
apps/openmw-mp/Script/Functions/World.cpp
View file

@ -83,6 +83,31 @@ int WorldFunctions::GetObjectRefNumIndex(unsigned int i) noexcept
return mwmp::Networking::getPtr()->getLastEvent()->objectChanges.objects[i].refNumIndex;
}
int WorldFunctions::GetObjectCount(unsigned int i) noexcept
{
return mwmp::Networking::getPtr()->getLastEvent()->objectChanges.objects[i].count;
}
int WorldFunctions::GetObjectGoldValue(unsigned int i) noexcept
{
return mwmp::Networking::getPtr()->getLastEvent()->objectChanges.objects[i].goldValue;
}
double WorldFunctions::GetObjectPosX(unsigned int i) noexcept
{
return mwmp::Networking::getPtr()->getLastEvent()->objectChanges.objects[i].pos.pos[0];
}
double WorldFunctions::GetObjectPosY(unsigned int i) noexcept
{
return mwmp::Networking::getPtr()->getLastEvent()->objectChanges.objects[i].pos.pos[1];
}
double WorldFunctions::GetObjectPosZ(unsigned int i) noexcept
{
return mwmp::Networking::getPtr()->getLastEvent()->objectChanges.objects[i].pos.pos[2];
}
void WorldFunctions::SendObjectDelete() noexcept
{
mwmp::Networking::get().getWorldController()->GetPacket(ID_OBJECT_DELETE)->Send(worldEvent, worldEvent->guid);

10
apps/openmw-mp/Script/Functions/World.hpp
View file

@ -15,6 +15,11 @@
\
{"GetObjectRefId", WorldFunctions::GetObjectRefId},\
{"GetObjectRefNumIndex", WorldFunctions::GetObjectRefNumIndex},\
{"GetObjectCount", WorldFunctions::GetObjectCount},\
{"GetObjectGoldValue", WorldFunctions::GetObjectGoldValue},\
{"GetObjectPosX", WorldFunctions::GetObjectPosX},\
{"GetObjectPosY", WorldFunctions::GetObjectPosY},\
{"GetObjectPosZ", WorldFunctions::GetObjectPosZ},\
\
{"SendObjectDelete", WorldFunctions::SendObjectDelete},\
{"SendObjectPlace", WorldFunctions::SendObjectPlace},\
@ -40,6 +45,11 @@ public:
static const char *GetObjectRefId(unsigned int i) noexcept;
static int GetObjectRefNumIndex(unsigned int i) noexcept;
static int GetObjectCount(unsigned int i) noexcept;
static int GetObjectGoldValue(unsigned int i) noexcept;
static double GetObjectPosX(unsigned int i) noexcept;
static double GetObjectPosY(unsigned int i) noexcept;
static double GetObjectPosZ(unsigned int i) noexcept;
static void SendObjectDelete() noexcept;
static void SendObjectPlace() noexcept;

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

@ -35,9 +35,9 @@ void PacketObjectPlace::Packet(RakNet::BitStream *bs, WorldEvent *event, bool se
RW(worldObject.refId, send);
RW(worldObject.refNumIndex, send);
RW(worldObject.count, send);
RW(worldObject.goldValue, send);
RW(worldObject.pos, send);
RW(worldObject.count, send);
if (!send)
{