mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-16 18:19:55 +00:00
Code Issues Releases Wiki Activity

[General] Rename unused ScriptMemberFloat packet to ObjectMiscellaneous

Browse source
This commit is contained in:
David Cernat 2020-05-15 13:29:30 +03:00
parent 95e5e6d33d
commit 297a254210
15 changed files with 88 additions and 91 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
apps/openmw-mp/CMakeLists.txt
View file

@ -117,13 +117,13 @@ set(PROCESSORS_OBJECT
processors/object/ProcessorDoorState.hpp processors/object/ProcessorMusicPlay.hpp
processors/object/ProcessorObjectActivate.hpp processors/object/ProcessorObjectAnimPlay.hpp
processors/object/ProcessorObjectDelete.hpp processors/object/ProcessorObjectHit.hpp
processors/object/ProcessorObjectLock.hpp processors/object/ProcessorObjectMove.hpp
processors/object/ProcessorObjectPlace.hpp processors/object/ProcessorObjectRestock.hpp
processors/object/ProcessorObjectRotate.hpp processors/object/ProcessorObjectScale.hpp
processors/object/ProcessorObjectSound.hpp processors/object/ProcessorObjectSpawn.hpp
processors/object/ProcessorObjectState.hpp processors/object/ProcessorObjectTrap.hpp
processors/object/ProcessorClientScriptLocal.hpp processors/object/ProcessorScriptMemberShort.hpp
processors/object/ProcessorScriptMemberFloat.hpp processors/object/ProcessorVideoPlay.hpp
processors/object/ProcessorObjectLock.hpp processors/object/ProcessorObjectMiscellaneous.hpp
processors/object/ProcessorObjectMove.hpp processors/object/ProcessorObjectPlace.hpp
processors/object/ProcessorObjectRestock.hpp processors/object/ProcessorObjectRotate.hpp
processors/object/ProcessorObjectScale.hpp processors/object/ProcessorObjectSound.hpp
processors/object/ProcessorObjectSpawn.hpp processors/object/ProcessorObjectState.hpp
processors/object/ProcessorObjectTrap.hpp processors/object/ProcessorClientScriptLocal.hpp
processors/object/ProcessorScriptMemberShort.hpp processors/object/ProcessorVideoPlay.hpp
)
source_group(tes3mp-server\\processors\\object FILES ${PROCESSORS_OBJECT})

4
apps/openmw-mp/processors/ProcessorInitializer.cpp
View file

@ -64,6 +64,7 @@
#include "object/ProcessorObjectHit.hpp"
#include "object/ProcessorObjectPlace.hpp"
#include "object/ProcessorObjectLock.hpp"
#include "object/ProcessorObjectMiscellaneous.hpp"
#include "object/ProcessorObjectMove.hpp"
#include "object/ProcessorObjectRestock.hpp"
#include "object/ProcessorObjectRotate.hpp"
@ -74,7 +75,6 @@
#include "object/ProcessorObjectTrap.hpp"
#include "object/ProcessorClientScriptLocal.hpp"
#include "object/ProcessorScriptMemberShort.hpp"
#include "object/ProcessorScriptMemberFloat.hpp"
#include "object/ProcessorVideoPlay.hpp"
#include "WorldstateProcessor.hpp"
#include "worldstate/ProcessorClientScriptGlobal.hpp"
@ -146,6 +146,7 @@ void ProcessorInitializer()
ObjectProcessor::AddProcessor(new ProcessorObjectDelete());
ObjectProcessor::AddProcessor(new ProcessorObjectHit());
ObjectProcessor::AddProcessor(new ProcessorObjectLock());
ObjectProcessor::AddProcessor(new ProcessorObjectMiscellaneous());
ObjectProcessor::AddProcessor(new ProcessorObjectMove());
ObjectProcessor::AddProcessor(new ProcessorObjectPlace());
ObjectProcessor::AddProcessor(new ProcessorObjectRestock());
@ -157,7 +158,6 @@ void ProcessorInitializer()
ObjectProcessor::AddProcessor(new ProcessorObjectTrap());
ObjectProcessor::AddProcessor(new ProcessorClientScriptLocal());
ObjectProcessor::AddProcessor(new ProcessorScriptMemberShort());
ObjectProcessor::AddProcessor(new ProcessorScriptMemberFloat());
ObjectProcessor::AddProcessor(new ProcessorVideoPlay());
WorldstateProcessor::AddProcessor(new ProcessorClientScriptGlobal());

