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

[General] Add and use isActor bool for WorldObject

Browse source
This commit is contained in:
David Cernat 2017-05-07 03:07:09 +03:00
parent 9d2c5c3502
commit de49f5f175
5 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -119,6 +119,11 @@ double WorldFunctions::GetObjectRotZ(unsigned int i) noexcept
return readEvent->worldObjects.at(i).position.rot[2];
}
bool WorldFunctions::GetObjectIsActor(unsigned int i) noexcept
{
return readEvent->worldObjects.at(i).isActor;
}
unsigned int WorldFunctions::GetContainerChangesSize(unsigned int objectIndex) noexcept
{
return readEvent->worldObjects.at(objectIndex).containerItemCount;

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

@ -23,6 +23,7 @@
{"GetObjectRotX", WorldFunctions::GetObjectRotX},\
{"GetObjectRotY", WorldFunctions::GetObjectRotY},\
{"GetObjectRotZ", WorldFunctions::GetObjectRotZ},\
{"GetObjectIsActor", WorldFunctions::GetObjectIsActor},\
\
{"GetContainerChangesSize", WorldFunctions::GetContainerChangesSize},\
{"GetContainerItemRefId", WorldFunctions::GetContainerItemRefId},\
@ -89,6 +90,7 @@ public:
static double GetObjectRotX(unsigned int i) noexcept;
static double GetObjectRotY(unsigned int i) noexcept;
static double GetObjectRotZ(unsigned int i) noexcept;
static bool GetObjectIsActor(unsigned int i) noexcept;
static unsigned int GetContainerChangesSize(unsigned int objectIndex) noexcept;
static const char *GetContainerItemRefId(unsigned int objectIndex, unsigned int itemIndex) noexcept;

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

@ -471,6 +471,8 @@ void WorldEvent::addObjectPlace(const MWWorld::Ptr& ptr)
// Get the real count of gold in a stack
worldObject.goldValue = ptr.getCellRef().getGoldValue();
worldObject.isActor = ptr.getClass().isActor();
addObject(worldObject);
}

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

@ -47,6 +47,8 @@ namespace mwmp
float floatVal;
std::string varName;
bool isActor;
std::vector<ContainerItem> containerItems;
unsigned int containerItemCount;
};

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

@ -40,6 +40,7 @@ void PacketObjectPlace::Packet(RakNet::BitStream *bs, bool send)
RW(worldObject.charge, send);
RW(worldObject.goldValue, send);
RW(worldObject.position, send);
RW(worldObject.isActor, send);
if (!send)
{