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

[General] Clean up BaseEvent and BaseStructs

Browse source
This commit is contained in:
David Cernat 2017-04-10 16:33:07 +03:00
parent 7662297334
commit 7700b82952
3 changed files with 0 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -38,11 +38,6 @@ namespace mwmp
ESM::Position position; ESM::Position position;
int drawState;
float headPitch;
float headYaw;
int doorState; int doorState;
int lockLevel; int lockLevel;
float scale; float scale;
@ -59,15 +54,6 @@ namespace mwmp
std::string varName; std::string varName;
ContainerChanges containerChanges; ContainerChanges containerChanges;
Animation animation;
bool hasAnimation;
AnimStates animStates;
bool hasAnimStates;
Movement movement;
bool hasMovement;
}; };
struct ObjectChanges struct ObjectChanges

7
components/openmw-mp/Base/BaseStructs.hpp
View file

@ -18,13 +18,6 @@ namespace mwmp
int jumpstate; int jumpstate;
bool forcestateupdate; bool forcestateupdate;
}; };
struct Movement
{
float x;
float y;
float z;
};
} }
#endif //OPENMW_BASESTRUCTS_HPP #endif //OPENMW_BASESTRUCTS_HPP

8
components/openmw-mp/Packets/Actor/PacketActorTest.cpp
View file

@ -45,7 +45,6 @@ void PacketActorTest::Packet(RakNet::BitStream *bs, bool send)
RW(actor.hasAnimation, send); RW(actor.hasAnimation, send);
RW(actor.hasAnimStates, send); RW(actor.hasAnimStates, send);
RW(actor.hasMovement, send);
if (actor.hasAnimation) if (actor.hasAnimation)
{ {
@ -63,13 +62,6 @@ void PacketActorTest::Packet(RakNet::BitStream *bs, bool send)
RW(actor.animStates.forcestateupdate, send); RW(actor.animStates.forcestateupdate, send);
} }
if (actor.hasMovement)
{
RW(actor.movement.x, send);
RW(actor.movement.y, send);
RW(actor.movement.y, send);
}
if (!send) if (!send)
{ {
actorList->baseActors.push_back(actor); actorList->baseActors.push_back(actor);