18
apps/openmw-mp/processors/object/ProcessorObjectMiscellaneous.hpp Normal file
View file

@ -0,0 +1,18 @@
#ifndef OPENMW_PROCESSOROBJECTMISCELLANEOUS_HPP
#define OPENMW_PROCESSOROBJECTMISCELLANEOUS_HPP
#include "../ObjectProcessor.hpp"
namespace mwmp
{
class ProcessorObjectMiscellaneous : public ObjectProcessor
{
public:
ProcessorObjectMiscellaneous()
{
BPP_INIT(ID_OBJECT_MISCELLANEOUS)
}
};
}
#endif //OPENMW_PROCESSOROBJECTMISCELLANEOUS_HPP

18
apps/openmw-mp/processors/object/ProcessorScriptMemberFloat.hpp
View file

@ -1,18 +0,0 @@
#ifndef OPENMW_PROCESSORSCRIPTMEMBERFLOAT_HPP
#define OPENMW_PROCESSORSCRIPTMEMBERFLOAT_HPP
#include "../ObjectProcessor.hpp"
namespace mwmp
{
class ProcessorScriptMemberFloat : public ObjectProcessor
{
public:
ProcessorScriptMemberFloat()
{
BPP_INIT(ID_SCRIPT_MEMBER_FLOAT)
}
};
}
#endif //OPENMW_PROCESSORSCRIPTMEMBERFLOAT_HPP

2
apps/openmw/CMakeLists.txt
View file

