Created directory structure for server files

server/CGameHandler.cpp

@@ -10,13 +10,13 @@
 #include "StdInc.h"
 #include "CGameHandler.h"
 
-#include "BattleProcessor.h"
 #include "CVCMIServer.h"
-#include "HeroPoolProcessor.h"
-#include "PlayerMessageProcessor.h"
 #include "ServerNetPackVisitors.h"
 #include "ServerSpellCastEnvironment.h"
-#include "CQuery.h"
+#include "battles/BattleProcessor.h"
+#include "processors/HeroPoolProcessor.h"
+#include "processors/PlayerMessageProcessor.h"
+#include "queries/CQuery.h"
 
 #include "../lib/ArtifactUtils.h"
 #include "../lib/CArtHandler.h"

server/CMakeLists.txt

@@ -1,12 +1,15 @@
 set(server_SRCS
 		StdInc.cpp
 
-		BattleProcessor.cpp
+		battles/BattleProcessor.cpp
+
+		queries/CQuery.cpp
+
+		processors/HeroPoolProcessor.cpp
+		processors/PlayerMessageProcessor.cpp
+
 		CGameHandler.cpp
-		HeroPoolProcessor.cpp
-		PlayerMessageProcessor.cpp
 		ServerSpellCastEnvironment.cpp
-		CQuery.cpp
 		CVCMIServer.cpp
 		NetPacksServer.cpp
 		NetPacksLobbyServer.cpp
@@ -15,12 +18,15 @@ set(server_SRCS
 set(server_HEADERS
 		StdInc.h
 
-		BattleProcessor.h
+		battles/BattleProcessor.h
+
+		queries/CQuery.h
+
+		processors/HeroPoolProcessor.h
+		processors/PlayerMessageProcessor.h
+
 		CGameHandler.h
-		HeroPoolProcessor.h
-		PlayerMessageProcessor.h
 		ServerSpellCastEnvironment.h
-		CQuery.h
 		CVCMIServer.h
 		LobbyNetPackVisitors.h
 		ServerNetPackVisitors.h

server/CVCMIServer.cpp

@@ -36,7 +36,7 @@
 #include "../lib/VCMI_Lib.h"
 #include "../lib/VCMIDirs.h"
 #include "CGameHandler.h"
-#include "PlayerMessageProcessor.h"
+#include "processors/PlayerMessageProcessor.h"
 #include "../lib/mapping/CMapInfo.h"
 #include "../lib/GameConstants.h"
 #include "../lib/logging/CBasicLogConfigurator.h"

server/NetPacksServer.cpp

@@ -11,10 +11,10 @@
 #include "ServerNetPackVisitors.h"
 
 #include "CGameHandler.h"
-#include "BattleProcessor.h"
-#include "CQuery.h"
-#include "HeroPoolProcessor.h"
-#include "PlayerMessageProcessor.h"
+#include "battles/BattleProcessor.h"
+#include "processors/HeroPoolProcessor.h"
+#include "processors/PlayerMessageProcessor.h"
+#include "queries/CQuery.h"
 
 #include "../lib/IGameCallback.h"
 #include "../lib/mapObjects/CGTownInstance.h"

server/ServerSpellCastEnvironment.cpp

@@ -8,11 +8,13 @@
  *
  */
 #include "StdInc.h"
-#include "../lib/gameState/CGameState.h"
-#include "CQuery.h"
-#include "CGameHandler.h"
 #include "ServerSpellCastEnvironment.h"
 
+#include "CGameHandler.h"
+#include "queries/CQuery.h"
+
+#include "../lib/gameState/CGameState.h"
+
 ///ServerSpellCastEnvironment
 ServerSpellCastEnvironment::ServerSpellCastEnvironment(CGameHandler * gh)
 	: gh(gh)

server/BattleProcessor.cpp → server/battles/BattleProcessor.cpp

@@ -10,32 +10,31 @@
 #include "StdInc.h"
 #include "BattleProcessor.h"
 
-#include "CGameHandler.h"
-#include "CQuery.h"
-#include "CVCMIServer.h"
-#include "HeroPoolProcessor.h"
-
-#include "../lib/ArtifactUtils.h"
-#include "../lib/CGeneralTextHandler.h"
-#include "../lib/CStack.h"
-#include "../lib/CondSh.h"
-#include "../lib/GameSettings.h"
-#include "../lib/ScopeGuard.h"
-#include "../lib/TerrainHandler.h"
-#include "../lib/UnlockGuard.h"
-#include "../lib/battle/BattleInfo.h"
-#include "../lib/battle/CUnitState.h"
-#include "../lib/gameState/CGameState.h"
-#include "../lib/mapObjects/CGTownInstance.h"
-#include "../lib/mapping/CMap.h"
-#include "../lib/modding/IdentifierStorage.h"
-#include "../lib/serializer/Cast.h"
-#include "../lib/spells/AbilityCaster.h"
-#include "../lib/spells/BonusCaster.h"
-#include "../lib/spells/CSpellHandler.h"
-#include "../lib/spells/ISpellMechanics.h"
-#include "../lib/spells/ObstacleCasterProxy.h"
-#include "../lib/spells/Problem.h"
+#include "../CGameHandler.h"
+#include "../CVCMIServer.h"
+#include "../processors/HeroPoolProcessor.h"
+#include "../queries/CQuery.h"
+
+#include "../../lib/ArtifactUtils.h"
+#include "../../lib/CGeneralTextHandler.h"
+#include "../../lib/CModHandler.h"
+#include "../../lib/CStack.h"
+#include "../../lib/CondSh.h"
+#include "../../lib/GameSettings.h"
+#include "../../lib/ScopeGuard.h"
+#include "../../lib/TerrainHandler.h"
+#include "../../lib/battle/BattleInfo.h"
+#include "../../lib/battle/CUnitState.h"
+#include "../../lib/gameState/CGameState.h"
+#include "../../lib/mapObjects/CGTownInstance.h"
+#include "../../lib/mapping/CMap.h"
+#include "../../lib/serializer/Cast.h"
+#include "../../lib/spells/AbilityCaster.h"
+#include "../../lib/spells/BonusCaster.h"
+#include "../../lib/spells/CSpellHandler.h"
+#include "../../lib/spells/ISpellMechanics.h"
+#include "../../lib/spells/ObstacleCasterProxy.h"
+#include "../../lib/spells/Problem.h"
 
 #define COMPLAIN_RET_IF(cond, txt) do {if (cond){gameHandler->complain(txt); return;}} while(0)
 #define COMPLAIN_RET_FALSE_IF(cond, txt) do {if (cond){gameHandler->complain(txt); return false;}} while(0)

server/BattleProcessor.h → server/battles/BattleProcessor.h

@@ -9,8 +9,8 @@
  */
 #pragma once
 
-#include "../lib/GameConstants.h"
-#include "../lib/NetPacks.h"
+#include "../../lib/GameConstants.h"
+#include "../../lib/NetPacks.h"
 
 VCMI_LIB_NAMESPACE_BEGIN
 

server/HeroPoolProcessor.cpp → server/processors/HeroPoolProcessor.cpp

@@ -10,17 +10,17 @@
 #include "StdInc.h"
 #include "HeroPoolProcessor.h"
 
-#include "CGameHandler.h"
-
-#include "../lib/CHeroHandler.h"
-#include "../lib/CPlayerState.h"
-#include "../lib/GameSettings.h"
-#include "../lib/NetPacks.h"
-#include "../lib/StartInfo.h"
-#include "../lib/mapObjects/CGTownInstance.h"
-#include "../lib/gameState/CGameState.h"
-#include "../lib/gameState/TavernHeroesPool.h"
-#include "../lib/gameState/TavernSlot.h"
+#include "../CGameHandler.h"
+
+#include "../../lib/CHeroHandler.h"
+#include "../../lib/CPlayerState.h"
+#include "../../lib/GameSettings.h"
+#include "../../lib/NetPacks.h"
+#include "../../lib/StartInfo.h"
+#include "../../lib/mapObjects/CGTownInstance.h"
+#include "../../lib/gameState/CGameState.h"
+#include "../../lib/gameState/TavernHeroesPool.h"
+#include "../../lib/gameState/TavernSlot.h"
 
 HeroPoolProcessor::HeroPoolProcessor()
 	: gameHandler(nullptr)

server/PlayerMessageProcessor.cpp → server/processors/PlayerMessageProcessor.cpp

@@ -10,18 +10,19 @@
 #include "StdInc.h"
 #include "PlayerMessageProcessor.h"
 
-#include "CGameHandler.h"
-#include "CVCMIServer.h"
-
-#include "../lib/serializer/Connection.h"
-#include "../lib/CGeneralTextHandler.h"
-#include "../lib/CHeroHandler.h"
-#include "../lib/CPlayerState.h"
-#include "../lib/GameConstants.h"
-#include "../lib/NetPacks.h"
-#include "../lib/StartInfo.h"
-#include "../lib/gameState/CGameState.h"
-#include "../lib/mapObjects/CGTownInstance.h"
+#include "../CGameHandler.h"
+#include "../CVCMIServer.h"
+
+#include "../../lib/serializer/Connection.h"
+#include "../../lib/CGeneralTextHandler.h"
+#include "../../lib/CHeroHandler.h"
+#include "../../lib/CModHandler.h"
+#include "../../lib/CPlayerState.h"
+#include "../../lib/GameConstants.h"
+#include "../../lib/NetPacks.h"
+#include "../../lib/StartInfo.h"
+#include "../../lib/gameState/CGameState.h"
+#include "../../lib/mapObjects/CGTownInstance.h"
 #include "../lib/modding/IdentifierStorage.h"
 #include "../lib/modding/ModScope.h"
 

server/PlayerMessageProcessor.h → server/processors/PlayerMessageProcessor.h

@@ -9,7 +9,7 @@
  */
 #pragma once
 
-#include "../lib/GameConstants.h"
+#include "../../lib/GameConstants.h"
 
 VCMI_LIB_NAMESPACE_BEGIN
 class CGHeroInstance;

server/CQuery.cpp → server/queries/CQuery.cpp

@@ -9,11 +9,13 @@
  */
 #include "StdInc.h"
 #include "CQuery.h"
-#include "CGameHandler.h"
-#include "BattleProcessor.h"
-#include "../lib/battle/BattleInfo.h"
-#include "../lib/mapObjects/MiscObjects.h"
-#include "../lib/serializer/Cast.h"
+
+#include "../CGameHandler.h"
+#include "../battles/BattleProcessor.h"
+
+#include "../../lib/battle/BattleInfo.h"
+#include "../../lib/mapObjects/MiscObjects.h"
+#include "../../lib/serializer/Cast.h"
 
 boost::mutex Queries::mx;
 

server/CQuery.h → server/queries/CQuery.h

@@ -9,8 +9,8 @@
  */
 #pragma once
 
-#include "../lib/GameConstants.h"
-#include "../lib/NetPacks.h"
+#include "../../lib/GameConstants.h"
+#include "../../lib/NetPacks.h"
 
 VCMI_LIB_NAMESPACE_BEGIN