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

[General] Rework PACKET_ORIGIN enum

Browse source 
Additionally, comment out reading of originClientScript in ObjectPacket for now.
This commit is contained in:
David Cernat 2018-07-22 22:43:40 +03:00
parent 9e6459043b
commit 3165c84db4
2 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -11,10 +11,12 @@ namespace mwmp
{
enum PACKET_ORIGIN
{
GAMEPLAY = 0,
CONSOLE = 1,
CLIENT_SCRIPT = 2,
SERVER_SCRIPT = 3
CLIENT_GAMEPLAY = 0,
CLIENT_CONSOLE = 1,
CLIENT_DIALOGUE = 2,
CLIENT_SCRIPT_LOCAL = 3,
CLIENT_SCRIPT_GLOBAL = 4,
SERVER_SCRIPT = 5
};
struct Item

4
components/openmw-mp/Packets/Object/ObjectPacket.cpp
View file

@ -50,8 +50,10 @@ bool ObjectPacket::PacketHeader(RakNet::BitStream *bs, bool send)
RW(objectList->packetOrigin, send);
if (objectList->packetOrigin == mwmp::CLIENT_SCRIPT)
/* Comment this out until it's implemented properly
if (objectList->packetOrigin == mwmp::CLIENT_SCRIPT_LOCAL)
RW(objectList->originClientScript, send, true);
*/
if (send)
objectList->baseObjectCount = (unsigned int)(objectList->baseObjects.size());