mirror
/
openmw-tes3mp
mirror of https://github.com/TES3MP/openmw-tes3mp.git
1
0
Fork 1
Code Issues Releases Wiki Activity

Merge pull request #428 from TES3MP/0.6.3 while resolving conflicts

Browse Source 
# Conflicts:
#   apps/openmw-mp/Networking.cpp
#   apps/openmw-mp/Script/Functions/Objects.cpp
#   apps/openmw-mp/Script/Functions/Objects.hpp
#   apps/openmw-mp/processors/ObjectProcessor.cpp
#   apps/openmw-mp/processors/object/ProcessorContainer.hpp
#   apps/openmw-mp/processors/object/ProcessorDoorState.hpp
#   apps/openmw-mp/processors/object/ProcessorMusicPlay.hpp
#   apps/openmw-mp/processors/object/ProcessorObjectAnimPlay.hpp
#   apps/openmw-mp/processors/object/ProcessorObjectDelete.hpp
#   apps/openmw-mp/processors/object/ProcessorObjectLock.hpp
#   apps/openmw-mp/processors/object/ProcessorObjectMove.hpp
#   apps/openmw-mp/processors/object/ProcessorObjectPlace.hpp
#   apps/openmw-mp/processors/object/ProcessorObjectRotate.hpp
#   apps/openmw-mp/processors/object/ProcessorObjectScale.hpp
#   apps/openmw-mp/processors/object/ProcessorObjectSpawn.hpp
#   apps/openmw-mp/processors/object/ProcessorObjectState.hpp
#   apps/openmw-mp/processors/object/ProcessorObjectTrap.hpp
#   apps/openmw-mp/processors/object/ProcessorScriptGlobalFloat.hpp
#   apps/openmw-mp/processors/object/ProcessorScriptGlobalShort.hpp
#   apps/openmw-mp/processors/object/ProcessorScriptLocalFloat.hpp
#   apps/openmw-mp/processors/object/ProcessorScriptLocalShort.hpp
#   apps/openmw-mp/processors/object/ProcessorScriptMemberFloat.hpp
#   apps/openmw-mp/processors/object/ProcessorScriptMemberShort.hpp
#   apps/openmw-mp/processors/object/ProcessorVideoPlay.hpp
#   apps/openmw/mwmp/Networking.cpp
#   apps/openmw/mwmp/processors/object/BaseObjectProcessor.hpp
#   apps/openmw/mwmp/processors/object/ProcessorMusicPlay.hpp
#   apps/openmw/mwmp/processors/object/ProcessorScriptGlobalFloat.hpp
#   apps/openmw/mwmp/processors/object/ProcessorScriptGlobalShort.hpp
#   apps/openmw/mwmp/processors/object/ProcessorScriptMemberFloat.hpp
#   apps/openmw/mwmp/processors/object/ProcessorScriptMemberShort.hpp
#   apps/openmw/mwmp/processors/object/ProcessorVideoPlay.hpp
pull/417/merge
David Cernat 7 years ago
parent 98eece808b 2ac334664b
commit b5922d18fd
56 changed files with 170 additions and 170 deletions
Show Stats Download Patch File Download Diff File

22
apps/openmw-mp/CMakeLists.txt
Unescape Escape View File

@ -95,16 +95,16 @@ set(PROCESSORS_PLAYER
source_group(tes3mp-server\\processors\\player FILES ${PROCESSORS_PLAYER})
set(PROCESSORS_WORLD
processors/world/ProcessorContainer.hpp processors/world/ProcessorDoorState.hpp
processors/world/ProcessorMusicPlay.hpp processors/world/ProcessorObjectAnimPlay.hpp
processors/world/ProcessorObjectDelete.hpp processors/world/ProcessorObjectLock.hpp
processors/world/ProcessorObjectMove.hpp processors/world/ProcessorObjectPlace.hpp
processors/world/ProcessorObjectRotate.hpp processors/world/ProcessorObjectScale.hpp
processors/world/ProcessorObjectSpawn.hpp processors/world/ProcessorObjectState.hpp
processors/world/ProcessorObjectTrap.hpp processors/world/ProcessorScriptLocalShort.hpp
processors/world/ProcessorScriptLocalFloat.hpp processors/world/ProcessorScriptMemberShort.hpp
processors/world/ProcessorScriptMemberFloat.hpp processors/world/ProcessorScriptGlobalShort.hpp
processors/world/ProcessorScriptGlobalFloat.hpp processors/world/ProcessorVideoPlay.hpp
processors/object/ProcessorContainer.hpp processors/object/ProcessorDoorState.hpp
processors/object/ProcessorMusicPlay.hpp processors/object/ProcessorObjectAnimPlay.hpp
processors/object/ProcessorObjectDelete.hpp processors/object/ProcessorObjectLock.hpp
processors/object/ProcessorObjectMove.hpp processors/object/ProcessorObjectPlace.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/ProcessorScriptLocalFloat.hpp processors/object/ProcessorScriptMemberShort.hpp
processors/object/ProcessorScriptMemberFloat.hpp processors/object/ProcessorScriptGlobalShort.hpp
processors/object/ProcessorScriptGlobalFloat.hpp processors/object/ProcessorVideoPlay.hpp
)
source_group(tes3mp-server\\processors\\world FILES ${PROCESSORS_WORLD})
@ -113,7 +113,7 @@ set(PROCESSORS
processors/ProcessorInitializer.cpp
processors/PlayerProcessor.cpp
processors/ActorProcessor.cpp
processors/WorldProcessor.cpp
processors/ObjectProcessor.cpp
)
source_group(tes3mp-server\\processors FILES ${PROCESSORS})

4
apps/openmw-mp/Networking.cpp
Unescape Escape View File

@ -19,7 +19,7 @@
#include "processors/ProcessorInitializer.hpp"
#include "processors/PlayerProcessor.hpp"
#include "processors/ActorProcessor.hpp"
#include "processors/WorldProcessor.hpp"
#include "processors/ObjectProcessor.hpp"
#include "Networking.hpp"
#include "MasterClient.hpp"
@ -178,7 +178,7 @@ void Networking::processObjectPacket(RakNet::Packet *packet)
if (!player->isHandshaked() || player->getLoadState() != Player::POSTLOADED)
return;
if (!WorldProcessor::Process(*packet, baseObjectList))
if (!ObjectProcessor::Process(*packet, baseObjectList))
LOG_MESSAGE_SIMPLE(Log::LOG_WARN, "Unhandled ObjectPacket with identifier %i has arrived", (int) packet->data[0]);
}

