From 4841c1ad4c7c2b20a288c159b0dfe4deaadd1b4a Mon Sep 17 00:00:00 2001 From: David Cernat Date: Wed, 5 Feb 2020 17:41:48 +0200 Subject: [PATCH] [General] Rename ScriptLocalShort into ClientScriptLocal --- apps/openmw-mp/CMakeLists.txt | 2 +- .../processors/ProcessorInitializer.cpp | 4 ++-- .../object/ProcessorClientScriptLocal.hpp | 18 ++++++++++++++++++ .../object/ProcessorScriptLocalShort.hpp | 18 ------------------ apps/openmw/CMakeLists.txt | 2 +- apps/openmw/mwmp/ObjectList.cpp | 10 +++++----- apps/openmw/mwmp/ObjectList.hpp | 4 ++-- .../mwmp/processors/ProcessorInitializer.cpp | 4 ++-- ...hort.hpp => ProcessorClientScriptLocal.hpp} | 12 ++++++------ apps/openmw/mwscript/interpretercontext.cpp | 6 +++--- components/CMakeLists.txt | 2 +- .../Controllers/ObjectPacketController.cpp | 4 ++-- components/openmw-mp/NetworkMessages.hpp | 2 +- .../Packets/Object/PacketClientScriptLocal.cpp | 17 +++++++++++++++++ .../Packets/Object/PacketClientScriptLocal.hpp | 17 +++++++++++++++++ .../Packets/Object/PacketScriptLocalShort.cpp | 17 ----------------- .../Packets/Object/PacketScriptLocalShort.hpp | 17 ----------------- 17 files changed, 78 insertions(+), 78 deletions(-) create mode 100644 apps/openmw-mp/processors/object/ProcessorClientScriptLocal.hpp delete mode 100644 apps/openmw-mp/processors/object/ProcessorScriptLocalShort.hpp rename apps/openmw/mwmp/processors/object/{ProcessorScriptLocalShort.hpp => ProcessorClientScriptLocal.hpp} (51%) create mode 100644 components/openmw-mp/Packets/Object/PacketClientScriptLocal.cpp create mode 100644 components/openmw-mp/Packets/Object/PacketClientScriptLocal.hpp delete mode 100644 components/openmw-mp/Packets/Object/PacketScriptLocalShort.cpp delete mode 100644 components/openmw-mp/Packets/Object/PacketScriptLocalShort.hpp diff --git a/apps/openmw-mp/CMakeLists.txt b/apps/openmw-mp/CMakeLists.txt index 338fc2f0e..ca1dc4bee 100644 --- a/apps/openmw-mp/CMakeLists.txt +++ b/apps/openmw-mp/CMakeLists.txt @@ -121,7 +121,7 @@ set(PROCESSORS_OBJECT processors/object/ProcessorObjectPlace.hpp processors/object/ProcessorObjectRestock.hpp processors/object/ProcessorObjectRotate.hpp processors/object/ProcessorObjectScale.hpp processors/object/ProcessorObjectSpawn.hpp processors/object/ProcessorObjectState.hpp - processors/object/ProcessorObjectTrap.hpp processors/object/ProcessorScriptLocalShort.hpp + processors/object/ProcessorObjectTrap.hpp processors/object/ProcessorClientScriptLocal.hpp processors/object/ProcessorScriptLocalFloat.hpp processors/object/ProcessorScriptMemberShort.hpp processors/object/ProcessorScriptMemberFloat.hpp processors/object/ProcessorVideoPlay.hpp ) diff --git a/apps/openmw-mp/processors/ProcessorInitializer.cpp b/apps/openmw-mp/processors/ProcessorInitializer.cpp index 3878c5e0c..5e09b3baa 100644 --- a/apps/openmw-mp/processors/ProcessorInitializer.cpp +++ b/apps/openmw-mp/processors/ProcessorInitializer.cpp @@ -71,7 +71,7 @@ #include "object/ProcessorObjectSpawn.hpp" #include "object/ProcessorObjectState.hpp" #include "object/ProcessorObjectTrap.hpp" -#include "object/ProcessorScriptLocalShort.hpp" +#include "object/ProcessorClientScriptLocal.hpp" #include "object/ProcessorScriptLocalFloat.hpp" #include "object/ProcessorScriptMemberShort.hpp" #include "object/ProcessorScriptMemberFloat.hpp" @@ -154,7 +154,7 @@ void ProcessorInitializer() ObjectProcessor::AddProcessor(new ProcessorObjectSpawn()); ObjectProcessor::AddProcessor(new ProcessorObjectState()); ObjectProcessor::AddProcessor(new ProcessorObjectTrap()); - ObjectProcessor::AddProcessor(new ProcessorScriptLocalShort()); + ObjectProcessor::AddProcessor(new ProcessorClientScriptLocal()); ObjectProcessor::AddProcessor(new ProcessorScriptLocalFloat()); ObjectProcessor::AddProcessor(new ProcessorScriptMemberShort()); ObjectProcessor::AddProcessor(new ProcessorScriptMemberFloat()); diff --git a/apps/openmw-mp/processors/object/ProcessorClientScriptLocal.hpp b/apps/openmw-mp/processors/object/ProcessorClientScriptLocal.hpp new file mode 100644 index 000000000..b95efd8c0 --- /dev/null +++ b/apps/openmw-mp/processors/object/ProcessorClientScriptLocal.hpp @@ -0,0 +1,18 @@ +#ifndef OPENMW_PROCESSORCLIENTSCRIPTLOCAL_HPP +#define OPENMW_PROCESSORCLIENTSCRIPTLOCAL_HPP + +#include "../ObjectProcessor.hpp" + +namespace mwmp +{ + class ProcessorClientScriptLocal : public ObjectProcessor + { + public: + ProcessorClientScriptLocal() + { + BPP_INIT(ID_CLIENT_SCRIPT_LOCAL) + } + }; +} + +#endif //OPENMW_PROCESSORCLIENTSCRIPTLOCAL_HPP diff --git a/apps/openmw-mp/processors/object/ProcessorScriptLocalShort.hpp b/apps/openmw-mp/processors/object/ProcessorScriptLocalShort.hpp deleted file mode 100644 index fe552e2ec..000000000 --- a/apps/openmw-mp/processors/object/ProcessorScriptLocalShort.hpp +++ /dev/null @@ -1,18 +0,0 @@ -#ifndef OPENMW_PROCESSORSCRIPTLOCALSHORT_HPP -#define OPENMW_PROCESSORSCRIPTLOCALSHORT_HPP - -#include "../ObjectProcessor.hpp" - -namespace mwmp -{ - class ProcessorScriptLocalShort : public ObjectProcessor - { - public: - ProcessorScriptLocalShort() - { - BPP_INIT(ID_SCRIPT_LOCAL_SHORT) - } - }; -} - -#endif //OPENMW_PROCESSORSCRIPTLOCALSHORT_HPP diff --git a/apps/openmw/CMakeLists.txt b/apps/openmw/CMakeLists.txt index c1699ffe1..a681bd58c 100644 --- a/apps/openmw/CMakeLists.txt +++ b/apps/openmw/CMakeLists.txt @@ -133,7 +133,7 @@ add_openmw_dir (mwmp/processors/object BaseObjectProcessor ProcessorObjectActivate ProcessorObjectAnimPlay ProcessorObjectAttach ProcessorObjectDelete ProcessorObjectHit ProcessorObjectLock ProcessorObjectMove ProcessorObjectPlace ProcessorObjectRestock ProcessorObjectRotate ProcessorObjectScale ProcessorObjectSound ProcessorObjectSpawn ProcessorObjectState ProcessorObjectTrap - ProcessorScriptLocalShort ProcessorScriptLocalFloat ProcessorScriptMemberShort ProcessorScriptMemberFloat + ProcessorClientScriptLocal ProcessorScriptLocalFloat ProcessorScriptMemberShort ProcessorScriptMemberFloat ) add_openmw_dir (mwmp/processors/worldstate ProcessorCellReset ProcessorClientScriptGlobal ProcessorClientScriptSettings diff --git a/apps/openmw/mwmp/ObjectList.cpp b/apps/openmw/mwmp/ObjectList.cpp index c917afcc7..631e7a068 100644 --- a/apps/openmw/mwmp/ObjectList.cpp +++ b/apps/openmw/mwmp/ObjectList.cpp @@ -1223,7 +1223,7 @@ void ObjectList::addConsoleCommandObject(const MWWorld::Ptr& ptr) addBaseObject(baseObject); } -void ObjectList::addScriptLocalShort(const MWWorld::Ptr& ptr, int index, int shortVal) +void ObjectList::addClientScriptLocal(const MWWorld::Ptr& ptr, int index, int shortVal) { cell = *ptr.getCell()->getCell(); @@ -1364,16 +1364,16 @@ void ObjectList::sendVideoPlay() mwmp::Main::get().getNetworking()->getObjectPacket(ID_VIDEO_PLAY)->Send(); } -void ObjectList::sendScriptLocalShort() +void ObjectList::sendClientScriptLocal() { - LOG_MESSAGE_SIMPLE(TimedLog::LOG_VERBOSE, "Sending ID_SCRIPT_LOCAL_SHORT about %s", cell.getDescription().c_str()); + LOG_MESSAGE_SIMPLE(TimedLog::LOG_VERBOSE, "Sending ID_CLIENT_SCRIPT_LOCAL about %s", cell.getDescription().c_str()); for (const auto &baseObject : baseObjects) LOG_APPEND(TimedLog::LOG_VERBOSE, "- cellRef: %s-%i, index: %i, shortVal: %i", baseObject.refId.c_str(), baseObject.refNum, baseObject.index, baseObject.shortVal); - mwmp::Main::get().getNetworking()->getObjectPacket(ID_SCRIPT_LOCAL_SHORT)->setObjectList(this); - mwmp::Main::get().getNetworking()->getObjectPacket(ID_SCRIPT_LOCAL_SHORT)->Send(); + mwmp::Main::get().getNetworking()->getObjectPacket(ID_CLIENT_SCRIPT_LOCAL)->setObjectList(this); + mwmp::Main::get().getNetworking()->getObjectPacket(ID_CLIENT_SCRIPT_LOCAL)->Send(); } void ObjectList::sendScriptLocalFloat() diff --git a/apps/openmw/mwmp/ObjectList.hpp b/apps/openmw/mwmp/ObjectList.hpp index 2f5c731f0..c0d94f1c7 100644 --- a/apps/openmw/mwmp/ObjectList.hpp +++ b/apps/openmw/mwmp/ObjectList.hpp @@ -68,7 +68,7 @@ namespace mwmp void addMusicPlay(std::string filename); void addVideoPlay(std::string filename, bool allowSkipping); void addConsoleCommandObject(const MWWorld::Ptr& ptr); - void addScriptLocalShort(const MWWorld::Ptr& ptr, int index, int shortVal); + void addClientScriptLocal(const MWWorld::Ptr& ptr, int index, int shortVal); void addScriptLocalFloat(const MWWorld::Ptr& ptr, int index, float floatVal); void addScriptMemberShort(std::string refId, int index, int shortVal); @@ -86,7 +86,7 @@ namespace mwmp void sendDoorState(); void sendMusicPlay(); void sendVideoPlay(); - void sendScriptLocalShort(); + void sendClientScriptLocal(); void sendScriptLocalFloat(); void sendScriptMemberShort(); void sendContainer(); diff --git a/apps/openmw/mwmp/processors/ProcessorInitializer.cpp b/apps/openmw/mwmp/processors/ProcessorInitializer.cpp index d868346a6..e07881ab2 100644 --- a/apps/openmw/mwmp/processors/ProcessorInitializer.cpp +++ b/apps/openmw/mwmp/processors/ProcessorInitializer.cpp @@ -67,7 +67,7 @@ #include "object/ProcessorObjectSpawn.hpp" #include "object/ProcessorObjectState.hpp" #include "object/ProcessorObjectTrap.hpp" -#include "object/ProcessorScriptLocalShort.hpp" +#include "object/ProcessorClientScriptLocal.hpp" #include "object/ProcessorScriptLocalFloat.hpp" #include "object/ProcessorScriptMemberShort.hpp" #include "object/ProcessorScriptMemberFloat.hpp" @@ -170,7 +170,7 @@ void ProcessorInitializer() ObjectProcessor::AddProcessor(new ProcessorObjectSpawn()); ObjectProcessor::AddProcessor(new ProcessorObjectState()); ObjectProcessor::AddProcessor(new ProcessorObjectTrap()); - ObjectProcessor::AddProcessor(new ProcessorScriptLocalShort()); + ObjectProcessor::AddProcessor(new ProcessorClientScriptLocal()); ObjectProcessor::AddProcessor(new ProcessorScriptLocalFloat()); ObjectProcessor::AddProcessor(new ProcessorScriptMemberShort()); ObjectProcessor::AddProcessor(new ProcessorScriptMemberFloat()); diff --git a/apps/openmw/mwmp/processors/object/ProcessorScriptLocalShort.hpp b/apps/openmw/mwmp/processors/object/ProcessorClientScriptLocal.hpp similarity index 51% rename from apps/openmw/mwmp/processors/object/ProcessorScriptLocalShort.hpp rename to apps/openmw/mwmp/processors/object/ProcessorClientScriptLocal.hpp index b1f20312c..c37704a1d 100644 --- a/apps/openmw/mwmp/processors/object/ProcessorScriptLocalShort.hpp +++ b/apps/openmw/mwmp/processors/object/ProcessorClientScriptLocal.hpp @@ -1,16 +1,16 @@ -#ifndef OPENMW_PROCESSORSCRIPTLOCALSHORT_HPP -#define OPENMW_PROCESSORSCRIPTLOCALSHORT_HPP +#ifndef OPENMW_PROCESSORCLIENTSCRIPTLOCAL_HPP +#define OPENMW_PROCESSORCLIENTSCRIPTLOCAL_HPP #include "BaseObjectProcessor.hpp" namespace mwmp { - class ProcessorScriptLocalShort final: public BaseObjectProcessor + class ProcessorClientScriptLocal final: public BaseObjectProcessor { public: - ProcessorScriptLocalShort() + ProcessorClientScriptLocal() { - BPP_INIT(ID_SCRIPT_LOCAL_SHORT) + BPP_INIT(ID_CLIENT_SCRIPT_LOCAL) } virtual void Do(ObjectPacket &packet, ObjectList &objectList) @@ -22,4 +22,4 @@ namespace mwmp }; } -#endif //OPENMW_PROCESSORSCRIPTLOCALSHORT_HPP +#endif //OPENMW_PROCESSORCLIENTSCRIPTLOCAL_HPP diff --git a/apps/openmw/mwscript/interpretercontext.cpp b/apps/openmw/mwscript/interpretercontext.cpp index b740bed97..8d15533ae 100644 --- a/apps/openmw/mwscript/interpretercontext.cpp +++ b/apps/openmw/mwscript/interpretercontext.cpp @@ -224,7 +224,7 @@ namespace MWScript /* Start of tes3mp addition - Send an ID_SCRIPT_LOCAL_SHORT packet every time a local short changes its value + Send an ID_CLIENT_SCRIPT_LOCAL packet every time a local short changes its value in a script approved for packet sending */ if (sendPackets) @@ -232,8 +232,8 @@ namespace MWScript mwmp::ObjectList *objectList = mwmp::Main::get().getNetworking()->getObjectList(); objectList->reset(); objectList->packetOrigin = ScriptController::getPacketOriginFromContextType(getContextType()); - objectList->addScriptLocalShort(mReference, index, value); - objectList->sendScriptLocalShort(); + objectList->addClientScriptLocal(mReference, index, value); + objectList->sendClientScriptLocal(); } /* End of tes3mp addition diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt index 01254bfaf..3c3389356 100644 --- a/components/CMakeLists.txt +++ b/components/CMakeLists.txt @@ -207,7 +207,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 PacketScriptLocalShort PacketScriptLocalFloat PacketScriptMemberShort + PacketMusicPlay PacketVideoPlay PacketClientScriptLocal PacketScriptLocalFloat PacketScriptMemberShort PacketScriptMemberFloat ) diff --git a/components/openmw-mp/Controllers/ObjectPacketController.cpp b/components/openmw-mp/Controllers/ObjectPacketController.cpp index f789ce631..364a8c92c 100644 --- a/components/openmw-mp/Controllers/ObjectPacketController.cpp +++ b/components/openmw-mp/Controllers/ObjectPacketController.cpp @@ -21,7 +21,7 @@ #include "../Packets/Object/PacketVideoPlay.hpp" #include "../Packets/Object/PacketConsoleCommand.hpp" -#include "../Packets/Object/PacketScriptLocalShort.hpp" +#include "../Packets/Object/PacketClientScriptLocal.hpp" #include "../Packets/Object/PacketScriptLocalFloat.hpp" #include "../Packets/Object/PacketScriptMemberShort.hpp" #include "../Packets/Object/PacketScriptMemberFloat.hpp" @@ -61,7 +61,7 @@ mwmp::ObjectPacketController::ObjectPacketController(RakNet::RakPeerInterface *p AddPacket(&packets, peer); AddPacket(&packets, peer); - AddPacket(&packets, peer); + AddPacket(&packets, peer); AddPacket(&packets, peer); AddPacket(&packets, peer); AddPacket(&packets, peer); diff --git a/components/openmw-mp/NetworkMessages.hpp b/components/openmw-mp/NetworkMessages.hpp index e3d0c8971..c564af5d3 100644 --- a/components/openmw-mp/NetworkMessages.hpp +++ b/components/openmw-mp/NetworkMessages.hpp @@ -89,7 +89,7 @@ enum GameMessages ID_MUSIC_PLAY, ID_VIDEO_PLAY, - ID_SCRIPT_LOCAL_SHORT, + ID_CLIENT_SCRIPT_LOCAL, ID_SCRIPT_LOCAL_FLOAT, ID_SCRIPT_MEMBER_SHORT, ID_SCRIPT_MEMBER_FLOAT, diff --git a/components/openmw-mp/Packets/Object/PacketClientScriptLocal.cpp b/components/openmw-mp/Packets/Object/PacketClientScriptLocal.cpp new file mode 100644 index 000000000..eefc7d657 --- /dev/null +++ b/components/openmw-mp/Packets/Object/PacketClientScriptLocal.cpp @@ -0,0 +1,17 @@ +#include +#include "PacketClientScriptLocal.hpp" + +using namespace mwmp; + +PacketClientScriptLocal::PacketClientScriptLocal(RakNet::RakPeerInterface *peer) : ObjectPacket(peer) +{ + packetID = ID_CLIENT_SCRIPT_LOCAL; + hasCellData = true; +} + +void PacketClientScriptLocal::Object(BaseObject &baseObject, bool send) +{ + ObjectPacket::Object(baseObject, send); + RW(baseObject.index, send); + RW(baseObject.shortVal, send); +} diff --git a/components/openmw-mp/Packets/Object/PacketClientScriptLocal.hpp b/components/openmw-mp/Packets/Object/PacketClientScriptLocal.hpp new file mode 100644 index 000000000..c74d95018 --- /dev/null +++ b/components/openmw-mp/Packets/Object/PacketClientScriptLocal.hpp @@ -0,0 +1,17 @@ +#ifndef OPENMW_PACKETCLIENTSCRIPTLOCAL_HPP +#define OPENMW_PACKETCLIENTSCRIPTLOCAL_HPP + +#include + +namespace mwmp +{ + class PacketClientScriptLocal : public ObjectPacket + { + public: + PacketClientScriptLocal(RakNet::RakPeerInterface *peer); + + virtual void Object(BaseObject &obj, bool send); + }; +} + +#endif //OPENMW_PACKETCLIENTSCRIPTLOCAL_HPP diff --git a/components/openmw-mp/Packets/Object/PacketScriptLocalShort.cpp b/components/openmw-mp/Packets/Object/PacketScriptLocalShort.cpp deleted file mode 100644 index b2315592c..000000000 --- a/components/openmw-mp/Packets/Object/PacketScriptLocalShort.cpp +++ /dev/null @@ -1,17 +0,0 @@ -#include -#include "PacketScriptLocalShort.hpp" - -using namespace mwmp; - -PacketScriptLocalShort::PacketScriptLocalShort(RakNet::RakPeerInterface *peer) : ObjectPacket(peer) -{ - packetID = ID_SCRIPT_LOCAL_SHORT; - hasCellData = true; -} - -void PacketScriptLocalShort::Object(BaseObject &baseObject, bool send) -{ - ObjectPacket::Object(baseObject, send); - RW(baseObject.index, send); - RW(baseObject.shortVal, send); -} diff --git a/components/openmw-mp/Packets/Object/PacketScriptLocalShort.hpp b/components/openmw-mp/Packets/Object/PacketScriptLocalShort.hpp deleted file mode 100644 index d2d0284e4..000000000 --- a/components/openmw-mp/Packets/Object/PacketScriptLocalShort.hpp +++ /dev/null @@ -1,17 +0,0 @@ -#ifndef OPENMW_PACKETSCRIPTLOCALSHORT_HPP -#define OPENMW_PACKETSCRIPTLOCALSHORT_HPP - -#include - -namespace mwmp -{ - class PacketScriptLocalShort : public ObjectPacket - { - public: - PacketScriptLocalShort(RakNet::RakPeerInterface *peer); - - virtual void Object(BaseObject &obj, bool send); - }; -} - -#endif //OPENMW_PACKETSCRIPTLOCALSHORT_HPP