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

[General] Fix remaining references to world packets/events

Browse source
This commit is contained in:
David Cernat 2018-05-17 00:08:37 +03:00
parent dc9a3bf73f
commit 049d0d9ba7
7 changed files with 17 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -144,7 +144,7 @@ set(PROCESSORS_PLAYER
source_group(tes3mp-server\\processors\\player FILES ${PROCESSORS_PLAYER}) source_group(tes3mp-server\\processors\\player FILES ${PROCESSORS_PLAYER})
set(PROCESSORS_WORLD set(PROCESSORS_OBJECT
processors/object/ProcessorContainer.hpp processors/object/ProcessorDoorState.hpp processors/object/ProcessorContainer.hpp processors/object/ProcessorDoorState.hpp
processors/object/ProcessorMusicPlay.hpp processors/object/ProcessorObjectAnimPlay.hpp processors/object/ProcessorMusicPlay.hpp processors/object/ProcessorObjectAnimPlay.hpp
processors/object/ProcessorObjectDelete.hpp processors/object/ProcessorObjectLock.hpp processors/object/ProcessorObjectDelete.hpp processors/object/ProcessorObjectLock.hpp
@ -157,7 +157,7 @@ set(PROCESSORS_WORLD
processors/object/ProcessorScriptGlobalFloat.hpp processors/object/ProcessorVideoPlay.hpp processors/object/ProcessorScriptGlobalFloat.hpp processors/object/ProcessorVideoPlay.hpp
) )
source_group(tes3mp-server\\processors\\world FILES ${PROCESSORS_WORLD}) source_group(tes3mp-server\\processors\\world FILES ${PROCESSORS_OBJECT})
set(PROCESSORS set(PROCESSORS
processors/ProcessorInitializer.cpp processors/ProcessorInitializer.cpp
@ -174,7 +174,7 @@ include_directories("./")
add_executable(tes3mp-server add_executable(tes3mp-server
${SERVER} ${SERVER_HEADER} ${SERVER} ${SERVER_HEADER}
${PROCESSORS_ACTOR} ${PROCESSORS_PLAYER} ${PROCESSORS_WORLD} ${PROCESSORS} ${PROCESSORS_ACTOR} ${PROCESSORS_PLAYER} ${PROCESSORS_OBJECT} ${PROCESSORS}
${APPLE_BUNDLE_RESOURCES} ${APPLE_BUNDLE_RESOURCES}
) )
add_definitions(-std=gnu++14 -Wno-ignored-qualifiers) add_definitions(-std=gnu++14 -Wno-ignored-qualifiers)

6
apps/openmw/mwmp/ObjectList.hpp
View file

@ -1,5 +1,5 @@
#ifndef OPENMW_WORLDEVENT_HPP #ifndef OPENMW_OBJECTLIST_HPP
#define OPENMW_WORLDEVENT_HPP #define OPENMW_OBJECTLIST_HPP
#include <components/openmw-mp/Base/BaseObject.hpp> #include <components/openmw-mp/Base/BaseObject.hpp>
#include "../mwworld/cellstore.hpp" #include "../mwworld/cellstore.hpp"
@ -90,4 +90,4 @@ namespace mwmp
}; };
} }
#endif //OPENMW_WORLDEVENT_HPP #endif //OPENMW_OBJECTLIST_HPP

10
apps/openmw/mwmp/processors/ObjectProcessor.hpp
View file

@ -1,9 +1,5 @@
// #ifndef OPENMW_OBJECTPROCESSSOR_HPP
// Created by koncord on 16.04.17. #define OPENMW_OBJECTPROCESSSOR_HPP
//
#ifndef OPENMW_WORLDPROCESSSOR_HPP
#define OPENMW_WORLDPROCESSSOR_HPP
#include <components/openmw-mp/Log.hpp> #include <components/openmw-mp/Log.hpp>
#include <components/openmw-mp/NetworkMessages.hpp> #include <components/openmw-mp/NetworkMessages.hpp>
@ -25,4 +21,4 @@ namespace mwmp
} }
#endif //OPENMW_WORLDPROCESSSOR_HPP #endif //OPENMW_OBJECTPROCESSSOR_HPP

6
components/openmw-mp/Controllers/ObjectPacketController.hpp
View file

@ -1,5 +1,5 @@
#ifndef OPENMW_WORLDPACKETCONTROLLER_HPP #ifndef OPENMW_OBJECTPACKETCONTROLLER_HPP
#define OPENMW_WORLDPACKETCONTROLLER_HPP #define OPENMW_OBJECTPACKETCONTROLLER_HPP
#include <RakPeerInterface.h> #include <RakPeerInterface.h>
@ -24,4 +24,4 @@ namespace mwmp
}; };
} }
#endif //OPENMW_WORLDPACKETCONTROLLER_HPP #endif //OPENMW_OBJECTPACKETCONTROLLER_HPP

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

@ -115,7 +115,7 @@ enum OrderingChannel
CHANNEL_SYSTEM = 0, CHANNEL_SYSTEM = 0,
CHANNEL_ACTOR, CHANNEL_ACTOR,
CHANNEL_PLAYER, CHANNEL_PLAYER,
CHANNEL_WORLDEVENT, CHANNEL_OBJECT,
CHANNEL_MASTER CHANNEL_MASTER
}; };

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

@ -11,7 +11,7 @@ ObjectPacket::ObjectPacket(RakNet::RakPeerInterface *peer) : BasePacket(peer)
packetID = 0; packetID = 0;
priority = HIGH_PRIORITY; priority = HIGH_PRIORITY;
reliability = RELIABLE_ORDERED; reliability = RELIABLE_ORDERED;
orderChannel = CHANNEL_WORLDEVENT; orderChannel = CHANNEL_OBJECT;
this->peer = peer; this->peer = peer;
} }

6
components/openmw-mp/Packets/Object/ObjectPacket.hpp
View file

@ -1,5 +1,5 @@
#ifndef OPENMW_WORLDPACKET_HPP #ifndef OPENMW_OBJECTPACKET_HPP
#define OPENMW_WORLDPACKET_HPP #define OPENMW_OBJECTPACKET_HPP
#include <string> #include <string>
#include <RakNetTypes.h> #include <RakNetTypes.h>
@ -32,4 +32,4 @@ namespace mwmp
}; };
} }
#endif //OPENMW_WORLDPACKET_HPP #endif //OPENMW_OBJECTPACKET_HPP