6
apps/openmw-mp/processors/WorldProcessor.cpp → apps/openmw-mp/processors/ObjectProcessor.cpp
Unescape Escape View File

@ -2,7 +2,7 @@
// Created by koncord on 03.04.17.
//
#include "WorldProcessor.hpp"
#include "ObjectProcessor.hpp"
#include "Networking.hpp"
using namespace mwmp;
@ -10,12 +10,12 @@ using namespace mwmp;
template<class T>
typename BasePacketProcessor<T>::processors_t BasePacketProcessor<T>::processors;
void WorldProcessor::Do(ObjectPacket &packet, const std::shared_ptr<Player> &player, BaseObjectList &objectList)
void ObjectProcessor::Do(ObjectPacket &packet, const std::shared_ptr<Player> &player, BaseObjectList &objectList)
{
packet.Send(true);
}
bool WorldProcessor::Process(RakNet::Packet &packet, BaseObjectList &objectList) noexcept
bool ObjectProcessor::Process(RakNet::Packet &packet, BaseObjectList &objectList) noexcept
{
// Clear our BaseObjectList before loading new data in it
objectList.cell.blank();

2
apps/openmw-mp/processors/WorldProcessor.hpp → apps/openmw-mp/processors/ObjectProcessor.hpp
Unescape Escape View File

@ -14,7 +14,7 @@
namespace mwmp
{
class WorldProcessor : public BasePacketProcessor<WorldProcessor>
class ObjectProcessor : public BasePacketProcessor<ObjectProcessor>
{
public:

82
apps/openmw-mp/processors/ProcessorInitializer.cpp
Unescape Escape View File

@ -58,27 +58,27 @@
#include "actor/ProcessorActorStatsDynamic.hpp"
#include "actor/ProcessorActorPosition.hpp"
#include "actor/ProcessorActorSpeech.hpp"
#include "WorldProcessor.hpp"
#include "world/ProcessorContainer.hpp"
#include "world/ProcessorDoorState.hpp"
#include "world/ProcessorMusicPlay.hpp"
#include "world/ProcessorObjectAnimPlay.hpp"
#include "world/ProcessorObjectDelete.hpp"
#include "world/ProcessorObjectPlace.hpp"
#include "world/ProcessorObjectLock.hpp"
#include "world/ProcessorObjectMove.hpp"
#include "world/ProcessorObjectRotate.hpp"
#include "world/ProcessorObjectScale.hpp"
#include "world/ProcessorObjectSpawn.hpp"
#include "world/ProcessorObjectState.hpp"
#include "world/ProcessorObjectTrap.hpp"
#include "world/ProcessorScriptLocalShort.hpp"
#include "world/ProcessorScriptLocalFloat.hpp"
#include "world/ProcessorScriptMemberShort.hpp"
#include "world/ProcessorScriptMemberFloat.hpp"
#include "world/ProcessorScriptGlobalShort.hpp"
#include "world/ProcessorScriptGlobalFloat.hpp"
#include "world/ProcessorVideoPlay.hpp"
#include "ObjectProcessor.hpp"
#include "object/ProcessorContainer.hpp"
#include "object/ProcessorDoorState.hpp"
#include "object/ProcessorMusicPlay.hpp"
#include "object/ProcessorObjectAnimPlay.hpp"
#include "object/ProcessorObjectDelete.hpp"
#include "object/ProcessorObjectPlace.hpp"
#include "object/ProcessorObjectLock.hpp"
#include "object/ProcessorObjectMove.hpp"
#include "object/ProcessorObjectRotate.hpp"
#include "object/ProcessorObjectScale.hpp"
#include "object/ProcessorObjectSpawn.hpp"
#include "object/ProcessorObjectState.hpp"
#include "object/ProcessorObjectTrap.hpp"
#include "object/ProcessorScriptLocalShort.hpp"
#include "object/ProcessorScriptLocalFloat.hpp"
#include "object/ProcessorScriptMemberShort.hpp"
#include "object/ProcessorScriptMemberFloat.hpp"
#include "object/ProcessorScriptGlobalShort.hpp"
#include "object/ProcessorScriptGlobalFloat.hpp"
#include "object/ProcessorVideoPlay.hpp"
using namespace mwmp;
@ -137,24 +137,24 @@ void ProcessorInitializer()
ActorProcessor::AddProcessor(new ProcessorActorStatsDynamic());
ActorProcessor::AddProcessor(new ProcessorActorTest());
WorldProcessor::AddProcessor(new ProcessorContainer());
WorldProcessor::AddProcessor(new ProcessorDoorState());
WorldProcessor::AddProcessor(new ProcessorMusicPlay());
WorldProcessor::AddProcessor(new ProcessorObjectAnimPlay());
WorldProcessor::AddProcessor(new ProcessorObjectDelete());
WorldProcessor::AddProcessor(new ProcessorObjectLock());
WorldProcessor::AddProcessor(new ProcessorObjectMove());
WorldProcessor::AddProcessor(new ProcessorObjectPlace());
WorldProcessor::AddProcessor(new ProcessorObjectRotate());
WorldProcessor::AddProcessor(new ProcessorObjectScale());
WorldProcessor::AddProcessor(new ProcessorObjectSpawn());
WorldProcessor::AddProcessor(new ProcessorObjectState());
WorldProcessor::AddProcessor(new ProcessorObjectTrap());
WorldProcessor::AddProcessor(new ProcessorScriptLocalShort());
WorldProcessor::AddProcessor(new ProcessorScriptLocalFloat());
WorldProcessor::AddProcessor(new ProcessorScriptMemberShort());
WorldProcessor::AddProcessor(new ProcessorScriptMemberFloat());
WorldProcessor::AddProcessor(new ProcessorScriptGlobalShort());
WorldProcessor::AddProcessor(new ProcessorScriptGlobalFloat());
WorldProcessor::AddProcessor(new ProcessorVideoPlay());
ObjectProcessor::AddProcessor(new ProcessorContainer());
ObjectProcessor::AddProcessor(new ProcessorDoorState());
ObjectProcessor::AddProcessor(new ProcessorMusicPlay());
ObjectProcessor::AddProcessor(new ProcessorObjectAnimPlay());
ObjectProcessor::AddProcessor(new ProcessorObjectDelete());
ObjectProcessor::AddProcessor(new ProcessorObjectLock());
ObjectProcessor::AddProcessor(new ProcessorObjectMove());
ObjectProcessor::AddProcessor(new ProcessorObjectPlace());
ObjectProcessor::AddProcessor(new ProcessorObjectRotate());
ObjectProcessor::AddProcessor(new ProcessorObjectScale());
ObjectProcessor::AddProcessor(new ProcessorObjectSpawn());
ObjectProcessor::AddProcessor(new ProcessorObjectState());
ObjectProcessor::AddProcessor(new ProcessorObjectTrap());
ObjectProcessor::AddProcessor(new ProcessorScriptLocalShort());
ObjectProcessor::AddProcessor(new ProcessorScriptLocalFloat());
ObjectProcessor::AddProcessor(new ProcessorScriptMemberShort());
ObjectProcessor::AddProcessor(new ProcessorScriptMemberFloat());
ObjectProcessor::AddProcessor(new ProcessorScriptGlobalShort());
ObjectProcessor::AddProcessor(new ProcessorScriptGlobalFloat());
ObjectProcessor::AddProcessor(new ProcessorVideoPlay());
}

4
apps/openmw-mp/processors/world/ProcessorContainer.hpp → apps/openmw-mp/processors/object/ProcessorContainer.hpp
Unescape Escape View File

@ -2,12 +2,12 @@
#define OPENMW_PROCESSORCONTAINER_HPP
#include <apps/openmw-mp/Object.hpp>
#include "../WorldProcessor.hpp"
#include "../ObjectProcessor.hpp"
namespace mwmp
{
class ProcessorContainer final: public WorldProcessor
class ProcessorContainer final: public ObjectProcessor
{
public:
ProcessorContainer()

4
apps/openmw-mp/processors/world/ProcessorDoorState.hpp → apps/openmw-mp/processors/object/ProcessorDoorState.hpp
Unescape Escape View File

@ -1,11 +1,11 @@
#ifndef OPENMW_PROCESSORDOORSTATE_HPP
#define OPENMW_PROCESSORDOORSTATE_HPP
#include "../WorldProcessor.hpp"
#include "../ObjectProcessor.hpp"
namespace mwmp
{
class ProcessorDoorState final: public WorldProcessor
class ProcessorDoorState final: public ObjectProcessor
{
public:
ProcessorDoorState()

4
apps/openmw-mp/processors/world/ProcessorMusicPlay.hpp → apps/openmw-mp/processors/object/ProcessorMusicPlay.hpp
Unescape Escape View File

@ -1,11 +1,11 @@
#ifndef OPENMW_PROCESSORMUSICPLAY_HPP
#define OPENMW_PROCESSORMUSICPLAY_HPP
#include "../WorldProcessor.hpp"
#include "../ObjectProcessor.hpp"
namespace mwmp
{
class ProcessorMusicPlay final: public WorldProcessor
class ProcessorMusicPlay final: public ObjectProcessor
{
public:
ProcessorMusicPlay()

4
apps/openmw-mp/processors/world/ProcessorObjectAnimPlay.hpp → apps/openmw-mp/processors/object/ProcessorObjectAnimPlay.hpp
Unescape Escape View File

@ -1,11 +1,11 @@
#ifndef OPENMW_PROCESSOROBJECTANIMPLAY_HPP
#define OPENMW_PROCESSOROBJECTANIMPLAY_HPP
#include "../WorldProcessor.hpp"
#include "../ObjectProcessor.hpp"
namespace mwmp
{
class ProcessorObjectAnimPlay final: public WorldProcessor
class ProcessorObjectAnimPlay final: public ObjectProcessor
{
public:
ProcessorObjectAnimPlay()

4
apps/openmw-mp/processors/world/ProcessorObjectDelete.hpp → apps/openmw-mp/processors/object/ProcessorObjectDelete.hpp
Unescape Escape View File

@ -1,11 +1,11 @@
#ifndef OPENMW_PROCESSOROBJECTDELETE_HPP
#define OPENMW_PROCESSOROBJECTDELETE_HPP
#include "../WorldProcessor.hpp"
#include "../ObjectProcessor.hpp"
namespace mwmp
{
class ProcessorObjectDelete final: public WorldProcessor
class ProcessorObjectDelete final: public ObjectProcessor
{
public:
ProcessorObjectDelete()

4
apps/openmw-mp/processors/world/ProcessorObjectLock.hpp → apps/openmw-mp/processors/object/ProcessorObjectLock.hpp
Unescape Escape View File

@ -1,11 +1,11 @@
#ifndef OPENMW_PROCESSOROBJECTLOCK_HPP
#define OPENMW_PROCESSOROBJECTLOCK_HPP
#include "../WorldProcessor.hpp"
#include "../ObjectProcessor.hpp"
namespace mwmp
{
class ProcessorObjectLock final: public WorldProcessor
class ProcessorObjectLock final: public ObjectProcessor
{
public:
ProcessorObjectLock()

4
apps/openmw-mp/processors/world/ProcessorObjectMove.hpp → apps/openmw-mp/processors/object/ProcessorObjectMove.hpp
Unescape Escape View File

@ -1,11 +1,11 @@
#ifndef OPENMW_PROCESSOROBJECTMOVE_HPP
#define OPENMW_PROCESSOROBJECTMOVE_HPP
#include "../WorldProcessor.hpp"
#include "../ObjectProcessor.hpp"
namespace mwmp
{
class ProcessorObjectMove final: public WorldProcessor
class ProcessorObjectMove final: public ObjectProcessor
{
public:
ProcessorObjectMove()

4
apps/openmw-mp/processors/world/ProcessorObjectPlace.hpp → apps/openmw-mp/processors/object/ProcessorObjectPlace.hpp
Unescape Escape View File

@ -1,12 +1,12 @@
#ifndef OPENMW_PROCESSOROBJECTPLACE_HPP
#define OPENMW_PROCESSOROBJECTPLACE_HPP
#include "../WorldProcessor.hpp"
#include "../ObjectProcessor.hpp"
#include <apps/openmw-mp/Networking.hpp>
namespace mwmp
{
class ProcessorObjectPlace final: public WorldProcessor
class ProcessorObjectPlace final: public ObjectProcessor
{
public:
ProcessorObjectPlace()

4
apps/openmw-mp/processors/world/ProcessorObjectRotate.hpp → apps/openmw-mp/processors/object/ProcessorObjectRotate.hpp
Unescape Escape View File

@ -1,11 +1,11 @@
#ifndef OPENMW_PROCESSOROBJECTROTATE_HPP
#define OPENMW_PROCESSOROBJECTROTATE_HPP
#include "../WorldProcessor.hpp"
#include "../ObjectProcessor.hpp"
namespace mwmp
{
class ProcessorObjectRotate final: public WorldProcessor
class ProcessorObjectRotate final: public ObjectProcessor
{
public:
ProcessorObjectRotate()

4
apps/openmw-mp/processors/world/ProcessorObjectScale.hpp → apps/openmw-mp/processors/object/ProcessorObjectScale.hpp
Unescape Escape View File

@ -1,11 +1,11 @@
#ifndef OPENMW_PROCESSOROBJECTSCALE_HPP
#define OPENMW_PROCESSOROBJECTSCALE_HPP
#include "../WorldProcessor.hpp"
#include "../ObjectProcessor.hpp"
namespace mwmp
{
class ProcessorObjectScale final: public WorldProcessor
class ProcessorObjectScale final: public ObjectProcessor
{
public:
ProcessorObjectScale()

4
apps/openmw-mp/processors/world/ProcessorObjectSpawn.hpp → apps/openmw-mp/processors/object/ProcessorObjectSpawn.hpp
Unescape Escape View File

@ -1,12 +1,12 @@
#ifndef OPENMW_PROCESSOROBJECTSPAWN_HPP
#define OPENMW_PROCESSOROBJECTSPAWN_HPP
#include "../WorldProcessor.hpp"
#include "../ObjectProcessor.hpp"
#include <apps/openmw-mp/Networking.hpp>
namespace mwmp
{
class ProcessorObjectSpawn final: public WorldProcessor
class ProcessorObjectSpawn final: public ObjectProcessor
{
public:
ProcessorObjectSpawn()

4
apps/openmw-mp/processors/world/ProcessorObjectState.hpp → apps/openmw-mp/processors/object/ProcessorObjectState.hpp
Unescape Escape View File

@ -1,11 +1,11 @@
#ifndef OPENMW_PROCESSOROBJECTSTATE_HPP
#define OPENMW_PROCESSOROBJECTSTATE_HPP
#include "../WorldProcessor.hpp"
#include "../ObjectProcessor.hpp"
namespace mwmp
{
class ProcessorObjectState final: public WorldProcessor
class ProcessorObjectState final: public ObjectProcessor
{
public:
ProcessorObjectState()

4
apps/openmw-mp/processors/world/ProcessorObjectTrap.hpp → apps/openmw-mp/processors/object/ProcessorObjectTrap.hpp
Unescape Escape View File

@ -1,11 +1,11 @@
#ifndef OPENMW_PROCESSOROBJECTTRAP_HPP
#define OPENMW_PROCESSOROBJECTTRAP_HPP
#include "../WorldProcessor.hpp"
#include "../ObjectProcessor.hpp"
namespace mwmp
{
class ProcessorObjectTrap final: public WorldProcessor
class ProcessorObjectTrap final: public ObjectProcessor
{
public:
ProcessorObjectTrap()

4
apps/openmw-mp/processors/world/ProcessorScriptGlobalFloat.hpp → apps/openmw-mp/processors/object/ProcessorScriptGlobalFloat.hpp
Unescape Escape View File

@ -1,11 +1,11 @@
#ifndef OPENMW_PROCESSORSCRIPTGLOBALFLOAT_HPP
#define OPENMW_PROCESSORSCRIPTGLOBALFLOAT_HPP
#include "../WorldProcessor.hpp"
#include "../ObjectProcessor.hpp"
namespace mwmp
{
class ProcessorScriptGlobalFloat final : public WorldProcessor
class ProcessorScriptGlobalFloat final : public ObjectProcessor
{
public:
ProcessorScriptGlobalFloat()

4
apps/openmw-mp/processors/world/ProcessorScriptGlobalShort.hpp → apps/openmw-mp/processors/object/ProcessorScriptGlobalShort.hpp
Unescape Escape View File

@ -1,11 +1,11 @@
#ifndef OPENMW_PROCESSORSCRIPTGLOBALSHORT_HPP
#define OPENMW_PROCESSORSCRIPTGLOBALSHORT_HPP
#include "../WorldProcessor.hpp"
#include "../ObjectProcessor.hpp"
namespace mwmp
{
class ProcessorScriptGlobalShort final: public WorldProcessor
class ProcessorScriptGlobalShort final: public ObjectProcessor
{
public:
ProcessorScriptGlobalShort()

4
apps/openmw-mp/processors/world/ProcessorScriptLocalFloat.hpp → apps/openmw-mp/processors/object/ProcessorScriptLocalFloat.hpp
Unescape Escape View File

@ -1,11 +1,11 @@
#ifndef OPENMW_PROCESSORSCRIPTLOCALFLOAT_HPP
#define OPENMW_PROCESSORSCRIPTLOCALFLOAT_HPP
#include "../WorldProcessor.hpp"
#include "../ObjectProcessor.hpp"
namespace mwmp
{
class ProcessorScriptLocalFloat final: public WorldProcessor
class ProcessorScriptLocalFloat final: public ObjectProcessor
{
public:
ProcessorScriptLocalFloat()

4
apps/openmw-mp/processors/world/ProcessorScriptLocalShort.hpp → apps/openmw-mp/processors/object/ProcessorScriptLocalShort.hpp
Unescape Escape View File

@ -1,11 +1,11 @@
#ifndef OPENMW_PROCESSORSCRIPTLOCALSHORT_HPP
#define OPENMW_PROCESSORSCRIPTLOCALSHORT_HPP
#include "../WorldProcessor.hpp"
#include "../ObjectProcessor.hpp"
namespace mwmp
{
class ProcessorScriptLocalShort final: public WorldProcessor
class ProcessorScriptLocalShort final: public ObjectProcessor
{
public:
ProcessorScriptLocalShort()

4
apps/openmw-mp/processors/world/ProcessorScriptMemberFloat.hpp → apps/openmw-mp/processors/object/ProcessorScriptMemberFloat.hpp
Unescape Escape View File

@ -1,11 +1,11 @@
#ifndef OPENMW_PROCESSORSCRIPTMEMBERFLOAT_HPP
#define OPENMW_PROCESSORSCRIPTMEMBERFLOAT_HPP
#include "../WorldProcessor.hpp"
#include "../ObjectProcessor.hpp"
namespace mwmp
{
class ProcessorScriptMemberFloat final : public WorldProcessor
class ProcessorScriptMemberFloat final : public ObjectProcessor
{
public:
ProcessorScriptMemberFloat()

4
apps/openmw-mp/processors/world/ProcessorScriptMemberShort.hpp → apps/openmw-mp/processors/object/ProcessorScriptMemberShort.hpp
Unescape Escape View File

@ -1,11 +1,11 @@
#ifndef OPENMW_PROCESSORSCRIPTMEMBERSHORT_HPP
#define OPENMW_PROCESSORSCRIPTMEMBERSHORT_HPP
#include "../WorldProcessor.hpp"
#include "../ObjectProcessor.hpp"
namespace mwmp
{
class ProcessorScriptMemberShort final: public WorldProcessor
class ProcessorScriptMemberShort final: public ObjectProcessor
{
public:
ProcessorScriptMemberShort()

4
apps/openmw-mp/processors/world/ProcessorVideoPlay.hpp → apps/openmw-mp/processors/object/ProcessorVideoPlay.hpp
Unescape Escape View File

@ -1,11 +1,11 @@
#ifndef OPENMW_PROCESSORVIDEOPLAY_HPP
#define OPENMW_PROCESSORVIDEOPLAY_HPP
#include "../WorldProcessor.hpp"
#include "../ObjectProcessor.hpp"
namespace mwmp
{
class ProcessorVideoPlay final: public WorldProcessor
class ProcessorVideoPlay final: public ObjectProcessor
{
public:
ProcessorVideoPlay()

4
apps/openmw/CMakeLists.txt
Unescape Escape View File

@ -104,7 +104,7 @@ add_openmw_dir (mwmp Main Networking LocalPlayer DedicatedPlayer PlayerList Loca
add_openmw_dir (mwmp/GUI GUIChat GUILogin PlayerMarkerCollection GUIDialogList TextInputDialog GUICustomWindow
)
add_openmw_dir(mwmp/processors BaseClientPacketProcessor PlayerProcessor WorldProcessor ActorProcessor ProcessorInitializer
add_openmw_dir(mwmp/processors BaseClientPacketProcessor PlayerProcessor ObjectProcessor ActorProcessor ProcessorInitializer
)
add_openmw_dir (mwmp/processors/actor ProcessorActorAI ProcessorActorAnimFlags ProcessorActorAnimPlay ProcessorActorAttack
@ -124,7 +124,7 @@ add_openmw_dir (mwmp/processors/player ProcessorChatMessage ProcessorGUIMessageB
ProcessorPlayerSpellbook ProcessorPlayerStatsDynamic ProcessorPlayerTopic
)
add_openmw_dir (mwmp/processors/world BaseObjectProcessor ProcessorConsoleCommand ProcessorContainer ProcessorDoorDestination
add_openmw_dir (mwmp/processors/object BaseObjectProcessor ProcessorConsoleCommand ProcessorContainer ProcessorDoorDestination
ProcessorDoorState ProcessorMusicPlay ProcessorVideoPlay ProcessorObjectAnimPlay ProcessorObjectAttach
ProcessorObjectCollision ProcessorObjectDelete ProcessorObjectLock ProcessorObjectMove ProcessorObjectPlace
ProcessorObjectReset ProcessorObjectRotate ProcessorObjectScale ProcessorObjectSpawn ProcessorObjectState

4
apps/openmw/mwmp/Networking.cpp
Unescape Escape View File

@ -38,7 +38,7 @@
#include "Main.hpp"
#include "processors/ProcessorInitializer.hpp"
#include "processors/PlayerProcessor.hpp"
#include "processors/WorldProcessor.hpp"
#include "processors/ObjectProcessor.hpp"
#include "processors/ActorProcessor.hpp"
#include "GUIController.hpp"
#include "CellController.hpp"
@ -432,7 +432,7 @@ void Networking::receiveMessage(RakNet::Packet *packet)
}
else if (objectPacketController.ContainsPacket(packet->data[0]))
{
if (!WorldProcessor::Process(*packet, objectList))
if (!ObjectProcessor::Process(*packet, objectList))
LOG_MESSAGE_SIMPLE(Log::LOG_WARN, "Unhandled ObjectPacket with identifier %i has arrived", (int) packet->data[0]);
}
}

4
apps/openmw/mwmp/processors/WorldProcessor.cpp → apps/openmw/mwmp/processors/ObjectProcessor.cpp
Unescape Escape View File

@ -1,4 +1,4 @@
#include "WorldProcessor.hpp"
#include "ObjectProcessor.hpp"
#include "../Main.hpp"
#include "../Networking.hpp"
@ -7,7 +7,7 @@ using namespace mwmp;
template<class T>
typename BasePacketProcessor<T>::processors_t BasePacketProcessor<T>::processors;
bool WorldProcessor::Process(RakNet::Packet &packet, ObjectList &objectList)
bool ObjectProcessor::Process(RakNet::Packet &packet, ObjectList &objectList)
{
RakNet::BitStream bsIn(&packet.data[1], packet.length, false);
bsIn.Read(guid);

2
apps/openmw/mwmp/processors/WorldProcessor.hpp → apps/openmw/mwmp/processors/ObjectProcessor.hpp
Unescape Escape View File

@ -15,7 +15,7 @@
namespace mwmp
{
class WorldProcessor : public BasePacketProcessor<WorldProcessor>, public BaseClientPacketProcessor
class ObjectProcessor : public BasePacketProcessor<ObjectProcessor>, public BaseClientPacketProcessor
{
public:
virtual void Do(ObjectPacket &packet, ObjectList &objectList) = 0;

102
apps/openmw/mwmp/processors/ProcessorInitializer.cpp
Unescape Escape View File

@ -54,32 +54,32 @@
#include "player/ProcessorPlayerStatsDynamic.hpp"
#include "player/ProcessorPlayerTopic.hpp"
#include "WorldProcessor.hpp"
#include "world/ProcessorConsoleCommand.hpp"
#include "world/ProcessorContainer.hpp"
#include "world/ProcessorDoorDestination.hpp"
#include "world/ProcessorDoorState.hpp"
#include "world/ProcessorMusicPlay.hpp"
#include "world/ProcessorObjectAnimPlay.hpp"
#include "world/ProcessorObjectAttach.hpp"
#include "world/ProcessorObjectCollision.hpp"
#include "world/ProcessorObjectDelete.hpp"
#include "world/ProcessorObjectLock.hpp"
#include "world/ProcessorObjectMove.hpp"
#include "world/ProcessorObjectPlace.hpp"
#include "world/ProcessorObjectReset.hpp"
#include "world/ProcessorObjectRotate.hpp"
#include "world/ProcessorObjectScale.hpp"
#include "world/ProcessorObjectSpawn.hpp"
#include "world/ProcessorObjectState.hpp"
#include "world/ProcessorObjectTrap.hpp"
#include "world/ProcessorScriptLocalShort.hpp"
#include "world/ProcessorScriptLocalFloat.hpp"
#include "world/ProcessorScriptMemberShort.hpp"
#include "world/ProcessorScriptMemberFloat.hpp"
#include "world/ProcessorScriptGlobalShort.hpp"
#include "world/ProcessorScriptGlobalFloat.hpp"
#include "world/ProcessorVideoPlay.hpp"
#include "ObjectProcessor.hpp"
#include "object/ProcessorConsoleCommand.hpp"
#include "object/ProcessorContainer.hpp"
#include "object/ProcessorDoorDestination.hpp"
#include "object/ProcessorDoorState.hpp"
#include "object/ProcessorMusicPlay.hpp"
#include "object/ProcessorObjectAnimPlay.hpp"
#include "object/ProcessorObjectAttach.hpp"
#include "object/ProcessorObjectCollision.hpp"
#include "object/ProcessorObjectDelete.hpp"
#include "object/ProcessorObjectLock.hpp"
#include "object/ProcessorObjectMove.hpp"
#include "object/ProcessorObjectPlace.hpp"
#include "object/ProcessorObjectReset.hpp"
#include "object/ProcessorObjectRotate.hpp"
#include "object/ProcessorObjectScale.hpp"
#include "object/ProcessorObjectSpawn.hpp"
#include "object/ProcessorObjectState.hpp"
#include "object/ProcessorObjectTrap.hpp"
#include "object/ProcessorScriptLocalShort.hpp"
#include "object/ProcessorScriptLocalFloat.hpp"
#include "object/ProcessorScriptMemberShort.hpp"
#include "object/ProcessorScriptMemberFloat.hpp"
#include "object/ProcessorScriptGlobalShort.hpp"
#include "object/ProcessorScriptGlobalFloat.hpp"
#include "object/ProcessorVideoPlay.hpp"
#include "actor/ProcessorActorAI.hpp"
#include "actor/ProcessorActorAnimFlags.hpp"
@ -148,31 +148,31 @@ void ProcessorInitializer()
PlayerProcessor::AddProcessor(new ProcessorPlayerStatsDynamic());
PlayerProcessor::AddProcessor(new ProcessorPlayerTopic());
WorldProcessor::AddProcessor(new ProcessorConsoleCommand());
WorldProcessor::AddProcessor(new ProcessorContainer());
WorldProcessor::AddProcessor(new ProcessorDoorDestination());
WorldProcessor::AddProcessor(new ProcessorDoorState());
WorldProcessor::AddProcessor(new ProcessorMusicPlay());
WorldProcessor::AddProcessor(new ProcessorObjectAnimPlay());
WorldProcessor::AddProcessor(new ProcessorObjectAttach());
WorldProcessor::AddProcessor(new ProcessorObjectCollision());
WorldProcessor::AddProcessor(new ProcessorObjectDelete());
WorldProcessor::AddProcessor(new ProcessorObjectLock());
WorldProcessor::AddProcessor(new ProcessorObjectMove());
WorldProcessor::AddProcessor(new ProcessorObjectPlace());
WorldProcessor::AddProcessor(new ProcessorObjectReset());
WorldProcessor::AddProcessor(new ProcessorObjectRotate());
WorldProcessor::AddProcessor(new ProcessorObjectScale());
WorldProcessor::AddProcessor(new ProcessorObjectSpawn());
WorldProcessor::AddProcessor(new ProcessorObjectState());
WorldProcessor::AddProcessor(new ProcessorObjectTrap());
WorldProcessor::AddProcessor(new ProcessorScriptLocalShort());
WorldProcessor::AddProcessor(new ProcessorScriptLocalFloat());
WorldProcessor::AddProcessor(new ProcessorScriptMemberShort());
WorldProcessor::AddProcessor(new ProcessorScriptMemberFloat());
WorldProcessor::AddProcessor(new ProcessorScriptGlobalShort());
WorldProcessor::AddProcessor(new ProcessorScriptGlobalFloat());
WorldProcessor::AddProcessor(new ProcessorVideoPlay());
ObjectProcessor::AddProcessor(new ProcessorConsoleCommand());
ObjectProcessor::AddProcessor(new ProcessorContainer());
ObjectProcessor::AddProcessor(new ProcessorDoorDestination());
ObjectProcessor::AddProcessor(new ProcessorDoorState());
ObjectProcessor::AddProcessor(new ProcessorMusicPlay());
ObjectProcessor::AddProcessor(new ProcessorObjectAnimPlay());
ObjectProcessor::AddProcessor(new ProcessorObjectAttach());
ObjectProcessor::AddProcessor(new ProcessorObjectCollision());
ObjectProcessor::AddProcessor(new ProcessorObjectDelete());
ObjectProcessor::AddProcessor(new ProcessorObjectLock());
ObjectProcessor::AddProcessor(new ProcessorObjectMove());
ObjectProcessor::AddProcessor(new ProcessorObjectPlace());
ObjectProcessor::AddProcessor(new ProcessorObjectReset());
ObjectProcessor::AddProcessor(new ProcessorObjectRotate());
ObjectProcessor::AddProcessor(new ProcessorObjectScale());
ObjectProcessor::AddProcessor(new ProcessorObjectSpawn());
ObjectProcessor::AddProcessor(new ProcessorObjectState());
ObjectProcessor::AddProcessor(new ProcessorObjectTrap());
ObjectProcessor::AddProcessor(new ProcessorScriptLocalShort());
ObjectProcessor::AddProcessor(new ProcessorScriptLocalFloat());
ObjectProcessor::AddProcessor(new ProcessorScriptMemberShort());
ObjectProcessor::AddProcessor(new ProcessorScriptMemberFloat());
ObjectProcessor::AddProcessor(new ProcessorScriptGlobalShort());
ObjectProcessor::AddProcessor(new ProcessorScriptGlobalFloat());
ObjectProcessor::AddProcessor(new ProcessorVideoPlay());
ActorProcessor::AddProcessor(new ProcessorActorAI());
ActorProcessor::AddProcessor(new ProcessorActorAnimFlags());

4
apps/openmw/mwmp/processors/world/BaseObjectProcessor.hpp → apps/openmw/mwmp/processors/object/BaseObjectProcessor.hpp
Unescape Escape View File

@ -5,14 +5,14 @@
#ifndef OPENMW_BASEOBJECTPROCESSOR_HPP
#define OPENMW_BASEOBJECTPROCESSOR_HPP
#include "../WorldProcessor.hpp"
#include "../ObjectProcessor.hpp"
#include "apps/openmw/mwmp/Main.hpp"
#include "apps/openmw/mwmp/CellController.hpp"
#include "apps/openmw/mwworld/cellstore.hpp"
namespace mwmp
{
class BaseObjectProcessor: public WorldProcessor
class BaseObjectProcessor: public ObjectProcessor
{
public:
virtual void Do(ObjectPacket &packet, ObjectList &objectList)

0
apps/openmw/mwmp/processors/world/ProcessorConsoleCommand.hpp → apps/openmw/mwmp/processors/object/ProcessorConsoleCommand.hpp
Unescape Escape View File

0
apps/openmw/mwmp/processors/world/ProcessorContainer.hpp → apps/openmw/mwmp/processors/object/ProcessorContainer.hpp
Unescape Escape View File

0
apps/openmw/mwmp/processors/world/ProcessorDoorDestination.hpp → apps/openmw/mwmp/processors/object/ProcessorDoorDestination.hpp
Unescape Escape View File

0
apps/openmw/mwmp/processors/world/ProcessorDoorState.hpp → apps/openmw/mwmp/processors/object/ProcessorDoorState.hpp
Unescape Escape View File

4
apps/openmw/mwmp/processors/world/ProcessorMusicPlay.hpp → apps/openmw/mwmp/processors/object/ProcessorMusicPlay.hpp
Unescape Escape View File

@ -1,11 +1,11 @@
#ifndef OPENMW_PROCESSORMUSICPLAY_HPP
#define OPENMW_PROCESSORMUSICPLAY_HPP
#include "../WorldProcessor.hpp"
#include "../ObjectProcessor.hpp"
namespace mwmp
{
class ProcessorMusicPlay final: public WorldProcessor
class ProcessorMusicPlay final: public ObjectProcessor
{
public:
ProcessorMusicPlay()

0
apps/openmw/mwmp/processors/world/ProcessorObjectAnimPlay.hpp → apps/openmw/mwmp/processors/object/ProcessorObjectAnimPlay.hpp
Unescape Escape View File

0
apps/openmw/mwmp/processors/world/ProcessorObjectAttach.hpp → apps/openmw/mwmp/processors/object/ProcessorObjectAttach.hpp
Unescape Escape View File

0
apps/openmw/mwmp/processors/world/ProcessorObjectCollision.hpp → apps/openmw/mwmp/processors/object/ProcessorObjectCollision.hpp
Unescape Escape View File

0
apps/openmw/mwmp/processors/world/ProcessorObjectDelete.hpp → apps/openmw/mwmp/processors/object/ProcessorObjectDelete.hpp
Unescape Escape View File

0
apps/openmw/mwmp/processors/world/ProcessorObjectLock.hpp → apps/openmw/mwmp/processors/object/ProcessorObjectLock.hpp
Unescape Escape View File

0
apps/openmw/mwmp/processors/world/ProcessorObjectMove.hpp → apps/openmw/mwmp/processors/object/ProcessorObjectMove.hpp
Unescape Escape View File

0
apps/openmw/mwmp/processors/world/ProcessorObjectPlace.hpp → apps/openmw/mwmp/processors/object/ProcessorObjectPlace.hpp
Unescape Escape View File

0
apps/openmw/mwmp/processors/world/ProcessorObjectReset.hpp → apps/openmw/mwmp/processors/object/ProcessorObjectReset.hpp
Unescape Escape View File

0
apps/openmw/mwmp/processors/world/ProcessorObjectRotate.hpp → apps/openmw/mwmp/processors/object/ProcessorObjectRotate.hpp
Unescape Escape View File

0
apps/openmw/mwmp/processors/world/ProcessorObjectScale.hpp → apps/openmw/mwmp/processors/object/ProcessorObjectScale.hpp
Unescape Escape View File

0
apps/openmw/mwmp/processors/world/ProcessorObjectSpawn.hpp → apps/openmw/mwmp/processors/object/ProcessorObjectSpawn.hpp
Unescape Escape View File

0
apps/openmw/mwmp/processors/world/ProcessorObjectState.hpp → apps/openmw/mwmp/processors/object/ProcessorObjectState.hpp
Unescape Escape View File

0
apps/openmw/mwmp/processors/world/ProcessorObjectTrap.hpp → apps/openmw/mwmp/processors/object/ProcessorObjectTrap.hpp
Unescape Escape View File

4
apps/openmw/mwmp/processors/world/ProcessorScriptGlobalFloat.hpp → apps/openmw/mwmp/processors/object/ProcessorScriptGlobalFloat.hpp
Unescape Escape View File

@ -1,11 +1,11 @@
#ifndef OPENMW_PROCESSORSCRIPTGLOBALFLOAT_HPP
#define OPENMW_PROCESSORSCRIPTGLOBALFLOAT_HPP
#include "../WorldProcessor.hpp"
#include "../ObjectProcessor.hpp"
namespace mwmp
{
class ProcessorScriptGlobalFloat final: public WorldProcessor
class ProcessorScriptGlobalFloat final: public ObjectProcessor
{
public:
ProcessorScriptGlobalFloat()

4
apps/openmw/mwmp/processors/world/ProcessorScriptGlobalShort.hpp → apps/openmw/mwmp/processors/object/ProcessorScriptGlobalShort.hpp
Unescape Escape View File

@ -1,11 +1,11 @@
#ifndef OPENMW_PROCESSORSCRIPTGLOBALSHORT_HPP
#define OPENMW_PROCESSORSCRIPTGLOBALSHORT_HPP
#include "../WorldProcessor.hpp"
#include "../ObjectProcessor.hpp"
namespace mwmp
{
class ProcessorScriptGlobalShort final: public WorldProcessor
class ProcessorScriptGlobalShort final: public ObjectProcessor
{
public:
ProcessorScriptGlobalShort()

0
apps/openmw/mwmp/processors/world/ProcessorScriptLocalFloat.hpp → apps/openmw/mwmp/processors/object/ProcessorScriptLocalFloat.hpp
Unescape Escape View File

0
apps/openmw/mwmp/processors/world/ProcessorScriptLocalShort.hpp → apps/openmw/mwmp/processors/object/ProcessorScriptLocalShort.hpp
Unescape Escape View File

4
apps/openmw/mwmp/processors/world/ProcessorScriptMemberFloat.hpp → apps/openmw/mwmp/processors/object/ProcessorScriptMemberFloat.hpp
Unescape Escape View File

@ -1,11 +1,11 @@
#ifndef OPENMW_PROCESSORSCRIPTMEMBERFLOAT_HPP
#define OPENMW_PROCESSORSCRIPTMEMBERFLOAT_HPP
#include "../WorldProcessor.hpp"
#include "../ObjectProcessor.hpp"
namespace mwmp
{
class ProcessorScriptMemberFloat final: public WorldProcessor
class ProcessorScriptMemberFloat final: public ObjectProcessor
{
public:
ProcessorScriptMemberFloat()

4
apps/openmw/mwmp/processors/world/ProcessorScriptMemberShort.hpp → apps/openmw/mwmp/processors/object/ProcessorScriptMemberShort.hpp
Unescape Escape View File

@ -1,11 +1,11 @@
#ifndef OPENMW_PROCESSORSCRIPTMEMBERSHORT_HPP
#define OPENMW_PROCESSORSCRIPTMEMBERSHORT_HPP
#include "../WorldProcessor.hpp"
#include "../ObjectProcessor.hpp"
namespace mwmp
{
class ProcessorScriptMemberShort final: public WorldProcessor
class ProcessorScriptMemberShort final: public ObjectProcessor
{
public:
ProcessorScriptMemberShort()

4
apps/openmw/mwmp/processors/world/ProcessorVideoPlay.hpp → apps/openmw/mwmp/processors/object/ProcessorVideoPlay.hpp
Unescape Escape View File

@ -1,11 +1,11 @@
#ifndef OPENMW_PROCESSORVIDEOPLAY_HPP
#define OPENMW_PROCESSORVIDEOPLAY_HPP
#include "../WorldProcessor.hpp"
#include "../ObjectProcessor.hpp"
namespace mwmp
{
class ProcessorVideoPlay final: public WorldProcessor
class ProcessorVideoPlay final: public ObjectProcessor
{
public:
ProcessorVideoPlay()
Write Preview
Loading…
Cancel
Save