@ -136,7 +136,7 @@ add_openmw_dir (mwmp/processors/object BaseObjectProcessor
ProcessorObjectActivate ProcessorObjectAnimPlay ProcessorObjectAttach ProcessorObjectDelete ProcessorObjectHit
ProcessorObjectLock ProcessorObjectMove ProcessorObjectPlace ProcessorObjectRestock ProcessorObjectRotate
ProcessorObjectScale ProcessorObjectSound ProcessorObjectSpawn ProcessorObjectState ProcessorObjectTrap
ProcessorClientScriptLocal ProcessorScriptMemberShort ProcessorScriptMemberFloat
ProcessorClientScriptLocal ProcessorScriptMemberShort ProcessorObjectMiscellaneous
)
add_openmw_dir (mwmp/processors/worldstate ProcessorCellReset ProcessorClientScriptGlobal ProcessorClientScriptSettings

4
apps/openmw/mwmp/processors/ProcessorInitializer.cpp
View file

@ -58,6 +58,7 @@
#include "object/ProcessorObjectDelete.hpp"
#include "object/ProcessorObjectHit.hpp"
#include "object/ProcessorObjectLock.hpp"
#include "object/ProcessorObjectMiscellaneous.hpp"
#include "object/ProcessorObjectMove.hpp"
#include "object/ProcessorObjectPlace.hpp"
#include "object/ProcessorObjectRestock.hpp"
@ -69,7 +70,6 @@
#include "object/ProcessorObjectTrap.hpp"
#include "object/ProcessorClientScriptLocal.hpp"
#include "object/ProcessorScriptMemberShort.hpp"
#include "object/ProcessorScriptMemberFloat.hpp"
#include "object/ProcessorVideoPlay.hpp"
#include "ActorProcessor.hpp"
@ -160,6 +160,7 @@ void ProcessorInitializer()
ObjectProcessor::AddProcessor(new ProcessorObjectDelete());
ObjectProcessor::AddProcessor(new ProcessorObjectHit());
ObjectProcessor::AddProcessor(new ProcessorObjectLock());
ObjectProcessor::AddProcessor(new ProcessorObjectMiscellaneous());
ObjectProcessor::AddProcessor(new ProcessorObjectMove());
ObjectProcessor::AddProcessor(new ProcessorObjectPlace());
ObjectProcessor::AddProcessor(new ProcessorObjectRestock());
@ -171,7 +172,6 @@ void ProcessorInitializer()
ObjectProcessor::AddProcessor(new ProcessorObjectTrap());
ObjectProcessor::AddProcessor(new ProcessorClientScriptLocal());
ObjectProcessor::AddProcessor(new ProcessorScriptMemberShort());
ObjectProcessor::AddProcessor(new ProcessorScriptMemberFloat());
ObjectProcessor::AddProcessor(new ProcessorVideoPlay());
ActorProcessor::AddProcessor(new ProcessorActorAI());

23
apps/openmw/mwmp/processors/object/ProcessorObjectMiscellaneous.hpp Normal file
View file

@ -0,0 +1,23 @@
#ifndef OPENMW_PROCESSOROBJECTMISCELLANEOUS_HPP
#define OPENMW_PROCESSOROBJECTMISCELLANEOUS_HPP
#include "../ObjectProcessor.hpp"
namespace mwmp
{
class ProcessorObjectMiscellaneous final: public ObjectProcessor
{
public:
ProcessorObjectMiscellaneous()
{
BPP_INIT(ID_OBJECT_MISCELLANEOUS)
}
virtual void Do(ObjectPacket &packet, ObjectList &objectList)
{
LOG_MESSAGE_SIMPLE(TimedLog::LOG_VERBOSE, "Received %s", strPacketID.c_str());
}
};
}
#endif //OPENMW_PROCESSOROBJECTMISCELLANEOUS_HPP

24
apps/openmw/mwmp/processors/object/ProcessorScriptMemberFloat.hpp
View file

@ -1,24 +0,0 @@
#ifndef OPENMW_PROCESSORSCRIPTMEMBERFLOAT_HPP
#define OPENMW_PROCESSORSCRIPTMEMBERFLOAT_HPP
#include "../ObjectProcessor.hpp"
namespace mwmp
{
class ProcessorScriptMemberFloat final: public ObjectProcessor
{
public:
ProcessorScriptMemberFloat()
{
BPP_INIT(ID_SCRIPT_MEMBER_FLOAT)
}
virtual void Do(ObjectPacket &packet, ObjectList &objectList)
{
LOG_MESSAGE_SIMPLE(TimedLog::LOG_VERBOSE, "Received %s", strPacketID.c_str());
//objectList.setMemberFloats();
}
};
}
#endif //OPENMW_PROCESSORSCRIPTMEMBERFLOAT_HPP

2
components/CMakeLists.txt
View file

@ -208,7 +208,7 @@ add_component_dir (openmw-mp/Packets/Object
PacketConsoleCommand PacketContainer PacketObjectActivate PacketObjectAnimPlay PacketObjectAttach
PacketObjectDelete PacketObjectHit PacketObjectLock PacketObjectMove PacketObjectPlace PacketObjectRestock
PacketObjectRotate PacketObjectScale PacketObjectSound PacketObjectSpawn PacketObjectState PacketObjectTrap
PacketMusicPlay PacketVideoPlay PacketClientScriptLocal PacketScriptMemberShort PacketScriptMemberFloat
PacketMusicPlay PacketVideoPlay PacketClientScriptLocal PacketScriptMemberShort PacketObjectMiscellaneous
)
add_component_dir (openmw-mp/Packets/Worldstate

4
components/openmw-mp/Controllers/ObjectPacketController.cpp
View file

@ -4,6 +4,7 @@
#include "../Packets/Object/PacketObjectDelete.hpp"
#include "../Packets/Object/PacketObjectHit.hpp"
#include "../Packets/Object/PacketObjectLock.hpp"
#include "../Packets/Object/PacketObjectMiscellaneous.hpp"
#include "../Packets/Object/PacketObjectMove.hpp"
#include "../Packets/Object/PacketObjectPlace.hpp"
#include "../Packets/Object/PacketObjectRestock.hpp"
@ -23,7 +24,6 @@
#include "../Packets/Object/PacketConsoleCommand.hpp"
#include "../Packets/Object/PacketClientScriptLocal.hpp"
#include "../Packets/Object/PacketScriptMemberShort.hpp"
#include "../Packets/Object/PacketScriptMemberFloat.hpp"
#include "ObjectPacketController.hpp"
@ -43,6 +43,7 @@ mwmp::ObjectPacketController::ObjectPacketController(RakNet::RakPeerInterface *p
AddPacket<PacketObjectDelete>(&packets, peer);
AddPacket<PacketObjectHit>(&packets, peer);
AddPacket<PacketObjectLock>(&packets, peer);
AddPacket<PacketObjectMiscellaneous>(&packets, peer);
AddPacket<PacketObjectMove>(&packets, peer);
AddPacket<PacketObjectPlace>(&packets, peer);
AddPacket<PacketObjectRestock>(&packets, peer);
@ -62,7 +63,6 @@ mwmp::ObjectPacketController::ObjectPacketController(RakNet::RakPeerInterface *p
AddPacket<PacketConsoleCommand>(&packets, peer);
AddPacket<PacketClientScriptLocal>(&packets, peer);
AddPacket<PacketScriptMemberShort>(&packets, peer);
AddPacket<PacketScriptMemberFloat>(&packets, peer);
}

2
components/openmw-mp/NetworkMessages.hpp
View file

@ -92,7 +92,7 @@ enum GameMessages
ID_CLIENT_SCRIPT_LOCAL,
ID_SCRIPT_LOCAL_FLOAT,
ID_SCRIPT_MEMBER_SHORT,
ID_SCRIPT_MEMBER_FLOAT,
ID_OBJECT_MISCELLANEOUS,
ID_CLIENT_SCRIPT_GLOBAL,
ID_OBJECT_RESTOCK,

14
components/openmw-mp/Packets/Object/PacketObjectMiscellaneous.cpp Normal file
View file

@ -0,0 +1,14 @@
#include <components/openmw-mp/NetworkMessages.hpp>
#include "PacketObjectMiscellaneous.hpp"
using namespace mwmp;
PacketObjectMiscellaneous::PacketObjectMiscellaneous(RakNet::RakPeerInterface *peer) : ObjectPacket(peer)
{
packetID = ID_OBJECT_MISCELLANEOUS;
}
void PacketObjectMiscellaneous::Object(BaseObject &baseObject, bool send)
{
}

17
components/openmw-mp/Packets/Object/PacketObjectMiscellaneous.hpp Normal file
View file

@ -0,0 +1,17 @@
#ifndef OPENMW_PACKETOBJECTMISCELLANEOUS_HPP
#define OPENMW_PACKETOBJECTMISCELLANEOUS_HPP
#include <components/openmw-mp/Packets/Object/ObjectPacket.hpp>
namespace mwmp
{
class PacketObjectMiscellaneous : public ObjectPacket
{
public:
PacketObjectMiscellaneous(RakNet::RakPeerInterface *peer);
virtual void Object(BaseObject &obj, bool send);
};
}
#endif //OPENMW_PACKETOBJECTMISCELLANEOUS_HPP

16
components/openmw-mp/Packets/Object/PacketScriptMemberFloat.cpp
View file

@ -1,16 +0,0 @@
#include <components/openmw-mp/NetworkMessages.hpp>
#include "PacketScriptMemberFloat.hpp"
using namespace mwmp;
PacketScriptMemberFloat::PacketScriptMemberFloat(RakNet::RakPeerInterface *peer) : ObjectPacket(peer)
{
packetID = ID_SCRIPT_MEMBER_FLOAT;
}
void PacketScriptMemberFloat::Object(BaseObject &baseObject, bool send)
{
RW(baseObject.refId, send);
RW(baseObject.index, send);
RW(baseObject.floatVal, send);
}

17
components/openmw-mp/Packets/Object/PacketScriptMemberFloat.hpp
View file

@ -1,17 +0,0 @@
#ifndef OPENMW_PACKETSCRIPTMEMBERFLOAT_HPP
#define OPENMW_PACKETSCRIPTMEMBERFLOAT_HPP
#include <components/openmw-mp/Packets/Object/ObjectPacket.hpp>
namespace mwmp
{
class PacketScriptMemberFloat : public ObjectPacket
{
public:
PacketScriptMemberFloat(RakNet::RakPeerInterface *peer);
virtual void Object(BaseObject &obj, bool send);
};
}
#endif //OPENMW_PACKETSCRIPTMEMBERFLOAT_HPP