mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-07-15 08:51:44 +00:00
Code Issues Releases Wiki Activity

[General] Rename unused ObjectCollision into ObjectSound

Browse source
This commit is contained in:
David Cernat 2020-01-26 13:30:28 +02:00
parent fcebd9f4ae
commit 271dc3df87
11 changed files with 69 additions and 69 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
apps/openmw/CMakeLists.txt
View file

@ -130,9 +130,9 @@ add_openmw_dir (mwmp/processors/object BaseObjectProcessor
ProcessorConsoleCommand ProcessorContainer ProcessorDoorDestination ProcessorDoorState ProcessorMusicPlay
ProcessorVideoPlay
ProcessorObjectActivate ProcessorObjectAnimPlay ProcessorObjectAttach ProcessorObjectCollision ProcessorObjectDelete
ProcessorObjectHit ProcessorObjectLock ProcessorObjectMove ProcessorObjectPlace ProcessorObjectRestock
ProcessorObjectRotate ProcessorObjectScale ProcessorObjectSpawn ProcessorObjectState ProcessorObjectTrap
ProcessorObjectActivate ProcessorObjectAnimPlay ProcessorObjectAttach ProcessorObjectDelete ProcessorObjectHit
ProcessorObjectLock ProcessorObjectMove ProcessorObjectPlace ProcessorObjectRestock ProcessorObjectRotate
ProcessorObjectScale ProcessorObjectSound ProcessorObjectSpawn ProcessorObjectState ProcessorObjectTrap
ProcessorScriptLocalShort ProcessorScriptLocalFloat ProcessorScriptMemberShort ProcessorScriptMemberFloat
)

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

@ -55,7 +55,6 @@
#include "object/ProcessorObjectActivate.hpp"
#include "object/ProcessorObjectAnimPlay.hpp"
#include "object/ProcessorObjectAttach.hpp"
#include "object/ProcessorObjectCollision.hpp"
#include "object/ProcessorObjectDelete.hpp"
#include "object/ProcessorObjectHit.hpp"
#include "object/ProcessorObjectLock.hpp"
@ -64,6 +63,7 @@
#include "object/ProcessorObjectRestock.hpp"
#include "object/ProcessorObjectRotate.hpp"
#include "object/ProcessorObjectScale.hpp"
#include "object/ProcessorObjectSound.hpp"
#include "object/ProcessorObjectSpawn.hpp"
#include "object/ProcessorObjectState.hpp"
#include "object/ProcessorObjectTrap.hpp"
@ -158,7 +158,6 @@ void ProcessorInitializer()
ObjectProcessor::AddProcessor(new ProcessorObjectActivate());
ObjectProcessor::AddProcessor(new ProcessorObjectAnimPlay());
ObjectProcessor::AddProcessor(new ProcessorObjectAttach());
ObjectProcessor::AddProcessor(new ProcessorObjectCollision());
ObjectProcessor::AddProcessor(new ProcessorObjectDelete());
ObjectProcessor::AddProcessor(new ProcessorObjectHit());
ObjectProcessor::AddProcessor(new ProcessorObjectLock());
@ -167,6 +166,7 @@ void ProcessorInitializer()
ObjectProcessor::AddProcessor(new ProcessorObjectRestock());
ObjectProcessor::AddProcessor(new ProcessorObjectRotate());
ObjectProcessor::AddProcessor(new ProcessorObjectScale());
ObjectProcessor::AddProcessor(new ProcessorObjectSound());
ObjectProcessor::AddProcessor(new ProcessorObjectSpawn());
ObjectProcessor::AddProcessor(new ProcessorObjectState());
ObjectProcessor::AddProcessor(new ProcessorObjectTrap());

26
apps/openmw/mwmp/processors/object/ProcessorObjectCollision.hpp
View file

@ -1,26 +0,0 @@
#ifndef OPENMW_PROCESSOROBJECTCOLLISION_HPP
#define OPENMW_PROCESSOROBJECTCOLLISION_HPP
#include "BaseObjectProcessor.hpp"
namespace mwmp
{
class ProcessorObjectCollision final: public BaseObjectProcessor
{
public:
ProcessorObjectCollision()
{
BPP_INIT(ID_OBJECT_COLLISION)
}
virtual void Do(ObjectPacket &packet, ObjectList &objectList)
{
BaseObjectProcessor::Do(packet, objectList);
//objectList.setObjectCollisions(ptrCellStore);
}
};
}
#endif //OPENMW_PROCESSOROBJECTCOLLISION_HPP

