diff --git a/apps/openmw-mp/CMakeLists.txt b/apps/openmw-mp/CMakeLists.txt index dd730d1ef..5de22de19 100644 --- a/apps/openmw-mp/CMakeLists.txt +++ b/apps/openmw-mp/CMakeLists.txt @@ -112,12 +112,12 @@ source_group(tes3mp-server\\processors\\actor FILES ${PROCESSORS_ACTOR}) set(PROCESSORS_PLAYER processors/player/ProcessorChatMsg.hpp processors/player/ProcessorGUIMessageBox.hpp - processors/player/ProcessorLevel.hpp processors/player/ProcessorPlayerAnimFlags.hpp - processors/player/ProcessorPlayerAttack.hpp processors/player/ProcessorPlayerAttribute.hpp - processors/player/ProcessorPlayerCellChange.hpp processors/player/ProcessorPlayerCellState.hpp - processors/player/ProcessorPlayerCharClass.hpp processors/player/ProcessorPlayerCharGen.hpp - processors/player/ProcessorPlayerDeath.hpp processors/player/ProcessorPlayerEquipment.hpp - processors/player/ProcessorPlayerInventory.hpp processors/player/ProcessorPlayerJournal.hpp + processors/player/ProcessorPlayerAnimFlags.hpp processors/player/ProcessorPlayerAttack.hpp + processors/player/ProcessorPlayerAttribute.hpp processors/player/ProcessorPlayerCellChange.hpp + processors/player/ProcessorPlayerCellState.hpp processors/player/ProcessorPlayerCharClass.hpp + processors/player/ProcessorPlayerCharGen.hpp processors/player/ProcessorPlayerDeath.hpp + processors/player/ProcessorPlayerEquipment.hpp processors/player/ProcessorPlayerInventory.hpp + processors/player/ProcessorPlayerJournal.hpp processors/player/ProcessorPlayerLevel.hpp processors/player/ProcessorPlayerPos.hpp processors/player/ProcessorPlayerResurrect.hpp processors/player/ProcessorPlayerSkill.hpp processors/player/ProcessorPlayerSpellbook.hpp processors/player/ProcessorPlayerStatsDynamic.hpp diff --git a/apps/openmw-mp/ProcessorInitializer.cpp b/apps/openmw-mp/ProcessorInitializer.cpp index 8e0979dbb..e30f7d6e1 100644 --- a/apps/openmw-mp/ProcessorInitializer.cpp +++ b/apps/openmw-mp/ProcessorInitializer.cpp @@ -10,7 +10,7 @@ #include "processors/player/ProcessorPlayerCellState.hpp" #include "processors/player/ProcessorPlayerAttribute.hpp" #include "processors/player/ProcessorPlayerSkill.hpp" -#include "processors/player/ProcessorLevel.hpp" +#include "processors/player/ProcessorPlayerLevel.hpp" #include "processors/player/ProcessorPlayerEquipment.hpp" #include "processors/player/ProcessorPlayerInventory.hpp" #include "processors/player/ProcessorPlayerSpellbook.hpp" @@ -63,7 +63,7 @@ void ProcessorInitializer() PlayerProcessor::AddProcessor(new ProcessorPlayerCellState()); PlayerProcessor::AddProcessor(new ProcessorPlayerAttribute()); PlayerProcessor::AddProcessor(new ProcessorPlayerSkill()); - PlayerProcessor::AddProcessor(new ProcessorLevel()); + PlayerProcessor::AddProcessor(new ProcessorPlayerLevel()); PlayerProcessor::AddProcessor(new ProcessorPlayerEquipment()); PlayerProcessor::AddProcessor(new ProcessorPlayerInventory()); PlayerProcessor::AddProcessor(new ProcessorPlayerSpellbook()); diff --git a/apps/openmw-mp/processors/player/ProcessorLevel.hpp b/apps/openmw-mp/processors/player/ProcessorPlayerLevel.hpp similarity index 68% rename from apps/openmw-mp/processors/player/ProcessorLevel.hpp rename to apps/openmw-mp/processors/player/ProcessorPlayerLevel.hpp index 0742d0e28..a48d6f7c1 100644 --- a/apps/openmw-mp/processors/player/ProcessorLevel.hpp +++ b/apps/openmw-mp/processors/player/ProcessorPlayerLevel.hpp @@ -2,18 +2,18 @@ // Created by koncord on 01.04.17. // -#ifndef OPENMW_PROCESSORLEVEL_HPP -#define OPENMW_PROCESSORLEVEL_HPP +#ifndef OPENMW_PROCESSORPLAYERLEVEL_HPP +#define OPENMW_PROCESSORPLAYERLEVEL_HPP #include "apps/openmw-mp/PlayerProcessor.hpp" namespace mwmp { - class ProcessorLevel : public PlayerProcessor + class ProcessorPlayerLevel : public PlayerProcessor { public: - ProcessorLevel() + ProcessorPlayerLevel() { BPP_INIT(ID_PLAYER_LEVEL) } @@ -28,4 +28,4 @@ namespace mwmp }; } -#endif //OPENMW_PROCESSORLEVEL_HPP +#endif //OPENMW_PROCESSORPLAYERLEVEL_HPP diff --git a/apps/openmw/CMakeLists.txt b/apps/openmw/CMakeLists.txt index d02e1060d..b0452f5f8 100644 --- a/apps/openmw/CMakeLists.txt +++ b/apps/openmw/CMakeLists.txt @@ -108,7 +108,7 @@ add_openmw_dir (mwmp\\processors\\actor ProcessorActorAnimFlags ProcessorActorAn add_openmw_dir (mwmp\\processors\\player ProcessorChatMessage ProcessorGameConsole ProcessorGameTime ProcessorGUIMessageBox ProcessorHandshake ProcessorPlayerAttack ProcessorPlayerAttribute ProcessorPlayerBaseInfo ProcessorPlayerCellChange ProcessorPlayerCellState ProcessorPlayerCharClass ProcessorPlayerCharGen ProcessorPlayerDeath ProcessorPlayerAnimFlags - ProcessorPlayerDynamicStats ProcessorPlayerEquipment ProcessorPlayerInventory ProcessorPlayerJournal + ProcessorPlayerStatsDynamic ProcessorPlayerEquipment ProcessorPlayerInventory ProcessorPlayerJournal ProcessorPlayerLevel ProcessorPlayerPos ProcessorPlayerResurrect ProcessorPlayerSkill ProcessorPlayerSpellbook ProcessorUserDisconnected ProcessorUserMyID ) diff --git a/apps/openmw/mwmp/ProcessorInitializer.cpp b/apps/openmw/mwmp/ProcessorInitializer.cpp index a8c75b786..73977ba1f 100644 --- a/apps/openmw/mwmp/ProcessorInitializer.cpp +++ b/apps/openmw/mwmp/ProcessorInitializer.cpp @@ -16,7 +16,7 @@ #include "processors/player/ProcessorPlayerSpellbook.hpp" #include "processors/player/ProcessorPlayerJournal.hpp" #include "processors/player/ProcessorPlayerAttack.hpp" -#include "processors/player/ProcessorPlayerDynamicStats.hpp" +#include "processors/player/ProcessorPlayerStatsDynamic.hpp" #include "processors/player/ProcessorPlayerDeath.hpp" #include "processors/player/ProcessorPlayerResurrect.hpp" #include "processors/player/ProcessorPlayerAnimFlags.hpp" @@ -73,7 +73,7 @@ void ProcessorInitializer() PlayerProcessor::AddProcessor(new ProcessorPlayerSpellbook()); PlayerProcessor::AddProcessor(new ProcessorPlayerJournal()); PlayerProcessor::AddProcessor(new ProcessorPlayerAttack()); - PlayerProcessor::AddProcessor(new ProcessorPlayerDynamicStats()); + PlayerProcessor::AddProcessor(new ProcessorPlayerStatsDynamic()); PlayerProcessor::AddProcessor(new ProcessorPlayerDeath()); PlayerProcessor::AddProcessor(new ProcessorPlayerResurrect()); PlayerProcessor::AddProcessor(new ProcessorPlayerAnimFlags()); diff --git a/apps/openmw/mwmp/processors/player/ProcessorPlayerDynamicStats.hpp b/apps/openmw/mwmp/processors/player/ProcessorPlayerStatsDynamic.hpp similarity index 81% rename from apps/openmw/mwmp/processors/player/ProcessorPlayerDynamicStats.hpp rename to apps/openmw/mwmp/processors/player/ProcessorPlayerStatsDynamic.hpp index c4fd431b7..57f783986 100644 --- a/apps/openmw/mwmp/processors/player/ProcessorPlayerDynamicStats.hpp +++ b/apps/openmw/mwmp/processors/player/ProcessorPlayerStatsDynamic.hpp @@ -2,18 +2,18 @@ // Created by koncord on 16.04.17. // -#ifndef OPENMW_PROCESSORPLAYERDYNAMICSTATS_HPP -#define OPENMW_PROCESSORPLAYERDYNAMICSTATS_HPP +#ifndef OPENMW_PROCESSORPLAYERSTATSDYNAMIC_HPP +#define OPENMW_PROCESSORPLAYERSTATSDYNAMIC_HPP #include "apps/openmw/mwmp/PlayerProcessor.hpp" namespace mwmp { - class ProcessorPlayerDynamicStats : public PlayerProcessor + class ProcessorPlayerStatsDynamic : public PlayerProcessor { public: - ProcessorPlayerDynamicStats() + ProcessorPlayerStatsDynamic() { BPP_INIT(ID_PLAYER_STATS_DYNAMIC) } @@ -44,4 +44,4 @@ namespace mwmp } -#endif //OPENMW_PROCESSORPLAYERDYNAMICSTATS_HPP +#endif //OPENMW_PROCESSORPLAYERSTATSDYNAMIC_HPP