26
apps/openmw/mwmp/processors/object/ProcessorObjectSound.hpp Normal file
View file

@ -0,0 +1,26 @@
#ifndef OPENMW_PROCESSOROBJECTSOUND_HPP
#define OPENMW_PROCESSOROBJECTSOUND_HPP
#include "BaseObjectProcessor.hpp"
namespace mwmp
{
class ProcessorObjectSound final: public BaseObjectProcessor
{
public:
ProcessorObjectSound()
{
BPP_INIT(ID_OBJECT_SOUND)
}
virtual void Do(ObjectPacket &packet, ObjectList &objectList)
{
BaseObjectProcessor::Do(packet, objectList);
//objectList.setObjectSounds(ptrCellStore);
}
};
}
#endif //OPENMW_PROCESSOROBJECTSOUND_HPP

4
components/CMakeLists.txt
View file

@ -205,8 +205,8 @@ add_component_dir (openmw-mp/Packets/Object
PacketDoorDestination PacketDoorState
PacketConsoleCommand PacketContainer PacketObjectActivate PacketObjectAnimPlay PacketObjectAttach
PacketObjectCollision PacketObjectDelete PacketObjectHit PacketObjectLock PacketObjectMove PacketObjectPlace
PacketObjectRestock PacketObjectRotate PacketObjectScale PacketObjectSpawn PacketObjectState PacketObjectTrap
PacketObjectDelete PacketObjectHit PacketObjectLock PacketObjectMove PacketObjectPlace PacketObjectRestock
PacketObjectRotate PacketObjectScale PacketObjectSound PacketObjectSpawn PacketObjectState PacketObjectTrap
PacketMusicPlay PacketVideoPlay PacketScriptLocalShort PacketScriptLocalFloat PacketScriptMemberShort
PacketScriptMemberFloat
)

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

@ -1,7 +1,6 @@
#include "../Packets/Object/PacketObjectActivate.hpp"
#include "../Packets/Object/PacketObjectAnimPlay.hpp"
#include "../Packets/Object/PacketObjectAttach.hpp"
#include "../Packets/Object/PacketObjectCollision.hpp"
#include "../Packets/Object/PacketObjectDelete.hpp"
#include "../Packets/Object/PacketObjectHit.hpp"
#include "../Packets/Object/PacketObjectLock.hpp"
@ -10,6 +9,7 @@
#include "../Packets/Object/PacketObjectRestock.hpp"
#include "../Packets/Object/PacketObjectRotate.hpp"
#include "../Packets/Object/PacketObjectScale.hpp"
#include "../Packets/Object/PacketObjectSound.hpp"
#include "../Packets/Object/PacketObjectSpawn.hpp"
#include "../Packets/Object/PacketObjectState.hpp"
#include "../Packets/Object/PacketObjectTrap.hpp"
@ -41,7 +41,6 @@ mwmp::ObjectPacketController::ObjectPacketController(RakNet::RakPeerInterface *p
AddPacket<PacketObjectActivate>(&packets, peer);
AddPacket<PacketObjectAnimPlay>(&packets, peer);
AddPacket<PacketObjectAttach>(&packets, peer);
AddPacket<PacketObjectCollision>(&packets, peer);
AddPacket<PacketObjectDelete>(&packets, peer);
AddPacket<PacketObjectHit>(&packets, peer);
AddPacket<PacketObjectLock>(&packets, peer);
@ -50,6 +49,7 @@ mwmp::ObjectPacketController::ObjectPacketController(RakNet::RakPeerInterface *p
AddPacket<PacketObjectRestock>(&packets, peer);
AddPacket<PacketObjectRotate>(&packets, peer);
AddPacket<PacketObjectScale>(&packets, peer);
AddPacket<PacketObjectSound>(&packets, peer);
AddPacket<PacketObjectSpawn>(&packets, peer);
AddPacket<PacketObjectState>(&packets, peer);
AddPacket<PacketObjectTrap>(&packets, peer);

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

@ -70,7 +70,7 @@ enum GameMessages
ID_OBJECT_ACTIVATE,
ID_OBJECT_ANIM_PLAY,
ID_OBJECT_ATTACH,
ID_OBJECT_COLLISION,
ID_OBJECT_SOUND,
ID_OBJECT_DELETE,
ID_OBJECT_LOCK,
ID_OBJECT_MOVE,

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

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

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

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

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

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

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

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